BaseTools: Various typo

Various typo in BaseTools.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Coeur <coeur@gmx.fr>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Antoine Coeur
2019-02-06 15:44:39 +08:00
committed by Liming Gao
parent 325ad62260
commit fb0b35e05f
172 changed files with 510 additions and 515 deletions

View File

@@ -217,7 +217,7 @@ Returns:
ImageContext->ImageType != EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER && \
ImageContext->ImageType != EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER) {
//
// upsupported PeImage subsystem type
// unsupported PeImage subsystem type
//
return RETURN_UNSUPPORTED;
}
@@ -483,7 +483,7 @@ Returns:
// In Te image header there is not a field to describe the ImageSize.
// Actually, the ImageSize equals the RVA plus the VirtualSize of
// the last section mapped into memory (Must be rounded up to
// a mulitple of Section Alignment). Per the PE/COFF specification, the
// a multiple of Section Alignment). Per the PE/COFF specification, the
// section headers in the Section Table must appear in order of the RVA
// values for the corresponding sections. So the ImageSize can be determined
// by the RVA and the VirtualSize of the last section header in the
@@ -1315,7 +1315,7 @@ PeCoffLoaderGetPdbPointer (
break;
default:
//
// For unknow Machine field, use Magic in optional Header
// For unknown Machine field, use Magic in optional Header
//
Magic = Hdr.Pe32->OptionalHeader.Magic;
}

View File

@@ -2057,13 +2057,13 @@ IsHexStr (
)
{
//
// skip preceeding white space
// skip preceding white space
//
while ((*Str != 0) && *Str == L' ') {
Str ++;
}
//
// skip preceeding zeros
// skip preceding zeros
//
while ((*Str != 0) && *Str == L'0') {
Str ++;

View File

@@ -1,5 +1,5 @@
/** @file
CalcuateCrc32 routine.
CalculateCrc32 routine.
Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
@@ -288,7 +288,7 @@ Routine Description:
Arguments:
Data - The buffer contaning the data to be processed
Data - The buffer containing the data to be processed
DataSize - The size of data to be processed
CrcOut - A pointer to the caller allocated UINT32 that on
contains the CRC32 checksum of Data

View File

@@ -1,5 +1,5 @@
/** @file
Header file for CalcuateCrc32 routine
Header file for CalculateCrc32 routine
Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
@@ -31,7 +31,7 @@ Routine Description:
Arguments:
Data - The buffer contaning the data to be processed
Data - The buffer containing the data to be processed
DataSize - The size of data to be processed
CrcOut - A pointer to the caller allocated UINT32 that on
contains the CRC32 checksum of Data

View File

@@ -747,7 +747,7 @@ Arguments:
Returns:
EFI_SUCCESS - Decompression is successfull
EFI_SUCCESS - Decompression is successful
EFI_INVALID_PARAMETER - The source data is corrupted
--*/
@@ -902,7 +902,7 @@ Arguments:
Returns:
EFI_SUCCESS - Decompression is successfull
EFI_SUCCESS - Decompression is successful
EFI_INVALID_PARAMETER - The source data is corrupted
--*/
@@ -937,7 +937,7 @@ Arguments:
Returns:
EFI_SUCCESS - Decompression is successfull
EFI_SUCCESS - Decompression is successful
EFI_INVALID_PARAMETER - The source data is corrupted
--*/

View File

@@ -70,7 +70,7 @@ Arguments:
Returns:
EFI_SUCCESS - Decompression is successfull
EFI_SUCCESS - Decompression is successful
EFI_INVALID_PARAMETER - The source data is corrupted
**/
@@ -128,7 +128,7 @@ Arguments:
Returns:
EFI_SUCCESS - Decompression is successfull
EFI_SUCCESS - Decompression is successful
EFI_INVALID_PARAMETER - The source data is corrupted
**/

View File

@@ -396,7 +396,7 @@ Routine Description:
Allocate memory spaces for data structures used in compression process
Argements: (VOID)
Arguments: (VOID)
Returns:
@@ -652,7 +652,7 @@ Returns: (VOID)
//
// We have just got a long match, the target tree
// can be located by MatchPos + 1. Travese the tree
// can be located by MatchPos + 1. Traverse the tree
// from bottom up to get to a proper starting point.
// The usage of PERC_FLAG ensures proper node deletion
// in DeleteNode() later.
@@ -1281,7 +1281,7 @@ Routine Description:
Outputs rightmost n bits of x
Argments:
Arguments:
n - the rightmost n bits of the data is used
x - the data

View File

@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "EfiUtilityMsgs.h"
//
// Declare module globals for keeping track of the the utility's
// Declare module globals for keeping track of the utility's
// name and other settings.
//
STATIC STATUS mStatus = STATUS_SUCCESS;
@@ -61,7 +61,7 @@ Arguments:
at least something valid is not specified.
FileName - name of the file or application. If not specified, then the
utilty name (as set by the utility calling SetUtilityName()
utility name (as set by the utility calling SetUtilityName()
earlier) is used. Otherwise "Unknown utility" is used.
LineNumber - the line number of error, typically used by parsers. If the
@@ -384,7 +384,7 @@ Routine Description:
Arguments:
Type - "warning" or "error" string to insert into the message to be
printed. The first character of this string (converted to uppercase)
is used to preceed the MessageCode value in the output string.
is used to precede the MessageCode value in the output string.
FileName - name of the file where the warning was detected, or the name
of the application that detected the warning
@@ -597,7 +597,7 @@ Routine Description:
Arguments:
UtilityName - name of the utility, which will be printed with all
error/warning/debug messags.
error/warning/debug messages.
Returns:
NA

View File

@@ -318,7 +318,7 @@ Routine Description:
Arguments:
FileType Type of file to search for.
Instance Instace of the file type to return.
Instance Instance of the file type to return.
File Return pointer. In the case of an error, contents are undefined.
Returns:
@@ -505,7 +505,7 @@ Arguments:
File The file to search.
SectionType Type of file to search for.
Instance Instace of the section to return.
Instance Instance of the section to return.
Section Return pointer. In the case of an error, contents are undefined.
Returns:

View File

@@ -228,7 +228,7 @@ Routine Description:
Arguments:
OldPath Path name of replace the final segment
Peer The new path name to concatinate to become the peer path
Peer The new path name to concatenate to become the peer path
Returns:

View File

@@ -104,7 +104,7 @@ Routine Description:
Arguments:
OldPath Path name of replace the final segment
Peer The new path name to concatinate to become the peer path
Peer The new path name to concatenate to become the peer path
Returns:

View File

@@ -36,7 +36,7 @@ typedef struct _GUID_SEC_TOOL_ENTRY {
} GUID_SEC_TOOL_ENTRY;
//
// Functin Implementation
// Function Implementation
//
EFI_HANDLE

View File

@@ -233,7 +233,7 @@ Returns:
CHAR8 *Delimiter;
BOOLEAN ParseError;
BOOLEAN ReadError;
UINTN Occurrance;
UINTN Occurrence;
//
// Check input parameters
@@ -258,7 +258,7 @@ Returns:
//
// Initialize our instance counter for the search token
//
Occurrance = 0;
Occurrence = 0;
if (FindSection (InputFile, Section)) {
//
@@ -307,7 +307,7 @@ Returns:
//
// Check if it is the correct instance
//
if (Instance == Occurrance) {
if (Instance == Occurrence) {
//
// Copy the contents following the =
//
@@ -338,9 +338,9 @@ Returns:
}
} else {
//
// Increment the occurrance found
// Increment the occurrence found
//
Occurrance++;
Occurrence++;
}
}
} while (
@@ -348,7 +348,7 @@ Returns:
!ReadError &&
InputFile->CurrentFilePointer < InputFile->Eof &&
CurrentToken[0] != '[' &&
Occurrance <= Instance
Occurrence <= Instance
);
}
//
@@ -478,7 +478,7 @@ AsciiStringToUint64 (
Routine Description:
Converts a null terminated ascii string that represents a number into a
UINT64 value. A hex number may be preceeded by a 0x, but may not be
UINT64 value. A hex number may be preceded by a 0x, but may not be
succeeded by an h. A number without 0x or 0X is considered to be base 10
unless the IsHex input is true.

View File

@@ -153,7 +153,7 @@ AsciiStringToUint64 (
Routine Description:
Converts a null terminated ascii string that represents a number into a
UINT64 value. A hex number may be preceeded by a 0x, but may not be
UINT64 value. A hex number may be preceded by a 0x, but may not be
succeeded by an h. A number without 0x or 0X is considered to be base 10
unless the IsHex input is true.

View File

@@ -715,7 +715,7 @@ Returns:
}
//
// Check Input paramters
// Check Input parameters
//
if (*InputFileName == NULL) {
fprintf (stderr, "Missing option. Input files is not specified\n");

View File

@@ -148,7 +148,7 @@ PeCoffLoaderGetEntryPoint (
//
/**
Pass in a pointer to an ARM MOVT or MOVW immediate instruciton and
Pass in a pointer to an ARM MOVT or MOVW immediate instruction and
return the immediate data encoded in the instruction
@param Instruction Pointer to ARM MOVT or MOVW immediate instruction
@@ -166,7 +166,7 @@ ThumbMovtImmediateAddress (
Update an ARM MOVT or MOVW immediate instruction immediate data.
@param Instruction Pointer to ARM MOVT or MOVW immediate instruction
@param Address New addres to patch into the instruction
@param Address New address to patch into the instruction
**/
VOID
@@ -178,10 +178,10 @@ ThumbMovtImmediatePatch (
/**
Pass in a pointer to an ARM MOVW/MOVT instruciton pair and
Pass in a pointer to an ARM MOVW/MOVT instruction pair and
return the immediate data encoded in the two` instruction
@param Instructions Pointer to ARM MOVW/MOVT insturction pair
@param Instructions Pointer to ARM MOVW/MOVT instruction pair
@return Immediate address encoded in the instructions
@@ -196,7 +196,7 @@ ThumbMovwMovtImmediateAddress (
Update an ARM MOVW/MOVT immediate instruction instruction pair.
@param Instructions Pointer to ARM MOVW/MOVT instruction pair
@param Address New addres to patch into the instructions
@param Address New address to patch into the instructions
**/
VOID
EFIAPI

View File

@@ -101,7 +101,7 @@ Returns:
/**
Pass in a pointer to an ARM MOVT or MOVW immediate instruciton and
Pass in a pointer to an ARM MOVT or MOVW immediate instruction and
return the immediate data encoded in the instruction
@param Instruction Pointer to ARM MOVT or MOVW immediate instruction
@@ -137,7 +137,7 @@ ThumbMovtImmediateAddress (
Update an ARM MOVT or MOVW immediate instruction immediate data.
@param Instruction Pointer to ARM MOVT or MOVW immediate instruction
@param Address New addres to patch into the instruction
@param Address New address to patch into the instruction
**/
VOID
ThumbMovtImmediatePatch (
@@ -147,7 +147,7 @@ ThumbMovtImmediatePatch (
{
UINT16 Patch;
// First 16-bit chunk of instruciton
// First 16-bit chunk of instruction
Patch = ((Address >> 12) & 0x000f); // imm4
Patch |= (((Address & BIT11) != 0) ? BIT10 : 0); // i
*Instruction = (*Instruction & ~0x040f) | Patch;
@@ -160,10 +160,10 @@ ThumbMovtImmediatePatch (
}
/**
Pass in a pointer to an ARM MOVW/MOVT instruciton pair and
Pass in a pointer to an ARM MOVW/MOVT instruction pair and
return the immediate data encoded in the two` instruction
@param Instructions Pointer to ARM MOVW/MOVT insturction pair
@param Instructions Pointer to ARM MOVW/MOVT instruction pair
@return Immediate address encoded in the instructions
@@ -188,7 +188,7 @@ ThumbMovwMovtImmediateAddress (
Update an ARM MOVW/MOVT immediate instruction instruction pair.
@param Instructions Pointer to ARM MOVW/MOVT instruction pair
@param Address New addres to patch into the instructions
@param Address New address to patch into the instructions
**/
VOID
EFIAPI

View File

@@ -356,7 +356,7 @@ Returns:
FALSE - otherwise
Notes:
Preceeding white space is ignored.
Preceding white space is ignored.
The parser's buffer pointer is advanced past the end of the
token.
@@ -636,7 +636,7 @@ Returns:
// Make sure we didn't exceed our maximum nesting depth
//
if (NestDepth > MAX_NEST_DEPTH) {
Error (NULL, 0, 3001, "Not Supported", "%s exceeeds max nesting depth (%u)", SourceFile->FileName, (unsigned) NestDepth);
Error (NULL, 0, 3001, "Not Supported", "%s exceeds max nesting depth (%u)", SourceFile->FileName, (unsigned) NestDepth);
Status = STATUS_ERROR;
goto Finish;
}

View File

@@ -70,7 +70,7 @@ Routine Description:
Arguments:
Strin The string to 'strip'
String The string to 'strip'
Returns:

View File

@@ -404,7 +404,7 @@ Routine Description:
Allocate memory spaces for data structures used in compression process
Argements:
Arguments:
VOID
Returns:
@@ -680,7 +680,7 @@ Returns: (VOID)
if (mMatchLen >= 4) {
//
// We have just got a long match, the target tree
// can be located by MatchPos + 1. Travese the tree
// can be located by MatchPos + 1. Traverse the tree
// from bottom up to get to a proper starting point.
// The usage of PERC_FLAG ensures proper node deletion
// in DeleteNode() later.

View File

@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
// Win32 include files do not compile clean with /W4, so we use the warning
// pragma to suppress the warnings for Win32 only. This way our code can stil
// pragma to suppress the warnings for Win32 only. This way our code can still
// compile at /W4 (highest warning level) with /WX (warnings cause build
// errors).
//

View File

@@ -178,7 +178,7 @@ int main(int argc, CHAR8 *argv[])
}
Str16 = (CHAR16 *)malloc(1024);
if (Str16 == NULL) {
fprintf(stderr, "Resource, memory cannot be allcoated");
fprintf(stderr, "Resource, memory cannot be allocated");
return STATUS_ERROR;
}
Ascii2UnicodeString(Str, Str16);

View File

@@ -5,7 +5,7 @@
all over this file.
The only place where multi-instance device paths are supported is in
environment varibles. Multi-instance device paths should never be placed
environment variables. Multi-instance device paths should never be placed
on a Handle.
Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>

View File

@@ -5,7 +5,7 @@
all over this file.
The only place where multi-instance device paths are supported is in
environment varibles. Multi-instance device paths should never be placed
environment variables. Multi-instance device paths should never be placed
on a Handle.
Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>

View File

@@ -1432,7 +1432,7 @@ Returns:
ImageCount = 0;
for (;;) {
//
// Save our postition in the file, since offsets in the headers
// Save our position in the file, since offsets in the headers
// are relative to the particular image.
//
ImageStart = ftell (InFptr);

View File

@@ -288,7 +288,7 @@ Returns:
FileBuffer = (UINT8 *) malloc (FileSize);
if (FileBuffer == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated!");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");
fclose (InFile);
goto Finish;
}

View File

@@ -110,7 +110,7 @@ CHAR8 *mFvbAlignmentName[] = {
// This data array will be located at the base of the Firmware Volume Header (FVH)
// in the boot block. It must not exceed 14 bytes of code. The last 2 bytes
// will be used to keep the FVH checksum consistent.
// This code will be run in response to a starutp IPI for HT-enabled systems.
// This code will be run in response to a startup IPI for HT-enabled systems.
//
#define SIZEOF_STARTUP_DATA_ARRAY 0x10
@@ -465,7 +465,7 @@ Returns:
case 0:
//
// 1 byte alignment
//if bit 1 have set, 128K byte alignmnet
//if bit 1 have set, 128K byte alignment
//
if (FfsFile->Attributes & FFS_ATTRIB_DATA_ALIGNMENT2) {
*Alignment = 17;
@@ -724,7 +724,7 @@ Returns:
memcpy ((UINT8 *)PadFile + CurFfsHeaderSize, ExtHeader, ExtHeader->ExtHeaderSize);
((EFI_FIRMWARE_VOLUME_HEADER *) FvImage->FileImage)->ExtHeaderOffset = (UINT16) ((UINTN) ((UINT8 *)PadFile + CurFfsHeaderSize) - (UINTN) FvImage->FileImage);
//
// Make next file start at QWord Boundry
// Make next file start at QWord Boundary
//
while (((UINTN) FvImage->CurrentFilePointer & (EFI_FFS_FILE_HEADER_ALIGNMENT - 1)) != 0) {
FvImage->CurrentFilePointer++;
@@ -1218,7 +1218,7 @@ Returns:
FileBuffer = malloc (FileSize);
if (FileBuffer == NULL) {
fclose (NewFile);
Error (NULL, 0, 4001, "Resouce", "memory cannot be allocated!");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");
return EFI_OUT_OF_RESOURCES;
}
@@ -1387,7 +1387,7 @@ Returns:
return EFI_ABORTED;
}
//
// Make next file start at QWord Boundry
// Make next file start at QWord Boundary
//
while (((UINTN) FvImage->CurrentFilePointer & (EFI_FFS_FILE_HEADER_ALIGNMENT - 1)) != 0) {
FvImage->CurrentFilePointer++;
@@ -2196,14 +2196,14 @@ Returns:
return EFI_ABORTED;
}
// Add opcode for an uncondional branch with no link. i.e.: " B SecEntryPoint"
// Add opcode for an unconditional branch with no link. i.e.: " B SecEntryPoint"
ResetVector[0] |= ARMT_UNCONDITIONAL_JUMP_INSTRUCTION;
// SWI handler movs pc,lr. Just in case a debugger uses SWI
ResetVector[2] = 0xE1B0F07E;
// Place holder to support a common interrupt handler from ROM.
// Currently not suppprted. For this to be used the reset vector would not be in this FV
// Currently not supported. For this to be used the reset vector would not be in this FV
// and the exception vectors would be hard coded in the ROM and just through this address
// to find a common handler in the a module in the FV.
ResetVector[3] = 0;
@@ -2235,7 +2235,7 @@ Returns:
ARMT above has an entry in ResetVector[2] for SWI. The way we are using the ResetVector
array at the moment, for AArch64, does not allow us space for this as the header only
allows for a fixed amount of bytes at the start. If we are sure that UEFI will live
within the first 4GB of addressable RAM we could potensioally adopt the same ResetVector
within the first 4GB of addressable RAM we could potentially adopt the same ResetVector
layout as above. But for the moment we replace the four 32bit vectors with two 64bit
vectors in the same area of the Image heasder. This allows UEFI to start from a 64bit
base.
@@ -2253,7 +2253,7 @@ Returns:
Error(NULL, 0, 3000, "Invalid", "SEC Entry point must be within 128MB of the start of the FV");
return EFI_ABORTED;
}
// Add opcode for an uncondional branch with no link. i.e.: " B SecEntryPoint"
// Add opcode for an unconditional branch with no link. i.e.: " B SecEntryPoint"
ResetVector[0] |= ARM64_UNCONDITIONAL_JUMP_INSTRUCTION;
}
@@ -3068,7 +3068,7 @@ Returns:
}
//
// Accumlate every FFS file size.
// Accumulate every FFS file size.
//
for (Index = 0; FvInfoPtr->FvFiles[Index][0] != 0; Index++) {
//
@@ -3143,7 +3143,7 @@ Returns:
}
//
// Make next ffs file start at QWord Boundry
// Make next ffs file start at QWord Boundary
//
if (FvInfoPtr->IsPiFvImage) {
CurrentOffset = (CurrentOffset + EFI_FFS_FILE_HEADER_ALIGNMENT - 1) & ~(EFI_FFS_FILE_HEADER_ALIGNMENT - 1);
@@ -3234,7 +3234,7 @@ Routine Description:
their base address to the parent image.
Arguments:
FvInfo A pointer to FV_INFO struture.
FvInfo A pointer to FV_INFO structure.
FfsFile A pointer to Ffs file image that may contain FvImage.
XipOffset The offset address to the parent FvImage base.
@@ -3277,7 +3277,7 @@ Returns:
return EFI_ABORTED;
}
// machine type is ARM, set a flag so ARM reset vector procesing occurs
// machine type is ARM, set a flag so ARM reset vector processing occurs
if ((MachineType == EFI_IMAGE_MACHINE_ARMT) || (MachineType == EFI_IMAGE_MACHINE_AARCH64)) {
VerboseMsg("Located ARM/AArch64 SEC/PEI core in child FV");
mArm = TRUE;
@@ -3311,7 +3311,7 @@ Routine Description:
Arguments:
FvInfo A pointer to FV_INFO struture.
FvInfo A pointer to FV_INFO structure.
FileName Ffs File PathName
FfsFile A pointer to Ffs file image.
XipOffset The offset address to use for rebasing the XIP file image.

View File

@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "EfiUtilityMsgs.h"
//
// Different file separater for Linux and Windows
// Different file separator for Linux and Windows
//
#define FILE_SEP_CHAR '/'

View File

@@ -74,7 +74,7 @@ CleanUp32 (
);
//
// Rename ELF32 strucutres to common names to help when porting to ELF64.
// Rename ELF32 structures to common names to help when porting to ELF64.
//
typedef Elf32_Shdr Elf_Shdr;
typedef Elf32_Ehdr Elf_Ehdr;
@@ -450,7 +450,7 @@ ScanSections32 (
mCoffOffset = CoffAlign(mCoffOffset);
if (SectionCount > 1 && mOutImageType == FW_EFI_IMAGE) {
Warning (NULL, 0, 0, NULL, "Mulitple sections in %s are merged into 1 text section. Source level debug might not work correctly.", mInImageName);
Warning (NULL, 0, 0, NULL, "Multiple sections in %s are merged into 1 text section. Source level debug might not work correctly.", mInImageName);
}
//
@@ -487,7 +487,7 @@ ScanSections32 (
}
if (SectionCount > 1 && mOutImageType == FW_EFI_IMAGE) {
Warning (NULL, 0, 0, NULL, "Mulitple sections in %s are merged into 1 data section. Source level debug might not work correctly.", mInImageName);
Warning (NULL, 0, 0, NULL, "Multiple sections in %s are merged into 1 data section. Source level debug might not work correctly.", mInImageName);
}
//
@@ -688,7 +688,7 @@ WriteSections32 (
default:
//
// Ignore for unkown section type.
// Ignore for unknown section type.
//
VerboseMsg ("%s unknown section type %x. We ignore this unknown section type.", mInImageName, (unsigned)Shdr->sh_type);
break;
@@ -1090,7 +1090,7 @@ WriteRelocations32 (
break;
default:
Error (NULL, 0, 3000, "Invalid", "%s bad ARM dynamic relocations, unkown type %d.", mInImageName, ELF32_R_TYPE (Rel->r_info));
Error (NULL, 0, 3000, "Invalid", "%s bad ARM dynamic relocations, unknown type %d.", mInImageName, ELF32_R_TYPE (Rel->r_info));
break;
}
}

View File

@@ -74,7 +74,7 @@ CleanUp64 (
);
//
// Rename ELF32 strucutres to common names to help when porting to ELF64.
// Rename ELF32 structures to common names to help when porting to ELF64.
//
typedef Elf64_Shdr Elf_Shdr;
typedef Elf64_Ehdr Elf_Ehdr;
@@ -580,7 +580,7 @@ ScanSections64 (
mCoffOffset = CoffAlign(mCoffOffset);
if (SectionCount > 1 && mOutImageType == FW_EFI_IMAGE) {
Warning (NULL, 0, 0, NULL, "Mulitple sections in %s are merged into 1 text section. Source level debug might not work correctly.", mInImageName);
Warning (NULL, 0, 0, NULL, "Multiple sections in %s are merged into 1 text section. Source level debug might not work correctly.", mInImageName);
}
//
@@ -634,7 +634,7 @@ ScanSections64 (
}
if (SectionCount > 1 && mOutImageType == FW_EFI_IMAGE) {
Warning (NULL, 0, 0, NULL, "Mulitple sections in %s are merged into 1 data section. Source level debug might not work correctly.", mInImageName);
Warning (NULL, 0, 0, NULL, "Multiple sections in %s are merged into 1 data section. Source level debug might not work correctly.", mInImageName);
}
//
@@ -817,7 +817,7 @@ WriteSections64 (
default:
//
// Ignore for unkown section type.
// Ignore for unknown section type.
//
VerboseMsg ("%s unknown section type %x. We ignore this unknown section type.", mInImageName, (unsigned)Shdr->sh_type);
break;

View File

@@ -49,7 +49,7 @@ typedef enum {
} SECTION_FILTER_TYPES;
//
// FunctionTalbe
// FunctionTable
//
typedef struct {
VOID (*ScanSections) ();

View File

@@ -176,7 +176,7 @@ Returns:
//
fprintf (stdout, "Options:\n");
fprintf (stdout, " -o FileName, --outputfile FileName\n\
File will be created to store the ouput content.\n");
File will be created to store the output content.\n");
fprintf (stdout, " -e EFI_FILETYPE, --efiImage EFI_FILETYPE\n\
Create Efi Image. EFI_FILETYPE is one of BASE,SMM_CORE,\n\
PEI_CORE, PEIM, DXE_CORE, DXE_DRIVER, UEFI_APPLICATION,\n\
@@ -261,13 +261,13 @@ Returns:
Guid is used to specify hii package list guid.\n\
Its format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\n\
If not specified, the first Form FormSet guid is used.\n");
fprintf (stdout, " --hiipackage Combine all input binary hii pacakges into \n\
fprintf (stdout, " --hiipackage Combine all input binary hii packages into \n\
a single package list as the text resource data(RC).\n\
It can't be combined with other action options\n\
except for -o option. It is a action option.\n\
If it is combined with other action options, the later\n\
input action option will override the previous one.\n");
fprintf (stdout, " --hiibinpackage Combine all input binary hii pacakges into \n\
fprintf (stdout, " --hiibinpackage Combine all input binary hii packages into \n\
a single package list as the binary resource section.\n\
It can't be combined with other action options\n\
except for -o option. It is a action option.\n\
@@ -559,7 +559,7 @@ PeCoffConvertImageToXip (
if (PeHdr->Pe32.OptionalHeader.SectionAlignment != PeHdr->Pe32.OptionalHeader.FileAlignment) {
//
// The only reason to expand zero fill sections is to make them compatible with XIP images.
// If SectionAlignment is not equal to FileAlginment then it is not an XIP type image.
// If SectionAlignment is not equal to FileAlignment then it is not an XIP type image.
//
return;
}
@@ -1390,7 +1390,7 @@ Returns:
goto Finish;
}
if (LogLevel > 9) {
Error (NULL, 0, 1003, "Invalid option value", "Debug Level range is 0-9, currnt input level is %d", (int) LogLevel);
Error (NULL, 0, 1003, "Invalid option value", "Debug Level range is 0-9, current input level is %d", (int) LogLevel);
goto Finish;
}
SetPrintLevel (LogLevel);
@@ -1536,16 +1536,16 @@ Returns:
VerboseMsg ("Dump the TE header information of the input TE image.");
break;
case FW_MCI_IMAGE:
VerboseMsg ("Conver input MicroCode.txt file to MicroCode.bin file.");
VerboseMsg ("Convert input MicroCode.txt file to MicroCode.bin file.");
break;
case FW_MERGE_IMAGE:
VerboseMsg ("Combine the input multi microcode bin files to one bin file.");
break;
case FW_HII_PACKAGE_LIST_RCIMAGE:
VerboseMsg ("Combine the input multi hii bin packages to one text pacakge list RC file.");
VerboseMsg ("Combine the input multi hii bin packages to one text package list RC file.");
break;
case FW_HII_PACKAGE_LIST_BINIMAGE:
VerboseMsg ("Combine the input multi hii bin packages to one binary pacakge list file.");
VerboseMsg ("Combine the input multi hii bin packages to one binary package list file.");
break;
case FW_REBASE_IMAGE:
VerboseMsg ("Rebase the input image to new base address.");
@@ -1633,7 +1633,7 @@ Returns:
goto Finish;
}
//
// Get hii package list lenght
// Get hii package list length
//
HiiPackageListHeader.PackageLength = sizeof (EFI_HII_PACKAGE_LIST_HEADER);
for (Index = 0; Index < InputFileNum; Index ++) {
@@ -1668,7 +1668,7 @@ Returns:
goto Finish;
}
if (memcmp (&HiiPackageListGuid, &mZeroGuid, sizeof (EFI_GUID)) == 0) {
Error (NULL, 0, 3000, "Invalid", "HII pacakge list guid is not specified!");
Error (NULL, 0, 3000, "Invalid", "HII package list guid is not specified!");
goto Finish;
}
memcpy (&HiiPackageListHeader.PackageListGuid, &HiiPackageListGuid, sizeof (EFI_GUID));
@@ -2172,7 +2172,7 @@ Returns:
if (PeHdr->Pe32.FileHeader.Machine == IMAGE_FILE_MACHINE_ARM) {
// Some tools kick out IMAGE_FILE_MACHINE_ARM (0x1c0) vs IMAGE_FILE_MACHINE_ARMT (0x1c2)
// so patch back to the offical UEFI value.
// so patch back to the official UEFI value.
PeHdr->Pe32.FileHeader.Machine = IMAGE_FILE_MACHINE_ARMT;
}
@@ -2372,7 +2372,7 @@ Returns:
//
memset (SectionHeader->Name, 0, sizeof (SectionHeader->Name));
//
// Zero Execption Table
// Zero Exception Table
//
Optional32->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress = 0;
Optional32->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size = 0;
@@ -2479,7 +2479,7 @@ Returns:
memset (RuntimeFunction, 0, sizeof (RUNTIME_FUNCTION));
}
//
// Zero Execption Table
// Zero Exception Table
//
Optional64->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size = 0;
Optional64->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress = 0;

View File

@@ -323,7 +323,7 @@ Returns:
//
Buffer = (UINT8 *) malloc ((size_t) TotalLength);
if (Buffer == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
goto Done;
}
CommonSect = (EFI_COMMON_SECTION_HEADER *) Buffer;
@@ -658,7 +658,7 @@ Returns:
if (Status == EFI_BUFFER_TOO_SMALL) {
FileBuffer = (UINT8 *) malloc (InputLength);
if (FileBuffer == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
return EFI_OUT_OF_RESOURCES;
}
//
@@ -887,7 +887,7 @@ Returns:
FileBuffer = (UINT8 *) malloc (InputLength + Offset);
if (FileBuffer == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
return EFI_OUT_OF_RESOURCES;
}
//
@@ -922,7 +922,7 @@ Returns:
// InputLength != 0, but FileBuffer == NULL means out of resources.
//
if (FileBuffer == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
return EFI_OUT_OF_RESOURCES;
}
@@ -1342,7 +1342,7 @@ Returns:
goto Finish;
}
if (LogLevel > 9) {
Error (NULL, 0, 1003, "Invalid option value", "Debug Level range is 0~9, currnt input level is %d", (int) LogLevel);
Error (NULL, 0, 1003, "Invalid option value", "Debug Level range is 0~9, current input level is %d", (int) LogLevel);
goto Finish;
}
SetPrintLevel (LogLevel);
@@ -1396,7 +1396,7 @@ Returns:
if ((InputFileNum == 0) && (InputFileName == NULL)) {
InputFileName = (CHAR8 **) malloc (MAXIMUM_INPUT_FILE_NUM * sizeof (CHAR8 *));
if (InputFileName == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
goto Finish;
}
memset (InputFileName, 0, (MAXIMUM_INPUT_FILE_NUM * sizeof (CHAR8 *)));
@@ -1410,7 +1410,7 @@ Returns:
);
if (InputFileName == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
goto Finish;
}
memset (&(InputFileName[InputFileNum]), 0, (MAXIMUM_INPUT_FILE_NUM * sizeof (CHAR8 *)));
@@ -1454,7 +1454,7 @@ Returns:
DummyFileBuffer = (UINT8 *) malloc (DummyFileSize);
if (DummyFileBuffer == NULL) {
fclose(DummyFile);
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
goto Finish;
}
@@ -1463,7 +1463,7 @@ Returns:
DebugMsg (NULL, 0, 9, "Dummy files", "the dummy file name is %s and the size is %u bytes", DummyFileName, (unsigned) DummyFileSize);
if (InputFileName == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
goto Finish;
}
InFile = fopen(LongFilePath(InputFileName[0]), "rb");
@@ -1478,7 +1478,7 @@ Returns:
InFileBuffer = (UINT8 *) malloc (InFileSize);
if (InFileBuffer == NULL) {
fclose(InFile);
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
goto Finish;
}
@@ -1685,7 +1685,7 @@ Returns:
Index += (strlen (StringBuffer) * 2) + 2;
OutFileBuffer = (UINT8 *) malloc (Index);
if (OutFileBuffer == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
goto Finish;
}
VersionSect = (EFI_VERSION_SECTION *) OutFileBuffer;
@@ -1706,7 +1706,7 @@ Returns:
Index += (strlen (StringBuffer) * 2) + 2;
OutFileBuffer = (UINT8 *) malloc (Index);
if (OutFileBuffer == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
goto Finish;
}
UiSect = (EFI_USER_INTERFACE_SECTION *) OutFileBuffer;
@@ -1734,7 +1734,7 @@ Returns:
if (Status == EFI_BUFFER_TOO_SMALL) {
OutFileBuffer = (UINT8 *) malloc (InputLength);
if (OutFileBuffer == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allcoated");
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated");
goto Finish;
}
//

View File

@@ -32,7 +32,7 @@
#if _MSC_EXTENSIONS
//
// use Microsoft* C complier dependent integer width types
// use Microsoft* C compiler dependent integer width types
//
typedef unsigned __int64 UINT64;
typedef __int64 INT64;

View File

@@ -30,7 +30,7 @@
#if _MSC_EXTENSIONS
//
// use Microsoft* C complier dependent integer width types
// use Microsoft* C compiler dependent integer width types
//
typedef unsigned __int64 UINT64;
typedef __int64 INT64;

View File

@@ -50,7 +50,7 @@
#ifndef TRUE
//
// BugBug: UEFI specification claims 1 and 0. We are concerned about the
// complier portability so we did it this way.
// compiler portability so we did it this way.
//
#define TRUE ((BOOLEAN)(1==1))
#endif

View File

@@ -207,19 +207,19 @@ typedef struct _EFI_IFR_GUID_VAREQNAME {
/// For vareqval (0x100), NameId is 0x100.
/// This value will convert to a Unicode String following this rule;
/// sprintf(StringBuffer, "%d", NameId) .
/// The the Unicode String will be used as a EFI Variable Name.
/// The Unicode String will be used as a EFI Variable Name.
///
UINT16 NameId;
} EFI_IFR_GUID_VAREQNAME;
///
/// EDKII implementation extension GUID, used to indaicate there are bit fields in the varstore.
/// EDKII implementation extension GUID, used to indicate there are bit fields in the varstore.
///
#define EDKII_IFR_BIT_VARSTORE_GUID \
{ 0x82DDD68B, 0x9163, 0x4187, {0x9B, 0x27, 0x20, 0xA8, 0xFD, 0x60 ,0xA7, 0x1D}}
///
/// EDKII implementation extension flags, used to indaicate the disply style and bit width for bit filed storage.
/// EDKII implementation extension flags, used to indicate the display style and bit width for bit filed storage.
/// Two high bits for display style and the low six bits for bit width.
///
#define EDKII_IFR_DISPLAY_BIT 0xC0

View File

@@ -148,7 +148,7 @@ typedef struct {
EFI_GUID FormatType;
//
// An arry of bytes of length Length.
// An array of bytes of length Length.
//
// UINT8 Data[1];
//

View File

@@ -201,7 +201,7 @@ typedef struct _WIN_CERTIFICATE_EFI_PKCS1_15 {
EFI_CERT_TYPE_RSA2048_SHA256. If the attribute specifies
authenticated access, then the Data buffer should begin with an
authentication descriptor prior to the data payload and DataSize
should reflect the the data.and descriptor size. The caller
should reflect the data.and descriptor size. The caller
shall digest the Monotonic Count value and the associated data
for the variable update using the SHA-256 1-way hash algorithm.
The ensuing the 32-byte digest will be signed using the private

View File

@@ -68,7 +68,7 @@
#if _MSC_EXTENSIONS
//
// use Microsoft* C complier dependent integer width types
// use Microsoft* C compiler dependent integer width types
//
typedef unsigned __int64 UINT64;
typedef __int64 INT64;
@@ -138,7 +138,7 @@ typedef INT32 INTN;
//
#if _MSC_EXTENSIONS
//
// Microsoft* compiler requires _EFIAPI useage, __cdecl is Microsoft* specific C.
// Microsoft* compiler requires _EFIAPI usage, __cdecl is Microsoft* specific C.
//
#define EFIAPI __cdecl
#endif

View File

@@ -497,7 +497,7 @@ typedef struct {
#define EFI_ACPI_2_0_SYSTEM_LOCALITY_INFORMATION_TABLE_SIGNATURE 0x54494C53
//
// "SPCR" Serial Port Concole Redirection Table
// "SPCR" Serial Port Console Redirection Table
//
#define EFI_ACPI_2_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE 0x52435053

View File

@@ -650,7 +650,7 @@ typedef struct {
#define EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE 0x4746434D
//
// "SPCR" Serial Port Concole Redirection Table
// "SPCR" Serial Port Console Redirection Table
//
#define EFI_ACPI_3_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE 0x52435053

View File

@@ -98,7 +98,7 @@ typedef union {
} PCI_TYPE_GENERIC;
typedef struct {
UINT32 CardBusSocketReg; // Cardus Socket/ExCA Base
UINT32 CardBusSocketReg; // Cardbus Socket/ExCA Base
// Address Register
//
UINT16 Reserved;
@@ -197,7 +197,7 @@ typedef struct {
#define PCI_IF_8259_PIC 0x00
#define PCI_IF_ISA_PIC 0x01
#define PCI_IF_EISA_PIC 0x02
#define PCI_IF_APIC_CONTROLLER 0x10 // I/O APIC interrupt controller , 32 bye none-prefectable memory.
#define PCI_IF_APIC_CONTROLLER 0x10 // I/O APIC interrupt controller , 32 byte none-prefetchable memory.
#define PCI_IF_APIC_CONTROLLER2 0x20
#define PCI_SUBCLASS_TIMER 0x02
#define PCI_IF_8254_TIMER 0x00

View File

@@ -125,7 +125,7 @@ EFI_DEVICE_PATH_PROTOCOL*
If NULL, then the instance size is not output.
@retval Pointer A pointer to the copy of the current device path instance.
@retval NULL DevicePathInstace was NULL on entry or there was insufficient memory.
@retval NULL DevicePathInstance was NULL on entry or there was insufficient memory.
**/
typedef

View File

@@ -149,12 +149,12 @@ typedef enum {
@param DestinationX X coordinate of destination for the BltBuffer.
@param DestinationY Y coordinate of destination for the BltBuffer.
@param Width Width of rectangle in BltBuffer in pixels.
@param Height Hight of rectangle in BltBuffer in pixels.
@param Height Height of rectangle in BltBuffer in pixels.
@param Delta OPTIONAL
@retval EFI_SUCCESS The Blt operation completed.
@retval EFI_INVALID_PARAMETER BltOperation is not valid.
@retval EFI_DEVICE_ERROR A hardware error occured writting to the video buffer.
@retval EFI_DEVICE_ERROR A hardware error occurred writing to the video buffer.
**/
typedef

View File

@@ -25,7 +25,7 @@
#define __EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL_H__
//
// Forward reference for pure ANSI compatability
// Forward reference for pure ANSI compatibility
typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL;

View File

@@ -133,12 +133,12 @@ typedef enum {
@param[in] DestinationX - X coordinate of destination for the BltBuffer.
@param[in] DestinationY - Y coordinate of destination for the BltBuffer.
@param[in] Width - Width of rectangle in BltBuffer in pixels.
@param[in] Height - Hight of rectangle in BltBuffer in pixels.
@param[in] Height - Height of rectangle in BltBuffer in pixels.
@param[in] Delta - OPTIONAL
@retval EFI_SUCCESS - The Blt operation completed.
@retval EFI_INVALID_PARAMETER - BltOperation is not valid.
@retval EFI_DEVICE_ERROR - A hardware error occured writting to the video buffer.
@retval EFI_DEVICE_ERROR - A hardware error occurred writing to the video buffer.
--*/
typedef

View File

@@ -71,7 +71,7 @@
//
// use Microsoft C complier dependent integer width types
// use Microsoft C compiler dependent integer width types
//
typedef unsigned __int64 UINT64;
typedef __int64 INT64;
@@ -153,17 +153,17 @@ typedef INT64 INTN;
//
// Modifier to ensure that all protocol member functions and EFI intrinsics
// use the correct C calling convention. All protocol member functions and
// EFI intrinsics are required to modify thier member functions with EFIAPI.
// EFI intrinsics are required to modify their member functions with EFIAPI.
//
#if _MSC_EXTENSIONS
///
/// Define the standard calling convention reguardless of optimization level.
/// Define the standard calling convention regardless of optimization level.
/// __cdecl is Microsoft* specific C extension.
///
#define EFIAPI __cdecl
#elif __GNUC__
///
/// Define the standard calling convention reguardless of optimization level.
/// Define the standard calling convention regardless of optimization level.
/// efidecl is an extension to GCC that supports the differnece between x64
/// GCC ABI and x64 Microsoft* ABI. EFI is closer to the Microsoft* ABI and
/// EFIAPI makes sure the right ABI is used for public interfaces.

View File

@@ -42,7 +42,7 @@ UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
SRes:
SZ_OK - OK
SZ_ERROR_MEM - Memory allocation error
SZ_ERROR_PARAM - Incorrect paramater in props
SZ_ERROR_PARAM - Incorrect parameter in props
SZ_ERROR_WRITE - ISeqOutStream write callback error
SZ_ERROR_OUTPUT_EOF - output buffer overflow - version with (Byte *) output
SZ_ERROR_PROGRESS - some break from progress callback

View File

@@ -142,7 +142,7 @@ HISTORY of the LZMA SDK
9.35 beta 2014-12-07
-------------------------
- 7zr.exe now support AES encryption.
- SFX mudules were added to LZMA SDK
- SFX modules were added to LZMA SDK
- Some bugs were fixed.

View File

@@ -54,7 +54,7 @@ LZMA SDK Contents
- C - small SFXs for installers (7z decompression)
- C++ - SFXs and SFXs for installers (7z decompression)
Precomiled binaries:
Precompiled binaries:
- console programs for lzma / 7z / xz compression and decompression
- SFX modules for installers.

View File

@@ -328,7 +328,7 @@ Returns:
if (strlen(argv[0]) > 2) {
Status = CountVerboseLevel (&argv[0][2], strlen(argv[0]) - 2, &VerboseLevel);
if (EFI_ERROR (Status)) {
Error (NULL, 0, 0x1003, NULL, "%s is invaild parameter!", argv[0]);
Error (NULL, 0, 0x1003, NULL, "%s is invalid parameter!", argv[0]);
return STATUS_ERROR;
}
}
@@ -351,7 +351,7 @@ Returns:
//
// Don't recognize the parameter.
//
Error (NULL, 0, 0x1003, NULL, "%s is invaild parameter!", argv[0]);
Error (NULL, 0, 0x1003, NULL, "%s is invalid parameter!", argv[0]);
return STATUS_ERROR;
}

View File

@@ -229,7 +229,7 @@ Routine Description:
Allocate memory spaces for data structures used in compression process
Argements:
Arguments:
VOID
Returns:
@@ -507,7 +507,7 @@ Returns: (VOID)
if (mMatchLen >= 4) {
//
// We have just got a long match, the target tree
// can be located by MatchPos + 1. Travese the tree
// can be located by MatchPos + 1. Traverse the tree
// from bottom up to get to a proper starting point.
// The usage of PERC_FLAG ensures proper node deletion
// in DeleteNode() later.
@@ -1708,7 +1708,7 @@ Returns:
fprintf (stdout, " --uefi\n\
Enable UefiCompress, use TianoCompress when without this option\n");
fprintf (stdout, " -o FileName, --output FileName\n\
File will be created to store the ouput content.\n");
File will be created to store the output content.\n");
fprintf (stdout, " -v, --verbose\n\
Turn on verbose output with informational messages.\n");
fprintf (stdout, " -q, --quiet\n\
@@ -2714,11 +2714,11 @@ Arguments:
Source - The source buffer containing the compressed data.
Destination - The destination buffer to store the decompressed data
Scratch - The buffer used internally by the decompress routine. This buffer is needed to store intermediate data.
Version - 1 for EFI1.1 Decompress algoruthm, 2 for Tiano Decompress algorithm
Version - 1 for EFI1.1 Decompress algorithm, 2 for Tiano Decompress algorithm
Returns:
RETURN_SUCCESS - Decompression is successfull
RETURN_SUCCESS - Decompression is successful
RETURN_INVALID_PARAMETER - The source data is corrupted
--*/

View File

@@ -210,7 +210,7 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
Sorcerer generated code may contain many calls to _t->type() in a
single statement. This change introduces a temporary variable
to eliminate unnnecesary function calls.
to eliminate unnecesary function calls.
Change implemented by Tom Molteno (tim videoscript.com).
@@ -525,11 +525,11 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
#275. (Changed in MR23) Addition of -nopurify option to antlr
A long time ago the PURIFY macro was introduced to initialize
return value arguments and get rid of annying messages from program
that checked for unitialized variables.
return value arguments and get rid of annoying messages from program
that checked for uninitialized variables.
This has caused significant annoyance for C++ users that had
classes with virtual functions or non-trivial contructors because
classes with virtual functions or non-trivial constructors because
it would zero the object, including the pointer to the virtual
function table. This could be defeated by redefining
the PURIFY macro to be empty, but it was a constant surprise to
@@ -656,12 +656,12 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
#266. (Changed in MR23) virtual function printMessage()
Bill Menees (bill.menees gogallagher.com) has completed the
tedious taks of replacing all calls to fprintf() with calls
tedious tasks of replacing all calls to fprintf() with calls
to the virtual function printMessage(). For classes which
have a pointer to the parser it forwards the printMessage()
call to the parser's printMessage() routine.
This should make it significanly easier to redirect pccts
This should make it significantly easier to redirect pccts
error and warning messages.
#265. (Changed in MR23) Remove "labase++" in C++ mode
@@ -1253,7 +1253,7 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
#228. (Changed in MR20) dlg crashes on "()"
The following token defintion will cause DLG to crash.
The following token definition will cause DLG to crash.
#token "()"
@@ -1747,7 +1747,7 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
#195. (Changed in MR14) #line directive not at column 1
Under certain circunstances a predicate test could generate
Under certain circumstances a predicate test could generate
a #line directive which was not at column 1.
Reported with fix by David K<>gedal (davidk lysator.liu.se)
@@ -2319,7 +2319,7 @@ List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
#164. (Changed in MR13) Unused variable _astp
For many compilations, we have lived with warnings about
the unused variable _astp. It turns out that this varible
the unused variable _astp. It turns out that this variable
can *never* be used because the code which references it was
commented out.

View File

@@ -690,7 +690,7 @@
The first line of the makefiles require a definition of PCCTS_HOME.
These are in additiion to the AntlrMSVC50.* and DlgMSVC50.*
These are in addition to the AntlrMSVC50.* and DlgMSVC50.*
supplied by Jeff Vincent (JVincent@novell.com).
#137. (Changed in MR11) Token getType(), getText(), getLine() const members
@@ -1681,7 +1681,7 @@
the variable [zz]traceOptionValueDefault is set to 0 or 1. When
the parser is initialized or [zz]traceReset() is called the
value of [zz]traceOptionValueDefault is copied to [zz]traceOptionValue.
The value of [zz]traceGuessOptionValue is always initialzed to 1,
The value of [zz]traceGuessOptionValue is always initialized to 1,
but, as noted earlier, nothing will be reported unless
[zz]traceOptionValue is also positive.
@@ -2028,7 +2028,7 @@
The syntax of the class statement ("class parser-name {")
has been extended to allow for the specification of base
classes. An arbirtrary number of tokens may now appear
classes. An arbitrary number of tokens may now appear
between the class name and the "{". They are output
again when the class declaration is generated. For
example:
@@ -2225,7 +2225,7 @@
This is especially important for predicates formed by rules
like the following:
uppperCaseVowel : <<isUpperCase(LATEXT(1))>>? vowel;
upperCaseVowel : <<isUpperCase(LATEXT(1))>>? vowel;
vowel: : <<isVowel(LATEXT(1))>>? LETTERS;
These predicates are combined using AND since both must be
@@ -2492,7 +2492,7 @@
a predicate expression tree. Prior to 1.33MR10 this link was never
cleared and the next time the guard was used to construct a new
tree the link could contain a spurious reference to another element
which had previosly been joined to it in the semantic predicate tree.
which had previously been joined to it in the semantic predicate tree.
For example:
@@ -2565,7 +2565,7 @@
tokens. They may not contain references to (...)+ and
(...)* blocks. This is now checked. This replaces the
fatal error message in item #78 with an appropriate
(non-fatal) error messge.
(non-fatal) error message.
In theory, context guards should be allowed to reference
rules. However, I have not had time to fix this.
@@ -2581,7 +2581,7 @@
correctly when the sets were of unequal sizes. Rewrote
set_equ to make it simpler and remove unnecessary and
expensive calls to set_deg(). This routine was not used
in 1.33 vanila.
in 1.33 vanilla.
#85. (Changed in 1.33MR10) Allow redefinition of MaxNumFiles
@@ -2617,7 +2617,7 @@
There were no changes in antlr or dlg output from the revised version.
The following fragment demonstates the problem by giving different
The following fragment demonstrates the problem by giving different
follow sets (option -pa) for var_access when built with k=1 and ck=2 on
1.33 vanilla and 1.33MR10:
@@ -2658,7 +2658,7 @@
1. start : r:rule t:Token <<$start=$r;>>
The $r refrence will not work when combined with
The $r reference will not work when combined with
the -gt option.
2. start : t:Token <<$start=$t;>>
@@ -3010,7 +3010,7 @@
parse by "falling through". The parse can still be easily
resumed in other ways, but not in the most natural fashion.
This results in an inconsistentcy between named exception
This results in an inconsistency between named exception
handlers and exception handlers for alternatives. When
an exception handler for an alternative "falls through"
it goes to the nextmost outer handler - not the "normal
@@ -3062,7 +3062,7 @@
zzconsumeUntil()
zzconsumeUntilToken()
#58. (Changed in 1.33MR7) Added defintion of zzbufsize to dlgauto.h
#58. (Changed in 1.33MR7) Added definition of zzbufsize to dlgauto.h
#57. (Changed in 1.33MR7) Format of #line directive
@@ -3073,9 +3073,9 @@
#56. (Added in 1.33MR7) Jan Mikkelsen <janm@zeta.org.au>
Move PURIFY macro invocaton to after rule's init action.
Move PURIFY macro invocation to after rule's init action.
#55. (Fixed in 1.33MR7) Unitialized variables in ANTLRParser
#55. (Fixed in 1.33MR7) Uninitialized variables in ANTLRParser
Member variables inf_labase and inf_last were not initialized.
(See item #50.)
@@ -3115,7 +3115,7 @@
The reason for "Normal Action" is that the normal flow of the
program after a user-written exception handler is to "drop through".
In the case of an exception handler for a rule this results in
the exection of a "return" statement. In the case of an
the execution of a "return" statement. In the case of an
exception handler attached to an alternative, rule, or token
this is the code that would have executed had there been no
exception.
@@ -3332,7 +3332,7 @@
Repair bug introduced by 1.33MR1 for #tokdefs. The original fix
placed "DLGmaxToken=9999" and "DLGminToken=0" in the TokenType enum
in order to fix a problem with an aggresive compiler assigning an 8
in order to fix a problem with an aggressive compiler assigning an 8
bit enum which might be too narrow. This caused #tokdefs to assume
that there were 9999 real tokens. The repair to the fix causes antlr to
ignore TokenTypes "DLGmaxToken" and "DLGminToken" in a #tokdefs file.

View File

@@ -1350,7 +1350,7 @@
the variable [zz]traceOptionValueDefault is set to 0 or 1. When
the parser is initialized or [zz]traceReset() is called the
value of [zz]traceOptionValueDefault is copied to [zz]traceOptionValue.
The value of [zz]traceGuessOptionValue is always initialzed to 1,
The value of [zz]traceGuessOptionValue is always initialized to 1,
but, as noted earlier, nothing will be reported unless
[zz]traceOptionValue is also positive.
@@ -1766,7 +1766,7 @@
This is especially important for predicates formed by rules
like the following:
uppperCaseVowel : <<isUpperCase(LATEXT(1))>>? vowel;
upperCaseVowel : <<isUpperCase(LATEXT(1))>>? vowel;
vowel: : <<isVowel(LATEXT(1))>>? LETTERS;
These predicates are combined using AND since both must be
@@ -1928,7 +1928,7 @@
parse by "falling through". The parse can still be easily
resumed in other ways, but not in the most natural fashion.
This results in an inconsistentcy between named exception
This results in an inconsistency between named exception
handlers and exception handlers for alternatives. When
an exception handler for an alternative "falls through"
it goes to the nextmost outer handler - not the "normal
@@ -1990,7 +1990,7 @@
The reason for "Normal Action" is that the normal flow of the
program after a user-written exception handler is to "drop through".
In the case of an exception handler for a rule this results in
the exection of a "return" statement. In the case of an
the execution of a "return" statement. In the case of an
exception handler attached to an alternative, rule, or token
this is the code that would have executed had there been no
exception.

View File

@@ -22,7 +22,7 @@
If the context guard g is not a subset of the lookahead context for r1
(in other words g is neither A nor B) then the code may execute r1
even when the lookahead context is not satisfied. This is an error
by the person coding the grammer, and the error should be reported to
by the person coding the grammar, and the error should be reported to
the user, but it isn't. expect. Some examples I've run seem to
indicate that such an error actually results in the rule becoming
unreachable.
@@ -184,7 +184,7 @@
THM: In MR20 have fixed the most common cases.
The following token defintion will cause DLG to crash.
The following token definition will cause DLG to crash.
#token "()"

View File

@@ -1394,7 +1394,7 @@ tclass()
/* MR23 */ if (p!= NULL && akaString != NULL) {
/* MR23 */ if (p->akaString != NULL) {
/* MR23 */ if (strcmp(p->akaString,akaString) != 0) {
/* MR23 */ warnFL(eMsg2("this #tokclass statment conflicts with a previous #tokclass %s(\"%s\") statement",
/* MR23 */ warnFL(eMsg2("this #tokclass statement conflicts with a previous #tokclass %s(\"%s\") statement",
/* MR23 */ t,p->akaString),
/* MR23 */ FileStr[save_file],save_line);
/* MR23 */ };
@@ -1635,7 +1635,7 @@ token()
if (te != NULL && akaString != NULL) {
if (te->akaString != NULL) {
if (strcmp(te->akaString,akaString) != 0) {
warnFL(eMsg2("this #token statment conflicts with a previous #token %s(\"%s\") statement",
warnFL(eMsg2("this #token statement conflicts with a previous #token %s(\"%s\") statement",
t,te->akaString),
FileStr[save_file],save_line);
};

View File

@@ -1331,7 +1331,7 @@ tclass : <<char *t=NULL; TCnode *e; int go=1,tok,totok; TermEntry *p, *term, *to
/* MR23 */ if (p!= NULL && akaString != NULL) {
/* MR23 */ if (p->akaString != NULL) {
/* MR23 */ if (strcmp(p->akaString,akaString) != 0) {
/* MR23 */ warnFL(eMsg2("this #tokclass statment conflicts with a previous #tokclass %s(\"%s\") statement",
/* MR23 */ warnFL(eMsg2("this #tokclass statement conflicts with a previous #tokclass %s(\"%s\") statement",
/* MR23 */ t,p->akaString),
/* MR23 */ FileStr[save_file],save_line);
/* MR23 */ };
@@ -1439,7 +1439,7 @@ token : <<char *t=NULL, *e=NULL, *a=NULL; int tnum=0;>>
if (te != NULL && akaString != NULL) {
if (te->akaString != NULL) {
if (strcmp(te->akaString,akaString) != 0) {
warnFL(eMsg2("this #token statment conflicts with a previous #token %s(\"%s\") statement",
warnFL(eMsg2("this #token statement conflicts with a previous #token %s(\"%s\") statement",
t,te->akaString),
FileStr[save_file],save_line);
};

View File

@@ -286,7 +286,7 @@ resource 'cmdo' (128, "Antlr") {
"If this option is checked, ANTLR will ge"
"nerate a cross reference for all rules. "
"For each rule it will print a list of al"
"l other rules that refrence it."
"l other rules that reference it."
},
/* [10] */
NotDependent {

View File

@@ -166,7 +166,7 @@ ExceptionGroup *eg;
};
};
/* ocurs at a later pass then for the exception_label */
/* occurs at a later pass then for the exception_label */
/* if an outerEG has been found then fill in the outer EG */
/* remove if from the list when the BlkLevel gets smaller */

View File

@@ -353,7 +353,7 @@ set *rk_out;
set_orin(&a, b);
set_free(b);
}
set_free(rk); /* this has no members, but free it's memory */
set_free(rk); /* this has no members, but free its memory */
set_orin(rk_out, rk2); /* remember what we couldn't do */
set_free(rk2);
if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
@@ -937,7 +937,7 @@ int jtype;
long n;
int thisOverflow=0; /* MR9 */
long set_deg_value; /* MR10 */
long threshhold; /* MR10 */
long threshold; /* MR10 */
require(block!=NULL, "NULL block");
require(block->ntype==nJunction, "invalid block");
@@ -954,8 +954,8 @@ int jtype;
b = set_and(alt1->fset[i], alt2->fset[i]);
/* MR9 */ set_deg_value = set_deg(b);
/* MR10 */ if (n > 0) {
/* MR10 */ threshhold = LONG_MAX / n;
/* MR10 */ if (set_deg_value <= threshhold) {
/* MR10 */ threshold = LONG_MAX / n;
/* MR10 */ if (set_deg_value <= threshold) {
/* MR10 */ n *= set_deg_value;
/* MR10 */ } else {
/* MR10 */ n=LONG_MAX;

View File

@@ -739,7 +739,7 @@ set *rk_out;
t = tlink(t, u, k2); /* any alts missing k2 toks, add u onto end */
Tfree(u); /* MR10 */
}
set_free(rk); /* rk is empty, but free it's memory */
set_free(rk); /* rk is empty, but free its memory */
set_orin(rk_out, rk2); /* remember what we couldn't do */
set_free(rk2);
return t;

View File

@@ -1590,7 +1590,7 @@ int *lastAltEmpty; /* MR23 */
with input "C"
Before MR21 the error message would be "expecting B - found C". After MR21
the error message would be "expcect A, B - found C". This was good, but it
the error message would be "expect A, B - found C". This was good, but it
caused problems for those using parser exceptions because the reference to
B was generated inside the {...} where B really wasn't part of the block.
@@ -1781,7 +1781,7 @@ Junction *q;
followed by a loopBlock whereas the start of a (...)+ block is
represented as a single node: a plusBlock. So if first_item_is_guess_block
is called when the current node is a loopBegin it starts with the
loop block rather than the the sub block which follows the loop block.
loop block rather than the sub block which follows the loop block.
However, we can't just skip past the loop block because some routines
depend on the old implementation. So, we provide a new implementation
which does skip the loopBlock. However, which should be called when ?
@@ -3496,7 +3496,7 @@ do { /* MR10 Change recursion into iteration */
/* MR23
If there were only one return value operand and
it had an initializer then it would have been
initiailized in the declaration.
initialized in the declaration.
*/
returnValueInitializer = getInitializer(q->ret); /* MR23 */
@@ -3740,7 +3740,7 @@ RuleEntry *r;
/* NOTICE: this is done only here, for the method definition, but */
/* not for the method declaration inside the class */
/* definition. This is exactly the behaviour defined in */
/* C++ standard for default paramters. */
/* C++ standard for default parameters. */
DumpANSIFunctionArgDef(output,q, 0 /* emit initializers ? */);
_gen("\n");
@@ -4726,7 +4726,7 @@ int bInitializer;
blocks to look like (...|...| epsilon) since there were
intervening generics. This fixes the problem for this
particular case. Things like actions or empty blocks of
various kinds will still cause problems, but I wasnt't
various kinds will still cause problems, but I wasn't
prepared to handle pathological cases like (A|()*). It
does handle (A | ()), which is a recommended idiom for
epsilon.

View File

@@ -215,7 +215,7 @@ typedef Graph Attrib;
/* M a x i m u m s */
/* MR20 Note G. Hobbelt These values are superceded by values in hash.h */
/* MR20 Note G. Hobbelt These values are superseded by values in hash.h */
#ifndef HashTableSize
#define HashTableSize 253

View File

@@ -640,7 +640,7 @@ Junction *q;
*
*/
/* MR5 Jan Mikkelsen 26-May-97 - added initalComma parameter */
/* MR5 Jan Mikkelsen 26-May-97 - added initialComma parameter */
void
#ifdef __USE_PROTOS
@@ -696,7 +696,7 @@ FILE *output;
&pSeparator,
&nest);
/* MR26 Handle rule arguments such as: IIR_Bool (IIR_Decl::*contstraint)()
/* MR26 Handle rule arguments such as: IIR_Bool (IIR_Decl::*constraint)()
For this we need to strip off anything which follows the symbol.
*/

View File

@@ -2357,7 +2357,7 @@ NEXT_P:
* expression, such as "#pred NotA !A" or "#pred NotXY ! (X && Y) or
* "#pred XbarY !(X && Y)". In particular, it cannot be set by any
* predicate expression occurring under any other circumstances.
* The #pred predicate expresssions are stored with in predEntry->pred
* The #pred predicate expressions are stored with in predEntry->pred
* and do not normally appear anywhere else until the predicates are
* "unfolded" in order to recognize redundancies, conflicts, and
* tautologies.

View File

@@ -90,7 +90,7 @@ set nfa_states;
if (dfa_size<=dfa_allocated){
/* need to redo array */
if (!dfa_array){
/* need some to do inital allocation */
/* need some to do initial allocation */
dfa_size=dfa_allocated+DFA_MIN;
dfa_array=(dfa_node **) malloc(sizeof(dfa_node*)*
dfa_size);
@@ -113,7 +113,7 @@ set nfa_states;
}
/* past a pointer to the start start of the nfa graph
/* past a pointer to the start of the nfa graph
* nfa_to_dfa convers this graph to dfa. The function returns
* a pointer to the first dfa state.
* NOTE: The function that prints out the table will have to figure out how
@@ -219,7 +219,7 @@ FILE *f;
#endif
/* Returns a pointer to a dfa node that has the same nfa nodes in it.
* This may or maynot be a newly created node.
* This may or may not be a newly created node.
*/
dfa_node *
#ifdef __USE_PROTOS

View File

@@ -117,7 +117,7 @@ typedef struct {
extern char program[]; /* tells what program this is */
extern char version[]; /* tells what version this is */
extern char *file_str[]; /* file names being used */
extern int err_found; /* flag to indicate error occured */
extern int err_found; /* flag to indicate error occurred */
extern int action_no; /* last action function printed */
extern int func_action; /* should actions be turned into functions?*/
extern set used_chars; /* used to label trans. arcs */
@@ -129,7 +129,7 @@ extern int comp_level; /* what compression level to use */
extern int interactive; /* interactive scanner (avoid lookahead)*/
extern int mode_counter; /* keeps track of the number of %%name */
extern int dfa_basep[]; /* start of each group of dfa */
extern int dfa_class_nop[];/* number of transistion arcs in */
extern int dfa_class_nop[];/* number of transition arcs in */
/* each dfa in each mode */
extern int nfa_allocated;
extern int dfa_allocated;

View File

@@ -23,9 +23,9 @@ resource 'cmdo' (128, "Dlg") {
{35, 175, 50, 225},
"On",
"-CC",
"When this control is checked, DLG genera"
"tes a scanner using C++ classes rather t"
"han C functions."
"When this control is checked, DLG generates "
"a scanner using C++ classes rather than "
"C functions."
},
/* [2] */
Or {
@@ -41,8 +41,7 @@ resource 'cmdo' (128, "Dlg") {
"DLGLexer",
keepCase,
"-cl",
"This entry specifies the name DLG uses f"
"or the C++ lexer class."
"This entry specifies the name DLG uses for the C++ lexer class."
},
/* [3] */
NotDependent {
@@ -90,8 +89,7 @@ resource 'cmdo' (128, "Dlg") {
{66, 25, 85, 135},
"Output File",
"",
"Choose the name of the file that will ho"
"ld the DLG-produced scanner."
"Choose the name of the file that will hold the DLG-produced scanner."
},
NoMore {
@@ -161,8 +159,7 @@ resource 'cmdo' (128, "Dlg") {
"mode.h",
keepCase,
"-m",
"This entry specifies the name DLG uses f"
"or its lexical mode output file."
"This entry specifies the name DLG uses for its lexical mode output file."
},
/* [11] */
NotDependent {
@@ -171,15 +168,14 @@ resource 'cmdo' (128, "Dlg") {
RadioButtons {
{ /* array radioArray: 3 elements */
/* [1] */
{134, 175, 149, 255}, "None", "", Set, "When this option is selected, DLG will n"
"ot compress its tables.",
{134, 175, 149, 255}, "None", "", Set, "When this option is selected, DLG will not "
"compress its tables.",
/* [2] */
{134, 265, 149, 345}, "Level 1", "-C1", NotSet, "When this option is selected, DLG will r"
"emove all unused characters from the tra"
"nsition-from table.",
{134, 265, 149, 345}, "Level 1", "-C1", NotSet, "When this option is selected, DLG will "
"remove all unused characters from the transition-from table.",
/* [3] */
{134, 360, 149, 450}, "Level 2", "-C2", NotSet, "When this option is selected, DLG will p"
"erform level 1 compression plus it will "
{134, 360, 149, 450}, "Level 2", "-C2", NotSet, "When this option is selected, DLG will "
"perform level 1 compression plus it will "
"map equivalent characters into the same "
"character classes."
}
@@ -202,8 +198,8 @@ resource 'cmdo' (128, "Dlg") {
{165, 20, 180, 145},
"Case Sensitive",
"-ci",
"When this control is checked, the DLG au"
"tomaton will treat upper and lower case "
"When this control is checked, the DLG automaton "
"will treat upper and lower case "
"characters identically."
},
/* [14] */
@@ -215,9 +211,8 @@ resource 'cmdo' (128, "Dlg") {
{165, 150, 180, 300},
"Interactive Scanner",
"-i",
"When this control is checked, DLG will g"
"enerate as interactive a scanner as poss"
"ible."
"When this control is checked, DLG will generate "
"as interactive a scanner as possible."
},
/* [15] */
NotDependent {
@@ -229,8 +224,8 @@ resource 'cmdo' (128, "Dlg") {
"Ambiguity Warnings",
"-Wambiguity",
"When this control is checked, DLG warns "
"if more than one regular expression coul"
"d match the same character sequence."
"if more than one regular expression could "
"match the same character sequence."
},
/* [16] */
NotDependent {
@@ -240,9 +235,9 @@ resource 'cmdo' (128, "Dlg") {
VersionString {
"1.33MR"
},
"PCCTS was written by Terence Parr, Russe"
"ll Quong, Will Cohen, and Hank Dietz: 19"
"89-1998. MPW port by Scott Haney.",
"PCCTS was written by Terence Parr, Russell "
"Quong, Will Cohen, and Hank Dietz: 1989-1998. "
"MPW port by Scott Haney.",
noDialog
},
/* [17] */
@@ -266,8 +261,8 @@ resource 'cmdo' (128, "Dlg") {
{142, 20, 157, 148},
"Generate ANSI C",
"-ga",
"When this control is checked, DLG genera"
"tes ANSI C compatible code."
"When this control is checked, DLG generates "
"ANSI C compatible code."
}
}
}

View File

@@ -813,7 +813,7 @@ new_nfa_node()
if (nfa_size<=nfa_allocated){
/* need to redo array */
if (!nfa_array){
/* need some to do inital allocation */
/* need some to do initial allocation */
nfa_size=nfa_allocated+NFA_MIN;
nfa_array=(nfa_node **) malloc(sizeof(nfa_node*)*
nfa_size);

View File

@@ -463,7 +463,7 @@ new_nfa_node()
if (nfa_size<=nfa_allocated){
/* need to redo array */
if (!nfa_array){
/* need some to do inital allocation */
/* need some to do initial allocation */
nfa_size=nfa_allocated+NFA_MIN;
nfa_array=(nfa_node **) malloc(sizeof(nfa_node*)*
nfa_size);

View File

@@ -134,7 +134,7 @@ int level; /* compression level to uses */
/* given pointer to beginning of graph and recursively walks it trying
* to find a maximal partition. This partion in returned in maximal_class
* to find a maximal partition. This partition in returned in maximal_class
*/
#ifdef __USE_PROTOS
void intersect_nfa_labels(nfa_node* start,set* maximal_class)

View File

@@ -69,7 +69,7 @@ ANTLRTokenPtr::~ANTLRTokenPtr()
//
// 8-Apr-97 MR1 Make operator -> a const member function
// as weall as some other member functions
// as well as some other member functions
//
ANTLRTokenPtr& ANTLRTokenPtr::operator = (const ANTLRTokenPtr & lhs) // MR1
{

View File

@@ -6,7 +6,7 @@
/* By Hubert Holin (Hubert.Holin@Bigfoot.com), 1998. */
/* */
/* This is completely free stuff, do whatever you want with */
/* it (but then, I will take no responsability for whatever */
/* it (but then, I will take no responsibility for whatever */
/* may happen if you do either... caveat emptor!). */
/* */
/************************************************************/
@@ -24,12 +24,12 @@ PCCTS_NAMESPACE_STD
// NOTES: The semantics of the copy constructor
// and the affectation operator may be unwaranted...
// and the affectation operator may be unwarranted...
// and the stream may not be reset.
//
// It would have been so much nicer for nextChar()
// to throw (of for the DLGInputStream to change status)
// upon hiting EOF than to return an "int"...
// upon hitting EOF than to return an "int"...
template <
class E,

View File

@@ -797,7 +797,7 @@ extern int zzguessing;
extern zzjmp_buf zzguess_start;
#endif
/* Define global veriables that refer to values exported by the scanner.
/* Define global variables that refer to values exported by the scanner.
* These declarations duplicate those in dlgdef.h, but are needed
* if ANTLR is not to generate a .dlg file (-gx); PS, this is a hack.
*/

View File

@@ -1,6 +1,6 @@
/** @file
VfrCompiler internal defintions.
VfrCompiler internal definitions.
Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials

View File

@@ -45,7 +45,7 @@ static SVFR_ERROR_HANDLE VFR_ERROR_HANDLE_TABLE [] = {
{ VFR_RETURN_DATA_STRING_ERROR, ": data field string error or not support"},
{ VFR_RETURN_DEFAULT_VALUE_REDEFINED, ": default value re-defined with different value"},
{ VFR_RETURN_CONSTANT_ONLY, ": only constant is allowed in the expression"},
{ VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR, ": Varstore name is defined by more than one varstores, it can't be referred as varstore, only varstore strucure name could be used."},
{ VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR, ": Varstore name is defined by more than one varstores, it can't be referred as varstore, only varstore structure name could be used."},
{ VFR_RETURN_BIT_WIDTH_ERROR, ": bit width must be <= sizeof (type) * 8 and the max width can not > 32" },
{ VFR_RETURN_STRING_TO_UINT_OVERFLOW, ": String to UINT* Overflow"},
{ VFR_RETURN_CODEUNDEFINED, ": undefined Error Code" }

View File

@@ -945,7 +945,7 @@ CFormPkg::DeclarePendingQuestion (
}
CNObj.SetFlags (0, Info.mVarType);
//
// Use maximum value not to limit the vaild value for the undefined question.
// Use maximum value not to limit the valid value for the undefined question.
//
switch (Info.mVarType) {
case EFI_IFR_TYPE_NUM_SIZE_64:
@@ -1515,7 +1515,7 @@ CIfrRecordInfoDB::IfrRecordAdjust (
}
//
// extract inconsistent opcode list
// pNode is Incosistent opcode, tNode is End Opcode
// pNode is Inconsistent opcode, tNode is End Opcode
//
//

View File

@@ -64,7 +64,7 @@ VfrParserStart (
//
// Define a lexical class for parsing quoted strings. Basically
// starts with a double quote, and ends with a double quote that
// is not preceeded with a backslash.
// is not preceded with a backslash.
//
#lexclass QUOTED_STRING
#token TheString "~[\"]*\"" << mode (START); >>
@@ -1214,7 +1214,7 @@ vfrStatementVarStoreNameValue :
;
//
// keep classDeinition and validClassNames for compatibility but not generate
// keep classDefinition and validClassNames for compatibility but not generate
// any IFR object
//
classDefinition[UINT16 & Class] :
@@ -4121,7 +4121,7 @@ vfrStatementExpression [UINT32 RootLevel, UINT32 ExpOpCount = 0] :
//
// Add new sub function for the sub expression extension to remember the ExpOpCount
// This funciton is only called by sub expression.
// This function is only called by sub expression.
//
vfrStatementExpressionSub [UINT32 RootLevel, UINT32 & ExpOpCount] :
andTerm[$RootLevel, $ExpOpCount]
@@ -5615,7 +5615,7 @@ EfiVfrParser::_DeclareDefaultFrameworkVarStore (
VSEObj.SetAttributes (0x00000002); //hardcode EFI_VARIABLE_BOOTSERVICE_ACCESS attribute
VSEObj.SetGuid (&pNode->mGuid);
VSEObj.SetVarStoreId (pNode->mVarStoreId);
// Generate old efi varstore storage structure for compatiable with old "VarEqVal" opcode,
// Generate old efi varstore storage structure for compatible with old "VarEqVal" opcode,
// which is 3 bytes less than new structure define in UEFI Spec 2.3.1.
VSEObj.SetBinaryLength (sizeof (EFI_IFR_VARSTORE_EFI) - 3);
#ifdef VFREXP_DEBUG

View File

@@ -1177,7 +1177,7 @@ CVfrVarDataTypeDB::DataTypeAddBitField (
}
} else {
//
// Check whether the bit fileds can be contained within one FieldType.
// Check whether the bit fields can be contained within one FieldType.
//
if (pTmp != NULL && pTmp->mIsBitField && strcmp (pTmp->mFieldType->mTypeName, pNewField->mFieldType->mTypeName) == 0 &&
(pTmp->mBitOffset - pTmp->mOffset * 8) + pTmp->mBitWidth + pNewField->mBitWidth <= pNewField->mFieldType->mTotalSize * 8) {
@@ -2058,7 +2058,7 @@ CVfrDataStorage::GetVarStoreId (
*VarStoreId = EFI_VARSTORE_ID_INVALID;
//
// Assume that Data strucutre name is used as StoreName, and check again.
// Assume that Data structure name is used as StoreName, and check again.
//
ReturnCode = GetVarStoreByDataType (StoreName, &pNode, StoreGuid);
if (pNode != NULL) {
@@ -2843,7 +2843,7 @@ CVfrQuestionDB::PrintAllQuestion (
SVfrQuestionNode *pNode = NULL;
for (pNode = mQuestionList; pNode != NULL; pNode = pNode->mNext) {
printf ("Question VarId is %s and QuesitonId is 0x%x\n", pNode->mVarIdStr, pNode->mQuestionId);
printf ("Question VarId is %s and QuestionId is 0x%x\n", pNode->mVarIdStr, pNode->mQuestionId);
}
}