 @@ -1,14 +1,14 @@
-/*	$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>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/bitops.h>
 #include <arch/aarch64/aarch64/disasm.h>
 #ifndef _KERNEL
 #include <stdio.h>
 #include <stdbool.h>
 #endif
 #define PRINTF		di->di_printf
 @@ -909,53 +909,53 @@ regoffset_b_common(const disasm_interfac
 		    op,
 		    ZREGNAME(0, Rt),
 		    SREGNAME(1, Rn),
 		    ZREGNAME(r, Rm),
 		    SHIFTOP8(option,
 		        "", "", "uxtw", "lsl", "", "", "sxtw", "sxtx"),
 );
+	}
+}
 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;
 	if ((r = regoffset_option_to_r(option)) < 0) {
 		UNDEFINED(pc, insn, "illegal option");
 		return;
+	}
 	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,
 		        "", "", "uxtw", "lsl", "", "", "sxtw", "sxtx"));
 	} 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,
 		        "", "", "uxtw", "lsl", "", "", "sxtw", "sxtx"),
 		    (u_int)shift);
+	}
+}
 static void
 regoffset_w_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)
+{
 @@ -2020,27 +2020,27 @@ OP3FUNC(op_ldrh_immunsign, imm12, Rn, Rt
 		PRINTF("ldrh\t%s, [%s]\n",
 		    ZREGNAME(0, Rt),
 		    SREGNAME(1, Rn));
 	} else {
 		PRINTF("ldrh\t%s, [%s,#%"PRId64"]\n",
 		    ZREGNAME(0, Rt),
 		    SREGNAME(1, Rn),
 		    ZeroExtend(12, imm12, 2));
+	}
+}
 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)
+{
 	PRINTF("ldrsb\t%s, [%s],#%"PRId64"\n",
 	    ZREGNAME((opc ^ 1), Rt),
 	    SREGNAME(1, Rn),
 	    SignExtend(9, imm9, 1));
+}
 OP4FUNC(op_ldrsb_immpreidx, opc, imm9, Rn, Rt)
+{
 	PRINTF("ldrsb\t%s, [%s,#%"PRId64"]!\n",
 @@ -2090,27 +2090,28 @@ OP4FUNC(op_ldrsh_immunsign, opc, imm12,
 		PRINTF("ldrsh\t%s, [%s]\n",
 		    ZREGNAME((opc ^ 1), Rt),
 		    SREGNAME(1, Rn));
 	} else {
 		PRINTF("ldrsh\t%s, [%s,#%"PRId64"]\n",
 		    ZREGNAME((opc ^ 1), Rt),
 		    SREGNAME(1, Rn),
 		    ZeroExtend(12, imm12, 2));
+	}
+}
 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)
+{
 	PRINTF("ldrsw\t%s, [%s],#%"PRId64"\n",
 	    ZREGNAME(1, Rt),
 	    SREGNAME(1, Rn),
 	    SignExtend(9, imm9, 1));
+}
 OP3FUNC(op_ldrsw_immpreidx, imm9, Rn, Rt)
+{
 	PRINTF("ldrsw\t%s, [%s,#%"PRId64"]!\n",
 @@ -3006,27 +3007,27 @@ OP3FUNC(op_strh_immunsign, imm12, Rn, Rt
 		PRINTF("strh\t%s, [%s]\n",
 		    ZREGNAME(0, Rt),
 		    SREGNAME(1, Rn));
 	} else {
 		PRINTF("strh\t%s, [%s,#%"PRId64"]\n",
 		    ZREGNAME(0, Rt),
 		    SREGNAME(1, Rn),
 		    ZeroExtend(12, imm12, 2));
+	}
+}
 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)
+{
 	if (imm9 == 0) {
 		PRINTF("sttr\t%s, [%s]\n",
 		    ZREGNAME(size, Rt),
 		    SREGNAME(1, Rn));
 	} else {
 		PRINTF("sttr\t%s, [%s,#%"PRId64"]\n",
 		    ZREGNAME(size, Rt),
 		    SREGNAME(1, Rn),
 		    SignExtend(9, imm9, 1));