Let Main register Base in the Loader

eregon · May 24, 2017 · afd7638 · afd7638
1 parent edcd7e5
commit afd7638
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/lib/main/init/Init.oz b/lib/main/init/Init.oz
@@ -359,6 +359,7 @@ define
 
       %% Link or apply root functor (i.e. application)
       proc {Main}
+         {Boot.registerBase Base}
          if {Not {PropertyTestGet 'oz.dotoz' _}} then {OnLoad} end
          AppFunctor = {GetOrFalse 'application.functor'}
       in

diff --git a/vm/src/org/mozartoz/truffle/nodes/builtins/BootBuiltins.java b/vm/src/org/mozartoz/truffle/nodes/builtins/BootBuiltins.java
@@ -4,6 +4,7 @@
 
 import org.mozartoz.truffle.nodes.OzNode;
 import org.mozartoz.truffle.nodes.builtins.VirtualStringBuiltinsFactory.ToAtomNodeFactory;
+import org.mozartoz.truffle.translator.Loader;
 
 import com.oracle.truffle.api.dsl.CreateCast;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -42,4 +43,17 @@ Object getNative(Object name) {
 
 	}
 
+	@Builtin(proc = true, deref = ALL)
+	@GenerateNodeFactory
+	@NodeChild("base")
+	public static abstract class RegisterBaseNode extends OzNode {
+
+		@Specialization
+		Object registerBase(DynamicObject base) {
+			Loader.getInstance().registerBase(base);
+			return unit;
+		}
+
+	}
+
 }
diff --git a/vm/src/org/mozartoz/truffle/translator/Loader.java b/vm/src/org/mozartoz/truffle/translator/Loader.java
@@ -40,7 +40,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.frame.FrameSlot;
-import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
@@ -154,6 +153,11 @@ public DynamicObject loadBase() {
 		return base;
 	}
 
+	public void registerBase(DynamicObject base) {
+		assert this.base == null || this.base == base;
+		this.base = base;
+	}
+
 	private RootCallTarget parseBase() {
 		tick("enter parseBase");
 		Program program = BootCompiler.buildBaseEnvProgram(
@@ -231,7 +235,6 @@ public void runFunctor(Source source, String... args) {
 				throw t;
 			}
 			tick("deserialized Main");
-			base = getBaseFromMain(main);
 		} else {
 			eagerLoad = true;
 			try {
@@ -282,13 +285,6 @@ private Object applyInitFunctor(Object initFunctor) {
 		return execute(ApplyFunctor.apply(language, initFunctor, imports, "Init.apply"));
 	}
 
-	private DynamicObject getBaseFromMain(OzProc main) {
-		MaterializedFrame topFrame = OzArguments.getParentFrame(main.declarationFrame);
-		FrameSlot baseSlot = topFrame.getFrameDescriptor().getSlots().get(0);
-		assert baseSlot.getIdentifier().toString().contains("<Base>");
-		return (DynamicObject) topFrame.getValue(baseSlot);
-	}
-
 	// Shutdown
 
 	private List<Process> childProcesses = new LinkedList<>();