Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Fix detached ArrayBuffer errors
  • Loading branch information
yonihemi committed Jan 25, 2022
commit 2bac14da0ae8c66bf2f313050e5bad57a42381d0
2 changes: 1 addition & 1 deletion Runtime/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export class SwiftRuntime {
},

swjs_decode_string: (bytes_ptr: pointer, length: number) => {
const bytes = this.memory.bytes.subarray(
const bytes = this.memory.bytes().subarray(
bytes_ptr,
bytes_ptr + length
);
Expand Down
18 changes: 8 additions & 10 deletions Runtime/src/memory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,27 @@ import { pointer } from "./types";

export class Memory {
readonly rawMemory: WebAssembly.Memory;
readonly bytes: Uint8Array;
readonly dataView: DataView;

private readonly heap = new SwiftRuntimeHeap();

constructor(exports: WebAssembly.Exports) {
this.rawMemory = exports.memory as WebAssembly.Memory;
this.bytes = new Uint8Array(this.rawMemory.buffer);
this.dataView = new DataView(this.rawMemory.buffer);
}

retain = (value: any) => this.heap.retain(value);
getObject = (ref: number) => this.heap.referenceHeap(ref);
release = (ref: number) => this.heap.release(ref);

writeBytes = (ptr: pointer, bytes: Uint8Array) =>
this.bytes.set(bytes, ptr);
bytes = () => new Uint8Array(this.rawMemory.buffer);
dataView = () => new DataView(this.rawMemory.buffer);

readUint32 = (ptr: pointer) => this.dataView.getUint32(ptr, true);
readFloat64 = (ptr: pointer) => this.dataView.getFloat64(ptr, true);
writeBytes = (ptr: pointer, bytes: Uint8Array) => this.bytes().set(bytes, ptr);

readUint32 = (ptr: pointer) => this.dataView().getUint32(ptr, true);
readFloat64 = (ptr: pointer) => this.dataView().getFloat64(ptr, true);

writeUint32 = (ptr: pointer, value: number) =>
this.dataView.setUint32(ptr, value, true);
this.dataView().setUint32(ptr, value, true);
writeFloat64 = (ptr: pointer, value: number) =>
this.dataView.setFloat64(ptr, value, true);
this.dataView().setFloat64(ptr, value, true);
}