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

List:       sbcl-commits
Subject:    [Sbcl-commits] master: Fix sb-safepoint
From:       stassats via Sbcl-commits <sbcl-commits () lists ! sourceforge ! net>
Date:       2020-06-20 15:45:49
Message-ID: 1592667949.786310.20605 () sfp-scm-5 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]

The branch "master" has been updated in SBCL:
       via  869fa34ad575fa8dd6939997850daea1b212a0de (commit)
      from  810b47b9d44245e7fc1f9a8f183bc5630c6f4d18 (commit)

- Log -----------------------------------------------------------------
commit 869fa34ad575fa8dd6939997850daea1b212a0de
Author: Stas Boukarev <stassats@gmail.com>
Date:   Sat Jun 20 18:43:01 2020 +0300

    Fix sb-safepoint
---
 src/compiler/x86-64/macros.lisp | 3 +--
 src/compiler/x86/macros.lisp    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/compiler/x86-64/macros.lisp b/src/compiler/x86-64/macros.lisp
index c6ed9502b..8ae5aba76 100644
--- a/src/compiler/x86-64/macros.lisp
+++ b/src/compiler/x86-64/macros.lisp
@@ -203,8 +203,7 @@
 
 #+sb-safepoint
 (defun emit-safepoint ()
-  (inst test :byte rax-tn (ea (- nil-value n-word-bytes other-pointer-lowtag
-                                 gc-safepoint-trap-offset))))
+  (inst test :byte rax-tn (ea (- static-space-start gc-safepoint-trap-offset))))
 
 (defmacro pseudo-atomic ((&key elide-if) &rest forms)
   #+sb-safepoint-strictly
diff --git a/src/compiler/x86/macros.lisp b/src/compiler/x86/macros.lisp
index 1e952dda2..2b7cc86d0 100644
--- a/src/compiler/x86/macros.lisp
+++ b/src/compiler/x86/macros.lisp
@@ -201,8 +201,7 @@
 #+sb-safepoint
 (defun emit-safepoint ()
   (inst test eax-tn (make-ea :dword :disp
-                             (- nil-value n-word-bytes other-pointer-lowtag
-                                gc-safepoint-trap-offset))))
+                             (- static-space-start gc-safepoint-trap-offset))))
 
 (defmacro pseudo-atomic ((&key elide-if) &rest forms)
   #+sb-safepoint-strictly

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


hooks/post-receive
-- 
SBCL


_______________________________________________
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] 

Configure | About | News | Add a list | Sponsored by KoreLogic