[PR #2907] [MERGED] kernel: Clean up and fix some mistakes. #3070

New issue

Closed

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

kerem commented

2026-02-27 22:02:19 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/shadps4-emu/shadPS4/pull/2907
Author: @squidbus
Created: 5/11/2025
Status: ✅ Merged
Merged: 5/11/2025
Merged by: @squidbus

Base: main ← Head: small-fixes

📝 Commits (1)

79a2e27 kernel: Clean up and fix some mistakes.

📊 Changes

8 files changed (+28 additions, -42 deletions)

View changed files

📝 src/common/va_ctx.h (+1 -1)
📝 src/core/libraries/kernel/aio.cpp (+1 -1)
📝 src/core/libraries/kernel/kernel.h (+5 -13)
📝 src/core/libraries/kernel/threads/pthread.cpp (+4 -7)
📝 src/core/libraries/kernel/threads/pthread.h (+2 -1)
📝 src/core/libraries/kernel/threads/pthread_attr.cpp (+10 -9)
📝 src/core/libraries/libs.h (+2 -8)
📝 src/core/linker.cpp (+3 -2)

📄 Description

Isolating some misc changes from https://github.com/shadps4-emu/shadPS4/pull/2905 to:

Make sure they get in regardless of whether that works
Make sure that these aren't causing some of the issues with that PR.

Summary:

Remove extra var-args definition from VA_ARGS macro to make the functions wrappable. As far as I can tell this wasn't needed.
Add missing PS4_SYSV_ABI to sceKernelAioInitializeImpl.
Clean up some commented debugging stuff from the ORBIS wrapper to make backtrace symbols cleaner.
Fix size of Cpuset in pthread affinity functions.
Simplify scePthreadSetaffinity using ORBIS similar to how we do scePthreadAttrGetaffinity/scePthreadAttrSetaffinity: create a separate function that just handles the argument difference, then wrap it to handle the error code translation.
Make clear that the parameter to LIB_OBJ is an object pointer, not a function.
Fix some missing uses of ExecuteGuest in the linker code.

Regression testing is appreciated.

_{🔄 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/2907 **Author:** [@squidbus](https://github.com/squidbus) **Created:** 5/11/2025 **Status:** ✅ Merged **Merged:** 5/11/2025 **Merged by:** [@squidbus](https://github.com/squidbus) **Base:** `main` ← **Head:** `small-fixes` --- ### 📝 Commits (1) - [`79a2e27`](https://github.com/shadps4-emu/shadPS4/commit/79a2e279c124e021c3d90155addab485d657c0da) kernel: Clean up and fix some mistakes. ### 📊 Changes **8 files changed** (+28 additions, -42 deletions) <details> <summary>View changed files</summary> 📝 `src/common/va_ctx.h` (+1 -1) 📝 `src/core/libraries/kernel/aio.cpp` (+1 -1) 📝 `src/core/libraries/kernel/kernel.h` (+5 -13) 📝 `src/core/libraries/kernel/threads/pthread.cpp` (+4 -7) 📝 `src/core/libraries/kernel/threads/pthread.h` (+2 -1) 📝 `src/core/libraries/kernel/threads/pthread_attr.cpp` (+10 -9) 📝 `src/core/libraries/libs.h` (+2 -8) 📝 `src/core/linker.cpp` (+3 -2) </details> ### 📄 Description Isolating some misc changes from https://github.com/shadps4-emu/shadPS4/pull/2905 to: * Make sure they get in regardless of whether that works * Make sure that these aren't causing some of the issues with that PR. Summary: * Remove extra var-args definition from `VA_ARGS` macro to make the functions wrappable. As far as I can tell this wasn't needed. * Add missing `PS4_SYSV_ABI` to `sceKernelAioInitializeImpl`. * Clean up some commented debugging stuff from the `ORBIS` wrapper to make backtrace symbols cleaner. * Fix size of `Cpuset` in pthread affinity functions. * Simplify `scePthreadSetaffinity` using `ORBIS` similar to how we do `scePthreadAttrGetaffinity`/`scePthreadAttrSetaffinity`: create a separate function that just handles the argument difference, then wrap it to handle the error code translation. * Make clear that the parameter to `LIB_OBJ` is an object pointer, not a function. * Fix some missing uses of `ExecuteGuest` in the linker code. Regression testing is appreciated. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>