Merge remote-tracking branch

'origin/GP-3071v2_Dan_moveNewEmulator--SQUASHED'

Conflicts:
	Ghidra/Debug/ProposedUtils/src/main/java/ghidra/pcode/exec/PcodeProgram.java

Ghidra/Debug/Framework-TraceModeling/build.gradle

@@ -24,6 +24,7 @@ eclipse.project.name = 'Debug Framework-TraceModeling'
 dependencies {
 	api project(':Generic')
 	api project(':SoftwareModeling')
+	api project(':Emulation')
 	api project(':ProposedUtils')
 	api project(':Framework-Debugging')
 	annotationProcessor project(':AnnotationValidator')

Ghidra/Debug/TaintAnalysis/build.gradle

@@ -23,6 +23,7 @@ eclipse.project.name = 'Debug TaintAnalysis'
 
 dependencies {
 	api project(':Debugger')
+	api project(':SystemEmulation')
 
 	// Oof. Apparently, this doesn't work transitively....
 	testImplementation project(path: ':ProposedUtils', configuration: 'testArtifacts')
@@ -30,4 +31,5 @@ dependencies {
 	testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts')
 	testImplementation project(path: ':Framework-TraceModeling', configuration: 'testArtifacts')
 	testImplementation project(path: ':Debugger', configuration: 'testArtifacts')
+	testImplementation project(path: ':SystemEmulation', configuration: 'testArtifacts')
 }

Ghidra/Features/Base/build.gradle

@@ -39,6 +39,7 @@ configurations {
 
 dependencies {
 	api project(':SoftwareModeling')
+	api project(':Emulation')
 
 	api 'org.apache.felix:org.apache.felix.framework:7.0.3'
 	api 'com.github.rotty3000:phidias:0.3.7'

Ghidra/Features/SystemEmulation/build.gradle

@@ -0,0 +1,29 @@
+/* ###
+ * IP: GHIDRA
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+apply from: "${rootProject.projectDir}/gradle/javaProject.gradle"
+apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle"
+apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle"
+apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle"
+
+apply plugin: 'eclipse'
+eclipse.project.name = 'Features SystemEmulation'
+
+dependencies {
+	api project(':Base')
+	api project(':Debugger')
+	api project(':Emulation')
+	api project(':DB')
+}

Ghidra/Features/SystemEmulation/certification.manifest

@@ -0,0 +1,2 @@
+##VERSION: 2.0
+Module.manifest||GHIDRA||||END|