X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Falpha-assem.S;h=3fd27e64d2a6cb0eac7e0009a1d617c16e497315;hb=90ca09b75fbc3b63b2f7d09c67b04b866dd783f6;hp=56d00471802520e1e594ef59d3079bbc4b5e1da5;hpb=63fcb94b875a97e468d9add229e220ecceec2352;p=sbcl.git

diff --git a/src/runtime/alpha-assem.S b/src/runtime/alpha-assem.S
index 56d0047..3fd27e6 100644
--- a/src/runtime/alpha-assem.S
+++ b/src/runtime/alpha-assem.S
@@ -82,11 +82,11 @@ call_into_lisp:
 	ldl	reg_A5,20(reg_CFP)
 
 	/* This call will 'return' into the LRA page below */
-	lda	reg_LRA,call_into_lisp_LRA_page+type_OtherPointer
+	lda	reg_LRA,call_into_lisp_LRA_page+OTHER_POINTER_LOWTAG
 
 	/* Indirect the closure */
-	ldl	reg_CODE,CLOSURE_FUNCTION_OFFSET(reg_LEXENV)
-	addl	reg_CODE,6*4-type_FunctionPointer,reg_LIP
+	ldl	reg_CODE, CLOSURE_FUN_OFFSET(reg_LEXENV)
+	addl	reg_CODE,6*4-FUN_POINTER_LOWTAG, reg_LIP
 
 	/* And into lisp we go. */
 	jsr	reg_ZERO,(reg_LIP)
@@ -100,7 +100,7 @@ call_into_lisp:
 	.globl	call_into_lisp_LRA
 call_into_lisp_LRA:	
 
-	.long	type_ReturnPcHeader
+	.long	RETURN_PC_HEADER_WIDETAG
 
 	/* execution resumes here*/
 	mov	reg_OCFP,reg_CSP
@@ -157,7 +157,7 @@ call_into_c:
 	addq	reg_CFP, 32, reg_CSP
 	stl	reg_OCFP, 0(reg_CFP)
 	subl	reg_LIP, reg_CODE, reg_L1
-	addl	reg_L1, type_OtherPointer, reg_L1
+	addl	reg_L1, OTHER_POINTER_LOWTAG, reg_L1
 	stl	reg_L1, 4(reg_CFP)
 	stl	reg_CODE, 8(reg_CFP)
 	stl	reg_NULL, 12(reg_CFP)
@@ -233,7 +233,7 @@ call_into_c:
 	/* can you see anything here which touches LRA?  I can't ...*/
 	ldl	reg_CODE, 8(reg_CFP)
 	ldl	reg_NL0, 4(reg_CFP)
-	subq	reg_NL0, type_OtherPointer, reg_NL0
+	subq	reg_NL0, OTHER_POINTER_LOWTAG, reg_NL0
 	addq	reg_CODE, reg_NL0, reg_NL0
 
 	mov	reg_CFP, reg_CSP
@@ -257,7 +257,7 @@ start_of_tramps:
         .ent    undefined_tramp_offset
 undefined_tramp = /* ### undefined_tramp_offset-call_into_lisp_LRA*/ 0x140+call_into_lisp_LRA_page
 undefined_tramp_offset:
-	bpt
+	call_pal PAL_bugchk
 	.long    trap_Error
         .byte    4                         /* what are these numbers? */
         .byte    23
@@ -276,9 +276,9 @@ undefined_tramp_offset:
         .ent    closure_tramp_offset
 closure_tramp = /* ### */ 0x150 + call_into_lisp_LRA_page
 closure_tramp_offset:
-        ldl     reg_LEXENV, FDEFN_FUNCTION_OFFSET(reg_FDEFN)
-        ldl     reg_L0, CLOSURE_FUNCTION_OFFSET(reg_LEXENV)
-        addl    reg_L0, FUNCTION_CODE_OFFSET, reg_LIP
+        ldl     reg_LEXENV, FDEFN_FUN_OFFSET(reg_FDEFN)
+        ldl     reg_L0, CLOSURE_FUN_OFFSET(reg_LEXENV)
+        addl    reg_L0, SIMPLE_FUN_CODE_OFFSET, reg_LIP
         jmp     reg_ZERO,(reg_LIP)
         .end    closure_tramp
 
@@ -288,16 +288,16 @@ end_of_tramps:
 
 
 /*
- * Function-end breakpoint magic.
+ * fun-end breakpoint magic.
  */
 
 	.text
 	.align	2
 	.set	noreorder
-	.globl	function_end_breakpoint_guts
-function_end_breakpoint_guts:
-	.long	type_ReturnPcHeader
-	br	zero, function_end_breakpoint_trap
+	.globl	fun_end_breakpoint_guts
+fun_end_breakpoint_guts:
+	.long	RETURN_PC_HEADER_WIDETAG
+	br	zero, fun_end_breakpoint_trap
 	nop
 	mov	reg_CSP, reg_OCFP
 	addl	reg_CSP, 4, reg_CSP
@@ -309,13 +309,13 @@ function_end_breakpoint_guts:
 	mov	reg_NULL, reg_A5
 1:
 
-	.globl	function_end_breakpoint_trap
-function_end_breakpoint_trap:
-	call_pal PAL_gentrap
-	.long	trap_FunctionEndBreakpoint
-	br	zero, function_end_breakpoint_trap
+	.globl	fun_end_breakpoint_trap
+fun_end_breakpoint_trap:
+	call_pal PAL_bugchk
+	.long	trap_FunEndBreakpoint
+	br	zero, fun_end_breakpoint_trap
 
-	.globl	function_end_breakpoint_end
-function_end_breakpoint_end:
+	.globl	fun_end_breakpoint_end
+fun_end_breakpoint_end: