[llvm-commits] [llvm] r91871 - in /llvm/trunk/lib/Target/X86: Disassembler/X86Disassembler.cpp Disassembler/X86DisassemblerDecoder.c X86TargetMachine.cpp
Sean Callanan
scallanan at apple.com
Mon Dec 21 17:11:27 PST 2009
Author: spyffe
Date: Mon Dec 21 19:11:26 2009
New Revision: 91871
URL: http://llvm.org/viewvc/llvm-project?rev=91871&view=rev
Log:
Fixed library dependencies between the X86 disassembler and
X86 codegen that were causing circular symbol dependencies.
Modified:
llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp
llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c
llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
Modified: llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp?rev=91871&r1=91870&r2=91871&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp (original)
+++ llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp Mon Dec 21 19:11:26 2009
@@ -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 @@
};
}
+extern Target TheX86_32Target, TheX86_64Target;
+
}
static void translateInstruction(MCInst &target,
@@ -461,8 +463,3 @@
TargetRegistry::RegisterMCDisassembler(TheX86_64Target,
createX86_64Disassembler);
}
-
-#endif
-
-extern "C" void LLVMInitializeX86Disassembler() {
-}
Modified: llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c?rev=91871&r1=91870&r2=91871&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c (original)
+++ llvm/trunk/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c Mon Dec 21 19:11:26 2009
@@ -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 @@
return 0;
}
-
-#endif
-
-int X86DissemblerDecoder_dummy = 0;
Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=91871&r1=91870&r2=91871&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Mon Dec 21 19:11:26 2009
@@ -38,8 +38,6 @@
}
}
-extern "C" void LLVMInitializeX86Disassembler();
-
extern "C" void LLVMInitializeX86Target() {
// Register the target.
RegisterTargetMachine<X86_32TargetMachine> X(TheX86_32Target);
@@ -49,8 +47,6 @@
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);
More information about the llvm-commits
mailing list