儲存庫 vbox 的更動 62649

時間撮記:

2016-7-28 下午10:05:03 (8 年 以前)

作者:

vboxsync

訊息:

VMMR3: warnings

檔案:

• trunk/src/VBox/VMM/VMMR3/PATM.cpp (修改) (9 筆差異)

trunk/src/VBox/VMM/VMMR3/PATM.cpp

@@ -2821 +2821 @@
     PPATCHINFO pPatch = &pPatchRec->patch;
     int rc = VERR_PATCHING_REFUSED;
-    uint32_t orgOffsetPatchMem = ~0;
+    uint32_t orgOffsetPatchMem = UINT32_MAX;
     RTRCPTR pInstrStart;
     bool fInserted;
@@ -3057 +3057 @@
     RTRCPTR  pCurInstrGC = pInstrGC;
     uint8_t *pCurInstrHC, *pInstrHC;
-    uint32_t orgOffsetPatchMem = ~0;
+    uint32_t orgOffsetPatchMem = UINT32_MAX;
 
     pInstrHC = pCurInstrHC = patmR3GCVirtToHCVirt(pVM, pCacheRec, pCurInstrGC);
@@ -3181 +3181 @@
     PPATCHINFO pPatch = &pPatchRec->patch;
     int rc = VERR_PATCHING_REFUSED;
-    uint32_t orgOffsetPatchMem = ~0;
+    uint32_t orgOffsetPatchMem = UINT32_MAX;
     bool fInserted;
 
@@ -3282 +3282 @@
     PPATCHINFO pPatch = &pPatchRec->patch;
     int rc = VERR_PATCHING_REFUSED;
-    uint32_t orgOffsetPatchMem = ~0;
+    uint32_t orgOffsetPatchMem = UINT32_MAX;
     bool fInserted;
 
@@ -3413 +3413 @@
     PPATCHINFO  pPatch = &pPatchRec->patch;
     RTRCPTR     pPage, pPatchTargetGC = 0;
-    uint32_t    orgOffsetPatchMem = ~0;
+    uint32_t    orgOffsetPatchMem = UINT32_MAX;
     int         rc = VERR_PATCHING_REFUSED;
     PPATCHINFO  pPatchToJmp = NULL; /**< Patch the trampoline jumps to. */
@@ -3906 +3906 @@
 static int patmDeactivateInt3Patch(PVM pVM, PPATCHINFO pPatch)
 {
-    uint8_t ASMInt3 = 0xCC;
+    uint8_t cbASMInt3 = 1;
     int     rc;
 
@@ -3913 +3913 @@
 
     /* Restore first opcode byte. */
-    rc = PGMPhysSimpleDirtyWriteGCPtr(VMMGetCpu0(pVM), pPatch->pPrivInstrGC, pPatch->aPrivInstr, sizeof(ASMInt3));
+    rc = PGMPhysSimpleDirtyWriteGCPtr(VMMGetCpu0(pVM), pPatch->pPrivInstrGC, pPatch->aPrivInstr, cbASMInt3);
     AssertRC(rc);
     return rc;
@@ -3934 +3934 @@
 int patmR3PatchInstrInt3(PVM pVM, RTRCPTR pInstrGC, R3PTRTYPE(uint8_t *) pInstrHC, DISCPUSTATE *pCpu, PPATCHINFO pPatch)
 {
-    uint8_t bASMInt3 = 0xCC;
+    uint8_t cbASMInt3 = 1;
     int rc;
 
@@ -3943 +3943 @@
     rc = PGMPhysSimpleReadGCPtr(VMMGetCpu0(pVM), pPatch->aPrivInstr, pPatch->pPrivInstrGC, pPatch->cbPrivInstr);
     AssertRC(rc);
-    pPatch->cbPatchJump = sizeof(bASMInt3);  /* bit of a misnomer in this case; size of replacement instruction. */
+    pPatch->cbPatchJump = cbASMInt3;  /* bit of a misnomer in this case; size of replacement instruction. */
 
     pPatch->flags |= PATMFL_INT3_REPLACEMENT;