refactor(wasm-api): minor updates C & Zig codegens

thi-ng · Oct 26, 2022 · a94e1cc · a94e1cc
1 parent 825add3
commit a94e1cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/packages/wasm-api/src/codegen/c11.ts b/packages/wasm-api/src/codegen/c11.ts
@@ -149,6 +149,7 @@ const __generateFields = (
 ) => {
 	const res: string[] = [];
 	const ftypes: Record<string, string> = {};
+	const isUnion = parent.type === "union";
 	const name = typePrefix + parent.name;
 	let padID = 0;
 	for (let f of parent.fields) {
@@ -203,7 +204,7 @@ const __generateFields = (
 		for (let f of parent.fields) {
 			if (isPadding(f)) continue;
 			fn(f.name + "_align", `alignof(${ftypes[f.name]})`);
-			fn(f.name + "_offset", `offsetof(${name}, ${f.name})`);
+			!isUnion && fn(f.name + "_offset", `offsetof(${name}, ${f.name})`);
 			fn(f.name + "_size", `sizeof(${ftypes[f.name]})`);
 		}
 	}

diff --git a/packages/wasm-api/src/codegen/zig.ts b/packages/wasm-api/src/codegen/zig.ts
@@ -110,6 +110,7 @@ const __generateFields = (
 	const res: string[] = [];
 	const ftypes: Record<string, string> = {};
 	const isUnion = parent.type === "union";
+	const name = parent.name;
 	let padID = 0;
 	for (let f of parent.fields) {
 		// autolabel explicit padding fields
@@ -175,22 +176,19 @@ const __generateFields = (
 		const fn = (fname: string, body: string) =>
 			res.push(
 				"",
-				`export fn ${parent.name}_${fname}() usize {`,
+				`export fn ${name}_${fname}() usize {`,
 				`return ${body};`,
 				`}`
 			);
 
-		fn("align", `@alignOf(${parent.name})`);
-		fn("size", `@sizeOf(${parent.name})`);
+		fn("align", `@alignOf(${name})`);
+		fn("size", `@sizeOf(${name})`);
 
 		for (let f of parent.fields) {
 			if (isPadding(f)) continue;
 			fn(f.name + "_align", `@alignOf(${ftypes[f.name]})`);
 			!isUnion &&
-				fn(
-					f.name + "_offset",
-					`@offsetOf(${parent.name}, "${f.name}")`
-				);
+				fn(f.name + "_offset", `@offsetOf(${name}, "${f.name}")`);
 			fn(f.name + "_size", `@sizeOf(${ftypes[f.name]})`);
 		}
 	}