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

Merge remote-tracking branch 'origin/Ghidra_11.4'

Browse source
This commit is contained in:
ghidra1 2025-05-19 12:43:10 -04:00
commit 5e7dcf750e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.java
View file

@ -938,7 +938,7 @@ public class InstructionDB extends CodeUnitDB implements Instruction, Instructio
FlowType myFlowType = getFlowType(); // getFlowType will validate FlowType myFlowType = getFlowType(); // getFlowType will validate
if (myFlowType.hasFallthrough()) { if (myFlowType.hasFallthrough()) {
try { try {
return getAddress().addNoWrap(proto.getFallThroughOffset(this)); return address.addNoWrap(getDefaultFallThroughOffset());
} }
catch (AddressOverflowException e) { catch (AddressOverflowException e) {
// ignore // ignore
@ -950,7 +950,7 @@ public class InstructionDB extends CodeUnitDB implements Instruction, Instructio
@Override @Override
public int getDefaultFallThroughOffset() { public int getDefaultFallThroughOffset() {
if (proto.getDelaySlotByteCount() <= 0) { if (proto.getDelaySlotByteCount() <= 0) {
return getLength(); return proto.getLength();
} }
lock.acquire(); lock.acquire();
try { try {