diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-08-15 22:18:30 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-08-15 22:18:30 +0300 |
| commit | 3c35348a83a87e68ce6f0447ffbbf2482bcb9e30 (patch) | |
| tree | 31c3f6df4963a04a799edb3ebd3fa8b7b98fd6d4 | |
| parent | 2b9d9142c5195b642bc192486dd749088e44510c (diff) | |
| download | jato-3c35348a83a87e68ce6f0447ffbbf2482bcb9e30.tar.gz | |
vm: Kill "quick" JVM bytecode opcodes
The "quick" JVM bytecode opcodes have never been used by Jato so drop
them. They are there for historical reasons only when Jato was still a
JIT compiler inside JamVM.
Signed-off-by: Pekka Enberg <penberg@kernel.org>
| -rw-r--r-- | include/vm/opcodes.h | 25 | ||||
| -rw-r--r-- | vm/bytecode.c | 5 |
2 files changed, 2 insertions, 28 deletions
diff --git a/include/vm/opcodes.h b/include/vm/opcodes.h index 90d7d7d7..da8c60c3 100644 --- a/include/vm/opcodes.h +++ b/include/vm/opcodes.h @@ -207,31 +207,6 @@ #define OPC_GOTO_W 0xc8 #define OPC_JSR_W 0xc9 #define OPC_BREAKPOINT 0xca -#define OPC_LDC_QUICK 0xcb -#define OPC_LDC_W_QUICK 0xcc -#define OPC_LDC2_W_QUICK 0xcd -#define OPC_GETFIELD_QUICK 0xce -#define OPC_PUTFIELD_QUICK 0xcf -#define OPC_GETFIELD2_QUICK 0xd0 -#define OPC_PUTFIELD2_QUICK 0xd1 -#define OPC_GETSTATIC_QUICK 0xd2 -#define OPC_PUTSTATIC_QUICK 0xd3 -#define OPC_GETSTATIC2_QUICK 0xd4 -#define OPC_PUTSTATIC2_QUICK 0xd5 -#define OPC_INVOKEVIRTUAL_QUICK 0xd6 -#define OPC_INVOKENONVIRTUAL_QUICK 0xd7 -#define OPC_INVOKESUPER_QUICK 0xd8 -#define OPC_INVOKESTATIC_QUICK 0xd9 -#define OPC_INVOKEINTERFACE_QUICK 0xda -#define OPC_INVOKEVIRTUALOBJECT_QUICK 0xdb -#define OPC_NEW_QUICK 0xdd -#define OPC_ANEWARRAY_QUICK 0xde -#define OPC_MULTIANEWARRAY_QUICK 0xdf -#define OPC_CHECKCAST_QUICK 0xe0 -#define OPC_INSTANCEOF_QUICK 0xe1 -#define OPC_INVOKEVIRTUAL_QUICK_W 0xe2 -#define OPC_GETFIELD_QUICK_W 0xe3 -#define OPC_PUTFIELD_QUICK_W 0xe4 #define OPC_IMPDEP1 0xfe #define OPC_IMPDEP2 0xff diff --git a/vm/bytecode.c b/vm/bytecode.c index 0a39108c..8d2dc24b 100644 --- a/vm/bytecode.c +++ b/vm/bytecode.c @@ -374,10 +374,9 @@ bool bc_ends_basic_block(unsigned char code) bool bc_is_invalid(unsigned char opc) { - return opc == OPC_BREAKPOINT + return opc >= OPC_BREAKPOINT || opc == OPC_XXXUNUSEDXXX - || opc == OPC_XXXUNUSEDXXX_ - || opc > OPC_PUTFIELD_QUICK_W; + || opc == OPC_XXXUNUSEDXXX_; } bool bc_is_ldc(unsigned char opc) |