1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MJIT: Merge mjit_compiler.rb into mjit.rb

Browse Source 
There are too many mjit_compiler.* files. It was hard to find files.
This commit is contained in:
Takashi Kokubun 2022-11-26 15:10:58 -08:00
parent de9e2a5ac7
commit b2dcde839d
5 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common.mk
View File

@ -1085,7 +1085,6 @@ BUILTIN_RB_SRCS = \
$(srcdir)/marshal.rb \ $(srcdir)/marshal.rb \
$(srcdir)/mjit.rb \ $(srcdir)/mjit.rb \
$(srcdir)/mjit_c.rb \ $(srcdir)/mjit_c.rb \
$(srcdir)/mjit_compiler.rb \
$(srcdir)/pack.rb \ $(srcdir)/pack.rb \
$(srcdir)/trace_point.rb \ $(srcdir)/trace_point.rb \
$(srcdir)/warning.rb \ $(srcdir)/warning.rb \
@ -9584,7 +9583,6 @@ miniinit.$(OBJEXT): {$(VPATH)}miniprelude.c
miniinit.$(OBJEXT): {$(VPATH)}missing.h miniinit.$(OBJEXT): {$(VPATH)}missing.h
miniinit.$(OBJEXT): {$(VPATH)}mjit.rb miniinit.$(OBJEXT): {$(VPATH)}mjit.rb
miniinit.$(OBJEXT): {$(VPATH)}mjit_c.rb miniinit.$(OBJEXT): {$(VPATH)}mjit_c.rb
miniinit.$(OBJEXT): {$(VPATH)}mjit_compiler.rb
miniinit.$(OBJEXT): {$(VPATH)}nilclass.rb miniinit.$(OBJEXT): {$(VPATH)}nilclass.rb
miniinit.$(OBJEXT): {$(VPATH)}node.h miniinit.$(OBJEXT): {$(VPATH)}node.h
miniinit.$(OBJEXT): {$(VPATH)}numeric.rb 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_compile_attr.inc
mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.c mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.c
mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.h 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)}mjit_unit.h
mjit_compiler.$(OBJEXT): {$(VPATH)}node.h mjit_compiler.$(OBJEXT): {$(VPATH)}node.h
mjit_compiler.$(OBJEXT): {$(VPATH)}ruby_assert.h mjit_compiler.$(OBJEXT): {$(VPATH)}ruby_assert.h

1
inits.c
View File

@ -108,7 +108,6 @@ rb_call_builtin_inits(void)
#if USE_MJIT #if USE_MJIT
BUILTIN(mjit); BUILTIN(mjit);
BUILTIN(mjit_c); BUILTIN(mjit_c);
BUILTIN(mjit_compiler);
#endif #endif
Init_builtin_prelude(); Init_builtin_prelude();
} }

13
mjit.rb
View File

@ -11,3 +11,16 @@ module RubyVM::MJIT
Primitive.cexpr! 'mjit_resume()' Primitive.cexpr! 'mjit_resume()'
end end
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

2
mjit_compiler.c
View File

@ -173,6 +173,4 @@ extern bool rb_splat_or_kwargs_p(const struct rb_callinfo *restrict ci);
#include "mjit_c.rbinc" #include "mjit_c.rbinc"
#include "mjit_compiler.rbinc"
#endif // USE_MJIT #endif // USE_MJIT

14
mjit_compiler.rb
View File

@ -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