Rename unique fields

This commit is contained in:
Adam
2015-07-10 11:29:46 -04:00
parent 5781f08152
commit df11cdaded
9 changed files with 117 additions and 7 deletions

View File

@@ -2,6 +2,7 @@ package info.sigterm.deob.attributes.code;
import info.sigterm.deob.ClassFile;
import info.sigterm.deob.ConstantPool;
import info.sigterm.deob.Field;
import info.sigterm.deob.execution.Frame;
import java.io.DataOutputStream;
@@ -211,4 +212,8 @@ public abstract class Instruction
public void renameClass(ClassFile cf, String name)
{
}
public void renameField(Field f, String name)
{
}
}

View File

@@ -1,9 +1,9 @@
package info.sigterm.deob.attributes.code;
import info.sigterm.deob.ClassFile;
import info.sigterm.deob.Field;
import info.sigterm.deob.attributes.Code;
import info.sigterm.deob.attributes.code.instruction.types.JumpingInstruction;
import info.sigterm.deob.attributes.code.instructions.LDC;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
@@ -203,4 +203,10 @@ public class Instructions
for (Instruction i : instructions)
i.renameClass(cf, name);
}
public void renameField(Field f, String name)
{
for (Instruction i : instructions)
i.renameField(f, name);
}
}

View File

@@ -12,6 +12,7 @@ import info.sigterm.deob.execution.StackContext;
import info.sigterm.deob.execution.Type;
import info.sigterm.deob.pool.Class;
import info.sigterm.deob.pool.Field;
import info.sigterm.deob.pool.NameAndType;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -66,4 +67,17 @@ public class GetField extends Instruction implements GetFieldInstruction
if (field.getClassEntry().getName().equals(cf.getName()))
field = new Field(new Class(name), field.getNameAndType());
}
@Override
public void renameField(info.sigterm.deob.Field f, String name)
{
if (field.getNameAndType().getName().equals(f.getName()) && field.getClassEntry().getName().equals(f.getFields().getClassFile().getName()))
{
Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType();
NameAndType newNat = new NameAndType(name, nat.getDescriptorType());
field = new Field(clazz, newNat);
}
}
}

View File

@@ -80,4 +80,17 @@ public class GetStatic extends Instruction implements GetFieldInstruction
if (field.getClassEntry().getName().equals(cf.getName()))
field = new Field(new Class(name), field.getNameAndType());
}
@Override
public void renameField(info.sigterm.deob.Field f, String name)
{
if (field.getNameAndType().getName().equals(f.getName()) && field.getClassEntry().getName().equals(f.getFields().getClassFile().getName()))
{
Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType();
NameAndType newNat = new NameAndType(name, nat.getDescriptorType());
field = new Field(clazz, newNat);
}
}
}

View File

@@ -11,6 +11,7 @@ import info.sigterm.deob.execution.Stack;
import info.sigterm.deob.execution.StackContext;
import info.sigterm.deob.pool.Class;
import info.sigterm.deob.pool.Field;
import info.sigterm.deob.pool.NameAndType;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -61,4 +62,17 @@ public class PutField extends Instruction implements SetFieldInstruction
if (field.getClassEntry().getName().equals(cf.getName()))
field = new Field(new Class(name), field.getNameAndType());
}
@Override
public void renameField(info.sigterm.deob.Field f, String name)
{
if (field.getNameAndType().getName().equals(f.getName()) && field.getClassEntry().getName().equals(f.getFields().getClassFile().getName()))
{
Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType();
NameAndType newNat = new NameAndType(name, nat.getDescriptorType());
field = new Field(clazz, newNat);
}
}
}

View File

@@ -11,6 +11,7 @@ import info.sigterm.deob.execution.Stack;
import info.sigterm.deob.execution.StackContext;
import info.sigterm.deob.pool.Class;
import info.sigterm.deob.pool.Field;
import info.sigterm.deob.pool.NameAndType;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -60,4 +61,17 @@ public class PutStatic extends Instruction implements SetFieldInstruction
if (field.getClassEntry().getName().equals(cf.getName()))
field = new Field(new Class(name), field.getNameAndType());
}
@Override
public void renameField(info.sigterm.deob.Field f, String name)
{
if (field.getNameAndType().getName().equals(f.getName()) && field.getClassEntry().getName().equals(f.getFields().getClassFile().getName()))
{
Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType();
NameAndType newNat = new NameAndType(name, nat.getDescriptorType());
field = new Field(clazz, newNat);
}
}
}