summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: f66e021)
rawpatchinlineside by side (parent: f66e021)
| author | 卜部昌平 <[email protected]> | |
| Fri, 10 Jul 2020 02:49:50 +0000 (10 11:49 +0900) | ||
| committer | 卜部昌平 <[email protected]> | |
| Sun, 12 Jul 2020 23:56:18 +0000 (13 08:56 +0900) |
We can obtain the verbatim source code of Primitive.cexpr!. Why not
paste that content into the JITed program.
paste that content into the JITed program.
diff --git a/integer.rb b/integer.rb
--- a/integer.rb
+++ b/integer.rb
# Returns +true+ if +int+ is an even number.
def even?
Primitive.attr! 'inline'
- Primitive.cexpr! 'int_even_p(self)'
+ Primitive.cexpr! 'rb_int_even_p(self)'
end
# call-seq:
# Returns +true+ if +int+ has a zero value.
def zero?
Primitive.attr! 'inline'
- Primitive.cexpr! 'int_zero_p(self)'
+ Primitive.cexpr! 'rb_int_zero_p(self)'
end
end
diff --git a/internal/numeric.h b/internal/numeric.h
--- a/internal/numeric.h
+++ b/internal/numeric.h
VALUE rb_int_and(VALUE x, VALUE y);
VALUE rb_int_lshift(VALUE x, VALUE y);
VALUE rb_int_div(VALUE x, VALUE y);
-VALUE rb_int_abs(VALUE num);
VALUE rb_int_odd_p(VALUE num);
int rb_int_positive_p(VALUE num);
int rb_int_negative_p(VALUE num);
int rb_float_cmp(VALUE x, VALUE y);
VALUE rb_float_eql(VALUE x, VALUE y);
VALUE rb_fix_aref(VALUE fix, VALUE idx);
+VALUE rb_int_zero_p(VALUE num);
+VALUE rb_int_even_p(VALUE num);
+VALUE rb_int_abs(VALUE num);
MJIT_SYMBOL_EXPORT_END
static inline bool
diff --git a/internal/object.h b/internal/object.h
--- a/internal/object.h
+++ b/internal/object.h
void rb_obj_copy_ivar(VALUE dest, VALUE obj);
VALUE rb_false(VALUE obj);
VALUE rb_convert_type_with_id(VALUE v, int t, const char* nam, ID mid);
+VALUE rb_obj_size(VALUE self, VALUE args, VALUE obj);
MJIT_SYMBOL_EXPORT_END
static inline void
diff --git a/numeric.c b/numeric.c
--- a/numeric.c
+++ b/numeric.c
return Qfalse;
}
+VALUE
+rb_int_zero_p(VALUE num)
+{
+ return int_zero_p(num);
+}
+
/*
* call-seq:
* num.nonzero? -> self or nil
}
}
+VALUE
+rb_int_even_p(VALUE num)
+{
+ return int_even_p(num);
+}
+
/*
* call-seq:
* int.allbits?(mask) -> true or false
diff --git a/object.c b/object.c
--- a/object.c
+++ b/object.c
return obj;
}
-static VALUE
+VALUE
rb_obj_size(VALUE self, VALUE args, VALUE obj)
{
return LONG2FIX(1);
# Parse built-in script and make rbinc file
require 'ripper'
+require 'stringio'
+require_relative 'ruby_vm/helpers/c_escape'
def string_literal(lit, str = [])
while lit
}
end
+def generate_cexpr(ofile, lineno, line_file, body_lineno, text, locals, func_name)
+ f = StringIO.new
+ f.puts '{'
+ lineno += 1
+ locals.reverse_each.with_index{|param, i|
+ next unless Symbol === param
+ f.puts "MAYBE_UNUSED(const VALUE) #{param} = rb_vm_lvar(ec, #{-3 - i});"
+ lineno += 1
+ }
+ f.puts "#line #{body_lineno} \"#{line_file}\""
+ lineno += 1
+
+ f.puts text
+ lineno += text.count("\n") + 1
+
+ f.puts "#line #{lineno + 2} \"#{ofile}\"" # TODO: restore line number.
+ f.puts "}"
+ f.puts
+ lineno += 3
+
+ return lineno, f.string
+end
+
def mk_builtin_header file
base = File.basename(file, '.rb')
ofile = "#{file}inc"
inlines.each{|cfunc_name, (body_lineno, text, locals, func_name)|
if String === cfunc_name
- f.puts "static VALUE #{cfunc_name}(struct rb_execution_context_struct *ec, const VALUE self) {"
- lineno += 1
-
- locals.reverse_each.with_index{|param, i|
- next unless Symbol === param
- f.puts "MAYBE_UNUSED(const VALUE) #{param} = rb_vm_lvar(ec, #{-3 - i});"
- lineno += 1
- }
- f.puts "#line #{body_lineno} \"#{line_file}\""
+ f.puts "static VALUE #{cfunc_name}(struct rb_execution_context_struct *ec, const VALUE self)"
lineno += 1
-
- f.puts text
- lineno += text.count("\n") + 1
-
- f.puts "#line #{lineno + 2} \"#{ofile}\"" # TODO: restore line number.
- f.puts "}"
- lineno += 2
+ lineno, str = generate_cexpr(ofile, lineno, line_file, body_lineno, text, locals, func_name)
+ f.write str
else
# cinit!
f.puts "#line #{body_lineno} \"#{line_file}\""
f.puts %'static void'
f.puts %'mjit_compile_invokebuiltin_for_#{func}(FILE *f, long index)'
f.puts %'{'
- f.puts %' if (index > 0) {'
- f.puts %' fprintf(f, " const unsigned int lnum = GET_ISEQ()->body->local_table_size;\\n");'
- f.puts %' fprintf(f, " const VALUE *argv = GET_EP() - lnum - VM_ENV_DATA_SIZE + 1 + %ld;\\n", index);'
- f.puts %' }'
- f.puts %' else if (index == 0) {'
- f.puts %' fprintf(f, " const VALUE *argv = NULL;\\n");'
- f.puts %' }'
- f.puts %' else {'
- f.puts %' fprintf(f, " const VALUE *argv = STACK_ADDR_FROM_TOP(%d);\\n", #{argc});'
- f.puts %' }'
- f.puts %' fprintf(f, " val = builtin_invoker#{argc}(ec, GET_SELF(), argv, %p);\\n", (const void *)#{cfunc_name});'
+ if inlines.has_key? cfunc_name
+ f.puts %' fprintf(f, " MAYBE_UNUSED(VALUE) self = GET_SELF();\\n");'
+ body_lineno, text, locals, func_name = inlines[cfunc_name]
+ lineno, str = generate_cexpr(ofile, lineno, line_file, body_lineno, text, locals, func_name)
+ str.each_line {|i|
+ f.printf(%' fprintf(f, "%%s", %s);\n', RubyVM::CEscape.rstring2cstr(i.sub(/^return\b/ , ' val =')))
+ }
+ else
+ decl = ', VALUE' * argc
+ argv = argc \
+ . times \
+ . map {|i|", argv[#{i}]"} \
+ . join('')
+ f.puts %' fprintf(f, " typedef VALUE (*func)(rb_execution_context_t *, VALUE#{decl});\\n");'
+ if argc > 0
+ f.puts %' if (index == -1) {'
+ f.puts %' fprintf(f, " const VALUE *argv = STACK_ADDR_FROM_TOP(%d);\\n", #{argc});'
+ f.puts %' }'
+ f.puts %' else {'
+ f.puts %' fprintf(f, " const unsigned int lnum = GET_ISEQ()->body->local_table_size;\\n");'
+ f.puts %' fprintf(f, " const VALUE *argv = GET_EP() - lnum - VM_ENV_DATA_SIZE + 1 + %ld;\\n", index);'
+ f.puts %' }'
+ end
+ f.puts %' fprintf(f, " func f = (func)%p\\n;", (const void *)#{cfunc_name});'
+ f.puts %' fprintf(f, " val = f(ec, GET_SELF()#{argv});\\n");'
+ end
f.puts %'}'
f.puts
}
# I believe this is the fastest implementation done in pure-ruby.
# Constants cached, gsub skips block evaluation, string literal optimized.
buf = str.b
- buf.gsub! %r/./n, RString2CStr
+ buf.gsub! %r/./nm, RString2CStr
return %'"#{buf}"'
end