diff options
Diffstat (limited to 'gas')
-rw-r--r-- | gas/ChangeLog | 5 | ||||
-rw-r--r-- | gas/config/tc-aarch64.c | 16 | ||||
-rw-r--r-- | gas/testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | gas/testsuite/gas/aarch64/illegal.l | 9 | ||||
-rw-r--r-- | gas/testsuite/gas/aarch64/illegal.s | 8 | ||||
-rw-r--r-- | gas/testsuite/gas/aarch64/sysreg-1.d | 10 | ||||
-rw-r--r-- | gas/testsuite/gas/aarch64/sysreg-1.s | 6 |
7 files changed, 47 insertions, 14 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 687c800..8dcd6ff 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,10 @@ 2014-09-03 Jiong Wang <jiong.wang@arm.com> + * config/tc-aarch64.c (parse_sys_reg): Remove the restriction on op0 + field. + +2014-09-03 Jiong Wang <jiong.wang@arm.com> + * config/tc-aarch64.c (parse_operands): Recognize PAIRREG. (aarch64_features): Add entry for lse extension. diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index b322d35..03fddd1 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -3333,19 +3333,13 @@ parse_sys_reg (char **str, struct hash_control *sys_regs, int imple_defined_p) return PARSE_FAIL; else { - /* Parse S<op0>_<op1>_<Cn>_<Cm>_<op2>, the implementation defined - registers. */ + /* Parse S<op0>_<op1>_<Cn>_<Cm>_<op2>. */ unsigned int op0, op1, cn, cm, op2; - if (sscanf (buf, "s%u_%u_c%u_c%u_%u", &op0, &op1, &cn, &cm, &op2) != 5) + + if (sscanf (buf, "s%u_%u_c%u_c%u_%u", &op0, &op1, &cn, &cm, &op2) + != 5) return PARSE_FAIL; - /* The architecture specifies the encoding space for implementation - defined registers as: - op0 op1 CRn CRm op2 - 1x xxx 1x11 xxxx xxx - For convenience GAS accepts a wider encoding space, as follows: - op0 op1 CRn CRm op2 - 1x xxx xxxx xxxx xxx */ - if ((op0 != 2 && op0 != 3) || op1 > 7 || cn > 15 || cm > 15 || op2 > 7) + if (op0 > 3 || op1 > 7 || cn > 15 || cm > 15 || op2 > 7) return PARSE_FAIL; value = (op0 << 14) | (op1 << 11) | (cn << 7) | (cm << 3) | op2; } diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index e81cdda..db580e4 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2014-09-03 Jiong Wang <jiong.wang@arm.com> + * gas/aarch64/illegal.s: Update testcase. + * gas/aarch64/illegal.d: Likewise. + * gas/aarch64/sysreg-1.s: Likewise. + * gas/aarch64/sysreg-1.d: Likewise. + +2014-09-03 Jiong Wang <jiong.wang@arm.com> + * gas/aarch64/lse-atomic.d: New. * gas/aarch64/lse-atomic.s: Likewise. * gas/aarch64/illegal-lse.d: Likewise. diff --git a/gas/testsuite/gas/aarch64/illegal.l b/gas/testsuite/gas/aarch64/illegal.l index 044b787..0e8c7eb 100644 --- a/gas/testsuite/gas/aarch64/illegal.l +++ b/gas/testsuite/gas/aarch64/illegal.l @@ -519,7 +519,7 @@ [^:]*:494: Error: .*`bfi x3,x7,#31,#48' [^:]*:496: Error: .*`str x1,page_table_count' [^:]*:498: Error: .*`prfm PLDL3KEEP,\[x9,x15,sxtx#2\]' -[^:]*:500: Error: .*`mrs x5,S1_0_C13_C8_0' +[^:]*:500: Error: .*`mrs x5,S1_0_C17_C8_0' [^:]*:502: Error: .*`msr S3_1_C11_C15_-1,x7' [^:]*:503: Error: .*`msr S3_1_11_15_1,x7' [^:]*:506: Error: .*`movi w1,#15' @@ -562,4 +562,9 @@ [^:]*:561: Error: .*`csetm w0,nv' [^:]*:562: Error: .*`cneg w0,w1,al' [^:]*:563: Error: .*`cneg w0,w1,nv' -[^:]*:563: Error: .* +[^:]*:565: Error: .*`mrs x5,S4_0_C12_C8_0' +[^:]*:566: Error: .*`mrs x6,S0_8_C11_C7_5' +[^:]*:567: Error: .*`mrs x7,S1_1_C16_C6_6' +[^:]*:568: Error: .*`mrs x8,S2_2_C15_C16_7' +[^:]*:569: Error: .*`mrs x9,S3_3_C14_C15_8' +[^:]*:569: Error: .* diff --git a/gas/testsuite/gas/aarch64/illegal.s b/gas/testsuite/gas/aarch64/illegal.s index f4746a5..9cf0600 100644 --- a/gas/testsuite/gas/aarch64/illegal.s +++ b/gas/testsuite/gas/aarch64/illegal.s @@ -497,7 +497,7 @@ prfm PLDL3KEEP, [x9, x15, sxtx #2] - mrs x5, S1_0_C13_C8_0 + mrs x5, S1_0_C17_C8_0 msr S3_1_C13_C15_1, x7 msr S3_1_C11_C15_-1, x7 msr S3_1_11_15_1, x7 @@ -561,3 +561,9 @@ one_label: csetm w0, nv cneg w0, w1, al cneg w0, w1, nv + + mrs x5, S4_0_C12_C8_0 + mrs x6, S0_8_C11_C7_5 + mrs x7, S1_1_C16_C6_6 + mrs x8, S2_2_C15_C16_7 + mrs x9, S3_3_C14_C15_8 diff --git a/gas/testsuite/gas/aarch64/sysreg-1.d b/gas/testsuite/gas/aarch64/sysreg-1.d index 81717c1..c6be2c4 100644 --- a/gas/testsuite/gas/aarch64/sysreg-1.d +++ b/gas/testsuite/gas/aarch64/sysreg-1.d @@ -4283,3 +4283,13 @@ Disassembly of section \.text: 42cc: d53c400f mrs x15, spsr_el2 42d0: d51e400f msr spsr_el3, x15 42d4: d53e400f mrs x15, spsr_el3 + 42d8: d500000f msr s0_0_c0_c0_0, x15 + 42dc: d520000f mrs x15, s0_0_c0_c0_0 + 42e0: d50ffffb sys #7, C15, C15, #7, x27 + 42e4: d52ffffb sysl x27, #7, C15, C15, #7 + 42e8: d514680e msr s2_4_c6_c8_0, x14 + 42ec: d534680e mrs x14, s2_4_c6_c8_0 + 42f0: d50ae444 sys #2, C14, C4, #2, x4 + 42f4: d52ae444 sysl x4, #2, C14, C4, #2 + 42f8: d501d167 msr s0_1_c13_c1_3, x7 + 42fc: d521d167 mrs x7, s0_1_c13_c1_3 diff --git a/gas/testsuite/gas/aarch64/sysreg-1.s b/gas/testsuite/gas/aarch64/sysreg-1.s index 700dd24..fc08328 100644 --- a/gas/testsuite/gas/aarch64/sysreg-1.s +++ b/gas/testsuite/gas/aarch64/sysreg-1.s @@ -166,3 +166,9 @@ rw_sys_reg sys_reg=spsr_el1 xreg=x15 r=1 w=1 rw_sys_reg sys_reg=spsr_el2 xreg=x15 r=1 w=1 rw_sys_reg sys_reg=spsr_el3 xreg=x15 r=1 w=1 + + rw_sys_reg sys_reg=s0_0_C0_C0_0 xreg=x15 r=1 w=1 + rw_sys_reg sys_reg=s1_7_C15_C15_7 xreg=x27 r=1 w=1 + rw_sys_reg sys_reg=s2_4_C6_C8_0 xreg=x14 r=1 w=1 + rw_sys_reg sys_reg=s1_2_C14_C4_2 xreg=x4 r=1 w=1 + rw_sys_reg sys_reg=s0_1_C13_C1_3 xreg=x7 r=1 w=1 |