Changes in directory llvm/lib/Target/X86:
X86CodeEmitter.cpp updated: 1.128 -> 1.129
X86ISelLowering.cpp updated: 1.315 -> 1.316
X86InstrInfo.cpp updated: 1.76 -> 1.77
X86InstrInfo.h updated: 1.61 -> 1.62
X86InstrInfo.td updated: 1.298 -> 1.299
X86RegisterInfo.cpp updated: 1.196 -> 1.197
---
Log message:
Make LABEL a builtin opcode.
---
Diffs of the changes: (+5 -20)
X86CodeEmitter.cpp | 2 ++
X86ISelLowering.cpp | 2 +-
X86InstrInfo.cpp | 8 --------
X86InstrInfo.h | 5 -----
X86InstrInfo.td | 4 ----
X86RegisterInfo.cpp | 4 ++--
6 files changed, 5 insertions(+), 20 deletions(-)
Index: llvm/lib/Target/X86/X86CodeEmitter.cpp
diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.128
llvm/lib/Target/X86/X86CodeEmitter.cpp:1.129
--- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.128 Tue Dec 19 16:59:26 2006
+++ llvm/lib/Target/X86/X86CodeEmitter.cpp Fri Jan 26 08:34:51 2007
@@ -630,6 +630,8 @@
assert(0 && "psuedo instructions should be removed before code
emission");
case TargetInstrInfo::INLINEASM:
assert(0 && "JIT does not support inline asm!\n");
+ case TargetInstrInfo::LABEL:
+ assert(0 && "JIT does not support meta labels!\n");
case X86::IMPLICIT_USE:
case X86::IMPLICIT_DEF:
case X86::IMPLICIT_DEF_GR8:
Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.315
llvm/lib/Target/X86/X86ISelLowering.cpp:1.316
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.315 Mon Jan 22 15:34:25 2007
+++ llvm/lib/Target/X86/X86ISelLowering.cpp Fri Jan 26 08:34:51 2007
@@ -235,7 +235,7 @@
if (!Subtarget->isTargetDarwin() &&
!Subtarget->isTargetELF() &&
!Subtarget->isTargetCygMing())
- setOperationAction(ISD::DEBUG_LABEL, MVT::Other, Expand);
+ setOperationAction(ISD::LABEL, MVT::Other, Expand);
// VASTART needs to be custom lowered to use the VarArgsFrameIndex
setOperationAction(ISD::VASTART , MVT::Other, Custom);
Index: llvm/lib/Target/X86/X86InstrInfo.cpp
diff -u llvm/lib/Target/X86/X86InstrInfo.cpp:1.76
llvm/lib/Target/X86/X86InstrInfo.cpp:1.77
--- llvm/lib/Target/X86/X86InstrInfo.cpp:1.76 Fri Dec 1 15:52:41 2006
+++ llvm/lib/Target/X86/X86InstrInfo.cpp Fri Jan 26 08:34:51 2007
@@ -26,14 +26,6 @@
TM(tm), RI(tm, *this) {
}
-/// getDWARF_LABELOpcode - Return the opcode of the target's DWARF_LABEL
-/// instruction if it has one. This is used by codegen passes that update
-/// DWARF line number info as they modify the code.
-unsigned X86InstrInfo::getDWARF_LABELOpcode() const {
- return X86::DWARF_LABEL;
-}
-
-
bool X86InstrInfo::isMoveInstr(const MachineInstr& MI,
unsigned& sourceReg,
unsigned& destReg) const {
Index: llvm/lib/Target/X86/X86InstrInfo.h
diff -u llvm/lib/Target/X86/X86InstrInfo.h:1.61
llvm/lib/Target/X86/X86InstrInfo.h:1.62
--- llvm/lib/Target/X86/X86InstrInfo.h:1.61 Mon Dec 4 22:01:03 2006
+++ llvm/lib/Target/X86/X86InstrInfo.h Fri Jan 26 08:34:52 2007
@@ -237,11 +237,6 @@
unsigned isLoadFromStackSlot(MachineInstr *MI, int &FrameIndex) const;
unsigned isStoreToStackSlot(MachineInstr *MI, int &FrameIndex) const;
- /// getDWARF_LABELOpcode - Return the opcode of the target's DWARF_LABEL
- /// instruction if it has one. This is used by codegen passes that update
- /// DWARF line number info as they modify the code.
- virtual unsigned getDWARF_LABELOpcode() const;
-
/// convertToThreeAddress - This method must be implemented by targets that
/// set the M_CONVERTIBLE_TO_3_ADDR flag. When this flag is set, the target
/// may be able to convert a two-address instruction into a true
Index: llvm/lib/Target/X86/X86InstrInfo.td
diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.298
llvm/lib/Target/X86/X86InstrInfo.td:1.299
--- llvm/lib/Target/X86/X86InstrInfo.td:1.298 Wed Jan 24 12:31:00 2007
+++ llvm/lib/Target/X86/X86InstrInfo.td Fri Jan 26 08:34:52 2007
@@ -2449,10 +2449,6 @@
[(dwarf_loc (i32 imm:$line), (i32 imm:$col),
(i32 imm:$file))]>;
-def DWARF_LABEL : I<0, Pseudo, (ops i32imm:$id),
- "\n${:private}debug_loc${id:debug}:",
- [(dwarf_label (i32 imm:$id))]>;
-
//===----------------------------------------------------------------------===//
// Non-Instruction Patterns
//===----------------------------------------------------------------------===//
Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.196
llvm/lib/Target/X86/X86RegisterInfo.cpp:1.197
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.196 Wed Jan 24 13:15:24 2007
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp Fri Jan 26 08:34:52 2007
@@ -1026,7 +1026,7 @@
if (hasInfo) {
// Mark effective beginning of when frame pointer becomes valid.
FrameLabelId = DebugInfo->NextLabelID();
- BuildMI(MBB, MBBI, TII.get(X86::DWARF_LABEL)).addImm(FrameLabelId);
+ BuildMI(MBB, MBBI, TII.get(X86::LABEL)).addImm(FrameLabelId);
}
if (hasFP(MF)) {
@@ -1078,7 +1078,7 @@
// Mark effective beginning of when frame pointer is ready.
unsigned ReadyLabelId = DebugInfo->NextLabelID();
- BuildMI(MBB, MBBI, TII.get(X86::DWARF_LABEL)).addImm(ReadyLabelId);
+ BuildMI(MBB, MBBI, TII.get(X86::LABEL)).addImm(ReadyLabelId);
MachineLocation FPDst(hasFP(MF) ? FramePtr : StackPtr);
MachineLocation FPSrc(MachineLocation::VirtualFP);
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
