Make opcode 00ff be called "dispatch-ff".

With this change, it's still implemented as an unused opcode, but
it's now ready for its new life!

Change-Id: Ic70d311704925067e47d87b657d133a792144e65

diff --git a/libdex/DexOpcodes.c b/libdex/DexOpcodes.c
index d2681ba..b68fb4b 100644 (file)
--- a/libdex/DexOpcodes.c
+++ b/libdex/DexOpcodes.c
@@ -285,7 +285,7 @@ static const char* gOpNames[kNumDalvikInstructions] = {
     "+iput-object-volatile",
     "+sget-object-volatile",
     "+sput-object-volatile",
-    "unused-ff",
+    "dispatch-ff",
     // END(libdex-opcode-names)
 };
 

diff --git a/libdex/DexOpcodes.h b/libdex/DexOpcodes.h
index d061d7c..368a110 100644 (file)
--- a/libdex/DexOpcodes.h
+++ b/libdex/DexOpcodes.h
@@ -316,7 +316,7 @@ typedef enum Opcode {
     OP_IPUT_OBJECT_VOLATILE         = 0xfc,
     OP_SGET_OBJECT_VOLATILE         = 0xfd,
     OP_SPUT_OBJECT_VOLATILE         = 0xfe,
-    OP_UNUSED_FF                    = 0xff,
+    OP_DISPATCH_FF                  = 0xff,
     // END(libdex-opcode-enum)
 } Opcode;
 
@@ -582,7 +582,7 @@ typedef enum Opcode {
         H(OP_IPUT_OBJECT_VOLATILE),                                           \
         H(OP_SGET_OBJECT_VOLATILE),                                           \
         H(OP_SPUT_OBJECT_VOLATILE),                                           \
-        H(OP_UNUSED_FF),                                                      \
+        H(OP_DISPATCH_FF),                                                    \
         /* END(libdex-goto-table) */                                          \
     };
 

diff --git a/vm/analysis/CodeVerify.c b/vm/analysis/CodeVerify.c
index f53956e..8bb0da0 100644 (file)
--- a/vm/analysis/CodeVerify.c
+++ b/vm/analysis/CodeVerify.c
@@ -5656,7 +5656,7 @@ sput_1nr_common:
     case OP_UNUSED_79:
     case OP_UNUSED_7A:
     case OP_BREAKPOINT:
-    case OP_UNUSED_FF:
+    case OP_DISPATCH_FF:
         failure = VERIFY_ERROR_GENERIC;
         break;
 

diff --git a/vm/analysis/DexVerify.c b/vm/analysis/DexVerify.c
index a1f2db3..2e2d267 100644 (file)
--- a/vm/analysis/DexVerify.c
+++ b/vm/analysis/DexVerify.c
@@ -1177,7 +1177,7 @@ static bool verifyInstructions(VerifierData* vdata)
         case OP_UNUSED_73:
         case OP_UNUSED_79:
         case OP_UNUSED_7A:
-        case OP_UNUSED_FF:
+        case OP_DISPATCH_FF:
             LOGE("VFY: unexpected opcode %02x\n", decInsn.opcode);
             okay = false;
             break;

diff --git a/vm/compiler/Dataflow.c b/vm/compiler/Dataflow.c
index dad52bf..924ba62 100644 (file)
--- a/vm/compiler/Dataflow.c
+++ b/vm/compiler/Dataflow.c
@@ -795,7 +795,7 @@ int dvmCompilerDataFlowAttributes[kMirOpLast] = {
     // FE OP_SPUT_OBJECT_VOLATILE
     DF_UA,
 
-    // FF OP_UNUSED_FF
+    // FF OP_DISPATCH_FF
     DF_NOP,
 
     // Beginning of extended MIR opcodes

diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c
index 55fee0e..0c5b617 100644 (file)
--- a/vm/compiler/codegen/arm/CodegenDriver.c
+++ b/vm/compiler/codegen/arm/CodegenDriver.c
@@ -1338,7 +1338,7 @@ static bool handleFmt10x(CompilationUnit *cUnit, MIR *mir)
         case OP_UNUSED_73:
         case OP_UNUSED_79:
         case OP_UNUSED_7A:
-        case OP_UNUSED_FF:
+        case OP_DISPATCH_FF:
             LOGE("Codegen: got unused opcode 0x%x\n",dalvikOpcode);
             return true;
         case OP_NOP:

diff --git a/vm/mterp/armv5te/OP_UNUSED_FF.S b/vm/mterp/armv5te/OP_DISPATCH_FF.S
similarity index 100%
rename from vm/mterp/armv5te/OP_UNUSED_FF.S
rename to vm/mterp/armv5te/OP_DISPATCH_FF.S

diff --git a/vm/mterp/c/OP_UNUSED_FF.c b/vm/mterp/c/OP_DISPATCH_FF.c
similarity index 85%
rename from vm/mterp/c/OP_UNUSED_FF.c
rename to vm/mterp/c/OP_DISPATCH_FF.c
index f4743db..a058b99 100644 (file)
--- a/vm/mterp/c/OP_UNUSED_FF.c
+++ b/vm/mterp/c/OP_DISPATCH_FF.c
@@ -1,4 +1,4 @@
-HANDLE_OPCODE(OP_UNUSED_FF)
+HANDLE_OPCODE(OP_DISPATCH_FF)
     /*
      * In portable interp, most unused opcodes will fall through to here.
      */

diff --git a/vm/mterp/config-x86-atom b/vm/mterp/config-x86-atom
index b46663d..e1e8866 100644 (file)
--- a/vm/mterp/config-x86-atom
+++ b/vm/mterp/config-x86-atom
@@ -272,7 +272,7 @@ op-start x86-atom
 #op OP_UNUSED_FC c
 #op OP_UNUSED_FD c
 #op OP_UNUSED_FE c
-#op OP_UNUSED_FF c
+#op OP_DISPATCH_FF c
 #op OP_USHR_INT_2ADDR c
 #op OP_USHR_INT_LIT8 c
 #op OP_USHR_INT c

diff --git a/vm/mterp/out/InterpAsm-armv5te-vfp.S b/vm/mterp/out/InterpAsm-armv5te-vfp.S
index 2cecb8f..3b7ec3e 100644 (file)
--- a/vm/mterp/out/InterpAsm-armv5te-vfp.S
+++ b/vm/mterp/out/InterpAsm-armv5te-vfp.S
@@ -7741,8 +7741,8 @@ dalvik_inst:
 
 /* ------------------------------ */
     .balign 64
-.L_OP_UNUSED_FF: /* 0xff */
-/* File: armv5te/OP_UNUSED_FF.S */
+.L_OP_DISPATCH_FF: /* 0xff */
+/* File: armv5te/OP_DISPATCH_FF.S */
 /* File: armv5te/unused.S */
     bl      common_abort
 

diff --git a/vm/mterp/out/InterpAsm-armv5te.S b/vm/mterp/out/InterpAsm-armv5te.S
index d3151a5..0d5502e 100644 (file)
--- a/vm/mterp/out/InterpAsm-armv5te.S
+++ b/vm/mterp/out/InterpAsm-armv5te.S
@@ -8063,8 +8063,8 @@ d2i_doconv:
 
 /* ------------------------------ */
     .balign 64
-.L_OP_UNUSED_FF: /* 0xff */
-/* File: armv5te/OP_UNUSED_FF.S */
+.L_OP_DISPATCH_FF: /* 0xff */
+/* File: armv5te/OP_DISPATCH_FF.S */
 /* File: armv5te/unused.S */
     bl      common_abort
 

diff --git a/vm/mterp/out/InterpAsm-armv7-a-neon.S b/vm/mterp/out/InterpAsm-armv7-a-neon.S
index eadbca4..1398a94 100644 (file)
--- a/vm/mterp/out/InterpAsm-armv7-a-neon.S
+++ b/vm/mterp/out/InterpAsm-armv7-a-neon.S
@@ -7695,8 +7695,8 @@ dalvik_inst:
 
 /* ------------------------------ */
     .balign 64
-.L_OP_UNUSED_FF: /* 0xff */
-/* File: armv5te/OP_UNUSED_FF.S */
+.L_OP_DISPATCH_FF: /* 0xff */
+/* File: armv5te/OP_DISPATCH_FF.S */
 /* File: armv5te/unused.S */
     bl      common_abort
 

diff --git a/vm/mterp/out/InterpAsm-armv7-a.S b/vm/mterp/out/InterpAsm-armv7-a.S
index 0475366..489098a 100644 (file)
--- a/vm/mterp/out/InterpAsm-armv7-a.S
+++ b/vm/mterp/out/InterpAsm-armv7-a.S
@@ -7695,8 +7695,8 @@ dalvik_inst:
 
 /* ------------------------------ */
     .balign 64
-.L_OP_UNUSED_FF: /* 0xff */
-/* File: armv5te/OP_UNUSED_FF.S */
+.L_OP_DISPATCH_FF: /* 0xff */
+/* File: armv5te/OP_DISPATCH_FF.S */
 /* File: armv5te/unused.S */
     bl      common_abort
 

diff --git a/vm/mterp/out/InterpAsm-x86-atom.S b/vm/mterp/out/InterpAsm-x86-atom.S
index dedd946..136e2f2 100644 (file)
--- a/vm/mterp/out/InterpAsm-x86-atom.S
+++ b/vm/mterp/out/InterpAsm-x86-atom.S
@@ -15325,8 +15325,8 @@ OP_IF_LEZ_2f:
     FINISH_A                            # jump to next instruction
 /* ------------------------------ */
     .balign 64
-.L_OP_UNUSED_FF: /* 0xff */
-/* File: x86-atom/OP_UNUSED_FF.S */
+.L_OP_DISPATCH_FF: /* 0xff */
+/* File: x86-atom/OP_DISPATCH_FF.S */
    /* Copyright (C) 2008 The Android Open Source Project
     *
     * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15343,7 +15343,7 @@ OP_IF_LEZ_2f:
     */
 
    /*
-    * File: OP_UNUSED_FF.S
+    * File: OP_DISPATCH_FF.S
     */
 
 /* File: x86-atom/unused.S */
@@ -17871,7 +17871,7 @@ dvmAsmInstructionJmpTable = .LdvmAsmInstructionJmpTable
 .long .L_OP_UNUSED_FC
 .long .L_OP_UNUSED_FD
 .long .L_OP_UNUSED_FE
-.long .L_OP_UNUSED_FF
+.long .L_OP_DISPATCH_FF
 
 /* File: x86-atom/footer.S */
    /* Copyright (C) 2008 The Android Open Source Project

diff --git a/vm/mterp/out/InterpAsm-x86.S b/vm/mterp/out/InterpAsm-x86.S
index 7273606..b2bcd08 100644 (file)
--- a/vm/mterp/out/InterpAsm-x86.S
+++ b/vm/mterp/out/InterpAsm-x86.S
@@ -6431,8 +6431,8 @@ dvmAsmInstructionStart = .L_OP_NOP
 
 /* ------------------------------ */
     .balign 64
-.L_OP_UNUSED_FF: /* 0xff */
-/* File: x86/OP_UNUSED_FF.S */
+.L_OP_DISPATCH_FF: /* 0xff */
+/* File: x86/OP_DISPATCH_FF.S */
 /* File: x86/unused.S */
     jmp     common_abort
 
@@ -9104,7 +9104,7 @@ dvmAsmInstructionJmpTable = .LdvmAsmInstructionJmpTable
 .long .L_OP_IPUT_OBJECT_VOLATILE
 .long .L_OP_SGET_OBJECT_VOLATILE
 .long .L_OP_SPUT_OBJECT_VOLATILE
-.long .L_OP_UNUSED_FF
+.long .L_OP_DISPATCH_FF
 
 
 /* File: x86/footer.S */

diff --git a/vm/mterp/out/InterpC-allstubs.c b/vm/mterp/out/InterpC-allstubs.c
index 2137645..5d8e3d6 100644 (file)
--- a/vm/mterp/out/InterpC-allstubs.c
+++ b/vm/mterp/out/InterpC-allstubs.c
@@ -3036,8 +3036,8 @@ OP_END
 HANDLE_SPUT_X(OP_SPUT_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_UNUSED_FF.c */
-HANDLE_OPCODE(OP_UNUSED_FF)
+/* File: c/OP_DISPATCH_FF.c */
+HANDLE_OPCODE(OP_DISPATCH_FF)
     /*
      * In portable interp, most unused opcodes will fall through to here.
      */

diff --git a/vm/mterp/out/InterpC-portdbg.c b/vm/mterp/out/InterpC-portdbg.c
index 04b6fbf..bf1825c 100644 (file)
--- a/vm/mterp/out/InterpC-portdbg.c
+++ b/vm/mterp/out/InterpC-portdbg.c
@@ -3392,8 +3392,8 @@ OP_END
 HANDLE_SPUT_X(OP_SPUT_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_UNUSED_FF.c */
-HANDLE_OPCODE(OP_UNUSED_FF)
+/* File: c/OP_DISPATCH_FF.c */
+HANDLE_OPCODE(OP_DISPATCH_FF)
     /*
      * In portable interp, most unused opcodes will fall through to here.
      */

diff --git a/vm/mterp/out/InterpC-portstd.c b/vm/mterp/out/InterpC-portstd.c
index 6f9b595..9abe3c4 100644 (file)
--- a/vm/mterp/out/InterpC-portstd.c
+++ b/vm/mterp/out/InterpC-portstd.c
@@ -3142,8 +3142,8 @@ OP_END
 HANDLE_SPUT_X(OP_SPUT_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_UNUSED_FF.c */
-HANDLE_OPCODE(OP_UNUSED_FF)
+/* File: c/OP_DISPATCH_FF.c */
+HANDLE_OPCODE(OP_DISPATCH_FF)
     /*
      * In portable interp, most unused opcodes will fall through to here.
      */

diff --git a/vm/mterp/x86-atom/OP_UNUSED_FF.S b/vm/mterp/x86-atom/OP_DISPATCH_FF.S
similarity index 96%
rename from vm/mterp/x86-atom/OP_UNUSED_FF.S
rename to vm/mterp/x86-atom/OP_DISPATCH_FF.S
index e831696..3c1c9f5 100644 (file)
--- a/vm/mterp/x86-atom/OP_UNUSED_FF.S
+++ b/vm/mterp/x86-atom/OP_DISPATCH_FF.S
@@ -14,7 +14,7 @@
     */
 
    /*
-    * File: OP_UNUSED_FF.S
+    * File: OP_DISPATCH_FF.S
     */
 
 %include "x86-atom/unused.S"

diff --git a/vm/mterp/x86-atom/entry.S b/vm/mterp/x86-atom/entry.S
index 8a3c9c1..3796838 100644 (file)
--- a/vm/mterp/x86-atom/entry.S
+++ b/vm/mterp/x86-atom/entry.S
@@ -388,4 +388,4 @@ dvmAsmInstructionJmpTable = .LdvmAsmInstructionJmpTable
 .long .L_OP_UNUSED_FC
 .long .L_OP_UNUSED_FD
 .long .L_OP_UNUSED_FE
-.long .L_OP_UNUSED_FF
+.long .L_OP_DISPATCH_FF

diff --git a/vm/mterp/x86/OP_UNUSED_FF.S b/vm/mterp/x86/OP_DISPATCH_FF.S
similarity index 100%
rename from vm/mterp/x86/OP_UNUSED_FF.S
rename to vm/mterp/x86/OP_DISPATCH_FF.S

diff --git a/vm/mterp/x86/entry.S b/vm/mterp/x86/entry.S
index a10a49e..27ef51c 100644 (file)
--- a/vm/mterp/x86/entry.S
+++ b/vm/mterp/x86/entry.S
@@ -376,5 +376,5 @@ dvmAsmInstructionJmpTable = .LdvmAsmInstructionJmpTable
 .long .L_OP_IPUT_OBJECT_VOLATILE
 .long .L_OP_SGET_OBJECT_VOLATILE
 .long .L_OP_SPUT_OBJECT_VOLATILE
-.long .L_OP_UNUSED_FF
+.long .L_OP_DISPATCH_FF