Changeset 101661 in vbox

Timestamp:

Oct 30, 2023 2:55:00 PM (15 months ago)

Author:

vboxsync

Message:

VMM/IEM: Windows build recompiler fixes. Fixed handling of 8-bit registers on AMD64 hosts (test instr). bugref:10371

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllN8veRecompiler.cpp (modified) (9 diffs)
• VMMAll/IEMAllThrdPython.py (modified) (4 diffs)
• include/IEMN8veRecompiler.h (modified) (3 diffs)

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

@@ -613 +613 @@
         {
 #ifdef IEMEXECMEM_USE_ALT_SUB_ALLOCATOR
-            uint32_t const idxFirst  = offChunk >> IEMEXECMEM_ALT_SUB_ALLOC_UNIT_SHIFT;
-            uint32_t const cReqUnits = cb       >> IEMEXECMEM_ALT_SUB_ALLOC_UNIT_SHIFT;
+            uint32_t const idxFirst  = (uint32_t)offChunk >> IEMEXECMEM_ALT_SUB_ALLOC_UNIT_SHIFT;
+            uint32_t const cReqUnits = (uint32_t)cb       >> IEMEXECMEM_ALT_SUB_ALLOC_UNIT_SHIFT;
 
             /* Check that it's valid and free it. */
@@ -750 +750 @@
      */
     uint8_t fRet = RtlAddFunctionTable(paFunctions, cFunctionEntries, (uintptr_t)pvChunk);
-    AssertReturn(fRet, NULL); /* Nothing to clean up on failure, since its within the chunk itself. */
-
-    return paFunctions;
+    AssertReturn(fRet, VERR_INTERNAL_ERROR_3); /* Nothing to clean up on failure, since its within the chunk itself. */
+
+    return VINF_SUCCESS;
 }
 
@@ -1572 +1572 @@
     pVCpu->iem.s.cInstructions += idxInstr;
     iemRaiseGeneralProtectionFault0Jmp(pVCpu);
+#ifndef _MSC_VER
     return VINF_IEM_RAISED_XCPT; /* not reached */
+#endif
 }
 
@@ -1899 +1901 @@
 
     uint32_t const cbNew = cNew * sizeof(IEMNATIVEINSTR);
-#if RT_ARCH_ARM64
+#ifdef RT_ARCH_ARM64
     AssertReturn(cbNew <= _1M, NULL); /* Limited by the branch instruction range (18+2 bits). */
 #else
@@ -2122 +2124 @@
 } const g_aGstShadowInfo[] =
 {
-#define CPUMCTX_OFF_AND_SIZE(a_Reg) RT_UOFFSETOF(VMCPU, cpum.GstCtx. a_Reg), RT_SIZEOFMEMB(VMCPU, cpum.GstCtx. a_Reg)
+#define CPUMCTX_OFF_AND_SIZE(a_Reg) (uint32_t)RT_UOFFSETOF(VMCPU, cpum.GstCtx. a_Reg), RT_SIZEOFMEMB(VMCPU, cpum.GstCtx. a_Reg)
     /* [kIemNativeGstReg_GprFirst + X86_GREG_xAX] = */  { CPUMCTX_OFF_AND_SIZE(rax),                "rax", },
     /* [kIemNativeGstReg_GprFirst + X86_GREG_xCX] = */  { CPUMCTX_OFF_AND_SIZE(rcx),                "rcx", },
@@ -3462 +3464 @@
     if (cAddParams > 2)
         off = iemNativeEmitStoreImm64ByBp(pReNative, off, IEMNATIVE_FP_OFF_STACK_ARG1, uParam2);
-    off = iemNativeEmitLeaGrpByBp(pReNative, off, X86_GREG_xCX, IEMNATIVE_FP_OFF_IN_SHADOW_ARG0); /* rcStrict */
+    off = iemNativeEmitLeaGprByBp(pReNative, off, X86_GREG_xCX, IEMNATIVE_FP_OFF_IN_SHADOW_ARG0); /* rcStrict */
 
 #else
@@ -3526 +3528 @@
         off = iemNativeEmitLoadGprImm64(pReNative, off, X86_GREG_x10, pCallEntry->auParams[2]);
     off = iemNativeEmitStoreGprByBp(pReNative, off, IEMNATIVE_FP_OFF_STACK_ARG0, X86_GREG_x10);
-    off = iemNativeEmitLeaGrpByBp(pReNative, off, X86_GREG_xCX, IEMNATIVE_FP_OFF_IN_SHADOW_ARG0); /* rcStrict */
+    off = iemNativeEmitLeaGprByBp(pReNative, off, X86_GREG_xCX, IEMNATIVE_FP_OFF_IN_SHADOW_ARG0); /* rcStrict */
 #  endif /* VBOXSTRICTRC_STRICT_ENABLED */
 # else
@@ -5125 +5127 @@
     AssertCompile(RT_ELEMENTS(s_aModes) == IEM_F_MODE_MASK + 1);
     memcpy(pszBuf, s_aModes[fFlags & IEM_F_MODE_MASK].psz, s_aModes[fFlags & IEM_F_MODE_MASK].cch);
-    unsigned off = s_aModes[fFlags & IEM_F_MODE_MASK].cch;
+    size_t off = s_aModes[fFlags & IEM_F_MODE_MASK].cch;
 
     pszBuf[off++] = ' ';
@@ -5598 +5600 @@
         }
         iemNativeDbgInfoAddThreadedCall(pReNative, (IEMTHREADEDFUNCS)pCallEntry->enmFunction, pfnRecom != NULL);
-#endif
-
-#ifdef VBOX_STRICT
+#elif defined(VBOX_STRICT)
         off = iemNativeEmitMarker(pReNative, off,
                                   RT_MAKE_U32((pTb->Thrd.cCalls - cCallsLeft - 1) | (pfnRecom ? 0x8000 : 0),

trunk/src/VBox/VMM/VMMAll/IEMAllThrdPython.py

@@ -87 +87 @@
     'IEMPCMPISTRXSRC':  (  256,   False, 'IEMPCMPISTRXSRC', ),
     'IEMPCMPESTRXSRC':  (  384,   False, 'IEMPCMPESTRXSRC', ),
-} | g_kdTypeInfo;
+}; #| g_kdTypeInfo; - requires 3.9
+g_kdTypeInfo2.update(g_kdTypeInfo);
 
 def getTypeBitCount(sType):
@@ -1785 +1786 @@
                         cNative += 1;
             print('debug: %.1f%% / %u out of %u threaded function variations are recompilable'
-                  % (cNative * 100.0 / cTotal, cNative, cTotal));
+                  % (cNative * 100.0 / cTotal, cNative, cTotal), file = sys.stderr);
 
         # Gather arguments + variable statistics for the MC blocks.
@@ -1820 +1821 @@
 
         print('debug: max vars+args: %u bytes / %u; max vars: %u bytes / %u; max args: %u bytes / %u'
-              % (cbMaxVarsAndArgs, cMaxVarsAndArgs, cbMaxVars, cMaxVars, cbMaxArgs, cMaxArgs,));
+              % (cbMaxVarsAndArgs, cMaxVarsAndArgs, cbMaxVars, cMaxVars, cbMaxArgs, cMaxArgs,), file = sys.stderr);
 
         return True;
@@ -2473 +2474 @@
                              help    = 'Displays the version/revision of the script and exit.');
         self.oOptions = oParser.parse_args(asArgs[1:]);
-        print("oOptions=%s" % (self.oOptions,));
+        print("oOptions=%s" % (self.oOptions,), file = sys.stderr);
 
         #

trunk/src/VBox/VMM/include/IEMN8veRecompiler.h

@@ -2872 +2872 @@
     {
         /* test Eb, imm8 */
-        if (iGprSrc >= 8)
-            pbCodeBuf[off++] = X86_OP_REX_B;
+        if (iGprSrc >= 4)
+            pbCodeBuf[off++] = iGprSrc >= 8 ? X86_OP_REX_B : X86_OP_REX;
         pbCodeBuf[off++] = 0xf6;
         pbCodeBuf[off++] = X86_MODRM_MAKE(X86_MOD_REG, 0, iGprSrc & 7);
@@ -2962 +2962 @@
         uint8_t * const pbCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 7);
         AssertReturn(pbCodeBuf, UINT32_MAX);
-        if (iGprSrc >= 8)
-            pbCodeBuf[off++] = X86_OP_REX_B;
         if (fBits <= UINT8_MAX)
         {
+            if (iGprSrc >= 4)
+                pbCodeBuf[off++] = iGprSrc >= 8 ? X86_OP_REX_B : X86_OP_REX;
             pbCodeBuf[off++] = 0xf6;
             pbCodeBuf[off++] = X86_MODRM_MAKE(X86_MOD_REG, 0, iGprSrc & 7);
@@ -2972 +2972 @@
         else
         {
+            if (iGprSrc >= 8)
+                pbCodeBuf[off++] = X86_OP_REX_B;
             pbCodeBuf[off++] = 0xf7;
             pbCodeBuf[off++] = X86_MODRM_MAKE(X86_MOD_REG, 0, iGprSrc & 7);