diff options
| -rw-r--r-- | lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp | 6 | ||||
| -rw-r--r-- | win32/VMCore/VMCore.vcproj | 29 | ||||
| -rw-r--r-- | win32/llvm.sln | 2 |
3 files changed, 34 insertions, 3 deletions
diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp index 84311a9..202bfa3 100644 --- a/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp +++ b/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp @@ -761,7 +761,7 @@ int RegReductionPriorityQueue::CalcNodePriority(const SUnit *SU) { SethiUllmanNumber = 1; } else { int Extra = 0; - for (std::set<SUnit*>::iterator I = SU->Preds.begin(), + for (std::set<SUnit*>::const_iterator I = SU->Preds.begin(), E = SU->Preds.end(); I != E; ++I) { SUnit *PredSU = *I; int PredSethiUllman = CalcNodePriority(PredSU); @@ -870,11 +870,11 @@ int LatencyPriorityQueue::CalcLatency(const SUnit &SU) { return Latency; int MaxSuccLatency = 0; - for (std::set<SUnit*>::iterator I = SU.Succs.begin(), + for (std::set<SUnit*>::const_iterator I = SU.Succs.begin(), E = SU.Succs.end(); I != E; ++I) MaxSuccLatency = std::max(MaxSuccLatency, CalcLatency(**I)); - for (std::set<SUnit*>::iterator I = SU.ChainSuccs.begin(), + for (std::set<SUnit*>::const_iterator I = SU.ChainSuccs.begin(), E = SU.ChainSuccs.end(); I != E; ++I) MaxSuccLatency = std::max(MaxSuccLatency, CalcLatency(**I)); diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj index a4324cd..3623f9b 100644 --- a/win32/VMCore/VMCore.vcproj +++ b/win32/VMCore/VMCore.vcproj @@ -4,6 +4,7 @@ Version="7.10" Name="VMCore" ProjectGUID="{45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}" + RootNamespace="VMCore" Keyword="Win32Proj"> <Platforms> <Platform @@ -145,6 +146,27 @@ RelativePath="..\..\lib\VMCore\Instructions.cpp"> </File> <File + RelativePath="..\..\include\llvm\Intrinsics.td"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Performing TableGen Step" + CommandLine="..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(InputDir)intrinsics.gen" + AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe" + Outputs="$(InputDir)intrinsics.gen"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Performing TableGen Step" + CommandLine="..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(InputDir)intrinsics.gen" + AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe" + Outputs="$(InputDir)intrinsics.gen"/> + </FileConfiguration> + </File> + <File RelativePath="..\..\lib\VMCore\LeakDetector.cpp"> </File> <File @@ -303,6 +325,13 @@ RelativePath="..\..\include\llvm\Assembly\Writer.h"> </File> </Filter> + <Filter + Name="Generated Tablegen Files" + Filter=""> + <File + RelativePath="..\..\include\llvm\intrinsics.gen"> + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/win32/llvm.sln b/win32/llvm.sln index eb0687f..3ef216e 100644 --- a/win32/llvm.sln +++ b/win32/llvm.sln @@ -31,6 +31,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VMCore", "VMCore\VMCore.vcproj", "{45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}" ProjectSection(ProjectDependencies) = postProject {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Target", "Target\Target.vcproj", "{059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4}" @@ -64,6 +65,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Transforms", "Transforms\Transforms.vcproj", "{C59374C1-9FC0-4147-B836-327DFDC52D99}" ProjectSection(ProjectDependencies) = postProject {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Configure", "Configure\Configure.vcproj", "{19514E48-456C-4B9D-8637-F2285476461E}" |