Skip to content

use copy_within instead of manual logic #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use copy_within instead of manual logic #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 13 additions & 37 deletions src/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2085,46 +2085,22 @@ fn CheckInputAmount(safe: bool, br: &bit_reader::BrotliBitReader, num: u32) -> b
fn memmove16(data: &mut [u8], u32off_dst: u32, u32off_src: u32) {
let off_dst = u32off_dst as usize;
let off_src = u32off_src as usize;
// data[off_dst + 15] = data[off_src + 15];
// data[off_dst + 14] = data[off_src + 14];
// data[off_dst + 13] = data[off_src + 13];
// data[off_dst + 12] = data[off_src + 12];
//
// data[off_dst + 11] = data[off_src + 11];
// data[off_dst + 10] = data[off_src + 10];
// data[off_dst + 9] = data[off_src + 9];
// data[off_dst + 8] = data[off_src + 8];
//
// data[off_dst + 7] = data[off_src + 7];
// data[off_dst + 6] = data[off_src + 6];
// data[off_dst + 5] = data[off_src + 5];
// data[off_dst + 4] = data[off_src + 4];
//
// data[off_dst + 3] = data[off_src + 3];
// data[off_dst + 2] = data[off_src + 2];
// data[off_dst + 1] = data[off_src + 1];
//
let mut local_array: [u8; 16] = fast_uninitialized!(16);
local_array.clone_from_slice(fast!((data)[off_src as usize ; off_src as usize + 16]));
fast_mut!((data)[off_dst as usize ; off_dst as usize + 16]).clone_from_slice(&local_array);


}


#[cfg(not(feature="unsafe"))]
fn memcpy_within_slice(data: &mut [u8], off_dst: usize, off_src: usize, size: usize) {
if off_dst > off_src {
let (src, dst) = data.split_at_mut(off_dst);
let src_slice = fast!((src)[off_src ; off_src + size]);
fast_mut!((dst)[0;size]).clone_from_slice(src_slice);
} else {
let (dst, src) = data.split_at_mut(off_src);
let src_slice = fast!((src)[0;size]);
fast_mut!((dst)[off_dst;off_dst + size]).clone_from_slice(src_slice);

#[cfg(not(feature = "unsafe"))]
data.copy_within(off_src..off_src + 16, off_dst);

#[cfg(feature = "unsafe")]
unsafe {
let ptr = data.as_mut_ptr();
core::ptr::copy(ptr.add(off_src), ptr.add(off_dst), 16);
}
}

#[cfg(not(feature = "unsafe"))]
fn memcpy_within_slice(data: &mut [u8], off_dst: usize, off_src: usize, size: usize) {
data.copy_within(off_src..off_src + size, off_dst);
}

#[cfg(feature="unsafe")]
fn memcpy_within_slice(data: &mut [u8], off_dst: usize, off_src: usize, size: usize) {
let ptr = data.as_mut_ptr();
Expand Down