diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-21 20:59:23 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-21 20:59:23 +0000 |
| commit | 34d1e9bb2504d7fa0b98ad99a32c549cd0d92853 (patch) | |
| tree | 3684a3a9330303573f4ae54a3b24fc7d1915b70d | |
| parent | bf52a3c0c4ce5044a31e62ab6f6366e5a76103a7 (diff) | |
* include/ruby/vm.h: write a comment.
* common.mk: remove vm.h from any rules.
vm.h is not needed on this version.
* vm_core.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | include/ruby/vm.h | 13 | ||||
| -rw-r--r-- | vm_core.h | 6 |
4 files changed, 21 insertions, 9 deletions
@@ -1,3 +1,12 @@ +Wed Oct 22 05:46:25 2008 Koichi Sasada <[email protected]> + + * include/ruby/vm.h: write a comment. + + * common.mk: remove vm.h from any rules. + vm.h is not needed on this version. + + * vm_core.h: ditto. + Wed Oct 22 05:39:39 2008 Koichi Sasada <[email protected]> * parse.y (arg_concat_gen): concat target node should be NODE_ARRAY. @@ -444,7 +444,7 @@ RUBY_H_INCLUDES = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \ ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h ID_H_INCLUDES = {$(VPATH)}id.h VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}vm_opts.h \ - {$(VPATH)}vm.h {$(VPATH)}thread_$(THREAD_MODEL).h \ + {$(VPATH)}thread_$(THREAD_MODEL).h \ {$(VPATH)}node.h $(ID_H_INCLUDES) array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h diff --git a/include/ruby/vm.h b/include/ruby/vm.h index cac13b51cb..6843469735 100644 --- a/include/ruby/vm.h +++ b/include/ruby/vm.h @@ -9,9 +9,14 @@ **********************************************************************/ -#ifndef RUBY_MVM_H -#define RUBY_MVM_H 1 +#ifndef RUBY_VM_H +#define RUBY_VM_H 1 -typedef struct rb_vm_struct rb_vm_t; +/* Place holder. + * + * We will prepare VM creation/control APIs on 1.9.2 or later. + * If you have an interest about it, please see mvm branch. + * http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/ + */ -#endif /* RUBY_MVM_H */ +#endif /* RUBY_VM_H */ @@ -15,7 +15,6 @@ #define RUBY_VM_THREAD_MODEL 2 #include "ruby/ruby.h" -#include "ruby/vm.h" #include "ruby/st.h" #include "node.h" @@ -225,8 +224,7 @@ typedef struct rb_iseq_struct rb_iseq_t; #define GetVMPtr(obj, ptr) \ GetCoreDataFromValue(obj, rb_vm_t, ptr) -struct rb_vm_struct -{ +typedef struct rb_vm_struct { VALUE self; rb_thread_lock_t global_vm_lock; @@ -270,7 +268,7 @@ struct rb_vm_struct #if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE struct rb_objspace *objspace; #endif -}; +} rb_vm_t; typedef struct { VALUE *pc; /* cfp[0] */ |