thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1961 from unknownbrackets/savestates

Browse source 
Fix some missing things from save states
This commit is contained in:
Henrik Rydgård 2013-05-28 00:41:01 -07:00
commit 0abf322c1d
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Core/HLE/sceIo.cpp
View file

@ -15,6 +15,7 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <cstdlib>
#include "Core/Config.h"
#include "Core/System.h"
#include "Core/Host.h"
@ -143,6 +144,7 @@ public:
FileNode() : callbackID(0), callbackArg(0), asyncResult(0), hasAsyncResult(false), pendingAsyncResult(false), sectorBlockMode(false), closePending(false), npdrm(0), pgdInfo(NULL) {}
~FileNode() {
pspFileSystem.CloseFile(handle);
pgd_close(pgdInfo);
}
const char *GetName() {return fullpath.c_str();}
const char *GetTypeName() {return "OpenFile";}
@ -165,7 +167,19 @@ public:
p.Do(info);
p.Do(openMode);
// TODO: Savestate PGD files?
p.Do(npdrm);
p.Do(pgd_offset);
bool hasPGD = pgdInfo != NULL;
p.Do(hasPGD);
if (hasPGD) {
if (p.mode == p.MODE_READ) {
pgdInfo = (PGD_DESC*) malloc(sizeof(PGD_DESC));
}
p.DoVoid(pgdInfo, sizeof(PGD_DESC));
if (p.mode == p.MODE_READ) {
pgdInfo->block_buf = (u8 *)malloc(pgdInfo->block_size * 2);
}
}
p.DoMarker("File");
}
@ -768,9 +782,6 @@ u32 sceIoClose(int id) {
u32 error;
DEBUG_LOG(HLE, "sceIoClose(%d)", id);
FileNode *f = kernelObjects.Get<FileNode>(id, error);
if(f && f->npdrm){
pgd_close(f->pgdInfo);
}
// Timing is not accurate, aiming low for now.
return hleDelayResult(kernelObjects.Destroy<FileNode>(id), "file closed", 100);
}

2
Core/HLE/sceKernelMemory.cpp
View file

@ -1331,7 +1331,7 @@ struct TLS : public KernelObject
const char *GetName() {return ntls.name;}
const char *GetTypeName() {return "TLS";}
static u32 GetMissingErrorCode() { return PSP_ERROR_UNKNOWN_TLS_ID; }
int GetIDType() const { return SCE_KERNEL_TMID_Vpl; }
int GetIDType() const { return SCE_KERNEL_TMID_Tls; }
TLS() : next(0) {}

1
Core/HW/SasAudio.cpp
View file

@ -505,6 +505,7 @@ void SasVoice::DoState(PointerWrap &p)
p.Do(vagSize);
p.Do(pcmAddr);
p.Do(pcmSize);
p.Do(pcmIndex);
p.Do(sampleRate);
p.Do(sampleFrac);