From c5e6d2f519b7f196fa3523c204977e7def9d0ded Mon Sep 17 00:00:00 2001
From: Evan Cheng <evan.cheng@apple.com>
Date: Mon, 11 Jul 2011 03:57:24 +0000
Subject: - Eliminate MCCodeEmitter's dependency on TargetMachine. It now uses
 MCInstrInfo   and MCSubtargetInfo. - Added methods to update subtarget
 features (used when targets automatically   detect subtarget features or
 switch modes). - Teach X86Subtarget to update MCSubtargetInfo features bits
 since the   MCSubtargetInfo layer can be shared with other modules. - These
 fixes .code 16 / .code 32 support since mode switch is updated in  
 MCSubtargetInfo so MC code emitter can do the right thing.

llvm-svn: 134884
---
 llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp | 12 ++++++++++++
 llvm/lib/Target/SystemZ/SystemZSubtarget.cpp |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'llvm/lib/Target/SystemZ')

diff --git a/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp b/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp
index fae9a6a6157..ae41d68d3e5 100644
--- a/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp
@@ -21,6 +21,7 @@
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/PseudoSourceValue.h"
+#include "llvm/Target/TargetRegistry.h"
 #include "llvm/Support/ErrorHandling.h"
 
 #define GET_INSTRINFO_CTOR
@@ -437,3 +438,14 @@ SystemZInstrInfo::getLongDispOpc(unsigned Opc) const {
   case SystemZ::MOV64Prm:  return get(SystemZ::MOV64Prmy);
   }
 }
+
+MCInstrInfo *createSystemZMCInstrInfo() {
+  MCInstrInfo *X = new MCInstrInfo();
+  InitSystemZMCInstrInfo(X);
+  return X;
+}
+
+extern "C" void LLVMInitializeSystemZMCInstrInfo() {
+  TargetRegistry::RegisterMCInstrInfo(TheSystemZTarget,
+                                      createSystemZMCInstrInfo);
+}
diff --git a/llvm/lib/Target/SystemZ/SystemZSubtarget.cpp b/llvm/lib/Target/SystemZ/SystemZSubtarget.cpp
index f6707f9a20d..fe3046b0cb0 100644
--- a/llvm/lib/Target/SystemZ/SystemZSubtarget.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZSubtarget.cpp
@@ -58,7 +58,7 @@ bool SystemZSubtarget::GVRequiresExtraLoad(const GlobalValue* GV,
 MCSubtargetInfo *createSystemZMCSubtargetInfo(StringRef TT, StringRef CPU,
                                               StringRef FS) {
   MCSubtargetInfo *X = new MCSubtargetInfo();
-  InitSystemZMCSubtargetInfo(X, CPU, FS);
+  InitSystemZMCSubtargetInfo(X, TT, CPU, FS);
   return X;
 }
 
-- 
cgit v1.2.3