doylet/Dqn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dqn: Simplify Hex->U64 and also remove UB right shift

Browse Source
This commit is contained in:
doyle 2023-08-29 22:44:43 +10:00
parent d756a26b42
commit 85c0fdf5fd
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dqn_helpers.cpp
View File

@ -229,19 +229,15 @@ DQN_API uint64_t Dqn_Bin_HexBufferToU64(char const *hex, Dqn_usize size)
DQN_ASSERT(DQN_CAST(Dqn_usize)(trim_size * 4 / 8) /*maximum amount of bytes represented in the hex string*/ <= sizeof(uint64_t)); DQN_ASSERT(DQN_CAST(Dqn_usize)(trim_size * 4 / 8) /*maximum amount of bytes represented in the hex string*/ <= sizeof(uint64_t));
uint64_t result = 0; uint64_t result = 0;
Dqn_usize bits_written = 0; Dqn_usize max_size = DQN_MIN(size, 8 /*bytes*/ * 2 /*hex chars per byte*/);
Dqn_usize max_size = DQN_MIN(size, 8 /*bytes*/ * 2 /*hex chars per byte*/); for (Dqn_usize hex_index = 0; hex_index < max_size; hex_index++) {
for (Dqn_usize hex_index = 0; hex_index < max_size; hex_index++, bits_written += 4) {
char ch = trim_hex[hex_index]; char ch = trim_hex[hex_index];
if (!Dqn_Char_IsHex(ch)) if (!Dqn_Char_IsHex(ch))
break; break;
uint8_t val = Dqn_Char_HexToU8(ch); uint8_t val = Dqn_Char_HexToU8(ch);
Dqn_usize bit_shift = 60 - bits_written; result = (result << 4) | val;
result |= (DQN_CAST(uint64_t)val << bit_shift);
} }
result >>= (64 - bits_written); // Shift the remainder digits to the end.
return result; return result;
} }