[src/netbsd-6]: src/sys/arch/arm/arm Pull up following revision(s) (requested...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4378f8be7e1b
branches:  netbsd-6
changeset: 776859:4378f8be7e1b
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 02 13:37:35 2015 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #1225):
        sys/arch/arm/arm/disassem.c: revision 1.26
The mode synonyms are different for stm and ldm - handle this.
PR/49520: arm/disassem.c doesn't use proper address mode name for loads

diffstat:

 sys/arch/arm/arm/disassem.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r ed07c3af7784 -r 4378f8be7e1b sys/arch/arm/arm/disassem.c
--- a/sys/arch/arm/arm/disassem.c       Wed Dec 31 05:56:29 2014 +0000
+++ b/sys/arch/arm/arm/disassem.c       Fri Jan 02 13:37:35 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disassem.c,v 1.18 2008/04/27 18:58:43 matt Exp $       */
+/*     $NetBSD: disassem.c,v 1.18.40.1 2015/01/02 13:37:35 martin Exp $        */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe.
@@ -49,7 +49,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.18 2008/04/27 18:58:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.18.40.1 2015/01/02 13:37:35 martin Exp $");
 
 #include <sys/systm.h>
 #include <arch/arm/arm/disassem.h>
@@ -233,7 +233,8 @@
 };
 
 static char const insn_stack_block_transfers[][4] = {
-       "ed", "ea", "fd", "fa"
+       "ed", "ea", "fd", "fa", /* stm */
+       "fa", "fd", "ea", "ed", /* ldm */
 };
 
 static char const op_shifts[][4] = {
@@ -255,7 +256,7 @@
 
 #define insn_condition(x)      arm32_insn_conditions[(x >> 28) & 0x0f]
 #define insn_blktrans(x)       insn_block_transfers[(x >> 23) & 3]
-#define insn_stkblktrans(x)    insn_stack_block_transfers[(x >> 23) & 3]
+#define insn_stkblktrans(x)    insn_stack_block_transfers[((x >> (20 - 2)) & 4)|((x >> 23) & 3)]
 #define op2_shift(x)           op_shifts[(x >> 5) & 3]
 #define insn_fparnd(x)         insn_fpa_rounding[(x >> 5) & 0x03]
 #define insn_fpaprec(x)                insn_fpa_precision[(((x >> 18) & 2)|(x >> 7)) & 1]