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

For unknown opcodes, mention the original opcode value in a comment

Browse Source
This commit is contained in:
Ben Gruver 2012-07-03 22:36:29 -07:00
parent 2f81aec886
commit a9ce1cf3ec
3 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java
View File

@ -32,6 +32,7 @@ import org.jf.baksmali.Adaptors.MethodItem;
import org.jf.baksmali.Adaptors.ReferenceFormatter;
import org.jf.baksmali.Adaptors.RegisterFormatter;
import org.jf.dexlib.Code.Format.Instruction20bc;
import org.jf.dexlib.Code.Format.UnknownInstruction;
import org.jf.util.IndentingWriter;
import org.jf.baksmali.Renderers.LongRenderer;
import org.jf.dexlib.Code.*;
@ -64,6 +65,11 @@ public class InstructionMethodItem<T extends Instruction> extends MethodItem {
writeTargetLabel(writer);
return true;
case Format10x:
if (instruction instanceof UnknownInstruction) {
writer.write("#unknown opcode: 0x");
writer.printUnsignedLongAsHex(((UnknownInstruction) instruction).getOriginalOpcode() & 0xFFFF);
writer.write('\n');
}
writeOpcode(writer);
return true;
case Format11n:

47
dexlib/src/main/java/org/jf/dexlib/Code/Format/UnknownInstruction.java Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright 2012, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.jf.dexlib.Code.Format;
import org.jf.dexlib.Code.Opcode;
public class UnknownInstruction extends Instruction10x {
private short originalOpcode;
public UnknownInstruction(short originalOpcode) {
super(Opcode.NOP);
this.originalOpcode = originalOpcode;
}
public short getOriginalOpcode() {
return originalOpcode;
}
}

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

@ -28,10 +28,7 @@
package org.jf.dexlib.Code;
import org.jf.dexlib.Code.Format.ArrayDataPseudoInstruction;
import org.jf.dexlib.Code.Format.Instruction10x;
import org.jf.dexlib.Code.Format.PackedSwitchDataPseudoInstruction;
import org.jf.dexlib.Code.Format.SparseSwitchDataPseudoInstruction;
import org.jf.dexlib.Code.Format.*;
import org.jf.dexlib.DexFile;
import org.jf.dexlib.Util.ExceptionWithContext;
import org.jf.dexlib.Util.Hex;
@ -55,7 +52,7 @@ public class InstructionIterator {
if (opcode == null) {
System.err.println(String.format("unknown opcode encountered - %x. Treating as nop.",
(opcodeValue & 0xFFFF)));
instruction = new Instruction10x(Opcode.NOP, insns, insnsPosition);
instruction = new UnknownInstruction(opcodeValue);
} else {
if (opcode == Opcode.NOP) {
byte secondByte = insns[insnsPosition + 1];