mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 02:03:24 +02:00
ARMInterface: Correct rebase errors.
This commit is contained in:
parent
71f1c0f9f9
commit
dda6147b0d
@ -212,8 +212,8 @@ void ARM_Dynarmic_64::Step() {
|
|||||||
ARM_Dynarmic_64::ARM_Dynarmic_64(System& system, CPUInterrupts& interrupt_handlers,
|
ARM_Dynarmic_64::ARM_Dynarmic_64(System& system, CPUInterrupts& interrupt_handlers,
|
||||||
bool uses_wall_clock, ExclusiveMonitor& exclusive_monitor,
|
bool uses_wall_clock, ExclusiveMonitor& exclusive_monitor,
|
||||||
std::size_t core_index)
|
std::size_t core_index)
|
||||||
: ARM_Interface{system, interrupt_handler, uses_wall_clock},
|
: ARM_Interface{system, interrupt_handlers, uses_wall_clock},
|
||||||
cb(std::make_unique<DynarmicCallbacks64>(*this)), inner_unicorn{system, interrupt_handler,
|
cb(std::make_unique<DynarmicCallbacks64>(*this)), inner_unicorn{system, interrupt_handlers,
|
||||||
uses_wall_clock,
|
uses_wall_clock,
|
||||||
ARM_Unicorn::Arch::AArch64,
|
ARM_Unicorn::Arch::AArch64,
|
||||||
core_index},
|
core_index},
|
||||||
|
@ -63,9 +63,9 @@ static bool UnmappedMemoryHook(uc_engine* uc, uc_mem_type type, u64 addr, int si
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
ARM_Unicorn::ARM_Unicorn(System& system, CPUInterruptHandler& interrupt_handler,
|
ARM_Unicorn::ARM_Unicorn(System& system, CPUInterrupts& interrupt_handlers,
|
||||||
bool uses_wall_clock, Arch architecture, std::size_t core_index)
|
bool uses_wall_clock, Arch architecture, std::size_t core_index)
|
||||||
: ARM_Interface{system, interrupt_handler, uses_wall_clock}, core_index{core_index} {
|
: ARM_Interface{system, interrupt_handlers, uses_wall_clock}, core_index{core_index} {
|
||||||
const auto arch = architecture == Arch::AArch32 ? UC_ARCH_ARM : UC_ARCH_ARM64;
|
const auto arch = architecture == Arch::AArch32 ? UC_ARCH_ARM : UC_ARCH_ARM64;
|
||||||
CHECKED(uc_open(arch, UC_MODE_ARM, &uc));
|
CHECKED(uc_open(arch, UC_MODE_ARM, &uc));
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ public:
|
|||||||
AArch64, // 64-bit ARM
|
AArch64, // 64-bit ARM
|
||||||
};
|
};
|
||||||
|
|
||||||
explicit ARM_Unicorn(System& system, CPUInterruptHandler& interrupt_handler,
|
explicit ARM_Unicorn(System& system, CPUInterrupts& interrupt_handlers,
|
||||||
bool uses_wall_clock, Arch architecture, std::size_t core_index);
|
bool uses_wall_clock, Arch architecture, std::size_t core_index);
|
||||||
~ARM_Unicorn() override;
|
~ARM_Unicorn() override;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user