ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The AR will skip over any codes that causes any AR error and continue executing the working ones. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@967 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox 2008-10-26 07:10:11 +00:00
parent e02aeebf66
commit c1e94a0852
2 changed files with 87 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
Source/Core/Core/Src/ActionReplay.cpp
View File

@ -46,7 +46,6 @@ static u8 type;
static u8 zcode; static u8 zcode;
static bool doFillNSlide = false; static bool doFillNSlide = false;
static bool doMemoryCopy = false; static bool doMemoryCopy = false;
static bool fail = false;
static u32 addr_last; static u32 addr_last;
static u32 val_last; static u32 val_last;
static std::vector<AREntry>::const_iterator iter; static std::vector<AREntry>::const_iterator iter;
@ -56,13 +55,13 @@ static ARCode code;
} // namespace } // namespace
void DoARSubtype_RamWriteAndFill(); bool DoARSubtype_RamWriteAndFill();
void DoARSubtype_WriteToPointer(); bool DoARSubtype_WriteToPointer();
void DoARSubtype_AddCode(); bool DoARSubtype_AddCode();
void DoARSubtype_MasterCodeAndWriteToCCXXXXXX(); bool DoARSubtype_MasterCodeAndWriteToCCXXXXXX();
void DoARSubtype_Other(); bool DoARSubtype_Other();
void DoARZeroCode_FillAndSlide(); bool DoARZeroCode_FillAndSlide();
void DoARZeroCode_MemoryCopy(); bool DoARZeroCode_MemoryCopy();
// Parses the Action Replay section of a game ini file. // Parses the Action Replay section of a game ini file.
void LoadActionReplayCodes(IniFile &ini) void LoadActionReplayCodes(IniFile &ini)
@ -128,10 +127,11 @@ void LoadActionReplayCodes(IniFile &ini)
void ActionReplayRunAllActive() void ActionReplayRunAllActive()
{ {
if (Core::GetStartupParameter().bEnableCheats && !fail) { if (Core::GetStartupParameter().bEnableCheats) {
for (std::vector<ARCode>::const_iterator iter = arCodes.begin(); iter != arCodes.end(); ++iter) for (std::vector<ARCode>::iterator iter = arCodes.begin(); iter != arCodes.end(); ++iter)
if (iter->active) if (iter->active)
RunActionReplayCode(*iter, false); if(!RunActionReplayCode(*iter))
iter->active = false;
} }
} }
@ -140,12 +140,12 @@ void ActionReplayRunAllActive()
// For example, some authors have created codes that add features to AR. Hacks for popular ones can be added here, // For example, some authors have created codes that add features to AR. Hacks for popular ones can be added here,
// but the problem is not generally solvable. // but the problem is not generally solvable.
// TODO: what is "nowIsBootup" for? // TODO: what is "nowIsBootup" for?
void RunActionReplayCode(const ARCode &arcode, bool nowIsBootup) { bool RunActionReplayCode(const ARCode &arcode) {
code = arcode; code = arcode;
for (iter = code.ops.begin(); iter != code.ops.end(); ++iter) for (iter = code.ops.begin(); iter != code.ops.end(); ++iter)
{ {
cmd = iter->cmd_addr >> 24; cmd = iter->cmd_addr >> 24; // AR command
addr = iter->cmd_addr; addr = iter->cmd_addr; // AR command with address offset
data = iter->value; data = iter->value;
subtype = ((addr >> 30) & 0x03); subtype = ((addr >> 30) & 0x03);
w = (cmd & 0x07); w = (cmd & 0x07);
@ -154,21 +154,22 @@ void RunActionReplayCode(const ARCode &arcode, bool nowIsBootup) {
// Do Fill & Slide // Do Fill & Slide
if (doFillNSlide) { if (doFillNSlide) {
DoARZeroCode_FillAndSlide(); if (!DoARZeroCode_FillAndSlide())
return false;
continue; continue;
} }
// Memory Copy // Memory Copy
if (doMemoryCopy) { if (doMemoryCopy) {
DoARZeroCode_MemoryCopy(); if (!DoARZeroCode_MemoryCopy())
return false;
continue; continue;
} }
// ActionReplay program self modification codes // ActionReplay program self modification codes
if (addr >= 0x00002000 && addr < 0x00003000) { if (addr >= 0x00002000 && addr < 0x00003000) {
PanicAlert("This action replay simulator does not support codes that modify Action Replay itself."); PanicAlert("This action replay simulator does not support codes that modify Action Replay itself.");
fail = true; return false;
return;
} }
// skip these weird init lines // skip these weird init lines
@ -180,15 +181,14 @@ void RunActionReplayCode(const ARCode &arcode, bool nowIsBootup) {
switch(zcode) switch(zcode)
{ {
case 0x00: // END OF CODES case 0x00: // END OF CODES
return; return true;
case 0x02: // Normal execution of codes case 0x02: // Normal execution of codes
// Todo: Set register 1BB4 to 0 // Todo: Set register 1BB4 to 0
break; break;
case 0x03: // Executes all codes in the same row case 0x03: // Executes all codes in the same row
// Todo: Set register 1BB4 to 1 // Todo: Set register 1BB4 to 1
PanicAlert("Zero 3 code not supported"); PanicAlert("Zero 3 code not supported");
fail = true; return false;
return;
case 0x04: // Fill & Slide or Memory Copy case 0x04: // Fill & Slide or Memory Copy
if (((addr >> 25) & 0x03) == 0x3) { if (((addr >> 25) & 0x03) == 0x3) {
doMemoryCopy = true; doMemoryCopy = true;
@ -202,8 +202,7 @@ void RunActionReplayCode(const ARCode &arcode, bool nowIsBootup) {
continue; continue;
default: default:
PanicAlert("Zero code unknown to dolphin: %08x",zcode); PanicAlert("Zero code unknown to dolphin: %08x",zcode);
fail = true; return false;
return;
} }
} }
@ -211,30 +210,37 @@ void RunActionReplayCode(const ARCode &arcode, bool nowIsBootup) {
switch (subtype) switch (subtype)
{ {
case 0x0: // Ram write (and fill) case 0x0: // Ram write (and fill)
DoARSubtype_RamWriteAndFill(); if (!DoARSubtype_RamWriteAndFill())
return false;
continue; continue;
case 0x1: // Write to pointer case 0x1: // Write to pointer
DoARSubtype_WriteToPointer(); if (!DoARSubtype_WriteToPointer())
return false;
continue; continue;
case 0x2: // Add code case 0x2: // Add code
DoARSubtype_AddCode(); if (!DoARSubtype_AddCode())
return false;
continue; continue;
case 0x3: // Master Code & Write to CCXXXXXX case 0x3: // Master Code & Write to CCXXXXXX
DoARSubtype_MasterCodeAndWriteToCCXXXXXX(); if (!DoARSubtype_MasterCodeAndWriteToCCXXXXXX())
continue; // TODO: This is not implemented yet return false;
continue;
default: // non-specific z codes (hacks) default: // non-specific z codes (hacks)
DoARSubtype_Other(); if (!DoARSubtype_Other())
return false;
continue; continue;
} }
} }
return true;
} }
void DoARSubtype_RamWriteAndFill() bool DoARSubtype_RamWriteAndFill()
{ {
if (w < 0x8) // Check the value W in 0xZWXXXXXXX if (w < 0x8) // Check the value W in 0xZWXXXXXXX
{ {
u32 new_addr = ((addr & 0x01FFFFFF) | 0x80000000); u32 new_addr = ((addr & 0x7FFFFF) | 0x80000000); // real GC address
switch ((addr >> 25) & 0x03) u8 size = ((addr >> 25) & 0x03);
switch (size)
{ {
case 0x00: // Byte write case 0x00: // Byte write
{ {
@ -258,20 +264,22 @@ void DoARSubtype_RamWriteAndFill()
Memory::Write_U32(data, new_addr); Memory::Write_U32(data, new_addr);
break; break;
default: default:
PanicAlert("Action Replay Error: Invalid size in Ram Write And Fill (%s)",code.name.c_str()); PanicAlert("Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)", size, addr, code.name.c_str());
fail = true; return false;
return;
} }
return true;
} }
return false;
} }
void DoARSubtype_WriteToPointer() bool DoARSubtype_WriteToPointer()
{ {
if (w < 0x8) if (w < 0x8)
{ {
u32 new_addr = ((addr & 0x01FFFFFF) | 0x80000000); u32 new_addr = ((addr & 0x7FFFFF) | 0x80000000);
switch ((addr >> 25) & 0x03) u8 size = ((addr >> 25) & 0x03);
switch (size)
{ {
case 0x00: // Byte write to pointer [40] case 0x00: // Byte write to pointer [40]
{ {
@ -296,19 +304,21 @@ void DoARSubtype_WriteToPointer()
break; break;
default: default:
PanicAlert("Action Replay Error: Invalid size in Write To Pointer (%s)",code.name.c_str()); PanicAlert("Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)", size, addr, code.name.c_str());
fail = true; return false;
return;
} }
return true;
} }
return false;
} }
void DoARSubtype_AddCode() bool DoARSubtype_AddCode()
{ {
if (w < 0x8) if (w < 0x8)
{ {
u32 new_addr = (addr & 0x81FFFFFF); u32 new_addr = (addr & 0x81FFFFFF);
switch ((new_addr >> 25) & 0x03) u8 size = ((addr >> 25) & 0x03);
switch (size)
{ {
case 0x0: // Byte add case 0x0: // Byte add
Memory::Write_U8(Memory::Read_U8(new_addr) + (data & 0xFF), new_addr); Memory::Write_U8(Memory::Read_U8(new_addr) + (data & 0xFF), new_addr);
@ -329,69 +339,69 @@ void DoARSubtype_AddCode()
break; break;
} }
default: default:
PanicAlert("Action Replay Error: Invalid size in Add Code (%s)",code.name.c_str()); PanicAlert("Action Replay Error: Invalid size(%08x : address = %08x) in Add Code (%s)", size, addr, code.name.c_str());
fail = true; return false;
return;
} }
return true;
} }
return false;
} }
void DoARSubtype_MasterCodeAndWriteToCCXXXXXX() bool DoARSubtype_MasterCodeAndWriteToCCXXXXXX()
{ {
// code not yet implemented - TODO // code not yet implemented - TODO
PanicAlert("Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)",code.name.c_str()); PanicAlert("Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)",code.name.c_str());
fail = true; return false;
return;
} }
// TODO(Omega): I think this needs cleanup, there might be a better way to code this part // TODO(Omega): I think this needs cleanup, there might be a better way to code this part
void DoARSubtype_Other() bool DoARSubtype_Other()
{ {
switch (cmd & 0xFE) switch (cmd & 0xFE)
{ {
case 0x90: case 0x90:
// Eh, this must be wrong. Should it really fallthrough? // Eh, this must be wrong. Should it really fallthrough?
if (Memory::Read_U32(addr) == data) return; // IF 32 bit equal, exit if (Memory::Read_U32(addr) == data) return true; // IF 32 bit equal, exit
case 0x08: // IF 8 bit equal, execute next opcode case 0x08: // IF 8 bit equal, execute next opcode
case 0x48: // (double) case 0x48: // (double)
if (Memory::Read_U16(addr) != (data & 0xFFFF)) { if (Memory::Read_U16(addr) != (data & 0xFFFF)) {
if (++iter == code.ops.end()) return; if (++iter == code.ops.end()) return true;
if (cmd == 0x48) if (++iter == code.ops.end()) return; if (cmd == 0x48) if (++iter == code.ops.end()) return true;
} }
break; break;
case 0x0A: // IF 16 bit equal, execute next opcode case 0x0A: // IF 16 bit equal, execute next opcode
case 0x4A: // (double) case 0x4A: // (double)
if (Memory::Read_U16(addr) != (data & 0xFFFF)) { if (Memory::Read_U16(addr) != (data & 0xFFFF)) {
if (++iter == code.ops.end()) return; if (++iter == code.ops.end()) return true;
if (cmd == 0x4A) if (++iter == code.ops.end()) return; if (cmd == 0x4A) if (++iter == code.ops.end()) return true;
} }
break; break;
case 0x0C: // IF 32 bit equal, execute next opcode case 0x0C: // IF 32 bit equal, execute next opcode
case 0x4C: // (double) case 0x4C: // (double)
if (Memory::Read_U32(addr) != data) { if (Memory::Read_U32(addr) != data) {
if (++iter == code.ops.end()) return; if (++iter == code.ops.end()) return true;
if (cmd == 0x4C) if (++iter == code.ops.end()) return; if (cmd == 0x4C) if (++iter == code.ops.end()) return true;
} }
break; break;
case 0x10: // IF NOT 8 bit equal, execute next opcode case 0x10: // IF NOT 8 bit equal, execute next opcode
case 0x50: // (double) case 0x50: // (double)
if (Memory::Read_U8(addr) == (data & 0xFF)) { if (Memory::Read_U8(addr) == (data & 0xFF)) {
if (++iter == code.ops.end()) return; if (++iter == code.ops.end()) return true;
if (cmd == 0x50) if (++iter == code.ops.end()) return; if (cmd == 0x50) if (++iter == code.ops.end()) return true;
} }
break; break;
case 0x12: // IF NOT 16 bit equal, execute next opcode case 0x12: // IF NOT 16 bit equal, execute next opcode
case 0x52: // (double) case 0x52: // (double)
if (Memory::Read_U16(addr) == (data & 0xFFFF)) { if (Memory::Read_U16(addr) == (data & 0xFFFF)) {
if (++iter == code.ops.end()) return; if (++iter == code.ops.end()) return true;
if (cmd == 0x52) if (++iter == code.ops.end()) return; if (cmd == 0x52) if (++iter == code.ops.end()) return true;
} }
break; break;
case 0x14: // IF NOT 32 bit equal, execute next opcode case 0x14: // IF NOT 32 bit equal, execute next opcode
case 0x54: // (double) case 0x54: // (double)
if (Memory::Read_U32(addr) == data) { if (Memory::Read_U32(addr) == data) {
if (++iter == code.ops.end()) return; if (++iter == code.ops.end()) return true;
if (cmd == 0x54) if (++iter == code.ops.end()) return; if (cmd == 0x54) if (++iter == code.ops.end()) return true;
} }
break; break;
case 0xC4: // "Master Code" - configure the AR case 0xC4: // "Master Code" - configure the AR
@ -409,11 +419,11 @@ void DoARSubtype_Other()
} }
default: default:
PanicAlert("Action Replay Error: Unknown Action Replay command %02x (%08x %08x)(%s)", cmd, iter->cmd_addr, iter->value, code.name.c_str()); PanicAlert("Action Replay Error: Unknown Action Replay command %02x (%08x %08x)(%s)", cmd, iter->cmd_addr, iter->value, code.name.c_str());
fail = true; return false;
return;
} }
return true;
} }
void DoARZeroCode_FillAndSlide() bool DoARZeroCode_FillAndSlide()
{ {
u32 new_addr = (addr_last & 0x81FFFFFF); u32 new_addr = (addr_last & 0x81FFFFFF);
u8 size = ((new_addr >> 25) & 0x03); u8 size = ((new_addr >> 25) & 0x03);
@ -425,7 +435,7 @@ void DoARZeroCode_FillAndSlide()
if (write_num < 1) { if (write_num < 1) {
doFillNSlide = false; doFillNSlide = false;
return; return true;
} }
if ((data >> 24) >> 3) { // z1 >> 3 if ((data >> 24) >> 3) { // z1 >> 3
@ -469,18 +479,17 @@ void DoARZeroCode_FillAndSlide()
curr_addr += addr_incr; curr_addr += addr_incr;
} break; } break;
default: default:
PanicAlert("Action Replay Error: Invalid size in Fill and Slide (%s)",code.name.c_str()); PanicAlert("Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)", size, new_addr, code.name.c_str());
doFillNSlide = false; doFillNSlide = false;
fail = true; return false;
return;
} }
doFillNSlide = false; doFillNSlide = false;
return; return true;
} }
void DoARZeroCode_MemoryCopy() bool DoARZeroCode_MemoryCopy()
{ {
u32 addr_dest = (val_last | 0x06000000); u32 addr_dest = (val_last | 0x06000000);
u32 addr_src = addr; u32 addr_src = ((addr & 0x7FFFFF) | 0x80000000);
u8 num_bytes = (data & 0x7FFF); u8 num_bytes = (data & 0x7FFF);
if ((data & ~0x7FFF) == 0x0000) { if ((data & ~0x7FFF) == 0x0000) {
@ -492,12 +501,12 @@ void DoARZeroCode_MemoryCopy()
else { // Memory Copy Without Pointer Support else { // Memory Copy Without Pointer Support
for(int i=0; i < num_bytes; i++) { for(int i=0; i < num_bytes; i++) {
Memory::Write_U32(Memory::Read_U32(addr_src + i), addr_dest + i); Memory::Write_U32(Memory::Read_U32(addr_src + i), addr_dest + i);
} return; } return true;
} }
} }
else { else {
PanicAlert("Action Replay Error: Invalid value (&08x) in Memory Copy (%s)", (data & ~0x7FFF), code.name.c_str()); PanicAlert("Action Replay Error: Invalid value (&08x) in Memory Copy (%s)", (data & ~0x7FFF), code.name.c_str());
fail = true; return false;
return;
} }
return true;
} }

2
Source/Core/Core/Src/ActionReplay.h
View File

@ -27,6 +27,6 @@ struct ARCode {
}; };
void ActionReplayRunAllActive(); void ActionReplayRunAllActive();
void RunActionReplayCode(const ARCode &arcode, bool nowIsBootup); bool RunActionReplayCode(const ARCode &arcode);
void LoadActionReplayCodes(IniFile &ini); void LoadActionReplayCodes(IniFile &ini);