Merge remote-tracking branch 'origin/GP-4125_ghidra1_ArtificialBlockAttribute--SQUASHED'

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ProgramEmulationUtils.java

@@ -171,7 +171,7 @@ public class ProgramEmulationUtils {
 	 */
 	public static Set<TraceMemoryFlag> getRegionFlags(MemoryBlock block) {
 		Set<TraceMemoryFlag> result = EnumSet.noneOf(TraceMemoryFlag.class);
-		int mask = block.getPermissions();
+		int mask = block.getFlags();
 		if ((mask & MemoryBlock.READ) != 0) {
 			result.add(TraceMemoryFlag.READ);
 		}

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewMemoryRegionBlock.java

@@ -18,6 +18,8 @@ package ghidra.trace.database.program;
 import java.io.InputStream;
 import java.math.BigInteger;
 
+import javax.help.UnsupportedOperationException;
+
 import ghidra.framework.store.LockException;
 import ghidra.program.model.address.*;
 import ghidra.trace.database.memory.DBTraceMemorySpace;
@@ -57,7 +59,7 @@ public class DBTraceProgramViewMemoryRegionBlock extends AbstractDBTraceProgramV
 	}
 
 	@Override
-	public int getPermissions() {
+	public int getFlags() {
 		int bits = 0;
 		for (TraceMemoryFlag flag : region.getFlags()) {
 			bits |= flag.getBits();
@@ -145,4 +147,15 @@ public class DBTraceProgramViewMemoryRegionBlock extends AbstractDBTraceProgramV
 	public void setVolatile(boolean v) {
 		region.setVolatile(v);
 	}
+
+	@Override
+	public boolean isArtificial() {
+		// By definition, any region present on target is non-artificial
+		return false;
+	}
+
+	@Override
+	public void setArtificial(boolean a) {
+		throw new UnsupportedOperationException();
+	}
 }

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewMemorySpaceBlock.java

@@ -50,7 +50,7 @@ public class DBTraceProgramViewMemorySpaceBlock extends AbstractDBTraceProgramVi
 	}
 
 	@Override
-	public int getPermissions() {
+	public int getFlags() {
 		return MemoryBlock.READ | MemoryBlock.WRITE | MemoryBlock.EXECUTE;
 	}
 
@@ -119,6 +119,16 @@ public class DBTraceProgramViewMemorySpaceBlock extends AbstractDBTraceProgramVi
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
+	public boolean isArtificial() {
+		return false;
+	}
+
+	@Override
+	public void setArtificial(boolean a) {
+		throw new UnsupportedOperationException();
+	}
+
 	@Override
 	public String getSourceName() {
 		return "Trace"; // TODO: What does this method actually do?

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewRegisterMemoryBlock.java

@@ -116,7 +116,7 @@ public class DBTraceProgramViewRegisterMemoryBlock implements MemoryBlock {
 	}
 
 	@Override
-	public int getPermissions() {
+	public int getFlags() {
 		return MemoryBlock.READ | MemoryBlock.WRITE;
 	}
 
@@ -220,6 +220,16 @@ public class DBTraceProgramViewRegisterMemoryBlock implements MemoryBlock {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
+	public boolean isArtificial() {
+		return false;
+	}
+
+	@Override
+	public void setArtificial(boolean a) {
+		throw new UnsupportedOperationException();
+	}
+
 	@Override
 	public String getSourceName() {
 		return "Trace"; // TODO: What does this method actually do?