Changeset 106136 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 24, 2024 9:32:39 AM (5 months ago)

Author:

vboxsync

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

164914

Message:

VMM/IEM: # padding. bugref:10720

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp (modified) (18 diffs)

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

@@ -8831 +8831 @@
     PCIEMTB                 pTb;
     PCIEMNATIVEPERCHUNKCTX  pCtx;
-# ifdef IEMNATIVE_WITH_TB_DEBUG_INFO
+#ifdef IEMNATIVE_WITH_TB_DEBUG_INFO
     PCIEMTBDBG              pDbgInfo;
-# endif
+#endif
 } IEMNATIVDISASMSYMCTX;
 typedef IEMNATIVDISASMSYMCTX *PIEMNATIVDISASMSYMCTX;
@@ -8915 +8915 @@
             }
         }
-#endif
+#endif /* IEMNATIVE_WITH_TB_DEBUG_INFO */
     }
     else
@@ -9203 +9203 @@
                         }
 
-#ifdef IEMNATIVE_WITH_SIMD_REG_ALLOCATOR
+# ifdef IEMNATIVE_WITH_SIMD_REG_ALLOCATOR
                         case kIemTbDbgEntryType_GuestSimdRegShadowing:
                         {
@@ -9220 +9220 @@
                             continue;
                         }
-#endif
+# endif
 
                         case kIemTbDbgEntryType_Label:
@@ -9241 +9241 @@
                             break;
 
-#ifdef IEMNATIVE_WITH_DELAYED_PC_UPDATING
+# ifdef IEMNATIVE_WITH_DELAYED_PC_UPDATING
                         case kIemTbDbgEntryType_DelayedPcUpdate:
                             pHlp->pfnPrintf(pHlp, "  Updating guest PC value by %u (cInstrSkipped=%u)\n",
@@ -9247 +9247 @@
                                             pDbgInfo->aEntries[iDbgEntry].DelayedPcUpdate.cInstrSkipped);
                             continue;
-#endif
-
-#ifdef IEMNATIVE_WITH_DELAYED_REGISTER_WRITEBACK
+# endif
+
+# ifdef IEMNATIVE_WITH_DELAYED_REGISTER_WRITEBACK
                         case kIemTbDbgEntryType_GuestRegDirty:
                         {
@@ -9270 +9270 @@
                                             << (pDbgInfo->aEntries[iDbgEntry].GuestRegWriteback.cShift * 25));
                             continue;
-#endif
+# endif
 
                         default:
@@ -9463 +9463 @@
         {
             PCIEMNATIVEINSTR const pNativeCur = &paNative[offNative];
-# ifndef VBOX_WITH_IEM_USING_CAPSTONE_DISASSEMBLER
+#ifndef VBOX_WITH_IEM_USING_CAPSTONE_DISASSEMBLER
             uint32_t               cbInstr    = sizeof(paNative[0]);
             int const              rc         = DISInstr(pNativeCur, enmHstCpuMode, &Dis, &cbInstr);
             if (RT_SUCCESS(rc))
             {
-#  if defined(RT_ARCH_AMD64)
+# if defined(RT_ARCH_AMD64)
                 if (Dis.pCurInstr->uOpcode == OP_NOP && cbInstr == 7) /* iemNativeEmitMarker */
                 {
@@ -9483 +9483 @@
                 }
                 else
-#  endif
+# endif
                 {
-#  ifdef RT_ARCH_AMD64
+# ifdef RT_ARCH_AMD64
                     DISFormatYasmEx(&Dis, szDisBuf, sizeof(szDisBuf),
                                     DIS_FMT_FLAGS_BYTES_WIDTH_MAKE(10) | DIS_FMT_FLAGS_BYTES_LEFT
                                     | DIS_FMT_FLAGS_RELATIVE_BRANCH | DIS_FMT_FLAGS_C_HEX,
                                     iemNativeDisasmGetSymbolCb, &SymCtx);
-#  elif defined(RT_ARCH_ARM64)
+# elif defined(RT_ARCH_ARM64)
                     DISFormatArmV8Ex(&Dis, szDisBuf, sizeof(szDisBuf),
                                      DIS_FMT_FLAGS_BYTES_LEFT | DIS_FMT_FLAGS_RELATIVE_BRANCH | DIS_FMT_FLAGS_C_HEX,
                                      iemNativeDisasmGetSymbolCb, &SymCtx);
-#  else
-#   error "Port me"
-#  endif
+# else
+#  error "Port me"
+# endif
                     pHlp->pfnPrintf(pHlp, "    %p: %s\n", pNativeCur, szDisBuf);
                 }
@@ -9502 +9502 @@
             else
             {
-#  if defined(RT_ARCH_AMD64)
+# if defined(RT_ARCH_AMD64)
                 pHlp->pfnPrintf(pHlp, "    %p:  %.*Rhxs - disassembly failure %Rrc\n",
                                 pNativeCur, RT_MIN(cNative - offNative, 16), pNativeCur, rc);
-#  else
+# else
                 pHlp->pfnPrintf(pHlp, "    %p:  %#010RX32 - disassembly failure %Rrc\n", pNativeCur, *pNativeCur, rc);
-#  endif
+# endif
                 cbInstr = sizeof(paNative[0]);
             }
             offNative += cbInstr / sizeof(paNative[0]);
 
-# else  /* VBOX_WITH_IEM_USING_CAPSTONE_DISASSEMBLER */
+#else  /* VBOX_WITH_IEM_USING_CAPSTONE_DISASSEMBLER */
             cs_insn *pInstr;
             size_t   cInstrs = cs_disasm(hDisasm, (const uint8_t *)pNativeCur, (cNative - offNative) * sizeof(*pNativeCur),
@@ -9521 +9521 @@
                 const char * const pszAnnotation = iemNativeDisasmAnnotateCapstone(&SymCtx, pInstr, szDisBuf, sizeof(szDisBuf));
                 size_t const       cchOp         = strlen(pInstr->op_str);
-#  if defined(RT_ARCH_AMD64)
+# if defined(RT_ARCH_AMD64)
                 if (pszAnnotation)
                     pHlp->pfnPrintf(pHlp, "    %p: %.*Rhxs %-7s %s%*s ; %s\n",
@@ -9530 +9530 @@
                                     pNativeCur, pInstr->size, pNativeCur, pInstr->mnemonic, pInstr->op_str);
 
-#  else
+# else
                 if (pszAnnotation)
                     pHlp->pfnPrintf(pHlp, "    %p: %#010RX32 %-7s %s%*s ; %s\n",
@@ -9538 +9538 @@
                     pHlp->pfnPrintf(pHlp, "    %p: %#010RX32 %-7s %s\n",
                                     pNativeCur, *pNativeCur, pInstr->mnemonic, pInstr->op_str);
-#  endif
+# endif
                 offNative += pInstr->size / sizeof(*pNativeCur);
                 cs_free(pInstr, cInstrs);
@@ -9544 +9544 @@
             else
             {
-#  if defined(RT_ARCH_AMD64)
+# if defined(RT_ARCH_AMD64)
                 pHlp->pfnPrintf(pHlp, "    %p:  %.*Rhxs - disassembly failure %d\n",
                                 pNativeCur, RT_MIN(cNative - offNative, 16), pNativeCur, cs_errno(hDisasm)));
-#  else
+# else
                 pHlp->pfnPrintf(pHlp, "    %p:  %#010RX32 - disassembly failure %d\n", pNativeCur, *pNativeCur, cs_errno(hDisasm));
-#  endif
+# endif
                 offNative++;
             }
-# endif /* VBOX_WITH_IEM_USING_CAPSTONE_DISASSEMBLER */
+#endif /* VBOX_WITH_IEM_USING_CAPSTONE_DISASSEMBLER */
         }
     }
@@ -9571 +9571 @@
         PIEMNATIVEINSTR pCodeBuf = iemNativeInstrBufEnsure(pReNative, off, fAlignMask + 1);
         while (off & fAlignMask)
-# if   defined(RT_ARCH_AMD64)
+#if   defined(RT_ARCH_AMD64)
             pCodeBuf[off++] = 0xcc;
-# elif defined(RT_ARCH_ARM64)
+#elif defined(RT_ARCH_ARM64)
             pCodeBuf[off++] = Armv8A64MkInstrBrk(0xcccc);
-# else
-#  error "port me"
-# endif
+#else
+# error "port me"
+#endif
     }
     return off;
@@ -9609 +9609 @@
     AssertReturn(pReNative, VERR_NO_MEMORY);
 
-# if   defined(RT_ARCH_AMD64)
+#if   defined(RT_ARCH_AMD64)
     uint32_t const fAlignMask = 15;
-# elif defined(RT_ARCH_ARM64)
+#elif defined(RT_ARCH_ARM64)
     uint32_t const fAlignMask = 31 / 4;
-# else
-#  error "port me"
-# endif
+#else
+# error "port me"
+#endif
     uint32_t aoffLabels[kIemNativeLabelType_LastTbExit + 1] = {0};
     int      rc  = VINF_SUCCESS;
@@ -9722 +9722 @@
             else
             {
-# ifdef VBOX_STRICT
+#ifdef VBOX_STRICT
                 off = iemNativeEmitBrk(pReNative, off, 0x2201);
-# endif
+#endif
                 off = iemNativeEmitJmpToFixed(pReNative, off, offReturnWithStatus);
             }
@@ -9730 +9730 @@
 
 
-# ifdef VBOX_STRICT
+#ifdef VBOX_STRICT
         /* Make sure we've generate code for all labels. */
         for (uint32_t i = kIemNativeLabelType_Invalid + 1; i < RT_ELEMENTS(aoffLabels); i++)
             Assert(aoffLabels[i] != 0 || i == kIemNativeLabelType_ReturnSuccess);
-# endif
+#endif
     }
     IEMNATIVE_CATCH_LONGJMP_BEGIN(pReNative, rc);