Changeset 7881

Timestamp:

Dec 10, 2007, 8:46:08 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

To avoid confusion, treat defx86lapfunction as an x86-64 thing,
and create a new defx8632lapfunction macro.

File:

• branches/ia32/compiler/X86/x86-lap.lisp (modified) (7 diffs)

branches/ia32/compiler/X86/x86-lap.lisp

@@ -1413 +1413 @@
           constants-vector)))))
 
-#+x86-target
+#+x8664-target
 (defun create-x86-function (name frag-list constants bits debug-info)
   (unless name (setq bits (logior bits (ash -1 $lfbits-noname-bit))))
@@ -1498 +1498 @@
          (instruction (x86::make-x86-instruction))
          (frag-list (make-frag-list)))
+    (make-x86-lap-label entry-code-tag)
+    (make-x86-lap-label srt-tag)
     (make-x86-lap-label end-code-tag)
-    (make-x86-lap-label entry-code-tag)
     ;; count of 32-bit words between header and function boundary
     ;; marker, inclusive.
@@ -1542 +1543 @@
             (incf srt-index 4)))))
     (show-frag-bytes frag-list)
-    (cross-create-x86-function name frag-list *x86-lap-constants* *x86-lap-lfun-bits* nil)))
+    (funcall #-x8632-target #'cross-create-x86-function
+             #+x8632-target (if (eq *target-backend* *host-backend*)
+                              #'create-x86-function
+                              #'cross-create-x86-function)
+             name frag-list *x86-lap-constants* *x86-lap-lfun-bits* nil)))
 
 (defmacro defx86lapfunction (&environment env name arglist &body body
@@ -1554 +1559 @@
      (eval-when (:compile-toplevel)
        (note-function-info ',name t ,env))
-     #-x86-target
+     #-x8664-target
      (progn
        (eval-when (:load-toplevel)
@@ -1560 +1565 @@
        (eval-when (:execute)
          (%define-x86-lap-function ',name '((let ,arglist ,@body)))))
-     #+x86-target       ; just shorthand for defun
+     #+x8664-target     ; just shorthand for defun
      (%defun (nfunction ,name (lambda (&lap 0) (x86-lap-function ,name ,arglist ,@body))) ,doc)))
 
@@ -1573 +1578 @@
      (eval-when (:compile-toplevel)
        (note-function-info ',name t ,env))
+     #-x8632-target
      (progn
        (eval-when (:load-toplevel)
@@ -1578 +1584 @@
        (eval-when (:execute)
          (%define-x8632-lap-function ',name '((let ,arglist ,@body)))))
-     ))
+     #+x8632-target
+     (%defun (nfunction ,name (lambda (&lap 0) (x86-lap-function ,name ,arglist ,@body))) ,doc)))