yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 10:19:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4394_ArrayIndexFormatting'

Browse source 
(Closes #6019)
This commit is contained in:
Ryan Kurtz 2024-04-01 11:19:49 -04:00
commit ea547fad95
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Ghidra/Features/Decompiler/src/decompile/cpp/printc.cc
View file

@ -1955,7 +1955,6 @@ void PrintC::pushPartialSymbol(const Symbol *sym,int4 off,int4 sz,
entry.token = &object_member;
entry.field = field;
entry.parent = ct;
entry.fieldname = field->name;
entry.hilite = EmitMarkup::no_color;
ct = field->type;
succeeded = true;
@ -1968,9 +1967,8 @@ void PrintC::pushPartialSymbol(const Symbol *sym,int4 off,int4 sz,
stack.emplace_back();
PartialSymbolEntry &entry( stack.back() );
entry.token = &subscript;
ostringstream s;
s << dec << el;
entry.fieldname = s.str();
entry.offset = el;
entry.size = 0;
entry.field = (const TypeField *)0;
entry.hilite = EmitMarkup::const_color;
ct = arrayof;
@ -1987,7 +1985,6 @@ void PrintC::pushPartialSymbol(const Symbol *sym,int4 off,int4 sz,
entry.token = &object_member;
entry.field = field;
entry.parent = ct;
entry.fieldname = entry.field->name;
entry.hilite = EmitMarkup::no_color;
ct = field->type;
succeeded = true;
@ -2013,7 +2010,8 @@ void PrintC::pushPartialSymbol(const Symbol *sym,int4 off,int4 sz,
entry.token = &object_member;
if (sz == 0)
sz = ct->getSize() - off;
entry.fieldname = unnamedField(off, sz); // If nothing else works, generate artificial field name
entry.offset = off; // Generate artificial name, based on offset and size of entry
entry.size = sz;
entry.field = (const TypeField *)0;
entry.hilite = EmitMarkup::no_color;
ct = (Datatype *)0;
@ -2029,11 +2027,17 @@ void PrintC::pushPartialSymbol(const Symbol *sym,int4 off,int4 sz,
pushOp(stack[i].token,op);
pushSymbol(sym,vn,op); // Push base symbol name
for(int4 i=0;i<stack.size();++i) {
const TypeField *field = stack[i].field;
if (field == (const TypeField *)0)
pushAtom(Atom(stack[i].fieldname,syntax,stack[i].hilite,op));
PartialSymbolEntry &entry (stack[i]);
if (entry.field == (const TypeField *)0) {
if (entry.size <= 0)
push_integer(entry.offset, entry.size, (entry.offset < 0), syntax, (Varnode *)0, op);
else {
string field = unnamedField(entry.offset,entry.size);
pushAtom(Atom(field,syntax,entry.hilite,op));
}
}
else
pushAtom(Atom(stack[i].fieldname,fieldtoken,stack[i].hilite,stack[i].parent,field->ident,op));
pushAtom(Atom(entry.field->name,fieldtoken,stack[i].hilite,stack[i].parent,entry.field->ident,op));
}
}

3
Ghidra/Features/Decompiler/src/decompile/cpp/printc.hh
View file

@ -48,7 +48,8 @@ struct PartialSymbolEntry {
const OpToken *token; ///< Operator used to drill-down to the field
const TypeField *field; ///< The component object describing the field
const Datatype *parent; ///< The parent data-type owning the field
string fieldname; ///< The name of the field
int8 offset; ///< Array index or unlabeled offset (if field is null)
int4 size; ///< (if > 0) Size of the unlabeled entry
EmitMarkup::syntax_highlight hilite; ///< Highlight information for the field token
};

2
Ghidra/Features/Decompiler/src/decompile/datatests/partialsplit.xml
View file

@ -75,7 +75,7 @@ c4205bc3e8bf0e000000000000000000
<com>quit</com>
</script>
<stringmatch name="Partial splitting #1" min="1" max="1">arr\[10\] = ptralone-&gt;b;</stringmatch>
<stringmatch name="Partial splitting #2" min="1" max="1">arr\[11\] = ptralone-&gt;c;</stringmatch>
<stringmatch name="Partial splitting #2" min="1" max="1">arr\[0xb\] = ptralone-&gt;c;</stringmatch>
<stringmatch name="Partial splitting #3" min="1" max="1">return arr\[ptralone-&gt;d\];</stringmatch>
<stringmatch name="Partial splitting #4" min="1" max="1">ptr-&gt;d = 0;</stringmatch>
<stringmatch name="Partial splitting #5" min="1" max="1">ptr-&gt;a = 0x100;</stringmatch>

1
Ghidra/Features/Decompiler/src/decompile/datatests/readvolatile.xml
View file

@ -11,6 +11,7 @@
<symbol space="ram" offset="0x484" name="iofunc"/>
</binaryimage>
<script>
<com>option integerformat dec</com>
<com>volatile [ram,0x210000,64]</com>
<com>map addr r0x210000 int1 NVRAM[32]</com>
<com>set track A0 0x210000 r0x484 r0x485</com>