Changeset 11309 in vbox for trunk/src/VBox/VMM
- Timestamp:
- Aug 8, 2008 11:25:08 PM (17 years ago)
- svn:sync-xref-src-repo-rev:
- 34404
- Location:
- trunk/src/VBox/VMM
- Files:
-
- 4 edited
-
PGMInternal.h (modified) (1 diff)
-
VMMAll/PGMAll.cpp (modified) (4 diffs)
-
VMMAll/PGMAllHandler.cpp (modified) (8 diffs)
-
VMMAll/TMAll.cpp (modified) (16 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/PGMInternal.h
r11221 r11309 3770 3770 } 3771 3771 Log2(("PHYS2VIRT: Removing %VGp-%VGp %#RX32 %s\n", 3772 pPhys2Virt->Core.Key, pPhys2Virt->Core.KeyLast, pPhys2Virt->offNextAlias, HCSTRING(pCur->pszDesc)));3772 pPhys2Virt->Core.Key, pPhys2Virt->Core.KeyLast, pPhys2Virt->offNextAlias, R3STRING(pCur->pszDesc))); 3773 3773 pPhys2Virt->offNextAlias = 0; 3774 3774 pPhys2Virt->Core.KeyLast = NIL_RTGCPHYS; /* require reinsert */ -
trunk/src/VBox/VMM/VMMAll/PGMAll.cpp
r10824 r11309 188 188 #include "PGMAllShw.h" 189 189 190 /* Guest - protected mode */ 191 #define PGM_GST_TYPE PGM_TYPE_PROT 192 #define PGM_GST_NAME(name) PGM_GST_NAME_PROT(name) 193 #define PGM_BTH_NAME(name) PGM_BTH_NAME_AMD64_PROT(name) 194 #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS 195 #include "PGMAllBth.h" 196 #undef BTH_PGMPOOLKIND_PT_FOR_PT 197 #undef PGM_BTH_NAME 198 #undef PGM_GST_TYPE 190 /* Guest - protected mode */ 191 #define PGM_GST_TYPE PGM_TYPE_PROT 192 #define PGM_GST_NAME(name) PGM_GST_NAME_PROT(name) 193 #define PGM_BTH_NAME(name) PGM_BTH_NAME_AMD64_PROT(name) 194 #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS 195 #include "PGMAllBth.h" 196 #undef BTH_PGMPOOLKIND_PT_FOR_PT 197 #undef PGM_BTH_NAME 198 #undef PGM_GST_TYPE 199 199 #undef PGM_GST_NAME 200 200 … … 938 938 } 939 939 /* The PDPT was cached or created; hook it up now. */ 940 pPml4e->u |= pShwPage->Core.Key 940 pPml4e->u |= pShwPage->Core.Key 941 941 | (pGstPml4e->u & ~(X86_PML4E_PG_MASK | X86_PML4E_AVL_MASK | X86_PML4E_PCD | X86_PML4E_PWT)); 942 942 943 943 const unsigned iPdPt = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_AMD64; 944 PX86PDPT pPdpt = (PX86PDPT)PGMPOOL_PAGE_2_PTR(pVM, pShwPage); 944 PX86PDPT pPdpt = (PX86PDPT)PGMPOOL_PAGE_2_PTR(pVM, pShwPage); 945 945 PX86PDPE pPdpe = &pPdpt->a[iPdPt]; 946 946 … … 1393 1393 1394 1394 /** 1395 * Performs and schedules necessary updates following a CR3 load or reload, 1395 * Performs and schedules necessary updates following a CR3 load or reload, 1396 1396 * without actually flushing the TLB as with PGMFlushTLB. 1397 1397 * … … 1712 1712 if (rc != VERR_PAGE_TABLE_NOT_PRESENT) 1713 1713 { 1714 AssertMsgFailed(("Conflict at %VGv with %s\n", GCPtr, HCSTRING(pMapping->pszDesc)));1714 AssertMsgFailed(("Conflict at %VGv with %s\n", GCPtr, R3STRING(pMapping->pszDesc))); 1715 1715 cErrors++; 1716 1716 break; -
trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp
r9254 r11309 86 86 { 87 87 Log(("PGMHandlerPhysicalRegisterEx: enmType=%d GCPhys=%VGp GCPhysLast=%VGp pfnHandlerR3=%VHv pvUserR3=%VHv pfnHandlerR0=%VHv pvUserR0=%VHv pfnHandlerGC=%VRv pvUserGC=%VRv pszDesc=%s\n", 88 enmType, GCPhys, GCPhysLast, pfnHandlerR3, pvUserR3, pfnHandlerR0, pvUserR0, pfnHandlerGC, pvUserGC, HCSTRING(pszDesc)));88 enmType, GCPhys, GCPhysLast, pfnHandlerR3, pvUserR3, pfnHandlerR0, pvUserR0, pfnHandlerGC, pvUserGC, R3STRING(pszDesc))); 89 89 90 90 /* … … 294 294 { 295 295 LogFlow(("PGMHandlerPhysicalDeregister: Removing Range %#VGp-%#VGp %s\n", 296 pCur->Core.Key, pCur->Core.KeyLast, HCSTRING(pCur->pszDesc)));296 pCur->Core.Key, pCur->Core.KeyLast, R3STRING(pCur->pszDesc))); 297 297 298 298 /* … … 1264 1264 { 1265 1265 AssertMsgFailed(("virt handler phys has incorrect key! %VGp %VGv %s\n", 1266 pVirt->aPhysToVirt[0].Core.Key, pVirt->GCPtr, HCSTRING(pVirt->pszDesc)));1266 pVirt->aPhysToVirt[0].Core.Key, pVirt->GCPtr, R3STRING(pVirt->pszDesc))); 1267 1267 pState->cErrors++; 1268 1268 } … … 1272 1272 { 1273 1273 AssertMsgFailed(("virt handler phys has incorrect key! %VGp %VGv %s\n", 1274 pVirt->aPhysToVirt[pVirt->cPages - 1].Core.KeyLast, pVirt->GCPtrLast, HCSTRING(pVirt->pszDesc)));1274 pVirt->aPhysToVirt[pVirt->cPages - 1].Core.KeyLast, pVirt->GCPtrLast, R3STRING(pVirt->pszDesc))); 1275 1275 pState->cErrors++; 1276 1276 } … … 1291 1291 { 1292 1292 AssertMsgFailed(("virt handler phys out of sync. %VGp GCPhysNew=~0 iPage=%#x %VGv %s\n", 1293 pVirt->aPhysToVirt[iPage].Core.Key, iPage, GCPtr, HCSTRING(pVirt->pszDesc)));1293 pVirt->aPhysToVirt[iPage].Core.Key, iPage, GCPtr, R3STRING(pVirt->pszDesc))); 1294 1294 pState->cErrors++; 1295 1295 } … … 1301 1301 { 1302 1302 AssertMsgFailed(("virt handler phys out of sync. %VGp GCPhysGst=%VGp iPage=%#x %VGv %s\n", 1303 pVirt->aPhysToVirt[iPage].Core.Key, GCPhysGst, iPage, GCPtr, HCSTRING(pVirt->pszDesc)));1303 pVirt->aPhysToVirt[iPage].Core.Key, GCPhysGst, iPage, GCPtr, R3STRING(pVirt->pszDesc))); 1304 1304 pState->cErrors++; 1305 1305 continue; … … 1310 1310 { 1311 1311 AssertMsgFailed(("virt handler getting ram flags. GCPhysGst=%VGp iPage=%#x %VGv %s\n", 1312 GCPhysGst, iPage, GCPtr, HCSTRING(pVirt->pszDesc)));1312 GCPhysGst, iPage, GCPtr, R3STRING(pVirt->pszDesc))); 1313 1313 pState->cErrors++; 1314 1314 continue; … … 1318 1318 { 1319 1319 AssertMsgFailed(("virt handler state mismatch. HCPhys=%VHp GCPhysGst=%VGp iPage=%#x %VGv state=%d expected>=%d %s\n", 1320 pPage->HCPhys, GCPhysGst, iPage, GCPtr, PGM_PAGE_GET_HNDL_VIRT_STATE(pPage), uState, HCSTRING(pVirt->pszDesc)));1320 pPage->HCPhys, GCPhysGst, iPage, GCPtr, PGM_PAGE_GET_HNDL_VIRT_STATE(pPage), uState, R3STRING(pVirt->pszDesc))); 1321 1321 pState->cErrors++; 1322 1322 continue; -
trunk/src/VBox/VMM/VMMAll/TMAll.cpp
r11155 r11309 389 389 TMTIMERSTATE enmState = pTimer->enmState; 390 390 Log2(("TMTimerDestroy: pTimer=%p:{.enmState=%s, .pszDesc='%s'} cRetries=%d\n", 391 pTimer, tmTimerState(enmState), HCSTRING(pTimer->pszDesc), cRetries));391 pTimer, tmTimerState(enmState), R3STRING(pTimer->pszDesc), cRetries)); 392 392 switch (enmState) 393 393 { … … 395 395 if (!VM_IS_EMT(pTimer->CTXALLSUFF(pVM))) 396 396 { 397 AssertMsgFailed(("Attempted timer destruction from other thread while expire pending! (%s)\n", HCSTRING(pTimer->pszDesc)));397 AssertMsgFailed(("Attempted timer destruction from other thread while expire pending! (%s)\n", R3STRING(pTimer->pszDesc))); 398 398 return VERR_INVALID_PARAMETER; 399 399 } … … 426 426 case TMTIMERSTATE_PENDING_DESTROY: 427 427 case TMTIMERSTATE_PENDING_STOP_DESTROY: 428 AssertMsgFailed(("How many times do you think you can destroy the same timer... (%s)\n", HCSTRING(pTimer->pszDesc)));428 AssertMsgFailed(("How many times do you think you can destroy the same timer... (%s)\n", R3STRING(pTimer->pszDesc))); 429 429 return VERR_INVALID_PARAMETER; 430 430 … … 457 457 */ 458 458 case TMTIMERSTATE_FREE: 459 AssertMsgFailed(("Invalid timer state %d (%s)\n", enmState, HCSTRING(pTimer->pszDesc)));459 AssertMsgFailed(("Invalid timer state %d (%s)\n", enmState, R3STRING(pTimer->pszDesc))); 460 460 return VERR_TM_INVALID_STATE; 461 461 default: 462 AssertMsgFailed(("Unknown timer state %d (%s)\n", enmState, HCSTRING(pTimer->pszDesc)));462 AssertMsgFailed(("Unknown timer state %d (%s)\n", enmState, R3STRING(pTimer->pszDesc))); 463 463 return VERR_TM_UNKNOWN_STATE; 464 464 } 465 465 } while (cRetries-- > 0); 466 466 467 AssertMsgFailed(("Failed waiting for stable state. state=%d (%s)\n", pTimer->enmState, HCSTRING(pTimer->pszDesc)));467 AssertMsgFailed(("Failed waiting for stable state. state=%d (%s)\n", pTimer->enmState, R3STRING(pTimer->pszDesc))); 468 468 return VERR_INTERNAL_ERROR; 469 469 } … … 490 490 TMTIMERSTATE enmState = pTimer->enmState; 491 491 Log2(("TMTimerSet: pTimer=%p:{.enmState=%s, .pszDesc='%s'} cRetries=%d u64Expire=%llu\n", 492 pTimer, tmTimerState(enmState), HCSTRING(pTimer->pszDesc), cRetries, u64Expire));492 pTimer, tmTimerState(enmState), R3STRING(pTimer->pszDesc), cRetries, u64Expire)); 493 493 switch (enmState) 494 494 { … … 566 566 case TMTIMERSTATE_PENDING_STOP_DESTROY: 567 567 case TMTIMERSTATE_FREE: 568 AssertMsgFailed(("Invalid timer state %d (%s)\n", enmState, HCSTRING(pTimer->pszDesc)));568 AssertMsgFailed(("Invalid timer state %d (%s)\n", enmState, R3STRING(pTimer->pszDesc))); 569 569 return VERR_TM_INVALID_STATE; 570 570 default: 571 AssertMsgFailed(("Unknown timer state %d (%s)\n", enmState, HCSTRING(pTimer->pszDesc)));571 AssertMsgFailed(("Unknown timer state %d (%s)\n", enmState, R3STRING(pTimer->pszDesc))); 572 572 return VERR_TM_UNKNOWN_STATE; 573 573 } 574 574 } while (cRetries-- > 0); 575 575 576 AssertMsgFailed(("Failed waiting for stable state. state=%d (%s)\n", pTimer->enmState, HCSTRING(pTimer->pszDesc)));576 AssertMsgFailed(("Failed waiting for stable state. state=%d (%s)\n", pTimer->enmState, R3STRING(pTimer->pszDesc))); 577 577 STAM_PROFILE_STOP(&pTimer->CTXALLSUFF(pVM)->tm.s.CTXALLSUFF(StatTimerSet), a); 578 578 return VERR_INTERNAL_ERROR; … … 696 696 TMTIMERSTATE enmState = pTimer->enmState; 697 697 Log2(("TMTimerStop: pTimer=%p:{.enmState=%s, .pszDesc='%s'} cRetries=%d\n", 698 pTimer, tmTimerState(enmState), HCSTRING(pTimer->pszDesc), cRetries));698 pTimer, tmTimerState(enmState), R3STRING(pTimer->pszDesc), cRetries)); 699 699 switch (enmState) 700 700 { … … 753 753 case TMTIMERSTATE_PENDING_STOP_DESTROY: 754 754 case TMTIMERSTATE_FREE: 755 AssertMsgFailed(("Invalid timer state %d (%s)\n", enmState, HCSTRING(pTimer->pszDesc)));755 AssertMsgFailed(("Invalid timer state %d (%s)\n", enmState, R3STRING(pTimer->pszDesc))); 756 756 return VERR_TM_INVALID_STATE; 757 757 default: 758 AssertMsgFailed(("Unknown timer state %d (%s)\n", enmState, HCSTRING(pTimer->pszDesc)));758 AssertMsgFailed(("Unknown timer state %d (%s)\n", enmState, R3STRING(pTimer->pszDesc))); 759 759 return VERR_TM_UNKNOWN_STATE; 760 760 } 761 761 } while (cRetries-- > 0); 762 762 763 AssertMsgFailed(("Failed waiting for stable state. state=%d (%s)\n", pTimer->enmState, HCSTRING(pTimer->pszDesc)));763 AssertMsgFailed(("Failed waiting for stable state. state=%d (%s)\n", pTimer->enmState, R3STRING(pTimer->pszDesc))); 764 764 STAM_PROFILE_STOP(&pTimer->CTXALLSUFF(pVM)->tm.s.CTXALLSUFF(StatTimerStop), a); 765 765 return VERR_INTERNAL_ERROR; … … 798 798 } 799 799 //Log2(("TMTimerGet: returns %llu (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n", 800 // u64, pTimer, tmTimerState(pTimer->enmState), HCSTRING(pTimer->pszDesc)));800 // u64, pTimer, tmTimerState(pTimer->enmState), R3STRING(pTimer->pszDesc))); 801 801 return u64; 802 802 } … … 1081 1081 case TMTIMERSTATE_PENDING_STOP_SCHEDULE: 1082 1082 Log2(("TMTimerGetExpire: returns ~0 (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n", 1083 pTimer, tmTimerState(pTimer->enmState), HCSTRING(pTimer->pszDesc)));1083 pTimer, tmTimerState(pTimer->enmState), R3STRING(pTimer->pszDesc))); 1084 1084 return ~(uint64_t)0; 1085 1085 … … 1088 1088 case TMTIMERSTATE_PENDING_SCHEDULE: 1089 1089 Log2(("TMTimerGetExpire: returns %llu (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n", 1090 pTimer->u64Expire, pTimer, tmTimerState(pTimer->enmState), HCSTRING(pTimer->pszDesc)));1090 pTimer->u64Expire, pTimer, tmTimerState(pTimer->enmState), R3STRING(pTimer->pszDesc))); 1091 1091 return pTimer->u64Expire; 1092 1092 … … 1105 1105 case TMTIMERSTATE_PENDING_STOP_DESTROY: 1106 1106 case TMTIMERSTATE_FREE: 1107 AssertMsgFailed(("Invalid timer state %d (%s)\n", enmState, HCSTRING(pTimer->pszDesc)));1107 AssertMsgFailed(("Invalid timer state %d (%s)\n", enmState, R3STRING(pTimer->pszDesc))); 1108 1108 Log2(("TMTimerGetExpire: returns ~0 (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n", 1109 pTimer, tmTimerState(pTimer->enmState), HCSTRING(pTimer->pszDesc)));1109 pTimer, tmTimerState(pTimer->enmState), R3STRING(pTimer->pszDesc))); 1110 1110 return ~(uint64_t)0; 1111 1111 default: 1112 AssertMsgFailed(("Unknown timer state %d (%s)\n", enmState, HCSTRING(pTimer->pszDesc)));1112 AssertMsgFailed(("Unknown timer state %d (%s)\n", enmState, R3STRING(pTimer->pszDesc))); 1113 1113 return ~(uint64_t)0; 1114 1114 } 1115 1115 } while (cRetries-- > 0); 1116 1116 1117 AssertMsgFailed(("Failed waiting for stable state. state=%d (%s)\n", pTimer->enmState, HCSTRING(pTimer->pszDesc)));1117 AssertMsgFailed(("Failed waiting for stable state. state=%d (%s)\n", pTimer->enmState, R3STRING(pTimer->pszDesc))); 1118 1118 Log2(("TMTimerGetExpire: returns ~0 (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n", 1119 pTimer, tmTimerState(pTimer->enmState), HCSTRING(pTimer->pszDesc)));1119 pTimer, tmTimerState(pTimer->enmState), R3STRING(pTimer->pszDesc))); 1120 1120 return ~(uint64_t)0; 1121 1121 } … … 1139 1139 case TMTIMERSTATE_PENDING_STOP_SCHEDULE: 1140 1140 Log2(("TMTimerIsActive: returns false (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n", 1141 pTimer, tmTimerState(pTimer->enmState), HCSTRING(pTimer->pszDesc)));1141 pTimer, tmTimerState(pTimer->enmState), R3STRING(pTimer->pszDesc))); 1142 1142 return false; 1143 1143 … … 1148 1148 case TMTIMERSTATE_PENDING_RESCHEDULE_SET_EXPIRE: 1149 1149 Log2(("TMTimerIsActive: returns true (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n", 1150 pTimer, tmTimerState(pTimer->enmState), HCSTRING(pTimer->pszDesc)));1150 pTimer, tmTimerState(pTimer->enmState), R3STRING(pTimer->pszDesc))); 1151 1151 return true; 1152 1152 … … 1157 1157 case TMTIMERSTATE_PENDING_STOP_DESTROY: 1158 1158 case TMTIMERSTATE_FREE: 1159 AssertMsgFailed(("Invalid timer state %s (%s)\n", tmTimerState(enmState), HCSTRING(pTimer->pszDesc)));1159 AssertMsgFailed(("Invalid timer state %s (%s)\n", tmTimerState(enmState), R3STRING(pTimer->pszDesc))); 1160 1160 Log2(("TMTimerIsActive: returns false (pTimer=%p:{.enmState=%s, .pszDesc='%s'})\n", 1161 pTimer, tmTimerState(pTimer->enmState), HCSTRING(pTimer->pszDesc)));1161 pTimer, tmTimerState(pTimer->enmState), R3STRING(pTimer->pszDesc))); 1162 1162 return false; 1163 1163 default: 1164 AssertMsgFailed(("Unknown timer state %d (%s)\n", enmState, HCSTRING(pTimer->pszDesc)));1164 AssertMsgFailed(("Unknown timer state %d (%s)\n", enmState, R3STRING(pTimer->pszDesc))); 1165 1165 return false; 1166 1166 } … … 1424 1424 */ 1425 1425 Log2(("tmTimerQueueSchedule: pTimer=%p:{.enmState=%s, .enmClock=%d, .enmType=%d, .pszDesc=%s}\n", 1426 pTimer, tmTimerState(pTimer->enmState), pTimer->enmClock, pTimer->enmType, HCSTRING(pTimer->pszDesc)));1426 pTimer, tmTimerState(pTimer->enmState), pTimer->enmClock, pTimer->enmType, R3STRING(pTimer->pszDesc))); 1427 1427 tmTimerQueueScheduleOne(pQueue, pTimer); 1428 1428 Log2(("tmTimerQueueSchedule: new %s\n", tmTimerState(pTimer->enmState)));
Note:
See TracChangeset
for help on using the changeset viewer.
