diff options
| -rw-r--r-- | gas/config/tc-s390.c | 14 | ||||
| -rw-r--r-- | gas/testsuite/gas/s390/esa-z900.d | 6 | ||||
| -rw-r--r-- | gas/testsuite/gas/s390/esa-z900.s | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/s390/s390.exp | 1 | ||||
| -rw-r--r-- | gas/testsuite/gas/s390/zarch-z900-err.l | 3 | ||||
| -rw-r--r-- | gas/testsuite/gas/s390/zarch-z900-err.s | 4 |
6 files changed, 26 insertions, 6 deletions
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c index 4af635b..4fd4f1f 100644 --- a/gas/config/tc-s390.c +++ b/gas/config/tc-s390.c @@ -1619,6 +1619,7 @@ md_gather_operands (char *str, md_apply_fix. */ for (i = 0; i < fc; i++) { + fixS *fixP; if (fixups[i].opindex < 0) { @@ -1633,7 +1634,6 @@ md_gather_operands (char *str, if (fixups[i].reloc != BFD_RELOC_UNUSED) { reloc_howto_type *reloc_howto; - fixS *fixP; int size; reloc_howto = bfd_reloc_type_lookup (stdoutput, fixups[i].reloc); @@ -1661,10 +1661,14 @@ md_gather_operands (char *str, fixP->fx_pcrel_adjust = operand->shift / 8; } else - fix_new_exp (frag_now, f - frag_now->fr_literal, 4, &fixups[i].exp, - (operand->flags & S390_OPERAND_PCREL) != 0, - ((bfd_reloc_code_real_type) - (fixups[i].opindex + (int) BFD_RELOC_UNUSED))); + fixP = fix_new_exp (frag_now, f - frag_now->fr_literal, 4, + &fixups[i].exp, + (operand->flags & S390_OPERAND_PCREL) != 0, + ((bfd_reloc_code_real_type) + (fixups[i].opindex + (int) BFD_RELOC_UNUSED))); + /* s390_insert_operand () does the range checking. */ + if (operand->flags & S390_OPERAND_PCREL) + fixP->fx_no_overflow = 1; } return str; } diff --git a/gas/testsuite/gas/s390/esa-z900.d b/gas/testsuite/gas/s390/esa-z900.d index 42f408b..86db064 100644 --- a/gas/testsuite/gas/s390/esa-z900.d +++ b/gas/testsuite/gas/s390/esa-z900.d @@ -52,6 +52,10 @@ Disassembly of section .text: .*: c0 f4 00 00 00 00 [ ]*jg 102 <foo\+0x102> .*: c0 65 00 00 00 00 [ ]*brasl %r6,108 <foo\+0x108> .*: c0 65 00 00 00 00 [ ]*brasl %r6,10e <foo\+0x10e> +.*: c0 65 80 00 00 00 [ ]*brasl %r6,114 <foo\+0x114> +.*: c0 65 80 00 00 00 [ ]*brasl %r6,11a <foo\+0x11a> +.*: c0 65 7f ff ff ff [ ]*brasl %r6,11e <foo\+0x11e> +.*: c0 65 7f ff ff ff [ ]*brasl %r6,124 <foo\+0x124> .*: 01 0b [ ]*tam .*: 01 0c [ ]*sam24 .*: 01 0d [ ]*sam31 @@ -62,7 +66,7 @@ Disassembly of section .text: .*: b9 97 00 69 [ ]*dlr %r6,%r9 .*: b9 98 00 69 [ ]*alcr %r6,%r9 .*: b9 99 00 69 [ ]*slbr %r6,%r9 -.*: c0 60 00 00 00 00 [ ]*larl %r6,136 <foo\+0x136> +.*: c0 60 00 00 00 00 [ ]*larl %r6,14e <foo\+0x14e> .*: e3 65 af ff 00 1e [ ]*lrv %r6,4095\(%r5,%r10\) .*: e3 65 af ff 00 1f [ ]*lrvh %r6,4095\(%r5,%r10\) .*: e3 65 af ff 00 3e [ ]*strv %r6,4095\(%r5,%r10\) diff --git a/gas/testsuite/gas/s390/esa-z900.s b/gas/testsuite/gas/s390/esa-z900.s index 7a00616..74bbf61 100644 --- a/gas/testsuite/gas/s390/esa-z900.s +++ b/gas/testsuite/gas/s390/esa-z900.s @@ -46,6 +46,10 @@ foo: brul . brasl %r6,. jasl %r6,. + brasl %r6,.-0x100000000 + jasl %r6,.-0x100000000 + brasl %r6,.+0xfffffffe + jasl %r6,.+0xfffffffe tam sam24 sam31 diff --git a/gas/testsuite/gas/s390/s390.exp b/gas/testsuite/gas/s390/s390.exp index d03555a..356fba9 100644 --- a/gas/testsuite/gas/s390/s390.exp +++ b/gas/testsuite/gas/s390/s390.exp @@ -20,6 +20,7 @@ if [expr [istarget "s390-*-*"] || [istarget "s390x-*-*"]] then { # } run_dump_test "zarch-z900" "{as -m64}" + run_list_test "zarch-z900-err" "-march=z900" run_dump_test "zarch-z990" "{as -m64} {as -march=z990}" run_list_test "zarch-z990-symbol-lay" "-m64 -march=z990" run_dump_test "zarch-z9-109" "{as -m64} {as -march=z9-109}" diff --git a/gas/testsuite/gas/s390/zarch-z900-err.l b/gas/testsuite/gas/s390/zarch-z900-err.l new file mode 100644 index 0000000..7299419 --- /dev/null +++ b/gas/testsuite/gas/s390/zarch-z900-err.l @@ -0,0 +1,3 @@ +.*: Assembler messages: +.*:3: Error: operand out of range \(fffffffefffffffe not between 0 and 4294967294\) +.*:4: Error: operand out of range \(0000000100000000 not between 0 and 4294967294\) diff --git a/gas/testsuite/gas/s390/zarch-z900-err.s b/gas/testsuite/gas/s390/zarch-z900-err.s new file mode 100644 index 0000000..96fef2a --- /dev/null +++ b/gas/testsuite/gas/s390/zarch-z900-err.s @@ -0,0 +1,4 @@ +.text +foo: + brasl %r6,.-0x100000002 + brasl %r6,.+0x100000000 |