diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html b/Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html
index 6b0c6942a3..ca05fa91d5 100644
--- a/Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html
+++ b/Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html
@@ -6,6 +6,38 @@
+Ghidra 9.1.1 Change History (December 2019)
+Improvements
+
+ - Importer:MachO. Improved import/load time of DYLD shared cache files. (GT-3261)
+ - Program API. Cached the addresses that correspond to executable memory to improve analysis performance. (GT-3260)
+
+
+Bugs
+
+ - Analysis. Fixed a symbol name error that occurred in the Objective-C analyzer. (GT-3321, Issue #1200)
+ - Analysis. Constant references are now computed correctly within functions in overlay spaces. (GT-3373)
+ - Build. Corrected build of DMG.jar which was improperly built within Ghidra 9.1 release. (GT-3364)
+ - Decompiler. Fixed bug causing
Pcode: XML comms: Badly formed address errors when decompiling HCS12 XGATE code. (GT-3297)
+ - Decompiler. Fixed
Array DataType must be Fixed length exceptions related to function pointer data types. (GT-3309)
+ - Decompiler. Fixed bug causing decompiler to drop statements, assigning string constants to global variables. (GT-3315)
+ - Decompiler. Fixed issue with enum name strings causing
Low-level Error: XML error: syntax error in the decompiler. (GT-3387, Issue #1329)
+ - GUI. Fixed a potential ConcurrentModificationException in the interactive python interpreter. (GT-3280)
+ - Importer:PE. Fixed an exception in the PeLoader that occurred when the size of the memory block for the headers is larger than the file size. (GT-3344, Issue #1266)
+ - Languages. Corrected Sparc floating point instruction pcode implementation. (GT-3202)
+ - Languages. Corrected the semantics of the PowerPC
e_cmpi instruction. (GT-3228, Issue #1127)
+ - Languages. Corrected bit generation for PowerPC instructions
se_bclri, se_bgeni, se_bseti, and se_btsti. (GT-3232, Issue #967)
+ - Languages. Corrected register definitions for x86
RDRAND instruction. (GT-3253, Issue #1169)
+ - Languages. Corrected signed immediate calculation for some powerPC VLE offsets being incorrect. (GT-3254, Issue #1160)
+ - Languages. Resolved issue with x86 escape opcodes preventing certain instruction patterns from decoding. (GT-3256)
+ - Languages. Corrected bug in
XGATE LDH instruction shifting out high bits. (GT-3268)
+ - Languages. Corrected processing of
R_MIPS_REL32, R_X86_64_RELATIVE, and R_X86_64_RELATIVE64 ELF relocations affecting relocatable binaries which have non-zero section/segment load addresses. (GT-3349)
+ - Listing. Fixed missing scroll bar in listing. (GT-3290)
+ - Listing. Fixed issue that was causing a stack trace to be generated when contiguous addresses were cleared for a range greater than
Integer.MAX. (GT-3357)
+ - Listing:References. Corrected Create Default Reference action bug which did not handle composite/array data components properly. (GT-3371)
+
+
+
Ghidra 9.1 Change History (October 2019)
New Features
@@ -107,7 +139,7 @@
Bugs
- Analysis. Fixed an exception in the EmbeddedMediaAnalyzer that occurred when media was discovered at the very end of the address space. (GT-2890)
- - Analysis. Recognition and disassembly of the FMA, F16C, and several missing AVX instructions have been added to the base x86 processor specification. The pcode for these instructions is pseudo-op and not a full pcode implementation. (GT-3168)
+ - Analysis. Recognition and disassembly of the
FMA, F16C, and several missing AVX instructions have been added to the base x86 processor specification. The pcode for these instructions is pseudo-op and not a full pcode implementation. (GT-3168)
- Basic Infrastructure. Updated the apache-commons-lang3 library to version 3.9 which supports Java 11. (GT-2879)
- Basic Infrastructure. Prevented Ghidra from launching with 32-bit Java installations. (GT-3146, Issue #882)
- Data Types. Corrected string data default label generation when defined within uninitialized memory, which will now render as
STRING_address. (GT-2715, Issue #272)
@@ -204,7 +236,7 @@
- Project Manager. Fixed a path traversal vulnerability that could occur when restoring a malicious project archive. (GT-3001, Issue #789)
- Scripting.
GhidraScript.askDomainFile() now correctly throws a CancelledException when the cancel button is clicked. (GT-2841)
- Scripting. Removed deprecated scripting methods older than 5 releases. (GT-2949)
- - Security. Removed use of insecure XMLEncoder/XMLDecoder from Ghidra code base. (GT-3198, Issue #1090)
+ - Security. Removed use of nonsecure XMLEncoder/XMLDecoder from Ghidra code base. (GT-3198, Issue #1090)
- Sleigh. Corrected Sleigh compiler bug which performed improper bounds checking for named register offset specification when space wordsize is not one (1). (GT-3034, Issue #831)
- Testing:CUnits. Fixed error logging in pcodetest for reporting an error when running a compile command. (GT-3199, Issue #1089)
- Version Tracking. Fixed NullPointerException in Version Tracking hashing algorithm. (GT-2976)
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataCmd.java
index 89245ff379..c1cf9aacf4 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataCmd.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataCmd.java
@@ -45,6 +45,7 @@ public class CreateDataCmd implements Command {
/**
* Constructs a command for creating data at an address.
* Simple pointer conversion will NOT be performed.
+ * Existing Undefined data will always be cleared even when force is false.
* @param addr the address at which to apply the datatype. Offcut data
* address allowed, provided force==true.
* @param force if true any existing conflicting data will be cleared
@@ -75,7 +76,8 @@ public class CreateDataCmd implements Command {
/**
* Constructs a command for creating data at an address.
* Simple pointer conversion will NOT be performed and existing
- * data will not be cleared.
+ * defined data will not be cleared, however existing Undefined data will
+ * be cleared.
* @param addr the address at which to apply the datatype.
* @param dataType the datatype to be applied at the given address.
*/
@@ -86,7 +88,7 @@ public class CreateDataCmd implements Command {
/**
* This is the same as {@link #CreateDataCmd(Address, DataType)} except that
* it allows the caller to control whether or not pointer conversion should be handled.
- *
+ * Existing Undefined data will always be cleared.
* @param addr the address at which to apply the datatype.
* @param dataType the datatype to be applied at the given address.
* @param isCycle true indicates this is from a cycle group action.
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java
index 4225e5629f..6c5880e2fe 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java
@@ -50,8 +50,8 @@ public class CreateThunkFunctionCmd extends BackgroundCommand {
private Function referencedFunction;
private List
referringThunkAddresses = new ArrayList<>();
private boolean checkForSideEffects = true;
-
- private static final int MAX_NUMBER_OF_THUNKING_INSTRUCTIONS = 5;
+
+ private static final int MAX_NUMBER_OF_THUNKING_INSTRUCTIONS = 8;
static String DEFAULT_FUNCTION_COMMENT = " THUNK-FUNCTION";
@@ -147,7 +147,7 @@ public class CreateThunkFunctionCmd extends BackgroundCommand {
Program program = (Program) obj;
FunctionManager functionMgr = program.getFunctionManager();
-
+
if (referencedFunctionAddr == Address.NO_ADDRESS) {
referencedFunctionAddr = null;
}
@@ -269,10 +269,10 @@ public class CreateThunkFunctionCmd extends BackgroundCommand {
}
referencedFunctionAddr = referencedSymbol.getAddress();
}
- else if ((referencedFunctionAddr == null || referencedFunctionAddr == Address.NO_ADDRESS) && autoThunkOK) {
+ else if ((referencedFunctionAddr == null || referencedFunctionAddr == Address.NO_ADDRESS) &&
+ autoThunkOK) {
// first try to get the address that is already there
- referencedFunctionAddr =
- getThunkedExternalFunctionAddress(program, entry);
+ referencedFunctionAddr = getThunkedExternalFunctionAddress(program, entry);
if (referencedFunctionAddr == null) {
referencedFunctionAddr = getThunkedAddr(program, entry, checkForSideEffects);
}
@@ -280,7 +280,8 @@ public class CreateThunkFunctionCmd extends BackgroundCommand {
if (referencedFunctionAddr == null || referencedFunctionAddr == Address.NO_ADDRESS) {
try {
if (resolveComputableFlow(program, entry, monitor)) {
- referencedFunctionAddr = getThunkedAddr(program, entry, checkForSideEffects);
+ referencedFunctionAddr =
+ getThunkedAddr(program, entry, checkForSideEffects);
}
}
catch (CancelledException e) {
@@ -479,7 +480,6 @@ public class CreateThunkFunctionCmd extends BackgroundCommand {
return referencedFunction;
}
-
/**
* if the code starting at entry is a thunk, return the thunked addess if known.
*
@@ -500,7 +500,8 @@ public class CreateThunkFunctionCmd extends BackgroundCommand {
*
* @return address that the thunk thunks,Address.NO_ADDRESS if thunk but unknown addr, null otherwise
*/
- public static Address getThunkedAddr(Program program, Address entry, boolean checkForSideEffects) {
+ public static Address getThunkedAddr(Program program, Address entry,
+ boolean checkForSideEffects) {
// General algorithm:
//
// get function, if has no other calls, and no other flow
@@ -566,8 +567,8 @@ public class CreateThunkFunctionCmd extends BackgroundCommand {
}
// record any used registers, checking for use of an unexpected unset register
- if (!addRegisterUsage(program, setAtStartRegisters, setRegisters, usedRegisters, pcodeOp,
- allow8bitNonUse)) {
+ if (checkForSideEffects && !addRegisterUsage(program, setAtStartRegisters,
+ setRegisters, usedRegisters, pcodeOp, allow8bitNonUse)) {
return null;
}
}
@@ -586,8 +587,8 @@ public class CreateThunkFunctionCmd extends BackgroundCommand {
}
// reached a flow, end of the line, gotta see what we have
- return getFlowingAddrFromFinalState(program, instr, flowType,
- checkForSideEffects, setRegisters, usedRegisters);
+ return getFlowingAddrFromFinalState(program, instr, flowType, checkForSideEffects,
+ setRegisters, usedRegisters);
}
return null;
@@ -664,8 +665,8 @@ public class CreateThunkFunctionCmd extends BackgroundCommand {
}
private static Address getFlowingAddrFromFinalState(Program program, Instruction instr,
- FlowType flowType, boolean checkForSideEffects,
- HashSet setRegisters, HashSet usedRegisters) {
+ FlowType flowType, boolean checkForSideEffects, HashSet setRegisters,
+ HashSet usedRegisters) {
// conditional jumps can't be thunks.
// any other flow, not good
@@ -736,8 +737,8 @@ public class CreateThunkFunctionCmd extends BackgroundCommand {
* false if input register found that was not initialized
*/
private static boolean addRegisterUsage(Program program, HashSet setAtStartRegisters,
- HashSet setRegisters, HashSet usedRegisters,
- PcodeOp pcode, boolean allow8bitNonUse) {
+ HashSet setRegisters, HashSet usedRegisters, PcodeOp pcode,
+ boolean allow8bitNonUse) {
int opcode = pcode.getOpcode();
Varnode output = pcode.getOutput();
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/DwarfDecodeContext.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/DwarfDecodeContext.java
index 99ce9e7980..e4177210af 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/DwarfDecodeContext.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/DwarfDecodeContext.java
@@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
- * REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +20,6 @@ import ghidra.program.model.listing.Function;
import ghidra.program.model.listing.Program;
import ghidra.program.model.mem.MemBuffer;
import ghidra.program.model.mem.MemoryBlock;
-import ghidra.program.util.ProgramLocation;
/**
* Organizational class to record vital data used by a DwarfEHDecoder.
@@ -33,12 +31,10 @@ public class DwarfDecodeContext {
private final MemoryBlock ehBlock;
private final Address functionEntryPoint;
- private final ProgramLocation loc;
private Object decodedValue;
private int encodedLength;
private MemBuffer buffer;
-
/**
* Constructs a Dwarf decode context.
* @param program the program containing the encoded data
@@ -85,7 +81,8 @@ public class DwarfDecodeContext {
* @param ehBlock the exception handling memory block
* @param entryPoint the associated function's entry point
*/
- public DwarfDecodeContext(Program program, Address readAddr, MemoryBlock ehBlock, Address entryPoint) {
+ public DwarfDecodeContext(Program program, Address readAddr, MemoryBlock ehBlock,
+ Address entryPoint) {
if (program == null) {
throw new NullPointerException("DwarfDecodeContext requires a program");
@@ -99,7 +96,6 @@ public class DwarfDecodeContext {
this.ehBlock = ehBlock;
this.functionEntryPoint = entryPoint;
- this.loc = new ProgramLocation(program, addr);
}
/**
@@ -124,16 +120,6 @@ public class DwarfDecodeContext {
this.addr = buffer.getAddress();
this.ehBlock = ehBlock;
this.functionEntryPoint = entryPoint;
-
- this.loc = new ProgramLocation(program, addr);
- }
-
- /**
- * Gets the location of the encoded data.
- * @return the program location
- */
- public ProgramLocation getProgramLocation() {
- return loc;
}
/**
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/GccAnalysisClass.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/GccAnalysisClass.java
index 119ac4a1a6..7c396224fd 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/GccAnalysisClass.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/GccAnalysisClass.java
@@ -21,6 +21,7 @@ import ghidra.program.model.address.Address;
import ghidra.program.model.data.*;
import ghidra.program.model.listing.CodeUnit;
import ghidra.program.model.listing.Program;
+import ghidra.program.model.util.CodeUnitInsertionException;
import ghidra.util.task.TaskMonitor;
/**
@@ -80,9 +81,14 @@ public abstract class GccAnalysisClass {
* @param dt the type for the data
*/
protected static void createData(Program program, Address addr, DataType dt) {
-
- CreateDataCmd dataCmd = new CreateDataCmd(addr, dt);
- dataCmd.applyTo(program);
+ try {
+ // try creating without clearing, the code units should be clear
+ program.getListing().createData(addr, dt);
+ }
+ catch (CodeUnitInsertionException | DataTypeConflictException e) {
+ CreateDataCmd dataCmd = new CreateDataCmd(addr, dt);
+ dataCmd.applyTo(program);
+ }
}
/**
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/sections/DebugFrameSection.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/sections/DebugFrameSection.java
index 236288d4f5..990b8d9355 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/sections/DebugFrameSection.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/sections/DebugFrameSection.java
@@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
- * REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -84,20 +83,26 @@ public class DebugFrameSection extends AbstractFrameSection {
}
private List analyzeSection(MemoryBlock curMemBlock)
- throws MemoryAccessException, AddressOutOfBoundsException, ExceptionHandlerFrameException {
-
+ throws MemoryAccessException, AddressOutOfBoundsException,
+ ExceptionHandlerFrameException {
monitor.setMessage("Analyzing " + curMemBlock.getName() + " section");
monitor.setShowProgressValue(true);
- monitor.setIndeterminate(true);
+ monitor.setIndeterminate(false);
ProgramLocation loc = new ProgramLocation(program, curMemBlock.getStart());
Address curAddress = loc.getAddress();
List regions = new ArrayList<>();
+ if (curAddress != null) {
+ monitor.setMaximum(curMemBlock.getEnd().subtract(curAddress));
+ }
while (curAddress != null && curAddress.compareTo(curMemBlock.getEnd()) < 0) {
+ if (monitor.isCancelled()) {
+ return regions;
+ }
/* Get the Common Information Entry */
Cie cie = getCie(curAddress);
@@ -112,8 +117,12 @@ public class DebugFrameSection extends AbstractFrameSection {
/*
* Add each Frame Description Entry (FDE) for the current CIE.
*/
+ List newRegions = new ArrayList<>();
+
while (curAddress != null && (curAddress.compareTo(curMemBlock.getEnd()) < 0)) {
+ monitor.setProgress(curAddress.subtract(loc.getAddress()));
+
Address currFdeAddr = curAddress;
try {
@@ -126,23 +135,24 @@ public class DebugFrameSection extends AbstractFrameSection {
}
if (region != null) {
- regions.add(region);
+ newRegions.add(region);
createFdeComment(curAddress);
- monitor.incrementProgress(1);
}
curAddress = fde.getNextAddress(); // This can be null.
- } catch (ExceptionHandlerFrameException efe) {
+ }
+ catch (ExceptionHandlerFrameException efe) {
// May have run into another CIE.
curAddress = currFdeAddr;
break;
}
}
- createAugmentationData(regions, cie);
+ createAugmentationData(newRegions, cie);
+
+ regions.addAll(newRegions);
}
return regions;
-
}
}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/structures/ehFrame/FrameDescriptionEntry.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/structures/ehFrame/FrameDescriptionEntry.java
index 18b9d868f9..fb4b3ab504 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/structures/ehFrame/FrameDescriptionEntry.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/structures/ehFrame/FrameDescriptionEntry.java
@@ -17,18 +17,21 @@ package ghidra.app.plugin.exceptionhandlers.gcc.structures.ehFrame;
import ghidra.app.cmd.comments.SetCommentCmd;
import ghidra.app.cmd.data.CreateArrayCmd;
+import ghidra.app.cmd.data.CreateDataCmd;
import ghidra.app.cmd.function.CreateFunctionCmd;
import ghidra.app.plugin.exceptionhandlers.gcc.*;
import ghidra.app.plugin.exceptionhandlers.gcc.datatype.UnsignedLeb128DataType;
import ghidra.app.plugin.exceptionhandlers.gcc.sections.CieSource;
import ghidra.app.plugin.exceptionhandlers.gcc.sections.DebugFrameSection;
import ghidra.app.plugin.exceptionhandlers.gcc.structures.gccexcepttable.LSDATable;
+import ghidra.app.util.opinion.ElfLoader;
import ghidra.program.model.address.*;
import ghidra.program.model.data.*;
import ghidra.program.model.listing.*;
import ghidra.program.model.mem.*;
import ghidra.program.model.scalar.Scalar;
import ghidra.program.model.symbol.*;
+import ghidra.program.model.util.CodeUnitInsertionException;
import ghidra.util.Msg;
import ghidra.util.exception.InvalidInputException;
import ghidra.util.task.TaskMonitor;
@@ -265,8 +268,18 @@ public class FrameDescriptionEntry extends GccAnalysisClass {
DataType encodedDt = cie.getFDEDecoder().getDataType(program);
createAndCommentData(program, addr, encodedDt, comment, CodeUnit.EOL_COMMENT);
- program.getReferenceManager().addMemoryReference(addr, pcBeginAddr, RefType.DATA,
- SourceType.ANALYSIS, 0);
+ if (pcBeginAddr.getOffset() != 0x0) {
+ // if the program was moved from a preferred image base, need to adjust
+ // the beginning of frame pointer
+ Long oib = ElfLoader.getElfOriginalImageBase(program);
+ if (oib != null) {
+ long imageBaseOffset = program.getImageBase().getOffset() - oib;
+ pcBeginAddr = pcBeginAddr.add(imageBaseOffset);
+ }
+
+ program.getReferenceManager().addMemoryReference(addr, pcBeginAddr, RefType.DATA,
+ SourceType.ANALYSIS, 0);
+ }
curSize += encodedLen;
return addr.add(encodedLen);
@@ -386,8 +399,14 @@ public class FrameDescriptionEntry extends GccAnalysisClass {
// Create initial instructions array with remaining bytes.
int instructionLength = intLength - curSize;
- arrayCmd = new CreateArrayCmd(addr, instructionLength, new ByteDataType(), BYTE_LEN);
- arrayCmd.applyTo(program);
+ ArrayDataType adt = new ArrayDataType(ByteDataType.dataType, instructionLength, BYTE_LEN);
+ try {
+ program.getListing().createData(addr, adt, adt.getLength());
+ }
+ catch (CodeUnitInsertionException e) {
+ CreateDataCmd dataCmd = new CreateDataCmd(addr, adt);
+ dataCmd.applyTo(program);
+ }
SetCommentCmd.createComment(program, addr, "(FDE) Call Frame Instructions",
CodeUnit.EOL_COMMENT);
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledThunk.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledThunk.java
index 291beb1e86..f1daaf45c4 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledThunk.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledThunk.java
@@ -17,6 +17,7 @@ package ghidra.app.util.demangler;
import ghidra.app.cmd.disassemble.DisassembleCommand;
import ghidra.app.cmd.function.CreateFunctionCmd;
+import ghidra.app.cmd.function.CreateThunkFunctionCmd;
import ghidra.program.model.address.*;
import ghidra.program.model.lang.InstructionContext;
import ghidra.program.model.listing.*;
@@ -110,8 +111,7 @@ public class DemangledThunk extends DemangledObject {
function.setThunkedFunction(thunkedFunction);
}
- Symbol s =
- applyDemangledName(thunkAddress, function.isThunk(), false, program);
+ Symbol s = applyDemangledName(thunkAddress, function.isThunk(), false, program);
return s != null;
}
@@ -181,8 +181,15 @@ public class DemangledThunk extends DemangledObject {
}
Symbol s = SymbolUtilities.getExpectedLabelOrFunctionSymbol(program,
- thunkedFunctionObject.originalMangled, err -> Msg.error(this, err));
+ thunkedFunctionObject.originalMangled, err -> Msg.warn(this, err));
+ if (s == null) {
+ Address thunkedAddr =
+ CreateThunkFunctionCmd.getThunkedAddr(program, thunkAddress, false);
+ if (thunkedAddr != null) {
+ s = program.getSymbolTable().getPrimarySymbol(thunkedAddr);
+ }
+ }
if (s == null || !block.contains(s.getAddress())) {
return null;
}
diff --git a/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java b/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java
index bdb3f9153b..bd6eddc2a7 100644
--- a/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java
+++ b/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java
@@ -502,6 +502,9 @@ public class GnuDemanglerParser implements DemanglerParser {
if (pos == -1) {
throw new RuntimeException();
}
+ if (str.endsWith(")")) {
+ throw new RuntimeException();
+ }
DemangledObject dobj = parse(null, str.substring(0, pos));
if (dobj == null) {
diff --git a/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java b/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
index 7be2635d0d..325910193a 100644
--- a/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
+++ b/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
@@ -62,6 +62,8 @@ public class GnuDemanglerParserTest extends AbstractGenericTest {
"_ZTv0_n24_NSt19basic_ostringstreamIcSt11char_traitsIcE14pool_allocatorIcEED0Ev");// virtual thunk
demangle(process, parser, "_ZTch0_h16_NK8KHotKeys13WindowTrigger4copyEPNS_10ActionDataE");// covariant return thunk
+ demangle(process, parser, "_ZNK2cc14ScrollSnapTypeneERKS0_");
+
List list = loadTextResource(GnuDemanglerParserTest.class, "libMagick.symbols.txt");
for (String mangled : list) {
if (mangled == null) {
@@ -73,8 +75,8 @@ public class GnuDemanglerParserTest extends AbstractGenericTest {
System.out.println("Elapsed Time: " + (System.currentTimeMillis() - start));
}
- private void demangle(GnuDemanglerNativeProcess process, GnuDemanglerParser parser, String mangled)
- throws IOException {
+ private void demangle(GnuDemanglerNativeProcess process, GnuDemanglerParser parser,
+ String mangled) throws IOException {
String demangled = process.demangle(mangled);
assertNotNull(demangled);
assertNotEquals(mangled, demangled);
@@ -165,6 +167,16 @@ public class GnuDemanglerParserTest extends AbstractGenericTest {
"covariant return thunk [nv:0] [nv:16] to KHotKeys::WindowTrigger::copy(KHotKeys::ActionData*) const");
assertTrue(parse instanceof DemangledThunk);
assertName(parse, "copy", "KHotKeys", "WindowTrigger");
+
+ try {
+ parse = parser.parse(
+ "_ZZN12GrGLFunctionIFPKhjEEC1IZN13skia_bindings28CreateGLES2InterfaceBindingsEPN3gpu5gles214GLES2InterfaceEPNS6_14ContextSupportEE3$_0EET_ENUlPKvjE_8__invokeESF_j",
+ "GrGLFunction::GrGLFunction(skia_bindings::CreateGLES2InterfaceBindings(gpu::gles2::GLES2Interface*, gpu::ContextSupport*)::$_0)::{lambda(void const*, unsigned int)#1}::__invoke(void const*, unsigned int)");
+ assertNull("Shouldn't have parsed", parser);
+ }
+ catch (Exception exc) {
+ // should get an exception
+ }
}
private void assertName(DemangledObject demangledObj, String name, String... namespaces) {
@@ -193,9 +205,8 @@ public class GnuDemanglerParserTest extends AbstractGenericTest {
DemangledObject object = parser.parse(mangled, demangled);
assertTrue(object instanceof DemangledFunction);
- assertEquals(
- "undefined glob_fn9(" +
- "char,int,long,long long,unsigned int,unsigned long,float,double,long double,bool,void *,void * *)",
+ assertEquals("undefined glob_fn9(" +
+ "char,int,long,long long,unsigned int,unsigned long,float,double,long double,bool,void *,void * *)",
object.getSignature(false));
}
diff --git a/Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc b/Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc
index 51abf6007c..31a363f889 100644
--- a/Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc
+++ b/Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc
@@ -1358,7 +1358,8 @@ with : ARMcondCk=1 {
:hlt immed6 is TMode=1 & op6=0b1011101010 & immed6
{
- software_hlt(immed6:4);
+ pc = software_hlt(immed6:4);
+ goto [pc];
}
:bkpt immed8 is TMode=1 & ItCond & op8=0xbe & immed8
@@ -1384,14 +1385,16 @@ with : ARMcondCk=1 {
:udf^ItCond "#"thc0007 is TMode=1 & ItCond & op8 = 0xde & thc0007
{
build ItCond;
- software_udf(thc0007:4);
+ pc = software_udf(thc0007:4);
+ goto [pc];
}
@endif
:udf^ItCond "#"tmp is TMode=1 & ItCond & op4=0xf7f & thc0003; op12=0xa & thc0011 [tmp = thc0003 << 12 | thc0011;]
{
build ItCond;
- software_udf(tmp:4);
+ pc = software_udf(tmp:4);
+ goto [pc];
}
@endif # VERSION_5
diff --git a/Ghidra/Processors/MIPS/src/main/java/ghidra/app/plugin/core/analysis/MipsAddressAnalyzer.java b/Ghidra/Processors/MIPS/src/main/java/ghidra/app/plugin/core/analysis/MipsAddressAnalyzer.java
index 2eb581ef56..6611f85b85 100644
--- a/Ghidra/Processors/MIPS/src/main/java/ghidra/app/plugin/core/analysis/MipsAddressAnalyzer.java
+++ b/Ghidra/Processors/MIPS/src/main/java/ghidra/app/plugin/core/analysis/MipsAddressAnalyzer.java
@@ -193,11 +193,12 @@ public class MipsAddressAnalyzer extends ConstantPropagationAnalyzer {
try {
String symname = "_gp_" + index++;
// check if it already exists
- Symbol existingSymbol = SymbolUtilities.getLabelOrFunctionSymbol(program, symname,
- err -> { /* ignore multiple symbols, if even one exists we need to skip if it has a different address */ } );
+ Symbol existingSymbol =
+ SymbolUtilities.getLabelOrFunctionSymbol(program, symname, err -> {
+ /* ignore multiple symbols, if even one exists we need to skip if it has a different address */ });
if (existingSymbol != null) {
if (existingSymbol.getAddress().equals(toAddr)) {
- return existingSymbol;
+ return existingSymbol;
}
continue; // can't use this one, look for the next free gp_ symbol
}
@@ -223,14 +224,16 @@ public class MipsAddressAnalyzer extends ConstantPropagationAnalyzer {
final AddressSet coveredSet = new AddressSet();
+ Address currentGPAssumptionValue = gp_assumption_value;
+
if (func != null) {
flowStart = func.getEntryPoint();
- if (gp_assumption_value != null) {
+ if (currentGPAssumptionValue != null) {
ProgramContext programContext = program.getProgramContext();
RegisterValue gpVal = programContext.getRegisterValue(gp, flowStart);
if (gpVal == null || !gpVal.hasValue()) {
- gpVal =
- new RegisterValue(gp, BigInteger.valueOf(gp_assumption_value.getOffset()));
+ gpVal = new RegisterValue(gp,
+ BigInteger.valueOf(currentGPAssumptionValue.getOffset()));
try {
program.getProgramContext().setRegisterValue(func.getEntryPoint(),
func.getEntryPoint(), gpVal);
@@ -245,6 +248,7 @@ public class MipsAddressAnalyzer extends ConstantPropagationAnalyzer {
// follow all flows building up context
// use context to fill out addresses on certain instructions
ContextEvaluator eval = new ConstantPropagationContextEvaluator(trustWriteMemOption) {
+ private Address localGPAssumptionValue = currentGPAssumptionValue;
private boolean mustStopNow = false; // if something discovered in processing, mustStop flag
@@ -297,8 +301,8 @@ public class MipsAddressAnalyzer extends ConstantPropagationAnalyzer {
if (registerValue != null) {
BigInteger value = registerValue.getUnsignedValue();
long unsignedValue = value.longValue();
- if (gp_assumption_value == null ||
- !(unsignedValue == gp_assumption_value.getOffset())) {
+ if (localGPAssumptionValue == null ||
+ !(unsignedValue == localGPAssumptionValue.getOffset())) {
synchronized (gp) {
Address gpRefAddr =
instr.getMinAddress().getNewAddress(unsignedValue);
@@ -317,18 +321,18 @@ public class MipsAddressAnalyzer extends ConstantPropagationAnalyzer {
instr.getMinAddress().getAddressSpace().getBaseSpaceID(),
unsignedValue, 1, RefType.DATA, PcodeOp.UNIMPLEMENTED, true,
monitor);
- if (gp_assumption_value == null) {
+ if (localGPAssumptionValue == null) {
program.getBookmarkManager().setBookmark(
lastSetInstr.getMinAddress(), BookmarkType.WARNING,
"GP Global Register Set",
"Global GP Register is set here.");
}
- if (gp_assumption_value != null &&
- !gp_assumption_value.equals(gpRefAddr)) {
- gp_assumption_value = null;
+ if (localGPAssumptionValue != null &&
+ !localGPAssumptionValue.equals(gpRefAddr)) {
+ localGPAssumptionValue = gp_assumption_value = null;
}
else {
- gp_assumption_value = gpRefAddr;
+ localGPAssumptionValue = gp_assumption_value = gpRefAddr;
}
}
}
@@ -400,10 +404,11 @@ public class MipsAddressAnalyzer extends ConstantPropagationAnalyzer {
// if it is assumed to be set to the same value, it can lead
// to incorrect re-use of the value (non-returning functions)
context.clearRegister(reg);
-
+
// need to add the reference here, register operand will no longer have a value
- instr.addOperandReference(0, addr, refType, SourceType.ANALYSIS);
-
+ instr.addOperandReference(0, addr, refType,
+ SourceType.ANALYSIS);
+
// set the register value on the target address
ProgramContext progContext = program.getProgramContext();
if (progContext.getValue(reg, addr, false) == null) {
diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction1Test.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction1Test.java
index 3e4cb088fe..bb753c6c4a 100644
--- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction1Test.java
+++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction1Test.java
@@ -213,18 +213,16 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
waitForTasks();
// make some changes to check in
- Program program = (Program) ((DomainFileNode) node).getDomainFile()
- .getDomainObject(this,
- true, false, TaskMonitor.DUMMY);
+ Program program = (Program) ((DomainFileNode) node).getDomainFile().getDomainObject(this,
+ true, false, TaskMonitor.DUMMY);
editProgram(program, (p) -> {
SymbolTable symTable = p.getSymbolTable();
symTable.createLabel(p.getMinAddress().getNewAddress(0x010001000), "fred",
SourceType.USER_DEFINED);
});
- program = (Program) ((DomainFileNode) xnode).getDomainFile()
- .getDomainObject(this, true,
- false, TaskMonitor.DUMMY);
+ program = (Program) ((DomainFileNode) xnode).getDomainFile().getDomainObject(this, true,
+ false, TaskMonitor.DUMMY);
editProgram(program, (p) -> {
SymbolTable symTable = p.getSymbolTable();
symTable.createLabel(p.getMinAddress(), "bob", SourceType.USER_DEFINED);
@@ -253,9 +251,8 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
checkout(programNode);
Program program =
- (Program) ((DomainFileNode) programNode).getDomainFile()
- .getDomainObject(this, true,
- false, TaskMonitor.DUMMY);
+ (Program) ((DomainFileNode) programNode).getDomainFile().getDomainObject(this, true,
+ false, TaskMonitor.DUMMY);
createHistoryEntry(program, "Symbol1");
frontEnd.checkIn(programNode, "This is checkin 1");
@@ -608,8 +605,9 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
selectInTable(table, node);
DockingActionIf undoCheckoutAction = getAction("UndoCheckOut");
- assertTrue(undoCheckoutAction.isEnabledForContext(dialog.getActionContext(null)));
- performAction(undoCheckoutAction);
+ ActionContext actionContext = dialog.getActionContext(null);
+ assertTrue(undoCheckoutAction.isEnabledForContext(actionContext));
+ performAction(undoCheckoutAction, actionContext, true);
waitForBusyTable(table);
assertEquals(1, model.getRowCount());