Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Annotator for local variables and function paramters #128

Merged
merged 10 commits into from Aug 2, 2020
Merged

Annotator for local variables and function paramters #128

Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7bdc584
annotator for local variables and parameters
NirmalManoj Jul 29, 2020
6e7619d
check to make sure varnode is local variable
NirmalManoj Jul 30, 2020
ac829cb
else -> else if
NirmalManoj Jul 30, 2020
412a32e
symbolId -> symbol map.
NirmalManoj Aug 1, 2020
1bc0bc0
cluttered, but finally a way to get all symbols reliably
NirmalManoj Aug 1, 2020
b56cf1f
intermediate
NirmalManoj Aug 1, 2020
10b6ea3
map ready
NirmalManoj Aug 1, 2020
2a00327
Annotation made from symbol
NirmalManoj Aug 2, 2020
3133433
fix test
NirmalManoj Aug 2, 2020
b1b215a
test for function variables
NirmalManoj Aug 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 38 additions & 1 deletion src/CodeXMLParse.cpp
View file
Open in desktop
Expand Up @@ -17,13 +17,24 @@ struct ParseCodeXMLContext
Funcdata *func;
std::map<uintm, PcodeOp *> ops;
std::map<unsigned long long, Varnode *> varnodes;

std::map<unsigned long long, Symbol *> symbols;

explicit ParseCodeXMLContext(Funcdata *func) : func(func)
{
for(auto it=func->beginOpAll(); it!=func->endOpAll(); it++)
ops[it->first.getTime()] = it->second;
for(auto it = func->beginLoc(); it != func->endLoc(); it++)
varnodes[(*it)->getCreateIndex()] = *it;

ScopeLocal *mapLocal = func->getScopeLocal();
MapIterator iter = mapLocal->begin();
MapIterator enditer = mapLocal->end();
for (; iter!=enditer; ++iter)
{
const SymbolEntry *entry = *iter;
Symbol *sym = entry->getSymbol();
symbols[sym->getId()] = sym;
}
}
};

Expand Down Expand Up @@ -162,11 +173,35 @@ void AnnotateConstantVariable(Varnode *varnode, std::vector<RCodeAnnotation> *ou
out->push_back(annotation);
}

// Annotates local variables and function parameters
void AnnotateLocalVariable(Symbol *symbol, std::vector<RCodeAnnotation> *out)
{
if(symbol == (Symbol *)0)
return;
RCodeAnnotation annotation = {};
annotation.variable.name = strdup(symbol->getName().c_str());
if(symbol->getCategory() == 0)
annotation.type = R_CODE_ANNOTATION_TYPE_FUNCTION_PARAMETER;
else
annotation.type = R_CODE_ANNOTATION_TYPE_LOCAL_VARIABLE;
out->push_back(annotation);
}

void AnnotateVariable(ANNOTATOR_PARAMS)
{
pugi::xml_attribute attr = node.attribute("varref");
if(attr.empty())
{
auto node_parent = node.parent();
if(strcmp(node_parent.name(), "vardecl") == 0)
{
pugi::xml_attribute attributeSymbolId = node_parent.attribute("symref");
unsigned long long symref = attributeSymbolId.as_ullong(ULLONG_MAX);
Symbol *symbol = ctx->symbols[symref];
AnnotateLocalVariable(symbol, out);
}
return;
}
unsigned long long varref = attr.as_ullong(ULLONG_MAX);
if(varref == ULLONG_MAX)
return;
Expand All @@ -178,6 +213,8 @@ void AnnotateVariable(ANNOTATOR_PARAMS)
AnnotateGlobalVariable(varnode, out);
else if (varnode->getHigh()->isConstant() && varnode->getHigh()->getType()->getMetatype() == TYPE_PTR)
AnnotateConstantVariable(varnode, out);
else if (!varnode->getHigh()->isPersist())
AnnotateLocalVariable(varnode->getHigh()->getSymbol(), out);
}

static const std::map<std::string, std::vector <void (*)(ANNOTATOR_PARAMS)> > annotators = {
Expand Down