aboutsummaryrefslogtreecommitdiff
path: root/gas/config
diff options
context:
space:
mode:
authorYufeng Zhang <yufeng.zhang@arm.com>2013-11-18 11:34:43 +0000
committerYufeng Zhang <yufeng.zhang@arm.com>2013-11-18 11:42:42 +0000
commit18cf6de4004b9eaa1a2c0be8dd03523fd60991d1 (patch)
tree84c91be5d2df9bd00825d60f98154af11a679ac1 /gas/config
parenta203d9b72fc2bc37992e0f0e3f2b7f0d9abdd0bd (diff)
downloadgdb-18cf6de4004b9eaa1a2c0be8dd03523fd60991d1.zip
gdb-18cf6de4004b9eaa1a2c0be8dd03523fd60991d1.tar.gz
gdb-18cf6de4004b9eaa1a2c0be8dd03523fd60991d1.tar.bz2
gas/
* config/tc-aarch64.c (parse_sys_reg): Support S2_<op1>_<Cn>_<Cm>_<op2>. gas/testsuite/ * gas/testsuite/sysreg.s: Add test. * gas/testsuite/sysreg.d: Update.
Diffstat (limited to 'gas/config')
-rw-r--r--gas/config/tc-aarch64.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index c230b1e..fb0ae33 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -3270,7 +3270,7 @@ parse_barrier (char **str)
Returns the encoding for the option, or PARSE_FAIL.
If IMPLE_DEFINED_P is non-zero, the function will also try to parse the
- implementation defined system register name S3_<op1>_<Cn>_<Cm>_<op2>. */
+ implementation defined system register name S<op0>_<op1>_<Cn>_<Cm>_<op2>. */
static int
parse_sys_reg (char **str, struct hash_control *sys_regs, int imple_defined_p)
@@ -3295,7 +3295,7 @@ parse_sys_reg (char **str, struct hash_control *sys_regs, int imple_defined_p)
return PARSE_FAIL;
else
{
- /* Parse S3_<op1>_<Cn>_<Cm>_<op2>, the implementation defined
+ /* Parse S<op0>_<op1>_<Cn>_<Cm>_<op2>, the implementation defined
registers. */
unsigned int op0, op1, cn, cm, op2;
if (sscanf (buf, "s%u_%u_c%u_c%u_%u", &op0, &op1, &cn, &cm, &op2) != 5)
@@ -3303,11 +3303,11 @@ parse_sys_reg (char **str, struct hash_control *sys_regs, int imple_defined_p)
/* The architecture specifies the encoding space for implementation
defined registers as:
op0 op1 CRn CRm op2
- 11 xxx 1x11 xxxx xxx
+ 1x xxx 1x11 xxxx xxx
For convenience GAS accepts a wider encoding space, as follows:
op0 op1 CRn CRm op2
- 11 xxx xxxx xxxx xxx */
- if (op0 != 3 || op1 > 7 || cn > 15 || cm > 15 || op2 > 7)
+ 1x xxx xxxx xxxx xxx */
+ if ((op0 != 2 && op0 != 3) || op1 > 7 || cn > 15 || cm > 15 || op2 > 7)
return PARSE_FAIL;
value = (op0 << 14) | (op1 << 11) | (cn << 7) | (cm << 3) | op2;
}