Changeset 14499 for release/1.6/source

Timestamp:

Dec 20, 2010, 8:54:00 PM (10 years ago)

Author:

rme

Message:

From trunk: GC integrity check more places; fix to progvsave.
(ARM only)

Location:

release/1.6/source

Files:

• . (modified) (1 prop)
• lisp-kernel/arm-gc.c (modified) (2 diffs)
• lisp-kernel/arm-spentry.s (modified) (1 diff)

release/1.6/source/lisp-kernel/arm-gc.c

@@ -144 +144 @@
 
 void
+check_xp(ExceptionInformation *xp)
+{
+  natural *regs = (natural *) xpGPRvector(xp);
+  LispObj lr_value;
+  int r;
+
+  for (r = arg_z; r <= Rfn; r++) {
+    check_node((regs[r]));
+  }
+}
+
+
+
+void
+check_tcrs(TCR *first)
+{
+  xframe_list *xframes;
+  ExceptionInformation *xp;
+  
+  TCR *tcr = first;
+  LispObj *tlb_start,*tlb_end;
+
+  do {
+    xp = tcr->gc_context;
+    if (xp) {
+      check_xp(xp);
+    }
+    for (xframes = (xframe_list *) tcr->xframe; 
+         xframes; 
+         xframes = xframes->prev) {
+      check_xp(xframes->curr);
+    }
+    tlb_start = tcr->tlb_pointer;
+    if (tlb_start) {
+      tlb_end = tlb_start + ((tcr->tlb_limit)>>fixnumshift);
+      check_range(tlb_start,tlb_end,false);
+    }
+    tcr = tcr->next;
+  } while (tcr != first);
+}
+
+void
 check_all_areas(TCR *tcr)
 {
@@ -169 +211 @@
       break;
 
+    case AREA_CSTACK:
+      check_range((LispObj *)a->active, (LispObj *)a->high, true);
+      break;
+
     }
     a = a->succ;
     code = (a->code);
   }
+  check_tcrs(tcr);
 }
 

release/1.6/source/lisp-kernel/arm-spentry.s

@@ -4160 +4160 @@
         __(b 9f)
 2:
+        __(orr imm1,imm1,fixnumone) /* force odd */
         __(mov imm1,imm1,lsl #num_subtag_bits-fixnumshift)
         __(orr imm1,imm1,#subtag_u32_vector)