summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e733e54)
raw | patch | inline | side by side (parent: e733e54)
author | Adrian Prantl <aprantl@apple.com> | |
Wed, 14 Jan 2015 01:01:28 +0000 (01:01 +0000) | ||
committer | Adrian Prantl <aprantl@apple.com> | |
Wed, 14 Jan 2015 01:01:28 +0000 (01:01 +0000) |
status in a bool and let the users deal with the error.
NFC.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225899 91177308-0d34-0410-b5e6-96231b3b80d8
NFC.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225899 91177308-0d34-0410-b5e6-96231b3b80d8
lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp | patch | blob | history | |
lib/CodeGen/AsmPrinter/DwarfExpression.cpp | patch | blob | history | |
lib/CodeGen/AsmPrinter/DwarfExpression.h | patch | blob | history |
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp b/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp
index b13f394b4c0786f541ea7a0ccee1c6a84fb80142..e02b05c5fbd48f1e01ada46c1be68e4493be4561 100644 (file)
"nop (could not find a dwarf register number)");
// Attempt to find a valid super- or sub-register.
- return Expr.AddMachineRegPiece(MLoc.getReg());
+ if (!Expr.AddMachineRegPiece(MLoc.getReg()))
+ Expr.EmitOp(dwarf::DW_OP_nop,
+ "nop (could not find a dwarf register number)");
+ return;
}
if (MLoc.isIndirect())
diff --git a/lib/CodeGen/AsmPrinter/DwarfExpression.cpp b/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
index 4c16ae70d1f344147d134c92acd91977568db65c..948dc92e25e51ae81c6aa6865510834ba9670447 100644 (file)
return true;
}
-void DwarfExpression::AddMachineRegPiece(unsigned MachineReg,
+bool DwarfExpression::AddMachineRegPiece(unsigned MachineReg,
unsigned PieceSizeInBits,
unsigned PieceOffsetInBits) {
const TargetRegisterInfo *TRI = getTRI();
AddReg(Reg);
if (PieceSizeInBits)
AddOpPiece(PieceSizeInBits, PieceOffsetInBits);
- return;
+ return true;
}
// Walk up the super-register chain until we find a valid number.
AddShr(RegOffset);
AddOpPiece(Size, PieceOffsetInBits);
}
- return;
+ return true;
}
}
}
}
- if (CurPos == PieceOffsetInBits)
- // FIXME: We have no reasonable way of handling errors in here.
- EmitOp(dwarf::DW_OP_nop, "nop (could not find a dwarf register number)");
+ return CurPos > PieceOffsetInBits;
}
void DwarfExpression::AddSignedConstant(int Value) {
return OffsetInBits;
}
-void DwarfExpression::AddMachineRegExpression(DIExpression Expr,
+bool DwarfExpression::AddMachineRegExpression(DIExpression Expr,
unsigned MachineReg,
unsigned PieceOffsetInBits) {
unsigned N = Expr.getNumElements();
unsigned I = 0;
+ bool ValidReg = false;
// Pattern-match combinations for which more efficient representations exist
// first.
if (N >= 3 && Expr.getElement(0) == dwarf::DW_OP_piece) {
unsigned SizeOfByte = 8;
unsigned OffsetInBits = Expr.getElement(1) * SizeOfByte;
unsigned SizeInBits = Expr.getElement(2) * SizeOfByte;
- AddMachineRegPiece(MachineReg, SizeInBits,
- getOffsetOrZero(OffsetInBits, PieceOffsetInBits));
+ ValidReg =
+ AddMachineRegPiece(MachineReg, SizeInBits,
+ getOffsetOrZero(OffsetInBits, PieceOffsetInBits));
I = 3;
} else if (N >= 3 && Expr.getElement(0) == dwarf::DW_OP_plus &&
Expr.getElement(2) == dwarf::DW_OP_deref) {
// [DW_OP_reg,Offset,DW_OP_plus,DW_OP_deref] --> [DW_OP_breg,Offset].
unsigned Offset = Expr.getElement(1);
- AddMachineRegIndirect(MachineReg, Offset);
+ ValidReg = AddMachineRegIndirect(MachineReg, Offset);
I = 3;
} else if (N >= 1 && Expr.getElement(0) == dwarf::DW_OP_deref) {
// [DW_OP_reg,DW_OP_deref] --> [DW_OP_breg].
- AddMachineRegIndirect(MachineReg);
+ ValidReg = AddMachineRegIndirect(MachineReg);
I = 1;
} else
- AddMachineRegPiece(MachineReg);
+ ValidReg = AddMachineRegPiece(MachineReg);
+
+ if (!ValidReg)
+ return false;
// Emit remaining elements of the expression.
AddExpression(Expr, I);
+ return true;
}
void DwarfExpression::AddExpression(DIExpression Expr, unsigned I,
index 4df958c5a033a666a913eda917f2f73c403768fb..c31d75355f9495566b4a981335ee664ae3d8acd9 100644 (file)
void AddShr(unsigned ShiftBy);
/// Emit an indirect dwarf register operation for the given machine register.
- /// Returns false if no DWARF register exists for MachineReg.
+ /// \return false if no DWARF register exists for MachineReg.
bool AddMachineRegIndirect(unsigned MachineReg, int Offset = 0);
/// \brief Emit a partial DWARF register operation.
/// function will attempt to emit a DWARF register by emitting a
/// piece of a super-register or by piecing together multiple
/// subregisters that alias the register.
- void AddMachineRegPiece(unsigned MachineReg, unsigned PieceSizeInBits = 0,
+ ///
+ /// \return false if no DWARF register exists for MachineReg.
+ bool AddMachineRegPiece(unsigned MachineReg, unsigned PieceSizeInBits = 0,
unsigned PieceOffsetInBits = 0);
/// Emit a signed constant.
/// Emit an entire DIExpression on top of a machine register location.
/// \param PieceOffsetInBits If this is one piece out of a fragmented
/// location, this is the offset of the piece inside the entire variable.
- void AddMachineRegExpression(DIExpression Expr, unsigned MachineReg,
+ /// \return false if no DWARF register exists for MachineReg.
+ bool AddMachineRegExpression(DIExpression Expr, unsigned MachineReg,
unsigned PieceOffsetInBits = 0);
/// Emit a the operations in a DIExpression, starting from element I.
/// \param PieceOffsetInBits If this is one piece out of a fragmented