diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/BreakCallBack.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/BreakCallBack.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/BreakCallBack.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/BreakCallBack.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/BreakTable.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/BreakTable.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/BreakTable.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/BreakTable.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/BreakTableCallBack.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/BreakTableCallBack.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/BreakTableCallBack.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/BreakTableCallBack.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/Emulate.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/Emulate.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/Emulate.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/Emulate.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/EmulateDisassemblerContext.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/EmulateDisassemblerContext.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/EmulateDisassemblerContext.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/EmulateDisassemblerContext.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/EmulateExecutionState.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/EmulateExecutionState.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/EmulateExecutionState.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/EmulateExecutionState.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/EmulateInstructionStateModifier.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/EmulateInstructionStateModifier.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/EmulateInstructionStateModifier.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/EmulateInstructionStateModifier.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/EmulateMemoryStateBuffer.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/EmulateMemoryStateBuffer.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/EmulateMemoryStateBuffer.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/EmulateMemoryStateBuffer.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/InstructionDecodeException.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/InstructionDecodeException.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/InstructionDecodeException.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/InstructionDecodeException.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/UnimplementedCallOtherException.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/UnimplementedCallOtherException.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/UnimplementedCallOtherException.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/UnimplementedCallOtherException.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/UnimplementedInstructionException.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/UnimplementedInstructionException.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/UnimplementedInstructionException.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/UnimplementedInstructionException.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/callother/OpBehaviorOther.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/callother/OpBehaviorOther.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/callother/OpBehaviorOther.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/callother/OpBehaviorOther.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/callother/OpBehaviorOtherNOP.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/callother/OpBehaviorOtherNOP.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/callother/OpBehaviorOtherNOP.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emulate/callother/OpBehaviorOtherNOP.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/loadimage/LoadImage.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/loadimage/LoadImage.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/loadimage/LoadImage.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/loadimage/LoadImage.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/loadimage/LoadImageFunc.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/loadimage/LoadImageFunc.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/loadimage/LoadImageFunc.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/loadimage/LoadImageFunc.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/AbstractMemoryState.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/AbstractMemoryState.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/AbstractMemoryState.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/AbstractMemoryState.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/DefaultMemoryState.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/DefaultMemoryState.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/DefaultMemoryState.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/DefaultMemoryState.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryBank.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryBank.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryBank.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryBank.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryFaultHandler.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryFaultHandler.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryFaultHandler.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryFaultHandler.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryPage.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryPage.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryPage.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryPage.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryPageBank.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryPageBank.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryPageBank.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryPageBank.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryPageOverlay.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryPageOverlay.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryPageOverlay.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryPageOverlay.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryState.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryState.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/MemoryState.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/MemoryState.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/UniqueMemoryBank.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/UniqueMemoryBank.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/memstate/UniqueMemoryBank.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/memstate/UniqueMemoryBank.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/BinaryOpBehavior.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/BinaryOpBehavior.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/BinaryOpBehavior.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/BinaryOpBehavior.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehavior.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehavior.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehavior.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehavior.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolAnd.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolAnd.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolAnd.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolAnd.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolNegate.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolNegate.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolNegate.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolNegate.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolOr.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolOr.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolOr.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolOr.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolXor.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolXor.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolXor.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorBoolXor.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorCopy.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorCopy.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorCopy.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorCopy.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorEqual.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorEqual.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorEqual.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorEqual.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFactory.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFactory.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFactory.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFactory.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatAbs.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatAbs.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatAbs.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatAbs.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatAdd.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatAdd.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatAdd.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatAdd.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatCeil.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatCeil.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatCeil.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatCeil.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatDiv.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatDiv.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatDiv.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatDiv.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatEqual.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatEqual.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatEqual.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatEqual.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloat2Float.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloat2Float.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloat2Float.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloat2Float.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloor.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloor.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloor.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloor.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatInt2Float.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatInt2Float.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatInt2Float.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatInt2Float.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatLess.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatLess.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatLess.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatLess.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessEqual.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessEqual.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessEqual.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessEqual.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatMult.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatMult.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatMult.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatMult.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNan.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNan.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNan.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNan.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNeg.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNeg.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNeg.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNeg.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNotEqual.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNotEqual.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNotEqual.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatNotEqual.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatRound.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatRound.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatRound.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatRound.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatSqrt.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatSqrt.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatSqrt.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatSqrt.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatSub.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatSub.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatSub.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatSub.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatTrunc.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatTrunc.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatTrunc.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorFloatTrunc.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorInt2Comp.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorInt2Comp.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorInt2Comp.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorInt2Comp.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntAdd.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntAdd.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntAdd.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntAdd.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntAnd.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntAnd.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntAnd.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntAnd.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntCarry.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntCarry.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntCarry.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntCarry.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntDiv.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntDiv.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntDiv.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntDiv.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLeft.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLeft.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLeft.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLeft.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLess.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLess.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLess.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLess.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLessEqual.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLessEqual.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLessEqual.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntLessEqual.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntMult.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntMult.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntMult.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntMult.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntNegate.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntNegate.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntNegate.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntNegate.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntOr.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntOr.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntOr.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntOr.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntRem.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntRem.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntRem.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntRem.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntRight.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntRight.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntRight.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntRight.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSborrow.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSborrow.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSborrow.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSborrow.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntScarry.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntScarry.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntScarry.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntScarry.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSdiv.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSdiv.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSdiv.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSdiv.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSext.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSext.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSext.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSext.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSless.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSless.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSless.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSless.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSlessEqual.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSlessEqual.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSlessEqual.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSlessEqual.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSrem.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSrem.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSrem.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSrem.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSright.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSright.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSright.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSright.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSub.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSub.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSub.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntSub.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntXor.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntXor.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntXor.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntXor.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntZext.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntZext.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntZext.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorIntZext.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorLzcount.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorLzcount.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorLzcount.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorLzcount.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorNotEqual.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorNotEqual.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorNotEqual.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorNotEqual.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorPiece.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorPiece.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorPiece.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorPiece.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorPopcount.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorPopcount.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorPopcount.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorPopcount.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorSubpiece.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorSubpiece.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/OpBehaviorSubpiece.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/OpBehaviorSubpiece.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/SpecialOpBehavior.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/SpecialOpBehavior.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/SpecialOpBehavior.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/SpecialOpBehavior.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/UnaryOpBehavior.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/UnaryOpBehavior.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/opbehavior/UnaryOpBehavior.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/opbehavior/UnaryOpBehavior.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/pcoderaw/PcodeOpRaw.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/pcoderaw/PcodeOpRaw.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/pcoderaw/PcodeOpRaw.java rename to Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/pcoderaw/PcodeOpRaw.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/memstate/UniqueMemoryBankTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/memstate/UniqueMemoryBankTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/memstate/UniqueMemoryBankTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/memstate/UniqueMemoryBankTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/AbstractOpBehaviorTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/AbstractOpBehaviorTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/AbstractOpBehaviorTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/AbstractOpBehaviorTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolAndTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolAndTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolAndTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolAndTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolNegateTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolNegateTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolNegateTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolNegateTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolOrTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolOrTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolOrTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolOrTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolXorTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolXorTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolXorTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorBoolXorTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatAbsTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatAbsTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatAbsTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatAbsTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatAddTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatAddTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatAddTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatAddTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatCeilTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatCeilTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatCeilTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatCeilTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatDivTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatDivTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatDivTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatDivTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatEqualTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatEqualTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatEqualTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatEqualTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloat2FloatTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloat2FloatTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloat2FloatTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloat2FloatTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloorTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloorTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloorTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatFloorTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatInt2FloatTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatInt2FloatTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatInt2FloatTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatInt2FloatTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessEqualTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessEqualTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessEqualTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessEqualTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatLessTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatMultTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatMultTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatMultTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatMultTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNanTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNanTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNanTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNanTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNegTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNegTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNegTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNegTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNotEqualTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNotEqualTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNotEqualTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatNotEqualTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatRoundTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatRoundTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatRoundTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatRoundTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatSqrtTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatSqrtTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatSqrtTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatSqrtTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatSubTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatSubTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatSubTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatSubTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatTruncTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatTruncTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatTruncTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorFloatTruncTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorInt2CompTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorInt2CompTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorInt2CompTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorInt2CompTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntAddTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntAddTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntAddTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntAddTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntAndTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntAndTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntAndTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntAndTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntCarryTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntCarryTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntCarryTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntCarryTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntDivTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntDivTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntDivTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntDivTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLeftTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLeftTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLeftTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLeftTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLessEqualTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLessEqualTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLessEqualTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLessEqualTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLessTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLessTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLessTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntLessTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntMultTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntMultTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntMultTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntMultTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntNegateTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntNegateTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntNegateTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntNegateTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntOrTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntOrTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntOrTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntOrTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntRemTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntRemTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntRemTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntRemTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntRightTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntRightTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntRightTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntRightTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSLessEqualTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSLessEqualTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSLessEqualTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSLessEqualTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSLessTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSLessTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSLessTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSLessTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSRightTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSRightTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSRightTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorIntSRightTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorLzcountTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorLzcountTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorLzcountTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorLzcountTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorPopcountTest.java b/Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorPopcountTest.java similarity index 100% rename from Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/pcode/opbehavior/OpBehaviorPopcountTest.java rename to Ghidra/Framework/Emulation/src/test/java/ghidra/pcode/opbehavior/OpBehaviorPopcountTest.java diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/error/LowlevelError.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/error/LowlevelError.java index c1a513db0c..0a57c1e471 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/error/LowlevelError.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/error/LowlevelError.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. @@ -18,11 +17,11 @@ package ghidra.pcode.error; public class LowlevelError extends RuntimeException { - public LowlevelError( String message ) { - super( message ); + public LowlevelError(String message) { + super(message); } - - public LowlevelError( String message, Throwable throwable ) { - super( message, throwable ); + + public LowlevelError(String message, Throwable throwable) { + super(message, throwable); } }