summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-09-02 05:07:14 +0200
committerbunnei <bunneidev@gmail.com>2016-09-15 23:49:26 +0200
commit1976a2d77374fa3465c02ccab08031ff67a743df (patch)
tree6fda308ba4b141cfe72c730e0f58092ff8ba562a /src
parentdynarmic: Add new submodule. (diff)
downloadyuzu-1976a2d77374fa3465c02ccab08031ff67a743df.tar
yuzu-1976a2d77374fa3465c02ccab08031ff67a743df.tar.gz
yuzu-1976a2d77374fa3465c02ccab08031ff67a743df.tar.bz2
yuzu-1976a2d77374fa3465c02ccab08031ff67a743df.tar.lz
yuzu-1976a2d77374fa3465c02ccab08031ff67a743df.tar.xz
yuzu-1976a2d77374fa3465c02ccab08031ff67a743df.tar.zst
yuzu-1976a2d77374fa3465c02ccab08031ff67a743df.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/CMakeLists.txt6
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp176
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.h51
3 files changed, 233 insertions, 0 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 174e9dc79..4a9c6fd2f 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,6 +1,7 @@
set(SRCS
arm/disassembler/arm_disasm.cpp
arm/disassembler/load_symbol_map.cpp
+ arm/dynarmic/arm_dynarmic.cpp
arm/dyncom/arm_dyncom.cpp
arm/dyncom/arm_dyncom_dec.cpp
arm/dyncom/arm_dyncom_interpreter.cpp
@@ -141,6 +142,7 @@ set(HEADERS
arm/arm_interface.h
arm/disassembler/arm_disasm.h
arm/disassembler/load_symbol_map.h
+ arm/dynarmic/arm_dynarmic.h
arm/dyncom/arm_dyncom.h
arm/dyncom/arm_dyncom_dec.h
arm/dyncom/arm_dyncom_interpreter.h
@@ -285,6 +287,10 @@ set(HEADERS
system.h
)
+include_directories(../../externals/dynarmic/include)
+
create_directory_groups(${SRCS} ${HEADERS})
add_library(core STATIC ${SRCS} ${HEADERS})
+
+target_link_libraries(core dynarmic)
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
new file mode 100644
index 000000000..46b4d6103
--- /dev/null
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -0,0 +1,176 @@
+// Copyright 2016 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "common/assert.h"
+#include "common/microprofile.h"
+
+#include <dynarmic/dynarmic.h>
+
+#include "core/arm/dynarmic/arm_dynarmic.h"
+#include "core/arm/dyncom/arm_dyncom_interpreter.h"
+#include "core/core.h"
+#include "core/core_timing.h"
+#include "core/hle/svc.h"
+#include "core/memory.h"
+
+static void InterpreterFallback(u32 pc, Dynarmic::Jit* jit, void* user_arg) {
+ ARMul_State* state = static_cast<ARMul_State*>(user_arg);
+
+ state->Reg = jit->Regs();
+ state->Cpsr = jit->Cpsr();
+ state->Reg[15] = pc;
+ state->ExtReg = jit->ExtRegs();
+ state->VFP[VFP_FPSCR] = jit->Fpscr();
+ state->NumInstrsToExecute = 1;
+
+ InterpreterMainLoop(state);
+
+ bool is_thumb = (state->Cpsr & (1 << 5)) != 0;
+ state->Reg[15] &= (is_thumb ? 0xFFFFFFFE : 0xFFFFFFFC);
+
+ jit->Regs() = state->Reg;
+ jit->Cpsr() = state->Cpsr;
+ jit->ExtRegs() = state->ExtReg;
+ jit->SetFpscr(state->VFP[VFP_FPSCR]);
+}
+
+static bool IsReadOnlyMemory(u32 vaddr) {
+ // TODO(bunnei): ImplementMe
+ return false;
+}
+
+static Dynarmic::UserCallbacks GetUserCallbacks(ARMul_State* interpeter_state) {
+ Dynarmic::UserCallbacks user_callbacks{};
+ user_callbacks.InterpreterFallback = &InterpreterFallback;
+ user_callbacks.user_arg = static_cast<void*>(interpeter_state);
+ user_callbacks.CallSVC = &SVC::CallSVC;
+ user_callbacks.IsReadOnlyMemory = &IsReadOnlyMemory;
+ user_callbacks.MemoryRead8 = &Memory::Read8;
+ user_callbacks.MemoryRead16 = &Memory::Read16;
+ user_callbacks.MemoryRead32 = &Memory::Read32;
+ user_callbacks.MemoryRead64 = &Memory::Read64;
+ user_callbacks.MemoryWrite8 = &Memory::Write8;
+ user_callbacks.MemoryWrite16 = &Memory::Write16;
+ user_callbacks.MemoryWrite32 = &Memory::Write32;
+ user_callbacks.MemoryWrite64 = &Memory::Write64;
+ return user_callbacks;
+}
+
+ARM_Dynarmic::ARM_Dynarmic(PrivilegeMode initial_mode) {
+ interpreter_state = std::make_unique<ARMul_State>(initial_mode);
+ jit = std::make_unique<Dynarmic::Jit>(GetUserCallbacks(interpreter_state.get()));
+}
+
+void ARM_Dynarmic::SetPC(u32 pc) {
+ jit->Regs()[15] = pc;
+}
+
+u32 ARM_Dynarmic::GetPC() const {
+ return jit->Regs()[15];
+}
+
+u32 ARM_Dynarmic::GetReg(int index) const {
+ return jit->Regs()[index];
+}
+
+void ARM_Dynarmic::SetReg(int index, u32 value) {
+ jit->Regs()[index] = value;
+}
+
+u32 ARM_Dynarmic::GetVFPReg(int index) const {
+ return jit->ExtRegs()[index];
+}
+
+void ARM_Dynarmic::SetVFPReg(int index, u32 value) {
+ jit->ExtRegs()[index] = value;
+}
+
+u32 ARM_Dynarmic::GetVFPSystemReg(VFPSystemRegister reg) const {
+ // TODO(bunnei): ImplementMe
+ UNIMPLEMENTED();
+ return 0;
+}
+
+void ARM_Dynarmic::SetVFPSystemReg(VFPSystemRegister reg, u32 value) {
+ // TODO(bunnei): ImplementMe
+ UNIMPLEMENTED();
+}
+
+u32 ARM_Dynarmic::GetCPSR() const {
+ return jit->Cpsr();
+}
+
+void ARM_Dynarmic::SetCPSR(u32 cpsr) {
+ jit->Cpsr() = cpsr;
+}
+
+u32 ARM_Dynarmic::GetCP15Register(CP15Register reg) {
+ return interpreter_state->CP15[reg];
+}
+
+void ARM_Dynarmic::SetCP15Register(CP15Register reg, u32 value) {
+ interpreter_state->CP15[reg] = value;
+}
+
+void ARM_Dynarmic::AddTicks(u64 ticks) {
+ down_count -= ticks;
+ if (down_count < 0) {
+ CoreTiming::Advance();
+ }
+}
+
+MICROPROFILE_DEFINE(ARM_Jit, "ARM JIT", "ARM JIT", MP_RGB(255, 64, 64));
+
+void ARM_Dynarmic::ExecuteInstructions(int num_instructions) {
+ MICROPROFILE_SCOPE(ARM_Jit);
+
+ jit->Run(static_cast<unsigned>(num_instructions));
+
+ AddTicks(num_instructions);
+}
+
+void ARM_Dynarmic::ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) {
+ memset(&context, 0, sizeof(Core::ThreadContext));
+
+ context.cpu_registers[0] = arg;
+ context.pc = entry_point;
+ context.sp = stack_top;
+ context.cpsr = USER32MODE | ((entry_point & 1) << 5); // Usermode and THUMB mode
+}
+
+void ARM_Dynarmic::SaveContext(Core::ThreadContext& ctx) {
+ memcpy(ctx.cpu_registers, jit->Regs().data(), sizeof(ctx.cpu_registers));
+ memcpy(ctx.fpu_registers, jit->ExtRegs().data(), sizeof(ctx.fpu_registers));
+
+ ctx.sp = jit->Regs()[13];
+ ctx.lr = jit->Regs()[14];
+ ctx.pc = jit->Regs()[15];
+ ctx.cpsr = jit->Cpsr();
+
+ ctx.fpscr = jit->Fpscr();
+ ctx.fpexc = interpreter_state->VFP[VFP_FPEXC];
+}
+
+void ARM_Dynarmic::LoadContext(const Core::ThreadContext& ctx) {
+ memcpy(jit->Regs().data(), ctx.cpu_registers, sizeof(ctx.cpu_registers));
+ memcpy(jit->ExtRegs().data(), ctx.fpu_registers, sizeof(ctx.fpu_registers));
+
+ jit->Regs()[13] = ctx.sp;
+ jit->Regs()[14] = ctx.lr;
+ jit->Regs()[15] = ctx.pc;
+ jit->Cpsr() = ctx.cpsr;
+
+ jit->SetFpscr(ctx.fpscr);
+ interpreter_state->VFP[VFP_FPEXC] = ctx.fpexc;
+}
+
+void ARM_Dynarmic::PrepareReschedule() {
+ if (jit->IsExecuting()) {
+ jit->HaltExecution();
+ }
+}
+
+void ARM_Dynarmic::ClearInstructionCache() {
+ jit->ClearCache();
+}
diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h
new file mode 100644
index 000000000..6cae56737
--- /dev/null
+++ b/src/core/arm/dynarmic/arm_dynarmic.h
@@ -0,0 +1,51 @@
+// Copyright 2016 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+
+#include <dynarmic/dynarmic.h>
+
+#include "common/common_types.h"
+
+#include "core/arm/arm_interface.h"
+#include "core/arm/skyeye_common/armstate.h"
+
+namespace Core {
+struct ThreadContext;
+}
+
+class ARM_Dynarmic final : virtual public ARM_Interface {
+public:
+ ARM_Dynarmic(PrivilegeMode initial_mode);
+
+ void SetPC(u32 pc) override;
+ u32 GetPC() const override;
+ u32 GetReg(int index) const override;
+ void SetReg(int index, u32 value) override;
+ u32 GetVFPReg(int index) const override;
+ void SetVFPReg(int index, u32 value) override;
+ u32 GetVFPSystemReg(VFPSystemRegister reg) const override;
+ void SetVFPSystemReg(VFPSystemRegister reg, u32 value) override;
+ u32 GetCPSR() const override;
+ void SetCPSR(u32 cpsr) override;
+ u32 GetCP15Register(CP15Register reg) override;
+ void SetCP15Register(CP15Register reg, u32 value) override;
+
+ void AddTicks(u64 ticks) override;
+
+ void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) override;
+ void SaveContext(Core::ThreadContext& ctx) override;
+ void LoadContext(const Core::ThreadContext& ctx) override;
+
+ void PrepareReschedule() override;
+ void ExecuteInstructions(int num_instructions) override;
+
+ void ClearInstructionCache() override;
+
+private:
+ std::unique_ptr<Dynarmic::Jit> jit;
+ std::unique_ptr<ARMul_State> interpreter_state;
+};