Changeset 7245

Timestamp:

09/17/07 16:58:47 (4 years ago)

Author:

rme

Message:

Straighten out how the immediate word count in IA-32 functions
is created and used by the compiler/assembler/disassembler.

Get rid of some calls to format used for debugging.

Location:

branches/ia32/compiler/X86

Files:

• x86-asm.lisp (modified) (1 diff)
• x86-disassemble.lisp (modified) (2 diffs)
• x86-lap.lisp (modified) (4 diffs)
• x862.lisp (modified) (2 diffs)

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

@@ -4287 +4287 @@
 
 (defun insert-self (instruction operand)
-  (format t "~&insert-self: instruction = ~a operand = ~a"
-          instruction operand)
   (setf (x86-immediate-operand-type operand)
         (encode-operand-type :self))

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

@@ -2754 +2754 @@
           (setq seq (funcall collect-function ds instruction seq)))))))
 
-;;; A function object in the IA-32 port has a two-byte "immediate word
-;;; count" between the header and the start of the machine
-;;; instructions.  This is interpreted as the number of (32 bit) words
-;;; there are to the GC-able constants.
-;;;
-;;; Before the constants, there is a table of self-reference offsets.
-;;; This table is separated from the code by four zero bytes.  We scan
-;;; backwards to find this delimiter, which marks the end of the
-;;; machine instructions.
-(defun nbytes-to-delimiter (imm-word-count code-vector)
-  (check-type code-vector (simple-array (unsigned-byte 8) (*)))
-  (do ((i (* 4 imm-word-count) (decf i 4)))
-      ((and (zerop (aref code-vector (+ i 0)))
-            (zerop (aref code-vector (+ i 1)))
-            (zerop (aref code-vector (+ i 2)))
-            (zerop (aref code-vector (+ i 3)))) i)))
-                                   
 (defun x8632-disassemble-xfunction (xfunction &key (symbolic-names
                                                          x8632::*x8632-symbolic-register-names*) (collect-function #'x86-print-disassembled-instruction))
@@ -2783 +2766 @@
               :symbolic-names symbolic-names
               :pending-labels (list 2)))
-         (blocks (x86-ds-blocks ds))
-         (imm-word-count (x86-ds-next-u16 ds)))
-    (setf (x86-ds-code-limit ds)
-          (nbytes-to-delimiter imm-word-count (uvref xfunction 0)))
+         (blocks (x86-ds-blocks ds)))
+    (setf (x86-ds-code-limit ds) (ash (x86-ds-next-u16 ds) 2))
     (do* ()
          ((null (x86-ds-pending-labels ds)))

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

@@ -423 +423 @@
                    designator (x86::reg-entry-reg-name r)))
           (case designator
-            (:%b (x86::x86-reg8 r))
+            (:%b (if (x86-byte-reg-p (x86::reg-entry-reg-name r))
+                   (x86::x86-reg8 r)
+                   (error "Designator ~a can't be used with register ~a"
+                          designator (x86::reg-entry-reg-name r))))
             (:%w (x86::x86-reg16 r))
             (:%l (x86::x86-reg32 r))
@@ -717 +720 @@
                    ;; special case
                    (when (eq val :self)
-                     (setq type (x86::encode-operand-type :self))
-                     (format t "~&self operand: type = ~s" type))
+                     (setq type (x86::encode-operand-type :self)))
                    (x86::make-x86-immediate-operand :type type
                                              :value expr))))
@@ -1494 +1496 @@
     ;; count of 32-bit words between header and function boundary
     ;; marker, inclusive.
-    (x86-lap-directive frag-list :short `(ash (+ (:^ ,end-code-tag)
+    (x86-lap-directive frag-list :short `(ash (+ (- (:^ ,end-code-tag) 4)
                                                  *x86-lap-entry-offset*) -2))
     (emit-x86-lap-label frag-list entry-code-tag)
@@ -1554 +1556 @@
      #+x86-target       ; just shorthand for defun
      (%defun (nfunction ,name (lambda (&lap 0) (x86-lap-function ,name ,arglist ,@body))) ,doc)))
+
+(defmacro defx8632lapfunction (&environment env name arglist &body body
+                             &aux doc)
+  (if (not (endp body))
+      (and (stringp (car body))
+           (cdr body)
+           (setq doc (car body))
+           (setq body (cdr body))))
+  `(progn
+     (eval-when (:compile-toplevel)
+       (note-function-info ',name t ,env))
+     (progn
+       (eval-when (:load-toplevel)
+         (%defun (nfunction ,name (lambda (&lap 0) (x86-lap-function ,name ,arglist ,@body))) ,doc))
+       (eval-when (:execute)
+         (%define-x8632-lap-function ',name '((let ,arglist ,@body)))))
+     ))

branches/ia32/compiler/X86/x862.lisp

@@ -575 +575 @@
                         (end-code-tag (gensym))
                         (srt-tag (gensym))
-                        (*x86-lap-self-reference-offsets* nil)
                         debug-info)
                    (make-x86-lap-label end-code-tag)
@@ -587 +586 @@
                     (:x8632
                      (make-x86-lap-label srt-tag)
-                     ;; count of 32-bit words between header and
-                     ;; function boundary marker, inclusive.
-                     (x86-lap-directive frag-list :short `(ash (+ (:^ ,end-code-tag)
+                     (x86-lap-directive frag-list :short `(ash (+ (- (:^ ,end-code-tag) 4)
                                                                   *x86-lap-entry-offset*) -2))))
                    (x862-expand-vinsns vinsns frag-list instruction)