simplify more

This commit is contained in:
dcode 2019-03-08 22:50:30 +01:00
parent 979a0b8f23
commit dd5430aa76

View File

@ -1,22 +1,28 @@
import { AL_MASK } from "./allocator"; import { AL_MASK } from "./allocator";
/** Common runtime header used by all objects. */ /** Common runtime header of all objects. */
@unmanaged @unmanaged
export class HEADER { export class HEADER {
/** Unique id of the respective class. Not yet registered with GC if zero.*/ /** Unique id of the respective class or a magic value if not yet registered.*/
classId: u32; classId: u32;
/** Size of the allocated payload. */ /** Size of the allocated payload. */
payloadSize: u32; payloadSize: u32;
/** Reserved field for use by GC. */ /** Reserved field for use by GC. Only present if GC is. */
reserved1: usize; // itcm: tagged next reserved1: usize; // itcm: tagged next
/** Reserved field for use by GC. */ /** Reserved field for use by GC. Only present if GC is. */
reserved2: usize; // itcm: prev reserved2: usize; // itcm: prev
} }
/** Whether a GC is present or not. */
@inline export const GC = true;
/** Size of the common runtime header. */ /** Size of the common runtime header. */
@inline export const HEADER_SIZE: usize = (offsetof<HEADER>() + AL_MASK) & ~AL_MASK; @inline export const HEADER_SIZE: usize = GC
/** Magic value used to validate common headers. */ ? (offsetof<HEADER>( ) + AL_MASK) & ~AL_MASK // full header if GC is present
@inline export const HEADER_MAGIC: usize = <usize>0xA55E4B17; : (offsetof<HEADER>("reserved1") + AL_MASK) & ~AL_MASK; // half header if GC is absent
/** Magic value used to validate common runtime headers. */
@inline export const HEADER_MAGIC: u32 = 0xA55E4B17;
/** Aligns an allocation to actual block size. */ /** Aligns an allocation to actual block size. */
function ALIGN(payloadSize: usize): usize { function ALIGN(payloadSize: usize): usize {
@ -33,19 +39,19 @@ function ALIGN(payloadSize: usize): usize {
function UNREF(ref: usize): HEADER { function UNREF(ref: usize): HEADER {
assert(ref >= HEAP_BASE + HEADER_SIZE); // must be a heap object assert(ref >= HEAP_BASE + HEADER_SIZE); // must be a heap object
var header = changetype<HEADER>(ref - HEADER_SIZE); var header = changetype<HEADER>(ref - HEADER_SIZE);
assert(!header.classId && header.reserved2 == HEADER_MAGIC); // must be unregistered assert(header.classId == HEADER_MAGIC); // must be unregistered
return header; return header;
} }
// === General allocation/deallocation ============================================================
/** Allocates a new object and returns a pointer to its payload. */ /** Allocates a new object and returns a pointer to its payload. */
export function ALLOC(payloadSize: u32): usize { export function ALLOC(payloadSize: u32): usize {
var header = changetype<HEADER>(memory.allocate(ALIGN(payloadSize))); var header = changetype<HEADER>(memory.allocate(ALIGN(payloadSize)));
header.classId = 0; header.classId = HEADER_MAGIC;
header.payloadSize = payloadSize; header.payloadSize = payloadSize;
header.reserved1 = 0; if (GC) {
header.reserved2 = HEADER_MAGIC; header.reserved1 = 0;
header.reserved2 = 0;
}
var ref = changetype<usize>(header) + HEADER_SIZE; var ref = changetype<usize>(header) + HEADER_SIZE;
memory.fill(ref, 0, payloadSize); memory.fill(ref, 0, payloadSize);
return ref; return ref;
@ -60,9 +66,11 @@ export function REALLOC(ref: usize, newPayloadSize: u32): usize {
if (ALIGN(payloadSize) < newAlignedSize) { if (ALIGN(payloadSize) < newAlignedSize) {
// move if the allocation isn't large enough to hold the new payload // move if the allocation isn't large enough to hold the new payload
let newHeader = changetype<HEADER>(memory.allocate(newAlignedSize)); let newHeader = changetype<HEADER>(memory.allocate(newAlignedSize));
newHeader.classId = 0; newHeader.classId = HEADER_MAGIC;
newHeader.reserved1 = 0; if (GC) {
newHeader.reserved2 = HEADER_MAGIC; newHeader.reserved1 = 0;
newHeader.reserved2 = 0;
}
let newRef = changetype<usize>(newHeader) + HEADER_SIZE; let newRef = changetype<usize>(newHeader) + HEADER_SIZE;
memory.copy(newRef, ref, payloadSize); memory.copy(newRef, ref, payloadSize);
memory.fill(newRef + payloadSize, 0, newPayloadSize - payloadSize); memory.fill(newRef + payloadSize, 0, newPayloadSize - payloadSize);
@ -91,13 +99,11 @@ export function FREE(ref: usize): void {
/** Registers a managed object with GC. */ /** Registers a managed object with GC. */
export function REGISTER<T>(ref: usize, parentRef: usize): void { export function REGISTER<T>(ref: usize, parentRef: usize): void {
var header = UNREF(ref); var header = UNREF(ref);
header.classId = /* TODO: CLASSID<T>() */ 1; header.classId = /* TODO: CLASSID<T>() */ 1;
header.reserved2 = 0;
// TODO // TODO
} }
// === ArrayBuffer ================================================================================ /** ArrayBuffer base class. */
export abstract class ArrayBufferBase { export abstract class ArrayBufferBase {
get byteLength(): i32 { get byteLength(): i32 {
var header = changetype<HEADER>(changetype<usize>(this) - HEADER_SIZE); var header = changetype<HEADER>(changetype<usize>(this) - HEADER_SIZE);
@ -105,8 +111,7 @@ export abstract class ArrayBufferBase {
} }
} }
// === String ===================================================================================== /** String base class. */
export abstract class StringBase { export abstract class StringBase {
get length(): i32 { get length(): i32 {
var header = changetype<HEADER>(changetype<usize>(this) - HEADER_SIZE); var header = changetype<HEADER>(changetype<usize>(this) - HEADER_SIZE);