From 444a01afa6ed52df21a22b28e9efe949ce1a428c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 30 Jul 2018 23:46:07 -0400 Subject: arm_dynarmic: Correct initializer list order Amends the initializer list to be in the same order that each variable would be initialized in. We also do this to ensure we don't use a bogus uninitialized instance of the exclusive monitor within MakeJit() We can also remove the jit member from the initializer list as this is initialized by PageTableChanged() --- src/core/arm/dynarmic/arm_dynarmic.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/core') diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 57b8634b9..343866251 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -139,14 +139,12 @@ void ARM_Dynarmic::Step() { } ARM_Dynarmic::ARM_Dynarmic(std::shared_ptr exclusive_monitor, size_t core_index) - : cb(std::make_unique(*this)), - jit(MakeJit()), exclusive_monitor{std::dynamic_pointer_cast( - exclusive_monitor)}, - core_index{core_index} { + : cb(std::make_unique(*this)), core_index{core_index}, + exclusive_monitor{std::dynamic_pointer_cast(exclusive_monitor)} { ARM_Interface::ThreadContext ctx; inner_unicorn.SaveContext(ctx); - LoadContext(ctx); PageTableChanged(); + LoadContext(ctx); } ARM_Dynarmic::~ARM_Dynarmic() = default; -- cgit v1.2.3 From 9d6aa7bff773a1553bf855177621315f882fa4dd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 31 Jul 2018 07:56:57 -0400 Subject: arm_dynarmic: Remove unnecessary qualifying of ThreadContext Given the ARM_Dynarmic class inherits from ARM_Interface, we don't need to qualify here. --- src/core/arm/dynarmic/arm_dynarmic.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core') diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 343866251..acb3437f2 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -141,7 +141,7 @@ void ARM_Dynarmic::Step() { ARM_Dynarmic::ARM_Dynarmic(std::shared_ptr exclusive_monitor, size_t core_index) : cb(std::make_unique(*this)), core_index{core_index}, exclusive_monitor{std::dynamic_pointer_cast(exclusive_monitor)} { - ARM_Interface::ThreadContext ctx; + ThreadContext ctx; inner_unicorn.SaveContext(ctx); PageTableChanged(); LoadContext(ctx); @@ -215,7 +215,7 @@ void ARM_Dynarmic::SetTPIDR_EL0(u64 value) { cb->tpidr_el0 = value; } -void ARM_Dynarmic::SaveContext(ARM_Interface::ThreadContext& ctx) { +void ARM_Dynarmic::SaveContext(ThreadContext& ctx) { ctx.cpu_registers = jit->GetRegisters(); ctx.sp = jit->GetSP(); ctx.pc = jit->GetPC(); @@ -224,7 +224,7 @@ void ARM_Dynarmic::SaveContext(ARM_Interface::ThreadContext& ctx) { ctx.fpscr = jit->GetFpcr(); } -void ARM_Dynarmic::LoadContext(const ARM_Interface::ThreadContext& ctx) { +void ARM_Dynarmic::LoadContext(const ThreadContext& ctx) { jit->SetRegisters(ctx.cpu_registers); jit->SetSP(ctx.sp); jit->SetPC(ctx.pc); -- cgit v1.2.3 From f08c0520a4dd00acae8f8d5f275a2bdef275b3a1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 31 Jul 2018 07:58:24 -0400 Subject: arm_dynarmic: Make SetTlsAddress() prototype and definition consistent Makes the definition use the same type aliases as in its prototype. --- src/core/arm/dynarmic/arm_dynarmic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index acb3437f2..1d8c15d97 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -203,7 +203,7 @@ u64 ARM_Dynarmic::GetTlsAddress() const { return cb->tpidrro_el0; } -void ARM_Dynarmic::SetTlsAddress(u64 address) { +void ARM_Dynarmic::SetTlsAddress(VAddr address) { cb->tpidrro_el0 = address; } -- cgit v1.2.3