6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-17 20:23:59 +00:00
Code Issues Projects Releases Wiki Activity

Simplify handling of variables with complex address (i.e. blocks variables)

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@130339 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Devang Patel
2011-04-27 22:45:24 +00:00
parent 2790ba8e5a
commit e1cdf84ee5
3 changed files with 32 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -699,11 +699,19 @@ DIE *DwarfDebug::constructVariableDIE(DbgVariable *DV, DbgScope *Scope) {
const TargetRegisterInfo *TRI = Asm->TM.getRegisterInfo();
if (DVInsn->getOperand(1).isImm() &&
TRI->getFrameRegister(*Asm->MF) == RegOp.getReg()) {
VariableCU->addFrameVariableAddress(DV, VariableDie,
DVInsn->getOperand(1).getImm());
updated = true;
} else
updated = VariableCU->addRegisterAddress(VariableDie, RegOp);
unsigned FrameReg = 0;
const TargetFrameLowering *TFI = Asm->TM.getFrameLowering();
int Offset =
TFI->getFrameIndexReference(*Asm->MF,
DVInsn->getOperand(1).getImm(),
FrameReg);
MachineLocation Location(FrameReg, Offset);
VariableCU->addVariableAddress(DV, VariableDie, Location);
} else if (RegOp.getReg())
VariableCU->addVariableAddress(DV, VariableDie,
MachineLocation(RegOp.getReg()));
updated = true;
}
else if (DVInsn->getOperand(0).isImm())
updated = VariableCU->addConstantValue(VariableDie,
@ -712,15 +720,9 @@ DIE *DwarfDebug::constructVariableDIE(DbgVariable *DV, DbgScope *Scope) {
updated =
VariableCU->addConstantFPValue(VariableDie, DVInsn->getOperand(0));
} else {
MachineLocation Location = Asm->getDebugValueLocation(DVInsn);
if (Location.getReg()) {
if (DV->getVariable().hasComplexAddress())
VariableCU->addComplexAddress(DV, VariableDie, dwarf::DW_AT_location,
Location);
else
VariableCU->addAddress(VariableDie, dwarf::DW_AT_location, Location);
updated = true;
}
VariableCU->addVariableAddress(DV, VariableDie,
Asm->getDebugValueLocation(DVInsn));
updated = true;
}
if (!updated) {
// If variableDie is not updated then DBG_VALUE instruction does not
@ -734,9 +736,15 @@ DIE *DwarfDebug::constructVariableDIE(DbgVariable *DV, DbgScope *Scope) {
// .. else use frame index, if available.
int FI = 0;
if (findVariableFrameIndex(DV, &FI))
VariableCU->addFrameVariableAddress(DV, VariableDie, FI);
if (findVariableFrameIndex(DV, &FI)) {
unsigned FrameReg = 0;
const TargetFrameLowering *TFI = Asm->TM.getFrameLowering();
int Offset =
TFI->getFrameIndexReference(*Asm->MF, FI, FrameReg);
MachineLocation Location(FrameReg, Offset);
VariableCU->addVariableAddress(DV, VariableDie, Location);
}
DV->setDIE(VariableDie);
return VariableDie;