Skip to content

Commit

Permalink
Merge pull request #12762 from mitaclaw/dead-config-code
Browse files Browse the repository at this point in the history
PowerPC: Remove Dead Config Code
  • Loading branch information
AdmiralCurtiss committed May 4, 2024
2 parents c442c0d + 2b337ae commit 0daf4d1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 31 deletions.
26 changes: 0 additions & 26 deletions Source/Core/Core/PowerPC/PowerPC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
#include <algorithm>
#include <bit>
#include <cstring>
#include <istream>
#include <ostream>
#include <type_traits>
#include <vector>

Expand Down Expand Up @@ -61,30 +59,6 @@ static void InvalidateCacheThreadSafe(Core::System& system, u64 userdata, s64 cy
static_cast<u32>(userdata));
}

std::istream& operator>>(std::istream& is, CPUCore& core)
{
std::underlying_type_t<CPUCore> val{};

if (is >> val)
{
core = static_cast<CPUCore>(val);
}
else
{
// Upon failure, fall back to the cached interpreter
// to ensure we always initialize our core reference.
core = CPUCore::CachedInterpreter;
}

return is;
}

std::ostream& operator<<(std::ostream& os, CPUCore core)
{
os << static_cast<std::underlying_type_t<CPUCore>>(core);
return os;
}

PowerPCManager::PowerPCManager(Core::System& system)
: m_breakpoints(system), m_memchecks(system), m_debug_interface(system, m_symbol_db),
m_system(system)
Expand Down
5 changes: 0 additions & 5 deletions Source/Core/Core/PowerPC/PowerPC.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include <array>
#include <cstddef>
#include <iosfwd>
#include <span>
#include <tuple>
#include <type_traits>
Expand Down Expand Up @@ -41,10 +40,6 @@ enum class CPUCore
CachedInterpreter = 5,
};

// For reading from and writing to our config.
std::istream& operator>>(std::istream& is, CPUCore& core);
std::ostream& operator<<(std::ostream& os, CPUCore core);

enum class CoreMode
{
Interpreter,
Expand Down

0 comments on commit 0daf4d1

Please sign in to comment.