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

Merge remote-tracking branch 'origin/GP-3186_ZeroSizeExportConsistency'

Browse source
This commit is contained in:
Ryan Kurtz 2023-03-17 15:57:28 -04:00
commit 45d2e42bb4
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
View file

@ -1004,7 +1004,7 @@ bool ConsistencyChecker::checkSectionTruncations(Constructor *ct,ConstructTpl *c
bool ConsistencyChecker::checkSubtable(SubtableSymbol *sym) bool ConsistencyChecker::checkSubtable(SubtableSymbol *sym)
{ {
int4 tablesize = 0; int4 tablesize = -1;
int4 numconstruct = sym->getNumConstructors(); int4 numconstruct = sym->getNumConstructors();
Constructor *ct; Constructor *ct;
bool testresult = true; bool testresult = true;
@ -1033,9 +1033,9 @@ bool ConsistencyChecker::checkSubtable(SubtableSymbol *sym)
} }
seennonemptyexport = true; seennonemptyexport = true;
int4 exsize = recoverSize(exportres->getSize(),ct); int4 exsize = recoverSize(exportres->getSize(),ct);
if (tablesize == 0) if (tablesize == -1)
tablesize = exsize; tablesize = exsize;
if ((exsize!=0)&&(exsize != tablesize)) { if (exsize != tablesize) {
ostringstream msg; ostringstream msg;
msg << "Table '" << sym->getName() << "' has inconsistent export size; "; msg << "Table '" << sym->getName() << "' has inconsistent export size; ";
msg << "Constructor starting at line " << dec << ct->getLineno() << " is first conflict"; msg << "Constructor starting at line " << dec << ct->getLineno() << " is first conflict";

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/ConsistencyChecker.java
View file

@ -725,7 +725,7 @@ class ConsistencyChecker {
} }
private boolean checkSubtable(SubtableSymbol sym) { private boolean checkSubtable(SubtableSymbol sym) {
int tablesize = 0; int tablesize = -1;
int numconstruct = sym.getNumConstructors(); int numconstruct = sym.getNumConstructors();
Constructor ct; Constructor ct;
boolean testresult = true; boolean testresult = true;
@ -757,10 +757,10 @@ class ConsistencyChecker {
} }
seennonemptyexport = true; seennonemptyexport = true;
int exsize = recoverSize(exportres.getSize(), ct); int exsize = recoverSize(exportres.getSize(), ct);
if (tablesize == 0) { if (tablesize == -1) {
tablesize = exsize; tablesize = exsize;
} }
if ((exsize != 0) && (exsize != tablesize)) { if (exsize != tablesize) {
compiler.reportError(ct.location, String.format( compiler.reportError(ct.location, String.format(
"Table '%s' has inconsistent export size; Constructor at %s is first conflict", "Table '%s' has inconsistent export size; Constructor at %s is first conflict",
sym.getName(), ct.location)); sym.getName(), ct.location));

10
Ghidra/Processors/Atmel/data/languages/avr32a.slaspec
View file

@ -637,19 +637,19 @@ RBSelector: rb9[ri0"<U> << 2]" is rb9 & ri0; selectorxy4_2=0x2 { ptr:4 = rb9 + (
RBSelector: rb9[ri0"<T> << 2]" is rb9 & ri0; selectorxy4_2=0x3 { ptr:4 = rb9 + (((ri0 >> 24) & 0xff) << 0x02); export ptr; } RBSelector: rb9[ri0"<T> << 2]" is rb9 & ri0; selectorxy4_2=0x3 { ptr:4 = rb9 + (((ri0 >> 24) & 0xff) << 0x02); export ptr; }
RS0A: rs0 is rs0 { export rs0; } RS0A: rs0 is rs0 { export rs0; }
RS0A: rs0 is rs0 & rs0=0xf { export inst_start; } RS0A: rs0 is rs0 & rs0=0xf { export *[const]:4 inst_start; }
RS9A: rs9 is rs9 { export rs9; } RS9A: rs9 is rs9 { export rs9; }
RS9A: rs9 is rs9 & rs9=0xf { export inst_start; } RS9A: rs9 is rs9 & rs9=0xf { export *[const]:4 inst_start; }
RX9A: rx9 is rx9 { export rx9; } RX9A: rx9 is rx9 { export rx9; }
RX9A: rx9 is rx9 & rx9=0xf { export inst_start; } RX9A: rx9 is rx9 & rx9=0xf { export *[const]:4 inst_start; }
RY0A: ry0 is ry0 { export ry0; } RY0A: ry0 is ry0 { export ry0; }
RY0A: ry0 is ry0 & ry0=0xf { export inst_start; } RY0A: ry0 is ry0 & ry0=0xf { export *[const]:4 inst_start; }
RD0A: rd0 is rd0 { export rd0; } RD0A: rd0 is rd0 { export rd0; }
RD0A: rd0 is rd0 & rd0=0xf { export inst_start; } RD0A: rd0 is rd0 & rd0=0xf { export *[const]:4 inst_start; }
macro ZSTATUS(RES) { macro ZSTATUS(RES) {
Z = RES == 0; Z = RES == 0;

2
Ghidra/Processors/Atmel/data/languages/avr32a_dsp_operations.sinc
View file

@ -18,7 +18,7 @@ rdPlus1: is erd0=0x6 {export R7;}
rdPlus1: is erd0=0x8 {export R9;} rdPlus1: is erd0=0x8 {export R9;}
rdPlus1: is erd0=0xa {export R11;} rdPlus1: is erd0=0xa {export R11;}
rdPlus1: is erd0=0xc {export SP;} rdPlus1: is erd0=0xc {export SP;}
rdPlus1: is erd0=0xe {export inst_start;}#PC register rdPlus1: is erd0=0xe {export *[const]:4 inst_start;}#PC register
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# ADDHH.W - Add Halfwords into Word # ADDHH.W - Add Halfwords into Word

6
Ghidra/Processors/MC6800/data/languages/6x09.sinc
View file

@ -197,11 +197,11 @@ EA: ",--"^W is idxReg=0b11 & noOffset5=1 & idxMode=0b01111 & W # ,--W
EA: addr,"PCR" is noOffset5=1 & idxMode=0b01100; simm8 [ addr = inst_next + simm8; ] EA: addr,"PCR" is noOffset5=1 & idxMode=0b01100; simm8 [ addr = inst_next + simm8; ]
{ {
export addr; export *[const]:2 addr;
} }
EA: addr,"PCR" is noOffset5=1 & idxMode=0b01101; simm16 [ addr = inst_next + simm16; ] EA: addr,"PCR" is noOffset5=1 & idxMode=0b01101; simm16 [ addr = inst_next + simm16; ]
{ {
export addr; export *[const]:2 addr;
} }
EA: "[,"idxReg"]" is idxReg & noOffset5=1 & idxMode=0b10100 EA: "[,"idxReg"]" is idxReg & noOffset5=1 & idxMode=0b10100
{ {
@ -394,7 +394,7 @@ OP2J: EA is (op47=6 | op47=0xA); EA
} }
OP2J: imm16 is (op47=7 | op47=0xB ); imm16 OP2J: imm16 is (op47=7 | op47=0xB ); imm16
{ {
export imm16; export *[const]:2 imm16;
} }
################################################################ ################################################################