Calchan/eden
1
0
Fork 0
forked from eden-emu/eden
Code Pull requests Activity

[nce] more arm macos fixes

Browse source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2025-08-30 20:22:24 +00:00 • committed by crueter
parent e4d75caca4
commit ec96d066ab
Signed by untrusted user: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/core/arm/nce/arm_nce.cpp
View file

@ -40,11 +40,7 @@ constexpr u32 StackSize = 128_KiB;
} // namespace } // namespace
void* ArmNce::RestoreGuestContext(void* raw_context) { void* ArmNce::RestoreGuestContext(void* raw_context) {
// Retrieve the host context. CTX_DECLARE(raw_context);
auto& host_ctx = static_cast<ucontext_t*>(raw_context)->uc_mcontext;
// Retrieve the host floating point state.
auto* fpctx = GetFloatingPointState(host_ctx);
// Restore all guest state except tpidr_el0. // Restore all guest state except tpidr_el0.
// Thread-local parameters will be located in x9. // Thread-local parameters will be located in x9.
auto* tpidr = reinterpret_cast<NativeExecutionParameters*>(CTX_X(9)); auto* tpidr = reinterpret_cast<NativeExecutionParameters*>(CTX_X(9));
@ -66,12 +62,7 @@ void* ArmNce::RestoreGuestContext(void* raw_context) {
} }
void ArmNce::SaveGuestContext(GuestContext* guest_ctx, void* raw_context) { void ArmNce::SaveGuestContext(GuestContext* guest_ctx, void* raw_context) {
// Retrieve the host context. CTX_DECLARE(raw_context);
auto& host_ctx = static_cast<ucontext_t*>(raw_context)->uc_mcontext;
// Retrieve the host floating point state.
auto* fpctx = GetFloatingPointState(host_ctx);
// Save all guest registers except tpidr_el0. // Save all guest registers except tpidr_el0.
std::memcpy(guest_ctx->cpu_registers.data(), &CTX_X(0), sizeof(guest_ctx->cpu_registers)); std::memcpy(guest_ctx->cpu_registers.data(), &CTX_X(0), sizeof(guest_ctx->cpu_registers));
std::memcpy(guest_ctx->vector_registers.data(), &CTX_Q(0), sizeof(guest_ctx->vector_registers)); std::memcpy(guest_ctx->vector_registers.data(), &CTX_Q(0), sizeof(guest_ctx->vector_registers));
@ -95,16 +86,15 @@ void ArmNce::SaveGuestContext(GuestContext* guest_ctx, void* raw_context) {
} }
bool ArmNce::HandleFailedGuestFault(GuestContext* guest_ctx, void* raw_info, void* raw_context) { bool ArmNce::HandleFailedGuestFault(GuestContext* guest_ctx, void* raw_info, void* raw_context) {
auto& host_ctx = static_cast<ucontext_t*>(raw_context)->uc_mcontext; CTX_DECLARE(raw_context);
auto* info = static_cast<siginfo_t*>(raw_info); auto* info = static_cast<siginfo_t*>(raw_info);
// We can't handle the access, so determine why we crashed. // We can't handle the access, so determine why we crashed.
const bool is_prefetch_abort = host_ctx.pc == reinterpret_cast<u64>(info->si_addr); auto const is_prefetch_abort = CTX_PC == reinterpret_cast<u64>(info->si_addr);
// For data aborts, skip the instruction and return to guest code. // For data aborts, skip the instruction and return to guest code.
// This will allow games to continue in many scenarios where they would otherwise crash. // This will allow games to continue in many scenarios where they would otherwise crash.
if (!is_prefetch_abort) { if (!is_prefetch_abort) {
host_ctx.pc += 4; CTX_PC += 4;
return true; return true;
} }
@ -129,7 +119,7 @@ bool ArmNce::HandleGuestAlignmentFault(GuestContext* guest_ctx, void* raw_info,
auto& memory = guest_ctx->system->ApplicationMemory(); auto& memory = guest_ctx->system->ApplicationMemory();
// Match and execute an instruction. // Match and execute an instruction.
if (auto next_pc = MatchAndExecuteOneInstruction(memory, raw_context); next_pc) { if (auto next_pc = MatchAndExecuteOneInstruction(memory, raw_context); next_pc) {
host_ctx.pc = *next_pc; CTX_PC = *next_pc;
return true; return true;
} }
// We couldn't handle the access. // We couldn't handle the access.

12
src/dynarmic/src/dynarmic/common/context.h
View file

@ -17,13 +17,13 @@
#endif #endif
#ifndef MCL_ARCHITECTURE_RISCV #ifndef MCL_ARCHITECTURE_RISCV
# ifndef __OpenBSD__ # ifdef __OpenBSD__
# define CTX_DECLARE(raw_context) ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(raw_context);
# else
# define CTX_DECLARE(raw_context) \ # define CTX_DECLARE(raw_context) \
ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(raw_context); \ ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(raw_context); \
auto& mctx = reinterpret_cast<ucontext_t*>(raw_context)->uc_mcontext; \ [[maybe_unused]] auto& mctx = reinterpret_cast<ucontext_t*>(raw_context)->uc_mcontext; \
[[maybe_unused]] const auto fpctx = GetFloatingPointState(mctx); [[maybe_unused]] const auto fpctx = GetFloatingPointState(mctx);
# else
# define CTX_DECLARE(raw_context) ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(raw_context);
# endif # endif
#endif #endif
@ -54,7 +54,7 @@
# define CTX_PC (mctx->__ss.__pc) # define CTX_PC (mctx->__ss.__pc)
# define CTX_SP (mctx->__ss.__sp) # define CTX_SP (mctx->__ss.__sp)
# define CTX_LR (mctx->__ss.__lr) # define CTX_LR (mctx->__ss.__lr)
# define CTX_LR (mctx->__ss.__pstate) # define CTX_PSTATE (mctx->__ss.__pstate)
# define CTX_X(i) (mctx->__ss.__x[i]) # define CTX_X(i) (mctx->__ss.__x[i])
# define CTX_Q(i) (mctx->__ns.__v[i]) # define CTX_Q(i) (mctx->__ns.__v[i])
# define CTX_FPSR(i) (mctx->__ns.__fpsr) # define CTX_FPSR(i) (mctx->__ns.__fpsr)
@ -63,7 +63,7 @@
# define CTX_PC (mctx.pc) # define CTX_PC (mctx.pc)
# define CTX_SP (mctx.sp) # define CTX_SP (mctx.sp)
# define CTX_LR (mctx.regs[30]) # define CTX_LR (mctx.regs[30])
# define CTX_SP (mctx.pstate) # define CTX_PSTATE (mctx.pstate)
# define CTX_X(i) (mctx.regs[i]) # define CTX_X(i) (mctx.regs[i])
# define CTX_Q(i) (fpctx->vregs[i]) # define CTX_Q(i) (fpctx->vregs[i])
# elif defined(__FreeBSD__) # elif defined(__FreeBSD__)