Changeset 101908 in vbox

Timestamp:

Nov 6, 2023 9:57:56 PM (16 months ago)

Author:

vboxsync

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

160004

Message:

VMM/IEM: Arm64 code generation fixes. bugref:10371

Location:

trunk

Files:

• include/iprt/armv8.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllThrdRecompiler.cpp (modified) (1 diff)

trunk/include/iprt/armv8.h

@@ -3271 +3271 @@
 typedef enum ARMV8INSTRCOND
 {
-    kArmv8InstrCond_Eq = 0,                     /**< Equal - Zero set. */
-    kArmv8InstrCond_Cs,                         /**< Carry set (also known as 'HS'). */
-    kArmv8InstrCond_Hs = kArmv8InstrCond_Cs,    /**< Unsigned higher or same. */
-    kArmv8InstrCond_Mi,                         /**< Negative result (minus). */
-    kArmv8InstrCond_Vs,                         /**< Overflow set. */
-    kArmv8InstrCond_Hi,                         /**< Unsigned higher. */
-    kArmv8InstrCond_Ge,                         /**< Signed greater or equal. */
-    kArmv8InstrCond_Le,                         /**< Signed less or equal. */
-
-    kArmv8InstrCond_Ne,                         /**< Not equal - Zero clear. */
-    kArmv8InstrCond_Cc,                         /**< Carry clear (also known as 'LO'). */
-    kArmv8InstrCond_Lo = kArmv8InstrCond_Cc,    /**< Unsigned lower. */
-    kArmv8InstrCond_Pl,                         /**< Positive or zero result (plus). */
-    kArmv8InstrCond_Vc,                         /**< Overflow clear. */
-    kArmv8InstrCond_Ls,                         /**< Unsigned lower or same. */
-    kArmv8InstrCond_Lt,                         /**< Signed less than. */
-    kArmv8InstrCond_Al                          /**< Condition is always true. */
+    kArmv8InstrCond_Eq = 0,                     /**< 0 - Equal - Zero set. */
+    kArmv8InstrCond_Ne,                         /**< 1 - Not equal - Zero clear. */
+
+    kArmv8InstrCond_Cs,                         /**< 2 - Carry set (also known as 'HS'). */
+    kArmv8InstrCond_Hs = kArmv8InstrCond_Cs,    /**< 2 - Unsigned higher or same. */
+    kArmv8InstrCond_Cc,                         /**< 3 - Carry clear (also known as 'LO'). */
+    kArmv8InstrCond_Lo = kArmv8InstrCond_Cc,    /**< 3 - Unsigned lower. */
+
+    kArmv8InstrCond_Mi,                         /**< 4 - Negative result (minus). */
+    kArmv8InstrCond_Pl,                         /**< 5 - Positive or zero result (plus). */
+
+    kArmv8InstrCond_Vs,                         /**< 6 - Overflow set. */
+    kArmv8InstrCond_Vc,                         /**< 7 - Overflow clear. */
+
+    kArmv8InstrCond_Hi,                         /**< 8 - Unsigned higher. */
+    kArmv8InstrCond_Ls,                         /**< 9 - Unsigned lower or same. */
+
+    kArmv8InstrCond_Ge,                         /**< a - Signed greater or equal. */
+    kArmv8InstrCond_Lt,                         /**< b - Signed less than. */
+
+    kArmv8InstrCond_Gt,                         /**< c - Signed less or equal. */
+    kArmv8InstrCond_Le,                         /**< d - Signed less or equal. */
+
+    kArmv8InstrCond_Al,                         /**< e - Condition is always true. */
+    kArmv8InstrCond_Al1                         /**< f - Condition is always true. */
 } ARMV8INSTRCOND;
 

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

@@ -3314 +3314 @@
     uint32_t const idxLabel = iemNativeLabelCreate(pReNative, kIemNativeLabelType_NonZeroRetOrPassUp);
     iemNativeAddFixup(pReNative, off, idxLabel, kIemNativeFixupType_RelImm19At5);
-    pu32CodeBuf[off++] = Armv8A64MkInstrCbzCbnz(true /*fJmpIfNotZero*/, ARMV8_A64_REG_X4, false /*f64Bit*/);
+    pu32CodeBuf[off++] = Armv8A64MkInstrCbzCbnz(true /*fJmpIfNotZero*/, 0, ARMV8_A64_REG_X4, false /*f64Bit*/);
 
 #else

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

@@ -2154 +2154 @@
         uint16_t const uCsLog  = pVCpu->cpum.GstCtx.cs.Sel;
         uint64_t const uRipLog = pVCpu->cpum.GstCtx.rip;
+        Assert(uCsLog != 0 || uRipLog > 0x400 || !IEM_IS_REAL_OR_V86_MODE(pVCpu)); /* Detect executing RM interrupt table. */
 #endif
         uint8_t b; IEM_OPCODE_GET_FIRST_U8(&b);