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

DebugData: Remove stack getters

Browse Source 
They're not used and the naming is confused, we can readd these if we
actually want to use them.
This commit is contained in:
Ziemas
2026-04-23 22:11:52 +02:00
committed by Ty
parent 86c5d2ae2a
commit a1a3cd9d1b
6 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2-qt/Debugger/DebuggerWindow.cpp
+1 -2
View File
@@ -525,8 +525,7 @@ void DebuggerWindow::onStepOut()
cpu->getPC(),
cpu->getRegister(0, 31),
cpu->getRegister(0, 29),
thread->EntryPoint(),
thread->StackTop());
thread->EntryPoint());
break;
}
}
pcsx2/DebugTools/BiosDebugData.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ std::vector<std::unique_ptr<BiosThread>> getIOPThreads()
return {};
}
data.stackBottom = iopMemRead32(item + 0x3c);
data.stacMem = iopMemRead32(item + 0x3c);
data.stackSize = iopMemRead32(item + 0x40);
data.status = iopMemRead8(item + 0xc);
data.tid = iopMemRead16(item + 0xa);
pcsx2/DebugTools/BiosDebugData.h
+2 -5
View File
@@ -48,7 +48,7 @@ struct EEInternalThread
u32 entry;
int argc;
u32 argstring;
u32 stackBottom;
u32 stackMem;
int stackSize;
u32 root;
u32 heap_base;
@@ -59,7 +59,7 @@ struct IOPInternalThread
{
u32 tid;
u32 PC;
u32 stackBottom;
u32 stacMem;
u32 stackSize;
u32 regCtx;
u32 status;
@@ -109,7 +109,6 @@ public:
[[nodiscard]] virtual WaitState Wait() const = 0;
[[nodiscard]] virtual u32 WaitId() const = 0;
[[nodiscard]] virtual u32 EntryPoint() const = 0;
[[nodiscard]] virtual u32 StackTop() const = 0;
[[nodiscard]] virtual u32 Priority() const = 0;
// Only call RegCtx on threads that aren't running
@@ -145,7 +144,6 @@ public:
};
[[nodiscard]] u32 WaitId() const override { return data.semaId; };
[[nodiscard]] u32 EntryPoint() const override { return data.entry; };
[[nodiscard]] u32 StackTop() const override { return data.stackBottom + data.stackSize; };
[[nodiscard]] u32 Priority() const override { return data.currentPriority; };
[[nodiscard]] u32 RegCtx() const override { return data.regCtx; };
@@ -190,7 +188,6 @@ public:
};
[[nodiscard]] u32 WaitId() const override { return data.waitId; };
[[nodiscard]] u32 EntryPoint() const override { return data.entrypoint; };
[[nodiscard]] u32 StackTop() const override { return data.stackBottom + data.stackSize; };
[[nodiscard]] u32 Priority() const override { return data.initPriority; };
[[nodiscard]] u32 RegCtx() const override { return data.regCtx; };
pcsx2/DebugTools/DebugInterface.cpp
+4 -4
View File
@@ -713,7 +713,7 @@ std::vector<MipsStackWalk::StackFrame> R5900DebugInterface::StackTrace(const Bio
if (thread.Status() == ThreadStatus::THS_RUN)
{
return MipsStackWalk::Walk(this, getPC(), getRegister(0, 31), getRegister(0, 29),
thread.EntryPoint(), thread.StackTop());
thread.EntryPoint());
}
EEInternalCtx* ctx = static_cast<EEInternalCtx*>(PSM(thread.RegCtx()));
@@ -722,7 +722,7 @@ std::vector<MipsStackWalk::StackFrame> R5900DebugInterface::StackTrace(const Bio
u32 ra = ctx->gpr[31 - 1]._u32[0];
u32 sp = ctx->gpr[29 - 1]._u32[0];
return MipsStackWalk::Walk(this, pc, ra, sp, thread.EntryPoint(), thread.StackTop());
return MipsStackWalk::Walk(this, pc, ra, sp, thread.EntryPoint());
}
std::vector<IopMod> R5900DebugInterface::GetModuleList() const
@@ -1071,7 +1071,7 @@ std::vector<MipsStackWalk::StackFrame> R3000DebugInterface::StackTrace(const Bio
if (thread.Status() == ThreadStatus::THS_RUN)
{
return MipsStackWalk::Walk(this, getPC(), getRegister(0, 31), getRegister(0, 29),
thread.EntryPoint(), thread.StackTop());
thread.EntryPoint());
}
u32 p = thread.RegCtx();
@@ -1079,7 +1079,7 @@ std::vector<MipsStackWalk::StackFrame> R3000DebugInterface::StackTrace(const Bio
u32 ra = Read32(p + 0x7c);
u32 sp = Read32(p + 0x74);
return MipsStackWalk::Walk(this, pc, ra, sp, thread.EntryPoint(), thread.StackTop());
return MipsStackWalk::Walk(this, pc, ra, sp, thread.EntryPoint());
}
std::vector<IopMod> R3000DebugInterface::GetModuleList() const
pcsx2/DebugTools/MipsStackWalk.cpp
+1 -1
View File
@@ -183,7 +183,7 @@ namespace MipsStackWalk
return ScanForEntry(cpu, frame, newPossibleEntry, ra);
}
std::vector<StackFrame> Walk(DebugInterface* cpu, u32 pc, u32 ra, u32 sp, u32 threadEntry, u32 threadStackTop)
std::vector<StackFrame> Walk(DebugInterface* cpu, u32 pc, u32 ra, u32 sp, u32 threadEntry)
{
std::vector<StackFrame> frames;
StackFrame current;
pcsx2/DebugTools/MipsStackWalk.h
+1 -1
View File
@@ -20,5 +20,5 @@ namespace MipsStackWalk {
int stackSize;
};
std::vector<StackFrame> Walk(DebugInterface* cpu, u32 pc, u32 ra, u32 sp, u32 threadEntry, u32 threadStackTop);
std::vector<StackFrame> Walk(DebugInterface* cpu, u32 pc, u32 ra, u32 sp, u32 threadEntry);
};