Merge pull request #602 from lioncash/lax-addr-box

DolphinWX: Allow short-hand searching in the code window
dolphin-emu · Jul 11, 2014 · 99d4ab0 · 99d4ab0
2 parents dc526aa + 26f3867
commit 99d4ab0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp
@@ -195,10 +195,18 @@ void CCodeWindow::OnCodeStep(wxCommandEvent& event)
 	Parent->UpdateGUI();
 }
 
-void CCodeWindow::JumpToAddress(u32 _Address)
+bool CCodeWindow::JumpToAddress(u32 address)
 {
-	codeview->Center(_Address);
-	UpdateLists();
+	// Jump to anywhere in memory
+	if (address <= 0xFFFFFFFF)
+	{
+		codeview->Center(address);
+		UpdateLists();
+
+		return true;
+	}
+
+	return false;
 }
 
 void CCodeWindow::OnCodeViewChange(wxCommandEvent &event)
@@ -208,20 +216,27 @@ void CCodeWindow::OnCodeViewChange(wxCommandEvent &event)
 
 void CCodeWindow::OnAddrBoxChange(wxCommandEvent& event)
 {
-	if (!GetToolBar()) return;
+	if (!GetToolBar())
+		return;
 
 	wxTextCtrl* pAddrCtrl = (wxTextCtrl*)GetToolBar()->FindControl(IDM_ADDRBOX);
-	wxString txt = pAddrCtrl->GetValue();
+	wxString txt = pAddrCtrl->GetValue().Strip(wxString::stripType::both);
 
-	std::string text(WxStrToStr(txt));
-	text = StripSpaces(text);
-	if (text.size() == 8)
+	bool success = false;
+	unsigned long addr;
+	if (txt.ToULong(&addr, 16))
 	{
-		u32 addr;
-		sscanf(text.c_str(), "%08x", &addr);
-		JumpToAddress(addr);
+		if (JumpToAddress(addr))
+			success = true;
 	}
 
+	if (success)
+		pAddrCtrl->SetBackgroundColour(wxNullColour);
+	else
+		pAddrCtrl->SetBackgroundColour(*wxRED);
+
+	pAddrCtrl->Refresh();
+
 	event.Skip();
 }
 

diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h
@@ -60,7 +60,7 @@ class CCodeWindow
 		bool AutomaticStart();
 		bool JITNoBlockCache();
 		bool JITBlockLinking();
-		void JumpToAddress(u32 _Address);
+		bool JumpToAddress(u32 address);
 
 		void Update() override;
 		void NotifyMapLoaded();