diff options
| author | Ben Smith <binji@chromium.org> | 2016-12-15 13:56:06 -0800 |
|---|---|---|
| committer | Ben Smith <binji@chromium.org> | 2016-12-15 15:22:45 -0800 |
| commit | 8d0fcc1fe04fd3497795a01c692667d7d47f3441 (patch) | |
| tree | 12cc82b236bc1aa376d60bd9a22ece577dfc10c7 | |
| parent | 180003ae092d1f083a1142fd5966aa5c24664cf8 (diff) | |
| download | wabt-8d0fcc1fe04fd3497795a01c692667d7d47f3441.tar.gz wabt-8d0fcc1fe04fd3497795a01c692667d7d47f3441.tar.bz2 wabt-8d0fcc1fe04fd3497795a01c692667d7d47f3441.zip | |
Update testsuite to f71cbe72bd5f4fb871bee39a9dc1278fa662a8a5
25 files changed, 714 insertions, 578 deletions
diff --git a/src/binary-reader-ast.c b/src/binary-reader-ast.c index e82b82c2..68c49be7 100644 --- a/src/binary-reader-ast.c +++ b/src/binary-reader-ast.c @@ -1163,5 +1163,7 @@ WasmResult wasm_read_binary_ast(struct WasmAllocator* allocator, WasmResult result = wasm_read_binary(allocator, data, size, &reader, 1, options); WASM_DESTROY_VECTOR_AND_ELEMENTS(allocator, ctx.label_stack, label_node); + if (WASM_FAILED(result)) + wasm_destroy_module(allocator, out_module); return result; } diff --git a/src/binary-reader.c b/src/binary-reader.c index a9927c13..d32bfc1f 100644 --- a/src/binary-reader.c +++ b/src/binary-reader.c @@ -1914,7 +1914,7 @@ WasmResult wasm_read_binary(WasmAllocator* allocator, CALLBACK_SECTION(begin_memory_section); uint32_t i; in_u32_leb128(ctx, &ctx->num_memories, "memory count"); - RAISE_ERROR_UNLESS(ctx->num_memories, "memory count must be 0 or 1"); + RAISE_ERROR_UNLESS(ctx->num_memories <= 1, "memory count must be 0 or 1"); CALLBACK(on_memory_count, ctx->num_memories); for (i = 0; i < ctx->num_memories; ++i) { WasmLimits page_limits; @@ -1999,12 +1999,12 @@ WasmResult wasm_read_binary(WasmAllocator* allocator, /* elem */ if (skip_until_section(ctx, WASM_BINARY_SECTION_ELEM, §ion_size)) { - RAISE_ERROR_UNLESS(num_total_tables(ctx) > 0, - "elem section without table section"); CALLBACK_SECTION(begin_elem_section); uint32_t i, num_elem_segments; in_u32_leb128(ctx, &num_elem_segments, "elem segment count"); CALLBACK(on_elem_segment_count, num_elem_segments); + RAISE_ERROR_UNLESS(num_elem_segments == 0 || num_total_tables(ctx) > 0, + "elem section without table section"); for (i = 0; i < num_elem_segments; ++i) { uint32_t table_index; in_u32_leb128(ctx, &table_index, "elem segment table index"); @@ -2073,12 +2073,12 @@ WasmResult wasm_read_binary(WasmAllocator* allocator, /* data */ if (skip_until_section(ctx, WASM_BINARY_SECTION_DATA, §ion_size)) { - RAISE_ERROR_UNLESS(num_total_memories(ctx) > 0, - "data section without memory section"); CALLBACK_SECTION(begin_data_section); uint32_t i, num_data_segments; in_u32_leb128(ctx, &num_data_segments, "data segment count"); CALLBACK(on_data_segment_count, num_data_segments); + RAISE_ERROR_UNLESS(num_data_segments == 0 || num_total_memories(ctx) > 0, + "data section without memory section"); for (i = 0; i < num_data_segments; ++i) { uint32_t memory_index; in_u32_leb128(ctx, &memory_index, "data segment memory index"); diff --git a/src/tools/wasm2wast.c b/src/tools/wasm2wast.c index fd94b8ec..55050f96 100644 --- a/src/tools/wasm2wast.c +++ b/src/tools/wasm2wast.c @@ -189,10 +189,11 @@ int main(int argc, char** argv) { wasm_close_file_writer(&file_writer); } } + + if (s_use_libc_allocator) + wasm_destroy_module(allocator, &module); } - if (s_use_libc_allocator) - wasm_destroy_module(allocator, &module); wasm_free(allocator, data); wasm_print_allocator_stats(allocator); wasm_destroy_allocator(allocator); diff --git a/src/validator.c b/src/validator.c index 635dd3ba..79b3316d 100644 --- a/src/validator.c +++ b/src/validator.c @@ -565,6 +565,15 @@ static void check_block(Context* ctx, ctx->type_stack.size = ctx->top_label->type_stack_limit; } +static void check_has_memory(Context* ctx, + const WasmLocation* loc, + WasmOpcode opcode) { + if (ctx->current_module->memories.size == 0) { + print_error(ctx, loc, "%s requires an imported or defined memory.", + wasm_get_opcode_name(opcode)); + } +} + static void check_expr(Context* ctx, const WasmExpr* expr) { switch (expr->type) { case WASM_EXPR_TYPE_BINARY: @@ -663,6 +672,7 @@ static void check_expr(Context* ctx, const WasmExpr* expr) { } case WASM_EXPR_TYPE_GROW_MEMORY: + check_has_memory(ctx, &expr->loc, WASM_OPCODE_GROW_MEMORY); check_opcode1(ctx, &expr->loc, WASM_OPCODE_GROW_MEMORY); break; @@ -678,6 +688,7 @@ static void check_expr(Context* ctx, const WasmExpr* expr) { } case WASM_EXPR_TYPE_LOAD: + check_has_memory(ctx, &expr->loc, expr->load.opcode); check_align(ctx, &expr->loc, expr->load.align, get_opcode_natural_alignment(expr->load.opcode)); check_offset(ctx, &expr->loc, expr->load.offset); @@ -694,6 +705,7 @@ static void check_expr(Context* ctx, const WasmExpr* expr) { } case WASM_EXPR_TYPE_CURRENT_MEMORY: + check_has_memory(ctx, &expr->loc, WASM_OPCODE_CURRENT_MEMORY); push_type(ctx, WASM_TYPE_I32); break; @@ -739,6 +751,7 @@ static void check_expr(Context* ctx, const WasmExpr* expr) { } case WASM_EXPR_TYPE_STORE: + check_has_memory(ctx, &expr->loc, expr->store.opcode); check_align(ctx, &expr->loc, expr->store.align, get_opcode_natural_alignment(expr->store.opcode)); check_offset(ctx, &expr->loc, expr->store.offset); diff --git a/test/binary/bad-segment-no-memory.txt b/test/binary/bad-segment-no-memory.txt index 9bc19d86..16d08fb7 100644 --- a/test/binary/bad-segment-no-memory.txt +++ b/test/binary/bad-segment-no-memory.txt @@ -9,6 +9,6 @@ section(DATA) { } (;; STDERR ;;; Error running "wasm2wast": -error: @0x0000000a: data section without memory section +error: @0x0000000b: data section without memory section ;;; STDERR ;;) diff --git a/test/dump/load-aligned.txt b/test/dump/load-aligned.txt index 034ead3e..eb6f01d3 100644 --- a/test/dump/load-aligned.txt +++ b/test/dump/load-aligned.txt @@ -1,6 +1,7 @@ ;;; TOOL: run-wasmdump ;;; FLAGS: -v (module + (memory 1) (func i32.const 0 i32.load8_s align=1 @@ -68,162 +69,170 @@ 0000010: 01 ; num functions 0000011: 00 ; function 0 signature index 000000f: 02 ; FIXUP section size -; section "CODE" (10) -0000012: 0a ; section code +; section "MEMORY" (5) +0000012: 05 ; section code 0000013: 00 ; section size (guess) -0000014: 01 ; num functions +0000014: 01 ; num memories +; memory 0 +0000015: 00 ; limits: flags +0000016: 01 ; limits: initial +0000013: 03 ; FIXUP section size +; section "CODE" (10) +0000017: 0a ; section code +0000018: 00 ; section size (guess) +0000019: 01 ; num functions ; function body 0 -0000015: 00 ; func body size (guess) -0000016: 00 ; local decl count -0000017: 41 ; i32.const -0000018: 00 ; i32 literal -0000019: 2c ; i32.load8_s -000001a: 00 ; alignment -000001b: 00 ; load offset -000001c: 1a ; drop -000001d: 41 ; i32.const -000001e: 00 ; i32 literal -000001f: 2e ; i32.load16_s -0000020: 00 ; alignment -0000021: 00 ; load offset -0000022: 1a ; drop -0000023: 41 ; i32.const -0000024: 00 ; i32 literal -0000025: 2e ; i32.load16_s -0000026: 01 ; alignment -0000027: 00 ; load offset -0000028: 1a ; drop -0000029: 41 ; i32.const -000002a: 00 ; i32 literal -000002b: 28 ; i32.load -000002c: 00 ; alignment -000002d: 00 ; load offset -000002e: 1a ; drop -000002f: 41 ; i32.const -0000030: 00 ; i32 literal -0000031: 28 ; i32.load -0000032: 01 ; alignment -0000033: 00 ; load offset -0000034: 1a ; drop -0000035: 41 ; i32.const -0000036: 00 ; i32 literal -0000037: 28 ; i32.load -0000038: 02 ; alignment -0000039: 00 ; load offset -000003a: 1a ; drop -000003b: 41 ; i32.const -000003c: 00 ; i32 literal -000003d: 30 ; i64.load8_s -000003e: 00 ; alignment -000003f: 00 ; load offset -0000040: 1a ; drop -0000041: 41 ; i32.const -0000042: 00 ; i32 literal -0000043: 32 ; i64.load16_s -0000044: 00 ; alignment -0000045: 00 ; load offset -0000046: 1a ; drop -0000047: 41 ; i32.const -0000048: 00 ; i32 literal -0000049: 32 ; i64.load16_s -000004a: 01 ; alignment -000004b: 00 ; load offset -000004c: 1a ; drop -000004d: 41 ; i32.const -000004e: 00 ; i32 literal -000004f: 34 ; i64.load32_s -0000050: 00 ; alignment -0000051: 00 ; load offset -0000052: 1a ; drop -0000053: 41 ; i32.const -0000054: 00 ; i32 literal -0000055: 34 ; i64.load32_s -0000056: 01 ; alignment -0000057: 00 ; load offset -0000058: 1a ; drop -0000059: 41 ; i32.const -000005a: 00 ; i32 literal -000005b: 34 ; i64.load32_s -000005c: 02 ; alignment -000005d: 00 ; load offset -000005e: 1a ; drop -000005f: 41 ; i32.const -0000060: 00 ; i32 literal -0000061: 29 ; i64.load -0000062: 00 ; alignment -0000063: 00 ; load offset -0000064: 1a ; drop -0000065: 41 ; i32.const -0000066: 00 ; i32 literal -0000067: 29 ; i64.load -0000068: 01 ; alignment -0000069: 00 ; load offset -000006a: 1a ; drop -000006b: 41 ; i32.const -000006c: 00 ; i32 literal -000006d: 29 ; i64.load -000006e: 02 ; alignment -000006f: 00 ; load offset -0000070: 1a ; drop -0000071: 41 ; i32.const -0000072: 00 ; i32 literal -0000073: 29 ; i64.load -0000074: 03 ; alignment -0000075: 00 ; load offset -0000076: 1a ; drop -0000077: 0b ; end -0000015: 62 ; FIXUP func body size -0000013: 64 ; FIXUP section size +000001a: 00 ; func body size (guess) +000001b: 00 ; local decl count +000001c: 41 ; i32.const +000001d: 00 ; i32 literal +000001e: 2c ; i32.load8_s +000001f: 00 ; alignment +0000020: 00 ; load offset +0000021: 1a ; drop +0000022: 41 ; i32.const +0000023: 00 ; i32 literal +0000024: 2e ; i32.load16_s +0000025: 00 ; alignment +0000026: 00 ; load offset +0000027: 1a ; drop +0000028: 41 ; i32.const +0000029: 00 ; i32 literal +000002a: 2e ; i32.load16_s +000002b: 01 ; alignment +000002c: 00 ; load offset +000002d: 1a ; drop +000002e: 41 ; i32.const +000002f: 00 ; i32 literal +0000030: 28 ; i32.load +0000031: 00 ; alignment +0000032: 00 ; load offset +0000033: 1a ; drop +0000034: 41 ; i32.const +0000035: 00 ; i32 literal +0000036: 28 ; i32.load +0000037: 01 ; alignment +0000038: 00 ; load offset +0000039: 1a ; drop +000003a: 41 ; i32.const +000003b: 00 ; i32 literal +000003c: 28 ; i32.load +000003d: 02 ; alignment +000003e: 00 ; load offset +000003f: 1a ; drop +0000040: 41 ; i32.const +0000041: 00 ; i32 literal +0000042: 30 ; i64.load8_s +0000043: 00 ; alignment +0000044: 00 ; load offset +0000045: 1a ; drop +0000046: 41 ; i32.const +0000047: 00 ; i32 literal +0000048: 32 ; i64.load16_s +0000049: 00 ; alignment +000004a: 00 ; load offset +000004b: 1a ; drop +000004c: 41 ; i32.const +000004d: 00 ; i32 literal +000004e: 32 ; i64.load16_s +000004f: 01 ; alignment +0000050: 00 ; load offset +0000051: 1a ; drop +0000052: 41 ; i32.const +0000053: 00 ; i32 literal +0000054: 34 ; i64.load32_s +0000055: 00 ; alignment +0000056: 00 ; load offset +0000057: 1a ; drop +0000058: 41 ; i32.const +0000059: 00 ; i32 literal +000005a: 34 ; i64.load32_s +000005b: 01 ; alignment +000005c: 00 ; load offset +000005d: 1a ; drop +000005e: 41 ; i32.const +000005f: 00 ; i32 literal +0000060: 34 ; i64.load32_s +0000061: 02 ; alignment +0000062: 00 ; load offset +0000063: 1a ; drop +0000064: 41 ; i32.const +0000065: 00 ; i32 literal +0000066: 29 ; i64.load +0000067: 00 ; alignment +0000068: 00 ; load offset +0000069: 1a ; drop +000006a: 41 ; i32.const +000006b: 00 ; i32 literal +000006c: 29 ; i64.load +000006d: 01 ; alignment +000006e: 00 ; load offset +000006f: 1a ; drop +0000070: 41 ; i32.const +0000071: 00 ; i32 literal +0000072: 29 ; i64.load +0000073: 02 ; alignment +0000074: 00 ; load offset +0000075: 1a ; drop +0000076: 41 ; i32.const +0000077: 00 ; i32 literal +0000078: 29 ; i64.load +0000079: 03 ; alignment +000007a: 00 ; load offset +000007b: 1a ; drop +000007c: 0b ; end +000001a: 62 ; FIXUP func body size +0000018: 64 ; FIXUP section size load-aligned.wasm: file format wasm 0x00000d Code Disassembly: func 0 - 000017: 41 00 | i32.const 0 - 000019: 2c 00 00 | i32.load8_s 0 0 - 00001c: 1a | drop - 00001d: 41 00 | i32.const 0 - 00001f: 2e 00 00 | i32.load16_s 0 0 - 000022: 1a | drop - 000023: 41 00 | i32.const 0 - 000025: 2e 01 00 | i32.load16_s 1 0 - 000028: 1a | drop - 000029: 41 00 | i32.const 0 - 00002b: 28 00 00 | i32.load 0 0 - 00002e: 1a | drop - 00002f: 41 00 | i32.const 0 - 000031: 28 01 00 | i32.load 1 0 - 000034: 1a | drop - 000035: 41 00 | i32.const 0 - 000037: 28 02 00 | i32.load 2 0 - 00003a: 1a | drop - 00003b: 41 00 | i32.const 0 - 00003d: 30 00 00 | i64.load8_s 0 0 - 000040: 1a | drop - 000041: 41 00 | i32.const 0 - 000043: 32 00 00 | i64.load16_s 0 0 - 000046: 1a | drop - 000047: 41 00 | i32.const 0 - 000049: 32 01 00 | i64.load16_s 1 0 - 00004c: 1a | drop - 00004d: 41 00 | i32.const 0 - 00004f: 34 00 00 | i64.load32_s 0 0 - 000052: 1a | drop - 000053: 41 00 | i32.const 0 - 000055: 34 01 00 | i64.load32_s 1 0 - 000058: 1a | drop - 000059: 41 00 | i32.const 0 - 00005b: 34 02 00 | i64.load32_s 2 0 - 00005e: 1a | drop - 00005f: 41 00 | i32.const 0 - 000061: 29 00 00 | i64.load 0 0 - 000064: 1a | drop - 000065: 41 00 | i32.const 0 - 000067: 29 01 00 | i64.load 1 0 - 00006a: 1a | drop - 00006b: 41 00 | i32.const 0 - 00006d: 29 02 00 | i64.load 2 0 - 000070: 1a | drop - 000071: 41 00 | i32.const 0 - 000073: 29 03 00 | i64.load 3 0 - 000076: 1a | drop + 00001c: 41 00 | i32.const 0 + 00001e: 2c 00 00 | i32.load8_s 0 0 + 000021: 1a | drop + 000022: 41 00 | i32.const 0 + 000024: 2e 00 00 | i32.load16_s 0 0 + 000027: 1a | drop + 000028: 41 00 | i32.const 0 + 00002a: 2e 01 00 | i32.load16_s 1 0 + 00002d: 1a | drop + 00002e: 41 00 | i32.const 0 + 000030: 28 00 00 | i32.load 0 0 + 000033: 1a | drop + 000034: 41 00 | i32.const 0 + 000036: 28 01 00 | i32.load 1 0 + 000039: 1a | drop + 00003a: 41 00 | i32.const 0 + 00003c: 28 02 00 | i32.load 2 0 + 00003f: 1a | drop + 000040: 41 00 | i32.const 0 + 000042: 30 00 00 | i64.load8_s 0 0 + 000045: 1a | drop + 000046: 41 00 | i32.const 0 + 000048: 32 00 00 | i64.load16_s 0 0 + 00004b: 1a | drop + 00004c: 41 00 | i32.const 0 + 00004e: 32 01 00 | i64.load16_s 1 0 + 000051: 1a | drop + 000052: 41 00 | i32.const 0 + 000054: 34 00 00 | i64.load32_s 0 0 + 000057: 1a | drop + 000058: 41 00 | i32.const 0 + 00005a: 34 01 00 | i64.load32_s 1 0 + 00005d: 1a | drop + 00005e: 41 00 | i32.const 0 + 000060: 34 02 00 | i64.load32_s 2 0 + 000063: 1a | drop + 000064: 41 00 | i32.const 0 + 000066: 29 00 00 | i64.load 0 0 + 000069: 1a | drop + 00006a: 41 00 | i32.const 0 + 00006c: 29 01 00 | i64.load 1 0 + 00006f: 1a | drop + 000070: 41 00 | i32.const 0 + 000072: 29 02 00 | i64.load 2 0 + 000075: 1a | drop + 000076: 41 00 | i32.const 0 + 000078: 29 03 00 | i64.load 3 0 + 00007b: 1a | drop ;;; STDOUT ;;) diff --git a/test/dump/load.txt b/test/dump/load.txt index 23f85900..c8d1bdf9 100644 --- a/test/dump/load.txt +++ b/test/dump/load.txt @@ -1,6 +1,7 @@ ;;; TOOL: run-wasmdump ;;; FLAGS: -v (module + (memory 1) (func i32.const 0 i32.load @@ -62,144 +63,152 @@ 0000010: 01 ; num functions 0000011: 00 ; function 0 signature index 000000f: 02 ; FIXUP section size -; section "CODE" (10) -0000012: 0a ; section code +; section "MEMORY" (5) +0000012: 05 ; section code 0000013: 00 ; section size (guess) -0000014: 01 ; num functions +0000014: 01 ; num memories +; memory 0 +0000015: 00 ; limits: flags +0000016: 01 ; limits: initial +0000013: 03 ; FIXUP section size +; section "CODE" (10) +0000017: 0a ; section code +0000018: 00 ; section size (guess) +0000019: 01 ; num functions ; function body 0 -0000015: 00 ; func body size (guess) -0000016: 00 ; local decl count -0000017: 41 ; i32.const -0000018: 00 ; i32 literal -0000019: 28 ; i32.load -000001a: 02 ; alignment -000001b: 00 ; load offset -000001c: 1a ; drop -000001d: 41 ; i32.const -000001e: 00 ; i32 literal -000001f: 2c ; i32.load8_s -0000020: 00 ; alignment -0000021: 00 ; load offset -0000022: 1a ; drop -0000023: 41 ; i32.const -0000024: 00 ; i32 literal -0000025: 2e ; i32.load16_s -0000026: 01 ; alignment -0000027: 00 ; load offset -0000028: 1a ; drop -0000029: 41 ; i32.const -000002a: 00 ; i32 literal -000002b: 2d ; i32.load8_u -000002c: 00 ; alignment -000002d: 00 ; load offset -000002e: 1a ; drop -000002f: 41 ; i32.const -0000030: 00 ; i32 literal -0000031: 2f ; i32.load16_u -0000032: 01 ; alignment -0000033: 00 ; load offset -0000034: 1a ; drop -0000035: 41 ; i32.const -0000036: 00 ; i32 literal -0000037: 29 ; i64.load -0000038: 03 ; alignment -0000039: 00 ; load offset -000003a: 1a ; drop -000003b: 41 ; i32.const -000003c: 00 ; i32 literal -000003d: 30 ; i64.load8_s -000003e: 00 ; alignment -000003f: 00 ; load offset -0000040: 1a ; drop -0000041: 41 ; i32.const -0000042: 00 ; i32 literal -0000043: 32 ; i64.load16_s -0000044: 01 ; alignment -0000045: 00 ; load offset -0000046: 1a ; drop -0000047: 41 ; i32.const -0000048: 00 ; i32 literal -0000049: 34 ; i64.load32_s -000004a: 02 ; alignment -000004b: 00 ; load offset -000004c: 1a ; drop -000004d: 41 ; i32.const -000004e: 00 ; i32 literal -000004f: 31 ; i64.load8_u -0000050: 00 ; alignment -0000051: 00 ; load offset -0000052: 1a ; drop -0000053: 41 ; i32.const -0000054: 00 ; i32 literal -0000055: 33 ; i64.load16_u -0000056: 01 ; alignment -0000057: 00 ; load offset -0000058: 1a ; drop -0000059: 41 ; i32.const -000005a: 00 ; i32 literal -000005b: 35 ; i64.load32_u -000005c: 02 ; alignment -000005d: 00 ; load offset -000005e: 1a ; drop -000005f: 41 ; i32.const -0000060: 00 ; i32 literal -0000061: 2a ; f32.load -0000062: 02 ; alignment -0000063: 00 ; load offset -0000064: 1a ; drop -0000065: 41 ; i32.const -0000066: 00 ; i32 literal -0000067: 2b ; f64.load -0000068: 03 ; alignment -0000069: 00 ; load offset -000006a: 1a ; drop -000006b: 0b ; end -0000015: 56 ; FIXUP func body size -0000013: 58 ; FIXUP section size +000001a: 00 ; func body size (guess) +000001b: 00 ; local decl count +000001c: 41 ; i32.const +000001d: 00 ; i32 literal +000001e: 28 ; i32.load +000001f: 02 ; alignment +0000020: 00 ; load offset +0000021: 1a ; drop +0000022: 41 ; i32.const +0000023: 00 ; i32 literal +0000024: 2c ; i32.load8_s +0000025: 00 ; alignment +0000026: 00 ; load offset +0000027: 1a ; drop +0000028: 41 ; i32.const +0000029: 00 ; i32 literal +000002a: 2e ; i32.load16_s +000002b: 01 ; alignment +000002c: 00 ; load offset +000002d: 1a ; drop +000002e: 41 ; i32.const +000002f: 00 ; i32 literal +0000030: 2d ; i32.load8_u +0000031: 00 ; alignment +0000032: 00 ; load offset +0000033: 1a ; drop +0000034: 41 ; i32.const +0000035: 00 ; i32 literal +0000036: 2f ; i32.load16_u +0000037: 01 ; alignment +0000038: 00 ; load offset +0000039: 1a ; drop +000003a: 41 ; i32.const +000003b: 00 ; i32 literal +000003c: 29 ; i64.load +000003d: 03 ; alignment +000003e: 00 ; load offset +000003f: 1a ; drop +0000040: 41 ; i32.const +0000041: 00 ; i32 literal +0000042: 30 ; i64.load8_s +0000043: 00 ; alignment +0000044: 00 ; load offset +0000045: 1a ; drop +0000046: 41 ; i32.const +0000047: 00 ; i32 literal +0000048: 32 ; i64.load16_s +0000049: 01 ; alignment +000004a: 00 ; load offset +000004b: 1a ; drop +000004c: 41 ; i32.const +000004d: 00 ; i32 literal +000004e: 34 ; i64.load32_s +000004f: 02 ; alignment +0000050: 00 ; load offset +0000051: 1a ; drop +0000052: 41 ; i32.const +0000053: 00 ; i32 literal +0000054: 31 ; i64.load8_u +0000055: 00 ; alignment +0000056: 00 ; load offset +0000057: 1a ; drop +0000058: 41 ; i32.const +0000059: 00 ; i32 literal +000005a: 33 ; i64.load16_u +000005b: 01 ; alignment +000005c: 00 ; load offset +000005d: 1a ; drop +000005e: 41 ; i32.const +000005f: 00 ; i32 literal +0000060: 35 ; i64.load32_u +0000061: 02 ; alignment +0000062: 00 ; load offset +0000063: 1a ; drop +0000064: 41 ; i32.const +0000065: 00 ; i32 literal +0000066: 2a ; f32.load +0000067: 02 ; alignment +0000068: 00 ; load offset +0000069: 1a ; drop +000006a: 41 ; i32.const +000006b: 00 ; i32 literal +000006c: 2b ; f64.load +000006d: 03 ; alignment +000006e: 00 ; load offset +000006f: 1a ; drop +0000070: 0b ; end +000001a: 56 ; FIXUP func body size +0000018: 58 ; FIXUP section size load.wasm: file format wasm 0x00000d Code Disassembly: func 0 - 000017: 41 00 | i32.const 0 - 000019: 28 02 00 | i32.load 2 0 - 00001c: 1a | drop - 00001d: 41 00 | i32.const 0 - 00001f: 2c 00 00 | i32.load8_s 0 0 - 000022: 1a | drop - 000023: 41 00 | i32.const 0 - 000025: 2e 01 00 | i32.load16_s 1 0 - 000028: 1a | drop - 000029: 41 00 | i32.const 0 - 00002b: 2d 00 00 | i32.load8_u 0 0 - 00002e: 1a | drop - 00002f: 41 00 | i32.const 0 - 000031: 2f 01 00 | i32.load16_u 1 0 - 000034: 1a | drop - 000035: 41 00 | i32.const 0 - 000037: 29 03 00 | i64.load 3 0 - 00003a: 1a | drop - 00003b: 41 00 | i32.const 0 - 00003d: 30 00 00 | i64.load8_s 0 0 - 000040: 1a | drop - 000041: 41 00 | i32.const 0 - 000043: 32 01 00 | i64.load16_s 1 0 - 000046: 1a | drop - 000047: 41 00 | i32.const 0 - 000049: 34 02 00 | i64.load32_s 2 0 - 00004c: 1a | drop - 00004d: 41 00 | i32.const 0 - 00004f: 31 00 00 | i64.load8_u 0 0 - 000052: 1a | drop - 000053: 41 00 | i32.const 0 - 000055: 33 01 00 | i64.load16_u 1 0 - 000058: 1a | drop - 000059: 41 00 | i32.const 0 - 00005b: 35 02 00 | i64.load32_u 2 0 - 00005e: 1a | drop - 00005f: 41 00 | i32.const 0 - 000061: 2a 02 00 | f32.load 2 0 - 000064: 1a | drop - 000065: 41 00 | i32.const 0 - 000067: 2b 03 00 | f64.load 3 0 - 00006a: 1a | drop + 00001c: 41 00 | i32.const 0 + 00001e: 28 02 00 | i32.load 2 0 + 000021: 1a | drop + 000022: 41 00 | i32.const 0 + 000024: 2c 00 00 | i32.load8_s 0 0 + 000027: 1a | drop + 000028: 41 00 | i32.const 0 + 00002a: 2e 01 00 | i32.load16_s 1 0 + 00002d: 1a | drop + 00002e: 41 00 | i32.const 0 + 000030: 2d 00 00 | i32.load8_u 0 0 + 000033: 1a | drop + 000034: 41 00 | i32.const 0 + 000036: 2f 01 00 | i32.load16_u 1 0 + 000039: 1a | drop + 00003a: 41 00 | i32.const 0 + 00003c: 29 03 00 | i64.load 3 0 + 00003f: 1a | drop + 000040: 41 00 | i32.const 0 + 000042: 30 00 00 | i64.load8_s 0 0 + 000045: 1a | drop + 000046: 41 00 | i32.const 0 + 000048: 32 01 00 | i64.load16_s 1 0 + 00004b: 1a | drop + 00004c: 41 00 | i32.const 0 + 00004e: 34 02 00 | i64.load32_s 2 0 + 000051: 1a | drop + 000052: 41 00 | i32.const 0 + 000054: 31 00 00 | i64.load8_u 0 0 + 000057: 1a | drop + 000058: 41 00 | i32.const 0 + 00005a: 33 01 00 | i64.load16_u 1 0 + 00005d: 1a | drop + 00005e: 41 00 | i32.const 0 + 000060: 35 02 00 | i64.load32_u 2 0 + 000063: 1a | drop + 000064: 41 00 | i32.const 0 + 000066: 2a 02 00 | f32.load 2 0 + 000069: 1a | drop + 00006a: 41 00 | i32.const 0 + 00006c: 2b 03 00 | f64.load 3 0 + 00006f: 1a | drop ;;; STDOUT ;;) diff --git a/test/dump/store-aligned.txt b/test/dump/store-aligned.txt index 6fb2ed15..50b6d9c3 100644 --- a/test/dump/store-aligned.txt +++ b/test/dump/store-aligned.txt @@ -1,6 +1,7 @@ ;;; TOOL: run-wasmdump ;;; FLAGS: -v (module + (memory 1) (func i32.const 0 i32.const 0 @@ -68,178 +69,186 @@ 0000010: 01 ; num functions 0000011: 00 ; function 0 signature index 000000f: 02 ; FIXUP section size -; section "CODE" (10) -0000012: 0a ; section code +; section "MEMORY" (5) +0000012: 05 ; section code 0000013: 00 ; section size (guess) -0000014: 01 ; num functions +0000014: 01 ; num memories +; memory 0 +0000015: 00 ; limits: flags +0000016: 01 ; limits: initial +0000013: 03 ; FIXUP section size +; section "CODE" (10) +0000017: 0a ; section code +0000018: 00 ; section size (guess) +0000019: 01 ; num functions ; function body 0 -0000015: 00 ; func body size (guess) -0000016: 00 ; local decl count -0000017: 41 ; i32.const -0000018: 00 ; i32 literal -0000019: 41 ; i32.const -000001a: 00 ; i32 literal -000001b: 3a ; i32.store8 -000001c: 00 ; alignment -000001d: 00 ; store offset +000001a: 00 ; func body size (guess) +000001b: 00 ; local decl count +000001c: 41 ; i32.const +000001d: 00 ; i32 literal 000001e: 41 ; i32.const 000001f: 00 ; i32 literal -0000020: 41 ; i32.const -0000021: 00 ; i32 literal -0000022: 3b ; i32.store16 -0000023: 00 ; alignment -0000024: 00 ; store offset +0000020: 3a ; i32.store8 +0000021: 00 ; alignment +0000022: 00 ; store offset +0000023: 41 ; i32.const +0000024: 00 ; i32 literal 0000025: 41 ; i32.const 0000026: 00 ; i32 literal -0000027: 41 ; i32.const -0000028: 00 ; i32 literal -0000029: 3b ; i32.store16 -000002a: 01 ; alignment -000002b: 00 ; store offset +0000027: 3b ; i32.store16 +0000028: 00 ; alignment +0000029: 00 ; store offset +000002a: 41 ; i32.const +000002b: 00 ; i32 literal 000002c: 41 ; i32.const 000002d: 00 ; i32 literal -000002e: 41 ; i32.const -000002f: 00 ; i32 literal -0000030: 36 ; i32.store -0000031: 00 ; alignment -0000032: 00 ; store offset +000002e: 3b ; i32.store16 +000002f: 01 ; alignment +0000030: 00 ; store offset +0000031: 41 ; i32.const +0000032: 00 ; i32 literal 0000033: 41 ; i32.const 0000034: 00 ; i32 literal -0000035: 41 ; i32.const -0000036: 00 ; i32 literal -0000037: 36 ; i32.store -0000038: 01 ; alignment -0000039: 00 ; store offset +0000035: 36 ; i32.store +0000036: 00 ; alignment +0000037: 00 ; store offset +0000038: 41 ; i32.const +0000039: 00 ; i32 literal 000003a: 41 ; i32.const 000003b: 00 ; i32 literal -000003c: 41 ; i32.const -000003d: 00 ; i32 literal -000003e: 36 ; i32.store -000003f: 02 ; alignment -0000040: 00 ; store offset +000003c: 36 ; i32.store +000003d: 01 ; alignment +000003e: 00 ; store offset +000003f: 41 ; i32.const +0000040: 00 ; i32 literal 0000041: 41 ; i32.const 0000042: 00 ; i32 literal -0000043: 42 ; i64.const -0000044: 00 ; i64 literal -0000045: 3c ; i64.store8 -0000046: 00 ; alignment -0000047: 00 ; store offset -0000048: 41 ; i32.const -0000049: 00 ; i32 literal -000004a: 42 ; i64.const -000004b: 00 ; i64 literal -000004c: 3d ; i64.store16 -000004d: 00 ; alignment -000004e: 00 ; store offset -000004f: 41 ; i32.const -0000050: 00 ; i32 literal -0000051: 42 ; i64.const -0000052: 00 ; i64 literal -0000053: 3d ; i64.store16 -0000054: 01 ; alignment -0000055: 00 ; store offset -0000056: 41 ; i32.const -0000057: 00 ; i32 literal -0000058: 42 ; i64.const -0000059: 00 ; i64 literal -000005a: 3e ; i64.store32 -000005b: 00 ; alignment -000005c: 00 ; store offset -000005d: 41 ; i32.const -000005e: 00 ; i32 literal -000005f: 42 ; i64.const -0000060: 00 ; i64 literal -0000061: 3e ; i64.store32 -0000062: 01 ; alignment -0000063: 00 ; store offset -0000064: 41 ; i32.const -0000065: 00 ; i32 literal -0000066: 42 ; i64.const -0000067: 00 ; i64 literal -0000068: 3e ; i64.store32 -0000069: 02 ; alignment -000006a: 00 ; store offset -000006b: 41 ; i32.const -000006c: 00 ; i32 literal -000006d: 42 ; i64.const -000006e: 00 ; i64 literal -000006f: 37 ; i64.store -0000070: 00 ; alignment -0000071: 00 ; store offset -0000072: 41 ; i32.const -0000073: 00 ; i32 literal -0000074: 42 ; i64.const -0000075: 00 ; i64 literal -0000076: 37 ; i64.store -0000077: 01 ; alignment -0000078: 00 ; store offset -0000079: 41 ; i32.const -000007a: 00 ; i32 literal -000007b: 42 ; i64.const -000007c: 00 ; i64 literal -000007d: 37 ; i64.store -000007e: 02 ; alignment -000007f: 00 ; store offset -0000080: 41 ; i32.const -0000081: 00 ; i32 literal -0000082: 42 ; i64.const -0000083: 00 ; i64 literal -0000084: 37 ; i64.store -0000085: 03 ; alignment -0000086: 00 ; store offset -0000087: 0b ; end -0000015: 72 ; FIXUP func body size -0000013: 74 ; FIXUP section size +0000043: 36 ; i32.store +0000044: 02 ; alignment +0000045: 00 ; store offset +0000046: 41 ; i32.const +0000047: 00 ; i32 literal +0000048: 42 ; i64.const +0000049: 00 ; i64 literal +000004a: 3c ; i64.store8 +000004b: 00 ; alignment +000004c: 00 ; store offset +000004d: 41 ; i32.const +000004e: 00 ; i32 literal +000004f: 42 ; i64.const +0000050: 00 ; i64 literal +0000051: 3d ; i64.store16 +0000052: 00 ; alignment +0000053: 00 ; store offset +0000054: 41 ; i32.const +0000055: 00 ; i32 literal +0000056: 42 ; i64.const +0000057: 00 ; i64 literal +0000058: 3d ; i64.store16 +0000059: 01 ; alignment +000005a: 00 ; store offset +000005b: 41 ; i32.const +000005c: 00 ; i32 literal +000005d: 42 ; i64.const +000005e: 00 ; i64 literal +000005f: 3e ; i64.store32 +0000060: 00 ; alignment +0000061: 00 ; store offset +0000062: 41 ; i32.const +0000063: 00 ; i32 literal +0000064: 42 ; i64.const +0000065: 00 ; i64 literal +0000066: 3e ; i64.store32 +0000067: 01 ; alignment +0000068: 00 ; store offset +0000069: 41 ; i32.const +000006a: 00 ; i32 literal +000006b: 42 ; i64.const +000006c: 00 ; i64 literal +000006d: 3e ; i64.store32 +000006e: 02 ; alignment +000006f: 00 ; store offset +0000070: 41 ; i32.const +0000071: 00 ; i32 literal +0000072: 42 ; i64.const +0000073: 00 ; i64 literal +0000074: 37 ; i64.store +0000075: 00 ; alignment +0000076: 00 ; store offset +0000077: 41 ; i32.const +0000078: 00 ; i32 literal +0000079: 42 ; i64.const +000007a: 00 ; i64 literal +000007b: 37 ; i64.store +000007c: 01 ; alignment +000007d: 00 ; store offset +000007e: 41 ; i32.const +000007f: 00 ; i32 literal +0000080: 42 ; i64.const +0000081: 00 ; i64 literal +0000082: 37 ; i64.store +0000083: 02 ; alignment +0000084: 00 ; store offset +0000085: 41 ; i32.const +0000086: 00 ; i32 literal +0000087: 42 ; i64.const +0000088: 00 ; i64 literal +0000089: 37 ; i64.store +000008a: 03 ; alignment +000008b: 00 ; store offset +000008c: 0b ; end +000001a: 72 ; FIXUP func body size +0000018: 74 ; FIXUP section size store-aligned.wasm: file format wasm 0x00000d Code Disassembly: func 0 - 000017: 41 00 | i32.const 0 - 000019: 41 00 | i32.const 0 - 00001b: 3a 00 00 | i32.store8 0 0 + 00001c: 41 00 | i32.const 0 00001e: 41 00 | i32.const 0 - 000020: 41 00 | i32.const 0 - 000022: 3b 00 00 | i32.store16 0 0 + 000020: 3a 00 00 | i32.store8 0 0 + 000023: 41 00 | i32.const 0 000025: 41 00 | i32.const 0 - 000027: 41 00 | i32.const 0 - 000029: 3b 01 00 | i32.store16 1 0 + 000027: 3b 00 00 | i32.store16 0 0 + 00002a: 41 00 | i32.const 0 00002c: 41 00 | i32.const 0 - 00002e: 41 00 | i32.const 0 - 000030: 36 00 00 | i32.store 0 0 + 00002e: 3b 01 00 | i32.store16 1 0 + 000031: 41 00 | i32.const 0 000033: 41 00 | i32.const 0 - 000035: 41 00 | i32.const 0 - 000037: 36 01 00 | i32.store 1 0 + 000035: 36 00 00 | i32.store 0 0 + 000038: 41 00 | i32.const 0 00003a: 41 00 | i32.const 0 - 00003c: 41 00 | i32.const 0 - 00003e: 36 02 00 | i32.store 2 0 + 00003c: 36 01 00 | i32.store 1 0 + 00003f: 41 00 | i32.const 0 000041: 41 00 | i32.const 0 - 000043: 42 00 | i64.const 0 - 000045: 3c 00 00 | i64.store8 0 0 - 000048: 41 00 | i32.const 0 - 00004a: 42 00 | i64.const 0 - 00004c: 3d 00 00 | i64.store16 0 0 - 00004f: 41 00 | i32.const 0 - 000051: 42 00 | i64.const 0 - 000053: 3d 01 00 | i64.store16 1 0 - 000056: 41 00 | i32.const 0 - 000058: 42 00 | i64.const 0 - 00005a: 3e 00 00 | i64.store32 0 0 - 00005d: 41 00 | i32.const 0 - 00005f: 42 00 | i64.const 0 - 000061: 3e 01 00 | i64.store32 1 0 - 000064: 41 00 | i32.const 0 - 000066: 42 00 | i64.const 0 - 000068: 3e 02 00 | i64.store32 2 0 - 00006b: 41 00 | i32.const 0 - 00006d: 42 00 | i64.const 0 - 00006f: 37 00 00 | i64.store 0 0 - 000072: 41 00 | i32.const 0 - 000074: 42 00 | i64.const 0 - 000076: 37 01 00 | i64.store 1 0 - 000079: 41 00 | i32.const 0 - 00007b: 42 00 | i64.const 0 - 00007d: 37 02 00 | i64.store 2 0 - 000080: 41 00 | i32.const 0 - 000082: 42 00 | i64.const 0 - 000084: 37 03 00 | i64.store 3 0 + 000043: 36 02 00 | i32.store 2 0 + 000046: 41 00 | i32.const 0 + 000048: 42 00 | i64.const 0 + 00004a: 3c 00 00 | i64.store8 0 0 + 00004d: 41 00 | i32.const 0 + 00004f: 42 00 | i64.const 0 + 000051: 3d 00 00 | i64.store16 0 0 + 000054: 41 00 | i32.const 0 + 000056: 42 00 | i64.const 0 + 000058: 3d 01 00 | i64.store16 1 0 + 00005b: 41 00 | i32.const 0 + 00005d: 42 00 | i64.const 0 + 00005f: 3e 00 00 | i64.store32 0 0 + 000062: 41 00 | i32.const 0 + 000064: 42 00 | i64.const 0 + 000066: 3e 01 00 | i64.store32 1 0 + 000069: 41 00 | i32.const 0 + 00006b: 42 00 | i64.const 0 + 00006d: 3e 02 00 | i64.store32 2 0 + 000070: 41 00 | i32.const 0 + 000072: 42 00 | i64.const 0 + 000074: 37 00 00 | i64.store 0 0 + 000077: 41 00 | i32.const 0 + 000079: 42 00 | i64.const 0 + 00007b: 37 01 00 | i64.store 1 0 + 00007e: 41 00 | i32.const 0 + 000080: 42 00 | i64.const 0 + 000082: 37 02 00 | i64.store 2 0 + 000085: 41 00 | i32.const 0 + 000087: 42 00 | i64.const 0 + 000089: 37 03 00 | i64.store 3 0 ;;; STDOUT ;;) diff --git a/test/dump/store.txt b/test/dump/store.txt index 36a73c71..0201ce1e 100644 --- a/test/dump/store.txt +++ b/test/dump/store.txt @@ -1,6 +1,7 @@ ;;; TOOL: run-wasmdump ;;; FLAGS: -v (module + (memory 1) (func i32.const 0 i32.const 0 @@ -47,108 +48,116 @@ 0000010: 01 ; num functions 0000011: 00 ; function 0 signature index 000000f: 02 ; FIXUP section size -; section "CODE" (10) -0000012: 0a ; section code +; section "MEMORY" (5) +0000012: 05 ; section code 0000013: 00 ; section size (guess) -0000014: 01 ; num functions +0000014: 01 ; num memories +; memory 0 +0000015: 00 ; limits: flags +0000016: 01 ; limits: initial +0000013: 03 ; FIXUP section size +; section "CODE" (10) +0000017: 0a ; section code +0000018: 00 ; section size (guess) +0000019: 01 ; num functions ; function body 0 -0000015: 00 ; func body size (guess) -0000016: 00 ; local decl count -0000017: 41 ; i32.const -0000018: 00 ; i32 literal -0000019: 41 ; i32.const -000001a: 00 ; i32 literal -000001b: 3a ; i32.store8 -000001c: 00 ; alignment -000001d: 00 ; store offset +000001a: 00 ; func body size (guess) +000001b: 00 ; local decl count +000001c: 41 ; i32.const +000001d: 00 ; i32 literal 000001e: 41 ; i32.const 000001f: 00 ; i32 literal -0000020: 41 ; i32.const -0000021: 00 ; i32 literal -0000022: 3b ; i32.store16 -0000023: 01 ; alignment -0000024: 00 ; store offset +0000020: 3a ; i32.store8 +0000021: 00 ; alignment +0000022: 00 ; store offset +0000023: 41 ; i32.const +0000024: 00 ; i32 literal 0000025: 41 ; i32.const 0000026: 00 ; i32 literal -0000027: 41 ; i32.const -0000028: 00 ; i32 literal -0000029: 36 ; i32.store -000002a: 02 ; alignment -000002b: 00 ; store offset +0000027: 3b ; i32.store16 +0000028: 01 ; alignment +0000029: 00 ; store offset +000002a: 41 ; i32.const +000002b: 00 ; i32 literal 000002c: 41 ; i32.const 000002d: 00 ; i32 literal -000002e: 42 ; i64.const -000002f: 00 ; i64 literal -0000030: 37 ; i64.store -0000031: 03 ; alignment -0000032: 00 ; store offset -0000033: 41 ; i32.const -0000034: 00 ; i32 literal -0000035: 42 ; i64.const -0000036: 00 ; i64 literal -0000037: 3c ; i64.store8 -0000038: 00 ; alignment -0000039: 00 ; store offset -000003a: 41 ; i32.const -000003b: 00 ; i32 literal -000003c: 42 ; i64.const -000003d: 00 ; i64 literal -000003e: 3d ; i64.store16 -000003f: 01 ; alignment -0000040: 00 ; store offset -0000041: 41 ; i32.const -0000042: 00 ; i32 literal -0000043: 42 ; i64.const -0000044: 00 ; i64 literal -0000045: 3e ; i64.store32 -0000046: 02 ; alignment -0000047: 00 ; store offset -0000048: 41 ; i32.const -0000049: 00 ; i32 literal -000004a: 43 ; f32.const -000004b: 0000 0000 ; f32 literal -000004f: 38 ; f32.store -0000050: 02 ; alignment -0000051: 00 ; store offset -0000052: 41 ; i32.const -0000053: 00 ; i32 literal -0000054: 44 ; f64.const -0000055: 0000 0000 0000 0000 ; f64 literal -000005d: 39 ; f64.store -000005e: 03 ; alignment -000005f: 00 ; store offset -0000060: 0b ; end -0000015: 4b ; FIXUP func body size -0000013: 4d ; FIXUP section size +000002e: 36 ; i32.store +000002f: 02 ; alignment +0000030: 00 ; store offset +0000031: 41 ; i32.const +0000032: 00 ; i32 literal +0000033: 42 ; i64.const +0000034: 00 ; i64 literal +0000035: 37 ; i64.store +0000036: 03 ; alignment +0000037: 00 ; store offset +0000038: 41 ; i32.const +0000039: 00 ; i32 literal +000003a: 42 ; i64.const +000003b: 00 ; i64 literal +000003c: 3c ; i64.store8 +000003d: 00 ; alignment +000003e: 00 ; store offset +000003f: 41 ; i32.const +0000040: 00 ; i32 literal +0000041: 42 ; i64.const +0000042: 00 ; i64 literal +0000043: 3d ; i64.store16 +0000044: 01 ; alignment +0000045: 00 ; store offset +0000046: 41 ; i32.const +0000047: 00 ; i32 literal +0000048: 42 ; i64.const +0000049: 00 ; i64 literal +000004a: 3e ; i64.store32 +000004b: 02 ; alignment +000004c: 00 ; store offset +000004d: 41 ; i32.const +000004e: 00 ; i32 literal +000004f: 43 ; f32.const +0000050: 0000 0000 ; f32 literal +0000054: 38 ; f32.store +0000055: 02 ; alignment +0000056: 00 ; store offset +0000057: 41 ; i32.const +0000058: 00 ; i32 literal +0000059: 44 ; f64.const +000005a: 0000 0000 0000 0000 ; f64 literal +0000062: 39 ; f64.store +0000063: 03 ; alignment +0000064: 00 ; store offset +0000065: 0b ; end +000001a: 4b ; FIXUP func body size +0000018: 4d ; FIXUP section size store.wasm: file format wasm 0x00000d Code Disassembly: func 0 - 000017: 41 00 | i32.const 0 - 000019: 41 00 | i32.const 0 - 00001b: 3a 00 00 | i32.store8 0 0 + 00001c: 41 00 | i32.const 0 00001e: 41 00 | i32.const 0 - 000020: 41 00 | i32.const 0 - 000022: 3b 01 00 | i32.store16 1 0 + 000020: 3a 00 00 | i32.store8 0 0 + 000023: 41 00 | i32.const 0 000025: 41 00 | i32.const 0 - 000027: 41 00 | i32.const 0 - 000029: 36 02 00 | i32.store 2 0 + 000027: 3b 01 00 | i32.store16 1 0 + 00002a: 41 00 | i32.const 0 00002c: 41 00 | i32.const 0 - 00002e: 42 00 | i64.const 0 - 000030: 37 03 00 | i64.store 3 0 - 000033: 41 00 | i32.const 0 - 000035: 42 00 | i64.const 0 - 000037: 3c 00 00 | i64.store8 0 0 - 00003a: 41 00 | i32.const 0 - 00003c: 42 00 | i64.const 0 - 00003e: 3d 01 00 | i64.store16 1 0 - 000041: 41 00 | i32.const 0 - 000043: 42 00 | i64.const 0 - 000045: 3e 02 00 | i64.store32 2 0 - 000048: 41 00 | i32.const 0 - 00004a: 43 00 00 00 00 | f32.const 0x0p+0 - 00004f: 38 02 00 | f32.store 2 0 - 000052: 41 00 | i32.const 0 - 000054: 44 00 00 00 00 00 00 00 00 | f64.const 0x0p+0 - 00005d: 39 03 00 | f64.store 3 0 + 00002e: 36 02 00 | i32.store 2 0 + 000031: 41 00 | i32.const 0 + 000033: 42 00 | i64.const 0 + 000035: 37 03 00 | i64.store 3 0 + 000038: 41 00 | i32.const 0 + 00003a: 42 00 | i64.const 0 + 00003c: 3c 00 00 | i64.store8 0 0 + 00003f: 41 00 | i32.const 0 + 000041: 42 00 | i64.const 0 + 000043: 3d 01 00 | i64.store16 1 0 + 000046: 41 00 | i32.const 0 + 000048: 42 00 | i64.const 0 + 00004a: 3e 02 00 | i64.store32 2 0 + 00004d: 41 00 | i32.const 0 + 00004f: 43 00 00 00 00 | f32.const 0x0p+0 + 000054: 38 02 00 | f32.store 2 0 + 000057: 41 00 | i32.const 0 + 000059: 44 00 00 00 00 00 00 00 00 | f64.const 0x0p+0 + 000062: 39 03 00 | f64.store 3 0 ;;; STDOUT ;;) diff --git a/test/parse/expr/bad-load-align-not-pot.txt b/test/parse/expr/bad-load-align-not-pot.txt index 5d1dfacd..240005ff 100644 --- a/test/parse/expr/bad-load-align-not-pot.txt +++ b/test/parse/expr/bad-load-align-not-pot.txt @@ -1,11 +1,12 @@ ;;; ERROR: 1 (module + (memory 1) (func i32.const 0 i32.load align=3 drop)) (;; STDERR ;;; -parse/expr/bad-load-align-not-pot.txt:5:5: alignment must be power-of-two +parse/expr/bad-load-align-not-pot.txt:6:5: alignment must be power-of-two i32.load align=3 ^^^^^^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-store-align-not-pot.txt b/test/parse/expr/bad-store-align-not-pot.txt index 2c1f56fd..060ce296 100644 --- a/test/parse/expr/bad-store-align-not-pot.txt +++ b/test/parse/expr/bad-store-align-not-pot.txt @@ -1,10 +1,12 @@ ;;; ERROR: 1 -(module (func - i32.const 0 - f32.const 0.0 - f32.store align=3)) +(module + (memory 1) + (func + i32.const 0 + f32.const 0.0 + f32.store align=3)) (;; STDERR ;;; -parse/expr/bad-store-align-not-pot.txt:5:11: alignment must be power-of-two - f32.store align=3)) - ^^^^^^^^^^^^^^^^^ +parse/expr/bad-store-align-not-pot.txt:7:5: alignment must be power-of-two + f32.store align=3)) + ^^^^^^^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/expr/current-memory.txt b/test/parse/expr/current-memory.txt index 684fdec3..2c71ed35 100644 --- a/test/parse/expr/current-memory.txt +++ b/test/parse/expr/current-memory.txt @@ -1,4 +1,5 @@ (module + (memory 1) (func current_memory drop)) diff --git a/test/parse/expr/grow-memory.txt b/test/parse/expr/grow-memory.txt index d8ea9577..e6fafbec 100644 --- a/test/parse/expr/grow-memory.txt +++ b/test/parse/expr/grow-memory.txt @@ -1,4 +1,5 @@ (module + (memory 1) (func i32.const 100 grow_memory diff --git a/test/parse/expr/load-aligned.txt b/test/parse/expr/load-aligned.txt index c65ec278..f4d94752 100644 --- a/test/parse/expr/load-aligned.txt +++ b/test/parse/expr/load-aligned.txt @@ -1,4 +1,5 @@ (module + (memory 1) (func i32.const 0 i32.load align=4 diff --git a/test/parse/expr/load-offset.txt b/test/parse/expr/load-offset.txt index ef94f7c3..6ff13772 100644 --- a/test/parse/expr/load-offset.txt +++ b/test/parse/expr/load-offset.txt @@ -1,4 +1,5 @@ (module + (memory 1) (func i32.const 0 i32.load offset=0 diff --git a/test/parse/expr/load.txt b/test/parse/expr/load.txt index a6f59dca..39470788 100644 --- a/test/parse/expr/load.txt +++ b/test/parse/expr/load.txt @@ -1,4 +1,5 @@ (module + (memory 1) (func i32.const 0 i32.load diff --git a/test/parse/expr/store-aligned.txt b/test/parse/expr/store-aligned.txt index 46d3de74..99056f09 100644 --- a/test/parse/expr/store-aligned.txt +++ b/test/parse/expr/store-aligned.txt @@ -1,4 +1,5 @@ (module + (memory 1) (func i32.const 0 i32.const 0 diff --git a/test/parse/expr/store-offset.txt b/test/parse/expr/store-offset.txt index 62fe66af..c0b8618e 100644 --- a/test/parse/expr/store-offset.txt +++ b/test/parse/expr/store-offset.txt @@ -1,4 +1,5 @@ (module + (memory 1) (func i32.const 0 i32.const 0 diff --git a/test/parse/expr/store.txt b/test/parse/expr/store.txt index bb19f62b..dfe1d947 100644 --- a/test/parse/expr/store.txt +++ b/test/parse/expr/store.txt @@ -1,4 +1,5 @@ (module + (memory 1) (func i32.const 0 i32.const 0 diff --git a/test/spec/custom_section.txt b/test/spec/custom_section.txt new file mode 100644 index 00000000..f5c7be36 --- /dev/null +++ b/test/spec/custom_section.txt @@ -0,0 +1,29 @@ +;;; TOOL: run-interp-spec +;;; STDIN_FILE: third_party/testsuite/custom_section.wast +(;; STDOUT ;;; +assert_malformed error: + third_party/testsuite/custom_section.wast:58:4: error in binary module: @0x0000000a: unable to read u32 leb128: string length + (module + ^^^^^^ +assert_malformed error: + third_party/testsuite/custom_section.wast:66:4: error in binary module: @0x0000000a: invalid section size: extends past end + (module + ^^^^^^ +assert_malformed error: + third_party/testsuite/custom_section.wast:74:4: error in binary module: @0x00000031: invalid section code: 36; max is 11 + (module + ^^^^^^ +assert_malformed error: + third_party/testsuite/custom_section.wast:83:4: error in binary module: @0x0000003e: function signature count != function body count + (module + ^^^^^^ +third_party/testsuite/custom_section.wast:58: assert_malformed passed: + error: @0x0000000a: unable to read u32 leb128: string length +third_party/testsuite/custom_section.wast:66: assert_malformed passed: + error: @0x0000000a: invalid section size: extends past end +third_party/testsuite/custom_section.wast:74: assert_malformed passed: + error: @0x00000031: invalid section code: 36; max is 11 +third_party/testsuite/custom_section.wast:83: assert_malformed passed: + error: @0x0000003e: function signature count != function body count +4/4 tests passed. +;;; STDOUT ;;) diff --git a/test/spec/memory.txt b/test/spec/memory.txt index 2fb2649d..142058af 100644 --- a/test/spec/memory.txt +++ b/test/spec/memory.txt @@ -2,108 +2,148 @@ ;;; STDIN_FILE: third_party/testsuite/memory.wast (;; STDOUT ;;; assert_invalid error: - third_party/testsuite/memory.wast:26:26: memory variable out of range (max 0) + third_party/testsuite/memory.wast:19:36: only one memory block allowed +(assert_invalid (module (memory 0) (memory 0)) "multiple memories") + ^^^^^^^^^^ +assert_invalid error: + third_party/testsuite/memory.wast:20:65: only one memory block allowed +...dule (memory (import "spectest" "memory") 0) (memory 0)) "multiple memories") + ^^^^^^^^^^ +assert_invalid error: + third_party/testsuite/memory.wast:29:26: memory variable out of range (max 0) (assert_invalid (module (data (i32.const 0))) "unknown memory") ^^^^ assert_invalid error: - third_party/testsuite/memory.wast:27:26: memory variable out of range (max 0) + third_party/testsuite/memory.wast:30:26: memory variable out of range (max 0) (assert_invalid (module (data (i32.const 0) "")) "unknown memory") ^^^^ assert_invalid error: - third_party/testsuite/memory.wast:28:26: memory variable out of range (max 0) + third_party/testsuite/memory.wast:31:26: memory variable out of range (max 0) (assert_invalid (module (data (i32.const 0) "x")) "unknown memory") ^^^^ assert_invalid error: - third_party/testsuite/memory.wast:31:29: type mismatch at data segment offset. got i64, expected i32 + third_party/testsuite/memory.wast:34:24: f32.load requires an imported or defined memory. + (module (func (drop (f32.load (i32.const 0))))) + ^^^^^^^^ +assert_invalid error: + third_party/testsuite/memory.wast:38:18: f32.store requires an imported or defined memory. + (module (func (f32.store (f32.const 0) (i32.const 0)))) + ^^^^^^^^^ +assert_invalid error: + third_party/testsuite/memory.wast:38:18: type mismatch at f32.store. got f32, expected i32 + (module (func (f32.store (f32.const 0) (i32.const 0)))) + ^^^^^^^^^ +assert_invalid error: + third_party/testsuite/memory.wast:38:18: type mismatch at f32.store. got i32, expected f32 + (module (func (f32.store (f32.const 0) (i32.const 0)))) + ^^^^^^^^^ +assert_invalid error: + third_party/testsuite/memory.wast:42:24: i32.load8_s requires an imported or defined memory. + (module (func (drop (i32.load8_s (i32.const 0))))) + ^^^^^^^^^^^ +assert_invalid error: + third_party/testsuite/memory.wast:46:18: i32.store8 requires an imported or defined memory. + (module (func (i32.store8 (i32.const 0) (i32.const 0)))) + ^^^^^^^^^^ +assert_invalid error: + third_party/testsuite/memory.wast:50:24: current_memory requires an imported or defined memory. + (module (func (drop (current_memory)))) + ^^^^^^^^^^^^^^ +assert_invalid error: + third_party/testsuite/memory.wast:54:24: grow_memory requires an imported or defined memory. + (module (func (drop (grow_memory (i32.const 0))))) + ^^^^^^^^^^^ +assert_invalid error: + third_party/testsuite/memory.wast:59:29: type mismatch at data segment offset. got i64, expected i32 (module (memory 1) (data (i64.const 0))) ^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:35:22: invalid data segment offset, must be a constant expression; either *.const or get_global. + third_party/testsuite/memory.wast:63:22: invalid data segment offset, must be a constant expression; either *.const or get_global. (module (memory 1) (data (i32.ctz (i32.const 0)))) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:39:22: invalid data segment offset, must be a constant expression; either *.const or get_global. + third_party/testsuite/memory.wast:67:22: invalid data segment offset, must be a constant expression; either *.const or get_global. (module (memory 1) (data (nop))) ^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:76:11: max pages (0) must be >= initial pages (1) + third_party/testsuite/memory.wast:104:11: max pages (0) must be >= initial pages (1) (module (memory 1 0)) ^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:80:11: initial pages (65537) must be <= (65536) + third_party/testsuite/memory.wast:108:11: initial pages (65537) must be <= (65536) (module (memory 65537)) ^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:84:11: initial pages (2147483648) must be <= (65536) + third_party/testsuite/memory.wast:112:11: initial pages (2147483648) must be <= (65536) (module (memory 2147483648)) ^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:88:11: initial pages (4294967295) must be <= (65536) + third_party/testsuite/memory.wast:116:11: initial pages (4294967295) must be <= (65536) (module (memory 4294967295)) ^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:92:11: max pages (65537) must be <= (65536) + third_party/testsuite/memory.wast:120:11: max pages (65537) must be <= (65536) (module (memory 0 65537)) ^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:96:11: max pages (2147483648) must be <= (65536) + third_party/testsuite/memory.wast:124:11: max pages (2147483648) must be <= (65536) (module (memory 0 2147483648)) ^^^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:100:11: max pages (4294967295) must be <= (65536) + third_party/testsuite/memory.wast:128:11: max pages (4294967295) must be <= (65536) (module (memory 0 4294967295)) ^^^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:111:35: alignment must not be larger than natural alignment (8) + third_party/testsuite/memory.wast:139:35: alignment must not be larger than natural alignment (8) (module (memory 0) (func (drop (i64.load align=16 (i32.const 0))))) ^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:115:35: alignment must not be larger than natural alignment (8) + third_party/testsuite/memory.wast:143:35: alignment must not be larger than natural alignment (8) (module (memory 0) (func (drop (i64.load align=32 (i32.const 0))))) ^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:119:35: alignment must not be larger than natural alignment (4) + third_party/testsuite/memory.wast:147:35: alignment must not be larger than natural alignment (4) (module (memory 0) (func (drop (i32.load align=8 (i32.const 0))))) ^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:123:35: alignment must not be larger than natural alignment (2) + third_party/testsuite/memory.wast:151:35: alignment must not be larger than natural alignment (2) (module (memory 0) (func (drop (i32.load16_u align=4 (i32.const 0))))) ^^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:127:35: alignment must not be larger than natural alignment (1) + third_party/testsuite/memory.wast:155:35: alignment must not be larger than natural alignment (1) (module (memory 0) (func (drop (i32.load8_u align=2 (i32.const 0))))) ^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:131:29: alignment must not be larger than natural alignment (1) + third_party/testsuite/memory.wast:159:29: alignment must not be larger than natural alignment (1) (module (memory 0) (func (i32.store8 align=2 (i32.const 0) (i32.const 0)))) ^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:135:29: alignment must not be larger than natural alignment (2) + third_party/testsuite/memory.wast:163:29: alignment must not be larger than natural alignment (2) (module (memory 0) (func (i32.load16_u align=4 (i32.const 0)))) ^^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:135:22: type stack at end of function is 1. expected 0 + third_party/testsuite/memory.wast:163:22: type stack at end of function is 1. expected 0 (module (memory 0) (func (i32.load16_u align=4 (i32.const 0)))) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:139:29: alignment must not be larger than natural alignment (1) + third_party/testsuite/memory.wast:167:29: alignment must not be larger than natural alignment (1) (module (memory 0) (func (i32.load8_u align=2 (i32.const 0)))) ^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:139:22: type stack at end of function is 1. expected 0 + third_party/testsuite/memory.wast:167:22: type stack at end of function is 1. expected 0 (module (memory 0) (func (i32.load8_u align=2 (i32.const 0)))) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/memory.wast:143:29: alignment must not be larger than natural alignment (1) + third_party/testsuite/memory.wast:171:29: alignment must not be larger than natural alignment (1) (module (memory 0) (func (i32.store8 align=2 (i32.const 0) (i32.const 0)))) ^^^^^^^^^^^^^^^^^^ -third_party/testsuite/memory.wast:49: assert_unlinkable passed: +third_party/testsuite/memory.wast:77: assert_unlinkable passed: error: data segment is out of bounds: [0, 1) >= max value 0 error: @0x00000017: on_data_segment_data callback failed -third_party/testsuite/memory.wast:53: assert_unlinkable passed: +third_party/testsuite/memory.wast:81: assert_unlinkable passed: error: data segment is out of bounds: [98304, 98305) >= max value 65536 error: @0x0000001f: on_data_segment_data callback failed -third_party/testsuite/memory.wast:62: assert_unlinkable passed: +third_party/testsuite/memory.wast:90: assert_unlinkable passed: error: data segment is out of bounds: [666, 667) >= max value 0 error: @0x0000002c: on_data_segment_data callback failed 30/30 tests passed. diff --git a/test/spec/start.txt b/test/spec/start.txt index 41deaa98..0c7279ab 100644 --- a/test/spec/start.txt +++ b/test/spec/start.txt @@ -6,11 +6,11 @@ assert_invalid error: (module (func) (start 1)) ^ assert_invalid error: - third_party/testsuite/start.wast:8:5: start function must not return anything + third_party/testsuite/start.wast:9:5: start function must not return anything (start $main) ^^^^^^^^^^^^^ assert_invalid error: - third_party/testsuite/start.wast:15:5: start function must be nullary + third_party/testsuite/start.wast:16:5: start function must be nullary (start $main) ^^^^^^^^^^^^^ inc() => @@ -19,5 +19,6 @@ inc() => inc() => called host spectest.print(i32:1) => called host spectest.print(i32:2) => +called host spectest.print() => 11/11 tests passed. ;;; STDOUT ;;) diff --git a/test/typecheck/bad-load-type-mismatch.txt b/test/typecheck/bad-load-type-mismatch.txt index ac4c052e..204bb1e8 100644 --- a/test/typecheck/bad-load-type-mismatch.txt +++ b/test/typecheck/bad-load-type-mismatch.txt @@ -1,11 +1,12 @@ ;;; ERROR: 1 (module + (memory 1) (func f32.const 0 i32.load drop)) (;; STDERR ;;; -typecheck/bad-load-type-mismatch.txt:5:5: type mismatch at i32.load. got f32, expected i32 +typecheck/bad-load-type-mismatch.txt:6:5: type mismatch at i32.load. got f32, expected i32 i32.load ^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-store-index-type-mismatch.txt b/test/typecheck/bad-store-index-type-mismatch.txt index afd1d140..1f3b7038 100644 --- a/test/typecheck/bad-store-index-type-mismatch.txt +++ b/test/typecheck/bad-store-index-type-mismatch.txt @@ -1,10 +1,12 @@ ;;; ERROR: 1 -(module (func - i32.const 0 - f32.const 0 - i32.store)) +(module + (memory 1) + (func + i32.const 0 + f32.const 0 + i32.store)) (;; STDERR ;;; -typecheck/bad-store-index-type-mismatch.txt:5:3: type mismatch at i32.store. got f32, expected i32 - i32.store)) - ^^^^^^^^^ +typecheck/bad-store-index-type-mismatch.txt:7:5: type mismatch at i32.store. got f32, expected i32 + i32.store)) + ^^^^^^^^^ ;;; STDERR ;;) diff --git a/third_party/testsuite b/third_party/testsuite -Subproject f464936e89661aa425eb15546f2cce052e3f709 +Subproject f71cbe72bd5f4fb871bee39a9dc1278fa662a8a |