diff --git a/src/xenia/cpu/backend.h b/src/xenia/cpu/backend.h index 51a533fe9..6182cf4de 100644 --- a/src/xenia/cpu/backend.h +++ b/src/xenia/cpu/backend.h @@ -20,7 +20,6 @@ namespace cpu { class JIT; -class LibraryLoader; namespace sdb { class SymbolTable; @@ -31,8 +30,6 @@ class Backend { public: virtual ~Backend() {} - virtual LibraryLoader* CreateLibraryLoader() = 0; - virtual JIT* CreateJIT(xe_memory_ref memory, sdb::SymbolTable* sym_table) = 0; protected: diff --git a/src/xenia/cpu/libjit/libjit_backend.cc b/src/xenia/cpu/libjit/libjit_backend.cc index b1fe7415f..fb72f588c 100644 --- a/src/xenia/cpu/libjit/libjit_backend.cc +++ b/src/xenia/cpu/libjit/libjit_backend.cc @@ -52,10 +52,6 @@ LibjitBackend::LibjitBackend() : LibjitBackend::~LibjitBackend() { } -LibraryLoader* LibjitBackend::CreateLibraryLoader() { - return NULL; -} - JIT* LibjitBackend::CreateJIT(xe_memory_ref memory, SymbolTable* sym_table) { return new LibjitJIT(memory, sym_table); } diff --git a/src/xenia/cpu/libjit/libjit_backend.h b/src/xenia/cpu/libjit/libjit_backend.h index bd8f0f6fc..cf9612f7f 100644 --- a/src/xenia/cpu/libjit/libjit_backend.h +++ b/src/xenia/cpu/libjit/libjit_backend.h @@ -25,8 +25,6 @@ public: LibjitBackend(); virtual ~LibjitBackend(); - virtual LibraryLoader* CreateLibraryLoader(); - virtual JIT* CreateJIT(xe_memory_ref memory, sdb::SymbolTable* sym_table); protected: diff --git a/src/xenia/cpu/libjit/libjit_library_loader.cc b/src/xenia/cpu/libjit/libjit_library_loader.cc deleted file mode 100644 index 83a3a35f5..000000000 --- a/src/xenia/cpu/libjit/libjit_library_loader.cc +++ /dev/null @@ -1,24 +0,0 @@ -/** - ****************************************************************************** - * Xenia : Xbox 360 Emulator Research Project * - ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * - * Released under the BSD license - see LICENSE in the root for more details. * - ****************************************************************************** - */ - -#include - - -using namespace xe; -using namespace xe::cpu; -using namespace xe::cpu::libjit; - - -LibjitLibraryLoader::LibjitLibraryLoader( - xe_memory_ref memory, kernel::ExportResolver* export_resolver) : - LibraryLoader(memory, export_resolver) { -} - -LibjitLibraryLoader::~LibjitLibraryLoader() { -} diff --git a/src/xenia/cpu/libjit/libjit_library_loader.h b/src/xenia/cpu/libjit/libjit_library_loader.h deleted file mode 100644 index 612913167..000000000 --- a/src/xenia/cpu/libjit/libjit_library_loader.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - ****************************************************************************** - * Xenia : Xbox 360 Emulator Research Project * - ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * - * Released under the BSD license - see LICENSE in the root for more details. * - ****************************************************************************** - */ - -#ifndef XENIA_CPU_LIBJIT_LIBJIT_LIBRARY_LOADER_H_ -#define XENIA_CPU_LIBJIT_LIBJIT_LIBRARY_LOADER_H_ - -#include -#include - -#include - - -namespace xe { -namespace cpu { -namespace libjit { - - -class LibjitLibraryLoader : public LibraryLoader { -public: - LibjitLibraryLoader(xe_memory_ref memory, - kernel::ExportResolver* export_resolver); - virtual ~LibjitLibraryLoader(); -}; - - -} // namespace libjit -} // namespace cpu -} // namespace xe - - -#endif // XENIA_CPU_LIBJIT_LIBJIT_LIBRARY_LOADER_H_ diff --git a/src/xenia/cpu/libjit/sources.gypi b/src/xenia/cpu/libjit/sources.gypi index 1fc277670..f5a17c9ae 100644 --- a/src/xenia/cpu/libjit/sources.gypi +++ b/src/xenia/cpu/libjit/sources.gypi @@ -12,7 +12,5 @@ 'libjit_emitter.h', 'libjit_jit.cc', 'libjit_jit.h', - 'libjit_library_loader.cc', - 'libjit_library_loader.h', ], } diff --git a/src/xenia/cpu/library_linker.h b/src/xenia/cpu/library_linker.h deleted file mode 100644 index 3c3b171f6..000000000 --- a/src/xenia/cpu/library_linker.h +++ /dev/null @@ -1,46 +0,0 @@ -/** - ****************************************************************************** - * Xenia : Xbox 360 Emulator Research Project * - ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * - * Released under the BSD license - see LICENSE in the root for more details. * - ****************************************************************************** - */ - -#ifndef XENIA_CPU_LIBRARY_LINKER_H_ -#define XENIA_CPU_LIBRARY_LINKER_H_ - -#include -#include - -#include -#include - - -namespace xe { -namespace cpu { - - -class LibraryLinker { -public: - virtual ~LibraryLinker() { - xe_memory_release(memory_); - } - -protected: - LibraryLinker(xe_memory_ref memory, - kernel::ExportResolver* export_resolver) { - memory_ = xe_memory_retain(memory); - export_resolver_ = export_resolver; - } - - xe_memory_ref memory_; - kernel::ExportResolver* export_resolver_; -}; - - -} // namespace cpu -} // namespace xe - - -#endif // XENIA_CPU_LIBRARY_LINKER_H_ diff --git a/src/xenia/cpu/library_loader.h b/src/xenia/cpu/library_loader.h deleted file mode 100644 index b25ff631c..000000000 --- a/src/xenia/cpu/library_loader.h +++ /dev/null @@ -1,46 +0,0 @@ -/** - ****************************************************************************** - * Xenia : Xbox 360 Emulator Research Project * - ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * - * Released under the BSD license - see LICENSE in the root for more details. * - ****************************************************************************** - */ - -#ifndef XENIA_CPU_LIBRARY_LOADER_H_ -#define XENIA_CPU_LIBRARY_LOADER_H_ - -#include -#include - -#include -#include - - -namespace xe { -namespace cpu { - - -class LibraryLoader { -public: - virtual ~LibraryLoader() { - xe_memory_release(memory_); - } - -protected: - LibraryLoader(xe_memory_ref memory, - kernel::ExportResolver* export_resolver) { - memory_ = xe_memory_retain(memory); - export_resolver_ = export_resolver; - } - - xe_memory_ref memory_; - kernel::ExportResolver* export_resolver_; -}; - - -} // namespace cpu -} // namespace xe - - -#endif // XENIA_CPU_LIBRARY_LOADER_H_ diff --git a/src/xenia/cpu/sources.gypi b/src/xenia/cpu/sources.gypi index 9a452458d..97ef7d3a7 100644 --- a/src/xenia/cpu/sources.gypi +++ b/src/xenia/cpu/sources.gypi @@ -10,8 +10,6 @@ 'global_exports.cc', 'global_exports.h', 'jit.h', - 'library_linker.h', - 'library_loader.h', 'ppc.h', 'processor.cc', 'processor.h',