From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Thu, 22 Dec 2022 08:30:45 +0000 (+0100)
Subject: FreeBSD: make amd64 aspace max mem 128Gbytes
X-Git-Tag: VALGRIND_3_21_0~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35bb01dd450bfe3ba658ec5b58bc9f47dfc4c2aa;p=thirdparty%2Fvalgrind.git

FreeBSD: make amd64 aspace max mem 128Gbytes
---

diff --git a/NEWS b/NEWS
index 40603494b5..2fb98e3aba 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ AMD64/macOS 10.13 and nanoMIPS/Linux.
 
 * ==================== CORE CHANGES ===================
 
+* Make the address space limit on FreeBSD amd64 128Gbytes
+  (the same as Linux and Solaris, it was 32Gbytes)
 
 * ==================== FIXED BUGS ====================
 
diff --git a/coregrind/m_aspacemgr/aspacemgr-linux.c b/coregrind/m_aspacemgr/aspacemgr-linux.c
index 933d6d9de2..00a42ffe6e 100644
--- a/coregrind/m_aspacemgr/aspacemgr-linux.c
+++ b/coregrind/m_aspacemgr/aspacemgr-linux.c
@@ -1662,7 +1662,7 @@ Addr VG_(am_startup) ( Addr sp_at_startup )
 
    aspacem_maxAddr = VG_PGROUNDDN( sp_at_startup ) - 1;
 # else
-   aspacem_maxAddr = (Addr) (Addr)0x800000000UL - 1; // 32G
+   aspacem_maxAddr = (Addr)0x2000000000ULL - 1; // 128G
 #  ifdef ENABLE_INNER
    { Addr cse = VG_PGROUNDDN( sp_at_startup ) - 1;
      if (aspacem_maxAddr > cse)