mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-28 12:33:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bugs in handling of the .restore directive.

Browse Source 
* config/tc-ia64.c (struct unwind): Add member "prologue_count".
	(dot_proc): Clear unwind.prologue_count to zero.
	(dot_prologue): Increment unwind.prologue_count.
	(dot_restore): If second operand is omitted, use
	unwind.prologue_count -1 for "ecount" (# of additional regions to
	pop).  Decrement unwind.prologue_count by number of regions
	popped.
This commit is contained in:
Jim Wilson 2001-02-21 22:39:59 +00:00
parent dd425adaa8
commit 33d01f331b
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gas/ChangeLog
View File

@ -1,3 +1,13 @@
2001-02-21 David Mosberger <davidm@hpl.hp.com>
* config/tc-ia64.c (struct unwind): Add member "prologue_count".
(dot_proc): Clear unwind.prologue_count to zero.
(dot_prologue): Increment unwind.prologue_count.
(dot_restore): If second operand is omitted, use
unwind.prologue_count -1 for "ecount" (# of additional regions to
pop). Decrement unwind.prologue_count by number of regions
popped.
2001-02-21 Nick Clifton <nickc@redhat.com>
* doc/as.texinfo (Section): Note that some flags to the COFF

18
gas/config/tc-ia64.c
View File

@ -624,6 +624,7 @@ static struct
/* TRUE if processing unwind directives in a prologue region. */
int prologue;
int prologue_mask;
unsigned int prologue_count; /* number of .prologues seen so far */
} unwind;
typedef void (*vbyte_func) PARAMS ((int, char *, char *));
@ -3047,7 +3048,7 @@ dot_restore (dummy)
int dummy ATTRIBUTE_UNUSED;
{
expressionS e1, e2;
unsigned long ecount = 0;
unsigned long ecount; /* # of _additional_ regions to pop */
int sep;
sep = parse_operand (&e1);
@ -3060,14 +3061,21 @@ dot_restore (dummy)
if (sep == ',')
{
parse_operand (&e2);
if (e1.X_op != O_constant)
if (e2.X_op != O_constant || e2.X_add_number < 0)
{
as_bad ("Second operand to .restore must be constant");
as_bad ("Second operand to .restore must be a constant >= 0");
return;
}
ecount = e1.X_op;
ecount = e2.X_add_number;
}
else
ecount = unwind.prologue_count - 1;
add_unwind_entry (output_epilogue (ecount));
if (ecount < unwind.prologue_count)
unwind.prologue_count -= ecount + 1;
else
unwind.prologue_count = 0;
}
static void
@ -3710,6 +3718,7 @@ dot_proc (dummy)
demand_empty_rest_of_line ();
ia64_do_align (16);
unwind.prologue_count = 0;
unwind.list = unwind.tail = unwind.current_entry = NULL;
unwind.personality_routine = 0;
}
@ -3764,6 +3773,7 @@ dot_prologue (dummy)
unwind.prologue = 1;
unwind.prologue_mask = mask;
++unwind.prologue_count;
}
static void