X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fassemfile.lisp;h=424b3a2583ccc5f2898c1ef013d16cd381b4d958;hb=37b1ed8e9b6faa84832b8251998b5d0eb1f6b307;hp=591acfb2a54b2105bb14cbe541b792a4a9e61634;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git diff --git a/src/assembly/assemfile.lisp b/src/assembly/assemfile.lisp index 591acfb..424b3a2 100644 --- a/src/assembly/assemfile.lisp +++ b/src/assembly/assemfile.lisp @@ -45,9 +45,6 @@ (let ((*features* (cons :sb-assembling *features*))) (init-assembler) (load (merge-pathnames name (make-pathname :type "lisp"))) - (fasl-dump-cold-load-form `(in-package ,(package-name - (sane-package))) - lap-fasl-output) (sb!assem:append-segment *code-segment* *elsewhere*) (setf *elsewhere* nil) (let ((length (sb!assem:finalize-segment *code-segment*))) @@ -119,7 +116,7 @@ ,@(unless (eq (reg-spec-kind reg) :res) `(:target ,(reg-spec-temp reg))))) -(defun emit-vop (name options vars) +(defun emit-assemble-vop (name options vars) (let* ((args (remove :arg vars :key #'reg-spec-kind :test #'neq)) (temps (remove :temp vars :key #'reg-spec-kind :test #'neq)) (results (remove :res vars :key #'reg-spec-kind :test #'neq)) @@ -188,9 +185,9 @@ (multiple-value-bind (name options) (if (atom name&options) (values name&options nil) - (values (car name&options) - (cdr name&options))) + (values (car name&options) + (cdr name&options))) (let ((regs (mapcar (lambda (var) (apply #'parse-reg-spec var)) vars))) (if *emit-assembly-code-not-vops-p* (emit-assemble name options regs code) - (emit-vop name options regs))))) + (emit-assemble-vop name options regs)))))