N-archive/mikage-dev
1
0
Fork 0
mirror of https://github.com/mikage-emu/mikage-dev.git synced 2025-01-06 21:40:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Thumb: Fix missing upper register bits in CMP

Browse source
This commit is contained in:
Tony Wasserka 2024-04-01 22:42:26 +02:00
parent d76b0dd8ff
commit f859b5e94f
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/arm/thumb.cpp
View file

@ -1,5 +1,7 @@
#include "thumb.hpp"
#include <framework/exceptions.hpp>
namespace ARM {
DecodedThumbInstr DecodeThumb(ARM::ThumbInstr instr) {
@ -400,8 +402,19 @@ DecodedThumbInstr DecodeThumb(ARM::ThumbInstr instr) {
} else if (instr.opcode_upper8 == 0b0100'0101) {
// CMP (3) - Compare
ARM::ARMInstr arm_instr;
if (!instr.idx_rd_upperbit && !instr.idx_rm_upperbit) {
throw Mikage::Exceptions::Invalid("Unpredictable configuration");
}
if (instr.idx_rm_upperbit && instr.idx_rm == 7) {
throw Mikage::Exceptions::Invalid("Unpredictable configuration");
}
if (instr.idx_rd_upperbit && instr.idx_rd_low == 7) {
throw Mikage::Exceptions::NotImplemented("Cannot use PC for this instruction, yet");
}
arm_instr.raw = (0b111000010101ul << 20)
| (uint32_t { instr.idx_rd_upperbit } << 19)
| (uint32_t { instr.idx_rd_low } << 16)
| (uint32_t { instr.idx_rm_upperbit } << 3)
| instr.idx_rm;
return { arm_instr };
} else if (instr.opcode_upper5 == 0b11000) {