diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2022-11-26 15:10:58 -0800 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2022-11-26 15:31:38 -0800 |
| commit | b2dcde839d824ba30590ce0a8ab8a2fe281fdeb9 (patch) | |
| tree | afcb043e05fd802e2e82f0200026a89482d93787 | |
| parent | de9e2a5ac7b4ef52a03b1b6a3b07708f11d8d11c (diff) | |
| download | ruby-b2dcde839d824ba30590ce0a8ab8a2fe281fdeb9.tar.gz | |
MJIT: Merge mjit_compiler.rb into mjit.rb
There are too many mjit_compiler.* files. It was hard to find files.
| -rw-r--r-- | common.mk | 3 | ||||
| -rw-r--r-- | inits.c | 1 | ||||
| -rw-r--r-- | mjit.rb | 13 | ||||
| -rw-r--r-- | mjit_compiler.c | 2 | ||||
| -rw-r--r-- | mjit_compiler.rb | 14 |
5 files changed, 13 insertions, 20 deletions
@@ -1085,7 +1085,6 @@ BUILTIN_RB_SRCS = \ $(srcdir)/marshal.rb \ $(srcdir)/mjit.rb \ $(srcdir)/mjit_c.rb \ - $(srcdir)/mjit_compiler.rb \ $(srcdir)/pack.rb \ $(srcdir)/trace_point.rb \ $(srcdir)/warning.rb \ @@ -9584,7 +9583,6 @@ miniinit.$(OBJEXT): {$(VPATH)}miniprelude.c miniinit.$(OBJEXT): {$(VPATH)}missing.h miniinit.$(OBJEXT): {$(VPATH)}mjit.rb miniinit.$(OBJEXT): {$(VPATH)}mjit_c.rb -miniinit.$(OBJEXT): {$(VPATH)}mjit_compiler.rb miniinit.$(OBJEXT): {$(VPATH)}nilclass.rb miniinit.$(OBJEXT): {$(VPATH)}node.h miniinit.$(OBJEXT): {$(VPATH)}numeric.rb @@ -10027,7 +10025,6 @@ mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_c.rbinc mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compile_attr.inc mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.c mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.h -mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.rbinc mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_unit.h mjit_compiler.$(OBJEXT): {$(VPATH)}node.h mjit_compiler.$(OBJEXT): {$(VPATH)}ruby_assert.h @@ -108,7 +108,6 @@ rb_call_builtin_inits(void) #if USE_MJIT BUILTIN(mjit); BUILTIN(mjit_c); - BUILTIN(mjit_compiler); #endif Init_builtin_prelude(); } @@ -11,3 +11,16 @@ module RubyVM::MJIT Primitive.cexpr! 'mjit_resume()' end end + +if RubyVM::MJIT.enabled? + begin + require 'fiddle' + require 'fiddle/import' + rescue LoadError + return # miniruby doesn't support MJIT + end + + require "mjit/c_type" + require "mjit/instruction" + require "mjit/compiler" +end diff --git a/mjit_compiler.c b/mjit_compiler.c index 1982ad925c..6b2ff433e2 100644 --- a/mjit_compiler.c +++ b/mjit_compiler.c @@ -173,6 +173,4 @@ extern bool rb_splat_or_kwargs_p(const struct rb_callinfo *restrict ci); #include "mjit_c.rbinc" -#include "mjit_compiler.rbinc" - #endif // USE_MJIT diff --git a/mjit_compiler.rb b/mjit_compiler.rb deleted file mode 100644 index 51dc9e774f..0000000000 --- a/mjit_compiler.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true -# TODO: Merge this to mjit.rb -if RubyVM::MJIT.enabled? - begin - require 'fiddle' - require 'fiddle/import' - rescue LoadError - return # skip miniruby - end - - require "mjit/c_type" - require "mjit/instruction" - require "mjit/compiler" -end |