From f619ed31b3a2ff360c1a8a92359f272107935cca Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 14 Sep 2023 19:27:53 +0200 Subject: [PATCH] Fixed a few typos (#65) --- bin/parser.cpp | 2 +- bin/template_parser.cpp | 2 +- cpu/CpuIntegration.c | 2 +- cpu/CpuModule_Disassembler.c | 2 +- cpu/CpuModule_Exceptions.c | 2 +- cpu/CpuModule_Logging.c | 2 +- cpu/fmem.c | 4 ++-- macos/errors.h | 26 +++++++++++++------------- macos/sysequ.h | 2 +- macos/traps.h | 2 +- mplite/pstdint.h | 2 +- toolbox/mm.cpp | 2 +- toolbox/rm.cpp | 2 +- verbatim/Templates.text | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bin/parser.cpp b/bin/parser.cpp index b4e0305..0af101f 100644 --- a/bin/parser.cpp +++ b/bin/parser.cpp @@ -13,7 +13,7 @@ ** ** The "lemon" program processes an LALR(1) input grammar file, then uses ** this template to construct a parser. The "lemon" program inserts text -** at each "%%" line. Also, any "P-a-r-s-e" identifer prefix (without the +** at each "%%" line. Also, any "P-a-r-s-e" identifier prefix (without the ** interstitial "-" characters) contained in this template is changed into ** the value of the %name directive from the grammar. Otherwise, the content ** of this template is copied straight through into the generate parser diff --git a/bin/template_parser.cpp b/bin/template_parser.cpp index 660b166..fd149cb 100644 --- a/bin/template_parser.cpp +++ b/bin/template_parser.cpp @@ -13,7 +13,7 @@ ** ** The "lemon" program processes an LALR(1) input grammar file, then uses ** this template to construct a parser. The "lemon" program inserts text -** at each "%%" line. Also, any "P-a-r-s-e" identifer prefix (without the +** at each "%%" line. Also, any "P-a-r-s-e" identifier prefix (without the ** interstitial "-" characters) contained in this template is changed into ** the value of the %name directive from the grammar. Otherwise, the content ** of this template is copied straight through into the generate parser diff --git a/cpu/CpuIntegration.c b/cpu/CpuIntegration.c index 57590b7..7bef9f9 100644 --- a/cpu/CpuIntegration.c +++ b/cpu/CpuIntegration.c @@ -152,7 +152,7 @@ ULO cpuIntegrationGetChipInterruptNumber(void) } // A wrapper for cpuSetIrqLevel that restarts the -// scheduling of cpu events if the cpu was stoppped +// scheduling of cpu events if the cpu was stopped void cpuIntegrationSetIrqLevel(ULO new_interrupt_level, ULO chip_interrupt_number) { if (cpuSetIrqLevel(new_interrupt_level)) diff --git a/cpu/CpuModule_Disassembler.c b/cpu/CpuModule_Disassembler.c index e1b4b32..f0d0388 100644 --- a/cpu/CpuModule_Disassembler.c +++ b/cpu/CpuModule_Disassembler.c @@ -1394,7 +1394,7 @@ static ULO cpuDisMovec(ULO prc, UWO opc, STR *sdata, STR *sinstruction, STR *sop case 0x002: /* CACR, Cache control register XX2346 */ strcat(soperands, "CACR"); break; - case 0x802: /* CAAR, Cache adress register XX2346 */ + case 0x802: /* CAAR, Cache address register XX2346 */ strcat(soperands, "CAAR"); break; case 0x803: /* MSP, Master stack pointer XX234X */ diff --git a/cpu/CpuModule_Exceptions.c b/cpu/CpuModule_Exceptions.c index 717646f..f53586f 100644 --- a/cpu/CpuModule_Exceptions.c +++ b/cpu/CpuModule_Exceptions.c @@ -165,7 +165,7 @@ void cpuThrowException(ULO vector_offset, ULO pc, BOOLE executejmp) void cpuThrowPrivilegeViolationException(void) { // The saved pc points to the instruction causing the violation - // (And the kickstart excpects pc in the stack frame to be the opcode PC.) + // (And the kickstart expects pc in the stack frame to be the opcode PC.) cpuThrowException(0x20, cpuGetOriginalPC(), FALSE); } diff --git a/cpu/CpuModule_Logging.c b/cpu/CpuModule_Logging.c index 026dd7d..1fe9517 100644 --- a/cpu/CpuModule_Logging.c +++ b/cpu/CpuModule_Logging.c @@ -28,7 +28,7 @@ #ifdef CPU_INSTRUCTION_LOGGING -/* Function for logging the intruction execution */ +/* Function for logging the instruction execution */ static cpuInstructionLoggingFunc cpu_instruction_logging_func; static cpuExceptionLoggingFunc cpu_exception_logging_func; static cpuInterruptLoggingFunc cpu_interrupt_logging_func; diff --git a/cpu/fmem.c b/cpu/fmem.c index 1cac266..fb82050 100644 --- a/cpu/fmem.c +++ b/cpu/fmem.c @@ -285,7 +285,7 @@ const STR *memory_kickimage_versionstrings[14] = { /*============================================================================*/ /* Set read and write stubs for a bank, as well as a direct pointer to */ /* its memory. NULL pointer is passed when the memory must always be */ - /* read through the stubs, like in a bank of regsters where writing */ + /* read through the stubs, like in a bank of registers where writing */ /* or reading the value generates side-effects. */ /* Datadirect is TRUE when data accesses can be made through a pointer */ /*============================================================================*/ @@ -1246,7 +1246,7 @@ const STR *memory_kickimage_versionstrings[14] = { } /*============================================================================*/ - /* An error occured during loading a kickstart file. Uses GUI to display */ + /* An error occurred during loading a kickstart file. Uses GUI to display */ /* an errorstring. */ /*============================================================================*/ diff --git a/macos/errors.h b/macos/errors.h index 7a7f967..e5139be 100644 --- a/macos/errors.h +++ b/macos/errors.h @@ -107,7 +107,7 @@ enum macos_error { envVersTooBig = -5502, /*Version bigger than call can handle*/ fontDecError = -64, /*error during font declaration*/ fontNotDeclared = -65, /*font not declared*/ - fontSubErr = -66, /*font substitution occured*/ + fontSubErr = -66, /*font substitution occurred*/ fontNotOutlineErr = -32615, /*bitmap font passed to routine that does outlines only*/ firstDskErr = -84, /*I/O System Errors*/ lastDskErr = -64, /*I/O System Errors*/ @@ -196,7 +196,7 @@ enum macos_error { rgnTooBigErr = -500, updPixMemErr = -125, /*insufficient memory to update a pixmap*/ pictInfoVersionErr = -11000, /* wrong version of the PictInfo structure */ - pictInfoIDErr = -11001, /* the internal consistancy check for the PictInfoID is wrong */ + pictInfoIDErr = -11001, /* the internal consistency check for the PictInfoID is wrong */ pictInfoVerbErr = -11002, /* the passed verb was invalid */ cantLoadPickMethodErr = -11003, /* unable to load the custom pick proc */ colorsRequestedErr = -11004, /* the number of colors requested was illegal */ @@ -249,7 +249,7 @@ enum macos_error { smEmptySlot = -300, /*No card in slot*/ smCRCFail = -301, /*CRC check failed for declaration data*/ smFormatErr = -302, /*FHeader Format is not Apple's*/ - smRevisionErr = -303, /*Wrong revison level*/ + smRevisionErr = -303, /*Wrong revision level*/ smNoDir = -304, /*Directory offset is Nil */ smDisabledSlot = -305, /*This slot is disabled (-305 use to be smLWTstBad)*/ smNosInfoArray = -306, /*No sInfoArray. Memory Mgr error.*/ @@ -258,14 +258,14 @@ enum macos_error { smResrvErr = -307, /*Fatal reserved error. Resreved field <> 0.*/ smUnExBusErr = -308, /*Unexpected BusError*/ smBLFieldBad = -309, /*ByteLanes field was bad.*/ - smFHBlockRdErr = -310, /*Error occured during _sGetFHeader.*/ - smFHBlkDispErr = -311, /*Error occured during _sDisposePtr (Dispose of FHeader block).*/ + smFHBlockRdErr = -310, /*Error occurred during _sGetFHeader.*/ + smFHBlkDispErr = -311, /*Error occurred during _sDisposePtr (Dispose of FHeader block).*/ smDisposePErr = -312, /*_DisposePointer error*/ smNoBoardSRsrc = -313, /*No Board sResource.*/ - smGetPRErr = -314, /*Error occured during _sGetPRAMRec (See SIMStatus).*/ + smGetPRErr = -314, /*Error occurred during _sGetPRAMRec (See SIMStatus).*/ smNoBoardId = -315, /*No Board Id.*/ smInitStatVErr = -316, /*The InitStatusV field was negative after primary or secondary init.*/ - smInitTblVErr = -317, /*An error occured while trying to initialize the Slot Resource Table.*/ + smInitTblVErr = -317, /*An error occurred while trying to initialize the Slot Resource Table.*/ smNoJmpTbl = -318, /*SDM jump table could not be created.*/ smBadBoardId = -319, /*BoardId was wrong; re-init the PRAM record.*/ smBusErrTO = -320, /*BusError time out.*/ @@ -285,20 +285,20 @@ but a special error is needed to patch secondary inits.*/ smCPUErr = -334, /*Code revision is wrong*/ smsPointerNil = -335, /*LPointer is nil From sOffsetData. If this error occurs; check sInfo rec for more information.*/ - smNilsBlockErr = -336, /*Nil sBlock error (Dont allocate and try to use a nil sBlock)*/ + smNilsBlockErr = -336, /*Nil sBlock error (Don't allocate and try to use a nil sBlock)*/ smSlotOOBErr = -337, /*Slot out of bounds error*/ smSelOOBErr = -338, /*Selector out of bounds error*/ smNewPErr = -339, /*_NewPtr error*/ smBlkMoveErr = -340, /*_BlockMove error*/ smCkStatusErr = -341, /*Status of slot = fail.*/ - smGetDrvrNamErr = -342, /*Error occured during _sGetDrvrName.*/ - smDisDrvrNamErr = -343, /*Error occured during _sDisDrvrName.*/ + smGetDrvrNamErr = -342, /*Error occurred during _sGetDrvrName.*/ + smDisDrvrNamErr = -343, /*Error occurred during _sDisDrvrName.*/ smNoMoresRsrcs = -344, /*No more sResources*/ smsGetDrvrErr = -345, /*Error occurred during _sGetDriver.*/ smBadsPtrErr = -346, /*Bad pointer was passed to sCalcsPointer*/ smByteLanesErr = -347, /*NumByteLanes was determined to be zero.*/ smOffsetErr = -348, /*Offset was too big (temporary error*/ - smNoGoodOpens = -349, /*No opens were successfull in the loop.*/ + smNoGoodOpens = -349, /*No opens were successful in the loop.*/ smSRTOvrFlErr = -350, /*SRT over flow.*/ smRecNotFnd = -351, /*Record not found in the SRT.*/ editionMgrInitErr = -450, /*edition manager not inited by this app*/ @@ -333,7 +333,7 @@ but a special error is needed to patch secondary inits.*/ interruptsMaskedErr = -624, /*don't call with interrupts masked*/ cannotDeferErr = -625, /*unable to defer additional functions*/ - ddpSktErr = -91, /*error in soket number*/ + ddpSktErr = -91, /*error in socket number*/ ddpLenErr = -92, /*data length too big*/ noBridgeErr = -93, /*no network bridge for non-local send*/ lapProtErr = -94, /*error in attaching/detaching protocol*/ @@ -453,7 +453,7 @@ but a special error is needed to patch secondary inits.*/ noDefaultUserErr = -922, /* user hasn't typed in owners name in Network Setup Control Pannel */ notLoggedInErr = -923, /* The default userRefNum does not yet exist */ noUserRefErr = -924, /* unable to create a new userRefNum */ - networkErr = -925, /* An error has occured in the network, not too likely */ + networkErr = -925, /* An error has occurred in the network, not too likely */ noInformErr = -926, /* PPCStart failed because destination did not have inform pending */ authFailErr = -927, /* unable to authenticate user at destination */ noUserRecErr = -928, /* Invalid user reference number */ diff --git a/macos/sysequ.h b/macos/sysequ.h index ff1afab..9c3a205 100644 --- a/macos/sysequ.h +++ b/macos/sysequ.h @@ -60,7 +60,7 @@ enum { SMGlobals = 0x0CC4, /* (long) pointer to Sound Manager Globals*/ TheGDevice = 0x0CC8, /*[GLOBAL VAR] (long) the current graphics device*/ CQDGlobals = 0x0CCC, /* (long) quickDraw global extensions*/ - ADBBase = 0x0CF8, /*[GLOBAL VAR] (long) pointer to Front Desk Buss Variables*/ + ADBBase = 0x0CF8, /*[GLOBAL VAR] (long) pointer to Front Desk Bus Variables*/ WarmStart = 0x0CFC, /*[GLOBAL VAR] (long) flag to indicate it is a warm start*/ TimeDBRA = 0x0D00, /*[GLOBAL VAR] (word) number of iterations of DBRA per millisecond*/ TimeSCCDB = 0x0D02, /*[GLOBAL VAR] (word) number of iter's of SCC access & DBRA.*/ diff --git a/macos/traps.h b/macos/traps.h index 751fd11..1f90247 100644 --- a/macos/traps.h +++ b/macos/traps.h @@ -1047,7 +1047,7 @@ enum { }; enum { - _ALMDispatch = 0xAAA4 /* Apple Location Manger*/ + _ALMDispatch = 0xAAA4 /* Apple Location Manager*/ }; enum { diff --git a/mplite/pstdint.h b/mplite/pstdint.h index 12c108a..d2d2234 100644 --- a/mplite/pstdint.h +++ b/mplite/pstdint.h @@ -73,7 +73,7 @@ * include stdint.h. The hope is that one or the other can be * used with no real difference. * - * 5) In the current verison, if your platform can't represent + * 5) In the current version, if your platform can't represent * int32_t, int16_t and int8_t, it just dumps out with a compiler * error. * diff --git a/toolbox/mm.cpp b/toolbox/mm.cpp index cfba0a1..8e6f009 100644 --- a/toolbox/mm.cpp +++ b/toolbox/mm.cpp @@ -1203,7 +1203,7 @@ namespace MM const auto &info = iter->second; - // resouce not yet supported... + // resource not yet supported... // would need extra field and support in RM:: when // creating. // see HSetRBit, HClrRBit diff --git a/toolbox/rm.cpp b/toolbox/rm.cpp index b314545..594950b 100644 --- a/toolbox/rm.cpp +++ b/toolbox/rm.cpp @@ -848,7 +848,7 @@ namespace RM if (nativeSize != info->size) { // resize... - // chould get state / unlock / set state ... but that does nothing in OS X. + // could get state / unlock / set state ... but that does nothing in OS X. ::SetHandleSize(nativeHandle, info->size); OSErr err = MemError(); diff --git a/verbatim/Templates.text b/verbatim/Templates.text index 8550ce8..fbb9b6e 100644 --- a/verbatim/Templates.text +++ b/verbatim/Templates.text @@ -257,8 +257,8 @@ struct VolumeParam { unsigned short ioVNmFls; /*number of files in directory*/ unsigned short ioVDirSt; /*start block of file directory*/ short ioVBlLn; /*GetVolInfo: length of dir in blocks*/ - unsigned short ioVNmAlBlks; /*for compatibilty ioVNmAlBlks * ioVAlBlkSiz <= 2 GB*/ - unsigned long ioVAlBlkSiz; /*for compatibilty ioVAlBlkSiz is <= $0000FE00 (65,024)*/ + unsigned short ioVNmAlBlks; /*for compatibility ioVNmAlBlks * ioVAlBlkSiz <= 2 GB*/ + unsigned long ioVAlBlkSiz; /*for compatibility ioVAlBlkSiz is <= $0000FE00 (65,024)*/ unsigned long ioVClpSiz; /*GetVolInfo: bytes to allocate at a time*/ unsigned short ioAlBlSt; /*starting disk(512-byte) block in block map*/ unsigned long ioVNxtFNum; /*GetVolInfo: next free file number*/