VirtualBox

Changeset 100733 in vbox for trunk


Ignore:
Timestamp:
Jul 28, 2023 10:51:16 PM (17 months ago)
Author:
vboxsync
Message:

VMM/IEM,ValKit: Shortened the IEMAllInstruction* file names to IEMAllInst*. This makes it easier to see the distinguishing bits of the name in the narrow buffer list widget here (this has been driving me nuts for months). Sorry for any conflicts this causes. bugref:10369

Location:
trunk/src/VBox
Files:
7 edited
12 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/.scm-settings

    r98917 r100733  
    2727
    2828
    29 /VMMAll/IEMAllInstructionsPython.py: --license-ose-dual
     29/VMMAll/IEMAllInstPython.py: --license-ose-dual
    3030
    3131--filter-out-files /testcase/dev.tar.gz
    … …  
    4141/VMMAll/PGMAllGst.h: --no-fix-header-guards
    4242/VMMAll/PGMAllShw.h: --no-fix-header-guards
    43 /VMMAll/IEMAllInstructionsCommonBodyMacros.h: --no-fix-header-guards
     43/VMMAll/IEMAllInstCommonBodyMacros.h: --no-fix-header-guards
    4444/testcase/tstVMStruct.h: --no-fix-header-guards
    4545/testcase/tstIEMAImplData.h: --no-fix-header-guards

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

    r100732 r100733  
    192192        VMMAll/HMVMXAll.cpp \
    193193        VMMAll/IEMAll.cpp \
    194         VMMAll/IEMAllInstructionsInterpretOnly.cpp \
     194        VMMAll/IEMAllInstInterpretOnly.cpp \
    195195        VMMAll/IEMAllAImplC.cpp \
    196196        VMMAll/IEMAllCImpl.cpp \
    … …  
    308308
    309309if "$(USERNAME)" == "bird" && "$(KBUILD_TARGET)" == "win"
    310  VBoxVMM_VMMAll/IEMAll.cpp_CXXFLAGS                         = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    311  VBoxVMM_VMMAll/IEMAllInstructionsInterpretOnly.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    312  VBoxVMM_VMMAll/IEMAllAImplC.cpp_CXXFLAGS                   = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    313  VBoxVMM_VMMAll/PGMAll.cpp_CXXFLAGS                         = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    314  VBoxVMM_VMMAll/PDMAllCritSect.cpp_CXXFLAGS                 = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    315  VBoxVMM_CLEAN += $(addprefix $(VBoxVMM_0_OUTDIR)/VMMAll/, IEMAll.cod IEMAllAImplC.cod IEMAllInstructionsInterpretOnly.cod PGMAll.cod PDMAllCritSect.cod)
     310 VBoxVMM_VMMAll/IEMAll.cpp_CXXFLAGS                  = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     311 VBoxVMM_VMMAll/IEMAllInstInterpretOnly.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     312 VBoxVMM_VMMAll/IEMAllAImplC.cpp_CXXFLAGS            = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     313 VBoxVMM_VMMAll/PGMAll.cpp_CXXFLAGS                  = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     314 VBoxVMM_VMMAll/PDMAllCritSect.cpp_CXXFLAGS          = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     315 VBoxVMM_CLEAN += $(addprefix $(VBoxVMM_0_OUTDIR)/VMMAll/, IEMAll.cod IEMAllAImplC.cod IEMAllInstInterpretOnly.cod PGMAll.cod PDMAllCritSect.cod)
    316316endif
    317317
    … …  
    492492$(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMInstructionStatisticsTmpl.h.ts \
    493493+| $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMInstructionStatisticsTmpl.h: \
    494                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsCommon.cpp.h \
    495                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsOneByte.cpp.h \
    496                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsTwoByte0f.cpp.h \
    497                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsThree0f38.cpp.h \
    498                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsThree0f3a.cpp.h \
    499                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsVexMap1.cpp.h \
    500                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsVexMap2.cpp.h \
    501                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsVexMap3.cpp.h \
    502                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructions3DNow.cpp.h
    503         $(QUIET)$(call MSG_GENERATE,VBoxVMM,$@,VMMAll/IEMAllInstructions*.cpp.h)
     494                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstCommon.cpp.h \
     495                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstOneByte.cpp.h \
     496                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstTwoByte0f.cpp.h \
     497                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstThree0f38.cpp.h \
     498                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstThree0f3a.cpp.h \
     499                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstVexMap1.cpp.h \
     500                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstVexMap2.cpp.h \
     501                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstVexMap3.cpp.h \
     502                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInst3DNow.cpp.h
     503        $(QUIET)$(call MSG_GENERATE,VBoxVMM,$@,VMMAll/IEMAllInst*.cpp.h)
    504504        $(QUIET)$(RM) -f -- "[email protected]" "[email protected]" "[email protected]"
    505505        $(QUIET)$(MKDIR) -p -- "$(dir $@)"
    … …  
    571571 +| $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMThreadedInstructions.cpp.h: \
    572572                $(PATH_SUB_CURRENT)/VMMAll/IEMAllThrdPython.py \
    573                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsPython.py \
    574                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsCommon.cpp.h \
    575                 $(if-expr !defined(IEM_WITHOUT_3DNOW)      ,$(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructions3DNow.cpp.h,) \
    576                 $(if-expr !defined(IEM_WITHOUT_THREE_0F_38),$(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsThree0f38.cpp.h,) \
    577                 $(if-expr !defined(IEM_WITHOUT_THREE_0F_3A),$(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsThree0f3a.cpp.h,) \
    578                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsTwoByte0f.cpp.h \
     573                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstPython.py \
     574                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstCommon.cpp.h \
     575                $(if-expr !defined(IEM_WITHOUT_3DNOW)      ,$(PATH_SUB_CURRENT)/VMMAll/IEMAllInst3DNow.cpp.h,) \
     576                $(if-expr !defined(IEM_WITHOUT_THREE_0F_38),$(PATH_SUB_CURRENT)/VMMAll/IEMAllInstThree0f38.cpp.h,) \
     577                $(if-expr !defined(IEM_WITHOUT_THREE_0F_3A),$(PATH_SUB_CURRENT)/VMMAll/IEMAllInstThree0f3a.cpp.h,) \
     578                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstTwoByte0f.cpp.h \
    579579                $(if-expr !defined(IEM_WITHOUT_VEX), \
    580                         $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsVexMap1.cpp.h \
    581                         $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsVexMap2.cpp.h \
    582                         $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsVexMap3.cpp.h,) \
    583                 $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstructionsOneByte.cpp.h
    584         $(QUIET)$(call MSG_GENERATE,VBoxVMM,$@,VMMAll/IEMAllInstructions*.cpp.h)
     580                        $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstVexMap1.cpp.h \
     581                        $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstVexMap2.cpp.h \
     582                        $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstVexMap3.cpp.h,) \
     583                $(PATH_SUB_CURRENT)/VMMAll/IEMAllInstOneByte.cpp.h
     584        $(QUIET)$(call MSG_GENERATE,VBoxVMM,$@,VMMAll/IEMAllInst*.cpp.h)
    585585        $(QUIET)$(RM) -f -- \
    586586                "$(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMThreadedInstructions.cpp.h.ts" \
    … …  
    772772        VMMAll/HMVMXAll.cpp \
    773773        VMMAll/IEMAll.cpp \
    774         VMMAll/IEMAllInstructionsInterpretOnly.cpp \
     774        VMMAll/IEMAllInstInterpretOnly.cpp \
    775775        $(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/IEMAllAImpl.asm,) \
    776776        VMMAll/IEMAllAImplC.cpp \
    … …  
    984984  VMMAll/IEMAllCImplSvmInstr.cpp_CXXFLAGS           += -noover -O2xy
    985985  VMMAll/IEMAllCImplVmxInstr.cpp_CXXFLAGS           += -noover -O2xy
    986   VMMAll/IEMAllInstructionsInterpretOnly.cpp_CXXFLAGS += -noover -O2xy
     986  VMMAll/IEMAllInstInterpretOnly.cpp_CXXFLAGS      += -noover -O2xy
    987987 else
    988988  # Omitting the frame pointer results in larger code, but it might be worth it. (esp addressing vs ebp?)
    … …  
    991991  VMMAll/IEMAllCImplSvmInstr.cpp_CXXFLAGS           += -O2 -fomit-frame-pointer
    992992  VMMAll/IEMAllCImplVmxInstr.cpp_CXXFLAGS           += -O2 -fomit-frame-pointer
    993   VMMAll/IEMAllInstructionsInterpretOnly.cpp_CXXFLAGS += -O2 -fomit-frame-pointer
     993  VMMAll/IEMAllInstInterpretOnly.cpp_CXXFLAGS      += -O2 -fomit-frame-pointer
    994994 endif
    995995endif # bird wants good stacks (aeichner as well)
    … …  
    10221022endef # def_vbox_vmm_py_check
    10231023
    1024 $(foreach py, $(addprefix $(PATH_SUB_CURRENT)/VMMAll/, IEMAllInstructionsPython.py IEMAllThrdPython.py ) \
     1024$(foreach py, $(addprefix $(PATH_SUB_CURRENT)/VMMAll/, IEMAllInstPython.py IEMAllThrdPython.py ) \
    10251025, $(eval $(def_vbox_vmm_py_check)))
    10261026
    … …  
    10431043
    10441044# Alias the IEM templates to the object in which they are instantiated.
    1045 IEMAllInstructions.cpp.o IEMAllInstructions.cpp.obj \
    1046 IEMAllInstructionsCommon.cpp.o IEMAllInstructionsCommon.cpp.obj \
    1047 IEMAllInstructionsOneByte.cpp.o IEMAllInstructionsOneByte.cpp.obj \
    1048 IEMAllInstructionsTwoByte0f.cpp.o IEMAllInstructionsTwoByte0f.cpp.obj \
    1049 IEMAllInstructionsThree0f38.cpp.o IEMAllInstructionsThree0f38.cpp.obj \
    1050 IEMAllInstructionsThree0f3a.cpp.o IEMAllInstructionsThree0f3a.cpp.obj \
    1051 IEMAllInstructionsVexMap1.cpp.o IEMAllInstructionsVexMap1.cpp.obj \
    1052 IEMAllInstructionsVexMap2.cpp.o IEMAllInstructionsVexMap2.cpp.obj \
    1053 IEMAllInstructionsVexMap3.cpp.o IEMAllInstructionsVexMap3.cpp.obj \
    1054 IEMAllInstructions3DNow.cpp.o IEMAllInstructions3DNow.cpp.obj: IEMAllInstructionsInterpretOnly.o
     1045IEMAllInst.cpp.o IEMAllInst.cpp.obj \
     1046IEMAllInstCommon.cpp.o IEMAllInstCommon.cpp.obj \
     1047IEMAllInstOneByte.cpp.o IEMAllInstOneByte.cpp.obj \
     1048IEMAllInstTwoByte0f.cpp.o IEMAllInstTwoByte0f.cpp.obj \
     1049IEMAllInstThree0f38.cpp.o IEMAllInstThree0f38.cpp.obj \
     1050IEMAllInstThree0f3a.cpp.o IEMAllInstThree0f3a.cpp.obj \
     1051IEMAllInstVexMap1.cpp.o IEMAllInstVexMap1.cpp.obj \
     1052IEMAllInstVexMap2.cpp.o IEMAllInstVexMap2.cpp.obj \
     1053IEMAllInstVexMap3.cpp.o IEMAllInstVexMap3.cpp.obj \
     1054IEMAllInst3DNow.cpp.o IEMAllInst3DNow.cpp.obj: IEMAllInstInterpretOnly.o
    10551055
    10561056IEMInternal.o IEMInternal.obj: IEMAll.o

  • trunk/src/VBox/VMM/VMMAll/IEMAllInstCommonBodyMacros.h

    r100732 r100733  
    44 *
    55 * This is placed in its own file without anything else in it, so that it can
    6  * be digested by SimplerParser in IEMAllInstructionsPython.py prior processing
     6 * be digested by SimplerParser in IEMAllInstPython.py prior processing
    77 * any of the other IEMAllInstruction*.cpp.h files.  For instance
    8  * IEMAllInstructionsCommon.cpp.h wouldn't do as it defines several invalid
     8 * IEMAllInstCommon.cpp.h wouldn't do as it defines several invalid
    99 * instructions and such that could confuse the parser result.
    1010 */

  • trunk/src/VBox/VMM/VMMAll/IEMAllInstInterpretOnly.cpp

    r100732 r100733  
    8484 * Include common bits.
    8585 */
    86 #include "IEMAllInstructionsCommonBodyMacros.h"
    87 #include "IEMAllInstructionsCommon.cpp.h"
     86#include "IEMAllInstCommonBodyMacros.h"
     87#include "IEMAllInstCommon.cpp.h"
    8888
    8989
    … …  
    9292 */
    9393#ifdef IEM_WITH_3DNOW
    94 # include "IEMAllInstructions3DNow.cpp.h"
     94# include "IEMAllInst3DNow.cpp.h"
    9595#endif
    9696
    9797#ifdef IEM_WITH_THREE_0F_38
    98 # include "IEMAllInstructionsThree0f38.cpp.h"
     98# include "IEMAllInstThree0f38.cpp.h"
    9999#endif
    100100
    101101#ifdef IEM_WITH_THREE_0F_3A
    102 # include "IEMAllInstructionsThree0f3a.cpp.h"
     102# include "IEMAllInstThree0f3a.cpp.h"
    103103#endif
    104104
    105 #include "IEMAllInstructionsTwoByte0f.cpp.h"
     105#include "IEMAllInstTwoByte0f.cpp.h"
    106106
    107107#ifdef IEM_WITH_VEX
    108 # include "IEMAllInstructionsVexMap1.cpp.h"
    109 # include "IEMAllInstructionsVexMap2.cpp.h"
    110 # include "IEMAllInstructionsVexMap3.cpp.h"
     108# include "IEMAllInstVexMap1.cpp.h"
     109# include "IEMAllInstVexMap2.cpp.h"
     110# include "IEMAllInstVexMap3.cpp.h"
    111111#endif
    112112
    113 #include "IEMAllInstructionsOneByte.cpp.h"
     113#include "IEMAllInstOneByte.cpp.h"
    114114

  • trunk/src/VBox/VMM/VMMAll/IEMAllInstPython.py

    r100732 r100733  
    52595259        return self.printErrors();
    52605260
    5261 ## The parsed content of IEMAllInstructionsCommonBodyMacros.h.
     5261## The parsed content of IEMAllInstCommonBodyMacros.h.
    52625262g_oParsedCommonBodyMacros = None # type: SimpleParser
    52635263
    … …  
    52815281
    52825282    #
    5283     # On the first call, we parse IEMAllInstructionsCommonBodyMacros.h so we
     5283    # On the first call, we parse IEMAllInstCommonBodyMacros.h so we
    52845284    # can use the macros from it when processing the other files.
    52855285    #
    … …  
    52875287    if g_oParsedCommonBodyMacros is None:
    52885288        # Locate the file.
    5289         sCommonBodyMacros = os.path.join(os.path.split(sSrcFile)[0], 'IEMAllInstructionsCommonBodyMacros.h');
     5289        sCommonBodyMacros = os.path.join(os.path.split(sSrcFile)[0], 'IEMAllInstCommonBodyMacros.h');
    52905290        if not os.path.isfile(sCommonBodyMacros):
    5291             sCommonBodyMacros = os.path.join(os.path.split(__file__)[0], 'IEMAllInstructionsCommonBodyMacros.h');
     5291            sCommonBodyMacros = os.path.join(os.path.split(__file__)[0], 'IEMAllInstCommonBodyMacros.h');
    52925292
    52935293        # Read it.
    … …  
    53685368## List of all main instruction files and their default maps.
    53695369g_aasAllInstrFilesAndDefaultMap = (
    5370     ( 'IEMAllInstructionsCommon.cpp.h',    'one',        ),
    5371     ( 'IEMAllInstructionsOneByte.cpp.h',   'one',        ),
    5372     ( 'IEMAllInstructionsTwoByte0f.cpp.h', 'two0f',      ),
    5373     ( 'IEMAllInstructionsThree0f38.cpp.h', 'three0f38',  ),
    5374     ( 'IEMAllInstructionsThree0f3a.cpp.h', 'three0f3a',  ),
    5375     ( 'IEMAllInstructionsVexMap1.cpp.h',   'vexmap1',    ),
    5376     ( 'IEMAllInstructionsVexMap2.cpp.h',   'vexmap2',    ),
    5377     ( 'IEMAllInstructionsVexMap3.cpp.h',   'vexmap3',    ),
    5378     ( 'IEMAllInstructions3DNow.cpp.h',     '3dnow',      ),
     5370    ( 'IEMAllInstCommon.cpp.h',    'one',        ),
     5371    ( 'IEMAllInstOneByte.cpp.h',   'one',        ),
     5372    ( 'IEMAllInstTwoByte0f.cpp.h', 'two0f',      ),
     5373    ( 'IEMAllInstThree0f38.cpp.h', 'three0f38',  ),
     5374    ( 'IEMAllInstThree0f3a.cpp.h', 'three0f3a',  ),
     5375    ( 'IEMAllInstVexMap1.cpp.h',   'vexmap1',    ),
     5376    ( 'IEMAllInstVexMap2.cpp.h',   'vexmap2',    ),
     5377    ( 'IEMAllInstVexMap3.cpp.h',   'vexmap3',    ),
     5378    ( 'IEMAllInst3DNow.cpp.h',     '3dnow',      ),
    53795379);
    53805380

  • trunk/src/VBox/VMM/VMMAll/IEMAllInstThree0f38.cpp.h

    r100732 r100733  
    33 * IEM - Instruction Decoding and Emulation.
    44 *
    5  * @remarks IEMAllInstructionsVexMap2.cpp.h is a VEX mirror of this file.
     5 * @remarks IEMAllInstVexMap2.cpp.h is a VEX mirror of this file.
    66 *          Any update here is likely needed in that file too.
    77 */

  • trunk/src/VBox/VMM/VMMAll/IEMAllInstThree0f3a.cpp.h

    r100732 r100733  
    33 * IEM - Instruction Decoding and Emulation, 0x0f 0x3a map.
    44 *
    5  * @remarks IEMAllInstructionsVexMap3.cpp.h is a VEX mirror of this file.
     5 * @remarks IEMAllInstVexMap3.cpp.h is a VEX mirror of this file.
    66 *          Any update here is likely needed in that file too.
    77 */

  • trunk/src/VBox/VMM/VMMAll/IEMAllInstTwoByte0f.cpp.h

    r100732 r100733  
    33 * IEM - Instruction Decoding and Emulation.
    44 *
    5  * @remarks IEMAllInstructionsVexMap1.cpp.h is a VEX mirror of this file.
     5 * @remarks IEMAllInstVexMap1.cpp.h is a VEX mirror of this file.
    66 *          Any update here is likely needed in that file too.
    77 */
    … …  
    1223912239        IEM_MC_FETCH_EFLAGS(EFlags);
    1224012240
    12241 #ifdef RT_ARCH_AMD64 /* some code duplication here because IEMAllInstructionsPython.py cannot parse if/else/#if spaghetti. */
     12241#ifdef RT_ARCH_AMD64 /* some code duplication here because IEMAllInstPython.py cannot parse if/else/#if spaghetti. */
    1224212242        if (IEM_GET_HOST_CPU_FEATURES(pVCpu)->fMovCmpXchg16b)
    1224312243        {

  • trunk/src/VBox/VMM/VMMAll/IEMAllInstVexMap1.cpp.h

    r100732 r100733  
    33 * IEM - Instruction Decoding and Emulation.
    44 *
    5  * @remarks IEMAllInstructionsTwoByte0f.cpp.h is a legacy mirror of this file.
     5 * @remarks IEMAllInstTwoByte0f.cpp.h is a legacy mirror of this file.
    66 *          Any update here is likely needed in that file too.
    77 */

  • trunk/src/VBox/VMM/VMMAll/IEMAllInstVexMap2.cpp.h

    r100732 r100733  
    33 * IEM - Instruction Decoding and Emulation.
    44 *
    5  * @remarks IEMAllInstructionsThree0f38.cpp.h is a VEX mirror of this file.
     5 * @remarks IEMAllInstThree0f38.cpp.h is a VEX mirror of this file.
    66 *          Any update here is likely needed in that file too.
    77 */

  • trunk/src/VBox/VMM/VMMAll/IEMAllInstVexMap3.cpp.h

    r100732 r100733  
    33 * IEM - Instruction Decoding and Emulation, 0x0f 0x3a map.
    44 *
    5  * @remarks IEMAllInstructionsThree0f3a.cpp.h is a VEX mirror of this file.
     5 * @remarks IEMAllInstThree0f3a.cpp.h is a VEX mirror of this file.
    66 *          Any update here is likely needed in that file too.
    77 */

  • trunk/src/VBox/VMM/VMMAll/IEMAllThrdPython.py

    r100732 r100733  
    55
    66"""
    7 Annotates and generates threaded functions from IEMAllInstructions*.cpp.h.
     7Annotates and generates threaded functions from IEMAllInst*.cpp.h.
    88"""
    99
    … …  
    4242import argparse;
    4343
    44 import IEMAllInstructionsPython as iai;
     44import IEMAllInstPython as iai;
    4545
    4646
    … …  
    945945
    946946    def __init__(self, oMcBlock):
    947         self.oMcBlock       = oMcBlock      # type: IEMAllInstructionsPython.McBlock
     947        self.oMcBlock       = oMcBlock      # type: IEMAllInstPython.McBlock
    948948        ## Variations for this block. There is at least one.
    949949        self.aoVariations   = []            # type: list(ThreadedFunctionVariation)
    … …  
    11891189        self.aoThreadedFuncs = []       # type: list(ThreadedFunction)
    11901190        self.oOptions        = None     # type: argparse.Namespace
    1191         self.aoParsers       = []       # type: list(IEMAllInstructionsPython.SimpleParser)
     1191        self.aoParsers       = []       # type: list(IEMAllInstPython.SimpleParser)
    11921192
    11931193    #
    … …  
    15661566        iThreadedFunction = 0;
    15671567        oThreadedFunction = self.getThreadedFunctionByIndex(0);
    1568         for oParser in self.aoParsers: # type: IEMAllInstructionsPython.SimpleParser
     1568        for oParser in self.aoParsers: # type: IEMAllInstPython.SimpleParser
    15691569            oOut.write("\n\n/* ****** BEGIN %s ******* */\n" % (oParser.sSrcFile,));
    15701570
    … …  
    16411641        oParser.add_argument('asInFiles',       metavar = 'input.cpp.h',        nargs = '*',
    16421642                             default = [os.path.join(sScriptDir, asFM[0]) for asFM in iai.g_aasAllInstrFilesAndDefaultMap],
    1643                              help = "Selection of VMMAll/IEMAllInstructions*.cpp.h files to use as input.");
     1643                             help = "Selection of VMMAll/IEMAllInst*.cpp.h files to use as input.");
    16441644        oParser.add_argument('--out-funcs-hdr', metavar = 'file-funcs.h',       dest = 'sOutFileFuncsHdr', action = 'store',
    16451645                             default = '-', help = 'The output header file for the functions.');
    … …  
    16501650        oParser.add_argument('--help', '-h', '-?', action = 'help', help = 'Display help and exit.');
    16511651        oParser.add_argument('--version', '-V', action = 'version',
    1652                              version = 'r%s (IEMAllThreadedPython.py), r%s (IEMAllInstructionsPython.py)'
     1652                             version = 'r%s (IEMAllThreadedPython.py), r%s (IEMAllInstPython.py)'
    16531653                                     % (__version__.split()[1], iai.__version__.split()[1],),
    16541654                             help = 'Displays the version/revision of the script and exit.');

  • trunk/src/VBox/VMM/VMMAll/IEMAllThrdRecompiler.cpp

    r100732 r100733  
    610610
    611611/*
    612  * Include the "annotated" IEMAllInstructions*.cpp.h files.
     612 * Include the "annotated" IEMAllInst*.cpp.h files.
    613613 */
    614614#include "IEMThreadedInstructions.cpp.h"

  • trunk/src/VBox/VMM/testcase/tstIEMCheckMc.cpp

    r100591 r100733  
    10231023/** @}  */
    10241024
    1025 #include "../VMMAll/IEMAllInstructionsInterpretOnly.cpp"
     1025#include "../VMMAll/IEMAllInstInterpretOnly.cpp"
    10261026
    10271027

  • trunk/src/VBox/ValidationKit/bootsectors/Makefile.kmk

    r98418 r100733  
    399399 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3-cpu-generated-1-data.c16: \
    400400                $(PATH_SUB_CURRENT)/bs3-cpu-generated-1-data.py \
    401                 $(PATH_SUB_CURRENT)/../../VMM/VMMAll/IEMAllInstructionsPython.py \
    402                 $(PATH_SUB_CURRENT)/../../VMM/VMMAll/IEMAllInstructions*.cpp.h \
     401                $(PATH_SUB_CURRENT)/../../VMM/VMMAll/IEMAllInstPython.py \
     402                $(PATH_SUB_CURRENT)/../../VMM/VMMAll/IEMAllInst*.cpp.h \
    403403                | $$(dir $$@)
    404404        $(REDIRECT) -0 /dev/null -- $(VBOX_BLD_PYTHON) $< $@

  • trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-data.py

    r98842 r100733  
    5353sys.path.append(g_ksVmmAllDir);
    5454
    55 import IEMAllInstructionsPython as iai; # pylint: disable=import-error
     55import IEMAllInstPython as iai; # pylint: disable=import-error
    5656
    5757
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette