6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-27 06:35:04 +00:00
Code Issues Projects Releases Wiki Activity

Switches casts around to avoid potential undefined behaviour of left-shifting signed numbers.

Browse Source
This commit is contained in:
Thomas Harte 2018-04-25 19:59:32 -04:00
parent 4c6dc597f4
commit c90e122eb2
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Storage/FileHolder.cpp
View File

@ -42,48 +42,48 @@ FileHolder::FileHolder(const std::string &file_name, FileMode ideal_mode)
} }
uint32_t FileHolder::get32le() { uint32_t FileHolder::get32le() {
uint32_t result = (uint32_t)std::fgetc(file_); uint32_t result = static_cast<uint32_t>(std::fgetc(file_));
result |= (uint32_t)(std::fgetc(file_) << 8); result |= static_cast<uint32_t>(std::fgetc(file_)) << 8;
result |= (uint32_t)(std::fgetc(file_) << 16); result |= static_cast<uint32_t>(std::fgetc(file_)) << 16;
result |= (uint32_t)(std::fgetc(file_) << 24); result |= static_cast<uint32_t>(std::fgetc(file_)) << 24;
return result; return result;
} }
uint32_t FileHolder::get32be() { uint32_t FileHolder::get32be() {
uint32_t result = (uint32_t)(std::fgetc(file_) << 24); uint32_t result = static_cast<uint32_t>(std::fgetc(file_)) << 24;
result |= (uint32_t)(std::fgetc(file_) << 16); result |= static_cast<uint32_t>(std::fgetc(file_)) << 16;
result |= (uint32_t)(std::fgetc(file_) << 8); result |= static_cast<uint32_t>(std::fgetc(file_)) << 8;
result |= (uint32_t)std::fgetc(file_); result |= static_cast<uint32_t>(std::fgetc(file_));
return result; return result;
} }
uint32_t FileHolder::get24le() { uint32_t FileHolder::get24le() {
uint32_t result = (uint32_t)std::fgetc(file_); uint32_t result = static_cast<uint32_t>(std::fgetc(file_));
result |= (uint32_t)(std::fgetc(file_) << 8); result |= static_cast<uint32_t>(std::fgetc(file_)) << 8;
result |= (uint32_t)(std::fgetc(file_) << 16); result |= static_cast<uint32_t>(std::fgetc(file_)) << 16;
return result; return result;
} }
uint32_t FileHolder::get24be() { uint32_t FileHolder::get24be() {
uint32_t result = (uint32_t)(std::fgetc(file_) << 16); uint32_t result = static_cast<uint32_t>(std::fgetc(file_)) << 16;
result |= (uint32_t)(std::fgetc(file_) << 8); result |= static_cast<uint32_t>(std::fgetc(file_)) << 8;
result |= (uint32_t)std::fgetc(file_); result |= static_cast<uint32_t>(std::fgetc(file_));
return result; return result;
} }
uint16_t FileHolder::get16le() { uint16_t FileHolder::get16le() {
uint16_t result = static_cast<uint16_t>(std::fgetc(file_)); uint16_t result = static_cast<uint16_t>(std::fgetc(file_));
result |= static_cast<uint16_t>(std::fgetc(file_) << 8); result |= static_cast<uint16_t>(static_cast<uint16_t>(std::fgetc(file_)) << 8);
return result; return result;
} }
uint16_t FileHolder::get16be() { uint16_t FileHolder::get16be() {
uint16_t result = static_cast<uint16_t>(std::fgetc(file_) << 8); uint16_t result = static_cast<uint16_t>(static_cast<uint16_t>(std::fgetc(file_)) << 8);
result |= static_cast<uint16_t>(std::fgetc(file_)); result |= static_cast<uint16_t>(std::fgetc(file_));
return result; return result;