mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 06:39:46 -06:00
nakee's new logmanager. added a console window for windows builds (prints to parent console on non-win32). also fix some random wxw bugs: main window's position is saved when using debugger, disabling windows from the tools menu are saved settings, some other small fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2675 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -30,8 +30,8 @@ extern u32 m_addressPBs;
|
||||
bool AXTask(u32& _uMail)
|
||||
{
|
||||
u32 uAddress = _uMail;
|
||||
DebugLog("AXTask - ================================================================");
|
||||
DebugLog("AXTask - AXCommandList-Addr: 0x%08x", uAddress);
|
||||
DEBUG_LOG(DSPHLE, "AXTask - ================================================================");
|
||||
DEBUG_LOG(DSPHLE, "AXTask - AXCommandList-Addr: 0x%08x", uAddress);
|
||||
|
||||
bool bExecuteList = true;
|
||||
|
||||
@ -50,7 +50,7 @@ bool AXTask(u32& _uMail)
|
||||
case 0: // AXLIST_STUDIOADDR: //00
|
||||
{
|
||||
uAddress += 4;
|
||||
DebugLog("AXLIST AXLIST_SBUFFER: %08x", uAddress);
|
||||
DEBUG_LOG(DSPHLE, "AXLIST AXLIST_SBUFFER: %08x", uAddress);
|
||||
}
|
||||
break;
|
||||
// ---------------------------------------------------------------------------------------
|
||||
@ -61,7 +61,7 @@ bool AXTask(u32& _uMail)
|
||||
{
|
||||
m_addressPBs = Memory_Read_U32(uAddress);
|
||||
uAddress += 4;
|
||||
DebugLog("AXLIST PB address: %08x", m_addressPBs);
|
||||
DEBUG_LOG(DSPHLE, "AXLIST PB address: %08x", m_addressPBs);
|
||||
bExecuteList = false;
|
||||
}
|
||||
break;
|
||||
@ -71,7 +71,7 @@ bool AXTask(u32& _uMail)
|
||||
{
|
||||
// Hopefully this is where in main ram to write.
|
||||
uAddress += 4;
|
||||
DebugLog("AXLIST AXLIST_SBUFFER: %08x", uAddress);
|
||||
DEBUG_LOG(DSPHLE, "AXLIST AXLIST_SBUFFER: %08x", uAddress);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -81,7 +81,7 @@ bool AXTask(u32& _uMail)
|
||||
{
|
||||
// ---------------------------------------------------------------------------------------
|
||||
// Stop the execution of this TaskList
|
||||
DebugLog("AXLIST default: %08x", uAddress);
|
||||
DEBUG_LOG(DSPHLE, "AXLIST default: %08x", uAddress);
|
||||
bExecuteList = false;
|
||||
// ---------------------------------------------------------------------------------------
|
||||
}
|
||||
@ -89,8 +89,8 @@ bool AXTask(u32& _uMail)
|
||||
} // end of switch
|
||||
}
|
||||
|
||||
DebugLog("AXTask - done, send resume");
|
||||
DebugLog("AXTask - ================================================================");
|
||||
DEBUG_LOG(DSPHLE, "AXTask - done, send resume");
|
||||
DEBUG_LOG(DSPHLE, "AXTask - ================================================================");
|
||||
|
||||
// now resume
|
||||
return true;
|
||||
|
@ -30,7 +30,6 @@
|
||||
#include "Common.h"
|
||||
|
||||
#include "UCode_AXStructs.h" // they are only in a virtual dir called UCodes AX
|
||||
#include "ConsoleWindow.h" // For Console::Print, Console::ClearScreen
|
||||
// =====================
|
||||
|
||||
|
||||
@ -362,8 +361,8 @@ void Logging()
|
||||
// =======================================================================================
|
||||
// Print
|
||||
// ---------------
|
||||
Console::ClearScreen();
|
||||
Console::Print("%s", sbuff.c_str());
|
||||
// Console::ClearScreen();
|
||||
INFO_LOG(DSPHLE, "%s", sbuff.c_str());
|
||||
sbuff.clear(); strcpy(buffer, "");
|
||||
// ---------------
|
||||
k=0;
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include "CommonTypes.h" // Pluginspecs
|
||||
|
||||
#include "UCode_AXStructs.h" // For the AXParamBlock structure
|
||||
#include "ConsoleWindow.h" // For Console::Print, Console::ClearScreen
|
||||
|
||||
|
||||
u32 m_addressPBs = 0;
|
||||
@ -54,7 +53,7 @@ int ReadOutPBs(AXParamBlock * _pPBs, int _num)
|
||||
|
||||
// reading and 'halfword' swap
|
||||
n++;
|
||||
if (n > 20 && logall) {Console::ClearScreen();}
|
||||
//FIXME if (n > 20 && logall) {Console::ClearScreen();}
|
||||
for (int i = 0; i < _num; i++)
|
||||
{
|
||||
// ---------------------------------------------------------------------------------------
|
||||
@ -68,7 +67,7 @@ int ReadOutPBs(AXParamBlock * _pPBs, int _num)
|
||||
// Create a shortcut that let us update struct members
|
||||
short * pDest = (short *) & _pPBs[i];
|
||||
|
||||
if (n > 20 && logall) {Console::Print("%c%i:", 223, i);} // logging
|
||||
if (n > 20 && logall) {DEBUG_LOG(DSPHLE, "%c%i:", 223, i);} // logging
|
||||
|
||||
// --------------
|
||||
// Here we update the PB. We do it by going through all 192 / 2 = 96 u16 values
|
||||
@ -80,7 +79,7 @@ int ReadOutPBs(AXParamBlock * _pPBs, int _num)
|
||||
{
|
||||
if (pSrc[p] != 0 && n > 20 && logall)
|
||||
{
|
||||
Console::Print("%i %04x | ", p, Common::swap16(pSrc[p]));
|
||||
DEBUG_LOG(DSPHLE, "%i %04x | ", p, Common::swap16(pSrc[p]));
|
||||
}
|
||||
}
|
||||
|
||||
@ -88,7 +87,7 @@ int ReadOutPBs(AXParamBlock * _pPBs, int _num)
|
||||
|
||||
}
|
||||
|
||||
if(n > 20 && logall) {Console::Print("\n");} // logging
|
||||
if(n > 20 && logall) {DEBUG_LOG(DSPHLE, "\n");} // logging
|
||||
// --------------
|
||||
// Here we update the block address to the starting point of the next PB
|
||||
blockAddr = (_pPBs[i].next_pb_hi << 16) | _pPBs[i].next_pb_lo;
|
||||
|
Reference in New Issue
Block a user