fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-06-28 22:21:50 +00:00
Code Issues Projects Releases Wiki Activity

finalize GC wiring

Browse Source
This commit is contained in:
dcode
2019-03-30 13:58:20 +01:00
parent 6a790321aa
commit 3e3c393856
33 changed files with 4605 additions and 2723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
std/assembly/array.ts
View File

@ -1,6 +1,6 @@
/// <reference path="./collector/index.d.ts" />
import { ALLOCATE, REALLOCATE, DISCARD, REGISTER, MAX_BYTELENGTH, MAKEARRAY, ArrayBufferView } from "./runtime";
import { ALLOCATE, REALLOCATE, DISCARD, REGISTER, MAX_BYTELENGTH, MAKEARRAY, ArrayBufferView, classId } from "./runtime";
import { ArrayBuffer } from "./arraybuffer";
import { COMPARATOR, SORT } from "./util/sort";
import { itoa, dtoa, itoa_stream, dtoa_stream, MAX_DOUBLE_LENGTH } from "./util/number";
@ -804,13 +804,22 @@ export class Array<T> extends ArrayBufferView {
// GC integration
@unsafe private __iter(fn: (ref: usize) => void): void {
@unsafe private __iterate(fn: (ref: usize) => void): void {
fn(changetype<usize>(this.data));
if (isManaged<T>()) {
let cur = this.dataStart;
let end = cur + <usize>this.dataLength;
while (cur < end) {
fn(load<usize>(cur));
let val = load<usize>(cur);
if (isNullable<T>()) {
if (val) {
fn(val);
call_indirect(classId<T>(), val, fn);
}
} else {
fn(val);
call_indirect(classId<T>(), val, fn);
}
cur += sizeof<usize>();
}
}

16
std/assembly/collector/itcm.ts
View File

@ -159,14 +159,12 @@ function step(): void {
if (TRACE) trace("itcm~step/MARK iterate", 1, objToRef(obj));
iter = obj;
obj.color = i32(!white);
// if (TRACE) {
// trace(" next/prev/hook", 3,
// changetype<usize>(obj.next),
// changetype<usize>(obj.prev),
// changetype<u32>(obj.hookFn)
// );
// }
obj.hookFn(objToRef(obj));
// CLASS~iterate(ref, fn)
call_indirect(obj.classId, objToRef(obj), (ref: usize): void => {
trace(" iter", 1, ref);
var obj = refToObj(ref);
if (obj.color == white) obj.makeGray();
});
} else {
if (TRACE) trace("itcm~step/MARK finish");
iterateRoots((ref: usize): void => {
@ -237,7 +235,7 @@ export function __ref_register(ref: usize): void {
step(); // also makes sure it's initialized
var obj = refToObj(ref);
obj.color = white;
fromSpace.push(obj);
fromSpace.push(obj); // sets gc-reserved header fields
}
// @ts-ignore: decorator

15
std/assembly/fixedarray.ts
View File

@ -1,4 +1,4 @@
import { ALLOCATE, REGISTER, MAX_BYTELENGTH, HEADER, HEADER_SIZE } from "./runtime";
import { ALLOCATE, REGISTER, MAX_BYTELENGTH, HEADER, HEADER_SIZE, classId } from "./runtime";
import { E_INDEXOUTOFRANGE, E_INVALIDLENGTH, E_HOLEYARRAY } from "./util/error";
// NOTE: DO NOT USE YET!
@ -71,12 +71,21 @@ export class FixedArray<T> {
// GC integration
@unsafe private __iter(fn: (ref: usize) => void): void {
@unsafe private __iterate(fn: (ref: usize) => void): void {
if (isManaged<T>()) {
let cur = changetype<usize>(this);
let end = cur + changetype<HEADER>(changetype<usize>(this) - HEADER_SIZE).payloadSize;
while (cur < end) {
fn(load<usize>(cur));
let val = load<usize>(cur);
if (isNullable<T>()) {
if (val) {
fn(val);
call_indirect(classId<T>(), val, fn);
}
} else {
fn(val);
call_indirect(classId<T>(), val, fn);
}
cur += sizeof<usize>();
}
}

29
std/assembly/map.ts
View File

@ -1,6 +1,7 @@
/// <reference path="./collector/index.d.ts" />
import { HASH } from "./util/hash";
import { classId } from "./runtime";
// A deterministic hash map based on CloseTable from https://github.com/jorendorff/dht
@ -267,7 +268,7 @@ export class Map<K,V> {
// GC integration
@unsafe private __iter(fn: (ref: usize) => void): void {
@unsafe private __iterate(fn: (ref: usize) => void): void {
fn(changetype<usize>(this.buckets));
var entries = this.entries;
fn(changetype<usize>(entries));
@ -277,8 +278,30 @@ export class Map<K,V> {
while (cur < end) {
let entry = changetype<MapEntry<K,V>>(cur);
if (!(entry.taggedNext & EMPTY)) {
if (isManaged<K>()) fn(changetype<usize>(entry.key));
if (isManaged<V>()) fn(changetype<usize>(entry.value));
if (isManaged<K>()) {
let val = changetype<usize>(entry.key);
if (isNullable<K>()) {
if (val) {
fn(val);
call_indirect(classId<K>(), val, fn);
}
} else {
fn(val);
call_indirect(classId<K>(), val, fn);
}
}
if (isManaged<V>()) {
let val = changetype<usize>(entry.value);
if (isNullable<V>()) {
if (val) {
fn(val);
call_indirect(classId<V>(), val, fn);
}
} else {
fn(val);
call_indirect(classId<V>(), val, fn);
}
}
}
cur += ENTRY_SIZE<K,V>();
}

16
std/assembly/set.ts
View File

@ -1,6 +1,7 @@
/// <reference path="./collector/index.d.ts" />
import { HASH } from "./util/hash";
import { classId } from "./runtime";
// A deterministic hash set based on CloseTable from https://github.com/jorendorff/dht
@ -197,7 +198,7 @@ export class Set<K> {
// GC integration
@unsafe private __iter(fn: (ref: usize) => void): void {
@unsafe private __iterate(fn: (ref: usize) => void): void {
fn(changetype<usize>(this.buckets));
var entries = this.entries;
fn(changetype<usize>(entries));
@ -206,7 +207,18 @@ export class Set<K> {
let end = cur + <usize>this.entriesOffset * ENTRY_SIZE<K>();
while (cur < end) {
let entry = changetype<SetEntry<K>>(cur);
if (!(entry.taggedNext & EMPTY)) fn(changetype<usize>(entry.key));
if (!(entry.taggedNext & EMPTY)) {
let val = changetype<usize>(entry.key);
if (isNullable<K>()) {
if (val) {
fn(val);
call_indirect(classId<K>(), val, fn);
}
} else {
fn(val);
call_indirect(classId<K>(), val, fn);
}
}
cur += ENTRY_SIZE<K>();
}
}