summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-10 08:47:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-10 08:47:05 +0000
commitd274cf524ad0a8571d16f449301987af685a983d (patch)
tree5c92c3cecb575391ed8c5e0f68f935b18ae96e84
parent6ccbfd76a1f0948f1cff76bea4d8f54956c82c3a (diff)
* common.mk: targets which depend on yarvcore.h now depend on
rubysig.h too. * yarvcore.h (rb_vm_t): use rb_atomic_t instead of int. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--common.mk10
-rw-r--r--yarvcore.h5
3 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 65ee294c1f4..749244cc920 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Feb 10 17:46:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk: targets which depend on yarvcore.h now depend on
+ rubysig.h too.
+
+ * yarvcore.h (rb_vm_t): use rb_atomic_t instead of int.
+
Sat Feb 10 00:13:11 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: fix typo (TkConfigMethod::__confinfo_cmd,
diff --git a/common.mk b/common.mk
index d269cd4247d..96ffaf89ae8 100644
--- a/common.mk
+++ b/common.mk
@@ -506,12 +506,12 @@ version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}yarvcore.h \
{$(VPATH)}compile.h {$(VPATH)}debug.h {$(VPATH)}ruby.h config.h \
{$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \
- {$(VPATH)}st.h {$(VPATH)}node.h \
+ {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}rubysig.h \
{$(VPATH)}insns.inc {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc \
{$(VPATH)}opt_sc.inc {$(VPATH)}optunifs.inc {$(VPATH)}vm_opts.h
iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}yarvcore.h {$(VPATH)}debug.h \
{$(VPATH)}ruby.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
- {$(VPATH)}intern.h {$(VPATH)}st.h \
+ {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}rubysig.h \
{$(VPATH)}gc.h {$(VPATH)}vm_opts.h \
{$(VPATH)}insns.inc {$(VPATH)}insns_info.inc
vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}vm.h {$(VPATH)}insnhelper.h \
@@ -524,17 +524,17 @@ vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}vm.h {$(VPATH)}insnhelper.h \
vm_dump.$(OBJEXT): {$(VPATH)}yarvcore.h {$(VPATH)}vm.h config.h \
{$(VPATH)}ruby.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
{$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}debug.h \
- {$(VPATH)}version.h {$(VPATH)}vm_opts.h
+ {$(VPATH)}rubysig.h {$(VPATH)}version.h {$(VPATH)}vm_opts.h
yarvcore.$(OBJEXT): {$(VPATH)}yarvcore.c {$(VPATH)}yarvcore.h \
{$(VPATH)}debug.h {$(VPATH)}ruby.h config.h {$(VPATH)}defines.h \
{$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}st.h \
- {$(VPATH)}node.h {$(VPATH)}gc.h {$(VPATH)}vm_opts.h
+ {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}gc.h {$(VPATH)}vm_opts.h
debug.$(OBJEXT): {$(VPATH)}debug.h {$(VPATH)}ruby.h {$(VPATH)}defines.h \
{$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}st.h config.h \
{$(VPATH)}st.h
blockinlining.$(OBJEXT): {$(VPATH)}ruby.h {$(VPATH)}defines.h \
{$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}st.h config.h \
- {$(VPATH)}node.h {$(VPATH)}yarvcore.h \
+ {$(VPATH)}node.h {$(VPATH)}yarvcore.h {$(VPATH)}rubysig.h \
{$(VPATH)}debug.h {$(VPATH)}vm_opts.h
diff --git a/yarvcore.h b/yarvcore.h
index 4d98f42b907..79f410cad3e 100644
--- a/yarvcore.h
+++ b/yarvcore.h
@@ -18,6 +18,7 @@
#include <setjmp.h>
#include "ruby.h"
+#include "rubysig.h"
#include "st.h"
#include "node.h"
@@ -326,8 +327,8 @@ typedef struct rb_vm_struct {
/* object management */
VALUE mark_object_ary;
- int signal_buff[RUBY_NSIG];
- int bufferd_signal_size;
+ rb_atomic_t signal_buff[RUBY_NSIG];
+ rb_atomic_t bufferd_signal_size;
} rb_vm_t;
typedef struct {