From 23c212516e3a91c74548ceccb597bdeaeb111e26 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 20 Dec 2016 02:10:40 +0000 Subject: [PATCH] MIPS/GAS/testsuite: Fix trailing padding in `loc-swap.s' Pad alignment with zeros rather than NOP instructions, for sensible multi-ISA MIPS16 testing. gas/ * testsuite/gas/mips/loc-swap.s: Use zeros rather than NOPs for trailing alignment padding. * testsuite/gas/mips/loc-swap.d: Adjust accordingly. * testsuite/gas/mips/micromips@loc-swap.d: Likewise. * testsuite/gas/mips/mips16@loc-swap-dis.d: Likewise. --- gas/ChangeLog | 8 ++++++++ gas/testsuite/gas/mips/loc-swap.d | 2 +- gas/testsuite/gas/mips/loc-swap.s | 2 +- gas/testsuite/gas/mips/micromips@loc-swap.d | 2 +- gas/testsuite/gas/mips/mips16@loc-swap-dis.d | 1 - 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 4b15c9fc290..c08ca3d0206 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2016-12-20 Maciej W. Rozycki + + * testsuite/gas/mips/loc-swap.s: Use zeros rather than NOPs for + trailing alignment padding. + * testsuite/gas/mips/loc-swap.d: Adjust accordingly. + * testsuite/gas/mips/micromips@loc-swap.d: Likewise. + * testsuite/gas/mips/mips16@loc-swap-dis.d: Likewise. + 2016-12-20 Maciej W. Rozycki * config/tc-mips.c (micromips_insn_length): Use diff --git a/gas/testsuite/gas/mips/loc-swap.d b/gas/testsuite/gas/mips/loc-swap.d index c4b91ed52c8..4e11106a186 100644 --- a/gas/testsuite/gas/mips/loc-swap.d +++ b/gas/testsuite/gas/mips/loc-swap.d @@ -57,5 +57,5 @@ Raw dump of debug contents of section \.debug_line: \[0x.*\] Special opcode 7: advance Address by 0 to 0x40 and Line by 2 to 39 \[0x.*\] Special opcode 120: advance Address by 8 to 0x48 and Line by 3 to 42 \[0x.*\] Special opcode 63: advance Address by 4 to 0x4c and Line by 2 to 44 - \[0x.*\] Advance PC by 24 to 0x64 + \[0x.*\] Advance PC by 36 to 0x70 \[0x.*\] Extended opcode 1: End of Sequence diff --git a/gas/testsuite/gas/mips/loc-swap.s b/gas/testsuite/gas/mips/loc-swap.s index a70acf21049..c51b68a2077 100644 --- a/gas/testsuite/gas/mips/loc-swap.s +++ b/gas/testsuite/gas/mips/loc-swap.s @@ -44,5 +44,5 @@ foo: jal bar # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ... - .align 2 + .align 4, 0 .space 16 diff --git a/gas/testsuite/gas/mips/micromips@loc-swap.d b/gas/testsuite/gas/mips/micromips@loc-swap.d index 1a4765ee7f0..23aedae972d 100644 --- a/gas/testsuite/gas/mips/micromips@loc-swap.d +++ b/gas/testsuite/gas/mips/micromips@loc-swap.d @@ -58,5 +58,5 @@ Raw dump of debug contents of section \.debug_line: \[0x.*\] Special opcode 35: advance Address by 2 to 0x23 and Line by 2 to 39 \[0x.*\] Special opcode 120: advance Address by 8 to 0x2b and Line by 3 to 42 \[0x.*\] Special opcode 35: advance Address by 2 to 0x2d and Line by 2 to 44 - \[0x.*\] Advance PC by 23 to 0x44 + \[0x.*\] Advance PC by 35 to 0x50 \[0x.*\] Extended opcode 1: End of Sequence diff --git a/gas/testsuite/gas/mips/mips16@loc-swap-dis.d b/gas/testsuite/gas/mips/mips16@loc-swap-dis.d index fd698ea0fe6..eb1831c6528 100644 --- a/gas/testsuite/gas/mips/mips16@loc-swap-dis.d +++ b/gas/testsuite/gas/mips/mips16@loc-swap-dis.d @@ -30,6 +30,5 @@ Disassembly of section \.text: [0-9a-f]+ <[^>]*> 65f8 move ra,s0 [0-9a-f]+ <[^>]*> 1800 0000 jal 0+0000 [ ]*[0-9a-f]+: R_MIPS16_26 bar -[0-9a-f]+ <[^>]*> 6500 nop [0-9a-f]+ <[^>]*> 6500 nop \.\.\. -- 2.30.2