From b09fe89be42e618ec3e643cb8a31b618c861ac6a Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Sun, 16 Nov 2014 16:45:24 +0100
Subject: [PATCH] Improvements in Jit compare UI

---
 UI/DevScreens.cpp | 52 ++++++++++++++++++++++++++++++++++++++++++-----
 UI/DevScreens.h   |  7 ++++++-
 native            |  2 +-
 3 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index 2220b16e3e..674e107dee 100644
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@@ -421,10 +421,15 @@ void JitCompareScreen::CreateViews() {
 
 	leftColumn->Add(new Choice("Current"))->OnClick.Handle(this, &JitCompareScreen::OnCurrentBlock);
 	leftColumn->Add(new Choice("By Address"))->OnClick.Handle(this, &JitCompareScreen::OnSelectBlock);
+	leftColumn->Add(new Choice("Prev"))->OnClick.Handle(this, &JitCompareScreen::OnPrevBlock);
+	leftColumn->Add(new Choice("Next"))->OnClick.Handle(this, &JitCompareScreen::OnNextBlock);
 	leftColumn->Add(new Choice("Random"))->OnClick.Handle(this, &JitCompareScreen::OnRandomBlock);
 	leftColumn->Add(new Choice("Random VFPU"))->OnClick.Handle(this, &JitCompareScreen::OnRandomVFPUBlock);
 	leftColumn->Add(new Choice(d->T("Back")))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
 	blockName_ = leftColumn->Add(new TextView("no block"));
+	blockAddr_ = leftColumn->Add(new TextEdit("", "", new LayoutParams(FILL_PARENT, WRAP_CONTENT)));
+	blockAddr_->OnTextChange.Handle(this, &JitCompareScreen::OnAddressChange);
+	blockStats_ = leftColumn->Add(new TextView(""));
 
 	EventParams ignore = {0};
 	OnCurrentBlock(ignore);
@@ -436,18 +441,23 @@ void JitCompareScreen::UpdateDisasm() {
 
 	using namespace UI;
 
-	if (currentBlock_ == -1) {
+	JitBlockCache *blockCache = MIPSComp::jit->GetBlockCache();
+
+	char temp[256];
+	snprintf(temp, sizeof(temp), "%i/%i", currentBlock_, blockCache->GetNumBlocks());
+	blockName_->SetText(temp);
+
+	if (currentBlock_ < 0 || currentBlock_ >= blockCache->GetNumBlocks()) {
 		leftDisasm_->Add(new TextView("No block"));
 		rightDisasm_->Add(new TextView("No block"));
+		blockStats_->SetText("");
 		return;
 	}
 
-	JitBlockCache *blockCache = MIPSComp::jit->GetBlockCache();
 	JitBlock *block = blockCache->GetBlock(currentBlock_);
 
-	char temp[256];
-	snprintf(temp, sizeof(temp), "%i/%i\n%08x", currentBlock_, blockCache->GetNumBlocks(), block->originalAddress);
-	blockName_->SetText(temp);
+	snprintf(temp, sizeof(temp), "%08x", block->originalAddress);
+	blockAddr_->SetText(temp);
 
 	// Alright. First generate the MIPS disassembly.
 	
@@ -467,6 +477,26 @@ void JitCompareScreen::UpdateDisasm() {
 	for (size_t i = 0; i < targetDis.size(); i++) {
 		rightDisasm_->Add(new TextView(targetDis[i]));
 	}
+
+	int numMips = leftDisasm_->GetNumSubviews();
+	int numHost = rightDisasm_->GetNumSubviews();
+
+	snprintf(temp, sizeof(temp), "%d to %d : %d%%", numMips, numHost, 100 * numHost / numMips);
+	blockStats_->SetText(temp);
+}
+
+UI::EventReturn JitCompareScreen::OnAddressChange(UI::EventParams &e) {
+	JitBlockCache *blockCache = MIPSComp::jit->GetBlockCache();
+	u32 addr;
+	if (blockAddr_->GetText().size() > 8)
+		return UI::EVENT_DONE;
+	if (1 == sscanf(blockAddr_->GetText().c_str(), "%08x", &addr)) {
+		if (Memory::IsValidAddress(addr)) {
+			currentBlock_ = blockCache->GetBlockNumberFromStartAddress(addr);
+			UpdateDisasm();
+		}
+	}
+	return UI::EVENT_DONE;
 }
 
 UI::EventReturn JitCompareScreen::OnSelectBlock(UI::EventParams &e) {
@@ -476,6 +506,18 @@ UI::EventReturn JitCompareScreen::OnSelectBlock(UI::EventParams &e) {
 	return UI::EVENT_DONE;
 }
 
+UI::EventReturn JitCompareScreen::OnPrevBlock(UI::EventParams &e) {
+	currentBlock_--;
+	UpdateDisasm();
+	return UI::EVENT_DONE;
+}
+
+UI::EventReturn JitCompareScreen::OnNextBlock(UI::EventParams &e) {
+	currentBlock_++;
+	UpdateDisasm();
+	return UI::EVENT_DONE;
+}
+
 UI::EventReturn JitCompareScreen::OnBlockAddress(UI::EventParams &e) {
 	JitBlockCache *blockCache = MIPSComp::jit->GetBlockCache();
 	if (Memory::IsValidAddress(e.a)) {
diff --git a/UI/DevScreens.h b/UI/DevScreens.h
index 0a1c475371..285f2fc34f 100644
--- a/UI/DevScreens.h
+++ b/UI/DevScreens.h
@@ -106,11 +106,16 @@ private:
 	UI::EventReturn OnRandomVFPUBlock(UI::EventParams &e);
 	UI::EventReturn OnCurrentBlock(UI::EventParams &e);
 	UI::EventReturn OnSelectBlock(UI::EventParams &e);
+	UI::EventReturn OnPrevBlock(UI::EventParams &e);
+	UI::EventReturn OnNextBlock(UI::EventParams &e);
 	UI::EventReturn OnBlockAddress(UI::EventParams &e);
+	UI::EventReturn OnAddressChange(UI::EventParams &e);
 
 	int currentBlock_;
 
-	UI::TextView *blockName_;	
+	UI::TextView *blockName_;
+	UI::TextEdit *blockAddr_;
+	UI::TextView *blockStats_;
 
 	UI::LinearLayout *leftDisasm_;	
 	UI::LinearLayout *rightDisasm_;	
diff --git a/native b/native
index 1e847f977d..ffee75fe5d 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 1e847f977d80ff427ec889eb03e0d8c4e56f29ee
+Subproject commit ffee75fe5da90812b3c0f3ce94913ea4092088ed