From cb5763ed53794ad94086afeb2f55320f5e53913b Mon Sep 17 00:00:00 2001
From: Gwilym Kuiper <gw@ilym.me>
Date: Wed, 22 Jun 2022 22:00:26 +0100
Subject: [PATCH] Check sizes 0..80 in size with 0..10 offset for memset

---
 agb/src/agbabi/memset.s |  4 ++--
 agb/src/agbabi/mod.rs   | 35 ++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/agb/src/agbabi/memset.s b/agb/src/agbabi/memset.s
index 87ba689..1ce85f5 100644
--- a/agb/src/agbabi/memset.s
+++ b/agb/src/agbabi/memset.s
@@ -19,13 +19,13 @@
     .balign 4
 
     .section .iwram.__aeabi_memset, "ax", %progbits
-    .global __agbabi_memset
-__agbabi_memset:
     .global __aeabi_memclr
 __aeabi_memclr:
     mov     r2, #0
     b       .LskipShifts
 
+    .global __agbabi_memset
+__agbabi_memset:
     .global __aeabi_memset
 __aeabi_memset:
     mov     r2, r2, lsl #24
diff --git a/agb/src/agbabi/mod.rs b/agb/src/agbabi/mod.rs
index 375268b..b5d403f 100644
--- a/agb/src/agbabi/mod.rs
+++ b/agb/src/agbabi/mod.rs
@@ -5,33 +5,38 @@ mod test {
         use alloc::vec;
 
         extern "C" {
-            fn __aeabi_memset(dest: *mut u8, n: usize, v: u8);
+            fn __agbabi_memset(dest: *mut u8, n: usize, v: u8);
             fn __aeabi_memset4(dest: *mut u8, n: usize, v: u8);
         }
 
         #[test_case]
-        fn test_memset_with_different_sizes(_gba: &mut Gba) {
+        fn test_memset_with_different_sizes_and_offsets(_gba: &mut Gba) {
             let mut values = vec![0u8; 100];
 
-            let v = 0x12;
+            let stored_value = 0x12;
 
             for n in 0..80 {
-                values.fill(0xFF);
+                for o in 0..10 {
+                    values.fill(0xFF);
 
-                unsafe {
-                    __aeabi_memset4(values.as_mut_ptr().wrapping_offset(10), n, v);
-                }
+                    unsafe {
+                        __agbabi_memset(values.as_mut_ptr().add(o), n, stored_value);
+                    }
 
-                for (i, &v) in values.iter().enumerate().take(10) {
-                    assert_eq!(v, 0xFF, "underrun at {}", i);
-                }
+                    for (i, &v) in values.iter().enumerate().take(o) {
+                        assert_eq!(v, 0xFF, "underrun at {i}, offset {o}, size {n}");
+                    }
 
-                for i in 0..n {
-                    assert_eq!(values[10 + i], v, "incorrect value at {}", i + 10);
-                }
+                    for (i, &v) in values.iter().enumerate().skip(o).take(n) {
+                        assert_eq!(
+                            v, stored_value,
+                            "incorrect value at {i}, offset {o}, size {n}"
+                        );
+                    }
 
-                for (i, &v) in values.iter().enumerate().skip(10 + n) {
-                    assert_eq!(v, 0xFF, "overrun at {}", i);
+                    for (i, &v) in values.iter().enumerate().skip(o + n) {
+                        assert_eq!(v, 0xFF, "overrun at {i}, offset {o}, size {n}");
+                    }
                 }
             }
         }