Bring Mkfiles up to date with [1929].

svn path=/trunk/yasm/; revision=1930

diff --git a/Makefile.am b/Makefile.am
index 31af44d82004e580c41d0b085ddcd6a60c8cfea7..d669d003845452ecbf97010b6477d89f56cac580 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,8 +75,10 @@ EXTRA_DIST += Mkfiles/vc/libyasm/libyasm.vcproj
 EXTRA_DIST += Mkfiles/vc/modules/modules.vcproj
 EXTRA_DIST += Mkfiles/vc/re2c/re2c.vcproj
 EXTRA_DIST += Mkfiles/vc/re2c/run.bat
-EXTRA_DIST += Mkfiles/vc/gap/gap.vcproj
-EXTRA_DIST += Mkfiles/vc/gap/run.bat
+EXTRA_DIST += Mkfiles/vc/genperf/genperf.vcproj
+EXTRA_DIST += Mkfiles/vc/genperf/run.bat
+EXTRA_DIST += Mkfiles/vc/x86geninsn/x86geninsn.vcproj
+EXTRA_DIST += Mkfiles/vc/x86geninsn/run.bat
 EXTRA_DIST += Mkfiles/vc8/crt_secure_no_deprecate.vsprops
 EXTRA_DIST += Mkfiles/vc8/yasm.sln
 EXTRA_DIST += Mkfiles/vc8/yasm.vcproj
@@ -96,8 +98,10 @@ EXTRA_DIST += Mkfiles/vc8/libyasm/libyasm.vcproj
 EXTRA_DIST += Mkfiles/vc8/modules/modules.vcproj
 EXTRA_DIST += Mkfiles/vc8/re2c/re2c.vcproj
 EXTRA_DIST += Mkfiles/vc8/re2c/run.bat
-EXTRA_DIST += Mkfiles/vc8/gap/gap.vcproj
-EXTRA_DIST += Mkfiles/vc8/gap/run.bat
+EXTRA_DIST += Mkfiles/vc8/genperf/genperf.vcproj
+EXTRA_DIST += Mkfiles/vc8/genperf/run.bat
+EXTRA_DIST += Mkfiles/vc8/x86geninsn/x86geninsn.vcproj
+EXTRA_DIST += Mkfiles/vc8/x86geninsn/run.bat
 
 # Until this gets fixed in automake
 DISTCLEANFILES = libyasm/stamp-h libyasm/stamp-h[0-9]*

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index aac7dc8c721bd89eccb15190ac3d4628249975ee..619fed4d8d23c01cd9c6100594b60f7b3bdc5cac 100644 (file)
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -50,7 +50,9 @@ MODULES_ARCH_X86_OBJS= \
  modules/arch/x86/x86arch.o \
  modules/arch/x86/x86bc.o \
  modules/arch/x86/x86expr.o \
- modules/arch/x86/x86id.o
+ modules/arch/x86/x86id.o \
+ x86cpu.o \
+ x86regtmod.o
 YASM_MODULES=arch_x86
 
 #MODULES_ARCH_LC3B_OBJS= \
@@ -170,10 +172,25 @@ genmodule: libyasm/genmodule.c
 module.c: libyasm/module.in genmodule
        ./genmodule libyasm/module.in Mkfiles/Makefile.dj
 
-x86parse.c: modules/arch/x86/x86parse.gap gap
-       ./gap modules/arch/x86/x86parse.gap $@
+x86geninsn: modules/arch/x86/x86geninsn.c
+       $(BUILDCC) -o $@ $<
+
+x86insn_nasm.gperf x86insn_gas.gperf: modules/arch/x86/x86insn.in x86geninsn
+       ./x86geninsn modules/arch/x86/x86insn.in x86insn_nasm.gperf x86insn_gas.gperf
+
+x86insn_nasm.c: x86insn_nasm.gperf genperf
+       ./genperf x86insn_nasm.gperf > $@
+
+x86insn_gas.c: x86insn_gas.gperf genperf
+       ./genperf x86insn_gas.gperf > $@
+
+x86cpu.c: modules/arch/x86/x86cpu.gperf genperf
+       ./genperf modules/arch/x86/x86cpu.gperf > $@
+
+x86regtmod.c: modules/arch/x86/x86regtmod.gperf genperf
+       ./genperf modules/arch/x86/x86regtmod.gperf > $@
 
-modules/arch/x86/x86id.c: x86parse.c
+modules/arch/x86/x86id.c: x86insn_nasm.c x86insn_gas.c
 
 lc3bid.c: modules/arch/lc3b/lc3bid.re re2c
        ./re2c -s -o $@ modules/arch/lc3b/lc3bid.re
@@ -198,15 +215,15 @@ RE2C_SRCS= \
 re2c: $(RE2C_SRCS)
        $(BUILDCC) -I. -o re2c $(RE2C_SRCS)
 
-GAP_SRCS= \
-       tools/gap/gap.c \
-       tools/gap/perfect.c \
+GENPERF_SRCS= \
+       tools/genperf/genperf.c \
+       tools/genperf/perfect.c \
        libyasm/phash.c \
        libyasm/xmalloc.c \
        libyasm/xstrdup.c
 
-gap: $(GAP_SRCS)
-       $(BUILDCC) -I. -o gap $(GAP_SRCS)
+genperf: $(GENPERF_SRCS)
+       $(BUILDCC) -I. -o genperf $(GENPERF_SRCS)
 
 yasm: $(YASM_OBJS)
        $(CC) -o yasm $(YASM_OBJS)

diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 29e2a197108f0234d3a9e886e544cfe64770e8b5..3859451dd7020898221ef4dd9bdeed0f2c923932 100644 (file)
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -53,7 +53,9 @@ MODULES_ARCH_X86_OBJS= \
  modules/arch/x86/x86arch.o \
  modules/arch/x86/x86bc.o \
  modules/arch/x86/x86expr.o \
- modules/arch/x86/x86id.o
+ modules/arch/x86/x86id.o \
+ x86cpu.o \
+ x86regtmod.o
 YASM_MODULES=arch_x86
 
 #MODULES_ARCH_LC3B_OBJS= \
@@ -162,7 +164,7 @@ nasm-macros.c: modules/preprocs/nasm/standard.mac version.mac genmacro
 modules/preprocs/nasm/nasm-pp.c: nasm-macros.c
 
 genversion: modules/preprocs/nasm/genversion.c
-       $(BUILDCC) -IMkfiles -o $@ $<
+       $(BUILDCC) -IMkfiles -I. -o $@ $<
 
 version.mac: genversion
        ./genversion $@
@@ -173,10 +175,25 @@ genmodule: libyasm/genmodule.c
 module.c: libyasm/module.in genmodule
        ./genmodule libyasm/module.in Mkfiles/Makefile.flat
 
-x86parse.c: modules/arch/x86/x86parse.gap gap
-       ./gap modules/arch/x86/x86parse.gap $@
+x86geninsn: modules/arch/x86/x86geninsn.c
+       $(BUILDCC) -o $@ $<
+
+x86insn_nasm.gperf x86insn_gas.gperf: modules/arch/x86/x86insn.in x86geninsn
+       ./x86geninsn modules/arch/x86/x86insn.in x86insn_nasm.gperf x86insn_gas.gperf
+
+x86insn_nasm.c: x86insn_nasm.gperf genperf
+       ./genperf x86insn_nasm.gperf > $@
+
+x86insn_gas.c: x86insn_gas.gperf genperf
+       ./genperf x86insn_gas.gperf > $@
+
+x86cpu.c: modules/arch/x86/x86cpu.gperf genperf
+       ./genperf modules/arch/x86/x86cpu.gperf > $@
+
+x86regtmod.c: modules/arch/x86/x86regtmod.gperf genperf
+       ./genperf modules/arch/x86/x86regtmod.gperf > $@
 
-modules/arch/x86/x86id.c: x86parse.c
+modules/arch/x86/x86id.c: x86insn_nasm.c x86insn_gas.c
 
 lc3bid.c: modules/arch/lc3b/lc3bid.re re2c
        ./re2c -s -o $@ modules/arch/lc3b/lc3bid.re
@@ -201,15 +218,15 @@ RE2C_SRCS= \
 re2c: $(RE2C_SRCS)
        $(BUILDCC) -I. -o re2c $(RE2C_SRCS)
 
-GAP_SRCS= \
-       tools/gap/gap.c \
-       tools/gap/perfect.c \
+GENPERF_SRCS= \
+       tools/genperf/genperf.c \
+       tools/genperf/perfect.c \
        libyasm/phash.c \
        libyasm/xmalloc.c \
        libyasm/xstrdup.c
 
-gap: $(GAP_SRCS)
-       $(BUILDCC) -I. -o gap $(GAP_SRCS)
+genperf: $(GENPERF_SRCS)
+       $(BUILDCC) -I. -o genperf $(GENPERF_SRCS)
 
 yasm: $(YASM_OBJS)
        $(CC) -o yasm $(YASM_OBJS)

diff --git a/Mkfiles/vc/gap/run.bat b/Mkfiles/vc/gap/run.bat
deleted file mode 100644 (file)
index d506080..0000000
--- a/Mkfiles/vc/gap/run.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-cd ..\..\..\\r
-%1 modules\arch\x86\x86parse.gap x86parse.c\r

diff --git a/Mkfiles/vc/gap/gap.vcproj b/Mkfiles/vc/genperf/genperf.vcproj
similarity index 81%
rename from Mkfiles/vc/gap/gap.vcproj
rename to Mkfiles/vc/genperf/genperf.vcproj
index ee7c8770e67f38cfd70ff92662a82ad087857fda..a0d9f4d4e741d590828f579fc9eaf1619eba245f 100644 (file)
--- a/Mkfiles/vc/gap/gap.vcproj
+++ b/Mkfiles/vc/genperf/genperf.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="7.10"\r
-       Name="gap"\r
-       ProjectGUID="{5758BF4E-ABC4-11DA-B012-B622A1EF5492}"\r
-       RootNamespace="gap"\r
+       Name="genperf"\r
+       ProjectGUID="{C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}"\r
+       RootNamespace="genperf"\r
        Keyword="Win32Proj">\r
        <Platforms>\r
                <Platform\r
@@ -33,10 +33,10 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/gap.exe"\r
+                               OutputFile="$(OutDir)/genperf.exe"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="$(OutDir)/gap.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)/genperf.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
@@ -80,7 +80,7 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/gap.exe"\r
+                               OutputFile="$(OutDir)/genperf.exe"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="TRUE"\r
                                SubSystem="1"\r
@@ -116,12 +116,12 @@
                <Filter\r
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{7D996CB2-ABC4-11DA-B012-B622A1EF5492}">\r
+                       UniqueIdentifier="{1062695D-1C50-4068-8313-73A409885BC1}">\r
                        <File\r
-                               RelativePath="..\..\..\tools\gap\gap.c">\r
+                               RelativePath="..\..\..\tools\genperf\genperf.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\tools\gap\perfect.c">\r
+                               RelativePath="..\..\..\tools\genperf\perfect.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\phash.c">\r
@@ -136,18 +136,18 @@
                <Filter\r
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{85DD7A94-ABC4-11DA-B012-B622A1EF5492}">\r
+                       UniqueIdentifier="{3C1E9AA8-6338-4CED-99F1-BEBA80607BD5}">\r
                        <File\r
-                               RelativePath="..\..\..\tools\gap\perfect.h">\r
+                               RelativePath="..\..\..\tools\genperf\perfect.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\tools\gap\standard.h">\r
+                               RelativePath="..\..\..\tools\genperf\standard.h">\r
                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
-                       UniqueIdentifier="{8EB9B268-ABC4-11DA-B012-B622A1EF5492}">\r
+                       UniqueIdentifier="{005ED203-AC60-4E97-A0A2-8239D00786FE}">\r
                </Filter>\r
                <File\r
                        RelativePath=".\run.bat">\r

diff --git a/Mkfiles/vc/genperf/run.bat b/Mkfiles/vc/genperf/run.bat
new file mode 100644 (file)
index 0000000..1cf44bf
--- /dev/null
+++ b/Mkfiles/vc/genperf/run.bat
@@ -0,0 +1,5 @@
+cd ..\..\..\\r
+%1 x86insn_nasm.gperf > x86insn_nasm.c\r
+%1 x86insn_gas.gperf > x86insn_gas.c\r
+%1 modules\arch\x86\x86cpu.gperf > x86cpu.c\r
+%1 modules\arch\x86\x86regtmod.gperf > x86regtmod.c\r

diff --git a/Mkfiles/vc/x86geninsn/run.bat b/Mkfiles/vc/x86geninsn/run.bat
new file mode 100644 (file)
index 0000000..ca29214
--- /dev/null
+++ b/Mkfiles/vc/x86geninsn/run.bat
@@ -0,0 +1,2 @@
+cd ..\..\..\r
+%1 modules\arch\x86\x86insn.in x86insn_nasm.gperf x86insn_gas.gperf\r

diff --git a/Mkfiles/vc/x86geninsn/x86geninsn.vcproj b/Mkfiles/vc/x86geninsn/x86geninsn.vcproj
new file mode 100644 (file)
index 0000000..b69f6f8
--- /dev/null
+++ b/Mkfiles/vc/x86geninsn/x86geninsn.vcproj
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="7.10"\r
+       Name="x86geninsn"\r
+       ProjectGUID="{22294DC7-C6DF-4C34-A178-8751B43867B7}"\r
+       RootNamespace="x86geninsn"\r
+       Keyword="Win32Proj">\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"/>\r
+       </Platforms>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="5"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="4"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)/x86geninsn.exe"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="$(OutDir)/x86geninsn.pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="run.bat &quot;$(TargetPath)&quot;"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="4"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)/x86geninsn.exe"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="run.bat &quot;$(TargetPath)&quot;"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{0356F9EC-3D6D-4078-9C85-272C51D60CEB}">\r
+                       <File\r
+                               RelativePath="..\..\..\modules\arch\x86\x86geninsn.c">\r
+                       </File>\r
+               </Filter>\r
+               <File\r
+                       RelativePath=".\run.bat">\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/Mkfiles/vc/yasm.sln b/Mkfiles/vc/yasm.sln
index 8921a59d157314076d55d6eab1a6d6fcd79d7b19..d41527ed6a5a012b55e5f6985015ec00cf411f99 100644 (file)
--- a/Mkfiles/vc/yasm.sln
+++ b/Mkfiles/vc/yasm.sln
@@ -32,8 +32,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2c", "re2c\re2c.vcproj",
        ProjectSection(ProjectDependencies) = postProject\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gap", "gap\gap.vcproj", "{5758BF4E-ABC4-11DA-B012-B622A1EF5492}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genperf", "genperf\genperf.vcproj", "{C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}"\r
        ProjectSection(ProjectDependencies) = postProject\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7} = {22294DC7-C6DF-4C34-A178-8751B43867B7}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genmodule", "genmodule\genmodule.vcproj", "{F0E8B707-00C5-4FF2-B8EF-7C39817132A0}"\r
@@ -44,6 +45,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genstring", "genstring\gens
        ProjectSection(ProjectDependencies) = postProject\r
        EndProjectSection\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86geninsn", "x86geninsn\x86geninsn.vcproj", "{22294DC7-C6DF-4C34-A178-8751B43867B7}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfiguration) = preSolution\r
                Debug = Debug\r
@@ -74,10 +79,10 @@ Global
                {3C58BE13-50A3-4583-984D-D8902B3D7713}.Debug.Build.0 = Debug|Win32\r
                {3C58BE13-50A3-4583-984D-D8902B3D7713}.Release.ActiveCfg = Release|Win32\r
                {3C58BE13-50A3-4583-984D-D8902B3D7713}.Release.Build.0 = Release|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Debug.ActiveCfg = Debug|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Debug.Build.0 = Debug|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Release.ActiveCfg = Release|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Release.Build.0 = Release|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Debug.ActiveCfg = Debug|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Debug.Build.0 = Debug|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Release.ActiveCfg = Release|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Release.Build.0 = Release|Win32\r
                {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Debug.ActiveCfg = Debug|Win32\r
                {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Debug.Build.0 = Debug|Win32\r
                {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Release.ActiveCfg = Release|Win32\r
@@ -86,6 +91,10 @@ Global
                {021CEB0A-F721-4F59-B349-9CEEAF244459}.Debug.Build.0 = Debug|Win32\r
                {021CEB0A-F721-4F59-B349-9CEEAF244459}.Release.ActiveCfg = Release|Win32\r
                {021CEB0A-F721-4F59-B349-9CEEAF244459}.Release.Build.0 = Release|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Debug.ActiveCfg = Debug|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Debug.Build.0 = Debug|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Release.ActiveCfg = Release|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Release.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(ExtensibilityGlobals) = postSolution\r
        EndGlobalSection\r

diff --git a/Mkfiles/vc8/gap/run.bat b/Mkfiles/vc8/gap/run.bat
deleted file mode 100644 (file)
index d506080..0000000
--- a/Mkfiles/vc8/gap/run.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-cd ..\..\..\\r
-%1 modules\arch\x86\x86parse.gap x86parse.c\r

diff --git a/Mkfiles/vc8/gap/gap.vcproj b/Mkfiles/vc8/genperf/genperf.vcproj
similarity index 85%
rename from Mkfiles/vc8/gap/gap.vcproj
rename to Mkfiles/vc8/genperf/genperf.vcproj
index 9ba900357fb21b9a78c04ce8caa4ab56c4474763..0bb6bd67025259d07e621bb6f4f7009b23f3a5cd 100644 (file)
--- a/Mkfiles/vc8/gap/gap.vcproj
+++ b/Mkfiles/vc8/genperf/genperf.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="gap"\r
-       ProjectGUID="{5758BF4E-ABC4-11DA-B012-B622A1EF5492}"\r
-       RootNamespace="gap"\r
+       Name="genperf"\r
+       ProjectGUID="{C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}"\r
+       RootNamespace="genperf"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -64,7 +64,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/gap.exe"\r
+                               OutputFile="$(OutDir)/genperf.exe"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
@@ -144,7 +144,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/gap.exe"\r
+                               OutputFile="$(OutDir)/genperf.exe"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="false"\r
                                ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
@@ -186,14 +186,14 @@
                <Filter\r
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{7D996CB2-ABC4-11DA-B012-B622A1EF5492}"\r
+                       UniqueIdentifier="{1062695D-1C50-4068-8313-73A409885BC1}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\..\tools\gap\gap.c"\r
+                               RelativePath="..\..\..\tools\genperf\genperf.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\tools\gap\perfect.c"\r
+                               RelativePath="..\..\..\tools\genperf\perfect.c"\r
                                >\r
                        </File>\r
                        <File\r
@@ -212,14 +212,14 @@
                <Filter\r
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{85DD7A94-ABC4-11DA-B012-B622A1EF5492}"\r
+                       UniqueIdentifier="{3C1E9AA8-6338-4CED-99F1-BEBA80607BD5}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\..\tools\gap\perfect.h"\r
+                               RelativePath="..\..\..\tools\genperf\perfect.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\tools\gap\standard.h"\r
+                               RelativePath="..\..\..\tools\genperf\standard.h"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/Mkfiles/vc8/genperf/run.bat b/Mkfiles/vc8/genperf/run.bat
new file mode 100644 (file)
index 0000000..1cf44bf
--- /dev/null
+++ b/Mkfiles/vc8/genperf/run.bat
@@ -0,0 +1,5 @@
+cd ..\..\..\\r
+%1 x86insn_nasm.gperf > x86insn_nasm.c\r
+%1 x86insn_gas.gperf > x86insn_gas.c\r
+%1 modules\arch\x86\x86cpu.gperf > x86cpu.c\r
+%1 modules\arch\x86\x86regtmod.gperf > x86regtmod.c\r

diff --git a/Mkfiles/vc8/x86geninsn/run.bat b/Mkfiles/vc8/x86geninsn/run.bat
new file mode 100644 (file)
index 0000000..ca29214
--- /dev/null
+++ b/Mkfiles/vc8/x86geninsn/run.bat
@@ -0,0 +1,2 @@
+cd ..\..\..\r
+%1 modules\arch\x86\x86insn.in x86insn_nasm.gperf x86insn_gas.gperf\r

diff --git a/Mkfiles/vc8/x86geninsn/x86geninsn.vcproj b/Mkfiles/vc8/x86geninsn/x86geninsn.vcproj
new file mode 100644 (file)
index 0000000..381f556
--- /dev/null
+++ b/Mkfiles/vc8/x86geninsn/x86geninsn.vcproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="x86geninsn"\r
+       ProjectGUID="{22294DC7-C6DF-4C34-A178-8751B43867B7}"\r
+       RootNamespace="x86geninsn"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\crt_secure_no_deprecate.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\x86geninsn.exe"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\crt_secure_no_deprecate.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="0"\r
+                               UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)/x86geninsn.exe"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="false"\r
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{0356F9EC-3D6D-4078-9C85-272C51D60CEB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\..\modules\arch\x86\x86geninsn.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <File\r
+                       RelativePath=".\run.bat"\r
+                       >\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/Mkfiles/vc8/yasm.sln b/Mkfiles/vc8/yasm.sln
index 6717facf9e579dfc87c68a52b43d53595de6b464..44f787199a066ea8c82036c63c4dd2503dfc5a6a 100644 (file)
--- a/Mkfiles/vc8/yasm.sln
+++ b/Mkfiles/vc8/yasm.sln
@@ -29,12 +29,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genversion", "genversion\ge
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2c", "re2c\re2c.vcproj", "{3C58BE13-50A3-4583-984D-D8902B3D7713}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gap", "gap\gap.vcproj", "{5758BF4E-ABC4-11DA-B012-B622A1EF5492}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genperf", "genperf\genperf.vcproj", "{C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7} = {22294DC7-C6DF-4C34-A178-8751B43867B7}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genmodule", "genmodule\genmodule.vcproj", "{F0E8B707-00C5-4FF2-B8EF-7C39817132A0}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genstring", "genstring\genstring.vcproj", "{021CEB0A-F721-4F59-B349-9CEEAF244459}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86geninsn", "x86geninsn\x86geninsn.vcproj", "{22294DC7-C6DF-4C34-A178-8751B43867B7}"\r
+EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{825AC694-358C-4D8D-92DE-33A2691978CE}"\r
        ProjectSection(SolutionItems) = preProject\r
                crt_secure_no_deprecate.vsprops = crt_secure_no_deprecate.vsprops\r
@@ -97,14 +102,14 @@ Global
                {3C58BE13-50A3-4583-984D-D8902B3D7713}.Release|Win32.Build.0 = Release|Win32\r
                {3C58BE13-50A3-4583-984D-D8902B3D7713}.Release|x64.ActiveCfg = Release|Win32\r
                {3C58BE13-50A3-4583-984D-D8902B3D7713}.Release|x64.Build.0 = Release|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Debug|Win32.Build.0 = Debug|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Debug|x64.Build.0 = Debug|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Release|Win32.ActiveCfg = Release|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Release|Win32.Build.0 = Release|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Release|x64.ActiveCfg = Release|Win32\r
-               {5758BF4E-ABC4-11DA-B012-B622A1EF5492}.Release|x64.Build.0 = Release|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Debug|Win32.Build.0 = Debug|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Debug|x64.Build.0 = Debug|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Release|Win32.ActiveCfg = Release|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Release|Win32.Build.0 = Release|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Release|x64.ActiveCfg = Release|Win32\r
+               {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Release|x64.Build.0 = Release|Win32\r
                {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Debug|Win32.Build.0 = Debug|Win32\r
                {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Debug|x64.ActiveCfg = Debug|Win32\r
@@ -121,6 +126,14 @@ Global
                {021CEB0A-F721-4F59-B349-9CEEAF244459}.Release|Win32.Build.0 = Release|Win32\r
                {021CEB0A-F721-4F59-B349-9CEEAF244459}.Release|x64.ActiveCfg = Release|Win32\r
                {021CEB0A-F721-4F59-B349-9CEEAF244459}.Release|x64.Build.0 = Release|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Debug|Win32.Build.0 = Debug|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Debug|x64.Build.0 = Debug|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Release|Win32.ActiveCfg = Release|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Release|Win32.Build.0 = Release|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Release|x64.ActiveCfg = Release|Win32\r
+               {22294DC7-C6DF-4C34-A178-8751B43867B7}.Release|x64.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r