Changeset 6948

Timestamp:

Jul 21, 2007, 10:51:36 PM (14 years ago)

Author:

gb

Message:

Allocate callback trampolines via mmap on ppc, too.

Location:

trunk/ccl/level-1

Files:

• ppc-callback-support.lisp (modified) (3 diffs)
• x86-callback-support.lisp (modified) (1 diff)

trunk/ccl/level-1/ppc-callback-support.lisp

@@ -21 +21 @@
 (in-package "CCL")
 
-;;; Do nothing; it seems that we can safely be pretty casual about assuming
-;;; that malloc()ed memory is executable on PPC.
-(defun reset-callback-storage ())
 
 
@@ -40 +37 @@
                #.(subprim-name->offset '.SPpoweropen-callbackX)
                #.(subprim-name->offset '.SPpoweropen-callback)))
-           (p (malloc 12)))
+           (p (%allocate-callback-pointer 12)))
       (setf (%get-long p 0) (logior (ldb (byte 8 16) index)
                                     (ppc-lap-word (lis 11 ??)))   ; unboxed index
@@ -62 +59 @@
 (defun make-callback-trampoline (index &optional monitor-exception-ports)
   (declare (ignorable monitor-exception-ports))
-  (let* ((p (malloc 16)))
+  (let* ((p (%allocate-callback-pointer 16)))
     (setf (%%get-unsigned-longlong p 0) #.(subprim-name->offset '.SPpoweropen-callback)
           (%%get-unsigned-longlong p 8) index)

trunk/ccl/level-1/x86-callback-support.lisp

@@ -16 +16 @@
 
 (in-package "CCL")
-
-(defstatic *callback-alloc-lock* (make-lock))
-
-;;; 
-(defun %make-executable-page ()
-  (#_mmap (%null-ptr)
-          (#_getpagesize)
-          (logior #$PROT_READ #$PROT_WRITE #$PROT_EXEC)
-          (logior #$MAP_PRIVATE #$MAP_ANON)
-          -1
-          0))
-
-(defstatic *available-bytes-for-callbacks* 0)
-(defstatic *current-callback-page* nil)
-
-(defun reset-callback-storage ()
-  (setq *available-bytes-for-callbacks* (#_getpagesize)
-        *current-callback-page* (%make-executable-page)))
-
-(defun %allocate-callback-pointer (n)
-  (with-lock-grabbed (*callback-alloc-lock*)
-    (when (< *available-bytes-for-callbacks* n)
-      (reset-callback-storage))
-    (decf *available-bytes-for-callbacks* n)
-    (values (%inc-ptr *current-callback-page* *available-bytes-for-callbacks*))))