Properly handle --bootstrap on MoarVM backend.

Raku · Oct 6, 2013 · 431c3b1 · 431c3b1
1 parent c847d0e
commit 431c3b1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/vm/moar/HLL/Backend.nqp b/src/vm/moar/HLL/Backend.nqp
@@ -55,7 +55,11 @@ class HLL::Backend::MoarVM {
             nqp::null()
         }
         else {
-            $assmblr.assemble_and_load($mast);
+            my $boot_mode := %adverbs<bootstrap> ?? 1 !! 0;
+            __MVM__usecompileehllconfig() if $boot_mode;
+            my $result := $assmblr.assemble_and_load($mast);
+            __MVM__usecompilerhllconfig() if $boot_mode;
+            $result
         }
     }
 

diff --git a/src/vm/moar/ModuleLoader.nqp b/src/vm/moar/ModuleLoader.nqp
@@ -42,8 +42,13 @@ knowhow ModuleLoader {
         else {
             my $*CTXSAVE := self;
             my $*MAIN_CTX := ModuleLoader;
+            my $boot_mode;
+            try { $boot_mode := nqp::ifnull(nqp::ifnull(%*COMPILING, {})<%?OPTIONS>, {})<bootstrap>; }
+            $boot_mode := !nqp::isnull($boot_mode) && $boot_mode;
             my $preserve_global := nqp::getcurhllsym('GLOBAL');
+            nqp::usecompileehllconfig() if $boot_mode;
             nqp::loadbytecode($path);
+            nqp::usecompilerhllconfig() if $boot_mode;
             nqp::bindcurhllsym('GLOBAL', $preserve_global);
             %modules_loaded{$path} := $module_ctx := $*MAIN_CTX;
         }
@@ -139,8 +144,13 @@ knowhow ModuleLoader {
             unless nqp::existskey(%settings_loaded, $path) {
                 my $*CTXSAVE := self;
                 my $*MAIN_CTX := ModuleLoader;
+                my $boot_mode;
+                try { $boot_mode := nqp::ifnull(nqp::ifnull(%*COMPILING, {})<%?OPTIONS>, {})<bootstrap>; }
+                $boot_mode := !nqp::isnull($boot_mode) && $boot_mode;
                 my $preserve_global := nqp::getcurhllsym('GLOBAL');
+                nqp::usecompileehllconfig() if $boot_mode;
                 nqp::loadbytecode($path);
+                nqp::usecompilerhllconfig() if $boot_mode;
                 nqp::bindcurhllsym('GLOBAL', $preserve_global);
                 unless nqp::defined($*MAIN_CTX) {
                     nqp::die("Unable to load setting $setting_name; maybe it is missing a YOU_ARE_HERE?");

diff --git a/src/vm/moar/QAST/QASTOperationsMAST.nqp b/src/vm/moar/QAST/QASTOperationsMAST.nqp
@@ -1852,6 +1852,8 @@ QAST::MASTOperations.add_core_moarop_mapping('sethllconfig', 'sethllconfig');
 QAST::MASTOperations.add_core_moarop_mapping('loadbytecode', 'loadbytecode');
 QAST::MASTOperations.add_core_moarop_mapping('settypehll', 'settypehll', 0);
 QAST::MASTOperations.add_core_moarop_mapping('settypehllrole', 'settypehllrole', 0);
+QAST::MASTOperations.add_core_moarop_mapping('usecompileehllconfig', 'usecompileehllconfig');
+QAST::MASTOperations.add_core_moarop_mapping('usecompilerhllconfig', 'usecompilerhllconfig');
 
 # regex engine related opcodes
 QAST::MASTOperations.add_core_moarop_mapping('nfafromstatelist', 'nfafromstatelist');