Merge remote-tracking branch 'origin/GP-4477_emteere_NoOffcutStringsD…

…efaultThreads' into Ghidra_11.1
NationalSecurityAgency · May 7, 2024 · e3ac296 · e3ac296
2 parents 197a18a + 28807a4
commit e3ac296
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/...tures/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java b/...tures/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java
@@ -66,7 +66,7 @@ public class ConstantPropagationAnalyzer extends AbstractAnalyzer {
  protected static final String MAX_THREAD_COUNT_OPTION_NAME = "Max Threads";
  protected static final String MAX_THREAD_COUNT_OPTION_DESCRIPTION =
  "Maximum threads for constant propagation. Too many threads causes thrashing in DB.";
- protected static final int MAX_THREAD_COUNT_OPTION_DEFAULT_VALUE = 1;
+ protected static final int MAX_THREAD_COUNT_OPTION_DEFAULT_VALUE = 2;
 
  protected static final String MIN_KNOWN_REFADDRESS_OPTION_NAME = "Min absolute reference";
  protected static final String MIN_KNOWN_REFADDRESS_OPTION_DESCRIPTION =

diff --git a/...Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTableAnalyzer.java b/...Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AddressTableAnalyzer.java
@@ -419,11 +419,8 @@ private int checkTable(AddressTable tableEntry, Program program, TaskMonitor mon
  if (cu == null) {
  continue;
  }
+
  boolean atStartOfCU = cu.getMinAddress().equals(targetAddr);
- // always allow offcuts to strings
- if (cu instanceof Data data && data.getDataType() instanceof AbstractStringDataType) {
- continue;
- }
  if (!allowOffcutReferences && !atStartOfCU) {
  // if the processor uses low bit to reference instructions
  // allow offcut to an instruction by 1