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

[kzk at freedesktop.org]

Author: kzk
Date: 2005-07-26 07:51:54 -0700 (Tue, 26 Jul 2005)
New Revision: 1036

Modified:
   branches/r5rs/sigscheme/datas.c
Log:
* protect register by using jmp_buf

* sigscheme/datas.c
  - (gc_mark): protect register by using jmp_buf
  - (gc_mark_stack): renamed to gc_mark_locations
  - (gc_mark_locations_n): new func



Modified: branches/r5rs/sigscheme/datas.c
===================================================================
--- branches/r5rs/sigscheme/datas.c	2005-07-26 14:40:18 UTC (rev 1035)
+++ branches/r5rs/sigscheme/datas.c	2005-07-26 14:51:54 UTC (rev 1036)
@@ -58,6 +58,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <malloc.h>
+#include <setjmp.h>
 
 /*=======================================
   Local Include
@@ -95,9 +96,9 @@
 static ScmObjHeap   *scm_heaps     = NULL;
 static ScmObj        scm_freelist  = NULL;
 
+static jmp_buf save_regs_buf;
 ScmObj *stack_start_pointer = NULL;
 
-
 static ScmObj *symbol_hash = NULL;
 static gc_protected_obj *protected_obj_list = NULL;
 
@@ -118,7 +119,8 @@
 static int  is_pointer_to_heap(ScmObj obj);
 
 static void gc_mark_protected_obj();
-static void gc_mark_stack(ScmObj *start, ScmObj *end);
+static void gc_mark_locations_n(ScmObj *start, int n);
+static void gc_mark_locations(ScmObj *start, ScmObj *end);
 static void gc_mark(void);
 
 /* GC Sweep Related Functions */
@@ -361,9 +363,24 @@
     }
 }
 
-static void gc_mark_stack(ScmObj *start, ScmObj *end)
+static void gc_mark_locations_n(ScmObj *start, int n)
 {
-    int i    = 0;
+    int i = 0;
+    ScmObj obj = SCM_NIL;
+    
+    /* mark stack */
+    for (i = 0; i < n; i++) {
+	obj = start[i];
+
+        if (is_pointer_to_heap(obj)) {
+            mark_obj(obj);
+        }
+    }
+
+}
+
+static void gc_mark_locations(ScmObj *start, ScmObj *end)
+{
     int size = 0;
     ScmObj *tmp = NULL;
 
@@ -378,15 +395,10 @@
     size = end - start;
 
 #if DEBUG_GC
-    printf("gc_mark_stack() : size = %d\n", size);
+    printf("gc_mark_locations() : size = %d\n", size);
 #endif
 
-    /* mark stack */
-    for (i = 0; i < size; i++) {
-        if (is_pointer_to_heap(start[i])) {
-            mark_obj(start[i]);
-        }
-    }
+    gc_mark_locations_n(start, size);
 }
 
 static void gc_mark_symbol_hash(void)
@@ -405,8 +417,12 @@
     printf("gc_mark\n");
 #endif
 
+    setjmp(save_regs_buf);
+    gc_mark_locations((ScmObj*)save_regs_buf,
+		      (ScmObj*)(((char*)save_regs_buf) + sizeof(save_regs_buf)));
+    
     gc_mark_protected_obj();
-    gc_mark_stack(stack_start_pointer, &obj);
+    gc_mark_locations(stack_start_pointer, &obj);
     gc_mark_symbol_hash();
 }