Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: sync op and type codes for GC proposal #133

Merged
merged 1 commit into from
May 19, 2023
Merged

feat: sync op and type codes for GC proposal #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 107 additions & 56 deletions src/WasmDis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import {
IGlobalNameEntry,
IFieldNameEntry,
ElementMode,
RefType,
} from "./WasmParser.js";

const NAME_SECTION_NAME = "name";
Expand Down Expand Up @@ -568,8 +569,16 @@ export class WasmDisassembler {
return "eq";
case TypeKind.i31ref:
return "i31";
case TypeKind.dataref:
return "data";
case TypeKind.structref:
return "struct";
case TypeKind.arrayref:
return "array";
case TypeKind.nullfuncref:
return "nofunc";
case TypeKind.nullexternref:
return "noextern";
case TypeKind.nullref:
return "none";
}
}
private typeToString(type: Type): string {
Expand Down Expand Up @@ -598,16 +607,22 @@ export class WasmDisassembler {
return "eqref";
case TypeKind.i31ref:
return "i31ref";
case TypeKind.dataref:
return "dataref";
case TypeKind.structref:
return "structref";
case TypeKind.arrayref:
return "arrayref";
case TypeKind.nullfuncref:
return "nullfuncref";
case TypeKind.nullexternref:
return "nullexternref";
case TypeKind.nullref:
return "nullref";
case TypeKind.ref:
return `(ref ${this.typeIndexToString(type.index)})`;
case TypeKind.optref:
return `(ref null ${this.typeIndexToString(type.index)})`;
case TypeKind.rtt:
return `(rtt ${this.typeIndexToString(type.index)})`;
case TypeKind.rtt_d:
return `(rtt ${type.depth} ${this.typeIndexToString(type.index)})`;
return `(ref ${this.typeIndexToString((type as RefType).ref_index)})`;
case TypeKind.ref_null:
return `(ref null ${this.typeIndexToString(
(type as RefType).ref_index
)})`;
default:
throw new Error(`Unexpected type ${JSON.stringify(type)}`);
}
Expand Down Expand Up @@ -662,7 +677,13 @@ export class WasmDisassembler {
return;
}
if (type.kind === TypeKind.unspecified) {
return this.printFuncType(type.index);
if (this._types[type.index].form == TypeKind.func) {
return this.printFuncType(type.index);
} else {
// Encoding error.
this.appendBuffer(` (type ${type.index})`);
return;
}
}
this.appendBuffer(" (result ");
this.appendBuffer(this.typeToString(type));
Expand Down Expand Up @@ -760,24 +781,28 @@ export class WasmDisassembler {
case OperatorCode.br_if:
case OperatorCode.br_on_null:
case OperatorCode.br_on_non_null:
this.appendBuffer(" ");
this.appendBuffer(this.useLabel(operator.brDepth));
break;
case OperatorCode.br_on_cast_:
case OperatorCode.br_on_cast_fail_:
case OperatorCode.br_on_cast__:
case OperatorCode.br_on_cast_fail__:
this.appendBuffer(" ");
this.appendBuffer(this.typeIndexToString(operator.refType));
this.appendBuffer(" ");
this.appendBuffer(this.useLabel(operator.brDepth));
break;
case OperatorCode.br_on_cast:
case OperatorCode.br_on_cast_fail:
case OperatorCode.br_on_func:
case OperatorCode.br_on_non_func:
case OperatorCode.br_on_data:
case OperatorCode.br_on_non_data:
case OperatorCode.br_on_i31:
case OperatorCode.br_on_non_i31:
this.appendBuffer(" flags=" + operator.literal);
this.appendBuffer(" ");
this.appendBuffer(this.typeIndexToString(operator.srcType));
this.appendBuffer(" ");
this.appendBuffer(this.typeIndexToString(operator.refType));
this.appendBuffer(" ");
this.appendBuffer(this.useLabel(operator.brDepth));
break;
case OperatorCode.br_on_cast_static:
case OperatorCode.br_on_cast_static_fail: {
const label = this.useLabel(operator.brDepth);
const refType = this._nameResolver.getTypeName(operator.refType, true);
this.appendBuffer(` ${label} ${refType}`);
break;
}
case OperatorCode.br_table:
for (var i = 0; i < operator.brTable.length; i++) {
this.appendBuffer(" ");
Expand Down Expand Up @@ -1043,7 +1068,7 @@ export class WasmDisassembler {
case OperatorCode.struct_get_s:
case OperatorCode.struct_get_u:
case OperatorCode.struct_set: {
const refType = this._nameResolver.getTypeName(operator.refType, true);
const refType = this.typeIndexToString(operator.refType);
const fieldName = this._nameResolver.getFieldName(
operator.refType,
operator.fieldIndex,
Expand All @@ -1055,8 +1080,10 @@ export class WasmDisassembler {
case OperatorCode.rtt_canon:
case OperatorCode.rtt_sub:
case OperatorCode.rtt_fresh_sub:
case OperatorCode.ref_test_static:
case OperatorCode.ref_cast_static:
case OperatorCode.ref_cast:
case OperatorCode.ref_cast_null:
case OperatorCode.ref_test:
case OperatorCode.ref_test_null:
case OperatorCode.struct_new_default:
case OperatorCode.struct_new_default_with_rtt:
case OperatorCode.struct_new:
Expand All @@ -1069,21 +1096,20 @@ export class WasmDisassembler {
case OperatorCode.array_get_s:
case OperatorCode.array_get_u:
case OperatorCode.array_set:
case OperatorCode.array_len: {
const refType = this._nameResolver.getTypeName(operator.refType, true);
case OperatorCode.array_len_: {
const refType = this.typeIndexToString(operator.refType);
this.appendBuffer(` ${refType}`);
break;
}
case OperatorCode.array_copy: {
const dstType = this._nameResolver.getTypeName(operator.refType, true);
const srcType = this._nameResolver.getTypeName(operator.srcType, true);
const dstType = this.typeIndexToString(operator.refType);
const srcType = this.typeIndexToString(operator.srcType);
this.appendBuffer(` ${dstType} ${srcType}`);
break;
}
case OperatorCode.array_init:
case OperatorCode.array_init_static: {
const refType = this._nameResolver.getTypeName(operator.refType, true);
const length = operator.brDepth; // Overloaded field.
case OperatorCode.array_new_fixed: {
const refType = this.typeIndexToString(operator.refType);
const length = operator.len;
this.appendBuffer(` ${refType} ${length}`);
break;
}
Expand Down Expand Up @@ -1212,6 +1238,8 @@ export class WasmDisassembler {
case SectionCode.Element:
case SectionCode.Tag:
this._currentSectionId = sectionInfo.id;
this._indent = " ";
this._indentLevel = 0;
break; // reading known section;
default:
reader.skipSection();
Expand Down Expand Up @@ -1499,36 +1527,45 @@ export class WasmDisassembler {
if (!this._skipTypes) {
var typeName = this._nameResolver.getTypeName(typeIndex, false);
var superTypeName = undefined;
if (typeEntry.supertype !== undefined) {
superTypeName = this.typeIndexToString(typeEntry.supertype);
if (typeEntry.supertypes !== undefined) {
superTypeName = typeEntry.supertypes
.map((ty) => this.typeIndexToString(ty))
.join("+");
}
this.appendBuffer(this._indent);
this.appendBuffer(`(type ${typeName} `);
var subtype = typeEntry.supertypes || typeEntry.final;
if (subtype) {
this.appendBuffer("(sub ");
if (typeEntry.final) this.appendBuffer("final ");
if (typeEntry.supertypes) {
this.appendBuffer(
typeEntry.supertypes
.map((ty) => this.typeIndexToString(ty))
.join(" ")
);
this.appendBuffer(" ");
}
}
if (typeEntry.form === TypeKind.func) {
this.appendBuffer(` (type ${typeName} (func`);
this.appendBuffer(`(func`);
this.printFuncType(typeIndex);
this.appendBuffer("))");
} else if (typeEntry.form === TypeKind.func_subtype) {
this.appendBuffer(` (type ${typeName} (func_subtype`);
this.printFuncType(typeIndex);
this.appendBuffer(` (supertype ${superTypeName})))`);
this.appendBuffer(")");
} else if (typeEntry.form === TypeKind.struct) {
this.appendBuffer(` (type ${typeName} (struct`);
this.printStructType(typeIndex);
this.appendBuffer("))");
} else if (typeEntry.form === TypeKind.struct_subtype) {
this.appendBuffer(` (type ${typeName} (struct_subtype`);
this.appendBuffer(`(struct`);
this.printStructType(typeIndex);
this.appendBuffer(` (supertype ${superTypeName})))`);
this.appendBuffer(")");
} else if (typeEntry.form === TypeKind.array) {
this.appendBuffer(` (type ${typeName} (array`);
this.printArrayType(typeIndex);
this.appendBuffer("))");
} else if (typeEntry.form === TypeKind.array_subtype) {
this.appendBuffer(` (type ${typeName} (array_subtype`);
this.appendBuffer(`(array`);
this.printArrayType(typeIndex);
this.appendBuffer(`) (supertype ${superTypeName})))`);
this.appendBuffer(")");
} else {
throw new Error(`Unknown type form: ${typeEntry.form}`);
}
if (subtype) {
this.appendBuffer(")");
}
this.appendBuffer(")");
this.newLine();
}
break;
Expand Down Expand Up @@ -1691,6 +1728,20 @@ export class WasmDisassembler {
this.logEndOfFunctionBodyOffset();
// See case BinaryReaderState.CODE_OPERATOR for closing of body
break;
case BinaryReaderState.BEGIN_REC_GROUP:
if (!this._skipTypes) {
this.appendBuffer(` (rec`);
this.newLine();
this.increaseIndent();
}
break;
case BinaryReaderState.END_REC_GROUP:
if (!this._skipTypes) {
this.decreaseIndent();
this.appendBuffer(` )`);
this.newLine();
}
break;
default:
throw new Error(`Expectected state: ${reader.state}`);
}
Expand Down
Loading