Browse Source

Merge pull request #8257 from merryhime/rm-PrepareReschedule

Remove unused PrepareReschedule function
nce_cpp
Mai M 4 years ago
committed by GitHub
parent
commit
1e68148c85
  1. 3
      src/core/arm/arm_interface.h
  2. 4
      src/core/arm/dynarmic/arm_dynarmic_32.cpp
  3. 1
      src/core/arm/dynarmic/arm_dynarmic_32.h
  4. 4
      src/core/arm/dynarmic/arm_dynarmic_64.cpp
  5. 1
      src/core/arm/dynarmic/arm_dynarmic_64.h
  6. 4
      src/core/core.cpp
  7. 3
      src/core/core.h

3
src/core/arm/arm_interface.h

@ -174,9 +174,6 @@ public:
/// Clears the exclusive monitor's state.
virtual void ClearExclusiveState() = 0;
/// Prepare core for thread reschedule (if needed to correctly handle state)
virtual void PrepareReschedule() = 0;
/// Signal an interrupt and ask the core to halt as soon as possible.
virtual void SignalInterrupt() = 0;

4
src/core/arm/dynarmic/arm_dynarmic_32.cpp

@ -327,10 +327,6 @@ void ARM_Dynarmic_32::LoadContext(const ThreadContext32& ctx) {
jit.load()->LoadContext(context);
}
void ARM_Dynarmic_32::PrepareReschedule() {
jit.load()->HaltExecution(break_loop);
}
void ARM_Dynarmic_32::SignalInterrupt() {
jit.load()->HaltExecution(break_loop);
}

1
src/core/arm/dynarmic/arm_dynarmic_32.h

@ -57,7 +57,6 @@ public:
void LoadContext(const ThreadContext32& ctx) override;
void LoadContext(const ThreadContext64& ctx) override {}
void PrepareReschedule() override;
void SignalInterrupt() override;
void ClearExclusiveState() override;

4
src/core/arm/dynarmic/arm_dynarmic_64.cpp

@ -395,10 +395,6 @@ void ARM_Dynarmic_64::LoadContext(const ThreadContext64& ctx) {
SetTPIDR_EL0(ctx.tpidr);
}
void ARM_Dynarmic_64::PrepareReschedule() {
jit.load()->HaltExecution(break_loop);
}
void ARM_Dynarmic_64::SignalInterrupt() {
jit.load()->HaltExecution(break_loop);
}

1
src/core/arm/dynarmic/arm_dynarmic_64.h

@ -51,7 +51,6 @@ public:
void LoadContext(const ThreadContext32& ctx) override {}
void LoadContext(const ThreadContext64& ctx) override;
void PrepareReschedule() override;
void SignalInterrupt() override;
void ClearExclusiveState() override;

4
src/core/core.cpp

@ -505,10 +505,6 @@ bool System::IsPoweredOn() const {
return impl->is_powered_on.load(std::memory_order::relaxed);
}
void System::PrepareReschedule() {
// Deprecated, does nothing, kept for backward compatibility.
}
void System::PrepareReschedule(const u32 core_index) {
impl->kernel.PrepareReschedule(core_index);
}

3
src/core/core.h

@ -193,9 +193,6 @@ public:
/// Gets a reference to the telemetry session for this emulation session.
[[nodiscard]] const Core::TelemetrySession& TelemetrySession() const;
/// Prepare the core emulation for a reschedule
void PrepareReschedule();
/// Prepare the core emulation for a reschedule
void PrepareReschedule(u32 core_index);

Loading…
Cancel
Save