Split GENCGC_PAGE_BYTES in 3 constants

[sbcl.git] / src / runtime / ppc-assem.S

diff --git a/src/runtime/ppc-assem.S b/src/runtime/ppc-assem.S
index 72838ca..a8a165c 100644 (file)
--- a/src/runtime/ppc-assem.S
+++ b/src/runtime/ppc-assem.S
@@ -344,12 +344,12 @@ x:
 #endif
        /* Turn on pseudo-atomic */
 
-       li reg_ALLOC,4
+       li reg_ALLOC,flag_PseudoAtomic
 #if defined(LISP_FEATURE_SB_THREAD)
-       stw reg_ZERO,THREAD_FOREIGN_FUNCTION_CALL_ACTIVE_OFFSET(reg_L2)
-       lwz reg_BSP,THREAD_BINDING_STACK_POINTER_OFFSET(reg_L2)
-       lwz reg_CSP,THREAD_CONTROL_STACK_POINTER_OFFSET(reg_L2)
-       lwz reg_OCFP,THREAD_CONTROL_FRAME_POINTER_OFFSET(reg_L2)
+       stw reg_ZERO,THREAD_FOREIGN_FUNCTION_CALL_ACTIVE_OFFSET(reg_THREAD)
+       lwz reg_BSP,THREAD_BINDING_STACK_POINTER_OFFSET(reg_THREAD)
+       lwz reg_CSP,THREAD_CONTROL_STACK_POINTER_OFFSET(reg_THREAD)
+       lwz reg_OCFP,THREAD_CONTROL_FRAME_POINTER_OFFSET(reg_THREAD)
 #else
        store(reg_ZERO,reg_NL4,CSYMBOL(foreign_function_call_active))
        load(reg_BSP,CSYMBOL(current_binding_stack_pointer))
@@ -364,8 +364,8 @@ x:
        add reg_ALLOC,reg_ALLOC,reg_NL4
 
        /* No longer atomic, and check for interrupt */
-       subi reg_ALLOC,reg_ALLOC,4
-       andi. reg_NL3, reg_ALLOC, 1
+       subi reg_ALLOC,reg_ALLOC,flag_PseudoAtomic
+       andi. reg_NL3, reg_ALLOC, flag_PseudoAtomicInterrupted
        twnei reg_NL3, 0
 
        /* Pass in the arguments */
@@ -407,16 +407,16 @@ lra:
        mr REG(3),reg_A0
 
        /* Turn on  pseudo-atomic */
-       la reg_ALLOC,4(reg_ALLOC)
+       la reg_ALLOC,flag_PseudoAtomic(reg_ALLOC)
 
 #if defined(LISP_FEATURE_SB_THREAD)
        /* Store lisp state */
-       stw reg_BSP,THREAD_BINDING_STACK_POINTER_OFFSET(reg_L2)
-       stw reg_CSP,THREAD_CONTROL_STACK_POINTER_OFFSET(reg_L2)
-       stw reg_CFP,THREAD_CONTROL_FRAME_POINTER_OFFSET(reg_L2)
+       stw reg_BSP,THREAD_BINDING_STACK_POINTER_OFFSET(reg_THREAD)
+       stw reg_CSP,THREAD_CONTROL_STACK_POINTER_OFFSET(reg_THREAD)
+       stw reg_CFP,THREAD_CONTROL_FRAME_POINTER_OFFSET(reg_THREAD)
 
        /* No longer in Lisp. */
-       stw reg_ALLOC,THREAD_FOREIGN_FUNCTION_CALL_ACTIVE_OFFSET(reg_L2)
+       stw reg_ALLOC,THREAD_FOREIGN_FUNCTION_CALL_ACTIVE_OFFSET(reg_THREAD)
 #else
        /* Store lisp state */
        clrrwi reg_NL1,reg_ALLOC,3
@@ -433,8 +433,8 @@ lra:
 #endif
 
        /* Check for interrupt */
-       subi reg_ALLOC, reg_ALLOC, 4
-       andi. reg_NL3, reg_ALLOC, 1
+       subi reg_ALLOC, reg_ALLOC, flag_PseudoAtomic
+       andi. reg_NL3, reg_ALLOC, flag_PseudoAtomicInterrupted
        twnei reg_NL3,0
        
        /* Back to C */
@@ -465,7 +465,7 @@ lra:
        mr reg_NARGS,reg_NL3
 
        /* Turn on pseudo-atomic */
-       la reg_ALLOC,4(reg_ALLOC)
+       la reg_ALLOC,flag_PseudoAtomic(reg_ALLOC)
 
        /* Convert the return address to an offset and save it on the stack. */
        sub reg_NFP,reg_LIP,reg_CODE
@@ -474,12 +474,12 @@ lra:
 
 #ifdef LISP_FEATURE_SB_THREAD
        /* Store Lisp state */
-       stw reg_BSP,THREAD_BINDING_STACK_POINTER_OFFSET(reg_L2)
-       stw reg_CSP,THREAD_CONTROL_STACK_POINTER_OFFSET(reg_L2)
-       stw reg_CFP,THREAD_CONTROL_FRAME_POINTER_OFFSET(reg_L2)
+       stw reg_BSP,THREAD_BINDING_STACK_POINTER_OFFSET(reg_THREAD)
+       stw reg_CSP,THREAD_CONTROL_STACK_POINTER_OFFSET(reg_THREAD)
+       stw reg_CFP,THREAD_CONTROL_FRAME_POINTER_OFFSET(reg_THREAD)
 
        /* No longer in Lisp. */
-       stw reg_CSP,THREAD_FOREIGN_FUNCTION_CALL_ACTIVE_OFFSET(reg_L2)
+       stw reg_CSP,THREAD_FOREIGN_FUNCTION_CALL_ACTIVE_OFFSET(reg_THREAD)
 #else
        /* Store Lisp state */
        clrrwi reg_NFP,reg_ALLOC,3
@@ -495,8 +495,8 @@ lra:
 #endif
        /* load(reg_POLL,saver2) */
        /* Disable pseudo-atomic; check pending interrupt */
-       subi reg_ALLOC, reg_ALLOC, 4
-       andi. reg_NL3, reg_ALLOC, 1
+       subi reg_ALLOC, reg_ALLOC, flag_PseudoAtomic
+       andi. reg_NL3, reg_ALLOC, flag_PseudoAtomicInterrupted
        twnei reg_NL3, 0
 
        mr reg_NL3,reg_NARGS
@@ -542,15 +542,14 @@ lra:
        li reg_LIP,0
 
        /* Atomic ... */
-        li reg_NL3,-4        
-       li reg_ALLOC,4
+       li reg_ALLOC,flag_PseudoAtomic
 
 #if defined(LISP_FEATURE_SB_THREAD)
        /* No longer in foreign function call. */
-       stw reg_ZERO,THREAD_FOREIGN_FUNCTION_CALL_ACTIVE_OFFSET(reg_L2)
+       stw reg_ZERO,THREAD_FOREIGN_FUNCTION_CALL_ACTIVE_OFFSET(reg_THREAD)
 
        /* The binding stack pointer isn't preserved by C. */
-       lwz reg_BSP,THREAD_BINDING_STACK_POINTER_OFFSET(reg_L2)
+       lwz reg_BSP,THREAD_BINDING_STACK_POINTER_OFFSET(reg_THREAD)
 #else
        /* No long in foreign function call. */
        store(reg_ZERO,reg_NL2,CSYMBOL(foreign_function_call_active))
@@ -578,8 +577,8 @@ lra:
        la reg_LIP,-OTHER_POINTER_LOWTAG(reg_LIP)
 
        /* No longer atomic */
-       subi reg_ALLOC, reg_ALLOC, 4
-       andi. reg_NL3, reg_ALLOC, 1
+       subi reg_ALLOC, reg_ALLOC, flag_PseudoAtomic
+       andi. reg_NL3, reg_ALLOC, flag_PseudoAtomicInterrupted
        twnei reg_NL3, 0
 
        mtlr reg_LIP