Quick build fix for gcc

This commit is contained in:
Henrik Rydgård committed 2012-12-28 23:33:00 +01:00
1 parent 1689731752
commit 95c4e0b9c4
8 files changed
+18 -10

No files matched your search

+3 -1
View File
@@ -17,6 +17,7 @@
#include "HLE.h"
#include <map>
#include <vector>
#include "../MemMap.h"
#include "HLETables.h"
@@ -60,7 +61,8 @@ void HLEInit()
void HLEDoState(PointerWrap &p)
{
p.Do(unresolvedSyscalls, Syscall());
Syscall sc = {0};
p.Do(unresolvedSyscalls, sc);
p.DoMarker("HLE");
}
+2 -1
View File
@@ -125,7 +125,8 @@ void __DisplayDoState(PointerWrap &p) {
p.Do(isVblank);
p.Do(hasSetMode);
p.Do(lastFrameTime);
p.Do(vblankWaitingThreads, WaitVBlankInfo(0));
WaitVBlankInfo wvi(0);
p.Do(vblankWaitingThreads, wvi);
p.Do(enterVblankEvent);
CoreTiming::RestoreRegisterEvent(enterVblankEvent, "EnterVBlank", &hleEnterVblank);
+3 -2
View File
@@ -57,7 +57,7 @@ public:
nef.currentPattern,
nef.numWaitThreads);
}
static u32 GetMissingErrorCode() {
return SCE_KERNEL_ERROR_UNKNOWN_EVFID;
}
@@ -66,7 +66,8 @@ public:
virtual void DoState(PointerWrap &p)
{
p.Do(nef);
p.Do(waitingThreads, EventFlagTh());
EventFlagTh eft = {0};
p.Do(waitingThreads, eft);
p.DoMarker("EventFlag");
}
+2 -1
View File
@@ -247,7 +247,8 @@ void __InterruptsDoState(PointerWrap &p)
}
intState.DoState(p);
p.Do(pendingInterrupts, PendingInterrupt(0, 0));
PendingInterrupt pi(0, 0);
p.Do(pendingInterrupts, pi);
p.Do(interruptsEnabled);
p.Do(inInterrupt);
p.DoMarker("sceKernelInterrupt");
+2 -1
View File
@@ -156,7 +156,8 @@ struct Mbx : public KernelObject
virtual void DoState(PointerWrap &p)
{
p.Do(nmb);
p.Do(waitingThreads, MbxWaitingThread());
MbxWaitingThread mwt(0,0);
p.Do(waitingThreads, mwt);
p.DoMarker("Mbx");
}
+3 -2
View File
@@ -155,8 +155,9 @@ struct MsgPipe : public KernelObject
virtual void DoState(PointerWrap &p)
{
p.Do(nmp);
p.Do(sendWaitingThreads, MsgPipeWaitingThread());
p.Do(receiveWaitingThreads, MsgPipeWaitingThread());
MsgPipeWaitingThread mpwt1 = {0}, mpwt2 = {0};
p.Do(sendWaitingThreads, mpwt1);
p.Do(receiveWaitingThreads, mpwt2);
bool hasBuffer = buffer != NULL;
p.Do(hasBuffer);
if (hasBuffer)
+1 -1
View File
@@ -44,7 +44,7 @@ namespace SaveState
struct Operation
{
Operation(OperationType t, std::string &f, Callback cb)
Operation(OperationType t, const std::string &f, Callback cb)
: type(t), filename(f), callback(cb)
{
}
+2 -1
View File
@@ -300,7 +300,8 @@ u32 BlockAllocator::GetTotalFreeBytes()
void BlockAllocator::DoState(PointerWrap &p)
{
p.Do(blocks, Block(0, 0, false));
Block b(0, 0, false);
p.Do(blocks, b);
p.Do(rangeStart_);
p.Do(rangeSize_);
p.Do(grain_);