Changeset 46855 in vbox for trunk/include/iprt

Timestamp:

Jun 28, 2013 3:02:41 AM (11 years ago)

Author:

vboxsync

Message:

iprt/asmdefs.mac: Working towards working import handling, at last... Mach-O adjustments.

File:

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

trunk/include/iprt/asmdefs.mac

@@ -113 +113 @@
 ; Mangles the given C name so it will _import_ the right symbol.
 %ifdef ASM_FORMAT_PE
-%define IMPNAME(name)   __imp_ %+ NAME(name)
-%else
-%define IMPNAME(name)   NAME(name)
+ %define IMPNAME(name)  __imp_ %+ NAME(name)
+%else
+ %define IMPNAME(name)  NAME(name)
 %endif
 
@@ -129 +129 @@
  %define IMP(name)      IMPNAME(name)
 %endif
+
+;;
+; Declares an imported object for use with IMP2.
+; @note May change the current section!
+%macro EXTERN_IMP2 1
+    extern IMPNAME(%1)
+    BEGINDATA
+ %ifdef ASM_FORMAT_MACHO
+    g_Imp2_ %+ %1:  RTCCPTR_DEF IMPNAME(%1)
+ %endif
+%endmacro
 
 ;;
@@ -147 +158 @@
  %endif
 %elifdef ASM_FORMAT_MACHO
- %ifdef RT_ARCH_AMD64
-  %define IMP2(name)    qword [IMPNAME(name) wrt rip]
- %else
-  %define IMP2(name)    IMPNAME(name)
- %endif
+ %define IMP2(name)     RTCCPTR_PRE [g_Imp2_ %+ name xWrtRIP]
 %endif
 %ifndef IMP2