ARMInterface: Correct rebase errors.

src/core/arm/dynarmic/arm_dynarmic_64.cpp

@@ -212,8 +212,8 @@ void ARM_Dynarmic_64::Step() {
 ARM_Dynarmic_64::ARM_Dynarmic_64(System& system, CPUInterrupts& interrupt_handlers,
                                  bool uses_wall_clock, ExclusiveMonitor& exclusive_monitor,
                                  std::size_t core_index)
-    : ARM_Interface{system, interrupt_handler, uses_wall_clock},
-      cb(std::make_unique<DynarmicCallbacks64>(*this)), inner_unicorn{system, interrupt_handler,
+    : ARM_Interface{system, interrupt_handlers, uses_wall_clock},
+      cb(std::make_unique<DynarmicCallbacks64>(*this)), inner_unicorn{system, interrupt_handlers,
                                                                       uses_wall_clock,
                                                                       ARM_Unicorn::Arch::AArch64,
                                                                       core_index},

src/core/arm/unicorn/arm_unicorn.cpp

@@ -63,9 +63,9 @@ static bool UnmappedMemoryHook(uc_engine* uc, uc_mem_type type, u64 addr, int si
     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)
-    : 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;
     CHECKED(uc_open(arch, UC_MODE_ARM, &uc));
 

src/core/arm/unicorn/arm_unicorn.h

@@ -20,7 +20,7 @@ public:
         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);
     ~ARM_Unicorn() override;