Simplify (and robustify) regular PACKing

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

diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S
index 4eabf21..62b3672 100644 (file)
--- a/src/runtime/mips-assem.S
+++ b/src/runtime/mips-assem.S
@@ -19,7 +19,6 @@
 #include "genesis/fdefn.h"
 #include "genesis/closure.h"
 #include "genesis/funcallable-instance.h"
-#include "genesis/return-pc.h"
 #include "genesis/simple-fun.h"
 #include "genesis/static-symbols.h"
                
@@ -166,7 +165,7 @@ symbol:
        lw      reg_A5, 20(reg_CFP)
 
        /* Calculate LRA */
-       la      reg_LRA, lra - RETURN_PC_RETURN_POINT_OFFSET
+       la      reg_LRA, lra + OTHER_POINTER_LOWTAG
 
        /* Indirect closure */
        lw      reg_CODE, CLOSURE_FUN_OFFSET(reg_LEXENV)
@@ -393,8 +392,8 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
           See debug-var-io.lisp. */
        .byte   254
        /* reg_FDEFN is #14. */
-       .byte   ((14 << 5) + sc_DescriptorReg) % 0x100
-       .byte   ((14 << 5) + sc_DescriptorReg) / 0x100
+       .byte   ((14 << 6) + sc_DescriptorReg) % 0x100
+       .byte   ((14 << 6) + sc_DescriptorReg) / 0x100
        .align  2
        .set    reorder
 1:     lw      reg_CODE, FDEFN_FUN_OFFSET(reg_FDEFN)