Skip to content

Commit e986c4f

Browse files
mamemame
committed
Remove the dependency from internal/cont.h to prism
1 parent fbaad48 commit e986c4f

File tree

13 files changed

+22
-58
lines changed

13 files changed

+22
-58
lines changed

‎common.mk‎

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4096,6 +4096,7 @@ cont.$(OBJEXT): $(top_srcdir)/internal/cont.h
40964096
cont.$(OBJEXT): $(top_srcdir)/internal/error.h
40974097
cont.$(OBJEXT): $(top_srcdir)/internal/gc.h
40984098
cont.$(OBJEXT): $(top_srcdir)/internal/imemo.h
4099+
cont.$(OBJEXT): $(top_srcdir)/internal/jit_cont.h
40994100
cont.$(OBJEXT): $(top_srcdir)/internal/namespace.h
41004101
cont.$(OBJEXT): $(top_srcdir)/internal/proc.h
41014102
cont.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
@@ -7103,6 +7104,7 @@ eval.$(OBJEXT): $(top_srcdir)/internal/hash.h
71037104
eval.$(OBJEXT): $(top_srcdir)/internal/imemo.h
71047105
eval.$(OBJEXT): $(top_srcdir)/internal/inits.h
71057106
eval.$(OBJEXT): $(top_srcdir)/internal/io.h
7107+
eval.$(OBJEXT): $(top_srcdir)/internal/jit_cont.h
71067108
eval.$(OBJEXT): $(top_srcdir)/internal/namespace.h
71077109
eval.$(OBJEXT): $(top_srcdir)/internal/object.h
71087110
eval.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
@@ -7603,26 +7605,6 @@ gc.$(OBJEXT): $(top_srcdir)/internal/thread.h
76037605
gc.$(OBJEXT): $(top_srcdir)/internal/variable.h
76047606
gc.$(OBJEXT): $(top_srcdir)/internal/vm.h
76057607
gc.$(OBJEXT): $(top_srcdir)/internal/warnings.h
7606-
gc.$(OBJEXT): $(top_srcdir)/prism/defines.h
7607-
gc.$(OBJEXT): $(top_srcdir)/prism/encoding.h
7608-
gc.$(OBJEXT): $(top_srcdir)/prism/node.h
7609-
gc.$(OBJEXT): $(top_srcdir)/prism/options.h
7610-
gc.$(OBJEXT): $(top_srcdir)/prism/pack.h
7611-
gc.$(OBJEXT): $(top_srcdir)/prism/parser.h
7612-
gc.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
7613-
gc.$(OBJEXT): $(top_srcdir)/prism/prism.h
7614-
gc.$(OBJEXT): $(top_srcdir)/prism/regexp.h
7615-
gc.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
7616-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
7617-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
7618-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
7619-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
7620-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
7621-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
7622-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
7623-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
7624-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
7625-
gc.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
76267608
gc.$(OBJEXT): {$(VPATH)}assert.h
76277609
gc.$(OBJEXT): {$(VPATH)}atomic.h
76287610
gc.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -7807,10 +7789,6 @@ gc.$(OBJEXT): {$(VPATH)}missing.h
78077789
gc.$(OBJEXT): {$(VPATH)}node.h
78087790
gc.$(OBJEXT): {$(VPATH)}onigmo.h
78097791
gc.$(OBJEXT): {$(VPATH)}oniguruma.h
7810-
gc.$(OBJEXT): {$(VPATH)}prism/ast.h
7811-
gc.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
7812-
gc.$(OBJEXT): {$(VPATH)}prism/version.h
7813-
gc.$(OBJEXT): {$(VPATH)}prism_compile.h
78147792
gc.$(OBJEXT): {$(VPATH)}probes.dmyh
78157793
gc.$(OBJEXT): {$(VPATH)}probes.h
78167794
gc.$(OBJEXT): {$(VPATH)}ractor.h
@@ -8111,26 +8089,6 @@ hash.$(OBJEXT): $(top_srcdir)/internal/time.h
81118089
hash.$(OBJEXT): $(top_srcdir)/internal/variable.h
81128090
hash.$(OBJEXT): $(top_srcdir)/internal/vm.h
81138091
hash.$(OBJEXT): $(top_srcdir)/internal/warnings.h
8114-
hash.$(OBJEXT): $(top_srcdir)/prism/defines.h
8115-
hash.$(OBJEXT): $(top_srcdir)/prism/encoding.h
8116-
hash.$(OBJEXT): $(top_srcdir)/prism/node.h
8117-
hash.$(OBJEXT): $(top_srcdir)/prism/options.h
8118-
hash.$(OBJEXT): $(top_srcdir)/prism/pack.h
8119-
hash.$(OBJEXT): $(top_srcdir)/prism/parser.h
8120-
hash.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h
8121-
hash.$(OBJEXT): $(top_srcdir)/prism/prism.h
8122-
hash.$(OBJEXT): $(top_srcdir)/prism/regexp.h
8123-
hash.$(OBJEXT): $(top_srcdir)/prism/static_literals.h
8124-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h
8125-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h
8126-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h
8127-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h
8128-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h
8129-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h
8130-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h
8131-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h
8132-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h
8133-
hash.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h
81348092
hash.$(OBJEXT): {$(VPATH)}assert.h
81358093
hash.$(OBJEXT): {$(VPATH)}atomic.h
81368094
hash.$(OBJEXT): {$(VPATH)}backward/2/assume.h
@@ -8311,10 +8269,6 @@ hash.$(OBJEXT): {$(VPATH)}missing.h
83118269
hash.$(OBJEXT): {$(VPATH)}node.h
83128270
hash.$(OBJEXT): {$(VPATH)}onigmo.h
83138271
hash.$(OBJEXT): {$(VPATH)}oniguruma.h
8314-
hash.$(OBJEXT): {$(VPATH)}prism/ast.h
8315-
hash.$(OBJEXT): {$(VPATH)}prism/diagnostic.h
8316-
hash.$(OBJEXT): {$(VPATH)}prism/version.h
8317-
hash.$(OBJEXT): {$(VPATH)}prism_compile.h
83188272
hash.$(OBJEXT): {$(VPATH)}probes.dmyh
83198273
hash.$(OBJEXT): {$(VPATH)}probes.h
83208274
hash.$(OBJEXT): {$(VPATH)}ractor.h
@@ -20575,6 +20529,7 @@ vm.$(OBJEXT): $(top_srcdir)/internal/gc.h
2057520529
vm.$(OBJEXT): $(top_srcdir)/internal/hash.h
2057620530
vm.$(OBJEXT): $(top_srcdir)/internal/imemo.h
2057720531
vm.$(OBJEXT): $(top_srcdir)/internal/inits.h
20532+
vm.$(OBJEXT): $(top_srcdir)/internal/jit_cont.h
2057820533
vm.$(OBJEXT): $(top_srcdir)/internal/missing.h
2057920534
vm.$(OBJEXT): $(top_srcdir)/internal/namespace.h
2058020535
vm.$(OBJEXT): $(top_srcdir)/internal/numeric.h

‎cont.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ extern int madvise(caddr_t, size_t, int);
2828
#include "eval_intern.h"
2929
#include "internal.h"
3030
#include "internal/cont.h"
31+
#include "internal/jit_cont.h"
3132
#include "internal/thread.h"
3233
#include "internal/error.h"
3334
#include "internal/gc.h"

‎eval.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "eval_intern.h"
2121
#include "internal.h"
2222
#include "internal/class.h"
23-
#include "internal/cont.h"
23+
#include "internal/jit_cont.h"
2424
#include "internal/error.h"
2525
#include "internal/eval.h"
2626
#include "internal/gc.h"

‎internal/cont.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* @brief Internal header for Fiber.
1010
*/
1111
#include "ruby/ruby.h" /* for VALUE */
12-
#include "iseq.h"
1312

1413
struct rb_thread_struct; /* in vm_core.h */
1514
struct rb_fiber_struct; /* in cont.c */
@@ -18,9 +17,6 @@ struct rb_execution_context_struct; /* in vm_core.c */
1817
/* cont.c */
1918
void rb_fiber_reset_root_local_storage(struct rb_thread_struct *);
2019
void ruby_register_rollback_func_for_ensure(VALUE (*ensure_func)(VALUE), VALUE (*rollback_func)(VALUE));
21-
void rb_jit_cont_init(void);
22-
void rb_jit_cont_each_iseq(rb_iseq_callback callback, void *data);
23-
void rb_jit_cont_finish(void);
2420

2521
/* vm.c */
2622
void rb_free_shared_fiber_pool(void);

‎internal/jit_cont.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#ifndef INTERNAL_JIT_CONT_H /*-*-C-*-vi:se ft=c:*/
2+
3+
#include "iseq.h"
4+
5+
/* cont.c */
6+
void rb_jit_cont_init(void);
7+
void rb_jit_cont_each_iseq(rb_iseq_callback callback, void *data);
8+
void rb_jit_cont_finish(void);
9+
10+
#endif /* INTERNAL_JIT_CONT_H */

‎internal/vm.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,5 @@ do { \
133133
RUBY_DTRACE_##name(arg, dtrace_file, dtrace_line); \
134134
} \
135135
} while (0)
136+
136137
#endif /* INTERNAL_VM_H */

‎math.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# define _USE_MATH_DEFINES 1
1616
#endif
1717

18-
#include <errno.h>
1918
#include <float.h>
2019
#include <math.h>
2120

@@ -24,7 +23,6 @@
2423
#include "internal/complex.h"
2524
#include "internal/math.h"
2625
#include "internal/object.h"
27-
#include "internal/vm.h"
2826

2927
VALUE rb_mMath;
3028
VALUE rb_eMathDomainError;

‎ruby.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include "eval_intern.h"
4545
#include "internal.h"
4646
#include "internal/cmdlineopt.h"
47-
#include "internal/cont.h"
4847
#include "internal/error.h"
4948
#include "internal/file.h"
5049
#include "internal/inits.h"
@@ -56,6 +55,7 @@
5655
#include "internal/thread.h"
5756
#include "internal/ruby_parser.h"
5857
#include "internal/variable.h"
58+
#include "prism_compile.h"
5959
#include "ruby/encoding.h"
6060
#include "ruby/thread.h"
6161
#include "ruby/util.h"

‎vm.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "internal/eval.h"
2121
#include "internal/gc.h"
2222
#include "internal/inits.h"
23+
#include "internal/jit_cont.h"
2324
#include "internal/missing.h"
2425
#include "internal/namespace.h"
2526
#include "internal/object.h"

‎yjit.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "iseq.h"
3030
#include "ruby/debug.h"
3131
#include "internal/cont.h"
32+
#include "internal/jit_cont.h"
3233
#include "zjit.h"
3334

3435
// For mmapp(), sysconf()

0 commit comments

Comments
 (0)