8000 Merge pull request #94 from Shopify/ujit-vestiges · eileencodes/ruby@218f07f · GitHub
[go: up one dir, main page]
Skip to content

Commit 218f07f

Browse files
maximecbmaximecb
authored
Merge pull request ruby#94 from Shopify/ujit-vestiges
Remove some MicroJIT vestiges
2 parents 978c74d + 3cb0c3b commit 218f07f

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

‎template/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,8 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \
597597
$(tooldir)/ruby_vm/models/instructions_unifications.rb \
598598
$(tooldir)/ruby_vm/models/operands_unifications.rb \
599599
$(tooldir)/ruby_vm/models/trace_instructions.rb \
600-
$(tooldir)/ruby_vm/models/micro_jit.rb \
601-
$(tooldir)/ruby_vm/models/micro_jit/example_instructions.rb \
600+
$(tooldir)/ruby_vm/models/yjit.rb \
601+
$(tooldir)/ruby_vm/models/yjit/example_instructions.rb \
602602
$(tooldir)/ruby_vm/models/typemap.rb \
603603
$(tooldir)/ruby_vm/scripts/converter.rb \
604604
$(tooldir)/ruby_vm/scripts/insns2vm.rb \

‎tool/ruby_vm/models/instructions.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
require_relative 'bare_instructions'
1414
require_relative 'operands_unifications'
1515
require_relative 'instructions_unifications'
16-
require_relative 'micro_jit'
16+
require_relative 'yjit'
1717

1818
RubyVM::Instructions = RubyVM::BareInstructions.to_a + \
1919
RubyVM::OperandsUnifications.to_a + \
2020
RubyVM::InstructionsUnifications.to_a + \
21-
RubyVM::MicroJIT::ExampleInstructions.to_a
21+
RubyVM::YJIT::ExampleInstructions.to_a
2222

2323

2424
require_relative 'trace_instructions'

‎tool/ruby_vm/models/micro_jit.rb renamed to ‎tool/ruby_vm/models/yjit.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# conditions mentioned in the file COPYING are met. Consult the file for
1111
# details.
1212

13-
module RubyVM::MicroJIT
13+
module RubyVM::YJIT
1414
ScrapeResult = Struct.new(:pre_call_bytes, :post_call_bytes, :disassembly_lines)
1515

1616
class << self
@@ -218,4 +218,4 @@ def comma_separated_hex_string(nums)
218218
end
219219
end
220220

221-
require_relative 'micro_jit/example_instructions'
221+
require_relative 'yjit/example_instructions'

‎tool/ruby_vm/models/micro_jit/example_instructions.rb renamed to ‎tool/ruby_vm/models/yjit/example_instructions.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# conditions mentioned in the file COPYING are met. Consult the file for
1111
# details.
1212

13-
class RubyVM::MicroJIT::ExampleInstructions
13+
class RubyVM::YJIT::ExampleInstructions
1414
include RubyVM::CEscape
1515

1616
attr_reader :name

‎tool/ruby_vm/views/vm.inc.erb

Copy file name to clipboard
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<%= render 'insn_entry', locals: { insn: insn } -%>
2626
% end
2727
%
28-
% RubyVM::MicroJIT::ExampleInstructions.to_a.each do |insn|
28+
% RubyVM::YJIT::ExampleInstructions.to_a.each do |insn|
2929
INSN_ENTRY(yjit_call_example_with_ec)
3030
{
3131
START_OF_ORIGINAL_INSN(yjit_call_example_with_ec);

‎tool/ruby_vm/views/yjit_hooks.inc.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
%# details.
99
<%= render 'copyright' %>
1010
<%= render 'notice', locals: {
11-
this_file: 'contains raw instruction bytes that helps MicroJIT generate code',
11+
this_file: 'contains raw instruction bytes that helps YJIT generate code',
1212
edit: __FILE__,
1313
} -%>
1414

15-
% success, byte_arrays = RubyVM::MicroJIT.scrape
15+
% success, byte_arrays = RubyVM::YJIT.scrape
1616
static const uint8_t yjit_scrape_successful = <%= success %>;
1717
% byte_arrays.each do |(prefix, scrape_result)|
1818
// Disassembly:

0 commit comments

Comments
 (0)
0