diff options
| author | Oleg Endo <olegendo@gcc.gnu.org> | 2016-06-04 06:08:33 +0000 |
|---|---|---|
| committer | Oleg Endo <olegendo@gcc.gnu.org> | 2016-06-04 06:08:33 +0000 |
| commit | c389d3496ad217dbce58cc90c7cc7c7d31b40d81 (patch) | |
| tree | 74a8b350552d28cacb1da3da852e03ab9a1d07f1 | |
| parent | 4624e9cd754a68b8dbd7fe7d75ef4882626649c6 (diff) | |
| download | gcc-c389d3496ad217dbce58cc90c7cc7c7d31b40d81.zip gcc-c389d3496ad217dbce58cc90c7cc7c7d31b40d81.tar.gz gcc-c389d3496ad217dbce58cc90c7cc7c7d31b40d81.tar.bz2 | |
Avoid potential slient wrong-code with reg+reg addr. modes on SH.
gcc/
* config/sh/sh.c (sh_print_operand_address): Don't use hardcoded 'r0'
for reg+reg addressing mode.
From-SVN: r237088
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/sh/sh.c | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6d3974b..bce140b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-06-04 Oleg Endo <olegendo@gcc.gnu.org> + + * config/sh/sh.c (sh_print_operand_address): Don't use hardcoded 'r0' + for reg+reg addressing mode. + 2016-06-03 Bill Schmidt <wschmidt@linux.vnet.ibm.com> * rs6000-c.c (c/c-tree.h): Add #include. diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index 2bd917a..74327aa 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -1038,8 +1038,16 @@ sh_print_operand_address (FILE *stream, machine_mode /*mode*/, rtx x) int base_num = true_regnum (base); int index_num = true_regnum (index); - fprintf (stream, "@(r0,%s)", - reg_names[MAX (base_num, index_num)]); + /* If base or index is R0, make sure that it comes first. + Usually one of them will be R0, but the order might be wrong. + If neither base nor index are R0 it's an error and we just + pass it on to the assembler. This avoids silent wrong code + bugs. */ + if (base_num == 0 && index_num != 0) + std::swap (base_num, index_num); + + fprintf (stream, "@(%s,%s)", reg_names[index_num], + reg_names[base_num]); break; } |