From 241afd837c09d42d38a23f9c5e988c50bfacfc30 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 6 Jun 2002 15:33:37 +0000 Subject: [PATCH] NASM fix for *_CONTENT() macros (Josh Vanderhoof) --- src/mesa/x86/assyntax.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h index ad71b74..6a4aa62 100644 --- a/src/mesa/x86/assyntax.h +++ b/src/mesa/x86/assyntax.h @@ -1,4 +1,4 @@ -/* $Id: assyntax.h,v 1.19 2002/04/02 16:18:20 brianp Exp $ */ +/* $Id: assyntax.h,v 1.20 2002/06/06 15:33:37 brianp Exp $ */ #ifndef __ASSYNTAX_H__ #define __ASSYNTAX_H__ @@ -991,12 +991,21 @@ SECTION _DATA public align=16 class=DATA use32 flat #define B_CONST(a) a /* Indirect Mode */ +#ifdef NASM_ASSEMBLER +#define P_CONTENT(a) [a] +#define X_CONTENT(a) TBYTE_PTR [a] +#define D_CONTENT(a) QWORD_PTR [a] +#define L_CONTENT(a) DWORD_PTR [a] +#define W_CONTENT(a) WORD_PTR [a] +#define B_CONTENT(a) BYTE_PTR [a] +#else #define P_CONTENT(a) a #define X_CONTENT(a) TBYTE_PTR a #define D_CONTENT(a) QWORD_PTR a #define L_CONTENT(a) DWORD_PTR a #define W_CONTENT(a) WORD_PTR a #define B_CONTENT(a) BYTE_PTR a +#endif /* Register a indirect */ #define P_REGIND(a) [a] -- 2.7.4