some more things that were moved to fork of SSVM and some refactoring

narumii · Oct 11, 2024 · 7a1ae63 · 7a1ae63
1 parent 51e5128
commit 7a1ae63
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 123 deletions.
diff --git a/deobfuscator-api/src/main/java/org/objectweb/asm/tree/AbstractInsnNode.java b/deobfuscator-api/src/main/java/org/objectweb/asm/tree/AbstractInsnNode.java
@@ -37,7 +37,7 @@
 
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.NamedOpcodes;
+import uwu.narumi.deobfuscator.api.asm.NamedOpcodes;
 import org.objectweb.asm.Type;
 
 /**

diff --git a/.../java/org/objectweb/asm/NamedOpcodes.java → ...mi/deobfuscator/api/asm/NamedOpcodes.java b/.../java/org/objectweb/asm/NamedOpcodes.java → ...mi/deobfuscator/api/asm/NamedOpcodes.java
@@ -1,11 +1,13 @@
-package org.objectweb.asm;
+package uwu.narumi.deobfuscator.api.asm;
+
+import org.objectweb.asm.Opcodes;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
-/*
-Debug purposes
+/**
+ * Maps opcodes to their names. For debug purposes.
  */
 public final class NamedOpcodes {
 

diff --git a/deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/asm/matcher/impl/StackMatch.java b/deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/asm/matcher/impl/StackMatch.java
@@ -1,6 +1,5 @@
 package uwu.narumi.deobfuscator.api.asm.matcher.impl;
 
-import org.objectweb.asm.NamedOpcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.analysis.Frame;
 import org.objectweb.asm.tree.analysis.OriginalSourceValue;

diff --git a/deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/helper/MethodHelper.java b/deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/helper/MethodHelper.java
@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
-import org.objectweb.asm.NamedOpcodes;
+import uwu.narumi.deobfuscator.api.asm.NamedOpcodes;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;

diff --git a/deobfuscator-impl/src/main/java/dev/xdark/ssvm/util/IOUtil.java b/deobfuscator-impl/src/main/java/dev/xdark/ssvm/util/IOUtil.java
diff --git a/deobfuscator-impl/src/main/java/uwu/narumi/deobfuscator/helper/ReflectionHelper.java b/deobfuscator-impl/src/main/java/uwu/narumi/deobfuscator/helper/ReflectionHelper.java