From 019e95530d5134d54d9c6596b03eed5b8cd24c4b Mon Sep 17 00:00:00 2001
From: emteere <47253321+emteere@users.noreply.github.com>
Date: Tue, 11 Oct 2022 22:20:11 +0000
Subject: [PATCH] GP-2534 Turn on shared function contiguous function options,
 except for on ARM

---
 .../ghidra/program/model/lang/GhidraLanguagePropertyKeys.java   | 2 +-
 Ghidra/Processors/ARM/data/languages/ARMCortex.pspec            | 2 +-
 Ghidra/Processors/ARM/data/languages/ARM_v45.pspec              | 2 +-
 Ghidra/Processors/ARM/data/languages/ARMt.pspec                 | 2 +-
 Ghidra/Processors/ARM/data/languages/ARMtTHUMB.pspec            | 2 +-
 Ghidra/Processors/ARM/data/languages/ARMt_v45.pspec             | 2 +-
 Ghidra/Processors/ARM/data/languages/ARMt_v6.pspec              | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/GhidraLanguagePropertyKeys.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/GhidraLanguagePropertyKeys.java
index 9d9fd97a0c..e9e4a039de 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/GhidraLanguagePropertyKeys.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/GhidraLanguagePropertyKeys.java
@@ -112,7 +112,7 @@ public final class GhidraLanguagePropertyKeys {
 	 * 
 	 * This could cause issues on programs with bad control flow, or bad disassembly
 	 */
-	public static final String ENABLE_ASSUME_CONTIGUOUS_FUNCTIONS_ONLY = "enableSharedReturnContiguousFunctionsOnly";
+	public static final String ENABLE_ASSUME_CONTIGUOUS_FUNCTIONS_ONLY = "enableContiguousFunctionsOnly";
 
 	/**
 	 * Non returning function analysis, where a function such as exit() is known to the compiler
diff --git a/Ghidra/Processors/ARM/data/languages/ARMCortex.pspec b/Ghidra/Processors/ARM/data/languages/ARMCortex.pspec
index 5873ef0925..50a8476363 100644
--- a/Ghidra/Processors/ARM/data/languages/ARMCortex.pspec
+++ b/Ghidra/Processors/ARM/data/languages/ARMCortex.pspec
@@ -5,7 +5,7 @@
     <property key="addressesDoNotAppearDirectlyInCode" value="true"/>
     <property key="allowOffcutReferencesToFunctionStarts" value="true"/>
     <property key="useNewFunctionStackAnalysis" value="true"/>
-    <property key="enableSharedReturnContiguousFunctionsOnly" value="false"/>
+    <property key="enableContiguousFunctionsOnly" value="false"/>
     <property key="emulateInstructionStateModifierClass" value="ghidra.program.emulation.ARMEmulateInstructionStateModifier"/>
   </properties>
   <programcounter register="pc"/>
diff --git a/Ghidra/Processors/ARM/data/languages/ARM_v45.pspec b/Ghidra/Processors/ARM/data/languages/ARM_v45.pspec
index 2cbde5e7f4..b7cd95249f 100644
--- a/Ghidra/Processors/ARM/data/languages/ARM_v45.pspec
+++ b/Ghidra/Processors/ARM/data/languages/ARM_v45.pspec
@@ -6,7 +6,7 @@
     <property key="allowOffcutReferencesToFunctionStarts" value="true"/>
     <property key="useNewFunctionStackAnalysis" value="true"/>
     <property key="enableSharedReturnAnalysis" value="false"/>
-    <property key="enableSharedReturnContiguousFunctionsOnly" value="false"/>
+    <property key="enableContiguousFunctionsOnly" value="false"/>
     <property key="emulateInstructionStateModifierClass" value="ghidra.program.emulation.ARMEmulateInstructionStateModifier"/>
   </properties>
   <programcounter register="pc"/>
diff --git a/Ghidra/Processors/ARM/data/languages/ARMt.pspec b/Ghidra/Processors/ARM/data/languages/ARMt.pspec
index 70e5e6c3d9..ff62a39286 100644
--- a/Ghidra/Processors/ARM/data/languages/ARMt.pspec
+++ b/Ghidra/Processors/ARM/data/languages/ARMt.pspec
@@ -5,7 +5,7 @@
     <property key="addressesDoNotAppearDirectlyInCode" value="true"/>
     <property key="allowOffcutReferencesToFunctionStarts" value="true"/>
     <property key="useNewFunctionStackAnalysis" value="true"/>
-    <property key="enableSharedReturnContiguousFunctionsOnly" value="false"/>
+    <property key="enableContiguousFunctionsOnly" value="false"/>
     <property key="emulateInstructionStateModifierClass" value="ghidra.program.emulation.ARMEmulateInstructionStateModifier"/>
     <property key="assemblyRating:ARM:BE:32:v7" value="PLATINUM"/>
     <property key="assemblyRating:ARM:LE:32:v7" value="PLATINUM"/>
diff --git a/Ghidra/Processors/ARM/data/languages/ARMtTHUMB.pspec b/Ghidra/Processors/ARM/data/languages/ARMtTHUMB.pspec
index 771ee02681..58b125c908 100644
--- a/Ghidra/Processors/ARM/data/languages/ARMtTHUMB.pspec
+++ b/Ghidra/Processors/ARM/data/languages/ARMtTHUMB.pspec
@@ -6,7 +6,7 @@
     <property key="addressesDoNotAppearDirectlyInCode" value="true"/>
     <property key="allowOffcutReferencesToFunctionStarts" value="true"/>
     <property key="useNewFunctionStackAnalysis" value="true"/>
-    <property key="enableSharedReturnContiguousFunctionsOnly" value="false"/>
+    <property key="enableContiguousFunctionsOnly" value="false"/>
     <property key="emulateInstructionStateModifierClass" value="ghidra.program.emulation.ARMEmulateInstructionStateModifier"/>
     <property key="assemblyRating:ARM:BE:32:v7" value="PLATINUM"/>
     <property key="assemblyRating:ARM:LE:32:v7" value="PLATINUM"/>
diff --git a/Ghidra/Processors/ARM/data/languages/ARMt_v45.pspec b/Ghidra/Processors/ARM/data/languages/ARMt_v45.pspec
index 0059c3cfaf..a8fe2ee893 100644
--- a/Ghidra/Processors/ARM/data/languages/ARMt_v45.pspec
+++ b/Ghidra/Processors/ARM/data/languages/ARMt_v45.pspec
@@ -6,7 +6,7 @@
     <property key="allowOffcutReferencesToFunctionStarts" value="true"/>
     <property key="useNewFunctionStackAnalysis" value="true"/>
     <property key="enableSharedReturnAnalysis" value="false"/>
-    <property key="enableSharedReturnContiguousFunctionsOnly" value="false"/>
+    <property key="enableContiguousFunctionsOnly" value="false"/>
     <property key="emulateInstructionStateModifierClass" value="ghidra.program.emulation.ARMEmulateInstructionStateModifier"/>
   </properties>
   <programcounter register="pc"/>
diff --git a/Ghidra/Processors/ARM/data/languages/ARMt_v6.pspec b/Ghidra/Processors/ARM/data/languages/ARMt_v6.pspec
index bd073c9734..a10848d14c 100644
--- a/Ghidra/Processors/ARM/data/languages/ARMt_v6.pspec
+++ b/Ghidra/Processors/ARM/data/languages/ARMt_v6.pspec
@@ -5,7 +5,7 @@
     <property key="addressesDoNotAppearDirectlyInCode" value="true"/>
     <property key="allowOffcutReferencesToFunctionStarts" value="true"/>
     <property key="useNewFunctionStackAnalysis" value="true"/>
-    <property key="enableSharedReturnContiguousFunctionsOnly" value="false"/>
+    <property key="enableContiguousFunctionsOnly" value="false"/>
     <property key="emulateInstructionStateModifierClass" value="ghidra.program.emulation.ARMEmulateInstructionStateModifier"/>
     <property key="assemblyRating:ARM:BE:32:v7" value="PLATINUM"/>
     <property key="assemblyRating:ARM:LE:32:v7" value="PLATINUM"/>