Changeset 1525 in vbox

Timestamp:

Mar 15, 2007 10:04:36 PM (18 years ago)

Author:

vboxsync

Message:

Make the asm struc testcase work with yasm 0.6.

Location:

trunk/src/VBox/VMM/testcase

Files:

• Makefile (modified) (5 diffs)
• tstAsmStructsAsm.asm (modified) (1 diff)

trunk/src/VBox/VMM/testcase/Makefile

@@ -50 +50 @@
         $(PATH_TARGET)/tstAsmStructs.h \
         $(PATH_TARGET)/tstAsmStructsAsm.o \
+        $(PATH_TARGET)/tstAsmStructsAsm.mac \
+        $(PATH_TARGET)/tstAsmStructsAsm.mac.o \
+        $(PATH_TARGET)/tstAsmStructsAsm.mac.lst \
         $(PATH_TARGET)/tstAsmStructs.h.dump
 
@@ -153 +156 @@
 #
 
-# 1. make an aout object containing the offsets.
-$(PATH_TARGET)/tstAsmStructsAsm.o: tstAsmStructsAsm.asm \
+# 1a. make a header file which makes all the structures+members globals.
+$(PATH_TARGET)/tstAsmStructsAsm.mac: tstAsmStructsAsm.asm tstAsmStructsAsm-lst.sed \
                 $(DEPTH)/include/iprt/asmdefs.mac \
                 $(DEPTH)/include/VBox/cpum.mac \
@@ -174 +177 @@
                         $(DEFS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
                 ) \
-                -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf -g stabs) \
-                $(foreach inc,$(INCS),-I$(inc)/) -o $@ $<
+                -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf) \
+                $(foreach inc,$(INCS),-I$(inc)/) -o $@.o -l [email protected] $<
 else
         $(QUIET)$(TOOL_NASM_AS) \
@@ -187 +190 @@
                 ) \
                 -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf) \
-                $(foreach inc,$(INCS),-I$(inc)/) -o $@ $<
+                $(foreach inc,$(INCS),-I$(inc)/) -o [email protected] -l [email protected] $<
+endif
+        $(SED) -f tstAsmStructsAsm-lst.sed [email protected] > $@ 
+
+
+
+# 1b. make an elf/macho object containing the offsets.
+$(PATH_TARGET)/tstAsmStructsAsm.o: tstAsmStructsAsm.asm $(PATH_TARGET)/tstAsmStructsAsm.mac \
+                Makefile \
+                | $(call DIRDEP,$(PATH_TARGET))
+        $(call MSG_L1,Compiling $<)
+ifndef DONT_USE_YASM
+        $(QUIET)$(TOOL_YASM_AS) \
+                $(addprefix -D, \
+                        DO_GLOBALS \
+                        $(DEFS) \
+                        $(DEFS.$(BUILD_TYPE)) \
+                        $(DEFS.$(BUILD_TARGET)) \
+                        IN_RING3 \
+                        $(DEFS.$(BUILD_TARGET_ARCH)) \
+                        $(DEFS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+                ) \
+                -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf -g stabs) \
+                $(foreach inc,$(INCS) $(PATH_TARGET),-I$(inc)/) -o $@ $<
+else
+        $(QUIET)$(TOOL_NASM_AS) \
+                $(addprefix -D, \
+                        DO_GLOBALS \
+                        $(DEFS) \
+                        $(DEFS.$(BUILD_TYPE)) \
+                        $(DEFS.$(BUILD_TARGET)) \
+                        IN_RING3 \
+                        $(DEFS.$(BUILD_TARGET_ARCH)) \
+                        $(DEFS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+                ) \
+                -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf) \
+                $(foreach inc,$(INCS) $(PATH_TARGET),-I$(inc)/) -o $@ $<
 endif
 
@@ -202 +241 @@
         $(VBOX_NM) $< > [email protected]
         $(QUIET)$(SED) -e '/STAMPROFILEADV/d' \
-               -e '/00[0-9a-fA-F]* a [^_.]*\./!d'     -e 's/\(00[0-9a-fA-F]*\) a \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
+               -e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d'     -e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
                [email protected] >  [email protected]
         $(QUIET)$(SED) -e '/VM_size$$/d' \
-               -e '/00[0-9a-fA-F]* a [^_.]*_size$$/!d'  -e 's/\(00[0-9a-fA-F]*\) a \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
+               -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d'  -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
                [email protected] >> [email protected]
         $(QUIET)$(MV) -f [email protected] $@

trunk/src/VBox/VMM/testcase/tstAsmStructsAsm.asm

@@ -33 +33 @@
 %include "VBox/vm.mac"
 %include "../VMMSwitcher/VMMSwitcher.mac"
+%ifdef DO_GLOBALS
+ %include "tstAsmStructsAsm.mac"
+%endif
 
 .text