X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=vc2005%2Flibfirm.vcproj;h=85758c1711d28f42cd55952bb5a3a35f2e852a76;hb=937cf6568ac3ef502d12ceb8c211180d0a798191;hp=a65f6eb9c1e014e0f1b77f2d8b90b5e07b6dfcc4;hpb=d2002eaad56644658d0e75840ef3358d00bdd892;p=libfirm

diff --git a/vc2005/libfirm.vcproj b/vc2005/libfirm.vcproj
index a65f6eb9c..85758c171 100644
--- a/vc2005/libfirm.vcproj
+++ b/vc2005/libfirm.vcproj
@@ -45,8 +45,8 @@
 				AdditionalOptions="/WL"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../obstack;../win32;../ir/adt;../ir/ana;../ir/common;../ir/debug;../ir/ident;../ir/ir;../ir/opt;../ir/stat;../ir/tr;../ir/tv;../ir/arch;../ir/lower;../ir/net;../ir/be;../ir/libcore;../include/libfirm;../include/libfirm/adt;../../ipd/include"
-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="../../obstack;../win32;../ir/adt;../ir/ana;../ir/common;../ir/debug;../ir/ident;../ir/ir;../ir/opt;../ir/stat;../ir/tr;../ir/tv;../ir/arch;../ir/lower;../ir/net;../ir/be;../ir/libcore;../include/libfirm;../include/libfirm/adt;../../ipd/include;../ir"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;inline=_inline"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -126,7 +126,7 @@
 				AdditionalOptions="/WL"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../obstack;../win32;../ir/adt;../ir/ana;../ir/common;../ir/debug;../ir/ident;../ir/ir;../ir/opt;../ir/stat;../ir/tr;../ir/tv;../ir/arch;../ir/lower;../ir/net;../ir/be;../ir/libcore;../include/libfirm;../include/libfirm/adt;../../ipd/include;../ir"
-				PreprocessorDefinitions="NO_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="NO_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;inline=_inline"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -173,7 +173,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Header install"
-				CommandLine="cd ..&#x0D;&#x0A;mkdir ..\ipd\include\libfirm&#x0D;&#x0A;xcopy /M /Y win32\firm_config.h ..\ipd\include\libfirm&#x0D;&#x0A;xcopy /M /E /Y include\libfirm  ..\ipd\include\libfirm&#x0D;&#x0A;"
+				CommandLine="cd ..&#x0D;&#x0A;mkdir ..\ipd\include\libfirm&#x0D;&#x0A;xcopy /M /E /Y include\libfirm  ..\ipd\include\libfirm&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -206,7 +206,7 @@
 				AdditionalOptions="/WL"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../obstack;../win32;../ir/adt;../ir/ana;../ir/common;../ir/debug;../ir/ident;../ir/ir;../ir/opt;../ir/stat;../ir/tr;../ir/tv;../ir/arch;../ir/lower;../ir/net;../ir/be;../ir/libcore;../include/libfirm;../include/libfirm/adt;../../ipd/include"
-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;inline=_inline"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -253,7 +253,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Header install"
-				CommandLine="cd ..&#x0D;&#x0A;mkdir ..\ipd\include\libfirm&#x0D;&#x0A;xcopy /M /Y win32\firm_config.h ..\ipd\include\libfirm&#x0D;&#x0A;xcopy /M /E /Y include\libfirm  ..\ipd\include\libfirm&#x0D;&#x0A;"
+				CommandLine="cd ..&#x0D;&#x0A;mkdir ..\ipd\include\libfirm&#x0D;&#x0A;xcopy /M /E /Y include\libfirm  ..\ipd\include\libfirm&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -268,10 +268,6 @@
 				RelativePath="..\win32\config.h"
 				>
 			</File>
-			<File
-				RelativePath="..\win32\firm_config.h"
-				>
-			</File>
 			<File
 				RelativePath="..\win32\ieee754.h"
 				>
@@ -322,6 +318,10 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath="..\ir\adt\array_t.h"
+					>
+				</File>
 				<File
 					RelativePath="..\ir\adt\bipartite.c"
 					>
@@ -619,45 +619,6 @@
 					</FileConfiguration>
 				</File>
 			</Filter>
-			<Filter
-				Name="arch"
-				>
-				<File
-					RelativePath="..\ir\arch\archop.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugJTEST|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\ir\arch\Makefile.in"
-					>
-				</File>
-			</Filter>
 			<Filter
 				Name="be"
 				>
@@ -926,10 +887,6 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\ir\be\becopyheur3.c"
-					>
-				</File>
 				<File
 					RelativePath="..\ir\be\becopyheur4.c"
 					>
@@ -1181,6 +1138,14 @@
 					RelativePath="..\ir\be\beilpsched.h"
 					>
 				</File>
+				<File
+					RelativePath="..\ir\be\beinfo.c"
+					>
+				</File>
+				<File
+					RelativePath="..\ir\be\beinfo.h"
+					>
+				</File>
 				<File
 					RelativePath="..\ir\be\beinsn.c"
 					>
@@ -1263,14 +1228,6 @@
 					RelativePath="..\ir\be\beirgmod.h"
 					>
 				</File>
-				<File
-					RelativePath="..\ir\be\bejavacoal.c"
-					>
-				</File>
-				<File
-					RelativePath="..\ir\be\bejavacoal.h"
-					>
-				</File>
 				<File
 					RelativePath="..\ir\be\belistsched.c"
 					>
@@ -1447,6 +1404,10 @@
 					RelativePath="..\ir\be\bemodule_t.h"
 					>
 				</File>
+				<File
+					RelativePath="..\ir\be\benewalloc.c"
+					>
+				</File>
 				<File
 					RelativePath="..\ir\be\benode.c"
 					>
@@ -1725,14 +1686,6 @@
 					RelativePath="..\ir\be\bespilloptions.h"
 					>
 				</File>
-				<File
-					RelativePath="..\ir\be\bespillremat.c"
-					>
-				</File>
-				<File
-					RelativePath="..\ir\be\bespillremat.h"
-					>
-				</File>
 				<File
 					RelativePath="..\ir\be\bespillslots.c"
 					>
@@ -1784,14 +1737,6 @@
 					RelativePath="..\ir\be\bessadestr.h"
 					>
 				</File>
-				<File
-					RelativePath="..\ir\be\bessadestrsimple.c"
-					>
-				</File>
-				<File
-					RelativePath="..\ir\be\bessadestrsimple.h"
-					>
-				</File>
 				<File
 					RelativePath="..\ir\be\bestabs.c"
 					>
@@ -1933,10 +1878,6 @@
 						RelativePath="..\ir\be\scripts\generate_emitter.pl"
 						>
 					</File>
-					<File
-						RelativePath="..\ir\be\scripts\generate_emitter_new.pl"
-						>
-					</File>
 					<File
 						RelativePath="..\ir\be\scripts\generate_machine.pl"
 						>
@@ -4197,6 +4138,22 @@
 			<Filter
 				Name="ir"
 				>
+				<File
+					RelativePath="..\ir\ir\gen_ir_cons.c.inl"
+					>
+				</File>
+				<File
+					RelativePath="..\ir\ir\gen_irio_export.inl"
+					>
+				</File>
+				<File
+					RelativePath="..\ir\ir\gen_irio_import.inl"
+					>
+				</File>
+				<File
+					RelativePath="..\ir\ir\gen_irio_lex.inl"
+					>
+				</File>
 				<File
 					RelativePath="..\ir\ir\instrument.c"
 					>
@@ -4205,6 +4162,43 @@
 					RelativePath="..\ir\ir\instrument.h"
 					>
 				</File>
+				<File
+					RelativePath="..\ir\ir\ir_spec.pl"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description=""
+							CommandLine=""
+							AdditionalDependencies=""
+							Outputs=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description=""
+							CommandLine=""
+							AdditionalDependencies=""
+							Outputs=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="DebugJTEST|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description=""
+							CommandLine=""
+							AdditionalDependencies=""
+							Outputs=""
+						/>
+					</FileConfiguration>
+				</File>
 				<File
 					RelativePath="..\ir\ir\irarch.c"
 					>
@@ -4469,34 +4463,6 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\ir\ir\irflag_t.def"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugJTEST|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-				</File>
 				<File
 					RelativePath="..\ir\ir\irflag_t.h"
 					>
@@ -4695,6 +4661,10 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath="..\ir\ir\irio.c"
+					>
+				</File>
 				<File
 					RelativePath="..\ir\ir\irmode.c"
 					>
@@ -5094,7 +5064,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\ir\opt\condeval.c"
+					RelativePath="..\ir\opt\jumpthreading.c"
 					>
 				</File>
 				<File
@@ -5105,37 +5075,6 @@
 					RelativePath="..\ir\opt\critical_edges.c"
 					>
 				</File>
-				<File
-					RelativePath="..\ir\opt\data_flow_scalar_replace.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugJTEST|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
 				<File
 					RelativePath="..\ir\opt\escape_ana.c"
 					>
@@ -5408,6 +5347,10 @@
 					RelativePath="..\ir\opt\opt_inline_t.h"
 					>
 				</File>
+				<File
+					RelativePath="..\ir\opt\opt_ldst.c"
+					>
+				</File>
 				<File
 					RelativePath="..\ir\opt\opt_osr.c"
 					>
@@ -5921,6 +5864,10 @@
 					RelativePath="..\ir\stat\stat_dmp.h"
 					>
 				</File>
+				<File
+					RelativePath="..\ir\stat\stat_liveness.c"
+					>
+				</File>
 				<File
 					RelativePath="..\ir\stat\stat_timing.c"
 					>
@@ -6951,45 +6898,6 @@
 					RelativePath="..\ir\ana\irdom_t.h"
 					>
 				</File>
-				<File
-					RelativePath="..\ir\ana\irextbb.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugJTEST|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\ir\ana\irextbb2.c"
-					>
-				</File>
-				<File
-					RelativePath="..\ir\ana\irextbb_t.h"
-					>
-				</File>
 				<File
 					RelativePath="..\ir\ana\irlivechk.c"
 					>
@@ -7380,10 +7288,6 @@
 				RelativePath="..\include\libfirm\iredges.h"
 				>
 			</File>
-			<File
-				RelativePath="..\include\libfirm\irextbb.h"
-				>
-			</File>
 			<File
 				RelativePath="..\include\libfirm\irflag.h"
 				>
@@ -7408,6 +7312,10 @@
 				RelativePath="..\include\libfirm\irhooks.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\libfirm\irio.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\libfirm\irlivechk.h"
 				>
@@ -7575,10 +7483,6 @@
 					RelativePath="..\include\libfirm\adt\impl.h"
 					>
 				</File>
-				<File
-					RelativePath="..\include\libfirm\adt\iterator.h"
-					>
-				</File>
 				<File
 					RelativePath="..\include\libfirm\adt\list.h"
 					>
@@ -7637,6 +7541,92 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="scripts"
+			>
+			<File
+				RelativePath="..\scripts\gen_ir.pl"
+				>
+			</File>
+			<File
+				RelativePath="..\scripts\gen_ir.py"
+				>
+			</File>
+			<File
+				RelativePath="..\scripts\gen_ir_io.py"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating I/O code: $(InputPath)"
+						CommandLine="python $(InputPath) ..\scripts\ir_spec.py ..\ir\ir"
+						AdditionalDependencies="..\scripts\ir_spec.py"
+						Outputs="..\ir\ir\gen_irio_import.inl;..\ir\ir\gen_irio_export.inl;..\ir\ir\gen_irio_lex.inl"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating I/O code: $(InputPath)"
+						CommandLine="python $(InputPath) ..\scripts\ir_spec.py ..\ir\ir"
+						AdditionalDependencies="..\scripts\ir_spec.py"
+						Outputs="..\ir\ir\gen_irio_import.inl;..\ir\ir\gen_irio_export.inl;..\ir\ir\gen_irio_lex.inl"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DebugJTEST|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating I/O code: $(InputPath)"
+						CommandLine="python $(InputPath) ..\scripts\ir_spec.py ..\ir\ir"
+						AdditionalDependencies="..\scripts\ir_spec.py"
+						Outputs="..\ir\ir\gen_irio_import.inl;..\ir\ir\gen_irio_export.inl;..\ir\ir\gen_irio_lex.inl"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\scripts\ir_spec.py"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Translate IR-Spec: $(InputPath)"
+						CommandLine="python ..\scripts\gen_ir.py $(InputPath) ..\ir\ir"
+						AdditionalDependencies="..\scripts\gen_ir.py"
+						Outputs="..\ir\ir\gen_ir_cons.c.inl"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Translate IR-Spec: $(InputPath)"
+						CommandLine="python ..\scripts\gen_ir.py $(InputPath) ..\ir\ir"
+						AdditionalDependencies="..\scripts\gen_ir.py"
+						Outputs="..\ir\ir\gen_ir_cons.c.inl"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DebugJTEST|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Translate IR-Spec: $(InputPath)"
+						CommandLine="python ..\scripts\gen_ir.py $(InputPath) ..\ir\ir"
+						AdditionalDependencies="..\scripts\gen_ir.py"
+						Outputs="..\ir\ir\gen_ir_cons.c.inl"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>