Changeset 6995 for branches

Timestamp:

Aug 3, 2007, 10:38:47 AM (17 years ago)

Author:

R. Matthew Emerson

Message:

Use *target-backend* in x86-subprim-offset.

File:

• branches/ia32/compiler/X86/x86-lapmacros.lisp (modified) (2 diffs)

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

@@ -392 +392 @@
     (leave)))
 
-;;; not sure about this
 (defx86lapmacro discard-reserved-frame ()
   (target-arch-case
@@ -412 +411 @@
         `(ret ($ ,(* x8664::node-size words-to-discard)))))))
 
-;;; xxx add ia32 version
-;;; Using *x8664-backend* here is wrong but expedient.
-;;; Using *x8632-backend* makes it doubly wrong, I guess.
 (defun x86-subprim-offset (name)
-  (let (info
-        offset)
-    (target-arch-case
-     (:x8632
-      (setf info (find name (arch::target-subprims-table (backend-target-arch *x8632-backend*)) :test #'string-equal :key #'subprimitive-info-name))
-      (setf offset (when info 
-                     (subprimitive-info-offset info))))
-     (:x8664
-      (setf info (find name (arch::target-subprims-table (backend-target-arch *x8664-backend*)) :test #'string-equal :key #'subprimitive-info-name))
-      (setf offset (when info
-                     (subprimitive-info-offset info))))
-      (or offset      
-          (error "Unknown subprim: ~s" name)))))
+  (let* ((info (find name (arch::target-subprims-table (backend-target-arch *target-backend*)) :test #'string-equal :key #'subprimitive-info-name))
+         (offset (when info 
+                   (subprimitive-info-offset info))))
+    (or offset      
+        (error "Unknown subprim: ~s" name))))
 
 (defx86lapmacro jmp-subprim (name)