Changeset 7114

Timestamp:

Aug 30, 2007, 1:50:01 AM (14 years ago)

Author:

rme

Message:

Correct numerous minor errors. At least it loads now.

File:

• branches/ia32/compiler/X86/X8632/x8632-vinsns.lisp (modified) (20 diffs)

branches/ia32/compiler/X86/X8632/x8632-vinsns.lisp

@@ -44 +44 @@
   (movl (:@ x8632::misc-data-offset (:%l v) (:%l scaled-idx)) (:%l dest)))
 
-(define-x8632-vinsn (push-misc-ref-node :push :node :vsp)  (()
-                                                            ((v :lisp)
-                                                             (scaled-idx :imm)))
+(define-x8632-vinsn (push-misc-ref-node :push :node :vsp) (()
+                                                           ((v :lisp)
+                                                            (scaled-idx :imm)))
   (pushl (:@ x8632::misc-data-offset (:%l v) (:%l scaled-idx))))
 
@@ -180 +180 @@
   (:talign x8632::fulltag-tra)
   (call (:@ x8632::symbol.fcell (:% x8632::fname)))
-  (movl (:self) (%l x8632::fn)))
+  (movl (:self) (:%l x8632::fn)))
 
 (define-x8632-vinsn set-nargs (()
@@ -233 +233 @@
    (pushl (:%l x8632::arg_y)))
   ((:pred >= min 1)
-   (pushl (%l x8632::arg_z)))
+   (pushl (:%l x8632::arg_z)))
   (movl (:$l x8632::nil-value) (:%l x8632::arg_y))
   (jmp :last)
@@ -266 +266 @@
                                               ((nbytes-pushed :s32const)))
   (movl (:%l x8632::ebp) (:@ (:apply + nbytes-pushed x8632::node-size) (:%l x8632::esp)))
-  (leal (:@ (:apply + nbytes-pushed x8632::node-size) (:%q x8632::esp)) (:%q x8632::ebp))
-  (popl  (:@ x8632::node-size (:%q x8632::ebp))))
+  (leal (:@ (:apply + nbytes-pushed x8632::node-size) (:%l x8632::esp)) (:%l x8632::ebp))
+  (popl  (:@ x8632::node-size (:%l x8632::ebp))))
 
 (define-x8632-vinsn save-lisp-context-variable-arg-count (()
@@ -291 +291 @@
   (movzwl (:%w x8632::nargs) (:%l temp))
   (subl (:$b (* $numx8632argregs x8632::node-size)) (:%l temp))
-  (movl (:%l x8632::ebp) (:@ x8632::node-size (:%l x8632::rsp) (:%l temp)))
+  (movl (:%l x8632::ebp) (:@ x8632::node-size (:%l x8632::esp) (:%l temp)))
   (leal (:@ x8632::node-size (:%l x8632::esp) (:%l temp)) (:%l x8632::ebp))
   (popl  (:@ x8632::node-size (:%l x8632::ebp))))
@@ -331 +331 @@
      ((frame-offset :u16const)
       (cur-vsp :u16const)))
-  (pushl (:@ (:apply - (:apply + frame-offset x8632::word-size-in-bytes)) (:%l x8632::rbp))))
+  (pushl (:@ (:apply - (:apply + frame-offset x8632::word-size-in-bytes)) (:%l x8632::ebp))))
 
 (define-x8632-vinsn vframe-store (()
@@ -414 +414 @@
   (movw (:%w object) (:%w tag))
   (andw (:$w x8632::fulltagmask) (:%w tag))
-  (cmpb (:$b x8632::fulltag-cons) (:%w tag))
+  (cmpw (:$w x8632::fulltag-cons) (:%w tag))
   (je.pt :ok)
   (uuo-error-reg-not-list (:%l object))
@@ -423 +423 @@
                                       ((tag :u16)))
   ;; check for NIL
-  (cmpl (:$l x8632::nil-value) (%l object))
+  (cmpl (:$l x8632::nil-value) (:%l object))
   (je.pn :bad)
   (movw (:%w object) (:%w tag))
@@ -430 +430 @@
   (je.pt :ok)
   :bad
-  (uuo-error-reg-not-tag (:%q object) (:$ub x8632::fulltag-cons))
+  (uuo-error-reg-not-tag (:%l object) (:$ub x8632::fulltag-cons))
   :ok)
 
@@ -525 +525 @@
   (movl (:@ x8632::misc-header-offset (:%l v)) (:%l temp))
   (andw (:$w #xff00) (:%w temp))
-  (shrq (:$ub (- x8632::num-subtag-bits x8632::fixnumshift)) (:%l temp))
-  (rcmpq (:%l idx) (:%l temp))
+  (shrl (:$ub (- x8632::num-subtag-bits x8632::fixnumshift)) (:%l temp))
+  (rcmpl (:%l idx) (:%l temp))
   (jb.pt :ok)
   (uuo-error-vector-bounds (:%l idx) (:%l v))
@@ -554 +554 @@
                               ())
   (shll (:$ub x8632::charcode-shift) (:%l src))
-  (leaq (:@ x8632::subtag-character (:%l src)) (:%l dest)))
+  (leal (:@ x8632::subtag-character (:%l src)) (:%l dest)))
 
 (define-x8632-vinsn (load-nil :constant-ref) (((dest t))
@@ -570 +570 @@
                                  ((object :lisp)))
   (movl (:%l object) (:%l tag))
-  ((:pred <= (:apply %hard-regspec-value a) x8632::ebx)
+  ((:pred <= (:apply %hard-regspec-value tag) x8632::ebx)
    (andb (:$b x8632::tagmask) (:%b tag)))
-  ((:pred > (:apply %hard-regspec-value a) x8632::ebx)
+  ((:pred > (:apply %hard-regspec-value tag) x8632::ebx)
    (andl (:$l x8632::tagmask) (:%l tag))))
 
@@ -587 +587 @@
 (define-x8632-vinsn extract-fulltag-fixnum (((tag :imm))
                                             ((object :lisp)))
-  (leal (:@ (:%q object) 4) (:%l tag))
+  (leal (:@ (:%l object) 4) (:%l tag))
   (andw (:$w (ash x8632::fulltagmask x8632::fixnumshift)) (:%w tag)))
 
@@ -598 +598 @@
   ((:pred <= (:apply  %hard-regspec-value tag) x8632::ebx)
    (movb (:@ x8632::misc-subtag-offset (:%l object)) (:%b tag)))
-  ((:pred > (:apply %hard-regspec-value a) x8632::ebx)
+  ((:pred > (:apply %hard-regspec-value tag) x8632::ebx)
    (movw (:@ x8632::misc-subtag-offset (:%l object)) (:%w tag)))
   :have-tag)
@@ -626 +626 @@
                                      ((temp :u32)))
   (movl (:$l x8632::t-value) (:%l temp))
-  (leaq (:@ (- x8632::t-offset) (:%l temp)) (:%l dest))
+  (leal (:@ (- x8632::t-offset) (:%l temp)) (:%l dest))
   (cmovccl (:$ub crbit) (:%l temp) (:%l dest)))
 
@@ -673 +673 @@
   (uuo-error-reg-not-type (:%l src) (:$ub arch::error-object-not-unsigned-byte-8))
   :ok
-  (movq (:%l src) (:%l dest))
-  (shrq (:$ub x8632::fixnumshift) (:%l dest)))
+  (movl (:%l src) (:%l dest))
+  (shrl (:$ub x8632::fixnumshift) (:%l dest)))
 
 (define-x8632-vinsn %unbox-u8 (((dest :u8))
@@ -743 +743 @@
   (cmpw (:$w x8632::tag-misc) (:%w dest))
   (jne :have-tag)
-  (movw (:@ x8632::misc-subtag-offset (:%w src)) (:%w dest))
-  (andw (:$w #xff) (%w dest))
+  (movw (:@ x8632::misc-subtag-offset (:%l src)) (:%w dest))
+  (andw (:$w #xff) (:%w dest))
   :have-tag
-  (cmpw (:$b x8632::subtag-bignum) (:%w dest))
+  (cmpw (:$w x8632::subtag-bignum) (:%w dest))
   (jne :bad)
   (movl (:@ x8632::misc-header-offset (:%l src)) (:%l dest))
@@ -753 +753 @@
   (cmpl (:$l x8632::two-digit-bignum-header) (:%l dest))
   (jne :bad)
-  (movq (:@ x8632::misc-data-offset (:%l src)) (:%l dest))
+  (movl (:@ x8632::misc-data-offset (:%l src)) (:%l dest))
   (testl (:%l dest) (:%l dest))
   (jns :done)
@@ -791 +791 @@
   ;; (movsbl (:%b temp) (:%l dest))
   (movl (:%l src) (:%l dest))
-  (sall (:$ub 24) (:%l dest))
+  (shll (:$ub 24) (:%l dest))
   (sarl (:$ub 24) (:%l dest)))
 
 (define-x8632-vinsn sign-extend-s16 (((dest :s32))
                                      ((src :s16)))
-  (movswq (:%w src) (:%l dest)))
+  (movswl (:%w src) (:%l dest)))
 
 ;;; xxx -- sigh...
@@ -819 +819 @@
   (:talign x8632::fulltag-tra)
   (call (:@ spno))
-  (movl (:self) (% x8632::fn)))
+  (movl (:self) (:% x8632::fn)))
 
 (define-x8632-vinsn fixnum-subtract-from (((dest t)