cranelift_ruby 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b7c82084d7d1c3df6fdea5cbf87a28d7984b6f2e81cbb83e9ed56389f334b8e
-  data.tar.gz: 79d48d591abe63680b5ff844c3e2ffbe39b5a604655c2abaada90598622de36f
+  metadata.gz: '039ede96c7d734182f363ea730befc04ae5cd9dd13e2564219e6dd03beae4d64'
+  data.tar.gz: 164e40e024c40bf14df62dad63189a4d428eed20ffcfb13f3c584dc91eb8d586
 SHA512:
-  metadata.gz: e23767df92a9adf4b7a25feff24e7dae695f4a8735b268e7badbc9fa40e3dce6468943f69dde350ceefbdfe29d92bd6393d651354fa1dd653ec65e7ae136403a
-  data.tar.gz: 63e61a3f1890cb29802e701c6a38b6281662b218a6f14e76b8fa08a13a00693e1a0181c5bf94b900c7423998fae2c1fb3566ce4ce18f167f8b1a4709f8363030
+  metadata.gz: 81228c2a238389ffa49236b29cb8f3017afbd90f47237d2a03cf966c67b6657ecd94538f0ce0000779d0779b1d1ca995fd4120f4628641fdb54f542e94ab2f13
+  data.tar.gz: f57c3c484724faf31e3738311cdfaa3bcf3f2b3dcdf6f8bed1a77e53724b6040689fd12c615325da440cb74cfbfc9ad1746c9828fb17150058811f9efcb340ff

data/lib/cranelift_ruby/version.rb

@@ -1,3 +1,3 @@
 module CraneliftRuby
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/src/lib.rs

@@ -5,6 +5,7 @@ extern crate rutie;
 extern crate lazy_static;
 
 use std::convert::TryInto;
+use std::mem;
 use std::num::TryFromIntError;
 
 use cranelift::codegen::binemit::{NullStackMapSink, NullTrapSink};
@@ -14,18 +15,19 @@ use cranelift::prelude::*;
 use cranelift_jit::{JITBuilder, JITModule};
 use cranelift_module::{default_libcall_names, FuncId, Linkage, Module};
 use eyre::{eyre, Result};
-use rutie::{
-    AnyException, AnyObject, Array, Class, Exception, Integer, NilClass, Object, Proc, RString,
-    Symbol, VM,
-};
+use rutie::rubysys::class;
+use rutie::types::Argc;
+use rutie::util::str_to_cstring;
+use rutie::{AnyException, AnyObject, Array, Boolean, Class, Exception, Integer, NilClass, Object, Proc, RString, Symbol, VM};
 class!(Cranelift);
 
 pub struct Builder {
     pub module: JITModule,
+    pub verbose: bool
 }
 
 impl Builder {
-    fn new() -> Result<Self> {
+    fn new(verbose: bool) -> Result<Self> {
         let mut flag_builder = settings::builder();
         flag_builder.set("use_colocated_libcalls", "false")?;
         // FIXME set back to true once the x64 backend supports it.
@@ -35,6 +37,7 @@ impl Builder {
         let isa = isa_builder.finish(settings::Flags::new(flag_builder));
         Ok(Self {
             module: JITModule::new(JITBuilder::with_isa(isa, default_libcall_names())),
+            verbose: verbose
         })
     }
 }
@@ -43,6 +46,36 @@ wrappable_struct!(Builder, BuilderWrapper, BUILDER_WRAPPER);
 
 class!(CraneliftBuilder);
 
+pub extern fn cranelift_builder_new(argc: Argc, argv: *const AnyObject, _rtself: AnyObject) -> AnyObject {
+    let args = rutie::types::Value::from(0);
+
+    unsafe {
+        let p_argv: *const rutie::types::Value = mem::transmute(argv);
+
+        class::rb_scan_args(
+            argc,
+            p_argv,
+            str_to_cstring("*").as_ptr(),
+            &args
+        )
+    };
+
+    let arguments = Array::from(args);
+    let verbose = {
+        if arguments.length() == 1 {
+            arguments.at(0).try_convert_to::<Boolean>().map_err(|e| VM::raise_ex(e)).unwrap().to_bool()
+        } else {
+            false
+        }
+    };
+    let builder = Builder::new(verbose)
+            .map_err(|e| VM::raise_ex(AnyException::new("StandardError", Some(&e.to_string()))))
+            .unwrap();
+    Class::from_existing("CraneliftRuby")
+        .get_nested_class("CraneliftBuilder")
+        .wrap_data(builder, &*BUILDER_WRAPPER)
+}
+
 methods!(
     CraneliftBuilder,
     itself,
@@ -58,14 +91,6 @@ methods!(
             .get_nested_class("Signature")
             .wrap_data(sig, &*SIGNATURE_WRAPPER)
     },
-    fn cranelift_builder_new() -> AnyObject {
-        let builder = Builder::new()
-            .map_err(|e| VM::raise_ex(AnyException::new("StandardError", Some(&e.to_string()))))
-            .unwrap();
-        Class::from_existing("CraneliftRuby")
-            .get_nested_class("CraneliftBuilder")
-            .wrap_data(builder, &*BUILDER_WRAPPER)
-    },
     fn make_function(name: RString, signature: AnyObject, callback: Proc) -> Integer {
         let builder = itself.get_data_mut(&*BUILDER_WRAPPER);
         let name = name.map_err(|e| VM::raise_ex(e)).unwrap();
@@ -152,7 +177,7 @@ fn make_function_impl(
     let mut func_ctx = FunctionBuilderContext::new();
     ctx.func.signature = signature.clone();
     ctx.func.name = ExternalName::user(0, func.as_u32());
-    // ctx.set_disasm(true);
+    ctx.set_disasm(builder.verbose);
     let bcx: FunctionBuilder = FunctionBuilder::new(&mut ctx.func, &mut func_ctx);
     let cranelift_bcx: AnyObject = Class::from_existing("CraneliftRuby")
         .get_nested_class("CraneliftFunctionBuilder")
@@ -160,12 +185,14 @@ fn make_function_impl(
     callback.call(&[cranelift_bcx]);
     let mut trap_sink = NullTrapSink {};
     let mut stack_map_sink = NullStackMapSink {};
-    // println!("{}", ctx.func.display(None).to_string());
     builder
         .module
         .define_function(func, &mut ctx, &mut trap_sink, &mut stack_map_sink)
         .map_err(|e| AnyException::new("StandardError", Some(&format!("{:?}", e))))?;
-    // println!("code: {}", ctx.mach_compile_result.unwrap().disasm.unwrap());
+    if builder.verbose {
+        println!("\n{}", ctx.func.display(None).to_string());
+        println!("{}\n", ctx.mach_compile_result.unwrap().disasm.unwrap());
+    }
     Ok(func.as_u32())
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cranelift_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Marco Concetto Rudilosso