diff options
author | Dan Bornstein <danfuzz@android.com> | 2010-12-02 16:46:25 -0800 |
---|---|---|
committer | Dan Bornstein <danfuzz@android.com> | 2010-12-02 16:46:25 -0800 |
commit | 90f15431b24a4004fab2db70f273155fcd1c42a4 (patch) | |
tree | ea01ea39a8a999e3ec437812ded80f6375ff1344 /vm | |
parent | 3c4dc3bc03f87e181c06f633c4c085341faeee92 (diff) | |
download | android_dalvik-90f15431b24a4004fab2db70f273155fcd1c42a4.tar.gz android_dalvik-90f15431b24a4004fab2db70f273155fcd1c42a4.tar.bz2 android_dalvik-90f15431b24a4004fab2db70f273155fcd1c42a4.zip |
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
Diffstat (limited to 'vm')
20 files changed, 30 insertions, 30 deletions
diff --git a/vm/analysis/CodeVerify.c b/vm/analysis/CodeVerify.c index f53956edb..8bb0da04c 100644 --- 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 a1f2db362..2e2d26751 100644 --- 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 dad52bf60..924ba6290 100644 --- 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 55fee0ef6..0c5b617f3 100644 --- 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 index faa7246f5..faa7246f5 100644 --- a/vm/mterp/armv5te/OP_UNUSED_FF.S +++ b/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 index f4743db9b..a058b99d6 100644 --- 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 b46663d3a..e1e88669e 100644 --- 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 2cecb8fc8..3b7ec3ec1 100644 --- 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 d3151a59d..0d5502efd 100644 --- 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 eadbca43c..1398a94bf 100644 --- 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 04753667f..489098a64 100644 --- 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 dedd946f1..136e2f293 100644 --- 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 72736066e..b2bcd08ee 100644 --- 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 21376458b..5d8e3d66e 100644 --- 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 04b6fbfa1..bf1825ceb 100644 --- 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 6f9b59547..9abe3c4c4 100644 --- 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 index e831696aa..3c1c9f553 100644 --- 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 8a3c9c13e..37968385e 100644 --- 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 index 31d98c1f3..31d98c1f3 100644 --- a/vm/mterp/x86/OP_UNUSED_FF.S +++ b/vm/mterp/x86/OP_DISPATCH_FF.S diff --git a/vm/mterp/x86/entry.S b/vm/mterp/x86/entry.S index a10a49e1e..27ef51c7d 100644 --- 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 |