diff options
author | Lili Cui <lili.cui@intel.com> | 2020-01-14 08:59:37 -0800 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2020-01-14 08:59:37 -0800 |
commit | e44925ae5689fc997b833d039e971484f54bd8c0 (patch) | |
tree | 8d15b4b195bbc63a894cdee40dc90ca7839aacb7 | |
parent | 7da6a5b938b426379f61e56e259a925bedfe242b (diff) | |
download | fsf-binutils-gdb-e44925ae5689fc997b833d039e971484f54bd8c0.zip fsf-binutils-gdb-e44925ae5689fc997b833d039e971484f54bd8c0.tar.gz fsf-binutils-gdb-e44925ae5689fc997b833d039e971484f54bd8c0.tar.bz2 |
x86: Updated align branch tests for Darwin and i686-pc-elf
1. Update align branch assembler tests to match Darwin disassembler
outputs.
2. Skip unsupported "call *foo" tests in 64-bit mode on Darwin.
3. Update align branch linker test to match any addresses for i686-pc-elf.
gas/
* testsuite/gas/i386/align-branch-1a.d: Updated for Darwin.
* testsuite/gas/i386/align-branch-1b.d: Likewise.
* testsuite/gas/i386/align-branch-1c.d: Likewise.
* testsuite/gas/i386/align-branch-1d.d: Likewise.
* testsuite/gas/i386/align-branch-1e.d: Likewise.
* testsuite/gas/i386/align-branch-1f.d: Likewise.
* testsuite/gas/i386/align-branch-1g.d: Likewise.
* testsuite/gas/i386/align-branch-1h.d: Likewise.
* testsuite/gas/i386/align-branch-1i.d: Likewise.
* testsuite/gas/i386/align-branch-5.d: Likewise.
* testsuite/gas/i386/x86-64-align-branch-1a.d: Likewise.
* testsuite/gas/i386/x86-64-align-branch-1b.d: Likewise.
* testsuite/gas/i386/x86-64-align-branch-1c.d: Likewise.
* testsuite/gas/i386/x86-64-align-branch-1d.d: Likewise.
* testsuite/gas/i386/x86-64-align-branch-1e.d: Likewise.
* testsuite/gas/i386/x86-64-align-branch-1f.d: Likewise.
* testsuite/gas/i386/x86-64-align-branch-1g.d: Likewise.
* testsuite/gas/i386/x86-64-align-branch-1h.d: Likewise.
* testsuite/gas/i386/x86-64-align-branch-1i.d: Likewise.
* testsuite/gas/i386/x86-64-align-branch-5.d: Likewise.
* testsuite/gas/i386/i386.exp: Skip x86-64-align-branch-2a,
x86-64-align-branch-2b and x86-64-align-branch-2c on Darwin.
ld/
* testsuite/ld-i386/align-branch-1.d: Updated for i686-pc-elf.
24 files changed, 254 insertions, 183 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 07cb331..fd67220 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,28 @@ +2020-01-14 Lili Cui <lili.cui@intel.com> + + * testsuite/gas/i386/align-branch-1a.d: Updated for Darwin. + * testsuite/gas/i386/align-branch-1b.d: Likewise. + * testsuite/gas/i386/align-branch-1c.d: Likewise. + * testsuite/gas/i386/align-branch-1d.d: Likewise. + * testsuite/gas/i386/align-branch-1e.d: Likewise. + * testsuite/gas/i386/align-branch-1f.d: Likewise. + * testsuite/gas/i386/align-branch-1g.d: Likewise. + * testsuite/gas/i386/align-branch-1h.d: Likewise. + * testsuite/gas/i386/align-branch-1i.d: Likewise. + * testsuite/gas/i386/align-branch-5.d: Likewise. + * testsuite/gas/i386/x86-64-align-branch-1a.d: Likewise. + * testsuite/gas/i386/x86-64-align-branch-1b.d: Likewise. + * testsuite/gas/i386/x86-64-align-branch-1c.d: Likewise. + * testsuite/gas/i386/x86-64-align-branch-1d.d: Likewise. + * testsuite/gas/i386/x86-64-align-branch-1e.d: Likewise. + * testsuite/gas/i386/x86-64-align-branch-1f.d: Likewise. + * testsuite/gas/i386/x86-64-align-branch-1g.d: Likewise. + * testsuite/gas/i386/x86-64-align-branch-1h.d: Likewise. + * testsuite/gas/i386/x86-64-align-branch-1i.d: Likewise. + * testsuite/gas/i386/x86-64-align-branch-5.d: Likewise. + * testsuite/gas/i386/i386.exp: Skip x86-64-align-branch-2a, + x86-64-align-branch-2b and x86-64-align-branch-2c on Darwin. + 2020-01-14 Sergey Belyashov <sergey.belyashov@gmail.com> PR 25377 diff --git a/gas/testsuite/gas/i386/align-branch-1a.d b/gas/testsuite/gas/i386/align-branch-1a.d index 46b7921..89b05fd 100644 --- a/gas/testsuite/gas/i386/align-branch-1a.d +++ b/gas/testsuite/gas/i386/align-branch-1a.d @@ -20,7 +20,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%ebp\) 1d: 89 75 f4 mov %esi,-0xc\(%ebp\) 20: 39 c5 cmp %eax,%ebp - 22: 74 5e je 82 <foo\+0x82> + 22: 74 5e je (0x)?82( .*)? 24: 3e 89 73 f4 mov %esi,%ds:-0xc\(%ebx\) 28: 89 75 f4 mov %esi,-0xc\(%ebp\) 2b: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -32,9 +32,9 @@ Disassembly of section .text: 3d: 5d pop %ebp 3e: 5d pop %ebp 3f: 5d pop %ebp - 40: 74 40 je 82 <foo\+0x82> + 40: 74 40 je (0x)?82( .*)? 42: 5d pop %ebp - 43: 74 3d je 82 <foo\+0x82> + 43: 74 3d je (0x)?82( .*)? 45: 36 89 44 24 fc mov %eax,%ss:-0x4\(%esp\) 4a: 89 75 f4 mov %esi,-0xc\(%ebp\) 4d: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -44,9 +44,9 @@ Disassembly of section .text: 59: 89 75 f4 mov %esi,-0xc\(%ebp\) 5c: 89 75 f4 mov %esi,-0xc\(%ebp\) 5f: 5d pop %ebp - 60: eb 26 jmp 88 <foo\+0x88> - 62: eb 24 jmp 88 <foo\+0x88> - 64: eb 22 jmp 88 <foo\+0x88> + 60: eb 26 jmp (0x)?88( .*)? + 62: eb 24 jmp (0x)?88( .*)? + 64: eb 22 jmp (0x)?88( .*)? 66: 89 45 fc mov %eax,-0x4\(%ebp\) 69: 89 75 f4 mov %esi,-0xc\(%ebp\) 6c: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -56,11 +56,13 @@ Disassembly of section .text: 78: 5d pop %ebp 79: 5d pop %ebp 7a: 39 c5 cmp %eax,%ebp - 7c: 74 04 je 82 <foo\+0x82> + 7c: 74 04 je (0x)?82( .*)? 7e: 66 90 xchg %ax,%ax - 80: eb 06 jmp 88 <foo\+0x88> + 80: eb 06 jmp (0x)?88( .*)? +#... 82: 8b 45 f4 mov -0xc\(%ebp\),%eax 85: 89 45 fc mov %eax,-0x4\(%ebp\) +#... 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 94: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) @@ -72,6 +74,6 @@ Disassembly of section .text: b4: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) ba: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) c0: 89 75 00 mov %esi,0x0\(%ebp\) - c3: 74 c3 je 88 <foo\+0x88> - c5: 74 c1 je 88 <foo\+0x88> + c3: 74 c3 je (0x)?88( .*)? + c5: 74 c1 je (0x)?88( .*)? #pass diff --git a/gas/testsuite/gas/i386/align-branch-1b.d b/gas/testsuite/gas/i386/align-branch-1b.d index b3f0e72..1a993b5 100644 --- a/gas/testsuite/gas/i386/align-branch-1b.d +++ b/gas/testsuite/gas/i386/align-branch-1b.d @@ -20,7 +20,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%ebp\) 1d: 89 75 f4 mov %esi,-0xc\(%ebp\) 20: 39 c5 cmp %eax,%ebp - 22: 74 5e je 82 <foo\+0x82> + 22: 74 5e je (0x)?82( .*)? 24: 3e 89 73 f4 mov %esi,%ds:-0xc\(%ebx\) 28: 89 75 f4 mov %esi,-0xc\(%ebp\) 2b: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -32,9 +32,9 @@ Disassembly of section .text: 3d: 5d pop %ebp 3e: 5d pop %ebp 3f: 5d pop %ebp - 40: 74 40 je 82 <foo\+0x82> + 40: 74 40 je (0x)?82( .*)? 42: 5d pop %ebp - 43: 74 3d je 82 <foo\+0x82> + 43: 74 3d je (0x)?82( .*)? 45: 36 89 44 24 fc mov %eax,%ss:-0x4\(%esp\) 4a: 89 75 f4 mov %esi,-0xc\(%ebp\) 4d: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -44,9 +44,9 @@ Disassembly of section .text: 59: 89 75 f4 mov %esi,-0xc\(%ebp\) 5c: 89 75 f4 mov %esi,-0xc\(%ebp\) 5f: 5d pop %ebp - 60: eb 26 jmp 88 <foo\+0x88> - 62: eb 24 jmp 88 <foo\+0x88> - 64: eb 22 jmp 88 <foo\+0x88> + 60: eb 26 jmp (0x)?88( .*)? + 62: eb 24 jmp (0x)?88( .*)? + 64: eb 22 jmp (0x)?88( .*)? 66: 89 45 fc mov %eax,-0x4\(%ebp\) 69: 89 75 f4 mov %esi,-0xc\(%ebp\) 6c: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -56,11 +56,13 @@ Disassembly of section .text: 78: 5d pop %ebp 79: 5d pop %ebp 7a: 39 c5 cmp %eax,%ebp - 7c: 74 04 je 82 <foo\+0x82> + 7c: 74 04 je (0x)?82( .*)? 7e: 66 90 xchg %ax,%ax - 80: eb 06 jmp 88 <foo\+0x88> + 80: eb 06 jmp (0x)?88( .*)? +#... 82: 8b 45 f4 mov -0xc\(%ebp\),%eax 85: 89 45 fc mov %eax,-0x4\(%ebp\) +#... 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 94: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) @@ -72,6 +74,6 @@ Disassembly of section .text: b4: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) ba: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) c0: 89 75 00 mov %esi,0x0\(%ebp\) - c3: 74 c3 je 88 <foo\+0x88> - c5: 74 c1 je 88 <foo\+0x88> + c3: 74 c3 je (0x)?88( .*)? + c5: 74 c1 je (0x)?88( .*)? #pass diff --git a/gas/testsuite/gas/i386/align-branch-1c.d b/gas/testsuite/gas/i386/align-branch-1c.d index 947dcc8..0e421b1 100644 --- a/gas/testsuite/gas/i386/align-branch-1c.d +++ b/gas/testsuite/gas/i386/align-branch-1c.d @@ -20,7 +20,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%ebp\) 1d: 89 75 f4 mov %esi,-0xc\(%ebp\) 20: 39 c5 cmp %eax,%ebp - 22: 74 5e je 82 <foo\+0x82> + 22: 74 5e je (0x)?82( .*)? 24: 3e 89 73 f4 mov %esi,%ds:-0xc\(%ebx\) 28: 89 75 f4 mov %esi,-0xc\(%ebp\) 2b: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -32,9 +32,9 @@ Disassembly of section .text: 3d: 5d pop %ebp 3e: 5d pop %ebp 3f: 5d pop %ebp - 40: 74 40 je 82 <foo\+0x82> + 40: 74 40 je (0x)?82( .*)? 42: 5d pop %ebp - 43: 74 3d je 82 <foo\+0x82> + 43: 74 3d je (0x)?82( .*)? 45: 36 89 44 24 fc mov %eax,%ss:-0x4\(%esp\) 4a: 89 75 f4 mov %esi,-0xc\(%ebp\) 4d: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -44,9 +44,9 @@ Disassembly of section .text: 59: 89 75 f4 mov %esi,-0xc\(%ebp\) 5c: 89 75 f4 mov %esi,-0xc\(%ebp\) 5f: 5d pop %ebp - 60: eb 26 jmp 88 <foo\+0x88> - 62: eb 24 jmp 88 <foo\+0x88> - 64: eb 22 jmp 88 <foo\+0x88> + 60: eb 26 jmp (0x)?88( .*)? + 62: eb 24 jmp (0x)?88( .*)? + 64: eb 22 jmp (0x)?88( .*)? 66: 89 45 fc mov %eax,-0x4\(%ebp\) 69: 89 75 f4 mov %esi,-0xc\(%ebp\) 6c: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -56,11 +56,13 @@ Disassembly of section .text: 78: 5d pop %ebp 79: 5d pop %ebp 7a: 39 c5 cmp %eax,%ebp - 7c: 74 04 je 82 <foo\+0x82> + 7c: 74 04 je (0x)?82( .*)? 7e: 66 90 xchg %ax,%ax - 80: eb 06 jmp 88 <foo\+0x88> + 80: eb 06 jmp (0x)?88( .*)? +#... 82: 8b 45 f4 mov -0xc\(%ebp\),%eax 85: 89 45 fc mov %eax,-0x4\(%ebp\) +#... 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 94: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) @@ -72,6 +74,6 @@ Disassembly of section .text: b4: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) ba: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) c0: 89 75 00 mov %esi,0x0\(%ebp\) - c3: 74 c3 je 88 <foo\+0x88> - c5: 74 c1 je 88 <foo\+0x88> + c3: 74 c3 je (0x)?88( .*)? + c5: 74 c1 je (0x)?88( .*)? #pass diff --git a/gas/testsuite/gas/i386/align-branch-1d.d b/gas/testsuite/gas/i386/align-branch-1d.d index db62f08..7ea8d8f 100644 --- a/gas/testsuite/gas/i386/align-branch-1d.d +++ b/gas/testsuite/gas/i386/align-branch-1d.d @@ -20,7 +20,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%ebp\) 1d: 89 75 f4 mov %esi,-0xc\(%ebp\) 20: 39 c5 cmp %eax,%ebp - 22: 74 5b je 7f <foo\+0x7f> + 22: 74 5b je (0x)?7f( .*)? 24: 3e 89 73 f4 mov %esi,%ds:-0xc\(%ebx\) 28: 89 75 f4 mov %esi,-0xc\(%ebp\) 2b: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -32,9 +32,9 @@ Disassembly of section .text: 3d: 5d pop %ebp 3e: 5d pop %ebp 3f: 5d pop %ebp - 40: 74 3d je 7f <foo\+0x7f> + 40: 74 3d je (0x)?7f( .*)? 42: 5d pop %ebp - 43: 74 3a je 7f <foo\+0x7f> + 43: 74 3a je (0x)?7f( .*)? 45: 89 44 24 fc mov %eax,-0x4\(%esp\) 49: 89 75 f4 mov %esi,-0xc\(%ebp\) 4c: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -44,9 +44,9 @@ Disassembly of section .text: 58: 89 75 f4 mov %esi,-0xc\(%ebp\) 5b: 89 75 f4 mov %esi,-0xc\(%ebp\) 5e: 5d pop %ebp - 5f: eb 24 jmp 85 <foo\+0x85> - 61: eb 22 jmp 85 <foo\+0x85> - 63: eb 20 jmp 85 <foo\+0x85> + 5f: eb 24 jmp (0x)?85( .*)? + 61: eb 22 jmp (0x)?85( .*)? + 63: eb 20 jmp (0x)?85( .*)? 65: 89 45 fc mov %eax,-0x4\(%ebp\) 68: 89 75 f4 mov %esi,-0xc\(%ebp\) 6b: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -56,10 +56,12 @@ Disassembly of section .text: 77: 5d pop %ebp 78: 5d pop %ebp 79: 39 c5 cmp %eax,%ebp - 7b: 74 02 je 7f <foo\+0x7f> - 7d: eb 06 jmp 85 <foo\+0x85> + 7b: 74 02 je (0x)?7f( .*)? + 7d: eb 06 jmp (0x)?85( .*)? +#... 7f: 8b 45 f4 mov -0xc\(%ebp\),%eax 82: 89 45 fc mov %eax,-0x4\(%ebp\) +#... 85: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 8b: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 91: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) @@ -71,6 +73,6 @@ Disassembly of section .text: b1: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) b7: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) bd: 89 75 00 mov %esi,0x0\(%ebp\) - c0: 74 c3 je 85 <foo\+0x85> - c2: 74 c1 je 85 <foo\+0x85> + c0: 74 c3 je (0x)?85( .*)? + c2: 74 c1 je (0x)?85( .*)? #pass diff --git a/gas/testsuite/gas/i386/align-branch-1e.d b/gas/testsuite/gas/i386/align-branch-1e.d index dafbee1..8a1269c 100644 --- a/gas/testsuite/gas/i386/align-branch-1e.d +++ b/gas/testsuite/gas/i386/align-branch-1e.d @@ -20,7 +20,7 @@ Disassembly of section .text: 18: 89 75 f4 mov %esi,-0xc\(%ebp\) 1b: 89 75 f4 mov %esi,-0xc\(%ebp\) 1e: 39 c5 cmp %eax,%ebp - 20: 74 5a je 7c <foo\+0x7c> + 20: 74 5a je (0x)?7c( .*)? 22: 89 73 f4 mov %esi,-0xc\(%ebx\) 25: 89 75 f4 mov %esi,-0xc\(%ebp\) 28: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -32,9 +32,9 @@ Disassembly of section .text: 3a: 5d pop %ebp 3b: 5d pop %ebp 3c: 5d pop %ebp - 3d: 74 3d je 7c <foo\+0x7c> + 3d: 74 3d je (0x)?7c( .*)? 3f: 5d pop %ebp - 40: 74 3a je 7c <foo\+0x7c> + 40: 74 3a je (0x)?7c( .*)? 42: 89 44 24 fc mov %eax,-0x4\(%esp\) 46: 89 75 f4 mov %esi,-0xc\(%ebp\) 49: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -44,9 +44,9 @@ Disassembly of section .text: 55: 89 75 f4 mov %esi,-0xc\(%ebp\) 58: 89 75 f4 mov %esi,-0xc\(%ebp\) 5b: 5d pop %ebp - 5c: eb 24 jmp 82 <foo\+0x82> - 5e: eb 22 jmp 82 <foo\+0x82> - 60: eb 20 jmp 82 <foo\+0x82> + 5c: eb 24 jmp (0x)?82( .*)? + 5e: eb 22 jmp (0x)?82( .*)? + 60: eb 20 jmp (0x)?82( .*)? 62: 89 45 fc mov %eax,-0x4\(%ebp\) 65: 89 75 f4 mov %esi,-0xc\(%ebp\) 68: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -56,10 +56,12 @@ Disassembly of section .text: 74: 5d pop %ebp 75: 5d pop %ebp 76: 39 c5 cmp %eax,%ebp - 78: 74 02 je 7c <foo\+0x7c> - 7a: eb 06 jmp 82 <foo\+0x82> + 78: 74 02 je (0x)?7c( .*)? + 7a: eb 06 jmp (0x)?82( .*)? +#... 7c: 8b 45 f4 mov -0xc\(%ebp\),%eax 7f: 89 45 fc mov %eax,-0x4\(%ebp\) +#... 82: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) @@ -71,7 +73,7 @@ Disassembly of section .text: ae: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) b4: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) ba: 89 75 00 mov %esi,0x0\(%ebp\) - bd: 74 c3 je 82 <foo\+0x82> + bd: 74 c3 je (0x)?82( .*)? bf: 90 nop - c0: 74 c0 je 82 <foo\+0x82> + c0: 74 c0 je (0x)?82( .*)? #pass diff --git a/gas/testsuite/gas/i386/align-branch-1f.d b/gas/testsuite/gas/i386/align-branch-1f.d index bf197c9..07d75f6 100644 --- a/gas/testsuite/gas/i386/align-branch-1f.d +++ b/gas/testsuite/gas/i386/align-branch-1f.d @@ -20,7 +20,7 @@ Disassembly of section .text: 18: 89 75 f4 mov %esi,-0xc\(%ebp\) 1b: 89 75 f4 mov %esi,-0xc\(%ebp\) 1e: 39 c5 cmp %eax,%ebp - 20: 74 5c je 7e <foo\+0x7e> + 20: 74 5c je (0x)?7e( .*)? 22: 89 73 f4 mov %esi,-0xc\(%ebx\) 25: 89 75 f4 mov %esi,-0xc\(%ebp\) 28: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -32,9 +32,9 @@ Disassembly of section .text: 3a: 5d pop %ebp 3b: 5d pop %ebp 3c: 5d pop %ebp - 3d: 74 3f je 7e <foo\+0x7e> + 3d: 74 3f je (0x)?7e( .*)? 3f: 5d pop %ebp - 40: 74 3c je 7e <foo\+0x7e> + 40: 74 3c je (0x)?7e( .*)? 42: 89 44 24 fc mov %eax,-0x4\(%esp\) 46: 89 75 f4 mov %esi,-0xc\(%ebp\) 49: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -44,10 +44,10 @@ Disassembly of section .text: 55: 89 75 f4 mov %esi,-0xc\(%ebp\) 58: 89 75 f4 mov %esi,-0xc\(%ebp\) 5b: 5d pop %ebp - 5c: eb 27 jmp 85 <foo\+0x85> + 5c: eb 27 jmp (0x)?85( .*)? 5e: 66 90 xchg %ax,%ax - 60: eb 23 jmp 85 <foo\+0x85> - 62: eb 21 jmp 85 <foo\+0x85> + 60: eb 23 jmp (0x)?85( .*)? + 62: eb 21 jmp (0x)?85( .*)? 64: 89 45 fc mov %eax,-0x4\(%ebp\) 67: 89 75 f4 mov %esi,-0xc\(%ebp\) 6a: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -57,10 +57,12 @@ Disassembly of section .text: 76: 5d pop %ebp 77: 5d pop %ebp 78: 39 c5 cmp %eax,%ebp - 7a: 74 02 je 7e <foo\+0x7e> - 7c: eb 07 jmp 85 <foo\+0x85> + 7a: 74 02 je (0x)?7e( .*)? + 7c: eb 07 jmp (0x)?85( .*)? +#... 7e: 36 8b 45 f4 mov %ss:-0xc\(%ebp\),%eax 82: 89 45 fc mov %eax,-0x4\(%ebp\) +#... 85: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 8b: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 91: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) @@ -72,6 +74,6 @@ Disassembly of section .text: b1: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) b7: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) bd: 89 75 00 mov %esi,0x0\(%ebp\) - c0: 74 c3 je 85 <foo\+0x85> - c2: 74 c1 je 85 <foo\+0x85> + c0: 74 c3 je (0x)?85( .*)? + c2: 74 c1 je (0x)?85( .*)? #pass diff --git a/gas/testsuite/gas/i386/align-branch-1g.d b/gas/testsuite/gas/i386/align-branch-1g.d index 6cae2cd..2c578e8 100644 --- a/gas/testsuite/gas/i386/align-branch-1g.d +++ b/gas/testsuite/gas/i386/align-branch-1g.d @@ -20,7 +20,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%ebp\) 1d: 89 75 f4 mov %esi,-0xc\(%ebp\) 20: 39 c5 cmp %eax,%ebp - 22: 74 5e je 82 <foo\+0x82> + 22: 74 5e je (0x)?82( .*)? 24: 3e 89 73 f4 mov %esi,%ds:-0xc\(%ebx\) 28: 89 75 f4 mov %esi,-0xc\(%ebp\) 2b: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -32,9 +32,9 @@ Disassembly of section .text: 3d: 5d pop %ebp 3e: 5d pop %ebp 3f: 5d pop %ebp - 40: 74 40 je 82 <foo\+0x82> + 40: 74 40 je (0x)?82( .*)? 42: 5d pop %ebp - 43: 74 3d je 82 <foo\+0x82> + 43: 74 3d je (0x)?82( .*)? 45: 36 89 44 24 fc mov %eax,%ss:-0x4\(%esp\) 4a: 89 75 f4 mov %esi,-0xc\(%ebp\) 4d: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -44,9 +44,9 @@ Disassembly of section .text: 59: 89 75 f4 mov %esi,-0xc\(%ebp\) 5c: 89 75 f4 mov %esi,-0xc\(%ebp\) 5f: 5d pop %ebp - 60: eb 26 jmp 88 <foo\+0x88> - 62: eb 24 jmp 88 <foo\+0x88> - 64: eb 22 jmp 88 <foo\+0x88> + 60: eb 26 jmp (0x)?88( .*)? + 62: eb 24 jmp (0x)?88( .*)? + 64: eb 22 jmp (0x)?88( .*)? 66: 89 45 fc mov %eax,-0x4\(%ebp\) 69: 89 75 f4 mov %esi,-0xc\(%ebp\) 6c: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -56,11 +56,13 @@ Disassembly of section .text: 78: 5d pop %ebp 79: 5d pop %ebp 7a: 39 c5 cmp %eax,%ebp - 7c: 74 04 je 82 <foo\+0x82> + 7c: 74 04 je (0x)?82( .*)? 7e: 66 90 xchg %ax,%ax - 80: eb 06 jmp 88 <foo\+0x88> + 80: eb 06 jmp (0x)?88( .*)? +#... 82: 8b 45 f4 mov -0xc\(%ebp\),%eax 85: 89 45 fc mov %eax,-0x4\(%ebp\) +#... 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 94: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) @@ -72,6 +74,6 @@ Disassembly of section .text: b4: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) ba: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) c0: 89 75 00 mov %esi,0x0\(%ebp\) - c3: 74 c3 je 88 <foo\+0x88> - c5: 74 c1 je 88 <foo\+0x88> + c3: 74 c3 je (0x)?88( .*)? + c5: 74 c1 je (0x)?88( .*)? #pass diff --git a/gas/testsuite/gas/i386/align-branch-1h.d b/gas/testsuite/gas/i386/align-branch-1h.d index 01871ee..9f49030 100644 --- a/gas/testsuite/gas/i386/align-branch-1h.d +++ b/gas/testsuite/gas/i386/align-branch-1h.d @@ -20,7 +20,7 @@ Disassembly of section .text: 18: 89 75 f4 mov %esi,-0xc\(%ebp\) 1b: 89 75 f4 mov %esi,-0xc\(%ebp\) 1e: 39 c5 cmp %eax,%ebp - 20: 74 5a je 7c <foo\+0x7c> + 20: 74 5a je (0x)?7c( .*)? 22: 89 73 f4 mov %esi,-0xc\(%ebx\) 25: 89 75 f4 mov %esi,-0xc\(%ebp\) 28: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -32,9 +32,9 @@ Disassembly of section .text: 3a: 5d pop %ebp 3b: 5d pop %ebp 3c: 5d pop %ebp - 3d: 74 3d je 7c <foo\+0x7c> + 3d: 74 3d je (0x)?7c( .*)? 3f: 5d pop %ebp - 40: 74 3a je 7c <foo\+0x7c> + 40: 74 3a je (0x)?7c( .*)? 42: 89 44 24 fc mov %eax,-0x4\(%esp\) 46: 89 75 f4 mov %esi,-0xc\(%ebp\) 49: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -44,9 +44,9 @@ Disassembly of section .text: 55: 89 75 f4 mov %esi,-0xc\(%ebp\) 58: 89 75 f4 mov %esi,-0xc\(%ebp\) 5b: 5d pop %ebp - 5c: eb 24 jmp 82 <foo\+0x82> - 5e: eb 22 jmp 82 <foo\+0x82> - 60: eb 20 jmp 82 <foo\+0x82> + 5c: eb 24 jmp (0x)?82( .*)? + 5e: eb 22 jmp (0x)?82( .*)? + 60: eb 20 jmp (0x)?82( .*)? 62: 89 45 fc mov %eax,-0x4\(%ebp\) 65: 89 75 f4 mov %esi,-0xc\(%ebp\) 68: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -56,10 +56,12 @@ Disassembly of section .text: 74: 5d pop %ebp 75: 5d pop %ebp 76: 39 c5 cmp %eax,%ebp - 78: 74 02 je 7c <foo\+0x7c> - 7a: eb 06 jmp 82 <foo\+0x82> + 78: 74 02 je (0x)?7c( .*)? + 7a: eb 06 jmp (0x)?82( .*)? +#... 7c: 8b 45 f4 mov -0xc\(%ebp\),%eax 7f: 89 45 fc mov %eax,-0x4\(%ebp\) +#... 82: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) @@ -71,6 +73,6 @@ Disassembly of section .text: ae: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) b4: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) ba: 89 75 00 mov %esi,0x0\(%ebp\) - bd: 74 c3 je 82 <foo\+0x82> - bf: 74 c1 je 82 <foo\+0x82> + bd: 74 c3 je (0x)?82( .*)? + bf: 74 c1 je (0x)?82( .*)? #pass diff --git a/gas/testsuite/gas/i386/align-branch-1i.d b/gas/testsuite/gas/i386/align-branch-1i.d index e2cbc28..75bf965 100644 --- a/gas/testsuite/gas/i386/align-branch-1i.d +++ b/gas/testsuite/gas/i386/align-branch-1i.d @@ -21,7 +21,7 @@ Disassembly of section .text: 1b: 89 75 f4 mov %esi,-0xc\(%ebp\) 1e: 66 90 xchg %ax,%ax 20: 39 c5 cmp %eax,%ebp - 22: 74 5e je 82 <foo\+0x82> + 22: 74 5e je (0x)?82( .*)? 24: 89 73 f4 mov %esi,-0xc\(%ebx\) 27: 89 75 f4 mov %esi,-0xc\(%ebp\) 2a: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -34,9 +34,9 @@ Disassembly of section .text: 3d: 5d pop %ebp 3e: 5d pop %ebp 3f: 90 nop - 40: 74 40 je 82 <foo\+0x82> + 40: 74 40 je (0x)?82( .*)? 42: 5d pop %ebp - 43: 74 3d je 82 <foo\+0x82> + 43: 74 3d je (0x)?82( .*)? 45: 89 44 24 fc mov %eax,-0x4\(%esp\) 49: 89 75 f4 mov %esi,-0xc\(%ebp\) 4c: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -47,9 +47,9 @@ Disassembly of section .text: 5b: 89 75 f4 mov %esi,-0xc\(%ebp\) 5e: 5d pop %ebp 5f: 90 nop - 60: eb 26 jmp 88 <foo\+0x88> - 62: eb 24 jmp 88 <foo\+0x88> - 64: eb 22 jmp 88 <foo\+0x88> + 60: eb 26 jmp (0x)?88( .*)? + 62: eb 24 jmp (0x)?88( .*)? + 64: eb 22 jmp (0x)?88( .*)? 66: 89 45 fc mov %eax,-0x4\(%ebp\) 69: 89 75 f4 mov %esi,-0xc\(%ebp\) 6c: 89 7d f8 mov %edi,-0x8\(%ebp\) @@ -59,11 +59,13 @@ Disassembly of section .text: 78: 5d pop %ebp 79: 5d pop %ebp 7a: 39 c5 cmp %eax,%ebp - 7c: 74 04 je 82 <foo\+0x82> + 7c: 74 04 je (0x)?82( .*)? 7e: 66 90 xchg %ax,%ax - 80: eb 06 jmp 88 <foo\+0x88> + 80: eb 06 jmp (0x)?88( .*)? +#... 82: 8b 45 f4 mov -0xc\(%ebp\),%eax 85: 89 45 fc mov %eax,-0x4\(%ebp\) +#... 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) 94: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) @@ -75,6 +77,6 @@ Disassembly of section .text: b4: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) ba: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%ebp\) c0: 89 75 00 mov %esi,0x0\(%ebp\) - c3: 74 c3 je 88 <foo\+0x88> - c5: 74 c1 je 88 <foo\+0x88> + c3: 74 c3 je (0x)?88( .*)? + c5: 74 c1 je (0x)?88( .*)? #pass diff --git a/gas/testsuite/gas/i386/align-branch-5.d b/gas/testsuite/gas/i386/align-branch-5.d index 1f11427..ca96c3c 100644 --- a/gas/testsuite/gas/i386/align-branch-5.d +++ b/gas/testsuite/gas/i386/align-branch-5.d @@ -7,6 +7,7 @@ Disassembly of section .text: 0+ <foo>: 0: c1 e9 02 shr \$0x2,%ecx +#... 3: c1 e9 02 shr \$0x2,%ecx 6: c1 e9 02 shr \$0x2,%ecx 9: 89 d1 mov %edx,%ecx @@ -19,9 +20,10 @@ Disassembly of section .text: 1c: c1 e9 02 shr \$0x2,%ecx 1f: f6 c2 02 test \$0x2,%dl 22: f3 ab rep stos %eax,%es:\(%edi\) - 24: 75 dd jne 3 <foo\+0x3> + 24: 75 dd jne (0x)?3( .*)? 26: 31 c0 xor %eax,%eax 28: c1 e9 02 shr \$0x2,%ecx +#... 2b: c1 e9 02 shr \$0x2,%ecx 2e: c1 e9 02 shr \$0x2,%ecx 31: 89 d1 mov %edx,%ecx @@ -31,6 +33,6 @@ Disassembly of section .text: 3b: c1 e9 02 shr \$0x2,%ecx 3e: f6 c2 02 test \$0x2,%dl 41: e8 [0-9a-f ]+ call .* - 46: 75 e3 jne 2b <foo\+0x2b> + 46: 75 e3 jne (0x)?2b( .*)? 48: 31 c0 xor %eax,%eax #pass diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp index 4c886d5..b081e35 100644 --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -1067,9 +1067,11 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t run_dump_test "x86-64-align-branch-1g" run_dump_test "x86-64-align-branch-1h" run_dump_test "x86-64-align-branch-1i" - run_dump_test "x86-64-align-branch-2a" - run_dump_test "x86-64-align-branch-2b" - run_dump_test "x86-64-align-branch-2c" + if { ![istarget "*-*-darwin*"] } then { + run_dump_test "x86-64-align-branch-2a" + run_dump_test "x86-64-align-branch-2b" + run_dump_test "x86-64-align-branch-2c" + } run_dump_test "x86-64-align-branch-4a" run_dump_test "x86-64-align-branch-4b" run_dump_test "x86-64-align-branch-5" diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1a.d b/gas/testsuite/gas/i386/x86-64-align-branch-1a.d index f96808a..0a5c8af 100644 --- a/gas/testsuite/gas/i386/x86-64-align-branch-1a.d +++ b/gas/testsuite/gas/i386/x86-64-align-branch-1a.d @@ -18,7 +18,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%rbp\) 1d: 89 75 f4 mov %esi,-0xc\(%rbp\) 20: 48 39 c5 cmp %rax,%rbp - 23: 74 5d je 82 <foo\+0x82> + 23: 74 5d je (0x)?82( .*)? 25: 2e 89 75 f4 mov %esi,%cs:-0xc\(%rbp\) 29: 89 75 f4 mov %esi,-0xc\(%rbp\) 2c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -29,9 +29,9 @@ Disassembly of section .text: 3b: 89 75 f4 mov %esi,-0xc\(%rbp\) 3e: 5d pop %rbp 3f: 5d pop %rbp - 40: 74 40 je 82 <foo\+0x82> + 40: 74 40 je (0x)?82( .*)? 42: 5d pop %rbp - 43: 74 3d je 82 <foo\+0x82> + 43: 74 3d je (0x)?82( .*)? 45: 2e 89 45 fc mov %eax,%cs:-0x4\(%rbp\) 49: 89 75 f4 mov %esi,-0xc\(%rbp\) 4c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -42,9 +42,9 @@ Disassembly of section .text: 5b: 89 75 f4 mov %esi,-0xc\(%rbp\) 5e: 5d pop %rbp 5f: 5d pop %rbp - 60: eb 26 jmp 88 <foo\+0x88> - 62: eb 24 jmp 88 <foo\+0x88> - 64: eb 22 jmp 88 <foo\+0x88> + 60: eb 26 jmp (0x)?88( .*)? + 62: eb 24 jmp (0x)?88( .*)? + 64: eb 22 jmp (0x)?88( .*)? 66: 89 45 fc mov %eax,-0x4\(%rbp\) 69: 89 75 f4 mov %esi,-0xc\(%rbp\) 6c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -54,11 +54,13 @@ Disassembly of section .text: 78: 5d pop %rbp 79: 5d pop %rbp 7a: 48 39 c5 cmp %rax,%rbp - 7d: 74 03 je 82 <foo\+0x82> + 7d: 74 03 je (0x)?82( .*)? 7f: 90 nop - 80: eb 06 jmp 88 <foo\+0x88> + 80: eb 06 jmp (0x)?88( .*)? +#... 82: 8b 45 f4 mov -0xc\(%rbp\),%eax 85: 89 45 fc mov %eax,-0x4\(%rbp\) +#... 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 94: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) @@ -69,7 +71,7 @@ Disassembly of section .text: b2: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b8: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) be: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) - c4: eb c2 jmp 88 <foo\+0x88> + c4: eb c2 jmp (0x)?88( .*)? c6: 5d pop %rbp c7: c3 retq #pass diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1b.d b/gas/testsuite/gas/i386/x86-64-align-branch-1b.d index 10b3476..375a31a 100644 --- a/gas/testsuite/gas/i386/x86-64-align-branch-1b.d +++ b/gas/testsuite/gas/i386/x86-64-align-branch-1b.d @@ -18,7 +18,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%rbp\) 1d: 89 75 f4 mov %esi,-0xc\(%rbp\) 20: 48 39 c5 cmp %rax,%rbp - 23: 74 5d je 82 <foo\+0x82> + 23: 74 5d je (0x)?82( .*)? 25: 2e 89 75 f4 mov %esi,%cs:-0xc\(%rbp\) 29: 89 75 f4 mov %esi,-0xc\(%rbp\) 2c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -29,9 +29,9 @@ Disassembly of section .text: 3b: 89 75 f4 mov %esi,-0xc\(%rbp\) 3e: 5d pop %rbp 3f: 5d pop %rbp - 40: 74 40 je 82 <foo\+0x82> + 40: 74 40 je (0x)?82( .*)? 42: 5d pop %rbp - 43: 74 3d je 82 <foo\+0x82> + 43: 74 3d je (0x)?82( .*)? 45: 2e 89 45 fc mov %eax,%cs:-0x4\(%rbp\) 49: 89 75 f4 mov %esi,-0xc\(%rbp\) 4c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -42,9 +42,9 @@ Disassembly of section .text: 5b: 89 75 f4 mov %esi,-0xc\(%rbp\) 5e: 5d pop %rbp 5f: 5d pop %rbp - 60: eb 26 jmp 88 <foo\+0x88> - 62: eb 24 jmp 88 <foo\+0x88> - 64: eb 22 jmp 88 <foo\+0x88> + 60: eb 26 jmp (0x)?88( .*)? + 62: eb 24 jmp (0x)?88( .*)? + 64: eb 22 jmp (0x)?88( .*)? 66: 89 45 fc mov %eax,-0x4\(%rbp\) 69: 89 75 f4 mov %esi,-0xc\(%rbp\) 6c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -54,11 +54,13 @@ Disassembly of section .text: 78: 5d pop %rbp 79: 5d pop %rbp 7a: 48 39 c5 cmp %rax,%rbp - 7d: 74 03 je 82 <foo\+0x82> + 7d: 74 03 je (0x)?82( .*)? 7f: 90 nop - 80: eb 06 jmp 88 <foo\+0x88> + 80: eb 06 jmp (0x)?88( .*)? +#... 82: 8b 45 f4 mov -0xc\(%rbp\),%eax 85: 89 45 fc mov %eax,-0x4\(%rbp\) +#... 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 94: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) @@ -69,7 +71,7 @@ Disassembly of section .text: b2: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b8: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) be: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) - c4: eb c2 jmp 88 <foo\+0x88> + c4: eb c2 jmp (0x)?88( .*)? c6: 5d pop %rbp c7: c3 retq #pass diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1c.d b/gas/testsuite/gas/i386/x86-64-align-branch-1c.d index 53c848a..b4e1c77b 100644 --- a/gas/testsuite/gas/i386/x86-64-align-branch-1c.d +++ b/gas/testsuite/gas/i386/x86-64-align-branch-1c.d @@ -18,7 +18,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%rbp\) 1d: 89 75 f4 mov %esi,-0xc\(%rbp\) 20: 48 39 c5 cmp %rax,%rbp - 23: 74 5d je 82 <foo\+0x82> + 23: 74 5d je (0x)?82( .*)? 25: 2e 89 75 f4 mov %esi,%cs:-0xc\(%rbp\) 29: 89 75 f4 mov %esi,-0xc\(%rbp\) 2c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -29,9 +29,9 @@ Disassembly of section .text: 3b: 89 75 f4 mov %esi,-0xc\(%rbp\) 3e: 5d pop %rbp 3f: 5d pop %rbp - 40: 74 40 je 82 <foo\+0x82> + 40: 74 40 je (0x)?82( .*)? 42: 5d pop %rbp - 43: 74 3d je 82 <foo\+0x82> + 43: 74 3d je (0x)?82( .*)? 45: 2e 89 45 fc mov %eax,%cs:-0x4\(%rbp\) 49: 89 75 f4 mov %esi,-0xc\(%rbp\) 4c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -42,9 +42,9 @@ Disassembly of section .text: 5b: 89 75 f4 mov %esi,-0xc\(%rbp\) 5e: 5d pop %rbp 5f: 5d pop %rbp - 60: eb 26 jmp 88 <foo\+0x88> - 62: eb 24 jmp 88 <foo\+0x88> - 64: eb 22 jmp 88 <foo\+0x88> + 60: eb 26 jmp (0x)?88( .*)? + 62: eb 24 jmp (0x)?88( .*)? + 64: eb 22 jmp (0x)?88( .*)? 66: 89 45 fc mov %eax,-0x4\(%rbp\) 69: 89 75 f4 mov %esi,-0xc\(%rbp\) 6c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -54,11 +54,13 @@ Disassembly of section .text: 78: 5d pop %rbp 79: 5d pop %rbp 7a: 48 39 c5 cmp %rax,%rbp - 7d: 74 03 je 82 <foo\+0x82> + 7d: 74 03 je (0x)?82( .*)? 7f: 90 nop - 80: eb 06 jmp 88 <foo\+0x88> + 80: eb 06 jmp (0x)?88( .*)? +#... 82: 8b 45 f4 mov -0xc\(%rbp\),%eax 85: 89 45 fc mov %eax,-0x4\(%rbp\) +#... 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 94: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) @@ -69,7 +71,7 @@ Disassembly of section .text: b2: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b8: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) be: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) - c4: eb c2 jmp 88 <foo\+0x88> + c4: eb c2 jmp (0x)?88( .*)? c6: 5d pop %rbp c7: c3 retq #pass diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1d.d b/gas/testsuite/gas/i386/x86-64-align-branch-1d.d index ae6445b..c72b017 100644 --- a/gas/testsuite/gas/i386/x86-64-align-branch-1d.d +++ b/gas/testsuite/gas/i386/x86-64-align-branch-1d.d @@ -18,7 +18,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%rbp\) 1d: 89 75 f4 mov %esi,-0xc\(%rbp\) 20: 48 39 c5 cmp %rax,%rbp - 23: 74 5b je 80 <foo\+0x80> + 23: 74 5b je (0x)?80( .*)? 25: 2e 89 75 f4 mov %esi,%cs:-0xc\(%rbp\) 29: 89 75 f4 mov %esi,-0xc\(%rbp\) 2c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -29,9 +29,9 @@ Disassembly of section .text: 3b: 89 75 f4 mov %esi,-0xc\(%rbp\) 3e: 5d pop %rbp 3f: 5d pop %rbp - 40: 74 3e je 80 <foo\+0x80> + 40: 74 3e je (0x)?80( .*)? 42: 5d pop %rbp - 43: 74 3b je 80 <foo\+0x80> + 43: 74 3b je (0x)?80( .*)? 45: 89 45 fc mov %eax,-0x4\(%rbp\) 48: 89 75 f4 mov %esi,-0xc\(%rbp\) 4b: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -42,9 +42,9 @@ Disassembly of section .text: 5a: 89 75 f4 mov %esi,-0xc\(%rbp\) 5d: 5d pop %rbp 5e: 5d pop %rbp - 5f: eb 25 jmp 86 <foo\+0x86> - 61: eb 23 jmp 86 <foo\+0x86> - 63: eb 21 jmp 86 <foo\+0x86> + 5f: eb 25 jmp (0x)?86( .*)? + 61: eb 23 jmp (0x)?86( .*)? + 63: eb 21 jmp (0x)?86( .*)? 65: 89 45 fc mov %eax,-0x4\(%rbp\) 68: 89 75 f4 mov %esi,-0xc\(%rbp\) 6b: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -54,10 +54,12 @@ Disassembly of section .text: 77: 5d pop %rbp 78: 5d pop %rbp 79: 48 39 c5 cmp %rax,%rbp - 7c: 74 02 je 80 <foo\+0x80> - 7e: eb 06 jmp 86 <foo\+0x86> + 7c: 74 02 je (0x)?80( .*)? + 7e: eb 06 jmp (0x)?86( .*)? +#... 80: 8b 45 f4 mov -0xc\(%rbp\),%eax 83: 89 45 fc mov %eax,-0x4\(%rbp\) +#... 86: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 8c: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 92: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) @@ -68,7 +70,7 @@ Disassembly of section .text: b0: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b6: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) bc: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) - c2: eb c2 jmp 86 <foo\+0x86> + c2: eb c2 jmp (0x)?86( .*)? c4: 5d pop %rbp c5: c3 retq #pass diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1e.d b/gas/testsuite/gas/i386/x86-64-align-branch-1e.d index beb7744..77b6253 100644 --- a/gas/testsuite/gas/i386/x86-64-align-branch-1e.d +++ b/gas/testsuite/gas/i386/x86-64-align-branch-1e.d @@ -18,7 +18,7 @@ Disassembly of section .text: 17: 89 75 f4 mov %esi,-0xc\(%rbp\) 1a: 89 75 f4 mov %esi,-0xc\(%rbp\) 1d: 48 39 c5 cmp %rax,%rbp - 20: 74 5b je 7d <foo\+0x7d> + 20: 74 5b je (0x)?7d( .*)? 22: 89 75 f4 mov %esi,-0xc\(%rbp\) 25: 89 75 f4 mov %esi,-0xc\(%rbp\) 28: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -29,9 +29,9 @@ Disassembly of section .text: 37: 89 75 f4 mov %esi,-0xc\(%rbp\) 3a: 5d pop %rbp 3b: 5d pop %rbp - 3c: 74 3f je 7d <foo\+0x7d> + 3c: 74 3f je (0x)?7d( .*)? 3e: 2e 5d cs pop %rbp - 40: 74 3b je 7d <foo\+0x7d> + 40: 74 3b je (0x)?7d( .*)? 42: 89 45 fc mov %eax,-0x4\(%rbp\) 45: 89 75 f4 mov %esi,-0xc\(%rbp\) 48: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -42,9 +42,9 @@ Disassembly of section .text: 57: 89 75 f4 mov %esi,-0xc\(%rbp\) 5a: 5d pop %rbp 5b: 5d pop %rbp - 5c: eb 25 jmp 83 <foo\+0x83> - 5e: eb 23 jmp 83 <foo\+0x83> - 60: eb 21 jmp 83 <foo\+0x83> + 5c: eb 25 jmp (0x)?83( .*)? + 5e: eb 23 jmp (0x)?83( .*)? + 60: eb 21 jmp (0x)?83( .*)? 62: 89 45 fc mov %eax,-0x4\(%rbp\) 65: 89 75 f4 mov %esi,-0xc\(%rbp\) 68: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -54,10 +54,12 @@ Disassembly of section .text: 74: 5d pop %rbp 75: 5d pop %rbp 76: 48 39 c5 cmp %rax,%rbp - 79: 74 02 je 7d <foo\+0x7d> - 7b: eb 06 jmp 83 <foo\+0x83> + 79: 74 02 je (0x)?7d( .*)? + 7b: eb 06 jmp (0x)?83( .*)? +#... 7d: 8b 45 f4 mov -0xc\(%rbp\),%eax 80: 89 45 fc mov %eax,-0x4\(%rbp\) +#... 83: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 89: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 8f: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) @@ -68,7 +70,7 @@ Disassembly of section .text: ad: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b3: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b9: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) - bf: eb c2 jmp 83 <foo\+0x83> + bf: eb c2 jmp (0x)?83( .*)? c1: 5d pop %rbp c2: c3 retq #pass diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1f.d b/gas/testsuite/gas/i386/x86-64-align-branch-1f.d index 24fbf45..aed8169 100644 --- a/gas/testsuite/gas/i386/x86-64-align-branch-1f.d +++ b/gas/testsuite/gas/i386/x86-64-align-branch-1f.d @@ -18,7 +18,7 @@ Disassembly of section .text: 17: 89 75 f4 mov %esi,-0xc\(%rbp\) 1a: 89 75 f4 mov %esi,-0xc\(%rbp\) 1d: 48 39 c5 cmp %rax,%rbp - 20: 74 5d je 7f <foo\+0x7f> + 20: 74 5d je (0x)?7f( .*)? 22: 89 75 f4 mov %esi,-0xc\(%rbp\) 25: 89 75 f4 mov %esi,-0xc\(%rbp\) 28: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -29,9 +29,9 @@ Disassembly of section .text: 37: 89 75 f4 mov %esi,-0xc\(%rbp\) 3a: 5d pop %rbp 3b: 5d pop %rbp - 3c: 74 41 je 7f <foo\+0x7f> + 3c: 74 41 je (0x)?7f( .*)? 3e: 2e 5d cs pop %rbp - 40: 74 3d je 7f <foo\+0x7f> + 40: 74 3d je (0x)?7f( .*)? 42: 89 45 fc mov %eax,-0x4\(%rbp\) 45: 89 75 f4 mov %esi,-0xc\(%rbp\) 48: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -42,10 +42,10 @@ Disassembly of section .text: 57: 89 75 f4 mov %esi,-0xc\(%rbp\) 5a: 5d pop %rbp 5b: 5d pop %rbp - 5c: eb 27 jmp 85 <foo\+0x85> + 5c: eb 27 jmp (0x)?85( .*)? 5e: 66 90 xchg %ax,%ax - 60: eb 23 jmp 85 <foo\+0x85> - 62: eb 21 jmp 85 <foo\+0x85> + 60: eb 23 jmp (0x)?85( .*)? + 62: eb 21 jmp (0x)?85( .*)? 64: 89 45 fc mov %eax,-0x4\(%rbp\) 67: 89 75 f4 mov %esi,-0xc\(%rbp\) 6a: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -55,10 +55,12 @@ Disassembly of section .text: 76: 5d pop %rbp 77: 5d pop %rbp 78: 48 39 c5 cmp %rax,%rbp - 7b: 74 02 je 7f <foo\+0x7f> - 7d: eb 06 jmp 85 <foo\+0x85> + 7b: 74 02 je (0x)?7f( .*)? + 7d: eb 06 jmp (0x)?85( .*)? +#... 7f: 8b 45 f4 mov -0xc\(%rbp\),%eax 82: 89 45 fc mov %eax,-0x4\(%rbp\) +#... 85: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 8b: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 91: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) @@ -69,7 +71,7 @@ Disassembly of section .text: af: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b5: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) bb: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) - c1: eb c2 jmp 85 <foo\+0x85> + c1: eb c2 jmp (0x)?85( .*)? c3: 5d pop %rbp c4: c3 retq #pass diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1g.d b/gas/testsuite/gas/i386/x86-64-align-branch-1g.d index 6244940..d468c38 100644 --- a/gas/testsuite/gas/i386/x86-64-align-branch-1g.d +++ b/gas/testsuite/gas/i386/x86-64-align-branch-1g.d @@ -18,7 +18,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%rbp\) 1d: 89 75 f4 mov %esi,-0xc\(%rbp\) 20: 48 39 c5 cmp %rax,%rbp - 23: 74 5d je 82 <foo\+0x82> + 23: 74 5d je (0x)?82( .*)? 25: 2e 89 75 f4 mov %esi,%cs:-0xc\(%rbp\) 29: 89 75 f4 mov %esi,-0xc\(%rbp\) 2c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -29,9 +29,9 @@ Disassembly of section .text: 3b: 89 75 f4 mov %esi,-0xc\(%rbp\) 3e: 5d pop %rbp 3f: 5d pop %rbp - 40: 74 40 je 82 <foo\+0x82> + 40: 74 40 je (0x)?82( .*)? 42: 5d pop %rbp - 43: 74 3d je 82 <foo\+0x82> + 43: 74 3d je (0x)?82( .*)? 45: 2e 89 45 fc mov %eax,%cs:-0x4\(%rbp\) 49: 89 75 f4 mov %esi,-0xc\(%rbp\) 4c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -42,9 +42,9 @@ Disassembly of section .text: 5b: 89 75 f4 mov %esi,-0xc\(%rbp\) 5e: 5d pop %rbp 5f: 5d pop %rbp - 60: eb 26 jmp 88 <foo\+0x88> - 62: eb 24 jmp 88 <foo\+0x88> - 64: eb 22 jmp 88 <foo\+0x88> + 60: eb 26 jmp (0x)?88( .*)? + 62: eb 24 jmp (0x)?88( .*)? + 64: eb 22 jmp (0x)?88( .*)? 66: 89 45 fc mov %eax,-0x4\(%rbp\) 69: 89 75 f4 mov %esi,-0xc\(%rbp\) 6c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -54,11 +54,13 @@ Disassembly of section .text: 78: 5d pop %rbp 79: 5d pop %rbp 7a: 48 39 c5 cmp %rax,%rbp - 7d: 74 03 je 82 <foo\+0x82> + 7d: 74 03 je (0x)?82( .*)? 7f: 90 nop - 80: eb 06 jmp 88 <foo\+0x88> + 80: eb 06 jmp (0x)?88( .*)? +#... 82: 8b 45 f4 mov -0xc\(%rbp\),%eax 85: 89 45 fc mov %eax,-0x4\(%rbp\) +#... 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 94: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) @@ -69,7 +71,7 @@ Disassembly of section .text: b2: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b8: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) be: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) - c4: eb c2 jmp 88 <foo\+0x88> + c4: eb c2 jmp (0x)?88( .*)? c6: 5d pop %rbp c7: c3 retq #pass diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1h.d b/gas/testsuite/gas/i386/x86-64-align-branch-1h.d index a6022be..cee7361 100644 --- a/gas/testsuite/gas/i386/x86-64-align-branch-1h.d +++ b/gas/testsuite/gas/i386/x86-64-align-branch-1h.d @@ -18,7 +18,7 @@ Disassembly of section .text: 17: 89 75 f4 mov %esi,-0xc\(%rbp\) 1a: 89 75 f4 mov %esi,-0xc\(%rbp\) 1d: 48 39 c5 cmp %rax,%rbp - 20: 74 5a je 7c <foo\+0x7c> + 20: 74 5a je (0x)?7c( .*)? 22: 89 75 f4 mov %esi,-0xc\(%rbp\) 25: 89 75 f4 mov %esi,-0xc\(%rbp\) 28: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -29,9 +29,9 @@ Disassembly of section .text: 37: 89 75 f4 mov %esi,-0xc\(%rbp\) 3a: 5d pop %rbp 3b: 5d pop %rbp - 3c: 74 3e je 7c <foo\+0x7c> + 3c: 74 3e je (0x)?7c( .*)? 3e: 5d pop %rbp - 3f: 74 3b je 7c <foo\+0x7c> + 3f: 74 3b je (0x)?7c( .*)? 41: 89 45 fc mov %eax,-0x4\(%rbp\) 44: 89 75 f4 mov %esi,-0xc\(%rbp\) 47: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -42,9 +42,9 @@ Disassembly of section .text: 56: 89 75 f4 mov %esi,-0xc\(%rbp\) 59: 5d pop %rbp 5a: 5d pop %rbp - 5b: eb 25 jmp 82 <foo\+0x82> - 5d: eb 23 jmp 82 <foo\+0x82> - 5f: eb 21 jmp 82 <foo\+0x82> + 5b: eb 25 jmp (0x)?82( .*)? + 5d: eb 23 jmp (0x)?82( .*)? + 5f: eb 21 jmp (0x)?82( .*)? 61: 89 45 fc mov %eax,-0x4\(%rbp\) 64: 89 75 f4 mov %esi,-0xc\(%rbp\) 67: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -54,10 +54,12 @@ Disassembly of section .text: 73: 5d pop %rbp 74: 5d pop %rbp 75: 48 39 c5 cmp %rax,%rbp - 78: 74 02 je 7c <foo\+0x7c> - 7a: eb 06 jmp 82 <foo\+0x82> + 78: 74 02 je (0x)?7c( .*)? + 7a: eb 06 jmp (0x)?82( .*)? +#... 7c: 8b 45 f4 mov -0xc\(%rbp\),%eax 7f: 89 45 fc mov %eax,-0x4\(%rbp\) +#... 82: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) @@ -68,7 +70,7 @@ Disassembly of section .text: ac: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b2: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b8: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) - be: eb c2 jmp 82 <foo\+0x82> + be: eb c2 jmp (0x)?82( .*)? c0: 5d pop %rbp c1: c3 retq #pass diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1i.d b/gas/testsuite/gas/i386/x86-64-align-branch-1i.d index 2493626..67b1b15 100644 --- a/gas/testsuite/gas/i386/x86-64-align-branch-1i.d +++ b/gas/testsuite/gas/i386/x86-64-align-branch-1i.d @@ -19,7 +19,7 @@ Disassembly of section .text: 1a: 89 75 f4 mov %esi,-0xc\(%rbp\) 1d: 0f 1f 00 nopl \(%rax\) 20: 48 39 c5 cmp %rax,%rbp - 23: 74 5d je 82 <foo\+0x82> + 23: 74 5d je (0x)?82( .*)? 25: 89 75 f4 mov %esi,-0xc\(%rbp\) 28: 89 75 f4 mov %esi,-0xc\(%rbp\) 2b: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -31,9 +31,9 @@ Disassembly of section .text: 3d: 5d pop %rbp 3e: 5d pop %rbp 3f: 90 nop - 40: 74 40 je 82 <foo\+0x82> + 40: 74 40 je (0x)?82( .*)? 42: 5d pop %rbp - 43: 74 3d je 82 <foo\+0x82> + 43: 74 3d je (0x)?82( .*)? 45: 89 45 fc mov %eax,-0x4\(%rbp\) 48: 89 75 f4 mov %esi,-0xc\(%rbp\) 4b: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -45,9 +45,9 @@ Disassembly of section .text: 5d: 5d pop %rbp 5e: 5d pop %rbp 5f: 90 nop - 60: eb 26 jmp 88 <foo\+0x88> - 62: eb 24 jmp 88 <foo\+0x88> - 64: eb 22 jmp 88 <foo\+0x88> + 60: eb 26 jmp (0x)?88( .*)? + 62: eb 24 jmp (0x)?88( .*)? + 64: eb 22 jmp (0x)?88( .*)? 66: 89 45 fc mov %eax,-0x4\(%rbp\) 69: 89 75 f4 mov %esi,-0xc\(%rbp\) 6c: 89 7d f8 mov %edi,-0x8\(%rbp\) @@ -57,11 +57,13 @@ Disassembly of section .text: 78: 5d pop %rbp 79: 5d pop %rbp 7a: 48 39 c5 cmp %rax,%rbp - 7d: 74 03 je 82 <foo\+0x82> + 7d: 74 03 je (0x)?82( .*)? 7f: 90 nop - 80: eb 06 jmp 88 <foo\+0x88> + 80: eb 06 jmp (0x)?88( .*)? +#... 82: 8b 45 f4 mov -0xc\(%rbp\),%eax 85: 89 45 fc mov %eax,-0x4\(%rbp\) +#... 88: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 8e: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) 94: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) @@ -72,7 +74,7 @@ Disassembly of section .text: b2: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) b8: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) be: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\) - c4: eb c2 jmp 88 <foo\+0x88> + c4: eb c2 jmp (0x)?88( .*)? c6: 5d pop %rbp c7: c3 retq #pass diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-5.d b/gas/testsuite/gas/i386/x86-64-align-branch-5.d index 3a16c1b..9770a4a 100644 --- a/gas/testsuite/gas/i386/x86-64-align-branch-5.d +++ b/gas/testsuite/gas/i386/x86-64-align-branch-5.d @@ -8,6 +8,7 @@ Disassembly of section .text: 0+ <foo>: 0: c1 e9 02 shr \$0x2,%ecx +#... 3: c1 e9 02 shr \$0x2,%ecx 6: c1 e9 02 shr \$0x2,%ecx 9: 89 d1 mov %edx,%ecx @@ -20,9 +21,10 @@ Disassembly of section .text: 1c: c1 e9 02 shr \$0x2,%ecx 1f: f6 c2 02 test \$0x2,%dl 22: f3 ab rep stos %eax,%es:\(%rdi\) - 24: 75 dd jne 3 <foo\+0x3> + 24: 75 dd jne (0x)?3( .*)? 26: 31 c0 xor %eax,%eax 28: c1 e9 02 shr \$0x2,%ecx +#... 2b: c1 e9 02 shr \$0x2,%ecx 2e: c1 e9 02 shr \$0x2,%ecx 31: 89 d1 mov %edx,%ecx @@ -31,7 +33,7 @@ Disassembly of section .text: 38: c1 e9 02 shr \$0x2,%ecx 3b: c1 e9 02 shr \$0x2,%ecx 3e: f6 c2 02 test \$0x2,%dl - 41: e8 00 00 00 00 callq 46 <foo\+0x46> - 46: 75 e3 jne 2b <foo\+0x2b> + 41: e8 00 00 00 00 callq (0x)?46( .*)? + 46: 75 e3 jne (0x)?2b( .*)? 48: 31 c0 xor %eax,%eax #pass diff --git a/ld/ChangeLog b/ld/ChangeLog index 1c80908..ee68a8c 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2020-01-14 Lili Cui <lili.cui@intel.com> + + * testsuite/ld-i386/align-branch-1.d: Updated for i686-pc-elf. + 2020-01-13 Alan Modra <amodra@gmail.com> * po/BLD-POTFILES.in: Regenerate. diff --git a/ld/testsuite/ld-i386/align-branch-1.d b/ld/testsuite/ld-i386/align-branch-1.d index 9eb7287..b1347e5 100644 --- a/ld/testsuite/ld-i386/align-branch-1.d +++ b/ld/testsuite/ld-i386/align-branch-1.d @@ -10,16 +10,16 @@ Disassembly of section .text: [a-f0-9]+ <_start>: +[a-f0-9]+: 85 d2 test %edx,%edx - +[a-f0-9]+: 74 20 je 8049024 <_start\+0x24> + +[a-f0-9]+: 74 20 je +[a-f0-9]+ <_start\+0x24> +[a-f0-9]+: 85 d2 test %edx,%edx - +[a-f0-9]+: 74 1c je 8049024 <_start\+0x24> + +[a-f0-9]+: 74 1c je +[a-f0-9]+ <_start\+0x24> +[a-f0-9]+: 85 ff test %edi,%edi - +[a-f0-9]+: 74 18 je 8049024 <_start\+0x24> + +[a-f0-9]+: 74 18 je +[a-f0-9]+ <_start\+0x24> +[a-f0-9]+: 65 a1 00 00 00 00 mov %gs:0x0,%eax +[a-f0-9]+: 90 nop +[a-f0-9]+: 8d 74 26 00 lea 0x0\(%esi,%eiz,1\),%esi +[a-f0-9]+: 3e 3e 3e 8b 90 fc ff ff ff ds ds mov %ds:-0x4\(%eax\),%edx +[a-f0-9]+: 85 d2 test %edx,%edx - +[a-f0-9]+: 74 00 je 8049024 <_start\+0x24> + +[a-f0-9]+: 74 00 je +[a-f0-9]+ <_start\+0x24> +[a-f0-9]+: c3 ret #pass |