mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2024-11-05 19:51:45 +00:00
dmnt-cheat: extend StoreRegisterToAddressOpcode some more
This commit is contained in:
parent
83626923cf
commit
2a973b9e16
2 changed files with 34 additions and 4 deletions
|
@ -142,6 +142,14 @@ void DmntCheatVm::LogOpcode(const CheatVmOpcode *opcode) {
|
|||
case StoreRegisterOffsetType_Imm:
|
||||
this->LogToDebugFile("Rel Addr: %lx\n", opcode->str_register.rel_address);
|
||||
break;
|
||||
case StoreRegisterOffsetType_MemReg:
|
||||
this->LogToDebugFile("Mem Type: %x\n", opcode->str_register.mem_type);
|
||||
break;
|
||||
case StoreRegisterOffsetType_MemImm:
|
||||
case StoreRegisterOffsetType_MemImmReg:
|
||||
this->LogToDebugFile("Mem Type: %x\n", opcode->str_register.mem_type);
|
||||
this->LogToDebugFile("Rel Addr: %lx\n", opcode->str_register.rel_address);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case CheatVmOpcodeType_BeginRegisterConditionalBlock:
|
||||
|
@ -364,15 +372,16 @@ bool DmntCheatVm::DecodeNextOpcode(CheatVmOpcode *out) {
|
|||
break;
|
||||
case CheatVmOpcodeType_StoreRegisterToAddress:
|
||||
{
|
||||
/* ATSRIOra (aaaaaaaa) */
|
||||
/* ATSRIOxa (aaaaaaaa) */
|
||||
/* A = opcode 10 */
|
||||
/* T = bit width */
|
||||
/* S = src register index */
|
||||
/* R = address register index */
|
||||
/* I = 1 if increment address register, 0 if not increment address register */
|
||||
/* O = offset type, 0 = None, 1 = Register, 2 = Immediate */
|
||||
/* r = offset register (for offset type 1) */
|
||||
/* a = relative address (for offset type 2) */
|
||||
/* O = offset type, 0 = None, 1 = Register, 2 = Immediate, 3 = Memory Region,
|
||||
4 = Memory Region + Relative Address (ignore address register), 5 = Memory Region + Relative Address */
|
||||
/* x = offset register (for offset type 1), memory type (for offset type 3) */
|
||||
/* a = relative address (for offset type 2+3) */
|
||||
opcode.str_register.bit_width = (first_dword >> 24) & 0xF;
|
||||
opcode.str_register.str_reg_index = ((first_dword >> 20) & 0xF);
|
||||
opcode.str_register.addr_reg_index = ((first_dword >> 16) & 0xF);
|
||||
|
@ -387,6 +396,14 @@ bool DmntCheatVm::DecodeNextOpcode(CheatVmOpcode *out) {
|
|||
case StoreRegisterOffsetType_Imm:
|
||||
opcode.str_register.rel_address = (((u64)(first_dword & 0xF) << 32ul) | ((u64)GetNextDword()));
|
||||
break;
|
||||
case StoreRegisterOffsetType_MemReg:
|
||||
opcode.str_register.mem_type = (MemoryAccessType)((first_dword >> 4) & 0xF);
|
||||
break;
|
||||
case StoreRegisterOffsetType_MemImm:
|
||||
case StoreRegisterOffsetType_MemImmReg:
|
||||
opcode.str_register.mem_type = (MemoryAccessType)((first_dword >> 4) & 0xF);
|
||||
opcode.str_register.rel_address = (((u64)(first_dword & 0xF) << 32ul) | ((u64)GetNextDword()));
|
||||
break;
|
||||
default:
|
||||
opcode.str_register.ofs_type = StoreRegisterOffsetType_None;
|
||||
break;
|
||||
|
@ -825,6 +842,15 @@ void DmntCheatVm::Execute(const CheatProcessMetadata *metadata) {
|
|||
case StoreRegisterOffsetType_Imm:
|
||||
dst_address += cur_opcode.str_register.rel_address;
|
||||
break;
|
||||
case StoreRegisterOffsetType_MemReg:
|
||||
dst_address = GetCheatProcessAddress(metadata, cur_opcode.str_register.mem_type, this->registers[cur_opcode.str_register.addr_reg_index]);
|
||||
break;
|
||||
case StoreRegisterOffsetType_MemImm:
|
||||
dst_address = GetCheatProcessAddress(metadata, cur_opcode.str_register.mem_type, cur_opcode.str_register.rel_address);
|
||||
break;
|
||||
case StoreRegisterOffsetType_MemImmReg:
|
||||
dst_address = GetCheatProcessAddress(metadata, cur_opcode.str_register.mem_type, this->registers[cur_opcode.str_register.addr_reg_index] + cur_opcode.str_register.rel_address);
|
||||
break;
|
||||
}
|
||||
|
||||
/* Write value to memory. Write only on valid bitwidth. */
|
||||
|
|
|
@ -79,6 +79,9 @@ enum StoreRegisterOffsetType : u32 {
|
|||
StoreRegisterOffsetType_None = 0,
|
||||
StoreRegisterOffsetType_Reg = 1,
|
||||
StoreRegisterOffsetType_Imm = 2,
|
||||
StoreRegisterOffsetType_MemReg = 3,
|
||||
StoreRegisterOffsetType_MemImm = 4,
|
||||
StoreRegisterOffsetType_MemImmReg = 5,
|
||||
};
|
||||
|
||||
enum CompareRegisterValueType : u32 {
|
||||
|
@ -170,6 +173,7 @@ struct StoreRegisterToAddressOpcode {
|
|||
u32 addr_reg_index;
|
||||
bool increment_reg;
|
||||
StoreRegisterOffsetType ofs_type;
|
||||
MemoryAccessType mem_type;
|
||||
u32 ofs_reg_index;
|
||||
u64 rel_address;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue