From c381db4ced3f395d6875724f9649c0d5579e15d1 Mon Sep 17 00:00:00 2001
From: Richard Kistruck <rhsk@ravenbrook.com>
Date: Fri, 25 Sep 2009 17:00:52 +0100
Subject: [PATCH 1/2] Mps br/padding exp-168764: for testing, turn off amc lsp,
 by setting amclargesegpages to 1<<18 * 4k pages => segs < 1gib are still 'not
 large'

Copied from Perforce
 Change: 168764
 ServerID: perforce.ravenbrook.com
---
 mps/code/config.h  | 5 ++++-
 mps/code/version.c | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mps/code/config.h b/mps/code/config.h
index ca6e796e48c..9a9ae085870 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -401,7 +401,10 @@
 /* Pool Class AMC configuration */
 
 /* AMC treats segments of this many pages (or more) as "Large" */
-#define AMCLargeSegPAGES ((Count)8)
+/* #define AMCLargeSegPAGES ((Count)8) */
+/* For testing: 1<<18 * 4K pages => segs < 1GiB are still 'not large' */
+#define AMCLargeSegPAGES ((Count)1<<18)
+
 
 
 #endif /* config_h */
diff --git a/mps/code/version.c b/mps/code/version.c
index 040aec40c79..e23bb5b0273 100644
--- a/mps/code/version.c
+++ b/mps/code/version.c
@@ -29,7 +29,7 @@ SRCID(version, "$Id$");
  * (Note: before 2006-02-01 the style was "release.epcore.chub")
  */
 
-#define MPS_RELEASE "exp-167727"
+#define MPS_RELEASE "exp-168764"
 
 
 /* MPSCopyrightNotice -- copyright notice for the binary
@@ -39,7 +39,7 @@ SRCID(version, "$Id$");
  */
 
 char MPSCopyrightNotice[] =
-  "Portions copyright (c) 2008 Ravenbrook Limited and Global Graphics Software.";
+  "Portions copyright (c) 2009 Ravenbrook Limited and Global Graphics Software.";
 
 
 /* MPSVersion -- return version string

From 6c29372e9076c2ce2cd94ce7ee9a21a4aabb1be4 Mon Sep 17 00:00:00 2001
From: Richard Kistruck <rhsk@ravenbrook.com>
Date: Mon, 28 Sep 2009 15:02:46 +0100
Subject: [PATCH 2/2] Mps br/padding exp-168778: amclargesegpages = 8 again.

(Also: report value of AMCLargeSegPAGES in AMCTraceEnd_pageret diag output).

Copied from Perforce
 Change: 168778
 ServerID: perforce.ravenbrook.com
---
 mps/code/config.h  | 5 +----
 mps/code/poolamc.c | 4 +++-
 mps/code/version.c | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mps/code/config.h b/mps/code/config.h
index 9a9ae085870..ca6e796e48c 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -401,10 +401,7 @@
 /* Pool Class AMC configuration */
 
 /* AMC treats segments of this many pages (or more) as "Large" */
-/* #define AMCLargeSegPAGES ((Count)8) */
-/* For testing: 1<<18 * 4K pages => segs < 1GiB are still 'not large' */
-#define AMCLargeSegPAGES ((Count)1<<18)
-
+#define AMCLargeSegPAGES ((Count)8)
 
 
 #endif /* config_h */
diff --git a/mps/code/poolamc.c b/mps/code/poolamc.c
index 8082886b5ce..16dc4386c2b 100644
--- a/mps/code/poolamc.c
+++ b/mps/code/poolamc.c
@@ -2238,7 +2238,9 @@ static void AMCTraceEnd(Pool pool, Trace trace)
       " $U", amc->pageretstruct[ti].sRL,
       " $U", amc->pageretstruct[ti].pRL,
       " $U", amc->pageretstruct[ti].pRLr,
-      " (page = $Ub, pRetMin $U)", ArenaAlign(pool->arena), pRetMin,
+      " (page = $Ub,", ArenaAlign(pool->arena), 
+      " Large >= $Up,", AMCLargeSegPAGES, 
+      " pRetMin $U)", pRetMin,
       NULL ));
   }
 
diff --git a/mps/code/version.c b/mps/code/version.c
index e23bb5b0273..aa570675bb4 100644
--- a/mps/code/version.c
+++ b/mps/code/version.c
@@ -29,7 +29,7 @@ SRCID(version, "$Id$");
  * (Note: before 2006-02-01 the style was "release.epcore.chub")
  */
 
-#define MPS_RELEASE "exp-168764"
+#define MPS_RELEASE "exp-168778"
 
 
 /* MPSCopyrightNotice -- copyright notice for the binary