X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fvalues.lisp;h=55cbe21959e718b95289a17521566c6aff0f15c1;hb=86fca9c405f91d02784bcdd24b25a81dce549332;hp=6c68c32fa31198d949bc264fa73d72761c56f679;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git diff --git a/src/compiler/x86/values.lisp b/src/compiler/x86/values.lisp index 6c68c32..55cbe21 100644 --- a/src/compiler/x86/values.lisp +++ b/src/compiler/x86/values.lisp @@ -57,13 +57,13 @@ LOOP (inst cmp list nil-temp) (inst jmp :e done) - (pushw list cons-car-slot list-pointer-type) - (loadw list list cons-cdr-slot list-pointer-type) + (pushw list cons-car-slot list-pointer-lowtag) + (loadw list list cons-cdr-slot list-pointer-lowtag) (inst mov eax list) (inst and al-tn lowtag-mask) - (inst cmp al-tn list-pointer-type) + (inst cmp al-tn list-pointer-lowtag) (inst jmp :e loop) - (error-call vop bogus-argument-to-values-list-error list) + (error-call vop bogus-arg-to-values-list-error list) DONE (inst mov count start) ; start is high address @@ -95,9 +95,10 @@ (move count num)) (t (inst lea src (make-ea :dword :base context - :disp (- (* (tn-value skip) word-bytes)))) + :disp (- (* (tn-value skip) + n-word-bytes)))) (move count num) - (inst sub count (* (tn-value skip) word-bytes))))) + (inst sub count (* (tn-value skip) n-word-bytes))))) (any-reg (move src context)