Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't overwrite label name if it already exists, get label value

Browse source
This commit is contained in:
Kingcom 2013-11-26 00:43:31 +01:00
parent 7c585485bb
commit 00a801f6a3
3 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Core/Debugger/SymbolMap.cpp
View file

@ -108,6 +108,8 @@ void SymbolMap::Clear() {
void SymbolMap::AddSymbol(const char *symbolname, unsigned int vaddress, size_t size, SymbolType st)
{
lock_guard guard(lock_);
symbolname = AddLabel(symbolname,vaddress);
MapEntry e;
strncpy(e.name, symbolname, 127);
e.name[127] = '\0';
@ -121,7 +123,6 @@ void SymbolMap::AddSymbol(const char *symbolname, unsigned int vaddress, size_t
entryRanges[e.vaddress + e.size] = e.vaddress;
}
AddLabel(symbolname,vaddress);
}
void SymbolMap::RemoveSymbolNum(int symbolnum){
@ -375,13 +376,19 @@ bool SymbolMap::getSymbolValue(char* symbol, u32& dest)
return false;
}
void SymbolMap::AddLabel(const char* name, u32 address)
const char* SymbolMap::AddLabel(const char* name, u32 address)
{
// keep a label if it already exists
auto it = labels.find(address);
if (it != labels.end())
return it->second.name;
Label label;
strcpy(label.name,name);
label.name[127] = 0;
labels[address] = label;
return name;
}
const char* SymbolMap::GetLabelName(u32 address)
@ -393,6 +400,21 @@ const char* SymbolMap::GetLabelName(u32 address)
return it->second.name;
}
bool SymbolMap::GetLabelValue(const char* name, u32& dest)
{
for (auto it = labels.begin(); it != labels.end(); it++)
{
if (strcasecmp(name,it->second.name) == 0)
{
dest = it->first;
return true;
}
}
return false;
}
static char descriptionTemp[256];
const char *SymbolMap::GetDescription(unsigned int address) const

3
Core/Debugger/SymbolMap.h
View file

@ -75,8 +75,9 @@ public:
void UseFuncSignaturesFile(const char *filename, u32 maxAddress);
void CompileFuncSignaturesFile(const char *filename) const;
void AddLabel(const char* name, u32 address);
const char* AddLabel(const char* name, u32 address);
const char* GetLabelName(u32 address);
bool GetLabelValue(const char* name, u32& dest);
private:
struct MapEntryUniqueInfo {
u32 address;

2
Core/MIPS/MIPSDebugInterface.cpp
View file

@ -109,7 +109,7 @@ public:
virtual bool parseSymbol(char* str, uint32& symbolValue)
{
return cpu->getSymbolValue(str,symbolValue);
return symbolMap.GetLabelValue(str,symbolValue);
}
virtual uint32 getReferenceValue(uint32 referenceIndex)