2005-09-08 Paul Brook <paul@codesourcery.com>

bfd/
	* reloc.c: Rename BFD_RELOC_ARM_SMI to BFD_RELOC_ARM_SMC.
	* bfd-in2.h: Regenerate.
	* libbfd.h: Regenerate.
opcodes/
	* arm-dis.c (arm_opcodes, thumb32_opcodes): Rename smi to smc.
gas/
	* config/tc-arm.c (do_smi, do_t_smi): Rename ...
	(do_smc, do_t_smc): ... to this.
	(insns): Remane smi to smc.
	(md_apply_fix, tc_gen_reloc): Rename BFD_RELOC_ARM_SMI to
	BFD_RELOC_ARM_SMC.
gas/testsuite/
	* gas/arm/arch6zk.d: Rename smi to smc.
	* gas/arm/arch6zk.s: Ditto.
	* gas/arm/thumb32.d: Ditto.
	* gas/arm/thumb32.s: Ditto.
This commit is contained in:
Paul Brook 2005-09-08 12:49:27 +00:00
parent d7f1af96dc
commit 3eb17e6bd2
13 changed files with 47 additions and 22 deletions

View File

@ -1,3 +1,9 @@
2005-09-08 Paul Brook <paul@codesourcery.com>
* reloc.c: Rename BFD_RELOC_ARM_SMI to BFD_RELOC_ARM_SMC.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
2005-09-06 H.J. Lu <hongjiu.lu@intel.com> 2005-09-06 H.J. Lu <hongjiu.lu@intel.com>
PR ld/1301 PR ld/1301

View File

@ -2876,7 +2876,7 @@ pc-relative or some form of GOT-indirect relocation. */
BFD_RELOC_ARM_T32_IMM12, BFD_RELOC_ARM_T32_IMM12,
BFD_RELOC_ARM_T32_ADD_PC12, BFD_RELOC_ARM_T32_ADD_PC12,
BFD_RELOC_ARM_SHIFT_IMM, BFD_RELOC_ARM_SHIFT_IMM,
BFD_RELOC_ARM_SMI, BFD_RELOC_ARM_SMC,
BFD_RELOC_ARM_SWI, BFD_RELOC_ARM_SWI,
BFD_RELOC_ARM_MULTI, BFD_RELOC_ARM_MULTI,
BFD_RELOC_ARM_CP_OFF_IMM, BFD_RELOC_ARM_CP_OFF_IMM,

View File

@ -1214,7 +1214,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
"BFD_RELOC_ARM_T32_IMM12", "BFD_RELOC_ARM_T32_IMM12",
"BFD_RELOC_ARM_T32_ADD_PC12", "BFD_RELOC_ARM_T32_ADD_PC12",
"BFD_RELOC_ARM_SHIFT_IMM", "BFD_RELOC_ARM_SHIFT_IMM",
"BFD_RELOC_ARM_SMI", "BFD_RELOC_ARM_SMC",
"BFD_RELOC_ARM_SWI", "BFD_RELOC_ARM_SWI",
"BFD_RELOC_ARM_MULTI", "BFD_RELOC_ARM_MULTI",
"BFD_RELOC_ARM_CP_OFF_IMM", "BFD_RELOC_ARM_CP_OFF_IMM",

View File

@ -2744,7 +2744,7 @@ ENUMX
ENUMX ENUMX
BFD_RELOC_ARM_SHIFT_IMM BFD_RELOC_ARM_SHIFT_IMM
ENUMX ENUMX
BFD_RELOC_ARM_SMI BFD_RELOC_ARM_SMC
ENUMX ENUMX
BFD_RELOC_ARM_SWI BFD_RELOC_ARM_SWI
ENUMX ENUMX

View File

@ -1,3 +1,11 @@
2005-09-08 Paul Brook <paul@codesourcery.com>
* config/tc-arm.c (do_smi, do_t_smi): Rename ...
(do_smc, do_t_smc): ... to this.
(insns): Remane smi to smc.
(md_apply_fix, tc_gen_reloc): Rename BFD_RELOC_ARM_SMI to
BFD_RELOC_ARM_SMC.
2005-09-07 Richard Henderson <rth@redhat.com> 2005-09-07 Richard Henderson <rth@redhat.com>
* dwarf2dbg.c (dwarf2_where): Set line->isa. * dwarf2dbg.c (dwarf2_where): Set line->isa.

View File

@ -5095,9 +5095,9 @@ do_shift (void)
} }
static void static void
do_smi (void) do_smc (void)
{ {
inst.reloc.type = BFD_RELOC_ARM_SMI; inst.reloc.type = BFD_RELOC_ARM_SMC;
inst.reloc.pc_rel = 0; inst.reloc.pc_rel = 0;
} }
@ -7430,7 +7430,7 @@ do_t_simd (void)
} }
static void static void
do_t_smi (void) do_t_smc (void)
{ {
unsigned int value = inst.reloc.exp.X_add_number; unsigned int value = inst.reloc.exp.X_add_number;
constraint (inst.reloc.exp.X_op != O_constant, constraint (inst.reloc.exp.X_op != O_constant,
@ -8846,7 +8846,7 @@ static const struct asm_opcode insns[] =
#undef ARM_VARIANT #undef ARM_VARIANT
#define ARM_VARIANT ARM_EXT_V6Z #define ARM_VARIANT ARM_EXT_V6Z
TCE(smi, 1600070, f7f08000, 1, (EXPi), smi, t_smi), TCE(smc, 1600070, f7f08000, 1, (EXPi), smc, t_smc),
#undef ARM_VARIANT #undef ARM_VARIANT
#define ARM_VARIANT ARM_EXT_V6T2 #define ARM_VARIANT ARM_EXT_V6T2
@ -11268,10 +11268,10 @@ md_apply_fix (fixS * fixP,
md_number_to_chars (buf+2, (valueT) (newval & 0xffff), THUMB_SIZE); md_number_to_chars (buf+2, (valueT) (newval & 0xffff), THUMB_SIZE);
break; break;
case BFD_RELOC_ARM_SMI: case BFD_RELOC_ARM_SMC:
if (((unsigned long) value) > 0xffff) if (((unsigned long) value) > 0xffff)
as_bad_where (fixP->fx_file, fixP->fx_line, as_bad_where (fixP->fx_file, fixP->fx_line,
_("invalid smi expression")); _("invalid smc expression"));
newval = md_chars_to_number (buf, INSN_SIZE); newval = md_chars_to_number (buf, INSN_SIZE);
newval |= (value & 0xf) | ((value & 0xfff0) << 4); newval |= (value & 0xf) | ((value & 0xfff0) << 4);
md_number_to_chars (buf, newval, INSN_SIZE); md_number_to_chars (buf, newval, INSN_SIZE);
@ -11866,7 +11866,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED,
case BFD_RELOC_NONE: type = "NONE"; break; case BFD_RELOC_NONE: type = "NONE"; break;
case BFD_RELOC_ARM_OFFSET_IMM8: type = "OFFSET_IMM8"; break; case BFD_RELOC_ARM_OFFSET_IMM8: type = "OFFSET_IMM8"; break;
case BFD_RELOC_ARM_SHIFT_IMM: type = "SHIFT_IMM"; break; case BFD_RELOC_ARM_SHIFT_IMM: type = "SHIFT_IMM"; break;
case BFD_RELOC_ARM_SMI: type = "SMI"; break; case BFD_RELOC_ARM_SMC: type = "SMC"; break;
case BFD_RELOC_ARM_SWI: type = "SWI"; break; case BFD_RELOC_ARM_SWI: type = "SWI"; break;
case BFD_RELOC_ARM_MULTI: type = "MULTI"; break; case BFD_RELOC_ARM_MULTI: type = "MULTI"; break;
case BFD_RELOC_ARM_CP_OFF_IMM: type = "CP_OFF_IMM"; break; case BFD_RELOC_ARM_CP_OFF_IMM: type = "CP_OFF_IMM"; break;

View File

@ -1,3 +1,10 @@
2005-09-08 Paul Brook <paul@codesourcery.com>
* gas/arm/arch6zk.d: Rename smi to smc.
* gas/arm/arch6zk.s: Ditto.
* gas/arm/thumb32.d: Ditto.
* gas/arm/thumb32.s: Ditto.
2005-09-07 Richard Henderson <rth@redhat.com> 2005-09-07 Richard Henderson <rth@redhat.com>
* gas/lns/lns-common-1.d: Don't match header or special opcode numbers. * gas/lns/lns-common-1.d: Don't match header or special opcode numbers.

View File

@ -24,8 +24,8 @@ Disassembly of section .text:
0+040 <[^>]*> e320f002 ? wfe 0+040 <[^>]*> e320f002 ? wfe
0+044 <[^>]*> e320f003 ? wfi 0+044 <[^>]*> e320f003 ? wfi
0+048 <[^>]*> e320f001 ? yield 0+048 <[^>]*> e320f001 ? yield
0+04c <[^>]*> e16ec371 ? smi 60465 0+04c <[^>]*> e16ec371 ? smc 60465
0+050 <[^>]*> 11613c7e ? smine 5070 0+050 <[^>]*> 11613c7e ? smcne 5070
0+054 <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\) 0+054 <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\)
0+058 <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\) 0+058 <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\)
0+05c <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\) 0+05c <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\)

View File

@ -23,8 +23,8 @@ label:
wfi wfi
yield yield
# ARMV6Z instructions # ARMV6Z instructions
smi 0xec31 smc 0xec31
smine 0x13ce smcne 0x13ce
# Add three nop instructions to ensure that the # Add three nop instructions to ensure that the
# output is 32-byte aligned as required for arm-aout. # output is 32-byte aligned as required for arm-aout.

View File

@ -810,8 +810,8 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> fa60 f009 ror\.w r0, r0, r9 0[0-9a-f]+ <[^>]+> fa60 f009 ror\.w r0, r0, r9
0[0-9a-f]+ <[^>]+> fa60 f005 ror\.w r0, r0, r5 0[0-9a-f]+ <[^>]+> fa60 f005 ror\.w r0, r0, r5
0[0-9a-f]+ <[^>]+> fa71 f002 rors\.w r0, r1, r2 0[0-9a-f]+ <[^>]+> fa71 f002 rors\.w r0, r1, r2
0[0-9a-f]+ <[^>]+> f7f0 8000 smi #0 ; 0x0 0[0-9a-f]+ <[^>]+> f7f0 8000 smc #0 ; 0x0
0[0-9a-f]+ <[^>]+> f7fd 8bca smi #43981 ; 0xabcd 0[0-9a-f]+ <[^>]+> f7fd 8bca smc #43981 ; 0xabcd
0[0-9a-f]+ <[^>]+> fb10 0000 smlabb r0, r0, r0, r0 0[0-9a-f]+ <[^>]+> fb10 0000 smlabb r0, r0, r0, r0
0[0-9a-f]+ <[^>]+> fb10 0900 smlabb r9, r0, r0, r0 0[0-9a-f]+ <[^>]+> fb10 0900 smlabb r9, r0, r0, r0
0[0-9a-f]+ <[^>]+> fb19 0000 smlabb r0, r9, r0, r0 0[0-9a-f]+ <[^>]+> fb19 0000 smlabb r0, r9, r0, r0

View File

@ -609,9 +609,9 @@ shift:
.purgem sh .purgem sh
smi: smc:
smi #0 smc #0
smi #0xabcd smc #0xabcd
smla: smla:
smlabb r0, r0, r0, r0 smlabb r0, r0, r0, r0

View File

@ -1,3 +1,7 @@
2005-09-08 Paul Brook <paul@codesourcery.com>
* arm-dis.c (arm_opcodes, thumb32_opcodes): Rename smi to smc.
2005-09-06 Chao-ying Fu <fu@mips.com> 2005-09-06 Chao-ying Fu <fu@mips.com>
* mips-opc.c (MT32): New define. * mips-opc.c (MT32): New define.

View File

@ -440,7 +440,7 @@ static const struct opcode32 arm_opcodes[] =
{ARM_EXT_V6T2, 0x07a00050, 0x0fa00070, "%22?usbfx%c\t%12-15r, %0-3r, #%7-11d, #%16-20W"}, {ARM_EXT_V6T2, 0x07a00050, 0x0fa00070, "%22?usbfx%c\t%12-15r, %0-3r, #%7-11d, #%16-20W"},
/* ARM V6Z instructions. */ /* ARM V6Z instructions. */
{ARM_EXT_V6Z, 0x01600070, 0x0ff000f0, "smi%c\t%e"}, {ARM_EXT_V6Z, 0x01600070, 0x0ff000f0, "smc%c\t%e"},
/* ARM V6K instructions. */ /* ARM V6K instructions. */
{ARM_EXT_V6K, 0xf57ff01f, 0xffffffff, "clrex"}, {ARM_EXT_V6K, 0xf57ff01f, 0xffffffff, "clrex"},
@ -968,7 +968,7 @@ static const struct opcode32 thumb32_opcodes[] =
{ARM_EXT_V6T2, 0xfbe00000, 0xfff000f0, "umlal\t%12-15r, %8-11r, %16-19r, %0-3r"}, {ARM_EXT_V6T2, 0xfbe00000, 0xfff000f0, "umlal\t%12-15r, %8-11r, %16-19r, %0-3r"},
{ARM_EXT_V6T2, 0xfbe00060, 0xfff000f0, "umaal\t%12-15r, %8-11r, %16-19r, %0-3r"}, {ARM_EXT_V6T2, 0xfbe00060, 0xfff000f0, "umaal\t%12-15r, %8-11r, %16-19r, %0-3r"},
{ARM_EXT_V6T2, 0xe8500f00, 0xfff00f00, "ldrex\t%12-15r, [%16-19r, #%0-7W]"}, {ARM_EXT_V6T2, 0xe8500f00, 0xfff00f00, "ldrex\t%12-15r, [%16-19r, #%0-7W]"},
{ARM_EXT_V6T2, 0xf7f08000, 0xfff0f000, "smi\t%K"}, {ARM_EXT_V6T2, 0xf7f08000, 0xfff0f000, "smc\t%K"},
{ARM_EXT_V6T2, 0xf04f0000, 0xfbef8000, "mov%20's.w\t%8-11r, %M"}, {ARM_EXT_V6T2, 0xf04f0000, 0xfbef8000, "mov%20's.w\t%8-11r, %M"},
{ARM_EXT_V6T2, 0xf06f0000, 0xfbef8000, "mvn%20's.w\t%8-11r, %M"}, {ARM_EXT_V6T2, 0xf06f0000, 0xfbef8000, "mvn%20's.w\t%8-11r, %M"},
{ARM_EXT_V6T2, 0xf810f000, 0xff70f000, "pld\t%a"}, {ARM_EXT_V6T2, 0xf810f000, 0xff70f000, "pld\t%a"},