maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Unbreak VC++ build. 

llvm-svn: 34917
This commit is contained in:
Jeff Cohen 2007-03-05 00:00:42 +00:00
parent 2fbcc0714c
commit b622c11f77
26 changed files with 173 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/include/llvm/ADT/SmallVector.h
View File

@ -18,6 +18,25 @@
#include <iterator> #include <iterator>
#include <memory> #include <memory>
#ifdef _MSC_VER
namespace std {
// Fix bug in VC++ implementation of std::uninitialized_copy. Define
// additional overloads so that the copy is recognized as a scalar and
// not an object copy.
template<class T1, class T2>
inline _Scalar_ptr_iterator_tag _Ptr_cat(T1 **, T2 **) {
_Scalar_ptr_iterator_tag _Cat;
return _Cat;
}
template<class T1, class T2>
inline _Scalar_ptr_iterator_tag _Ptr_cat(T1* const *, T2 **) {
_Scalar_ptr_iterator_tag _Cat;
return _Cat;
}
}
#endif
namespace llvm { namespace llvm {
/// SmallVectorImpl - This class consists of common code factored out of the /// SmallVectorImpl - This class consists of common code factored out of the

1
llvm/include/llvm/Analysis/ScalarEvolution.h
View File

@ -22,6 +22,7 @@
#define LLVM_ANALYSIS_SCALAREVOLUTION_H #define LLVM_ANALYSIS_SCALAREVOLUTION_H
#include "llvm/Pass.h" #include "llvm/Pass.h"
#include "llvm/Support/DataTypes.h"
#include "llvm/Support/Streams.h" #include "llvm/Support/Streams.h"
#include <set> #include <set>

2
llvm/include/llvm/Support/MathExtras.h
View File

@ -255,7 +255,7 @@ inline unsigned CountPopulation_64(uint64_t Value) {
uint64_t v = Value - ((Value >> 1) & 0x5555555555555555ULL); uint64_t v = Value - ((Value >> 1) & 0x5555555555555555ULL);
v = (v & 0x3333333333333333ULL) + ((v >> 2) & 0x3333333333333333ULL); v = (v & 0x3333333333333333ULL) + ((v >> 2) & 0x3333333333333333ULL);
v = (v + (v >> 4)) & 0x0F0F0F0F0F0F0F0FULL; v = (v + (v >> 4)) & 0x0F0F0F0F0F0F0F0FULL;
return (uint64_t)(v * 0x0101010101010101ULL) >> 56; return unsigned((uint64_t)(v * 0x0101010101010101ULL) >> 56);
#endif #endif
} }

4
llvm/lib/Analysis/ConstantFolding.cpp
View File

@ -72,8 +72,8 @@ static bool IsConstantOffsetFromGlobal(Constant *C, GlobalValue *&GV,
// N = N + Offset // N = N + Offset
Offset += TD.getStructLayout(ST)->getElementOffset(CI->getZExtValue()); Offset += TD.getStructLayout(ST)->getElementOffset(CI->getZExtValue());
} else { } else {
const SequentialType *ST = cast<SequentialType>(*GTI); const SequentialType *SQT = cast<SequentialType>(*GTI);
Offset += TD.getTypeSize(ST->getElementType())*CI->getSExtValue(); Offset += TD.getTypeSize(SQT->getElementType())*CI->getSExtValue();
} }
} }
return true; return true;

1
llvm/lib/Analysis/IPA/Andersens.cpp
View File

@ -62,6 +62,7 @@
#include "llvm/Analysis/Passes.h" #include "llvm/Analysis/Passes.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include "llvm/ADT/Statistic.h" #include "llvm/ADT/Statistic.h"
#include <algorithm>
#include <set> #include <set>
using namespace llvm; using namespace llvm;

2
llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
View File

@ -3301,7 +3301,7 @@ TargetLowering::LowerCallTo(SDOperand Chain, const Type *RetTy,
// Flags[2] -> isSRet // Flags[2] -> isSRet
// Flags[1] -> isInReg // Flags[1] -> isInReg
// Flags[0] -> isSigned // Flags[0] -> isSigned
unsigned Flags = (isSRet << 2) | (isInReg << 1) | isSigned | unsigned Flags = (isSRet << 2) | (isInReg << 1) | unsigned(isSigned) |
(OriginalAlignment << 27); (OriginalAlignment << 27);
switch (getTypeAction(VT)) { switch (getTypeAction(VT)) {

10
llvm/lib/Support/APInt.cpp
View File

@ -17,6 +17,7 @@
#include "llvm/DerivedTypes.h" #include "llvm/DerivedTypes.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include "llvm/Support/MathExtras.h" #include "llvm/Support/MathExtras.h"
#include <math.h>
#include <cstring> #include <cstring>
#include <cstdlib> #include <cstdlib>
#ifndef NDEBUG #ifndef NDEBUG
@ -1224,9 +1225,16 @@ APInt APInt::sqrt() const {
// an IEEE double precision floating point value), then we can use the // an IEEE double precision floating point value), then we can use the
// libc sqrt function which will probably use a hardware sqrt computation. // libc sqrt function which will probably use a hardware sqrt computation.
// This should be faster than the algorithm below. // This should be faster than the algorithm below.
if (magnitude < 52) if (magnitude < 52) {
#ifdef _MSC_VER
// Amazingly, VC++ doesn't have round().
return APInt(BitWidth,
uint64_t(::sqrt(double(isSingleWord()?VAL:pVal[0]))) + 0.5);
#else
return APInt(BitWidth, return APInt(BitWidth,
uint64_t(::round(::sqrt(double(isSingleWord()?VAL:pVal[0]))))); uint64_t(::round(::sqrt(double(isSingleWord()?VAL:pVal[0])))));
#endif
}
// Okay, all the short cuts are exhausted. We must compute it. The following // Okay, all the short cuts are exhausted. We must compute it. The following
// is a classical Babylonian method for computing the square root. This code // is a classical Babylonian method for computing the square root. This code

2
llvm/lib/Target/TargetData.cpp
View File

@ -400,7 +400,7 @@ uint64_t TargetData::getTypeSize(const Type *Ty) const {
unsigned char Alignment; unsigned char Alignment;
Size = getTypeSize(ATy->getElementType()); Size = getTypeSize(ATy->getElementType());
Alignment = getABITypeAlignment(ATy->getElementType()); Alignment = getABITypeAlignment(ATy->getElementType());
unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment; uint64_t AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
return AlignedSize*ATy->getNumElements(); return AlignedSize*ATy->getNumElements();
} }
case Type::StructTyID: { case Type::StructTyID: {

1
llvm/lib/Transforms/IPO/RaiseAllocations.cpp
View File

@ -22,6 +22,7 @@
#include "llvm/Support/CallSite.h" #include "llvm/Support/CallSite.h"
#include "llvm/Support/Compiler.h" #include "llvm/Support/Compiler.h"
#include "llvm/ADT/Statistic.h" #include "llvm/ADT/Statistic.h"
#include <algorithm>
using namespace llvm; using namespace llvm;
STATISTIC(NumRaised, "Number of allocations raised"); STATISTIC(NumRaised, "Number of allocations raised");

1
llvm/lib/Transforms/Scalar/InstructionCombining.cpp
View File

@ -7663,6 +7663,7 @@ Instruction *InstCombiner::FoldPHIArgOpIntoPHI(PHINode &PN) {
PhiVal, ConstantOp); PhiVal, ConstantOp);
else else
assert(0 && "Unknown operation"); assert(0 && "Unknown operation");
return 0;
} }
/// DeadPHICycle - Return true if this PHI node is only used by a PHI node cycle /// DeadPHICycle - Return true if this PHI node is only used by a PHI node cycle

2
llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
View File

@ -421,7 +421,7 @@ namespace {
iSGT = iUGT; iSGT = iUGT;
iSLT = iULT; iSLT = iULT;
} else { } else {
assert(iULT->first->getValue().isPositive() >= 0 && assert(iULT->first->getValue().isPositive() &&
iUGT->first->getValue().isNegative() &&"Bad sign comparison."); iUGT->first->getValue().isNegative() &&"Bad sign comparison.");
iSGT = iULT; iSGT = iULT;
iSLT = iUGT; iSLT = iUGT;

1
llvm/lib/VMCore/Pass.cpp
View File

@ -19,6 +19,7 @@
#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/STLExtras.h"
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/TypeInfo.h" #include "llvm/Support/TypeInfo.h"
#include <algorithm>
#include <set> #include <set>
using namespace llvm; using namespace llvm;

1
llvm/lib/VMCore/PassManager.cpp
View File

@ -19,6 +19,7 @@
#include "llvm/ModuleProvider.h" #include "llvm/ModuleProvider.h"
#include "llvm/Support/Streams.h" #include "llvm/Support/Streams.h"
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include <algorithm>
#include <vector> #include <vector>
#include <map> #include <map>

2
llvm/lib/VMCore/Value.cpp
View File

@ -128,7 +128,7 @@ void Value::setName(const char *Name) {
void Value::setName(const char *NameStr, unsigned NameLen) { void Value::setName(const char *NameStr, unsigned NameLen) {
if (NameLen == 0 && !hasName()) return; if (NameLen == 0 && !hasName()) return;
if (getType() != Type::VoidTy && "Cannot assign a name to void values!"); assert(getType() != Type::VoidTy && "Cannot assign a name to void values!");
// Get the symbol table to update for this object. // Get the symbol table to update for this object.
ValueSymbolTable *ST; ValueSymbolTable *ST;

1
llvm/tools/llvm-nm/llvm-nm.cpp
View File

@ -22,6 +22,7 @@
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include "llvm/System/Signals.h" #include "llvm/System/Signals.h"
#include <algorithm>
#include <cctype> #include <cctype>
#include <cerrno> #include <cerrno>
#include <cstring> #include <cstring>

1
llvm/tools/llvm-prof/llvm-prof.cpp
View File

@ -21,6 +21,7 @@
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include "llvm/System/Signals.h" #include "llvm/System/Signals.h"
#include <algorithm>
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
#include <map> #include <map>

9
llvm/win32/Analysis/Analysis.vcproj
View File

@ -132,9 +132,6 @@
<File <File
RelativePath="..\..\lib\Analysis\ConstantFolding.cpp"> RelativePath="..\..\lib\Analysis\ConstantFolding.cpp">
</File> </File>
<File
RelativePath="..\..\lib\Analysis\ConstantRange.cpp">
</File>
<File <File
RelativePath="..\..\lib\Analysis\InstCount.cpp"> RelativePath="..\..\lib\Analysis\InstCount.cpp">
</File> </File>
@ -150,6 +147,9 @@
<File <File
RelativePath="..\..\lib\Analysis\LoopInfo.cpp"> RelativePath="..\..\lib\Analysis\LoopInfo.cpp">
</File> </File>
<File
RelativePath="..\..\lib\Analysis\LoopPass.cpp">
</File>
<File <File
RelativePath="..\..\lib\Analysis\PostDominators.cpp"> RelativePath="..\..\lib\Analysis\PostDominators.cpp">
</File> </File>
@ -240,6 +240,9 @@
<File <File
RelativePath="..\..\include\llvm\Analysis\LoopInfo.h"> RelativePath="..\..\include\llvm\Analysis\LoopInfo.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\Analysis\LoopPass.h">
</File>
<File <File
RelativePath="..\..\include\llvm\Analysis\Passes.h"> RelativePath="..\..\include\llvm\Analysis\Passes.h">
</File> </File>

3
llvm/win32/Bytecode/Bytecode.vcproj
View File

@ -133,9 +133,6 @@
<File <File
RelativePath="..\..\lib\Bytecode\Writer\SlotCalculator.h"> RelativePath="..\..\lib\Bytecode\Writer\SlotCalculator.h">
</File> </File>
<File
RelativePath="..\..\lib\Bytecode\Writer\SlotTable.h">
</File>
<File <File
RelativePath="..\..\lib\Bytecode\Writer\Writer.cpp"> RelativePath="..\..\lib\Bytecode\Writer\Writer.cpp">
</File> </File>

34
llvm/win32/CodeGen/CodeGen.vcproj
View File

@ -120,6 +120,9 @@
<File <File
RelativePath="..\..\lib\CodeGen\ELFWriter.cpp"> RelativePath="..\..\lib\CodeGen\ELFWriter.cpp">
</File> </File>
<File
RelativePath="..\..\lib\CodeGen\ELFWriter.h">
</File>
<File <File
RelativePath="..\..\lib\CodeGen\IntrinsicLowering.cpp"> RelativePath="..\..\lib\CodeGen\IntrinsicLowering.cpp">
</File> </File>
@ -138,18 +141,24 @@
<File <File
RelativePath="..\..\lib\CodeGen\MachineBasicBlock.cpp"> RelativePath="..\..\lib\CodeGen\MachineBasicBlock.cpp">
</File> </File>
<File
RelativePath="..\..\lib\CodeGen\MachineDebugInfo.cpp">
</File>
<File <File
RelativePath="..\..\lib\CodeGen\MachineFunction.cpp"> RelativePath="..\..\lib\CodeGen\MachineFunction.cpp">
</File> </File>
<File <File
RelativePath="..\..\lib\CodeGen\MachineInstr.cpp"> RelativePath="..\..\lib\CodeGen\MachineInstr.cpp">
</File> </File>
<File
RelativePath="..\..\lib\CodeGen\MachineModuleInfo.cpp">
</File>
<File <File
RelativePath="..\..\lib\CodeGen\MachinePassRegistry.cpp"> RelativePath="..\..\lib\CodeGen\MachinePassRegistry.cpp">
</File> </File>
<File
RelativePath="..\..\lib\CodeGen\MachOWriter.cpp">
</File>
<File
RelativePath="..\..\lib\CodeGen\MachOWriter.h">
</File>
<File <File
RelativePath="..\..\lib\CodeGen\Passes.cpp"> RelativePath="..\..\lib\CodeGen\Passes.cpp">
</File> </File>
@ -168,6 +177,9 @@
<File <File
RelativePath="..\..\lib\CodeGen\RegAllocSimple.cpp"> RelativePath="..\..\lib\CodeGen\RegAllocSimple.cpp">
</File> </File>
<File
RelativePath="..\..\lib\CodeGen\RegisterScavenging.cpp">
</File>
<File <File
RelativePath="..\..\lib\CodeGen\TwoAddressInstructionPass.cpp"> RelativePath="..\..\lib\CodeGen\TwoAddressInstructionPass.cpp">
</File> </File>
@ -180,6 +192,9 @@
<Filter <Filter
Name="SelectionDAG" Name="SelectionDAG"
Filter=""> Filter="">
<File
RelativePath="..\..\lib\CodeGen\SelectionDAG\CallingConvLower.cpp">
</File>
<File <File
RelativePath="..\..\lib\CodeGen\SelectionDAG\DAGCombiner.cpp"> RelativePath="..\..\lib\CodeGen\SelectionDAG\DAGCombiner.cpp">
</File> </File>
@ -219,11 +234,14 @@
<File <File
RelativePath="..\..\include\llvm\CodeGen\AsmPrinter.h"> RelativePath="..\..\include\llvm\CodeGen\AsmPrinter.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\CodeGen\CallingConvLower.h">
</File>
<File <File
RelativePath="..\..\include\llvm\CodeGen\DwarfWriter.h"> RelativePath="..\..\include\llvm\CodeGen\DwarfWriter.h">
</File> </File>
<File <File
RelativePath="..\..\include\llvm\CodeGen\ELFWriter.h"> RelativePath="..\..\include\llvm\CodeGen\FileWriters.h">
</File> </File>
<File <File
RelativePath="..\..\include\llvm\CodeGen\InstrScheduling.h"> RelativePath="..\..\include\llvm\CodeGen\InstrScheduling.h">
@ -273,6 +291,9 @@
<File <File
RelativePath="..\..\include\llvm\CodeGen\MachineLocation.h"> RelativePath="..\..\include\llvm\CodeGen\MachineLocation.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\CodeGen\MachineModuleInfo.h">
</File>
<File <File
RelativePath="..\..\include\llvm\CodeGen\MachinePassRegistry.h"> RelativePath="..\..\include\llvm\CodeGen\MachinePassRegistry.h">
</File> </File>
@ -280,7 +301,7 @@
RelativePath="..\..\include\llvm\CodeGen\MachineRelocation.h"> RelativePath="..\..\include\llvm\CodeGen\MachineRelocation.h">
</File> </File>
<File <File
RelativePath="..\..\include\llvm\CodeGen\MachOWriter.h"> RelativePath="..\..\include\llvm\CodeGen\MachORelocation.h">
</File> </File>
<File <File
RelativePath="..\..\include\llvm\CodeGen\Passes.h"> RelativePath="..\..\include\llvm\CodeGen\Passes.h">
@ -291,6 +312,9 @@
<File <File
RelativePath="..\..\include\llvm\CodeGen\RegAllocRegistry.h"> RelativePath="..\..\include\llvm\CodeGen\RegAllocRegistry.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\CodeGen\RegisterScavenging.h">
</File>
<File <File
RelativePath="..\..\include\llvm\CodeGen\RuntimeLibcalls.h"> RelativePath="..\..\include\llvm\CodeGen\RuntimeLibcalls.h">
</File> </File>

30
llvm/win32/Support/Support.vcproj
View File

@ -115,6 +115,9 @@
<File <File
RelativePath="..\..\lib\Support\Annotation.cpp"> RelativePath="..\..\lib\Support\Annotation.cpp">
</File> </File>
<File
RelativePath="..\..\lib\Support\APInt.cpp">
</File>
<File <File
RelativePath="..\..\lib\Support\CommandLine.cpp"> RelativePath="..\..\lib\Support\CommandLine.cpp">
</File> </File>
@ -128,7 +131,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\lib\Support\CStringMap.cpp"> RelativePath="..\..\lib\Support\ConstantRange.cpp">
</File> </File>
<File <File
RelativePath="..\..\lib\Support\Debug.cpp"> RelativePath="..\..\lib\Support\Debug.cpp">
@ -172,6 +175,9 @@
Name="VCCLCompilerTool"/> Name="VCCLCompilerTool"/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\..\lib\Support\SmallPtrSet.cpp">
</File>
<File <File
RelativePath="..\..\lib\Support\Statistic.cpp"> RelativePath="..\..\lib\Support\Statistic.cpp">
</File> </File>
@ -181,6 +187,9 @@
<File <File
RelativePath="..\..\lib\Support\StringExtras.cpp"> RelativePath="..\..\lib\Support\StringExtras.cpp">
</File> </File>
<File
RelativePath="..\..\lib\Support\StringMap.cpp">
</File>
<File <File
RelativePath="..\..\lib\Support\SystemUtils.cpp"> RelativePath="..\..\lib\Support\SystemUtils.cpp">
</File> </File>
@ -301,6 +310,9 @@
<File <File
RelativePath="..\..\include\llvm\Support\MathExtras.h"> RelativePath="..\..\include\llvm\Support\MathExtras.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\Support\OutputBuffer.h">
</File>
<File <File
RelativePath="..\..\include\llvm\Support\PassNameParser.h"> RelativePath="..\..\include\llvm\Support\PassNameParser.h">
</File> </File>
@ -342,10 +354,10 @@
Name="ADT" Name="ADT"
Filter=""> Filter="">
<File <File
RelativePath="..\..\include\llvm\Adt\BitSetVector.h"> RelativePath="..\..\include\llvm\ADT\APInt.h">
</File> </File>
<File <File
RelativePath="..\..\include\llvm\ADT\CStringMap.h"> RelativePath="..\..\include\llvm\ADT\BitVector.h">
</File> </File>
<File <File
RelativePath="..\..\include\llvm\Adt\DenseMap.h"> RelativePath="..\..\include\llvm\Adt\DenseMap.h">
@ -374,6 +386,9 @@
<File <File
RelativePath="..\..\include\llvm\Adt\ilist"> RelativePath="..\..\include\llvm\Adt\ilist">
</File> </File>
<File
RelativePath="..\..\include\llvm\ADT\IndexedMap.h">
</File>
<File <File
RelativePath="..\..\include\llvm\Adt\iterator"> RelativePath="..\..\include\llvm\Adt\iterator">
</File> </File>
@ -389,6 +404,12 @@
<File <File
RelativePath="..\..\include\llvm\Adt\SetVector.h"> RelativePath="..\..\include\llvm\Adt\SetVector.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\ADT\SmallPtrSet.h">
</File>
<File
RelativePath="..\..\include\llvm\ADT\SmallSet.h">
</File>
<File <File
RelativePath="..\..\include\llvm\ADT\SmallString.h"> RelativePath="..\..\include\llvm\ADT\SmallString.h">
</File> </File>
@ -404,6 +425,9 @@
<File <File
RelativePath="..\..\include\llvm\Adt\StringExtras.h"> RelativePath="..\..\include\llvm\Adt\StringExtras.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\ADT\StringMap.h">
</File>
<File <File
RelativePath="..\..\include\llvm\Adt\Tree.h"> RelativePath="..\..\include\llvm\Adt\Tree.h">
</File> </File>

6
llvm/win32/System/System.vcproj
View File

@ -112,6 +112,9 @@
<File <File
RelativePath="..\..\lib\System\Alarm.cpp"> RelativePath="..\..\lib\System\Alarm.cpp">
</File> </File>
<File
RelativePath="..\..\lib\System\Disassembler.cpp">
</File>
<File <File
RelativePath="..\..\lib\System\DynamicLibrary.cpp"> RelativePath="..\..\lib\System\DynamicLibrary.cpp">
</File> </File>
@ -150,6 +153,9 @@
<File <File
RelativePath="..\..\include\llvm\System\Alarm.h"> RelativePath="..\..\include\llvm\System\Alarm.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\System\Disassembler.h">
</File>
<File <File
RelativePath="..\..\include\llvm\System\DynamicLibrary.h"> RelativePath="..\..\include\llvm\System\DynamicLibrary.h">
</File> </File>

6
llvm/win32/TableGen/TableGen.vcproj
View File

@ -128,6 +128,9 @@
<File <File
RelativePath="..\..\utils\TableGen\AsmWriterEmitter.cpp"> RelativePath="..\..\utils\TableGen\AsmWriterEmitter.cpp">
</File> </File>
<File
RelativePath="..\..\utils\TableGen\CallingConvEmitter.cpp">
</File>
<File <File
RelativePath="..\..\utils\TableGen\CodeEmitterGen.cpp"> RelativePath="..\..\utils\TableGen\CodeEmitterGen.cpp">
</File> </File>
@ -208,6 +211,9 @@
<File <File
RelativePath="..\..\utils\TableGen\AsmWriterEmitter.h"> RelativePath="..\..\utils\TableGen\AsmWriterEmitter.h">
</File> </File>
<File
RelativePath="..\..\utils\TableGen\CallingConvEmitter.h">
</File>
<File <File
RelativePath="..\..\utils\TableGen\CodeEmitterGen.h"> RelativePath="..\..\utils\TableGen\CodeEmitterGen.h">
</File> </File>

9
llvm/win32/Target/Target.vcproj
View File

@ -132,6 +132,9 @@
<File <File
RelativePath="..\..\lib\Target\TargetMachineRegistry.cpp"> RelativePath="..\..\lib\Target\TargetMachineRegistry.cpp">
</File> </File>
<File
RelativePath="..\..\lib\Target\TargetMachOWriterInfo.cpp">
</File>
<File <File
RelativePath="..\..\lib\Target\TargetSubtarget.cpp"> RelativePath="..\..\lib\Target\TargetSubtarget.cpp">
</File> </File>
@ -152,6 +155,9 @@
<File <File
RelativePath="..\..\include\llvm\Target\TargetData.h"> RelativePath="..\..\include\llvm\Target\TargetData.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\Target\TargetELFWriterInfo.h">
</File>
<File <File
RelativePath="..\..\include\llvm\Target\TargetFrameInfo.h"> RelativePath="..\..\include\llvm\Target\TargetFrameInfo.h">
</File> </File>
@ -173,6 +179,9 @@
<File <File
RelativePath="..\..\include\llvm\Target\TargetMachineRegistry.h"> RelativePath="..\..\include\llvm\Target\TargetMachineRegistry.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\Target\TargetMachOWriterInfo.h">
</File>
<File <File
RelativePath="..\..\include\llvm\Target\TargetOptions.h"> RelativePath="..\..\include\llvm\Target\TargetOptions.h">
</File> </File>

24
llvm/win32/Transforms/Transforms.vcproj
View File

@ -108,18 +108,6 @@
Name="Source Files" Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\lib\Transforms\ExprTypeConvert.cpp">
</File>
<File
RelativePath="..\..\lib\Transforms\LevelRaise.cpp">
</File>
<File
RelativePath="..\..\lib\Transforms\TransformInternals.cpp">
</File>
<File
RelativePath="..\..\lib\Transforms\TransformInternals.h">
</File>
<Filter <Filter
Name="Instrumentation" Name="Instrumentation"
Filter=""> Filter="">
@ -129,9 +117,6 @@
<File <File
RelativePath="..\..\lib\Transforms\Instrumentation\EdgeProfiling.cpp"> RelativePath="..\..\lib\Transforms\Instrumentation\EdgeProfiling.cpp">
</File> </File>
<File
RelativePath="..\..\lib\Transforms\Instrumentation\EmitFunctions.cpp">
</File>
<File <File
RelativePath="..\..\lib\Transforms\Instrumentation\ProfilingUtils.cpp"> RelativePath="..\..\lib\Transforms\Instrumentation\ProfilingUtils.cpp">
</File> </File>
@ -144,9 +129,6 @@
<File <File
RelativePath="..\..\lib\Transforms\Instrumentation\RSProfiling.h"> RelativePath="..\..\lib\Transforms\Instrumentation\RSProfiling.h">
</File> </File>
<File
RelativePath="..\..\lib\Transforms\Instrumentation\TraceBasicBlocks.cpp">
</File>
</Filter> </Filter>
<Filter <Filter
Name="IPO" Name="IPO"
@ -166,9 +148,6 @@
<File <File
RelativePath="..\..\lib\Transforms\Ipo\ExtractFunction.cpp"> RelativePath="..\..\lib\Transforms\Ipo\ExtractFunction.cpp">
</File> </File>
<File
RelativePath="..\..\lib\Transforms\Ipo\FunctionResolution.cpp">
</File>
<File <File
RelativePath="..\..\lib\Transforms\Ipo\GlobalDCE.cpp"> RelativePath="..\..\lib\Transforms\Ipo\GlobalDCE.cpp">
</File> </File>
@ -208,6 +187,9 @@
<File <File
RelativePath="..\..\lib\Transforms\Ipo\SimplifyLibCalls.cpp"> RelativePath="..\..\lib\Transforms\Ipo\SimplifyLibCalls.cpp">
</File> </File>
<File
RelativePath="..\..\lib\Transforms\IPO\StripDeadPrototypes.cpp">
</File>
<File <File
RelativePath="..\..\lib\Transforms\Ipo\StripSymbols.cpp"> RelativePath="..\..\lib\Transforms\Ipo\StripSymbols.cpp">
</File> </File>

16
llvm/win32/VMCore/VMCore.vcproj
View File

@ -116,7 +116,7 @@
RelativePath="..\..\lib\VMCore\BasicBlock.cpp"> RelativePath="..\..\lib\VMCore\BasicBlock.cpp">
</File> </File>
<File <File
RelativePath="..\..\lib\VMCore\ConstantFolding.cpp"> RelativePath="..\..\lib\VMCore\ConstantFold.cpp">
</File> </File>
<File <File
RelativePath="..\..\lib\VMCore\Constants.cpp"> RelativePath="..\..\lib\VMCore\Constants.cpp">
@ -149,7 +149,8 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Performing TableGen Step" Description="Performing TableGen Step"
CommandLine="..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen CommandLine="echo Building $(InputFileName) code emitter with tblgen
..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
" "
AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td" AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
Outputs="$(SolutionDir)llvm\intrinsics.gen"/> Outputs="$(SolutionDir)llvm\intrinsics.gen"/>
@ -159,7 +160,8 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Performing TableGen Step" Description="Performing TableGen Step"
CommandLine="..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen CommandLine="echo Building $(InputFileName) code emitter with tblgen
..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
" "
AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td" AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
Outputs="$(SolutionDir)llvm\intrinsics.gen"/> Outputs="$(SolutionDir)llvm\intrinsics.gen"/>
@ -183,9 +185,6 @@
<File <File
RelativePath="..\..\lib\VMCore\PassManager.cpp"> RelativePath="..\..\lib\VMCore\PassManager.cpp">
</File> </File>
<File
RelativePath="..\..\lib\VMCore\SymbolTable.cpp">
</File>
<File <File
RelativePath="..\..\lib\VMCore\Type.cpp"> RelativePath="..\..\lib\VMCore\Type.cpp">
</File> </File>
@ -228,7 +227,7 @@
RelativePath="..\..\include\llvm\Constant.h"> RelativePath="..\..\include\llvm\Constant.h">
</File> </File>
<File <File
RelativePath="..\..\lib\VMCore\ConstantFolding.h"> RelativePath="..\..\lib\VMCore\ConstantFold.h">
</File> </File>
<File <File
RelativePath="..\..\include\llvm\Constants.h"> RelativePath="..\..\include\llvm\Constants.h">
@ -299,9 +298,6 @@
<File <File
RelativePath="..\..\include\llvm\Assembly\PrintModulePass.h"> RelativePath="..\..\include\llvm\Assembly\PrintModulePass.h">
</File> </File>
<File
RelativePath="..\..\include\llvm\SymbolTable.h">
</File>
<File <File
RelativePath="..\..\include\llvm\SymbolTableListTraits.h"> RelativePath="..\..\include\llvm\SymbolTableListTraits.h">
</File> </File>

45
llvm/win32/x86/x86.vcproj
View File

@ -116,36 +116,58 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Performing TableGen Step" Description="Performing TableGen Step"
CommandLine="..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc CommandLine="echo Building $(InputFileName) register names with tblgen
..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
echo Building $(InputFileName) register information header with tblgen
..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc ..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc
echo Building $(InputFileName) register information implementation with tblgen
..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc ..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc
echo Building $(InputFileName) instruction names with tblgen
..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc ..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc
echo Building $(InputFileName) instruction information with tblgen
..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc ..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc
echo Building $(InputFileName) assembly writer with tblgen
..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc ..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc
echo Building $(InputFileName) assembly writer #1 with tblgen
..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc ..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc
echo Building $(InputFileName) instruction selector implementation with tblgen
..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc ..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc
echo Building $(InputFileName) subtarget information with tblgen
..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc ..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc
echo Building $(InputFileName) calling convention information with tblgen
..\$(IntDir)\TableGen.exe -gen-callingconv -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenCallingConv.inc
" "
AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe" AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)X86CallingConv.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc"/> Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc;X86GenCallingConv.inc"/>
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Performing TableGen Step" Description="Performing TableGen Step"
CommandLine="..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc CommandLine="echo Building $(InputFileName) register names with tblgen
..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
echo Building $(InputFileName) register information header with tblgen
..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc ..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc
echo Building $(InputFileName) register information implementation with tblgen
..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc ..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc
echo Building $(InputFileName) instruction names with tblgen
..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc ..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc
echo Building $(InputFileName) instruction information with tblgen
..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc ..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc
echo Building $(InputFileName) assembly writer with tblgen
..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc ..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc
echo Building $(InputFileName) assembly writer #1 with tblgen
..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc ..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc
echo Building $(InputFileName) instruction selector implementation with tblgen
..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc ..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc
echo Building $(InputFileName) subtarget information with tblgen
..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc ..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc
echo Building $(InputFileName) calling convention information with tblgen
..\$(IntDir)\TableGen.exe -gen-callingconv -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenCallingConv.inc
" "
AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe" AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)X86CallingConv.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc"/> Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc;X86GenCallingConv.inc"/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
@ -158,7 +180,13 @@
RelativePath="..\..\lib\Target\X86\X86CodeEmitter.cpp"> RelativePath="..\..\lib\Target\X86\X86CodeEmitter.cpp">
</File> </File>
<File <File
RelativePath="..\..\lib\Target\X86\X86ELFWriter.cpp"> RelativePath="..\..\lib\Target\X86\X86COFF.h">
</File>
<File
RelativePath="..\..\lib\Target\X86\X86ELFWriterInfo.cpp">
</File>
<File
RelativePath="..\..\lib\Target\X86\X86ELFWriterInfo.h">
</File> </File>
<File <File
RelativePath="..\..\lib\Target\X86\X86FloatingPoint.cpp"> RelativePath="..\..\lib\Target\X86\X86FloatingPoint.cpp">
@ -213,6 +241,9 @@
<File <File
RelativePath="..\..\lib\Target\X86\X86ATTAsmPrinter.h"> RelativePath="..\..\lib\Target\X86\X86ATTAsmPrinter.h">
</File> </File>
<File
RelativePath="..\..\lib\Target\X86\X86CallingConv.td">
</File>
<File <File
RelativePath="..\..\lib\Target\X86\X86InstrBuilder.h"> RelativePath="..\..\lib\Target\X86\X86InstrBuilder.h">
</File> </File>