Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7b0aa9ed9c80^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 66f3984dcf22
Choose a head ref
  • 12 commits
  • 9 files changed
  • 1 contributor

Commits on May 2, 2016

  1. [Truffle] Use the same names for CExt methods as the C API methods, s… 

    …o it's more searchable.
    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    7b0aa9e View commit details

  2. [Truffle] Use the JVMCI build in Sulong for JAVACMD when using --sulong

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    4e46988 View commit details

  3. [Truffle] File for CExt methods in Ruby.

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    5ce3628 View commit details

  4. [Truffle] Use const char * everywhere.

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    9e98e7c View commit details

  5. [Truffle] Pass through String in NameToJavaStringNode.

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    f447e51 View commit details

  6. [Truffle] rb_define_module

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    9858d22 View commit details

  7. [Truffle] Use truffle_read_string

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    b174622 View commit details

  8. [Truffle] Use truffle_read_string in more places.

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    82db09d View commit details

  9. [Truffle] rb_const_get as object.const_get

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    8b351c0 View commit details

  10. [Truffle] Move Qfalse into Ruby.

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    d331a71 View commit details

  11. [Truffle] Implement the numeric macros in Java.

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    3e1b6e2 View commit details

  12. [Truffle] Implement the rest of the C API we're using so far in Ruby.

    @chrisseaton
    chrisseaton committed May 2, 2016
    Copy the full SHA
    66f3984 View commit details
14 changes: 7 additions & 7 deletions lib/ruby/truffle/cext/ruby.h
View file
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ ID rb_intern(const char *string);
VALUE rb_str_new2(const char *string);
VALUE ID2SYM(ID id);
VALUE rb_intern_str(VALUE string);
void rb_str_cat(VALUE string, char *to_concat, long length);
void rb_str_cat(VALUE string, const char *to_concat, long length);

int RARRAY_LEN(VALUE array);
VALUE *RARRAY_PTR(VALUE array);
@@ -90,7 +90,7 @@ VALUE rb_hash_new();
VALUE rb_hash_aref(VALUE hash, VALUE key);
void rb_hash_aset(VALUE hash, VALUE key, VALUE value);

void rb_scan_args(int argc, VALUE *argv, char *format, ...);
void rb_scan_args(int argc, VALUE *argv, const char *format, ...);

VALUE rb_funcall(VALUE object, ID name, int argc, ...);

@@ -101,12 +101,12 @@ VALUE rb_const_get(VALUE object, ID name);

void rb_raise(VALUE exception, const char *format, ...);

VALUE rb_define_module(char *name);
VALUE rb_define_module_under(VALUE module, char *name);
VALUE rb_define_module(const char *name);
VALUE rb_define_module_under(VALUE module, const char *name);

void rb_define_method(VALUE module, char *name, void *function, int args);
void rb_define_private_method(VALUE module, char *name, void *function, int args);
int rb_define_module_function(VALUE module, char *name, void *function, int args);
void rb_define_method(VALUE module, const char *name, void *function, int args);
void rb_define_private_method(VALUE module, const char *name, void *function, int args);
int rb_define_module_function(VALUE module, const char *name, void *function, int args);

#if defined(__cplusplus)
}
Binary file modified lib/ruby/truffle/cext/ruby.su
View file
Binary file not shown.
14 changes: 13 additions & 1 deletion tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -59,6 +59,17 @@ def self.find_graal
end
raise "couldn't find graal - download it as described in https://github.com/jruby/jruby/wiki/Downloading-GraalVM and extract it into the JRuby repository or parent directory"
end

def self.find_sulong_graal(dir)
jvmci = File.join(dir, '..', 'jvmci')
Dir.entries(jvmci).each do |entry|
child = File.join(jvmci, entry)
if File.directory?(child) && entry.start_with?('jdk')
return File.join(child, 'product', 'bin', 'java')
end
end
raise "couldn't find the Java build in the Sulong repository - you need to check it out and build it"
end

def self.find_graal_js
jar = ENV['GRAAL_JS_JAR']
@@ -279,7 +290,7 @@ def help
puts 'jt run [options] args... run JRuby with -X+T and args'
puts ' --graal use Graal (set GRAAL_BIN or it will try to automagically find it)'
puts ' --js add Graal.js to the classpath (set GRAAL_JS_JAR)'
puts ' --sulong add Sulong to the classpath (set SULONG_DIR, implies --graal)'
puts ' --sulong add Sulong to the classpath (set SULONG_DIR, implies --graal but finds it from the SULONG_DIR)'
puts ' --asm show assembly (implies --graal)'
puts ' --server run an instrumentation server on port 8080'
puts ' --igv make sure IGV is running and dump Graal graphs after partial escape (implies --graal)'
@@ -394,6 +405,7 @@ def run(*args)

if args.delete('--sulong')
dir = Utilities.find_sulong_dir
env_vars["JAVACMD"] = Utilities.find_sulong_graal(dir)
jruby_args << '-J-classpath'
jruby_args << File.join(dir, 'lib', '*')
jruby_args << '-J-classpath'
103 changes: 49 additions & 54 deletions truffle/src/main/c/cext/ruby.c
View file
Original file line number Diff line number Diff line change
@@ -12,96 +12,91 @@

#include <ruby.h>

static void *ruby_cext;

__attribute__((constructor))
void truffle_ruby_load() {
ruby_cext = truffle_import("ruby_cext");
}
#define RUBY_CEXT truffle_import_cached("ruby_cext")

VALUE get_Qfalse() {
return (VALUE) truffle_read(ruby_cext, "qfalse");
return (VALUE) truffle_read(RUBY_CEXT, "Qfalse");
}

VALUE get_Qtrue() {
return (VALUE) truffle_read(ruby_cext, "qtrue");
return (VALUE) truffle_read(RUBY_CEXT, "Qtrue");
}

VALUE get_Qnil() {
return (VALUE) truffle_read(ruby_cext, "qnil");
return (VALUE) truffle_read(RUBY_CEXT, "Qnil");
}

VALUE get_rb_cObject() {
return (VALUE) truffle_read(ruby_cext, "object");
return (VALUE) truffle_read(RUBY_CEXT, "rb_cObject");
}

VALUE get_rb_cArray() {
return (VALUE) truffle_read(ruby_cext, "array");
return (VALUE) truffle_read(RUBY_CEXT, "rb_cArray");
}

VALUE get_rb_cHash() {
return (VALUE) truffle_read(ruby_cext, "hash");
return (VALUE) truffle_read(RUBY_CEXT, "rb_cHash");
}

VALUE get_rb_eRuntimeError() {
return (VALUE) truffle_read(ruby_cext, "runtime_error");
return (VALUE) truffle_read(RUBY_CEXT, "rb_eRuntimeError");
}

int NUM2INT(VALUE value) {
return truffle_invoke_i(ruby_cext, "num2int", value);
return truffle_invoke_i(RUBY_CEXT, "NUM2INT", value);
}

unsigned int NUM2UINT(VALUE value) {
return (unsigned int) truffle_invoke_i(ruby_cext, "num2uint", value);
return (unsigned int) truffle_invoke_i(RUBY_CEXT, "NUM2UINT", value);
}

long NUM2LONG(VALUE value) {
return truffle_invoke_l(ruby_cext, "num2long", value);
return truffle_invoke_l(RUBY_CEXT, "NUM2LONG", value);
}

int FIX2INT(VALUE value) {
return truffle_invoke_i(ruby_cext, "fix2int", value);
return truffle_invoke_i(RUBY_CEXT, "FIX2INT", value);
}

unsigned int FIX2UINT(VALUE value) {
return (unsigned int) truffle_invoke_i(ruby_cext, "fix2uint", value);
return (unsigned int) truffle_invoke_i(RUBY_CEXT, "FIX2UINT", value);
}

long FIX2LONG(VALUE value) {
return truffle_invoke_l(ruby_cext, "fix2long", value);
return truffle_invoke_l(RUBY_CEXT, "FIX2LONG", value);
}

VALUE INT2NUM(int value) {
return (VALUE) truffle_invoke(ruby_cext, "int2num", value);
return (VALUE) truffle_invoke(RUBY_CEXT, "INT2NUM", value);
}

VALUE INT2FIX(int value) {
return (VALUE) truffle_invoke(ruby_cext, "int2fix", value);
return (VALUE) truffle_invoke(RUBY_CEXT, "INT2FIX", value);
}

VALUE UINT2NUM(unsigned int value) {
return (VALUE) truffle_invoke(ruby_cext, "uint2num", value);
return (VALUE) truffle_invoke(RUBY_CEXT, "UINT2NUM", value);
}

VALUE LONG2NUM(long value) {
return (VALUE) truffle_invoke(ruby_cext, "long2num", value);
return (VALUE) truffle_invoke(RUBY_CEXT, "LONG2NUM", value);
}

VALUE LONG2FIX(long value) {
return (VALUE) truffle_invoke(ruby_cext, "long2fix", value);
return (VALUE) truffle_invoke(RUBY_CEXT, "LONG2FIX", value);
}

int FIXNUM_P(VALUE value) {
return truffle_invoke_i(ruby_cext, "fixnum?", value);
return truffle_invoke_i(RUBY_CEXT, "FIXNUM_P", value);
}

VALUE rb_float_new(double value) {
return (VALUE) truffle_invoke(ruby_cext, "float_new", value);
return (VALUE) truffle_invoke(RUBY_CEXT, "rb_float_new", value);
}

char *RSTRING_PTR(VALUE string) {
// Needs to return a fake char* which actually calls back into Ruby when read or written
return (char*) truffle_invoke(ruby_cext, "string_ptr", string);
return (char*) truffle_invoke(RUBY_CEXT, "RSTRING_PTR", string);
}

int RSTRING_LEN(VALUE string) {
@@ -113,23 +108,23 @@ VALUE rb_ary_dup(VALUE array) {
}

ID rb_intern(const char *string) {
return (ID) truffle_invoke(ruby_cext, "intern", string);
return (ID) truffle_invoke(RUBY_CEXT, "rb_intern", string);
}

VALUE rb_str_new2(const char *string) {
return (VALUE) truffle_invoke(ruby_cext, "str_new2", string);
return (VALUE) truffle_invoke(RUBY_CEXT, "rb_str_new2", truffle_read_string(string));
}

VALUE rb_intern_str(VALUE string) {
return (VALUE) truffle_invoke(ruby_cext, "intern", string);
return (VALUE) truffle_invoke(RUBY_CEXT, "rb_intern_str", string);
}

VALUE ID2SYM(ID id) {
return truffle_invoke(ruby_cext, "id2sym", id);
return truffle_invoke(RUBY_CEXT, "ID2SYM", id);
}

void rb_str_cat(VALUE string, char *to_concat, long length) {
truffle_invoke(ruby_cext, "string_cat", string, to_concat, length);
void rb_str_cat(VALUE string, const char *to_concat, long length) {
truffle_invoke(RUBY_CEXT, "rb_str_cat", string, truffle_read_string(to_concat), length);
}

int RARRAY_LEN(VALUE array) {
@@ -138,19 +133,19 @@ int RARRAY_LEN(VALUE array) {

VALUE *RARRAY_PTR(VALUE array) {
// Needs to return a fake VALUE* which actually calls back into Ruby when read or written
return (VALUE*) truffle_invoke(ruby_cext, "array_ptr", array);
return (VALUE*) truffle_invoke(RUBY_CEXT, "RARRAY_PTR", array);
}

VALUE rb_ary_new_capa(long capacity) {
return (VALUE) truffle_invoke(ruby_cext, "array_new_capa", capacity);
return (VALUE) truffle_invoke(RUBY_CEXT, "rb_ary_new_capa", capacity);
}

VALUE rb_ary_new2() {
return (VALUE) truffle_invoke(ruby_cext, "array_new2");
return (VALUE) truffle_invoke(RUBY_CEXT, "rb_ary_new2");
}

VALUE rb_ary_new() {
return (VALUE) truffle_invoke(ruby_cext, "array_new");
return (VALUE) truffle_invoke(RUBY_CEXT, "rb_ary_new");
}

void rb_ary_push(VALUE array, VALUE value) {
@@ -170,7 +165,7 @@ int RARRAY_LENINT(VALUE array) {
}

VALUE rb_hash_new() {
return (VALUE) truffle_invoke(ruby_cext, "hash_new");
return (VALUE) truffle_invoke(RUBY_CEXT, "rb_hash_new");
}

VALUE rb_hash_aref(VALUE hash, VALUE key) {
@@ -181,47 +176,47 @@ void rb_hash_aset(VALUE hash, VALUE key, VALUE value) {
truffle_write(hash, key, value);
}

void rb_scan_args(int argc, VALUE *argv, char *format, ...) {
truffle_invoke(ruby_cext, "scan_args", argc, argv, format /*, where to get args? */);
void rb_scan_args(int argc, VALUE *argv, const char *format, ...) {
truffle_invoke(RUBY_CEXT, "rb_scan_args", argc, argv, format /*, where to get args? */);
}

VALUE rb_funcall(VALUE object, ID name, int argc, ...) {
return truffle_invoke(object, name /*, where to get args? */);
}

VALUE rb_iv_get(VALUE object, const char *name) {
return truffle_read(object, name);
return truffle_read(object, truffle_read_string(name));
}

VALUE rb_iv_set(VALUE object, const char *name, VALUE value) {
truffle_write(object, name, value);
truffle_write(object, truffle_read_string(name), value);
return value;
}

VALUE rb_const_get(VALUE object, ID name) {
return truffle_invoke(ruby_cext, "const_get", object, name);
return truffle_invoke(object, "const_get", name);
}

void rb_raise(VALUE exception, const char *format, ...) {
truffle_invoke(ruby_cext, "raise", format /*, where to get args? */);
truffle_invoke(RUBY_CEXT, "rb_raise", format /*, where to get args? */);
}

VALUE rb_define_module(char *name) {
return truffle_invoke(ruby_cext, "define_module", name);
VALUE rb_define_module(const char *name) {
return truffle_invoke(RUBY_CEXT, "rb_define_module", truffle_read_string(name));
}

VALUE rb_define_module_under(VALUE module, char *name) {
return truffle_invoke(ruby_cext, "define_module_under", module, name);
VALUE rb_define_module_under(VALUE module, const char *name) {
return truffle_invoke(RUBY_CEXT, "rb_define_module_under", module, name);
}

void rb_define_method(VALUE module, char *name, void *function, int args) {
truffle_invoke(ruby_cext, "define_method", module, name, function, args);
void rb_define_method(VALUE module, const char *name, void *function, int args) {
truffle_invoke(RUBY_CEXT, "rb_define_method", module, truffle_read_string(name), function, args);
}

void rb_define_private_method(VALUE module, char *name, void *function, int args) {
truffle_invoke(ruby_cext, "define_private_method", module, name, function, args);
void rb_define_private_method(VALUE module, const char *name, void *function, int args) {
truffle_invoke(RUBY_CEXT, "rb_define_private_method", module, truffle_read_string(name), function, args);
}

int rb_define_module_function(VALUE module, char *name, void *function, int args) {
return truffle_invoke_i(ruby_cext, "define_module_function", module, name, function, args);
int rb_define_module_function(VALUE module, const char *name, void *function, int args) {
return truffle_invoke_i(RUBY_CEXT, "rb_define_module_function", module, truffle_read_string(name), function, args);
}
7 changes: 6 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/cast/NameToJavaStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -40,6 +40,11 @@ public NameToJavaStringNode(RubyContext context, SourceSection sourceSection) {

public abstract String executeToJavaString(VirtualFrame frame, Object name);

@Specialization
public String passThroughJavaString(String string) {
return string;
}

@Specialization(guards = "isRubySymbol(symbol)")
public String coerceRubySymbol(DynamicObject symbol) {
return Layouts.SYMBOL.getString(symbol);
@@ -50,7 +55,7 @@ public String coerceRubyString(DynamicObject string) {
return string.toString();
}

@Specialization(guards = { "!isRubySymbol(object)", "!isRubyString(object)" })
@Specialization(guards = { "!isString(object)", "!isRubySymbol(object)", "!isRubyString(object)" })
public String coerceObject(VirtualFrame frame, Object object) {
final Object coerced;
try {
Loading