这是indexloc提供的服务，不要输入任何密码
Skip to content

Implement immutable instructions 45cc and 4rcc #705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 2, 2019
Merged

Implement immutable instructions 45cc and 4rcc #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ public static ImmutableInstruction of(Instruction instruction) {
return ImmutableInstruction3rmi.of((Instruction3rmi)instruction);
case Format3rms:
return ImmutableInstruction3rms.of((Instruction3rms)instruction);
case Format45cc:
return ImmutableInstruction45cc.of((Instruction45cc)instruction);
case Format4rcc:
return ImmutableInstruction4rcc.of((Instruction4rcc)instruction);
case Format51l:
return ImmutableInstruction51l.of((Instruction51l)instruction);
case PackedSwitchPayload:
Expand Down
76 changes: 76 additions & 0 deletions dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction45cc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
package org.jf.dexlib2.immutable.instruction;

import org.jf.dexlib2.Format;
import org.jf.dexlib2.Opcode;
import org.jf.dexlib2.iface.instruction.formats.Instruction45cc;
import org.jf.dexlib2.iface.reference.Reference;
import org.jf.dexlib2.immutable.reference.ImmutableReference;
import org.jf.dexlib2.immutable.reference.ImmutableReferenceFactory;
import org.jf.dexlib2.util.Preconditions;

import javax.annotation.Nonnull;

public class ImmutableInstruction45cc extends ImmutableInstruction implements Instruction45cc {
public static final Format FORMAT = Format.Format45cc;

protected final int registerCount;
protected final int registerC;
protected final int registerD;
protected final int registerE;
protected final int registerF;
protected final int registerG;
@Nonnull protected final ImmutableReference reference;
@Nonnull protected final ImmutableReference reference2;

public ImmutableInstruction45cc(@Nonnull Opcode opcode,
int registerCount,
int registerC,
int registerD,
int registerE,
int registerF,
int registerG,
@Nonnull Reference reference,
@Nonnull Reference reference2) {
super(opcode);
this.registerCount = Preconditions.check35cAnd45ccRegisterCount(registerCount);
this.registerC = (registerCount>0) ? Preconditions.checkNibbleRegister(registerC) : 0;
this.registerD = (registerCount>1) ? Preconditions.checkNibbleRegister(registerD) : 0;
this.registerE = (registerCount>2) ? Preconditions.checkNibbleRegister(registerE) : 0;
this.registerF = (registerCount>3) ? Preconditions.checkNibbleRegister(registerF) : 0;
this.registerG = (registerCount>4) ? Preconditions.checkNibbleRegister(registerG) : 0;
this.reference = ImmutableReferenceFactory.of(reference);
this.reference2 = ImmutableReferenceFactory.of(reference2);
}

public static ImmutableInstruction45cc of(Instruction45cc instruction) {
if (instruction instanceof ImmutableInstruction45cc) {
return (ImmutableInstruction45cc) instruction;
} else {
return new ImmutableInstruction45cc(
instruction.getOpcode(),
instruction.getRegisterCount(),
instruction.getRegisterC(),
instruction.getRegisterD(),
instruction.getRegisterE(),
instruction.getRegisterF(),
instruction.getRegisterG(),
instruction.getReference(),
instruction.getReference2());
}
}

@Override public int getRegisterCount() { return 0; }
@Override public int getRegisterC() { return 0; }
@Override public int getRegisterD() { return 0; }
@Override public int getRegisterE() { return 0; }
@Override public int getRegisterF() { return 0; }
@Override public int getRegisterG() { return 0; }
Copy link
Contributor Author

@aki-ks aki-ks Aug 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JesusFreke Sorry, I've accidentally missed to implement the auto-generated getters.


@Override public ImmutableReference getReference() { return reference; }
@Override public int getReferenceType() { return opcode.referenceType; }

@Override public ImmutableReference getReference2() { return reference2; }
@Override public int getReferenceType2() { return opcode.referenceType2; }

@Override public Format getFormat() { return FORMAT; }
}
57 changes: 57 additions & 0 deletions dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction4rcc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package org.jf.dexlib2.immutable.instruction;

import org.jf.dexlib2.Format;
import org.jf.dexlib2.Opcode;
import org.jf.dexlib2.iface.instruction.formats.Instruction4rcc;
import org.jf.dexlib2.iface.reference.Reference;
import org.jf.dexlib2.immutable.reference.ImmutableReference;
import org.jf.dexlib2.immutable.reference.ImmutableReferenceFactory;
import org.jf.dexlib2.util.Preconditions;

import javax.annotation.Nonnull;

public class ImmutableInstruction4rcc extends ImmutableInstruction implements Instruction4rcc {
private static final Format FORMAT = Format.Format4rcc;

protected final int startRegister;
protected final int registerCount;

@Nonnull protected final ImmutableReference reference;
@Nonnull protected final ImmutableReference reference2;

public ImmutableInstruction4rcc(
@Nonnull Opcode opcode,
int startRegister,
int registerCount,
@Nonnull Reference reference,
@Nonnull Reference reference2) {
super(opcode);
this.startRegister = Preconditions.checkShortRegister(startRegister);
this.registerCount = Preconditions.checkRegisterRangeCount(registerCount);
this.reference = ImmutableReferenceFactory.of(reference);
this.reference2 = ImmutableReferenceFactory.of(reference2);
}

public static ImmutableInstruction4rcc of(Instruction4rcc instruction) {
if (instruction instanceof ImmutableInstruction4rcc) {
return (ImmutableInstruction4rcc) instruction;
}
return new ImmutableInstruction4rcc(
instruction.getOpcode(),
instruction.getStartRegister(),
instruction.getRegisterCount(),
instruction.getReference(),
instruction.getReference2());
}

@Override public int getStartRegister() { return startRegister; }
@Override public int getRegisterCount() { return registerCount; }

@Override public Reference getReference() { return reference; }
@Override public int getReferenceType() { return opcode.referenceType; }

@Override public Reference getReference2() { return reference2; }
@Override public int getReferenceType2() { return opcode.referenceType2; }

@Override public Format getFormat() { return FORMAT; }
}