alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 08:41:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Replace memcpy tests with a test which does all offsets for lots of sizes

Browse source 
Found a bug in agbabi with size 0, source offset 1, target offset 3
This commit is contained in:
Gwilym Kuiper 2022-06-22 23:31:23 +01:00
parent 0b1ed3a3dd
commit 6aa30462f9
2 changed files with 32 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
agb/src/agbabi/memcpy.s
View file

@ -22,6 +22,10 @@
__agbabi_memcpy: __agbabi_memcpy:
.global __aeabi_memcpy .global __aeabi_memcpy
__aeabi_memcpy: __aeabi_memcpy:
// Handle <= 2 byte copies byte-by-byte
cmp r2, #2
ble .Lcopy1
// Check pointer alignment // Check pointer alignment
eor r3, r1, r0 eor r3, r1, r0
// JoaoBapt carry & sign bit test // JoaoBapt carry & sign bit test
@ -30,9 +34,6 @@ __aeabi_memcpy:
bcs .Lcopy2 bcs .Lcopy2
.Lcopy4: .Lcopy4:
// Handle <= 2 byte copies byte-by-byte
cmp r2, #2
ble .Lcopy1
// Copy half and byte head // Copy half and byte head
rsb r3, r0, #4 rsb r3, r0, #4

134
agb/src/agbabi/mod.rs
View file

@ -145,115 +145,37 @@ mod test {
} }
#[test_case] #[test_case]
fn test_memcpy_bytes_with_different_sizes(_gba: &mut Gba) { fn test_all_of_memcpy(_gba: &mut Gba) {
let mut input = vec![0u8; 70]; let mut input = vec![0u8; 100];
let mut output = vec![0u8; 70]; let mut output = vec![0u8; 100];
for size in 0..68 { for size in 0..80 {
for (i, value) in input.iter_mut().enumerate() { for offset_input in 0..10 {
*value = i as u8 * 3; for offset_output in 0..10 {
} // initialise the buffers
for (i, value) in input.iter_mut().enumerate() {
*value = i as u8;
output[i] = 0;
}
output.fill(0); unsafe {
__agbabi_memcpy(
output.as_mut_ptr().add(offset_output),
input.as_ptr().add(offset_input),
size,
);
}
unsafe { for (i, &v) in output.iter().enumerate() {
__agbabi_memcpy(output.as_mut_ptr(), input.as_ptr(), size); if i < offset_output {
} assert_eq!(v, 0, "underrun, size: {size}, input offset: {offset_input}, output offset: {offset_output}, i: {i}");
} else if i < offset_output + size {
for i in 0..size { assert_eq!(v, (i - offset_output + offset_input) as u8, "incorrect copy, size: {size}, input offset: {offset_input}, output offset: {offset_output}, i: {i}");
assert_eq!(input[i], output[i], "Failed with size = {size} at i = {i}"); } else {
} assert_eq!(v, 0, "overrun, size: {size}, input offset: {offset_input}, output offset: {offset_output}, i: {i}");
}
for (i, value) in output.iter().enumerate().skip(size) { }
assert_eq!(*value, 0, "overrun with size = {size} at i = {i}"); }
}
}
}
#[test_case]
fn test_memcpy_bytes_output_offsetted_with_different_sizes(_gba: &mut Gba) {
let mut input = vec![0u8; 70];
let mut output = vec![0u8; 70];
for size in 0..60 {
for (i, value) in input.iter_mut().enumerate() {
*value = i as u8 * 3;
}
output.fill(0);
unsafe {
__agbabi_memcpy(output.as_mut_ptr().add(1), input.as_ptr(), size);
}
for i in 0..size {
assert_eq!(
input[i],
output[i + 1],
"Failed with size = {size} at i = {i}"
);
}
for (i, value) in output.iter().enumerate().skip(size + 1) {
assert_eq!(*value, 0, "overrun with size = {size} at i = {i}");
}
}
}
#[test_case]
fn test_memcpy_bytes_input_offsetted_with_different_sizes(_gba: &mut Gba) {
let mut input = vec![0u8; 70];
let mut output = vec![0u8; 70];
for size in 0..60 {
for (i, value) in input.iter_mut().enumerate() {
*value = i as u8 * 3;
}
output.fill(0);
unsafe {
__agbabi_memcpy(output.as_mut_ptr(), input.as_ptr().add(1), size);
}
for i in 0..size {
assert_eq!(
input[i + 1],
output[i],
"Failed with size = {size} at i = {i}"
);
}
for (i, value) in output.iter().enumerate().skip(size) {
assert_eq!(*value, 0, "overrun with size = {size} at i = {i}");
}
}
}
#[test_case]
fn test_memcpy_bytes_input_output_offsetted_with_different_sizes(_gba: &mut Gba) {
let mut input = vec![0u8; 70];
let mut output = vec![0u8; 70];
for size in 0..60 {
for (i, value) in input.iter_mut().enumerate() {
*value = i as u8 * 3;
}
output.fill(0);
unsafe {
__agbabi_memcpy(output.as_mut_ptr().add(1), input.as_ptr().add(1), size);
}
assert_eq!(output[0], 0);
for i in 1..size + 1 {
assert_eq!(input[i], output[i], "Failed with size = {size} at i = {i}");
}
for (i, value) in output.iter().enumerate().skip(size + 1) {
assert_eq!(*value, 0, "overrun with size = {size} at i = {i}");
} }
} }
} }