mirror
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix hypervisor context memory placement" 

This reverts commit b1089ab1a3.
This commit is contained in:
Ani 2025-12-16 22:22:32 +01:00
parent b1089ab1a3
commit 061fb5d112
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/Cell/PPUThread.h
View File

@ -257,9 +257,6 @@ public:
// Sticky saturation bit // Sticky saturation bit
v128 sat{}; v128 sat{};
// Hypervisor context data
rpcs3::hypervisor_context_t hv_ctx; // HV context for gate enter exit. Keep at a low struct offset.
// Optimization: precomputed java-mode mask for handling denormals // Optimization: precomputed java-mode mask for handling denormals
u32 jm_mask = 0x7f80'0000; u32 jm_mask = 0x7f80'0000;
@ -310,6 +307,9 @@ public:
// Thread name // Thread name
atomic_ptr<std::string> ppu_tname; atomic_ptr<std::string> ppu_tname;
// Hypervisor context data
rpcs3::hypervisor_context_t hv_ctx; // HV context for gate enter exit. Keep at a low struct offset.
u64 last_ftsc = 0; u64 last_ftsc = 0;
u64 last_ftime = 0; u64 last_ftime = 0;
u32 last_faddr = 0; u32 last_faddr = 0;

5
rpcs3/Emu/Cell/SPUThread.h
View File

@ -673,9 +673,6 @@ public:
std::array<v128, 128> gpr{}; std::array<v128, 128> gpr{};
SPU_FPSCR fpscr{}; SPU_FPSCR fpscr{};
// Hypervisor context data
rpcs3::hypervisor_context_t hv_ctx; // NOTE: The offset within the class must be within the first 1MiB (10 bits max)
// MFC command data // MFC command data
spu_mfc_cmd ch_mfc_cmd{}; spu_mfc_cmd ch_mfc_cmd{};
@ -791,6 +788,8 @@ public:
u64 block_recover = 0; u64 block_recover = 0;
u64 block_failure = 0; u64 block_failure = 0;
rpcs3::hypervisor_context_t hv_ctx; // NOTE: The offset within the class must be within the first 1MiB
u64 ftx = 0; // Failed transactions u64 ftx = 0; // Failed transactions
u64 stx = 0; // Succeeded transactions (pure counters) u64 stx = 0; // Succeeded transactions (pure counters)