[llvm-commits] [llvm] r95256 - in /llvm/trunk/lib/Target/X86: CMakeLists.txt X86.h X86CodeEmitter.cpp X86MCCodeEmitter.cpp X86TargetMachine.cpp

[Chris Lattner]

Author: lattner
Date: Wed Feb  3 15:24:49 2010
New Revision: 95256

URL: http://llvm.org/viewvc/llvm-project?rev=95256&view=rev
Log:
stub out a new X86 encoder, which can be tried with
-enable-new-x86-encoder until its stable.

Added:
    llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp
Modified:
    llvm/trunk/lib/Target/X86/CMakeLists.txt
    llvm/trunk/lib/Target/X86/X86.h
    llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp
    llvm/trunk/lib/Target/X86/X86TargetMachine.cpp

Modified: llvm/trunk/lib/Target/X86/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/CMakeLists.txt?rev=95256&r1=95255&r2=95256&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/X86/CMakeLists.txt Wed Feb  3 15:24:49 2010
@@ -25,6 +25,7 @@
   X86InstrInfo.cpp
   X86JITInfo.cpp
   X86MCAsmInfo.cpp
+  X86MCCodeEmitter.cpp 
   X86RegisterInfo.cpp
   X86Subtarget.cpp
   X86TargetMachine.cpp

Modified: llvm/trunk/lib/Target/X86/X86.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86.h?rev=95256&r1=95255&r2=95256&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86.h (original)
+++ llvm/trunk/lib/Target/X86/X86.h Wed Feb  3 15:24:49 2010
@@ -50,6 +50,7 @@
                                           JITCodeEmitter &JCE);
 
 MCCodeEmitter *createHeinousX86MCCodeEmitter(const Target &, TargetMachine &TM);
+MCCodeEmitter *createX86MCCodeEmitter(const Target &, TargetMachine &TM);
 
 /// createX86EmitCodeToMemory - Returns a pass that converts a register
 /// allocated function into raw machine code in a dynamically

Modified: llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp?rev=95256&r1=95255&r2=95256&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp Wed Feb  3 15:24:49 2010
@@ -1099,8 +1099,19 @@
 };
 }
 
+#include "llvm/Support/CommandLine.h"
+
+static cl::opt<bool> EnableNewEncoder("enable-new-x86-encoder",
+                                      cl::ReallyHidden);
+
+
 // Ok, now you can look.
-MCCodeEmitter *llvm::createHeinousX86MCCodeEmitter(const Target &,
+MCCodeEmitter *llvm::createHeinousX86MCCodeEmitter(const Target &T,
                                                    TargetMachine &TM) {
+  
+  // FIXME: Remove the heinous one when the new one works.
+  if (EnableNewEncoder)
+    return createX86MCCodeEmitter(T, TM);
+
   return new X86MCCodeEmitter(static_cast<X86TargetMachine&>(TM));
 }

Added: llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp?rev=95256&view=auto

==============================================================================
--- llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp (added)
+++ llvm/trunk/lib/Target/X86/X86MCCodeEmitter.cpp Wed Feb  3 15:24:49 2010
@@ -0,0 +1,41 @@
+//===-- X86/X86MCCodeEmitter.cpp - Convert X86 code to machine code -------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the X86MCCodeEmitter class.
+//
+//===----------------------------------------------------------------------===//
+
+#define DEBUG_TYPE "x86-emitter"
+#include "X86.h"
+#include "X86TargetMachine.h"
+#include "llvm/MC/MCCodeEmitter.h"
+using namespace llvm;
+
+namespace {
+class X86MCCodeEmitter : public MCCodeEmitter {
+  X86MCCodeEmitter(const X86MCCodeEmitter &); // DO NOT IMPLEMENT
+  void operator=(const X86MCCodeEmitter &); // DO NOT IMPLEMENT
+  X86TargetMachine &TM;
+public:
+  X86MCCodeEmitter(X86TargetMachine &tm) : TM(tm) {
+  }
+
+  ~X86MCCodeEmitter() {}
+  
+  void EncodeInstruction(const MCInst &MI, raw_ostream &OS) const {
+  }
+};
+
+} // end anonymous namespace
+
+
+MCCodeEmitter *llvm::createX86MCCodeEmitter(const Target &,
+                                            TargetMachine &TM) {
+  return new X86MCCodeEmitter(static_cast<X86TargetMachine&>(TM));
+}

Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=95256&r1=95255&r2=95256&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Wed Feb  3 15:24:49 2010
@@ -48,6 +48,7 @@
   RegisterAsmInfoFn B(TheX86_64Target, createMCAsmInfo);
 
   // Register the code emitter.
+  // FIXME: Remove the heinous one when the new one works.
   TargetRegistry::RegisterCodeEmitter(TheX86_32Target,
                                       createHeinousX86MCCodeEmitter);
   TargetRegistry::RegisterCodeEmitter(TheX86_64Target,