diff options
| author | John Hawthorn <[email protected]> | 2023-03-16 13:13:19 -0700 |
|---|---|---|
| committer | John Hawthorn <[email protected]> | 2023-03-16 14:16:56 -0700 |
| commit | 617c9b4656d4eda67b845c102fc13b02dc76a439 (patch) | |
| tree | fea64b322d5c13cf1062cd121b538e812dd0a8a0 /tool/ruby_vm/views | |
| parent | 8dbddd5bf8a2f36b0cd32d97f7f7fa383bbc5b64 (diff) | |
Rename opes to operands on RubyVM::BaseInstruction
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/7523
Diffstat (limited to 'tool/ruby_vm/views')
| -rw-r--r-- | tool/ruby_vm/views/_comptime_insn_stack_increase.erb | 2 | ||||
| -rw-r--r-- | tool/ruby_vm/views/_insn_entry.erb | 4 | ||||
| -rw-r--r-- | tool/ruby_vm/views/lib/ruby_vm/rjit/instruction.rb.erb | 2 | ||||
| -rw-r--r-- | tool/ruby_vm/views/optinsn.inc.erb | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tool/ruby_vm/views/_comptime_insn_stack_increase.erb b/tool/ruby_vm/views/_comptime_insn_stack_increase.erb index b633ab4d32..cb895815ce 100644 --- a/tool/ruby_vm/views/_comptime_insn_stack_increase.erb +++ b/tool/ruby_vm/views/_comptime_insn_stack_increase.erb @@ -42,7 +42,7 @@ comptime_insn_stack_increase_dispatch(enum ruby_vminsn_type insn, const VALUE *o % end case <%= i.bin %>: return <%= attr_function %>(<%= - i.opes.map.with_index do |v, j| + i.operands.map.with_index do |v, j| if v[:type] == 'CALL_DATA' && i.has_attribute?('comptime_sp_inc') v = v.dup v[:type] = 'CALL_INFO' diff --git a/tool/ruby_vm/views/_insn_entry.erb b/tool/ruby_vm/views/_insn_entry.erb index f34afddb1f..32070c5f34 100644 --- a/tool/ruby_vm/views/_insn_entry.erb +++ b/tool/ruby_vm/views/_insn_entry.erb @@ -20,7 +20,7 @@ INSN_ENTRY(<%= insn.name %>) <%= render_c_expr konst -%> % end % -% insn.opes.each_with_index do |ope, i| +% insn.operands.each_with_index do |ope, i| <%= ope[:decl] %> = (<%= ope[:type] %>)GET_OPERAND(<%= i + 1 %>); % end # define INSN_ATTR(x) <%= insn.call_attribute(' ## x ## ') %> @@ -41,7 +41,7 @@ INSN_ENTRY(<%= insn.name %>) % end <%= insn.handle_canary "SETUP_CANARY(leaf)" -%> COLLECT_USAGE_INSN(INSN_ATTR(bin)); -% insn.opes.each_with_index do |ope, i| +% insn.operands.each_with_index do |ope, i| COLLECT_USAGE_OPERAND(INSN_ATTR(bin), <%= i %>, <%= ope[:name] %>); % end % unless body.empty? diff --git a/tool/ruby_vm/views/lib/ruby_vm/rjit/instruction.rb.erb b/tool/ruby_vm/views/lib/ruby_vm/rjit/instruction.rb.erb index 84c2e92414..4f08524a77 100644 --- a/tool/ruby_vm/views/lib/ruby_vm/rjit/instruction.rb.erb +++ b/tool/ruby_vm/views/lib/ruby_vm/rjit/instruction.rb.erb @@ -7,7 +7,7 @@ module RubyVM::RJIT # :nodoc: all name: :<%= insn.name %>, bin: <%= i %>, # BIN(<%= insn.name %>) len: <%= insn.width %>, # insn_len - operands: <%= (insn.opes unless insn.name.start_with?('trace_')).inspect %>, + operands: <%= (insn.operands unless insn.name.start_with?('trace_')).inspect %>, ), % end } diff --git a/tool/ruby_vm/views/optinsn.inc.erb b/tool/ruby_vm/views/optinsn.inc.erb index 0190f9e07a..de7bb210ea 100644 --- a/tool/ruby_vm/views/optinsn.inc.erb +++ b/tool/ruby_vm/views/optinsn.inc.erb @@ -29,14 +29,14 @@ insn_operands_unification(INSN *iobj) /* <%= insn.pretty_name %> */ if ( <%= insn.condition('op') %> ) { -% insn.opes.each_with_index do |o, x| +% insn.operands.each_with_index do |o, x| % n = insn.operand_shift_of(o) % if n != 0 then op[<%= x %>] = op[<%= x + n %>]; % end % end iobj->insn_id = <%= insn.bin %>; - iobj->operand_size = <%= insn.opes.size %>; + iobj->operand_size = <%= insn.operands.size %>; break; } % end |