diff options
Diffstat (limited to 'src/arch/dalvik/instruction.c')
| -rw-r--r-- | src/arch/dalvik/instruction.c | 187 |
1 files changed, 94 insertions, 93 deletions
diff --git a/src/arch/dalvik/instruction.c b/src/arch/dalvik/instruction.c index e3ece11..cc1cab2 100644 --- a/src/arch/dalvik/instruction.c +++ b/src/arch/dalvik/instruction.c @@ -28,7 +28,6 @@ #include "instruction-int.h" -#include "decomp/translate.h" #include "operands/register.h" #include "../instruction-int.h" #include "../register-int.h" @@ -65,7 +64,8 @@ typedef struct _dalvik_instruction const char *keyword; /* Mot clef de la commande */ - decomp_instr_fc decomp; /* Procédure de décompilation */ + void *ptr; + //decomp_instr_fc decomp; /* Procédure de décompilation */ } dalvik_instruction; @@ -73,40 +73,40 @@ typedef struct _dalvik_instruction static dalvik_instruction _instructions[DOP_COUNT] = { [DOP_NOP] = { 0x00, "nop", NULL }, - [DOP_MOVE] = { 0x01, "move", dalvik_decomp_instr_move }, + [DOP_MOVE] = { 0x01, "move", NULL }, [DOP_MOVE_FROM_16] = { 0x02, "move/from16" }, [DOP_MOVE_16] = { 0x03, "move/16" }, [DOP_MOVE_WIDE] = { 0x04, "move-wide" }, [DOP_MOVE_WIDE_FROM_16] = { 0x05, "move-wide/from16" }, [DOP_MOVE_WIDE_16] = { 0x06, "move-wide/16" }, - [DOP_MOVE_OBJECT] = { 0x07, "move-object", dalvik_decomp_instr_move_object }, + [DOP_MOVE_OBJECT] = { 0x07, "move-object", NULL }, [DOP_MOVE_OBJECT_FROM_16] = { 0x08, "move-object/from16" }, [DOP_MOVE_OBJECT_16] = { 0x09, "move-object/16" }, - [DOP_MOVE_RESULT] = { 0x0a, "move-result", dalvik_decomp_instr_move_result }, - [DOP_MOVE_RESULT_WIDE] = { 0x0b, "move-result-wide", dalvik_decomp_instr_move_result }, - [DOP_MOVE_RESULT_OBJECT] = { 0x0c, "move-result-object", dalvik_decomp_instr_move_result }, + [DOP_MOVE_RESULT] = { 0x0a, "move-result", NULL }, + [DOP_MOVE_RESULT_WIDE] = { 0x0b, "move-result-wide", NULL }, + [DOP_MOVE_RESULT_OBJECT] = { 0x0c, "move-result-object", NULL }, [DOP_MOVE_EXCEPTION] = { 0x0d, "move-exception" }, - [DOP_RETURN_VOID] = { 0x0e, "return-void", dalvik_decomp_instr_return_void }, - [DOP_RETURN] = { 0x0f, "return", dalvik_decomp_instr_return }, - [DOP_RETURN_WIDE] = { 0x10, "return-wide", dalvik_decomp_instr_return }, - [DOP_RETURN_OBJECT] = { 0x11, "return-object", dalvik_decomp_instr_return }, - [DOP_CONST_4] = { 0x12, "const/4", dalvik_decomp_instr_const }, - [DOP_CONST_16] = { 0x13, "const/16", dalvik_decomp_instr_const }, + [DOP_RETURN_VOID] = { 0x0e, "return-void", NULL }, + [DOP_RETURN] = { 0x0f, "return", NULL }, + [DOP_RETURN_WIDE] = { 0x10, "return-wide", NULL }, + [DOP_RETURN_OBJECT] = { 0x11, "return-object", NULL }, + [DOP_CONST_4] = { 0x12, "const/4", NULL }, + [DOP_CONST_16] = { 0x13, "const/16", NULL }, [DOP_CONST] = { 0x14, "const" }, [DOP_CONST_HIGH16] = { 0x15, "const/high16" }, [DOP_CONST_WIDE_16] = { 0x16, "const-wide/16" }, [DOP_CONST_WIDE_32] = { 0x17, "const-wide/32" }, [DOP_CONST_WIDE] = { 0x18, "const-wide" }, [DOP_CONST_WIDE_HIGH16] = { 0x19, "const-wide/high16" }, - [DOP_CONST_STRING] = { 0x1a, "const-string", dalvik_decomp_instr_const_str }, + [DOP_CONST_STRING] = { 0x1a, "const-string", NULL }, [DOP_CONST_STRING_JUMBO] = { 0x1b, "const-string/jumbo" }, [DOP_CONST_CLASS] = { 0x1c, "const-class" }, [DOP_MONITOR_ENTER] = { 0x1d, "monitor-enter" }, [DOP_MONITOR_EXIT] = { 0x1e, "monitor-exit" }, [DOP_CHECK_CAST] = { 0x1f, "check-cast" }, [DOP_INSTANCE_OF] = { 0x20, "instance-of" }, - [DOP_ARRAY_LENGTH] = { 0x21, "array-length", dalvik_decomp_instr_array_length }, - [DOP_NEW_INSTANCE] = { 0x22, "new-instance", dalvik_decomp_instr_new_instance }, + [DOP_ARRAY_LENGTH] = { 0x21, "array-length", NULL }, + [DOP_NEW_INSTANCE] = { 0x22, "new-instance", NULL }, [DOP_NEW_ARRAY] = { 0x23, "new-array" }, [DOP_FILLED_NEW_ARRAY] = { 0x24, "fill-new-array" }, [DOP_FILLED_NEW_ARRAY_RANGE]= { 0x25, "fill-new-array/range" }, @@ -115,25 +115,25 @@ static dalvik_instruction _instructions[DOP_COUNT] = { [DOP_GOTO] = { 0x28, "goto" }, [DOP_GOTO_16] = { 0x29, "goto/16" }, [DOP_GOTO_32] = { 0x2a, "goto/32" }, - [DOP_PACKED_SWITCH] = { 0x2b, "packed-switch", dalvik_decomp_instr_switch }, - [DOP_SPARSE_SWITCH] = { 0x2c, "sparse-switch", dalvik_decomp_instr_switch }, + [DOP_PACKED_SWITCH] = { 0x2b, "packed-switch", NULL }, + [DOP_SPARSE_SWITCH] = { 0x2c, "sparse-switch", NULL }, [DOP_CMPL_FLOAT] = { 0x2d, "cmp-long" }, [DOP_CMPG_FLOAT] = { 0x2e, "cmpg-float" }, [DOP_CMPL_DOUBLE] = { 0x2f, "cmpl-double" }, [DOP_CMPG_DOUBLE] = { 0x30, "cmpg-double" }, [DOP_CMP_LONG] = { 0x31, "cmp-long" }, - [DOP_IF_EQ] = { 0x32, "if-eq", dalvik_decomp_instr_if }, - [DOP_IF_NE] = { 0x33, "if-ne", dalvik_decomp_instr_if }, - [DOP_IF_LT] = { 0x34, "if-lt", dalvik_decomp_instr_if }, - [DOP_IF_GE] = { 0x35, "if-ge", dalvik_decomp_instr_if }, - [DOP_IF_GT] = { 0x36, "if-gt", dalvik_decomp_instr_if }, - [DOP_IF_LE] = { 0x37, "if-le", dalvik_decomp_instr_if }, - [DOP_IF_EQZ] = { 0x38, "if-eqz", dalvik_decomp_instr_if_zero }, - [DOP_IF_NEZ] = { 0x39, "if-nez", dalvik_decomp_instr_if_zero }, - [DOP_IF_LTZ] = { 0x3a, "if-ltz", dalvik_decomp_instr_if_zero }, - [DOP_IF_GEZ] = { 0x3b, "if-gez", dalvik_decomp_instr_if_zero }, - [DOP_IF_GTZ] = { 0x3c, "if-gtz", dalvik_decomp_instr_if_zero }, - [DOP_IF_LEZ] = { 0x3d, "if-lez", dalvik_decomp_instr_if_zero }, + [DOP_IF_EQ] = { 0x32, "if-eq", NULL }, + [DOP_IF_NE] = { 0x33, "if-ne", NULL }, + [DOP_IF_LT] = { 0x34, "if-lt", NULL }, + [DOP_IF_GE] = { 0x35, "if-ge", NULL }, + [DOP_IF_GT] = { 0x36, "if-gt", NULL }, + [DOP_IF_LE] = { 0x37, "if-le", NULL }, + [DOP_IF_EQZ] = { 0x38, "if-eqz", NULL }, + [DOP_IF_NEZ] = { 0x39, "if-nez", NULL }, + [DOP_IF_LTZ] = { 0x3a, "if-ltz", NULL }, + [DOP_IF_GEZ] = { 0x3b, "if-gez", NULL }, + [DOP_IF_GTZ] = { 0x3c, "if-gtz", NULL }, + [DOP_IF_LEZ] = { 0x3d, "if-lez", NULL }, [DOP_UNUSED_3E] = { 0x3e, NULL /* unused */ }, [DOP_UNUSED_3F] = { 0x3f, NULL /* unused */ }, [DOP_UNUSED_40] = { 0x40, NULL /* unused */ }, @@ -144,24 +144,24 @@ static dalvik_instruction _instructions[DOP_COUNT] = { [DOP_AGET_WIDE] = { 0x45, "aget-wide" }, [DOP_AGET_OBJECT] = { 0x46, "aget-object" }, [DOP_AGET_BOOLEAN] = { 0x47, "aget-boolean" }, - [DOP_AGET_BYTE] = { 0x48, "aget-byte", dalvik_decomp_instr_aget }, + [DOP_AGET_BYTE] = { 0x48, "aget-byte", NULL }, [DOP_AGET_CHAR] = { 0x49, "aget-char" }, [DOP_AGET_SHORT] = { 0x4a, "aget-short" }, [DOP_APUT] = { 0x4b, "aput" }, [DOP_APUT_WIDE] = { 0x4c, "aput-wide" }, [DOP_APUT_OBJECT] = { 0x4d, "aput-object" }, [DOP_APUT_BOOLEAN] = { 0x4e, "aput-boolean" }, - [DOP_APUT_BYTE] = { 0x4f, "aput-byte", dalvik_decomp_instr_aput }, + [DOP_APUT_BYTE] = { 0x4f, "aput-byte", NULL }, [DOP_APUT_CHAR] = { 0x50, "aput-char" }, [DOP_APUT_SHORT] = { 0x51, "aput-short" }, - [DOP_IGET] = { 0x52, "iget", dalvik_decomp_instr_iget }, + [DOP_IGET] = { 0x52, "iget", NULL }, [DOP_IGET_WIDE] = { 0x53, "iget-wide" }, [DOP_IGET_OBJECT] = { 0x54, "iget-object" }, [DOP_IGET_BOOLEAN] = { 0x55, "iget-boolean" }, [DOP_IGET_BYTE] = { 0x56, "iget-byte" }, [DOP_IGET_CHAR] = { 0x57, "iget-char" }, [DOP_IGET_SHORT] = { 0x58, "iget-short" }, - [DOP_IPUT] = { 0x59, "iput", dalvik_decomp_instr_iput }, + [DOP_IPUT] = { 0x59, "iput", NULL }, [DOP_IPUT_WIDE] = { 0x5a, "iput-wide" }, [DOP_IPUT_OBJECT] = { 0x5b, "iput-object" }, [DOP_IPUT_BOOLEAN] = { 0x5c, "iput-boolean" }, @@ -182,10 +182,10 @@ static dalvik_instruction _instructions[DOP_COUNT] = { [DOP_SPUT_BYTE] = { 0x6b, "sput-byte" }, [DOP_SPUT_CHAR] = { 0x6c, "sput-char" }, [DOP_SPUT_SHORT] = { 0x6d, "sput-short" }, - [DOP_INVOKE_VIRTUAL] = { 0x6e, "invoke-virtual", dalvik_decomp_instr_invoke_virtual }, + [DOP_INVOKE_VIRTUAL] = { 0x6e, "invoke-virtual", NULL }, [DOP_INVOKE_SUPER] = { 0x6f, "invoke-static" }, - [DOP_INVOKE_DIRECT] = { 0x70, "invoke-direct", dalvik_decomp_instr_invoke_direct }, - [DOP_INVOKE_STATIC] = { 0x71, "invoke-static", dalvik_decomp_instr_invoke_static }, + [DOP_INVOKE_DIRECT] = { 0x70, "invoke-direct", NULL }, + [DOP_INVOKE_STATIC] = { 0x71, "invoke-static", NULL }, [DOP_INVOKE_INTERFACE] = { 0x72, "invoke-interface" }, [DOP_UNUSED_73] = { 0x73, NULL /* unused */ }, [DOP_INVOKE_VIRTUAL_RANGE] = { 0x74, "invoke-virtual/range" }, @@ -216,14 +216,14 @@ static dalvik_instruction _instructions[DOP_COUNT] = { [DOP_TO_INT_BYTE] = { 0x8d, "int-to-byte" }, [DOP_TO_INT_CHAR] = { 0x8e, "int-to-char" }, [DOP_TO_INT_SHORT] = { 0x8f, "int-to-short" }, - [DOP_ADD_INT] = { 0x90, "add-int", dalvik_decomp_instr_arithm }, - [DOP_SUB_INT] = { 0x91, "sub-int", dalvik_decomp_instr_arithm }, - [DOP_MUL_INT] = { 0x92, "mul-int", dalvik_decomp_instr_arithm }, - [DOP_DIV_INT] = { 0x93, "div-int", dalvik_decomp_instr_arithm }, - [DOP_REM_INT] = { 0x94, "rem-int", dalvik_decomp_instr_arithm }, - [DOP_AND_INT] = { 0x95, "and-int", dalvik_decomp_instr_arithm }, - [DOP_OR_INT] = { 0x96, "or-int", dalvik_decomp_instr_arithm }, - [DOP_XOR_INT] = { 0x97, "xor-int", dalvik_decomp_instr_arithm }, + [DOP_ADD_INT] = { 0x90, "add-int", NULL }, + [DOP_SUB_INT] = { 0x91, "sub-int", NULL }, + [DOP_MUL_INT] = { 0x92, "mul-int", NULL }, + [DOP_DIV_INT] = { 0x93, "div-int", NULL }, + [DOP_REM_INT] = { 0x94, "rem-int", NULL }, + [DOP_AND_INT] = { 0x95, "and-int", NULL }, + [DOP_OR_INT] = { 0x96, "or-int", NULL }, + [DOP_XOR_INT] = { 0x97, "xor-int", NULL }, [DOP_SHL_INT] = { 0x98, "shl-int" }, [DOP_SHR_INT] = { 0x99, "shr-int" }, [DOP_USHR_INT] = { 0x9a, "ushr-int" }, @@ -248,54 +248,54 @@ static dalvik_instruction _instructions[DOP_COUNT] = { [DOP_MUL_DOUBLE] = { 0xad, "mul-double" }, [DOP_DIV_DOUBLE] = { 0xae, "div-double" }, [DOP_REM_DOUBLE] = { 0xaf, "rem-double" }, - [DOP_ADD_INT_2ADDR] = { 0xb0, "add-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_SUB_INT_2ADDR] = { 0xb1, "sub-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_MUL_INT_2ADDR] = { 0xb2, "mul-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_DIV_INT_2ADDR] = { 0xb3, "div-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_REM_INT_2ADDR] = { 0xb4, "rem-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_AND_INT_2ADDR] = { 0xb5, "and-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_OR_INT_2ADDR] = { 0xb6, "or-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_XOR_INT_2ADDR] = { 0xb7, "xor-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_SHL_INT_2ADDR] = { 0xb8, "shl-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_SHR_INT_2ADDR] = { 0xb9, "shr-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_USHR_INT_2ADDR] = { 0xba, "ushr-int/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_ADD_LONG_2ADDR] = { 0xbb, "add-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_SUB_LONG_2ADDR] = { 0xbc, "sub-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_MUL_LONG_2ADDR] = { 0xbd, "mul-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_DIV_LONG_2ADDR] = { 0xbe, "div-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_REM_LONG_2ADDR] = { 0xbf, "rem-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_AND_LONG_2ADDR] = { 0xc0, "and-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_OR_LONG_2ADDR] = { 0xc1, "or-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_XOR_LONG_2ADDR] = { 0xc2, "xor-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_SHL_LONG_2ADDR] = { 0xc3, "shl-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_SHR_LONG_2ADDR] = { 0xc4, "shr-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_USHR_LONG_2ADDR] = { 0xc5, "ushr-long/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_ADD_FLOAT_2ADDR] = { 0xc6, "add-float/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_SUB_FLOAT_2ADDR] = { 0xc7, "sub-float/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_MUL_FLOAT_2ADDR] = { 0xc8, "mul-float/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_DIV_FLOAT_2ADDR] = { 0xc9, "div-float/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_REM_FLOAT_2ADDR] = { 0xca, "rem-float/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_ADD_DOUBLE_2ADDR] = { 0xcb, "add-double/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_SUB_DOUBLE_2ADDR] = { 0xcc, "sub-double/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_MUL_DOUBLE_2ADDR] = { 0xcd, "mul-double/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_DIV_DOUBLE_2ADDR] = { 0xce, "div-double/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_REM_DOUBLE_2ADDR] = { 0xcf, "rem-double/2addr", dalvik_decomp_instr_arithm_2addr }, - [DOP_ADD_INT_LIT16] = { 0xd0, "add-int/lit16", dalvik_decomp_instr_arithm_lit }, + [DOP_ADD_INT_2ADDR] = { 0xb0, "add-int/2addr", NULL }, + [DOP_SUB_INT_2ADDR] = { 0xb1, "sub-int/2addr", NULL }, + [DOP_MUL_INT_2ADDR] = { 0xb2, "mul-int/2addr", NULL }, + [DOP_DIV_INT_2ADDR] = { 0xb3, "div-int/2addr", NULL }, + [DOP_REM_INT_2ADDR] = { 0xb4, "rem-int/2addr", NULL }, + [DOP_AND_INT_2ADDR] = { 0xb5, "and-int/2addr", NULL }, + [DOP_OR_INT_2ADDR] = { 0xb6, "or-int/2addr", NULL }, + [DOP_XOR_INT_2ADDR] = { 0xb7, "xor-int/2addr", NULL }, + [DOP_SHL_INT_2ADDR] = { 0xb8, "shl-int/2addr", NULL }, + [DOP_SHR_INT_2ADDR] = { 0xb9, "shr-int/2addr", NULL }, + [DOP_USHR_INT_2ADDR] = { 0xba, "ushr-int/2addr", NULL }, + [DOP_ADD_LONG_2ADDR] = { 0xbb, "add-long/2addr", NULL }, + [DOP_SUB_LONG_2ADDR] = { 0xbc, "sub-long/2addr", NULL }, + [DOP_MUL_LONG_2ADDR] = { 0xbd, "mul-long/2addr", NULL }, + [DOP_DIV_LONG_2ADDR] = { 0xbe, "div-long/2addr", NULL }, + [DOP_REM_LONG_2ADDR] = { 0xbf, "rem-long/2addr", NULL }, + [DOP_AND_LONG_2ADDR] = { 0xc0, "and-long/2addr", NULL }, + [DOP_OR_LONG_2ADDR] = { 0xc1, "or-long/2addr", NULL }, + [DOP_XOR_LONG_2ADDR] = { 0xc2, "xor-long/2addr", NULL }, + [DOP_SHL_LONG_2ADDR] = { 0xc3, "shl-long/2addr", NULL }, + [DOP_SHR_LONG_2ADDR] = { 0xc4, "shr-long/2addr", NULL }, + [DOP_USHR_LONG_2ADDR] = { 0xc5, "ushr-long/2addr", NULL }, + [DOP_ADD_FLOAT_2ADDR] = { 0xc6, "add-float/2addr", NULL }, + [DOP_SUB_FLOAT_2ADDR] = { 0xc7, "sub-float/2addr", NULL }, + [DOP_MUL_FLOAT_2ADDR] = { 0xc8, "mul-float/2addr", NULL }, + [DOP_DIV_FLOAT_2ADDR] = { 0xc9, "div-float/2addr", NULL }, + [DOP_REM_FLOAT_2ADDR] = { 0xca, "rem-float/2addr", NULL }, + [DOP_ADD_DOUBLE_2ADDR] = { 0xcb, "add-double/2addr", NULL }, + [DOP_SUB_DOUBLE_2ADDR] = { 0xcc, "sub-double/2addr", NULL }, + [DOP_MUL_DOUBLE_2ADDR] = { 0xcd, "mul-double/2addr", NULL }, + [DOP_DIV_DOUBLE_2ADDR] = { 0xce, "div-double/2addr", NULL }, + [DOP_REM_DOUBLE_2ADDR] = { 0xcf, "rem-double/2addr", NULL }, + [DOP_ADD_INT_LIT16] = { 0xd0, "add-int/lit16", NULL }, [DOP_RSUB_INT] = { 0xd1, "rsub-int" }, - [DOP_MUL_INT_LIT16] = { 0xd2, "mul-int/lit16", dalvik_decomp_instr_arithm_lit }, - [DOP_DIV_INT_LIT16] = { 0xd3, "div-int/lit16", dalvik_decomp_instr_arithm_lit }, - [DOP_REM_INT_LIT16] = { 0xd4, "rem-int/lit16", dalvik_decomp_instr_arithm_lit }, - [DOP_AND_INT_LIT16] = { 0xd5, "and-int/lit16", dalvik_decomp_instr_arithm_lit }, - [DOP_OR_INT_LIT16] = { 0xd6, "or-int/lit16", dalvik_decomp_instr_arithm_lit }, - [DOP_XOR_INT_LIT16] = { 0xd7, "xor-int/lit16", dalvik_decomp_instr_arithm_lit }, - [DOP_ADD_INT_LIT8] = { 0xd8, "add-int/lit8", dalvik_decomp_instr_arithm_lit }, + [DOP_MUL_INT_LIT16] = { 0xd2, "mul-int/lit16", NULL }, + [DOP_DIV_INT_LIT16] = { 0xd3, "div-int/lit16", NULL }, + [DOP_REM_INT_LIT16] = { 0xd4, "rem-int/lit16", NULL }, + [DOP_AND_INT_LIT16] = { 0xd5, "and-int/lit16", NULL }, + [DOP_OR_INT_LIT16] = { 0xd6, "or-int/lit16", NULL }, + [DOP_XOR_INT_LIT16] = { 0xd7, "xor-int/lit16", NULL }, + [DOP_ADD_INT_LIT8] = { 0xd8, "add-int/lit8", NULL }, [DOP_RSUB_INT_LIT8] = { 0xd9, "rsub-int/lit8" }, - [DOP_MUL_INT_LIT8] = { 0xda, "mul-int/lit8", dalvik_decomp_instr_arithm_lit }, - [DOP_DIV_INT_LIT8] = { 0xdb, "div-int/lit8", dalvik_decomp_instr_arithm_lit }, - [DOP_REM_INT_LIT8] = { 0xdc, "rem-int/lit8", dalvik_decomp_instr_arithm_lit }, - [DOP_AND_INT_LIT8] = { 0xdd, "and-int/lit8", dalvik_decomp_instr_arithm_lit }, - [DOP_OR_INT_LIT8] = { 0xde, "or-int/lit8", dalvik_decomp_instr_arithm_lit }, - [DOP_XOR_INT_LIT8] = { 0xdf, "xor-int/lit8", dalvik_decomp_instr_arithm_lit }, + [DOP_MUL_INT_LIT8] = { 0xda, "mul-int/lit8", NULL }, + [DOP_DIV_INT_LIT8] = { 0xdb, "div-int/lit8", NULL }, + [DOP_REM_INT_LIT8] = { 0xdc, "rem-int/lit8", NULL }, + [DOP_AND_INT_LIT8] = { 0xdd, "and-int/lit8", NULL }, + [DOP_OR_INT_LIT8] = { 0xde, "or-int/lit8", NULL }, + [DOP_XOR_INT_LIT8] = { 0xdf, "xor-int/lit8", NULL }, [DOP_SHL_INT_LIT8] = { 0xe0, "shl-int/lit8" }, [DOP_SHR_INT_LIT8] = { 0xe1, "shr-int/lit8" }, [DOP_USHR_INT_LIT8] = { 0xe2, "ushr-int/lit8" }, @@ -336,7 +336,7 @@ static dalvik_instruction _instructions[DOP_COUNT] = { static const char *dalvik_instruction_get_keyword(const GDalvikInstruction *, AsmSyntax); /* Décompile une instruction de la machine virtuelle Dalvik. */ -GDecInstruction *dalvik_instruction_decompile(const GDalvikInstruction *, GDecContext *); +//GDecInstruction *dalvik_instruction_decompile(const GDalvikInstruction *, GDecContext *); @@ -592,7 +592,7 @@ static const char *dalvik_instruction_get_keyword(const GDalvikInstruction *inst * Remarques : - * * * ******************************************************************************/ - +#if 0 GDecInstruction *dalvik_instruction_decompile(const GDalvikInstruction *instr, GDecContext *ctx) { GDecInstruction *result; /* Instruction à retourner */ @@ -606,3 +606,4 @@ GDecInstruction *dalvik_instruction_decompile(const GDalvikInstruction *instr, G return result; } +#endif |