2008-08-16 21:58:07 +00:00
|
|
|
// Copyright (C) 2003-2008 Dolphin Project.
|
|
|
|
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU General Public License as published by
|
|
|
|
// the Free Software Foundation, version 2.0.
|
|
|
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License 2.0 for more details.
|
|
|
|
|
|
|
|
// A copy of the GPL 2.0 should have been included with the program.
|
|
|
|
// If not, see http://www.gnu.org/licenses/
|
|
|
|
|
|
|
|
// Official SVN repository and contact information can be found at
|
|
|
|
// http://code.google.com/p/dolphin-emu/
|
|
|
|
|
2008-10-04 20:15:19 +00:00
|
|
|
#include "../Debugger/Debugger.h"
|
2008-08-16 21:58:07 +00:00
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
#include "../PCHW/DSoundStream.h"
|
|
|
|
#endif
|
|
|
|
#include "../PCHW/Mixer.h"
|
|
|
|
#include "../MailHandler.h"
|
|
|
|
|
|
|
|
#include "UCodes.h"
|
|
|
|
#include "UCode_AXStructs.h"
|
|
|
|
#include "UCode_AX.h"
|
|
|
|
|
2008-10-06 18:40:34 +00:00
|
|
|
|
2008-10-04 17:26:12 +00:00
|
|
|
// ---------------------------------------------------------------------------------------
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// Externals
|
2008-10-04 17:26:12 +00:00
|
|
|
// -----------
|
|
|
|
extern float ratioFactor;
|
2008-10-03 10:59:56 +00:00
|
|
|
extern u32 gLastBlock;
|
2008-10-06 18:40:34 +00:00
|
|
|
bool gSSBM = true; // used externally
|
|
|
|
bool gSSBMremedy1 = true; // used externally
|
|
|
|
bool gSSBMremedy2 = true; // used externally
|
2008-10-07 00:59:12 +00:00
|
|
|
bool gSequenced = true; // used externally
|
|
|
|
bool gReset = false; // used externally
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
extern CDebugger* m_frame;
|
2008-10-04 17:26:12 +00:00
|
|
|
// -----------
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
|
2008-10-06 18:40:34 +00:00
|
|
|
|
2008-08-16 21:58:07 +00:00
|
|
|
CUCode_AX::CUCode_AX(CMailHandler& _rMailHandler, bool wii)
|
|
|
|
: IUCode(_rMailHandler)
|
|
|
|
, m_addressPBs(0xFFFFFFFF)
|
|
|
|
, wii_mode(wii)
|
|
|
|
{
|
|
|
|
// we got loaded
|
|
|
|
m_rMailHandler.PushMail(0xDCD10000);
|
|
|
|
m_rMailHandler.PushMail(0x80000000); // handshake ??? only (crc == 0xe2136399) needs it ...
|
|
|
|
|
|
|
|
templbuffer = new int[1024 * 1024];
|
|
|
|
temprbuffer = new int[1024 * 1024];
|
|
|
|
}
|
|
|
|
|
|
|
|
CUCode_AX::~CUCode_AX()
|
|
|
|
{
|
|
|
|
m_rMailHandler.Clear();
|
|
|
|
delete [] templbuffer;
|
|
|
|
delete [] temprbuffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CUCode_AX::HandleMail(u32 _uMail)
|
|
|
|
{
|
|
|
|
if ((_uMail & 0xFFFF0000) == MAIL_AX_ALIST)
|
|
|
|
{
|
|
|
|
// a new List
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
AXTask(_uMail);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
s16 CUCode_AX::ADPCM_Step(AXParamBlock& pb, u32& samplePos, u32 newSamplePos, u16 frac)
|
|
|
|
{
|
|
|
|
PBADPCMInfo &adpcm = pb.adpcm;
|
|
|
|
|
|
|
|
while (samplePos < newSamplePos)
|
|
|
|
{
|
|
|
|
if ((samplePos & 15) == 0)
|
|
|
|
{
|
|
|
|
adpcm.pred_scale = g_dspInitialize.pARAM_Read_U8((samplePos & ~15) >> 1);
|
|
|
|
samplePos += 2;
|
|
|
|
newSamplePos += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
int scale = 1 << (adpcm.pred_scale & 0xF);
|
|
|
|
int coef_idx = adpcm.pred_scale >> 4;
|
|
|
|
|
|
|
|
s32 coef1 = adpcm.coefs[coef_idx * 2 + 0];
|
|
|
|
s32 coef2 = adpcm.coefs[coef_idx * 2 + 1];
|
|
|
|
|
|
|
|
int temp = (samplePos & 1) ?
|
|
|
|
(g_dspInitialize.pARAM_Read_U8(samplePos >> 1) & 0xF) :
|
|
|
|
(g_dspInitialize.pARAM_Read_U8(samplePos >> 1) >> 4);
|
|
|
|
|
|
|
|
if (temp >= 8)
|
|
|
|
temp -= 16;
|
|
|
|
|
|
|
|
// 0x400 = 0.5 in 11-bit fixed point
|
|
|
|
int val = (scale * temp) + ((0x400 + coef1 * adpcm.yn1 + coef2 * adpcm.yn2) >> 11);
|
|
|
|
|
|
|
|
if (val > 0x7FFF)
|
|
|
|
val = 0x7FFF;
|
|
|
|
else if (val < -0x7FFF)
|
|
|
|
val = -0x7FFF;
|
|
|
|
|
|
|
|
adpcm.yn2 = adpcm.yn1;
|
|
|
|
adpcm.yn1 = val;
|
|
|
|
|
|
|
|
samplePos++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return adpcm.yn1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ADPCM_Loop(AXParamBlock& pb)
|
|
|
|
{
|
|
|
|
if (!pb.is_stream)
|
|
|
|
{
|
|
|
|
pb.adpcm.yn1 = pb.adpcm_loop_info.yn1;
|
|
|
|
pb.adpcm.yn2 = pb.adpcm_loop_info.yn2;
|
|
|
|
pb.adpcm.pred_scale = pb.adpcm_loop_info.pred_scale;
|
|
|
|
}
|
|
|
|
//else stream and we should not attempt to replace values
|
|
|
|
}
|
|
|
|
|
2008-10-09 04:00:47 +00:00
|
|
|
|
|
|
|
// =======================================================================================
|
|
|
|
// Volume control (ramping)
|
|
|
|
// --------------
|
|
|
|
u16 ADPCM_Vol(u16 vol, u16 delta, u16 mixer_control)
|
|
|
|
{
|
|
|
|
int x = vol;
|
|
|
|
if (delta && delta < 0x4000)
|
|
|
|
x += delta; // unsure what the right step is
|
|
|
|
//x ++;
|
|
|
|
//x += 8; //?
|
|
|
|
else if (delta && delta > 0x4000)
|
|
|
|
//x -= (0x8000 - pb.mixer.unknown); // this didn't work
|
|
|
|
x--;
|
|
|
|
if (x < 0) x = 0; // make limits
|
|
|
|
// does this make any sense?
|
|
|
|
//if (pb.mixer_control < 1000 && x < pb.mixer_control) x = pb.mixer_control;
|
|
|
|
//if (x >= 0x7fff) xl = 0x7fff; // this seems to high
|
|
|
|
if (mixer_control > 1000 && x > mixer_control) x = mixer_control;
|
|
|
|
return x; // update volume
|
|
|
|
}
|
|
|
|
|
|
|
|
// ==============
|
|
|
|
|
|
|
|
|
2008-08-16 21:58:07 +00:00
|
|
|
void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
|
|
|
|
{
|
|
|
|
AXParamBlock PBs[NUMBER_OF_PBS];
|
|
|
|
|
|
|
|
if (_iSize > 1024 * 1024)
|
|
|
|
_iSize = 1024 * 1024;
|
|
|
|
|
|
|
|
memset(templbuffer, 0, _iSize * sizeof(int));
|
|
|
|
memset(temprbuffer, 0, _iSize * sizeof(int));
|
|
|
|
// read out pbs
|
|
|
|
int numberOfPBs = ReadOutPBs(PBs, NUMBER_OF_PBS);
|
|
|
|
#ifdef _WIN32
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
ratioFactor = 32000.0f / (float)DSound::DSound_GetSampleRate();
|
2008-08-16 21:58:07 +00:00
|
|
|
#else
|
2008-10-01 20:54:16 +00:00
|
|
|
ratioFactor = 32000.0f / 44100.0f;
|
2008-08-16 21:58:07 +00:00
|
|
|
#endif
|
|
|
|
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// write logging data to debugger
|
|
|
|
if(m_frame)
|
|
|
|
{
|
|
|
|
CUCode_AX::Logging(_pBuffer, _iSize, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-08-16 21:58:07 +00:00
|
|
|
for (int i = 0; i < numberOfPBs; i++)
|
|
|
|
{
|
|
|
|
AXParamBlock& pb = PBs[i];
|
|
|
|
|
2008-10-09 04:00:47 +00:00
|
|
|
// get necessary values
|
|
|
|
const u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo;
|
|
|
|
const u32 loopPos = (pb.audio_addr.loop_addr_hi << 16) | pb.audio_addr.loop_addr_lo;
|
|
|
|
const u32 updaddr = (u32)(pb.updates.data_hi << 16) | pb.updates.data_lo;
|
|
|
|
const u32 upddata = Memory_Read_U32(updaddr);
|
|
|
|
|
2008-09-28 21:26:33 +00:00
|
|
|
|
|
|
|
// =======================================================================================
|
2008-10-06 18:40:34 +00:00
|
|
|
/*
|
|
|
|
Fix problems introduced with the SSBM fix - Sometimes when a music stream ended sampleEnd
|
|
|
|
would become extremely high and the game would play random sound data from ARAM resulting in
|
|
|
|
a strange noise. This should take care of that. - Some games (Monkey Ball 1 and Tales of
|
2008-10-09 04:00:47 +00:00
|
|
|
Symphonia and other) also had one odd last block with a strange high loopPos and strange
|
|
|
|
num_updates values, the loopPos limit turns those off also. - Please report any side effects.
|
2008-10-06 18:40:34 +00:00
|
|
|
*/
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// ------------
|
2008-10-06 18:40:34 +00:00
|
|
|
if (
|
2008-10-07 00:59:12 +00:00
|
|
|
(sampleEnd > 0x10000000 || loopPos > 0x10000000)
|
2008-10-06 18:40:34 +00:00
|
|
|
&& gSSBMremedy1
|
|
|
|
)
|
|
|
|
{
|
|
|
|
pb.running = 0;
|
|
|
|
|
|
|
|
// also reset all values if it makes any difference
|
|
|
|
pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0;
|
|
|
|
pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0;
|
|
|
|
pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0;
|
|
|
|
|
2008-10-07 00:59:12 +00:00
|
|
|
pb.src.cur_addr_frac = 0; PBs[i].src.ratio_hi = 0; PBs[i].src.ratio_lo = 0;
|
|
|
|
pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0;
|
|
|
|
|
2008-10-06 18:40:34 +00:00
|
|
|
pb.audio_addr.looping = 0;
|
|
|
|
pb.adpcm_loop_info.pred_scale = 0;
|
|
|
|
pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0;
|
|
|
|
}
|
|
|
|
|
2008-09-28 21:26:33 +00:00
|
|
|
/*
|
2008-10-07 00:59:12 +00:00
|
|
|
// the fact that no settings are reset (except running) after a SSBM type music stream or another
|
|
|
|
looping block (for example in Battle Stadium DON) has ended could cause loud garbled sound to be
|
2008-10-09 04:00:47 +00:00
|
|
|
played from one or more blocks. Perhaps it was in conjunction with the old sequenced music fix below,
|
|
|
|
I'm not sure. This was an attempt to prevent that anyway by resetting all. But I'm not sure if this
|
|
|
|
is needed anymore. Please try to play SSBM without it and see if it works anyway.
|
2008-09-28 21:26:33 +00:00
|
|
|
*/
|
2008-10-06 18:40:34 +00:00
|
|
|
if (
|
|
|
|
// detect blocks that have recently been running that we should reset
|
|
|
|
pb.running == 0 && pb.audio_addr.looping == 1
|
2008-10-09 04:00:47 +00:00
|
|
|
//pb.running == 0 && pb.adpcm_loop_info.pred_scale
|
2008-10-06 18:40:34 +00:00
|
|
|
|
2008-10-09 04:00:47 +00:00
|
|
|
// this prevents us from ruining sequenced music blocks, may not be needed
|
|
|
|
/*
|
2008-10-06 18:40:34 +00:00
|
|
|
&& !(pb.updates.num_updates[0] || pb.updates.num_updates[1] || pb.updates.num_updates[2]
|
|
|
|
|| pb.updates.num_updates[3] || pb.updates.num_updates[4])
|
2008-10-09 04:00:47 +00:00
|
|
|
*/
|
|
|
|
&& !upddata
|
2008-10-07 00:59:12 +00:00
|
|
|
|
|
|
|
&& pb.mixer_control == 0 // only use this in SSBM
|
2008-10-06 18:40:34 +00:00
|
|
|
|
|
|
|
&& gSSBMremedy2 // let us turn this fix on and off
|
|
|
|
)
|
2008-09-28 21:26:33 +00:00
|
|
|
{
|
2008-10-09 04:00:47 +00:00
|
|
|
// reset the detection values
|
2008-10-06 18:40:34 +00:00
|
|
|
pb.audio_addr.looping = 0;
|
|
|
|
pb.adpcm_loop_info.pred_scale = 0;
|
|
|
|
pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0;
|
2008-10-09 04:00:47 +00:00
|
|
|
|
|
|
|
//pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0;
|
|
|
|
//pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0;
|
|
|
|
//pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0;
|
|
|
|
|
|
|
|
//pb.src.cur_addr_frac = 0; PBs[i].src.ratio_hi = 0; PBs[i].src.ratio_lo = 0;
|
|
|
|
//pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0;
|
2008-09-28 21:26:33 +00:00
|
|
|
}
|
2008-10-06 18:40:34 +00:00
|
|
|
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// =============
|
2008-09-28 21:26:33 +00:00
|
|
|
|
|
|
|
|
|
|
|
// =======================================================================================
|
|
|
|
/*
|
2008-10-07 00:59:12 +00:00
|
|
|
Sequenced music fix - Because SSBM type music and other (for example Battle Stadium DON) looping
|
|
|
|
blocks did no have its pred_scale (or any other parameter except running) turned off after a song
|
|
|
|
was stopped a pred_scale check here had the effect of turning those blocks on immediately after
|
2008-10-09 04:00:47 +00:00
|
|
|
the stopped. One way to easily test this is to start a game in BS DON, wait for the Fight message
|
|
|
|
so that the loops begin, and then exit the game and you can see that the sound effects will
|
|
|
|
continue to play in the menus. That's not good. Because the pred_scale check caused these effects
|
|
|
|
I'm trying an update data check instead, it relieas on the assumption that all games that don't
|
|
|
|
use sequencing have blank memory at the update address so that upddata = 0 in those cases. That
|
|
|
|
turned out to now hold, many games that don't use sequencing still had update_addr pointing to
|
|
|
|
some memory location with data, either inside the parameter block space or close before or after
|
|
|
|
it.
|
2008-09-28 21:26:33 +00:00
|
|
|
*/
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// ------------
|
2008-10-06 18:40:34 +00:00
|
|
|
//if (!pb.running && pb.adpcm_loop_info.pred_scale)
|
2008-10-09 04:00:47 +00:00
|
|
|
//if (!pb.running && pb.audio_addr.looping)
|
|
|
|
if (!pb.running && upddata)
|
|
|
|
/*
|
2008-10-06 18:40:34 +00:00
|
|
|
if (!pb.running &&
|
|
|
|
(pb.updates.num_updates[0] || pb.updates.num_updates[1] || pb.updates.num_updates[2]
|
2008-10-07 00:59:12 +00:00
|
|
|
|| pb.updates.num_updates[3] || pb.updates.num_updates[4])
|
|
|
|
&& gSequenced
|
2008-10-09 04:00:47 +00:00
|
|
|
)
|
|
|
|
*/
|
2008-09-28 21:26:33 +00:00
|
|
|
{
|
2008-10-06 18:40:34 +00:00
|
|
|
pb.running = 1;
|
2008-09-28 21:26:33 +00:00
|
|
|
}
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// =============
|
2008-09-28 21:26:33 +00:00
|
|
|
|
2008-10-07 00:59:12 +00:00
|
|
|
|
|
|
|
// =======================================================================================
|
|
|
|
// Reset all values
|
|
|
|
// ------------
|
|
|
|
if (gReset
|
|
|
|
&& (pb.running || pb.audio_addr.looping || pb.adpcm_loop_info.pred_scale)
|
|
|
|
)
|
|
|
|
{
|
|
|
|
pb.running = 0;
|
|
|
|
|
|
|
|
pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0;
|
|
|
|
pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0;
|
|
|
|
pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0;
|
|
|
|
|
|
|
|
pb.src.cur_addr_frac = 0; PBs[i].src.ratio_hi = 0; PBs[i].src.ratio_lo = 0;
|
|
|
|
pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0;
|
|
|
|
|
|
|
|
pb.audio_addr.looping = 0;
|
|
|
|
pb.adpcm_loop_info.pred_scale = 0;
|
|
|
|
pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0;
|
|
|
|
}
|
|
|
|
// =============
|
|
|
|
|
|
|
|
|
2008-08-16 21:58:07 +00:00
|
|
|
if (pb.running)
|
|
|
|
{
|
2008-09-22 12:07:34 +00:00
|
|
|
// =======================================================================================
|
|
|
|
// Set initial parameters
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// ------------
|
2008-10-06 18:40:34 +00:00
|
|
|
//constants
|
2008-08-16 21:58:07 +00:00
|
|
|
const u32 ratio = (u32)(((pb.src.ratio_hi << 16) + pb.src.ratio_lo) * ratioFactor);
|
|
|
|
|
|
|
|
//variables
|
|
|
|
u32 samplePos = (pb.audio_addr.cur_addr_hi << 16) | pb.audio_addr.cur_addr_lo;
|
|
|
|
u32 frac = pb.src.cur_addr_frac;
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// =============
|
2008-09-22 12:07:34 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// =======================================================================================
|
|
|
|
// Handle no-src streams - No src streams have pb.src_type == 2 and have pb.src.ratio_hi = 0
|
|
|
|
// and pb.src.ratio_lo = 0. We handle that by setting the sampling ratio integer to 1. This
|
|
|
|
// makes samplePos update in the correct way.
|
|
|
|
// ---------------------------------------------------------------------------------------
|
|
|
|
// Stream settings
|
|
|
|
// src_type = 2 (most other games have src_type = 0)
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// ------------
|
2008-09-22 12:07:34 +00:00
|
|
|
// Affected games:
|
|
|
|
// Baten Kaitos - Eternal Wings (2003)
|
|
|
|
// Baten Kaitos - Origins (2006)?
|
2008-10-09 05:41:02 +00:00
|
|
|
// Soul Calibur 2: The movie music use src_type 2 but it needs no adjustment, perhaps
|
|
|
|
// the sound format plays in to, Baten use ADPCM SC2 use PCM16
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// ------------
|
2008-10-09 05:41:02 +00:00
|
|
|
if(pb.src_type == 2 && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0))
|
2008-09-22 12:07:34 +00:00
|
|
|
{
|
|
|
|
pb.src.ratio_hi = 1;
|
|
|
|
}
|
Some changes to the debugger, added a DSP HLE debugging window. I moved the initialization of DLLdebugger from Core.cpp to the debugging window. (I hope this doesn't break the LLE debugger in any way, or does it have to be started right after LoadPlugin?). Also added a ShowOnStart saved setting to the debugger. And a MainWindow saved setting that set the position and size of the main window when it's started. I may have broken things in the debugger by allowing disabling of for example the Jit window. Please accept my apologies if that is the case.
There's an annoying problem with the DSP HLE wx window that blocks some input and places it in a queue. For example if you have loaded the window and press X on the main window, that action is blocked an placed in some kind of queue and not executed until you have closed the debugging window. This is also why the main Dolphin-Debugger window does not show up until you close the sound window. If someone find a fix to this I guess it could be convenient. There is another way to show the window, m_frame->Show() that is normally supposed to remove this kind of on-focus lock, but in a dll it seemingly breaks because it makes Dllmain call DLL_PROCESS_DETACH immediately after DLL_PROCESS_ATTACH so the window has to be killed or we crash.
Also, otherwise unnecessarily I had to disable the new DSP HLE debug window in Release mode because I could not access the SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() string that I need to start it (if I tried it crashed). Very annoying and strange. I could not access m_strDSPPlugin or m_strVideoPlugin either, but all other values in m_LocalCoreStartupParameter seemed to work fine. I'll have to leave it to someone else to figure out why.
TODO: Later I'll add function to the debugging buttons, currently only update have a function. I'll add some option to show a custom console window (that actually worked better that the wx window to show the current parameters status, it had less flicker on frequent updates). I'll also add some custom log file saving option.
Also, the reason I placed Logging.cpp in its own dir is because I plan to add more files to it. There were problems with some build modes, win32 with debugging crashed on booting a game, I don't know if it's my fault. And I could not build Debug win64 because of some wx linking problem.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@722 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 03:19:23 +00:00
|
|
|
// =============
|
2008-09-22 12:07:34 +00:00
|
|
|
|
2008-08-16 21:58:07 +00:00
|
|
|
|
2008-09-22 12:07:34 +00:00
|
|
|
// =======================================================================================
|
2008-10-06 18:40:34 +00:00
|
|
|
// Games that use looping to play non-looping music streams - SSBM has info in all
|
|
|
|
// pb.adpcm_loop_info parameters but has pb.audio_addr.looping = 0. If we treat these streams
|
2008-10-07 00:59:12 +00:00
|
|
|
// like any other looping streams the music works. It seems like pb.mixer_control == 0 may
|
|
|
|
// identify these types of blocks.
|
|
|
|
// --------------
|
2008-10-06 18:40:34 +00:00
|
|
|
if(
|
2008-10-07 00:59:12 +00:00
|
|
|
(pb.adpcm_loop_info.pred_scale || pb.adpcm_loop_info.yn1 || pb.adpcm_loop_info.yn2)
|
|
|
|
&& pb.mixer_control == 0
|
2008-10-06 18:40:34 +00:00
|
|
|
&& gSSBM
|
|
|
|
)
|
2008-09-22 12:07:34 +00:00
|
|
|
{
|
|
|
|
pb.audio_addr.looping = 1;
|
|
|
|
}
|
2008-10-07 00:59:12 +00:00
|
|
|
// ==============
|
2008-09-22 12:07:34 +00:00
|
|
|
|
|
|
|
|
|
|
|
// =======================================================================================
|
|
|
|
// Walk through _iSize
|
2008-08-16 21:58:07 +00:00
|
|
|
for (int s = 0; s < _iSize; s++)
|
|
|
|
{
|
|
|
|
int sample = 0;
|
|
|
|
frac += ratio;
|
|
|
|
u32 newSamplePos = samplePos + (frac >> 16); //whole number of frac
|
|
|
|
|
2008-09-22 12:07:34 +00:00
|
|
|
|
|
|
|
// =======================================================================================
|
|
|
|
// Process sample format
|
2008-10-07 00:59:12 +00:00
|
|
|
// --------------
|
2008-08-16 21:58:07 +00:00
|
|
|
switch (pb.audio_addr.sample_format)
|
|
|
|
{
|
|
|
|
case AUDIOFORMAT_PCM8:
|
|
|
|
pb.adpcm.yn2 = pb.adpcm.yn1; //save last sample
|
|
|
|
pb.adpcm.yn1 = ((s8)g_dspInitialize.pARAM_Read_U8(samplePos)) << 8;
|
|
|
|
|
|
|
|
if (pb.src_type == SRCTYPE_NEAREST)
|
|
|
|
{
|
|
|
|
sample = pb.adpcm.yn1;
|
|
|
|
}
|
|
|
|
else //linear interpolation
|
|
|
|
{
|
|
|
|
sample = (pb.adpcm.yn1 * (u16)frac + pb.adpcm.yn2 * (u16)(0xFFFF - frac)) >> 16;
|
|
|
|
}
|
|
|
|
|
|
|
|
samplePos = newSamplePos;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case AUDIOFORMAT_PCM16:
|
|
|
|
pb.adpcm.yn2 = pb.adpcm.yn1; //save last sample
|
|
|
|
pb.adpcm.yn1 = (s16)(u16)((g_dspInitialize.pARAM_Read_U8(samplePos * 2) << 8) | (g_dspInitialize.pARAM_Read_U8((samplePos * 2 + 1))));
|
|
|
|
if (pb.src_type == SRCTYPE_NEAREST)
|
|
|
|
sample = pb.adpcm.yn1;
|
|
|
|
else //linear interpolation
|
|
|
|
sample = (pb.adpcm.yn1 * (u16)frac + pb.adpcm.yn2 * (u16)(0xFFFF - frac)) >> 16;
|
|
|
|
|
|
|
|
samplePos = newSamplePos;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case AUDIOFORMAT_ADPCM:
|
|
|
|
sample = ADPCM_Step(pb, samplePos, newSamplePos, frac);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2008-10-07 00:59:12 +00:00
|
|
|
// ================
|
2008-09-22 12:07:34 +00:00
|
|
|
|
2008-08-16 21:58:07 +00:00
|
|
|
|
2008-09-22 12:07:34 +00:00
|
|
|
// =======================================================================================
|
|
|
|
// Volume control
|
2008-08-16 21:58:07 +00:00
|
|
|
frac &= 0xffff;
|
|
|
|
|
|
|
|
int vol = pb.vol_env.cur_volume >> 9;
|
|
|
|
sample = sample * vol >> 8;
|
|
|
|
|
|
|
|
if (pb.mixer_control & MIXCONTROL_RAMPING)
|
|
|
|
{
|
|
|
|
int x = pb.vol_env.cur_volume;
|
2008-10-09 04:00:47 +00:00
|
|
|
x += pb.vol_env.cur_volume_delta; // I'm not sure about this, can anybody find a game
|
|
|
|
// that use this?
|
2008-08-16 21:58:07 +00:00
|
|
|
if (x < 0) x = 0;
|
|
|
|
if (x >= 0x7fff) x = 0x7fff;
|
|
|
|
pb.vol_env.cur_volume = x; // maybe not per sample?? :P
|
2008-10-09 04:00:47 +00:00
|
|
|
|
|
|
|
// strange way to not use this in Skies where it didn't work well
|
|
|
|
if(pb.mixer_control != 9 && pb.mixer_control != 123)
|
|
|
|
{
|
|
|
|
pb.mixer.volume_left = ADPCM_Vol(pb.mixer.volume_left, pb.mixer.unknown, pb.mixer_control);
|
|
|
|
pb.mixer.volume_right = ADPCM_Vol(pb.mixer.volume_right, pb.mixer.unknown2, pb.mixer_control);
|
|
|
|
}
|
2008-08-16 21:58:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int leftmix = pb.mixer.volume_left >> 5;
|
|
|
|
int rightmix = pb.mixer.volume_right >> 5;
|
2008-10-07 00:59:12 +00:00
|
|
|
// ===============
|
2008-09-22 12:07:34 +00:00
|
|
|
|
2008-08-16 21:58:07 +00:00
|
|
|
|
|
|
|
int left = sample * leftmix >> 8;
|
|
|
|
int right = sample * rightmix >> 8;
|
|
|
|
|
|
|
|
//adpcm has to walk from oldSamplePos to samplePos here
|
|
|
|
templbuffer[s] += left;
|
|
|
|
temprbuffer[s] += right;
|
|
|
|
|
|
|
|
if (samplePos >= sampleEnd)
|
|
|
|
{
|
|
|
|
if (pb.audio_addr.looping == 1)
|
|
|
|
{
|
|
|
|
samplePos = loopPos;
|
|
|
|
if (pb.audio_addr.sample_format == AUDIOFORMAT_ADPCM)
|
|
|
|
ADPCM_Loop(pb);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pb.running = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2008-09-22 12:07:34 +00:00
|
|
|
} // end of the _iSize loop
|
2008-10-07 00:59:12 +00:00
|
|
|
// ============
|
2008-09-22 12:07:34 +00:00
|
|
|
|
2008-08-16 21:58:07 +00:00
|
|
|
|
|
|
|
pb.src.cur_addr_frac = (u16)frac;
|
|
|
|
pb.audio_addr.cur_addr_hi = samplePos >> 16;
|
|
|
|
pb.audio_addr.cur_addr_lo = (u16)samplePos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < _iSize; i++)
|
|
|
|
{
|
|
|
|
// Clamp into 16-bit. Maybe we should add a volume compressor here.
|
|
|
|
int left = templbuffer[i];
|
|
|
|
int right = temprbuffer[i];
|
|
|
|
if (left < -32767) left = -32767;
|
|
|
|
if (left > 32767) left = 32767;
|
|
|
|
if (right < -32767) right = -32767;
|
|
|
|
if (right > 32767) right = 32767;
|
|
|
|
*_pBuffer++ += left;
|
|
|
|
*_pBuffer++ += right;
|
|
|
|
}
|
|
|
|
|
|
|
|
// write back out pbs
|
|
|
|
WriteBackPBs(PBs, numberOfPBs);
|
2008-10-09 04:00:47 +00:00
|
|
|
|
|
|
|
// write logging data to debugger again after the update
|
|
|
|
if(m_frame)
|
|
|
|
{
|
|
|
|
CUCode_AX::Logging(_pBuffer, _iSize, 1);
|
|
|
|
}
|
2008-08-16 21:58:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void CUCode_AX::Update()
|
|
|
|
{
|
|
|
|
// check if we have to sent something
|
|
|
|
if (!m_rMailHandler.IsEmpty())
|
|
|
|
{
|
|
|
|
g_dspInitialize.pGenerateDSPInterrupt();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// AX seems to bootup one task only and waits for resume-callbacks
|
|
|
|
// everytime the DSP has "spare time" it sends a resume-mail to the CPU
|
|
|
|
// and the __DSPHandler calls a AX-Callback which generates a new AXFrame
|
|
|
|
bool CUCode_AX::AXTask(u32& _uMail)
|
|
|
|
{
|
|
|
|
u32 uAddress = _uMail;
|
|
|
|
DebugLog("AXTask - AXCommandList-Addr: 0x%08x", uAddress);
|
|
|
|
|
|
|
|
u32 Addr__AXStudio;
|
|
|
|
u32 Addr__AXOutSBuffer;
|
|
|
|
u32 Addr__AXOutSBuffer_1;
|
|
|
|
u32 Addr__AXOutSBuffer_2;
|
|
|
|
u32 Addr__A;
|
|
|
|
u32 Addr__12;
|
|
|
|
u32 Addr__4_1;
|
|
|
|
u32 Addr__4_2;
|
|
|
|
u32 Addr__5_1;
|
|
|
|
u32 Addr__5_2;
|
|
|
|
u32 Addr__6;
|
|
|
|
u32 Addr__9;
|
|
|
|
|
|
|
|
bool bExecuteList = true;
|
|
|
|
|
|
|
|
while (bExecuteList)
|
|
|
|
{
|
|
|
|
static int last_valid_command = 0;
|
|
|
|
u16 iCommand = Memory_Read_U16(uAddress);
|
|
|
|
uAddress += 2;
|
|
|
|
switch (iCommand)
|
|
|
|
{
|
|
|
|
case AXLIST_STUDIOADDR: //00
|
|
|
|
Addr__AXStudio = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
if (wii_mode)
|
|
|
|
uAddress += 6;
|
|
|
|
DebugLog("AXLIST studio address: %08x", Addr__AXStudio);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x001:
|
|
|
|
{
|
|
|
|
u32 address = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
u16 param1 = Memory_Read_U16(uAddress);
|
|
|
|
uAddress += 2;
|
|
|
|
u16 param2 = Memory_Read_U16(uAddress);
|
|
|
|
uAddress += 2;
|
|
|
|
u16 param3 = Memory_Read_U16(uAddress);
|
|
|
|
uAddress += 2;
|
|
|
|
DebugLog("AXLIST 1: %08x, %04x, %04x, %04x", address, param1, param2, param3);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
//
|
|
|
|
// Somewhere we should be getting a bitmask of AX_SYNC values
|
|
|
|
// that tells us what has been updated
|
|
|
|
// Dunno if important
|
|
|
|
//
|
|
|
|
case AXLIST_PBADDR: //02
|
|
|
|
{
|
|
|
|
m_addressPBs = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
|
|
|
|
mixer_HLEready = true;
|
|
|
|
DebugLog("AXLIST PB address: %08x", m_addressPBs);
|
|
|
|
#ifdef _WIN32
|
|
|
|
DebugLog("Update the SoundThread to be in sync");
|
|
|
|
DSound::DSound_UpdateSound(); //do it in this thread to avoid sync problems
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x0003:
|
|
|
|
DebugLog("AXLIST command 0x0003 ????");
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x0004:
|
|
|
|
Addr__4_1 = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
Addr__4_2 = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
DebugLog("AXLIST 4_1 4_2 addresses: %08x %08x", Addr__4_1, Addr__4_2);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x0005:
|
|
|
|
Addr__5_1 = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
Addr__5_2 = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
DebugLog("AXLIST 5_1 5_2 addresses: %08x %08x", Addr__5_1, Addr__5_2);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x0006:
|
|
|
|
Addr__6 = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
DebugLog("AXLIST 6 address: %08x", Addr__6);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case AXLIST_SBUFFER:
|
|
|
|
// Hopefully this is where in main ram to write.
|
|
|
|
Addr__AXOutSBuffer = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
if (wii_mode) {
|
|
|
|
uAddress += 12;
|
|
|
|
}
|
|
|
|
DebugLog("AXLIST OutSBuffer address: %08x", Addr__AXOutSBuffer);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x0009:
|
|
|
|
Addr__9 = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
DebugLog("AXLIST 6 address: %08x", Addr__9);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case AXLIST_COMPRESSORTABLE: // 0xa
|
|
|
|
Addr__A = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
if (wii_mode) {
|
|
|
|
// There's one more here.
|
|
|
|
// uAddress += 4;
|
|
|
|
}
|
|
|
|
DebugLog("AXLIST CompressorTable address: %08x", Addr__A);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x000e:
|
|
|
|
Addr__AXOutSBuffer_1 = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
2008-10-03 18:59:57 +00:00
|
|
|
|
|
|
|
// Addr__AXOutSBuffer_2 is the address in RAM that we are supposed to mix to.
|
|
|
|
// Although we don't, currently.
|
2008-08-16 21:58:07 +00:00
|
|
|
Addr__AXOutSBuffer_2 = Memory_Read_U32(uAddress);
|
|
|
|
uAddress += 4;
|
|
|
|
DebugLog("AXLIST sbuf2 addresses: %08x %08x", Addr__AXOutSBuffer_1, Addr__AXOutSBuffer_2);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case AXLIST_END:
|
|
|
|
bExecuteList = false;
|
|
|
|
DebugLog("AXLIST end");
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x0010: //Super Monkey Ball 2
|
|
|
|
DebugLog("AXLIST unknown");
|
|
|
|
//should probably read/skip stuff here
|
|
|
|
uAddress += 8;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x0011:
|
|
|
|
uAddress += 4;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x0012:
|
|
|
|
Addr__12 = Memory_Read_U16(uAddress);
|
|
|
|
uAddress += 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x0013:
|
|
|
|
uAddress += 6 * 4; // 6 Addresses.
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x000d:
|
|
|
|
if (wii_mode) {
|
|
|
|
uAddress += 4 * 4; // 4 addresses. another aux?
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
// non-wii : fall through
|
|
|
|
|
|
|
|
case 0x000b:
|
|
|
|
if (wii_mode) {
|
|
|
|
uAddress += 2; // one 0x8000 in rabbids
|
|
|
|
uAddress += 4 * 2; // then two RAM addressses
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
// non-wii : fall through
|
|
|
|
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
static bool bFirst = true;
|
|
|
|
if (bFirst == true)
|
|
|
|
{
|
|
|
|
char szTemp[2048];
|
|
|
|
sprintf(szTemp, "Unknown AX-Command 0x%x (address: 0x%08x). Last valid: %02x\n",
|
|
|
|
iCommand, uAddress - 2, last_valid_command);
|
|
|
|
int num = -32;
|
|
|
|
while (num < 64+32)
|
|
|
|
{
|
|
|
|
char szTemp2[128] = "";
|
|
|
|
sprintf(szTemp2, "%s0x%04x\n", num == 0 ? ">>" : " ", Memory_Read_U16(uAddress + num));
|
|
|
|
strcat(szTemp, szTemp2);
|
|
|
|
num += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
PanicAlert(szTemp);
|
|
|
|
bFirst = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// unknown command so stop the execution of this TaskList
|
|
|
|
bExecuteList = false;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (bExecuteList)
|
|
|
|
last_valid_command = iCommand;
|
|
|
|
}
|
|
|
|
DebugLog("AXTask - done, send resume");
|
|
|
|
|
|
|
|
// i hope resume is okay AX
|
|
|
|
m_rMailHandler.PushMail(0xDCD10001);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CUCode_AX::ReadOutPBs(AXParamBlock* _pPBs, int _num)
|
|
|
|
{
|
|
|
|
int count = 0;
|
|
|
|
u32 blockAddr = m_addressPBs;
|
|
|
|
|
|
|
|
// reading and 'halfword' swap
|
|
|
|
for (int i = 0; i < _num; i++)
|
|
|
|
{
|
|
|
|
const short *pSrc = (const short *)g_dspInitialize.pGetMemoryPointer(blockAddr);
|
|
|
|
if (pSrc != NULL)
|
|
|
|
{
|
|
|
|
short *pDest = (short *)&_pPBs[i];
|
|
|
|
for (size_t p = 0; p < sizeof(AXParamBlock) / 2; p++)
|
|
|
|
{
|
|
|
|
pDest[p] = Common::swap16(pSrc[p]);
|
2008-10-06 18:40:34 +00:00
|
|
|
|
|
|
|
// To avoid a performance drop in the Release build I place this in the debug
|
|
|
|
// build only
|
2008-10-03 10:59:56 +00:00
|
|
|
#if defined(_DEBUG) || defined(DEBUGFAST)
|
|
|
|
gLastBlock = blockAddr + p*2 + 2; // save last block location
|
|
|
|
#endif
|
2008-08-16 21:58:07 +00:00
|
|
|
}
|
|
|
|
blockAddr = (_pPBs[i].next_pb_hi << 16) | _pPBs[i].next_pb_lo;
|
2008-10-03 10:59:56 +00:00
|
|
|
count++;
|
2008-08-16 21:58:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2008-10-09 04:00:47 +00:00
|
|
|
// return the number of read PBs
|
2008-08-16 21:58:07 +00:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CUCode_AX::WriteBackPBs(AXParamBlock* _pPBs, int _num)
|
|
|
|
{
|
|
|
|
u32 blockAddr = m_addressPBs;
|
|
|
|
|
|
|
|
// write back and 'halfword'swap
|
|
|
|
for (int i = 0; i < _num; i++)
|
|
|
|
{
|
|
|
|
short* pSrc = (short*)&_pPBs[i];
|
|
|
|
short* pDest = (short*)g_dspInitialize.pGetMemoryPointer(blockAddr);
|
|
|
|
for (size_t p = 0; p < sizeof(AXParamBlock) / 2; p++)
|
|
|
|
{
|
|
|
|
pDest[p] = Common::swap16(pSrc[p]);
|
|
|
|
}
|
|
|
|
|
|
|
|
// next block
|
|
|
|
blockAddr = (_pPBs[i].next_pb_hi << 16) | _pPBs[i].next_pb_lo;
|
|
|
|
}
|
|
|
|
}
|