diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/arm/disassembler/load_symbol_map.cpp | 31 | ||||
| -rw-r--r-- | src/core/arm/disassembler/load_symbol_map.h | 13 |
3 files changed, 0 insertions, 46 deletions
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 @@ | |||
| 1 | set(SRCS | 1 | set(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 | |||
| 180 | set(HEADERS | 179 | set(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 | */ | ||
| 16 | void 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 | */ | ||
| 13 | void LoadSymbolMap(std::string filename); | ||