Changeset 72892 in vbox

Timestamp:

Jul 4, 2018 4:39:51 PM (7 years ago)

Author:

vboxsync

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

123439

Message:

EM: We no longer need the assembly code in EMAllA.asm anymore.

Location:

trunk

Files:

• include/VBox/vmm/em.h (modified) (1 diff)
• src/VBox/VMM/Makefile.kmk (modified) (3 diffs)
• src/VBox/VMM/VMMAll/EMAllA.asm (deleted)
• src/VBox/VMM/testcase/Makefile.kmk (modified) (4 diffs)
• src/VBox/VMM/testcase/tstInstrEmul.cpp (deleted)

trunk/include/VBox/vmm/em.h

@@ -324 +324 @@
 /** @} */
 
-/** @name Assembly routines
- * @{ */
-VMMDECL(uint32_t)   EMEmulateCmp(uint32_t u32Param1, uint64_t u64Param2, size_t cb);
-VMMDECL(uint32_t)   EMEmulateAnd(void *pvParam1, uint64_t u64Param2, size_t cb);
-VMMDECL(uint32_t)   EMEmulateInc(void *pvParam1, size_t cb);
-VMMDECL(uint32_t)   EMEmulateDec(void *pvParam1, size_t cb);
-VMMDECL(uint32_t)   EMEmulateOr(void *pvParam1, uint64_t u64Param2, size_t cb);
-VMMDECL(int)        EMEmulateLockOr(void *pvParam1, uint64_t u64Param2, size_t cbSize, RTGCUINTREG32 *pf);
-VMMDECL(uint32_t)   EMEmulateXor(void *pvParam1, uint64_t u64Param2, size_t cb);
-VMMDECL(int)        EMEmulateLockXor(void *pvParam1, uint64_t u64Param2, size_t cbSize, RTGCUINTREG32 *pf);
-VMMDECL(uint32_t)   EMEmulateAdd(void *pvParam1, uint64_t u64Param2, size_t cb);
-VMMDECL(int)        EMEmulateLockAnd(void *pvParam1, uint64_t u64Param2, size_t cbSize, RTGCUINTREG32 *pf);
-VMMDECL(uint32_t)   EMEmulateSub(void *pvParam1, uint64_t u64Param2, size_t cb);
-VMMDECL(uint32_t)   EMEmulateAdcWithCarrySet(void *pvParam1, uint64_t u64Param2, size_t cb);
-VMMDECL(uint32_t)   EMEmulateBtr(void *pvParam1, uint64_t u64Param2);
-VMMDECL(int)        EMEmulateLockBtr(void *pvParam1, uint64_t u64Param2, RTGCUINTREG32 *pf);
-VMMDECL(uint32_t)   EMEmulateBts(void *pvParam1, uint64_t u64Param2);
-VMMDECL(uint32_t)   EMEmulateBtc(void *pvParam1, uint64_t u64Param2);
-VMMDECL(uint32_t)   EMEmulateCmpXchg(void *pvParam1, uint64_t *pu32Param2, uint64_t u32Param3, size_t cbSize);
-VMMDECL(uint32_t)   EMEmulateLockCmpXchg(void *pvParam1, uint64_t *pu64Param2, uint64_t u64Param3, size_t cbSize);
-VMMDECL(uint32_t)   EMEmulateCmpXchg8b(void *pu32Param1, uint32_t *pEAX, uint32_t *pEDX, uint32_t uEBX, uint32_t uECX);
-VMMDECL(uint32_t)   EMEmulateLockCmpXchg8b(void *pu32Param1, uint32_t *pEAX, uint32_t *pEDX, uint32_t uEBX, uint32_t uECX);
-VMMDECL(uint32_t)   EMEmulateXAdd(void *pvParam1, void *pvParam2, size_t cbOp);
-VMMDECL(uint32_t)   EMEmulateLockXAdd(void *pvParam1, void *pvParam2, size_t cbOp);
-/** @} */
 
 /** @name REM locking routines

trunk/src/VBox/VMM/Makefile.kmk

@@ -194 +194 @@
         VMMAll/SELMAll.cpp \
         VMMAll/EMAll.cpp \
-        VMMAll/EMAllA.asm \
         VMMAll/FTMAll.cpp \
         VMMAll/GIMAll.cpp \
@@ -565 +564 @@
         VMMAll/IOMAllMMIO.cpp \
         VMMAll/EMAll.cpp \
-        VMMAll/EMAllA.asm \
         VMMAll/FTMAll.cpp \
         VMMAll/GIMAll.cpp \
@@ -712 +710 @@
         VMMAll/DBGFAll.cpp \
         VMMAll/EMAll.cpp \
-        VMMAll/EMAllA.asm \
         VMMAll/FTMAll.cpp \
         VMMAll/GIMAll.cpp \

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -41 +41 @@
 endif
 ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
- PROGRAMS  += tstInstrEmul
  if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
   PROGRAMS += tstGlobalConfigHardened
@@ -116 +115 @@
         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
-ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
- TESTING += \
-        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
-endif
 
 OTHER_CLEAN += \
         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run \
-        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run \
         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.o \
         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.o.dep \
@@ -269 +263 @@
 tstSSM_SOURCES          = tstSSM.cpp
 tstSSM_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
-
-#
-# Test some EM assembly routines used in instruction emulation.
-#
-tstInstrEmul_TEMPLATE   = VBOXR3EXE
-tstInstrEmul_SOURCES    = tstInstrEmul.cpp ../VMMAll/EMAllA.asm
-tstInstrEmul_LIBS       = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
 
 #
@@ -500 +487 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
-
-
-#
-# Run rule for tstInstrEmul.
-#
-$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run: $$(tstInstrEmul_1_STAGE_TARGET) | $$(dir $$@)
-        $(QUIET)$(RM) -f $@
-        $(QUIET)$(REDIRECT) -E 'VBOX_LOG_FLAGS=disabled' -E 'VBOX_LOG_DEST=nofile' \
-                $(if $(eq $(KBUILD_TARGET),darwin), -E 'DYLD_FALLBACK_LIBRARY_PATH=$(dir $(LIB_RUNTIME))') \
-                -- \
-                $(tstInstrEmul_1_STAGE_TARGET)
-        $(QUIET)$(APPEND) "$@" "done"