Skip to content

chore(sync): merge upstream boykopovar/AnyPS5 up to e67cc8186 (conflicts) - #47

Open
github-actions[bot] wants to merge 977 commits into
mainfrom
sync/upstream-2026-10-28
Open

github-actions[bot] wants to merge 977 commits into
mainfrom
sync/upstream-2026-10-28

Conversation

@github-actions

@github-actions github-actions Bot commented Oct 28, 2026 •

Copy link
Copy Markdown

What

Merges boykopovar/AnyPS5 main (up to e67cc8186) into the fork with a merge commit. Upstream is 5323 commits ahead of the fork's merge base: 1618 merged pull requests, 2897 files. The fork is 50 commits ahead of upstream. Opened by the sync workflow on 2026-11-01; the workflow refreshes this pull request while it is open and never merges it.

Draft: upstream does not merge cleanly. 24 files have conflicts. The branch is unchanged because a person has already pushed to it; merge upstream into it by hand.

Conflicts

  • .github/workflows/sanitizers.yml
  • .github/workflows/web-tests.yml
  • CMakeLists.txt (Build wiring)
  • README.md (Docs)
  • core/libs/prx/libSceAgcDriver/Graphics/include/State.hpp
  • core/libs/prx/libSceHttp2/Export.cpp (Observation hot spots)
  • core/libs/prx/libSceNet/Export.cpp (Observation hot spots)
  • core/libs/prx/libSceNetCtl/Export.cpp (Observation hot spots)
  • core/libs/prx/libSceNpAuth/Export.cpp (Observation hot spots)
  • core/libs/prx/libSceNpCommerce/Export.cpp (Observation hot spots)
  • core/libs/prx/libSceNpCppWebApi/Export.cpp (Observation hot spots)
  • core/libs/prx/libSceNpEntitlementAccess/Export.cpp (Observation hot spots)
  • core/libs/prx/libSceNpManager/Export.cpp (Observation hot spots)
  • core/libs/prx/libSceNpUniversalDataSystem/src/Event.cpp (Observation hot spots)
  • core/libs/prx/libSceNpUniversalDataSystem/src/EventPropertyArray.cpp (Observation hot spots)
  • core/libs/prx/libSceNpUniversalDataSystem/src/EventPropertyObject.cpp (Observation hot spots)
  • core/libs/prx/libSceNpWebApi/Export.cpp (Observation hot spots)
  • core/libs/prx/libSceNpWebApi2/Export.cpp (Observation hot spots)
  • core/libs/tests/GuestHttp2.cpp (Bridge tests)
  • core/libs/tests/GuestNpAuthAuthorizedAppCode.cpp (Bridge tests)
  • docs/dev/BUILD.md
  • docs/dev/ENVIRONMENT.md (Docs)
  • docs/dev/debt/libSceNet.md (Docs)
  • docs/dev/debt/libSceNpManager.md (Docs)

To resolve: check out this branch, fix the files, commit and push. The next run merges new upstream commits on top of your commits.

Upstream changes

1051 fix, 786 test, 708 feat, 580 docs, 73 perf, 54 refactor, 29 ci, 28 build, 12 chore, 9 style, 2 revert, 1 other (commit subjects, merges excluded).

Most changed places: elsewhere (1069), libSceAgcDriver (597), libkernel (73), libSceNKWebKit (69), libc (66), libSceNgs2.native (44), libSceVideoOut (41), libSceAudioOut (33), libSceIcu (27), libSceLibreSsl (25), libSceLibreSsl3 (20), libScePad (17).

Changed on both sides

49 files were changed by upstream and by the fork since the merge base. These are the fork's hot spots; read the bridge calls in them after the merge.

  • .github/workflows/build.yml - Build workflow
  • CMakeLists.txt (conflict) - Build wiring
  • README.md (conflict) - Docs
  • core/libs/CMakeLists.txt - Build wiring
  • core/libs/prx/libSceAgcDriver/Graphics/include/State.hpp (conflict)
  • core/libs/prx/libSceAgcDriver/Graphics/src/State.cpp
  • core/libs/prx/libSceAgcDriver/tests/Graphics.cpp
  • core/libs/prx/libSceHttp2/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNet/CMakeLists.txt - Build wiring
  • core/libs/prx/libSceNet/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNetCtl/CMakeLists.txt - Bridge
  • core/libs/prx/libSceNetCtl/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpAuth/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpCommerce/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpCppWebApi/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpEntitlementAccess/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpGameIntent/Export.cpp - Observation hot spots
  • core/libs/prx/libSceNpManager/CMakeLists.txt - Build wiring
  • core/libs/prx/libSceNpManager/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpMatching2/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpSessionSignaling/Export.cpp - Observation hot spots
  • core/libs/prx/libSceNpSignaling/Export.cpp - Observation hot spots
  • core/libs/prx/libSceNpUniversalDataSystem/CMakeLists.txt - Build wiring
  • core/libs/prx/libSceNpUniversalDataSystem/Export.cpp - Observation hot spots
  • core/libs/prx/libSceNpUniversalDataSystem/src/Event.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpUniversalDataSystem/src/EventPropertyArray.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpUniversalDataSystem/src/EventPropertyObject.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpWebApi/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceNpWebApi2/Export.cpp (conflict) - Observation hot spots
  • core/libs/prx/libSceSsl/CMakeLists.txt (conflict) - Build wiring
  • core/libs/prx/libSceSsl/Export.cpp - Observation hot spots
  • core/libs/prx/libSceUserService/CMakeLists.txt - Build wiring
  • core/libs/prx/libSceUserService/Export.cpp - Observation hot spots
  • core/libs/prx/libc/include/General.hpp - Not-implemented hook
  • core/libs/prx/libc/src/General.cpp - Not-implemented hook
  • core/libs/prx/libkernel/Socket/include/SocketPoll.hpp - Socket descriptors
  • core/libs/prx/libkernel/Socket/src/Udp.cpp - Socket descriptors
  • core/libs/tests/GuestHttp2.cpp (conflict) - Bridge tests
  • core/libs/tests/GuestNpAuthAuthorizedAppCode.cpp (conflict) - Bridge tests
  • core/libs/tests/GuestSceNet.cpp - Bridge tests
  • docs/dev/ENVIRONMENT.md (conflict) - Docs
  • docs/dev/debt/libSceAgcDriver.md - Docs
  • docs/dev/debt/libSceHttp2.md - Docs
  • docs/dev/debt/libSceNet.md (conflict) - Docs
  • docs/dev/debt/libSceNetCtl.md - Docs
  • docs/dev/debt/libSceNpManager.md (conflict) - Docs
  • docs/dev/debt/libSceNpWebApi2.md - Docs
  • tools/check_skips.py - Build workflow
  • tools/tests/test_check_skips.py - Build workflow

Upstream pull requests that touched them: 6498, 7310, 7780, 8105, 8223, 8930, 9129, 9193, 9231, 9243, 9284, 9431, 9515, 9595, 9612, 9626, 9723, 9772, 9924, 10194, 10307, 10348, 10414, 10502, 10544, 10575, 10581, 10720, 10886, 10995, 11062, 11071, 11075, 11098, 11130, 11145, 11273, 11294, 11296, 11305, 11307, 11341, 11357, 11363, 11366, 11369, 11412, 11441, 11447, 11507, 11522, 11530, 11572, 11616, 11617, 11635, 11636, 11637, 11639, 11668.

Upstream pull requests

1618 merged upstream pull requests
  • 13926 feat(relinker): validate conversions without writing outputs
  • 13922 test(tools): run NID audit validation cases in process
  • 13879 fix(agc): order DCC clear fills against GPU writes in resident presentation
  • 10844 perf(agc): read DCC keys from a pending word fill instead of waiting for the GPU
  • 13919 fix(tools): resolve linked public header manifest roots
  • 11447 build(agc): compile Lifecycle, GuestMemory and GuestBufferMemory on macOS
  • 12474 fix(libkernel): report a host-only descriptor as not open to fcntl and ioctl
  • 12332 test(libSceHttp2): cover sceHttp2SetRequestContentLength ids and deletion
  • 11854 fix(videoout): report output status flags 0 with HDR output
  • 13204 feat(rnpsbundle): add named inventory exports
  • 13499 perf(agc): trap CPU reads of label readbacks on macOS instead of storing them
  • 13917 fix(tools): check against upstream/main by default in check_conventions and check_compile
  • 13819 fix(libc): match nearbyint inexact flags to guest libc
  • 13904 fix(libkernel): return EFAULT from memory protection and stack queries for invalid memory
  • 13868 feat(libSceGLSlimVSH): implement EGL 1.4 and GLES 2.0 state, objects and pbuffer storage
  • 13908 fix(libkernel): return EFAULT from cpuset and pthread affinity for invalid memory
  • 13916 fix(relinker): follow DT_RELR pointers as code roots in code analysis
  • 13915 fix(relinker): require a non-empty PT_TLS for guest module TLS relocations
  • 13910 fix(tools): preserve Unicode cache separators
  • 13914 fix(relinker): reject a second PT_GNU_EH_FRAME segment
  • 13905 feat(tools): compare recorded worker busy percentages
  • 13912 feat(tools): show library functions implemented per day and in the last week
  • 13442 feat(libc): trap guest reads of write-watched pages on macOS
  • 13895 fix(libkernel): fail chflags and fchflags with EPERM when a system flag changes
  • 13894 fix(agc): continue a direct mesh draw past the X group limit in Z
  • 13896 fix(libkernel): fail rtprio_thread, sched_setscheduler and setpriority with the jail privilege errors
  • 13822 fix(libScePosixForWebKit): omit implicit raw resolver records
  • 13907 feat(input): capture extended keypad editing and memory keys
  • 13906 feat(input): match accented language names in option searches
  • 13898 fix(libSceCesCs): refuse the Cp1254 and Cp1258 holes and UTF-32 surrogates as a PS5 does
  • 13900 fix(ci): resume interrupted draft releases safely
  • 13876 fix(libkernel): return EFAULT from time conversions for unwritable stores
  • 13732 feat(libc): implement a64l, l64a, and l64a_r radix-64 integer conversions
  • 13897 feat(libSceLibreSsl3): implement EVP_PKEY_get0_RSA, EVP_PKEY_get0_DSA and EVP_PKEY_get0_DH
  • 13891 fix(tools): reject invalid A/B phase chronology
  • 13890 test(agc): read an image store through a heap mirror and from the CPU
  • 13893 docs(debt): list sceVideodec2ReleaseComputeQueue as a silent stub
  • 12649 fix(relinker): reject negative relative relocation targets in strict filter
  • 12597 fix(libc): report fopen_s and freopen_s argument errors to the constraint handler
  • 13892 docs(debt): list sceKernelIsAddressSanitizerEnabled as a silent stub
  • 8604 test(agc): skip the MSAA retirement storage promotion without shaderStorageImageMultisample
  • 8365 feat(agc): store the pipeline journal's modules compressed
  • 12949 fix(libSceLibcInternal): allow null process ID in posix_spawn
  • 10939 fix(shader): honour op_sel on the v_mad_u32_u16 and v_mad_i32_i16 addend and result
  • 11873 fix(agc): wait for a shader's registered preparation before taking the transaction lock
  • 13149 fix(shader): recognize scalarized constant-stride image tables
  • 14151 fix(relinker): let a later RELATIVE entry replace an earlier one in a guest module
  • 14222 feat(libSceVoice): answer the adjustment, QA recording, customer data and memory size calls as firmware 13.42 does
  • 14236 docs(debt): name the HTTP/2 init arguments that titles pass
  • 14234 docs(debt): name what the emulators answer for sceNpHasSignedUp and sceNpCheckNpReachability
  • 14233 test(tools): match the symlink loop error code on localized Windows
  • 14171 fix(libSceLibreSsl3): return d2i_ASN1_INTEGER errors instead of throwing
  • 12742 docs(agc): count how local titles call sceAgcGetDataPacketPayloadAddress_0090
  • 13124 feat(libSceMediaFrameworkInterface): declare 177 callable exports
  • 7202 fix(libkernel): support lstat on long Windows paths
  • 7261 perf(agc): keep a resource set's import proof across registry changes that leave the imports in place
  • 7938 perf(libc): skip the known occupied guest arena prefix
  • 8937 feat(libc): implement fesetenv
  • 13783 perf(libc): unprotect the rest of the 64 KiB block after a sequential write fault on macOS
  • 14215 fix(tests): exercise no-Vulkan shutdown during DLL teardown
  • and 1558 more

Workflow files not included

The workflow token cannot push changes to .github/workflows, so this branch keeps the fork's version of every workflow file. Upstream changed these; apply what the fork needs by hand with git checkout upstream/main -- <file> and a normal commit:

  • .github/workflows/sanitizers.yml
  • .github/workflows/web-tests.yml

Tested

Not built: the branch has unresolved conflicts.

Checklist

  • Based on current main; no other open PR implements the same functions
  • One topic per PR; follow-ups go in a new PR
  • No comments in code except technical debt
  • Unimplemented paths throw (NotImplemented_nid_no_patch); silent stubs are listed under Silent stubs in their library's technical debt file
  • No notes, investigation .md files or images added to the repository
  • New third-party code is a submodule built from source
  • Generic behaviour, not specific to one title
  • Depends on: none
  • Fixes: none
  • Unblocks: none
  • GPUs tested: n/a
  • AI-assisted: no

View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need.

adriadam10 and others added 30 commits October 28, 2026 01:32
…pler-pr

fix(shader): select point samplers for direct Uint images
…mat-lookup

perf(recompiler): translate GCN buffer formats without a private table
perf(shader): skip log2 correction outside the near-one range
perf(shader): use 32-bit scalar buffer bounds
…ge-readback-20261026

feat(agc): capture selected live storage images without writeback
…sampler-bounds

fix(ajm): bound resampler positions before integer conversion
…n-attribute-flags

fix(libSceLibcInternal): preserve combined POSIX spawn flags
…dules

fix(savedata): build libSceSaveData and libSceSaveDataDialog from the native sources
…ble-timed-sleeps

fix(libkernel): wake timed sleeps for thread cancellation
…d-stream

fix(libc): reopen a closed stream in freopen instead of aborting
…-number-rex-prefixes

fix(relinker): honor prefixes in the syscall number byte walk
…orkload

feat(libSceAgc): emit ACB workload packets for complete, active and stream-inactive
fix(libkernel): report 12 GiB of direct memory, as a PS5 does
…rsp-uses

fix(relinker): preserve opcode-encoded stack register uses
…depth-view

fix(agc): select the first level of a single-level depth view
…-race

fix(libc): read the stream status flags atomically when keeping a directory read error
…-descriptor-epoch

fix(agc,shader): unify descriptor pendingWrite policy and enforce invalidation epochs
…cast-nan-reuse

fix(shader): reuse folded bitcasts and NaN tests within blocks
…6-fma

fix(shader): take the fused result when an f16 fma's sum is exact
# Conflicts:
#	docs/dev/debt/libSceAgcDriver.md
…ated draws

TessellationInstancePatches divided the draw's index count by the
tessellation configuration's inputControlPoints. A request replayed from a
serialized capture is not validated for that field, so a configuration with
zero control points and an instanced draw raised SIGFPE while the cache key
was built, before ShaderInputInfoBuilder could reject the configuration with
its intended error. The function now reports no instance patches for zero
control points and leaves the rejection to the builder.
The instance patch count has to be zero instead of crashing, and a regular
configuration still divides the index count by the control points.
…essionmanager-parameter-lifecycles

feat(libSceNpCppWebApi): track the SessionManager V1 parameter lifecycles as the module does
…og-reopen-finished-coverage

test(libSceCdlgG2P): cover reopen and null parameter behavior in finished dialog state
…ero-length-coverage

test(libSceCesCs): cover null source buffer in utf16 and utf32le conversions
test(libkernel): cover sceKernelReadTsc's rate against sceKernelGetTscFrequency
…-profile-coverage

test(libSceCesCs): cover null source and profile checks in utf16 and utf32 sbc conversions
oneandonlydean and others added 23 commits October 28, 2026 22:49
…ost-finalize-lifecycle

test(libSceSystemGesture): cover post-finalization entry point rejections
…g-post-terminate-lifecycle

test(libSceVrServiceDialog): cover post-terminate lifecycle and argument precedence
…alog-post-terminate-lifecycle

test(libSceSocialScreenDialog): cover post-terminate lifecycle and argument precedence
…tion-instance-patches-zero-control-points

fix(shader): do not divide by zero control points when keying tessellated draws
…ount-zeros

feat(libc): add C23 count-zeros exports
…ences-moltenvk

fix(shader): fence the LDS lock's critical section on MoltenVK
…nd-output-size

fix(tools): refuse a SELF whose load segments expand the output far past the container
…istory-output-alias-protection

fix(tools): reject aliased report output paths in progress_history
…-input-errors

fix(tools): report unreadable --body and --event inputs in check_conventions as usage errors
…nal-cancellation

fix(libkernel): avoid cancellation wakeups during thread exit
…conf-measured-names

fix(libkernel): sysconf answers the names a PS5 payload process answers
…ing-ownership

fix(shader): preserve ownership of mapped shader pack entries
…ed-restricted-symbols

fix(relinker): validate visibility of undefined strong symbols
…ction-pool

perf(shader): allocate a program's instruction list nodes from a pool
…aling-status

feat(libSceNpMatching2): answer signaling connection status and context start abort offline
…imports

fix(nid): move PE library imports whose NID is longer than the name
…helper-lane-masks

revert(shader): restore pixel helper lanes in guest lane masks (boykopovar#11199)
@AlxcBTW
AlxcBTW marked this pull request as ready for review October 28, 2026 11:38
@AlxcBTW

AlxcBTW commented Oct 28, 2026

Copy link
Copy Markdown
Member

How the 5 conflicts were resolved (upstream code kept everywhere, every fork NetBridgeCall hook kept or re-applied):

  • CMakeLists.txt: the fork side only changed line endings (whole file CRLF) plus the sync_upstream test; took upstream's file (LF) and re-added that one add_test.
  • libSceNet/Export.cpp (4 hunks): sceNetShowNetstat stub dropped because upstream now implements it (re-wrapped with NetBridgeCall); sceNetSocket keeps our NetBridgeCall plus upstream's EPROTOTYPE branch; sceNetShowIfconfig takes upstream's implementation wrapped with NetBridgeCall/netCall.Ret.
  • libSceNpCppWebApi/Export.cpp (14 hunks): upstream's new parameter bodies (ConstructParameter, InitializeParameter*, TerminateParameter, SetParameterText) with NetBridgeCall + netCall.Ret on each.
  • libSceNpMatching2/Export.cpp (2 hunks): upstream's AbortContextStart and SignalingGetConnectionStatus implementations, observed.
  • libSceSsl/CMakeLists.txt: link line is libkernel libc libSceNetCtl ... (upstream's libkernel plus our bridge dependency).

Silent merges checked: also observed the 9 new libSceNpUniversalDataSystemInt* stubs and the 8 new libSceHttp2 inventory exports; sceNetShowNetstat needed a SockInfoSource adaptation (first CI run failed to compile there). docs/dev/BUILD.md now links upstream's sanitizers workflow by URL because the sync commit left that workflow file out. Not observed, as before: libSceNpCommon, libSceNpTus, libSceLibreSsl.

CI: Build (windows, ctest), Bridge End-to-End, Toolkit and Input mapper pass. conventions fails only on upstream's commit subject 97f1d41a2 Revert "Merge pull request #10809 ...", which sits in upstream history and cannot be rewritten; needs an engine owner's call.

@github-actions github-actions Bot changed the title chore(sync): merge upstream boykopovar/AnyPS5 up to 3a40945e6 (conflicts) chore(sync): merge upstream boykopovar/AnyPS5 up to 1d8fd64e2 (conflicts) Oct 29, 2026
@github-actions github-actions Bot changed the title chore(sync): merge upstream boykopovar/AnyPS5 up to 1d8fd64e2 (conflicts) chore(sync): merge upstream boykopovar/AnyPS5 up to 3948413d7 (conflicts) Oct 30, 2026
@github-actions github-actions Bot changed the title chore(sync): merge upstream boykopovar/AnyPS5 up to 3948413d7 (conflicts) chore(sync): merge upstream boykopovar/AnyPS5 up to cf5a1805e (conflicts) Oct 31, 2026
@github-actions github-actions Bot changed the title chore(sync): merge upstream boykopovar/AnyPS5 up to cf5a1805e (conflicts) chore(sync): merge upstream boykopovar/AnyPS5 up to e67cc8186 (conflicts) Nov 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.