kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Remove some MicroJIT vestiges

Browse source 
Just happened to run across this, so lets fix them
This commit is contained in:
Aaron Patterson 2021-06-21 15:16:13 -07:00 • committed by Alan Wu
parent 0cd3b97e02
commit 30f20d7c38
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
template/Makefile.in
View file

@ -610,8 +610,8 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \
$(tooldir)/ruby_vm/models/instructions_unifications.rb \ $(tooldir)/ruby_vm/models/instructions_unifications.rb \
$(tooldir)/ruby_vm/models/operands_unifications.rb \ $(tooldir)/ruby_vm/models/operands_unifications.rb \
$(tooldir)/ruby_vm/models/trace_instructions.rb \ $(tooldir)/ruby_vm/models/trace_instructions.rb \
$(tooldir)/ruby_vm/models/micro_jit.rb \ $(tooldir)/ruby_vm/models/yjit.rb \
$(tooldir)/ruby_vm/models/micro_jit/example_instructions.rb \ $(tooldir)/ruby_vm/models/yjit/example_instructions.rb \
$(tooldir)/ruby_vm/models/typemap.rb \ $(tooldir)/ruby_vm/models/typemap.rb \
$(tooldir)/ruby_vm/scripts/converter.rb \ $(tooldir)/ruby_vm/scripts/converter.rb \
$(tooldir)/ruby_vm/scripts/insns2vm.rb \ $(tooldir)/ruby_vm/scripts/insns2vm.rb \

4
tool/ruby_vm/models/instructions.rb
View file

@ -13,12 +13,12 @@
require_relative 'bare_instructions' require_relative 'bare_instructions'
require_relative 'operands_unifications' require_relative 'operands_unifications'
require_relative 'instructions_unifications' require_relative 'instructions_unifications'
require_relative 'micro_jit' require_relative 'yjit'
RubyVM::Instructions = RubyVM::BareInstructions.to_a + \ RubyVM::Instructions = RubyVM::BareInstructions.to_a + \
RubyVM::OperandsUnifications.to_a + \ RubyVM::OperandsUnifications.to_a + \
RubyVM::InstructionsUnifications.to_a + \ RubyVM::InstructionsUnifications.to_a + \
RubyVM::MicroJIT::ExampleInstructions.to_a RubyVM::YJIT::ExampleInstructions.to_a
require_relative 'trace_instructions' require_relative 'trace_instructions'

4
tool/ruby_vm/models/micro_jit.rb → tool/ruby_vm/models/yjit.rb
View file

@ -10,7 +10,7 @@
# conditions mentioned in the file COPYING are met. Consult the file for # conditions mentioned in the file COPYING are met. Consult the file for
# details. # details.
module RubyVM::MicroJIT module RubyVM::YJIT
ScrapeResult = Struct.new(:pre_call_bytes, :post_call_bytes, :disassembly_lines) ScrapeResult = Struct.new(:pre_call_bytes, :post_call_bytes, :disassembly_lines)
class << self class << self
@ -218,4 +218,4 @@ module RubyVM::MicroJIT
end end
end end
require_relative 'micro_jit/example_instructions' require_relative 'yjit/example_instructions'

2
tool/ruby_vm/models/micro_jit/example_instructions.rb → tool/ruby_vm/models/yjit/example_instructions.rb
View file

@ -10,7 +10,7 @@
# conditions mentioned in the file COPYING are met. Consult the file for # conditions mentioned in the file COPYING are met. Consult the file for
# details. # details.
class RubyVM::MicroJIT::ExampleInstructions class RubyVM::YJIT::ExampleInstructions
include RubyVM::CEscape include RubyVM::CEscape
attr_reader :name attr_reader :name

2
tool/ruby_vm/views/vm.inc.erb
View file

@ -25,7 +25,7 @@
<%= render 'insn_entry', locals: { insn: insn } -%> <%= render 'insn_entry', locals: { insn: insn } -%>
% end % end
% %
% RubyVM::MicroJIT::ExampleInstructions.to_a.each do |insn| % RubyVM::YJIT::ExampleInstructions.to_a.each do |insn|
INSN_ENTRY(yjit_call_example_with_ec) INSN_ENTRY(yjit_call_example_with_ec)
{ {
START_OF_ORIGINAL_INSN(yjit_call_example_with_ec); START_OF_ORIGINAL_INSN(yjit_call_example_with_ec);

4
tool/ruby_vm/views/yjit_hooks.inc.erb
View file

@ -8,11 +8,11 @@
%# details. %# details.
<%= render 'copyright' %> <%= render 'copyright' %>
<%= render 'notice', locals: { <%= 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__, edit: __FILE__,
} -%> } -%>
% success, byte_arrays = RubyVM::MicroJIT.scrape % success, byte_arrays = RubyVM::YJIT.scrape
static const uint8_t yjit_scrape_successful = <%= success %>; static const uint8_t yjit_scrape_successful = <%= success %>;
% byte_arrays.each do |(prefix, scrape_result)| % byte_arrays.each do |(prefix, scrape_result)|
// Disassembly: // Disassembly: