[llvm-commits] [llvm] r77878 - in /llvm/trunk/lib/Target/ARM: ARMTargetAsmInfo.cpp ARMTargetAsmInfo.h ARMTargetMachine.cpp
Chris Lattner
sabre at nondot.org
Sat Aug 1 22:23:52 PDT 2009
Author: lattner
Date: Sun Aug 2 00:23:52 2009
New Revision: 77878
URL: http://llvm.org/viewvc/llvm-project?rev=77878&view=rev
Log:
ARM TAI no longer needs a TM, but createTargetAsmInfo() still does.
Modified:
llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h
llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=77878&r1=77877&r2=77878&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Sun Aug 2 00:23:52 2009
@@ -12,9 +12,6 @@
//===----------------------------------------------------------------------===//
#include "ARMTargetAsmInfo.h"
-#include "ARMTargetMachine.h"
-#include <cstring>
-#include <cctype>
using namespace llvm;
const char *const llvm::arm_asm_table[] = {
@@ -43,10 +40,7 @@
0,0
};
-ARMDarwinTargetAsmInfo::ARMDarwinTargetAsmInfo(const ARMBaseTargetMachine &TM):
- ARMTargetAsmInfo<DarwinTargetAsmInfo>(TM) {
- Subtarget = &TM.getSubtarget<ARMSubtarget>();
-
+ARMDarwinTargetAsmInfo::ARMDarwinTargetAsmInfo() {
ZeroDirective = "\t.space\t";
ZeroFillDirective = "\t.zerofill\t"; // Uses .zerofill
SetDirective = "\t.set\t";
@@ -55,10 +49,7 @@
SupportsDebugInformation = true;
}
-ARMELFTargetAsmInfo::ARMELFTargetAsmInfo(const ARMBaseTargetMachine &TM):
- ARMTargetAsmInfo<TargetAsmInfo>(TM) {
- Subtarget = &TM.getSubtarget<ARMSubtarget>();
-
+ARMELFTargetAsmInfo::ARMELFTargetAsmInfo() {
NeedsSet = false;
HasLEB128 = true;
AbsoluteDebugSectionOffsets = true;
@@ -82,4 +73,5 @@
}
// Instantiate default implementation.
+TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<DarwinTargetAsmInfo>);
TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h?rev=77878&r1=77877&r2=77878&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h Sun Aug 2 00:23:52 2009
@@ -11,11 +11,9 @@
//
//===----------------------------------------------------------------------===//
-#ifndef ARMTARGETASMINFO_H
-#define ARMTARGETASMINFO_H
+#ifndef LLVM_ARMTARGETASMINFO_H
+#define LLVM_ARMTARGETASMINFO_H
-#include "ARMTargetMachine.h"
-#include "llvm/Target/TargetAsmInfo.h"
#include "llvm/Target/DarwinTargetAsmInfo.h"
#include "llvm/Support/Compiler.h"
@@ -25,7 +23,7 @@
template <class BaseTAI>
struct ARMTargetAsmInfo : public BaseTAI {
- explicit ARMTargetAsmInfo(const ARMBaseTargetMachine &TM) {
+ explicit ARMTargetAsmInfo() {
BaseTAI::AsmTransCBE = arm_asm_table;
BaseTAI::AlignmentIsInBytes = false;
@@ -36,18 +34,17 @@
BaseTAI::InlineAsmEnd = "@ InlineAsm End";
BaseTAI::LCOMMDirective = "\t.lcomm\t";
}
-
- const ARMSubtarget *Subtarget;
};
+ EXTERN_TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<DarwinTargetAsmInfo>);
EXTERN_TEMPLATE_INSTANTIATION(class ARMTargetAsmInfo<TargetAsmInfo>);
struct ARMDarwinTargetAsmInfo : public ARMTargetAsmInfo<DarwinTargetAsmInfo> {
- explicit ARMDarwinTargetAsmInfo(const ARMBaseTargetMachine &TM);
+ explicit ARMDarwinTargetAsmInfo();
};
struct ARMELFTargetAsmInfo : public ARMTargetAsmInfo<TargetAsmInfo> {
- explicit ARMELFTargetAsmInfo(const ARMBaseTargetMachine &TM);
+ explicit ARMELFTargetAsmInfo();
};
} // namespace llvm
Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=77878&r1=77877&r2=77878&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Sun Aug 2 00:23:52 2009
@@ -78,9 +78,9 @@
switch (Subtarget.TargetType) {
default: llvm_unreachable("Unknown ARM subtarget kind");
case ARMSubtarget::isDarwin:
- return new ARMDarwinTargetAsmInfo(*this);
+ return new ARMDarwinTargetAsmInfo();
case ARMSubtarget::isELF:
- return new ARMELFTargetAsmInfo(*this);
+ return new ARMELFTargetAsmInfo();
}
}
More information about the llvm-commits
mailing list