Changeset 9768 for branches

Timestamp:

Jun 16, 2008, 1:36:35 PM (16 years ago)

Author:

R. Matthew Emerson

Message:

Add .SPaset1 (replacing .SPunused_5), and use it in x862-%aset1.

.SPbuiltin_aset1 just jumps straight to %aset1 now.

Location:

branches/ia32

Files:

• compiler/X86/X8632/x8632-arch.lisp (modified) (1 diff)
• compiler/X86/x862.lisp (modified) (1 diff)
• lisp-kernel/x86-spentry32.s (modified) (3 diffs)
• lisp-kernel/x86-spjump32.s (modified) (1 diff)

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

@@ -980 +980 @@
          (defx8632subprim .SPaset3)
          (defx8632subprim .SPffcall-return-registers)
-         (defx8632subprim .SPunused-5)
+         (defx8632subprim .SPaset1)
          (defx8632subprim .SPunused-6)
          (defx8632subprim .SPunbind-interrupt-level)

branches/ia32/compiler/X86/x862.lisp

@@ -7371 +7371 @@
     (if keyword
       (x862-vset seg vreg xfer keyword v i n (not *x862-reckless*))
-      (x862-ternary-builtin seg vreg xfer '%aset1 v i n))))
+      (target-arch-case
+       (:x8632
+        (with-x86-local-vinsn-macros (seg vreg xfer)
+          (let* ((subprim (subprim-name->offset '.SPaset1))
+                 (tail-p (x862-tailcallok xfer)))
+            (x862-three-targeted-reg-forms seg
+                                           v ($ x8632::temp0)
+                                           i ($ x8632::arg_y)
+                                           n ($ x8632::arg_z))
+            (if tail-p
+              (progn
+                (x862-restore-full-lisp-context seg)
+                (! jump-subprim subprim))
+              (progn
+                (! call-subprim subprim)
+                (when vreg
+                  (<- ($ x8632::arg_z)))
+                (^))))))
+       (:x8664
+        (x862-ternary-builtin seg vreg xfer '%aset1 v i n))))))
 
 (defx862 x862-%i+ %i+ (seg vreg xfer form1 form2 &optional overflow)

branches/ia32/lisp-kernel/x86-spentry32.s

@@ -3899 +3899 @@
 _endsubp(builtin_logxor)
 
-_spentry(builtin_aset1)
+/* temp0 = vector, arg_y = index, arg_z = newval */
+_spentry(aset1)
         __(extract_typecode(%temp0,%imm0))
         __(box_fixnum(%imm0,%temp1))
         __(cmpb $min_vector_subtag,%imm0_b)
         __(ja _SPsubtag_misc_set)
+        /* push frame... */
         __(pop %temp1)
         __(push $reserved_frame_marker)
@@ -3909 +3911 @@
         __(push %temp0)
         __(push %temp1)
+        /* and fall through... */
+_endsubp(aset1)
+
+_spentry(builtin_aset1)
         __(jump_builtin(_builtin_aset1,3))
 _endsubp(builtin_aset1)
@@ -4430 +4436 @@
 _endsubp(breakpoint)
 
-_spentry(unused_5)
-        __(int $3)
-_endsubp(unused_5)
-
 _spentry(unused_6)
         __(int $3)

branches/ia32/lisp-kernel/x86-spjump32.s

@@ -172 +172 @@
         _spjump(aset3)
         _spjump(ffcall_return_registers)
-        _spjump(unused_5)
+        _spjump(aset1)
         _spjump(unused_6)
         _spjump(unbind_interrupt_level)