Skip to content

Commit

Permalink
Merge SrcSelect.c, AX.c, Crazy Taxi.txt, and DSP_UC_AX1.txt into new …
Browse files Browse the repository at this point in the history 
…and improved disasm -> DSP/DSP_UC_6A696CE7.txt

Goal is complete/near complete RE of DSP_UC_6A696CE7 (GC AX), and hopefully ROM.
From there, seeing the additional changes in other GC AX versions (there are only 4 others, with minor differences), should be "simple".

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4818 8ced0084-cf51-0410-be5f-012b33b47a6e
  • Loading branch information
@shuffle2
shuffle2 committed Jan 13, 2010
1 parent 94570d3 commit d558c53
Show file tree
Hide file tree
Showing 8 changed files with 3,457 additions and 5,945 deletions.
284 changes: 104 additions & 180 deletions Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Version="9.00"
Name="Plugin_DSP_LLE"
ProjectGUID="{3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}"
RootNamespace="Plugin_DSP_LLE"
Expand Down Expand Up @@ -584,208 +584,132 @@
</References>
<Files>
<Filter
Name="Logging"
Name="RE"
>
<File
RelativePath=".\Src\Logging\AXTask.cpp"
RelativePath="..\..\..\docs\DSP\DSP_UC_ROM.txt"
>
</File>
<File
RelativePath=".\Src\Logging\Logging.cpp"
RelativePath="..\..\..\docs\DSP\unlockmemcard.ds"
>
</File>
<File
RelativePath=".\Src\Logging\Logging.h"
>
</File>
<File
RelativePath=".\Src\Logging\ReadPBs.cpp"
>
</File>
<File
RelativePath=".\Src\Logging\UCode_AXStructs.h"
>
</File>
</Filter>
<Filter
Name="Docs"
>
<File
RelativePath="..\..\..\docs\DSP\AX.c"
<Filter
Name="AX_GC"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
<File
RelativePath="..\..\..\docs\DSP\Crazy Taxi.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
</File>
<File
RelativePath="..\..\..\docs\DSP\DSP_UC_6A696CE7.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
ExcludedFromBuild="true"
</File>
<File
RelativePath="..\..\..\docs\DSP\DSP_UC_MP2.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\docs\DSP\Crazy Taxi.txt"
</File>
</Filter>
<Filter
Name="JA_GC"
>
</File>
<File
RelativePath="..\..\..\docs\DSP\dsp_rom.txt"
>
</File>
<File
RelativePath="..\..\..\docs\DSP\DSP_UC_Zelda.txt"
>
</File>
<File
RelativePath="..\..\..\docs\DSP\SrcSelect_.c"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
<File
RelativePath="..\..\..\docs\DSP\DSP_UC_Luigi.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
</File>
<File
RelativePath="..\..\..\docs\DSP\DSP_UC_Zelda.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
</File>
<File
RelativePath="..\..\..\docs\DSP\wwdsp.c"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
ExcludedFromBuild="true"
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\docs\DSP\Zelda.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
ExcludedFromBuild="true"
</File>
<File
RelativePath="..\..\..\docs\DSP\zeldaNotes.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\docs\DSP\wwdsp.c"
</File>
</Filter>
<Filter
Name="JA_WII"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
<File
RelativePath="..\..\..\docs\DSP\DSP_UC_Pikmin2Wii.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
</File>
<File
RelativePath="..\..\..\docs\DSP\DSP_UC_PikminWii.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
</File>
<File
RelativePath="..\..\..\docs\DSP\DSP_UC_SuperMarioGalaxy.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
</File>
<File
RelativePath="..\..\..\docs\DSP\DSP_UC_Zelda_Wii.txt"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\docs\DSP\Zelda.txt"
</File>
</Filter>
<Filter
Name="AX_WII"
>
</File>
<File
RelativePath="..\..\..\docs\DSP\zeldaNotes.txt"
>
</File>
<File
RelativePath="..\..\..\docs\DSP\DSP_UC_AXWii.txt"
>
</File>
</Filter>
</Filter>
<Filter
Name="ConfigDialog"
Expand Down
19 changes: 9 additions & 10 deletions Source/Plugins/Plugin_DSP_LLE/Src/DSPHost.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// http://code.google.com/p/dolphin-emu/

#include "Common.h"
#include "Hash.h"
#include "DSPHost.h"
#include "DSPSymbols.h"
#include "Tools.h"
Expand Down Expand Up @@ -70,29 +71,27 @@ u32 DSPHost_CodeLoaded(const u8 *ptr, int size)
u32 crc = GenerateCRC(ptr, size);
DumpDSPCode(ptr, size, crc);

// this crc is comparable with the HLE plugin
u32 ector_crc = 0;
for (int i = 0; i < size; i++)
{
ector_crc ^= ptr[i];
//let's rol
ector_crc = (ector_crc << 3) | (ector_crc >> 29);
}
// HLE plugin uses this crc method
u32 ector_crc = HashEctor(ptr, size);

DSPSymbols::Clear();

// Auto load text file - if none just disassemble.

// TODO: Don't hardcode for Zelda.
NOTICE_LOG(DSPLLE, "CRC: %08x", ector_crc);
NOTICE_LOG(DSPLLE, "ector_crc: %08x", ector_crc);

DSPSymbols::Clear();
bool success = false;
switch (ector_crc)
{
case 0x86840740: success = DSPSymbols::ReadAnnotatedAssembly("../../docs/DSP/DSP_UC_Zelda.txt"); break;
case 0x42f64ac4: success = DSPSymbols::ReadAnnotatedAssembly("../../docs/DSP/DSP_UC_Luigi.txt"); break;
case 0x4e8a8b21: success = DSPSymbols::ReadAnnotatedAssembly("../../docs/DSP/DSP_UC_AX1.txt"); break;
case 0x07f88145: success = DSPSymbols::ReadAnnotatedAssembly("../../docs/DSP/DSP_UC_4CB8233B.txt"); break;
case 0x3ad3b7ac: success = DSPSymbols::ReadAnnotatedAssembly("../../docs/DSP/DSP_UC_8A7A05E2.txt"); break;
case 0x3daf59b9: success = DSPSymbols::ReadAnnotatedAssembly("../../docs/DSP/DSP_UC_D9D066EA.txt"); break;
case 0x4e8a8b21: success = DSPSymbols::ReadAnnotatedAssembly("../../docs/DSP/DSP_UC_6A696CE7.txt"); break;
case 0xe2136399: success = DSPSymbols::ReadAnnotatedAssembly("../../docs/DSP/DSP_UC_EB79C705.txt"); break;
default: success = false; break;
}

Expand Down
5 changes: 1 addition & 4 deletions Source/Plugins/Plugin_DSP_LLE/Src/SConscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ files = [
"Globals.cpp",
"main.cpp",
"Tools.cpp",
"DSPHost.cpp",
"Logging/AXTask.cpp",
"Logging/Logging.cpp",
"Logging/ReadPBs.cpp",
"DSPHost.cpp",
]

if env['HAVE_WX']:
Expand Down
Loading

0 comments on commit d558c53

Please sign in to comment.