6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-17 04:24:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix last bits of MC layer issues. llvm-mc doesn't need to initialize TargetMachine's anymore.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135963 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng
2011-07-25 20:53:02 +00:00
parent af6981f2f5
commit 1b0fc9b418
8 changed files with 27 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/MC/MCDisassembler/EDDisassembler.cpp
View File

@ -34,8 +34,6 @@
#include "llvm/Support/MemoryObject.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Target/TargetRegistry.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/Target/TargetSelect.h"
using namespace llvm;
@ -107,7 +105,6 @@ void EDDisassembler::initialize() {
sInitialized = true;
InitializeAllTargetInfos();
InitializeAllTargets();
InitializeAllTargetMCs();
InitializeAllAsmPrinters();
InitializeAllAsmParsers();
@ -170,29 +167,18 @@ EDDisassembler::EDDisassembler(CPUKey &key) :
if (!Tgt)
return;
std::string CPU;
std::string featureString;
TargetMachine.reset(Tgt->createTargetMachine(tripleString, CPU,
featureString));
MRI.reset(Tgt->createMCRegInfo(tripleString));
// FIXME: It shouldn't be using TargetRegisterInfo!
const TargetRegisterInfo *registerInfo = TargetMachine->getRegisterInfo();
if (!registerInfo)
if (!MRI)
return;
initMaps(*registerInfo);
initMaps(*MRI);
AsmInfo.reset(Tgt->createMCAsmInfo(tripleString));
if (!AsmInfo)
return;
MRI.reset(Tgt->createMCRegInfo(tripleString));
if (!MRI)
return;
Disassembler.reset(Tgt->createMCDisassembler());
if (!Disassembler)
@ -208,10 +194,10 @@ EDDisassembler::EDDisassembler(CPUKey &key) :
return;
GenericAsmLexer.reset(new AsmLexer(*AsmInfo));
SpecificAsmLexer.reset(Tgt->createAsmLexer(*AsmInfo));
SpecificAsmLexer.reset(Tgt->createAsmLexer(*MRI, *AsmInfo));
SpecificAsmLexer->InstallLexer(*GenericAsmLexer);
initMaps(*TargetMachine->getRegisterInfo());
initMaps(*MRI);
Valid = true;
}
@ -273,7 +259,7 @@ EDInst *EDDisassembler::createInst(EDByteReaderCallback byteReader,
}
}
void EDDisassembler::initMaps(const TargetRegisterInfo &registerInfo) {
void EDDisassembler::initMaps(const MCRegisterInfo &registerInfo) {
unsigned numRegisters = registerInfo.getNumRegs();
unsigned registerIndex;