From f410708281594d98d9829cb82d36a7883dd0440f Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 29 Feb 2024 22:48:18 +0700 Subject: [PATCH] Fix typos. --- code/addrobj.c | 2 +- code/arena.c | 2 +- code/commpre.nmk | 4 ++-- code/dbgpool.c | 2 +- code/gcbench.c | 2 +- code/ld.c | 4 ++-- code/mpsi.c | 2 +- code/policy.c | 4 ++-- code/pool.c | 2 +- code/poolamc.c | 2 +- code/poolawl.c | 2 +- code/poolmrg.c | 2 +- code/shield.c | 2 +- code/splay.c | 4 ++-- code/tagtest.c | 2 +- code/trans.c | 2 +- design/finalize.txt | 2 +- design/freelist.txt | 2 +- design/io.txt | 2 +- design/message-gc.txt | 4 ++-- design/nailboard.txt | 2 +- design/object-debug.txt | 6 +++--- design/pool.txt | 2 +- design/poolams.txt | 2 +- design/poolmvt.txt | 4 ++-- design/prot.txt | 2 +- design/pthreadext.txt | 4 ++-- design/range.txt | 2 +- design/strategy.txt | 2 +- design/write-barrier.txt | 4 ++-- manual/source/release.rst | 2 +- manual/source/topic/arena.rst | 2 +- manual/source/topic/cache.rst | 2 +- manual/source/topic/debugging.rst | 2 +- manual/source/topic/format.rst | 2 +- manual/source/topic/location.rst | 4 ++-- test/function/120.c | 2 +- test/function/235.c | 2 +- test/function/237.c | 4 ++-- test/function/43.c | 2 +- test/function/503.txt | 2 +- test/test/script/help/naming | 2 +- test/test/script/help/options | 2 +- test/test/script/help/output | 2 +- test/test/testlib/awlfmt.c | 2 +- test/test/testlib/preBQ.h | 2 +- test/test/testlib/testlib.c | 2 +- tool/monitor | 4 ++-- 48 files changed, 61 insertions(+), 61 deletions(-) diff --git a/code/addrobj.c b/code/addrobj.c index f4fe524771..7c98128a8d 100644 --- a/code/addrobj.c +++ b/code/addrobj.c @@ -205,7 +205,7 @@ int main(int argc, char *argv[]) test_main(); - printf("%s: Conculsion, failed to find any defects.\n", argv[0]); + printf("%s: Conclusion, failed to find any defects.\n", argv[0]); return 0; } diff --git a/code/arena.c b/code/arena.c index 7139ff4bc8..9f29432eaa 100644 --- a/code/arena.c +++ b/code/arena.c @@ -987,7 +987,7 @@ Res ArenaFreeLandDelete(Arena arena, Addr base, Addr limit) } -/* ArenaFreeLandAlloc -- allocate a continguous range of tracts of +/* ArenaFreeLandAlloc -- allocate a contiguous range of tracts of * size bytes from the arena's free land. * * size, zones, and high are as for LandFindInZones. diff --git a/code/commpre.nmk b/code/commpre.nmk index 8aa9e557f9..77102f0335 100644 --- a/code/commpre.nmk +++ b/code/commpre.nmk @@ -7,7 +7,7 @@ # # .description: This makefile fragment is included in more specific # makefiles for platforms which use the "mv" builder. This is -# the first of two common makefile fragements (the other is commpost.nmk). +# the first of two common makefile fragments (the other is commpost.nmk). # Alas, due to shortcomings in nmake, it is not possible to use only one # common fragment. # @@ -41,7 +41,7 @@ # # EDITING # -# To add new targets. varieties, and parts: +# To add new targets, varieties, and parts: # Search for the string "%%TARGET", "%%VARIETY", or "%%PART" in this makefile # and follow the instructions. # diff --git a/code/dbgpool.c b/code/dbgpool.c index 54ab6864bb..ac5f010299 100644 --- a/code/dbgpool.c +++ b/code/dbgpool.c @@ -333,7 +333,7 @@ static Bool patternCheck(ReadonlyAddr pattern, Size size, Addr base, Addr limit) /* debugPoolSegIterate -- iterate over a range of segments in an arena * - * Expects to be called on a range corresponding to objects withing a + * Expects to be called on a range corresponding to objects within a * single pool. * * NOTE: This relies on pools consistently using segments diff --git a/code/gcbench.c b/code/gcbench.c index 2e7abc2bd9..07fdac6f37 100644 --- a/code/gcbench.c +++ b/code/gcbench.c @@ -139,7 +139,7 @@ static obj_t new_tree(mps_ap_t ap, obj_t oldtree, unsigned d) /* Update tree to be identical tree but with nodes reallocated * with probability pupdate. This avoids writing to vector slots - * if unecessary. */ + * if unnecessary. */ static obj_t update_tree(mps_ap_t ap, obj_t oldtree, unsigned d) { obj_t tree; diff --git a/code/ld.c b/code/ld.c index 483c2f90cb..d9bc69c1ff 100644 --- a/code/ld.c +++ b/code/ld.c @@ -171,7 +171,7 @@ void LDReset(mps_ld_t ld, Arena arena) * .add.sync: Add must take place _before_ the location of the reference * is depended on. If the reference changes between adding and * depending it will show up as moved because the movement will have - * occured since the epoch recorded in the dependency. If the location + * occurred since the epoch recorded in the dependency. If the location * were used first only the new location of the reference would end up * in the set. * @@ -212,7 +212,7 @@ void LDAdd(mps_ld_t ld, Arena arena, Addr addr) * to use the prehistory instead. * * .stale.old: Otherwise, if the dependency is older than the length - * of the history, check it against all movement that has ever occured. + * of the history, check it against all movement that has ever occurred. */ Bool LDIsStaleAny(mps_ld_t ld, Arena arena) { diff --git a/code/mpsi.c b/code/mpsi.c index eab0deb89e..bf83e4181c 100644 --- a/code/mpsi.c +++ b/code/mpsi.c @@ -58,7 +58,7 @@ SRCID(mpsi, "$Id$"); /* mpsi_check -- check consistency of interface mappings * * .check.purpose: The mpsi_check function attempts to check whether - * the defintions in match the equivalent definition in + * the definitions in match the equivalent definition in * the MPM. It is checking the assumptions made in the other functions * in this implementation. * diff --git a/code/policy.c b/code/policy.c index d519583710..54b9867e62 100644 --- a/code/policy.c +++ b/code/policy.c @@ -22,7 +22,7 @@ SRCID(policy, "$Id$"); * * pref describes the address space preferences for the allocation. * size is the amount of memory requested to be allocated, in bytes. - * pool is the pool that is requresting the memory. + * pool is the pool that is requesting the memory. * * If successful, update *tractReturn to point to the initial tract of * the allocated memory and return ResOK. Otherwise return a result @@ -198,7 +198,7 @@ Bool PolicyShouldCollectWorld(Arena arena, double availableTime, } -/* policyCondemnChain -- condemn approriate parts of this chain +/* policyCondemnChain -- condemn appropriate parts of this chain * * If successful, set *mortalityReturn to an estimate of the mortality * of the condemned parts of this chain and return ResOK. diff --git a/code/pool.c b/code/pool.c index fc04563175..6e7d71dcd0 100644 --- a/code/pool.c +++ b/code/pool.c @@ -59,7 +59,7 @@ Bool PoolClassCheck(PoolClass klass) CHECKL(FUNCHECK(klass->freeSize)); CHECKL(FUNCHECK(klass->addrObject)); - /* Check that pool classes overide sets of related methods. */ + /* Check that pool classes override sets of related methods. */ CHECKL((klass->init == PoolAbsInit) == (klass->instClassStruct.finish == PoolAbsFinish)); CHECKL((klass->bufferFill == PoolNoBufferFill) == diff --git a/code/poolamc.c b/code/poolamc.c index c526c8e56f..b712ce5237 100644 --- a/code/poolamc.c +++ b/code/poolamc.c @@ -83,7 +83,7 @@ enum { /* amcSegStruct -- AMC-specific fields appended to GCSegStruct * * .seg.accounted-as-buffered: The "accountedAsBuffered" flag is TRUE - * if the segment has an atached buffer and is accounted against the + * if the segment has an attached buffer and is accounted against the * pool generation's bufferedSize. But note that if this is FALSE, the * segment might still have an attached buffer -- this happens if the * segment was condemned while the buffer was attached. diff --git a/code/poolawl.c b/code/poolawl.c index 17347d7af5..77b8fb27bd 100644 --- a/code/poolawl.c +++ b/code/poolawl.c @@ -424,7 +424,7 @@ static void AWLNoteScan(Seg seg, ScanState ss) /* This is "successful" scan at proper rank. */ ++ awl->stats.goodScans; if (0 < awlseg->singleAccesses) { - /* Accesses have been proceesed singly. Record that we + /* Accesses have been processed singly. Record that we * genuinely did save a protection-provoked scan */ ++ awl->stats.savedScans; awl->stats.savedAccesses += awlseg->singleAccesses; diff --git a/code/poolmrg.c b/code/poolmrg.c index 426aaf8667..a898634f7d 100644 --- a/code/poolmrg.c +++ b/code/poolmrg.c @@ -679,7 +679,7 @@ static void MRGFinish(Inst inst) /* We call RingRemove on the master node for the rings, thereby */ /* effectively emptying them, but leaving the rest of the ring */ /* "dangling". This is okay as we are about to destroy all the */ - /* segments so the contents of the rings will dissappear soon. */ + /* segments so the contents of the rings will disappear soon. */ /* .finish.no-final: Note that this relies on the fact that no */ /* Guardians are in the FINAL state and hence on the Arena Message */ diff --git a/code/shield.c b/code/shield.c index 180374cfb8..83bdd3e159 100644 --- a/code/shield.c +++ b/code/shield.c @@ -89,7 +89,7 @@ Bool ShieldCheck(Shield shield) remember to sync it before we return to the mutator. */ CHECKL(shield->limit + shield->queuePending >= shield->unsynced); - /* The mutator is suspeneded if there are any holds. */ + /* The mutator is suspended if there are any holds. */ CHECKL(shield->holds == 0 || shield->suspended); /* This is too expensive to check all the time since we have an diff --git a/code/splay.c b/code/splay.c index fc7873480e..2c30583005 100644 --- a/code/splay.c +++ b/code/splay.c @@ -717,7 +717,7 @@ static Compare SplaySplay(SplayTree splay, TreeKey key, #endif /* Short-circuit common cases. Splay trees often bring recently - acccessed nodes to the root. */ + accessed nodes to the root. */ if (SplayTreeIsEmpty(splay) || compare(SplayTreeRoot(splay), key) == CompareEQUAL) return CompareEQUAL; @@ -1337,7 +1337,7 @@ Bool SplayFindLast(Tree *nodeReturn, SplayTree splay, * node affected by the change in properties at the given node (which has * the given key) in an appropriate order. * - * The function fullfils its job by first splaying at the given node, and + * The function fulfils its job by first splaying at the given node, and * updating the single node. In the MPS it is used by the CBS during * coalescing, when the node is likely to be at (or adjacent to) the top * of the tree anyway. diff --git a/code/tagtest.c b/code/tagtest.c index 5568ef493d..e1fa1c3cd9 100644 --- a/code/tagtest.c +++ b/code/tagtest.c @@ -22,7 +22,7 @@ typedef struct cons_s { } cons_s, *cons_t; typedef mps_word_t imm_t; /* Immediate value. */ -typedef mps_word_t fwd_t; /* Fowarding pointer. */ +typedef mps_word_t fwd_t; /* Forwarding pointer. */ static mps_word_t tag_bits; /* Number of tag bits */ static mps_word_t tag_cons; /* Tag bits indicating pointer to cons */ diff --git a/code/trans.c b/code/trans.c index ba7b9b6fb1..7e0f9ec196 100644 --- a/code/trans.c +++ b/code/trans.c @@ -179,7 +179,7 @@ Res TransformAddOldNew(Transform transform, /* .old-white: Old refs must be in managed memory, because transformFix is only reached when a reference is to something - in the condemned set. Other referenes are eliminated by + in the condemned set. Other references are eliminated by TraceFix, and we can't (currently) transformation of them. */ { Seg seg; diff --git a/design/finalize.txt b/design/finalize.txt index 460556bd11..d7f6816f2c 100644 --- a/design/finalize.txt +++ b/design/finalize.txt @@ -114,7 +114,7 @@ is that if an object is finalized multiple times, then multiple guardians are created in the final pool, and so multiple messages will be posted to the message queue when the object is determined to be finalizable. But this behaviour is not guaranteed by the -documentation, leaving us free to change the iplementation. +documentation, leaving us free to change the implementation. _`.int.finalize.write`: Writes a reference to the object into the guardian object. diff --git a/design/freelist.txt b/design/freelist.txt index 6de41928ec..efb510cc28 100644 --- a/design/freelist.txt +++ b/design/freelist.txt @@ -116,7 +116,7 @@ it is merged with adjacent ranges so as to maintain _`.impl.rule.break`: The use of ``freelistEND`` to mark the end of the list violates the rule that exceptional values should not be used to -distinguish exeptional situations. This infraction allows the +distinguish exceptional situations. This infraction allows the implementation to meet `.req.zero-overhead`_. (There are other ways to do this, such as using another tag to indicate the last block in the list, but these would be more complicated.) diff --git a/design/io.txt b/design/io.txt index fb6e8cd605..bfedb2b4aa 100644 --- a/design/io.txt +++ b/design/io.txt @@ -164,7 +164,7 @@ modify their modules. _`.if.msg.dgram`: Neither the MPM nor the external tools should assume that the messages will be delivered in finite time, exactly once, or in order. This will allow the I/O modules to be implemented using -unreliable transport layers such as the Internet User Datagram Protocl +unreliable transport layers such as the Internet User Datagram Protocol (UDP). It will also give the I/O module the freedom to drop information rather than block on a congested network, or stop the memory manager when the disk is full, or similar events which really diff --git a/design/message-gc.txt b/design/message-gc.txt index 7001bc8f50..33b8dafc8b 100644 --- a/design/message-gc.txt +++ b/design/message-gc.txt @@ -139,7 +139,7 @@ collections in those circumstances. _`.req.queue`: Must support a client that enables, but does not promptly retrieve, GC messages. Messages that have not yet been -retrived must remain queued, and the client must be able to retrieve +retrieved must remain queued, and the client must be able to retrieve them later without loss. It is not acceptable to stop issuing GC messages for subsequent collections merely because messages from previous collections have not yet been retrieved. _`.req.queue.why`: @@ -185,7 +185,7 @@ using ``ControlAlloc()``. .. _job001570: https://www.ravenbrook.com/project/mps/issue/job001570/ -Poiters to these messages are stored in ``tsMessage[ti]`` and +Pointers to these messages are stored in ``tsMessage[ti]`` and ``tMessage[ti]`` arrays in the ``ArenaStruct``. .. note:: diff --git a/design/nailboard.txt b/design/nailboard.txt index 515cbd8112..60b402f6fe 100644 --- a/design/nailboard.txt +++ b/design/nailboard.txt @@ -50,7 +50,7 @@ is *no* ambiguous reference to that address, but that can only be established when the trace is complete.) _`.req.range`: A nailboard must be able to determine if any nail is -set in a continguous range. (Because we must preserve the whole object +set in a contiguous range. (Because we must preserve the whole object if there is any ambiguous reference to it.) _`.req.range.cost`: Determining if any nail is set in a continuous diff --git a/design/object-debug.txt b/design/object-debug.txt index 29ecc496fe..c062a7e246 100644 --- a/design/object-debug.txt +++ b/design/object-debug.txt @@ -130,7 +130,7 @@ in the fencepost pattern. Possibly something like this (while we could still store the parameters in the pool or allocation point, there seems little point in doing so in this case, and having them as explicit parameters to the macros allows the client to specify -constants to gain effiency):: +constants to gain efficiency):: #define mps_add_fencepost(size, fp_size) #define mps_fill_fenceposts(obj, size, fp_size, fp_pattern) @@ -227,7 +227,7 @@ problem; we can turn features on or off with pool init parameters. _`.fence.pool.abstract`: We could simply use pool init parameters only to control all debugging features (optargs would be useful here). -While there migh be subclasses and wrappers internally, the client +While there might be subclasses and wrappers internally, the client would only see a single pool class; in the internal view, this would be an abstract class, and the parameters would determine which concrete class actually gets instantiated. @@ -325,7 +325,7 @@ _`.interface.fenceposting.format`: A function to wrap a format ``typedef void (*mps_fmt_adjust_fencepost_t)(size_t *size_io)`` _`.interface.fenceposting.adjust`: A format method to adjust size of a -block about to be allocted to allow for fenceposts. +block about to be allocated to allow for fenceposts. ``typedef void (*mps_fmt_put_fencepost_t)(mps_addr_t * addr_io, size_t size)`` diff --git a/design/pool.txt b/design/pool.txt index f0c25a4e76..5dc7b02736 100644 --- a/design/pool.txt +++ b/design/pool.txt @@ -45,7 +45,7 @@ _`.struct.outer`: The *outer structure* of a pool belonging to the ABC pool class is a C object of type ``ABCPoolStruct``, which is a typedef for ``struct PoolABCStruct``. -_`.stuct.outer.sig`: See `design.mps.sig.field.end.outer`_. +_`.struct.outer.sig`: See `design.mps.sig.field.end.outer`_. .. _design.mps.sig.field.end.outer: sig.txt#field-end-outer diff --git a/design/poolams.txt b/design/poolams.txt index 3110b3f1d1..90c391e102 100644 --- a/design/poolams.txt +++ b/design/poolams.txt @@ -219,7 +219,7 @@ white sets, each trace needs its own set of tables. _`.colour.check`: The grey-and-non-white state is illegal, and free objects must be white as explained in -analysis.non-moving-colour.contraint.reclaim. +analysis.non-moving-colour.constraint.reclaim. Iteration diff --git a/design/poolmvt.txt b/design/poolmvt.txt index 4857e9ed9b..55a62db507 100644 --- a/design/poolmvt.txt +++ b/design/poolmvt.txt @@ -171,10 +171,10 @@ with a particular response time or throughput, just so long as we don't block for too long. Clearly there is a missing requirement.] _`.req.attr.performance.time`: By inference, the time overhead must be -competetive. +competitive. _`.req.attr.performance.space`: By inference, the space overhead must -be competetive. +be competitive. _`.req.attr.reliability`: The pool class must have "rock-solid reliability" (source: req.dylan.attr.rel.mtbf, req.epcore.attr.rel, diff --git a/design/prot.txt b/design/prot.txt index ba642b6c20..4df68869f7 100644 --- a/design/prot.txt +++ b/design/prot.txt @@ -108,7 +108,7 @@ if write accesses to the range are to be forbidden, and contains the ``AccessREAD`` bit if read accesses to the range are to be forbidden. _`.if.set.read`: If the request is to forbid read accesses (that is, -``AccessREAD`` is set) then the implemntation may also forbid write +``AccessREAD`` is set) then the implementation may also forbid write accesses, but read accesses must not be forbidden unless ``AccessREAD`` is set. diff --git a/design/pthreadext.txt b/design/pthreadext.txt index 63b4f29ff2..6099920358 100644 --- a/design/pthreadext.txt +++ b/design/pthreadext.txt @@ -213,10 +213,10 @@ object with other objects corresponding to the same thread (same suspended state, or when this is the only ``PThreadext`` object with this ``id`` in the suspended state, this ring is single. -_`.impl.global.suspend-ring`: The module maintains a global varaible +_`.impl.global.suspend-ring`: The module maintains a global variable ``suspendedRing``, a ring of ``PThreadext`` objects which are in a suspended state. This is primarily so that it's possible to determine -whether a thread is curently suspended anyway because of another +whether a thread is currently suspended anyway because of another ``PThreadext`` object, when a suspend attempt is made. _`.impl.global.victim`: The module maintains a global variable diff --git a/design/range.txt b/design/range.txt index e3c1050b32..990352802a 100644 --- a/design/range.txt +++ b/design/range.txt @@ -130,7 +130,7 @@ Document history - 2013-05-21 GDR_ Created. - 2014-01-15 GDR_ Added ``RangeContains()``. -- 2016-03-27 RB_ Addded ``RangeSetBase()`` and ``RangeSetLimit()``. +- 2016-03-27 RB_ Added ``RangeSetBase()`` and ``RangeSetLimit()``. .. _GDR: https://www.ravenbrook.com/consultants/gdr/ .. _RB: https://www.ravenbrook.com/consultants/rb/ diff --git a/design/strategy.txt b/design/strategy.txt index c478cb19b1..f541d0275a 100644 --- a/design/strategy.txt +++ b/design/strategy.txt @@ -267,7 +267,7 @@ Debit *total*, credit *free*. (But see `.account.total.negated`_.) _`.accounting.op.free`: Free a segment. First, ensure that the contents of the segment are accounted as free, by artificially ageing any memory accounted as *new* or *newDeferred* (see -`.accounting.op.age`_) and then artifically reclaiming any memory +`.accounting.op.age`_) and then artificially reclaiming any memory accounted as *old* or *oldDeferred* (see `.accounting.op.reclaim`_). Finally, debit *free*, credit *total*. (But see `.account.total.negated`_.) diff --git a/design/write-barrier.txt b/design/write-barrier.txt index c63605e900..274c24b6f4 100644 --- a/design/write-barrier.txt +++ b/design/write-barrier.txt @@ -94,7 +94,7 @@ _`.deferral.reset`: The count is reset after three events: 3. a barrier hit (``WB_DEFER_HIT``) -_`.deferral.dabble`: The set of objects condemend by the garbage +_`.deferral.dabble`: The set of objects condemned by the garbage collector changes, and so does what is interesting or boring. For example, a collection of a nursery space in zone 3 might be followed by a collection of a top generation in zone 7. This will upset @@ -107,7 +107,7 @@ Improvements _`.improv.by-os`: The overheads hardware barriers varies widely between operating systems. On Windows it is very cheap to change memory -protection and to handle protecion faults. On macOS it is very +protection and to handle protection faults. On macOS it is very expensive. The balance between barriers and scanning work is different. We should measure the relative costs and tune the deferral for each separately. diff --git a/manual/source/release.rst b/manual/source/release.rst index 2f84da833e..aaa57918b3 100644 --- a/manual/source/release.rst +++ b/manual/source/release.rst @@ -846,7 +846,7 @@ New features #. The new pool class :ref:`pool-mvt` provides manually managed allocation of variable-size objects using a *temporal fit* - allocation policy (that is, objects that are allocated togther are + allocation policy (that is, objects that are allocated together are expected to be freed together). diff --git a/manual/source/topic/arena.rst b/manual/source/topic/arena.rst index 61302d249a..e661135c98 100644 --- a/manual/source/topic/arena.rst +++ b/manual/source/topic/arena.rst @@ -1172,7 +1172,7 @@ not access any memory managed by the MPS. .. note:: - The extenstion callback is also called immediately after the arena + The extension callback is also called immediately after the arena is created, in other words, the creation of the arena is treated as a special example of an extension of the arena. diff --git a/manual/source/topic/cache.rst b/manual/source/topic/cache.rst index 1f2e7a2dbf..5ddc5bc3e6 100644 --- a/manual/source/topic/cache.rst +++ b/manual/source/topic/cache.rst @@ -36,7 +36,7 @@ Allocations through the cache (using :c:func:`mps_sac_alloc` or :c:macro:`MPS_SAC_ALLOC_FAST`) are serviced from the cache if possible, otherwise from the pool. Similarly, deallocations through the cache (using :c:func:`mps_sac_free` or :c:macro:`MPS_SAC_FREE_FAST`) return -the block to the appopriate free list for its size. For example:: +the block to the appropriate free list for its size. For example:: Foo *foo; mps_addr_t p; diff --git a/manual/source/topic/debugging.rst b/manual/source/topic/debugging.rst index 8223badf14..53c52ae6be 100644 --- a/manual/source/topic/debugging.rst +++ b/manual/source/topic/debugging.rst @@ -42,7 +42,7 @@ debugging: :dfn:`free space splatting` overwrites recycled space with a pattern of data. If the pattern is designed so that it does not resemble a live object (and if code checks the consistency of its data - structues), then this helps to detect :term:`dangling pointer` + structures), then this helps to detect :term:`dangling pointer` dereferences. The pattern is checked just before allocation, and when a block of memory is released from the pool to the arena, to see that it is unchanged. All free space in a pool can be checked diff --git a/manual/source/topic/format.rst b/manual/source/topic/format.rst index 5dea36eaa1..4fea3e1587 100644 --- a/manual/source/topic/format.rst +++ b/manual/source/topic/format.rst @@ -27,7 +27,7 @@ the means by which the client program communicates this information to the MPS. An object format is a collection of :term:`format methods` and other -(usually scalar) values which together describe programatically the +(usually scalar) values which together describe programmatically the layout of objects belonging to the format. Format methods include the :term:`skip method` (which calculates an object's size), the :term:`scan method` (which :term:`fixes ` references in the diff --git a/manual/source/topic/location.rst b/manual/source/topic/location.rst index aa70a07168..e68554612c 100644 --- a/manual/source/topic/location.rst +++ b/manual/source/topic/location.rst @@ -321,7 +321,7 @@ Location dependency interface Otherwise, :c:func:`mps_ld_isstale` may return either true or false. (The function strives to return true in the case where - ``addr`` was added to the location dependency and subsquently + ``addr`` was added to the location dependency and subsequently moved, and false otherwise, but cannot ensure this.) .. note:: @@ -356,7 +356,7 @@ Location dependency interface Otherwise, :c:func:`mps_ld_isstale_any` may return either true or false. (The function strives to return true in the case where a - block was added to the location dependency and subsquently moved, + block was added to the location dependency and subsequently moved, and false otherwise, but cannot ensure this.) .. note:: diff --git a/test/function/120.c b/test/function/120.c index c25abd1d86..1a36f0873a 100644 --- a/test/function/120.c +++ b/test/function/120.c @@ -64,7 +64,7 @@ static void test(void *stack_pointer) die(mps_alloc(&a, pool, (size_t) 64), "alloc"); } /* shouldn't be possible to set the commit limit to less than the amount - currently commited */ + currently committed */ report_res("com_less", mps_arena_commit_limit_set(arena, mps_arena_committed(arena)-1)); diff --git a/test/function/235.c b/test/function/235.c index 740297ab24..dded4b127a 100644 --- a/test/function/235.c +++ b/test/function/235.c @@ -43,7 +43,7 @@ static void test(void *stack_pointer) to the free land. 2. We are freeing every other object, and so each object is an - isolated continguous free range and so requires an additional CBS + isolated contiguous free range and so requires an additional CBS block. 3. Eventually the free land's block pool runs out of memory and diff --git a/test/function/237.c b/test/function/237.c index 20e01ab66d..42244c6d12 100644 --- a/test/function/237.c +++ b/test/function/237.c @@ -59,7 +59,7 @@ static void test(void *stack_pointer) * hit (if it fails to halt the thread once, it assumes the thread is * no longer alive and will no longer try to halt it again). As such, * we terminate the thread when we have found a page that will trigger - * the hit. Then, we can call SetLastError() with som error code, read + * the hit. Then, we can call SetLastError() with some error code, read * from the memory with a barrier. This triggers the exception * handler, which will realize that it needs to scan the particular * page, and thus need to stop threads. In this case, we know that the @@ -67,7 +67,7 @@ static void test(void *stack_pointer) * GetLastError(). Then we can verify that the main thread does not * observe this change. This serves as a good (and hopefully, * reliable) illustration of what could happen, even if it is - * tecnically a bad thing to have a terminated thread registered with + * technically a bad thing to have a terminated thread registered with * the MPS. */ diff --git a/test/function/43.c b/test/function/43.c index c34e602579..8adad09682 100644 --- a/test/function/43.c +++ b/test/function/43.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = regresion test for request.dylan.170461 + summary = regression test for request.dylan.170461 language = c link = testlib.o awlfmt.o END_HEADER diff --git a/test/function/503.txt b/test/function/503.txt index f552d3c3e2..d71e385506 100644 --- a/test/function/503.txt +++ b/test/function/503.txt @@ -25,7 +25,7 @@ them with wi by running tests and measuring times. Tests to run: - MMQA_test_function!{77,78,79,80}.c and others It's not quite clear in the quote above whether "a slow-down of -more than 10%" means a slow down in memory-managament time, or +more than 10%" means a slow down in memory-management time, or a slow down in total application time. I take it to refer to a slow-down in memory-management time, given a typical pattern of allocation, freeing, &c. Therefore if, say, Dylan goes 5% slower diff --git a/test/test/script/help/naming b/test/test/script/help/naming index 851679b0f6..f84c4e8c88 100644 --- a/test/test/script/help/naming +++ b/test/test/script/help/naming @@ -1,7 +1,7 @@ Numbering of test programs % $Id$ -Test program are indentified by their hope names, i.e. by a hope +Test program are identified by their hope names, i.e. by a hope compound, an exclamation mark, and the test file name. The test file name will usually be a number followed by .c. diff --git a/test/test/script/help/options b/test/test/script/help/options index f22a155965..05c78fd7b7 100644 --- a/test/test/script/help/options +++ b/test/test/script/help/options @@ -34,7 +34,7 @@ MMQA_LOG_DIR / -g 'log' directory inside the MMQA 'test' directory. MMQA_DATA_DIR / -data - the diretory in which MMQA data files may be found. Default is + the directory in which MMQA data files may be found. Default is '../data' from the MMQA 'test' directory. This is used when tests specify a particular file as their standard input. If you specify the standard input with MMQA_STDIN, the current directory is used. diff --git a/test/test/script/help/output b/test/test/script/help/output index f3a585e9b0..546f9c0c3d 100644 --- a/test/test/script/help/output +++ b/test/test/script/help/output @@ -30,7 +30,7 @@ the eventual test output. The processing program will pass straight through all lines beginning with %, and all blank lines. It will strip a ! from the beginning of any line which begins with one (use for !=), -and do platform-speciic stuff on all the remaining lines. +and do platform-specific stuff on all the remaining lines. It will complain about (at least) the first line it doesn't understand. diff --git a/test/test/testlib/awlfmt.c b/test/test/testlib/awlfmt.c index 0977d0de6d..13052ccc88 100644 --- a/test/test/testlib/awlfmt.c +++ b/test/test/testlib/awlfmt.c @@ -1,6 +1,6 @@ /* $Id$ awlfmt.c - A format simlar to newfmt, but for the awl pool + A format similar to newfmt, but for the awl pool */ #include "awlfmt.h" diff --git a/test/test/testlib/preBQ.h b/test/test/testlib/preBQ.h index a2f48ebd7f..469ceda809 100644 --- a/test/test/testlib/preBQ.h +++ b/test/test/testlib/preBQ.h @@ -1,6 +1,6 @@ /* $Id$ Before baroque interface; - - nothing was different. Only change in BQ is inclusing of mpsw3.h. + - nothing was different. Only change in BQ is including of mpsw3.h. */ #include "preHU.h" diff --git a/test/test/testlib/testlib.c b/test/test/testlib/testlib.c index 3ce8a44e37..7aa7475d61 100644 --- a/test/test/testlib/testlib.c +++ b/test/test/testlib/testlib.c @@ -225,7 +225,7 @@ void asserts(int expr, const char *format, ...) /* routines for easy use of the MPS */ -/* my own assertion handler, insalled by run_test */ +/* my own assertion handler, installed by run_test */ static void mmqa_assert_handler(const char *cond, const char *id, const char *file, unsigned line) diff --git a/tool/monitor b/tool/monitor index 49437e48c2..46ff2ab902 100755 --- a/tool/monitor +++ b/tool/monitor @@ -4,7 +4,7 @@ # Copyright (c) 2018-2020 Ravenbrook Limited. See end of file for license. # # Read a telemetry stream from a program using the MPS, construct a -# model of the MPS data structures in the progam, and display selected +# model of the MPS data structures in the program, and display selected # time series from the model in a graphical user interface. # # Requirements: Python 3.6, Matplotlib, PyQt5. @@ -1245,7 +1245,7 @@ class ErrorReporter(ContextDecorator): # help documentation. # # Otherwise the members of `iterable` are presentation names of key -# presses. After convertion via the event_key function, they are matched +# presses. After conversion via the event_key function, they are matched # against `event.key` for MPL key press events. So `iterable` may be a # single character, or a short string (whose individual characters are # the keys), or an iterable of strings.