Raymond Toy pushed to branch rtoy-amd64-p1 at cmucl / cmucl

Commits:

1 changed file:

Changes:

  • src/code/sap.lisp
    ... ... @@ -80,19 +80,19 @@
    80 80
    81 81 
     (defun int-sap (int)
    82 82 
       "Converts an integer into a System Area Pointer."
    83 
    -  (declare (type (unsigned-byte #-alpha #.vm:word-bits #+alpha 64) int))
    83 
    +  (declare (type (unsigned-byte #-(or alpha amd64) #.vm:word-bits #+(or alpha amd64) 64) int))
    84 84 
       (int-sap int))
    85 85
    86 86 
     (defun sap-ref-8 (sap offset)
    87 87 
       "Returns the 8-bit byte at OFFSET bytes from SAP."
    88 88 
       (declare (type system-area-pointer sap)
    89 
    -	   (type (signed-byte #-alpha #.vm:word-bits #+alpha 64) offset))
    89 
    +	   (type (signed-byte #-(or alpha amd64) #.vm:word-bits #+(or alpha amd64) 64) offset))
    90 90 
       (sap-ref-8 sap offset))
    91 91
    92 92 
     (defun sap-ref-16 (sap offset)
    93 93 
       "Returns the 16-bit word at OFFSET bytes from SAP."
    94 94 
       (declare (type system-area-pointer sap)
    95 
    -	   (type (signed-byte #-alpha #.(1- vm:word-bits) #+alpha 63) offset))
    95 
    +	   (type (signed-byte #-(or alpha amd64) #.(1- vm:word-bits) #+(or alpha amd64) 63) offset))
    96 96 
       (sap-ref-16 sap offset))
    97 97
    98 98 
     (defun sap-ref-32 (sap offset)
    ... ... @@ -110,7 +110,7 @@
    110 110 
     (defun sap-ref-sap (sap offset)
    111 111 
       "Returns the 32-bit system-area-pointer at OFFSET bytes from SAP."
    112 112 
       (declare (type system-area-pointer sap)
    113 
    -	   (type (signed-byte #-alpha #.vm:word-bits #+alpha 64) offset))
    113 
    +	   (type (signed-byte #-(or alpha amd64) #.vm:word-bits #+(or alpha amd64) 64) offset))
    114 114 
       (sap-ref-sap sap offset))
    115 115
    116 116 
     (defun sap-ref-single (sap offset)
    ... ... @@ -135,13 +135,13 @@
    135 135 
     (defun signed-sap-ref-8 (sap offset)
    136 136 
       "Returns the signed 8-bit byte at OFFSET bytes from SAP."
    137 137 
       (declare (type system-area-pointer sap)
    138 
    -	   (type (signed-byte #-alpha #.vm:word-bits #+alpha 64) offset))
    138 
    +	   (type (signed-byte #-(or alpha amd64) #.vm:word-bits #+(or alpha amd64) 64) offset))
    139 139 
       (signed-sap-ref-8 sap offset))
    140 140
    141 141 
     (defun signed-sap-ref-16 (sap offset)
    142 142 
       "Returns the signed 16-bit word at OFFSET bytes from SAP."
    143 143 
       (declare (type system-area-pointer sap)
    144 
    -	   (type (signed-byte #-alpha #.(1- vm:word-bits) #+alpha 63) offset))
    144 
    +	   (type (signed-byte #-(or alpha amd64) #.(1- vm:word-bits) #+(or alpha amd64) 63) offset))
    145 145 
       (signed-sap-ref-16 sap offset))
    146 146
    147 147 
     (defun signed-sap-ref-32 (sap offset)
    ... ... @@ -158,13 +158,13 @@
    158 158
    159 159 
     (defun %set-sap-ref-8 (sap offset new-value)
    160 160 
       (declare (type system-area-pointer sap)
    161 
    -	   (type (signed-byte #-alpha #.vm:word-bits #+alpha 64) offset)
    161 
    +	   (type (signed-byte #-(or alpha amd64) #.vm:word-bits #+(or alpha amd64) 64) offset)
    162 162 
     	   (type (unsigned-byte 8) new-value))
    163 163 
       (setf (sap-ref-8 sap offset) new-value))
    164 164
    165 165 
     (defun %set-sap-ref-16 (sap offset new-value)
    166 166 
       (declare (type system-area-pointer sap)
    167 
    -	   (type (signed-byte #-alpha #.(1- vm:word-bits) #+alpha 63) offset)
    167 
    +	   (type (signed-byte #-(or alpha amd64) #.(1- vm:word-bits) #+(or alpha amd64) 63) offset)
    168 168 
     	   (type (unsigned-byte 16) new-value))
    169 169 
       (setf (sap-ref-16 sap offset) new-value))
    170 170
    ... ... @@ -182,13 +182,13 @@
    182 182
    183 183 
     (defun %set-signed-sap-ref-8 (sap offset new-value)
    184 184 
       (declare (type system-area-pointer sap)
    185 
    -	   (type (signed-byte #-alpha #.vm:word-bits #+alpha 64) offset)
    185 
    +	   (type (signed-byte #-(or alpha amd64) #.vm:word-bits #+(or alpha amd64) 64) offset)
    186 186 
     	   (type (signed-byte 8) new-value))
    187 187 
       (setf (signed-sap-ref-8 sap offset) new-value))
    188 188
    189 189 
     (defun %set-signed-sap-ref-16 (sap offset new-value)
    190 190 
       (declare (type system-area-pointer sap)
    191 
    -	   (type (signed-byte #-alpha #.(1- vm:word-bits) #+alpha 63) offset)
    191 
    +	   (type (signed-byte #-(or alpha amd64) #.(1- vm:word-bits) #+(or alpha amd64) 63) offset)
    192 192 
     	   (type (signed-byte 16) new-value))
    193 193 
       (setf (signed-sap-ref-16 sap offset) new-value))
    194 194
    ... ... @@ -206,7 +206,7 @@
    206 206
    207 207 
     (defun %set-sap-ref-sap (sap offset new-value)
    208 208 
       (declare (type system-area-pointer sap new-value)
    209 
    -	   (type (signed-byte #-alpha #.vm:word-bits #+alpha 64) offset))
    209 
    +	   (type (signed-byte #-(or alpha amd64) #.vm:word-bits #+(or alpha amd64) 64) offset))
    210 210 
       (setf (sap-ref-sap sap offset) new-value))
    211 211
    212 212 
     (defun %set-sap-ref-single (sap offset new-value)

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.common-lisp.net. If you'd like to receive fewer emails, you can adjust your notification settings.