Changeset 8244

Timestamp:

Jan 22, 2008, 10:14:28 PM (17 years ago)

Author:

Gary Byers

Message:

Don't add non-weak hash-table vectors to GCweakvll in the marker.

File:

• trunk/source/lisp-kernel/x86-gc.c (modified) (4 diffs)

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

@@ -25 +25 @@
 #include <string.h>
 #include <sys/time.h>
-
-#ifndef timeradd
-# define timeradd(a, b, result)                                               \
-  do {                                                                        \
-    (result)->tv_sec = (a)->tv_sec + (b)->tv_sec;                             \
-    (result)->tv_usec = (a)->tv_usec + (b)->tv_usec;                          \
-    if ((result)->tv_usec >= 1000000)                                         \
-      {                                                                       \
-        ++(result)->tv_sec;                                                   \
-        (result)->tv_usec -= 1000000;                                         \
-      }                                                                       \
-  } while (0)
-#endif
-#ifndef timersub
-# define timersub(a, b, result)                                               \
-  do {                                                                        \
-    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;                             \
-    (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;                          \
-    if ((result)->tv_usec < 0) {                                              \
-      --(result)->tv_sec;                                                     \
-      (result)->tv_usec += 1000000;                                           \
-    }                                                                         \
-  } while (0)
-#endif
 
 
@@ -349 +325 @@
           ((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;
+        }
       }
 
@@ -518 +494 @@
           ((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;
+        }
       }
 
@@ -758 +734 @@
         ((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;
+      }
     }