[PR #4033] [MERGED] GR2-win-crash-fix #3886

New issue

Closed

opened 2026-02-27 22:05:20 +03:00 by kerem · 0 comments

kerem commented

2026-02-27 22:05:20 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/shadps4-emu/shadPS4/pull/4033
Author: @w1naenator
Created: 2/14/2026
Status: ✅ Merged
Merged: 2/14/2026
Merged by: @georgemoralis

Base: main ← Head: GR2-min-win-fix

📝 Commits (5)

2f885b6 Improve stack clearing logic in ExecuteGuest
5ae377d Refactor ExecuteGuest to simplify stack clearing logic
bf6fc21 Recover thread initialization in ExecuteGuest function
05bda74 Enhance null check for thread control block
3dee2ae Fix condition to check tcb before clearing stack

📊 Changes

1 file changed (+4 additions, -1 deletions)

View changed files

📝 src/core/tls.h (+4 -1)

📄 Description

Added a check for fiber stacks before clearing the stack in ExecuteGuest. That fixes Gravity Rush 2 crash on Windows.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/shadps4-emu/shadPS4/pull/4033 **Author:** [@w1naenator](https://github.com/w1naenator) **Created:** 2/14/2026 **Status:** ✅ Merged **Merged:** 2/14/2026 **Merged by:** [@georgemoralis](https://github.com/georgemoralis) **Base:** `main` ← **Head:** `GR2-min-win-fix` --- ### 📝 Commits (5) - [`2f885b6`](https://github.com/shadps4-emu/shadPS4/commit/2f885b6c210be008b225d0975040ca2a0ea92652) Improve stack clearing logic in ExecuteGuest - [`5ae377d`](https://github.com/shadps4-emu/shadPS4/commit/5ae377decf06d1f9c7e7145af36ac878f0a149f0) Refactor ExecuteGuest to simplify stack clearing logic - [`bf6fc21`](https://github.com/shadps4-emu/shadPS4/commit/bf6fc21da5fad8ec8618f73164405653f93a1dd0) Recover thread initialization in ExecuteGuest function - [`05bda74`](https://github.com/shadps4-emu/shadPS4/commit/05bda74ce18a0ea0f2202f923a2757b8c1cd2ce7) Enhance null check for thread control block - [`3dee2ae`](https://github.com/shadps4-emu/shadPS4/commit/3dee2ae90d45f097068df71e0a7dc373cc47bd8b) Fix condition to check tcb before clearing stack ### 📊 Changes **1 file changed** (+4 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `src/core/tls.h` (+4 -1) </details> ### 📄 Description Added a check for fiber stacks before clearing the stack in ExecuteGuest. That fixes Gravity Rush 2 crash on Windows. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>