projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.7.4.8:
[sbcl.git]
/
src
/
runtime
/
alpha-assem.S
diff --git
a/src/runtime/alpha-assem.S
b/src/runtime/alpha-assem.S
index
b2be715
..
ed5074f
100644
(file)
--- 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 */
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_FUN_OFFSET(reg_LEXENV)
/* Indirect the closure */
ldl reg_CODE, CLOSURE_FUN_OFFSET(reg_LEXENV)
- addl reg_CODE,6*4-type_FunPointer, reg_LIP
+ addl reg_CODE,6*4-FUN_POINTER_LOWTAG, reg_LIP
/* And into lisp we go. */
jsr reg_ZERO,(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:
.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
/* 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
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)
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)
/* 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
addq reg_CODE, reg_NL0, reg_NL0
mov reg_CFP, reg_CSP
@@
-260,7
+260,7
@@
undefined_tramp_offset:
call_pal PAL_bugchk
.long trap_Error
.byte 4 /* what are these numbers? */
call_pal PAL_bugchk
.long trap_Error
.byte 4 /* what are these numbers? */
- .byte 23
+ .byte UNDEFINED_FUN_ERROR
.byte 254
.byte (0xe0 + sc_DescriptorReg)
.byte 2
.byte 254
.byte (0xe0 + sc_DescriptorReg)
.byte 2
@@
-278,7
+278,7
@@
closure_tramp = /* ### */ 0x150 + call_into_lisp_LRA_page
closure_tramp_offset:
ldl reg_LEXENV, FDEFN_FUN_OFFSET(reg_FDEFN)
ldl reg_L0, CLOSURE_FUN_OFFSET(reg_LEXENV)
closure_tramp_offset:
ldl reg_LEXENV, FDEFN_FUN_OFFSET(reg_FDEFN)
ldl reg_L0, CLOSURE_FUN_OFFSET(reg_LEXENV)
- addl reg_L0, FUN_CODE_OFFSET, reg_LIP
+ addl reg_L0, SIMPLE_FUN_CODE_OFFSET, reg_LIP
jmp reg_ZERO,(reg_LIP)
.end closure_tramp
jmp reg_ZERO,(reg_LIP)
.end closure_tramp
@@
-296,7
+296,7
@@
end_of_tramps:
.set noreorder
.globl fun_end_breakpoint_guts
fun_end_breakpoint_guts:
.set noreorder
.globl fun_end_breakpoint_guts
fun_end_breakpoint_guts:
- .long type_ReturnPcHeader
+ .long RETURN_PC_HEADER_WIDETAG
br zero, fun_end_breakpoint_trap
nop
mov reg_CSP, reg_OCFP
br zero, fun_end_breakpoint_trap
nop
mov reg_CSP, reg_OCFP