replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wire up 64-bit MCCodeEmitter. 

llvm-svn: 95438
This commit is contained in:
Chris Lattner 2010-02-05 21:51:35 +00:00
parent 86bd194234
commit 9c9453e582
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/Target/X86/X86.h
View File

@ -50,7 +50,8 @@ FunctionPass *createX86JITCodeEmitterPass(X86TargetMachine &TM,
JITCodeEmitter &JCE);
MCCodeEmitter *createHeinousX86MCCodeEmitter(const Target &, TargetMachine &TM);
MCCodeEmitter *createX86MCCodeEmitter(const Target &, TargetMachine &TM);
MCCodeEmitter *createX86_32MCCodeEmitter(const Target &, TargetMachine &TM);
MCCodeEmitter *createX86_64MCCodeEmitter(const Target &, TargetMachine &TM);
/// createX86EmitCodeToMemory - Returns a pass that converts a register
/// allocated function into raw machine code in a dynamically

7
llvm/lib/Target/X86/X86CodeEmitter.cpp
View File

@ -1117,8 +1117,11 @@ MCCodeEmitter *llvm::createHeinousX86MCCodeEmitter(const Target &T,
TargetMachine &TM) {
// FIXME: Remove the heinous one when the new one works.
if (EnableNewEncoder)
return createX86MCCodeEmitter(T, TM);
if (EnableNewEncoder) {
if (TM.getTargetData()->getPointerSize() == 4)
return createX86_32MCCodeEmitter(T, TM);
return createX86_64MCCodeEmitter(T, TM);
}
return new X86MCCodeEmitter(static_cast<X86TargetMachine&>(TM));
}

16
llvm/lib/Target/X86/X86MCCodeEmitter.cpp
View File

@ -27,10 +27,9 @@ class X86MCCodeEmitter : public MCCodeEmitter {
const TargetInstrInfo &TII;
bool Is64BitMode;
public:
X86MCCodeEmitter(TargetMachine &tm)
X86MCCodeEmitter(TargetMachine &tm, bool is64Bit)
: TM(tm), TII(*TM.getInstrInfo()) {
// FIXME: Get this from the right place.
Is64BitMode = false;
Is64BitMode = is64Bit;
}
~X86MCCodeEmitter() {}
@ -83,9 +82,14 @@ public:
} // end anonymous namespace
MCCodeEmitter *llvm::createX86MCCodeEmitter(const Target &,
TargetMachine &TM) {
return new X86MCCodeEmitter(TM);
MCCodeEmitter *llvm::createX86_32MCCodeEmitter(const Target &,
TargetMachine &TM) {
return new X86MCCodeEmitter(TM, false);
}
MCCodeEmitter *llvm::createX86_64MCCodeEmitter(const Target &,
TargetMachine &TM) {
return new X86MCCodeEmitter(TM, true);
}