mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 22:29:39 -06:00
MemoryView can now view ARAM (rightclick -> toggle memory). Add "search for instruction" capability to debugger. Code cleanup, log zelda pb type (9 all the time in Zelda Four Swords)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3479 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -21,26 +21,36 @@
|
||||
#include "Common.h"
|
||||
#include "UCodes.h"
|
||||
|
||||
|
||||
// Here's a piece of pure guesswork, looking at random supposedly-PBs
|
||||
// from Zelda Four Swords.
|
||||
|
||||
// These are 0x180 bytes large.
|
||||
// Zelda WW param blocks. These are 0x180 bytes large.
|
||||
// According to FIRES, the ucodes copies 0xc0 shorts (0x180 bytes) from RAM
|
||||
// but only writes back 0x80 shorts (0x100 bytes). So the last 0x80 are "read only".
|
||||
struct ZPB
|
||||
{
|
||||
u16 temp[0x80];
|
||||
u16 temp2; u16 temp3;
|
||||
u16 whatever[0x14 / 2];
|
||||
// R/W data =============
|
||||
// AFC history (2 shorts) must be in here somewhere, plus lots of other state.
|
||||
u16 rw_unknown[0x80];
|
||||
|
||||
// Read only data
|
||||
u16 type; // 0x5, 0x9 = AFC.
|
||||
u16 r_unknown1;
|
||||
|
||||
u16 r_unknown2[0x14 / 2];
|
||||
|
||||
// Not sure what addresses this is, hopefully to sample data in ARAM.
|
||||
// These are the only things in the param blocks that look a lot like pointers.
|
||||
u16 addr_high; // at 0x18 = 0xC * 2
|
||||
u16 addr_low;
|
||||
|
||||
u16 filler[(0x80 - 0x1C) / 2];
|
||||
u16 r_unknown3[(0x80 - 0x1C) / 2];
|
||||
};
|
||||
|
||||
namespace {
|
||||
// If this miscompiles, adjust the size of ZPB to 0x180 bytes (0xc0 shorts).
|
||||
CompileTimeAssert<sizeof(ZPB) == 0x180> ensure_zpb_size_correct;
|
||||
} // namespace
|
||||
|
||||
|
||||
// Zelda UCode - the big mystery.
|
||||
class CUCode_Zelda : public IUCode
|
||||
{
|
||||
private:
|
||||
@ -54,6 +64,7 @@ private:
|
||||
DSP_UNKN = 0xDCD10005,
|
||||
};
|
||||
|
||||
// Sync =========================================
|
||||
bool m_bSyncInProgress;
|
||||
u32 m_SyncIndex;
|
||||
u32 m_SyncStep;
|
||||
@ -69,17 +80,24 @@ private:
|
||||
u32 m_SyncCount;
|
||||
u32 m_SyncMax;
|
||||
|
||||
// List in progress
|
||||
// List, buffer management =====================
|
||||
u32 m_numSteps;
|
||||
bool m_bListInProgress;
|
||||
u32 m_step;
|
||||
u8 m_Buffer[1024];
|
||||
void ExecuteList();
|
||||
|
||||
u32 m_readOffset;
|
||||
u32 Read32() {
|
||||
u32 res = *(u32*)&m_Buffer[m_readOffset];
|
||||
m_readOffset += 4;
|
||||
if ((m_readOffset >> 2) >= m_numSteps + 1) {
|
||||
WARN_LOG(DSPHLE, "Read32 out of bounds");
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Param blocks, mixer state ====================
|
||||
// HLE state
|
||||
int num_param_blocks;
|
||||
|
||||
@ -96,27 +114,6 @@ private:
|
||||
return param_blocks_ptr + sizeof(ZPB) * block_no;
|
||||
}
|
||||
|
||||
u8 Read8()
|
||||
{
|
||||
return m_Buffer[m_readOffset++];
|
||||
}
|
||||
|
||||
u16 Read16()
|
||||
{
|
||||
u16 res = *(u16*)&m_Buffer[m_readOffset];
|
||||
m_readOffset += 2;
|
||||
return res;
|
||||
}
|
||||
|
||||
u32 Read32()
|
||||
{
|
||||
u32 res = *(u32*)&m_Buffer[m_readOffset];
|
||||
m_readOffset += 4;
|
||||
if ((m_readOffset >> 2) >= m_numSteps + 1) {
|
||||
WARN_LOG(DSPHLE, "Read32 out of bounds");
|
||||
}
|
||||
return res;
|
||||
}
|
||||
public:
|
||||
|
||||
CUCode_Zelda(CMailHandler& _rMailHandler);
|
||||
@ -128,4 +125,3 @@ public:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user