citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #4447 from B3n30/cheats_comp_16bit 

Fix 16bit comparison operations
This commit is contained in:
Pengfei Zhu 2018-11-18 21:49:53 +08:00 committed by GitHub
parent d3b1b5f22c 2f3142e192
commit 607b384d86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/cheats/gateway_cheat.cpp
View File

@ -280,25 +280,25 @@ void GatewayCheat::Execute(Core::System& system) {
case CheatType::GreaterThan16WithMask: case CheatType::GreaterThan16WithMask:
// 7XXXXXXX ZZZZYYYY - Execute next block IF YYYY > ((not ZZZZ) AND half[XXXXXXX]) // 7XXXXXXX ZZZZYYYY - Execute next block IF YYYY > ((not ZZZZ) AND half[XXXXXXX])
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool { CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
return static_cast<u16>(line.value) > ~(static_cast<u16>(~line.value >> 16) & val); return static_cast<u16>(line.value) > (static_cast<u16>(~line.value >> 16) & val);
}); });
break; break;
case CheatType::LessThan16WithMask: case CheatType::LessThan16WithMask:
// 8XXXXXXX ZZZZYYYY - Execute next block IF YYYY < ((not ZZZZ) AND half[XXXXXXX]) // 8XXXXXXX ZZZZYYYY - Execute next block IF YYYY < ((not ZZZZ) AND half[XXXXXXX])
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool { CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
return static_cast<u16>(line.value) < ~(static_cast<u16>(~line.value >> 16) & val); return static_cast<u16>(line.value) < (static_cast<u16>(~line.value >> 16) & val);
}); });
break; break;
case CheatType::EqualTo16WithMask: case CheatType::EqualTo16WithMask:
// 9XXXXXXX ZZZZYYYY - Execute next block IF YYYY = ((not ZZZZ) AND half[XXXXXXX]) // 9XXXXXXX ZZZZYYYY - Execute next block IF YYYY = ((not ZZZZ) AND half[XXXXXXX])
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool { CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
return static_cast<u16>(line.value) == ~(static_cast<u16>(~line.value >> 16) & val); return static_cast<u16>(line.value) == (static_cast<u16>(~line.value >> 16) & val);
}); });
break; break;
case CheatType::NotEqualTo16WithMask: case CheatType::NotEqualTo16WithMask:
// AXXXXXXX ZZZZYYYY - Execute next block IF YYYY <> ((not ZZZZ) AND half[XXXXXXX]) // AXXXXXXX ZZZZYYYY - Execute next block IF YYYY <> ((not ZZZZ) AND half[XXXXXXX])
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool { CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
return static_cast<u16>(line.value) != ~(static_cast<u16>(~line.value >> 16) & val); return static_cast<u16>(line.value) != (static_cast<u16>(~line.value >> 16) & val);
}); });
break; break;
case CheatType::LoadOffset: case CheatType::LoadOffset: