From 26f4046e17207c00eae7e541eb71b0564d0f2e7e Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Tue, 8 Jun 2004 00:46:54 +0000 Subject: [PATCH] Remove obsolete opcodes which violate "_jit_load_opcode"'s rules. --- ChangeLog | 3 +++ include/jit/jit-opcode.h | 34 ++++++++++++++++------------------ jit/jit-interp.c | 16 ---------------- jit/jit-opcode.c | 2 -- 4 files changed, 19 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9aa0a5a..cf4056f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ * jit/Makefile.am, jit/jit-cpuid-x86.c, jit/jit-cpuid-x86.h: add an API for querying the x86 "cpuid" information. + * include/jit/jit-opcode.h, jit/jit-interp.c, jit/jit-opcode.c: + remove obsolete opcodes which violate "_jit_load_opcode"'s rules. + 2004-06-08 Miroslaw Dobrzanski-Neumann * jit/jit-alloc.c: fix ROUND_END_PTR so that it adds the size diff --git a/include/jit/jit-opcode.h b/include/jit/jit-opcode.h index 8f51f7d..ef1710a 100644 --- a/include/jit/jit-opcode.h +++ b/include/jit/jit-opcode.h @@ -479,36 +479,34 @@ extern "C" { #define JIT_OP_LOAD_ELEMENT_SHORT 0x0186 #define JIT_OP_LOAD_ELEMENT_USHORT 0x0187 #define JIT_OP_LOAD_ELEMENT_INT 0x0188 -#define JIT_OP_LOAD_ELEMENT_UINT 0x0189 -#define JIT_OP_LOAD_ELEMENT_LONG 0x018A -#define JIT_OP_LOAD_ELEMENT_ULONG 0x018B -#define JIT_OP_LOAD_ELEMENT_FLOAT32 0x018C -#define JIT_OP_LOAD_ELEMENT_FLOAT64 0x018D -#define JIT_OP_LOAD_ELEMENT_NFLOAT 0x018E -#define JIT_OP_STORE_ELEMENT_BYTE 0x018F -#define JIT_OP_STORE_ELEMENT_SHORT 0x0190 -#define JIT_OP_STORE_ELEMENT_INT 0x0191 -#define JIT_OP_STORE_ELEMENT_LONG 0x0192 -#define JIT_OP_STORE_ELEMENT_FLOAT32 0x0193 -#define JIT_OP_STORE_ELEMENT_FLOAT64 0x0194 -#define JIT_OP_STORE_ELEMENT_NFLOAT 0x0195 +#define JIT_OP_LOAD_ELEMENT_LONG 0x0189 +#define JIT_OP_LOAD_ELEMENT_FLOAT32 0x018A +#define JIT_OP_LOAD_ELEMENT_FLOAT64 0x018B +#define JIT_OP_LOAD_ELEMENT_NFLOAT 0x018C +#define JIT_OP_STORE_ELEMENT_BYTE 0x018D +#define JIT_OP_STORE_ELEMENT_SHORT 0x018E +#define JIT_OP_STORE_ELEMENT_INT 0x018F +#define JIT_OP_STORE_ELEMENT_LONG 0x0190 +#define JIT_OP_STORE_ELEMENT_FLOAT32 0x0191 +#define JIT_OP_STORE_ELEMENT_FLOAT64 0x0192 +#define JIT_OP_STORE_ELEMENT_NFLOAT 0x0193 /* * Block operations. */ -#define JIT_OP_MEMCPY 0x0196 -#define JIT_OP_MEMMOVE 0x0197 -#define JIT_OP_MEMSET 0x0198 +#define JIT_OP_MEMCPY 0x0194 +#define JIT_OP_MEMMOVE 0x0195 +#define JIT_OP_MEMSET 0x0196 /* * Allocate memory from the stack. */ -#define JIT_OP_ALLOCA 0x0199 +#define JIT_OP_ALLOCA 0x0197 /* * The number of opcodes in the above list. */ -#define JIT_OP_NUM_OPCODES 0x019A +#define JIT_OP_NUM_OPCODES 0x0198 /* * Opcode information. diff --git a/jit/jit-interp.c b/jit/jit-interp.c index 2fe2c0d..08ef999 100644 --- a/jit/jit-interp.c +++ b/jit/jit-interp.c @@ -3846,14 +3846,6 @@ void _jit_run_function(jit_function_interp_t func, jit_item *args, } VMBREAK; - VMCASE(JIT_OP_LOAD_ELEMENT_UINT): - { - /* Load an unsigned 32-bit integer value from an array */ - VM_STK_UINT1 = VM_LOAD_ELEM(jit_uint); - VM_MODIFY_PC_AND_STACK(1, 1); - } - VMBREAK; - VMCASE(JIT_OP_LOAD_ELEMENT_LONG): { /* Load a signed 64-bit integer value from an array */ @@ -3862,14 +3854,6 @@ void _jit_run_function(jit_function_interp_t func, jit_item *args, } VMBREAK; - VMCASE(JIT_OP_LOAD_ELEMENT_ULONG): - { - /* Load an unsigned 64-bit integer value from an array */ - VM_STK_ULONG1 = VM_LOAD_ELEM(jit_ulong); - VM_MODIFY_PC_AND_STACK(1, 1); - } - VMBREAK; - VMCASE(JIT_OP_LOAD_ELEMENT_FLOAT32): { /* Load a 32-bit float value from an array */ diff --git a/jit/jit-opcode.c b/jit/jit-opcode.c index a2621d4..c985ef0 100644 --- a/jit/jit-opcode.c +++ b/jit/jit-opcode.c @@ -495,9 +495,7 @@ jit_opcode_info_t const jit_opcodes[JIT_OP_NUM_OPCODES] = { {"load_element_short", F_(INT, PTR, INT)}, {"load_element_ushort", F_(INT, PTR, INT)}, {"load_element_int", F_(INT, PTR, INT)}, - {"load_element_uint", F_(INT, PTR, INT)}, {"load_element_long", F_(LONG, PTR, INT)}, - {"load_element_ulong", F_(LONG, PTR, INT)}, {"load_element_float32", F_(FLOAT32, PTR, INT)}, {"load_element_float64", F_(FLOAT64, PTR, INT)}, {"load_element_nfloat", F_(NFLOAT, PTR, INT)}, -- 2.47.3