Attachment 144568 Details for Bug 220053 – working (possibly) patch

[patch] working (possibly) patch

sbcl-1.0.1-ppc-64KiB-page.patch (text/plain), 3.22 KB, created by David Woodhouse on 2006-12-29 22:50:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2006-12-29 22:50:55 UTC

Size: 3.22 KB

patch

obsolete

>--- sbcl-1.0.1/src/runtime/linux-os.c~	2006-12-28 18:34:23.000000000 +0000
>+++ sbcl-1.0.1/src/runtime/linux-os.c	2006-12-28 18:34:25.000000000 +0000
>@@ -185,7 +185,12 @@ os_init(char *argv[], char *envp[])
>             "LD_ASSUME_KERNEL\n");
>     }
> #endif
>+#ifdef LISP_FEATURE_PPC
>+    /* Assume 64KiB pages on PowerPC, since that's what the ABI says */
>+    os_vm_page_size = 65536;
>+#else
>     os_vm_page_size = getpagesize();
>+#endif
> 
>     /* KLUDGE: Disable memory randomization on new Linux kernels
>      * by setting a personality flag and re-executing. (We need
>--- sbcl-1.0.1/src/compiler/ppc/backend-parms.lisp~	2006-12-28 19:26:26.000000000 +0000
>+++ sbcl-1.0.1/src/compiler/ppc/backend-parms.lisp	2006-12-28 19:22:35.000000000 +0000
>@@ -3,5 +3,5 @@
> (def!constant +backend-fasl-file-implementation+ :ppc)
> (setf *backend-register-save-penalty* 3)
> (setf *backend-byte-order* :big-endian)
>-(setf *backend-page-size* 4096)
>+(setf *backend-page-size* 65536)
> 
>--- sbcl-1.0.1/src/code/linux-os.lisp~	2006-12-28 19:28:32.000000000 +0000
>+++ sbcl-1.0.1/src/code/linux-os.lisp	2006-12-28 19:28:11.000000000 +0000
>@@ -48,4 +48,4 @@
>   ;; probably should call getpagesize()
>   ;; FIXME: Or we could just get rid of this, since the uses of it look
>   ;; disposable.
>-  4096)
>+  65536)
>--- sbcl-1.0.1/src/compiler/ppc/parms.lisp~	2006-12-28 19:31:08.000000000 +0000
>+++ sbcl-1.0.1/src/compiler/ppc/parms.lisp	2006-12-28 19:31:16.000000000 +0000
>@@ -27,7 +27,7 @@
> 
> ;;; The size in bytes of the GENCGC pages. Should be a multiple of the
> ;;; architecture code size.
>-(def!constant gencgc-page-size 4096)
>+(def!constant gencgc-page-size 65536)
> 
> ;;; flags for the generational garbage collector
> (def!constant pseudo-atomic-interrupted-flag 1)
>--- sbcl-1.0.1/src/runtime/gencgc-internal.h~	2006-12-28 19:54:14.000000000 +0000
>+++ sbcl-1.0.1/src/runtime/gencgc-internal.h	2006-12-28 19:54:52.000000000 +0000
>@@ -40,16 +40,8 @@ struct page {
>      * than the actual bytes used for pages within the current
>      * allocation regions. It should be 0 for all unallocated pages (not
>      * hard to achieve).
>-     *
>-     * Currently declared as an unsigned short to make the struct size
>-     * smaller. This means that GENCGC-PAGE-SIZE is constrained to fit
>-     * inside a short.
>      */
>-    unsigned short bytes_used;
>-
>-#if USHRT_MAX < PAGE_BYTES
>-#error "PAGE_BYTES too large"
>-#endif
>+    unsigned bytes_used;
> 
>     unsigned
>         /* This is set when the page is write-protected. This should
>Index: src/runtime/coreparse.c
>===================================================================
>RCS file: /cvsroot/sbcl/sbcl/src/runtime/coreparse.c,v
>retrieving revision 1.36
>diff -u -r1.36 coreparse.c
>--- sbcl-1.0.1/src/runtime/coreparse.c	15 Dec 2006 02:57:53 -0000	1.36
>+++ sbcl-1.0.1/src/runtime/coreparse.c	29 Dec 2006 13:38:35 -0000
>@@ -349,7 +349,11 @@
>                 size -= bytes_read;
>                 while (bytes_read) {
>                     bytes_read -= sizeof(long);
>-                    page_table[offset++].first_object_offset = data[i++];
>+                    if (data[i]) {
>+                        page_table[offset].first_object_offset = data[i];
>+                    }
>+                    i++;
>+                    offset++;
>                 }
>             }
>

Actions: View | Diff

Attachments on bug 220053: 144482 | 144512 | 144540 | 144568 | 144583