X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-sap.lisp;h=d49334a11bc43791f75ba43a2971b68e06ec79d9;hb=5e4205cf17c3a04d4a8f6aed55c28b5a338caf47;hp=5a429b667254b4a06cee16d9a7732529ae1be79e;hpb=21223eedf790450dc484907c2bedf2b9bdaa80bf;p=sbcl.git

diff --git a/src/code/target-sap.lisp b/src/code/target-sap.lisp
index 5a429b6..d49334a 100644
--- a/src/code/target-sap.lisp
+++ b/src/code/target-sap.lisp
@@ -56,7 +56,7 @@
 
 ;;; Convert an integer into a SAP.
 (defun int-sap (int)
-  (declare (type sap-int-type int))
+  (declare (type sap-int int))
   (int-sap int))
 
 ;;; Return the 8-bit byte at OFFSET bytes from SAP.
@@ -78,12 +78,17 @@
   (sap-ref-32 sap offset))
 
 ;;; Return the 64-bit quadword at OFFSET bytes from SAP.
-#!+alpha
 (defun sap-ref-64 (sap offset)
   (declare (type system-area-pointer sap)
 	   (fixnum offset))
   (sap-ref-64 sap offset))
 
+;;; Return the unsigned word of natural size OFFSET bytes from SAP.
+(defun sap-ref-word (sap offset)
+  (declare (type system-area-pointer sap)
+	   (fixnum offset))
+  (sap-ref-word sap offset))
+
 ;;; Return the 32-bit SAP at OFFSET bytes from SAP.
 (defun sap-ref-sap (sap offset)
   (declare (type system-area-pointer sap)
@@ -128,12 +133,17 @@
   (signed-sap-ref-32 sap offset))
 
 ;;; Return the signed 64-bit quadword at OFFSET bytes from SAP.
-#!+alpha
 (defun signed-sap-ref-64 (sap offset)
   (declare (type system-area-pointer sap)
 	   (fixnum offset))
   (signed-sap-ref-64 sap offset))
 
+;;; Return the signed word of natural size OFFSET bytes from SAP.
+(defun signed-sap-ref-word (sap offset)
+  (declare (type system-area-pointer sap)
+	   (fixnum offset))
+  (signed-sap-ref-word sap offset))
+
 (defun %set-sap-ref-8 (sap offset new-value)
   (declare (type system-area-pointer sap)
 	   (fixnum offset)
@@ -152,13 +162,18 @@
 	   (type (unsigned-byte 32) new-value))
   (setf (sap-ref-32 sap offset) new-value))
 
-#!+alpha
 (defun %set-sap-ref-64 (sap offset new-value)
   (declare (type system-area-pointer sap)
 	   (fixnum offset)
 	   (type (unsigned-byte 64) new-value))
   (setf (sap-ref-64 sap offset) new-value))
 
+(defun %set-sap-ref-word (sap offset new-value)
+  (declare (type system-area-pointer sap)
+	   (fixnum offset)
+	   (type (unsigned-byte #.sb!vm:n-machine-word-bits) new-value))
+  (setf (sap-ref-word sap offset) new-value))
+
 (defun %set-signed-sap-ref-8 (sap offset new-value)
   (declare (type system-area-pointer sap)
 	   (fixnum offset)
@@ -177,13 +192,18 @@
 	   (type (signed-byte 32) new-value))
   (setf (signed-sap-ref-32 sap offset) new-value))
 
-#!+alpha
 (defun %set-signed-sap-ref-64 (sap offset new-value)
   (declare (type system-area-pointer sap)
 	   (fixnum offset)
 	   (type (signed-byte 64) new-value))
   (setf (signed-sap-ref-64 sap offset) new-value))
 
+(defun %set-signed-sap-ref-word (sap offset new-value)
+  (declare (type system-area-pointer sap)
+	   (fixnum offset)
+	   (type (signed-byte #.sb!vm:n-machine-word-bits) new-value))
+  (setf (signed-sap-ref-word sap offset) new-value))
+
 (defun %set-sap-ref-sap (sap offset new-value)
   (declare (type system-area-pointer sap new-value)
 	   (fixnum offset))