diff --git a/Core/HLE/sceCtrl.cpp b/Core/HLE/sceCtrl.cpp index d8998af521..9a89bdd39c 100644 --- a/Core/HLE/sceCtrl.cpp +++ b/Core/HLE/sceCtrl.cpp @@ -361,7 +361,7 @@ u32 sceCtrlSetSamplingMode(u32 mode) int sceCtrlGetSamplingMode(u32 modePtr) { u32 retVal = analogEnabled == true ? CTRL_MODE_ANALOG : CTRL_MODE_DIGITAL; - DEBUG_LOG(HLE, "%d=sceCtrlGetSamplingMode(%i)", retVal); + DEBUG_LOG(HLE, "%d=sceCtrlGetSamplingMode(%08x)", retVal, modePtr); if (Memory::IsValidAddress(modePtr)) Memory::Write_U32(retVal, modePtr); diff --git a/Core/HLE/sceKernelInterrupt.h b/Core/HLE/sceKernelInterrupt.h index 6b60a7870f..461c5153ea 100644 --- a/Core/HLE/sceKernelInterrupt.h +++ b/Core/HLE/sceKernelInterrupt.h @@ -71,10 +71,10 @@ struct PendingInterrupt { PendingInterrupt(int intr_, int subintr_, int arg_) : intr(intr_), subintr(subintr_), hasArg(true), arg(arg_) {} - int arg; - bool hasArg; int intr; int subintr; + bool hasArg; + int arg; }; class SubIntrHandler diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 70b86778b0..cd7b4fbb4b 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -1140,9 +1140,15 @@ void sceKernelCheckThreadStack() { u32 error; Thread *t = kernelObjects.Get(__KernelGetCurThread(), error); - u32 diff = abs((long)((s64)t->stackBlock - (s64)currentMIPS->r[MIPS_REG_SP])); - ERROR_LOG(HLE, "%i=sceKernelCheckThreadStack()", diff); - RETURN(diff); //Blatant lie + if (t) { + u32 diff = abs((long)((s64)t->stackBlock - (s64)currentMIPS->r[MIPS_REG_SP])); + WARN_LOG(HLE, "%i=sceKernelCheckThreadStack()", diff); + RETURN(diff); + } else { + // WTF? + ERROR_LOG(HLE, "sceKernelCheckThreadStack() - not on thread"); + RETURN(-1); + } } void ThreadContext::reset() diff --git a/GPU/GPUCommon.h b/GPU/GPUCommon.h index fbd55fd005..803f63efd5 100644 --- a/GPU/GPUCommon.h +++ b/GPU/GPUCommon.h @@ -9,8 +9,8 @@ public: dlIdGenerator(1), currentList(NULL), stackptr(0), - dumpThisFrame_(false), - dumpNextFrame_(false) + dumpNextFrame_(false), + dumpThisFrame_(false) {} virtual void PreExecuteOp(u32 op, u32 diff);