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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2023-06-01 06:17:13 -04:00
commit d91a60f201
6 changed files with 421 additions and 327 deletions
Download patch file Download diff file Expand all files Collapse all files

733
Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java
View file

File diff suppressed because it is too large Load diff

4
Ghidra/Features/Decompiler/src/decompile/cpp/dynamic.cc
View file

@ -236,6 +236,8 @@ void DynamicHash::calcHash(const PcodeOp *op,int4 slot,uint4 method)
buildOpUp(markop[opproc]); buildOpUp(markop[opproc]);
} }
gatherUnmarkedVn(); gatherUnmarkedVn();
for(;vnproc<markvn.size();++vnproc)
buildVnUp(markvn[vnproc]);
break; break;
case 6: case 6:
gatherUnmarkedOp(); gatherUnmarkedOp();
@ -243,6 +245,8 @@ void DynamicHash::calcHash(const PcodeOp *op,int4 slot,uint4 method)
buildOpDown(markop[opproc]); buildOpDown(markop[opproc]);
} }
gatherUnmarkedVn(); gatherUnmarkedVn();
for(;vnproc<markvn.size();++vnproc)
buildVnDown(markvn[vnproc]);
break; break;
default: default:
break; break;

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/DynamicHash.java
View file

@ -294,6 +294,9 @@ public class DynamicHash {
buildOpUp(markop.get(opproc)); buildOpUp(markop.get(opproc));
} }
gatherUnmarkedVn(); gatherUnmarkedVn();
for (; vnproc < markvn.size(); ++vnproc) {
buildVnUp(markvn.get(vnproc));
}
break; break;
case 6: case 6:
gatherUnmarkedOp(); gatherUnmarkedOp();
@ -301,6 +304,9 @@ public class DynamicHash {
buildOpDown(markop.get(opproc)); buildOpDown(markop.get(opproc));
} }
gatherUnmarkedVn(); gatherUnmarkedVn();
for (; vnproc < markvn.size(); ++vnproc) {
buildVnDown(markvn.get(vnproc));
}
break; break;
default: default:
break; break;

1
Ghidra/Processors/PowerPC/data/languages/ppc_32_be_Mac.cspec
View file

@ -42,6 +42,7 @@
</pentry> </pentry>
</output> </output>
<unaffected> <unaffected>
<register name="r13"/>
<register name="r14"/> <register name="r14"/>
<register name="r15"/> <register name="r15"/>
<register name="r16"/> <register name="r16"/>

2
Ghidra/Processors/PowerPC/data/languages/ppc_32_e500_be.cspec
View file

@ -45,6 +45,8 @@
</pentry> </pentry>
</output> </output>
<unaffected> <unaffected>
<register name="r2"/> <!-- _SDA2_BASE_ -->
<register name="r13"/> <!-- _SDA_BASE_ -->
<register name="r14"/> <register name="r14"/>
<register name="r15"/> <register name="r15"/>
<register name="r16"/> <register name="r16"/>

2
Ghidra/Processors/PowerPC/data/languages/ppc_32_e500_le.cspec
View file

@ -45,6 +45,8 @@
</pentry> </pentry>
</output> </output>
<unaffected> <unaffected>
<register name="r2"/> <!-- _SDA2_BASE_ -->
<register name="r13"/> <!-- _SDA_BASE_ -->
<register name="r14"/> <register name="r14"/>
<register name="r15"/> <register name="r15"/>
<register name="r16"/> <register name="r16"/>