From 4af666e4a6dbcff1a68ebc3bc64fe813decb5920 Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Fri, 24 Aug 2012 16:54:05 -0700 Subject: Remove support for the extended opcodes --- smali/src/main/antlr3/org/jf/smali/smaliLexer.g | 71 ---------------------- smali/src/main/antlr3/org/jf/smali/smaliParser.g | 66 -------------------- .../src/main/antlr3/org/jf/smali/smaliTreeWalker.g | 70 --------------------- smali/src/main/jflex/smaliLexer.flex | 43 ------------- .../test/resources/LexerTest/InstructionTest.smali | 52 ---------------- .../resources/LexerTest/InstructionTest.tokens | 54 +--------------- 6 files changed, 1 insertion(+), 355 deletions(-) (limited to 'smali/src') diff --git a/smali/src/main/antlr3/org/jf/smali/smaliLexer.g b/smali/src/main/antlr3/org/jf/smali/smaliLexer.g index 3d7949ee..872e1065 100644 --- a/smali/src/main/antlr3/org/jf/smali/smaliLexer.g +++ b/smali/src/main/antlr3/org/jf/smali/smaliLexer.g @@ -696,80 +696,9 @@ INSTRUCTION_FORMAT3rms_METHOD : 'invoke-virtual-quick/range' | 'invoke-super-quick/range'; -INSTRUCTION_FORMAT41c_TYPE - : 'check-cast/jumbo' - | 'new-instance/jumbo' - | 'const-class/jumbo'; - -INSTRUCTION_FORMAT41c_FIELD - : 'sget/jumbo' - | 'sget-wide/jumbo' - | 'sget-object/jumbo' - | 'sget-boolean/jumbo' - | 'sget-byte/jumbo' - | 'sget-char/jumbo' - | 'sget-short/jumbo' - | 'sput/jumbo' - | 'sput-wide/jumbo' - | 'sput-object/jumbo' - | 'sput-boolean/jumbo' - | 'sput-byte/jumbo' - | 'sput-char/jumbo' - | 'sput-short/jumbo'; - -INSTRUCTION_FORMAT41c_FIELD_ODEX - : 'sget-volatile/jumbo' - | 'sget-wide-volatile/jumbo' - | 'sget-object-volatile/jumbo' - | 'sput-volatile/jumbo' - | 'sput-wide-volatile/jumbo' - | 'sput-object-volatile/jumbo'; - INSTRUCTION_FORMAT51l : 'const-wide'; -INSTRUCTION_FORMAT52c_TYPE - : 'instance-of/jumbo' - | 'new-array/jumbo'; - -INSTRUCTION_FORMAT52c_FIELD - : 'iget/jumbo' - | 'iget-wide/jumbo' - | 'iget-object/jumbo' - | 'iget-boolean/jumbo' - | 'iget-byte/jumbo' - | 'iget-char/jumbo' - | 'iget-short/jumbo' - | 'iput/jumbo' - | 'iput-wide/jumbo' - | 'iput-object/jumbo' - | 'iput-boolean/jumbo' - | 'iput-byte/jumbo' - | 'iput-char/jumbo' - | 'iput-short/jumbo'; - -INSTRUCTION_FORMAT52c_FIELD_ODEX - : 'iget-volatile/jumbo' - | 'iget-wide-volatile/jumbo' - | 'iget-object-volatile/jumbo' - | 'iput-volatile/jumbo' - | 'iput-wide-volatile/jumbo' - | 'iput-object-volatile/jumbo'; - -INSTRUCTION_FORMAT5rc_METHOD - : 'invoke-virtual/jumbo' - | 'invoke-super/jumbo' - | 'invoke-direct/jumbo' - | 'invoke-static/jumbo' - | 'invoke-interface/jumbo'; - -INSTRUCTION_FORMAT5rc_METHOD_ODEX - : 'invoke-object-init/jumbo'; - -INSTRUCTION_FORMAT5rc_TYPE - : 'filled-new-array/jumbo'; - - /********************************************************** * Types **********************************************************/ diff --git a/smali/src/main/antlr3/org/jf/smali/smaliParser.g b/smali/src/main/antlr3/org/jf/smali/smaliParser.g index 1ea2d6b5..3d272b0e 100644 --- a/smali/src/main/antlr3/org/jf/smali/smaliParser.g +++ b/smali/src/main/antlr3/org/jf/smali/smaliParser.g @@ -117,13 +117,7 @@ tokens { I_STATEMENT_FORMAT35c_TYPE; I_STATEMENT_FORMAT3rc_METHOD; I_STATEMENT_FORMAT3rc_TYPE; - I_STATEMENT_FORMAT41c_TYPE; - I_STATEMENT_FORMAT41c_FIELD; I_STATEMENT_FORMAT51l; - I_STATEMENT_FORMAT52c_TYPE; - I_STATEMENT_FORMAT52c_FIELD; - I_STATEMENT_FORMAT5rc_METHOD; - I_STATEMENT_FORMAT5rc_TYPE; I_STATEMENT_ARRAY_DATA; I_STATEMENT_PACKED_SWITCH; I_STATEMENT_SPARSE_SWITCH; @@ -732,16 +726,7 @@ instruction returns [int size] | insn_format3rc_type { $size = $insn_format3rc_type.size; } | insn_format3rmi_method { $size = $insn_format3rmi_method.size; } | insn_format3rms_method { $size = $insn_format3rms_method.size; } - | insn_format41c_type { $size = $insn_format41c_type.size; } - | insn_format41c_field { $size = $insn_format41c_field.size; } - | insn_format41c_field_odex { $size = $insn_format41c_field_odex.size; } | insn_format51l { $size = $insn_format51l.size; } - | insn_format52c_type { $size = $insn_format52c_type.size; } - | insn_format52c_field { $size = $insn_format52c_field.size; } - | insn_format52c_field_odex { $size = $insn_format52c_field_odex.size; } - | insn_format5rc_method { $size = $insn_format5rc_method.size; } - | insn_format5rc_method_odex { $size = $insn_format5rc_method_odex.size; } - | insn_format5rc_type { $size = $insn_format5rc_type.size; } | insn_array_data_directive { $size = $insn_array_data_directive.size; } | insn_packed_switch_directive { $size = $insn_packed_switch_directive.size; } | insn_sparse_switch_directive { $size = $insn_sparse_switch_directive.size; }; @@ -989,62 +974,11 @@ insn_format3rms_method returns [int size] throwOdexedInstructionException(input, $INSTRUCTION_FORMAT3rms_METHOD.text); }; -insn_format41c_type returns [int size] - : //e.g. const-class/jumbo v2, Lorg/jf/HelloWorld2/HelloWorld2; - INSTRUCTION_FORMAT41c_TYPE REGISTER COMMA reference_type_descriptor {$size = Format.Format41c.size;} - -> ^(I_STATEMENT_FORMAT41c_TYPE[$start, "I_STATEMENT_FORMAT41c"] INSTRUCTION_FORMAT41c_TYPE REGISTER reference_type_descriptor); - -insn_format41c_field returns [int size] - : //e.g. sget-object/jumbo v0, Ljava/lang/System;->out:Ljava/io/PrintStream; - INSTRUCTION_FORMAT41c_FIELD REGISTER COMMA fully_qualified_field {$size = Format.Format41c.size;} - -> ^(I_STATEMENT_FORMAT41c_FIELD[$start, "I_STATEMENT_FORMAT41c_FIELD"] INSTRUCTION_FORMAT41c_FIELD REGISTER fully_qualified_field); - -insn_format41c_field_odex returns [int size] - : //e.g. sget-object-volatile/jumbo v0, Ljava/lang/System;->out:Ljava/io/PrintStream; - INSTRUCTION_FORMAT41c_FIELD_ODEX REGISTER COMMA fully_qualified_field {$size = Format.Format41c.size;} - { - throwOdexedInstructionException(input, $INSTRUCTION_FORMAT41c_FIELD_ODEX.text); - }; - insn_format51l returns [int size] : //e.g. const-wide v0, 5000000000L INSTRUCTION_FORMAT51l REGISTER COMMA fixed_literal {$size = Format.Format51l.size;} -> ^(I_STATEMENT_FORMAT51l[$start, "I_STATEMENT_FORMAT51l"] INSTRUCTION_FORMAT51l REGISTER fixed_literal); -insn_format52c_type returns [int size] - : //e.g. instance-of/jumbo v0, v1, Ljava/lang/String; - INSTRUCTION_FORMAT52c_TYPE REGISTER COMMA REGISTER COMMA nonvoid_type_descriptor {$size = Format.Format52c.size;} - -> ^(I_STATEMENT_FORMAT52c_TYPE[$start, "I_STATEMENT_FORMAT52c_TYPE"] INSTRUCTION_FORMAT52c_TYPE REGISTER REGISTER nonvoid_type_descriptor); - -insn_format52c_field returns [int size] - : //e.g. iput-object/jumbo v1, v0 Lorg/jf/HelloWorld2/HelloWorld2;->helloWorld:Ljava/lang/String; - INSTRUCTION_FORMAT52c_FIELD REGISTER COMMA REGISTER COMMA fully_qualified_field {$size = Format.Format52c.size;} - -> ^(I_STATEMENT_FORMAT52c_FIELD[$start, "I_STATEMENT_FORMAT52c_FIELD"] INSTRUCTION_FORMAT52c_FIELD REGISTER REGISTER fully_qualified_field); - -insn_format52c_field_odex returns [int size] - : //e.g. iput-object-volatile/jumbo v1, v0 Lorg/jf/HelloWorld2/HelloWorld2;->helloWorld:Ljava/lang/String; - INSTRUCTION_FORMAT52c_FIELD_ODEX REGISTER COMMA REGISTER COMMA fully_qualified_field {$size = Format.Format52c.size;} - { - throwOdexedInstructionException(input, $INSTRUCTION_FORMAT52c_FIELD_ODEX.text); - }; - -insn_format5rc_method returns [int size] - : //e.g. invoke-virtual/jumbo {v25..v26}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - INSTRUCTION_FORMAT5rc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA fully_qualified_method {$size = Format.Format5rc.size;} - -> ^(I_STATEMENT_FORMAT5rc_METHOD[$start, "I_STATEMENT_FORMAT5rc_METHOD"] INSTRUCTION_FORMAT5rc_METHOD register_range fully_qualified_method); - -insn_format5rc_method_odex returns [int size] - : //e.g. invoke-object-init/jumbo {v25}, Ljava/lang/Object->()V - INSTRUCTION_FORMAT5rc_METHOD_ODEX OPEN_BRACE register_range CLOSE_BRACE COMMA fully_qualified_method {$size = Format.Format5rc.size;} - { - throwOdexedInstructionException(input, $INSTRUCTION_FORMAT5rc_METHOD_ODEX.text); - }; - -insn_format5rc_type returns [int size] - : //e.g. filled-new-array/jumbo {v0..v6}, I - INSTRUCTION_FORMAT5rc_TYPE OPEN_BRACE register_range CLOSE_BRACE COMMA nonvoid_type_descriptor {$size = Format.Format5rc.size;} - -> ^(I_STATEMENT_FORMAT5rc_TYPE[$start, "I_STATEMENT_FORMAT5rc_TYPE"] INSTRUCTION_FORMAT5rc_TYPE register_range nonvoid_type_descriptor); - insn_array_data_directive returns [int size] @init {boolean needsNop = false;} : ARRAY_DATA_DIRECTIVE diff --git a/smali/src/main/antlr3/org/jf/smali/smaliTreeWalker.g b/smali/src/main/antlr3/org/jf/smali/smaliTreeWalker.g index a4073796..33c83741 100644 --- a/smali/src/main/antlr3/org/jf/smali/smaliTreeWalker.g +++ b/smali/src/main/antlr3/org/jf/smali/smaliTreeWalker.g @@ -1251,26 +1251,6 @@ instruction[int totalMethodRegisters, int methodParameterRegisters, Listout:LJava/io/PrintStream; - ^(I_STATEMENT_FORMAT41c_FIELD INSTRUCTION_FORMAT41c_FIELD REGISTER fully_qualified_field) - { - Opcode opcode = Opcode.getOpcodeByName($INSTRUCTION_FORMAT41c_FIELD.text); - int regA = parseRegister_short($REGISTER.text, $totalMethodRegisters, $methodParameterRegisters); - - FieldIdItem fieldIdItem = $fully_qualified_field.fieldIdItem; - - $instructions.add(new Instruction41c(opcode, regA, fieldIdItem)); - } | //e.g. const-wide v0, 5000000000L ^(I_STATEMENT_FORMAT51l INSTRUCTION_FORMAT51l REGISTER fixed_64bit_literal) { @@ -1281,56 +1261,6 @@ instruction[int totalMethodRegisters, int methodParameterRegisters, ListhelloWorld:Ljava/lang/String; - ^(I_STATEMENT_FORMAT52c_FIELD INSTRUCTION_FORMAT52c_FIELD registerA=REGISTER registerB=REGISTER fully_qualified_field) - { - Opcode opcode = Opcode.getOpcodeByName($INSTRUCTION_FORMAT52c_FIELD.text); - int regA = parseRegister_short($registerA.text, $totalMethodRegisters, $methodParameterRegisters); - int regB = parseRegister_short($registerB.text, $totalMethodRegisters, $methodParameterRegisters); - - FieldIdItem fieldIdItem = $fully_qualified_field.fieldIdItem; - - $instructions.add(new Instruction52c(opcode, regA, regB, fieldIdItem)); - } - | //e.g. invoke-virtual/jumbo {v25..v26} java/lang/StringBuilder/append(Ljava/lang/String;)Ljava/lang/StringBuilder; - ^(I_STATEMENT_FORMAT5rc_METHOD INSTRUCTION_FORMAT5rc_METHOD register_range[$totalMethodRegisters, $methodParameterRegisters] fully_qualified_method) - { - Opcode opcode = Opcode.getOpcodeByName($INSTRUCTION_FORMAT5rc_METHOD.text); - int startRegister = $register_range.startRegister; - int endRegister = $register_range.endRegister; - - int registerCount = endRegister-startRegister+1; - $outRegisters = registerCount; - - MethodIdItem methodIdItem = $fully_qualified_method.methodIdItem; - - $instructions.add(new Instruction5rc(opcode, registerCount, startRegister, methodIdItem)); - } - | //e.g. filled-new-array/jumbo {v0..v6} I - ^(I_STATEMENT_FORMAT5rc_TYPE INSTRUCTION_FORMAT5rc_TYPE register_range[$totalMethodRegisters, $methodParameterRegisters] nonvoid_type_descriptor) - { - Opcode opcode = Opcode.getOpcodeByName($INSTRUCTION_FORMAT5rc_TYPE.text); - int startRegister = $register_range.startRegister; - int endRegister = $register_range.endRegister; - - int registerCount = endRegister-startRegister+1; - $outRegisters = registerCount; - - TypeIdItem typeIdItem = $nonvoid_type_descriptor.type; - - $instructions.add(new Instruction5rc(opcode, registerCount, startRegister, typeIdItem)); - } | //e.g. .array-data 4 1000000 .end array-data ^(I_STATEMENT_ARRAY_DATA ^(I_ARRAY_ELEMENT_SIZE short_integral_literal) array_elements) { diff --git a/smali/src/main/jflex/smaliLexer.flex b/smali/src/main/jflex/smaliLexer.flex index 5fba1395..231abefd 100644 --- a/smali/src/main/jflex/smaliLexer.flex +++ b/smali/src/main/jflex/smaliLexer.flex @@ -570,52 +570,9 @@ Type = {PrimitiveType} | {ClassDescriptor} | {ArrayDescriptor} return newToken(INSTRUCTION_FORMAT3rms_METHOD); } - "check-cast/jumbo" | "new-instance/jumbo" | "const-class/jumbo" { - return newToken(INSTRUCTION_FORMAT41c_TYPE); - } - - "sget/jumbo" | "sget-wide/jumbo" | "sget-object/jumbo" | "sget-boolean/jumbo" | "sget-byte/jumbo" | - "sget-char/jumbo" | "sget-short/jumbo" | "sput/jumbo" | "sput-wide/jumbo" | "sput-object/jumbo" | - "sput-boolean/jumbo" | "sput-byte/jumbo" | "sput-char/jumbo" | "sput-short/jumbo" { - return newToken(INSTRUCTION_FORMAT41c_FIELD); - } - - "sget-volatile/jumbo" | "sget-wide-volatile/jumbo" | "sget-object-volatile/jumbo" | "sput-volatile/jumbo" | - "sput-wide-volatile/jumbo" | "sput-object-volatile/jumbo" { - return newToken(INSTRUCTION_FORMAT41c_FIELD_ODEX); - } - "const-wide" { return newToken(INSTRUCTION_FORMAT51l); } - - "instance-of/jumbo" | "new-array/jumbo" { - return newToken(INSTRUCTION_FORMAT52c_TYPE); - } - - "iget/jumbo" | "iget-wide/jumbo" | "iget-object/jumbo" | "iget-boolean/jumbo" | "iget-byte/jumbo" | - "iget-char/jumbo" | "iget-short/jumbo" | "iput/jumbo" | "iput-wide/jumbo" | "iput-object/jumbo" | - "iput-boolean/jumbo" | "iput-byte/jumbo" | "iput-char/jumbo" | "iput-short/jumbo" { - return newToken(INSTRUCTION_FORMAT52c_FIELD); - } - - "iget-volatile/jumbo" | "iget-wide-volatile/jumbo" | "iget-object-volatile/jumbo" | "iput-volatile/jumbo" | - "iput-wide-volatile/jumbo" | "iput-object-volatile/jumbo" { - return newToken(INSTRUCTION_FORMAT52c_FIELD_ODEX); - } - - "invoke-virtual/jumbo" | "invoke-super/jumbo" | "invoke-direct/jumbo" | "invoke-static/jumbo" | - "invoke-interface/jumbo" { - return newToken(INSTRUCTION_FORMAT5rc_METHOD); - } - - "invoke-object-init/jumbo" { - return newToken(INSTRUCTION_FORMAT5rc_METHOD_ODEX); - } - - "filled-new-array/jumbo" { - return newToken(INSTRUCTION_FORMAT5rc_TYPE); - } } /*Types*/ diff --git a/smali/src/test/resources/LexerTest/InstructionTest.smali b/smali/src/test/resources/LexerTest/InstructionTest.smali index 8b458342..2247adc0 100644 --- a/smali/src/test/resources/LexerTest/InstructionTest.smali +++ b/smali/src/test/resources/LexerTest/InstructionTest.smali @@ -225,56 +225,4 @@ filled-new-array/range execute-inline/range invoke-virtual-quick/range invoke-super-quick/range -check-cast/jumbo -new-instance/jumbo -const-class/jumbo -sget/jumbo -sget-wide/jumbo -sget-object/jumbo -sget-boolean/jumbo -sget-byte/jumbo -sget-char/jumbo -sget-short/jumbo -sput/jumbo -sput-wide/jumbo -sput-object/jumbo -sput-boolean/jumbo -sput-byte/jumbo -sput-char/jumbo -sput-short/jumbo const-wide -instance-of/jumbo -new-array/jumbo -iget/jumbo -iget-wide/jumbo -iget-object/jumbo -iget-boolean/jumbo -iget-byte/jumbo -iget-char/jumbo -iget-short/jumbo -iput/jumbo -iput-wide/jumbo -iput-object/jumbo -iput-boolean/jumbo -iput-byte/jumbo -iput-char/jumbo -iput-short/jumbo -invoke-virtual/jumbo -invoke-super/jumbo -invoke-direct/jumbo -invoke-static/jumbo -invoke-interface/jumbo -filled-new-array/jumbo -invoke-object-init/jumbo -iget-volatile/jumbo -iget-wide-volatile/jumbo -iget-object-volatile/jumbo -iput-volatile/jumbo -iput-wide-volatile/jumbo -iput-object-volatile/jumbo -sget-volatile/jumbo -sget-wide-volatile/jumbo -sget-object-volatile/jumbo -sput-volatile/jumbo -sput-wide-volatile/jumbo -sput-object-volatile/jumbo diff --git a/smali/src/test/resources/LexerTest/InstructionTest.tokens b/smali/src/test/resources/LexerTest/InstructionTest.tokens index 457ceebd..2adb364d 100644 --- a/smali/src/test/resources/LexerTest/InstructionTest.tokens +++ b/smali/src/test/resources/LexerTest/InstructionTest.tokens @@ -225,56 +225,4 @@ INSTRUCTION_FORMAT3rc_TYPE("filled-new-array/range") INSTRUCTION_FORMAT3rmi_METHOD("execute-inline/range") INSTRUCTION_FORMAT3rms_METHOD("invoke-virtual-quick/range") INSTRUCTION_FORMAT3rms_METHOD("invoke-super-quick/range") -INSTRUCTION_FORMAT41c_TYPE("check-cast/jumbo") -INSTRUCTION_FORMAT41c_TYPE("new-instance/jumbo") -INSTRUCTION_FORMAT41c_TYPE("const-class/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sget/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sget-wide/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sget-object/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sget-boolean/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sget-byte/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sget-char/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sget-short/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sput/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sput-wide/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sput-object/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sput-boolean/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sput-byte/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sput-char/jumbo") -INSTRUCTION_FORMAT41c_FIELD("sput-short/jumbo") -INSTRUCTION_FORMAT51l("const-wide") -INSTRUCTION_FORMAT52c_TYPE("instance-of/jumbo") -INSTRUCTION_FORMAT52c_TYPE("new-array/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iget/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iget-wide/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iget-object/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iget-boolean/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iget-byte/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iget-char/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iget-short/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iput/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iput-wide/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iput-object/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iput-boolean/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iput-byte/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iput-char/jumbo") -INSTRUCTION_FORMAT52c_FIELD("iput-short/jumbo") -INSTRUCTION_FORMAT5rc_METHOD("invoke-virtual/jumbo") -INSTRUCTION_FORMAT5rc_METHOD("invoke-super/jumbo") -INSTRUCTION_FORMAT5rc_METHOD("invoke-direct/jumbo") -INSTRUCTION_FORMAT5rc_METHOD("invoke-static/jumbo") -INSTRUCTION_FORMAT5rc_METHOD("invoke-interface/jumbo") -INSTRUCTION_FORMAT5rc_TYPE("filled-new-array/jumbo") -INSTRUCTION_FORMAT5rc_METHOD_ODEX("invoke-object-init/jumbo") -INSTRUCTION_FORMAT52c_FIELD_ODEX("iget-volatile/jumbo") -INSTRUCTION_FORMAT52c_FIELD_ODEX("iget-wide-volatile/jumbo") -INSTRUCTION_FORMAT52c_FIELD_ODEX("iget-object-volatile/jumbo") -INSTRUCTION_FORMAT52c_FIELD_ODEX("iput-volatile/jumbo") -INSTRUCTION_FORMAT52c_FIELD_ODEX("iput-wide-volatile/jumbo") -INSTRUCTION_FORMAT52c_FIELD_ODEX("iput-object-volatile/jumbo") -INSTRUCTION_FORMAT41c_FIELD_ODEX("sget-volatile/jumbo") -INSTRUCTION_FORMAT41c_FIELD_ODEX("sget-wide-volatile/jumbo") -INSTRUCTION_FORMAT41c_FIELD_ODEX("sget-object-volatile/jumbo") -INSTRUCTION_FORMAT41c_FIELD_ODEX("sput-volatile/jumbo") -INSTRUCTION_FORMAT41c_FIELD_ODEX("sput-wide-volatile/jumbo") -INSTRUCTION_FORMAT41c_FIELD_ODEX("sput-object-volatile/jumbo") +INSTRUCTION_FORMAT51l("const-wide") \ No newline at end of file -- cgit v1.2.3