mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2504_Arm_common_switchpattern--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-10-04 01:43:16 -04:00
parent 40f1a87ecf b9496de7f5
commit adc3d1b570
21 changed files with 784 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/EHDataTypeUtilities.java
View File

@@ -324,10 +324,11 @@ public class EHDataTypeUtilities {
public static boolean createFunctionIfNeeded(Program program, Address functionAddress) {
// If there isn't an instruction at the function address yet, then disassemble there.
Listing listing = program.getListing();
functionAddress =
Address normalizedFunctionAddress =
PseudoDisassembler.getNormalizedDisassemblyAddress(program, functionAddress);
Instruction inst = listing.getInstructionAt(functionAddress);
Instruction inst = listing.getInstructionAt(normalizedFunctionAddress);
if (inst == null) {
functionAddress = PseudoDisassembler.setTargeContextForDisassembly(program, functionAddress);
DisassembleCommand cmd = new DisassembleCommand(functionAddress, null, true);
if (!cmd.applyTo(program) || cmd.getDisassembledAddressSet().isEmpty()) {
Msg.error(EHDataTypeUtilities.class, "Failed to disassemble at " + functionAddress);
@@ -337,12 +338,12 @@ public class EHDataTypeUtilities {
// If there isn't a function at the function address yet, then try to create one there.
FunctionManager functionManager = program.getFunctionManager();
Function function = functionManager.getFunctionAt(functionAddress);
Function function = functionManager.getFunctionAt(normalizedFunctionAddress);
if (function == null) {
CreateFunctionCmd cmd = new CreateFunctionCmd(functionAddress);
CreateFunctionCmd cmd = new CreateFunctionCmd(normalizedFunctionAddress);
if (!cmd.applyTo(program)) {
Msg.error(EHDataTypeUtilities.class,
"Failed to create function at " + functionAddress);
"Failed to create function at " + normalizedFunctionAddress);
return false;
}
}