mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-03-26 08:41:47 -07:00
Catch-up merge from master sources.
Copied from Perforce Change: 181651 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Brooksby
commit
44ae8e2ddd
7 changed files with 34 additions and 20 deletions
|
|
@ -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 && \
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ int main(int argc, char *argv[])
|
|||
Insist(lock != NULL);
|
||||
|
||||
LockInit(lock);
|
||||
UNUSED(argc);
|
||||
|
||||
shared = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
20
mps/configure
vendored
20
mps/configure
vendored
|
|
@ -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 release 1.111.0.
|
||||
#
|
||||
# Report bugs to <mps-questions@ravenbrook.com>.
|
||||
#
|
||||
|
|
@ -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='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 master 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 master:";;
|
||||
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 master
|
||||
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 master, 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 $@
|
||||
|
|
@ -3445,7 +3445,7 @@ $as_echo "FreeBSD x86" >&6; }
|
|||
MPS_TARGET_NAME=fri3gc
|
||||
CFLAGS="$CFLAGS_GC"
|
||||
;;
|
||||
amd64-*-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
|
||||
|
|
@ -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 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 master
|
||||
Memory Pool System Kit config.status release 1.111.0
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ case $host in
|
|||
MPS_TARGET_NAME=fri3gc
|
||||
CFLAGS="$CFLAGS_GC"
|
||||
;;
|
||||
amd64-*-freebsd*)
|
||||
amd64-*-freebsd* | x86_64-*-freebsd*)
|
||||
AC_MSG_RESULT([FreeBSD x86_64])
|
||||
MPS_TARGET_NAME=fri6gc
|
||||
CFLAGS="$CFLAGS_GC"
|
||||
|
|
|
|||
|
|
@ -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::
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue