[uim-commit] r1448 - branches/r5rs/sigscheme

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-09-06 21:43:59 -0700 (Tue, 06 Sep 2005)
New Revision: 1448

Modified:
   branches/r5rs/sigscheme/datas.c
   branches/r5rs/sigscheme/io.c
   branches/r5rs/sigscheme/sigscheme.c
Log:
* sigscheme/sigscheme.c
  - (SigScm_Initialize): Rename the stack protection pointer
    appropriately, and initialize by 0 to avoid the conservative
    mismark
* sigscheme/io.c
  - (SigScm_load, ScmOp_require): Ditto
* sigscheme/datas.c
  - (Scm_eval_c_string): Ditto
  - (gc_mark): Rename the stack protection pointer appropriately


Modified: branches/r5rs/sigscheme/datas.c
===================================================================
--- branches/r5rs/sigscheme/datas.c	2005-09-07 00:33:10 UTC (rev 1447)
+++ branches/r5rs/sigscheme/datas.c	2005-09-07 04:43:59 UTC (rev 1448)
@@ -474,7 +474,7 @@
 
 static void gc_mark(void)
 {
-    ScmObj obj;
+    ScmObj stack_end;
 
 #if DEBUG_GC
     printf("gc_mark\n");
@@ -485,7 +485,7 @@
                       (ScmObj*)(((char*)save_regs_buf) + sizeof(save_regs_buf)));
 
     gc_mark_protected_var();
-    gc_mark_locations(scm_stack_start_pointer, &obj);
+    gc_mark_locations(scm_stack_start_pointer, &stack_end);
     gc_mark_symbol_hash();
 }
 
@@ -872,9 +872,9 @@
 
 ScmObj Scm_eval_c_string(const char *exp)
 {
-    ScmObj stack_start;
-    ScmObj str_port = SCM_NULL;
-    ScmObj ret = SCM_NULL;
+    ScmObj stack_start = NULL;
+    ScmObj str_port    = SCM_NULL;
+    ScmObj ret         = SCM_NULL;
 
     /* start protecting stack */
     SigScm_GC_ProtectStack(&stack_start);

Modified: branches/r5rs/sigscheme/io.c
===================================================================
--- branches/r5rs/sigscheme/io.c	2005-09-07 00:33:10 UTC (rev 1447)
+++ branches/r5rs/sigscheme/io.c	2005-09-07 04:43:59 UTC (rev 1448)
@@ -413,7 +413,7 @@
 ===========================================================================*/
 ScmObj SigScm_load(const char *filename)
 {
-    ScmObj stack_start;
+    ScmObj stack_start  = NULL;
     ScmObj port         = SCM_NULL;
     ScmObj s_expression = SCM_NULL;
     char  *filepath     = create_valid_path(filename);
@@ -516,8 +516,8 @@
  */
 ScmObj ScmOp_require(ScmObj filename)
 {
-    ScmObj stack_start;
-    ScmObj loaded_str = SCM_NULL;
+    ScmObj stack_start = NULL;
+    ScmObj loaded_str  = SCM_NULL;
 
     if (!STRINGP(filename))
         SigScm_ErrorObj("require : string required but got ", filename);

Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c	2005-09-07 00:33:10 UTC (rev 1447)
+++ branches/r5rs/sigscheme/sigscheme.c	2005-09-07 04:43:59 UTC (rev 1448)
@@ -74,9 +74,10 @@
 =======================================*/
 void SigScm_Initialize(void)
 {
-    ScmObj obj;
-    SigScm_GC_ProtectStack(&obj);
+    ScmObj stack_start = NULL;
 
+    SigScm_GC_ProtectStack(&stack_start);
+
     /*=======================================================================
       Etc Variable Initialization
     =======================================================================*/
@@ -375,7 +376,7 @@
     scm_return_value = SCM_NULL;
 #endif
 
-    SigScm_GC_UnprotectStack(&obj);
+    SigScm_GC_UnprotectStack(&stack_start);
 }
 
 void SigScm_Finalize()