Changeset 8248

Timestamp:

Jan 23, 2008, 12:48:36 AM (17 years ago)

Author:

Gary Byers

Message:

Don't add non-weak hash-tables to GCweakvll (in more cases.)

Location:

trunk/source/lisp-kernel

Files:

• ppc-gc.c (modified) (4 diffs)
• x86-gc.c (modified) (1 diff)

trunk/source/lisp-kernel/ppc-gc.c

@@ -303 +303 @@
           ((hash_table_vector_header *) base)->cache_key = undefined;
           ((hash_table_vector_header *) base)->cache_value = lisp_nil;
-        }
-        deref(ptr_to_lispobj(base),1) = GCweakvll;
-        GCweakvll = n;
-        return;
+          deref(ptr_to_lispobj(base),1) = GCweakvll;
+          GCweakvll = n;
+          return;
+        }
       }
 
@@ -563 +563 @@
           ((hash_table_vector_header *) base)->cache_key = undefined;
           ((hash_table_vector_header *) base)->cache_value = lisp_nil;
-        }
-        deref(ptr_to_lispobj(base),1) = GCweakvll;
-        GCweakvll = n;
-        return;
+          deref(ptr_to_lispobj(base),1) = GCweakvll;
+          GCweakvll = n;
+          return;
+        }
       }
 
@@ -732 +732 @@
           ((hash_table_vector_header *) base)->cache_key = undefined;
           ((hash_table_vector_header *) base)->cache_value = lisp_nil;
-        }
-
-        deref(ptr_to_lispobj(base),1) = GCweakvll;
-        GCweakvll = this;
-        goto Climb;
+          
+          deref(ptr_to_lispobj(base),1) = GCweakvll;
+          GCweakvll = this;
+          goto Climb;
+        }
       }
 
@@ -990 +990 @@
           ((hash_table_vector_header *) start)->cache_key = undefined;
           ((hash_table_vector_header *) start)->cache_value = lisp_nil;
-        }
-
-        start[1] = GCweakvll;
-        GCweakvll = (LispObj) (((natural) start) + fulltag_misc);
-      } else {
-
-        if (subtag == subtag_pool) {
-          start[1] = lisp_nil;
-        }
-
-        if (subtag == subtag_weak) {
-          natural weak_type = (natural) start[2];
-          if (weak_type >> population_termination_bit)
-            element_count -= 2;
-          else
-            element_count -= 1; 
-          start[1] = GCweakvll;
-          GCweakvll = (LispObj) (((natural) start) + fulltag_misc);    
-        }
-
-        base = start + element_count + 1;
-        while(element_count--) {
-          mark_root(*--base);
-        }
-      }
+        
+          start[1] = GCweakvll;
+          GCweakvll = (LispObj) (((natural) start) + fulltag_misc);
+          element_count = 0;
+        }
+      }
+      if (subtag == subtag_pool) {
+        start[1] = lisp_nil;
+      }
+
+      if (subtag == subtag_weak) {
+        natural weak_type = (natural) start[2];
+        if (weak_type >> population_termination_bit)
+          element_count -= 2;
+        else
+          element_count -= 1; 
+        start[1] = GCweakvll;
+        GCweakvll = (LispObj) (((natural) start) + fulltag_misc);    
+      }
+
+      base = start + element_count + 1;
+      while(element_count--) {
+        mark_root(*--base);
+      }   
       start += size;
     }

trunk/source/lisp-kernel/x86-gc.c

@@ -998 +998 @@
           ((hash_table_vector_header *) start)->cache_key = undefined;
           ((hash_table_vector_header *) start)->cache_value = lisp_nil;
-        }
-
-        start[1] = GCweakvll;
-        GCweakvll = (LispObj) (((natural) start) + fulltag_misc);
-      } else {
-
-        if (subtag == subtag_pool) {
-          start[1] = lisp_nil;
-        }
-
-        if (subtag == subtag_weak) {
-          natural weak_type = (natural) start[2];
-          if (weak_type >> population_termination_bit)
-            element_count -= 2;
-          else
-            element_count -= 1; 
-          start[1] = GCweakvll;
-          GCweakvll = (LispObj) (((natural) start) + fulltag_misc);    
-        }
-
-        base = start + element_count + 1;
-        if (subtag == subtag_function) {
-          element_count -= (int)start[1];
+          start[1] = GCweakvll;
+          GCweakvll = (LispObj) (((natural) start) + fulltag_misc);
+          element_count = 0;
         }
-        while(element_count--) {
-          mark_root(*--base);
-        }
+      } 
+      if (subtag == subtag_pool) {
+        start[1] = lisp_nil;
+      }
+
+      if (subtag == subtag_weak) {
+        natural weak_type = (natural) start[2];
+        if (weak_type >> population_termination_bit)
+          element_count -= 2;
+        else
+          element_count -= 1; 
+        start[1] = GCweakvll;
+        GCweakvll = (LispObj) (((natural) start) + fulltag_misc);    
+      }
+
+      base = start + element_count + 1;
+      if (subtag == subtag_function) {
+        element_count -= (int)start[1];
+      }
+      while(element_count--) {
+        mark_root(*--base);
       }
       start += size;