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

Fix adr pseudo op for Thumb.

This commit is contained in:
Nick Clifton 2000-03-17 22:12:08 +00:00
parent 1cc26dd06a
commit 43f0557653
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gas/ChangeLog
View File

@ -1,3 +1,11 @@
2000-03-17 Thomas de Lellis <tdel@windriver.com>
* config/tc-arm.c (do_t_adr): Flag "adr Rd,label"
instruction operand bad if Rd > 7 when generating
thumb instructions. Prevents for example,
"adr r12,label" from silently failing and generating
the wrong instruction.
2000-03-17 Nick Clifton <nickc@cygnus.com> 2000-03-17 Nick Clifton <nickc@cygnus.com>
* config/tc-arm.c (md_apply_fix3): Handle same-section relocations * config/tc-arm.c (md_apply_fix3): Handle same-section relocations

19
gas/config/tc-arm.c
View File

@ -2642,8 +2642,7 @@ do_adr (str, flags)
unsigned long flags; unsigned long flags;
{ {
/* This is a pseudo-op of the form "adr rd, label" to be converted /* This is a pseudo-op of the form "adr rd, label" to be converted
into a relative address of the form "add rd, pc, #label-.-8" */ into a relative address of the form "add rd, pc, #label-.-8". */
skip_whitespace (str); skip_whitespace (str);
if (reg_required_here (&str, 12) == FAIL if (reg_required_here (&str, 12) == FAIL
@ -2654,10 +2653,11 @@ do_adr (str, flags)
inst.error = BAD_ARGS; inst.error = BAD_ARGS;
return; return;
} }
/* Frag hacking will turn this into a sub instruction if the offset turns /* Frag hacking will turn this into a sub instruction if the offset turns
out to be negative. */ out to be negative. */
inst.reloc.type = BFD_RELOC_ARM_IMMEDIATE; inst.reloc.type = BFD_RELOC_ARM_IMMEDIATE;
inst.reloc.exp.X_add_number -= 8; /* PC relative adjust */ inst.reloc.exp.X_add_number -= 8; /* PC relative adjust. */
inst.reloc.pc_rel = 1; inst.reloc.pc_rel = 1;
inst.instruction |= flags; inst.instruction |= flags;
end_of_line (str); end_of_line (str);
@ -4905,11 +4905,15 @@ static void
do_t_adr (str) do_t_adr (str)
char * str; char * str;
{ {
int reg;
/* This is a pseudo-op of the form "adr rd, label" to be converted /* This is a pseudo-op of the form "adr rd, label" to be converted
into a relative address of the form "add rd, pc, #label-.-4" */ into a relative address of the form "add rd, pc, #label-.-4". */
skip_whitespace (str); skip_whitespace (str);
if (reg_required_here (&str, 4) == FAIL /* Store Rd in temporary location inside instruction. */ /* Store Rd in temporary location inside instruction. */
if ((reg = reg_required_here (&str, 4)) == FAIL
|| (reg > 7) /* For Thumb reg must be r0..r7. */
|| skip_past_comma (&str) == FAIL || skip_past_comma (&str) == FAIL
|| my_get_expression (&inst.reloc.exp, &str)) || my_get_expression (&inst.reloc.exp, &str))
{ {
@ -4919,9 +4923,10 @@ do_t_adr (str)
} }
inst.reloc.type = BFD_RELOC_ARM_THUMB_ADD; inst.reloc.type = BFD_RELOC_ARM_THUMB_ADD;
inst.reloc.exp.X_add_number -= 4; /* PC relative adjust */ inst.reloc.exp.X_add_number -= 4; /* PC relative adjust. */
inst.reloc.pc_rel = 1; inst.reloc.pc_rel = 1;
inst.instruction |= REG_PC; /* Rd is already placed into the instruction */ inst.instruction |= REG_PC; /* Rd is already placed into the instruction. */
end_of_line (str); end_of_line (str);
} }