mirror of
https://github.com/ksherlock/mpw.git
synced 2024-12-27 03:30:18 +00:00
Fixed a few typos (#65)
This commit is contained in:
parent
f460696b4f
commit
f619ed31b3
@ -13,7 +13,7 @@
|
|||||||
**
|
**
|
||||||
** The "lemon" program processes an LALR(1) input grammar file, then uses
|
** The "lemon" program processes an LALR(1) input grammar file, then uses
|
||||||
** this template to construct a parser. The "lemon" program inserts text
|
** 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
|
** interstitial "-" characters) contained in this template is changed into
|
||||||
** the value of the %name directive from the grammar. Otherwise, the content
|
** the value of the %name directive from the grammar. Otherwise, the content
|
||||||
** of this template is copied straight through into the generate parser
|
** of this template is copied straight through into the generate parser
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
**
|
**
|
||||||
** The "lemon" program processes an LALR(1) input grammar file, then uses
|
** The "lemon" program processes an LALR(1) input grammar file, then uses
|
||||||
** this template to construct a parser. The "lemon" program inserts text
|
** 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
|
** interstitial "-" characters) contained in this template is changed into
|
||||||
** the value of the %name directive from the grammar. Otherwise, the content
|
** the value of the %name directive from the grammar. Otherwise, the content
|
||||||
** of this template is copied straight through into the generate parser
|
** of this template is copied straight through into the generate parser
|
||||||
|
@ -152,7 +152,7 @@ ULO cpuIntegrationGetChipInterruptNumber(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// A wrapper for cpuSetIrqLevel that restarts the
|
// 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)
|
void cpuIntegrationSetIrqLevel(ULO new_interrupt_level, ULO chip_interrupt_number)
|
||||||
{
|
{
|
||||||
if (cpuSetIrqLevel(new_interrupt_level))
|
if (cpuSetIrqLevel(new_interrupt_level))
|
||||||
|
@ -1394,7 +1394,7 @@ static ULO cpuDisMovec(ULO prc, UWO opc, STR *sdata, STR *sinstruction, STR *sop
|
|||||||
case 0x002: /* CACR, Cache control register XX2346 */
|
case 0x002: /* CACR, Cache control register XX2346 */
|
||||||
strcat(soperands, "CACR");
|
strcat(soperands, "CACR");
|
||||||
break;
|
break;
|
||||||
case 0x802: /* CAAR, Cache adress register XX2346 */
|
case 0x802: /* CAAR, Cache address register XX2346 */
|
||||||
strcat(soperands, "CAAR");
|
strcat(soperands, "CAAR");
|
||||||
break;
|
break;
|
||||||
case 0x803: /* MSP, Master stack pointer XX234X */
|
case 0x803: /* MSP, Master stack pointer XX234X */
|
||||||
|
@ -165,7 +165,7 @@ void cpuThrowException(ULO vector_offset, ULO pc, BOOLE executejmp)
|
|||||||
void cpuThrowPrivilegeViolationException(void)
|
void cpuThrowPrivilegeViolationException(void)
|
||||||
{
|
{
|
||||||
// The saved pc points to the instruction causing the violation
|
// 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);
|
cpuThrowException(0x20, cpuGetOriginalPC(), FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
#ifdef CPU_INSTRUCTION_LOGGING
|
#ifdef CPU_INSTRUCTION_LOGGING
|
||||||
|
|
||||||
/* Function for logging the intruction execution */
|
/* Function for logging the instruction execution */
|
||||||
static cpuInstructionLoggingFunc cpu_instruction_logging_func;
|
static cpuInstructionLoggingFunc cpu_instruction_logging_func;
|
||||||
static cpuExceptionLoggingFunc cpu_exception_logging_func;
|
static cpuExceptionLoggingFunc cpu_exception_logging_func;
|
||||||
static cpuInterruptLoggingFunc cpu_interrupt_logging_func;
|
static cpuInterruptLoggingFunc cpu_interrupt_logging_func;
|
||||||
|
@ -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 */
|
/* 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 */
|
/* 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. */
|
/* or reading the value generates side-effects. */
|
||||||
/* Datadirect is TRUE when data accesses can be made through a pointer */
|
/* 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. */
|
/* an errorstring. */
|
||||||
/*============================================================================*/
|
/*============================================================================*/
|
||||||
|
|
||||||
|
@ -107,7 +107,7 @@ enum macos_error {
|
|||||||
envVersTooBig = -5502, /*Version bigger than call can handle*/
|
envVersTooBig = -5502, /*Version bigger than call can handle*/
|
||||||
fontDecError = -64, /*error during font declaration*/
|
fontDecError = -64, /*error during font declaration*/
|
||||||
fontNotDeclared = -65, /*font not declared*/
|
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*/
|
fontNotOutlineErr = -32615, /*bitmap font passed to routine that does outlines only*/
|
||||||
firstDskErr = -84, /*I/O System Errors*/
|
firstDskErr = -84, /*I/O System Errors*/
|
||||||
lastDskErr = -64, /*I/O System Errors*/
|
lastDskErr = -64, /*I/O System Errors*/
|
||||||
@ -196,7 +196,7 @@ enum macos_error {
|
|||||||
rgnTooBigErr = -500,
|
rgnTooBigErr = -500,
|
||||||
updPixMemErr = -125, /*insufficient memory to update a pixmap*/
|
updPixMemErr = -125, /*insufficient memory to update a pixmap*/
|
||||||
pictInfoVersionErr = -11000, /* wrong version of the PictInfo structure */
|
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 */
|
pictInfoVerbErr = -11002, /* the passed verb was invalid */
|
||||||
cantLoadPickMethodErr = -11003, /* unable to load the custom pick proc */
|
cantLoadPickMethodErr = -11003, /* unable to load the custom pick proc */
|
||||||
colorsRequestedErr = -11004, /* the number of colors requested was illegal */
|
colorsRequestedErr = -11004, /* the number of colors requested was illegal */
|
||||||
@ -249,7 +249,7 @@ enum macos_error {
|
|||||||
smEmptySlot = -300, /*No card in slot*/
|
smEmptySlot = -300, /*No card in slot*/
|
||||||
smCRCFail = -301, /*CRC check failed for declaration data*/
|
smCRCFail = -301, /*CRC check failed for declaration data*/
|
||||||
smFormatErr = -302, /*FHeader Format is not Apple's*/
|
smFormatErr = -302, /*FHeader Format is not Apple's*/
|
||||||
smRevisionErr = -303, /*Wrong revison level*/
|
smRevisionErr = -303, /*Wrong revision level*/
|
||||||
smNoDir = -304, /*Directory offset is Nil */
|
smNoDir = -304, /*Directory offset is Nil */
|
||||||
smDisabledSlot = -305, /*This slot is disabled (-305 use to be smLWTstBad)*/
|
smDisabledSlot = -305, /*This slot is disabled (-305 use to be smLWTstBad)*/
|
||||||
smNosInfoArray = -306, /*No sInfoArray. Memory Mgr error.*/
|
smNosInfoArray = -306, /*No sInfoArray. Memory Mgr error.*/
|
||||||
@ -258,14 +258,14 @@ enum macos_error {
|
|||||||
smResrvErr = -307, /*Fatal reserved error. Resreved field <> 0.*/
|
smResrvErr = -307, /*Fatal reserved error. Resreved field <> 0.*/
|
||||||
smUnExBusErr = -308, /*Unexpected BusError*/
|
smUnExBusErr = -308, /*Unexpected BusError*/
|
||||||
smBLFieldBad = -309, /*ByteLanes field was bad.*/
|
smBLFieldBad = -309, /*ByteLanes field was bad.*/
|
||||||
smFHBlockRdErr = -310, /*Error occured during _sGetFHeader.*/
|
smFHBlockRdErr = -310, /*Error occurred during _sGetFHeader.*/
|
||||||
smFHBlkDispErr = -311, /*Error occured during _sDisposePtr (Dispose of FHeader block).*/
|
smFHBlkDispErr = -311, /*Error occurred during _sDisposePtr (Dispose of FHeader block).*/
|
||||||
smDisposePErr = -312, /*_DisposePointer error*/
|
smDisposePErr = -312, /*_DisposePointer error*/
|
||||||
smNoBoardSRsrc = -313, /*No Board sResource.*/
|
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.*/
|
smNoBoardId = -315, /*No Board Id.*/
|
||||||
smInitStatVErr = -316, /*The InitStatusV field was negative after primary or secondary init.*/
|
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.*/
|
smNoJmpTbl = -318, /*SDM jump table could not be created.*/
|
||||||
smBadBoardId = -319, /*BoardId was wrong; re-init the PRAM record.*/
|
smBadBoardId = -319, /*BoardId was wrong; re-init the PRAM record.*/
|
||||||
smBusErrTO = -320, /*BusError time out.*/
|
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*/
|
smCPUErr = -334, /*Code revision is wrong*/
|
||||||
smsPointerNil = -335, /*LPointer is nil From sOffsetData. If this error occurs; check sInfo rec for more information.*/
|
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*/
|
smSlotOOBErr = -337, /*Slot out of bounds error*/
|
||||||
smSelOOBErr = -338, /*Selector out of bounds error*/
|
smSelOOBErr = -338, /*Selector out of bounds error*/
|
||||||
smNewPErr = -339, /*_NewPtr error*/
|
smNewPErr = -339, /*_NewPtr error*/
|
||||||
smBlkMoveErr = -340, /*_BlockMove error*/
|
smBlkMoveErr = -340, /*_BlockMove error*/
|
||||||
smCkStatusErr = -341, /*Status of slot = fail.*/
|
smCkStatusErr = -341, /*Status of slot = fail.*/
|
||||||
smGetDrvrNamErr = -342, /*Error occured during _sGetDrvrName.*/
|
smGetDrvrNamErr = -342, /*Error occurred during _sGetDrvrName.*/
|
||||||
smDisDrvrNamErr = -343, /*Error occured during _sDisDrvrName.*/
|
smDisDrvrNamErr = -343, /*Error occurred during _sDisDrvrName.*/
|
||||||
smNoMoresRsrcs = -344, /*No more sResources*/
|
smNoMoresRsrcs = -344, /*No more sResources*/
|
||||||
smsGetDrvrErr = -345, /*Error occurred during _sGetDriver.*/
|
smsGetDrvrErr = -345, /*Error occurred during _sGetDriver.*/
|
||||||
smBadsPtrErr = -346, /*Bad pointer was passed to sCalcsPointer*/
|
smBadsPtrErr = -346, /*Bad pointer was passed to sCalcsPointer*/
|
||||||
smByteLanesErr = -347, /*NumByteLanes was determined to be zero.*/
|
smByteLanesErr = -347, /*NumByteLanes was determined to be zero.*/
|
||||||
smOffsetErr = -348, /*Offset was too big (temporary error*/
|
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.*/
|
smSRTOvrFlErr = -350, /*SRT over flow.*/
|
||||||
smRecNotFnd = -351, /*Record not found in the SRT.*/
|
smRecNotFnd = -351, /*Record not found in the SRT.*/
|
||||||
editionMgrInitErr = -450, /*edition manager not inited by this app*/
|
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*/
|
interruptsMaskedErr = -624, /*don't call with interrupts masked*/
|
||||||
cannotDeferErr = -625, /*unable to defer additional functions*/
|
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*/
|
ddpLenErr = -92, /*data length too big*/
|
||||||
noBridgeErr = -93, /*no network bridge for non-local send*/
|
noBridgeErr = -93, /*no network bridge for non-local send*/
|
||||||
lapProtErr = -94, /*error in attaching/detaching protocol*/
|
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 */
|
noDefaultUserErr = -922, /* user hasn't typed in owners name in Network Setup Control Pannel */
|
||||||
notLoggedInErr = -923, /* The default userRefNum does not yet exist */
|
notLoggedInErr = -923, /* The default userRefNum does not yet exist */
|
||||||
noUserRefErr = -924, /* unable to create a new userRefNum */
|
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 */
|
noInformErr = -926, /* PPCStart failed because destination did not have inform pending */
|
||||||
authFailErr = -927, /* unable to authenticate user at destination */
|
authFailErr = -927, /* unable to authenticate user at destination */
|
||||||
noUserRecErr = -928, /* Invalid user reference number */
|
noUserRecErr = -928, /* Invalid user reference number */
|
||||||
|
@ -60,7 +60,7 @@ enum {
|
|||||||
SMGlobals = 0x0CC4, /* (long) pointer to Sound Manager Globals*/
|
SMGlobals = 0x0CC4, /* (long) pointer to Sound Manager Globals*/
|
||||||
TheGDevice = 0x0CC8, /*[GLOBAL VAR] (long) the current graphics device*/
|
TheGDevice = 0x0CC8, /*[GLOBAL VAR] (long) the current graphics device*/
|
||||||
CQDGlobals = 0x0CCC, /* (long) quickDraw global extensions*/
|
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*/
|
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*/
|
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.*/
|
TimeSCCDB = 0x0D02, /*[GLOBAL VAR] (word) number of iter's of SCC access & DBRA.*/
|
||||||
|
@ -1047,7 +1047,7 @@ enum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
_ALMDispatch = 0xAAA4 /* Apple Location Manger*/
|
_ALMDispatch = 0xAAA4 /* Apple Location Manager*/
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
@ -73,7 +73,7 @@
|
|||||||
* include stdint.h. The hope is that one or the other can be
|
* include stdint.h. The hope is that one or the other can be
|
||||||
* used with no real difference.
|
* 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
|
* int32_t, int16_t and int8_t, it just dumps out with a compiler
|
||||||
* error.
|
* error.
|
||||||
*
|
*
|
||||||
|
@ -1203,7 +1203,7 @@ namespace MM
|
|||||||
|
|
||||||
const auto &info = iter->second;
|
const auto &info = iter->second;
|
||||||
|
|
||||||
// resouce not yet supported...
|
// resource not yet supported...
|
||||||
// would need extra field and support in RM:: when
|
// would need extra field and support in RM:: when
|
||||||
// creating.
|
// creating.
|
||||||
// see HSetRBit, HClrRBit
|
// see HSetRBit, HClrRBit
|
||||||
|
@ -848,7 +848,7 @@ namespace RM
|
|||||||
|
|
||||||
if (nativeSize != info->size) {
|
if (nativeSize != info->size) {
|
||||||
// resize...
|
// 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);
|
::SetHandleSize(nativeHandle, info->size);
|
||||||
OSErr err = MemError();
|
OSErr err = MemError();
|
||||||
|
@ -257,8 +257,8 @@ struct VolumeParam {
|
|||||||
unsigned short ioVNmFls; /*number of files in directory*/
|
unsigned short ioVNmFls; /*number of files in directory*/
|
||||||
unsigned short ioVDirSt; /*start block of file directory*/
|
unsigned short ioVDirSt; /*start block of file directory*/
|
||||||
short ioVBlLn; /*GetVolInfo: length of dir in blocks*/
|
short ioVBlLn; /*GetVolInfo: length of dir in blocks*/
|
||||||
unsigned short ioVNmAlBlks; /*for compatibilty ioVNmAlBlks * ioVAlBlkSiz <= 2 GB*/
|
unsigned short ioVNmAlBlks; /*for compatibility ioVNmAlBlks * ioVAlBlkSiz <= 2 GB*/
|
||||||
unsigned long ioVAlBlkSiz; /*for compatibilty ioVAlBlkSiz is <= $0000FE00 (65,024)*/
|
unsigned long ioVAlBlkSiz; /*for compatibility ioVAlBlkSiz is <= $0000FE00 (65,024)*/
|
||||||
unsigned long ioVClpSiz; /*GetVolInfo: bytes to allocate at a time*/
|
unsigned long ioVClpSiz; /*GetVolInfo: bytes to allocate at a time*/
|
||||||
unsigned short ioAlBlSt; /*starting disk(512-byte) block in block map*/
|
unsigned short ioAlBlSt; /*starting disk(512-byte) block in block map*/
|
||||||
unsigned long ioVNxtFNum; /*GetVolInfo: next free file number*/
|
unsigned long ioVNxtFNum; /*GetVolInfo: next free file number*/
|
||||||
|
Loading…
Reference in New Issue
Block a user