From: William Harold Newman <william.newman@airmail.net>
Date: Mon, 26 Feb 2001 19:33:09 +0000 (+0000)
Subject: 0.6.11.1:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=21223eedf790450dc484907c2bedf2b9bdaa80bf;p=sbcl.git

0.6.11.1:
	Address the out-of-order use of SAP-INT-TYPE pointed out by
		 Arthur Lemmens on sbcl-devel 2001-02-21..
	..Split target-allocate.lisp out of target-sap.lisp.
	..target-sap.lisp moves late in stems-and-flags.lisp-expr, while
		target-allocate.lisp stays in the same place.
---

diff --git a/src/code/target-allocate.lisp b/src/code/target-allocate.lisp
new file mode 100644
index 0000000..37d6540
--- /dev/null
+++ b/src/code/target-allocate.lisp
@@ -0,0 +1,32 @@
+;;;; system memory allocation
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
+
+(in-package "SB!KERNEL")
+
+(sb!alien:def-alien-routine ("os_allocate" allocate-system-memory)
+			    system-area-pointer
+  (bytes sb!c-call:unsigned-long))
+
+(sb!alien:def-alien-routine ("os_allocate_at" allocate-system-memory-at)
+			    system-area-pointer
+  (address system-area-pointer)
+  (bytes sb!c-call:unsigned-long))
+
+(sb!alien:def-alien-routine ("os_reallocate" reallocate-system-memory)
+			    system-area-pointer
+  (old system-area-pointer)
+  (old-size sb!c-call:unsigned-long)
+  (new-size sb!c-call:unsigned-long))
+
+(sb!alien:def-alien-routine ("os_deallocate" deallocate-system-memory)
+			    sb!c-call:void
+  (addr system-area-pointer)
+  (bytes sb!c-call:unsigned-long))
diff --git a/src/code/target-sap.lisp b/src/code/target-sap.lisp
index b63c33d..5a429b6 100644
--- a/src/code/target-sap.lisp
+++ b/src/code/target-sap.lisp
@@ -10,8 +10,6 @@
 ;;;; files for more information.
 
 (in-package "SB!KERNEL")
-
-;;;; primitive SAP operations
 
 ;;; Return T iff the SAP X points to a smaller address then the SAP Y.
 (defun sap< (x y)
@@ -209,25 +207,3 @@
 	   (fixnum offset)
 	   (type long-float new-value))
   (setf (sap-ref-long sap offset) new-value))
-
-;;;; system memory allocation
-
-(sb!alien:def-alien-routine ("os_allocate" allocate-system-memory)
-			    system-area-pointer
-  (bytes sb!c-call:unsigned-long))
-
-(sb!alien:def-alien-routine ("os_allocate_at" allocate-system-memory-at)
-			    system-area-pointer
-  (address system-area-pointer)
-  (bytes sb!c-call:unsigned-long))
-
-(sb!alien:def-alien-routine ("os_reallocate" reallocate-system-memory)
-			    system-area-pointer
-  (old system-area-pointer)
-  (old-size sb!c-call:unsigned-long)
-  (new-size sb!c-call:unsigned-long))
-
-(sb!alien:def-alien-routine ("os_deallocate" deallocate-system-memory)
-			    sb!c-call:void
-  (addr system-area-pointer)
-  (bytes sb!c-call:unsigned-long))
diff --git a/stems-and-flags.lisp-expr b/stems-and-flags.lisp-expr
index 7e947a4..2952bcb 100644
--- a/stems-and-flags.lisp-expr
+++ b/stems-and-flags.lisp-expr
@@ -170,7 +170,7 @@
 
  ("code/target-alieneval" :not-host)
  ("code/target-c-call"    :not-host)
- ("code/target-sap"       :not-host)
+ ("code/target-allocate"  :not-host)
 
  ("code/array"         :not-host)
  ("code/target-sxhash" :not-host)
@@ -553,6 +553,7 @@
  ("compiler/generic/target-core" :not-host) ; uses stuff from
                                             ;   "compiler/generic/core"
 
+ ("code/target-sap"        :not-host) ; uses SAP-INT-TYPE
  ("code/target-package"    :not-host) ; needs "code/package"
  ("code/target-random"     :not-host) ; needs "code/random"
  ("code/target-hash-table" :not-host) ; needs "code/hash-table"