disas/mips: Fix branch displacement for BEQZC and BNEZC
PATCH v2 1/1 disas/mips: Fix branch displacement for BEQZC and BNEZC
From: David Daney <[email protected]>
disas/mips.c got added in commit 6643d27ea0 ("MIPS disas support") apparently based on binutils tag 'gdb_6_1-branchpoint' [1]. Back then, MIPSr6 was not supported (added in binutils commit 7361da2c952 during 2014 [2]).
Binutils codebase diverged so much over the last 18 years, it is not possible to simply cherry-pick their changes, so fix it BEQZC / BNEZC 21-bit signed branch displacement locally.
[1] https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=opcodes/mips-dis.c;hb=refs/tags/gdb_6_1-branchpoint
[2] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=7361da2c952
---
v2: Use sextract32 (rth)
--- disas/mips.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
disas/mips.c +10 -2
@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>. */#include "qemu/osdep.h" +#include "qemu/bitops.h" #include "disas/dis-asm.h" /* mips.h. Mips opcode list for GDB, the GNU debugger.
@@ -1334,9 +1335,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"balc", "+p", 0xe8000000, 0xfc000000, UBD|WR_31, 0, I32R6}, {"bc", "+p", 0xc8000000, 0xfc000000, UBD|WR_31, 0, I32R6}, {"jic", "t,o", 0xd8000000, 0xffe00000, UBD|RD_t, 0, I32R6}, -{"beqzc", "s,+p", 0xd8000000, 0xfc000000, CBD|RD_s, 0, I32R6}, +{"beqzc", "s,+q", 0xd8000000, 0xfc000000, CBD|RD_s, 0, I32R6}, {"jialc", "t,o", 0xf8000000, 0xffe00000, UBD|RD_t, 0, I32R6}, -{"bnezc", "s,+p", 0xf8000000, 0xfc000000, CBD|RD_s, 0, I32R6}, +{"bnezc", "s,+q", 0xf8000000, 0xfc000000, CBD|RD_s, 0, I32R6}, {"beqzalc", "s,t,p", 0x20000000, 0xffe00000, CBD|RD_s|RD_t, 0, I32R6}, {"bovc", "s,t,p", 0x20000000, 0xfc000000, CBD|RD_s|RD_t, 0, I32R6}, {"beqc", "s,t,p", 0x20000000, 0xfc000000, CBD|RD_s|RD_t, 0, I32R6},
@@ -4462,6 +4463,13 @@ print_insn_args (const char *d, (*info->print_address_func) (info->target, info);break ; +case 'q' : +/* Sign extend the displacement with 21 bits. */ + delta =sextract32 (l,OP_SH_DELTA ,21 ); + info->target = (delta <<2 ) + pc +INSNLEN ; + (*info->print_address_func) (info->target, info); +break ; +case 't' :/* Coprocessor 0 reg name */ (*info->fprintf_func) (info->stream, "%s", mips_cp0_names[(l >> OP_SH_RT) &
Signature · 1 line
2.37.3
Quoted 19 lines · Philippe Mathieu-Daudé
From: David Daney<[email protected]>
disas/mips.cgot added in commit6643d27ea0("MIPS disas support") apparently based on binutils tag 'gdb_6_1-branchpoint' [1]. Back then, MIPSr6 was not supported (added in binutils commit7361da2c952during 2014 [2]).Binutils codebase diverged so much over the last 18 years, it is not possible to simply cherry-pick their changes, so fix it BEQZC / BNEZC 21-bit signed branch displacement locally.
[1]https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=opcodes/mips-dis.c;hb=refs/tags/gdb_6_1-branchpoint [2]https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=7361da2c952
Fixes 31837be3ee ("target-mips: add compact and CP1 branches")Signed-off-by David Daney<[email protected]>Reviewed-by Marcin Nowakowski<[email protected]>[PMD: Added commit description]Signed-off-by Philippe Mathieu-Daudé<[email protected]>
Quoted 5 lines
---
v2: Use sextract32 (rth)--- disas/mips.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
r~