[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sbcl-commits
Subject:    [Sbcl-commits] master: Amend previous commit.
From:       "Douglas Katzman" <snuglas () users ! sourceforge ! net>
Date:       2017-03-27 22:40:43
Message-ID: 1490654443.996440.19618 () sfp-scm-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

The branch "master" has been updated in SBCL:
       via  41415f05a1582403dce499a5239df97b72801fe8 (commit)
      from  0c1b3ec67aa36f9d9756ddea8d7a3688cfbd715b (commit)

- Log -----------------------------------------------------------------
commit 41415f05a1582403dce499a5239df97b72801fe8
Author: Douglas Katzman <dougk@google.com>
Date:   Mon Mar 27 18:39:37 2017 -0400

    Amend previous commit.
    
    Fix arm64/backend-parms.  (Also some #ifdef'd out lines)
---
 src/compiler/arm64/backend-parms.lisp | 1 +
 src/runtime/gencgc.c                  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/compiler/arm64/backend-parms.lisp b/src/compiler/arm64/backend-parms.lisp
index 38bc564..126cf90 100644
--- a/src/compiler/arm64/backend-parms.lisp
+++ b/src/compiler/arm64/backend-parms.lisp
@@ -14,6 +14,7 @@
 ;;; writes to old generations are logged.  With mprotect-based write
 ;;; barriers, this must be a multiple of the OS page size.
 (defconstant gencgc-card-bytes *backend-page-bytes*)
+(defconstant gencgc-card-shift (1- (integer-length gencgc-card-bytes)))
 ;;; The minimum size of new allocation regions.  While it doesn't
 ;;; currently make a lot of sense to have a card size lower than
 ;;; the alloc granularity, it will, once we are smarter about finding
diff --git a/src/runtime/gencgc.c b/src/runtime/gencgc.c
index 8d4aa7b..ed70abb 100644
--- a/src/runtime/gencgc.c
+++ b/src/runtime/gencgc.c
@@ -2564,13 +2564,13 @@ scavenge_generations(generation_index_t from, generation_index_t to)
      * have been written to. */
     for (i = 0; i < page_table_pages; i++) {
         if (page_allocated_p(i)
-            && (page_table[i].bytes_used != 0)
+            && (page_bytes_used(i) != 0)
             && (page_table[i].gen == generation)
             && (page_table[i].write_protected_cleared != 0)) {
             FSHOW((stderr, "/scavenge_generation() %d\n", generation));
             FSHOW((stderr,
                    "/page bytes_used=%d scan_start_offset=%lu dont_move=%d\n",
-                    page_table[i].bytes_used,
+                    page_bytes_used(i),
                     scan_start_offset(page_table[i]),
                     page_table[i].dont_move));
             lose("write to protected page %d in scavenge_generation()\n", i);
@@ -2806,7 +2806,7 @@ scavenge_newspace_generation(generation_index_t generation)
          * have been written to. */
         for (i = 0; i < page_table_pages; i++) {
             if (page_allocated_p(i)
-                && (page_table[i].bytes_used != 0)
+                && (page_bytes_used(i) != 0)
                 && (page_table[i].gen == generation)
                 && (page_table[i].write_protected_cleared != 0)
                 && (page_table[i].dont_move == 0)) {
@@ -2932,7 +2932,7 @@ print_ptr(lispobj *addr)
                 pi1,
                 page_table[pi1].allocated,
                 page_table[pi1].gen,
-                page_table[pi1].bytes_used,
+                page_bytes_used(pi1),
                 scan_start_offset(page_table[pi1]),
                 page_table[pi1].dont_move);
     fprintf(stderr,"  %x %x %x %x (%x) %x %x %x %x\n",

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Sbcl-commits mailing list
Sbcl-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sbcl-commits
[prev in list] [next in list] [prev in thread] [next in thread]