Merge branch 'main' into main

malucard · web-flow · commit 4104ab093d45 · 2025-02-26T19:10:33.000-03:00
diff --git a/.gitignore b/.gitignore
@@ -124,3 +124,9 @@ luacov.stats.out
 /lua
 /lua_modules
 /.luarocks
+
+# appimage build files
+/appimage-build
+/AppDir
+/*.AppImage
+/*.AppImage.zsync
diff --git a/src/core/r3000a.cc b/src/core/r3000a.cc
@@ -34,6 +34,7 @@
 #include "core/sio.h"
 #include "core/sio1.h"
 #include "core/spu.h"
+#include "supportpsx/memory.h"
 #include "fmt/format.h"
 
 int PCSX::R3000Acpu::psxInit() {
@@ -502,3 +503,28 @@ void PCSX::R3000Acpu::processB0KernelCall(uint32_t call) {
         }
     }
 }
+
+std::pair<const uint32_t, std::string>* PCSX::R3000Acpu::findContainingSymbol(uint32_t addr) {
+    auto symBefore = m_symbols.upper_bound(addr);
+    if (symBefore != m_symbols.begin()) { // verify there is actually a symbol before addr
+        symBefore--;
+        if (symBefore->first != addr) {
+            PCSX::PSXAddress addrInfo(addr);
+            PCSX::PSXAddress symbolInfo(symBefore->first);
+            if (addrInfo.segment != symbolInfo.segment) {
+                // if the symbol is different and not in the same memory region, it'd be wrong
+                return nullptr;
+            }
+        }
+        return &*symBefore;
+    }
+    return nullptr;
+}
+
+std::string* PCSX::R3000Acpu::getSymbolAt(uint32_t addr) {
+    auto symBefore = m_symbols.find(addr);
+    if (symBefore != m_symbols.end()) {
+        return &symBefore->second;
+    }
+    return nullptr;
+}
diff --git a/src/core/r3000a.h b/src/core/r3000a.h
@@ -290,6 +290,9 @@ class R3000Acpu {
 
     std::map<uint32_t, std::string> m_symbols;
 
+	std::pair<const uint32_t, std::string>* findContainingSymbol(uint32_t addr);
+	std::string* getSymbolAt(uint32_t addr);
+
     static int psxInit();
     virtual bool isDynarec() = 0;
     void psxReset();
diff --git a/src/gui/widgets/assembly.cc b/src/gui/widgets/assembly.cc
@@ -302,8 +302,8 @@ void PCSX::Widgets::Assembly::Target(uint32_t value) {
     if (m_displayArrowForJumps) m_arrows.push_back({m_currentAddr, value});
     std::snprintf(label, sizeof(label), "0x%8.8x##%8.8x", value, m_currentAddr);
     std::string longLabel = label;
-    auto symbols = findSymbol(value);
-    if (symbols.size() != 0) longLabel = *symbols.begin() + " ;" + label;
+    std::string* symbol = g_emulator->m_cpu->getSymbolAt(value);
+    if (symbol) longLabel = *symbol + " ;" + label;
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
     if (ImGui::Button(longLabel.c_str())) {
         m_jumpToPC = value;
@@ -366,8 +366,8 @@ void PCSX::Widgets::Assembly::OfB(int16_t offset, uint8_t reg, int size) {
     uint32_t addr = m_registers->GPR.r[reg] + offset;
 
     std::string longLabel;
-    auto symbols = findSymbol(addr);
-    if (symbols.size() != 0) longLabel = *symbols.begin() + " ; ";
+    std::string* symbol = g_emulator->m_cpu->getSymbolAt(addr);
+    if (symbol) longLabel = *symbol + " ; ";
 
     const auto& io = ImGui::GetIO();
     unsigned targetEditorIndex = io.KeyShift ? 1 : (io.KeyCtrl ? 2 : 0);
@@ -405,17 +405,17 @@ void PCSX::Widgets::Assembly::BranchDest(uint32_t value) {
     sameLine();
     m_arrows.push_back({m_currentAddr, value});
     std::snprintf(label, sizeof(label), "0x%8.8x##%8.8x", value, m_currentAddr);
-    auto symbols = findSymbol(value);
-    if (symbols.size() == 0) {
+    std::string* symbol = g_emulator->m_cpu->getSymbolAt(value);
+    if (symbol) {
+        std::string longLabel = *symbol + " ;" + label;
         ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-        if (ImGui::Button(label)) {
+        if (ImGui::Button(longLabel.c_str())) {
             m_jumpToPC = value;
         }
         ImGui::PopStyleVar();
     } else {
-        std::string longLabel = *symbols.begin() + " ;" + label;
         ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
-        if (ImGui::Button(longLabel.c_str())) {
+        if (ImGui::Button(label)) {
             m_jumpToPC = value;
         }
         ImGui::PopStyleVar();
@@ -427,8 +427,8 @@ void PCSX::Widgets::Assembly::Offset(uint32_t addr, int size) {
     char label[32];
     std::snprintf(label, sizeof(label), "0x%8.8x##%8.8x", addr, m_currentAddr);
     std::string longLabel = label;
-    auto symbols = findSymbol(addr);
-    if (symbols.size() != 0) longLabel = *symbols.begin() + " ;" + label;
+    std::string* symbol = g_emulator->m_cpu->getSymbolAt(addr);
+    if (symbol) longLabel = *symbol + " ;" + label;
 
     const auto& io = ImGui::GetIO();
     unsigned targetEditorIndex = io.KeyShift ? 1 : (io.KeyCtrl ? 2 : 0);
@@ -598,6 +598,10 @@ settings, otherwise debugging features may not work.)");
     bool openAssembler = false;
     bool openSymbolAdder = false;
 
+    float lineHeight = ImGui::GetTextLineHeight();
+    float previousSymbolY = topleft.y;
+    std::optional<std::string> previousSymbol;
+
     while (clipper.Step()) {
         bool skipNext = false;
         bool delaySlotNext = false;
@@ -676,11 +680,23 @@ settings, otherwise debugging features may not work.)");
                 tcode >>= 8;
                 b[3] = tcode & 0xff;
 
-                auto symbols = findSymbol(dispAddr);
-                if (symbols.size() != 0) {
-                    ImGui::PushStyleColor(ImGuiCol_Text, s_labelColor);
-                    ImGui::Text("%s:", symbols.begin()->c_str());
-                    ImGui::PopStyleColor();
+                std::pair<const uint32_t, std::string>* symbol = cpu->findContainingSymbol(dispAddr);
+                if (symbol) {
+                    if (symbol->first == dispAddr) {
+                        ImGui::PushStyleColor(ImGuiCol_Text, s_labelColor);
+                        ImGui::Text("%s:", symbol->second.c_str());
+                        ImGui::PopStyleColor();
+                    } else {
+                        // if this is the first visible line and it's not a label itself, store the previous symbol
+                        float y = ImGui::GetCursorScreenPos().y;
+                        if (y + lineHeight >= topleft.y && y <= topleft.y + lineHeight) {
+                            previousSymbol = symbol->second;
+                            // if the second visible line is a symbol, push the previous symbol display up
+                            if (cpu->getSymbolAt(dispAddr + 4) && y < previousSymbolY) {
+                                previousSymbolY = y;
+                            }
+                        }
+                    }
                 }
 
                 for (int i = 0; i < m_numColumns * ImGui::GetWindowDpiScale(); i++) {
@@ -750,15 +766,15 @@ settings, otherwise debugging features may not work.)");
                 }
                 std::string contextMenuID = fmt::format("assembly address menu {}", dispAddr);
                 if (ImGui::BeginPopupContextItem(contextMenuID.c_str())) {
-                    if (symbols.size() == 0) {
+                    if (symbol) {
+                        if (ImGui::MenuItem(_("Remove symbol"))) {
+                            cpu->m_symbols.erase(dispAddr);
+                        }
+                    } else {
                         if (ImGui::MenuItem(_("Create symbol here"))) {
                             openSymbolAdder = true;
                             m_symbolAddress = dispAddr;
                         }
-                    } else {
-                        if (ImGui::MenuItem(_("Remove symbol"))) {
-                            cpu->m_symbols.erase(dispAddr);
-                        }
                     }
                     if (ImGui::MenuItem(_("Copy Address"))) {
                         char fmtAddr[10];
@@ -938,6 +954,13 @@ settings, otherwise debugging features may not work.)");
         }
     }
     drawList->ChannelsMerge();
+    if (previousSymbol) {
+        ImVec2 pos(ImGui::GetCursorScreenPos().x, previousSymbolY);
+        ImVec2 posEnd(pos.x + glyphWidth * 64, pos.y + ImGui::GetTextLineHeight());
+        drawList->AddRectFilled(pos, posEnd, ImGui::GetColorU32(ImGuiCol_WindowBg));
+        std::string text = "^ " + previousSymbol.value() + " ^";
+        drawList->AddText(pos, ImGui::GetColorU32(s_labelColor), text.data(), text.data() + text.size());
+    }
     ImGui::EndChild();
     ImGui::PopFont();
     if (m_jumpToPC.has_value()) {
@@ -1078,7 +1101,7 @@ if not success then return msg else return nil end
 
     if (m_showSymbols) {
         if (ImGui::Begin(_("Symbols"), &m_showSymbols)) {
-            if (ImGui::Button(_("Refresh"))) rebuildSymbolsCaches();
+            if (ImGui::Button(_("Refresh"))) rebuildSymbolsCache();
             ImGui::SameLine();
             ImGui::InputText(_("Filter"), &m_symbolFilter);
             ImGui::BeginChild("symbolsList");
@@ -1114,24 +1137,11 @@ if not success then return msg else return nil end
     return changed;
 }
 
-std::list<std::string> PCSX::Widgets::Assembly::findSymbol(uint32_t addr) {
-    auto& cpu = g_emulator->m_cpu;
-    std::list<std::string> ret;
-    auto symbol = cpu->m_symbols.find(addr);
-    if (symbol != cpu->m_symbols.end()) ret.emplace_back(symbol->second);
-
-    if (!m_symbolsCachesValid) rebuildSymbolsCaches();
-    auto elfSymbol = m_elfSymbolsCache.find(addr);
-    if (elfSymbol != m_elfSymbolsCache.end()) ret.emplace_back(elfSymbol->second);
-
-    return ret;
-}
-
-void PCSX::Widgets::Assembly::rebuildSymbolsCaches() {
+void PCSX::Widgets::Assembly::rebuildSymbolsCache() {
     auto& cpu = g_emulator->m_cpu;
     m_symbolsCache.clear();
     for (auto& symbol : cpu->m_symbols) {
         m_symbolsCache.insert(std::pair(symbol.second, symbol.first));
     }
-    m_symbolsCachesValid = true;
+    m_symbolsCacheValid = true;
 }
diff --git a/src/gui/widgets/assembly.h b/src/gui/widgets/assembly.h
@@ -110,12 +110,10 @@ class Assembly : private Disasm {
         uint32_t addr;
     };
 
-    std::list<std::string> findSymbol(uint32_t addr);
     std::map<std::string, uint32_t> m_symbolsCache;
-    std::map<uint32_t, std::string> m_elfSymbolsCache;
-    bool m_symbolsCachesValid = false;
+    bool m_symbolsCacheValid = false;
 
-    void rebuildSymbolsCaches();
+    void rebuildSymbolsCache();
     void addMemoryEditorContext(uint32_t addr, int size);
     void addMemoryEditorSubMenu(uint32_t addr, int size);
 
diff --git a/src/supportpsx/iec-60908b.h b/src/supportpsx/iec-60908b.h
@@ -159,7 +159,7 @@ struct fmt::formatter<PCSX::IEC60908b::MSF> {
     }
 
     template <typename FormatContext>
-    auto format(PCSX::IEC60908b::MSF const &msf, FormatContext &ctx) {
+    auto format(PCSX::IEC60908b::MSF const &msf, FormatContext &ctx) const {
         return fmt::format_to(ctx.out(), "{0:02}:{1:02}:{2:02}", msf.m, msf.s, msf.f);
     }
 };
diff --git a/tools/ghidra_scripts/OverlayReduxSymbols.java b/tools/ghidra_scripts/OverlayReduxSymbols.java
@@ -1,6 +1,6 @@
 // Exports symbols to PCSX-Redux's symbols map including Overlays filtering
+//@author Nicolas "Pixel" Noble
 //@author acemon33
-//@category PSX
 
 import ghidra.app.script.GhidraScript;
 import ghidra.program.model.symbol.*;
@@ -15,12 +15,9 @@
 public class OverlayReduxSymbols extends GhidraScript {
 
     public void run() throws Exception {
-        MemoryBlock[] MemoryBlockList = state.getCurrentProgram().getMemory().getBlocks();
-        List<String> choices = new ArrayList();
-        for (int i = 0; i < MemoryBlockList.length; i++) { if (MemoryBlockList[i].isOverlay()) choices.add(MemoryBlockList[i].getName()); }
-        List<String> filterList = askChoices("Title", "Message", choices);
-        List<String> choiceList = new ArrayList();
-        for (String e : choices) { choiceList.add(e + "::"); choiceList.add(e + "__"); }
+        List<String> options = this.getMemoryBlockOptions();
+        List<String> filterList = askChoices("Title", "Message", options);
+        List<String> choiceList = this.getOptionList(options);
         
         List<String> symbols = new ArrayList<String>();
         SymbolTable st = state.getCurrentProgram().getSymbolTable();
@@ -31,15 +28,28 @@ public void run() throws Exception {
             String name = sym.getName(true);
             
             boolean hasFilter = true;
-            for (String s : filterList) { if (add.toString().contains(s)) { hasFilter = false; break; } }
+            for (String s : filterList) {
+                if (add.toString().contains(s)) {
+                    hasFilter = false;
+                    break;
+                }
+            }
             if (hasFilter)
             {
                 boolean isNext = false;
-                for (String s : choiceList) { if (add.toString().contains(s)) { isNext = true; break; } }
-                if (isNext) continue;
+                for (String s : choiceList) {
+                    if (add.toString().contains(s)) {
+                        isNext = true;
+                        break;
+                    }
+                }
+                if (isNext)
+                    continue;
             }
 
             symbols.add(String.format("%08x %s", add.getOffset(), name));
+            // symbols.add(String.format("%s %s", add, name));
+            // println(String.format("%s %s", add, name));
         }
 
         HttpClient client = HttpClient.newHttpClient();
@@ -50,6 +60,26 @@ public void run() throws Exception {
 
         client.send(request, HttpResponse.BodyHandlers.ofString());
     
+        // for (String address : symbols) println(address);
         println("size: " + symbols.size());
     }
+
+    private List<String> getMemoryBlockOptions() {
+        MemoryBlock[] MemoryBlockList = state.getCurrentProgram().getMemory().getBlocks();
+        List<String> options = new ArrayList();
+        for (int i = 0; i < MemoryBlockList.length; i++) {
+            if (MemoryBlockList[i].isOverlay())
+                options.add(MemoryBlockList[i].getName());
+        }
+        return options;
+    }
+
+    private List<String> getOptionList(List<String> options) {
+        List<String> resultList = new ArrayList();
+        for (String e : options) {
+            resultList.add(e + "::");
+            resultList.add(e + "__");
+            }
+        return resultList;
+    }
 }
diff --git a/tools/ghidra_scripts/OverlaysImporter.java b/tools/ghidra_scripts/OverlaysImporter.java
diff --git a/tools/ghidra_scripts/export_overlay_to_redux.py b/tools/ghidra_scripts/export_overlay_to_redux.py

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ struct fmt::formatter<PCSX::IEC60908b::MSF> {`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`template <typename FormatContext>`
`162`		`- auto format(PCSX::IEC60908b::MSF const &msf, FormatContext &ctx) {`
	`162`	`+ auto format(PCSX::IEC60908b::MSF const &msf, FormatContext &ctx) const {`
`163`	`163`	`return fmt::format_to(ctx.out(), "{0:02}:{1:02}:{2:02}", msf.m, msf.s, msf.f);`
`164`	`164`	`}`
`165`	`165`	`};`