Changeset 15748

Timestamp:

Feb 24, 2013, 1:14:40 PM (7 years ago)

Author:

gb

Message:

Write barrier changes for PPC, too.

Location:

trunk/source/lisp-kernel

Files:

• ppc-exceptions.c (modified) (5 diffs)
• ppc-spentry.s (modified) (7 diffs)

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

@@ -1921 +1921 @@
   egc_store_node_conditional, 
   egc_store_node_conditional_test,
-  egc_set_hash_key,
-  egc_gvset,
-  egc_rplaca,
-  egc_rplacd,
+  egc_set_hash_key, egc_set_hash_key_did_store,
+  egc_gvset, egc_gvset_did_store,
+  egc_rplaca, egc_rplaca_did_store,
+  egc_rplacd, egc_rplacd_did_store,
   egc_set_hash_key_conditional,
   egc_set_hash_key_conditional_test;
@@ -1946 +1946 @@
     LispObj *ea = 0, val = 0, root = 0;
     bitvector refbits = (bitvector)(lisp_global(REFBITS));
-    Boolean need_store = true, need_check_memo = true, need_memoize_root = false;
+    Boolean need_check_memo = true, need_memoize_root = false;
 
     if (program_counter >= &egc_set_hash_key_conditional) {
@@ -1954 +1954 @@
         return;
       }
-      need_store = false;
       root = xpGPR(xp,arg_x);
       ea = (LispObj *) (root+xpGPR(xp,arg_y)+misc_data_offset);
@@ -1968 +1967 @@
       ea = (LispObj*)(xpGPR(xp,arg_x) + xpGPR(xp,imm4));
       xpGPR(xp,arg_z) = t_value;
-      need_store = false;
     } else if (program_counter >= &egc_set_hash_key) {
+      if (program_counter < &egc_set_hash_key_did_store) {
+        return;
+      }
       root = xpGPR(xp,arg_x);
       val = xpGPR(xp,arg_z);
@@ -1975 +1976 @@
       need_memoize_root = true;
     } else if (program_counter >= &egc_gvset) {
+      if (program_counter < &egc_gvset_did_store) {
+        return;
+      }
       ea = (LispObj *) (xpGPR(xp,arg_x)+xpGPR(xp,arg_y)+misc_data_offset);
       val = xpGPR(xp,arg_z);
     } else if (program_counter >= &egc_rplacd) {
+      if (program_counter < &egc_rplacd_did_store) {
+        return;
+      }
       ea = (LispObj *) untag(xpGPR(xp,arg_y));
       val = xpGPR(xp,arg_z);
     } else {                      /* egc_rplaca */
+      if (program_counter < &egc_rplaca_did_store) {
+        return;
+      }
       ea =  ((LispObj *) untag(xpGPR(xp,arg_y)))+1;
       val = xpGPR(xp,arg_z);
-    }
-    if (need_store) {
-      *ea = val;
     }
     if (need_check_memo) {

trunk/source/lisp-kernel/ppc-spentry.s

@@ -464 +464 @@
 /* For RPLACA and RPLACD, things are fairly simple: regardless of where we  */
 /* are in the function, we can do the store (even if it's already been done)  */
+/* Wrong: we generally only want to do it once, at most .... */        
 /* and calculate whether or not we need to set the bit out-of-line.  (Actually */
 /* setting the bit needs to be done atomically, unless we're sure that other */
@@ -470 +471 @@
         
         .globl C(egc_write_barrier_start)
+        .globl C(egc_rplaca_did_store)
 _spentry(rplaca)
 C(egc_write_barrier_start):
         __(cmplr(cr2,arg_z,arg_y))
         __(_rplaca(arg_y,arg_z))
+C(egc_rplaca_did_store):                
         __(blelr cr2)
         __(ref_global(imm2,ref_base))
@@ -498 +501 @@
 
         .globl C(egc_rplacd)
+        .globl C(egc_rplacd_did_store)
 _spentry(rplacd)
 C(egc_rplacd):
         __(cmplr(cr2,arg_z,arg_y))
         __(_rplacd(arg_y,arg_z))
+C(egc_rplacd_did_store):        
         __(blelr cr2)
         __(ref_global(imm2,ref_base))
@@ -528 +533 @@
 
         .globl C(egc_gvset)
+        .globl C(egc_gvset_did_store)
 _spentry(gvset)
 C(egc_gvset):
@@ -533 +539 @@
         __(la imm0,misc_data_offset(arg_y))
         __(strx(arg_z,arg_x,imm0))
+C(egc_gvset_did_store): 
         __(blelr cr2)
         __(add imm0,imm0,arg_x)
@@ -560 +567 @@
 /* the store, record the address of the hash-table vector in the refmap,  */
 /* as well. */
-        .globl C(egc_set_hash_key)        
+        .globl C(egc_set_hash_key)      
+        .globl C(egc_set_hash_key_did_store)  
 _spentry(set_hash_key)
 C(egc_set_hash_key):
@@ -566 +574 @@
         __(la imm0,misc_data_offset(arg_y))
         __(strx(arg_z,arg_x,imm0))
+C(egc_set_hash_key_did_store):          
         __(blelr cr2)
         __(add imm0,imm0,arg_x)