From 6537a39f106436e7563bb856dc8f1399d3f32ab3 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Mon, 6 May 2013 18:39:26 +0100 Subject: [PATCH 01/13] Avoid type puns. Copied from Perforce Change: 181561 ServerID: perforce.ravenbrook.com --- mps/code/qs.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) 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: From 3c35eda773d393ee9b694ac3c03e1da00a075dde Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Mon, 6 May 2013 19:01:25 +0100 Subject: [PATCH 02/13] 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(-) 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 && \ From 57d538d58e23a14fa4c2adf072df6914cb9ac30e Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Tue, 7 May 2013 08:46:01 +0100 Subject: [PATCH 03/13] Freebsd 9.1's uname now reports "x64_64" on 64-bit systems. Copied from Perforce Change: 181565 ServerID: perforce.ravenbrook.com --- mps/configure | 1 + mps/configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/mps/configure b/mps/configure index 37bc1f842af..c30d0c7632f 100755 --- a/mps/configure +++ b/mps/configure @@ -3446,6 +3446,7 @@ $as_echo "FreeBSD x86" >&6; } CFLAGS="$CFLAGS_GC" ;; amd64-*-freebsd*) + x86_64-*-freebsd*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeBSD x86_64" >&5 $as_echo "FreeBSD x86_64" >&6; } MPS_TARGET_NAME=fri6gc diff --git a/mps/configure.ac b/mps/configure.ac index a502abe9232..ebeb9fac5d2 100644 --- a/mps/configure.ac +++ b/mps/configure.ac @@ -81,6 +81,7 @@ case $host in CFLAGS="$CFLAGS_GC" ;; amd64-*-freebsd*) + x86_64-*-freebsd*) AC_MSG_RESULT([FreeBSD x86_64]) MPS_TARGET_NAME=fri6gc CFLAGS="$CFLAGS_GC" From 4d4f914a01a44609c93a96c3adbf1edf2cc64447 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Tue, 7 May 2013 11:45:40 +0100 Subject: [PATCH 04/13] Correct case syntax. Copied from Perforce Change: 181569 ServerID: perforce.ravenbrook.com --- mps/configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mps/configure.ac b/mps/configure.ac index ebeb9fac5d2..e3d65aa7fa0 100644 --- a/mps/configure.ac +++ b/mps/configure.ac @@ -80,8 +80,7 @@ case $host in MPS_TARGET_NAME=fri3gc CFLAGS="$CFLAGS_GC" ;; - amd64-*-freebsd*) - x86_64-*-freebsd*) + amd64-*-freebsd* | x86_64-*-freebsd*) AC_MSG_RESULT([FreeBSD x86_64]) MPS_TARGET_NAME=fri6gc CFLAGS="$CFLAGS_GC" From de37f254c158e3246521f761c10fdece4cbda0c0 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Tue, 7 May 2013 11:48:58 +0100 Subject: [PATCH 05/13] Correct case syntax. Copied from Perforce Change: 181570 ServerID: perforce.ravenbrook.com --- mps/configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mps/configure b/mps/configure index c30d0c7632f..2f1113baece 100755 --- a/mps/configure +++ b/mps/configure @@ -3445,8 +3445,7 @@ $as_echo "FreeBSD x86" >&6; } MPS_TARGET_NAME=fri3gc CFLAGS="$CFLAGS_GC" ;; - amd64-*-freebsd*) - x86_64-*-freebsd*) + amd64-*-freebsd* | x86_64-*-freebsd*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeBSD x86_64" >&5 $as_echo "FreeBSD x86_64" >&6; } MPS_TARGET_NAME=fri6gc From ff11f1798da45949cc8aecf7570239fef534d7ad Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Tue, 7 May 2013 19:01:59 +0100 Subject: [PATCH 06/13] Fix typo. Copied from Perforce Change: 181591 ServerID: perforce.ravenbrook.com --- mps/manual/source/guide/advanced.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mps/manual/source/guide/advanced.rst b/mps/manual/source/guide/advanced.rst index d6fd1ba163b..f65de503e9e 100644 --- a/mps/manual/source/guide/advanced.rst +++ b/mps/manual/source/guide/advanced.rst @@ -364,7 +364,7 @@ actually test that ``key`` appears in the table, not just that some key with the same hash does.) When a table is rehashed, call :c:func:`mps_ld_reset` to clear the -location dependency, and the :c:func:`mps_ld_add` for each key before it is added back to the table. +location dependency, and then :c:func:`mps_ld_add` for each key before it is added back to the table. .. note:: From 82861dbc645eef120faeb572732868e9b4f77ed5 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Wed, 8 May 2013 00:19:39 +0100 Subject: [PATCH 07/13] 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(+) 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 */ From 9b2a78e54de7b7964a05871621be646f63935410 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Wed, 8 May 2013 13:46:36 +0100 Subject: [PATCH 08/13] Branching mps master sources for version 1.111. Copied from Perforce Change: 181615 ServerID: perforce.ravenbrook.com From 38b58c86b0f2859f377de79eec7d79939e79b8d4 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Wed, 8 May 2013 13:53:01 +0100 Subject: [PATCH 09/13] Updating "master" to "version 1.111" in documents. Copied from Perforce Change: 181616 ServerID: perforce.ravenbrook.com --- mps/configure.ac | 2 +- mps/tool/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mps/configure.ac b/mps/configure.ac index e3d65aa7fa0..8dd0a93bf50 100644 --- a/mps/configure.ac +++ b/mps/configure.ac @@ -16,7 +16,7 @@ AC_PREREQ([2.50]) # http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Initializing-configure.html#Initializing-configure AC_INIT([Memory Pool System Kit], - [master], + [version 1.111], [mps-questions@ravenbrook.com], [mps-kit], [http://www.ravenbrook.com/project/mps/]) diff --git a/mps/tool/index.html b/mps/tool/index.html index aeaf3e32b9d..d0a1335d881 100644 --- a/mps/tool/index.html +++ b/mps/tool/index.html @@ -18,7 +18,7 @@ Ravenbrook / Projects / Memory Pool System / -Master Product Sources +Version 1.111 Product Sources

Memory Pool System Project

@@ -112,7 +112,7 @@ Ravenbrook / Projects / Memory Pool System / -Master Product Sources +Version 1.111 Product Sources

From 5a68cc292eb883e9e3ccd8464cfa602d8f072b1b Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Wed, 8 May 2013 13:57:31 +0100 Subject: [PATCH 10/13] 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(-) 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 From d28d6cbba859d1434014bd278b42635bcd1409a8 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Wed, 8 May 2013 14:11:27 +0100 Subject: [PATCH 11/13] 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(+) 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; From 50da9e5d9572e2cde7f018c53c0fb51d2ada18d7 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Wed, 8 May 2013 14:13:25 +0100 Subject: [PATCH 12/13] Updating configure script for version 1.111. Copied from Perforce Change: 181624 ServerID: perforce.ravenbrook.com --- mps/configure | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mps/configure b/mps/configure index 2f1113baece..a41c68a90d2 100755 --- a/mps/configure +++ b/mps/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Memory Pool System Kit master. +# Generated by GNU Autoconf 2.69 for Memory Pool System Kit version 1.111. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Memory Pool System Kit' PACKAGE_TARNAME='mps-kit' -PACKAGE_VERSION='master' -PACKAGE_STRING='Memory Pool System Kit master' +PACKAGE_VERSION='version 1.111' +PACKAGE_STRING='Memory Pool System Kit version 1.111' PACKAGE_BUGREPORT='mps-questions@ravenbrook.com' PACKAGE_URL='http://www.ravenbrook.com/project/mps/' @@ -1243,7 +1243,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Memory Pool System Kit master to adapt to many kinds of systems. +\`configure' configures Memory Pool System Kit version 1.111 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1308,7 +1308,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Memory Pool System Kit master:";; + short | recursive ) echo "Configuration of Memory Pool System Kit version 1.111:";; esac cat <<\_ACEOF @@ -1389,7 +1389,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Memory Pool System Kit configure master +Memory Pool System Kit configure version 1.111 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1645,7 +1645,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Memory Pool System Kit $as_me master, which was +It was created by Memory Pool System Kit $as_me version 1.111, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4056,7 +4056,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Memory Pool System Kit $as_me master, which was +This file was extended by Memory Pool System Kit $as_me version 1.111, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4110,7 +4110,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Memory Pool System Kit config.status master +Memory Pool System Kit config.status version 1.111 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" From 7d769048decfd57b30e2e4e925c0964112ba1eb8 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Wed, 8 May 2013 14:43:01 +0100 Subject: [PATCH 13/13] Adding steps for updating configure.ac to release procedure. Editing configure.ac for release 1.111.0. Copied from Perforce Change: 181625 ServerID: perforce.ravenbrook.com --- mps/configure | 18 +++++++++--------- mps/configure.ac | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mps/configure b/mps/configure index a41c68a90d2..50885dcc35a 100755 --- a/mps/configure +++ b/mps/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Memory Pool System Kit version 1.111. +# Generated by GNU Autoconf 2.69 for Memory Pool System Kit release 1.111.0. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Memory Pool System Kit' PACKAGE_TARNAME='mps-kit' -PACKAGE_VERSION='version 1.111' -PACKAGE_STRING='Memory Pool System Kit version 1.111' +PACKAGE_VERSION='release 1.111.0' +PACKAGE_STRING='Memory Pool System Kit release 1.111.0' PACKAGE_BUGREPORT='mps-questions@ravenbrook.com' PACKAGE_URL='http://www.ravenbrook.com/project/mps/' @@ -1243,7 +1243,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Memory Pool System Kit version 1.111 to adapt to many kinds of systems. +\`configure' configures Memory Pool System Kit release 1.111.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1308,7 +1308,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Memory Pool System Kit version 1.111:";; + short | recursive ) echo "Configuration of Memory Pool System Kit release 1.111.0:";; esac cat <<\_ACEOF @@ -1389,7 +1389,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Memory Pool System Kit configure version 1.111 +Memory Pool System Kit configure release 1.111.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1645,7 +1645,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Memory Pool System Kit $as_me version 1.111, which was +It was created by Memory Pool System Kit $as_me release 1.111.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4056,7 +4056,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Memory Pool System Kit $as_me version 1.111, which was +This file was extended by Memory Pool System Kit $as_me release 1.111.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4110,7 +4110,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Memory Pool System Kit config.status version 1.111 +Memory Pool System Kit config.status release 1.111.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/mps/configure.ac b/mps/configure.ac index 8dd0a93bf50..1b6034d2896 100644 --- a/mps/configure.ac +++ b/mps/configure.ac @@ -16,7 +16,7 @@ AC_PREREQ([2.50]) # http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Initializing-configure.html#Initializing-configure AC_INIT([Memory Pool System Kit], - [version 1.111], + [release 1.111.0], [mps-questions@ravenbrook.com], [mps-kit], [http://www.ravenbrook.com/project/mps/])