Changeset 26223 in vbox
- Timestamp:
- Feb 3, 2010 9:58:26 PM (15 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 6 edited
- 3 moved
-
Disassembler/Makefile.kmk (modified) (1 diff)
-
Runtime/Makefile.kmk (modified) (3 diffs)
-
Runtime/testcase/Makefile.kmk (modified) (1 diff)
-
VMM/Makefile.kmk (modified) (1 diff)
-
VMM/testcase/Makefile.kmk (modified) (2 diffs)
-
VMM/testcase/tstMicro.cpp (modified) (1 diff)
-
VMM/testcase/tstMicroRC.cpp (moved) (moved from trunk/src/VBox/VMM/testcase/tstMicroGC.cpp ) (2 diffs)
-
VMM/testcase/tstMicroRC.def (moved) (moved from trunk/src/VBox/VMM/testcase/tstMicroGC.def ) (1 diff)
-
VMM/testcase/tstMicroRCA.asm (moved) (moved from trunk/src/VBox/VMM/testcase/tstMicroGCA.asm ) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Disassembler/Makefile.kmk
r26222 r26223 51 51 52 52 ifdef VBOX_WITH_RAW_MODE 53 LIBRARIES += Disasm GC54 Disasm GC_TEMPLATE = VBoxRc55 Disasm GC_DEFS = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY56 Disasm GC_SOURCES = \53 LIBRARIES += DisasmRC 54 DisasmRC_TEMPLATE = VBoxRc 55 DisasmRC_DEFS = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY 56 DisasmRC_SOURCES = \ 57 57 DisasmCore.cpp \ 58 58 DisasmReg.cpp \ -
trunk/src/VBox/Runtime/Makefile.kmk
r26222 r26223 60 60 LIBRARIES += RuntimeR3 RuntimeR0 RuntimeEFCPP RuntimeR3NoCRTGCC 61 61 ifdef VBOX_WITH_RAW_MODE 62 LIBRARIES += Runtime GC62 LIBRARIES += RuntimeRC 63 63 endif 64 64 ifdef VBOX_WITH_VBOXDRV … … 1547 1547 ifdef VBOX_WITH_RAW_MODE 1548 1548 # 1549 # Runtime GC - Guestcontext library.1549 # RuntimeRC - Raw-mode context library. 1550 1550 # 1551 Runtime GC_TEMPLATE = VBoxRc1552 Runtime GC_DEFS = IN_RT_GC RT_WITH_VBOX1553 Runtime GC_INCS = include1554 Runtime GC_SOURCES = \1551 RuntimeRC_TEMPLATE = VBoxRc 1552 RuntimeRC_DEFS = IN_RT_GC RT_WITH_VBOX 1553 RuntimeRC_INCS = include 1554 RuntimeRC_SOURCES = \ 1555 1555 common/log/log.cpp \ 1556 1556 common/log/logellipsis.cpp \ … … 1595 1595 1596 1596 #if1of ($(KBUILD_TARGET_ARCH),amd64 x86) 1597 # Runtime GC_SOURCES += common/time/timesupA.asm1597 # RuntimeRC_SOURCES += common/time/timesupA.asm 1598 1598 #else 1599 Runtime GC_SOURCES += common/time/timesupref.cpp1599 RuntimeRC_SOURCES += common/time/timesupref.cpp 1600 1600 #endif 1601 1601 1602 Runtime GC_SOURCES.win.x86 = $(RuntimeWin32ASM_SOURCES)1602 RuntimeRC_SOURCES.win.x86 = $(RuntimeWin32ASM_SOURCES) 1603 1603 1604 1604 ifeq ($(VBOX_LDR_FMT32),lx) 1605 Runtime GC_SOURCES += os2/sys0.asm1605 RuntimeRC_SOURCES += os2/sys0.asm 1606 1606 endif 1607 1607 1608 1608 if1of ($(KBUILD_TARGET), darwin solaris freebsd) 1609 Runtime GC_SOURCES += \1609 RuntimeRC_SOURCES += \ 1610 1610 common/math/gcc/adddi3.c \ 1611 1611 common/math/gcc/anddi3.c \ -
trunk/src/VBox/Runtime/testcase/Makefile.kmk
r26222 r26223 238 238 endif 239 239 tstLdrObj_LIBS = \ 240 $(PATH_LIB)/Disasm GC$(VBOX_SUFF_LIB) \241 $(PATH_LIB)/Runtime GC$(VBOX_SUFF_LIB)240 $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ 241 $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB) 242 242 ifeq ($(VBOX_LDR_FMT32),pe) 243 243 tstLdrObj_LDFLAGS = -Entry:Entrypoint -
trunk/src/VBox/VMM/Makefile.kmk
r26222 r26223 351 351 352 352 VMMGC_LIBS = \ 353 $(PATH_LIB)/Disasm GC$(VBOX_SUFF_LIB) \354 $(PATH_LIB)/Runtime GC$(VBOX_SUFF_LIB)353 $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ 354 $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB) 355 355 ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),) 356 356 VMMGC_LIBS += \ -
trunk/src/VBox/VMM/testcase/Makefile.kmk
r26222 r26223 48 48 ifdef VBOX_WITH_RAW_MODE 49 49 PROGRAMS += tstMicro 50 SYSMODS += tstMicro GC50 SYSMODS += tstMicroRC 51 51 endif 52 52 ifdef VBOX_WITH_PDM_ASYNC_COMPLETION … … 228 228 tstMicro_LIBS = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME) 229 229 230 tstMicro GC_TEMPLATE = VBoxRc231 tstMicro GC_SOURCES = tstMicroGC.cpp tstMicroGCA.asm232 tstMicro GC_DEFS =233 tstMicro GC_INCS = $(VBOX_PATH_VMM_SRC)/testcase230 tstMicroRC_TEMPLATE = VBoxRc 231 tstMicroRC_SOURCES = tstMicroRC.cpp tstMicroRCA.asm 232 tstMicroRC_DEFS = 233 tstMicroRC_INCS = $(VBOX_PATH_VMM_SRC)/testcase 234 234 ifeq ($(VBOX_LDR_FMT32),pe) 235 tstMicro GC_LDFLAGS = -Entry:tstMicroGC236 endif 237 tstMicro GC_SYSSUFF = .gc238 tstMicro GC_LIBS = \239 $(PATH_LIB)/Disasm GC$(VBOX_SUFF_LIB) \240 $(PATH_LIB)/Runtime GC$(VBOX_SUFF_LIB)235 tstMicroRC_LDFLAGS = -Entry:tstMicroRC 236 endif 237 tstMicroRC_SYSSUFF = .gc 238 tstMicroRC_LIBS = \ 239 $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ 240 $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB) 241 241 ifeq ($(filter-out pe lx,$(VBOX_LDR_FMT32)),) 242 tstMicro GC_LIBS += \242 tstMicroRC_LIBS += \ 243 243 $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB) \ 244 244 $(LIB_VMMGC) 245 245 endif 246 tstMicro GC_SOURCES.win = tstMicroGC.def246 tstMicroRC_SOURCES.win = tstMicroRC.def 247 247 248 248 endif # VBOX_WITH_RAW_MODE -
trunk/src/VBox/VMM/testcase/tstMicro.cpp
r26152 r26223 203 203 * Loading the module and resolve the entry point. 204 204 */ 205 int rc = PDMR3LdrLoadRC(pVM, NULL, "tstMicro GC.gc");206 if (RT_FAILURE(rc)) 207 { 208 RTPrintf(TESTCASE ": Failed to load tstMicro GC.gc, rc=%Rra\n", rc);205 int rc = PDMR3LdrLoadRC(pVM, NULL, "tstMicroRC.gc"); 206 if (RT_FAILURE(rc)) 207 { 208 RTPrintf(TESTCASE ": Failed to load tstMicroRC.gc, rc=%Rra\n", rc); 209 209 return rc; 210 210 } 211 211 RTRCPTR RCPtrEntry; 212 rc = PDMR3LdrGetSymbolRC(pVM, "tstMicro GC.gc", "tstMicroGC", &RCPtrEntry);213 if (RT_FAILURE(rc)) 214 { 215 RTPrintf(TESTCASE ": Failed to resolve the 'tstMicro GC' entry point in tstMicroGC.gc, rc=%Rra\n", rc);212 rc = PDMR3LdrGetSymbolRC(pVM, "tstMicroRC.gc", "tstMicroRC", &RCPtrEntry); 213 if (RT_FAILURE(rc)) 214 { 215 RTPrintf(TESTCASE ": Failed to resolve the 'tstMicroRC' entry point in tstMicroRC.gc, rc=%Rra\n", rc); 216 216 return rc; 217 217 } 218 218 RTRCPTR RCPtrStart; 219 rc = PDMR3LdrGetSymbolRC(pVM, "tstMicro GC.gc", "tstMicroGCAsmStart", &RCPtrStart);220 if (RT_FAILURE(rc)) 221 { 222 RTPrintf(TESTCASE ": Failed to resolve the 'tstMicro GCAsmStart' entry point in tstMicroGC.gc, rc=%Rra\n", rc);219 rc = PDMR3LdrGetSymbolRC(pVM, "tstMicroRC.gc", "tstMicroRCAsmStart", &RCPtrStart); 220 if (RT_FAILURE(rc)) 221 { 222 RTPrintf(TESTCASE ": Failed to resolve the 'tstMicroRCAsmStart' entry point in tstMicroRC.gc, rc=%Rra\n", rc); 223 223 return rc; 224 224 } 225 225 RTRCPTR RCPtrEnd; 226 rc = PDMR3LdrGetSymbolRC(pVM, "tstMicro GC.gc", "tstMicroGCAsmEnd", &RCPtrEnd);227 if (RT_FAILURE(rc)) 228 { 229 RTPrintf(TESTCASE ": Failed to resolve the 'tstMicro GCAsmEnd' entry point in tstMicroGC.gc, rc=%Rra\n", rc);226 rc = PDMR3LdrGetSymbolRC(pVM, "tstMicroRC.gc", "tstMicroRCAsmEnd", &RCPtrEnd); 227 if (RT_FAILURE(rc)) 228 { 229 RTPrintf(TESTCASE ": Failed to resolve the 'tstMicroRCAsmEnd' entry point in tstMicroRC.gc, rc=%Rra\n", rc); 230 230 return rc; 231 231 } -
trunk/src/VBox/VMM/testcase/tstMicroRC.cpp
r26217 r26223 39 39 *******************************************************************************/ 40 40 RT_C_DECLS_BEGIN 41 DECLEXPORT(int) tstMicro GC(PTSTMICRO pTst, unsigned uTestcase);41 DECLEXPORT(int) tstMicroRC(PTSTMICRO pTst, unsigned uTestcase); 42 42 RT_C_DECLS_END 43 43 … … 133 133 134 134 135 DECLEXPORT(int) tstMicro GC(PTSTMICRO pTst, unsigned uTestcase)135 DECLEXPORT(int) tstMicroRC(PTSTMICRO pTst, unsigned uTestcase) 136 136 { 137 137 RTLogPrintf("pTst=%p uTestcase=%d\n", pTst, uTestcase); -
trunk/src/VBox/VMM/testcase/tstMicroRC.def
r26217 r26223 18 18 ; 19 19 20 LIBRARY tstMicro GC.gc20 LIBRARY tstMicroRC.gc 21 21 EXPORTS 22 22 ; data 23 23 24 24 ; code 25 tstMicro GCAsmStart26 tstMicro GCAsmEnd25 tstMicroRCAsmStart 26 tstMicroRCAsmEnd 27 27 tstPFR1 28 28 tstPFR2 -
trunk/src/VBox/VMM/testcase/tstMicroRCA.asm
r26217 r26223 1 1 ; $Id$ 2 2 ;; @file 3 ; tstMicro GCA3 ; tstMicroRCA 4 4 ; 5 5 … … 133 133 134 134 BEGINCODE 135 EXPORTEDNAME tstMicro GCAsmStart135 EXPORTEDNAME tstMicroRCAsmStart 136 136 137 137 … … 558 558 ENDPROC tstTrapHandler 559 559 560 EXPORTEDNAME tstMicro GCAsmEnd560 EXPORTEDNAME tstMicroRCAsmEnd
Note:
See TracChangeset
for help on using the changeset viewer.

