natto1784/matar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu/arm: fix MSR by changing modes

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2024-06-13 03:55:08 +05:30
parent c4a9c5ee5e
commit eaa4abcb90
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cpu/arm/exec.cc
View File

@@ -283,7 +283,7 @@ Instruction::exec(Cpu& cpu) {
uint32_t address = cpu.gpr[data.rn]; uint32_t address = cpu.gpr[data.rn];
Mode mode = cpu.cpsr.mode(); Mode mode = cpu.cpsr.mode();
int8_t i = 0; int8_t i = 0;
pc_error(data.rn); pc_error(data.rn);
@@ -377,6 +377,11 @@ Instruction::exec(Cpu& cpu) {
pc_error(data.operand); pc_error(data.operand);
if (cpu.cpsr.mode() != Mode::User) { if (cpu.cpsr.mode() != Mode::User) {
if (!data.spsr) {
Psr tmp = Psr(cpu.gpr[data.operand]);
cpu.chg_mode(tmp.mode());
}
psr.set_all(cpu.gpr[data.operand]); psr.set_all(cpu.gpr[data.operand]);
} }
break; break;