(eval-when (:compile-toplevel :load-toplevel :execute)
(defvar *byte-register-names* (make-array 32 :initial-element nil))
- (defvar *word-register-names* (make-array 16 :initial-element nil))
- (defvar *dword-register-names* (make-array 16 :initial-element nil))
+ (defvar *word-register-names* (make-array 32 :initial-element nil))
+ (defvar *dword-register-names* (make-array 32 :initial-element nil))
(defvar *qword-register-names* (make-array 32 :initial-element nil))
(defvar *float-register-names* (make-array 16 :initial-element nil)))
(defreg bp 10 :word)
(defreg si 12 :word)
(defreg di 14 :word)
- (defregset *word-regs* ax cx dx bx si di)
+ (defreg r8w 16 :word)
+ (defreg r9w 18 :word)
+ (defreg r10w 20 :word)
+ (defreg r11w 22 :word)
+ (defreg r12w 24 :word)
+ (defreg r13w 26 :word)
+ (defreg r14w 28 :word)
+ (defreg r15w 30 :word)
+ (defregset *word-regs* ax cx dx bx si di r8w r9w r10w
+ #+nil r11w #+nil r12w r13w r14w r15w)
;; double word registers
(defreg eax 0 :dword)
(defreg ebp 10 :dword)
(defreg esi 12 :dword)
(defreg edi 14 :dword)
- (defregset *dword-regs* eax ecx edx ebx esi edi)
+ (defreg r8d 16 :dword)
+ (defreg r9d 18 :dword)
+ (defreg r10d 20 :dword)
+ (defreg r11d 22 :dword)
+ (defreg r12d 24 :dword)
+ (defreg r13d 26 :dword)
+ (defreg r14d 28 :dword)
+ (defreg r15d 30 :dword)
+ (defregset *dword-regs* eax ecx edx ebx esi edi r8d r9d r10d
+ #+nil r11d #+nil r12w r13d r14d r15d)
;; quadword registers
(defreg rax 0 :qword)
;;; (What a KLUDGE! Anyone who wants to come in and clean up this mess
;;; has my gratitude.) (FIXME: Maybe this should be me..)
(eval-when (:compile-toplevel :load-toplevel :execute)
- (def!constant kludge-nondeterministic-catch-block-size 6))
+ (def!constant kludge-nondeterministic-catch-block-size 5))
(!define-storage-classes
(fp-single-zero immediate-constant)
(fp-double-zero immediate-constant)
+ (fp-complex-single-zero immediate-constant)
+ (fp-complex-double-zero immediate-constant)
+
+ (fp-single-immediate immediate-constant)
+ (fp-double-immediate immediate-constant)
+ (fp-complex-single-immediate immediate-constant)
+ (fp-complex-double-immediate immediate-constant)
(immediate immediate-constant)
(sap-stack stack) ; System area pointers.
(single-stack stack) ; single-floats
(double-stack stack)
- (complex-single-stack stack :element-size 2) ; complex-single-floats
+ (complex-single-stack stack) ; complex-single-floats
(complex-double-stack stack :element-size 2) ; complex-double-floats
;; non-descriptor SINGLE-FLOATs
(single-reg float-registers
- :locations #.(loop for i from 0 below 15 collect i)
- :constant-scs (fp-single-zero)
+ :locations #.*float-regs*
+ :constant-scs (fp-single-zero fp-single-immediate)
:save-p t
:alternate-scs (single-stack))
;; non-descriptor DOUBLE-FLOATs
(double-reg float-registers
- :locations #.(loop for i from 0 below 15 collect i)
- :constant-scs (fp-double-zero)
+ :locations #.*float-regs*
+ :constant-scs (fp-double-zero fp-double-immediate)
:save-p t
:alternate-scs (double-stack))
(complex-single-reg float-registers
- :locations #.(loop for i from 0 to 14 by 2 collect i)
- :element-size 2
- :constant-scs ()
+ :locations #.*float-regs*
+ :constant-scs (fp-complex-single-zero fp-complex-single-immediate)
:save-p t
:alternate-scs (complex-single-stack))
(complex-double-reg float-registers
- :locations #.(loop for i from 0 to 14 by 2 collect i)
- :element-size 2
- :constant-scs ()
+ :locations #.*float-regs*
+ :constant-scs (fp-complex-double-zero fp-complex-double-immediate)
:save-p t
:alternate-scs (complex-double-stack))
;;; These are used to (at least) determine operand size.
(defparameter *float-sc-names* '(single-reg))
(defparameter *double-sc-names* '(double-reg double-stack))
+(defparameter *complex-sc-names* '(complex-single-reg complex-single-stack
+ complex-double-reg complex-double-stack))
) ; EVAL-WHEN
\f
;;;; miscellaneous TNs for the various registers
(def-misc-reg-tns unsigned-reg rax rbx rcx rdx rbp rsp rdi rsi
r8 r9 r10 r11 r12 r13 r14 r15)
- (def-misc-reg-tns dword-reg eax ebx ecx edx ebp esp edi esi)
- (def-misc-reg-tns word-reg ax bx cx dx bp sp di si)
+ (def-misc-reg-tns dword-reg eax ebx ecx edx ebp esp edi esi
+ r8d r9d r10d r11d r12d r13d r14d r15d)
+ (def-misc-reg-tns word-reg ax bx cx dx bp sp di si
+ r8w r9w r10w r11w r12w r13w r14w r15w)
(def-misc-reg-tns byte-reg al cl dl bl sil dil r8b r9b r10b
r11b r12b r13b r14b r15b)
(def-misc-reg-tns single-reg
float0 float1 float2 float3 float4 float5 float6 float7
float8 float9 float10 float11 float12 float13 float14 float15))
+(defun reg-in-size (tn size)
+ (make-random-tn :kind :normal
+ :sc (sc-or-lose
+ (ecase size
+ (:byte 'byte-reg)
+ (:word 'word-reg)
+ (:dword 'dword-reg)
+ (:qword 'unsigned-reg)))
+ :offset (tn-offset tn)))
+
;; A register that's never used by the code generator, and can therefore
;; be used as an assembly temporary in cases where a VOP :TEMPORARY can't
;; be used.
(make-random-tn :kind :normal :sc (sc-or-lose 'unsigned-reg )
:offset r12-offset))
-(defparameter fp-single-zero-tn
- (make-random-tn :kind :normal
- :sc (sc-or-lose 'single-reg)
- :offset 15))
-
-(defparameter fp-double-zero-tn
- (make-random-tn :kind :normal
- :sc (sc-or-lose 'double-reg)
- :offset 15))
-
;;; If value can be represented as an immediate constant, then return
;;; the appropriate SC number, otherwise return NIL.
(!def-vm-support-routine immediate-constant-sc (value)
(typecase value
((or (integer #.sb!xc:most-negative-fixnum #.sb!xc:most-positive-fixnum)
- #-sb-xc-host system-area-pointer character)
+ character)
(sc-number-or-lose 'immediate))
(symbol
(when (static-symbol-p value)
(sc-number-or-lose 'immediate)))
(single-float
- (if (eql value 0f0)
- (sc-number-or-lose 'fp-single-zero )
- nil))
+ (sc-number-or-lose
+ (if (eql value 0f0) 'fp-single-zero 'fp-single-immediate)))
(double-float
- (if (eql value 0d0)
- (sc-number-or-lose 'fp-double-zero )
- nil))))
+ (sc-number-or-lose
+ (if (eql value 0d0) 'fp-double-zero 'fp-double-immediate)))
+ ((complex single-float)
+ (sc-number-or-lose
+ (if (eql value #c(0f0 0f0))
+ 'fp-complex-single-zero
+ 'fp-complex-single-immediate)))
+ ((complex double-float)
+ (sc-number-or-lose
+ (if (eql value #c(0d0 0d0))
+ 'fp-complex-double-zero
+ 'fp-complex-double-immediate)))))
\f
;;;; miscellaneous function call parameters
-;;; offsets of special stack frame locations
-(def!constant ocfp-save-offset 0)
-(def!constant return-pc-save-offset 1)
+;;; Offsets of special stack frame locations relative to RBP.
+;;;
+;;; Consider the standard prologue PUSH RBP; MOV RBP, RSP: the return
+;;; address is at RBP+8, the old control stack frame pointer is at
+;;; RBP, the magic 3rd slot is at RBP-8. Then come the locals from
+;;; RBP-16 on.
+(def!constant return-pc-save-offset 0)
+(def!constant ocfp-save-offset 1)
(def!constant code-save-offset 2)
+;;; Let SP be the stack pointer before CALLing, and FP is the frame
+;;; pointer after the standard prologue. SP +
+;;; FRAME-WORD-OFFSET(SP->FP-OFFSET + I) = FP + FRAME-WORD-OFFSET(I).
+(def!constant sp->fp-offset 2)
+
+(declaim (inline frame-word-offset))
+(defun frame-word-offset (index)
+ (- (1- index)))
+
+(declaim (inline frame-byte-offset))
+(defun frame-byte-offset (index)
+ (* (frame-word-offset index) n-word-bytes))
(def!constant lra-save-offset return-pc-save-offset) ; ?