From 726608ce56226a81ffffd28179df63f33b5372e0 Mon Sep 17 00:00:00 2001
From: Gareth Rees
Date: Mon, 6 May 2013 18:39:26 +0100
Subject: Avoid type puns.

Copied from Perforce
 Change: 181561
 ServerID: perforce.ravenbrook.com

---
 mps/code/qs.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'mps/code')

diff --git a/mps/code/qs.c b/mps/code/qs.c
index 2adc49ec4b9..2bf41c4c8f4 100644
--- a/mps/code/qs.c
+++ b/mps/code/qs.c
@@ -187,6 +187,7 @@ static void makerndlist(unsigned l)
 {
   unsigned i;
   mps_word_t r;
+  mps_addr_t addr;
 
   cdie(l > 0, "list len");
   if(list != NULL) {
@@ -194,8 +195,10 @@ static void makerndlist(unsigned l)
     list = NULL;
   }
   listl = l;
-  die(mps_alloc((mps_addr_t *)&list, mpool, (l * sizeof(mps_word_t))),
+  addr = list;
+  die(mps_alloc(&addr, mpool, (l * sizeof(mps_word_t))),
       "Alloc List");
+  list = addr;
   reg[0] = (mps_addr_t)0;
   regtag[0] = QSRef;
   for(i = 0; i < l; ++i) {
@@ -330,6 +333,8 @@ static void *go(void *p, size_t s)
 {
   mps_fmt_t format;
   mps_chain_t chain;
+  mps_addr_t base;
+  mps_addr_t *addr;
 
   testlib_unused(p);
   testlib_unused(s);
@@ -350,8 +355,11 @@ static void *go(void *p, size_t s)
                             reg,
                             NREGS),
       "RootCreateTable");
+  
+  base = &activationStack;
+  addr = base;
   die(mps_root_create_table(&actroot, arena, mps_rank_ambig(), 0,
-      (mps_addr_t *)&activationStack, sizeof(QSCell)/sizeof(mps_addr_t)),
+                            addr, sizeof(QSCell)/sizeof(mps_addr_t)),
       "RootCreateTable");
 
   /* makes a random list */
@@ -396,6 +404,7 @@ static mps_res_t scan1(mps_ss_t ss, mps_addr_t *objectIO)
 {
   QSCell cell;
   mps_res_t res;
+  mps_addr_t addr;
 
   cdie(objectIO != NULL, "objectIO");
 
@@ -404,20 +413,24 @@ static mps_res_t scan1(mps_ss_t ss, mps_addr_t *objectIO)
 
     switch(cell->tag) {
     case QSRef:
-      if(!MPS_FIX1(ss, (mps_addr_t)cell->value))
+      addr = cell->value;
+      if(!MPS_FIX1(ss, addr))
         goto fixTail;
-      res = MPS_FIX2(ss, (mps_addr_t *)&cell->value);
+      res = MPS_FIX2(ss, &addr);
       if(res != MPS_RES_OK)
         return res;
+      cell->value = addr;
     /* fall */
 
     case QSInt:
     fixTail:
-      if(!MPS_FIX1(ss, (mps_addr_t)cell->tail))
+      addr = cell->tail;
+      if(!MPS_FIX1(ss, addr))
         break;
-      res = MPS_FIX2(ss, (mps_addr_t *)&cell->tail);
+      res = MPS_FIX2(ss, &addr);
       if(res != MPS_RES_OK)
         return res;
+      cell->tail = addr;
       break;
 
     case QSEvac:
-- 
cgit v1.2.1


From 297f2872007db0c06948bc0026a598a363c19930 Mon Sep 17 00:00:00 2001
From: Gareth Rees
Date: Mon, 6 May 2013 19:01:25 +0100
Subject: Put xxxxxx at the end of the pattern argument to mktemp, so that it
 works on freebsd and os x.

Copied from Perforce
 Change: 181562
 ServerID: perforce.ravenbrook.com

---
 mps/code/comm.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mps/code')

diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index 63facd0b6e5..11b54b902ab 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -239,7 +239,7 @@ TESTCASES=abqtest amcss amcsshe amcssth amsss amssshe apss arenacv awlut \
           messtest mpmss mpsicv poolncv qs sacss segsmss steptest \
           walkt0
 testrun: $(TESTCASES)
-	OUTPUT=$$(mktemp /tmp/mps-XXXXXX.log); \
+	OUTPUT=$$(mktemp /tmp/mps.log.XXXXXX); \
 	echo "Logging test output to $$OUTPUT"; \
 	$(^:%=(TESTCASE=$(PFM)/$(VARIETY)/%; \
               echo "\n\n-- Running $$TESTCASE at $$(date) --" >> $$OUTPUT && \
-- 
cgit v1.2.1


From 7b009080c968be7f69a4e3182e6775aa2b271c4f Mon Sep 17 00:00:00 2001
From: Richard Brooksby
Date: Wed, 8 May 2013 00:19:39 +0100
Subject: Adding type mps_awl_find_dependent_t that is documented but didn't
 actually exist.

Copied from Perforce
 Change: 181596
 ServerID: perforce.ravenbrook.com

---
 mps/code/mpscawl.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mps/code')

diff --git a/mps/code/mpscawl.h b/mps/code/mpscawl.h
index 0b5bc790acf..f413c03c5e6 100644
--- a/mps/code/mpscawl.h
+++ b/mps/code/mpscawl.h
@@ -11,6 +11,8 @@
 
 extern mps_class_t mps_class_awl(void);
 
+typedef mps_addr_t (*mps_awl_find_dependent_t)(mps_addr_t addr);
+
 #endif /* mpscawl_h */
 
 
-- 
cgit v1.2.1


From c72234fbb925b6aa33331ac545efac90d4bb7718 Mon Sep 17 00:00:00 2001
From: Richard Brooksby
Date: Wed, 8 May 2013 13:57:31 +0100
Subject: Updating mps_release to release/1.111.0

Copied from Perforce
 Change: 181619
 ServerID: perforce.ravenbrook.com

---
 mps/code/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mps/code')

diff --git a/mps/code/version.c b/mps/code/version.c
index 03e7b78334e..0a9afed3476 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 "release/1.110.0"
+#define MPS_RELEASE "release/1.111.0"
 
 
 /* MPSCopyrightNotice -- copyright notice for the binary
-- 
cgit v1.2.1


From 6aeb72af5ed9b598cf7aaf9d93eeb9270b57c26d Mon Sep 17 00:00:00 2001
From: Richard Brooksby
Date: Wed, 8 May 2013 14:11:27 +0100
Subject: Adding unused declaration for unused variable.

Copied from Perforce
 Change: 181623
 ServerID: perforce.ravenbrook.com

---
 mps/code/lockutw3.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mps/code')

diff --git a/mps/code/lockutw3.c b/mps/code/lockutw3.c
index b135f0e1d43..51a1206a37d 100644
--- a/mps/code/lockutw3.c
+++ b/mps/code/lockutw3.c
@@ -74,6 +74,7 @@ int main(int argc, char *argv[])
   Insist(lock != NULL);
 
   LockInit(lock);
+  UNUSED(argc);
 
   shared = 0;
 
-- 
cgit v1.2.1