archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 09:48:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unused code removed

Browse source
This commit is contained in:
Nekotekina 2015-02-28 15:37:06 +03:00
parent e4bfe81712
commit 6cbdeb9411
4 changed files with 7 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Cell/PPUProgramCompiler.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "PPUInstrTable.h" /*#include "PPUInstrTable.h"
#include "Loader/ELF64.h" #include "Loader/ELF64.h"
/*
enum ArgType enum ArgType
{ {
ARG_ERR = 0, ARG_ERR = 0,

10
rpcs3/Emu/System.cpp
View file

@ -38,11 +38,6 @@ static const std::string& BreakPointsDBName = "BreakPoints.dat";
static const u16 bpdb_version = 0x1000; static const u16 bpdb_version = 0x1000;
extern std::atomic<u32> g_thread_count; extern std::atomic<u32> g_thread_count;
ModuleInitializer::ModuleInitializer()
{
Emu.AddModuleInit(std::move(std::unique_ptr<ModuleInitializer>(this)));
}
Emulator::Emulator() Emulator::Emulator()
: m_status(Stopped) : m_status(Stopped)
, m_mode(DisAsm) , m_mode(DisAsm)
@ -82,11 +77,6 @@ Emulator::~Emulator()
void Emulator::Init() void Emulator::Init()
{ {
while(m_modules_init.size())
{
m_modules_init[0]->Init();
m_modules_init.erase(m_modules_init.begin());
}
} }
void Emulator::SetPath(const std::string& path, const std::string& elf_path) void Emulator::SetPath(const std::string& path, const std::string& elf_path)

14
rpcs3/Emu/System.h
View file

@ -61,14 +61,6 @@ public:
u32 GetTLSMemsz() const { return tls_memsz; } u32 GetTLSMemsz() const { return tls_memsz; }
}; };
class ModuleInitializer
{
public:
ModuleInitializer();
virtual void Init() = 0;
};
class Emulator class Emulator
{ {
enum Mode enum Mode
@ -83,7 +75,6 @@ class Emulator
u32 m_rsx_callback; u32 m_rsx_callback;
u32 m_cpu_thr_stop; u32 m_cpu_thr_stop;
std::vector<std::unique_ptr<ModuleInitializer>> m_modules_init;
std::vector<u64> m_break_points; std::vector<u64> m_break_points;
std::vector<u64> m_marked_points; std::vector<u64> m_marked_points;
@ -164,11 +155,6 @@ public:
ModuleManager& GetModuleManager() { return *m_module_manager; } ModuleManager& GetModuleManager() { return *m_module_manager; }
SyncPrimManager& GetSyncPrimManager() { return *m_sync_prim_manager; } SyncPrimManager& GetSyncPrimManager() { return *m_sync_prim_manager; }
void AddModuleInit(std::unique_ptr<ModuleInitializer> m)
{
m_modules_init.push_back(std::move(m));
}
void SetTLSData(u32 addr, u32 filesz, u32 memsz) void SetTLSData(u32 addr, u32 filesz, u32 memsz)
{ {
m_info.SetTLSData(addr, filesz, memsz); m_info.SetTLSData(addr, filesz, memsz);

9
rpcs3/Gui/CompilerELF.cpp
View file

@ -1,8 +1,9 @@
#include "stdafx_gui.h" #include "stdafx_gui.h"
#include "Utilities/rMsgBox.h" #include "Utilities/rMsgBox.h"
#include "Emu/Cell/PPUProgramCompiler.h" //#include "Emu/Cell/PPUProgramCompiler.h"
using namespace PPU_opcodes; //using namespace PPU_opcodes;
#include "CompilerELF.h" #include "CompilerELF.h"
enum CompilerIDs enum CompilerIDs
@ -392,8 +393,8 @@ void CompilerELF::LoadElf(wxCommandEvent& event)
LoadElf(fmt::ToUTF8(ctrl.GetPath())); LoadElf(fmt::ToUTF8(ctrl.GetPath()));
} }
#include "Emu/Cell/PPUDisAsm.h" //#include "Emu/Cell/PPUDisAsm.h"
#include "Emu/Cell/PPUDecoder.h" //#include "Emu/Cell/PPUDecoder.h"
void CompilerELF::LoadElf(const std::string& path) void CompilerELF::LoadElf(const std::string& path)
{ {