Changeset 108196 in vbox for trunk/src/VBox/VMM/Makefile.kmk

Timestamp:

Feb 13, 2025 3:18:18 PM (3 months ago)

Author:

vboxsync

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

167514

Message:

VMM/IEM: Moving x86 target specific files to VMMAll/target-x86/... jiraref:VBP-1431

File:

• trunk/src/VBox/VMM/Makefile.kmk (modified) (10 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -199 +199 @@
         VMMAll/IEMAllIntprTables3.cpp \
         VMMAll/IEMAllIntprTables4.cpp \
-        VMMAll/IEMAllAImplC.cpp \
-        VMMAll/IEMAllCImpl.cpp \
-        VMMAll/IEMAllCImplSvmInstr.cpp \
-        VMMAll/IEMAllCImplVmxInstr.cpp \
-        VMMAll/IEMAllDbg.cpp \
+        VMMAll/target-x86/IEMAllAImplC-x86.cpp \
+        VMMAll/target-x86/IEMAllCImpl-x86.cpp \
+        VMMAll/target-x86/IEMAllCImplSvmInstr-x86.cpp \
+        VMMAll/target-x86/IEMAllCImplVmxInstr-x86.cpp \
+        VMMAll/target-x86/IEMAllDbg-x86.cpp \
         VMMAll/IOMAll.cpp \
         VMMAll/IOMAllMmioNew.cpp \
@@ -239 +239 @@
 VBoxVMM_SOURCES.amd64 += \
         VMMR3/PGMR3DbgA.asm \
-        $(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/IEMAllAImpl.asm,) \
+        $(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/target-x86/IEMAllAImpl-x86-amd64.asm,) \
         VMMAll/VMMAllA.asm
 VBoxVMM_SOURCES.arm64 += \
-        VMMAll/IEMAllAImpl-arm64.S
+        VMMAll/target-x86/IEMAllAImpl-x86-arm64.S
 ifdef VBOX_WITH_VUSB
  VBoxVMM_SOURCES += VMMR3/PDMUsb.cpp
@@ -359 +359 @@
  #VBoxVMM_VMMAll/IEMAllIntprTables3.cpp_CXXFLAGS      = /FAcs /Fa$(subst /,\\,$(outbase).cod)
  #VBoxVMM_VMMAll/IEMAllIntprTables4.cpp_CXXFLAGS      = /FAcs /Fa$(subst /,\\,$(outbase).cod)
- VBoxVMM_VMMAll/IEMAllAImplC.cpp_CXXFLAGS            = /FAcs /Fa$(subst /,\\,$(outbase).cod)
+ VBoxVMM_VMMAll/target-x86/IEMAllAImplC-x86.cpp_CXXFLAGS            = /FAcs /Fa$(subst /,\\,$(outbase).cod)
  VBoxVMM_VMMAll/IEMAllN8veExecMem.cpp_CXXFLAGS       = /FAcs /Fa$(subst /,\\,$(outbase).cod)
  VBoxVMM_VMMAll/IEMAllN8veRecompiler.cpp_CXXFLAGS    = /FAcs /Fa$(subst /,\\,$(outbase).cod)
@@ -375 +375 @@
 
  VBoxVMM_CLEAN += $(addprefix $(VBoxVMM_0_OUTDIR)/VMMAll/, \
-                IEMAll.cod IEMAllIntprTables1.cod IEMAllIntprTables2.cod IEMAllIntprTables3.cod IEMAllIntprTables4.cod IEMAllAImplC.cod \
+                IEMAll.cod IEMAllIntprTables1.cod IEMAllIntprTables2.cod IEMAllIntprTables3.cod IEMAllIntprTables4.cod IEMAllAImplC-x86.cod \
                 IEMAllN8veExecMem.cod IEMAllN8veRecompiler.cod IEMAllN8veRecompFuncs1.cod IEMAllN8veRecompFuncs2.cod \
                 IEMAllThrdRecompiler.cod IEMAllThrdFuncsBltIn.cod IEMAllThrdTables1.cod IEMAllThrdFuncs.cod \
@@ -940 +940 @@
         VMMAll/IEMAllIntprTables3.cpp \
         VMMAll/IEMAllIntprTables4.cpp \
-        VMMAll/IEMAllAImplC.cpp \
-        VMMAll/IEMAllCImpl.cpp \
-        VMMAll/IEMAllCImplSvmInstr.cpp \
-        VMMAll/IEMAllCImplVmxInstr.cpp \
-        VMMAll/IEMAllDbg.cpp \
+        VMMAll/target-x86/IEMAllAImplC-x86.cpp \
+        VMMAll/target-x86/IEMAllCImpl-x86.cpp \
+        VMMAll/target-x86/IEMAllCImplSvmInstr-x86.cpp \
+        VMMAll/target-x86/IEMAllCImplVmxInstr-x86.cpp \
+        VMMAll/target-x86/IEMAllDbg-x86.cpp \
         VMMAll/IOMAll.cpp \
         VMMAll/IOMAllMmioNew.cpp \
@@ -974 +974 @@
         VMMR0/HMR0A.asm \
         VMMR0/HMR0UtilA.asm \
-        $(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/IEMAllAImpl.asm,) \
+        $(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/target-x86/IEMAllAImpl-x86-amd64.asm,) \
         VMMAll/VMMAllA.asm
 
@@ -1003 +1003 @@
 
  if "$(USERNAME)" == "bird" && "$(KBUILD_TARGET)" == "win"
-  VMMR0_VMMAll/IEMAll.cpp_CXXFLAGS       = /FAcs /Fa$(subst /,\\,$(outbase).cod)
-  VMMR0_VMMAll/IEMAllAImplC.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
-  VMMR0_VMMAll/PGMAll.cpp_CXXFLAGS       = /FAcs /Fa$(subst /,\\,$(outbase).cod)
-  VMMR0_CLEAN += $(addprefix $(VMMR0_0_OUTDIR)/VMMAll/, IEMAll.cod IEMAllAImplC.cod PGMAll.cod)
+  VMMR0_VMMAll/IEMAll.cpp_CXXFLAGS                      = /FAcs /Fa$(subst /,\\,$(outbase).cod)
+  VMMR0_VMMAll/target-x86/IEMAllAImplC-x86.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
+  VMMR0_VMMAll/PGMAll.cpp_CXXFLAGS                      = /FAcs /Fa$(subst /,\\,$(outbase).cod)
+  VMMR0_CLEAN += $(addprefix $(VMMR0_0_OUTDIR)/VMMAll/, IEMAll.cod IEMAllAImplC-x86.cod PGMAll.cod)
  endif
 
@@ -1150 +1150 @@
   # cl : Command line warning D9025 : overriding '/Oy-' with '/Oy'
   VMMAll/IEMAll.cpp_CXXFLAGS                        += -noover -O2xy
-  VMMAll/IEMAllAImplC.cpp_CXXFLAGS                  += -noover -O2xy
-  VMMAll/IEMAllCImpl.cpp_CXXFLAGS                   += -noover -O2xy
-  VMMAll/IEMAllCImplSvmInstr.cpp_CXXFLAGS           += -noover -O2xy
-  VMMAll/IEMAllCImplVmxInstr.cpp_CXXFLAGS           += -noover -O2xy
+  VMMAll/target-x86/IEMAllAImplC-x86.cpp_CXXFLAGS                  += -noover -O2xy
+  VMMAll/target-x86/IEMAllCImpl-x86.cpp_CXXFLAGS                   += -noover -O2xy
+  VMMAll/target-x86/IEMAllCImplSvmInstr-x86.cpp_CXXFLAGS           += -noover -O2xy
+  VMMAll/target-x86/IEMAllCImplVmxInstr-x86.cpp_CXXFLAGS           += -noover -O2xy
   VMMAll/IEMAllIntprTables1.cpp_CXXFLAGS            += -noover -O2xy
   VMMAll/IEMAllIntprTables2.cpp_CXXFLAGS            += -noover -O2xy
@@ -1161 +1161 @@
   # Omitting the frame pointer results in larger code, but it might be worth it. (esp addressing vs ebp?)
   VMMAll/IEMAll.cpp_CXXFLAGS                        += -O2 -fomit-frame-pointer
-  VMMAll/IEMAllCImpl.cpp_CXXFLAGS                   += -O2 -fomit-frame-pointer
-  VMMAll/IEMAllCImplSvmInstr.cpp_CXXFLAGS           += -O2 -fomit-frame-pointer
-  VMMAll/IEMAllCImplVmxInstr.cpp_CXXFLAGS           += -O2 -fomit-frame-pointer
+  VMMAll/target-x86/IEMAllCImpl-x86.cpp_CXXFLAGS                   += -O2 -fomit-frame-pointer
+  VMMAll/target-x86/IEMAllCImplSvmInstr-x86.cpp_CXXFLAGS           += -O2 -fomit-frame-pointer
+  VMMAll/target-x86/IEMAllCImplVmxInstr-x86.cpp_CXXFLAGS           += -O2 -fomit-frame-pointer
   VMMAll/IEMAllIntprTables1.cpp_CXXFLAGS            += -O2 -fomit-frame-pointer
   VMMAll/IEMAllIntprTables2.cpp_CXXFLAGS            += -O2 -fomit-frame-pointer
@@ -1229 +1229 @@
 IEMInternal.o IEMInternal.obj: IEMAll.o
 
-IEMAllCImplStrInstr.cpp.o IEMAllCImplStrInstr.cpp.obj: IEMAllCImpl.o
+IEMAllCImplStrInstr-x86.cpp.o IEMAllCImplStrInstr-x86.cpp.obj: IEMAllCImpl-x86.o
 
 # Alias the NEM template to the objects where it is used: