Changeset 101581 in vbox for trunk/src

Timestamp:

Oct 24, 2023 2:50:49 PM (18 months ago)

Author:

vboxsync

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

159662

Message:

VMM/IEM: Native IEM_MC_IF_EFL_BIT_SET_OR_BITS_NE and IEM_MC_IF_EFL_BIT_NOT_SET_AND_BITS_EQ translations. Emitter naming fixes. bugref:10371

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllInstPython.py (modified) (1 diff)
• VMMAll/IEMAllN8veRecompiler.cpp (modified) (7 diffs)
• include/IEMN8veRecompiler.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllInstPython.py ¶

@@ -2888 +2888 @@
     'IEM_MC_IF_EFL_ANY_BITS_SET':                                (McBlock.parseMcGenericCond,       True,  True,  ),
     'IEM_MC_IF_EFL_BIT_NOT_SET':                                 (McBlock.parseMcGenericCond,       True,  True,  ),
-    'IEM_MC_IF_EFL_BIT_NOT_SET_AND_BITS_EQ':                     (McBlock.parseMcGenericCond,       True,  False, ),
+    'IEM_MC_IF_EFL_BIT_NOT_SET_AND_BITS_EQ':                     (McBlock.parseMcGenericCond,       True,  True,  ),
     'IEM_MC_IF_EFL_BIT_SET':                                     (McBlock.parseMcGenericCond,       True,  True,  ),
-    'IEM_MC_IF_EFL_BIT_SET_OR_BITS_NE':                          (McBlock.parseMcGenericCond,       True,  False, ),
+    'IEM_MC_IF_EFL_BIT_SET_OR_BITS_NE':                          (McBlock.parseMcGenericCond,       True,  True,  ),
     'IEM_MC_IF_EFL_BITS_EQ':                                     (McBlock.parseMcGenericCond,       True,  True,  ),
     'IEM_MC_IF_EFL_BITS_NE':                                     (McBlock.parseMcGenericCond,       True,  True,  ),

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

@@ -4089 +4089 @@
  * Start of the if-block, snapshotting the register and variable state.
  */
-DECLINLINE(void) iemNativeCondStartIfBlock(PIEMRECOMPILERSTATE pReNative, uint32_t offIfBlock)
+DECLINLINE(void) iemNativeCondStartIfBlock(PIEMRECOMPILERSTATE pReNative, uint32_t offIfBlock, uint32_t idxLabelIf = UINT32_MAX)
 {
     Assert(offIfBlock != UINT32_MAX);
@@ -4096 +4096 @@
     Assert(!pEntry->fInElse);
 
-    /* Define the start of the IF block for disassembly. */
+    /* Define the start of the IF block if request or for disassembly purposes. */
+    if (idxLabelIf != UINT32_MAX)
+        iemNativeLabelDefine(pReNative, idxLabelIf, offIfBlock);
 #ifdef IEMNATIVE_WITH_TB_DEBUG_INFO
-    iemNativeLabelCreate(pReNative, kIemNativeLabelType_If, offIfBlock, pReNative->paLabels[pEntry->idxLabelElse].uData);
+    else
+        iemNativeLabelCreate(pReNative, kIemNativeLabelType_If, offIfBlock, pReNative->paLabels[pEntry->idxLabelElse].uData);
 #else
     RT_NOREF(offIfBlock);
@@ -4331 +4334 @@
 
     /* Test and jump. */
-    off = iemNativeEmitTestBitInGprAndJmpToLabelIfSet(pReNative, off, idxEflReg, iBitNo, pEntry->idxLabelElse);
+    off = iemNativeEmitTestBitInGprAndJmpToLabelIfNotSet(pReNative, off, idxEflReg, iBitNo, pEntry->idxLabelElse);
 
     /* Free but don't flush the EFlags register. */
@@ -4363 +4366 @@
 
     /* Test and jump. */
-    off = iemNativeEmitTestBitInGprAndJmpToLabelIfNotSet(pReNative, off, idxEflReg, iBitNo, pEntry->idxLabelElse);
+    off = iemNativeEmitTestBitInGprAndJmpToLabelIfSet(pReNative, off, idxEflReg, iBitNo, pEntry->idxLabelElse);
 
     /* Free but don't flush the EFlags register. */
@@ -4376 +4379 @@
 
 #define IEM_MC_IF_EFL_BITS_EQ(a_fBit1, a_fBit2)         \
-    off = iemNativeEmitIfEflagsTwoBitsComp(pReNative, off, a_fBit1, a_fBit2, false /*fNotEqual*/); \
+    off = iemNativeEmitIfEflagsTwoBitsEqual(pReNative, off, a_fBit1, a_fBit2, false /*fInverted*/); \
     AssertReturn(off != UINT32_MAX, UINT32_MAX); \
     do {
 
 #define IEM_MC_IF_EFL_BITS_NE(a_fBit1, a_fBit2)         \
-    off = iemNativeEmitIfEflagsTwoBitsComp(pReNative, off, a_fBit1, a_fBit2, true /*fNotEqual*/); \
+    off = iemNativeEmitIfEflagsTwoBitsEqual(pReNative, off, a_fBit1, a_fBit2, true /*fInverted*/); \
     AssertReturn(off != UINT32_MAX, UINT32_MAX); \
     do {
 
 /** Emits code for IEM_MC_IF_EFL_BITS_EQ and IEM_MC_IF_EFL_BITS_NE. */
-DECLINLINE(uint32_t) iemNativeEmitIfEflagsTwoBitsComp(PIEMRECOMPILERSTATE pReNative, uint32_t off,
-                                                      uint32_t fBit1InEfl, uint32_t fBit2InEfl, bool fNotEqual)
+DECLINLINE(uint32_t) iemNativeEmitIfEflagsTwoBitsEqual(PIEMRECOMPILERSTATE pReNative, uint32_t off,
+                                                       uint32_t fBit1InEfl, uint32_t fBit2InEfl, bool fInverted)
 {
     PIEMNATIVECOND pEntry = iemNativeCondPushIf(pReNative);
@@ -4439 +4442 @@
 #endif
 
-    /* Test and jump. */
-    if (fNotEqual)
-        off = iemNativeEmitTestBitInGprAndJmpToLabelIfSet(pReNative, off, idxTmpReg, iBitNo2, pEntry->idxLabelElse);
-    else
-        off = iemNativeEmitTestBitInGprAndJmpToLabelIfNotSet(pReNative, off, idxTmpReg, iBitNo2, pEntry->idxLabelElse);
+    /* Test (bit #2 is set in tmpreg if not-equal) and jump. */
+    off = iemNativeEmitTestBitInGprAndJmpToLabelIfCc(pReNative, off, idxTmpReg, iBitNo2,
+                                                     pEntry->idxLabelElse, !fInverted /*fJmpIfSet*/);
 
     /* Free but don't flush the EFlags and tmp registers. */
@@ -4451 +4452 @@
     /* Make a copy of the core state now as we start the if-block. */
     iemNativeCondStartIfBlock(pReNative, off);
+
+    return off;
+}
+
+
+#define IEM_MC_IF_EFL_BIT_NOT_SET_AND_BITS_EQ(a_fBit, a_fBit1, a_fBit2) \
+    off = iemNativeEmitIfEflagsBitNotSetAndTwoBitsEqual(pReNative, off, a_fBit, a_fBit1, a_fBit2, false /*fInverted*/); \
+    AssertReturn(off != UINT32_MAX, UINT32_MAX); \
+    do {
+
+#define IEM_MC_IF_EFL_BIT_SET_OR_BITS_NE(a_fBit, a_fBit1, a_fBit2) \
+    off = iemNativeEmitIfEflagsBitNotSetAndTwoBitsEqual(pReNative, off, a_fBit, a_fBit1, a_fBit2, true /*fInverted*/); \
+    AssertReturn(off != UINT32_MAX, UINT32_MAX); \
+    do {
+
+/** Emits code for IEM_MC_IF_EFL_BIT_NOT_SET_AND_BITS_EQ and
+ *  IEM_MC_IF_EFL_BIT_SET_OR_BITS_NE. */
+DECLINLINE(uint32_t) iemNativeEmitIfEflagsBitNotSetAndTwoBitsEqual(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint32_t fBitInEfl,
+                                                                  uint32_t fBit1InEfl, uint32_t fBit2InEfl, bool fInverted)
+{
+    PIEMNATIVECOND pEntry = iemNativeCondPushIf(pReNative);
+    AssertReturn(pEntry, UINT32_MAX);
+
+    /* We need an if-block label for the non-inverted variant. */
+    uint32_t const idxLabelIf = fInverted ? iemNativeLabelCreate(pReNative, kIemNativeLabelType_If, UINT32_MAX,
+                                                                 pReNative->paLabels[pEntry->idxLabelElse].uData) : UINT32_MAX;
+    AssertReturn(idxLabelIf != UINT32_MAX || !fInverted, UINT32_MAX);
+
+    /* Get the eflags. */
+    uint8_t const idxEflReg = iemNativeRegAllocTmpForGuestReg(pReNative, &off, kIemNativeGstReg_EFlags,
+                                                              kIemNativeGstRegUse_ReadOnly);
+    AssertReturn(idxEflReg != UINT8_MAX, UINT32_MAX);
+
+    /* Translate the flag masks to bit numbers. */
+    unsigned const iBitNo = ASMBitFirstSetU32(fBitInEfl) - 1;
+    Assert(RT_BIT_32(iBitNo) == fBitInEfl);
+
+    unsigned const iBitNo1 = ASMBitFirstSetU32(fBit1InEfl) - 1;
+    Assert(RT_BIT_32(iBitNo1) == fBit1InEfl);
+    Assert(iBitNo1 != iBitNo);
+
+    unsigned const iBitNo2 = ASMBitFirstSetU32(fBit2InEfl) - 1;
+    Assert(RT_BIT_32(iBitNo2) == fBit2InEfl);
+    Assert(iBitNo2 != iBitNo);
+    Assert(iBitNo2 != iBitNo1);
+
+#ifdef RT_ARCH_AMD64
+    uint8_t const idxTmpReg = iemNativeRegAllocTmpImm(pReNative, &off, fBit1InEfl); /* This must come before we jump anywhere! */
+#elif defined(RT_ARCH_ARM64)
+    uint8_t const idxTmpReg = iemNativeRegAllocTmp(pReNative, &off);
+#endif
+    AssertReturn(idxTmpReg != UINT8_MAX, UINT32_MAX);
+
+    /* Check for the lone bit first. */
+    if (!fInverted)
+        off = iemNativeEmitTestBitInGprAndJmpToLabelIfSet(pReNative, off, idxEflReg, iBitNo, pEntry->idxLabelElse);
+    else
+        off = iemNativeEmitTestBitInGprAndJmpToLabelIfSet(pReNative, off, idxEflReg, iBitNo, idxLabelIf);
+
+    /* Then extract and compare the other two bits. */
+#ifdef RT_ARCH_AMD64
+    off = iemNativeEmitAndGpr32ByGpr32(pReNative, off, idxTmpReg, idxEflReg);
+    if (iBitNo1 > iBitNo2)
+        off = iemNativeEmitShiftGpr32Right(pReNative, off, idxTmpReg, iBitNo1 - iBitNo2);
+    else
+        off = iemNativeEmitShiftGpr32Left(pReNative, off, idxTmpReg, iBitNo2 - iBitNo1);
+    off = iemNativeEmitXorGpr32ByGpr32(pReNative, off, idxTmpReg, idxEflReg);
+
+#elif defined(RT_ARCH_ARM64)
+    uint32_t *pu32CodeBuf = iemNativeInstrBufEnsure(pReNative, off, 2);
+    AssertReturn(pu32CodeBuf, UINT32_MAX);
+
+    /* and tmpreg, eflreg, #1<<iBitNo1 */
+    pu32CodeBuf[off++] = Armv8A64MkInstrAndImm(idxTmpReg, idxEflReg, 0 /*uImm7SizeLen -> 32*/, 32 - iBitNo1, false /*f64Bit*/);
+
+    /* eeyore tmpreg, eflreg, tmpreg, LSL/LSR, #abs(iBitNo2 - iBitNo1) */
+    if (iBitNo1 > iBitNo2)
+        pu32CodeBuf[off++] = Armv8A64MkInstrEor(idxTmpReg, idxEflReg, idxTmpReg, false /*64bit*/,
+                                                iBitNo1 - iBitNo2, kArmv8A64InstrShift_Lsr);
+    else
+        pu32CodeBuf[off++] = Armv8A64MkInstrEor(idxTmpReg, idxEflReg, idxTmpReg, false /*64bit*/,
+                                                iBitNo2 - iBitNo1, kArmv8A64InstrShift_Lsl);
+
+    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
+
+#else
+# error "Port me"
+#endif
+
+    /* Test (bit #2 is set in tmpreg if not-equal) and jump. */
+    off = iemNativeEmitTestBitInGprAndJmpToLabelIfCc(pReNative, off, idxTmpReg, iBitNo2,
+                                                     pEntry->idxLabelElse, !fInverted /*fJmpIfSet*/);
+
+    /* Free but don't flush the EFlags and tmp registers. */
+    iemNativeRegFreeTmp(pReNative, idxTmpReg);
+    iemNativeRegFreeTmp(pReNative, idxEflReg);
+
+    /* Make a copy of the core state now as we start the if-block. */
+    iemNativeCondStartIfBlock(pReNative, off, idxLabelIf);
 
     return off;

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

@@ -264 +264 @@
     kIemNativeLabelType_Invalid = 0,
     kIemNativeLabelType_Return,
-#ifdef IEMNATIVE_WITH_TB_DEBUG_INFO
     kIemNativeLabelType_If,
-#endif
     kIemNativeLabelType_Else,
     kIemNativeLabelType_Endif,
@@ -2483 +2481 @@
                                                                  uint8_t iGprSrc, uint8_t iBitNo, uint32_t idxLabel)
 {
-    return iemNativeEmitTestBitInGprAndJmpToLabelIfCc(pReNative, off, iGprSrc, iBitNo, idxLabel, false /*fJmpIfSet*/);
+    return iemNativeEmitTestBitInGprAndJmpToLabelIfCc(pReNative, off, iGprSrc, iBitNo, idxLabel, true /*fJmpIfSet*/);
 }
 
@@ -2496 +2494 @@
                                                                     uint8_t iGprSrc, uint8_t iBitNo, uint32_t idxLabel)
 {
-    return iemNativeEmitTestBitInGprAndJmpToLabelIfCc(pReNative, off, iGprSrc, iBitNo, idxLabel, true /*fJmpIfSet*/);
+    return iemNativeEmitTestBitInGprAndJmpToLabelIfCc(pReNative, off, iGprSrc, iBitNo, idxLabel, false /*fJmpIfSet*/);
 }