diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2006-08-19 16:27:35 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2006-08-19 16:27:35 +0000 |
| commit | 58f3a4260d6f897edfca5033566a0674091836ec (patch) | |
| tree | 4d8014a5cdab145a2d53766c38baf89e1aef86da | |
| parent | 45b77be0404ecfc49a7fb3cf93b55c689b57e134 (diff) | |
| download | binutils-gdb-58f3a4260d6f897edfca5033566a0674091836ec.tar.gz | |
gas/
* config/tc-arm.c (s_arm_unwind_save_mmxwr): Correct condition for
merging with previous long opcode.
gas/testsuite/
* gas/arm/unwind.s: Test not merging iWMMXt register save with
previous long opcode.
* gas/arm/unwind.d, gas/arm/unwind_vxworks.d: Update.
| -rw-r--r-- | ChangeLog.csl | 11 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/unwind.d | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/unwind.s | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/unwind_vxworks.d | 4 |
5 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 6ccbea32910..ac2b9881a7e 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,14 @@ +2006-08-19 Joseph Myers <joseph@codesourcery.com> + + gas/ + * config/tc-arm.c (s_arm_unwind_save_mmxwr): Correct condition for + merging with previous long opcode. + + gas/testsuite/ + * gas/arm/unwind.s: Test not merging iWMMXt register save with + previous long opcode. + * gas/arm/unwind.d, gas/arm/unwind_vxworks.d: Update. + 2006-08-18 Paul Brook <paul@codesourcery.com> Backport from mainline. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 9c3077ab53c..176c065a59c 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -3454,7 +3454,7 @@ s_arm_unwind_save_mmxwr (void) op = 0xffff << (reg - 1); if (reg > 0 - || ((mask & op) == (1u << (reg - 1)))) + && ((mask & op) == (1u << (reg - 1)))) { op = (1 << (reg + i + 1)) - 1; op &= ~((1 << reg) - 1); diff --git a/gas/testsuite/gas/arm/unwind.d b/gas/testsuite/gas/arm/unwind.d index cd4a7c7995c..e7a9036d64d 100644 --- a/gas/testsuite/gas/arm/unwind.d +++ b/gas/testsuite/gas/arm/unwind.d @@ -32,8 +32,8 @@ Contents of section .text: 0010 (04200520|20052004) .* Contents of section .ARM.extab: 0000 (449b0181 b0b08086|81019b44 8680b0b0) 00000000 00000000 .* - 0010 (8402b101 b0b0b005 2a000000 00c60181|01b10284 05b0b0b0 0000002a 8101c600) .* - 0020 (b0b0c1c1|c1c1b0b0) 00000000 .* + 0010 (8402b101 b0b0b005 2a000000 00c60281|01b10284 05b0b0b0 0000002a 8102c600) .* + 0020 (d0c6c1c1 b0b0c0c6|c1c1c6d0 c6c0b0b0) 00000000 .* Contents of section .ARM.exidx: 0000 00000000 (b0b0a880 04000000|80a8b0b0 00000004) 00000000 .* 0010 (08000000 0c000000 0c000000 1c000000|00000008 0000000c 0000000c 0000001c) .* diff --git a/gas/testsuite/gas/arm/unwind.s b/gas/testsuite/gas/arm/unwind.s index 7d0f126954f..f0503788b3a 100644 --- a/gas/testsuite/gas/arm/unwind.s +++ b/gas/testsuite/gas/arm/unwind.s @@ -27,6 +27,8 @@ foo2: @ Custom personality routine .fnend foo3: @ Saving iwmmxt registers .fnstart + .save {wr12} + .save {wr13} .save {wr11} .save {wr10} .save {wr10, wr11} diff --git a/gas/testsuite/gas/arm/unwind_vxworks.d b/gas/testsuite/gas/arm/unwind_vxworks.d index ccd16a65cc9..4e4b215ad39 100644 --- a/gas/testsuite/gas/arm/unwind_vxworks.d +++ b/gas/testsuite/gas/arm/unwind_vxworks.d @@ -31,8 +31,8 @@ Contents of section .text: 0010 (04200520|20052004) .* Contents of section .ARM.extab: 0000 (449b0181 b0b08086|81019b44 8680b0b0) 00000000 00000000 .* - 0010 (8402b101 b0b0b005 2a000000 00c60181|01b10284 05b0b0b0 0000002a 8101c600) .* - 0020 (b0b0c1c1|c1c1b0b0) 00000000 .* + 0010 (8402b101 b0b0b005 2a000000 00c60281|01b10284 05b0b0b0 0000002a 8102c600) .* + 0020 (d0c6c1c1 b0b0c0c6|c1c1c6d0 c6c0b0b0) 00000000 .* Contents of section .ARM.exidx: 0000 00000000 (b0b0a880|80a8b0b0) 00000000 00000000 .* 0010 00000000 00000000 00000000 00000000 .* |