diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/analysis/JitDataFlowModel.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/analysis/JitDataFlowModel.java index 4c9dab1b9f..2f7b6f9a4f 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/analysis/JitDataFlowModel.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/analysis/JitDataFlowModel.java @@ -322,8 +322,8 @@ public class JitDataFlowModel { /** * An upward graph traversal for collecting all values in the use-def graph. * - * @see JitAnalysisContext#allValues() - * @see JitAnalysisContext#allValuesSorted() + * @see #allValues() + * @see #allValuesSorted() */ protected class ValCollector extends HashSet implements JitOpUpwardVisitor { public ValCollector() { @@ -479,7 +479,7 @@ public class JitDataFlowModel { * NOTE: This is only as complete as it needed to be for me to diagnose whatever issue I was * having at the time. * - * @see JitAnalysisContext#exportGraphviz(File) + * @see #exportGraphviz(File) */ protected class GraphvizExporter implements JitOpUpwardVisitor { final PrintWriter out; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/FieldReq.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/FieldReq.java index 8cfb65b978..1b088352a7 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/FieldReq.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/FieldReq.java @@ -22,7 +22,7 @@ import ghidra.pcode.emu.jit.gen.tgt.JitCompiledPassage; /** * A field request for a pre-fetched or pre-constructed element */ -interface FieldReq { +public interface FieldReq { /** * Derive a suitable name for the field * diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/InstanceFieldReq.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/InstanceFieldReq.java index ce8a01649f..da08b69893 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/InstanceFieldReq.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/InstanceFieldReq.java @@ -21,7 +21,7 @@ import org.objectweb.asm.MethodVisitor; /** * An instance field request initialized in the class constructor */ -interface InstanceFieldReq extends FieldReq { +public interface InstanceFieldReq extends FieldReq { /** * Emit the field declaration and its initialization bytecode * diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/StaticFieldReq.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/StaticFieldReq.java index 907bb41944..41f6fa30c0 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/StaticFieldReq.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/StaticFieldReq.java @@ -21,13 +21,13 @@ import org.objectweb.asm.MethodVisitor; /** * A static field request initialized in the class initializer */ -interface StaticFieldReq extends FieldReq { +public interface StaticFieldReq extends FieldReq { /** * Emit the field declaration and its initialization bytecode * *

- * The declaration is emitted into the class definition, and the initialization code is - * emitted into the class initializer. + * The declaration is emitted into the class definition, and the initialization code is emitted + * into the class initializer. * * @param gen the code generator * @param cv the visitor for the class definition diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BitwiseBinOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BitwiseBinOpGen.java index 7d73f93f55..604a26ae32 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BitwiseBinOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BitwiseBinOpGen.java @@ -16,8 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.ILOAD; -import static org.objectweb.asm.Opcodes.ISTORE; import org.objectweb.asm.*; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolAndOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolAndOpGen.java index 14fb9fed6b..d21f88bad2 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolAndOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolAndOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IAND; -import static org.objectweb.asm.Opcodes.LAND; - import ghidra.pcode.emu.jit.op.JitBoolAndOp; import ghidra.pcode.opbehavior.OpBehaviorBoolAnd; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolNegateOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolNegateOpGen.java index 60a85a2f7f..9d0d1f6a73 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolNegateOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolNegateOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IXOR; -import static org.objectweb.asm.Opcodes.LXOR; - import org.objectweb.asm.MethodVisitor; import ghidra.lifecycle.Unfinished; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolOrOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolOrOpGen.java index 867fd72948..ee64b909e8 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolOrOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolOrOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IOR; -import static org.objectweb.asm.Opcodes.LOR; - import ghidra.pcode.emu.jit.op.JitBoolOrOp; import ghidra.pcode.opbehavior.OpBehaviorBoolOr; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolXorOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolXorOpGen.java index 6d9d4867ba..1ac776cb74 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolXorOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BoolXorOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IXOR; -import static org.objectweb.asm.Opcodes.LXOR; - import ghidra.pcode.emu.jit.op.JitBoolXorOp; import ghidra.pcode.opbehavior.OpBehaviorBoolXor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchIndOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchIndOpGen.java index 4119c8b8ed..913e52c6e6 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchIndOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchIndOpGen.java @@ -15,16 +15,13 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.ACONST_NULL; -import static org.objectweb.asm.Opcodes.ARETURN; - import org.objectweb.asm.MethodVisitor; import ghidra.pcode.emu.jit.JitPcodeThread; import ghidra.pcode.emu.jit.analysis.JitControlFlowModel.JitBlock; import ghidra.pcode.emu.jit.analysis.JitType; import ghidra.pcode.emu.jit.analysis.JitType.LongJitType; -import ghidra.pcode.emu.jit.gen.*; +import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.gen.type.TypeConversions; import ghidra.pcode.emu.jit.op.JitBranchIndOp; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchOpGen.java index fddd2c7b53..bcc5569ed7 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/BranchOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.pcode.emu.jit.gen.GenConsts.MDESC_JIT_COMPILED_PASSAGE__GET_CHAINED; import static ghidra.pcode.emu.jit.gen.GenConsts.NAME_JIT_COMPILED_PASSAGE; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; @@ -25,7 +24,8 @@ import org.objectweb.asm.MethodVisitor; import ghidra.pcode.emu.jit.JitPassage.*; import ghidra.pcode.emu.jit.JitPcodeThread; import ghidra.pcode.emu.jit.analysis.JitControlFlowModel.JitBlock; -import ghidra.pcode.emu.jit.gen.*; +import ghidra.pcode.emu.jit.gen.FieldForExitSlot; +import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.gen.tgt.JitCompiledPassage; import ghidra.pcode.emu.jit.gen.var.VarGen; import ghidra.pcode.emu.jit.op.JitBranchOp; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CBranchOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CBranchOpGen.java index 7fcb84ad54..13490ce187 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CBranchOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CBranchOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.*; - import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; @@ -24,7 +22,7 @@ import ghidra.pcode.emu.jit.JitPassage.ExtBranch; import ghidra.pcode.emu.jit.JitPassage.IntBranch; import ghidra.pcode.emu.jit.analysis.JitControlFlowModel.JitBlock; import ghidra.pcode.emu.jit.analysis.JitType; -import ghidra.pcode.emu.jit.gen.*; +import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.gen.type.TypeConversions; import ghidra.pcode.emu.jit.gen.var.VarGen; import ghidra.pcode.emu.jit.gen.var.VarGen.BlockTransition; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CallOtherMissingOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CallOtherMissingOpGen.java index ebe1ddcde9..7c671f4f89 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CallOtherMissingOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CallOtherMissingOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.pcode.emu.jit.gen.GenConsts.MDESC_SLEIGH_LINK_EXCEPTION__$INIT; import static ghidra.pcode.emu.jit.gen.GenConsts.NAME_SLEIGH_LINK_EXCEPTION; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CallOtherOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CallOtherOpGen.java index ffaca2c070..c92460acab 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CallOtherOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CallOtherOpGen.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.*; import java.lang.reflect.Method; import java.lang.reflect.Parameter; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CompareFloatOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CompareFloatOpGen.java index d60c455856..c9dcf1d4d6 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CompareFloatOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CompareFloatOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.GOTO; - import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CompareIntBinOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CompareIntBinOpGen.java index af5eb603d4..7fa382b629 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CompareIntBinOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CompareIntBinOpGen.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CopyOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CopyOpGen.java index 8419b27fb4..e02aa8472c 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CopyOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/CopyOpGen.java @@ -18,8 +18,8 @@ package ghidra.pcode.emu.jit.gen.op; import org.objectweb.asm.MethodVisitor; import ghidra.pcode.emu.jit.analysis.JitControlFlowModel.JitBlock; -import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.analysis.JitType; +import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.op.JitCopyOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatAbsOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatAbsOpGen.java index 7334ba8f32..d34dec6cdd 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatAbsOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatAbsOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatAddOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatAddOpGen.java index 647f98d466..4c4332b202 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatAddOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatAddOpGen.java @@ -16,8 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.DADD; -import static org.objectweb.asm.Opcodes.FADD; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatCeilOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatCeilOpGen.java index cb844a89d4..1757504e38 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatCeilOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatCeilOpGen.java @@ -18,7 +18,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.MDESC_$DOUBLE_UNOP; import static ghidra.pcode.emu.jit.gen.GenConsts.NAME_MATH; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatDivOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatDivOpGen.java index 42e8daa996..fb210ba10c 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatDivOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatDivOpGen.java @@ -16,8 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.DDIV; -import static org.objectweb.asm.Opcodes.FDIV; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatEqualOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatEqualOpGen.java index 175dfc8621..fa332998c8 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatEqualOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatEqualOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.*; - import ghidra.pcode.emu.jit.op.JitFloatEqualOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatFloat2FloatOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatFloat2FloatOpGen.java index 2b14d09ae9..f1835eb3e0 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatFloat2FloatOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatFloat2FloatOpGen.java @@ -16,8 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.D2F; -import static org.objectweb.asm.Opcodes.F2D; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatFloorOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatFloorOpGen.java index fefcad8828..60636d7d05 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatFloorOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatFloorOpGen.java @@ -18,7 +18,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.MDESC_$DOUBLE_UNOP; import static ghidra.pcode.emu.jit.gen.GenConsts.NAME_MATH; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatInt2FloatOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatInt2FloatOpGen.java index 430b252c2a..dc952442ad 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatInt2FloatOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatInt2FloatOpGen.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatLessEqualOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatLessEqualOpGen.java index 98bc9f8500..3a4e344406 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatLessEqualOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatLessEqualOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.*; - import ghidra.pcode.emu.jit.op.JitFloatLessEqualOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatLessOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatLessOpGen.java index 1da203130d..4600dd0c64 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatLessOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatLessOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.*; - import ghidra.pcode.emu.jit.op.JitFloatLessOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatMultOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatMultOpGen.java index c17fb951ff..651773b2a0 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatMultOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatMultOpGen.java @@ -16,8 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.DMUL; -import static org.objectweb.asm.Opcodes.FMUL; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNaNOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNaNOpGen.java index 38339dba61..25822468b0 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNaNOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNaNOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNegOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNegOpGen.java index 0a4d7d91a4..3b48f90317 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNegOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNegOpGen.java @@ -16,8 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.DNEG; -import static org.objectweb.asm.Opcodes.FNEG; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNotEqualOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNotEqualOpGen.java index 873e5397db..bb807a2ff9 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNotEqualOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatNotEqualOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.*; - import ghidra.pcode.emu.jit.op.JitFloatNotEqualOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatRoundOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatRoundOpGen.java index b39ff90c24..f7708f58b3 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatRoundOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatRoundOpGen.java @@ -18,7 +18,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.MDESC_$DOUBLE_UNOP; import static ghidra.pcode.emu.jit.gen.GenConsts.NAME_MATH; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatSqrtOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatSqrtOpGen.java index 2ded873509..a6fd21fbd3 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatSqrtOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatSqrtOpGen.java @@ -18,7 +18,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.MDESC_$DOUBLE_UNOP; import static ghidra.pcode.emu.jit.gen.GenConsts.NAME_MATH; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatSubOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatSubOpGen.java index 22e963d0d3..75951643f8 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatSubOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatSubOpGen.java @@ -16,8 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.DSUB; -import static org.objectweb.asm.Opcodes.FSUB; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatTruncOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatTruncOpGen.java index 21f6a817ca..2348237af7 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatTruncOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/FloatTruncOpGen.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/Int2CompOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/Int2CompOpGen.java index 9a33514bf6..4a210ed96d 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/Int2CompOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/Int2CompOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.INEG; -import static org.objectweb.asm.Opcodes.LNEG; - import org.objectweb.asm.MethodVisitor; import ghidra.lifecycle.Unfinished; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntAddOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntAddOpGen.java index 3441cc33a1..bb0b775129 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntAddOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntAddOpGen.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.*; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntAndOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntAndOpGen.java index 8393d73bdd..a55f8ee240 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntAndOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntAndOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IAND; -import static org.objectweb.asm.Opcodes.LAND; - import ghidra.pcode.emu.jit.op.JitIntAndOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntCarryOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntCarryOpGen.java index 7656f2028f..395b3d54b9 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntCarryOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntCarryOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.*; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntDivOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntDivOpGen.java index dc8efa1cf5..e15b508d19 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntDivOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntDivOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntEqualOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntEqualOpGen.java index 0ed4287bf7..dc84f6a3ca 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntEqualOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntEqualOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IFEQ; -import static org.objectweb.asm.Opcodes.IF_ICMPEQ; - import ghidra.pcode.emu.jit.op.JitIntEqualOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntLessEqualOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntLessEqualOpGen.java index 9782de0937..2f41d1f935 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntLessEqualOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntLessEqualOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IFLE; - import ghidra.pcode.emu.jit.op.JitIntLessEqualOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntLessOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntLessOpGen.java index 517e51f87f..279d7b4fd1 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntLessOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntLessOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IFLT; - import ghidra.pcode.emu.jit.op.JitIntLessOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntMultOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntMultOpGen.java index 737f2c820a..cab8efca0a 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntMultOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntMultOpGen.java @@ -16,8 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.IMUL; -import static org.objectweb.asm.Opcodes.LMUL; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntNegateOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntNegateOpGen.java index 95ffac3a44..a903b58a99 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntNegateOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntNegateOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.*; - import org.objectweb.asm.MethodVisitor; import ghidra.lifecycle.Unfinished; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntNotEqualOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntNotEqualOpGen.java index 6c726e9225..c5d809ec83 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntNotEqualOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntNotEqualOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IFNE; -import static org.objectweb.asm.Opcodes.IF_ICMPNE; - import ghidra.pcode.emu.jit.op.JitIntNotEqualOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntOrOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntOrOpGen.java index b169e0430a..2a6010c6b9 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntOrOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntOrOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IOR; -import static org.objectweb.asm.Opcodes.LOR; - import ghidra.pcode.emu.jit.op.JitIntOrOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntRemOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntRemOpGen.java index d8d33b37c1..3bc4e50936 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntRemOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntRemOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSBorrowOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSBorrowOpGen.java index f7b2d59283..09bfc6eaaf 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSBorrowOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSBorrowOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSCarryOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSCarryOpGen.java index 0743102b7c..6228aeb689 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSCarryOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSCarryOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSDivOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSDivOpGen.java index b40753592c..76ddbf3fdc 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSDivOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSDivOpGen.java @@ -16,8 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.IDIV; -import static org.objectweb.asm.Opcodes.LDIV; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSExtOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSExtOpGen.java index 013eda3b16..129597f661 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSExtOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSExtOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.*; - import org.objectweb.asm.MethodVisitor; import ghidra.lifecycle.Unfinished; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSLessEqualOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSLessEqualOpGen.java index 7b2b6c6b7b..d2873ac9b0 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSLessEqualOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSLessEqualOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IFLE; -import static org.objectweb.asm.Opcodes.IF_ICMPLE; - import ghidra.pcode.emu.jit.op.JitIntSLessEqualOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSLessOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSLessOpGen.java index ce190afe79..49bdc9002d 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSLessOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSLessOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IFLT; -import static org.objectweb.asm.Opcodes.IF_ICMPLT; - import ghidra.pcode.emu.jit.op.JitIntSLessOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSRemOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSRemOpGen.java index 1bd2bef6e8..94397ee823 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSRemOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSRemOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IREM; -import static org.objectweb.asm.Opcodes.LREM; - import org.objectweb.asm.MethodVisitor; import ghidra.lifecycle.Unfinished; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSubOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSubOpGen.java index d3433344f8..d52c1174d1 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSubOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntSubOpGen.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.*; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntXorOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntXorOpGen.java index 342d1d95c6..ea3abecc77 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntXorOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntXorOpGen.java @@ -15,9 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.IXOR; -import static org.objectweb.asm.Opcodes.LXOR; - import ghidra.pcode.emu.jit.op.JitIntXorOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntZExtOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntZExtOpGen.java index 49c8c0cf7f..d66a9746a6 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntZExtOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/IntZExtOpGen.java @@ -18,8 +18,8 @@ package ghidra.pcode.emu.jit.gen.op; import org.objectweb.asm.MethodVisitor; import ghidra.pcode.emu.jit.analysis.JitControlFlowModel.JitBlock; -import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.analysis.JitType; +import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.op.JitIntZExtOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/LoadOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/LoadOpGen.java index 388a5494eb..c3d0fc295b 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/LoadOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/LoadOpGen.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/LzCountOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/LzCountOpGen.java index 7fcf009d09..ca1847599d 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/LzCountOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/LzCountOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/NopOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/NopOpGen.java index ff1412f474..7786836bf1 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/NopOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/NopOpGen.java @@ -19,6 +19,7 @@ import org.objectweb.asm.MethodVisitor; import ghidra.pcode.emu.jit.analysis.JitControlFlowModel.JitBlock; import ghidra.pcode.emu.jit.gen.JitCodeGenerator; +import ghidra.pcode.emu.jit.op.JitNopOp; import ghidra.pcode.emu.jit.op.JitOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/OpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/OpGen.java index 47ff63bdff..2288dfcc39 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/OpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/OpGen.java @@ -483,7 +483,7 @@ import ghidra.program.model.pcode.PcodeOp; * * @param the class of p-code op node in the use-def graph */ -public interface OpGen { +public interface OpGen extends Opcodes { /** * Lookup the generator for a given p-code op use-def node * diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/PhiOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/PhiOpGen.java index 9384db2bec..7c33110506 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/PhiOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/PhiOpGen.java @@ -18,8 +18,8 @@ package ghidra.pcode.emu.jit.gen.op; import org.objectweb.asm.MethodVisitor; import ghidra.pcode.emu.jit.analysis.JitControlFlowModel.JitBlock; -import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.analysis.JitVarScopeModel; +import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.op.JitPhiOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/PopCountOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/PopCountOpGen.java index 01bd758f66..5e5b273c6b 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/PopCountOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/PopCountOpGen.java @@ -17,7 +17,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.lifecycle.Unfinished.TODO; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/ShiftIntBinOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/ShiftIntBinOpGen.java index 9de81c8811..980e68681d 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/ShiftIntBinOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/ShiftIntBinOpGen.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/StoreOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/StoreOpGen.java index 3ed1402346..4e4efb9a53 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/StoreOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/StoreOpGen.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/SubPieceOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/SubPieceOpGen.java index e823da1184..dbbd64fbf8 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/SubPieceOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/SubPieceOpGen.java @@ -15,8 +15,6 @@ */ package ghidra.pcode.emu.jit.gen.op; -import static org.objectweb.asm.Opcodes.*; - import org.objectweb.asm.*; import ghidra.pcode.emu.jit.analysis.JitControlFlowModel.JitBlock; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/SynthSubPieceOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/SynthSubPieceOpGen.java index 702b12d517..298d4195a1 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/SynthSubPieceOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/SynthSubPieceOpGen.java @@ -18,8 +18,8 @@ package ghidra.pcode.emu.jit.gen.op; import org.objectweb.asm.MethodVisitor; import ghidra.pcode.emu.jit.analysis.JitControlFlowModel.JitBlock; -import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.analysis.JitVarScopeModel; +import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.op.JitSynthSubPieceOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/UnOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/UnOpGen.java index 50d6d39f71..5ebe23d1c0 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/UnOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/UnOpGen.java @@ -18,8 +18,8 @@ package ghidra.pcode.emu.jit.gen.op; import org.objectweb.asm.MethodVisitor; import ghidra.pcode.emu.jit.analysis.JitControlFlowModel.JitBlock; -import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.analysis.JitType; +import ghidra.pcode.emu.jit.gen.JitCodeGenerator; import ghidra.pcode.emu.jit.op.JitUnOp; /** diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/UnimplementedOpGen.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/UnimplementedOpGen.java index 28cd82cf8b..5ae789490d 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/UnimplementedOpGen.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/op/UnimplementedOpGen.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.op; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.MethodVisitor; diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/type/TypeConversions.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/type/TypeConversions.java index b8c1435bfd..bd17bcf1b7 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/type/TypeConversions.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/gen/type/TypeConversions.java @@ -16,7 +16,6 @@ package ghidra.pcode.emu.jit.gen.type; import static ghidra.pcode.emu.jit.gen.GenConsts.*; -import static org.objectweb.asm.Opcodes.*; import org.objectweb.asm.*; @@ -61,7 +60,7 @@ import ghidra.program.model.pcode.PcodeOp; * if the operand requires a floating-point type. * */ -public interface TypeConversions { +public interface TypeConversions extends Opcodes { /** * Emit an {@link Opcodes#IAND} to reduce the number of bits to those permitted in an int of the * given size. @@ -583,7 +582,6 @@ public interface TypeConversions { * float is used as a boolean, it must be converted to an int first. * * @param from the type of the value currently on the stack - * @param size the size in bytes of the value on the stack * @param mv the method visitor * @see #generateLdcFalse(JitType, MethodVisitor) * @see #generateLdcTrue(JitType, MethodVisitor) diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/DefaultPcodeExecutorState.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/DefaultPcodeExecutorState.java index 7c1a7cd4cd..b2563334b6 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/DefaultPcodeExecutorState.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/DefaultPcodeExecutorState.java @@ -4,9 +4,9 @@ * 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. @@ -27,12 +27,6 @@ import ghidra.program.model.mem.MemBuffer; /** * A p-code executor state formed from a piece whose address and value types are the same * - *

- * This class will also wire in the arithmetic's - * {@link PcodeArithmetic#modBeforeStore(int, int, Object, int, Object)} and - * {@link PcodeArithmetic#modAfterLoad(int, int, Object, int, Object)}, which is only possible when - * the address and value type are guaranteed to match. - * * @param the type of values and addresses in the state */ public class DefaultPcodeExecutorState implements PcodeExecutorState { diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/PcodeExecutor.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/PcodeExecutor.java index 4ca4de3e36..59fd138f44 100644 --- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/PcodeExecutor.java +++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/PcodeExecutor.java @@ -421,9 +421,9 @@ public class PcodeExecutor { * *

* This implements only part of the p-code control flow semantics. An emulator must also - * override {@link #branchToAddress(Address)}, so that it can update its internal program - * counter. The emulator could just read the program counter from the state after every - * completed frame, but receiving it "out of band" is faster. + * override {@link #branchToAddress(PcodeOp, Address)}, so that it can update its internal + * program counter. The emulator could just read the program counter from the state after + * every completed frame, but receiving it "out of band" is faster. * * @param op the op * @param offset the offset (the new value of the program counter)