Skip to content

Commit 103ce53

Browse files
dcodeIOdcodeIO
committed
AIR concept
1 parent 7de4745 commit 103ce53

File tree

7 files changed

+645
-29
lines changed

7 files changed

+645
-29
lines changed

‎cli/asc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const mkdirp = require("./util/mkdirp");
4242
const find = require("./util/find");
4343
const EOL = process.platform === "win32" ? "\r\n" : "\n";
4444
const SEP = process.platform === "win32" ? "\\" : "/";
45-
const binaryen = global.binaryen || (global.binaryen = require("binaryen"));
45+
const binaryen = global.binaryen || (global.binaryen = require("../lib/binaryen"));
4646

4747
// Sets up an extension with its definition counterpart and relevant regexes.
4848
function setupExtension(extension) {

‎lib/binaryen.js

Lines changed: 463 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/air.ts

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
/**
2+
* @fileoverview AssemblyScript Intermediate Representation.
3+
*
4+
* AIR is a thin layer on top of Binaryen IR.
5+
*
6+
* @license Apache-2.0
7+
*/
8+
import * as binaryen from "./glue/binaryen";
9+
import {
10+
readString,
11+
allocString,
12+
Index,
13+
ExpressionRef,
14+
ExpressionId,
15+
NativeType
16+
} from "./module";
17+
18+
@unmanaged
19+
export abstract class Expression {
20+
21+
static wrap(ref: ExpressionRef): Expression {
22+
switch (binaryen._BinaryenExpressionGetId(ref)) {
23+
case ExpressionId.Block: return new Block(ref);
24+
case ExpressionId.If: return new If(ref);
25+
// case ExpressionId.Loop: return new Loop(ref);
26+
// case ExpressionId.Break: return new Break(ref);
27+
// case ExpressionId.Switch: return new Switch(ref);
28+
// TODO
29+
}
30+
assert(false);
31+
return unreachable();
32+
}
33+
34+
private _ref: ExpressionRef;
35+
36+
constructor(ref: ExpressionRef) {
37+
assert(ASC_TARGET === 0);
38+
this._ref = ref;
39+
}
40+
41+
get ref(): ExpressionRef {
42+
if (ASC_TARGET !== 0) return changetype<ExpressionRef>(this);
43+
return this._ref;
44+
}
45+
46+
get id(): ExpressionId {
47+
return binaryen._BinaryenExpressionGetId(this.ref);
48+
}
49+
50+
get type(): NativeType {
51+
return binaryen._BinaryenExpressionGetType(this.ref);
52+
}
53+
54+
finalize(): void {
55+
binaryen._BinaryenExpressionFinalize(this.ref);
56+
}
57+
}
58+
59+
@unmanaged
60+
export class Block extends Expression {
61+
62+
constructor(ref: ExpressionRef) {
63+
if (ASC_TARGET !== 0) return changetype<Block>(ref);
64+
super(ref);
65+
}
66+
67+
get name(): string | null {
68+
return readString(binaryen._BinaryenBlockGetName(this.ref));
69+
}
70+
71+
set name(name: string | null) {
72+
var namePtr = allocString(name);
73+
binaryen._BinaryenBlockSetName(this.ref, namePtr);
74+
binaryen._free(namePtr);
75+
}
76+
77+
get numChildren(): Index {
78+
return binaryen._BinaryenBlockGetNumChildren(this.ref);
79+
}
80+
81+
// TBD
82+
// get children(): Expression[] {
83+
// var numChildren = binaryen._BinaryenBlockGetNumChildren(this.ref);
84+
// var children = new Array<Expression>(numChildren);
85+
// for (let index: Index = 0; index < numChildren; ++index) {
86+
// children[index] = Expression.wrap(binaryen._BinaryenBlockGetChildAt(this.ref, index));
87+
// }
88+
// return children;
89+
// }
90+
91+
getChildAt(index: Index): Expression {
92+
return Expression.wrap(binaryen._BinaryenBlockGetChildAt(this.ref, index));
93+
}
94+
95+
setChildAt(index: Index, child: Expression): void {
96+
binaryen._BinaryenBlockSetChildAt(this.ref, index, child.ref);
97+
}
98+
99+
appendChild(child: Expression): Index {
100+
return binaryen._BinaryenBlockAppendChild(this.ref, child.ref);
101+
}
102+
103+
insertChildAt(index: Index, child: Expression): void {
104+
binaryen._BinaryenBlockInsertChildAt(this.ref, index, child.ref);
105+
}
106+
107+
removeChildAt(index: Index): Expression {
108+
return Expression.wrap(binaryen._BinaryenBlockRemoveChildAt(this.ref, index));
109+
}
110+
}
111+
112+
@unmanaged
113+
export class If extends Expression {
114+
115+
constructor(ref: ExpressionRef) {
116+
if (ASC_TARGET !== 0) return changetype<If>(ref);
117+
super(ref);
118+
}
119+
120+
get condition(): Expression {
121+
return Expression.wrap(binaryen._BinaryenIfGetCondition(this.ref));
122+
}
123+
124+
set condition(expr: Expression) {
125+
binaryen._BinaryenIfSetCondition(this.ref, expr.ref);
126+
}
127+
128+
get ifTrue(): Expression {
129+
return Expression.wrap(binaryen._BinaryenIfGetIfTrue(this.ref));
130+
}
131+
132+
set ifTrue(expr: Expression) {
133+
binaryen._BinaryenIfSetIfTrue(this.ref, expr.ref);
134+
}
135+
136+
get ifFalse(): Expression | null {
137+
var expr = binaryen._BinaryenIfGetIfFalse(this.ref);
138+
return expr ? Expression.wrap(expr) : null;
139+
}
140+
141+
set ifFalse(expr: Expression | null) {
142+
binaryen._BinaryenIfSetIfFalse(this.ref, expr ? expr.ref : 0);
143+
}
144+
}

‎src/compiler.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import {
3939
getConstValueF32,
4040
getConstValueF64,
4141
getBlockChildCount,
42-
getBlockChild,
42+
getBlockChildAt,
4343
getBlockName,
4444
getLocalGetIndex,
4545
isLocalTee,
@@ -2194,7 +2194,7 @@ export class Compiler extends DiagnosticEmitter {
21942194
switch (getExpressionId(stmt)) {
21952195
case ExpressionId.Block: {
21962196
if (!getBlockName(stmt)) {
2197-
for (let j: Index = 0, k = getBlockChildCount(stmt); j < k; ++j) stmts.push(getBlockChild(stmt, j));
2197+
for (let j: Index = 0, k = getBlockChildCount(stmt); j < k; ++j) stmts.push(getBlockChildAt(stmt, j));
21982198
break;
21992199
}
22002200
// fall-through
@@ -7635,7 +7635,7 @@ export class Compiler extends DiagnosticEmitter {
76357635
if (getBlockName(expr) === null) { // must not be a break target
76367636
let count = getBlockChildCount(expr);
76377637
if (count) {
7638-
return this.tryUndoAutorelease(getBlockChild(expr, count - 1), flow);
7638+
return this.tryUndoAutorelease(getBlockChildAt(expr, count - 1), flow);
76397639
}
76407640
}
76417641
break;

‎src/flow.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import {
5656
isLoadSigned,
5757
getBlockName,
5858
getBlockChildCount,
59-
getBlockChild,
59+
getBlockChildAt,
6060
getIfTrue,
6161
getIfFalse,
6262
getSelectThen,
@@ -66,7 +66,7 @@ import {
6666
getIfCondition,
6767
getConstValueI64High,
6868
getUnaryValue,
69-
getCallOperand,
69+
getCallOperandAt,
7070
traverse
7171
} from "./module";
7272

@@ -1114,7 +1114,7 @@ export class Flow {
11141114
let program = this.parentFunction.program;
11151115
if (name == program.retainInstance.internalName) {
11161116
// __retain just passes through the argument
1117-
this.inheritNonnullIfTrue(getCallOperand(expr, 0), iff);
1117+
this.inheritNonnullIfTrue(getCallOperandAt(expr, 0), iff);
11181118
}
11191119
break;
11201120
}
@@ -1423,7 +1423,7 @@ export class Flow {
14231423
case ExpressionId.Block: {
14241424
if (!getBlockName(expr)) {
14251425
let size = assert(getBlockChildCount(expr));
1426-
let last = getBlockChild(expr, size - 1);
1426+
let last = getBlockChildAt(expr, size - 1);
14271427
return this.canOverflow(last, type);
14281428
}
14291429
break;

‎src/glue/binaryen.d.ts

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ export declare function _BinaryenBrOnExn(module: BinaryenModuleRef, name: usize,
520520

521521
export declare function _BinaryenTupleMake(module: BinaryenModuleRef, operands: usize, numOperands: BinaryenIndex): BinaryenExpressionRef;
522522
export declare function _BinaryenTupleMakeGetNumOperands(expr: BinaryenExpressionRef): BinaryenIndex;
523-
export declare function _BinaryenTupleMakeGetOperand(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
523+
export declare function _BinaryenTupleMakeGetOperandAt(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
524524
export declare function _BinaryenTupleExtract(module: BinaryenModuleRef, tuple: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
525525
export declare function _BinaryenTupleExtractGetTuple(expr: BinaryenExpressionRef): BinaryenExpressionRef;
526526
export declare function _BinaryenTupleExtractGetIndex(expr: BinaryenExpressionRef): BinaryenIndex;
@@ -531,14 +531,23 @@ export declare function _BinaryenExpressionGetId(expr: BinaryenExpressionRef): B
531531
export declare function _BinaryenExpressionGetType(expr: BinaryenExpressionRef): BinaryenType;
532532
export declare function _BinaryenExpressionPrint(expr: BinaryenExpressionRef): void;
533533
export declare function _BinaryenExpressionCopy(expr: BinaryenExpressionRef, module: BinaryenModuleRef): BinaryenExpressionRef;
534+
export declare function _BinaryenExpressionFinalize(expr: BinaryenExpressionRef): void;
534535

535536
export declare function _BinaryenBlockGetName(expr: BinaryenExpressionRef): usize;
537+
export declare function _BinaryenBlockSetName(expr: BinaryenExpressionRef, name: usize): void;
536538
export declare function _BinaryenBlockGetNumChildren(expr: BinaryenExpressionRef): BinaryenIndex;
537-
export declare function _BinaryenBlockGetChild(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
539+
export declare function _BinaryenBlockGetChildAt(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
540+
export declare function _BinaryenBlockSetChildAt(expr: BinaryenExpressionRef, index: BinaryenIndex, childExpr: BinaryenExpressionRef): void;
541+
export declare function _BinaryenBlockAppendChild(expr: BinaryenExpressionRef, childExpr: BinaryenExpressionRef): BinaryenIndex;
542+
export declare function _BinaryenBlockInsertChildAt(expr: BinaryenExpressionRef, index: BinaryenIndex, childExpr: BinaryenExpressionRef): void;
543+
export declare function _BinaryenBlockRemoveChildAt(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
538544

539545
export declare function _BinaryenIfGetCondition(expr: BinaryenExpressionRef): BinaryenExpressionRef;
546+
export declare function _BinaryenIfSetCondition(expr: BinaryenExpressionRef, conditionExpr: BinaryenExpressionRef): void;
540547
export declare function _BinaryenIfGetIfTrue(expr: BinaryenExpressionRef): BinaryenExpressionRef;
548+
export declare function _BinaryenIfSetIfTrue(expr: BinaryenExpressionRef, ifTrueExpr: BinaryenExpressionRef): void;
541549
export declare function _BinaryenIfGetIfFalse(expr: BinaryenExpressionRef): BinaryenExpressionRef;
550+
export declare function _BinaryenIfSetIfFalse(expr: BinaryenExpressionRef, ifFalseExpr: BinaryenExpressionRef): void;
542551

543552
export declare function _BinaryenLoopGetName(expr: BinaryenExpressionRef): usize;
544553
export declare function _BinaryenLoopGetBody(expr: BinaryenExpressionRef): BinaryenExpressionRef;
@@ -548,18 +557,18 @@ export declare function _BinaryenBreakGetCondition(expr: BinaryenExpressionRef):
548557
export declare function _BinaryenBreakGetValue(expr: BinaryenExpressionRef): BinaryenExpressionRef;
549558

550559
export declare function _BinaryenSwitchGetNumNames(expr: BinaryenExpressionRef): BinaryenIndex;
551-
export declare function _BinaryenSwitchGetName(expr: BinaryenExpressionRef, index: BinaryenIndex): usize;
560+
export declare function _BinaryenSwitchGetNameAt(expr: BinaryenExpressionRef, index: BinaryenIndex): usize;
552561
export declare function _BinaryenSwitchGetDefaultName(expr: BinaryenExpressionRef): usize;
553562
export declare function _BinaryenSwitchGetCondition(expr: BinaryenExpressionRef): BinaryenExpressionRef;
554563
export declare function _BinaryenSwitchGetValue(expr: BinaryenExpressionRef): BinaryenExpressionRef;
555564

556565
export declare function _BinaryenCallGetTarget(expr: BinaryenExpressionRef): usize;
557566
export declare function _BinaryenCallGetNumOperands(expr: BinaryenExpressionRef): BinaryenIndex;
558-
export declare function _BinaryenCallGetOperand(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
567+
export declare function _BinaryenCallGetOperandAt(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
559568

560569
export declare function _BinaryenCallIndirectGetTarget(expr: BinaryenExpressionRef): BinaryenExpressionRef;
561570
export declare function _BinaryenCallIndirectGetNumOperands(expr: BinaryenExpressionRef): BinaryenIndex;
562-
export declare function _BinaryenCallIndirectGetOperand(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
571+
export declare function _BinaryenCallIndirectGetOperandAt(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
563572

564573
export declare function _BinaryenLocalGetGetIndex(expr: BinaryenExpressionRef): BinaryenIndex;
565574

@@ -575,7 +584,7 @@ export declare function _BinaryenGlobalSetGetValue(expr: BinaryenExpressionRef):
575584
export declare function _BinaryenHostGetOp(expr: BinaryenExpressionRef): BinaryenOp;
576585
export declare function _BinaryenHostGetNameOperand(expr: BinaryenExpressionRef): usize;
577586
export declare function _BinaryenHostGetNumOperands(expr: BinaryenExpressionRef): BinaryenIndex;
578-
export declare function _BinaryenHostGetOperand(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
587+
export declare function _BinaryenHostGetOperandAt(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
579588

580589
export declare function _BinaryenLoadIsAtomic(expr: BinaryenExpressionRef): bool;
581590
export declare function _BinaryenLoadIsSigned(expr: BinaryenExpressionRef): bool;
@@ -685,7 +694,7 @@ export declare function _BinaryenTryGetCatchBody(expr: BinaryenExpressionRef): B
685694

686695
export declare function _BinaryenThrowGetEvent(expr: BinaryenExpressionRef): usize;
687696
export declare function _BinaryenThrowGetNumOperands(expr: BinaryenExpressionRef): BinaryenIndex;
688-
export declare function _BinaryenThrowGetOperand(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
697+
export declare function _BinaryenThrowGetOperandAt(expr: BinaryenExpressionRef, index: BinaryenIndex): BinaryenExpressionRef;
689698

690699
export declare function _BinaryenRethrowGetExnref(expr: BinaryenExpressionRef): BinaryenExpressionRef;
691700

‎src/module.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2013,8 +2013,8 @@ export function getBlockChildCount(expr: ExpressionRef): Index {
20132013
return binaryen._BinaryenBlockGetNumChildren(expr);
20142014
}
20152015

2016-
export function getBlockChild(expr: ExpressionRef, index: Index): ExpressionRef {
2017-
return binaryen._BinaryenBlockGetChild(expr, index);
2016+
export function getBlockChildAt(expr: ExpressionRef, index: Index): ExpressionRef {
2017+
return binaryen._BinaryenBlockGetChildAt(expr, index);
20182018
}
20192019

20202020
export function getIfCondition(expr: ExpressionRef): ExpressionRef {
@@ -2073,8 +2073,8 @@ export function getCallOperandCount(expr: ExpressionRef): i32 {
20732073
return binaryen._BinaryenCallGetNumOperands(expr);
20742074
}
20752075

2076-
export function getCallOperand(expr: ExpressionRef, index: Index): ExpressionRef {
2077-
return binaryen._BinaryenCallGetOperand(expr, index);
2076+
export function getCallOperandAt(expr: ExpressionRef, index: Index): ExpressionRef {
2077+
return binaryen._BinaryenCallGetOperandAt(expr, index);
20782078
}
20792079

20802080
export function getHostOp(expr: ExpressionRef): ExpressionRef {
@@ -2085,8 +2085,8 @@ export function getHostOperandCount(expr: ExpressionRef): Index {
20852085
return binaryen._BinaryenHostGetNumOperands(expr);
20862086
}
20872087

2088-
export function getHostOperand(expr: ExpressionRef, index: Index): ExpressionRef {
2089-
return binaryen._BinaryenHostGetOperand(expr, index);
2088+
export function getHostOperandAt(expr: ExpressionRef, index: Index): ExpressionRef {
2089+
return binaryen._BinaryenHostGetOperandAt(expr, index);
20902090
}
20912091

20922092
export function getHostName(expr: ExpressionRef): string | null {
@@ -2390,7 +2390,7 @@ function stringLengthUTF8(str: string): usize {
23902390
return len;
23912391
}
23922392

2393-
function allocString(str: string | null): usize {
2393+
export function allocString(str: string | null): usize {
23942394
if (str === null) return 0;
23952395
var ptr = binaryen._malloc(stringLengthUTF8(str) + 1) >>> 0;
23962396
// the following is based on Emscripten's stringToUTF8Array
@@ -2495,7 +2495,7 @@ export function needsExplicitUnreachable(expr: ExpressionRef): bool {
24952495
let numChildren = binaryen._BinaryenBlockGetNumChildren(expr); // last child needs unreachable
24962496
return (
24972497
numChildren > 0 &&
2498-
needsExplicitUnreachable(binaryen._BinaryenBlockGetChild(expr, numChildren - 1))
2498+
needsExplicitUnreachable(binaryen._BinaryenBlockGetChildAt(expr, numChildren - 1))
24992499
);
25002500
}
25012501
}
@@ -2512,7 +2512,7 @@ export function traverse<T>(
25122512
switch (getExpressionId(expr)) {
25132513
case ExpressionId.Block: {
25142514
for (let i: Index = 0, n = binaryen._BinaryenBlockGetNumChildren(expr); i < n; ++i) {
2515-
visit(binaryen._BinaryenBlockGetChild(expr, i), data);
2515+
visit(binaryen._BinaryenBlockGetChildAt(expr, i), data);
25162516
}
25172517
break;
25182518
}
@@ -2538,13 +2538,13 @@ export function traverse<T>(
25382538
}
25392539
case ExpressionId.Call: {
25402540
for (let i: Index = 0, n = binaryen._BinaryenCallGetNumOperands(expr); i < n; ++i) {
2541-
visit(binaryen._BinaryenCallGetOperand(expr, i), data);
2541+
visit(binaryen._BinaryenCallGetOperandAt(expr, i), data);
25422542
}
25432543
break;
25442544
}
25452545
case ExpressionId.CallIndirect: {
25462546
for (let i: Index = 0, n = binaryen._BinaryenCallIndirectGetNumOperands(expr); i < n; ++i) {
2547-
visit(binaryen._BinaryenCallIndirectGetOperand(expr, i), data);
2547+
visit(binaryen._BinaryenCallIndirectGetOperandAt(expr, i), data);
25482548
}
25492549
break;
25502550
}
@@ -2599,7 +2599,7 @@ export function traverse<T>(
25992599
}
26002600
case ExpressionId.Host: {
26012601
for (let i: Index = 0, n = binaryen._BinaryenHostGetNumOperands(expr); i < n; ++i) {
2602-
visit(binaryen._BinaryenHostGetOperand(expr, i), data);
2602+
visit(binaryen._BinaryenHostGetOperandAt(expr, i), data);
26032603
}
26042604
break;
26052605
}
@@ -2703,7 +2703,7 @@ export function traverse<T>(
27032703
}
27042704
case ExpressionId.Throw: {
27052705
for (let i: Index = 0, n = binaryen._BinaryenThrowGetNumOperands(expr); i < n; ++i) {
2706-
visit(binaryen._BinaryenThrowGetOperand(expr, i), data);
2706+
visit(binaryen._BinaryenThrowGetOperandAt(expr, i), data);
27072707
}
27082708
break;
27092709
}
@@ -2717,7 +2717,7 @@ export function traverse<T>(
27172717
}
27182718
case ExpressionId.TupleMake: {
27192719
for (let i: Index = 0, n = binaryen._BinaryenTupleMakeGetNumOperands(expr); i < n; ++i) {
2720-
visit(binaryen._BinaryenTupleMakeGetOperand(expr, i), data);
2720+
visit(binaryen._BinaryenTupleMakeGetOperandAt(expr, i), data);
27212721
}
27222722
break;
27232723
}

0 commit comments

Comments
 (0)