mirror of
https://github.com/melonDS-emu/melonDS.git
synced 2024-11-14 21:37:42 -07:00
simple thumb instructions (untested but probably right)
This commit is contained in:
parent
7c3108e20f
commit
13ae96b4e3
@ -631,8 +631,8 @@ void T_LDR_REG(ARM* cpu)
|
|||||||
u32 addr = cpu->R[(cpu->CurInstr >> 3) & 0x7] + cpu->R[(cpu->CurInstr >> 6) & 0x7];
|
u32 addr = cpu->R[(cpu->CurInstr >> 3) & 0x7] + cpu->R[(cpu->CurInstr >> 6) & 0x7];
|
||||||
|
|
||||||
u32 val;
|
u32 val;
|
||||||
cpu->DataRead32(addr, &val);
|
if (cpu->DataRead32(addr, &val))
|
||||||
cpu->R[cpu->CurInstr & 0x7] = ROR(val, 8*(addr&0x3));
|
cpu->R[cpu->CurInstr & 0x7] = ROR(val, 8*(addr&0x3));
|
||||||
|
|
||||||
cpu->AddCycles_CDI();
|
cpu->AddCycles_CDI();
|
||||||
}
|
}
|
||||||
@ -657,8 +657,8 @@ void T_STRH_REG(ARM* cpu)
|
|||||||
void T_LDRSB_REG(ARM* cpu)
|
void T_LDRSB_REG(ARM* cpu)
|
||||||
{
|
{
|
||||||
u32 addr = cpu->R[(cpu->CurInstr >> 3) & 0x7] + cpu->R[(cpu->CurInstr >> 6) & 0x7];
|
u32 addr = cpu->R[(cpu->CurInstr >> 3) & 0x7] + cpu->R[(cpu->CurInstr >> 6) & 0x7];
|
||||||
cpu->DataRead8(addr, &cpu->R[cpu->CurInstr & 0x7]);
|
if (cpu->DataRead8(addr, &cpu->R[cpu->CurInstr & 0x7]))
|
||||||
cpu->R[cpu->CurInstr & 0x7] = (s32)(s8)cpu->R[cpu->CurInstr & 0x7];
|
cpu->R[cpu->CurInstr & 0x7] = (s32)(s8)cpu->R[cpu->CurInstr & 0x7];
|
||||||
|
|
||||||
cpu->AddCycles_CDI();
|
cpu->AddCycles_CDI();
|
||||||
}
|
}
|
||||||
@ -674,8 +674,8 @@ void T_LDRH_REG(ARM* cpu)
|
|||||||
void T_LDRSH_REG(ARM* cpu)
|
void T_LDRSH_REG(ARM* cpu)
|
||||||
{
|
{
|
||||||
u32 addr = cpu->R[(cpu->CurInstr >> 3) & 0x7] + cpu->R[(cpu->CurInstr >> 6) & 0x7];
|
u32 addr = cpu->R[(cpu->CurInstr >> 3) & 0x7] + cpu->R[(cpu->CurInstr >> 6) & 0x7];
|
||||||
cpu->DataRead16(addr, &cpu->R[cpu->CurInstr & 0x7]);
|
if (cpu->DataRead16(addr, &cpu->R[cpu->CurInstr & 0x7]))
|
||||||
cpu->R[cpu->CurInstr & 0x7] = (s32)(s16)cpu->R[cpu->CurInstr & 0x7];
|
cpu->R[cpu->CurInstr & 0x7] = (s32)(s16)cpu->R[cpu->CurInstr & 0x7];
|
||||||
|
|
||||||
cpu->AddCycles_CDI();
|
cpu->AddCycles_CDI();
|
||||||
}
|
}
|
||||||
@ -696,8 +696,8 @@ void T_LDR_IMM(ARM* cpu)
|
|||||||
offset += cpu->R[(cpu->CurInstr >> 3) & 0x7];
|
offset += cpu->R[(cpu->CurInstr >> 3) & 0x7];
|
||||||
|
|
||||||
u32 val;
|
u32 val;
|
||||||
cpu->DataRead32(offset, &val);
|
if (cpu->DataRead32(offset, &val))
|
||||||
cpu->R[cpu->CurInstr & 0x7] = ROR(val, 8*(offset&0x3));
|
cpu->R[cpu->CurInstr & 0x7] = ROR(val, 8*(offset&0x3));
|
||||||
cpu->AddCycles_CDI();
|
cpu->AddCycles_CDI();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user