fix!: Rework memory management (#461)

grain-lang · Dec 12, 2020 · 89a2aa8 · 89a2aa8
1 parent 6ada4ea
commit 89a2aa8
Show file tree

Hide file tree

Showing 12 changed files with 387 additions and 548 deletions.
diff --git a/cli/bin/run.js b/cli/bin/run.js
@@ -8,7 +8,7 @@ module.exports = async function run(filename, options) {
     let locator = runtime.defaultFileLocator(includeDirs);
     let GrainRunner = runtime.buildGrainRunner(locator, {limitMemory: options.limitMemory});
     if (options.printOutput) {
-      let result = await GrainRunner.runFileUnboxed(filename, true);
+      let result = await GrainRunner.runFileUnboxed(filename);
       console.log(runtime.grainToString(GrainRunner, result));
     } else {
       await GrainRunner.runFile(filename);

diff --git a/runtime/src/core/closures.js b/runtime/src/core/closures.js
@@ -1,4 +1,4 @@
-import { view, grainModule } from '../runtime';
+import { managedMemory, grainModule } from '../runtime';
 import { throwGrainError } from '../errors/errors';
 import { grainToJSVal, JSToGrainVal } from '../utils/utils';
 import { GRAIN_ERR_ARITY_MISMATCH } from '../errors/error-codes';
@@ -7,6 +7,8 @@ import { print } from '../lib/print';
 
 export class GrainClosure {
   constructor(loc) {
+    const view = managedMemory.view;
+
     this.loc = loc;
     this.arity = view[loc];
     this.ptr = view[loc + 1];
@@ -28,6 +30,8 @@ export class GrainClosure {
 };
 
 export function printClosure(c) {
+  const view = managedMemory.view;
+
   c /= 4;
   let arity = view[c];
   let idx = view[c + 1];

diff --git a/runtime/src/core/grain-module.js b/runtime/src/core/grain-module.js
@@ -103,10 +103,6 @@ export class GrainModule {
     return this.requiredExport("GRAIN$TABLE_SIZE");
   }
 
-  get cleanupGlobals() {
-    return this.requiredExport("GRAIN$CLEANUP_GLOBALS");
-  }
-
   get types() {
     if (!this._types) {
       let cmi = this.cmi;

diff --git a/runtime/src/core/heap.js b/runtime/src/core/heap.js
@@ -1,4 +1,4 @@
-import { memory, malloc } from '../runtime';
+import { memory, managedMemory } from '../runtime';
 import { GrainError } from '../errors/errors';
 
 export const heapController = {
@@ -26,5 +26,5 @@ export function makeMemoryChecker(runner) {
 
 export function grainHeapAllocate(numWords) {
   // allocates the number of words
-  return malloc(numWords * 4)
+  return managedMemory.malloc(numWords * 4)
 }
diff --git a/runtime/src/core/malloc.js b/runtime/src/core/malloc.js