Changeset 7114


Ignore:
Timestamp:
Aug 30, 2007, 1:50:01 AM (14 years ago)
Author:
rme
Message:

Correct numerous minor errors. At least it loads now.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/ia32/compiler/X86/X8632/x8632-vinsns.lisp

    r7112 r7114  
    4444  (movl (:@ x8632::misc-data-offset (:%l v) (:%l scaled-idx)) (:%l dest)))
    4545
    46 (define-x8632-vinsn (push-misc-ref-node :push :node :vsp)  (()
    47                                                             ((v :lisp)
    48                                                              (scaled-idx :imm)))
     46(define-x8632-vinsn (push-misc-ref-node :push :node :vsp) (()
     47                                                           ((v :lisp)
     48                                                            (scaled-idx :imm)))
    4949  (pushl (:@ x8632::misc-data-offset (:%l v) (:%l scaled-idx))))
    5050
     
    180180  (:talign x8632::fulltag-tra)
    181181  (call (:@ x8632::symbol.fcell (:% x8632::fname)))
    182   (movl (:self) (%l x8632::fn)))
     182  (movl (:self) (:%l x8632::fn)))
    183183
    184184(define-x8632-vinsn set-nargs (()
     
    233233   (pushl (:%l x8632::arg_y)))
    234234  ((:pred >= min 1)
    235    (pushl (%l x8632::arg_z)))
     235   (pushl (:%l x8632::arg_z)))
    236236  (movl (:$l x8632::nil-value) (:%l x8632::arg_y))
    237237  (jmp :last)
     
    266266                                              ((nbytes-pushed :s32const)))
    267267  (movl (:%l x8632::ebp) (:@ (:apply + nbytes-pushed x8632::node-size) (:%l x8632::esp)))
    268   (leal (:@ (:apply + nbytes-pushed x8632::node-size) (:%q x8632::esp)) (:%q x8632::ebp))
    269   (popl  (:@ x8632::node-size (:%q x8632::ebp))))
     268  (leal (:@ (:apply + nbytes-pushed x8632::node-size) (:%l x8632::esp)) (:%l x8632::ebp))
     269  (popl  (:@ x8632::node-size (:%l x8632::ebp))))
    270270
    271271(define-x8632-vinsn save-lisp-context-variable-arg-count (()
     
    291291  (movzwl (:%w x8632::nargs) (:%l temp))
    292292  (subl (:$b (* $numx8632argregs x8632::node-size)) (:%l temp))
    293   (movl (:%l x8632::ebp) (:@ x8632::node-size (:%l x8632::rsp) (:%l temp)))
     293  (movl (:%l x8632::ebp) (:@ x8632::node-size (:%l x8632::esp) (:%l temp)))
    294294  (leal (:@ x8632::node-size (:%l x8632::esp) (:%l temp)) (:%l x8632::ebp))
    295295  (popl  (:@ x8632::node-size (:%l x8632::ebp))))
     
    331331     ((frame-offset :u16const)
    332332      (cur-vsp :u16const)))
    333   (pushl (:@ (:apply - (:apply + frame-offset x8632::word-size-in-bytes)) (:%l x8632::rbp))))
     333  (pushl (:@ (:apply - (:apply + frame-offset x8632::word-size-in-bytes)) (:%l x8632::ebp))))
    334334
    335335(define-x8632-vinsn vframe-store (()
     
    414414  (movw (:%w object) (:%w tag))
    415415  (andw (:$w x8632::fulltagmask) (:%w tag))
    416   (cmpb (:$b x8632::fulltag-cons) (:%w tag))
     416  (cmpw (:$w x8632::fulltag-cons) (:%w tag))
    417417  (je.pt :ok)
    418418  (uuo-error-reg-not-list (:%l object))
     
    423423                                      ((tag :u16)))
    424424  ;; check for NIL
    425   (cmpl (:$l x8632::nil-value) (%l object))
     425  (cmpl (:$l x8632::nil-value) (:%l object))
    426426  (je.pn :bad)
    427427  (movw (:%w object) (:%w tag))
     
    430430  (je.pt :ok)
    431431  :bad
    432   (uuo-error-reg-not-tag (:%q object) (:$ub x8632::fulltag-cons))
     432  (uuo-error-reg-not-tag (:%l object) (:$ub x8632::fulltag-cons))
    433433  :ok)
    434434
     
    525525  (movl (:@ x8632::misc-header-offset (:%l v)) (:%l temp))
    526526  (andw (:$w #xff00) (:%w temp))
    527   (shrq (:$ub (- x8632::num-subtag-bits x8632::fixnumshift)) (:%l temp))
    528   (rcmpq (:%l idx) (:%l temp))
     527  (shrl (:$ub (- x8632::num-subtag-bits x8632::fixnumshift)) (:%l temp))
     528  (rcmpl (:%l idx) (:%l temp))
    529529  (jb.pt :ok)
    530530  (uuo-error-vector-bounds (:%l idx) (:%l v))
     
    554554                              ())
    555555  (shll (:$ub x8632::charcode-shift) (:%l src))
    556   (leaq (:@ x8632::subtag-character (:%l src)) (:%l dest)))
     556  (leal (:@ x8632::subtag-character (:%l src)) (:%l dest)))
    557557
    558558(define-x8632-vinsn (load-nil :constant-ref) (((dest t))
     
    570570                                 ((object :lisp)))
    571571  (movl (:%l object) (:%l tag))
    572   ((:pred <= (:apply %hard-regspec-value a) x8632::ebx)
     572  ((:pred <= (:apply %hard-regspec-value tag) x8632::ebx)
    573573   (andb (:$b x8632::tagmask) (:%b tag)))
    574   ((:pred > (:apply %hard-regspec-value a) x8632::ebx)
     574  ((:pred > (:apply %hard-regspec-value tag) x8632::ebx)
    575575   (andl (:$l x8632::tagmask) (:%l tag))))
    576576
     
    587587(define-x8632-vinsn extract-fulltag-fixnum (((tag :imm))
    588588                                            ((object :lisp)))
    589   (leal (:@ (:%q object) 4) (:%l tag))
     589  (leal (:@ (:%l object) 4) (:%l tag))
    590590  (andw (:$w (ash x8632::fulltagmask x8632::fixnumshift)) (:%w tag)))
    591591
     
    598598  ((:pred <= (:apply  %hard-regspec-value tag) x8632::ebx)
    599599   (movb (:@ x8632::misc-subtag-offset (:%l object)) (:%b tag)))
    600   ((:pred > (:apply %hard-regspec-value a) x8632::ebx)
     600  ((:pred > (:apply %hard-regspec-value tag) x8632::ebx)
    601601   (movw (:@ x8632::misc-subtag-offset (:%l object)) (:%w tag)))
    602602  :have-tag)
     
    626626                                     ((temp :u32)))
    627627  (movl (:$l x8632::t-value) (:%l temp))
    628   (leaq (:@ (- x8632::t-offset) (:%l temp)) (:%l dest))
     628  (leal (:@ (- x8632::t-offset) (:%l temp)) (:%l dest))
    629629  (cmovccl (:$ub crbit) (:%l temp) (:%l dest)))
    630630
     
    673673  (uuo-error-reg-not-type (:%l src) (:$ub arch::error-object-not-unsigned-byte-8))
    674674  :ok
    675   (movq (:%l src) (:%l dest))
    676   (shrq (:$ub x8632::fixnumshift) (:%l dest)))
     675  (movl (:%l src) (:%l dest))
     676  (shrl (:$ub x8632::fixnumshift) (:%l dest)))
    677677
    678678(define-x8632-vinsn %unbox-u8 (((dest :u8))
     
    743743  (cmpw (:$w x8632::tag-misc) (:%w dest))
    744744  (jne :have-tag)
    745   (movw (:@ x8632::misc-subtag-offset (:%w src)) (:%w dest))
    746   (andw (:$w #xff) (%w dest))
     745  (movw (:@ x8632::misc-subtag-offset (:%l src)) (:%w dest))
     746  (andw (:$w #xff) (:%w dest))
    747747  :have-tag
    748   (cmpw (:$b x8632::subtag-bignum) (:%w dest))
     748  (cmpw (:$w x8632::subtag-bignum) (:%w dest))
    749749  (jne :bad)
    750750  (movl (:@ x8632::misc-header-offset (:%l src)) (:%l dest))
     
    753753  (cmpl (:$l x8632::two-digit-bignum-header) (:%l dest))
    754754  (jne :bad)
    755   (movq (:@ x8632::misc-data-offset (:%l src)) (:%l dest))
     755  (movl (:@ x8632::misc-data-offset (:%l src)) (:%l dest))
    756756  (testl (:%l dest) (:%l dest))
    757757  (jns :done)
     
    791791  ;; (movsbl (:%b temp) (:%l dest))
    792792  (movl (:%l src) (:%l dest))
    793   (sall (:$ub 24) (:%l dest))
     793  (shll (:$ub 24) (:%l dest))
    794794  (sarl (:$ub 24) (:%l dest)))
    795795
    796796(define-x8632-vinsn sign-extend-s16 (((dest :s32))
    797797                                     ((src :s16)))
    798   (movswq (:%w src) (:%l dest)))
     798  (movswl (:%w src) (:%l dest)))
    799799
    800800;;; xxx -- sigh...
     
    819819  (:talign x8632::fulltag-tra)
    820820  (call (:@ spno))
    821   (movl (:self) (% x8632::fn)))
     821  (movl (:self) (:% x8632::fn)))
    822822
    823823(define-x8632-vinsn fixnum-subtract-from (((dest t)
Note: See TracChangeset for help on using the changeset viewer.