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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-12-03 12:59:00 -0800 (Sat, 03 Dec 2005)
New Revision: 2339

Modified:
   branches/r5rs/sigscheme/sigschemeinternal.h
   branches/r5rs/sigscheme/storage-gc.c
Log:
* sigscheme/sigschemeinternal.h
  - (scm_stack_start_pointer): Removed
* sigscheme/storage-gc.c
  - (scm_stack_start_pointer): Rename to stack_start_pointer
  - (stack_start_pointer):
    * Renamed from scm_stack_start_pointer
    * Make static
  - (SigScm_GC_ProtectStackInternal, SigScm_GC_ProtectStack,
    SigScm_GC_UnprotectStack, gc_mark): Follow the renaming


Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2005-12-03 20:57:29 UTC (rev 2338)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2005-12-03 20:59:00 UTC (rev 2339)
@@ -75,9 +75,6 @@
 extern ScmObj SigScm_null_values;
 #endif
 
-/* storage-gc.c */
-extern ScmObj *scm_stack_start_pointer;
-
 /*=======================================
    Macro Declarations
 =======================================*/

Modified: branches/r5rs/sigscheme/storage-gc.c
===================================================================
--- branches/r5rs/sigscheme/storage-gc.c	2005-12-03 20:57:29 UTC (rev 2338)
+++ branches/r5rs/sigscheme/storage-gc.c	2005-12-03 20:59:00 UTC (rev 2339)
@@ -130,7 +130,7 @@
 #endif
 
 static jmp_buf save_regs_buf;
-ScmObj *scm_stack_start_pointer = NULL;
+static ScmObj *stack_start_pointer = NULL;
 #if UIM_SCM_GCC4_READY_GC
 /* See also the comment about these variables in sigscheme.h */
 ScmObj *(*volatile scm_gc_protect_stack)(ScmObj *)
@@ -240,8 +240,8 @@
     if (!designated_stack_start)
         designated_stack_start = &stack_start;
 
-    if (!scm_stack_start_pointer)
-        scm_stack_start_pointer = designated_stack_start;
+    if (!stack_start_pointer)
+        stack_start_pointer = designated_stack_start;
 
     /* may intentionally be an invalidated local address */
     return designated_stack_start;
@@ -251,15 +251,15 @@
 
 void SigScm_GC_ProtectStack(ScmObj *stack_start)
 {
-    if (!scm_stack_start_pointer)
-        scm_stack_start_pointer = stack_start;
+    if (!stack_start_pointer)
+        stack_start_pointer = stack_start;
 }
 #endif /* SCM_GCC4_READY_GC */
 
 void SigScm_GC_UnprotectStack(ScmObj *stack_start)
 {
-    if (scm_stack_start_pointer == stack_start)
-        scm_stack_start_pointer = NULL;
+    if (stack_start_pointer == stack_start)
+        stack_start_pointer = NULL;
 }
 
 /*============================================================================
@@ -536,7 +536,7 @@
     setjmp(save_regs_buf);
     gc_mark_locations((ScmObj *)save_regs_buf, (ScmObj *)save_regs_buf_end);
     gc_mark_protected_var();
-    gc_mark_locations(scm_stack_start_pointer, &stack_end);
+    gc_mark_locations(stack_start_pointer, &stack_end);
     gc_mark_symbol_hash();
 }