make nqp::backendconfig available for all backends

Raku · Oct 28, 2013 · ffcebf9 · ffcebf9
1 parent 0d34a3e
commit ffcebf9
Show file tree

Hide file tree

Showing 24 changed files with 91,597 additions and 91,373 deletions.
diff --git a/src/vm/jvm/HLL/Backend.nqp b/src/vm/jvm/HLL/Backend.nqp
@@ -1,11 +1,13 @@
 # Backend class for the JVM.
 class HLL::Backend::JVM {
+    our %jvm_config := nqp::backendconfig();
+
     method apply_transcodings($s, $transcode) {
         $s
     }
 
     method config() {
-        nqp::jvmgetconfig()
+        %jvm_config
     }
 
     method force_gc() {

diff --git a/src/vm/jvm/QAST/Compiler.nqp b/src/vm/jvm/QAST/Compiler.nqp
@@ -2477,7 +2477,7 @@ QAST::OperationsJAST.map_classlib_core_op('continuationinvoke', $TYPE_OPS, 'cont
 QAST::OperationsJAST.map_classlib_core_op('jvmeqaddr', $TYPE_OPS, 'jvmeqaddr', [$RT_OBJ, $RT_OBJ], $RT_INT, :tc);
 QAST::OperationsJAST.map_classlib_core_op('jvmisnull', $TYPE_OPS, 'jvmisnull', [$RT_OBJ], $RT_INT, :tc);
 QAST::OperationsJAST.map_classlib_core_op('jvmbootinterop', $TYPE_OPS, 'jvmbootinterop', [], $RT_OBJ, :tc);
-QAST::OperationsJAST.map_classlib_core_op('jvmgetconfig', $TYPE_OPS, 'jvmgetconfig', [], $RT_OBJ, :tc);
+QAST::OperationsJAST.map_classlib_core_op('backendconfig', $TYPE_OPS, 'jvmgetconfig', [], $RT_OBJ, :tc);
 
 # Native call ops
 QAST::OperationsJAST.map_classlib_core_op('initnativecall', $TYPE_NATIVE_OPS, 'init', [], $RT_INT);

diff --git a/src/vm/jvm/stage0/JASTNodes.jar b/src/vm/jvm/stage0/JASTNodes.jar
diff --git a/src/vm/jvm/stage0/ModuleLoader.jar b/src/vm/jvm/stage0/ModuleLoader.jar
diff --git a/src/vm/jvm/stage0/NQPCORE.setting.jar b/src/vm/jvm/stage0/NQPCORE.setting.jar
diff --git a/src/vm/jvm/stage0/NQPHLL.jar b/src/vm/jvm/stage0/NQPHLL.jar
diff --git a/src/vm/jvm/stage0/NQPP6QRegex.jar b/src/vm/jvm/stage0/NQPP6QRegex.jar
diff --git a/src/vm/jvm/stage0/QAST.jar b/src/vm/jvm/stage0/QAST.jar
diff --git a/src/vm/jvm/stage0/QASTNode.jar b/src/vm/jvm/stage0/QASTNode.jar
diff --git a/src/vm/jvm/stage0/QRegex.jar b/src/vm/jvm/stage0/QRegex.jar
diff --git a/src/vm/jvm/stage0/nqp.jar b/src/vm/jvm/stage0/nqp.jar
diff --git a/src/vm/jvm/stage0/nqpmo.jar b/src/vm/jvm/stage0/nqpmo.jar
diff --git a/src/vm/parrot/HLL/Backend.nqp b/src/vm/parrot/HLL/Backend.nqp
@@ -1,6 +1,6 @@
 # Backend class for Parrot.
 class HLL::Backend::Parrot {
-    our %parrot_config := pir::getinterp__P()[pir::const::IGLOBALS_CONFIG_HASH];
+    our %parrot_config := nqp::backendconfig();
 
     method apply_transcodings($s, $transcode) {
         for nqp::split(' ', $transcode) {

diff --git a/src/vm/parrot/ModuleLoader.nqp b/src/vm/parrot/ModuleLoader.nqp
@@ -24,7 +24,7 @@ knowhow ModuleLoader {
         nqp::push(@search_paths, 'blib');
 
         # Add NQP langauge directory.
-        my %conf := pir::getinterp__P()[pir::const::IGLOBALS_CONFIG_HASH];
+        my %conf := nqp::backendconfig();
         nqp::push(@search_paths, %conf<libdir> ~ %conf<versiondir> ~
             '/languages/nqp/lib');
 

diff --git a/src/vm/parrot/NQP/Ops.nqp b/src/vm/parrot/NQP/Ops.nqp
@@ -101,3 +101,14 @@ $ops.add_hll_op('nqp', 'falsey', -> $qastcomp, $op {
     }
     $ops
 });
+
+# pir::getinterp__P()[pir::const::IGLOBALS_CONFIG_HASH];
+$ops.add_hll_op('nqp', 'backendconfig', -> $qastcomp, $op {
+    $qastcomp.as_post(
+        QAST::VarWithFallback.new(
+            :scope('positional'), :fallback(QAST::Op.new( :op('list') )),
+            QAST::VM.new( :pirop('getinterp__P') ),
+            QAST::VM.new( :pirconst('IGLOBALS_CONFIG_HASH') )
+        )
+    )
+});
diff --git a/src/vm/parrot/stage0/HLL-s0.pir b/src/vm/parrot/stage0/HLL-s0.pir