From 4143a59d9d006a0c6c08276d47f10d5978c18779 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 23 Aug 2015 20:29:23 -0400 Subject: [PATCH] cleanup --- .../deob/attributes/code/instructions/GetField.java | 10 +--------- .../deob/attributes/code/instructions/GetStatic.java | 10 +--------- .../deob/deobfuscators/arithmetic/ModArith.java | 12 ------------ 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java b/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java index 67da2bdf62..84bbe1d55c 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java @@ -102,15 +102,7 @@ public class GetField extends Instruction implements GetFieldInstruction @Override public void renameField(net.runelite.deob.Field f, Field newField) { - Class clazz = field.getClassEntry(); - NameAndType nat = field.getNameAndType(); - - ClassFile cf = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName()); - if (cf == null) - return; - - net.runelite.deob.Field f2 = cf.findFieldDeep(nat); - assert f2 != null; + net.runelite.deob.Field f2 = getMyField(); if (f2 == f) field = newField; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java b/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java index d4bb05104a..bcf957ebca 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java @@ -99,15 +99,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction @Override public void renameField(net.runelite.deob.Field f, Field newField) { - Class clazz = field.getClassEntry(); - NameAndType nat = field.getNameAndType(); - - ClassFile cf = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName()); - if (cf == null) - return; - - net.runelite.deob.Field f2 = cf.findFieldDeep(nat); - assert f2 != null; + net.runelite.deob.Field f2 = getMyField(); if (f2 == f) { diff --git a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java index 244c1ff39c..9f06cf2a40 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java +++ b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java @@ -157,18 +157,6 @@ public class ModArith implements Deobfuscator return fields; } - -// private void replace(Pair pair) -// { -// // do replacements with pair -// -// for (Frame frame : execution.processedFrames) -// { -// for (InstructionContext ctx : frame.getInstructions()) -// { -// } -// } -// } @Override public void run(ClassGroup group)