mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-26 07:11:34 -08:00
Catch-up merge from branch/2014-05-28/align to branch/2014-06-14/vm.
Copied from Perforce Change: 186633 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees
commit
27ef3e0e9e
8 changed files with 52 additions and 39 deletions
|
|
@ -639,7 +639,7 @@ Res ControlDescribe(Arena arena, mps_lib_FILE *stream, Count depth)
|
|||
}
|
||||
|
||||
|
||||
/* ArenaChunkInsert -- insert chunk into arena's chunk tree */
|
||||
/* ArenaChunkInsert -- insert chunk into arena's chunk tree and ring */
|
||||
|
||||
void ArenaChunkInsert(Arena arena, Chunk chunk) {
|
||||
Bool inserted;
|
||||
|
|
@ -656,6 +656,11 @@ void ArenaChunkInsert(Arena arena, Chunk chunk) {
|
|||
TreeBalance(&updatedTree);
|
||||
arena->chunkTree = updatedTree;
|
||||
RingAppend(&arena->chunkRing, &chunk->chunkRing);
|
||||
|
||||
/* As part of the bootstrap, the first created chunk becomes the primary
|
||||
chunk. This step allows ArenaFreeLandInsert to allocate pages. */
|
||||
if (arena->primary == NULL)
|
||||
arena->primary = chunk;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -210,6 +210,7 @@ MPMCOMMON = \
|
|||
traceanc.c \
|
||||
tract.c \
|
||||
tree.c \
|
||||
version.c \
|
||||
vm.c \
|
||||
walk.c
|
||||
MPM = $(MPMCOMMON) $(MPMPF) $(AMC) $(AMS) $(AWL) $(LO) $(MV2) $(MVFF) $(PLINTH)
|
||||
|
|
@ -635,8 +636,7 @@ endif
|
|||
$(PFM)/$(VARIETY)/%.a:
|
||||
$(ECHO) "$(PFM): $@"
|
||||
rm -f $@
|
||||
$(CC) $(CFLAGSSTRICT) -c -o $(PFM)/$(VARIETY)/version.o version.c
|
||||
$(AR) $(ARFLAGS) $@ $^ $(PFM)/$(VARIETY)/version.o
|
||||
$(AR) $(ARFLAGS) $@ $^
|
||||
$(RANLIB) $@
|
||||
|
||||
# Executable
|
||||
|
|
|
|||
|
|
@ -301,6 +301,8 @@ int main(int argc, char *argv[]) {
|
|||
}
|
||||
break;
|
||||
default:
|
||||
/* This is printed in parts to keep within the 509 character
|
||||
limit for string literals in portable standard C. */
|
||||
fprintf(stderr,
|
||||
"Usage: %s [option...] [test...]\n"
|
||||
"Options:\n"
|
||||
|
|
@ -317,18 +319,17 @@ int main(int argc, char *argv[]) {
|
|||
" -b n, --nblocks=n\n"
|
||||
" Length of the block array (default %u).\n"
|
||||
" -s n, --sshift=n\n"
|
||||
" Log2 max block size in words (default %u).\n"
|
||||
" -c p, --pact=p\n"
|
||||
" Probability of acting on a block (default %g).\n",
|
||||
" Log2 max block size in words (default %u).\n",
|
||||
argv[0],
|
||||
(unsigned long)arena_size,
|
||||
(unsigned long)arena_grain_size,
|
||||
niter,
|
||||
npass,
|
||||
nblocks,
|
||||
sshift,
|
||||
pact);
|
||||
sshift);
|
||||
fprintf(stderr,
|
||||
" -c p, --pact=p\n"
|
||||
" Probability of acting on a block (default %g).\n"
|
||||
" -r n, --rinter=n\n"
|
||||
" Recurse every n passes if n > 0 (default %u).\n"
|
||||
" -d n, --rmax=n\n"
|
||||
|
|
@ -343,6 +344,7 @@ int main(int argc, char *argv[]) {
|
|||
" mv pool class MV\n"
|
||||
" mvb pool class MV with buffers\n"
|
||||
" an malloc\n",
|
||||
pact,
|
||||
rinter,
|
||||
rmax);
|
||||
return EXIT_FAILURE;
|
||||
|
|
|
|||
|
|
@ -393,6 +393,8 @@ int main(int argc, char *argv[]) {
|
|||
zoned = FALSE;
|
||||
break;
|
||||
default:
|
||||
/* This is printed in parts to keep within the 509 character
|
||||
limit for string literals in portable standard C. */
|
||||
fprintf(stderr,
|
||||
"Usage: %s [option...] [test...]\n"
|
||||
"Options:\n"
|
||||
|
|
@ -405,20 +407,19 @@ int main(int argc, char *argv[]) {
|
|||
" -i n, --niter=n\n"
|
||||
" Iterate each test n times (default %u).\n"
|
||||
" -p n, --npass=n\n"
|
||||
" Pass over the tree n times (default %u).\n"
|
||||
" -g c,m, --gen=c[KMG],m\n"
|
||||
" Generation with capacity c (in Kb) and mortality m\n"
|
||||
" Use multiple times for multiple generations.\n"
|
||||
" -w n, --width=n\n"
|
||||
" Width of tree nodes made (default %lu)\n",
|
||||
" Pass over the tree n times (default %u).\n",
|
||||
argv[0],
|
||||
(unsigned long)arena_size,
|
||||
(unsigned long)arena_grain_size,
|
||||
nthreads,
|
||||
niter,
|
||||
npass,
|
||||
(unsigned long)width);
|
||||
npass);
|
||||
fprintf(stderr,
|
||||
" -g c,m, --gen=c[KMG],m\n"
|
||||
" Generation with capacity c (in Kb) and mortality m\n"
|
||||
" Use multiple times for multiple generations.\n"
|
||||
" -w n, --width=n\n"
|
||||
" Width of tree nodes made (default %lu)\n"
|
||||
" -d n, --depth=n\n"
|
||||
" Depth of tree made (default %u)\n"
|
||||
" -r p, --preuse=p\n"
|
||||
|
|
@ -428,15 +429,17 @@ int main(int argc, char *argv[]) {
|
|||
" -l --pin-leaf\n"
|
||||
" Make a pinned object to use for leaves.\n"
|
||||
" -x n, --seed=n\n"
|
||||
" Random number seed (default from entropy)\n"
|
||||
" Random number seed (default from entropy)\n",
|
||||
(unsigned long)width,
|
||||
depth,
|
||||
preuse,
|
||||
pupdate);
|
||||
fprintf(stderr,
|
||||
" -z, --arena-unzoned\n"
|
||||
" Disable zoned allocation in the arena\n"
|
||||
"Tests:\n"
|
||||
" amc pool class AMC\n"
|
||||
" ams pool class AMS\n",
|
||||
depth,
|
||||
preuse,
|
||||
pupdate);
|
||||
" ams pool class AMS\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
argc -= optind;
|
||||
|
|
|
|||
|
|
@ -1426,15 +1426,15 @@
|
|||
22B2BC3618B6434F00C33E63 /* scheme-advanced */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "scheme-advanced"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
22C2ACA018BE3FEC006B3677 /* nailboardtest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nailboardtest.c; sourceTree = "<group>"; };
|
||||
22C2ACAF18BE400A006B3677 /* nailboardtest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = nailboardtest; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
22E30E821886FF1400D98EA9 /* nailboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nailboard.c; sourceTree = "<group>"; };
|
||||
22E30E831886FF1400D98EA9 /* nailboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nailboard.h; sourceTree = "<group>"; };
|
||||
22F846AF18F4379C00982BA7 /* lockut.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lockut.c; sourceTree = "<group>"; };
|
||||
22F846BD18F437B900982BA7 /* lockut */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lockut; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
22C5C99A18EC6AEC004C63D4 /* failover.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = failover.c; sourceTree = "<group>"; };
|
||||
22C5C99B18EC6AEC004C63D4 /* failover.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = failover.h; sourceTree = "<group>"; };
|
||||
22C5C99C18EC6AEC004C63D4 /* land.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = land.c; sourceTree = "<group>"; };
|
||||
22DD93E118ED815F00240DD2 /* failover.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = failover.txt; path = ../design/failover.txt; sourceTree = "<group>"; };
|
||||
22DD93E218ED815F00240DD2 /* land.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = land.txt; path = ../design/land.txt; sourceTree = "<group>"; };
|
||||
22E30E821886FF1400D98EA9 /* nailboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nailboard.c; sourceTree = "<group>"; };
|
||||
22E30E831886FF1400D98EA9 /* nailboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nailboard.h; sourceTree = "<group>"; };
|
||||
22F846AF18F4379C00982BA7 /* lockut.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lockut.c; sourceTree = "<group>"; };
|
||||
22F846BD18F437B900982BA7 /* lockut */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lockut; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
22FA177516E8D6FC0098B23F /* amcssth */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = amcssth; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
22FA177616E8D7A80098B23F /* amcssth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = amcssth.c; sourceTree = "<group>"; };
|
||||
22FACED1188807FF000FDBC1 /* airtest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = airtest.c; sourceTree = "<group>"; };
|
||||
|
|
@ -1599,7 +1599,6 @@
|
|||
311F2F6717398B3B00C15B6A /* mpsio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpsio.h; sourceTree = "<group>"; };
|
||||
311F2F6817398B3B00C15B6A /* mpslib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpslib.h; sourceTree = "<group>"; };
|
||||
311F2F6917398B3B00C15B6A /* mpstd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpstd.h; sourceTree = "<group>"; };
|
||||
311F2F6A17398B4C00C15B6A /* mpsw3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpsw3.h; sourceTree = "<group>"; };
|
||||
311F2F6B17398B4C00C15B6A /* mpswin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpswin.h; sourceTree = "<group>"; };
|
||||
311F2F6D17398B6300C15B6A /* prmci3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = prmci3.h; sourceTree = "<group>"; };
|
||||
311F2F6E17398B6300C15B6A /* prmci6.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = prmci6.h; sourceTree = "<group>"; };
|
||||
|
|
@ -2410,7 +2409,6 @@
|
|||
311F2F6717398B3B00C15B6A /* mpsio.h */,
|
||||
311F2F6817398B3B00C15B6A /* mpslib.h */,
|
||||
311F2F6917398B3B00C15B6A /* mpstd.h */,
|
||||
311F2F6A17398B4C00C15B6A /* mpsw3.h */,
|
||||
311F2F6B17398B4C00C15B6A /* mpswin.h */,
|
||||
22E30E821886FF1400D98EA9 /* nailboard.c */,
|
||||
22E30E831886FF1400D98EA9 /* nailboard.h */,
|
||||
|
|
@ -3383,7 +3381,7 @@
|
|||
31EEABDA156AAE9E00714D05 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastUpgradeCheck = 0460;
|
||||
LastUpgradeCheck = 0510;
|
||||
};
|
||||
buildConfigurationList = 31EEABDD156AAE9E00714D05 /* Build configuration list for PBXProject "mps" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
|
|
@ -5170,6 +5168,7 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
|
||||
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
|
|
@ -5190,6 +5189,7 @@
|
|||
GCC_WARN_PEDANTIC = YES;
|
||||
GCC_WARN_SHADOW = YES;
|
||||
GCC_WARN_SIGN_COMPARE = YES;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES;
|
||||
GCC_WARN_UNKNOWN_PRAGMAS = YES;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
|
|
@ -5606,6 +5606,7 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
|
||||
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
|
|
@ -5626,6 +5627,7 @@
|
|||
GCC_WARN_PEDANTIC = YES;
|
||||
GCC_WARN_SHADOW = YES;
|
||||
GCC_WARN_SIGN_COMPARE = YES;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES;
|
||||
GCC_WARN_UNKNOWN_PRAGMAS = YES;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
|
|
@ -5660,6 +5662,7 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
|
||||
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
|
|
@ -5680,6 +5683,7 @@
|
|||
GCC_WARN_PEDANTIC = YES;
|
||||
GCC_WARN_SHADOW = YES;
|
||||
GCC_WARN_SIGN_COMPARE = YES;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES;
|
||||
GCC_WARN_UNKNOWN_PRAGMAS = YES;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
|
|
|
|||
|
|
@ -232,11 +232,6 @@ Res ChunkInit(Chunk chunk, Arena arena,
|
|||
|
||||
ArenaChunkInsert(arena, chunk);
|
||||
|
||||
/* As part of the bootstrap, the first created chunk becomes the primary
|
||||
chunk. This step allows AreaFreeLandInsert to allocate pages. */
|
||||
if (arena->primary == NULL)
|
||||
arena->primary = chunk;
|
||||
|
||||
return ResOK;
|
||||
|
||||
failLandInsert:
|
||||
|
|
|
|||
|
|
@ -4384,9 +4384,11 @@ static int start(int argc, char *argv[])
|
|||
fprintf(stderr, "%s\n", error_message);
|
||||
fflush(stderr);
|
||||
exit_code = EXIT_FAILURE;
|
||||
} else
|
||||
for (i = 0; i < argc; ++i)
|
||||
load(env, op_env, make_string(strlen(argv[i]), argv[i]));
|
||||
} else {
|
||||
int a;
|
||||
for (a = 0; a < argc; ++a)
|
||||
load(env, op_env, make_string(strlen(argv[a]), argv[a]));
|
||||
}
|
||||
} else {
|
||||
/* Ask the MPS to tell us when it's garbage collecting so that we can
|
||||
print some messages. Completely optional. */
|
||||
|
|
|
|||
|
|
@ -4314,9 +4314,11 @@ static int start(int argc, char *argv[])
|
|||
fprintf(stderr, "%s\n", error_message);
|
||||
fflush(stderr);
|
||||
exit_code = EXIT_FAILURE;
|
||||
} else
|
||||
for (i = 0; i < argc; ++i)
|
||||
load(env, op_env, make_string(strlen(argv[i]), argv[i]));
|
||||
} else {
|
||||
int a;
|
||||
for (a = 0; a < argc; ++a)
|
||||
load(env, op_env, make_string(strlen(argv[a]), argv[a]));
|
||||
}
|
||||
} else {
|
||||
/* Ask the MPS to tell us when it's garbage collecting so that we can
|
||||
print some messages. Completely optional. */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue