OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Nios II prologue analyzer to handle multiple stack adjustments. 

2014-11-25  Sandra Loosemore  <sandra@codesourcery.com>

	gdb/
	* nios2-tdep.c (nios2_analyze_prologue): Replace restriction
	that there can be only one stack adjustment in the prologue
	with tests to detect specific disallowed stack adjustments.
This commit is contained in:
Sandra Loosemore 2014-11-25 18:40:28 -08:00
parent 7f1659b587
commit aa4893954a
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2014-11-25 Sandra Loosemore <sandra@codesourcery.com>
* nios2-tdep.c (nios2_analyze_prologue): Replace restriction
that there can be only one stack adjustment in the prologue
with tests to detect specific disallowed stack adjustments.
2014-11-25 Sandra Loosemore <sandra@codesourcery.com>
* nios2-tdep.c (nios2_in_epilogue_p): Handle multiple stack

33
gdb/nios2-tdep.c
View File

@ -842,6 +842,11 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
cache->reg_saved[NIOS2_SP_REGNUM].addr = -4;
}
else if (rc == NIOS2_SP_REGNUM && ra == NIOS2_FP_REGNUM)
/* This is setting SP from FP. This only happens in the
function epilogue. */
break;
else if (rc != 0)
{
if (value[rb].reg == 0)
@ -853,13 +858,21 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
value[rc].offset = value[ra].offset + value[rb].offset;
}
prologue_end = pc;
/* The add/move is only considered a prologue instruction
if the destination is SP or FP. */
if (rc == NIOS2_SP_REGNUM || rc == NIOS2_FP_REGNUM)
prologue_end = pc;
}
else if (nios2_match_sub (insn, op, mach, &ra, &rb, &rc))
{
/* SUB rc, ra, rb */
if (rc != 0)
if (rc == NIOS2_SP_REGNUM && rb == NIOS2_SP_REGNUM
&& value[rc].reg != 0)
/* If we are decrementing the SP by a non-constant amount,
this is alloca, not part of the prologue. */
break;
else if (rc != 0)
{
if (value[rb].reg == 0)
value[rc].reg = value[ra].reg;
@ -873,12 +886,13 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
{
/* ADDI rb, ra, imm */
/* The first stack adjustment is part of the prologue.
Any subsequent stack adjustments are either down to
alloca or the epilogue so stop analysing when we hit
them. */
/* A positive stack adjustment has to be part of the epilogue. */
if (rb == NIOS2_SP_REGNUM
&& (value[rb].offset != 0 || value[ra].reg != NIOS2_SP_REGNUM))
&& (imm > 0 || value[ra].reg != NIOS2_SP_REGNUM))
break;
/* Likewise restoring SP from FP. */
else if (rb == NIOS2_SP_REGNUM && ra == NIOS2_FP_REGNUM)
break;
if (rb != 0)
@ -887,7 +901,10 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
value[rb].offset = value[ra].offset + imm;
}
prologue_end = pc;
/* The add is only considered a prologue instruction
if the destination is SP or FP. */
if (rb == NIOS2_SP_REGNUM || rb == NIOS2_FP_REGNUM)
prologue_end = pc;
}
else if (nios2_match_orhi (insn, op, mach, &ra, &rb, &uimm))