preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove unused code in ImMemView

Browse Source
This commit is contained in:
fcrwr
2026-02-27 14:35:48 +05:00
parent dd92f82464
commit 50690e3e4d
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/ImDebugger/ImMemView.cpp
+3 -11
View File
@@ -21,7 +21,7 @@
#include "UI/ImDebugger/ImDebugger.h"
#include "UI/ImDebugger/ImMemView.h"
static const char* searchtypes[] = {"u8", "u16", "u32", "u64", "float", "string", "string16","bytesequence"};
static const char* searchtypes[] = {"u8", "u16", "u32", "u64", "float", "string", "string16", "bytesequence"};
ImMemView::ImMemView() {
windowStart_ = curAddress_;
@@ -156,7 +156,7 @@ void ImMemView::Draw(ImDrawList *drawList) {
const ImColor zeroColor = 0x888888ff;
const ImColor searchResBg = 0xFF108010;
if (address + j >= selectRangeStart_ && address + j < selectRangeEnd_ && !memSearch_.searching) {
if (address + j >= selectRangeStart_ && address + j < selectRangeEnd_) {
if (asciiSelected_) {
hexBGCol = secondarySelBg;
hexTextCol = secondarySelFg;
@@ -174,7 +174,7 @@ void ImMemView::Draw(ImDrawList *drawList) {
continueRect = true;
}
} else if (!tag.empty()) {
if (memSearch_.status == SEARCH_OK && address+j>= memSearch_.matchAddress && address +j < memSearch_.matchAddress + memSearch_.data.size() && !memSearch_.searching) {
if (memSearch_.status == SEARCH_OK && address+j >= memSearch_.matchAddress && address +j < memSearch_.matchAddress + memSearch_.data.size()) {
hexBGCol = searchResBg;
} else {
hexBGCol = pickTagColor(tag);
@@ -860,7 +860,6 @@ MemorySearchStatus ImMemView::search(bool continueSearch) {
memoryAreas.emplace_back(PSP_GetKernelMemoryBase(), PSP_GetUserMemoryEnd());
memoryAreas.emplace_back(PSP_GetScratchpadMemoryBase(), PSP_GetScratchpadMemoryEnd());
memSearch_.searching = true;
// NOTE:
// this currently stops at the first found value
// we could look for all matches
@@ -887,14 +886,8 @@ MemorySearchStatus ImMemView::search(bool continueSearch) {
int index = memSearch_.searchAddress - memSearch_.segmentStart;
int endIndex = memSearch_.segmentEnd - memSearch_.segmentStart - size;
while (index < endIndex) {
// cancel search
if ((index % 256) == 0 && ImGui::IsKeyDown(ImGuiKey_Escape)) {
memSearch_.searching = false;
return SEARCH_CANCEL;
}
if (memcmp(&dataPointer[index], data, size) == 0) {
memSearch_.matchAddress = index + memSearch_.segmentStart;
memSearch_.searching = false;
gotoAddr(memSearch_.matchAddress);
return SEARCH_OK;
}
@@ -903,7 +896,6 @@ MemorySearchStatus ImMemView::search(bool continueSearch) {
}
statusMessage_ = "Not found";
memSearch_.searching = false;
return SEARCH_NOTFOUND;
}
UI/ImDebugger/ImMemView.h
+3 -4
View File
@@ -18,8 +18,9 @@ enum CommonToggles {
Off,
};
enum MemorySearchStatus {SEARCH_PSP_NOT_INIT=-1, SEARCH_INITIAL, SEARCH_OK, SEARCH_NOTFOUND, SEARCH_CANCEL};
enum MemorySearchType {BITS_8, BITS_16, BITS_32, BITS_64, FLOAT_32, STRING, STRING_16, BYTE_SEQ};
enum MemorySearchStatus {SEARCH_PSP_NOT_INIT=-1, SEARCH_INITIAL, SEARCH_OK, SEARCH_NOTFOUND};
enum MemorySearchType {BITS_8, BITS_16, BITS_32, BITS_64, FLOAT_32, STRING, STRING_16, BYTE_SEQ};
class ImMemView {
public:
ImMemView();
@@ -85,7 +86,6 @@ private:
u32 matchAddress = 0xFFFFFFFF;
u32 segmentStart;
u32 segmentEnd;
bool searching;
MemorySearchStatus status = SEARCH_INITIAL;
} memSearch_{};
@@ -210,7 +210,6 @@ private:
char searchStr_[512];
// store the state of the search form
ImMemView memView_;
char searchTerm_[64]{};
u32 gotoAddr_ = 0x08800000;
};