X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fsubprim.lisp;h=a922c85a49ebe942101fe27bf4056ca205f92647;hb=a6b91f356da1b5ae2987f79db9bd137970512959;hp=41c48877eea6c2277210d8344fee0bc2171bab53;hpb=adf0d51d2bde8b723276bacf94641df9aa5ae561;p=sbcl.git diff --git a/src/compiler/x86/subprim.lisp b/src/compiler/x86/subprim.lisp index 41c4887..a922c85 100644 --- a/src/compiler/x86/subprim.lisp +++ b/src/compiler/x86/subprim.lisp @@ -11,9 +11,6 @@ ;;;; files for more information. (in-package "SB!VM") - -(file-comment - "$Header$") ;;;; LENGTH @@ -39,7 +36,7 @@ ;; list, because this is a :fast-safe vop. LOOP ;; Get the CDR and boost the count. - (loadw ptr ptr cons-cdr-slot list-pointer-type) + (loadw ptr ptr cons-cdr-slot list-pointer-lowtag) (inst add count (fixnumize 1)) ;; If we hit NIL, then we are done. (inst cmp ptr nil-value) @@ -48,10 +45,10 @@ ;; not, loop back for more. (move eax ptr) (inst and al-tn lowtag-mask) - (inst cmp al-tn list-pointer-type) + (inst cmp al-tn list-pointer-lowtag) (inst jmp :e loop) ;; It's dotted all right. Flame out. - (error-call vop object-not-list-error ptr) + (error-call vop 'object-not-list-error ptr) ;; We be done. DONE)) @@ -75,11 +72,11 @@ (inst jmp :e done) ;; Indirect the next cons cell, and boost the count. LOOP - (loadw ptr ptr cons-cdr-slot list-pointer-type) + (loadw ptr ptr cons-cdr-slot list-pointer-lowtag) (inst add count (fixnumize 1)) ;; If we aren't done, go back for more. (inst cmp ptr nil-value) (inst jmp :ne loop) DONE)) -(define-static-function length (object) :translate length) +(define-static-fun length (object) :translate length)