[llvm-commits] [llvm] r168536 - in /llvm/trunk: include/llvm/MC/MCDwarf.h lib/MC/MCDwarf.cpp

Rafael Espindola rafael.espindola at gmail.com
Fri Nov 23 20:33:48 PST 2012


Author: rafael
Date: Fri Nov 23 22:33:48 2012
New Revision: 168536

URL: http://llvm.org/viewvc/llvm-project?rev=168536&view=rev
Log:
Change the representation of MCCFIInstruction.

We now store the Register and Offset directly. MachineLocation is gone (from
this file)!

Modified:
    llvm/trunk/include/llvm/MC/MCDwarf.h
    llvm/trunk/lib/MC/MCDwarf.cpp

Modified: llvm/trunk/include/llvm/MC/MCDwarf.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCDwarf.h?rev=168536&r1=168535&r2=168536&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCDwarf.h (original)
+++ llvm/trunk/include/llvm/MC/MCDwarf.h Fri Nov 23 22:33:48 2012
@@ -16,7 +16,6 @@
 #define LLVM_MC_MCDWARF_H
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/MC/MachineLocation.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/Dwarf.h"
 #include "llvm/Support/Compiler.h"
@@ -272,108 +271,102 @@
   private:
     OpType Operation;
     MCSymbol *Label;
-    // Move to & from location.
-    MachineLocation Destination;
-    MachineLocation Source;
+    unsigned Register;
+    int Offset;
     std::vector<char> Values;
-    MCCFIInstruction(OpType Op, MCSymbol *L, const MachineLocation &D,
-                     const MachineLocation &S, StringRef V) :
-      Operation(Op), Label(L), Destination(D), Source(S),
+
+    MCCFIInstruction(OpType Op, MCSymbol *L, unsigned R,
+                     int O, StringRef V) :
+      Operation(Op), Label(L), Register(R), Offset(O),
       Values(V.begin(), V.end()) {
     }
 
   public:
     static MCCFIInstruction
     createOffset(MCSymbol *L, unsigned Register, int Offset) {
-      MachineLocation Dest(Register, Offset);
-      MachineLocation Source(Register, Offset);
-      MCCFIInstruction Ret(OpOffset, L, Dest, Source, "");
+      MCCFIInstruction Ret(OpOffset, L, Register, Offset, "");
       return Ret;
     }
 
     static MCCFIInstruction
     createDefCfaRegister(MCSymbol *L, unsigned Register) {
-      MachineLocation Dest(Register);
-      MachineLocation Source(MachineLocation::VirtualFP);
-      MCCFIInstruction Ret(OpDefCfaRegister, L, Dest, Source, "");
+      MCCFIInstruction Ret(OpDefCfaRegister, L, Register, 0, "");
       return Ret;
     }
 
     static MCCFIInstruction createDefCfaOffset(MCSymbol *L, int Offset) {
-      MachineLocation Dest(MachineLocation::VirtualFP);
-      MachineLocation Source(MachineLocation::VirtualFP, -Offset);
-      MCCFIInstruction Ret(OpDefCfaOffset, L, Dest, Source, "");
+      MCCFIInstruction Ret(OpDefCfaOffset, L, 0, -Offset, "");
       return Ret;
     }
 
     static MCCFIInstruction
     createDefCfa(MCSymbol *L, unsigned Register, int Offset) {
-      MachineLocation Dest(MachineLocation::VirtualFP);
-      MachineLocation Source(Register, -Offset);
-      MCCFIInstruction Ret(OpDefCfa, L, Dest, Source, "");
+      MCCFIInstruction Ret(OpDefCfa, L, Register, -Offset, "");
       return Ret;
     }
 
     static MCCFIInstruction createUndefined(MCSymbol *L, unsigned Register) {
-      MachineLocation Dummy;
-      MachineLocation Dest(Register);
-      MCCFIInstruction Ret(OpUndefined, L, Dest, Dummy, "");
+      MCCFIInstruction Ret(OpUndefined, L, Register, 0, "");
       return Ret;
     }
 
     static MCCFIInstruction createRestore(MCSymbol *L, unsigned Register) {
-      MachineLocation Dummy;
-      MachineLocation Dest(Register);
-      MCCFIInstruction Ret(OpRestore, L, Dest, Dummy, "");
+      MCCFIInstruction Ret(OpRestore, L, Register, 0, "");
       return Ret;
     }
 
     static MCCFIInstruction createSameValue(MCSymbol *L, unsigned Register) {
-      MachineLocation Dummy;
-      MachineLocation Dest(Register);
-      MCCFIInstruction Ret(OpSameValue, L, Dest, Dummy, "");
+      MCCFIInstruction Ret(OpSameValue, L, Register, 0, "");
       return Ret;
     }
 
     static MCCFIInstruction createRestoreState(MCSymbol *L) {
-      MachineLocation Dummy;
-      MCCFIInstruction Ret(OpRestoreState, L, Dummy, Dummy, "");
+      MCCFIInstruction Ret(OpRestoreState, L, 0, 0, "");
       return Ret;
     }
 
     static MCCFIInstruction createRememberState(MCSymbol *L) {
-      MachineLocation Dummy;
-      MCCFIInstruction Ret(OpRememberState, L, Dummy, Dummy, "");
+      MCCFIInstruction Ret(OpRememberState, L, 0, 0, "");
       return Ret;
     }
 
     static MCCFIInstruction
     createRelOffset(MCSymbol *L, unsigned Register, int Offset) {
-      MachineLocation Dest(Register, Offset);
-      MachineLocation Source(Register, Offset);
-      MCCFIInstruction Ret(OpRelOffset, L, Dest, Source, "");
+      MCCFIInstruction Ret(OpRelOffset, L, Register, Offset, "");
       return Ret;
     }
 
     static MCCFIInstruction
     createAdjustCfaOffset(MCSymbol *L, int Adjustment) {
-      MachineLocation Dest(MachineLocation::VirtualFP);
-      MachineLocation Source(MachineLocation::VirtualFP, Adjustment);
-      MCCFIInstruction Ret(OpAdjustCfaOffset, L, Dest, Source, "");
+      MCCFIInstruction Ret(OpAdjustCfaOffset, L, 0, Adjustment, "");
       return Ret;
     }
 
     static MCCFIInstruction createEscape(MCSymbol *L, StringRef Vals) {
-      MachineLocation Dummy;
-      MCCFIInstruction Ret(OpEscape, L, Dummy, Dummy, Vals);
+      MCCFIInstruction Ret(OpEscape, L, 0, 0, Vals);
       return Ret;
     }
 
     OpType getOperation() const { return Operation; }
     MCSymbol *getLabel() const { return Label; }
-    const MachineLocation &getDestination() const { return Destination; }
-    const MachineLocation &getSource() const { return Source; }
+
+    unsigned getRegister() const {
+      assert(Operation == OpDefCfa || Operation == OpOffset ||
+             Operation == OpRestore || Operation == OpUndefined ||
+             Operation == OpSameValue || Operation == OpDefCfaRegister ||
+             Operation == OpRelOffset);
+      return Register;
+    }
+
+    int getOffset() const {
+      assert(Operation == OpDefCfa || Operation == OpOffset ||
+             Operation == OpRelOffset || Operation == OpDefCfaOffset ||
+             Operation == OpAdjustCfaOffset);
+      return Offset;
+    }
+
     const StringRef getValues() const {
+      assert(Operation == OpEscape);
       return StringRef(&Values[0], Values.size());
     }
   };

Modified: llvm/trunk/lib/MC/MCDwarf.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDwarf.cpp?rev=168536&r1=168535&r2=168536&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDwarf.cpp (original)
+++ llvm/trunk/lib/MC/MCDwarf.cpp Fri Nov 23 22:33:48 2012
@@ -939,7 +939,7 @@
 
   switch (Instr.getOperation()) {
   case MCCFIInstruction::OpUndefined: {
-    unsigned Reg = Instr.getDestination().getReg();
+    unsigned Reg = Instr.getRegister();
     if (VerboseAsm) {
       Streamer.AddComment("DW_CFA_undefined");
       Streamer.AddComment(Twine("Reg ") + Twine(Reg));
@@ -950,7 +950,6 @@
   }
   case MCCFIInstruction::OpAdjustCfaOffset:
   case MCCFIInstruction::OpDefCfaOffset: {
-    const MachineLocation &Src = Instr.getSource();
     const bool IsRelative =
       Instr.getOperation() == MCCFIInstruction::OpAdjustCfaOffset;
 
@@ -959,9 +958,9 @@
     Streamer.EmitIntValue(dwarf::DW_CFA_def_cfa_offset, 1);
 
     if (IsRelative)
-      CFAOffset += Src.getOffset();
+      CFAOffset += Instr.getOffset();
     else
-      CFAOffset = -Src.getOffset();
+      CFAOffset = -Instr.getOffset();
 
     if (VerboseAsm)
       Streamer.AddComment(Twine("Offset " + Twine(CFAOffset)));
@@ -970,17 +969,15 @@
     return;
   }
   case MCCFIInstruction::OpDefCfa: {
-    const MachineLocation &Src = Instr.getSource();
-
     if (VerboseAsm)
       Streamer.AddComment("DW_CFA_def_cfa");
     Streamer.EmitIntValue(dwarf::DW_CFA_def_cfa, 1);
 
     if (VerboseAsm)
-      Streamer.AddComment(Twine("Reg ") + Twine(Src.getReg()));
-    Streamer.EmitULEB128IntValue(Src.getReg());
+      Streamer.AddComment(Twine("Reg ") + Twine(Instr.getRegister()));
+    Streamer.EmitULEB128IntValue(Instr.getRegister());
 
-    CFAOffset = -Src.getOffset();
+    CFAOffset = -Instr.getOffset();
 
     if (VerboseAsm)
       Streamer.AddComment(Twine("Offset " + Twine(CFAOffset)));
@@ -990,29 +987,24 @@
   }
 
   case MCCFIInstruction::OpDefCfaRegister: {
-    const MachineLocation &Dst = Instr.getDestination();
-
-    assert(Dst.isReg() && "Machine move not supported yet.");
     if (VerboseAsm)
       Streamer.AddComment("DW_CFA_def_cfa_register");
     Streamer.EmitIntValue(dwarf::DW_CFA_def_cfa_register, 1);
 
     if (VerboseAsm)
-      Streamer.AddComment(Twine("Reg ") + Twine(Dst.getReg()));
-    Streamer.EmitULEB128IntValue(Dst.getReg());
+      Streamer.AddComment(Twine("Reg ") + Twine(Instr.getRegister()));
+    Streamer.EmitULEB128IntValue(Instr.getRegister());
 
     return;
   }
 
   case MCCFIInstruction::OpOffset:
   case MCCFIInstruction::OpRelOffset: {
-    const MachineLocation &Dst = Instr.getDestination();
-    const MachineLocation &Src = Instr.getSource();
     const bool IsRelative =
       Instr.getOperation() == MCCFIInstruction::OpRelOffset;
 
-    unsigned Reg = Src.getReg();
-    int Offset = Dst.getOffset();
+    unsigned Reg = Instr.getRegister();
+    int Offset = Instr.getOffset();
     if (IsRelative)
       Offset -= CFAOffset;
     Offset = Offset / dataAlignmentFactor;
@@ -1049,7 +1041,7 @@
     Streamer.EmitIntValue(dwarf::DW_CFA_restore_state, 1);
     return;
   case MCCFIInstruction::OpSameValue: {
-    unsigned Reg = Instr.getDestination().getReg();
+    unsigned Reg = Instr.getRegister();
     if (VerboseAsm) Streamer.AddComment("DW_CFA_same_value");
     Streamer.EmitIntValue(dwarf::DW_CFA_same_value, 1);
     if (VerboseAsm) Streamer.AddComment(Twine("Reg ") + Twine(Reg));
@@ -1057,7 +1049,7 @@
     return;
   }
   case MCCFIInstruction::OpRestore: {
-    unsigned Reg = Instr.getDestination().getReg();
+    unsigned Reg = Instr.getRegister();
     if (VerboseAsm) {
       Streamer.AddComment("DW_CFA_restore");
       Streamer.AddComment(Twine("Reg ") + Twine(Reg));





More information about the llvm-commits mailing list