Changeset 99239 in vbox for trunk

Timestamp:

Mar 30, 2023 3:46:48 PM (2 years ago)

Author:

vboxsync

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

156622

Message:

Disassembler: Make it possible to build the disassembler library without x86/amd64 support, bugref:10394

Location:

trunk/src/VBox

Files:

trunk/src/VBox/Disassembler/Disasm.cpp

-              r99236
+              r99239
     pDis->pvUser            = pvUser;
     pDis->uCpuMode          = (uint8_t)enmCpuMode;
+#if defined(VBOX_DIS_WITH_X86_AMD64)
     return disInitializeStateX86(pDis, enmCpuMode, fFilter);
+#else
+    return VERR_NOT_SUPPORTED;
+#endif
+}
 …
     PCDISOPCODE paOneByteMap = disInitializeState(pDis, uInstrAddr, enmCpuMode, fFilter, pfnReadBytes, pvUser);
     disPrefetchBytes(pDis);
+#if defined(VBOX_DIS_WITH_X86_AMD64)
     return disInstrWorkerX86(pDis, paOneByteMap, pcbInstr);
+#else
+    return VERR_NOT_SUPPORTED;
+#endif
+}
 …
+    }
+#if defined(VBOX_DIS_WITH_X86_AMD64)
     return disInstrWorkerX86(pDis, paOneByteMap, pcbInstr);
+#else
+    return VERR_NOT_SUPPORTED;
+#endif
+}

-              r99236
+              r99239
+#if defined(VBOX_DIS_WITH_X86_AMD64)
 /* x86/amd64 */
 DECLHIDDEN(PCDISOPCODE) disInitializeStateX86(PDISSTATE pDis, DISCPUMODE enmCpuMode, uint32_t fFilter);
 DECLHIDDEN(int)         disInstrWorkerX86(PDISSTATE pDis, PCDISOPCODE paOneByteMap, uint32_t *pcbInstr);
+#endif
 size_t disFormatBytes(PCDISSTATE pDis, char *pszDst, size_t cchDst, uint32_t fFlags);

-              r99238
+              r99239
 LIBRARIES              += DisasmR3
 DisasmR3_TEMPLATE       = VBoxR3Dll
 DisasmR3_DEFS           = IN_DIS
+DisasmR3_DEFS           = IN_DIS VBOX_DIS_WITH_X86_AMD64
 DisasmR3_SOURCES        = \
         Disasm.cpp \
 …
  LIBRARIES              += DisasmCoreR3
  DisasmCoreR3_TEMPLATE   = VBoxR3Dll
  DisasmCoreR3_DEFS       = IN_DIS DIS_CORE_ONLY
+ DisasmCoreR3_DEFS       = IN_DIS DIS_CORE_ONLY VBOX_DIS_WITH_X86_AMD64
  DisasmCoreR3_SOURCES    = \
         Disasm.cpp \
 …
   LIBRARIES              += DisasmRC
   DisasmRC_TEMPLATE       = VBoxRc
   DisasmRC_DEFS           = IN_DIS IN_RT_RC DIS_CORE_ONLY
+  DisasmRC_DEFS           = IN_DIS IN_RT_RC DIS_CORE_ONLY VBOX_DIS_WITH_X86_AMD64
   DisasmRC_SOURCES        = \
         Disasm.cpp \
 …
  LIBRARIES              += DisasmR0
  DisasmR0_TEMPLATE       = VBoxR0
  DisasmR0_DEFS           = IN_DIS IN_RT_R0 DIS_CORE_ONLY
+ DisasmR0_DEFS           = IN_DIS IN_RT_R0 DIS_CORE_ONLY VBOX_DIS_WITH_X86_AMD64
  DisasmR0_SOURCES        = \
         Disasm.cpp \

-              r99237
+              r99239
         IN_DIS_STATIC \
         DIS_CORE_ONLY \
+        VBOX_DIS_WITH_X86_AMD64 \
         IPRT_NO_CRT \
         RT_WITH_NOCRT_ALIASES \
 …
         IN_DIS_STATIC \
         DIS_CORE_ONLY \
+        VBOX_DIS_WITH_X86_AMD64 \
         LOG_DISABLED
  SUPR3HardenedStatic_DEFS.linux += \

Note: See TracChangeset for help on using the changeset viewer.