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

support for in loop for class and interface #15

Merged
merged 6 commits into from
Oct 8, 2023
Merged

support for in loop for class and interface #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
341a556
support for in loop on class and infc
kylo5aby Sep 28, 2023
18f7ef9
Merge remote-tracking branch 'upstream/main' into for-in
kylo5aby Sep 28, 2023
bb42c33
add functions to get vtable & meta from object
kylo5aby Sep 28, 2023
5a4a9bc
replace wasm_func_call node to enum_key_get node
kylo5aby Oct 7, 2023
83eeafb
add some comments
kylo5aby Oct 8, 2023
9f02ff4
Merge remote-tracking branch 'upstream/main' into for-in
kylo5aby Oct 8, 2023
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
4 changes: 4 additions & 0 deletions lib/builtin/builtin_name.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ export namespace BuiltinNames {
// builtin module name
export const builtinModuleName = 'builtin';

// customize wasm util functions prefix name
export const utilsFuncName = 'utils';

// builtin file name
export const builtinTypeName = 'lib.type.d.ts';
export const builtinImplementFileName = 'lib_builtin.ts';
Expand Down Expand Up @@ -267,4 +270,5 @@ export namespace BuiltinNames {
}
export const ObjectToStringMethod = 'toString';
export const ObjectBuiltinMethods = [ObjectToStringMethod];
export const getPropNamesByMeta = 'get_prop_name_by_meta';
}
246 changes: 245 additions & 1 deletion src/backend/binaryen/lib/init_builtin_api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import {
StringRefEqOp,
StringRefMeatureOp,
StringRefSliceOp,
StringRefNewOp,
baseStructType,
emptyStructType,
stringArrayStructTypeForStringRef,
} from '../glue/transform.js';
Expand All @@ -19,6 +21,13 @@ import {
FunctionalFuncs,
FlattenLoop,
getCString,
getFieldFromMetaByOffset,
MetaDataOffset,
META_FLAG_MASK,
ItableFlag,
MetaFieldOffset,
SIZE_OF_META_FIELD,
getWASMObjectMeta,
} from '../utils.js';
import { dyntype } from './dyntype/utils.js';
import { arrayToPtr } from '../glue/transform.js';
Expand All @@ -33,8 +42,9 @@ import {
import { array_get_data, array_get_length_i32 } from './array_utils.js';
import { SemanticsKind } from '../../../semantics/semantics_nodes.js';
import { ValueTypeKind } from '../../../semantics/value_types.js';
import { getBuiltInFuncName } from '../../../utils.js';
import { getBuiltInFuncName, getUtilsFuncName } from '../../../utils.js';
import { getConfig } from '../../../../config/config_mgr.js';
import { memoryAlignment } from '../memory.js';

function anyrefCond(module: binaryen.Module) {
const ref = module.local.get(0, binaryen.anyref);
Expand Down Expand Up @@ -80,6 +90,219 @@ function anyrefCond(module: binaryen.Module) {
return module.block(null, [stmt], binaryen.i32);
}

function getPropNameThroughMeta(module: binaryen.Module) {
const objIndex = 0,
elemsIndex = 1,
metaIndex = 2,
metaFieldsCountIndex = 3,
metaFieldsPtrIndex = 4,
propNameIndex = 5,
fieldFlagIndex = 6,
loopIndex = 7,
iterPropCountIndex = 8,
curCharIndex = 9,
strLenIndex = 10;

const obj = module.local.get(objIndex, baseStructType.typeRef);
const elems = module.local.get(
elemsIndex,
stringArrayTypeInfoForStringRef.typeRef,
);
const meta = module.local.get(metaIndex, binaryen.i32);
const mataFieldsCount = module.local.get(
metaFieldsCountIndex,
binaryen.i32,
);
const metaFieldsPtr = module.local.get(metaFieldsPtrIndex, binaryen.i32);
const propName = module.local.get(propNameIndex, binaryen.i32);
const fieldFlag = module.local.get(fieldFlagIndex, binaryen.i32);
const loopIdx = module.local.get(loopIndex, binaryen.i32);
const iterPropCount = module.local.get(iterPropCountIndex, binaryen.i32);
const curChar = module.local.get(curCharIndex, binaryen.i32);
const strLen = module.local.get(strLenIndex, binaryen.i32);

const statementArray: binaryen.ExpressionRef[] = [];

// 1. get meta
const metaValue = getWASMObjectMeta(module, obj);
statementArray.push(module.local.set(metaIndex, metaValue));

// 2. get meta fields count
statementArray.push(
module.local.set(
metaFieldsCountIndex,
getFieldFromMetaByOffset(module, meta, MetaDataOffset.COUNT_OFFSET),
),
);

// 3. get meta fields ptr
statementArray.push(
module.local.set(
metaFieldsPtrIndex,
module.i32.add(
meta,
module.i32.const(MetaDataOffset.FIELDS_PTR_OFFSET),
),
),
);

statementArray.push(
module.local.set(iterPropCountIndex, module.i32.const(0)),
);

// 4. get number of iterable properties, and fill string array by iterable names
const loop = (loopLabel: string, ifTrueBlock: binaryen.ExpressionRef) => {
const loopInit = module.local.set(loopIndex, module.i32.const(0));
const loopCond = module.i32.lt_u(loopIdx, mataFieldsCount);
const loopIncrementor = module.local.set(
loopIndex,
module.i32.add(loopIdx, module.i32.const(1)),
);
const loopStmtsArray: binaryen.ExpressionRef[] = [];
const flagAndIndex = module.i32.load(
MetaFieldOffset.FLAG_AND_INDEX_OFFSET,
memoryAlignment,
metaFieldsPtr,
);
loopStmtsArray.push(
module.local.set(
fieldFlagIndex,
module.i32.and(flagAndIndex, module.i32.const(META_FLAG_MASK)),
),
);
loopStmtsArray.push(
module.if(
module.i32.eq(fieldFlag, module.i32.const(ItableFlag.FIELD)),
ifTrueBlock,
),
);
loopStmtsArray.push(
module.local.set(
metaFieldsPtrIndex,
module.i32.add(
metaFieldsPtr,
module.i32.const(SIZE_OF_META_FIELD),
),
),
);
const forLoop: FlattenLoop = {
label: loopLabel,
condition: loopCond,
statements: module.block(null, loopStmtsArray),
incrementor: loopIncrementor,
};
statementArray.push(loopInit);
statementArray.push(
module.loop(
loopLabel,
FunctionalFuncs.flattenLoopStatement(
module,
forLoop,
SemanticsKind.FOR,
),
),
);
};

// get number of iterable properties
loop(
'for_label1',
module.local.set(
iterPropCountIndex,
module.i32.add(iterPropCount, module.i32.const(1)),
),
);

statementArray.push(
module.local.set(
elemsIndex,
binaryenCAPI._BinaryenArrayNew(
module.ptr,
stringArrayTypeInfoForStringRef.heapTypeRef,
iterPropCount,
module.ref.null(binaryen.stringref),
),
),
);

// fill string array by iterable names
statementArray.push(
module.local.set(
metaFieldsPtrIndex,
module.i32.add(
meta,
module.i32.const(MetaDataOffset.FIELDS_PTR_OFFSET),
),
),
module.local.set(iterPropCountIndex, module.i32.const(0)),
);

const getIterPropBlock = module.block(null, [
module.local.set(
propNameIndex,
module.i32.load(
MetaFieldOffset.NAME_OFFSET,
memoryAlignment,
metaFieldsPtr,
),
),
// get property name length by a loop
module.local.set(
curCharIndex,
module.i32.add(propName, module.i32.const(-1)),
),
module.loop(
'label_0',
module.block(null, [
module.br_if(
'label_0',
module.i32.load8_u(
0,
0,
module.local.tee(
curCharIndex,
module.i32.add(curChar, module.i32.const(1)),
binaryen.i32,
),
),
),
]),
),
module.local.set(strLenIndex, module.i32.sub(curChar, propName)),
binaryenCAPI._BinaryenArraySet(
module.ptr,
elems,
iterPropCount,
binaryenCAPI._BinaryenStringNew(
module.ptr,
StringRefNewOp.UTF8,
propName,
strLen,
0,
0,
false,
),
),
module.local.set(
iterPropCountIndex,
module.i32.add(iterPropCount, module.i32.const(1)),
),
]);

loop('for_label2', getIterPropBlock);

// 5. create string array
const stringArrayRef = binaryenCAPI._BinaryenStructNew(
module.ptr,
arrayToPtr([elems, iterPropCount]).ptr,
2,
stringArrayStructTypeInfoForStringRef.heapTypeRef,
);
statementArray.push(module.return(stringArrayRef));

return module.block(null, statementArray);
}

function string_concat(module: binaryen.Module) {
/** Args: context, this, string[] */
const thisStrStructIdx = 1;
Expand Down Expand Up @@ -3559,6 +3782,27 @@ export function callBuiltInAPIs(module: binaryen.Module) {
[],
string_toUpperCase_stringref(module),
);
/** For now, here should enable --enableStringref flag to get prop name
* through meta
*/
module.addFunction(
getUtilsFuncName(BuiltinNames.getPropNamesByMeta),
baseStructType.typeRef,
stringArrayStructTypeInfoForStringRef.typeRef,
[
stringArrayTypeInfoForStringRef.typeRef,
binaryen.i32,
binaryen.i32,
binaryen.i32,
binaryen.i32,
binaryen.i32,
binaryen.i32,
binaryen.i32,
binaryen.i32,
binaryen.i32,
],
getPropNameThroughMeta(module),
);
} else {
module.addFunction(
UtilFuncs.getFuncName(
Expand Down
2 changes: 1 addition & 1 deletion src/backend/binaryen/memory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function initGlobalOffset(module: binaryen.Module) {
);
}

export const LinearMemoryAlign = 4;
export const memoryAlignment = 4;

export function initDefaultMemory(
module: binaryen.Module,
Expand Down
Loading