Index: bus_space_asm_generic.S
===================================================================
RCS file: /cvsroot/src/sys/arch/aarch64/aarch64/bus_space_asm_generic.S,v
retrieving revision 1.1
diff -u -p -r1.1 bus_space_asm_generic.S
--- bus_space_asm_generic.S	1 Apr 2018 04:35:03 -0000	1.1
+++ bus_space_asm_generic.S	13 Jan 2020 13:16:40 -0000
@@ -334,7 +334,7 @@ ENTRY_NP(\funcname\()_bs_rr_4)
 	ldr	w8, [x1, x2]	/* value = *src */
 	subs	x4, x4, #1	/* count-- */
 	add	x2, x2, x9	/* src += delta */
-	str	w8, [x3], #2	/* *dst++ = value */
+	str	w8, [x3], #4	/* *dst++ = value */
 	b.ne	1b
 	ret
 #ifdef DIAGNOSTIC
@@ -363,7 +363,7 @@ ENTRY_NP(\funcname\()_bs_rr_8)
 	ldr	x8, [x1, x2]	/* value = *src */
 	subs	x4, x4, #1	/* count-- */
 	add	x2, x2, x9	/* src += delta */
-	str	x8, [x3], #2	/* *dst++ = value */
+	str	x8, [x3], #8	/* *dst++ = value */
 	b.ne	1b
 	ret
 #ifdef DIAGNOSTIC
@@ -423,7 +423,7 @@ ENTRY_NP(\funcname\()_bs_rr_4_swap)
 	subs	x4, x4, #1	/* count-- */
 	add	x2, x2, x9	/* src += delta */
 	rev	w8, w8
-	str	w8, [x3], #2	/* *dst++ = value */
+	str	w8, [x3], #4	/* *dst++ = value */
 	b.ne	1b
 	ret
 #ifdef DIAGNOSTIC
@@ -453,7 +453,7 @@ ENTRY_NP(\funcname\()_bs_rr_8_swap)
 	subs	x4, x4, #1	/* count-- */
 	add	x2, x2, x9	/* src += delta */
 	rev	x8, x8
-	str	x8, [x3], #2	/* *dst++ = value */
+	str	x8, [x3], #8	/* *dst++ = value */
 	b.ne	1b
 	ret
 #ifdef DIAGNOSTIC