protoverse

commit 5d9ea066ea725c396c19fbe0cc55da03b5916027
parent 2fc7ce9fea547ad456081bf536f249445f2357ee
Author: William Casarin <jb55@jb55.com>
Date:   Wed, 14 Jul 2021 22:43:35 -0700

elem parser wip

Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
src/error.c
 | 
5
+++--
M
src/error.h
 | 
2
+-
M
src/wasm.c
 | 
55
+++++++++++++++++++++++++------------------------------
M
src/wasm.h
 | 
18
++++++++++++++++++

4 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/src/error.c b/src/error.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
-void note_error_(struct cursor *errs, struct cursor *p, const char *fmt, ...)
+int note_error_(struct cursor *errs, struct cursor *p, const char *fmt, ...)
 {
 	static char buf[512];
 	struct error err;
@@ -21,7 +21,8 @@ void note_error_(struct cursor *errs, struct cursor *p, const char *fmt, ...)
 		fprintf(stderr, "arena OOM when recording error, ");
 		fprintf(stderr, "errs->p at %ld, remaining %ld, strlen %ld\n",
 				errs->p - errs->start, errs->end - errs->p, strlen(buf));
-		return;
 	}
+
+	return 0;
 }
 
diff --git a/src/error.h b/src/error.h
@@ -23,6 +23,6 @@ static inline int cursor_pull_error(struct cursor *cur, struct error *err)
 	       cursor_pull_c_str(cur, &err->msg);
 }
 
-void note_error_(struct cursor *errs, struct cursor *p, const char *fmt, ...);
+int note_error_(struct cursor *errs, struct cursor *p, const char *fmt, ...);
 
 #endif /* PROTOVERSE_ERROR_H */
diff --git a/src/wasm.c b/src/wasm.c
@@ -1204,6 +1204,16 @@ static int parse_global_section(struct wasm_parser *p,
 	return 1;
 }
 
+static int parse_element_section(struct wasm_parser *p, struct elemsec *elemsec)
+{
+	struct element *elements;
+	unsigned int count;
+
+	if (!parse_vector(p, sizeof(struct elem), &count, (void**)&elements)) {
+		return parse_err(p, "elements vec");
+	}
+}
+
 static int parse_memory_section(struct wasm_parser *p,
 		struct memsec *memory_section)
 {
@@ -1211,14 +1221,12 @@ static int parse_memory_section(struct wasm_parser *p,
 	unsigned int elems, i;
 
 	if (!parse_vector(p, sizeof(*mems), &elems, (void**)&mems)) {
-		parse_err(p, "mems vector");
-		return 0;
+		return parse_err(p, "mems vector");
 	}
 
 	for (i = 0; i < elems; i++) {
 		if (!parse_limits(p, &mems[i])) {
-			parse_err(p, "memory #%d/%d", i+1, elems);
-			return 0;
+			return parse_err(p, "memory #%d/%d", i+1, elems);
 		}
 	}
 
@@ -1232,8 +1240,7 @@ static int parse_start_section(struct wasm_parser *p,
 		struct startsec *start_section)
 {
 	if (!leb128_read(&p->cur, (unsigned int*)&start_section->start_fn)) {
-		parse_err(p, "start_fn index");
-		return 0;
+		return parse_err(p, "start_fn index");
 	}
 
 	return 1;
@@ -1243,13 +1250,11 @@ static inline int parse_byte_vector(struct wasm_parser *p, unsigned char **data,
 		int *data_len)
 {
 	if (!leb128_read(&p->cur, (unsigned int*)data_len)) {
-		parse_err(p, "len");
-		return 0;
+		return parse_err(p, "len");
 	}
 
 	if (p->cur.p + *data_len > p->cur.end) {
-		parse_err(p, "byte vector overflow");
-		return 0;
+		return parse_err(p, "byte vector overflow");
 	}
 
 	*data = p->cur.p;
@@ -1263,14 +1268,12 @@ static int parse_wdata(struct wasm_parser *p, struct wdata *data)
 	u8 tag;
 
 	if (!pull_byte(&p->cur, &tag)) {
-		parse_err(p, "tag");
-		return 0;
+		return parse_err(p, "tag");
 	}
 
 	if (tag > 2) {
 		cursor_print_around(&p->cur, 10);
-		parse_err(p, "invalid datasegment tag: 0x%x", tag);
-		return 0;
+		return parse_err(p, "invalid datasegment tag: 0x%x", tag);
 	}
 
 	switch (tag) {
@@ -1279,13 +1282,11 @@ static int parse_wdata(struct wasm_parser *p, struct wdata *data)
 		data->active.mem_index = 0;
 
 		if (!parse_const_expr(p, &data->active.offset_expr)) {
-			parse_err(p, "const expr");
-			return 0;
+			return parse_err(p, "const expr");
 		}
 
 		if (!parse_byte_vector(p, &data->bytes, &data->bytes_len)) {
-			parse_err(p, "bytes vector");
-			return 0;
+			return parse_err(p, "bytes vector");
 		}
 
 		break;
@@ -1294,8 +1295,7 @@ static int parse_wdata(struct wasm_parser *p, struct wdata *data)
 		data->mode = datamode_passive;
 
 		if (!parse_byte_vector(p, &data->bytes, &data->bytes_len)) {
-			parse_err(p, "passive bytes vector");
-			return 0;
+			return parse_err(p, "passive bytes vector");
 		}
 
 		break;
@@ -1304,18 +1304,15 @@ static int parse_wdata(struct wasm_parser *p, struct wdata *data)
 		data->mode = datamode_active;
 
 		if (!leb128_read(&p->cur, (unsigned int*)&data->active.mem_index))  {
-			parse_err(p, "read active data mem_index");
-			return 0;
+			return parse_err(p, "read active data mem_index");
 		}
 
 		if (!parse_const_expr(p, &data->active.offset_expr)) {
-			parse_err(p, "read active data (w/ mem_index) offset_expr");
-			return 0;
+			return parse_err(p, "read active data (w/ mem_index) offset_expr");
 		}
 
 		if (!parse_byte_vector(p, &data->bytes, &data->bytes_len)) {
-			parse_err(p, "active (w/ mem_index) bytes vector");
-			return 0;
+			return parse_err(p, "active (w/ mem_index) bytes vector");
 		}
 
 		break;
@@ -1330,14 +1327,12 @@ static int parse_data_section(struct wasm_parser *p, struct datasec *section)
 	unsigned int elems, i;
 
 	if (!parse_vector(p, sizeof(*data), &elems, (void**)&data)) {
-		parse_err(p, "datas vector");
-		return 0;
+		return parse_err(p, "datas vector");
 	}
 
 	for (i = 0; i < elems; i++) {
 		if (!parse_wdata(p, &data[i])) {
-			parse_err(p, "data segment #%d/%d", i+1, elems);
-			return 0;
+			return parse_err(p, "data segment #%d/%d", i+1, elems);
 		}
 	}
 
diff --git a/src/wasm.h b/src/wasm.h
@@ -84,6 +84,24 @@ struct tablesec {
 	int num_tables;
 };
 
+enum elem_mode {
+	elem_mode_passive,
+	elem_mode_active,
+	elem_mode_declarative,
+}
+
+struct elem {
+	enum elem_mode mode;
+	enum reftype reftype;
+	int tableidx;
+	struct expr offset;
+};
+
+struct elemsec {
+	struct elem *elems;
+	int num_elems;
+};
+
 struct memsec {
 	struct limits *mems; /* memtype */
 	int num_mems;