Remove handling unsupported opcodes in loader (#1464)

wenyongh · web-flow · commit 8a7dd4dc3ed4 · 2022-09-08T15:38:16.000+08:00
Remove handling opcode DROP_64/SELECT_64 in loader stage
prepare_bytecode, as they are the modified opcodes of DROP/SELECT
for optimization purpose, but not the opcodes defined by spec.
diff --git a/core/iwasm/interpreter/wasm_loader.c b/core/iwasm/interpreter/wasm_loader.c
@@ -7313,7 +7313,6 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
             }
 
             case WASM_OP_DROP:
-            case WASM_OP_DROP_64:
             {
                 BranchBlock *cur_block = loader_ctx->frame_csp - 1;
                 int32 available_stack_cell =
@@ -7381,7 +7380,6 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
             }
 
             case WASM_OP_SELECT:
-            case WASM_OP_SELECT_64:
             {
                 uint8 ref_type;
                 BranchBlock *cur_block = loader_ctx->frame_csp - 1;
diff --git a/core/iwasm/interpreter/wasm_mini_loader.c b/core/iwasm/interpreter/wasm_mini_loader.c
@@ -5519,7 +5519,6 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
             }
 
             case WASM_OP_DROP:
-            case WASM_OP_DROP_64:
             {
                 BranchBlock *cur_block = loader_ctx->frame_csp - 1;
                 int32 available_stack_cell =
@@ -5572,7 +5571,6 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,
             }
 
             case WASM_OP_SELECT:
-            case WASM_OP_SELECT_64:
             {
                 uint8 ref_type;
                 BranchBlock *cur_block = loader_ctx->frame_csp - 1;

Original file line number	Diff line number	Diff line change
`@@ -7313,7 +7313,6 @@ wasm_loader_prepare_bytecode(WASMModule module, WASMFunction func,`
`7313`	`7313`	`}`
`7314`	`7314`
`7315`	`7315`	`case WASM_OP_DROP:`
`7316`		`- case WASM_OP_DROP_64:`
`7317`	`7316`	`{`
`7318`	`7317`	`BranchBlock *cur_block = loader_ctx->frame_csp - 1;`
`7319`	`7318`	`int32 available_stack_cell =`
`@@ -7381,7 +7380,6 @@ wasm_loader_prepare_bytecode(WASMModule module, WASMFunction func,`
`7381`	`7380`	`}`
`7382`	`7381`
`7383`	`7382`	`case WASM_OP_SELECT:`
`7384`		`- case WASM_OP_SELECT_64:`
`7385`	`7383`	`{`
`7386`	`7384`	`uint8 ref_type;`
`7387`	`7385`	`BranchBlock *cur_block = loader_ctx->frame_csp - 1;`
Original file line number	Diff line number	Diff line change
`@@ -5519,7 +5519,6 @@ wasm_loader_prepare_bytecode(WASMModule module, WASMFunction func,`
`5519`	`5519`	`}`
`5520`	`5520`
`5521`	`5521`	`case WASM_OP_DROP:`
`5522`		`- case WASM_OP_DROP_64:`
`5523`	`5522`	`{`
`5524`	`5523`	`BranchBlock *cur_block = loader_ctx->frame_csp - 1;`
`5525`	`5524`	`int32 available_stack_cell =`
`@@ -5572,7 +5571,6 @@ wasm_loader_prepare_bytecode(WASMModule module, WASMFunction func,`
`5572`	`5571`	`}`
`5573`	`5572`
`5574`	`5573`	`case WASM_OP_SELECT:`
`5575`		`- case WASM_OP_SELECT_64:`
`5576`	`5574`	`{`
`5577`	`5575`	`uint8 ref_type;`
`5578`	`5576`	`BranchBlock *cur_block = loader_ctx->frame_csp - 1;`