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

Maintain the stack per displaylist, not globally.

Browse Source
This commit is contained in:
Unknown W. Brackets committed 2013-03-31 23:57:03 -07:00
1 parent affe91cb3b
commit b8e4c72f04
3 files changed
+7 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GPU/GPUCommon.cpp
+5 -8
View File
@@ -45,6 +45,7 @@ u32 GPUCommon::EnqueueList(u32 listpc, u32 stall, int subIntrBase, bool head)
dl.stall = stall & 0xFFFFFFF;
dl.status = PSP_GE_LIST_QUEUED;
dl.subIntrBase = subIntrBase;
dl.stackptr = 0;
if(head)
dlQueue.push_front(dl);
else
@@ -92,8 +93,6 @@ bool GPUCommon::InterpretList(DisplayList &list)
time_update();
double start = time_now_d();
currentList = &list;
// Reset stackptr for safety
stackptr = 0;
u32 op = 0;
prev = 0;
finished = false;
@@ -211,12 +210,12 @@ void GPUCommon::ExecuteOp(u32 op, u32 diff) {
// Saint Seiya needs correct support for relative calls.
u32 retval = currentList->pc + 4;
u32 target = gstate_c.getRelativeAddress(data);
if (stackptr == ARRAY_SIZE(stack)) {
if (currentList->stackptr == ARRAY_SIZE(currentList->stack)) {
ERROR_LOG(G3D, "CALL: Stack full!");
} else if (!Memory::IsValidAddress(target)) {
ERROR_LOG(G3D, "CALL to illegal address %08x - ignoring! data=%06x", target, data);
} else {
stack[stackptr++] = retval;
currentList->stack[currentList->stackptr++] = retval;
currentList->pc = target - 4; // pc will be increased after we return, counteract that
}
}
@@ -224,10 +223,10 @@ void GPUCommon::ExecuteOp(u32 op, u32 diff) {
case GE_CMD_RET:
{
if (stackptr == 0) {
if (currentList->stackptr == 0) {
ERROR_LOG(G3D, "RET: Stack empty!");
} else {
u32 target = (currentList->pc & 0xF0000000) | (stack[--stackptr] & 0x0FFFFFFF);
u32 target = (currentList->pc & 0xF0000000) | (currentList->stack[--currentList->stackptr] & 0x0FFFFFFF);
//target = (target + gstate_c.originAddr) & 0xFFFFFFF;
currentList->pc = target - 4;
if (!Memory::IsValidAddress(currentList->pc)) {
@@ -323,8 +322,6 @@ void GPUCommon::DoState(PointerWrap &p) {
}
p.Do(interruptRunning);
p.Do(prev);
p.Do(stack);
p.Do(stackptr);
p.Do(finished);
p.DoMarker("GPUCommon");
}
GPU/GPUCommon.h
-3
View File
@@ -8,7 +8,6 @@ public:
GPUCommon() :
dlIdGenerator(1),
currentList(NULL),
stackptr(0),
dumpNextFrame_(false),
dumpThisFrame_(false),
interruptsEnabled_(true)
@@ -43,8 +42,6 @@ protected:
bool interruptRunning;
u32 prev;
u32 stack[2];
u32 stackptr;
bool finished;
bool dumpNextFrame_;
GPU/GPUInterface.h
+2
View File
@@ -54,6 +54,8 @@ struct DisplayList
DisplayListStatus status;
int subIntrBase;
u16 subIntrToken;
u32 stack[32];
int stackptr;
};
class GPUInterface