This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[Patch, ARM, GAS] Fix apptance of APSR as an operand to MRC.
- From: Tejas Belagod <tejas dot belagod at arm dot com>
- To: binutils at sourceware dot org
- Date: Mon, 13 Sep 2010 14:08:25 +0100
- Subject: [Patch, ARM, GAS] Fix apptance of APSR as an operand to MRC.
Hi,
Attached is a patch that fixes the acceptance of APSR_nzcv as a core
register operand to MRC instruction. This is the new syntax as specified
by UAL. In pre-UAL syntax, PC was written instead of APSR_nzcv to select
this form. This fix also has a small change to the disassembler where we
disassemble '1111' in the Rt field of MRC as 'APSR_nzcv' instead of
'PC'. Tested for arm-none-eabi. OK?
--
Tejas Belagod
ARM.
gas/testsuite
2010-09-13 Tejas Belagod <tejas.belagod@arm.com>
* gas/arm/copro.s: Add test for APSR_nzcv as an MRC operand.
* gas/arm/copro.d: Change pc in MRC to disassemble as
APSR_nzcv. Also add disassembly for test added in copro.s.
opcodes/
2010-09-13 Tejas Belagod <tejas.belagod@arm.com>
* arm-dis.c (coprocessor_opcodes): Add MRC entry for APSR_nzcv.
gas/
2010-09-13 Tejas Belagod <tejas.belagod@arm.com>
* config/tc-arm.c (insns): Change MRC entry to accept APSR_RR
instead of just RR.
Index: gas/config/tc-arm.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-arm.c,v
retrieving revision 1.458
diff -u -p -r1.458 tc-arm.c
--- gas/config/tc-arm.c 9 Sep 2010 12:08:12 -0000 1.458
+++ gas/config/tc-arm.c 13 Sep 2010 13:00:29 -0000
@@ -16704,7 +16704,7 @@ static const struct asm_opcode insns[] =
TCE("stc", c000000, ec000000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc),
TC3("stcl", c400000, ec400000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc),
TCE("mcr", e000010, ee000010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg),
- TCE("mrc", e100010, ee100010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg),
+ TCE("mrc", e100010, ee100010, 6, (RCP, I7b, APSR_RR, RCN, RCN, oI7b), co_reg, co_reg),
#undef ARM_VARIANT
#define ARM_VARIANT & arm_ext_v2s /* ARM 3 - swp instructions. */
Index: gas/testsuite/gas/arm/copro.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/copro.d,v
retrieving revision 1.11
diff -u -p -r1.11 copro.d
--- gas/testsuite/gas/arm/copro.d 12 Nov 2009 14:49:44 -0000 1.11
+++ gas/testsuite/gas/arm/copro.d 13 Sep 2010 13:00:29 -0000
@@ -20,7 +20,7 @@ Disassembly of section .text:
0+028 <[^>]*> 3ca4860c stccc 6, cr8, \[r4\], #48.*
0+02c <[^>]*> ed0f7101 stfs f7, \[pc, #-4\] ; .* <bar>
0+030 <[^>]*> ee715212 mrc 2, 3, r5, cr1, cr2, \{0\}
-0+034 <[^>]*> aeb1f4f2 mrcge 4, 5, pc, cr1, cr2, \{7\}
+0+034 <[^>]*> aeb1f4f2 mrcge 4, 5, APSR_nzcv, cr1, cr2, \{7\}
0+038 <[^>]*> ee215711 mcr 7, 1, r5, cr1, cr1, \{0\}
0+03c <[^>]*> be228519 mcrlt 5, 1, r8, cr2, cr9, \{0\}
0+040 <[^>]*> ec907300 ldc 3, cr7, \[r0\], \{0\}
@@ -39,3 +39,4 @@ Disassembly of section .text:
0+074 <[^>]*> ec407efe mcrr 14, 15, r7, r0, cr14
0+078 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
0+07c <[^>]*> e1a00000 nop ; \(mov r0, r0\)
+0+080 <[^>]*> aeb1f4f2 mrcge 4, 5, APSR_nzcv, cr1, cr2, \{7\}
Index: gas/testsuite/gas/arm/copro.s
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/copro.s,v
retrieving revision 1.5
diff -u -p -r1.5 copro.s
--- gas/testsuite/gas/arm/copro.s 29 Jan 2009 11:56:19 -0000 1.5
+++ gas/testsuite/gas/arm/copro.s 13 Sep 2010 13:00:29 -0000
@@ -44,3 +44,6 @@ bar:
# Extra instructions to allow for code alignment in arm-aout target.
nop
nop
+
+ # UAL-syntax for MRC with APSR. Pre-UAL was PC
+ mrcge p4, 5, APSR_nzcv, cr1, cr2, 7
Index: opcodes/arm-dis.c
===================================================================
RCS file: /cvs/src/src/opcodes/arm-dis.c,v
retrieving revision 1.129
diff -u -p -r1.129 arm-dis.c
--- opcodes/arm-dis.c 8 Jul 2010 22:40:28 -0000 1.129
+++ opcodes/arm-dis.c 13 Sep 2010 13:00:51 -0000
@@ -474,6 +474,7 @@ static const struct opcode32 coprocessor
{ARM_EXT_V5E, 0x0c400000, 0x0ff00000, "mcrr%c\t%8-11d, %4-7d, %12-15R, %16-19r, cr%0-3d"},
{ARM_EXT_V5E, 0x0c500000, 0x0ff00000, "mrrc%c\t%8-11d, %4-7d, %12-15Ru, %16-19Ru, cr%0-3d"},
{ARM_EXT_V2, 0x0e000000, 0x0f000010, "cdp%c\t%8-11d, %20-23d, cr%12-15d, cr%16-19d, cr%0-3d, {%5-7d}"},
+ {ARM_EXT_V2, 0x0e10f010, 0x0f10f010, "mrc%c\t%8-11d, %21-23d, APSR_nzcv, cr%16-19d, cr%0-3d, {%5-7d}"},
{ARM_EXT_V2, 0x0e100010, 0x0f100010, "mrc%c\t%8-11d, %21-23d, %12-15r, cr%16-19d, cr%0-3d, {%5-7d}"},
{ARM_EXT_V2, 0x0e000010, 0x0f100010, "mcr%c\t%8-11d, %21-23d, %12-15R, cr%16-19d, cr%0-3d, {%5-7d}"},
{ARM_EXT_V2, 0x0c000000, 0x0e100000, "stc%22'l%c\t%8-11d, cr%12-15d, %A"},