openrs2
/
openrs2
3
1
Fork 3
Code Issues 69 Pull Requests Releases Activity

Convert CounterTransformer to Kotlin

Browse Source
pull/48/head
Graham 4 years ago
parent 00526587b0
commit 957c0820a3
2 changed files with 122 additions and 124 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 124
      deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.java
  2. 122
      deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.kt

124
deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.java
Unescape View File

@ -1,124 +0,0 @@
package dev.openrs2.deob.transform;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import dev.openrs2.asm.InsnMatcher;
import dev.openrs2.asm.MemberRef;
import dev.openrs2.asm.MethodNodeUtilsKt;
import dev.openrs2.asm.classpath.ClassPath;
import dev.openrs2.asm.classpath.Library;
import dev.openrs2.asm.transform.Transformer;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.FieldInsnNode;
import org.objectweb.asm.tree.MethodNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class CounterTransformer extends Transformer {
private static final Logger logger = LoggerFactory.getLogger(CounterTransformer.class);
private static final InsnMatcher RESET_PATTERN = InsnMatcher.compile("ICONST_0 PUTSTATIC");
private static final InsnMatcher INCREMENT_PATTERN = InsnMatcher.compile("GETSTATIC ICONST_1 IADD PUTSTATIC");
private final Set<MemberRef> counters = new HashSet<>();
@Override
public void preTransform(ClassPath classPath) {
counters.clear();
var references = new HashMap<MemberRef, Integer>();
var resets = new HashMap<MemberRef, Integer>();
var increments = new HashMap<MemberRef, Integer>();
for (var library : classPath.getLibraries()) {
for (var clazz : library) {
for (var method : clazz.methods) {
if (MethodNodeUtilsKt.hasCode(method)) {
findCounters(method, references, resets, increments);
}
}
}
}
deleteCounters(classPath, references, resets, increments);
}
private void findCounters(MethodNode method, Map<MemberRef, Integer> references, Map<MemberRef, Integer> resets, Map<MemberRef, Integer> increments) {
for (var it = method.instructions.iterator(); it.hasNext(); ) {
var insn = it.next();
if (insn.getType() != AbstractInsnNode.FIELD_INSN) {
continue;
}
var fieldInsn = (FieldInsnNode) insn;
references.merge(new MemberRef(fieldInsn), 1, Integer::sum);
}
RESET_PATTERN.match(method).forEach(match -> {
var putstatic = (FieldInsnNode) match.get(1);
resets.merge(new MemberRef(putstatic), 1, Integer::sum);
});
INCREMENT_PATTERN.match(method).forEach(match -> {
var getstatic = (FieldInsnNode) match.get(0);
var putstatic = (FieldInsnNode) match.get(3);
if (getstatic.owner.equals(putstatic.owner) && getstatic.name.equals(putstatic.name) && getstatic.desc.equals(putstatic.desc)) {
increments.merge(new MemberRef(putstatic), 1, Integer::sum);
}
});
}
private void deleteCounters(ClassPath classPath, Map<MemberRef, Integer> references, Map<MemberRef, Integer> resets, Map<MemberRef, Integer> increments) {
for (Map.Entry<MemberRef, Integer> entry : references.entrySet()) {
var counter = entry.getKey();
if (entry.getValue() != 3) { /* one for the reset, two for the increment */
continue;
}
if (resets.getOrDefault(counter, 0) != 1) {
continue;
}
if (increments.getOrDefault(counter, 0) != 1) {
continue;
}
ClassNode owner = classPath.getNode(counter.getOwner());
owner.fields.removeIf(f -> f.name.equals(counter.getName()) && f.desc.equals(counter.getDesc()));
counters.add(counter);
}
}
@Override
public boolean transformCode(ClassPath classPath, Library library, ClassNode clazz, MethodNode method) {
RESET_PATTERN.match(method).forEach(match -> {
var putstatic = (FieldInsnNode) match.get(1);
if (counters.contains(new MemberRef(putstatic))) {
match.forEach(method.instructions::remove);
}
});
INCREMENT_PATTERN.match(method).forEach(match -> {
var getstatic = (FieldInsnNode) match.get(0);
var putstatic = (FieldInsnNode) match.get(3);
if (getstatic.owner.equals(putstatic.owner) && getstatic.name.equals(putstatic.name) && getstatic.desc.equals(putstatic.desc) &&
counters.contains(new MemberRef(putstatic))) {
match.forEach(method.instructions::remove);
}
});
return false;
}
@Override
public void postTransform(ClassPath classPath) {
logger.info("Removed {} counters", counters.size());
}
}

122
deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.kt
Unescape View File

@ -0,0 +1,122 @@
package dev.openrs2.deob.transform
import com.github.michaelbull.logging.InlineLogger
import dev.openrs2.asm.InsnMatcher
import dev.openrs2.asm.MemberRef
import dev.openrs2.asm.classpath.ClassPath
import dev.openrs2.asm.classpath.Library
import dev.openrs2.asm.hasCode
import dev.openrs2.asm.transform.Transformer
import org.objectweb.asm.tree.ClassNode
import org.objectweb.asm.tree.FieldInsnNode
import org.objectweb.asm.tree.MethodNode
class CounterTransformer : Transformer() {
private val counters = mutableSetOf<MemberRef>()
override fun preTransform(classPath: ClassPath) {
counters.clear()
val references = mutableMapOf<MemberRef, Int>()
val resets = mutableMapOf<MemberRef, Int>()
val increments = mutableMapOf<MemberRef, Int>()
for (library in classPath.libraries) {
for (clazz in library) {
for (method in clazz.methods) {
if (method.hasCode()) {
findCounters(method, references, resets, increments)
}
}
}
}
deleteCounters(classPath, references, resets, increments)
}
private fun findCounters(
method: MethodNode,
references: MutableMap<MemberRef, Int>,
resets: MutableMap<MemberRef, Int>,
increments: MutableMap<MemberRef, Int>
) {
for (insn in method.instructions) {
if (insn is FieldInsnNode) {
references.merge(MemberRef(insn), 1, Integer::sum)
}
}
RESET_PATTERN.match(method).forEach {
val putstatic = MemberRef(it[1] as FieldInsnNode)
resets.merge(putstatic, 1, Integer::sum)
}
INCREMENT_PATTERN.match(method).forEach {
val getstatic = MemberRef(it[0] as FieldInsnNode)
val putstatic = MemberRef(it[3] as FieldInsnNode)
if (getstatic == putstatic) {
increments.merge(putstatic, 1, Integer::sum)
}
}
}
private fun deleteCounters(
classPath: ClassPath,
references: Map<MemberRef, Int>,
resets: Map<MemberRef, Int>,
increments: Map<MemberRef, Int>
) {
for ((counter, value) in references) {
// one for the reset, two for the increment
if (value != 3) {
continue
}
if (resets[counter] != 1) {
continue
}
if (increments[counter] != 1) {
continue
}
val owner = classPath.getNode(counter.owner)!!
owner.fields.removeIf { it.name == counter.name && it.desc == counter.desc }
counters.add(counter)
}
}
override fun transformCode(
classPath: ClassPath,
library: Library,
clazz: ClassNode,
method: MethodNode
): Boolean {
RESET_PATTERN.match(method).forEach {
val putstatic = it[1] as FieldInsnNode
if (counters.contains(MemberRef(putstatic))) {
it.forEach(method.instructions::remove)
}
}
INCREMENT_PATTERN.match(method).forEach {
val getstatic = MemberRef(it[0] as FieldInsnNode)
val putstatic = MemberRef(it[3] as FieldInsnNode)
if (getstatic == putstatic && counters.contains(putstatic)) {
it.forEach(method.instructions::remove)
}
}
return false
}
override fun postTransform(classPath: ClassPath) {
logger.info { "Removed ${counters.size} counters" }
}
companion object {
private val logger = InlineLogger()
private val RESET_PATTERN = InsnMatcher.compile("ICONST_0 PUTSTATIC")
private val INCREMENT_PATTERN = InsnMatcher.compile("GETSTATIC ICONST_1 IADD PUTSTATIC")
}
}
Write Preview
Loading…
Cancel
Save