Changeset 8374

Timestamp:

Jan 29, 2008, 7:02:31 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

Update LAP code to use a 32-bit %nargs.

Location:

branches/ia32/level-0/X86/X8632

Files:

• x8632-def.lisp (modified) (8 diffs)
• x8632-utils.lisp (modified) (2 diffs)

branches/ia32/level-0/X86/X8632/x8632-def.lisp

@@ -91 +91 @@
   (:arglist (fixnum &optional offset))
   (check-nargs 1 2)
-  (cmpw ($ x8632::fixnumone) (% nargs))
+  (cmpl ($ x8632::fixnumone) (% nargs))
   (jne @2-args)
   (movl (% offset) (% fixnum))
@@ -103 +103 @@
   (:arglist (fixnum &optional offset))
   (check-nargs 1 2)
-  (cmpw ($ x8632::fixnumone) (% nargs))
+  (cmpl ($ x8632::fixnumone) (% nargs))
   (jne @2-args)
   (movl (% offset) (% fixnum))
@@ -116 +116 @@
   (check-nargs 2 3)
   (movl (@ fixnum (% esp)) (% temp0))
-  (cmpw ($ '2) (% nargs))
+  (cmpl ($ '2) (% nargs))
   (jne @3-args)
   (movl (% offset) (% temp0))
@@ -132 +132 @@
   (movl (@ fixnum (% esp)) (% temp0))
   (save-simple-frame)
-  (cmpw ($ '2) (% nargs))
+  (cmpl ($ '2) (% nargs))
   (jne @3-args)
   (movl (% offset) (% temp0))
@@ -391 +391 @@
   (movl (@ x8632::lisp-frame.return-address (% ebp)) (% temp0))
   (movl (@ 0 (% ebp)) (% ebp))
-  (rcmpw (% nargs) ($ '2))
+  (rcmpl (% nargs) ($ '2))
   (jbe @pop-regs)
   ;; More than 2 args; some must have been pushed by caller,
@@ -399 +399 @@
   (jmp @popped)
   @pop-regs
-  (rcmpw (% nargs) ($ '1))
+  (rcmpl (% nargs) ($ '1))
   (jb @discard)
   (ja @pop2)
@@ -431 +431 @@
    (movl (% arg_z) (% temp0))           ; last
    (movl (% arg_y) (% arg_z))           ; butlast
-   (subw ($ '2) (% nargs))              ; remove count for butlast & last
+   (subl ($ '2) (% nargs))              ; remove count for butlast & last
    (movd (% imm0) (% mm0))              ;save nargs (aka imm0) for later
    ;; Do .SPspreadargz inline here
@@ -457 +457 @@
    (movl (% temp0) (% arg_z))
    (pop (% arg_y))
-   (addw ($ '1) (% nargs))
+   (addl ($ '1) (% nargs))
    (load-constant funcall temp0)
    (pushl (@ (% :rcontext) x8632::tcr.save0))   ;return address

branches/ia32/level-0/X86/X8632/x8632-utils.lisp

@@ -127 +127 @@
 ;;; N.B. nargs is the same register as imm0
 (defx8632lapfunction true ()
-  (movzwl (% nargs) (% imm0))
   (subl ($ '2) (% imm0))
   (leal (@ '2 (% esp) (% imm0)) (% imm0))
@@ -135 +134 @@
 
 (defx8632lapfunction false ()
-  (movzwl (% nargs) (% imm0))
   (subl ($ '2) (% imm0))
   (leal (@ '2 (% esp) (% imm0)) (% imm0))