\r
VfrCompiler main class and main function.\r
\r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
mOptions.IncludePaths = NULL;\r
mOptions.SkipCPreprocessor = TRUE;\r
mOptions.CPreprocessorOptions = NULL;\r
- mOptions.CompatibleMode = FALSE;\r
mOptions.HasOverrideClassGuid = FALSE;\r
mOptions.WarningAsError = FALSE;\r
mOptions.AutoDefault = FALSE;\r
}\r
\r
AppendCPreprocessorOptions (Argv[Index]);\r
- } else if (stricmp(Argv[Index], "-c") == 0 || stricmp(Argv[Index], "--compatible-framework") == 0) {\r
- mOptions.CompatibleMode = TRUE;\r
} else if (stricmp(Argv[Index], "-s") == 0|| stricmp(Argv[Index], "--string-db") == 0) {\r
Index++;\r
if ((Index >= Argc) || (Argv[Index][0] == '-')) {\r
" create an IFR HII pack file",\r
" -n, --no-pre-processing",\r
" do not preprocessing input file",\r
- " -c, --compatible-framework",\r
- " compatible framework vfr file",\r
" -s, --string-db",\r
" input uni string package file",\r
" -g, --guid",\r
goto Fail;\r
}\r
\r
- InputInfo.CompatibleMode = mOptions.CompatibleMode;\r
if (mOptions.HasOverrideClassGuid) {\r
InputInfo.OverrideClassGuid = &mOptions.OverrideClassGuid;\r
} else {\r
DebugError (NULL, 0, 0001, "Error parsing vfr file", " %s.Buffer not allocated.", mOptions.VfrFileName);\r
}\r
\r
- //\r
- // For UEFI mode, not do OpCode Adjust\r
- //\r
- if (mOptions.CompatibleMode) {\r
- //\r
- // Adjust Opcode to be compatible with framework vfr\r
- //\r
- Status = gCIfrRecordInfoDB.IfrRecordAdjust ();\r
- if (Status != VFR_RETURN_SUCCESS) {\r
- //\r
- // Record List Adjust Failed\r
- //\r
- SET_RUN_STATUS (STATUS_FAILED);\r
- return;\r
- }\r
- //\r
- // Re get the IfrRecord Buffer.\r
- //\r
- gCIfrRecordInfoDB.IfrRecordOutput (gRBuffer);\r
- }\r
-\r
return;\r
}\r
\r
goto Fail;\r
}\r
\r
- if (!mOptions.CreateIfrPkgFile || mOptions.CompatibleMode) {\r
+ if (!mOptions.CreateIfrPkgFile) {\r
if ((pFile = fopen (LongFilePath (mOptions.COutputFileName), "w")) == NULL) {\r
DebugError (NULL, 0, 0001, "Error opening output C file", "%s", mOptions.COutputFileName);\r
goto Fail;\r
fprintf (pFile, "%s\n", gSourceFileHeader[Index]);\r
}\r
\r
- if (mOptions.CompatibleMode) {\r
- gCVfrBufferConfig.OutputCFile (pFile, mOptions.VfrBaseFileName);\r
- }\r
-\r
if (gCFormPkg.GenCFile (mOptions.VfrBaseFileName, pFile, &gRBuffer) != VFR_RETURN_SUCCESS) {\r
fclose (pFile);\r
goto Fail;\r
\r
VfrCompiler internal definitions.\r
\r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
CHAR8 *IncludePaths;\r
bool SkipCPreprocessor;\r
CHAR8 *CPreprocessorOptions;\r
- BOOLEAN CompatibleMode;\r
BOOLEAN HasOverrideClassGuid;\r
EFI_GUID OverrideClassGuid;\r
BOOLEAN WarningAsError;\r
\r
The definition of CFormPkg's member function\r
\r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
return Ret;\r
}\r
\r
- //\r
- // For framework vfr file, the extension framework header will be added.\r
- //\r
- if (VfrCompatibleMode) {\r
- fprintf (pFile, " // FRAMEWORK PACKAGE HEADER Length\n");\r
- PkgLength = PkgHdr->Length + sizeof (UINT32) + 2;\r
- _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, " ", (CHAR8 *)&PkgLength, sizeof (UINT32));\r
- fprintf (pFile, "\n\n // FRAMEWORK PACKAGE HEADER Type\n");\r
- PkgLength = 3;\r
- _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, " ", (CHAR8 *)&PkgLength, sizeof (UINT16));\r
- } else {\r
- fprintf (pFile, " // ARRAY LENGTH\n");\r
- PkgLength = PkgHdr->Length + sizeof (UINT32);\r
- _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, " ", (CHAR8 *)&PkgLength, sizeof (UINT32));\r
- }\r
+\r
+ fprintf (pFile, " // ARRAY LENGTH\n");\r
+ PkgLength = PkgHdr->Length + sizeof (UINT32);\r
+ _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, " ", (CHAR8 *)&PkgLength, sizeof (UINT32));\r
\r
fprintf (pFile, "\n\n // PACKAGE HEADER\n");\r
_WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, " ", (CHAR8 *)PkgHdr, sizeof (EFI_HII_PACKAGE_HEADER));\r
// For undefined Efi VarStore type question\r
// Append the extended guided opcode to contain VarName\r
//\r
- if (VarStoreType == EFI_VFR_VARSTORE_EFI || VfrCompatibleMode) {\r
+ if (VarStoreType == EFI_VFR_VARSTORE_EFI) {\r
CIfrVarEqName CVNObj (QId, Info.mInfo.mVarName);\r
CVNObj.SetLineNo (LineNo);\r
}\r
\r
The definition of CFormPkg's member function\r
\r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
};\r
\r
typedef struct {\r
- BOOLEAN CompatibleMode;\r
EFI_GUID *OverrideClassGuid;\r
} INPUT_INFO_TO_SYNTAX;\r
\r
/*++ @file\r
Vfr Syntax\r
\r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
--*/\r
)\r
{\r
ParserBlackBox<CVfrDLGLexer, EfiVfrParser, ANTLRToken> VfrParser(File);\r
- VfrParser.parser()->SetCompatibleMode (InputInfo->CompatibleMode);\r
VfrParser.parser()->SetOverrideClassGuid (InputInfo->OverrideClassGuid);\r
return VfrParser.parser()->vfrProgram();\r
}\r
>>\r
vfrFormSetList\r
E:EndFormSet <<\r
- if (mCompatibleMode) {\r
- //\r
- // declare all undefined varstore and efivarstore\r
- //\r
- _DeclareDefaultFrameworkVarStore (GET_LINENO(E));\r
- }\r
- \r
//\r
// Declare undefined Question so that they can be used in expression.\r
//\r
\r
VOID _DeclareDefaultLinearVarStore (IN UINT32);\r
VOID _DeclareStandardDefaultStorage (IN UINT32);\r
- VOID _DeclareDefaultFrameworkVarStore (IN UINT32);\r
\r
VOID AssignQuestionKey (IN CIfrQuestionHeader &, IN ANTLRTokenPtr);\r
\r
VOID IdEqIdDoSpecial (IN UINT32 &, IN UINT32, IN EFI_QUESTION_ID, IN CHAR8 *, IN UINT32, IN EFI_QUESTION_ID, IN CHAR8 *, IN UINT32, IN EFI_COMPARE_TYPE);\r
VOID IdEqListDoSpecial (IN UINT32 &, IN UINT32, IN EFI_QUESTION_ID, IN CHAR8 *, IN UINT32, IN UINT16, IN UINT16 *);\r
VOID SetOverrideClassGuid (IN EFI_GUID *);\r
-//\r
-// For framework vfr compatibility\r
-//\r
- VOID SetCompatibleMode (IN BOOLEAN);\r
>>\r
}\r
\r
return Ref;\r
}\r
\r
-//\r
-// framework vfr to default declare varstore for each structure\r
-//\r
-VOID\r
-EfiVfrParser::_DeclareDefaultFrameworkVarStore (\r
- IN UINT32 LineNo\r
- )\r
-{\r
- SVfrVarStorageNode *pNode;\r
- UINT32 TypeSize;\r
- BOOLEAN FirstNode;\r
- CONST CHAR8 VarName[] = "Setup";\r
-\r
- FirstNode = TRUE;\r
- pNode = gCVfrDataStorage.GetBufferVarStoreList();\r
- if (pNode == NULL && gCVfrVarDataTypeDB.mFirstNewDataTypeName != NULL) {\r
- //\r
- // Create the default Buffer Var Store when no VarStore is defined.\r
- // its name should be "Setup"\r
- //\r
- gCVfrVarDataTypeDB.GetDataTypeSize (gCVfrVarDataTypeDB.mFirstNewDataTypeName, &TypeSize);\r
- CIfrVarStore VSObj;\r
- VSObj.SetLineNo (LineNo);\r
- VSObj.SetVarStoreId (0x1); //the first and only one Buffer Var Store\r
- VSObj.SetSize ((UINT16) TypeSize);\r
- //VSObj.SetName (gCVfrVarDataTypeDB.mFirstNewDataTypeName);\r
- VSObj.SetName ((CHAR8 *) VarName);\r
- VSObj.SetGuid (&mFormsetGuid);\r
-#ifdef VFREXP_DEBUG\r
- printf ("Create the default VarStoreName is %s\n", gCVfrVarDataTypeDB.mFirstNewDataTypeName);\r
-#endif\r
- } else {\r
- for (; pNode != NULL; pNode = pNode->mNext) {\r
- //\r
- // create the default varstore opcode for not declared varstore\r
- // the first varstore name should be "Setup"\r
- //\r
- if (!pNode->mAssignedFlag) {\r
- CIfrVarStore VSObj;\r
- VSObj.SetLineNo (LineNo);\r
- VSObj.SetVarStoreId (pNode->mVarStoreId);\r
- VSObj.SetSize ((UINT16) pNode->mStorageInfo.mDataType->mTotalSize);\r
- if (FirstNode) {\r
- VSObj.SetName ((CHAR8 *) VarName);\r
- FirstNode = FALSE;\r
- } else {\r
- VSObj.SetName (pNode->mVarStoreName);\r
- }\r
- VSObj.SetGuid (&pNode->mGuid);\r
-#ifdef VFREXP_DEBUG\r
- printf ("undefined VarStoreName is %s and Id is 0x%x\n", pNode->mVarStoreName, pNode->mVarStoreId);\r
-#endif\r
- }\r
- }\r
- }\r
-\r
- pNode = gCVfrDataStorage.GetEfiVarStoreList();\r
- for (; pNode != NULL; pNode = pNode->mNext) {\r
- //\r
- // create the default efi varstore opcode for not exist varstore\r
- //\r
- if (!pNode->mAssignedFlag) {\r
- CIfrVarStoreEfi VSEObj;\r
- VSEObj.SetLineNo (LineNo);\r
- VSEObj.SetAttributes (0x00000002); //hardcode EFI_VARIABLE_BOOTSERVICE_ACCESS attribute\r
- VSEObj.SetGuid (&pNode->mGuid);\r
- VSEObj.SetVarStoreId (pNode->mVarStoreId);\r
- // Generate old efi varstore storage structure for compatible with old "VarEqVal" opcode,\r
- // which is 3 bytes less than new structure define in UEFI Spec 2.3.1.\r
- VSEObj.SetBinaryLength (sizeof (EFI_IFR_VARSTORE_EFI) - 3);\r
-#ifdef VFREXP_DEBUG\r
- printf ("undefined Efi VarStoreName is %s and Id is 0x%x\n", pNode->mVarStoreName, pNode->mVarStoreId);\r
-#endif\r
- }\r
- }\r
-\r
-}\r
-\r
VOID\r
EfiVfrParser::_DeclareDefaultLinearVarStore (\r
IN UINT32 LineNo\r
mOverrideClassGuid = OverrideClassGuid;\r
}\r
\r
-//\r
-// For framework vfr compatibility\r
-//\r
-VOID\r
-EfiVfrParser::SetCompatibleMode (IN BOOLEAN Mode)\r
-{\r
- mCompatibleMode = Mode;\r
- mCVfrQuestionDB.SetCompatibleMode (Mode);\r
-}\r
-\r
VOID\r
EfiVfrParser::CheckDuplicateDefaultValue (\r
IN EFI_DEFAULT_ID DefaultId,\r
\r
Vfr common library functions.\r
\r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
return VFR_RETURN_FATAL_ERROR;\r
}\r
\r
- //\r
- // Framework Vfr file Array Index is from 1.\r
- // But Uefi Vfr file Array Index is from 0.\r
- //\r
- if (VfrCompatibleMode && ArrayIdx != INVALID_ARRAY_INDEX) {\r
- if (ArrayIdx == 0) {\r
- return VFR_RETURN_ERROR_ARRARY_NUM;\r
- }\r
- ArrayIdx = ArrayIdx - 1;\r
- }\r
-\r
if ((ArrayIdx != INVALID_ARRAY_INDEX) && ((Field->mArrayNum == 0) || (Field->mArrayNum <= ArrayIdx))) {\r
return VFR_RETURN_ERROR_ARRARY_NUM;\r
}\r
{\r
UINT32 Index, Mask, Offset;\r
\r
- //\r
- // Assign the different ID range for the different type VarStore to support Framework Vfr\r
- //\r
Index = 0;\r
- if ((!VfrCompatibleMode) || (VarType == EFI_VFR_VARSTORE_BUFFER)) {\r
- Index = 0;\r
- } else if (VarType == EFI_VFR_VARSTORE_EFI) {\r
- Index = 1;\r
- } else if (VarType == EFI_VFR_VARSTORE_NAME) {\r
- Index = 2;\r
- }\r
\r
for (; Index < EFI_FREE_VARSTORE_ID_BITMAP_SIZE; Index++) {\r
if (mFreeVarStoreIdBitMap[Index] != 0xFFFFFFFF) {\r
SVfrVarStorageNode *pNode;\r
SVfrVarStorageNode *MatchNode;\r
\r
- //\r
- // Framework VFR uses Data type name as varstore name, so don't need check again.\r
- //\r
- if (VfrCompatibleMode) {\r
- return VFR_RETURN_UNDEFINED;\r
- }\r
-\r
MatchNode = NULL;\r
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
if (strcmp (pNode->mStorageInfo.mDataType->mTypeName, DataTypeName) != 0) {\r
return VFR_RETURN_GET_NVVARSTORE_ERROR;\r
}\r
\r
- //\r
- // Framework Vfr file Index is from 1, but Uefi Vfr file Index is from 0.\r
- //\r
- if (VfrCompatibleMode) {\r
- if (Index == 0) {\r
- return VFR_RETURN_ERROR_ARRARY_NUM;\r
- }\r
- Index --;\r
- }\r
-\r
Info->mInfo.mVarName = mCurrVarStorageNode->mStorageInfo.mNameSpace.mNameTable[Index];\r
\r
return VFR_RETURN_SUCCESS;\r
if (QuestionId == EFI_QUESTION_ID_INVALID) {\r
QuestionId = GetFreeQuestionId ();\r
} else {\r
- //\r
- // For Framework Vfr, don't check question ID conflict.\r
- //\r
- if (!VfrCompatibleMode && ChekQuestionIdFree (QuestionId) == FALSE) {\r
+ if (ChekQuestionIdFree (QuestionId) == FALSE) {\r
delete pNode;\r
return VFR_RETURN_QUESTIONID_REDEFINED;\r
}\r
return VFR_RETURN_SUCCESS;\r
}\r
\r
- //\r
- // For Framework Vfr, don't check question ID conflict.\r
- //\r
- if (!VfrCompatibleMode && ChekQuestionIdFree (NewQId) == FALSE) {\r
+ if (ChekQuestionIdFree (NewQId) == FALSE) {\r
return VFR_RETURN_REDEFINED;\r
}\r
\r
return StringSize;\r
}\r
\r
-BOOLEAN VfrCompatibleMode = FALSE;\r
-\r
CVfrVarDataTypeDB gCVfrVarDataTypeDB;\r
CVfrDefaultStore gCVfrDefaultStore;\r
CVfrDataStorage gCVfrDataStorage;\r
\r
Vfr common library functions.\r
\r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
#include "EfiVfr.h"\r
#include "VfrError.h"\r
\r
-extern BOOLEAN VfrCompatibleMode;\r
static EFI_GUID gEdkiiIfrBitVarGuid = EDKII_IFR_BIT_VARSTORE_GUID;\r
\r
#define MAX_BIT_WIDTH 32\r
VOID PrintAllQuestion (IN VOID);\r
VOID ResetInit (IN VOID);\r
\r
- VOID SetCompatibleMode (IN BOOLEAN Mode) {\r
- VfrCompatibleMode = Mode;\r
- }\r
-\r
private:\r
CVfrQuestionDB (IN CONST CVfrQuestionDB&); // Prevent copy-construction\r
CVfrQuestionDB& operator= (IN CONST CVfrQuestionDB&); // Prevent assignment\r
\fs18\cf1\insrsid2570438 \hich\af43\dbch\af31505\loch\f43 t}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid1204842 \hich\af43\dbch\af31505\loch\f43 he}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 \r
input vfr file. The input VFR file has been pro\hich\af43\dbch\af31505\loch\f43 cessed. If this option is not specified, the default behavior is same to set this option. \r
\par }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid83254 \hich\af43\dbch\af31505\loch\f43 Selecting this option disables preprocessing of VFR files. }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid2570438 \r
-\par }\pard \ltrpar\ql \li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \ab\af43\afs18 \ltrch\fcs0 \b\fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 -c, --compatible-framework\r
-\par }\pard \ltrpar\ql \li360\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 Recognize}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid83254 \r
-\hich\af43\dbch\af31505\loch\f43 s}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 the input VFR file is the framework VFR syntax. If this option is n\hich\af43\dbch\af31505\loch\f43 \r
-ot specified, the UEFI syntax is default }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid83254 \hich\af43\dbch\af31505\loch\f43 the VFR }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 syntax.\r
\par }\pard \ltrpar\ql \li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \ab\af43\afs18 \ltrch\fcs0 \b\fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 -h, --help\r
\par }\pard \ltrpar\ql \fi360\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 Print version and usage of this program and exit.\r
\par }\pard \ltrpar\ql \li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid12931970 {\rtlch\fcs1 \ab\af43\afs18 \ltrch\fcs0 \b\fs18\insrsid12931970\charrsid6448922 \hich\af43\dbch\af31505\loch\f43 -s, --string-db\r
projects / mirror_edk2.git / commitdiff