Index: /trunk/src/VBox/VMM/VMMR3/PATM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PATM.cpp (revision 54686) +++ /trunk/src/VBox/VMM/VMMR3/PATM.cpp (revision 54687) @@ -160,6 +160,6 @@ AssertCompile(VMCPU_FF_INTERRUPT_PIC == RT_BIT_32(1)); - AssertReleaseMsg(PATMInterruptFlag == (VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_TIMER | VMCPU_FF_REQUEST), - ("Interrupt flags out of sync!! PATMInterruptFlag=%#x expected %#x. broken assembler?\n", PATMInterruptFlag, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_TIMER | VMCPU_FF_REQUEST)); + AssertReleaseMsg(g_fPatmInterruptFlag == (VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_TIMER | VMCPU_FF_REQUEST), + ("Interrupt flags out of sync!! g_fPatmInterruptFlag=%#x expected %#x. broken assembler?\n", g_fPatmInterruptFlag, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_TIMER | VMCPU_FF_REQUEST)); /* Allocate patch memory and GC patch state memory. */ @@ -308,12 +308,12 @@ #endif /* VBOX_WITH_STATISTICS */ - Log(("PATMCallRecord.cbFunction %u\n", PATMCallRecord.cbFunction)); - Log(("PATMCallIndirectRecord.cbFunction %u\n", PATMCallIndirectRecord.cbFunction)); - Log(("PATMRetRecord.cbFunction %u\n", PATMRetRecord.cbFunction)); - Log(("PATMJumpIndirectRecord.cbFunction %u\n", PATMJumpIndirectRecord.cbFunction)); - Log(("PATMPopf32Record.cbFunction %u\n", PATMPopf32Record.cbFunction)); - Log(("PATMIretRecord.cbFunction %u\n", PATMIretRecord.cbFunction)); - Log(("PATMStiRecord.cbFunction %u\n", PATMStiRecord.cbFunction)); - Log(("PATMCheckIFRecord.cbFunction %u\n", PATMCheckIFRecord.cbFunction)); + Log(("g_patmCallRecord.cbFunction %u\n", g_patmCallRecord.cbFunction)); + Log(("g_patmCallIndirectRecord.cbFunction %u\n", g_patmCallIndirectRecord.cbFunction)); + Log(("g_patmRetRecord.cbFunction %u\n", g_patmRetRecord.cbFunction)); + Log(("g_patmJumpIndirectRecord.cbFunction %u\n", g_patmJumpIndirectRecord.cbFunction)); + Log(("g_patmPopf32Record.cbFunction %u\n", g_patmPopf32Record.cbFunction)); + Log(("g_patmIretRecord.cbFunction %u\n", g_patmIretRecord.cbFunction)); + Log(("g_patmStiRecord.cbFunction %u\n", g_patmStiRecord.cbFunction)); + Log(("g_patmCheckIFRecord.cbFunction %u\n", g_patmCheckIFRecord.cbFunction)); return rc; Index: /trunk/src/VBox/VMM/VMMR3/PATMA.asm =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PATMA.asm (revision 54686) +++ /trunk/src/VBox/VMM/VMMR3/PATMA.asm (revision 54687) @@ -64,5 +64,5 @@ ; Patch record for statistics -GLOBALNAME PATMStatsRecord +GLOBALNAME g_patmStatsRecord RTCCPTR_DEF PATMStats_Start DD 0 @@ -94,5 +94,5 @@ SECTION .data ; Patch record for setting PATM_INTERRUPTFLAG -GLOBALNAME PATMSetPIFRecord +GLOBALNAME g_patmSetPIFRecord RTCCPTR_DEF PATMSetPIF_Start DD 0 @@ -121,5 +121,5 @@ SECTION .data ; Patch record for clearing PATM_INTERRUPTFLAG -GLOBALNAME PATMClearPIFRecord +GLOBALNAME g_patmClearPIFRecord RTCCPTR_DEF PATMClearPIF_Start DD 0 @@ -176,5 +176,5 @@ SECTION .data ; Patch record for clearing PATM_INHIBITIRQADDR -GLOBALNAME PATMClearInhibitIRQFaultIF0Record +GLOBALNAME g_patmClearInhibitIRQFaultIF0Record RTCCPTR_DEF PATMClearInhibitIRQFaultIF0_Start DD 0 @@ -248,5 +248,5 @@ SECTION .data ; Patch record for clearing PATM_INHIBITIRQADDR -GLOBALNAME PATMClearInhibitIRQContIF0Record +GLOBALNAME g_patmClearInhibitIRQContIF0Record RTCCPTR_DEF PATMClearInhibitIRQContIF0_Start DD 0 @@ -309,5 +309,5 @@ SECTION .data ; Patch record for 'cli' -GLOBALNAME PATMCliRecord +GLOBALNAME g_patmCliRecord RTCCPTR_DEF PATMCliStart DD PATMCliJump - PATMCliStart @@ -357,5 +357,5 @@ SECTION .data ; Patch record for 'sti' -GLOBALNAME PATMStiRecord +GLOBALNAME g_patmStiRecord RTCCPTR_DEF PATMStiStart DD 0 @@ -447,5 +447,5 @@ SECTION .data ; Patch record for trap gate entrypoint -GLOBALNAME PATMTrapEntryRecord +GLOBALNAME g_patmTrapEntryRecord RTCCPTR_DEF PATMTrapEntryStart DD PATMTrapEntryJump - PATMTrapEntryStart @@ -534,5 +534,5 @@ SECTION .data ; Patch record for trap gate entrypoint -GLOBALNAME PATMTrapEntryRecordErrorCode +GLOBALNAME g_patmTrapEntryRecordErrorCode RTCCPTR_DEF PATMTrapErrorCodeEntryStart DD PATMTrapErrorCodeEntryJump - PATMTrapErrorCodeEntryStart @@ -618,5 +618,5 @@ SECTION .data ; Patch record for interrupt gate entrypoint -GLOBALNAME PATMIntEntryRecord +GLOBALNAME g_patmIntEntryRecord RTCCPTR_DEF PATMIntEntryStart DD 0 @@ -702,5 +702,5 @@ SECTION .data ; Patch record for interrupt gate entrypoint -GLOBALNAME PATMIntEntryRecordErrorCode +GLOBALNAME g_patmIntEntryRecordErrorCode RTCCPTR_DEF PATMIntEntryErrorCodeStart DD 0 @@ -789,5 +789,5 @@ SECTION .data ; Patch record for 'popfd' -GLOBALNAME PATMPopf32Record +GLOBALNAME g_patmPopf32Record RTCCPTR_DEF PATMPopf32Start DD PATMPopf32Jump - PATMPopf32Start @@ -883,5 +883,5 @@ SECTION .data ; Patch record for 'popfd' -GLOBALNAME PATMPopf32Record_NoExit +GLOBALNAME g_patmPopf32Record_NoExit RTCCPTR_DEF PATMPopf32_NoExitStart DD 0 @@ -967,5 +967,5 @@ SECTION .data ; Patch record for 'popf' -GLOBALNAME PATMPopf16Record +GLOBALNAME g_patmPopf16Record RTCCPTR_DEF PATMPopf16Start DD PATMPopf16Jump - PATMPopf16Start @@ -1030,5 +1030,5 @@ SECTION .data ; Patch record for 'popf' -GLOBALNAME PATMPopf16Record_NoExit +GLOBALNAME g_patmPopf16Record_NoExit RTCCPTR_DEF PATMPopf16Start_NoExit DD 0 @@ -1089,5 +1089,5 @@ SECTION .data ; Patch record for 'pushfd' -GLOBALNAME PATMPushf32Record +GLOBALNAME g_patmPushf32Record RTCCPTR_DEF PATMPushf32Start DD 0 @@ -1138,5 +1138,5 @@ SECTION .data ; Patch record for 'pushf' -GLOBALNAME PATMPushf16Record +GLOBALNAME g_patmPushf16Record RTCCPTR_DEF PATMPushf16Start DD 0 @@ -1180,5 +1180,5 @@ SECTION .data ; Patch record for 'push cs' -GLOBALNAME PATMPushCSRecord +GLOBALNAME g_patmPushCSRecord RTCCPTR_DEF PATMPushCSStart DD PATMPushCSJump - PATMPushCSStart @@ -1394,5 +1394,5 @@ SECTION .data ; Patch record for 'iretd' -GLOBALNAME PATMIretRecord +GLOBALNAME g_patmIretRecord RTCCPTR_DEF PATMIretStart DD 0 @@ -1692,5 +1692,5 @@ SECTION .data ; Patch record for 'iretd' -GLOBALNAME PATMIretRing1Record +GLOBALNAME g_patmIretRing1Record RTCCPTR_DEF PATMIretRing1Start DD 0 @@ -1843,5 +1843,5 @@ SECTION .data -GLOBALNAME PATMIretFunctionRecord +GLOBALNAME g_patmIretFunctionRecord RTCCPTR_DEF PATMIretFunction_Start DD 0 @@ -1912,5 +1912,5 @@ SECTION .data ; Patch record for 'cpuid' -GLOBALNAME PATMCpuidRecord +GLOBALNAME g_patmCpuidRecord istruc PATCHASMRECORD at PATCHASMRECORD.pbFunction, RTCCPTR_DEF PATMCpuidStart @@ -1957,5 +1957,5 @@ SECTION .data ; Patch record for 'JEcx' -GLOBALNAME PATMJEcxRecord +GLOBALNAME g_patmJEcxRecord RTCCPTR_DEF PATMJEcxStart DD 0 @@ -1997,5 +1997,5 @@ SECTION .data ; Patch record for 'Loop' -GLOBALNAME PATMLoopRecord +GLOBALNAME g_patmLoopRecord RTCCPTR_DEF PATMLoopStart DD 0 @@ -2039,5 +2039,5 @@ SECTION .data ; Patch record for 'Loopz' -GLOBALNAME PATMLoopZRecord +GLOBALNAME g_patmLoopZRecord RTCCPTR_DEF PATMLoopZStart DD 0 @@ -2082,5 +2082,5 @@ SECTION .data ; Patch record for 'LoopNZ' -GLOBALNAME PATMLoopNZRecord +GLOBALNAME g_patmLoopNZRecord RTCCPTR_DEF PATMLoopNZStart DD 0 @@ -2217,5 +2217,5 @@ SECTION .data ; Patch record for indirect calls and jumps -GLOBALNAME PATMLookupAndCallRecord +GLOBALNAME g_patmLookupAndCallRecord RTCCPTR_DEF PATMLookupAndCallStart DD 0 @@ -2336,5 +2336,5 @@ SECTION .data ; Patch record for indirect calls and jumps -GLOBALNAME PATMLookupAndJumpRecord +GLOBALNAME g_patmLookupAndJumpRecord RTCCPTR_DEF PATMLookupAndJumpStart DD 0 @@ -2397,5 +2397,5 @@ SECTION .data ; Patch record for direct calls -GLOBALNAME PATMCallRecord +GLOBALNAME g_patmCallRecord RTCCPTR_DEF PATMCallStart DD 0 @@ -2455,5 +2455,5 @@ SECTION .data ; Patch record for indirect calls -GLOBALNAME PATMCallIndirectRecord +GLOBALNAME g_patmCallIndirectRecord RTCCPTR_DEF PATMCallIndirectStart DD 0 @@ -2518,5 +2518,5 @@ SECTION .data ; Patch record for indirect jumps -GLOBALNAME PATMJumpIndirectRecord +GLOBALNAME g_patmJumpIndirectRecord RTCCPTR_DEF PATMJumpIndirectStart DD 0 @@ -2584,5 +2584,5 @@ SECTION .data -GLOBALNAME PATMRetRecord +GLOBALNAME g_patmRetRecord RTCCPTR_DEF PATMRet_Start DD 0 @@ -2751,5 +2751,5 @@ SECTION .data -GLOBALNAME PATMRetFunctionRecord +GLOBALNAME g_patmRetFunctionRecord RTCCPTR_DEF PATMRetFunction_Start DD 0 @@ -2829,5 +2829,5 @@ SECTION .data ; Patch record for call instructions -GLOBALNAME PATMCheckIFRecord +GLOBALNAME g_patmCheckIFRecord RTCCPTR_DEF PATMCheckIF_Start DD PATMCheckIF_Jump - PATMCheckIF_Start @@ -2922,5 +2922,5 @@ SECTION .data -GLOBALNAME PATMMovFromSSRecord +GLOBALNAME g_patmMovFromSSRecord RTCCPTR_DEF PATMMovFromSS_Start DD 0 @@ -2936,5 +2936,5 @@ SECTION .rodata ; For assertion during init (to make absolutely sure the flags are in sync in vm.mac & vm.h) -GLOBALNAME PATMInterruptFlag +GLOBALNAME g_fPatmInterruptFlag DD VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_TIMER | VMCPU_FF_REQUEST Index: /trunk/src/VBox/VMM/VMMR3/PATMPatch.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PATMPatch.cpp (revision 54686) +++ /trunk/src/VBox/VMM/VMMR3/PATMPatch.cpp (revision 54687) @@ -434,7 +434,7 @@ if (EMIsRawRing1Enabled(pVM)) - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMIretRing1Record, 0, false, &callInfo); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmIretRing1Record, 0, false, &callInfo); else - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMIretRecord, 0, false, &callInfo); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmIretRecord, 0, false, &callInfo); PATCHGEN_EPILOG(pPatch, size); @@ -447,5 +447,5 @@ PATCHGEN_PROLOG(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMCliRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmCliRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); @@ -464,5 +464,5 @@ PATCHGEN_PROLOG(pVM, pPatch); callInfo.pNextInstrGC = pNextInstrGC; - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMStiRecord, 0, false, &callInfo); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmStiRecord, 0, false, &callInfo); PATCHGEN_EPILOG(pPatch, size); @@ -486,9 +486,9 @@ { Log(("operand size override!!\n")); - size = patmPatchGenCode(pVM, pPatch, pPB, (fGenJumpBack) ? &PATMPopf16Record : &PATMPopf16Record_NoExit , pReturnAddrGC, fGenJumpBack, &callInfo); + size = patmPatchGenCode(pVM, pPatch, pPB, (fGenJumpBack) ? &g_patmPopf16Record : &g_patmPopf16Record_NoExit , pReturnAddrGC, fGenJumpBack, &callInfo); } else { - size = patmPatchGenCode(pVM, pPatch, pPB, (fGenJumpBack) ? &PATMPopf32Record : &PATMPopf32Record_NoExit, pReturnAddrGC, fGenJumpBack, &callInfo); + size = patmPatchGenCode(pVM, pPatch, pPB, (fGenJumpBack) ? &g_patmPopf32Record : &g_patmPopf32Record_NoExit, pReturnAddrGC, fGenJumpBack, &callInfo); } @@ -506,9 +506,9 @@ { Log(("operand size override!!\n")); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMPushf16Record, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmPushf16Record, 0, false); } else { - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMPushf32Record, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmPushf32Record, 0, false); } @@ -521,5 +521,5 @@ uint32_t size; PATCHGEN_PROLOG(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMPushCSRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmPushCSRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); return VINF_SUCCESS; @@ -536,14 +536,14 @@ { case OP_LOOP: - pPatchAsmRec = &PATMLoopRecord; + pPatchAsmRec = &g_patmLoopRecord; break; case OP_LOOPNE: - pPatchAsmRec = &PATMLoopNZRecord; + pPatchAsmRec = &g_patmLoopNZRecord; break; case OP_LOOPE: - pPatchAsmRec = &PATMLoopZRecord; + pPatchAsmRec = &g_patmLoopZRecord; break; case OP_JECXZ: - pPatchAsmRec = &PATMJEcxRecord; + pPatchAsmRec = &g_patmJEcxRecord; break; default: @@ -748,5 +748,5 @@ callInfo.pReturnGC = pCurInstrGC + pCpu->cbInstr; callInfo.pTargetGC = (fIndirect) ? 0xDEADBEEF : pTargetGC; - size = patmPatchGenCode(pVM, pPatch, pPB, (fIndirect) ? &PATMCallIndirectRecord : &PATMCallRecord, 0, false, &callInfo); + size = patmPatchGenCode(pVM, pPatch, pPB, (fIndirect) ? &g_patmCallIndirectRecord : &g_patmCallRecord, 0, false, &callInfo); PATCHGEN_EPILOG(pPatch, size); @@ -825,5 +825,5 @@ callInfo.pReturnGC = pCurInstrGC + pCpu->cbInstr; callInfo.pTargetGC = 0xDEADBEEF; - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMJumpIndirectRecord, 0, false, &callInfo); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmJumpIndirectRecord, 0, false, &callInfo); PATCHGEN_EPILOG(pPatch, size); @@ -878,5 +878,5 @@ PATCHGEN_PROLOG_NODEF(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMRetRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmRetRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); @@ -907,5 +907,5 @@ pVM->patm.s.pfnHelperCallGC = PATCHCODE_PTR_GC(pPatch) + pPatch->uCurPatchOffset; PATCHGEN_PROLOG(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMLookupAndCallRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmLookupAndCallRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); @@ -915,5 +915,5 @@ pVM->patm.s.pfnHelperRetGC = PATCHCODE_PTR_GC(pPatch) + pPatch->uCurPatchOffset; PATCHGEN_PROLOG_NODEF(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMRetFunctionRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmRetFunctionRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); @@ -923,5 +923,5 @@ pVM->patm.s.pfnHelperJumpGC = PATCHCODE_PTR_GC(pPatch) + pPatch->uCurPatchOffset; PATCHGEN_PROLOG_NODEF(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMLookupAndJumpRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmLookupAndJumpRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); @@ -931,5 +931,5 @@ pVM->patm.s.pfnHelperIretGC = PATCHCODE_PTR_GC(pPatch) + pPatch->uCurPatchOffset; PATCHGEN_PROLOG_NODEF(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMIretFunctionRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmIretFunctionRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); @@ -979,5 +979,5 @@ /* Generate code to check for IF=1 before executing the call to the duplicated function. */ - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMCheckIFRecord, pCurInstrGC, true); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmCheckIFRecord, pCurInstrGC, true); PATCHGEN_EPILOG(pPatch, size); @@ -1001,5 +1001,5 @@ patmR3AddP2GLookupRecord(pVM, pPatch, pPB, pInstrGC, PATM_LOOKUP_PATCH2GUEST); - int size = patmPatchGenCode(pVM, pPatch, pPB, &PATMSetPIFRecord, 0, false); + int size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmSetPIFRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); return VINF_SUCCESS; @@ -1022,5 +1022,5 @@ patmR3AddP2GLookupRecord(pVM, pPatch, pPB, pInstrGC, PATM_LOOKUP_PATCH2GUEST); - int size = patmPatchGenCode(pVM, pPatch, pPB, &PATMClearPIFRecord, 0, false); + int size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmClearPIFRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); return VINF_SUCCESS; @@ -1051,7 +1051,7 @@ if (pPatch->flags & PATMFL_DUPLICATE_FUNCTION) - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMClearInhibitIRQContIF0Record, 0, false, &callInfo); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmClearInhibitIRQContIF0Record, 0, false, &callInfo); else - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMClearInhibitIRQFaultIF0Record, 0, false, &callInfo); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmClearInhibitIRQFaultIF0Record, 0, false, &callInfo); PATCHGEN_EPILOG(pPatch, size); @@ -1085,5 +1085,5 @@ /* Generate entrypoint for the interrupt handler (correcting CS in the interrupt stack frame) */ size = patmPatchGenCode(pVM, pPatch, pPB, - (pPatch->flags & PATMFL_INTHANDLER_WITH_ERRORCODE) ? &PATMIntEntryRecordErrorCode : &PATMIntEntryRecord, + (pPatch->flags & PATMFL_INTHANDLER_WITH_ERRORCODE) ? &g_patmIntEntryRecordErrorCode : &g_patmIntEntryRecord, 0, false); @@ -1119,5 +1119,5 @@ /* Generate entrypoint for the trap handler (correcting CS in the interrupt stack frame) */ size = patmPatchGenCode(pVM, pPatch, pPB, - (pPatch->flags & PATMFL_TRAPHANDLER_WITH_ERRORCODE) ? &PATMTrapEntryRecordErrorCode : &PATMTrapEntryRecord, + (pPatch->flags & PATMFL_TRAPHANDLER_WITH_ERRORCODE) ? &g_patmTrapEntryRecordErrorCode : &g_patmTrapEntryRecord, pTrapHandlerGC, true); PATCHGEN_EPILOG(pPatch, size); @@ -1137,5 +1137,5 @@ /* Generate code to keep calling statistics for this patch */ - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMStatsRecord, pInstrGC, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmStatsRecord, pInstrGC, false); PATCHGEN_EPILOG(pPatch, size); @@ -1275,5 +1275,5 @@ PATCHGEN_PROLOG(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMClearPIFRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmClearPIFRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); @@ -1288,5 +1288,5 @@ /* checks and corrects RPL of pushed ss*/ PATCHGEN_PROLOG_NODEF(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMMovFromSSRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmMovFromSSRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); @@ -1301,5 +1301,5 @@ PATCHGEN_PROLOG_NODEF(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMSetPIFRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmSetPIFRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); @@ -1517,5 +1517,5 @@ PATCHGEN_PROLOG(pVM, pPatch); - size = patmPatchGenCode(pVM, pPatch, pPB, &PATMCpuidRecord, 0, false); + size = patmPatchGenCode(pVM, pPatch, pPB, &g_patmCpuidRecord, 0, false); PATCHGEN_EPILOG(pPatch, size); Index: /trunk/src/VBox/VMM/VMMR3/PATMR3Dbg.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PATMR3Dbg.cpp (revision 54686) +++ /trunk/src/VBox/VMM/VMMR3/PATMR3Dbg.cpp (revision 54687) @@ -241,8 +241,8 @@ * Global functions and a start marker. */ - ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperCallGC, PATMLookupAndCallRecord.cbFunction, "PATMLookupAndCall"); - ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperRetGC, PATMRetFunctionRecord.cbFunction, "PATMRetFunction"); - ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperJumpGC, PATMLookupAndJumpRecord.cbFunction, "PATMLookupAndJump"); - ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperIretGC, PATMIretFunctionRecord.cbFunction, "PATMIretFunction"); + ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperCallGC, g_patmLookupAndCallRecord.cbFunction, "PATMLookupAndCall"); + ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperRetGC, g_patmRetFunctionRecord.cbFunction, "PATMRetFunction"); + ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperJumpGC, g_patmLookupAndJumpRecord.cbFunction, "PATMLookupAndJump"); + ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperIretGC, g_patmIretFunctionRecord.cbFunction, "PATMIretFunction"); ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pPatchMemGC, 0, "PatchMemStart"); Index: /trunk/src/VBox/VMM/include/PATMA.h =================================================================== --- /trunk/src/VBox/VMM/include/PATMA.h (revision 54686) +++ /trunk/src/VBox/VMM/include/PATMA.h (revision 54687) @@ -170,51 +170,51 @@ /** @name Patch Descriptor Records (in PATMA.asm) * @{ */ -extern PATCHASMRECORD PATMCliRecord; -extern PATCHASMRECORD PATMStiRecord; -extern PATCHASMRECORD PATMPopf32Record; -extern PATCHASMRECORD PATMPopf16Record; -extern PATCHASMRECORD PATMPopf16Record_NoExit; -extern PATCHASMRECORD PATMPopf32Record_NoExit; -extern PATCHASMRECORD PATMPushf32Record; -extern PATCHASMRECORD PATMPushf16Record; -extern PATCHASMRECORD PATMIretRecord; -extern PATCHASMRECORD PATMIretRing1Record; -extern PATCHASMRECORD PATMCpuidRecord; -extern PATCHASMRECORD PATMLoopRecord; -extern PATCHASMRECORD PATMLoopZRecord; -extern PATCHASMRECORD PATMLoopNZRecord; -extern PATCHASMRECORD PATMJEcxRecord; -extern PATCHASMRECORD PATMIntEntryRecord; -extern PATCHASMRECORD PATMIntEntryRecordErrorCode; -extern PATCHASMRECORD PATMTrapEntryRecord; -extern PATCHASMRECORD PATMTrapEntryRecordErrorCode; -extern PATCHASMRECORD PATMPushCSRecord; - -extern PATCHASMRECORD PATMCheckIFRecord; +extern PATCHASMRECORD g_patmCliRecord; +extern PATCHASMRECORD g_patmStiRecord; +extern PATCHASMRECORD g_patmPopf32Record; +extern PATCHASMRECORD g_patmPopf16Record; +extern PATCHASMRECORD g_patmPopf16Record_NoExit; +extern PATCHASMRECORD g_patmPopf32Record_NoExit; +extern PATCHASMRECORD g_patmPushf32Record; +extern PATCHASMRECORD g_patmPushf16Record; +extern PATCHASMRECORD g_patmIretRecord; +extern PATCHASMRECORD g_patmIretRing1Record; +extern PATCHASMRECORD g_patmCpuidRecord; +extern PATCHASMRECORD g_patmLoopRecord; +extern PATCHASMRECORD g_patmLoopZRecord; +extern PATCHASMRECORD g_patmLoopNZRecord; +extern PATCHASMRECORD g_patmJEcxRecord; +extern PATCHASMRECORD g_patmIntEntryRecord; +extern PATCHASMRECORD g_patmIntEntryRecordErrorCode; +extern PATCHASMRECORD g_patmTrapEntryRecord; +extern PATCHASMRECORD g_patmTrapEntryRecordErrorCode; +extern PATCHASMRECORD g_patmPushCSRecord; + +extern PATCHASMRECORD g_patmCheckIFRecord; extern PATCHASMRECORD PATMJumpToGuest_IF1Record; -extern PATCHASMRECORD PATMCallRecord; -extern PATCHASMRECORD PATMCallIndirectRecord; -extern PATCHASMRECORD PATMRetRecord; -extern PATCHASMRECORD PATMJumpIndirectRecord; - -extern PATCHASMRECORD PATMLookupAndCallRecord; -extern PATCHASMRECORD PATMRetFunctionRecord; -extern PATCHASMRECORD PATMLookupAndJumpRecord; -extern PATCHASMRECORD PATMIretFunctionRecord; - -extern PATCHASMRECORD PATMStatsRecord; - -extern PATCHASMRECORD PATMSetPIFRecord; -extern PATCHASMRECORD PATMClearPIFRecord; - -extern PATCHASMRECORD PATMSetInhibitIRQRecord; -extern PATCHASMRECORD PATMClearInhibitIRQFaultIF0Record; -extern PATCHASMRECORD PATMClearInhibitIRQContIF0Record; - -extern PATCHASMRECORD PATMMovFromSSRecord; -/** @} */ - -extern const uint32_t PATMInterruptFlag; +extern PATCHASMRECORD g_patmCallRecord; +extern PATCHASMRECORD g_patmCallIndirectRecord; +extern PATCHASMRECORD g_patmRetRecord; +extern PATCHASMRECORD g_patmJumpIndirectRecord; + +extern PATCHASMRECORD g_patmLookupAndCallRecord; +extern PATCHASMRECORD g_patmRetFunctionRecord; +extern PATCHASMRECORD g_patmLookupAndJumpRecord; +extern PATCHASMRECORD g_patmIretFunctionRecord; + +extern PATCHASMRECORD g_patmStatsRecord; + +extern PATCHASMRECORD g_patmSetPIFRecord; +extern PATCHASMRECORD g_patmClearPIFRecord; + +extern PATCHASMRECORD g_patmSetInhibitIRQRecord; +extern PATCHASMRECORD g_patmClearInhibitIRQFaultIF0Record; +extern PATCHASMRECORD g_patmClearInhibitIRQContIF0Record; + +extern PATCHASMRECORD g_patmMovFromSSRecord; +/** @} */ + +extern const uint32_t g_fPatmInterruptFlag; RT_C_DECLS_END