user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CI, better memcmp tests

Browse source
This commit is contained in:
David Hoppenbrouwers 2022-05-28 00:09:02 +02:00
parent d6650678de
commit e7a8932e3b
No known key found for this signature in database
GPG key ID: A9156EA5E4B644FF
3 changed files with 15 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/compiler-builtins/src/mem/impls.rs
View file

@ -267,7 +267,7 @@ pub unsafe fn set_bytes(mut s: *mut u8, c: u8, mut n: usize) {
}
#[inline(always)]
pub unsafe fn compare_bytes(s1: *const u8, s2: *const u8, n: usize) {
pub unsafe fn compare_bytes(s1: *const u8, s2: *const u8, n: usize) -> i32 {
let mut i = 0;
while i < n {
let a = *s1.add(i);

6
library/compiler-builtins/src/mem/x86_64.rs
View file

@ -102,11 +102,7 @@ pub unsafe fn set_bytes(dest: *mut u8, c: u8, count: usize) {
}
#[inline(always)]
pub unsafe fn compare_bytes(
a: *const u8,
b: *const u8,
n: usize,
) -> i32 {
pub unsafe fn compare_bytes(a: *const u8, b: *const u8, n: usize) -> i32 {
unsafe fn cmp<T, U, F>(mut a: *const T, mut b: *const T, n: usize, f: F) -> i32
where
T: Clone + Copy + Eq,

55
library/compiler-builtins/testcrate/tests/mem.rs
View file

@ -116,55 +116,26 @@ fn memset_nonzero() {
#[test]
fn memcmp_eq() {
let arr1: [u8; 32] = [
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31,
];
let arr2: [u8; 32] = [
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31,
];
for i in 0..32 {
let arr1 @ arr2 = gen_arr::<256>();
for i in 0..256 {
unsafe {
assert_eq!(memcmp(arr1.as_ptr(), arr2.as_ptr(), i), 0);
assert_eq!(memcmp(arr2.as_ptr(), arr1.as_ptr(), i), 0);
assert_eq!(memcmp(arr1.0.as_ptr(), arr2.0.as_ptr(), i), 0);
assert_eq!(memcmp(arr2.0.as_ptr(), arr1.0.as_ptr(), i), 0);
}
}
}
#[test]
fn memcmp_ne() {
let arr1: [u8; 8] = [0, 1, 2, 3, 4, 5, 6, 7];
let arr2: [u8; 8] = [0, 1, 2, 3, 4, 5, 7, 7];
unsafe {
assert!(memcmp(arr1.as_ptr(), arr2.as_ptr(), 8) < 0);
assert!(memcmp(arr2.as_ptr(), arr1.as_ptr(), 8) > 0);
}
}
#[test]
fn memcmp_ne_16() {
let arr1: [u8; 16] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
let arr2: [u8; 16] = [0, 1, 2, 3, 4, 5, 7, 7, 8, 9, 10, 11, 12, 13, 14, 15];
unsafe {
assert!(memcmp(arr1.as_ptr(), arr2.as_ptr(), 16) < 0);
assert!(memcmp(arr2.as_ptr(), arr1.as_ptr(), 16) > 0);
}
}
#[test]
fn memcmp_ne_32() {
let arr1: [u8; 32] = [
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0,
];
let arr2: [u8; 32] = [
0, 1, 2, 3, 4, 5, 7, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0,
];
unsafe {
assert!(memcmp(arr1.as_ptr(), arr2.as_ptr(), 32) < 0);
assert!(memcmp(arr2.as_ptr(), arr1.as_ptr(), 32) > 0);
let arr1 @ arr2 = gen_arr::<256>();
for i in 0..256 {
let mut diff_arr = arr1;
diff_arr.0[i] = 127;
let expect = diff_arr.0[i].cmp(&arr2.0[i]);
for k in i + 1..256 {
let result = unsafe { memcmp(diff_arr.0.as_ptr(), arr2.0.as_ptr(), k) };
assert_eq!(expect, result.cmp(&0));
}
}
}