X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fhppa%2Fassem-rtns.lisp;h=4cae72b884c1035063ca8fad7a16de239f7d3128;hb=942e45e3bb73fd55786e4a0ab4590324063c0c89;hp=85b60a354d153f4879f78810c5ba9b7a1a74679f;hpb=8a19c6876412b8ad1cf729297c2a373d63a0d0ec;p=sbcl.git diff --git a/src/assembly/hppa/assem-rtns.lisp b/src/assembly/hppa/assem-rtns.lisp index 85b60a3..4cae72b 100644 --- a/src/assembly/hppa/assem-rtns.lisp +++ b/src/assembly/hppa/assem-rtns.lisp @@ -40,7 +40,7 @@ (loadw a4 vals 4) (inst addib := (fixnumize -1) count default-a5-and-on :nullify t) (loadw a5 vals 5) - (inst addib := (fixnumize -1) count done :nullify t) + (inst addib := (fixnumize -1) count done :nullify t) ;; Copy the remaining args to the top of the stack. (inst addi (* 6 n-word-bytes) vals src) @@ -71,7 +71,7 @@ (move cfp-tn ocfp-tn) (move old-fp cfp-tn) (inst add ocfp-tn nvals csp-tn) - + ;; Return. (lisp-return lra)) @@ -108,7 +108,7 @@ ;; Calculate NARGS (as a fixnum) (inst sub csp-tn args nargs) - + ;; Load the argument regs (must do this now, 'cause the blt might ;; trash these locations) (loadw a0 args 0) @@ -123,13 +123,13 @@ (inst comb :<= count zero-tn done :nullify t) (inst addi (* n-word-bytes register-arg-count) args src) (inst addi (* n-word-bytes register-arg-count) cfp-tn dst) - + LOOP ;; Copy one arg. (inst ldwm 4 src temp) (inst addib :> (fixnumize -1) count loop) (inst stwm temp 4 dst) - + DONE ;; We are done. Do the jump. (loadw temp lexenv closure-fun-slot fun-pointer-lowtag) @@ -160,15 +160,15 @@ (let ((error (generate-error-code nil invalid-unwind-error))) (inst bc := nil block zero-tn error)) - + (load-symbol-value cur-uwp *current-unwind-protect-block*) (loadw target-uwp block unwind-block-current-uwp-slot) (inst bc :<> nil cur-uwp target-uwp do-uwp) - + (move block cur-uwp) DO-EXIT - + (loadw cfp-tn cur-uwp unwind-block-current-cont-slot) (loadw code-tn cur-uwp unwind-block-current-code-slot) (loadw lra cur-uwp unwind-block-entry-pc-slot) @@ -191,13 +191,13 @@ (declare (ignore start count)) ; We just need them in the registers. (load-symbol-value catch *current-catch-block*) - + LOOP (let ((error (generate-error-code nil unseen-throw-tag-error target))) (inst bc := nil catch zero-tn error)) (loadw tag catch catch-block-tag-slot) (inst comb :<> tag target loop :nullify t) (loadw catch catch catch-block-previous-catch-slot) - + (inst b *unwind-entry-point*) (inst move catch target))