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

Treat unknown opcodes as nops

Browse Source
This commit is contained in:
Ben Gruver 2012-06-28 23:13:45 -07:00
parent 9069177bff
commit 2f81aec886
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
dexlib/src/main/java/org/jf/dexlib/Code/InstructionIterator.java
View File

@ -53,35 +53,37 @@ public class InstructionIterator {
Instruction instruction = null; Instruction instruction = null;
if (opcode == null) { if (opcode == null) {
throw new RuntimeException("Unknown opcode: " + Hex.u1(insns[insnsPosition])); System.err.println(String.format("unknown opcode encountered - %x. Treating as nop.",
} (opcodeValue & 0xFFFF)));
instruction = new Instruction10x(Opcode.NOP, insns, insnsPosition);
if (opcode == Opcode.NOP) {
byte secondByte = insns[insnsPosition + 1];
switch (secondByte) {
case 0:
{
instruction = new Instruction10x(Opcode.NOP, insns, insnsPosition);
break;
}
case 1:
{
instruction = new PackedSwitchDataPseudoInstruction(insns, insnsPosition);
break;
}
case 2:
{
instruction = new SparseSwitchDataPseudoInstruction(insns, insnsPosition);
break;
}
case 3:
{
instruction = new ArrayDataPseudoInstruction(insns, insnsPosition);
break;
}
}
} else { } else {
instruction = opcode.format.Factory.makeInstruction(dexFile, opcode, insns, insnsPosition); if (opcode == Opcode.NOP) {
byte secondByte = insns[insnsPosition + 1];
switch (secondByte) {
case 0:
{
instruction = new Instruction10x(Opcode.NOP, insns, insnsPosition);
break;
}
case 1:
{
instruction = new PackedSwitchDataPseudoInstruction(insns, insnsPosition);
break;
}
case 2:
{
instruction = new SparseSwitchDataPseudoInstruction(insns, insnsPosition);
break;
}
case 3:
{
instruction = new ArrayDataPseudoInstruction(insns, insnsPosition);
break;
}
}
} else {
instruction = opcode.format.Factory.makeInstruction(dexFile, opcode, insns, insnsPosition);
}
} }
assert instruction != null; assert instruction != null;