Changeset 41782 in vbox for trunk/src/VBox/Disassembler

Timestamp:

Jun 16, 2012 7:11:27 PM (12 years ago)

Author:

vboxsync

Message:

Missing copy & past fixups.

File:

• trunk/src/VBox/Disassembler/DisasmCore.cpp (modified) (8 diffs)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -313 +313 @@
     }
 
-    if (off <= pCpu->cbCachedInstr)
-        disReadMore(pCpu, off, 1);
-
+    disReadMore(pCpu, off, 1);
     return pCpu->abInstr[off];
 }
@@ -368 +366 @@
     }
 
-    if (off + 2 < pCpu->cbCachedInstr)
-        disReadMore(pCpu, off, 2);
-
+    disReadMore(pCpu, off, 2);
 #ifdef DIS_HOST_UNALIGNED_ACCESS_OK
     return *(uint16_t const *)&pCpu->abInstr[off];
@@ -422 +418 @@
 DECL_NO_INLINE(static, uint32_t) disReadDWordSlow(PDISCPUSTATE pCpu, RTUINTPTR off)
 {
-    if (RT_UNLIKELY(off + 2 > DIS_MAX_INSTR_LENGTH))
+    if (RT_UNLIKELY(off + 4 > DIS_MAX_INSTR_LENGTH))
     {
         Log(("disReadDWord: too long instruction...\n"));
@@ -438 +434 @@
     }
 
-    if (off + 2 < pCpu->cbCachedInstr)
-        disReadMore(pCpu, off, 2);
-
+    disReadMore(pCpu, off, 4);
 #ifdef DIS_HOST_UNALIGNED_ACCESS_OK
     return *(uint32_t const *)&pCpu->abInstr[off];
@@ -458 +452 @@
 DECLINLINE(uint32_t) disReadDWordByOff(PDISCPUSTATE pCpu, RTUINTPTR off)
 {
-    if (RT_UNLIKELY(off + 2 > pCpu->cbCachedInstr))
+    if (RT_UNLIKELY(off + 4 > pCpu->cbCachedInstr))
         return disReadDWordSlow(pCpu, off);
 
@@ -492 +486 @@
 DECL_NO_INLINE(static, uint64_t) disReadQWordSlow(PDISCPUSTATE pCpu, RTUINTPTR off)
 {
-    if (RT_UNLIKELY(off + 2 > DIS_MAX_INSTR_LENGTH))
+    if (RT_UNLIKELY(off + 8 > DIS_MAX_INSTR_LENGTH))
     {
         Log(("disReadQWord: too long instruction...\n"));
@@ -517 +511 @@
     }
 
-    if (off + 2 < pCpu->cbCachedInstr)
-        disReadMore(pCpu, off, 2);
-
+    disReadMore(pCpu, off, 8);
 #ifdef DIS_HOST_UNALIGNED_ACCESS_OK
     return *(uint64_t const *)&pCpu->abInstr[off];
@@ -538 +530 @@
 DECLINLINE(uint64_t) disReadQWordByOff(PDISCPUSTATE pCpu, RTUINTPTR off)
 {
-    if (RT_UNLIKELY(off + 2 > pCpu->cbCachedInstr))
+    if (RT_UNLIKELY(off + 8 > pCpu->cbCachedInstr))
         return disReadQWordSlow(pCpu, off);