summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.mk2
-rw-r--r--mjit_c.c2
-rw-r--r--mjit_c.rb5
-rw-r--r--template/Makefile.in3
-rw-r--r--tool/ruby_vm/views/mjit_sp_inc.inc.erb17
-rwxr-xr-xtool/update-deps1
-rw-r--r--win32/Makefile.sub2
7 files changed, 2 insertions, 30 deletions
diff --git a/common.mk b/common.mk
index ee76f345d2..12b3fd7b2b 100644
--- a/common.mk
+++ b/common.mk
@@ -1041,7 +1041,6 @@ $(srcs_vpath)insns_info.inc: $(tooldir)/ruby_vm/views/insns_info.inc.erb $(inc_c
$(srcs_vpath)vmtc.inc: $(tooldir)/ruby_vm/views/vmtc.inc.erb $(inc_common_headers)
$(srcs_vpath)vm.inc: $(tooldir)/ruby_vm/views/vm.inc.erb $(inc_common_headers) \
$(tooldir)/ruby_vm/views/_insn_entry.erb $(tooldir)/ruby_vm/views/_trace_instruction.erb
-$(srcs_vpath)mjit_sp_inc.inc: $(tooldir)/ruby_vm/views/mjit_sp_inc.inc.erb
BUILTIN_RB_SRCS = \
$(srcdir)/ast.rb \
@@ -10037,7 +10036,6 @@ mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.c
mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.h
mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.rb
mjit_c.$(OBJEXT): {$(VPATH)}mjit_c.rbinc
-mjit_c.$(OBJEXT): {$(VPATH)}mjit_sp_inc.inc
mjit_c.$(OBJEXT): {$(VPATH)}node.h
mjit_c.$(OBJEXT): {$(VPATH)}onigmo.h
mjit_c.$(OBJEXT): {$(VPATH)}oniguruma.h
diff --git a/mjit_c.c b/mjit_c.c
index 9a909590e7..9af89c649d 100644
--- a/mjit_c.c
+++ b/mjit_c.c
@@ -27,8 +27,6 @@ void rb_mjit_c(void) {}
#include "insns.inc"
#include "insns_info.inc"
-#include "mjit_sp_inc.inc"
-
#if SIZEOF_LONG == SIZEOF_VOIDP
#define NUM2PTR(x) NUM2ULONG(x)
#define PTR2NUM(x) ULONG2NUM(x)
diff --git a/mjit_c.rb b/mjit_c.rb
index 51238f52d1..d670a6582a 100644
--- a/mjit_c.rb
+++ b/mjit_c.rb
@@ -525,11 +525,6 @@ module RubyVM::MJIT # :nodoc: all
mjit_options.new(addr)
end
- def mjit_call_attribute_sp_inc(insn, operands)
- _operands_addr = operands.to_i
- Primitive.cexpr! 'LONG2NUM(mjit_call_attribute_sp_inc(NUM2INT(insn), (VALUE *)NUM2PTR(_operands_addr)))'
- end
-
def mjit_capture_cc_entries(compiled_body, captured_body)
_compiled_body_addr = compiled_body.to_i
_captured_body_addr = captured_body.to_i
diff --git a/template/Makefile.in b/template/Makefile.in
index 3068992e6d..60390e8c93 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -580,7 +580,7 @@ update-known-errors:
$(IFCHANGE) $(srcdir)/defs/known_errors.def -
INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
- vmtc.inc vm.inc mjit_sp_inc.inc
+ vmtc.inc vm.inc
$(INSNS): $(srcdir)/insns.def vm_opts.h \
$(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def \
@@ -619,7 +619,6 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \
$(tooldir)/ruby_vm/views/_trace_instruction.erb \
$(tooldir)/ruby_vm/views/insns.inc.erb \
$(tooldir)/ruby_vm/views/insns_info.inc.erb \
- $(tooldir)/ruby_vm/views/mjit_sp_inc.inc.erb \
$(tooldir)/ruby_vm/views/opt_sc.inc.erb \
$(tooldir)/ruby_vm/views/optinsn.inc.erb \
$(tooldir)/ruby_vm/views/optunifs.inc.erb \
diff --git a/tool/ruby_vm/views/mjit_sp_inc.inc.erb b/tool/ruby_vm/views/mjit_sp_inc.inc.erb
deleted file mode 100644
index 7b925420dd..0000000000
--- a/tool/ruby_vm/views/mjit_sp_inc.inc.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-static rb_snum_t
-mjit_call_attribute_sp_inc(const int insn, const VALUE *operands)
-{
- switch (insn) {
-% (RubyVM::BareInstructions.to_a + RubyVM::OperandsUnifications.to_a).each do |insn|
- case BIN(<%= insn.name %>): {
-% # compiler: Prepare operands which may be used by `insn.call_attribute`
-% insn.opes.each_with_index do |ope, i|
- MAYBE_UNUSED(<%= ope.fetch(:decl) %>) = (<%= ope.fetch(:type) %>)operands[<%= i %>];
-% end
- return <%= insn.call_attribute('sp_inc') %>;
- }
-% end
- default:
- rb_bug("unexpected insn in mjit_call_attribute_sp_inc");
- }
-}
diff --git a/tool/update-deps b/tool/update-deps
index 7f3a0c24ce..6b8bb67236 100755
--- a/tool/update-deps
+++ b/tool/update-deps
@@ -119,7 +119,6 @@ FILES_NEED_VPATH = %w[
known_errors.inc
lex.c
miniprelude.c
- mjit_sp_inc.inc
newline.c
node_name.inc
opt_sc.inc
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 903a338942..ae97edcb8d 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1353,7 +1353,7 @@ probes.h: {$(VPATH)}probes.dmyh
<<KEEP
INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
- vmtc.inc vm.inc mjit_sp_inc.inc
+ vmtc.inc vm.inc
!if [exit > insns_rules.mk]
!else if [for %I in ($(INSNS)) do \