RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-29 14:40:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed library dependencies between the X86 disassembler and

Browse Source 
X86 codegen that were causing circular symbol dependencies.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91871 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sean Callanan 2009-12-22 01:11:26 +00:00
parent 9b96ecaffa
commit 0122c9051a
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Target/X86/Disassembler/X86Disassembler.cpp
View File

@ -14,11 +14,8 @@
//
//===----------------------------------------------------------------------===//
#if 0
#include "X86Disassembler.h"
#include "X86DisassemblerDecoder.h"
#include "X86InstrInfo.h"
#include "llvm/MC/MCDisassembler.h"
#include "llvm/MC/MCDisassembler.h"
@ -27,6 +24,9 @@
#include "llvm/Support/MemoryObject.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include "../X86GenRegisterNames.inc"
using namespace llvm;
using namespace llvm::X86Disassembler;
@ -46,6 +46,8 @@ namespace X86 {
};
}
extern Target TheX86_32Target, TheX86_64Target;
}
static void translateInstruction(MCInst &target,
@ -461,8 +463,3 @@ extern "C" void LLVMInitializeX86Disassembler() {
TargetRegistry::RegisterMCDisassembler(TheX86_64Target,
createX86_64Disassembler);
}
#endif
extern "C" void LLVMInitializeX86Disassembler() {
}

6
lib/Target/X86/Disassembler/X86DisassemblerDecoder.c
View File

@ -13,8 +13,6 @@
*
*===----------------------------------------------------------------------===*/
#if 0
#include <assert.h> /* for assert() */
#include <stdarg.h> /* for va_*() */
#include <stdio.h> /* for vsnprintf() */
@ -1361,7 +1359,3 @@ int decodeInstruction(struct InternalInstruction* insn,
return 0;
}
#endif
int X86DissemblerDecoder_dummy = 0;

4
lib/Target/X86/X86TargetMachine.cpp
View File

@ -38,8 +38,6 @@ static const MCAsmInfo *createMCAsmInfo(const Target &T, StringRef TT) {
}
}
extern "C" void LLVMInitializeX86Disassembler();
extern "C" void LLVMInitializeX86Target() {
// Register the target.
RegisterTargetMachine<X86_32TargetMachine> X(TheX86_32Target);
@ -49,8 +47,6 @@ extern "C" void LLVMInitializeX86Target() {
RegisterAsmInfoFn A(TheX86_32Target, createMCAsmInfo);
RegisterAsmInfoFn B(TheX86_64Target, createMCAsmInfo);
LLVMInitializeX86Disassembler();
// Register the code emitter.
TargetRegistry::RegisterCodeEmitter(TheX86_32Target, createX86MCCodeEmitter);
TargetRegistry::RegisterCodeEmitter(TheX86_64Target, createX86MCCodeEmitter);