Start save stating the filesystem state.

Plus minor fixes and at least an attempt to make states the same
on both 32 and 64 bit.

Core/SaveState.cpp

@@ -21,10 +21,12 @@
 #include "SaveState.h"
 #include "Core.h"
 #include "CoreTiming.h"
+#include "HLE/HLE.h"
 #include "HLE/sceKernel.h"
 #include "HW/MemoryStick.h"
 #include "MemMap.h"
 #include "MIPS/MIPS.h"
+#include "System.h"
 
 namespace SaveState
 {
@@ -72,8 +74,9 @@ namespace SaveState
 		Memory::DoState(p);
 		MemoryStick_DoState(p);
 		currentMIPS->DoState(p);
+		pspFileSystem.DoState(p);
+		HLEDoState(p);
 		__KernelDoState(p);
-		// TODO: filesystem, HLE?
 	}
 
 	void Enqueue(SaveState::Operation op)