AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-06-06 06:33:37 +00:00
Code Issues Projects Releases Wiki Activity

IOStreams: Use 1U when shifting bitmasks

Browse Source 
Otherwise this is technically shifting a signed value, which can lead to
warnings. While we're at it, we can use UINT32_MAX instead of
0xFFFFFFFF to mean the same thing.
This commit is contained in:
Lioncash 2019-11-08 19:05:42 -05:00
parent 95a0b0e559
commit 9a728a38d6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/IOStreams.cpp
View File

@ -26,10 +26,10 @@ s32 CBitStreamReader::ReadEncoded(u32 bitCount) {
#endif #endif
u32 ret = 0; u32 ret = 0;
s32 shiftAmt = x20_bitOffset - s32(bitCount); const s32 shiftAmt = x20_bitOffset - s32(bitCount);
if (shiftAmt < 0) { if (shiftAmt < 0) {
/* OR in remaining bits of cached value */ /* OR in remaining bits of cached value */
u32 mask = bitCount == 32 ? 0xffffffff : ((1 << bitCount) - 1); u32 mask = bitCount == 32 ? UINT32_MAX : ((1U << bitCount) - 1);
ret |= (x1c_val << u32(-shiftAmt)) & mask; ret |= (x1c_val << u32(-shiftAmt)) & mask;
/* Load in exact number of bytes remaining */ /* Load in exact number of bytes remaining */
@ -43,11 +43,11 @@ s32 CBitStreamReader::ReadEncoded(u32 bitCount) {
x20_bitOffset = loadDiv.quot * 8 + shiftAmt; x20_bitOffset = loadDiv.quot * 8 + shiftAmt;
/* OR in next bits */ /* OR in next bits */
mask = (1 << u32(-shiftAmt)) - 1; mask = (1U << u32(-shiftAmt)) - 1;
ret |= (x1c_val >> x20_bitOffset) & mask; ret |= (x1c_val >> x20_bitOffset) & mask;
} else { } else {
/* OR in bits of cached value */ /* OR in bits of cached value */
u32 mask = bitCount == 32 ? 0xffffffff : ((1 << bitCount) - 1); const u32 mask = bitCount == 32 ? UINT32_MAX : ((1U << bitCount) - 1);
ret |= (x1c_val >> u32(shiftAmt)) & mask; ret |= (x1c_val >> u32(shiftAmt)) & mask;
/* New bit offset */ /* New bit offset */
@ -70,10 +70,10 @@ void CBitStreamWriter::WriteEncoded(u32 val, u32 bitCount) {
fmt::print(fmt(" {} {}\n"), position(), x18_bitOffset); fmt::print(fmt(" {} {}\n"), position(), x18_bitOffset);
#endif #endif
s32 shiftAmt = x18_bitOffset - s32(bitCount); const s32 shiftAmt = x18_bitOffset - s32(bitCount);
if (shiftAmt < 0) { if (shiftAmt < 0) {
/* OR remaining bits to cached value */ /* OR remaining bits to cached value */
u32 mask = (1 << x18_bitOffset) - 1; const u32 mask = (1U << x18_bitOffset) - 1;
x14_val |= (val >> u32(-shiftAmt)) & mask; x14_val |= (val >> u32(-shiftAmt)) & mask;
/* Write out 32-bits */ /* Write out 32-bits */
@ -85,7 +85,7 @@ void CBitStreamWriter::WriteEncoded(u32 val, u32 bitCount) {
x14_val = val << x18_bitOffset; x14_val = val << x18_bitOffset;
} else { } else {
/* OR bits to cached value */ /* OR bits to cached value */
u32 mask = bitCount == 32 ? 0xffffffff : ((1 << bitCount) - 1); const u32 mask = bitCount == 32 ? UINT32_MAX : ((1U << bitCount) - 1);
x14_val |= (val & mask) << u32(shiftAmt); x14_val |= (val & mask) << u32(shiftAmt);
/* New bit offset */ /* New bit offset */