summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-05-07 15:01:37 -0700
committerGravatar Yuri Kunde Schlesner2017-05-07 15:33:39 -0700
commitcb4da3975e076c828f77b3517a73e2071c605950 (patch)
treed1c0f42e9f5f5b7224948531b7bda5c4d724f1ad
parentRemove ability to load symbol maps (diff)
downloadyuzu-cb4da3975e076c828f77b3517a73e2071c605950.tar.gz
yuzu-cb4da3975e076c828f77b3517a73e2071c605950.tar.xz
yuzu-cb4da3975e076c828f77b3517a73e2071c605950.zip
Remove unused symbols code
-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
38 param_package.cpp 38 param_package.cpp
39 scm_rev.cpp 39 scm_rev.cpp
40 string_util.cpp 40 string_util.cpp
41 symbols.cpp
42 thread.cpp 41 thread.cpp
43 timer.cpp 42 timer.cpp
44 ) 43 )
@@ -74,7 +73,6 @@ set(HEADERS
74 scope_exit.h 73 scope_exit.h
75 string_util.h 74 string_util.h
76 swap.h 75 swap.h
77 symbols.h
78 synchronized_wrapper.h 76 synchronized_wrapper.h
79 thread.h 77 thread.h
80 thread_queue_list.h 78 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 @@
1// Copyright 2014 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#include "common/symbols.h"
6
7TSymbolsMap g_symbols;
8
9namespace Symbols {
10bool HasSymbol(u32 address) {
11 return g_symbols.find(address) != g_symbols.end();
12}
13
14void Add(u32 address, const std::string& name, u32 size, u32 type) {
15 if (!HasSymbol(address)) {
16 TSymbol symbol;
17 symbol.address = address;
18 symbol.name = name;
19 symbol.size = size;
20 symbol.type = type;
21
22 g_symbols.emplace(address, symbol);
23 }
24}
25
26TSymbol GetSymbol(u32 address) {
27 const auto iter = g_symbols.find(address);
28
29 if (iter != g_symbols.end())
30 return iter->second;
31
32 return {};
33}
34
35const std::string GetName(u32 address) {
36 return GetSymbol(address).name;
37}
38
39void Remove(u32 address) {
40 g_symbols.erase(address);
41}
42
43void Clear() {
44 g_symbols.clear();
45}
46}
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 @@
1// Copyright 2014 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include <map>
8#include <string>
9#include <utility>
10#include "common/common_types.h"
11
12struct TSymbol {
13 u32 address = 0;
14 std::string name;
15 u32 size = 0;
16 u32 type = 0;
17};
18
19typedef std::map<u32, TSymbol> TSymbolsMap;
20typedef std::pair<u32, TSymbol> TSymbolsPair;
21
22namespace Symbols {
23bool HasSymbol(u32 address);
24
25void Add(u32 address, const std::string& name, u32 size, u32 type);
26TSymbol GetSymbol(u32 address);
27const std::string GetName(u32 address);
28void Remove(u32 address);
29void Clear();
30}
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 @@
1set(SRCS 1set(SRCS
2 arm/disassembler/arm_disasm.cpp 2 arm/disassembler/arm_disasm.cpp
3 arm/disassembler/load_symbol_map.cpp
4 arm/dynarmic/arm_dynarmic.cpp 3 arm/dynarmic/arm_dynarmic.cpp
5 arm/dynarmic/arm_dynarmic_cp15.cpp 4 arm/dynarmic/arm_dynarmic_cp15.cpp
6 arm/dyncom/arm_dyncom.cpp 5 arm/dyncom/arm_dyncom.cpp
@@ -180,7 +179,6 @@ set(SRCS
180set(HEADERS 179set(HEADERS
181 arm/arm_interface.h 180 arm/arm_interface.h
182 arm/disassembler/arm_disasm.h 181 arm/disassembler/arm_disasm.h
183 arm/disassembler/load_symbol_map.h
184 arm/dynarmic/arm_dynarmic.h 182 arm/dynarmic/arm_dynarmic.h
185 arm/dynarmic/arm_dynarmic_cp15.h 183 arm/dynarmic/arm_dynarmic_cp15.h
186 arm/dyncom/arm_dyncom.h 184 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 @@
1// Copyright 2014 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#include <sstream>
6#include <string>
7#include <vector>
8#include "common/file_util.h"
9#include "common/symbols.h"
10#include "core/arm/disassembler/load_symbol_map.h"
11
12/*
13 * Loads a symbol map file for use with the disassembler
14 * @param filename String filename path of symbol map file
15 */
16void LoadSymbolMap(std::string filename) {
17 std::ifstream infile(filename);
18
19 std::string address_str, function_name, line;
20 u32 size;
21
22 while (std::getline(infile, line)) {
23 std::istringstream iss(line);
24 if (!(iss >> address_str >> size >> function_name)) {
25 break; // Error parsing
26 }
27 u32 address = std::stoul(address_str, nullptr, 16);
28
29 Symbols::Add(address, function_name, size, 2);
30 }
31}
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 @@
1// Copyright 2014 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include <string>
8
9/*
10 * Loads a symbol map file for use with the disassembler
11 * @param filename String filename path of symbol map file
12 */
13void LoadSymbolMap(std::string filename);