diff options
24 files changed, 313 insertions, 148 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 7ab0b28..2561c50 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,32 @@ 2016-07-02 Maciej W. Rozycki <macro@imgtec.com> + * testsuite/gas/mips/branch-misc-2.s: Move non + locally-defined-global symbol tests... + * testsuite/gas/mips/branch-misc-5.s: ... to this new test. + * testsuite/gas/mips/branch-misc-2.d: Update accordingly. + * testsuite/gas/mips/branch-misc-2-64.d: Likewise. + * testsuite/gas/mips/branch-misc-2pic.d: Likewise. + * testsuite/gas/mips/branch-misc-2pic-64.d: Likewise. + * testsuite/gas/mips/mipsr6@branch-misc-2-64.d: Likewise. + * testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d: Likewise. + * testsuite/gas/mips/micromips@branch-misc-2.d: Likewise. + * testsuite/gas/mips/micromips@branch-misc-2-64.d: Likewise. + * testsuite/gas/mips/micromips@branch-misc-2pic.d: Likewise. + * testsuite/gas/mips/micromips@branch-misc-2pic-64.d: Likewise. + * testsuite/gas/mips/branch-misc-5.d: New test. + * testsuite/gas/mips/branch-misc-5pic.d: New test. + * testsuite/gas/mips/branch-misc-5-64.d: New test. + * testsuite/gas/mips/branch-misc-5pic-64.d: New test. + * testsuite/gas/mips/mipsr6@branch-misc-5-64.d: New test. + * testsuite/gas/mips/mipsr6@branch-misc-5pic-64.d: New test. + * testsuite/gas/mips/micromips@branch-misc-5.d: New test. + * testsuite/gas/mips/micromips@branch-misc-5pic.d: New test. + * testsuite/gas/mips/micromips@branch-misc-5-64.d: New test. + * testsuite/gas/mips/micromips@branch-misc-5pic-64.d: New test. + * testsuite/gas/mips/mips.exp: Run the new tests. + +2016-07-02 Maciej W. Rozycki <macro@imgtec.com> + * testsuite/gas/mips/beq.s: Uncomment branches to undefined symbols. * testsuite/gas/mips/beq.d: Update accordingly. diff --git a/gas/testsuite/gas/mips/branch-misc-2-64.d b/gas/testsuite/gas/mips/branch-misc-2-64.d index 3b7791a..d299585 100644 --- a/gas/testsuite/gas/mips/branch-misc-2-64.d +++ b/gas/testsuite/gas/mips/branch-misc-2-64.d @@ -3,7 +3,7 @@ #source: branch-misc-2.s #as: -64 -non_shared -# Test the backward branches to globals symbols in current file. +# Test branches to global symbols in current file. .*: +file format .*mips.* @@ -44,19 +44,4 @@ Disassembly of section .text: \.\.\. \.\.\. \.\.\. -0+00a8 <[^>]*> 10000000 b 00000000000000ac <g6\+0x4> -[ ]*a8: R_MIPS_PC16 x1-0x4 -[ ]*a8: R_MIPS_NONE \*ABS\*-0x4 -[ ]*a8: R_MIPS_NONE \*ABS\*-0x4 -0+00ac <[^>]*> 00000000 nop -0+00b0 <[^>]*> 10000000 b 00000000000000b4 <g6\+0xc> -[ ]*b0: R_MIPS_PC16 x2-0x4 -[ ]*b0: R_MIPS_NONE \*ABS\*-0x4 -[ ]*b0: R_MIPS_NONE \*ABS\*-0x4 -0+00b4 <[^>]*> 00000000 nop -0+00b8 <[^>]*> 10000000 b 00000000000000bc <g6\+0x14> -[ ]*b8: R_MIPS_PC16 \.data-0x4 -[ ]*b8: R_MIPS_NONE \*ABS\*-0x4 -[ ]*b8: R_MIPS_NONE \*ABS\*-0x4 -0+00bc <[^>]*> 00000000 nop \.\.\. diff --git a/gas/testsuite/gas/mips/branch-misc-2.d b/gas/testsuite/gas/mips/branch-misc-2.d index ba99165..287364c 100644 --- a/gas/testsuite/gas/mips/branch-misc-2.d +++ b/gas/testsuite/gas/mips/branch-misc-2.d @@ -2,7 +2,7 @@ #name: MIPS branch-misc-2 #as: -32 -non_shared -# Test the backward branches to globals symbols in current file. +# Test branches to global symbols in current file. .*: +file format .*mips.* @@ -31,13 +31,4 @@ Disassembly of section .text: \.\.\. \.\.\. \.\.\. -0+00a8 <[^>]*> 1000ffff b 000000a8 <g6> -[ ]*a8: R_MIPS_PC16 x1 -0+00ac <[^>]*> 00000000 nop -0+00b0 <[^>]*> 1000ffff b 000000b0 <g6\+0x8> -[ ]*b0: R_MIPS_PC16 x2 -0+00b4 <[^>]*> 00000000 nop -0+00b8 <[^>]*> 1000ffff b 000000b8 <g6\+0x10> -[ ]*b8: R_MIPS_PC16 \.Ldata -0+00bc <[^>]*> 00000000 nop \.\.\. diff --git a/gas/testsuite/gas/mips/branch-misc-2.s b/gas/testsuite/gas/mips/branch-misc-2.s index abf43c5..4490362 100644 --- a/gas/testsuite/gas/mips/branch-misc-2.s +++ b/gas/testsuite/gas/mips/branch-misc-2.s @@ -1,4 +1,4 @@ -# Source file used to test the backward branches to globals in this file. +# Source file used to test branches to globals in this file. .globl g1 .text .globl g2 .text @@ -32,13 +32,6 @@ g5: .space 20 g6: - b x1 - b x2 - b .Ldata - # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ... .align 2 .space 8 - - .data -.Ldata: diff --git a/gas/testsuite/gas/mips/branch-misc-2pic-64.d b/gas/testsuite/gas/mips/branch-misc-2pic-64.d index 7cef9e9..2f64f6b 100644 --- a/gas/testsuite/gas/mips/branch-misc-2pic-64.d +++ b/gas/testsuite/gas/mips/branch-misc-2pic-64.d @@ -3,7 +3,7 @@ #source: branch-misc-2.s #as: -64 -call_shared -# Test the backward branches to globals symbols in current file. +# Test branches to global symbols in current file. .*: +file format .*mips.* @@ -44,19 +44,4 @@ Disassembly of section .text: \.\.\. \.\.\. \.\.\. -0+00a8 <[^>]*> 10000000 b 00000000000000ac <g6\+0x4> -[ ]*a8: R_MIPS_PC16 x1-0x4 -[ ]*a8: R_MIPS_NONE \*ABS\*-0x4 -[ ]*a8: R_MIPS_NONE \*ABS\*-0x4 -0+00ac <[^>]*> 00000000 nop -0+00b0 <[^>]*> 10000000 b 00000000000000b4 <g6\+0xc> -[ ]*b0: R_MIPS_PC16 x2-0x4 -[ ]*b0: R_MIPS_NONE \*ABS\*-0x4 -[ ]*b0: R_MIPS_NONE \*ABS\*-0x4 -0+00b4 <[^>]*> 00000000 nop -0+00b8 <[^>]*> 10000000 b 00000000000000bc <g6\+0x14> -[ ]*b8: R_MIPS_PC16 \.data-0x4 -[ ]*b8: R_MIPS_NONE \*ABS\*-0x4 -[ ]*b8: R_MIPS_NONE \*ABS\*-0x4 -0+00bc <[^>]*> 00000000 nop \.\.\. diff --git a/gas/testsuite/gas/mips/branch-misc-2pic.d b/gas/testsuite/gas/mips/branch-misc-2pic.d index a8e9330..ce8ffc8 100644 --- a/gas/testsuite/gas/mips/branch-misc-2pic.d +++ b/gas/testsuite/gas/mips/branch-misc-2pic.d @@ -3,7 +3,7 @@ #source: branch-misc-2.s #as: -32 -call_shared -# Test the backward branches to globals symbols in current file. +# Test branches to global symbols in current file. .*: +file format .*mips.* @@ -32,13 +32,4 @@ Disassembly of section .text: \.\.\. \.\.\. \.\.\. -0+00a8 <[^>]*> 1000ffff b 000000a8 <g6> -[ ]*a8: R_MIPS_PC16 x1 -0+00ac <[^>]*> 00000000 nop -0+00b0 <[^>]*> 1000ffff b 000000b0 <g6\+0x8> -[ ]*b0: R_MIPS_PC16 x2 -0+00b4 <[^>]*> 00000000 nop -0+00b8 <[^>]*> 1000ffff b 000000b8 <g6\+0x10> -[ ]*b8: R_MIPS_PC16 \.Ldata -0+00bc <[^>]*> 00000000 nop \.\.\. diff --git a/gas/testsuite/gas/mips/branch-misc-5-64.d b/gas/testsuite/gas/mips/branch-misc-5-64.d new file mode 100644 index 0000000..619921b --- /dev/null +++ b/gas/testsuite/gas/mips/branch-misc-5-64.d @@ -0,0 +1,27 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS branch-misc-5-64 +#source: branch-misc-5.s +#as: -64 -non_shared + +# Test branches to undefined symbols and a defined local symbol +# in another section. + +.*: +file format .*mips.* + +Disassembly of section .text: +0+0000 <[^>]*> 10000000 b 0000000000000004 <g6\+0x4> +[ ]*0: R_MIPS_PC16 x1-0x4 +[ ]*0: R_MIPS_NONE \*ABS\*-0x4 +[ ]*0: R_MIPS_NONE \*ABS\*-0x4 +0+0004 <[^>]*> 00000000 nop +0+0008 <[^>]*> 10000000 b 000000000000000c <g6\+0xc> +[ ]*8: R_MIPS_PC16 x2-0x4 +[ ]*8: R_MIPS_NONE \*ABS\*-0x4 +[ ]*8: R_MIPS_NONE \*ABS\*-0x4 +0+000c <[^>]*> 00000000 nop +0+0010 <[^>]*> 10000000 b 0000000000000014 <g6\+0x14> +[ ]*10: R_MIPS_PC16 \.data-0x4 +[ ]*10: R_MIPS_NONE \*ABS\*-0x4 +[ ]*10: R_MIPS_NONE \*ABS\*-0x4 +0+0014 <[^>]*> 00000000 nop + \.\.\. diff --git a/gas/testsuite/gas/mips/branch-misc-5.d b/gas/testsuite/gas/mips/branch-misc-5.d new file mode 100644 index 0000000..e9c99cc --- /dev/null +++ b/gas/testsuite/gas/mips/branch-misc-5.d @@ -0,0 +1,20 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS branch-misc-5 +#as: -32 -non_shared + +# Test branches to undefined symbols and a defined local symbol +# in another section. + +.*: +file format .*mips.* + +Disassembly of section \.text: +0+0000 <[^>]*> 1000ffff b 00000000 <g6> +[ ]*0: R_MIPS_PC16 x1 +0+0004 <[^>]*> 00000000 nop +0+0008 <[^>]*> 1000ffff b 00000008 <g6\+0x8> +[ ]*8: R_MIPS_PC16 x2 +0+000c <[^>]*> 00000000 nop +0+0010 <[^>]*> 1000ffff b 00000010 <g6\+0x10> +[ ]*10: R_MIPS_PC16 \.Ldata +0+0014 <[^>]*> 00000000 nop + \.\.\. diff --git a/gas/testsuite/gas/mips/branch-misc-5.s b/gas/testsuite/gas/mips/branch-misc-5.s new file mode 100644 index 0000000..ac307f5 --- /dev/null +++ b/gas/testsuite/gas/mips/branch-misc-5.s @@ -0,0 +1,20 @@ +# Source file used to test branches to undefined symbols and a defined +# local symbol in another section. + + .globl g6 .text + + .globl x1 .text + + .text +g6: + + b x1 + b x2 + b .Ldata + +# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ... + .align 2 + .space 8 + + .data +.Ldata: diff --git a/gas/testsuite/gas/mips/branch-misc-5pic-64.d b/gas/testsuite/gas/mips/branch-misc-5pic-64.d new file mode 100644 index 0000000..68c82d4 --- /dev/null +++ b/gas/testsuite/gas/mips/branch-misc-5pic-64.d @@ -0,0 +1,27 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS branch-misc-5pic-64 +#source: branch-misc-5.s +#as: -64 -call_shared + +# Test branches to undefined symbols and a defined local symbol +# in another section. + +.*: +file format .*mips.* + +Disassembly of section .text: +0+0000 <[^>]*> 10000000 b 0000000000000004 <g6\+0x4> +[ ]*0: R_MIPS_PC16 x1-0x4 +[ ]*0: R_MIPS_NONE \*ABS\*-0x4 +[ ]*0: R_MIPS_NONE \*ABS\*-0x4 +0+0004 <[^>]*> 00000000 nop +0+0008 <[^>]*> 10000000 b 000000000000000c <g6\+0xc> +[ ]*8: R_MIPS_PC16 x2-0x4 +[ ]*8: R_MIPS_NONE \*ABS\*-0x4 +[ ]*8: R_MIPS_NONE \*ABS\*-0x4 +0+000c <[^>]*> 00000000 nop +0+0010 <[^>]*> 10000000 b 0000000000000014 <g6\+0x14> +[ ]*10: R_MIPS_PC16 \.data-0x4 +[ ]*10: R_MIPS_NONE \*ABS\*-0x4 +[ ]*10: R_MIPS_NONE \*ABS\*-0x4 +0+0014 <[^>]*> 00000000 nop + \.\.\. diff --git a/gas/testsuite/gas/mips/branch-misc-5pic.d b/gas/testsuite/gas/mips/branch-misc-5pic.d new file mode 100644 index 0000000..6fba525 --- /dev/null +++ b/gas/testsuite/gas/mips/branch-misc-5pic.d @@ -0,0 +1,21 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS branch-misc-5pic +#source: branch-misc-5.s +#as: -32 -call_shared + +# Test branches to undefined symbols and a defined local symbol +# in another section. + +.*: +file format .*mips.* + +Disassembly of section .text: +0+0000 <[^>]*> 1000ffff b 00000000 <g6> +[ ]*0: R_MIPS_PC16 x1 +0+0004 <[^>]*> 00000000 nop +0+0008 <[^>]*> 1000ffff b 00000008 <g6\+0x8> +[ ]*8: R_MIPS_PC16 x2 +0+000c <[^>]*> 00000000 nop +0+0010 <[^>]*> 1000ffff b 00000010 <g6\+0x10> +[ ]*10: R_MIPS_PC16 \.Ldata +0+0014 <[^>]*> 00000000 nop + \.\.\. diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-2-64.d b/gas/testsuite/gas/mips/micromips@branch-misc-2-64.d index 61f27f7..2e6bd96 100644 --- a/gas/testsuite/gas/mips/micromips@branch-misc-2-64.d +++ b/gas/testsuite/gas/mips/micromips@branch-misc-2-64.d @@ -3,7 +3,7 @@ #source: branch-misc-2.s #as: -64 -non_shared -# Test the backward branches to global symbols in current file (microMIPS). +# Test branches to global symbols in current file (microMIPS). .*: +file format .*mips.* @@ -44,20 +44,4 @@ Disassembly of section \.text: \.\.\. \.\.\. \.\.\. -[0-9a-f]+ <[^>]*> 9400 0000 b 0+00ac <g6\+0x4> - a8: R_MICROMIPS_PC16_S1 x1\-0x4 - a8: R_MIPS_NONE \*ABS\*\-0x4 - a8: R_MIPS_NONE \*ABS\*\-0x4 -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 9400 0000 b 0+00b2 <g6\+0xa> - ae: R_MICROMIPS_PC16_S1 x2\-0x4 - ae: R_MIPS_NONE \*ABS\*\-0x4 - ae: R_MIPS_NONE \*ABS\*\-0x4 -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 9400 0000 b 0+00b8 <g6\+0x10> - b4: R_MICROMIPS_PC16_S1 \.data\-0x4 - b4: R_MIPS_NONE \*ABS\*\-0x4 - b4: R_MIPS_NONE \*ABS\*\-0x4 -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 0c00 nop \.\.\. diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-2.d b/gas/testsuite/gas/mips/micromips@branch-misc-2.d index 1dcc8db..02c6b40 100644 --- a/gas/testsuite/gas/mips/micromips@branch-misc-2.d +++ b/gas/testsuite/gas/mips/micromips@branch-misc-2.d @@ -3,7 +3,7 @@ #source: branch-misc-2.s #as: -32 -non_shared -# Test the backward branches to global symbols in current file (microMIPS). +# Test branches to global symbols in current file (microMIPS). .*: +file format .*mips.* @@ -32,14 +32,4 @@ Disassembly of section \.text: \.\.\. \.\.\. \.\.\. -[0-9a-f]+ <[^>]*> 9400 fffe b 0+00a8 <g6> - a8: R_MICROMIPS_PC16_S1 x1 -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 9400 fffe b 0+00ae <g6\+0x6> - ae: R_MICROMIPS_PC16_S1 x2 -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 9400 fffe b 0+00b4 <g6\+0xc> - b4: R_MICROMIPS_PC16_S1 \.Ldata -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 0c00 nop \.\.\. diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-2pic-64.d b/gas/testsuite/gas/mips/micromips@branch-misc-2pic-64.d index 7b8b40a..a0b6fcc 100644 --- a/gas/testsuite/gas/mips/micromips@branch-misc-2pic-64.d +++ b/gas/testsuite/gas/mips/micromips@branch-misc-2pic-64.d @@ -3,7 +3,7 @@ #source: branch-misc-2.s #as: -64 -call_shared -# Test the backward branches to global symbols in current file (microMIPS). +# Test branches to global symbols in current file (microMIPS). .*: +file format .*mips.* @@ -44,20 +44,4 @@ Disassembly of section \.text: \.\.\. \.\.\. \.\.\. -[0-9a-f]+ <[^>]*> 9400 0000 b 0+00ac <g6\+0x4> - a8: R_MICROMIPS_PC16_S1 x1\-0x4 - a8: R_MIPS_NONE \*ABS\*\-0x4 - a8: R_MIPS_NONE \*ABS\*\-0x4 -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 9400 0000 b 0+00b2 <g6\+0xa> - ae: R_MICROMIPS_PC16_S1 x2\-0x4 - ae: R_MIPS_NONE \*ABS\*\-0x4 - ae: R_MIPS_NONE \*ABS\*\-0x4 -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 9400 0000 b 0+00b8 <g6\+0x10> - b4: R_MICROMIPS_PC16_S1 \.data\-0x4 - b4: R_MIPS_NONE \*ABS\*\-0x4 - b4: R_MIPS_NONE \*ABS\*\-0x4 -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 0c00 nop \.\.\. diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-2pic.d b/gas/testsuite/gas/mips/micromips@branch-misc-2pic.d index f9ecd03..6785ac0 100644 --- a/gas/testsuite/gas/mips/micromips@branch-misc-2pic.d +++ b/gas/testsuite/gas/mips/micromips@branch-misc-2pic.d @@ -3,7 +3,7 @@ #source: branch-misc-2.s #as: -32 -call_shared -# Test the backward branches to global symbols in current file (microMIPS). +# Test branches to global symbols in current file (microMIPS). .*: +file format .*mips.* @@ -32,14 +32,4 @@ Disassembly of section \.text: \.\.\. \.\.\. \.\.\. -[0-9a-f]+ <[^>]*> 9400 fffe b 0+00a8 <g6> - a8: R_MICROMIPS_PC16_S1 x1 -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 9400 fffe b 0+00ae <g6\+0x6> - ae: R_MICROMIPS_PC16_S1 x2 -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 9400 fffe b 0+00b4 <g6\+0xc> - b4: R_MICROMIPS_PC16_S1 \.Ldata -[0-9a-f]+ <[^>]*> 0c00 nop -[0-9a-f]+ <[^>]*> 0c00 nop \.\.\. diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-5-64.d b/gas/testsuite/gas/mips/micromips@branch-misc-5-64.d new file mode 100644 index 0000000..675752d --- /dev/null +++ b/gas/testsuite/gas/mips/micromips@branch-misc-5-64.d @@ -0,0 +1,28 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS branch-misc-5-64 +#source: branch-misc-5.s +#as: -64 -non_shared + +# Test branches to undefined symbols and a defined local symbol +# in another section (microMIPS). + +.*: +file format .*mips.* + +Disassembly of section \.text: +[0-9a-f]+ <[^>]*> 9400 0000 b 0+0004 <g6\+0x4> + 0: R_MICROMIPS_PC16_S1 x1\-0x4 + 0: R_MIPS_NONE \*ABS\*\-0x4 + 0: R_MIPS_NONE \*ABS\*\-0x4 +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 9400 0000 b 0+000a <g6\+0xa> + 6: R_MICROMIPS_PC16_S1 x2\-0x4 + 6: R_MIPS_NONE \*ABS\*\-0x4 + 6: R_MIPS_NONE \*ABS\*\-0x4 +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 9400 0000 b 0+0010 <g6\+0x10> + c: R_MICROMIPS_PC16_S1 \.data\-0x4 + c: R_MIPS_NONE \*ABS\*\-0x4 + c: R_MIPS_NONE \*ABS\*\-0x4 +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 0c00 nop + \.\.\. diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-5.d b/gas/testsuite/gas/mips/micromips@branch-misc-5.d new file mode 100644 index 0000000..ef408ad --- /dev/null +++ b/gas/testsuite/gas/mips/micromips@branch-misc-5.d @@ -0,0 +1,22 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS branch-misc-5 +#source: branch-misc-5.s +#as: -32 -non_shared + +# Test branches to undefined symbols and a defined local symbol +# in another section (microMIPS). + +.*: +file format .*mips.* + +Disassembly of section \.text: +[0-9a-f]+ <[^>]*> 9400 fffe b 0+0000 <g6> + 0: R_MICROMIPS_PC16_S1 x1 +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 9400 fffe b 0+0006 <g6\+0x6> + 6: R_MICROMIPS_PC16_S1 x2 +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 9400 fffe b 0+000c <g6\+0xc> + c: R_MICROMIPS_PC16_S1 \.Ldata +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 0c00 nop + \.\.\. diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-5pic-64.d b/gas/testsuite/gas/mips/micromips@branch-misc-5pic-64.d new file mode 100644 index 0000000..90b2143 --- /dev/null +++ b/gas/testsuite/gas/mips/micromips@branch-misc-5pic-64.d @@ -0,0 +1,28 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS branch-misc-5pic-64 +#source: branch-misc-5.s +#as: -64 -call_shared + +# Test branches to undefined symbols and a defined local symbol +# in another section (microMIPS). + +.*: +file format .*mips.* + +Disassembly of section \.text: +[0-9a-f]+ <[^>]*> 9400 0000 b 0+0004 <g6\+0x4> + 0: R_MICROMIPS_PC16_S1 x1\-0x4 + 0: R_MIPS_NONE \*ABS\*\-0x4 + 0: R_MIPS_NONE \*ABS\*\-0x4 +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 9400 0000 b 0+000a <g6\+0xa> + 6: R_MICROMIPS_PC16_S1 x2\-0x4 + 6: R_MIPS_NONE \*ABS\*\-0x4 + 6: R_MIPS_NONE \*ABS\*\-0x4 +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 9400 0000 b 0+0010 <g6\+0x10> + c: R_MICROMIPS_PC16_S1 \.data\-0x4 + c: R_MIPS_NONE \*ABS\*\-0x4 + c: R_MIPS_NONE \*ABS\*\-0x4 +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 0c00 nop + \.\.\. diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-5pic.d b/gas/testsuite/gas/mips/micromips@branch-misc-5pic.d new file mode 100644 index 0000000..730b037 --- /dev/null +++ b/gas/testsuite/gas/mips/micromips@branch-misc-5pic.d @@ -0,0 +1,22 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS branch-misc-5pic +#source: branch-misc-5.s +#as: -32 -call_shared + +# Test branches to undefined symbols and a defined local symbol +# in another section (microMIPS). + +.*: +file format .*mips.* + +Disassembly of section \.text: +[0-9a-f]+ <[^>]*> 9400 fffe b 0+0000 <g6> + 0: R_MICROMIPS_PC16_S1 x1 +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 9400 fffe b 0+0006 <g6\+0x6> + 6: R_MICROMIPS_PC16_S1 x2 +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 9400 fffe b 0+000c <g6\+0xc> + c: R_MICROMIPS_PC16_S1 \.Ldata +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 0c00 nop + \.\.\. diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp index e20905e..731afd2 100644 --- a/gas/testsuite/gas/mips/mips.exp +++ b/gas/testsuite/gas/mips/mips.exp @@ -561,6 +561,8 @@ if { [istarget mips*-*-vxworks*] } { run_dump_test_arches "branch-misc-2pic" [mips_arch_list_matching mips1] run_dump_test "branch-misc-3" run_dump_test_arches "branch-misc-4" [mips_arch_list_matching mips1] + run_dump_test_arches "branch-misc-5" [mips_arch_list_matching mips1] + run_dump_test_arches "branch-misc-5pic" [mips_arch_list_matching mips1] if $has_newabi { run_dump_test_arches "branch-misc-2-64" \ [mips_arch_list_matching mips3] @@ -568,6 +570,10 @@ if { [istarget mips*-*-vxworks*] } { [mips_arch_list_matching mips3] run_dump_test_arches "branch-misc-4-64" \ [mips_arch_list_matching mips3] + run_dump_test_arches "branch-misc-5-64" \ + [mips_arch_list_matching mips3] + run_dump_test_arches "branch-misc-5pic-64" \ + [mips_arch_list_matching mips3] } run_dump_test "branch-swap" diff --git a/gas/testsuite/gas/mips/mipsr6@branch-misc-2-64.d b/gas/testsuite/gas/mips/mipsr6@branch-misc-2-64.d index 44ffa7c..a46bf30 100644 --- a/gas/testsuite/gas/mips/mipsr6@branch-misc-2-64.d +++ b/gas/testsuite/gas/mips/mipsr6@branch-misc-2-64.d @@ -3,7 +3,7 @@ #source: branch-misc-2.s #as: -64 -non_shared -# Test the backward branches to globals symbols in current file. +# Test branches to global symbols in current file (MIPSr6). .*: +file format .*mips.* @@ -44,19 +44,4 @@ Disassembly of section .text: \.\.\. \.\.\. \.\.\. -0+00a8 <[^>]*> 10000000 b 00000000000000ac <g6\+0x4> -[ ]*a8: R_MIPS_PC16 x1-0x4 -[ ]*a8: R_MIPS_NONE \*ABS\*-0x4 -[ ]*a8: R_MIPS_NONE \*ABS\*-0x4 -0+00ac <[^>]*> 00000000 nop -0+00b0 <[^>]*> 10000000 b 00000000000000b4 <g6\+0xc> -[ ]*b0: R_MIPS_PC16 x2-0x4 -[ ]*b0: R_MIPS_NONE \*ABS\*-0x4 -[ ]*b0: R_MIPS_NONE \*ABS\*-0x4 -0+00b4 <[^>]*> 00000000 nop -0+00b8 <[^>]*> 10000000 b 00000000000000bc <g6\+0x14> -[ ]*b8: R_MIPS_PC16 \.Ldata-0x4 -[ ]*b8: R_MIPS_NONE \*ABS\*-0x4 -[ ]*b8: R_MIPS_NONE \*ABS\*-0x4 -0+00bc <[^>]*> 00000000 nop \.\.\. diff --git a/gas/testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d b/gas/testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d index 5ff980e..f2217db 100644 --- a/gas/testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d +++ b/gas/testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d @@ -3,7 +3,7 @@ #source: branch-misc-2.s #as: -64 -call_shared -# Test the backward branches to globals symbols in current file. +# Test branches to global symbols in current file (MIPSr6). .*: +file format .*mips.* @@ -44,19 +44,4 @@ Disassembly of section .text: \.\.\. \.\.\. \.\.\. -0+00a8 <[^>]*> 10000000 b 00000000000000ac <g6\+0x4> -[ ]*a8: R_MIPS_PC16 x1-0x4 -[ ]*a8: R_MIPS_NONE \*ABS\*-0x4 -[ ]*a8: R_MIPS_NONE \*ABS\*-0x4 -0+00ac <[^>]*> 00000000 nop -0+00b0 <[^>]*> 10000000 b 00000000000000b4 <g6\+0xc> -[ ]*b0: R_MIPS_PC16 x2-0x4 -[ ]*b0: R_MIPS_NONE \*ABS\*-0x4 -[ ]*b0: R_MIPS_NONE \*ABS\*-0x4 -0+00b4 <[^>]*> 00000000 nop -0+00b8 <[^>]*> 10000000 b 00000000000000bc <g6\+0x14> -[ ]*b8: R_MIPS_PC16 \.Ldata-0x4 -[ ]*b8: R_MIPS_NONE \*ABS\*-0x4 -[ ]*b8: R_MIPS_NONE \*ABS\*-0x4 -0+00bc <[^>]*> 00000000 nop \.\.\. diff --git a/gas/testsuite/gas/mips/mipsr6@branch-misc-5-64.d b/gas/testsuite/gas/mips/mipsr6@branch-misc-5-64.d new file mode 100644 index 0000000..153bb0d --- /dev/null +++ b/gas/testsuite/gas/mips/mipsr6@branch-misc-5-64.d @@ -0,0 +1,27 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS branch-misc-5-64 +#source: branch-misc-5.s +#as: -64 -non_shared + +# Test branches to undefined symbols and a defined local symbol +# in another section (MIPSr6). + +.*: +file format .*mips.* + +Disassembly of section .text: +0+0000 <[^>]*> 10000000 b 0000000000000004 <g6\+0x4> +[ ]*0: R_MIPS_PC16 x1-0x4 +[ ]*0: R_MIPS_NONE \*ABS\*-0x4 +[ ]*0: R_MIPS_NONE \*ABS\*-0x4 +0+0004 <[^>]*> 00000000 nop +0+0008 <[^>]*> 10000000 b 000000000000000c <g6\+0xc> +[ ]*8: R_MIPS_PC16 x2-0x4 +[ ]*8: R_MIPS_NONE \*ABS\*-0x4 +[ ]*8: R_MIPS_NONE \*ABS\*-0x4 +0+000c <[^>]*> 00000000 nop +0+0010 <[^>]*> 10000000 b 0000000000000014 <g6\+0x14> +[ ]*10: R_MIPS_PC16 \.Ldata-0x4 +[ ]*10: R_MIPS_NONE \*ABS\*-0x4 +[ ]*10: R_MIPS_NONE \*ABS\*-0x4 +0+0014 <[^>]*> 00000000 nop + \.\.\. diff --git a/gas/testsuite/gas/mips/mipsr6@branch-misc-5pic-64.d b/gas/testsuite/gas/mips/mipsr6@branch-misc-5pic-64.d new file mode 100644 index 0000000..a5fdfbe --- /dev/null +++ b/gas/testsuite/gas/mips/mipsr6@branch-misc-5pic-64.d @@ -0,0 +1,27 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS branch-misc-5pic-64 +#source: branch-misc-5.s +#as: -64 -call_shared + +# Test branches to undefined symbols and a defined local symbol +# in another section (MIPSr6). + +.*: +file format .*mips.* + +Disassembly of section .text: +0+0000 <[^>]*> 10000000 b 0000000000000004 <g6\+0x4> +[ ]*0: R_MIPS_PC16 x1-0x4 +[ ]*0: R_MIPS_NONE \*ABS\*-0x4 +[ ]*0: R_MIPS_NONE \*ABS\*-0x4 +0+0004 <[^>]*> 00000000 nop +0+0008 <[^>]*> 10000000 b 000000000000000c <g6\+0xc> +[ ]*8: R_MIPS_PC16 x2-0x4 +[ ]*8: R_MIPS_NONE \*ABS\*-0x4 +[ ]*8: R_MIPS_NONE \*ABS\*-0x4 +0+000c <[^>]*> 00000000 nop +0+0010 <[^>]*> 10000000 b 0000000000000014 <g6\+0x14> +[ ]*10: R_MIPS_PC16 \.Ldata-0x4 +[ ]*10: R_MIPS_NONE \*ABS\*-0x4 +[ ]*10: R_MIPS_NONE \*ABS\*-0x4 +0+0014 <[^>]*> 00000000 nop + \.\.\. |