Changeset 12924

Timestamp:

Oct 8, 2009, 5:41:11 AM (11 years ago)

Author:

rme

Message:

wp_update_range(): try to update hash vectors correctly

File:

• branches/watchpoints/lisp-kernel/x86-gc.c (modified) (4 diffs)

branches/watchpoints/lisp-kernel/x86-gc.c

@@ -2813 +2813 @@
  */
 
-static inline void
+static inline int
 wp_maybe_update(LispObj *p, LispObj old, LispObj new)
 {
   if (*p == old) {
     *p = new;
-  }
+    return true;
+  }
+  return false;
 }
 
@@ -2848 +2850 @@
     } else if (nodeheader_tag_p(tag_n)) {
       nwords = header_element_count(node);
-      
       nwords += 1 - (nwords & 1);
 
@@ -2859 +2860 @@
         nwords -= skip;
         while(skip--) {
-          if (*p == old) *p = new;
+          wp_maybe_update(p, old, new);
           p++;
         }
@@ -2868 +2869 @@
         nwords >>= 1;
         while(nwords--) {
-          if (*p == old && hashp) {
-            *p = new;
+          if (wp_maybe_update(p, old, new) && hashp) {
             hashp->flags |= nhash_key_moved_mask;
             hashp = NULL;
           }
           p++;
-          if (*p == old) *p = new;
+          wp_maybe_update(p, old, new);
           p++;
         }