6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1027 from TomHarte/GCCWarnings

Browse Source 
Resolve GCC compilation warnings.
This commit is contained in:
Thomas Harte 2022-04-27 20:00:38 -04:00 committed by GitHub
commit 872b941b20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InstructionSets/M68k/Decoder.cpp
View File

@ -1144,8 +1144,6 @@ Preinstruction Predecoder<model>::decode6(uint16_t instruction) {
template <Model model>
Preinstruction Predecoder<model>::decode7(uint16_t instruction) {
using Op = Operation;
// 4-134 (p238)
if(!(instruction & 0x100)) {
Decode(MOVEQ);

2
InstructionSets/x86/Decoder.cpp
View File

@ -849,7 +849,7 @@ std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(con
default: assert(false);
}
if(expects_sib && (source_ == Source::Indirect | destination_ == Source::Indirect)) {
if(expects_sib && (source_ == Source::Indirect || destination_ == Source::Indirect)) {
phase_ = Phase::ScaleIndexBase;
} else {
phase_ = (displacement_size_ != DataSize::None || operand_size_ != DataSize::None) ? Phase::DisplacementOrOperand : Phase::ReadyToPost;