1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00

Make DwarfExpression use the new DIExpressionIterator. NFC.

llvm-svn: 226748
This commit is contained in:
Adrian Prantl 2015-01-22 00:00:59 +00:00
parent 919936d65f
commit 59be0cc8b7
2 changed files with 36 additions and 30 deletions

View File

@ -200,55 +200,62 @@ static unsigned getOffsetOrZero(unsigned OffsetInBits,
bool DwarfExpression::AddMachineRegExpression(DIExpression Expr,
unsigned MachineReg,
unsigned PieceOffsetInBits) {
unsigned N = Expr.getNumElements();
unsigned I = 0;
bool ValidReg = false;
auto I = Expr.begin();
// Pattern-match combinations for which more efficient representations exist
// first.
if (N >= 3 && Expr.getElement(0) == dwarf::DW_OP_piece) {
if (I == Expr.end())
return AddMachineRegPiece(MachineReg);
bool ValidReg = false;
switch (*I) {
case dwarf::DW_OP_piece: {
unsigned SizeOfByte = 8;
unsigned OffsetInBits = Expr.getElement(1) * SizeOfByte;
unsigned SizeInBits = Expr.getElement(2) * SizeOfByte;
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) {
unsigned OffsetInBits = I.getArg(1) * SizeOfByte;
unsigned SizeInBits = I.getArg(2) * SizeOfByte;
// Piece always comes at the end of the expression.
return AddMachineRegPiece(MachineReg, SizeInBits,
getOffsetOrZero(OffsetInBits, PieceOffsetInBits));
}
case dwarf::DW_OP_plus:
// [DW_OP_reg,Offset,DW_OP_plus,DW_OP_deref] --> [DW_OP_breg,Offset].
unsigned Offset = Expr.getElement(1);
ValidReg = AddMachineRegIndirect(MachineReg, Offset);
I = 3;
} else if (N >= 1 && Expr.getElement(0) == dwarf::DW_OP_deref) {
if (*std::next(I) == dwarf::DW_OP_deref) {
unsigned Offset = I.getArg(1);
ValidReg = AddMachineRegIndirect(MachineReg, Offset);
std::advance(I, 2);
break;
} else
ValidReg = AddMachineRegPiece(MachineReg);
case dwarf::DW_OP_deref:
// [DW_OP_reg,DW_OP_deref] --> [DW_OP_breg].
ValidReg = AddMachineRegIndirect(MachineReg);
I = 1;
} else
ValidReg = AddMachineRegPiece(MachineReg);
++I;
break;
default:
llvm_unreachable("unsupported operand");
}
if (!ValidReg)
return false;
// Emit remaining elements of the expression.
AddExpression(Expr, I);
AddExpression(I, PieceOffsetInBits);
return true;
}
void DwarfExpression::AddExpression(DIExpression Expr, unsigned I,
void DwarfExpression::AddExpression(DIExpressionIterator I,
unsigned PieceOffsetInBits) {
unsigned N = Expr.getNumElements();
for (; I < N; ++I) {
switch (Expr.getElement(I)) {
for (; I != DIExpressionIterator(); ++I) {
switch (*I) {
case dwarf::DW_OP_piece: {
unsigned SizeOfByte = 8;
unsigned OffsetInBits = Expr.getElement(++I) * SizeOfByte;
unsigned SizeInBits = Expr.getElement(++I) * SizeOfByte;
unsigned OffsetInBits = I.getArg(1) * SizeOfByte;
unsigned SizeInBits = I.getArg(2) * SizeOfByte;
AddOpPiece(SizeInBits, getOffsetOrZero(OffsetInBits, PieceOffsetInBits));
break;
}
case dwarf::DW_OP_plus:
EmitOp(dwarf::DW_OP_plus_uconst);
EmitUnsigned(Expr.getElement(++I));
EmitUnsigned(I.getArg(1));
break;
case dwarf::DW_OP_deref:
EmitOp(dwarf::DW_OP_deref);

View File

@ -93,11 +93,10 @@ public:
/// \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.
/// Emit a the operations remaining the DIExpressionIterator I.
/// \param PieceOffsetInBits If this is one piece out of a fragmented
/// location, this is the offset of the piece inside the entire variable.
void AddExpression(DIExpression Expr, unsigned PieceOffsetInBits = 0,
unsigned I = 0);
void AddExpression(DIExpressionIterator I, unsigned PieceOffsetInBits = 0);
};
/// DwarfExpression implementation for .debug_loc entries.