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

GT-3448_emteere_LargeDisPerf code review changes. Fixing code defined

Browse source 
notification
This commit is contained in:
emteere 2020-02-20 20:23:23 +00:00
parent a9c7e69ac3
commit 8bfd0c1042
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java
View file

@ -25,7 +25,6 @@ import ghidra.app.util.RepeatInstructionByteTracker;
import ghidra.framework.options.Options;
import ghidra.program.database.register.AddressRangeObjectMap;
import ghidra.program.model.address.*;
import ghidra.program.model.data.DefaultDataType;
import ghidra.program.model.lang.*;
import ghidra.program.model.lang.InstructionError.InstructionErrorType;
import ghidra.program.model.listing.*;
@ -464,17 +463,15 @@ public class Disassembler implements DisassemblerConflictHandler {
continue;
}
todoSubset.delete(nextAddr, nextAddr);
// must be aligned
if (nextAddr.getOffset() % alignment != 0) {
todoSubset.delete(nextAddr, nextAddr);
continue;
}
Data data = listing.getUndefinedDataAt(nextAddr);
if (data == null) {
// no undefined here, skip to next undefined
todoSubset.delete(nextAddr, nextAddr);
AddressSetView undefinedRanges = null;
try {
undefinedRanges =
@ -489,10 +486,7 @@ public class Disassembler implements DisassemblerConflictHandler {
AddressSet currentSet =
disassemble(nextAddr, restrictedSet, initialContextValue, doFollowFlow);
if (currentSet.isEmpty()) { // nothing disassembled
todoSubset.delete(nextAddr, nextAddr);
}
else {
if (!currentSet.isEmpty()) { // nothing disassembled
todoSubset.delete(currentSet);
disassembledAddrs.add(currentSet);
}