ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-24 02:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix out registers for invoke-polymorphic

Browse Source 
The calculation of the number of output registers for
invoke-polymorphic and invoke-polymorphic-range should be based on the
number of registers provided.
This commit is contained in:
Orion Hodson 2017-08-31 09:29:49 +01:00 committed by Ben Gruver
parent 93a4373023
commit b84345935a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dexlib2/src/main/java/org/jf/dexlib2/util/InstructionUtil.java
View File

@ -38,5 +38,9 @@ public final class InstructionUtil {
return opcode == Opcode.INVOKE_STATIC || opcode == Opcode.INVOKE_STATIC_RANGE; return opcode == Opcode.INVOKE_STATIC || opcode == Opcode.INVOKE_STATIC_RANGE;
} }
public static boolean isInvokePolymorphic(Opcode opcode) {
return opcode == Opcode.INVOKE_POLYMORPHIC || opcode == Opcode.INVOKE_POLYMORPHIC_RANGE;
}
private InstructionUtil() {} private InstructionUtil() {}
} }

9
dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
View File

@ -52,6 +52,7 @@ import org.jf.dexlib2.iface.debug.LineNumber;
import org.jf.dexlib2.iface.instruction.Instruction; import org.jf.dexlib2.iface.instruction.Instruction;
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction; import org.jf.dexlib2.iface.instruction.OneRegisterInstruction;
import org.jf.dexlib2.iface.instruction.ReferenceInstruction; import org.jf.dexlib2.iface.instruction.ReferenceInstruction;
import org.jf.dexlib2.iface.instruction.VariableRegisterInstruction;
import org.jf.dexlib2.iface.instruction.formats.*; import org.jf.dexlib2.iface.instruction.formats.*;
import org.jf.dexlib2.iface.reference.*; import org.jf.dexlib2.iface.reference.*;
import org.jf.dexlib2.util.InstructionUtil; import org.jf.dexlib2.util.InstructionUtil;
@ -955,7 +956,13 @@ public abstract class DexWriter<
if (instruction.getOpcode().referenceType == ReferenceType.METHOD) { if (instruction.getOpcode().referenceType == ReferenceType.METHOD) {
ReferenceInstruction refInsn = (ReferenceInstruction)instruction; ReferenceInstruction refInsn = (ReferenceInstruction)instruction;
MethodReference methodRef = (MethodReference)refInsn.getReference(); MethodReference methodRef = (MethodReference)refInsn.getReference();
int paramCount = MethodUtil.getParameterRegisterCount(methodRef, InstructionUtil.isInvokeStatic(instruction.getOpcode())); Opcode opcode = instruction.getOpcode();
int paramCount;
if (InstructionUtil.isInvokePolymorphic(opcode)) {
paramCount = ((VariableRegisterInstruction)instruction).getRegisterCount();
} else {
paramCount = MethodUtil.getParameterRegisterCount(methodRef, InstructionUtil.isInvokeStatic(opcode));
}
if (paramCount > outParamCount) { if (paramCount > outParamCount) {
outParamCount = paramCount; outParamCount = paramCount;
} }