diff options
author | Adrian Prantl <aprantl@apple.com> | 2013-07-09 20:28:37 +0000 |
---|---|---|
committer | Adrian Prantl <aprantl@apple.com> | 2013-07-09 20:28:37 +0000 |
commit | 3517640443f0b5224e2a6414c246ac60016ee9d4 (patch) | |
tree | 011ad059026ee96743b0327cd32e41679c4f4021 /lib/CodeGen/AsmPrinter/AsmPrinter.cpp | |
parent | 7d185e4e5b1da7e07e1c3b9539e2c9bc8e983e62 (diff) | |
download | external_llvm-3517640443f0b5224e2a6414c246ac60016ee9d4.zip external_llvm-3517640443f0b5224e2a6414c246ac60016ee9d4.tar.gz external_llvm-3517640443f0b5224e2a6414c246ac60016ee9d4.tar.bz2 |
Reapply an improved version of r180816/180817.
Change the informal convention of DBG_VALUE machine instructions so that
we can express a register-indirect address with an offset of 0.
The old convention was that a DBG_VALUE is a register-indirect value if
the offset (operand 1) is nonzero. The new convention is that a DBG_VALUE
is register-indirect if the first operand is a register and the second
operand is an immediate. For plain register values the combination reg,
reg is used. MachineInstrBuilder::BuildMI knows how to build the new
DBG_VALUES.
rdar://problem/13658587
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185966 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/AsmPrinter/AsmPrinter.cpp')
-rw-r--r-- | lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 52e52b4..7c10bd6 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -570,8 +570,10 @@ static bool emitDebugValueComment(const MachineInstr *MI, AsmPrinter &AP) { } OS << V.getName() << " <- "; - int64_t Offset = MI->getOperand(1).getImm(); - bool Deref = false; + // The second operand is only an offset if it's an immediate. + bool Deref = MI->getOperand(0).isReg() && MI->getOperand(1).isImm(); + int64_t Offset = Deref ? MI->getOperand(1).getImm() : 0; + // Register or immediate value. Register 0 means undef. if (MI->getOperand(0).isFPImm()) { APFloat APF = APFloat(MI->getOperand(0).getFPImm()->getValueAPF()); @@ -595,8 +597,6 @@ static bool emitDebugValueComment(const MachineInstr *MI, AsmPrinter &AP) { unsigned Reg; if (MI->getOperand(0).isReg()) { Reg = MI->getOperand(0).getReg(); - Deref = Offset != 0; // FIXME: use a better sentinel value so that deref - // of a reg with a zero offset is valid } else { assert(MI->getOperand(0).isFI() && "Unknown operand type"); const TargetFrameLowering *TFI = AP.TM.getFrameLowering(); @@ -616,10 +616,9 @@ static bool emitDebugValueComment(const MachineInstr *MI, AsmPrinter &AP) { OS << AP.TM.getRegisterInfo()->getName(Reg); } - if (Offset) - OS << '+' << Offset; if (Deref) - OS << ']'; + OS << '+' << Offset << ']'; + // NOTE: Want this comment at start of line, don't emit with AddComment. AP.OutStreamer.EmitRawText(OS.str()); return true; |