Changeset 58587 in vbox

Timestamp:

Nov 5, 2015 3:44:39 PM (9 years ago)

Author:

vboxsync

Message:

iprt/asmdefs.h: nasm fixes.

File:

• trunk/include/iprt/asmdefs.mac (modified) (7 diffs)

trunk/include/iprt/asmdefs.mac

@@ -251 +251 @@
 ;;
 ; Global marker which is DECLASM() compatible.
-%macro GLOBALNAME 1,
+%macro GLOBALNAME 1
 %ifndef ASM_FORMAT_BIN
 global NAME(%1)
@@ -260 +260 @@
 ;;
 ; Global exported marker which is DECLASM() compatible.
-%macro EXPORTEDNAME 1,
+%macro EXPORTEDNAME 1
  %ifdef ASM_FORMAT_PE
   export %1=NAME(%1)
@@ -274 +274 @@
 ;;
 ; Global marker which is DECLASM() compatible.
-%macro GLOBALNAME_EX 2,
+%macro GLOBALNAME_EX 2
 %ifndef ASM_FORMAT_BIN
  %ifdef ASM_FORMAT_ELF
@@ -287 +287 @@
 ;;
 ; Global exported marker which is DECLASM() compatible.
-%macro EXPORTEDNAME_EX 2,
+%macro EXPORTEDNAME_EX 2
  %ifdef ASM_FORMAT_PE
   export %1=NAME(%1)
@@ -332 +332 @@
 GLOBALNAME_EX %1 %+ _EndProc, function hidden
 %ifdef ASM_FORMAT_ELF
+ %ifndef __NASM__ ; nasm does this in the global directive.
 size NAME(%1)               NAME(%1 %+ _EndProc) - NAME(%1)
 size NAME(%1 %+ _EndProc)   0
+ %endif
 %endif
     db  0xCC, 0xCC, 0xCC, 0xCC
@@ -898 +900 @@
 ;;
 ; Structure size assertion macro.
-%define AssertCompileSize(a_Type, a_Size) AssertCompileSizeML a_Type, a_Size
-%macro AssertCompileSizeML 2,
+%ifdef __NASM__
+ %define AssertCompileSize(a_Type, a_Size) ; Not possible?
+%else
+ %define AssertCompileSize(a_Type, a_Size) AssertCompileSizeML a_Type, a_Size
+%endif
+%macro AssertCompileSizeML 2
  %ifndef KBUILD_GENERATING_MAKEFILE_DEPENDENCIES
   %assign AssertVar_cbActual   %1 %+ _size
@@ -911 +917 @@
 ;;
 ; Structure memember offset assertion macro.
-%define AssertCompileMemberOffset(a_Type, a_Member, a_off) AssertCompileMemberOffsetML a_Type, a_Member, a_off
-%macro AssertCompileMemberOffsetML 3,
+%ifdef __NASM__
+ %define AssertCompileMemberOffset(a_Type, a_Member, a_off) ; Not possible?
+%else
+ %define AssertCompileMemberOffset(a_Type, a_Member, a_off) AssertCompileMemberOffsetML a_Type, a_Member, a_off
+%endif
+%macro AssertCompileMemberOffsetML 3
  %ifndef KBUILD_GENERATING_MAKEFILE_DEPENDENCIES
   %assign AssertVar_offActual   %1 %+ . %+ %2