From 8fe14ca1da2485d5e54d5989ed738c89eeb50e04 Mon Sep 17 00:00:00 2001
From: "Peter A. Bigot" <pabigot@users.sourceforge.net>
Date: Sat, 2 Jun 2012 16:55:45 -0500
Subject: [PATCH] Correct counts in disassembled rxxm/pushm/popm

---
 util/dis.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/dis.c b/util/dis.c
index edf5541..0214694 100644
--- a/util/dis.c
+++ b/util/dis.c
@@ -85,7 +85,7 @@ static int decode_00xx(const uint8_t *code, address_t len,
 		insn->dst_mode = MSP430_AMODE_REGISTER;
 		insn->dst_reg = op & 0xf;
 		insn->src_mode = MSP430_AMODE_IMMEDIATE;
-		insn->src_addr = (op >> 10) & 3;
+		insn->src_addr = 1 + ((op >> 10) & 3);
 		insn->dsize = (op & 0x0010) ?
 			MSP430_DSIZE_WORD : MSP430_DSIZE_AWORD;
 		return 2;
@@ -227,7 +227,7 @@ static int decode_14xx(const uint8_t *code,
 	insn->itype = MSP430_ITYPE_DOUBLE;
 	insn->op = op & 0xfe00;
 	insn->dst_mode = MSP430_AMODE_REGISTER;
-	insn->dst_reg = op & 0xf;
+	insn->dst_reg = 1 + (op & 0xf);
 	insn->src_mode = MSP430_AMODE_IMMEDIATE;
 	insn->src_addr = (op >> 4) & 0xf;
 	insn->dsize = (op & 0x0100) ?