Merge pull request #12328 from unknownbrackets/io-async

Use PSP threads for async IO
hrydgard · Oct 7, 2019 · eb2109a · eb2109a
2 parents 83c349a + c53acfc
commit eb2109a
Show file tree

Hide file tree

Showing 6 changed files with 335 additions and 148 deletions.
diff --git a/Core/HLE/HLEHelperThread.cpp b/Core/HLE/HLEHelperThread.cpp
@@ -49,17 +49,20 @@ HLEHelperThread::HLEHelperThread(const char *threadName, const char *module, con
 }
 
 HLEHelperThread::~HLEHelperThread() {
-	__KernelDeleteThread(id_, SCE_KERNEL_ERROR_THREAD_TERMINATED, "helper deleted");
-	kernelMemory.Free(entry_);
+	if (id_)
+		__KernelDeleteThread(id_, SCE_KERNEL_ERROR_THREAD_TERMINATED, "helper deleted");
+	if (entry_)
+		kernelMemory.Free(entry_);
 }
 
 void HLEHelperThread::AllocEntry(u32 size) {
 	entry_ = kernelMemory.Alloc(size);
+	Memory::Memset(entry_, 0, size);
 	currentMIPS->InvalidateICache(entry_, size);
 }
 
 void HLEHelperThread::Create(const char *threadName, u32 prio, int stacksize) {
-	id_ = __KernelCreateThreadInternal(threadName, __KernelGetCurThreadModuleId(), entry_, prio, stacksize, 0);
+	id_ = __KernelCreateThreadInternal(threadName, __KernelGetCurThreadModuleId(), entry_, prio, stacksize, 0x00001000);
 }
 
 void HLEHelperThread::DoState(PointerWrap &p) {
@@ -79,3 +82,12 @@ void HLEHelperThread::Start(u32 a0, u32 a1) {
 void HLEHelperThread::Terminate() {
 	__KernelStopThread(id_, SCE_KERNEL_ERROR_THREAD_TERMINATED, "helper terminated");
 }
+
+bool HLEHelperThread::Stopped() {
+	return KernelIsThreadDormant(id_);
+}
+
+void HLEHelperThread::Forget() {
+	id_ = 0;
+	entry_ = 0;
+}
diff --git a/Core/HLE/HLEHelperThread.h b/Core/HLE/HLEHelperThread.h
@@ -31,11 +31,15 @@ class HLEHelperThread {
 
 	void Start(u32 a0, u32 a1);
 	void Terminate();
+	bool Stopped();
+
+	// For savestates.
+	void Forget();
 
 private:
 	void AllocEntry(u32 size);
 	void Create(const char *threadName, u32 prio, int stacksize);
 
 	SceUID id_;
 	u32 entry_;
-};
+};