backend/dynarmic: bug fix for context_restore

Malongtao1995 · Dec 17, 2021 · d3afa16 · d3afa16
1 parent 575ac20
commit d3afa16
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/backend/dynarmic/src/main/native/dynarmic/dynarmic.cpp b/backend/dynarmic/src/main/native/dynarmic/dynarmic.cpp
@@ -1290,13 +1290,20 @@ JNIEXPORT void JNICALL Java_com_github_unidbg_arm_backend_dynarmic_Dynarmic_cont
     jit->SetFpcr(ctx->fpcr);
     jit->SetFpsr(ctx->fpsr);
     jit->SetPstate(ctx->pstate);
+
+    DynarmicCallbacks64 *cb = dynarmic->cb64;
+    cb->tpidr_el0 = ctx->tpidr_el0;
+    cb->tpidrro_el0 = ctx->tpidrro_el0;
   } else {
     Dynarmic::A32::Jit *jit = dynarmic->jit32;
     t_context32 ctx = (t_context32) context;
     jit->Regs() = ctx->regs;
     jit->ExtRegs() = ctx->extRegs;
     jit->SetCpsr(ctx->cpsr);
     jit->SetFpscr(ctx->fpscr);
+
+    DynarmicCallbacks32 *cb = dynarmic->cb32;
+    cb->cp15.get()->uro = ctx->uro;
   }
 }
 
@@ -1318,13 +1325,20 @@ JNIEXPORT void JNICALL Java_com_github_unidbg_arm_backend_dynarmic_Dynarmic_cont
     ctx->fpcr = jit->GetFpcr();
     ctx->fpsr = jit->GetFpsr();
     ctx->pstate = jit->GetPstate();
+
+    DynarmicCallbacks64 *cb = dynarmic->cb64;
+    ctx->tpidr_el0 = cb->tpidr_el0;
+    ctx->tpidrro_el0 = cb->tpidrro_el0;
   } else {
     Dynarmic::A32::Jit *jit = dynarmic->jit32;
     t_context32 ctx = (t_context32) context;
     ctx->regs = jit->Regs();
     ctx->extRegs = jit->ExtRegs();
     ctx->cpsr = jit->Cpsr();
     ctx->fpscr = jit->Fpscr();
+
+    DynarmicCallbacks32 *cb = dynarmic->cb32;
+    ctx->uro = cb->cp15.get()->uro;
   }
 }
 

diff --git a/backend/dynarmic/src/main/native/dynarmic/dynarmic.h b/backend/dynarmic/src/main/native/dynarmic/dynarmic.h
@@ -32,11 +32,14 @@ typedef struct context64 {
   std::uint32_t fpcr;
   std::uint32_t fpsr;
   std::uint32_t pstate;
+  std::uint64_t tpidr_el0;
+  std::uint64_t tpidrro_el0;
 } *t_context64;
 
 typedef struct context32 {
   std::array<std::uint32_t, 16> regs;
   std::array<std::uint32_t, 64> extRegs;
   std::uint32_t cpsr;
   std::uint32_t fpscr;
+  std::uint32_t uro;
 } *t_context32;
diff --git a/backend/dynarmic/src/main/resources/natives/osx_64/libdynarmic.dylib b/backend/dynarmic/src/main/resources/natives/osx_64/libdynarmic.dylib