Skip to content

Commit e697ceb

Browse files
committed
Merging branch/2023-02-13/fix-typos for GitHub pull request #149 <#149>.
2 parents 0a27a84 + 670bb0c commit e697ceb

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

code/eventdef.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@
608608
PARAM(X, 0, P, trace, "the trace") \
609609
PARAM(X, 1, P, arena, "trace's arena") \
610610
PARAM(X, 2, W, fixRefCount, "references which pass zone check") \
611-
PARAM(X, 3, W, segRefCount, "referencess which refer to segments") \
611+
PARAM(X, 3, W, segRefCount, "references which refer to segments") \
612612
PARAM(X, 4, W, whiteSegRefCount, "references which refer to white segments") \
613613
PARAM(X, 5, W, nailCount, "segments nailed by ambiguous references") \
614614
PARAM(X, 6, W, snapCount, "references snapped to forwarded objects") \
@@ -654,7 +654,7 @@
654654

655655
#define EVENT_VMCompact_PARAMS(PARAM, X) \
656656
PARAM(X, 0, W, vmem0, "pre-collection reserved size") \
657-
PARAM(X, 1, W, vmem1, "pre-compact reseved size") \
657+
PARAM(X, 1, W, vmem1, "pre-compact reserved size") \
658658
PARAM(X, 2, W, vmem2, "post-compact reserved size")
659659

660660
#define EVENT_VMFinish_PARAMS(PARAM, X) \

code/freelist.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ static void freelistBlockSetLimit(Freelist fl, FreelistBlock block, Addr limit)
147147
}
148148

149149

150-
/* freelistBlockInit -- initalize block storing the range [base, limit). */
150+
/* freelistBlockInit -- initialize block storing the range [base, limit). */
151151

152152
static FreelistBlock freelistBlockInit(Freelist fl, Addr base, Addr limit)
153153
{
@@ -714,7 +714,7 @@ static Res freelistFindInZones(Bool *foundReturn, Range rangeReturn,
714714

715715
/* freelistDescribeVisitor -- visitor method for freelistDescribe
716716
*
717-
* Writes a decription of the range into the stream pointed to by
717+
* Writes a description of the range into the stream pointed to by
718718
* closure.
719719
*/
720720

code/misc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ typedef const struct SrcIdStruct {
7979
/* NOOP -- null statement
8080
*
8181
* Do not be tempted to use NULL, or just semicolon as the null
82-
* statement. These items are dangerously ambigous and could cause
82+
* statement. These items are dangerously ambiguous and could cause
8383
* subtle bugs if misplaced. NOOP is a macro which is guaranteed to
8484
* cause an error if it is not used in a statement context.
8585
*/
@@ -146,7 +146,7 @@ typedef const struct SrcIdStruct {
146146

147147
/* UNUSED -- declare parameter unused
148148
*
149-
* This macro supresses warnings about unused parameters. It should be
149+
* This macro suppresses warnings about unused parameters. It should be
150150
* applied to the parameter at the beginning of the body of the
151151
* procedure.
152152
*

code/mpmtypes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ enum {
327327

328328
/* Root Variants -- see <design/type#.rootvar>
329329
*
330-
* .rootvar: Synchonize with <code/root.c#rootvarcheck>
330+
* .rootvar: Synchronize with <code/root.c#rootvarcheck>
331331
*/
332332

333333
enum {

code/mpslib.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
extern int mps_lib_get_EOF(void);
2222
#define mps_lib_EOF (mps_lib_get_EOF())
2323

24-
/* An anonymous structure type used to represent files. Analagous to
24+
/* An anonymous structure type used to represent files. Analogous to
2525
`FILE *` from stdio.h. */
2626
typedef struct mps_lib_stream_s mps_lib_FILE;
2727

28-
/* Return the standard output and standard error streams. Analagous to
28+
/* Return the standard output and standard error streams. Analogous to
2929
`stdout` and `stderr` from stdio.h. */
3030
extern mps_lib_FILE *mps_lib_get_stderr(void);
3131
extern mps_lib_FILE *mps_lib_get_stdout(void);
3232
#define mps_lib_stderr (mps_lib_get_stderr())
3333
#define mps_lib_stdout (mps_lib_get_stdout())
3434

35-
/* Send a character or string to a stream. Analagous to `fputc` and `fputs`
35+
/* Send a character or string to a stream. Analogous to `fputc` and `fputs`
3636
from stdio.h. */
3737
extern int mps_lib_fputc(int, mps_lib_FILE *);
3838
extern int mps_lib_fputs(const char *, mps_lib_FILE *);
@@ -55,7 +55,7 @@ typedef void (*mps_lib_assert_fail_t)(const char *, unsigned, const char *);
5555
extern mps_lib_assert_fail_t mps_lib_assert_fail_install(mps_lib_assert_fail_t);
5656

5757

58-
/* Set, copy, or compare memory. Analagous to `memset`, `memcpy`, and
58+
/* Set, copy, or compare memory. Analogous to `memset`, `memcpy`, and
5959
`memcmp` from string.h. */
6060
extern void *(mps_lib_memset)(void *, int, size_t);
6161
extern void *(mps_lib_memcpy)(void *, const void *, size_t);

code/poolamc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static Res amcSegFixEmergency(Seg seg, ScanState ss, Ref *refIO);
3535
static void amcSegWalk(Seg seg, Format format, FormattedObjectsVisitor f,
3636
void *p, size_t s);
3737

38-
/* local class declations */
38+
/* local class declarations */
3939

4040
typedef AMC AMCZPool;
4141
#define AMCZPoolCheck AMCCheck

code/poollo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ static void loSegReclaim(Seg seg, Trace trace)
312312
Buffer buffer;
313313
Bool hasBuffer = SegBuffer(&buffer, seg);
314314
Count reclaimedGrains = (Count)0;
315-
Format format = NULL; /* supress "may be used uninitialized" warning */
315+
Format format = NULL; /* suppress "may be used uninitialized" warning */
316316
Count preservedInPlaceCount = (Count)0;
317317
Size preservedInPlaceSize = (Size)0;
318318
Bool b;

code/root.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Bool RootModeCheck(RootMode mode)
9595

9696
/* RootCheck -- check the consistency of a root structure
9797
*
98-
* .rootcheck: Keep synchonized with <code/mpmst.h#root>. */
98+
* .rootcheck: Keep synchronized with <code/mpmst.h#root>. */
9999

100100
Bool RootCheck(Root root)
101101
{

design/poolamc.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ The reasons why a segment and its pages might be retained are:
283283

284284
#. ambiguous reference to first-obj: unavoidable page retention (only
285285
the mutator can reduce this, if they so wish, by nulling out ambig
286-
referencess);
286+
references);
287287
#. ambiguous reference to rest-obj: tuning MPS LSP policy could
288288
mitigate this, reducing the likelihood of rest-objs being
289289
co-located with large first-objs;
@@ -459,7 +459,7 @@ chooses exactly one of three options:
459459
broken heart's forwarding pointer.
460460

461461
If the rank of the reference is ``RankAMBIG`` then it either does (1)
462-
or (2) depending on wether there is an existing nailboard or not.
462+
or (2) depending on whether there is an existing nailboard or not.
463463
Otherwise (the rank is exact or higher) if there is a broken heart it
464464
is used to snapout the pointer. Otherwise it is as for an
465465
``RankAMBIG`` reference: we either do (1) or (2).
@@ -521,7 +521,7 @@ _`.struct.pool`: Like other pool class instances, it contains a
521521

522522
_`.struct.format`: The ``format`` field points to a ``Format``
523523
structure describing the object format of objects allocated in the
524-
pool. The field is intialized by ``AMCInit()`` from a parameter, and
524+
pool. The field is initialized by ``AMCInit()`` from a parameter, and
525525
thereafter it is not changed until the pool is destroyed.
526526

527527
.. note::

tool/monitor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ class Trace(EventHandler):
642642
self.add_count('snaps', event.snapCount)
643643
self.add_count('forwarded', event.forwardedCount)
644644
self.add_size('forwarded', event.forwardedSize)
645-
self.add_count('preseved in place', event.preservedInPlaceCount)
645+
self.add_count('preserved in place', event.preservedInPlaceCount)
646646
self.add_size('preserved in place', event.preservedInPlaceSize)
647647

648648
def TraceStatReclaim(self, t, event):

0 commit comments

Comments
 (0)