Author: ko1
Date: 2005-07-03 20:43:14 +0900 (Sun, 03 Jul 2005)
New Revision: 198

Modified:
   trunk/ChangeLog
   trunk/depend
   trunk/insns.def
   trunk/rb/eval.rb
   trunk/yarvcore.c
   trunk/yarvcore.h
Log:
	* yarvcore.c, yarvcore.h : remove cYarvThrowObject (unused)

	* yarvcore.c, yarvcore.h, insns.def : 
	thread_object#stack_mark_poinetr

	* depend, rb/eval.rb : BOPT, TOPT -> OPT




Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-07-03 05:50:17 UTC (rev 197)
+++ trunk/ChangeLog	2005-07-03 11:43:14 UTC (rev 198)
@@ -4,6 +4,16 @@
 #  from Mon, 03 May 2004 01:24:19 +0900
 #
 
+2005-07-03(Sun) 20:31:09 +0900  Koichi Sasada  <ko1 atdot.net>
+
+	* yarvcore.c, yarvcore.h : remove cYarvThrowObject (unused)
+
+	* yarvcore.c, yarvcore.h, insns.def : 
+	thread_object#stack_mark_poinetr
+
+	* depend, rb/eval.rb : BOPT, TOPT -> OPT
+
+
 2005-07-03(Sun) 13:53:47 +0900  Koichi Sasada  <ko1 atdot.net>
 
 	* compile.c, compile.h : INSN_OBJECT, LABEL_OBJECT -> INSN, LABEL,

Modified: trunk/depend
===================================================================
--- trunk/depend	2005-07-03 05:50:17 UTC (rev 197)
+++ trunk/depend	2005-07-03 11:43:14 UTC (rev 198)
@@ -46,20 +46,20 @@
 	$(RUBY) -I$(srcdir) $(srcdir)/rb/makedocs.rb $(INSNS2VMOPT)
 
 test-all: all
-	$(RUBY) -I$(srcdir) $(srcdir)/test/runner.rb $(TESTOPT) $(TOPT)
+	$(RUBY) -I$(srcdir) $(srcdir)/test/runner.rb $(OPT)
 
 test-each: all
-	$(RUBY) -I$(srcdir) $(srcdir)/test/test_$(ITEM).rb $(TESTOPT) $(TOPT)
+	$(RUBY) -I$(srcdir) $(srcdir)/test/test_$(ITEM).rb $(OPT)
 
 run: all
 	$(RUBY) -I$(srcdir) $(srcdir)/test.rb $(RUNOPT)
 
 benchmark: all
-	$(RUBY) -I$(srcdir) $(srcdir)/benchmark/run.rb $(BOPT)
+	$(RUBY) -I$(srcdir) $(srcdir)/benchmark/run.rb $(OPT)
 
 ITEM=bmx_temp
 tbench: all
-	$(RUBY) -I$(srcdir) $(srcdir)/benchmark/run.rb $(ITEM) $(BOPT)
+	$(RUBY) -I$(srcdir) $(srcdir)/benchmark/run.rb $(ITEM) $(OPT)
 
 
 test-compiler: all

Modified: trunk/insns.def
===================================================================
--- trunk/insns.def	2005-07-03 05:50:17 UTC (rev 197)
+++ trunk/insns.def	2005-07-03 11:43:14 UTC (rev 198)
@@ -1418,7 +1418,8 @@
       rb_bug("stack overflow");
     }
     /* TODO: maybe more severe check is needed */
-    th->stack_mark_pointer = sp + niseqobj->stack_max;
+    // th->stack_mark_pointer = sp + niseqobj->stack_max;
+    // use SP instead of stack_mark_pointer
     
     /* clear locals */
     if(niseqobj->local_tbl){
@@ -2062,8 +2063,6 @@
 (VALUE recv, VALUE obj, VALUE set)
 (VALUE val)
 {
-  volatile VALUE recv_protect = recv;
-  
   if(!SPECIAL_CONST_P(recv)){
     if(HEAP_CLASS_OF(recv) == rb_cArray &&
        FIXNUM_P(obj)){

Modified: trunk/rb/eval.rb
===================================================================
--- trunk/rb/eval.rb	2005-07-03 05:50:17 UTC (rev 197)
+++ trunk/rb/eval.rb	2005-07-03 11:43:14 UTC (rev 198)
@@ -64,7 +64,7 @@
   5.times{|count|
     print count
     FileUtils.cd(dirname(idx)){
-      exec_cmd("make benchmark BOPT=-y > ../b#{idx}-#{count}")
+      exec_cmd("make benchmark OPT=-y > ../b#{idx}-#{count}")
     }
   }
   puts

Modified: trunk/yarvcore.c
===================================================================
--- trunk/yarvcore.c	2005-07-03 05:50:17 UTC (rev 197)
+++ trunk/yarvcore.c	2005-07-03 11:43:14 UTC (rev 198)
@@ -18,7 +18,6 @@
 VALUE cYarvVM;
 VALUE cYarvThread;
 VALUE mYarvInsns;
-VALUE cYarvThrowObject;
 VALUE cYarvEnv;
 VALUE cYarvProc;
 
@@ -474,7 +473,7 @@
   if(ptr){
     thobj = ptr;
     if(thobj->stack){
-      rb_gc_mark_locations(thobj->stack, thobj->stack_mark_pointer);
+      rb_gc_mark_locations(thobj->stack, thobj->sp+1);
     }
     /* mark ruby objects */
     if(thobj->vm){
@@ -507,7 +506,6 @@
   /* allocate thread stack */
   thobj->stack      = ALLOC_N(VALUE, YARV_THREAD_STACK_SIZE);
   thobj->stack_size = YARV_THREAD_STACK_SIZE;
-  thobj->stack_mark_pointer = thobj->stack + 0x20;
   thobj->klass_nest_stack = rb_ary_push(rb_ary_new(), rb_cObject);
   
   
@@ -724,11 +722,8 @@
   /* misc */
   /* jitcompile(obj, selector) */
   rb_define_global_function("jitcompile", yarv_jitcompile, 2);
-  
-  /* declare YARVCore::ThrowObject */
-  cYarvThrowObject = rb_define_class_under(mYarvCore, "ThrowObject", rb_cObject);
 
-
+  
   /* YARV test functions */
   
   rb_define_global_function("once", yarv_once, 0);

Modified: trunk/yarvcore.h
===================================================================
--- trunk/yarvcore.h	2005-07-03 05:50:17 UTC (rev 197)
+++ trunk/yarvcore.h	2005-07-03 11:43:14 UTC (rev 198)
@@ -15,7 +15,6 @@
 extern VALUE cYarvVM;
 extern VALUE cYarvThread;
 extern VALUE mYarvInsns;
-extern VALUE cYarvThrowObject;
 extern VALUE cYarvEnv;
 extern VALUE cYarvProc;
 
@@ -198,8 +197,6 @@
   VALUE *stack;                   /* must free, must mark*/
   unsigned long stack_size;
   
-  VALUE *stack_mark_pointer;
-  
   VALUE *pc;
   VALUE *sp;
   VALUE *lfp;


--
ML: yarv-diff quickml.atdot.net
Info: http://www.atdot.net/~ko1/quickml