diff --git a/Core/Debugger/DebugInterface.h b/Core/Debugger/DebugInterface.h index 321f3f0a65..12605c86b5 100644 --- a/Core/Debugger/DebugInterface.h +++ b/Core/Debugger/DebugInterface.h @@ -41,7 +41,6 @@ public: virtual void runToBreakpoint() {} virtual int getColor(unsigned int address){return 0xFFFFFFFF;} virtual const char *getDescription(unsigned int address) {return "";} - virtual bool getSymbolValue(char* symbol, u32& dest) { return false; }; virtual bool initExpression(const char* exp, PostfixExpression& dest) { return false; }; virtual bool parseExpression(PostfixExpression& exp, u32& dest) { return false; }; diff --git a/Core/Debugger/DisassemblyManager.cpp b/Core/Debugger/DisassemblyManager.cpp index 4216e0f734..f8a9818157 100644 --- a/Core/Debugger/DisassemblyManager.cpp +++ b/Core/Debugger/DisassemblyManager.cpp @@ -305,7 +305,7 @@ void DisassemblyFunction::recheck() int DisassemblyFunction::getNumLines() { - return lineAddresses.size(); + return (int) lineAddresses.size(); } int DisassemblyFunction::getLineNum(u32 address, bool findStart) diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp index f14e7c1bec..d80ce61310 100644 --- a/Core/Debugger/SymbolMap.cpp +++ b/Core/Debugger/SymbolMap.cpp @@ -338,44 +338,6 @@ u32 SymbolMap::GetNextSymbolAddress(u32 address) return containingEntry->second; } -const char* SymbolMap::getDirectSymbol(u32 address) -{ - lock_guard guard(lock_); - SymbolInfo info; - if (GetSymbolInfo(&info,address) == false) return NULL; - if (info.address != address) return NULL; // has to be the START of the function - - // now we need the name... which we can't just get from GetSymbolInfo because of the - // unique entries. But, there are so many less instances where there actually IS a - // label that the speed up is still massive - for (auto it = entries.begin(), end = entries.end(); it != end; ++it) - { - const MapEntry &entry = *it; - unsigned int addr = entry.vaddress; - if (addr == address) return entry.name; - } - return NULL; -} - -bool SymbolMap::getSymbolValue(char* symbol, u32& dest) -{ - lock_guard guard(lock_); - for (auto it = entries.begin(), end = entries.end(); it != end; ++it) - { - const MapEntry &entry = *it; -#ifdef _WIN32 - if (_stricmp(entry.name,symbol) == 0) -#else - if (strcasecmp(entry.name,symbol) == 0) -#endif - { - dest = entry.vaddress; - return true; - } - } - return false; -} - const char* SymbolMap::AddLabel(const char* name, u32 address) { // keep a label if it already exists diff --git a/Core/Debugger/SymbolMap.h b/Core/Debugger/SymbolMap.h index 61157d5fe8..6260932576 100644 --- a/Core/Debugger/SymbolMap.h +++ b/Core/Debugger/SymbolMap.h @@ -69,8 +69,6 @@ public: void IncreaseRunCount(int num); unsigned int GetRunCount(int num) const; void SortSymbols(); - const char* getDirectSymbol(u32 address); - bool getSymbolValue(char* symbol, u32& dest); void UseFuncSignaturesFile(const char *filename, u32 maxAddress); void CompileFuncSignaturesFile(const char *filename) const; diff --git a/Core/MIPS/MIPSDebugInterface.cpp b/Core/MIPS/MIPSDebugInterface.cpp index b096d0d716..4e8f5a7fda 100644 --- a/Core/MIPS/MIPSDebugInterface.cpp +++ b/Core/MIPS/MIPSDebugInterface.cpp @@ -230,11 +230,6 @@ const char *MIPSDebugInterface::getDescription(unsigned int address) return symbolMap.GetDescription(address); } -bool MIPSDebugInterface::getSymbolValue(char* symbol, u32& dest) -{ - return symbolMap.getSymbolValue(symbol,dest); -} - bool MIPSDebugInterface::initExpression(const char* exp, PostfixExpression& dest) { MipsExpressionFunctions funcs(this); diff --git a/Core/MIPS/MIPSDebugInterface.h b/Core/MIPS/MIPSDebugInterface.h index f01aa49640..895454ef43 100644 --- a/Core/MIPS/MIPSDebugInterface.h +++ b/Core/MIPS/MIPSDebugInterface.h @@ -40,7 +40,6 @@ public: virtual void runToBreakpoint(); virtual int getColor(unsigned int address); virtual const char *getDescription(unsigned int address); - virtual bool getSymbolValue(char* symbol, u32& dest); virtual bool initExpression(const char* exp, PostfixExpression& dest); virtual bool parseExpression(PostfixExpression& exp, u32& dest);