From c1556ecd7843912269aba283a0fd307729fa0c3a Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Thu, 23 Feb 2017 19:26:53 +0000 Subject: [PATCH] MIPS/BFD: Discard ineligible JALR relocations right away Discard R_MIPS_JALR and R_MICROMIPS_JALR relocations associated with jumps that cannot be converted to an equivalent branch right away in `mips_elf_calculate_relocation' rather than letting them through to `mips_elf_perform_relocation'. This includes cross-mode jumps which need to flip the ISA bit or jumps to a misaligned location that cannot be encoded with a branch, in addition to preemptible symbol references already handled. Cross-mode jumps are actually already rejected as the conversion is made in `mips_elf_perform_relocation', so in this case this change only saves some processing. Jumps to a misaligned location are however converted, with bits causing misalignment lost, making resulting code functionally different even if the lone effect is avoiding an address error exception with an instruction fetch at the jump destination requested. Add test cases suitable, also including GAS verification to confirm that the JALR relocations explicitly requested have indeed been output in the intermediate objects used. bfd/ * elfxx-mips.c (mips_elf_calculate_relocation) : Discard relocation if `cross_mode_jump_p' or misaligned. gas/ * testsuite/gas/mips/jalr4.d: New test. * testsuite/gas/mips/jalr4-n32.d: New test. * testsuite/gas/mips/jalr4-n64.d: New test. * testsuite/gas/mips/jalr4.s: New test source. * testsuite/gas/mips/mips.exp: Run the new tests. ld/ * testsuite/ld-mips-elf/jalr4.dd: New test. * testsuite/ld-mips-elf/mips-elf.exp: Run the new test. --- bfd/ChangeLog | 6 +++ bfd/elfxx-mips.c | 6 +++ gas/ChangeLog | 8 ++++ gas/testsuite/gas/mips/jalr4-n32.d | 5 +++ gas/testsuite/gas/mips/jalr4-n64.d | 42 ++++++++++++++++++ gas/testsuite/gas/mips/jalr4.d | 30 +++++++++++++ gas/testsuite/gas/mips/jalr4.s | 63 +++++++++++++++++++++++++++ gas/testsuite/gas/mips/mips.exp | 8 ++++ ld/ChangeLog | 5 +++ ld/testsuite/ld-mips-elf/jalr4.dd | 19 ++++++++ ld/testsuite/ld-mips-elf/mips-elf.exp | 9 +++- 11 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 gas/testsuite/gas/mips/jalr4-n32.d create mode 100644 gas/testsuite/gas/mips/jalr4-n64.d create mode 100644 gas/testsuite/gas/mips/jalr4.d create mode 100644 gas/testsuite/gas/mips/jalr4.s create mode 100644 ld/testsuite/ld-mips-elf/jalr4.dd diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3a3ca286318..46f5f9cfdc2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2017-02-23 Maciej W. Rozycki + + * elfxx-mips.c (mips_elf_calculate_relocation) + : Discard relocation if `cross_mode_jump_p' + or misaligned. + 2017-02-23 Alan Modra PR 20744 diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index c184d2e0e01..ec086de76ef 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6278,7 +6278,13 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd, when the symbol does not resolve locally. */ if (h != NULL && !SYMBOL_CALLS_LOCAL (info, &h->root)) return bfd_reloc_continue; + /* We can't optimize cross-mode jumps either. */ + if (*cross_mode_jump_p) + return bfd_reloc_continue; value = symbol + addend; + /* Neither we can non-instruction-aligned targets. */ + if (r_type == R_MIPS_JALR ? (value & 3) != 0 : (value & 1) == 0) + return bfd_reloc_continue; break; case R_MIPS_PJUMP: diff --git a/gas/ChangeLog b/gas/ChangeLog index 415237c6946..0f46787ebac 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2017-02-23 Maciej W. Rozycki + + * testsuite/gas/mips/jalr4.d: New test. + * testsuite/gas/mips/jalr4-n32.d: New test. + * testsuite/gas/mips/jalr4-n64.d: New test. + * testsuite/gas/mips/jalr4.s: New test source. + * testsuite/gas/mips/mips.exp: Run the new tests. + 2017-02-23 Sheldon Lobo Add support for associating SPARC ASIs with an architecture level. diff --git a/gas/testsuite/gas/mips/jalr4-n32.d b/gas/testsuite/gas/mips/jalr4-n32.d new file mode 100644 index 00000000000..fde29f51156 --- /dev/null +++ b/gas/testsuite/gas/mips/jalr4-n32.d @@ -0,0 +1,5 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS JALR reloc unaligned/cross-mode (n32) +#as: -n32 +#source: jalr4.s +#dump: jalr4.d diff --git a/gas/testsuite/gas/mips/jalr4-n64.d b/gas/testsuite/gas/mips/jalr4-n64.d new file mode 100644 index 00000000000..b61fc232949 --- /dev/null +++ b/gas/testsuite/gas/mips/jalr4-n64.d @@ -0,0 +1,42 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS JALR reloc unaligned/cross-mode (n64) +#as: -64 +#source: jalr4.s + +.*: +file format .*mips.* + +Disassembly of section \.text: +[0-9a-f]+ <[^>]*> 0320f809 jalr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar0 +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320000[89] jr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar0 +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320f809 jalr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar1 +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320000[89] jr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar1 +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320f809 jalr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar2 +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320000[89] jr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar2 +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[ ]*[0-9a-f]+: R_MIPS_NONE \*ABS\* +[0-9a-f]+ <[^>]*> 00000000 nop + \.\.\. + \.\.\. + \.\.\. + \.\.\. diff --git a/gas/testsuite/gas/mips/jalr4.d b/gas/testsuite/gas/mips/jalr4.d new file mode 100644 index 00000000000..1a1afdda0a3 --- /dev/null +++ b/gas/testsuite/gas/mips/jalr4.d @@ -0,0 +1,30 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS JALR reloc unaligned/cross-mode (o32) +#as: -32 +#source: jalr4.s + +.*: +file format .*mips.* + +Disassembly of section \.text: +[0-9a-f]+ <[^>]*> 0320f809 jalr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar0 +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320000[89] jr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar0 +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320f809 jalr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar1 +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320000[89] jr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar1 +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320f809 jalr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar2 +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320000[89] jr t9 +[ ]*[0-9a-f]+: R_MIPS_JALR bar2 +[0-9a-f]+ <[^>]*> 00000000 nop + \.\.\. + \.\.\. + \.\.\. + \.\.\. diff --git a/gas/testsuite/gas/mips/jalr4.s b/gas/testsuite/gas/mips/jalr4.s new file mode 100644 index 00000000000..4ad6f264d86 --- /dev/null +++ b/gas/testsuite/gas/mips/jalr4.s @@ -0,0 +1,63 @@ + .abicalls + .text + + .align 2 + .globl foo + .ent foo +foo: + .reloc 1f, R_MIPS_JALR, bar0 +1: jalr $25 + .reloc 1f, R_MIPS_JALR, bar0 +1: jr $25 + .reloc 1f, R_MIPS_JALR, bar1 +1: jalr $25 + .reloc 1f, R_MIPS_JALR, bar1 +1: jr $25 + .reloc 1f, R_MIPS_JALR, bar2 +1: jalr $25 + .reloc 1f, R_MIPS_JALR, bar2 +1: jr $25 + .end foo + +# Force some (non-delay-slot) zero bytes, to make 'objdump' print ... + .align 4, 0 + .space 16 + + .align 2 + .globl bar0 + .ent bar0 +bar0: + .insn + .end bar0 + +# Force some (non-delay-slot) zero bytes, to make 'objdump' print ... + .align 4, 0 + .space 16 + + .align 2 + .globl bar1 + .ent bar1 + .space 2 +bar1: + .insn + .end bar1 + +# Force some (non-delay-slot) zero bytes, to make 'objdump' print ... + .align 4, 0 + .space 16 + + .set mips64r2 + .set mips16 + .align 2 + .globl bar2 + .ent bar2 + .byte 0 +bar2: + .insn + .end bar2 + .set nomips16 + .set mips0 + +# Force some (non-delay-slot) zero bytes, to make 'objdump' print ... + .align 4, 0 + .space 16 diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp index bef710635bb..591af507a27 100644 --- a/gas/testsuite/gas/mips/mips.exp +++ b/gas/testsuite/gas/mips/mips.exp @@ -1182,13 +1182,21 @@ if { [istarget mips*-*-vxworks*] } { run_dump_test "jalr2" run_dump_test_arches "jalr3" [mips_arch_list_matching mips1 \ !micromips] + run_dump_test_arches "jalr4" [mips_arch_list_matching mips1 \ + !micromips] if $has_newabi { run_dump_test_arches "jalr3-n32" \ [mips_arch_list_matching mips3 \ !micromips] + run_dump_test_arches "jalr4-n32" \ + [mips_arch_list_matching mips3 \ + !micromips] run_dump_test_arches "jalr3-n64" \ [mips_arch_list_matching mips3 \ !micromips] + run_dump_test_arches "jalr4-n64" \ + [mips_arch_list_matching mips3 \ + !micromips] } run_dump_test_arches "aent" [mips_arch_list_matching mips1] diff --git a/ld/ChangeLog b/ld/ChangeLog index 8807c909f22..3e88456a179 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2017-02-23 Maciej W. Rozycki + + * testsuite/ld-mips-elf/jalr4.dd: New test. + * testsuite/ld-mips-elf/mips-elf.exp: Run the new test. + 2017-02-23 Alan Modra PR 20744 diff --git a/ld/testsuite/ld-mips-elf/jalr4.dd b/ld/testsuite/ld-mips-elf/jalr4.dd new file mode 100644 index 00000000000..8e4175647f2 --- /dev/null +++ b/ld/testsuite/ld-mips-elf/jalr4.dd @@ -0,0 +1,19 @@ +.*: +file format .*mips.* + +Disassembly of section \.text: +[0-9a-f]+ <[^>]*> 0411000f bal 0+000040 +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 1000000d b 0+000040 +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320f809 jalr t9 +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 03200008 jr t9 +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0320f809 jalr t9 +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 03200008 jr t9 +[0-9a-f]+ <[^>]*> 00000000 nop + \.\.\. + \.\.\. + \.\.\. + \.\.\. diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp index 7fa11c5989d..dab0e0fbab9 100644 --- a/ld/testsuite/ld-mips-elf/mips-elf.exp +++ b/ld/testsuite/ld-mips-elf/mips-elf.exp @@ -999,7 +999,14 @@ foreach { abi } $abis { "$abi_asflags($abi)" \ [list ../../../gas/testsuite/gas/mips/jalr3.s] \ [list "objdump -d jalr3.dd"] \ - "jalr3-${abi}"]] + "jalr3-${abi}"] \ + [list \ + "MIPS JALR reloc unaligned/cross-mode link test ($abi)" \ + "$abi_ldflags($abi) -T jalr3.ld" "" \ + "$abi_asflags($abi)" \ + [list ../../../gas/testsuite/gas/mips/jalr4.s] \ + [list "objdump {-d --prefix-addresses --show-raw-insn} jalr4.dd"] \ + "jalr4-${abi}"]] } proc build_mips_plt_lib { abi } { -- 2.30.2