Merge pull request #3118 from unknownbrackets/io-async

Prep work for pspFileSystem and two small fixes

Core/System.cpp

@@ -116,6 +116,8 @@ void CPU_WaitStatus(bool (*pred)()) {
 	cpuThreadLock.unlock();
 }
 
+void CPU_Shutdown();
+
 void CPU_Init() {
 	currentCPU = &mipsr4k;
 	numCPUs = 1;
@@ -163,12 +165,7 @@ void CPU_Init() {
 
 	// Why did we check for CORE_POWERDOWN here?
 	if (!LoadFile(filename, &coreParameter.errorString)) {
-		pspFileSystem.Shutdown();
-		CoreTiming::Shutdown();
-		__KernelShutdown();
-		HLEShutdown();
-		host->ShutdownSound();
-		Memory::Shutdown();
+		CPU_Shutdown();
 		coreParameter.fileToStart = "";
 		CPU_SetState(CPU_THREAD_NOT_RUNNING);
 		return;
@@ -182,20 +179,18 @@ void CPU_Init() {
 }
 
 void CPU_Shutdown() {
-	pspFileSystem.Shutdown();
-
-	CoreTiming::Shutdown();
-
 	if (g_Config.bAutoSaveSymbolMap) {
 		host->SaveSymbolMap();
 	}
 
+	CoreTiming::Shutdown();
+	__KernelShutdown();
+	HLEShutdown();
 	if (coreParameter.enableSound) {
 		host->ShutdownSound();
 		mixer = 0;  // deleted in ShutdownSound
 	}
-	__KernelShutdown();
-	HLEShutdown();
+	pspFileSystem.Shutdown();
 	Memory::Shutdown();
 	currentCPU = 0;
 }