Support --vmlibs on MoarVM.

Raku · Oct 24, 2013 · ad5b106 · ad5b106
1 parent 94b174b
commit ad5b106
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/NQP/Compiler.nqp b/src/NQP/Compiler.nqp
@@ -36,6 +36,7 @@ my @clo := $nqpcomp.commandline_options();
 $nqpcomp.addstage('classname', :after<start>);
 #?endif
 #?if moar
+@clo.push('vmlibs=s');
 @clo.push('bootstrap');
 #?endif
 

diff --git a/src/NQP/World.nqp b/src/NQP/World.nqp
@@ -489,18 +489,38 @@ class NQP::World is HLL::World {
 
     # Adds libraries that NQP code depends on.
     method libs() {
+#?if parrot
         # Need to load the NQP dynops/dympmcs, plus any extras requested.
         my @loadlibs := ['nqp_group', 'nqp_ops', 'nqp_bigint_ops', 'trans_ops', 'io_ops'];
         if %*COMPILING<%?OPTIONS><vmlibs> {
             for nqp::split(',', %*COMPILING<%?OPTIONS><vmlibs>) {
                 @loadlibs.push($_);
             }
         }
-        QAST::VM.new(
-            loadlibs => @loadlibs,
-            jvm => QAST::Op.new( :op('null') ),
-            moar => QAST::Op.new( :op('null') )
-        );
+        QAST::VM.new( :@loadlibs );
+#?endif
+#?if jvm
+        QAST::Op.new( :op('null') )
+#?endif
+#?if moar
+        my $libs := QAST::Stmts.new();
+        if %*COMPILING<%?OPTIONS><vmlibs> {
+            for nqp::split(',', %*COMPILING<%?OPTIONS><vmlibs>) {
+                my @bits := nqp::split('=', $_);
+                $libs.push(QAST::VM.new(
+                    :moarop('loadlib'),
+                    QAST::SVal.new( :value(@bits[0]) ),
+                    QAST::SVal.new( :value(@bits[0]) )
+                ));
+                $libs.push(QAST::VM.new(
+                    :moarop('loadext'),
+                    QAST::SVal.new( :value(@bits[0]) ),
+                    QAST::SVal.new( :value(@bits[1]) )
+                ));
+            }
+        }
+        $libs
+#?endif
     }
 
     # Adds some initial tasks.