D39334.id119639.diff
No OneTemporary
Actions

Size

803 B

Referenced Files

None

Subscribers

None

D39334.id119639.diff
View Options

	diff --git a/sys/arm64/arm64/disassem.c b/sys/arm64/arm64/disassem.c
	--- a/sys/arm64/arm64/disassem.c
	+++ b/sys/arm64/arm64/disassem.c
	@@ -483,9 +483,13 @@
	arm64_reg(sf, rt), arm64_reg(1, rn),
	arm64_reg(option & 1, rm));

	- /* Calculate amount, it's op(31:30) */
	- amount = (insn >> ARM_INSN_SIZE_OFFSET) &
	- ARM_INSN_SIZE_MASK;
	+ if (scale == 0)
	+ amount = 0;
	+ else {
	+ /* Calculate amount, it's op(31:30) */
	+ amount = (insn >> ARM_INSN_SIZE_OFFSET) &
	+ ARM_INSN_SIZE_MASK;
	+ }

	switch (option) {
	case 0x2:
	@@ -499,7 +503,7 @@
	di->di_printf(", sxtw #%d", amount);
	break;
	case 0x7:
	- di->di_printf(", sxts #%d", amount);
	+ di->di_printf(", sxtx #%d", amount);
	break;
	default:
	di->di_printf(", RSVD");