parent
86bd194234
commit
9c9453e582
|
@ -50,7 +50,8 @@ FunctionPass *createX86JITCodeEmitterPass(X86TargetMachine &TM,
|
||||||
JITCodeEmitter &JCE);
|
JITCodeEmitter &JCE);
|
||||||
|
|
||||||
MCCodeEmitter *createHeinousX86MCCodeEmitter(const Target &, TargetMachine &TM);
|
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
|
/// createX86EmitCodeToMemory - Returns a pass that converts a register
|
||||||
/// allocated function into raw machine code in a dynamically
|
/// allocated function into raw machine code in a dynamically
|
||||||
|
|
|
@ -1117,8 +1117,11 @@ MCCodeEmitter *llvm::createHeinousX86MCCodeEmitter(const Target &T,
|
||||||
TargetMachine &TM) {
|
TargetMachine &TM) {
|
||||||
|
|
||||||
// FIXME: Remove the heinous one when the new one works.
|
// FIXME: Remove the heinous one when the new one works.
|
||||||
if (EnableNewEncoder)
|
if (EnableNewEncoder) {
|
||||||
return createX86MCCodeEmitter(T, TM);
|
if (TM.getTargetData()->getPointerSize() == 4)
|
||||||
|
return createX86_32MCCodeEmitter(T, TM);
|
||||||
|
return createX86_64MCCodeEmitter(T, TM);
|
||||||
|
}
|
||||||
|
|
||||||
return new X86MCCodeEmitter(static_cast<X86TargetMachine&>(TM));
|
return new X86MCCodeEmitter(static_cast<X86TargetMachine&>(TM));
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,10 +27,9 @@ class X86MCCodeEmitter : public MCCodeEmitter {
|
||||||
const TargetInstrInfo &TII;
|
const TargetInstrInfo &TII;
|
||||||
bool Is64BitMode;
|
bool Is64BitMode;
|
||||||
public:
|
public:
|
||||||
X86MCCodeEmitter(TargetMachine &tm)
|
X86MCCodeEmitter(TargetMachine &tm, bool is64Bit)
|
||||||
: TM(tm), TII(*TM.getInstrInfo()) {
|
: TM(tm), TII(*TM.getInstrInfo()) {
|
||||||
// FIXME: Get this from the right place.
|
Is64BitMode = is64Bit;
|
||||||
Is64BitMode = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
~X86MCCodeEmitter() {}
|
~X86MCCodeEmitter() {}
|
||||||
|
@ -83,9 +82,14 @@ public:
|
||||||
} // end anonymous namespace
|
} // end anonymous namespace
|
||||||
|
|
||||||
|
|
||||||
MCCodeEmitter *llvm::createX86MCCodeEmitter(const Target &,
|
MCCodeEmitter *llvm::createX86_32MCCodeEmitter(const Target &,
|
||||||
TargetMachine &TM) {
|
TargetMachine &TM) {
|
||||||
return new X86MCCodeEmitter(TM);
|
return new X86MCCodeEmitter(TM, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
MCCodeEmitter *llvm::createX86_64MCCodeEmitter(const Target &,
|
||||||
|
TargetMachine &TM) {
|
||||||
|
return new X86MCCodeEmitter(TM, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue