summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-08 00:01:37 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-08 00:33:39 +0200
commitcb4da3975e076c828f77b3517a73e2071c605950 (patch)
treed1c0f42e9f5f5b7224948531b7bda5c4d724f1ad
parentRemove ability to load symbol maps (diff)
downloadyuzu-cb4da3975e076c828f77b3517a73e2071c605950.tar
yuzu-cb4da3975e076c828f77b3517a73e2071c605950.tar.gz
yuzu-cb4da3975e076c828f77b3517a73e2071c605950.tar.bz2
yuzu-cb4da3975e076c828f77b3517a73e2071c605950.tar.lz
yuzu-cb4da3975e076c828f77b3517a73e2071c605950.tar.xz
yuzu-cb4da3975e076c828f77b3517a73e2071c605950.tar.zst
yuzu-cb4da3975e076c828f77b3517a73e2071c605950.zip
-rw-r--r--src/common/CMakeLists.txt2
-rw-r--r--src/common/symbols.cpp46
-rw-r--r--src/common/symbols.h30
-rw-r--r--src/core/CMakeLists.txt2
-rw-r--r--src/core/arm/disassembler/load_symbol_map.cpp31
-rw-r--r--src/core/arm/disassembler/load_symbol_map.h13
6 files changed, 0 insertions, 124 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 13277a5c2..4b30185f1 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -38,7 +38,6 @@ set(SRCS
param_package.cpp
scm_rev.cpp
string_util.cpp
- symbols.cpp
thread.cpp
timer.cpp
)
@@ -74,7 +73,6 @@ set(HEADERS
scope_exit.h
string_util.h
swap.h
- symbols.h
synchronized_wrapper.h
thread.h
thread_queue_list.h
diff --git a/src/common/symbols.cpp b/src/common/symbols.cpp
deleted file mode 100644
index c4d16af85..000000000
--- a/src/common/symbols.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "common/symbols.h"
-
-TSymbolsMap g_symbols;
-
-namespace Symbols {
-bool HasSymbol(u32 address) {
- return g_symbols.find(address) != g_symbols.end();
-}
-
-void Add(u32 address, const std::string& name, u32 size, u32 type) {
- if (!HasSymbol(address)) {
- TSymbol symbol;
- symbol.address = address;
- symbol.name = name;
- symbol.size = size;
- symbol.type = type;
-
- g_symbols.emplace(address, symbol);
- }
-}
-
-TSymbol GetSymbol(u32 address) {
- const auto iter = g_symbols.find(address);
-
- if (iter != g_symbols.end())
- return iter->second;
-
- return {};
-}
-
-const std::string GetName(u32 address) {
- return GetSymbol(address).name;
-}
-
-void Remove(u32 address) {
- g_symbols.erase(address);
-}
-
-void Clear() {
- g_symbols.clear();
-}
-}
diff --git a/src/common/symbols.h b/src/common/symbols.h
deleted file mode 100644
index f5a48e05a..000000000
--- a/src/common/symbols.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <map>
-#include <string>
-#include <utility>
-#include "common/common_types.h"
-
-struct TSymbol {
- u32 address = 0;
- std::string name;
- u32 size = 0;
- u32 type = 0;
-};
-
-typedef std::map<u32, TSymbol> TSymbolsMap;
-typedef std::pair<u32, TSymbol> TSymbolsPair;
-
-namespace Symbols {
-bool HasSymbol(u32 address);
-
-void Add(u32 address, const std::string& name, u32 size, u32 type);
-TSymbol GetSymbol(u32 address);
-const std::string GetName(u32 address);
-void Remove(u32 address);
-void Clear();
-}
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index a2866fdd8..190dc985a 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,6 +1,5 @@
set(SRCS
arm/disassembler/arm_disasm.cpp
- arm/disassembler/load_symbol_map.cpp
arm/dynarmic/arm_dynarmic.cpp
arm/dynarmic/arm_dynarmic_cp15.cpp
arm/dyncom/arm_dyncom.cpp
@@ -180,7 +179,6 @@ set(SRCS
set(HEADERS
arm/arm_interface.h
arm/disassembler/arm_disasm.h
- arm/disassembler/load_symbol_map.h
arm/dynarmic/arm_dynarmic.h
arm/dynarmic/arm_dynarmic_cp15.h
arm/dyncom/arm_dyncom.h
diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp
deleted file mode 100644
index 6863c103a..000000000
--- a/src/core/arm/disassembler/load_symbol_map.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <sstream>
-#include <string>
-#include <vector>
-#include "common/file_util.h"
-#include "common/symbols.h"
-#include "core/arm/disassembler/load_symbol_map.h"
-
-/*
- * Loads a symbol map file for use with the disassembler
- * @param filename String filename path of symbol map file
- */
-void LoadSymbolMap(std::string filename) {
- std::ifstream infile(filename);
-
- std::string address_str, function_name, line;
- u32 size;
-
- while (std::getline(infile, line)) {
- std::istringstream iss(line);
- if (!(iss >> address_str >> size >> function_name)) {
- break; // Error parsing
- }
- u32 address = std::stoul(address_str, nullptr, 16);
-
- Symbols::Add(address, function_name, size, 2);
- }
-}
diff --git a/src/core/arm/disassembler/load_symbol_map.h b/src/core/arm/disassembler/load_symbol_map.h
deleted file mode 100644
index d28c551c3..000000000
--- a/src/core/arm/disassembler/load_symbol_map.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <string>
-
-/*
- * Loads a symbol map file for use with the disassembler
- * @param filename String filename path of symbol map file
- */
-void LoadSymbolMap(std::string filename);