summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authorAaron Patterson <tenderlove@ruby-lang.org>2021-06-21 15:16:13 -0700
committerAlan Wu <XrXr@users.noreply.github.com>2021-10-20 18:19:36 -0400
commit30f20d7c3867d6e06d78efb5d7e99b4b4260c2ac (patch)
treefe85e6510a98372accaec75f0418db2222a37b00 /tool
parent0cd3b97e027332236625835578329580be12023c (diff)
Remove some MicroJIT vestiges
Just happened to run across this, so lets fix them
Diffstat (limited to 'tool')
-rw-r--r--tool/ruby_vm/models/instructions.rb4
-rw-r--r--tool/ruby_vm/models/yjit.rb (renamed from tool/ruby_vm/models/micro_jit.rb)4
-rw-r--r--tool/ruby_vm/models/yjit/example_instructions.rb (renamed from tool/ruby_vm/models/micro_jit/example_instructions.rb)2
-rw-r--r--tool/ruby_vm/views/vm.inc.erb2
-rw-r--r--tool/ruby_vm/views/yjit_hooks.inc.erb4
5 files changed, 8 insertions, 8 deletions
diff --git a/tool/ruby_vm/models/instructions.rb b/tool/ruby_vm/models/instructions.rb
index 1533872d66..e6e5d2713b 100644
--- a/tool/ruby_vm/models/instructions.rb
+++ b/tool/ruby_vm/models/instructions.rb
@@ -13,12 +13,12 @@
require_relative 'bare_instructions'
require_relative 'operands_unifications'
require_relative 'instructions_unifications'
-require_relative 'micro_jit'
+require_relative 'yjit'
RubyVM::Instructions = RubyVM::BareInstructions.to_a + \
RubyVM::OperandsUnifications.to_a + \
RubyVM::InstructionsUnifications.to_a + \
- RubyVM::MicroJIT::ExampleInstructions.to_a
+ RubyVM::YJIT::ExampleInstructions.to_a
require_relative 'trace_instructions'
diff --git a/tool/ruby_vm/models/micro_jit.rb b/tool/ruby_vm/models/yjit.rb
index 83b463a367..e6caab1081 100644
--- a/tool/ruby_vm/models/micro_jit.rb
+++ b/tool/ruby_vm/models/yjit.rb
@@ -10,7 +10,7 @@
# conditions mentioned in the file COPYING are met. Consult the file for
# details.
-module RubyVM::MicroJIT
+module RubyVM::YJIT
ScrapeResult = Struct.new(:pre_call_bytes, :post_call_bytes, :disassembly_lines)
class << self
@@ -218,4 +218,4 @@ module RubyVM::MicroJIT
end
end
-require_relative 'micro_jit/example_instructions'
+require_relative 'yjit/example_instructions'
diff --git a/tool/ruby_vm/models/micro_jit/example_instructions.rb b/tool/ruby_vm/models/yjit/example_instructions.rb
index 5dd40fef65..16d6633af5 100644
--- a/tool/ruby_vm/models/micro_jit/example_instructions.rb
+++ b/tool/ruby_vm/models/yjit/example_instructions.rb
@@ -10,7 +10,7 @@
# conditions mentioned in the file COPYING are met. Consult the file for
# details.
-class RubyVM::MicroJIT::ExampleInstructions
+class RubyVM::YJIT::ExampleInstructions
include RubyVM::CEscape
attr_reader :name
diff --git a/tool/ruby_vm/views/vm.inc.erb b/tool/ruby_vm/views/vm.inc.erb
index c49c785df6..a4a32a8623 100644
--- a/tool/ruby_vm/views/vm.inc.erb
+++ b/tool/ruby_vm/views/vm.inc.erb
@@ -25,7 +25,7 @@
<%= render 'insn_entry', locals: { insn: insn } -%>
% end
%
-% RubyVM::MicroJIT::ExampleInstructions.to_a.each do |insn|
+% RubyVM::YJIT::ExampleInstructions.to_a.each do |insn|
INSN_ENTRY(yjit_call_example_with_ec)
{
START_OF_ORIGINAL_INSN(yjit_call_example_with_ec);
diff --git a/tool/ruby_vm/views/yjit_hooks.inc.erb b/tool/ruby_vm/views/yjit_hooks.inc.erb
index faca2050c6..1abd281491 100644
--- a/tool/ruby_vm/views/yjit_hooks.inc.erb
+++ b/tool/ruby_vm/views/yjit_hooks.inc.erb
@@ -8,11 +8,11 @@
%# details.
<%= render 'copyright' %>
<%= render 'notice', locals: {
- this_file: 'contains raw instruction bytes that helps MicroJIT generate code',
+ this_file: 'contains raw instruction bytes that helps YJIT generate code',
edit: __FILE__,
} -%>
-% success, byte_arrays = RubyVM::MicroJIT.scrape
+% success, byte_arrays = RubyVM::YJIT.scrape
static const uint8_t yjit_scrape_successful = <%= success %>;
% byte_arrays.each do |(prefix, scrape_result)|
// Disassembly: