Changeset 15241 for release


Ignore:
Timestamp:
Mar 9, 2012, 7:46:33 PM (7 years ago)
Author:
rme
Message:

Merge from trunk:

Location:
release/1.8/source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • release/1.8/source

  • release/1.8/source/compiler/X86/x862.lisp

    r15239 r15241  
    10621062
    10631063
    1064 (defun x862-bind-lambda (seg lcells req opt rest keys auxen optsupvloc passed-in-regs lexpr &optional inherited
     1064(defun x862-bind-lambda (seg lcells req opt rest keys auxen optsupvloc passed-in-regs lexpr inherited tail-label
    10651065                             &aux (vloc 0) (numopt (list-length (%car opt)))
    10661066                             (nkeys (list-length (%cadr keys)))
     
    11051105            (x862-copy-register seg reg *x862-arg-z*)
    11061106            (x862-set-var-ea seg rest reg))
    1107             (let* ((loc *x862-vstack*))
    1108               (x862-vpush-register seg *x862-arg-z* :reserved)
    1109               (x862-note-top-cell rest)
    1110               (x862-bind-var seg rest loc *x862-top-vstack-lcell*))))
     1107          (let* ((loc *x862-vstack*))
     1108            (x862-vpush-register seg *x862-arg-z* :reserved)
     1109            (x862-note-top-cell rest)
     1110            (x862-bind-var seg rest loc *x862-top-vstack-lcell*))))
    11111111      (let* ((rvloc (+ vloc (* 2 *x862-target-node-size* nkeys))))
    11121112        (if (setq reg (nx2-assign-register-var rest))
    11131113          (x862-init-regvar seg rest reg (x862-vloc-ea rvloc))
    11141114          (x862-bind-var seg rest rvloc (pop lcells))))))
    1115     (when keys
    1116       (apply #'x862-init-keys seg vloc lcells keys))
     1115  (when keys
     1116    (apply #'x862-init-keys seg vloc lcells keys))
     1117  (when tail-label
     1118    (with-x86-local-vinsn-macros (seg)
     1119      (@+ tail-label)))
    11171120  (x862-seq-bind seg (%car auxen) (%cadr auxen)))
    11181121
     
    67236726          (setq *x862-entry-vstack* *x862-vstack*)
    67246727          (setq reserved-lcells (x862-collect-lcells :reserved))
    6725           (x862-bind-lambda seg reserved-lcells req opt rest keys auxen optsupvloc arg-regs lexprp inherited-vars)
    6726           (when *x862-tail-label*
    6727             (@+ *x862-tail-label*))
     6728          (x862-bind-lambda seg reserved-lcells req opt rest keys auxen optsupvloc arg-regs lexprp inherited-vars *x862-tail-label*)
    67286729          (when next-method-var-scope-info
    67296730            (push next-method-var-scope-info *x862-recorded-symbols*)))
  • release/1.8/source/level-0/X86/X8632/x8632-misc.lisp

    r15239 r15241  
    713713
    714714(defx8632lapfunction %vect-data-to-macptr ((vect arg_y) (ptr arg_z))
     715  (cmpb ($ x8632::subtag-double-float-vector) (@ x8632::misc-subtag-offset (% vect)))
     716  (je @dfloat)
     717  (cmpb ($ x8632::subtag-double-float) (@ x8632::misc-subtag-offset (% vect)))
     718  (je @dfloat)
    715719  (lea (@ x8632::misc-data-offset (% vect)) (% imm0))
     720  (jmp @common)
     721  @dfloat
     722  (lea (@ x8632::misc-dfloat-offset (% vect)) (% imm0))
     723  @common
    716724  (movl (% imm0) (@ x8632::macptr.address (% ptr)))
    717725  (single-value-return))
  • release/1.8/source/lib/macros.lisp

    r15239 r15241  
    406406             (continue cond &rest args) expansion
    407407             (setq condform `(condition-arg ,cond (list ,@args) 'simple-error)
    408                    signalform `(cerror ,continue ,cname))))
     408                   signalform `(cerror ,continue ,cname ,@args))))
    409409          ((signal error warn)
    410410           (destructuring-bind
Note: See TracChangeset for help on using the changeset viewer.