Savestate cleanup + be more careful with vectors.

For some reason I debugged it going into std::string so I just made
them all more explicit which fixed everything.
This commit is contained in:
Unknown W. Brackets committed 2012-12-28 13:55:31 -08:00
1 parent 644e6b615c
commit bcecd881b1
11 files changed
+22 -13

No files matched your search

+1 -1
View File
@@ -60,7 +60,7 @@ void HLEInit()
void HLEDoState(PointerWrap &p)
{
p.Do(unresolvedSyscalls);
p.Do(unresolvedSyscalls, Syscall());
p.DoMarker("HLE");
}
+2 -1
View File
@@ -303,7 +303,8 @@ void __CtrlDoState(PointerWrap &p)
p.Do(ctrlCycle);
p.Do(waitingThreads);
SceUID dv = 0;
p.Do(waitingThreads, dv);
p.Do(ctrlTimer);
CoreTiming::RestoreRegisterEvent(ctrlTimer, "CtrlSampleTimer", __CtrlTimerUpdate);
+1 -1
View File
@@ -66,7 +66,7 @@ public:
virtual void DoState(PointerWrap &p)
{
p.Do(nef);
p.Do(waitingThreads);
p.Do(waitingThreads, EventFlagTh());
p.DoMarker("EventFlag");
}
+1 -1
View File
@@ -156,7 +156,7 @@ struct Mbx : public KernelObject
virtual void DoState(PointerWrap &p)
{
p.Do(nmb);
p.Do(waitingThreads);
p.Do(waitingThreads, MbxWaitingThread());
p.DoMarker("Mbx");
}
+1
View File
@@ -145,6 +145,7 @@ public:
virtual void DoState(PointerWrap &p) {
p.Do(moduleID_);
p.Do(retValAddr);
p.DoMarker("AfterModuleEntryCall");
}
static Action *Create() {
return new AfterModuleEntryCall;
+6 -2
View File
@@ -155,12 +155,16 @@ struct MsgPipe : public KernelObject
virtual void DoState(PointerWrap &p)
{
p.Do(nmp);
p.Do(sendWaitingThreads);
p.Do(receiveWaitingThreads);
p.Do(sendWaitingThreads, MsgPipeWaitingThread());
p.Do(receiveWaitingThreads, MsgPipeWaitingThread());
bool hasBuffer = buffer != NULL;
p.Do(hasBuffer);
if (hasBuffer)
{
if (buffer == NULL)
buffer = new u8[nmp.bufSize];
p.DoArray(buffer, nmp.bufSize);
}
p.DoMarker("MsgPipe");
}
+4 -2
View File
@@ -66,7 +66,8 @@ struct Mutex : public KernelObject
virtual void DoState(PointerWrap &p)
{
p.Do(nm);
p.Do(waitingThreads);
SceUID dv = 0;
p.Do(waitingThreads, dv);
p.DoMarker("Mutex");
}
@@ -115,7 +116,8 @@ struct LwMutex : public KernelObject
virtual void DoState(PointerWrap &p)
{
p.Do(nm);
p.Do(waitingThreads);
SceUID dv = 0;
p.Do(waitingThreads, dv);
p.DoMarker("LwMutex");
}
+2 -1
View File
@@ -60,7 +60,8 @@ struct Semaphore : public KernelObject
virtual void DoState(PointerWrap &p)
{
p.Do(ns);
p.Do(waitingThreads);
SceUID dv = 0;
p.Do(waitingThreads, dv);
p.DoMarker("Semaphore");
}
+2 -2
View File
@@ -431,7 +431,6 @@ public:
for (size_t i = 0; i < THREAD_CALLBACK_NUM_TYPES; ++i)
{
std::set<SceUID>::iterator it, end;
p.Do(registeredCallbacks[i]);
p.Do(readyCallbacks[i]);
}
@@ -615,7 +614,8 @@ void __KernelThreadingDoState(PointerWrap &p)
p.Do(intReturnHackAddr);
p.Do(currentThread);
p.Do(threadqueue);
SceUID dv = 0;
p.Do(threadqueue, dv);
p.DoArray(threadIdleID, ARRAY_SIZE(threadIdleID));
p.Do(dispatchEnabled);
p.Do(curModule);
+1
View File
@@ -336,6 +336,7 @@ void SasInstance::DoState(PointerWrap &p) {
p.Do(sampleRate);
p.Do(outputMode);
// SetGrainSize() / ClearGrainSize() should've made our buffers match.
if (mixBuffer != NULL && grainSize > 0) {
p.DoArray(mixBuffer, grainSize * 2);
}
+1 -2
View File
@@ -300,8 +300,7 @@ u32 BlockAllocator::GetTotalFreeBytes()
void BlockAllocator::DoState(PointerWrap &p)
{
Block default_value(0, 0, false);
p.Do(blocks, default_value);
p.Do(blocks, Block(0, 0, false));
p.Do(rangeStart_);
p.Do(rangeSize_);
p.Do(grain_);