diff options
| author | Mingjie Xing <mingjie.xing@gmail.com> | 2011-01-11 07:22:09 +0000 |
|---|---|---|
| committer | Mingjie Xing <mingjie.xing@gmail.com> | 2011-01-11 07:22:09 +0000 |
| commit | c95354ed1373286584d5729f3c0ce97cded6fbce (patch) | |
| tree | 902dc5eb658c1799a50183eadc15e306557a9c5d /gas | |
| parent | 0d7a18f740233546470b92af36ebb116405bc810 (diff) | |
| download | gdb-c95354ed1373286584d5729f3c0ce97cded6fbce.zip gdb-c95354ed1373286584d5729f3c0ce97cded6fbce.tar.gz gdb-c95354ed1373286584d5729f3c0ce97cded6fbce.tar.bz2 | |
Take unadjusted offset for loongson3a specific instructions.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-mips.c | 17 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/loongson-3a-2.d | 8 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/loongson-3a-2.s | 8 |
5 files changed, 31 insertions, 12 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 2318483..449aa73 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2011-01-11 Mingjie Xing <mingjie.xing@gmail.com> + + * config/tc-mips.c (mips_ip): Update error messages. Take an + unadjusted offset for "+c" argument. + 2011-01-10 Nick Clifton <nickc@redhat.com> * config/tc-i386.c (x86_elf_abi): Only define for targets that use diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index ee9b276..ae37e02 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -9321,7 +9321,7 @@ mips_ip (char *str, struct mips_cl_insn *ip) if (imm_expr.X_add_number < min_range || imm_expr.X_add_number > max_range) { - as_bad (_("immediate not in range %ld..%ld (%ld)"), + as_bad (_("Offset not in range %ld..%ld (%ld)"), (long) min_range, (long) max_range, (long) imm_expr.X_add_number); } @@ -9338,7 +9338,7 @@ mips_ip (char *str, struct mips_cl_insn *ip) if (imm_expr.X_add_number < min_range || imm_expr.X_add_number > max_range) { - as_bad (_("immediate not in range %ld..%ld (%ld)"), + as_bad (_("Offset not in range %ld..%ld (%ld)"), (long) min_range, (long) max_range, (long) imm_expr.X_add_number); } @@ -9352,14 +9352,23 @@ mips_ip (char *str, struct mips_cl_insn *ip) check_absolute_expr (ip, &imm_expr); min_range = -((OP_MASK_OFFSET_C + 1) >> 1); max_range = ((OP_MASK_OFFSET_C + 1) >> 1) - 1; + /* We check the offset range before adjusted. */ + min_range <<= 4; + max_range <<= 4; if (imm_expr.X_add_number < min_range || imm_expr.X_add_number > max_range) { - as_bad (_("immediate not in range %ld..%ld (%ld)"), + as_bad (_("Offset not in range %ld..%ld (%ld)"), (long) min_range, (long) max_range, (long) imm_expr.X_add_number); } - INSERT_OPERAND (OFFSET_C, *ip, imm_expr.X_add_number); + if (imm_expr.X_add_number & 0xf) + { + as_bad (_("Offset not 16 bytes alignment (%ld)"), + (long) imm_expr.X_add_number); + } + /* Right shift 4 bits to adjust the offset operand. */ + INSERT_OPERAND (OFFSET_C, *ip, imm_expr.X_add_number >> 4); imm_expr.X_op = O_absent; s = expr_end; continue; diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index d28da8d..e63bd65 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-01-11 Mingjie Xing <mingjie.xing@gmail.com> + + * mips/loongson-3a-2.s, mips/loongson-3a-2.d: Use the real offset + value in assembly. + 2011-01-10 Nathan Sidwell <nathan@codesourcery.com> Glauber de Oliveira Costa <glommer@gmail.com> diff --git a/gas/testsuite/gas/mips/loongson-3a-2.d b/gas/testsuite/gas/mips/loongson-3a-2.d index 4029a60..32fea2e 100644 --- a/gas/testsuite/gas/mips/loongson-3a-2.d +++ b/gas/testsuite/gas/mips/loongson-3a-2.d @@ -57,9 +57,9 @@ Disassembly of section .text: .*: d8912c07 gsldxc1 \$f17,-128\(\$4,\$5\) .*: f8d23bfe gsswxc1 \$f18,127\(\$6,\$7\) .*: f9134c07 gssdxc1 \$f19,-128\(\$8,\$9\) -.*: c98b3fea gslq \$10,\$11,255\(\$12\) -.*: e9ee402d gssq \$13,\$14,-256\(\$15\) -.*: ca15bff4 gslqc1 \$f20,\$f21,255\(\$16\) -.*: ea37c036 gssqc1 \$f22,\$f23,-256\(\$17\) +.*: c98b3fea gslq \$10,\$11,4080\(\$12\) +.*: e9ee402d gssq \$13,\$14,-4096\(\$15\) +.*: ca15bff4 gslqc1 \$f20,\$f21,4080\(\$16\) +.*: ea37c036 gssqc1 \$f22,\$f23,-4096\(\$17\) #pass diff --git a/gas/testsuite/gas/mips/loongson-3a-2.s b/gas/testsuite/gas/mips/loongson-3a-2.s index 16a38c9..c296b06 100644 --- a/gas/testsuite/gas/mips/loongson-3a-2.s +++ b/gas/testsuite/gas/mips/loongson-3a-2.s @@ -58,8 +58,8 @@ gsswxc1 $f18,127($6,$7)
gssdxc1 $f19,-128($8,$9)
- gslq $10,$11,255($12)
- gssq $13,$14,-256($15)
- gslqc1 $f20,$f21,255($16)
- gssqc1 $f22,$f23,-256($17)
+ gslq $10,$11,4080($12)
+ gssq $13,$14,-4096($15)
+ gslqc1 $f20,$f21,4080($16)
+ gssqc1 $f22,$f23,-4096($17)
|