Changeset 107227 in vbox for trunk/src/VBox/VMM/VMMR3/DBGF.cpp

Timestamp:

Dec 4, 2024 3:20:14 PM (6 weeks ago)

Author:

vboxsync

Message:

VMM: Cleaning up ARMv8 / x86 split. jiraref:VBP-1470

File:

• trunk/src/VBox/VMM/VMMR3/DBGF.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/DBGF.cpp

@@ -1598 +1598 @@
          * Do minimal parsing.  No real need to involve the disassembler here.
          */
-        if (   (u32Insn & 0xfffffc1f) == 0xd65f0000 /* RET */
-            || (u32Insn & 0xfffffc1f) == 0xd65f081f /* RETAA */
-            || (u32Insn & 0xfffffc1f) == 0xd65f0c1f /* RETAB */
-            || (u32Insn & 0xffffffff) == 0xd69f03e0 /* ERET */
-            || (u32Insn & 0xffffffff) == 0xd69f0bff /* ERETAA */
-            || (u32Insn & 0xffffffff) == 0xd69f0fff /* ERETAB */)
+        if (   (u32Insn & UINT32_C(0xfffffc1f)) == UINT32_C(0xd65f0000) /* RET */
+            || (u32Insn & UINT32_C(0xfffffc1f)) == UINT32_C(0xd65f081f) /* RETAA */
+            || (u32Insn & UINT32_C(0xfffffc1f)) == UINT32_C(0xd65f0c1f) /* RETAB */
+            || (u32Insn & UINT32_C(0xffffffff)) == UINT32_C(0xd69f03e0) /* ERET */
+            || (u32Insn & UINT32_C(0xffffffff)) == UINT32_C(0xd69f0bff) /* ERETAA */
+            || (u32Insn & UINT32_C(0xffffffff)) == UINT32_C(0xd69f0fff) /* ERETAB */)
             return DBGFSTEPINSTRTYPE_RET;
-        else if (   (u32Insn & 0xfffffc1f) == 0xd63f0000 /* BLR */
-                 || (u32Insn & 0xfffffc1f) == 0xd63f081f /* BLRAAZ */
-                 || (u32Insn & 0xfffffc1f) == 0xd63f0c1f /* BLRABZ */
-                 || (u32Insn & 0xfffffc00) == 0xd73f0800 /* BLRAA */
-                 || (u32Insn & 0xfffffc00) == 0xd73f0c00 /* BLRAB */
-                 || (u32Insn & 0xfc000000) == 0x14000000 /* BL */
-                 || (u32Insn & 0xffe0001f) == 0xd4000001 /* SVC */
-                 || (u32Insn & 0xffe0001f) == 0xd4000002 /* HVC */
-                 || (u32Insn & 0xffe0001f) == 0xd4000003 /* SMC */
-                 || (u32Insn & 0xffe0001f) == 0xd4200000 /* BRK */
-                 || (u32Insn & 0xffe0001f) == 0xd4400000 /* HLT */)
+        if (   (u32Insn & UINT32_C(0xfffffc1f)) == UINT32_C(0xd63f0000) /* BLR */
+            || (u32Insn & UINT32_C(0xfffffc1f)) == UINT32_C(0xd63f081f) /* BLRAAZ */
+            || (u32Insn & UINT32_C(0xfffffc1f)) == UINT32_C(0xd63f0c1f) /* BLRABZ */
+            || (u32Insn & UINT32_C(0xfffffc00)) == UINT32_C(0xd73f0800) /* BLRAA */
+            || (u32Insn & UINT32_C(0xfffffc00)) == UINT32_C(0xd73f0c00) /* BLRAB */
+            || (u32Insn & UINT32_C(0xfc000000)) == UINT32_C(0x14000000) /* BL */
+            || (u32Insn & UINT32_C(0xffe0001f)) == UINT32_C(0xd4000001) /* SVC */
+            || (u32Insn & UINT32_C(0xffe0001f)) == UINT32_C(0xd4000002) /* HVC */
+            || (u32Insn & UINT32_C(0xffe0001f)) == UINT32_C(0xd4000003) /* SMC */
+            || (u32Insn & UINT32_C(0xffe0001f)) == UINT32_C(0xd4200000) /* BRK */
+            || (u32Insn & UINT32_C(0xffe0001f)) == UINT32_C(0xd4400000) /* HLT */)
             return DBGFSTEPINSTRTYPE_CALL;
-        else
-            return DBGFSTEPINSTRTYPE_OTHER;
-    }
-#else
+        return DBGFSTEPINSTRTYPE_OTHER;
+    }
+
+#elif defined(VBOX_VMM_TARGET_X86)
     /*
      * Read the instruction.
@@ -1694 +1694 @@
         }
     }
+
+#else
+# error "port me"
 #endif