summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2022-12-21 22:46:15 -0800
committerGitHub <noreply@github.com>2022-12-21 22:46:15 -0800
commitbb4cbd0803c3297ad036008adc7a01159ce44e1e (patch)
tree11286d4b8c1171141b9767c29b7e788b1c3f6f8a
parent43f4093a313146d1a5c59f7b234872cdd6950c6c (diff)
downloadruby-bb4cbd0803c3297ad036008adc7a01159ce44e1e.tar.gz
Put RubyVM::MJIT::Compiler under ruby_vm directory (#6989)
[Misc #19250]
-rw-r--r--.gitignore2
-rw-r--r--common.mk6
-rw-r--r--lib/ruby_vm/mjit/c_pointer.rb (renamed from lib/mjit/c_pointer.rb)0
-rw-r--r--lib/ruby_vm/mjit/c_type.rb (renamed from lib/mjit/c_type.rb)0
-rw-r--r--lib/ruby_vm/mjit/compiler.rb (renamed from lib/mjit/compiler.rb)0
-rw-r--r--mjit.rb8
-rw-r--r--tool/ruby_vm/views/lib/ruby_vm/mjit/instruction.rb.erb (renamed from tool/ruby_vm/views/lib/mjit/instruction.rb.erb)0
7 files changed, 8 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 535c4fb789..99d32a1825 100644
--- a/.gitignore
+++ b/.gitignore
@@ -238,7 +238,7 @@ lcov*.info
# MJIT
/include/ruby-*/*/rb_mjit_min_header-*.h
-/lib/mjit/instruction.rb
+/lib/ruby_vm/mjit/instruction.rb
/mjit_config.h
/rb_mjit_header.h
diff --git a/common.mk b/common.mk
index 0d41d24947..8021f03a58 100644
--- a/common.mk
+++ b/common.mk
@@ -235,9 +235,9 @@ all: $(SHOWFLAGS) main docs
main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
@$(NULLCMD)
-main: $(srcdir)/lib/mjit/instruction.rb
-srcs: $(srcdir)/lib/mjit/instruction.rb
-$(srcdir)/lib/mjit/instruction.rb: $(tooldir)/insns2vm.rb $(tooldir)/ruby_vm/views/lib/mjit/instruction.rb.erb $(srcdir)/insns.def
+main: $(srcdir)/lib/ruby_vm/mjit/instruction.rb
+srcs: $(srcdir)/lib/ruby_vm/mjit/instruction.rb
+$(srcdir)/lib/ruby_vm/mjit/instruction.rb: $(tooldir)/insns2vm.rb $(tooldir)/ruby_vm/views/lib/ruby_vm/mjit/instruction.rb.erb $(srcdir)/insns.def
$(ECHO) generating $@
$(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb --basedir="$(srcdir)" $(INSNS2VMOPT) $@
diff --git a/lib/mjit/c_pointer.rb b/lib/ruby_vm/mjit/c_pointer.rb
index ee0be54a3c..ee0be54a3c 100644
--- a/lib/mjit/c_pointer.rb
+++ b/lib/ruby_vm/mjit/c_pointer.rb
diff --git a/lib/mjit/c_type.rb b/lib/ruby_vm/mjit/c_type.rb
index 9e45d8d41c..9e45d8d41c 100644
--- a/lib/mjit/c_type.rb
+++ b/lib/ruby_vm/mjit/c_type.rb
diff --git a/lib/mjit/compiler.rb b/lib/ruby_vm/mjit/compiler.rb
index fae51d6114..fae51d6114 100644
--- a/lib/mjit/compiler.rb
+++ b/lib/ruby_vm/mjit/compiler.rb
diff --git a/mjit.rb b/mjit.rb
index 64c1c69c1a..7391451a6c 100644
--- a/mjit.rb
+++ b/mjit.rb
@@ -20,10 +20,10 @@ if RubyVM::MJIT.enabled?
return # miniruby doesn't support MJIT
end
- RubyVM::MJIT::C = Object.new # forward declaration for mjit/compiler
- require "mjit/c_type"
- require "mjit/instruction"
- require "mjit/compiler"
+ RubyVM::MJIT::C = Object.new # forward declaration for ruby_vm/mjit/compiler
+ require 'ruby_vm/mjit/c_type'
+ require 'ruby_vm/mjit/instruction'
+ require 'ruby_vm/mjit/compiler'
module RubyVM::MJIT
private_constant(*constants)
diff --git a/tool/ruby_vm/views/lib/mjit/instruction.rb.erb b/tool/ruby_vm/views/lib/ruby_vm/mjit/instruction.rb.erb
index dac53668a0..dac53668a0 100644
--- a/tool/ruby_vm/views/lib/mjit/instruction.rb.erb
+++ b/tool/ruby_vm/views/lib/ruby_vm/mjit/instruction.rb.erb