DSP HLE improvements...

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3499 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.h

@@ -21,99 +21,110 @@
 #include "Common.h"
 #include "UCodes.h"
 
-// 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
 {
-	// R/W data =============
-	// AFC history (2 shorts) must be in here somewhere, plus lots of other state.
-	u16 rw_unknown[0x80];
+    // R/W data =============
+    // AFC history (2 shorts) must be in here somewhere, plus lots of other state.
+    u16 unk0;
+    u16 unk1;
+    u16 unk2;
+    u16 unk3;
+    u16 unk4;
+    u16 unk5;
+    u16 unk6;
 
-	// Read only data
-	u16 type;                // 0x5, 0x9 = AFC.
-	u16 r_unknown1;
+    u16 unk7[0x2C];       // 0x033
+    u16 SampleData[0x4D];
 
-	u16 r_unknown2[0x14 / 2];
+    // Read only data(0x80 to the end)
+    u16 type;                // 0x5, 0x9 = AFC.
+    u16 r_unknown1;
 
-	// 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 r_unknown2[0x14 / 2];
 
-	u16 r_unknown3[(0x80 - 0x1C) / 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 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;
+    // 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:
 	enum EDSP_Codes
 	{
-		DSP_INIT   = 0xDCD10000,
-		DSP_RESUME = 0xDCD10001,
-		DSP_YIELD  = 0xDCD10002,
-		DSP_DONE   = 0xDCD10003,
-		DSP_SYNC   = 0xDCD10004,
-		DSP_UNKN   = 0xDCD10005,
+		DSP_INIT        = 0xDCD10000,
+		DSP_RESUME      = 0xDCD10001,
+		DSP_YIELD       = 0xDCD10002,
+		DSP_DONE        = 0xDCD10003,
+		DSP_SYNC        = 0xDCD10004,
+		DSP_FRAME_END   = 0xDCD10005,
 	};
 
-	// Sync =========================================
-	bool m_bSyncInProgress;
-	u32 m_SyncIndex;
-	u32 m_SyncStep;
-	u32 m_SyncValues[16];
-
-	// Command 0x1: SetupTable
-	u32 m_SyncMaxStep;
+    // AFC CoefTable
+    short m_AFCCoefTable[16][2];
 
 	// Command 0x2: SyncFrame
-	bool m_bSyncCmdPending;
-	u32 m_SyncEndSync;
-	u32 m_SyncCurStep;
-	u32 m_SyncCount;
-	u32 m_SyncMax;
+    int m_NumberOfFramesToRender;
+    int m_CurrentFrameToRender;
 
-	// List, buffer management =====================
+	// List in progress
 	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");
-		}
+
+
+    enum EMailState  
+    {
+        WaitForMail,
+        ReadingFrameSync,
+        ReadingMessage,
+        ReadingSystemMsg
+    };
+    EMailState m_MailState;
+    u16 m_PBMask[0x10];
+
+
+    u32 m_NumPBs;
+    u32 m_PBAddress;
+
+    u32 m_MaxSyncedPB;
+
+    ZPB m_PBs[0x40];
+
+
+
+	u8 Read8()
+	{
+		return m_Buffer[m_readOffset++];
+	}
+
+	u16 Read16()
+	{
+		u16 res = *(u16*)&m_Buffer[m_readOffset];
+		m_readOffset += 2;
 		return res;
 	}
 
-
-	// Param blocks, mixer state ====================
-	// HLE state
-	int num_param_blocks;
-
-	u32 param_blocks_ptr;
-	u32 param_blocks2_ptr;
-
-	ZPB zpbs[0x40];
-	ZPB zpbs2[4];
-
-	void CopyPBsFromRAM();
-	void CopyPBsToRAM();
-	
-	u32 GetParamBlockAddr(int block_no) const {
-		return param_blocks_ptr + sizeof(ZPB) * block_no;
+	u32 Read32()
+	{
+		u32 res = *(u32*)&m_Buffer[m_readOffset];
+		m_readOffset += 4;
+		return res;
 	}
-
 public:
 
 	CUCode_Zelda(CMailHandler& _rMailHandler);
@@ -122,6 +133,24 @@ public:
 	void HandleMail(u32 _uMail);
 	void Update(int cycles);
 	void MixAdd(short* buffer, int size);
+
+
+    void UpdatePB(ZPB& _rPB, int *templbuffer, int *temprbuffer, u32 _Size);
+
+    void CopyPBsFromRAM();
+    void CopyPBsToRAM();
+
+
+    int AFCdecodebuffer(char *input, signed short *out, short * histp, short * hist2p, int type = 9);
+
+
+    int *templbuffer;
+    int *temprbuffer;
+
+    // simple dump ...
+    void DumpPB(const ZPB& _rPB);
+    int DumpAFC(u8* pIn, const int size, const int srate);
 };
 
 #endif
+