From c5b113c649702447e1d4edd036fc6afca2ac638c Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 26 Jun 2017 07:56:44 +0000 Subject: move several fields from rb_thread_t to rb_execution_context_t. * vm_core.h (rb_thread_t): move several fields which are copied at cont.c to rb_execution_context_t. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_core.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'vm_core.h') diff --git a/vm_core.h b/vm_core.h index 028d9c3177..dc9043497f 100644 --- a/vm_core.h +++ b/vm_core.h @@ -737,6 +737,12 @@ typedef struct rb_thread_context_struct { VALUE *stack; /* must free, must mark */ size_t stack_size; /* size in word (byte size / sizeof(VALUE)) */ rb_control_frame_t *cfp; + + struct rb_vm_tag *tag; + struct rb_vm_protect_tag *protect_tag; + + int safe_level; + int raised_flag; } rb_execution_context_t; typedef struct rb_thread_struct { @@ -745,8 +751,7 @@ typedef struct rb_thread_struct { rb_vm_t *vm; rb_execution_context_t ec; - int safe_level; - int raised_flag; + VALUE last_status; /* $? */ /* for rb_iterate */ @@ -801,9 +806,6 @@ typedef struct rb_thread_struct { VALUE locking_mutex; struct rb_mutex_struct *keeping_mutexes; - struct rb_vm_tag *tag; - struct rb_vm_protect_tag *protect_tag; - /* storage */ st_table *local_storage; VALUE local_storage_recursive_hash; -- cgit v1.2.3