Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add smoother disassembly scrolling for step over

Browse Source
This commit is contained in:
Kingcom committed 2013-10-19 01:19:39 +02:00
1 parent ef1e34bffd
commit 9af9577ad9
2 files changed
+23 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Windows/Debugger/CtrlDisAsmView.h
+3
View File
@@ -89,6 +89,7 @@ class CtrlDisAsmView
bool searching;
bool dontRedraw;
bool keyTaken;
bool stepScrolling;
void assembleOpcode(u32 address, std::string defaultText);
void disassembleToFile();
@@ -141,6 +142,8 @@ public:
{
return debugger;
}
u32 getWindowEnd() { return windowStart+visibleRows*instructionSize; };
void gotoAddr(unsigned int addr)
{
u32 windowEnd = windowStart+visibleRows*instructionSize;
Windows/Debugger/Debugger_Disasm.cpp
+20 -7
View File
@@ -189,10 +189,12 @@ void CDisasm::stepOver()
// If the current PC is on a breakpoint, the user doesn't want to do nothing.
CBreakPoints::SetSkipFirst(currentMIPS->pc);
u32 currentPc = cpu->GetPC();
u32 windowEnd = ptr->getWindowEnd();
MIPSAnalyst::MipsOpcodeInfo info = MIPSAnalyst::GetOpcodeInfo(cpu,cpu->GetPC());
ptr->setDontRedraw(true);
u32 breakpointAddress = cpu->GetPC()+cpu->getInstructionSize(0);
u32 breakpointAddress = currentPc+cpu->getInstructionSize(0);
if (info.isBranch)
{
if (info.isConditional == false)
@@ -206,13 +208,24 @@ void CDisasm::stepOver()
breakpointAddress = info.branchTarget;
}
} else { // beq, ...
// set breakpoint at branch target
breakpointAddress = info.branchTarget;
CBreakPoints::AddBreakPoint(breakpointAddress,true);
// and after the delay slot
breakpointAddress = cpu->GetPC()+2*cpu->getInstructionSize(0);
if (info.conditionMet)
{
breakpointAddress = info.branchTarget;
} else {
breakpointAddress = currentPc+2*cpu->getInstructionSize(0);
if (breakpointAddress == windowEnd-4)
ptr->scrollWindow(1);
else if (breakpointAddress == windowEnd)
ptr->scrollWindow(2);
else if (breakpointAddress == windowEnd+4)
ptr->scrollWindow(3);
}
}
} else {
if (breakpointAddress == windowEnd-4)
ptr->scrollWindow(1);
else if (breakpointAddress == windowEnd)
ptr->scrollWindow(2);
}
SetDebugMode(false, true);