Changeset 102701 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Dec 26, 2023 12:20:10 AM (15 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160870

Message:

VMM/IEM: A couple of ARM fixes. Disassembly fix. bugref:10371

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllN8veRecompBltIn.cpp (modified) (2 diffs)
• IEMAllN8veRecompiler.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompBltIn.cpp

@@ -1148 +1148 @@
 # ifdef VBOX_STRICT /* Assert(!(pVCpu->iem.s.GCPhysInstrBuf & X86_PAGE_OFFSET_MASK)); */
     off = iemNativeEmitAndGpr32ByImm(pReNative, off, idxRegTmp2, X86_PAGE_OFFSET_MASK, true /*fSetFlags*/);
-    off = iemNativeEmitJzToFixed(pReNative, off, off + 1 /* correct for ARM64 */);
+    off = iemNativeEmitJzToFixed(pReNative, off, off + 2 /* correct for ARM64 */);
     off = iemNativeEmitBrk(pReNative, off, 0x2005);
 # endif
@@ -1469 +1469 @@
 # ifdef VBOX_STRICT /* Assert(!(pVCpu->iem.s.GCPhysInstrBuf & X86_PAGE_OFFSET_MASK)); */
     off = iemNativeEmitAndGpr32ByImm(pReNative, off, idxRegTmp2, X86_PAGE_OFFSET_MASK, true /*fSetFlags*/);
-    off = iemNativeEmitJzToFixed(pReNative, off, off + 1 /* correct for ARM64 */);
+    off = iemNativeEmitJzToFixed(pReNative, off, off + 2 /* correct for ARM64 */);
     off = iemNativeEmitBrk(pReNative, off, 0x2005);
 # endif

trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp

@@ -11343 +11343 @@
                             /* Disassemble the instruction. */
                             //uint8_t const cbInstrMax = RT_MIN(pTb->aRanges[idxRange].cbOpcodes - offRange, 15);
-                            uint8_t const cbInstrMax = RT_MIN(cbOpcodes - offRange, 15);
+                            uint8_t const cbInstrMax = RT_MIN(cbOpcodes - offOpcodes, 15);
                             uint32_t      cbInstr    = 1;
                             int rc = DISInstrWithPrefetchedBytes(GCPhysPc, enmGstCpuMode, DISOPTYPE_ALL,