[src/trunk]: src/sys/arch/arm/arm Fix test for SMI_IMB{, range} that was broke...

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

details:   https://anonhg.NetBSD.org/src/rev/6d75eb29592b
branches:  trunk
changeset: 358830:6d75eb29592b
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Jan 18 14:18:23 2018 +0000

description:
Fix test for SMI_IMB{,range} that was broken in 1.46

>From Ramakrishna Rao Desetti

diffstat:

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

diffs (30 lines):

diff -r 2a1d9ccd07c5 -r 6d75eb29592b sys/arch/arm/arm/syscall.c
--- a/sys/arch/arm/arm/syscall.c        Thu Jan 18 13:31:20 2018 +0000
+++ b/sys/arch/arm/arm/syscall.c        Thu Jan 18 14:18:23 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: syscall.c,v 1.62 2017/07/02 16:16:44 skrll Exp $       */
+/*     $NetBSD: syscall.c,v 1.63 2018/01/18 14:18:23 skrll Exp $       */
 
 /*-
  * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.62 2017/07/02 16:16:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.63 2018/01/18 14:18:23 skrll Exp $");
 
 #include <sys/cpu.h>
 #include <sys/device.h>
@@ -214,8 +214,9 @@
        /* test new official and old unofficial NetBSD ranges */
        if (__predict_false(os_mask != SWI_OS_NETBSD)
            && __predict_false(os_mask != 0)) {
-               if (os_mask == SWI_OS_ARM
-                   && (code == SWI_IMB || code == SWI_IMBrange)) {
+
+               const uint32_t swi = __SHIFTOUT(insn, __BITS(23,0));
+               if (swi == SWI_IMB || swi == SWI_IMBrange) {
                        userret(l);
                        return;
                }