From: Robert Brown <robert.brown@gmail.com>
Date: Sun, 30 Oct 2011 11:44:33 +0000 (+0200)
Subject: fix GENCGC DYNAMIC-USAGE on 64-bit platforms
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=408ed62925d643c163f0e9fc7b3fd41cce65fbea;p=sbcl.git

fix GENCGC DYNAMIC-USAGE on 64-bit platforms

  Fixes lp#881445.
---

diff --git a/src/code/gc.lisp b/src/code/gc.lisp
index 517cb0d..96ef1d9 100644
--- a/src/code/gc.lisp
+++ b/src/code/gc.lisp
@@ -13,22 +13,19 @@
 
 ;;;; DYNAMIC-USAGE and friends
 
-(eval-when (:compile-toplevel :execute)
-  (sb!xc:defmacro def-c-var-fun (lisp-fun c-var-name)
-    `(defun ,lisp-fun ()
-       (sb!alien:extern-alien ,c-var-name (sb!alien:unsigned 32)))))
-
 #!-sb-fluid
 (declaim (inline current-dynamic-space-start))
 #!+gencgc
 (defun current-dynamic-space-start () sb!vm:dynamic-space-start)
 #!-gencgc
-(def-c-var-fun current-dynamic-space-start "current_dynamic_space")
+(defun current-dynamic-space-start ()
+  (sb!alien:extern-alien "current_dynamic_space" sb!alien:unsigned-long))
 
 #!-sb-fluid
 (declaim (inline dynamic-usage))
 #!+gencgc
-(def-c-var-fun dynamic-usage "bytes_allocated")
+(defun dynamic-usage ()
+  (sb!alien:extern-alien "bytes_allocated" sb!alien:unsigned-long))
 #!-gencgc
 (defun dynamic-usage ()
   (the (unsigned-byte 32)
diff --git a/tests/interface.impure.lisp b/tests/interface.impure.lisp
index ac4776a..33f7886 100644
--- a/tests/interface.impure.lisp
+++ b/tests/interface.impure.lisp
@@ -264,5 +264,13 @@
   (assert (equal "foo" (documentation 'bug-643958-test 'function)))
   (setf (documentation 'bug-643958-test 'function) "bar")
   (assert (equal "bar" (documentation 'bug-643958-test 'function))))
+
+(with-test (:name :bug-881445
+            :skipped-on '(not :x86-64))
+  (let ((x (make-array (1- (expt 2 32)) :element-type '(unsigned-byte 8))))
+    (assert (> (sb-kernel:dynamic-usage) (length x)))
+    ;; prevent compiler from getting too smart...
+    (eval x)
+    t))
 
 ;;;; success