ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hopefully make the callstack more accurate 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2398 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-02-23 21:27:58 +00:00
parent 042034f199
commit 541a10b2fc
2 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Source/Core/DebuggerWX/Src/CodeWindow.cpp
View File

@ -687,7 +687,6 @@ void CCodeWindow::OnCodeStep(wxCommandEvent& event)
case IDM_DEBUG_GO:
{
// [F|RES] prolly we should disable the other buttons in go mode too ...
JumpToAddress(PC);
if (CCPU::IsStepping())
{
@ -698,7 +697,8 @@ void CCodeWindow::OnCodeStep(wxCommandEvent& event)
CCPU::EnableStepping(true); // Break
Host_UpdateLogDisplay();
}
wxThread::Sleep(20);
JumpToAddress(PC);
Update();
}
break;
@ -737,36 +737,6 @@ void CCodeWindow::JumpToAddress(u32 _Address)
}
void CCodeWindow::UpdateLists()
{
callers->Clear();
u32 addr = codeview->GetSelection();
Symbol *symbol = g_symbolDB.GetSymbolFromAddr(addr);
if (!symbol)
return;
for (int i = 0; i < (int)symbol->callers.size(); i++)
{
u32 caller_addr = symbol->callers[i].callAddress;
Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr);
if (caller_symbol) {
int idx = callers->Append(wxString::Format( wxT("< %s (%08x)"), caller_symbol->name.c_str(), caller_addr));
callers->SetClientData(idx, (void*)caller_addr);
}
}
calls->Clear();
for (int i = 0; i < (int)symbol->calls.size(); i++)
{
u32 call_addr = symbol->calls[i].function;
Symbol *call_symbol = g_symbolDB.GetSymbolFromAddr(call_addr);
if (call_symbol) {
int idx = calls->Append(wxString::Format(_T("> %s (%08x)"), call_symbol->name.c_str(), call_addr));
calls->SetClientData(idx, (void*)call_addr);
}
}
}
void CCodeWindow::OnCodeViewChange(wxCommandEvent &event)
{
//PanicAlert("boo");
@ -832,9 +802,37 @@ void CCodeWindow::SingleCPUStep()
Host_UpdateLogDisplay();
}
void CCodeWindow::Update()
void CCodeWindow::UpdateLists()
{
callers->Clear();
u32 addr = codeview->GetSelection();
Symbol *symbol = g_symbolDB.GetSymbolFromAddr(addr);
if (!symbol)
return;
for (int i = 0; i < (int)symbol->callers.size(); i++)
{
u32 caller_addr = symbol->callers[i].callAddress;
Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr);
if (caller_symbol) {
int idx = callers->Append(wxString::Format( wxT("< %s (%08x)"), caller_symbol->name.c_str(), caller_addr));
callers->SetClientData(idx, (void*)caller_addr);
}
}
calls->Clear();
for (int i = 0; i < (int)symbol->calls.size(); i++)
{
u32 call_addr = symbol->calls[i].function;
Symbol *call_symbol = g_symbolDB.GetSymbolFromAddr(call_addr);
if (call_symbol) {
int idx = calls->Append(wxString::Format(_T("> %s (%08x)"), call_symbol->name.c_str(), call_addr));
calls->SetClientData(idx, (void*)call_addr);
}
}
}
void CCodeWindow::UpdateCallstack()
{
codeview->Refresh();
callstack->Clear();
std::vector<Debugger::CallstackEntry> stack;
@ -851,7 +849,13 @@ void CCodeWindow::Update()
{
callstack->Append(wxString::FromAscii("invalid callstack"));
}
}
void CCodeWindow::Update()
{
codeview->Refresh();
UpdateCallstack();
UpdateButtonStates();
/* DO NOT Automatically show the current PC position when a breakpoint is hit or

1
Source/Core/DebuggerWX/Src/CodeWindow.h
View File

@ -214,6 +214,7 @@ class CCodeWindow
void UpdateButtonStates();
void UpdateLists();
void UpdateCallstack();
void RecreateToolbar();
void PopulateToolbar(wxToolBar* toolBar);
void OnStatusBar(wxMenuEvent& event); void OnStatusBar_(wxUpdateUIEvent& event);