From 7b83640a28010a8a6d5d3aab4da20fe75f3f94b2 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 2 Aug 2010 05:30:38 +0000 Subject: [PATCH] make "show pc" in dsp lle debugger actually work again code cleanup in Hash.cpp git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6033 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Hash.cpp | 15 --------------- .../Src/Debugger/DSPDebugWindow.cpp | 9 +-------- .../Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h | 1 - 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/Source/Core/Common/Src/Hash.cpp b/Source/Core/Common/Src/Hash.cpp index 406690464e..3f4602ecdc 100644 --- a/Source/Core/Common/Src/Hash.cpp +++ b/Source/Core/Common/Src/Hash.cpp @@ -105,21 +105,6 @@ u32 HashFNV(const u8* ptr, int length) } -// Another fast and decent hash -u32 HashFNV1(const u8* ptr, int length) -{ - u32 hash = 0x811c9dc5; - - for (int i = 0; i < length; i++) - { - hash *= 1677761; - hash ^= ptr[i]; - } - - return(hash); -} - - // Stupid hash - but can't go back now :) // Don't use for new things. At least it's reasonably fast. u32 HashEctor(const u8* ptr, int length) diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.cpp index cacdfa7a9f..155d0302c5 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.cpp @@ -36,8 +36,7 @@ DSPDebuggerLLE* m_DebuggerFrame = NULL; BEGIN_EVENT_TABLE(DSPDebuggerLLE, wxPanel) EVT_CLOSE(DSPDebuggerLLE::OnClose) - EVT_MENU_RANGE(ID_RUNTOOL, ID_STEPTOOL, DSPDebuggerLLE::OnChangeState) - EVT_MENU(ID_SHOWPCTOOL, DSPDebuggerLLE::OnShowPC) + EVT_MENU_RANGE(ID_RUNTOOL, ID_SHOWPCTOOL, DSPDebuggerLLE::OnChangeState) EVT_TEXT_ENTER(ID_ADDRBOX, DSPDebuggerLLE::OnAddrBoxChange) EVT_LISTBOX(ID_SYMBOLLIST, DSPDebuggerLLE::OnSymbolListChange) END_EVENT_TABLE() @@ -155,12 +154,6 @@ void DSPDebuggerLLE::OnChangeState(wxCommandEvent& event) m_mgr.Update(); } -void DSPDebuggerLLE::OnShowPC(wxCommandEvent& event) -{ - // UpdateDisAsmListView will focus on PC - Refresh(); -} - void DSPDebuggerLLE::Refresh() { #ifdef __linux__ diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h b/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h index d71f89035c..1d256e562f 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h +++ b/Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.h @@ -90,7 +90,6 @@ private: void OnClose(wxCloseEvent& event); void OnChangeState(wxCommandEvent& event); - void OnShowPC(wxCommandEvent& event); void OnRightClick(wxListEvent& event); void OnDoubleClick(wxListEvent& event); void OnAddrBoxChange(wxCommandEvent& event);