[src/netbsd-10]: src/sys/arch/aarch64/aarch64 Pull up following revision(s) (...

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

details:   https://anonhg.NetBSD.org/src/rev/9f5e4f188f27
branches:  netbsd-10
changeset: 373011:9f5e4f188f27
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 12 12:11:28 2023 +0000

description:
Pull up following revision(s) (requested by ryo in ticket #44):

        sys/arch/aarch64/aarch64/bus_space_asm_generic.S: revision 1.6

fixed a bug that bus_space_read_region_{2,4,8}_swap() accesses wrong address.

diffstat:

 sys/arch/aarch64/aarch64/bus_space_asm_generic.S |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 9657afea978a -r 9f5e4f188f27 sys/arch/aarch64/aarch64/bus_space_asm_generic.S
--- a/sys/arch/aarch64/aarch64/bus_space_asm_generic.S  Thu Jan 12 12:09:18 2023 +0000
+++ b/sys/arch/aarch64/aarch64/bus_space_asm_generic.S  Thu Jan 12 12:11:28 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space_asm_generic.S,v 1.5 2020/11/12 11:28:39 jmcneill Exp $       */
+/*     $NetBSD: bus_space_asm_generic.S,v 1.5.18.1 2023/01/12 12:11:28 martin Exp $    */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -29,7 +29,7 @@
 #include <aarch64/asm.h>
 #include "assym.h"
 
-RCSID("$NetBSD: bus_space_asm_generic.S,v 1.5 2020/11/12 11:28:39 jmcneill Exp $")
+RCSID("$NetBSD: bus_space_asm_generic.S,v 1.5.18.1 2023/01/12 12:11:28 martin Exp $")
 
 .macro generate_bsfunc funcname, dsbop
 /* uint8_t {funcname}_bs_r_1(x0:tag, x1:addr, x2:offset) */
@@ -389,7 +389,7 @@
 0:
        lsl     x2, x2, x8      /* offset <<= tag->bs_stride */
 1:
-       ldrh    w8, [x1, x9]    /* value = *src */
+       ldrh    w8, [x1, x2]    /* value = *src */
        subs    x4, x4, #1      /* count-- */
        add     x2, x2, x9      /* src += delta */
        rev16   w8, w8
@@ -419,7 +419,7 @@
 0:
        lsl     x2, x2, x8      /* offset <<= tag->bs_stride */
 1:
-       ldr     w8, [x1, x9]    /* value = *src */
+       ldr     w8, [x1, x2]    /* value = *src */
        subs    x4, x4, #1      /* count-- */
        add     x2, x2, x9      /* src += delta */
        rev     w8, w8
@@ -449,7 +449,7 @@
 0:
        lsl     x2, x2, x8      /* offset <<= tag->bs_stride */
 1:
-       ldr     x8, [x1, x9]    /* value = *src */
+       ldr     x8, [x1, x2]    /* value = *src */
        subs    x4, x4, #1      /* count-- */
        add     x2, x2, x9      /* src += delta */
        rev     x8, x8