Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 19:28:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'GP-4775_ghidra1_InstrLenOverrideBug' into patch

Browse Source
This commit is contained in:
ghidra1
2024-07-15 12:01:38 -04:00
parent 258e8d3b41 52499e7ba7
commit b7a3a5db82
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.java
+6 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -884,8 +884,11 @@ public class InstructionDB extends CodeUnitDB implements Instruction, Instructio
private void addLengthOverrideFallthroughRef() { private void addLengthOverrideFallthroughRef() {
if (isLengthOverridden() && !isFallThroughOverridden()) { if (isLengthOverridden() && !isFallThroughOverridden()) {
// length-override always uses default fall-through address // length-override always uses default fall-through address
refMgr.addMemoryReference(address, getDefaultFallThrough(), RefType.FALL_THROUGH, Address defaultFallThrough = getDefaultFallThrough();
if (defaultFallThrough != null) {
refMgr.addMemoryReference(address, defaultFallThrough, RefType.FALL_THROUGH,
SourceType.USER_DEFINED, Reference.MNEMONIC); SourceType.USER_DEFINED, Reference.MNEMONIC);
}
} }
} }