Skip to content

Commit 4e2dc77

Browse files
Rawkfolkertdev
Rawk
authored and
folkertdev
committed
Replace size_of::<T>() * 8 with T::BITS 
1 parent 17b10c3 commit 4e2dc77

4 files changed

Lines changed: 18 additions & 19 deletions

File tree

‎lib/legacy/zstd_v05.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -644,15 +644,15 @@ fn FSEv05_decompress_usingDTable_generic<const N: usize>(
644644
} else {
645645
FSEv05_decodeSymbol(&mut state1, &mut bitD) as core::ffi::c_int
646646
}) as u8;
647-
if (FSEv05_MAX_TABLELOG * 2 + 7) as size_t > size_of::<size_t>().wrapping_mul(8) {
647+
if FSEv05_MAX_TABLELOG * 2 + 7 > size_t::BITS as core::ffi::c_int {
648648
bitD.reload();
649649
}
650650
op[1] = (if fast != 0 {
651651
FSEv05_decodeSymbolFast(&mut state2, &mut bitD) as core::ffi::c_int
652652
} else {
653653
FSEv05_decodeSymbol(&mut state2, &mut bitD) as core::ffi::c_int
654654
}) as u8;
655-
if (FSEv05_MAX_TABLELOG * 4 + 7) as size_t > size_of::<size_t>().wrapping_mul(8)
655+
if FSEv05_MAX_TABLELOG * 4 + 7 > size_t::BITS as core::ffi::c_int
656656
&& bitD.reload() > StreamStatus::Unfinished
657657
{
658658
op = &mut op[2..];
@@ -663,7 +663,7 @@ fn FSEv05_decompress_usingDTable_generic<const N: usize>(
663663
} else {
664664
FSEv05_decodeSymbol(&mut state1, &mut bitD) as core::ffi::c_int
665665
}) as u8;
666-
if (FSEv05_MAX_TABLELOG * 2 + 7) as size_t > size_of::<size_t>().wrapping_mul(8) {
666+
if FSEv05_MAX_TABLELOG * 2 + 7 > size_t::BITS as core::ffi::c_int {
667667
bitD.reload();
668668
}
669669
op[3] = (if fast != 0 {

‎lib/legacy/zstd_v06.rs‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -299,14 +299,14 @@ unsafe fn BITv06_initDStream(
299299

300300
#[inline]
301301
unsafe fn BITv06_lookBits(bitD: *const BITv06_DStream_t, nbBits: u32) -> size_t {
302-
let bitMask = size_of::<size_t>().wrapping_mul(8).wrapping_sub(1) as u32;
302+
let bitMask = size_t::BITS - 1;
303303
(*bitD).bitContainer << ((*bitD).bitsConsumed & bitMask)
304304
>> 1
305305
>> (bitMask.wrapping_sub(nbBits) & bitMask)
306306
}
307307
#[inline]
308308
unsafe fn BITv06_lookBitsFast(bitD: *const BITv06_DStream_t, nbBits: u32) -> size_t {
309-
let bitMask = size_of::<size_t>().wrapping_mul(8).wrapping_sub(1) as u32;
309+
let bitMask = size_t::BITS - 1;
310310
(*bitD).bitContainer << ((*bitD).bitsConsumed & bitMask)
311311
>> (bitMask.wrapping_add(1).wrapping_sub(nbBits) & bitMask)
312312
}
@@ -328,7 +328,7 @@ unsafe fn BITv06_readBitsFast(bitD: *mut BITv06_DStream_t, nbBits: u32) -> size_
328328
}
329329
#[inline]
330330
unsafe fn BITv06_reloadDStream(bitD: *mut BITv06_DStream_t) -> BITv06_DStream_status {
331-
if (*bitD).bitsConsumed as size_t > size_of::<size_t>().wrapping_mul(8) {
331+
if (*bitD).bitsConsumed > size_t::BITS {
332332
return BITv06_DStream_overflow;
333333
}
334334
if (*bitD).ptr >= ((*bitD).start).add(size_of::<size_t>()) {
@@ -338,7 +338,7 @@ unsafe fn BITv06_reloadDStream(bitD: *mut BITv06_DStream_t) -> BITv06_DStream_st
338338
return BITv06_DStream_unfinished;
339339
}
340340
if (*bitD).ptr == (*bitD).start {
341-
if ((*bitD).bitsConsumed as size_t) < size_of::<size_t>().wrapping_mul(8) {
341+
if (*bitD).bitsConsumed < size_t::BITS {
342342
return BITv06_DStream_endOfBuffer;
343343
}
344344
return BITv06_DStream_completed;
@@ -356,8 +356,7 @@ unsafe fn BITv06_reloadDStream(bitD: *mut BITv06_DStream_t) -> BITv06_DStream_st
356356
}
357357
#[inline]
358358
unsafe fn BITv06_endOfDStream(DStream: *const BITv06_DStream_t) -> core::ffi::c_uint {
359-
((*DStream).ptr == (*DStream).start
360-
&& (*DStream).bitsConsumed as size_t == size_of::<size_t>().wrapping_mul(8))
359+
((*DStream).ptr == (*DStream).start && (*DStream).bitsConsumed == size_t::BITS)
361360
as core::ffi::c_int as core::ffi::c_uint
362361
}
363362
#[inline]
@@ -677,15 +676,15 @@ unsafe fn FSEv06_decompress_usingDTable_generic(
677676
} else {
678677
FSEv06_decodeSymbol(&mut state1, &mut bitD) as core::ffi::c_int
679678
}) as u8;
680-
if (FSEv06_MAX_TABLELOG * 2 + 7) as size_t > size_of::<size_t>().wrapping_mul(8) {
679+
if FSEv06_MAX_TABLELOG * 2 + 7 > size_t::BITS as core::ffi::c_int {
681680
BITv06_reloadDStream(&mut bitD);
682681
}
683682
*op.add(1) = (if fast != 0 {
684683
FSEv06_decodeSymbolFast(&mut state2, &mut bitD) as core::ffi::c_int
685684
} else {
686685
FSEv06_decodeSymbol(&mut state2, &mut bitD) as core::ffi::c_int
687686
}) as u8;
688-
if (FSEv06_MAX_TABLELOG * 4 + 7) as size_t > size_of::<size_t>().wrapping_mul(8)
687+
if FSEv06_MAX_TABLELOG * 4 + 7 > size_t::BITS as core::ffi::c_int
689688
&& BITv06_reloadDStream(&mut bitD) as core::ffi::c_uint
690689
> BITv06_DStream_unfinished as core::ffi::c_int as core::ffi::c_uint
691690
{
@@ -697,7 +696,7 @@ unsafe fn FSEv06_decompress_usingDTable_generic(
697696
} else {
698697
FSEv06_decodeSymbol(&mut state1, &mut bitD) as core::ffi::c_int
699698
}) as u8;
700-
if (FSEv06_MAX_TABLELOG * 2 + 7) as size_t > size_of::<size_t>().wrapping_mul(8) {
699+
if FSEv06_MAX_TABLELOG * 2 + 7 > size_t::BITS as std::ffi::c_int {
701700
BITv06_reloadDStream(&mut bitD);
702701
}
703702
*op.add(3) = (if fast != 0 {
@@ -1561,10 +1560,10 @@ unsafe fn HUFv06_decodeLastSymbolX4(
15611560
memcpy(op, dt.add(val) as *const core::ffi::c_void, 1);
15621561
if (*dt.add(val)).length as core::ffi::c_int == 1 {
15631562
BITv06_skipBits(DStream, (*dt.add(val)).nbBits as u32);
1564-
} else if ((*DStream).bitsConsumed as size_t) < size_of::<size_t>().wrapping_mul(8) {
1563+
} else if (*DStream).bitsConsumed < size_t::BITS {
15651564
BITv06_skipBits(DStream, (*dt.add(val)).nbBits as u32);
1566-
if (*DStream).bitsConsumed as size_t > size_of::<size_t>().wrapping_mul(8) {
1567-
(*DStream).bitsConsumed = size_of::<size_t>().wrapping_mul(8) as core::ffi::c_uint;
1565+
if (*DStream).bitsConsumed > size_t::BITS {
1566+
(*DStream).bitsConsumed = size_t::BITS;
15681567
}
15691568
}
15701569
1

‎programs/benchzstd.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ pub const BMK_RUNTEST_DEFAULT_MS: core::ffi::c_int = 1000;
9898
static maxMemory: usize = if size_of::<size_t>() == 4 {
9999
2 * (1 << 30) - 64 * (1 << 20)
100100
} else {
101-
1usize << (size_of::<usize>() * 8 - 31)
101+
1usize << (usize::BITS - 31)
102102
};
103103
pub const DEBUG: core::ffi::c_int = 0;
104104
unsafe fn uintSize(mut value: core::ffi::c_uint) -> size_t {

‎programs/zstdcli.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ unsafe fn usageAdvanced(programName: *const core::ffi::c_char) {
329329
stdout,
330330
b"*** %s (%i-bit) %s, by %s ***\n\0" as *const u8 as *const core::ffi::c_char,
331331
b"Zstandard CLI\0" as *const u8 as *const core::ffi::c_char,
332-
size_of::<size_t>().wrapping_mul(8) as core::ffi::c_int,
332+
size_t::BITS as core::ffi::c_int,
333333
b"v1.5.8\0" as *const u8 as *const core::ffi::c_char,
334334
b"Yann Collet\0" as *const u8 as *const core::ffi::c_char,
335335
);
@@ -1403,7 +1403,7 @@ unsafe fn printVersion() {
14031403
stdout,
14041404
b"*** %s (%i-bit) %s, by %s ***\n\0" as *const u8 as *const core::ffi::c_char,
14051405
b"Zstandard CLI\0" as *const u8 as *const core::ffi::c_char,
1406-
size_of::<size_t>().wrapping_mul(8) as core::ffi::c_int,
1406+
size_t::BITS as core::ffi::c_int,
14071407
b"v1.5.8\0" as *const u8 as *const core::ffi::c_char,
14081408
b"Yann Collet\0" as *const u8 as *const core::ffi::c_char,
14091409
);
@@ -2794,7 +2794,7 @@ unsafe fn main_0(
27942794
stderr,
27952795
b"*** %s (%i-bit) %s, by %s ***\n\0" as *const u8 as *const core::ffi::c_char,
27962796
b"Zstandard CLI\0" as *const u8 as *const core::ffi::c_char,
2797-
size_of::<size_t>().wrapping_mul(8) as core::ffi::c_int,
2797+
size_t::BITS as core::ffi::c_int,
27982798
b"v1.5.8\0" as *const u8 as *const core::ffi::c_char,
27992799
b"Yann Collet\0" as *const u8 as *const core::ffi::c_char,
28002800
);

0 commit comments

Comments
 (0)