Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/aarch64/aarch64 fix wrong target register size of "...
details: https://anonhg.NetBSD.org/src/rev/2ed4216f2c31
branches: trunk
changeset: 953036:2ed4216f2c31
user: ryo <ryo%NetBSD.org@localhost>
date: Tue Feb 23 20:26:50 2021 +0000
description:
fix wrong target register size of "ldrsh"
"ldrsh Xt, [Xn, Xm]" was being output as "ldrsh Wt, [Xn, Xm]"
diffstat:
sys/arch/aarch64/aarch64/disasm.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diffs (80 lines):
diff -r c4a0c1c65988 -r 2ed4216f2c31 sys/arch/aarch64/aarch64/disasm.c
--- a/sys/arch/aarch64/aarch64/disasm.c Tue Feb 23 20:15:04 2021 +0000
+++ b/sys/arch/aarch64/aarch64/disasm.c Tue Feb 23 20:26:50 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disasm.c,v 1.13 2021/02/23 20:15:04 ryo Exp $ */
+/* $NetBSD: disasm.c,v 1.14 2021/02/23 20:26:50 ryo Exp $ */
/*
* Copyright (c) 2018 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disasm.c,v 1.13 2021/02/23 20:15:04 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disasm.c,v 1.14 2021/02/23 20:26:50 ryo Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -919,7 +919,7 @@
static void
regoffset_h_common(const disasm_interface_t *di, uint64_t pc, uint32_t insn,
uint64_t Rm, uint64_t option, uint64_t shift, uint64_t Rn, uint64_t Rt,
- const char *op)
+ uint64_t RtSz, const char *op)
{
int r;
@@ -931,13 +931,13 @@
if ((shift == 0) && (option == 3)) {
PRINTF("%s\t%s, [%s,%s]\n",
op,
- ZREGNAME(0, Rt),
+ ZREGNAME(RtSz, Rt),
SREGNAME(1, Rn),
ZREGNAME(r, Rm));
} else if (shift == 0) {
PRINTF("%s\t%s, [%s,%s,%s]\n",
op,
- ZREGNAME(0, Rt),
+ ZREGNAME(RtSz, Rt),
SREGNAME(1, Rn),
ZREGNAME(r, Rm),
SHIFTOP8(option,
@@ -945,7 +945,7 @@
} else {
PRINTF("%s\t%s, [%s,%s,%s #%u]\n",
op,
- ZREGNAME(0, Rt),
+ ZREGNAME(RtSz, Rt),
SREGNAME(1, Rn),
ZREGNAME(r, Rm),
SHIFTOP8(option,
@@ -2030,7 +2030,7 @@
OP5FUNC(op_ldrh_reg, Rm, option, shift, Rn, Rt)
{
- regoffset_h_common(di, pc, insn, Rm, option, shift, Rn, Rt, "ldrh");
+ regoffset_h_common(di, pc, insn, Rm, option, shift, Rn, Rt, 0, "ldrh");
}
OP4FUNC(op_ldrsb_immpostidx, opc, imm9, Rn, Rt)
@@ -2100,7 +2100,8 @@
OP6FUNC(op_ldrsh_reg, opc, Rm, option, shift, Rn, Rt)
{
- regoffset_h_common(di, pc, insn, Rm, option, shift, Rn, Rt, "ldrsh");
+ regoffset_h_common(di, pc, insn, Rm, option, shift, Rn, Rt, opc ^ 1,
+ "ldrsh");
}
OP3FUNC(op_ldrsw_immpostidx, imm9, Rn, Rt)
@@ -3016,7 +3017,7 @@
OP5FUNC(op_strh_reg, Rm, option, shift, Rn, Rt)
{
- regoffset_h_common(di, pc, insn, Rm, option, shift, Rn, Rt, "strh");
+ regoffset_h_common(di, pc, insn, Rm, option, shift, Rn, Rt, 0, "strh");
}
OP4FUNC(op_sttr, size, imm9, Rn, Rt)
Home |
Main Index |
Thread Index |
Old Index