\r
VfrCompiler main class and main function.\r
\r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
mOptions.CPreprocessorOptions = NULL;\r
mOptions.CompatibleMode = FALSE;\r
mOptions.HasOverrideClassGuid = FALSE;\r
+ mOptions.WarningAsError = FALSE;\r
memset (&mOptions.OverrideClassGuid, 0, sizeof (EFI_GUID));\r
\r
if (Argc == 1) {\r
Usage ();\r
SET_RUN_STATUS (STATUS_DEAD);\r
return;\r
+ } else if (stricmp(Argv[Index], "--version") == 0) {\r
+ Version ();\r
+ SET_RUN_STATUS (STATUS_DEAD);\r
+ return;\r
} else if (stricmp(Argv[Index], "-l") == 0) {\r
mOptions.CreateRecordListFile = TRUE;\r
gCIfrRecordInfoDB.TurnOn ();\r
goto Fail;\r
}\r
mOptions.HasOverrideClassGuid = TRUE;\r
+ } else if (stricmp(Argv[Index], "-w") == 0 || stricmp(Argv[Index], "--warning-as-error") == 0) {\r
+ mOptions.WarningAsError = TRUE;\r
} else {\r
DebugError (NULL, 0, 1000, "Unknown option", "unrecognized option %s", Argv[Index]);\r
goto Fail;\r
mPreProcessCmd = (CHAR8 *) PREPROCESSOR_COMMAND;\r
mPreProcessOpt = (CHAR8 *) PREPROCESSOR_OPTIONS;\r
\r
+ SET_RUN_STATUS (STATUS_STARTED);\r
+\r
OptionInitialization(Argc, Argv);\r
\r
if ((IS_RUN_STATUS(STATUS_FAILED)) || (IS_RUN_STATUS(STATUS_DEAD))) {\r
UINT32 Index;\r
CONST CHAR8 *Help[] = {\r
" ", \r
- "VfrCompile version " VFR_COMPILER_VERSION __BUILD_VERSION VFR_COMPILER_UPDATE_TIME,\r
- "Copyright (c) 2004-2011 Intel Corporation. All rights reserved.",\r
+ "VfrCompile version " VFR_COMPILER_VERSION "Build " __BUILD_VERSION,\r
+ "Copyright (c) 2004-2016 Intel Corporation. All rights reserved.",\r
" ",\r
"Usage: VfrCompile [options] VfrFile",\r
" ",\r
"Options:",\r
" -h, --help prints this help",\r
+ " --version prints version info",\r
" -l create an output IFR listing file",\r
" -o DIR, --output-directory DIR",\r
" deposit all output files to directory OutputDir",\r
" -g, --guid",\r
" override class guid input",\r
" format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",\r
+ " -w --warning-as-error",\r
+ " treat warning as an error",\r
+ NULL\r
+ };\r
+ for (Index = 0; Help[Index] != NULL; Index++) {\r
+ fprintf (stdout, "%s\n", Help[Index]);\r
+ }\r
+}\r
+\r
+VOID \r
+CVfrCompiler::Version (\r
+ VOID\r
+ )\r
+{\r
+ UINT32 Index;\r
+ CONST CHAR8 *Help[] = {\r
+ "VfrCompile version " VFR_COMPILER_VERSION "Build " __BUILD_VERSION,\r
NULL\r
};\r
for (Index = 0; Help[Index] != NULL; Index++) {\r
goto Out;\r
}\r
\r
- if ((pVfrFile = fopen (mOptions.VfrFileName, "r")) == NULL) {\r
+ if ((pVfrFile = fopen (LongFilePath (mOptions.VfrFileName), "r")) == NULL) {\r
DebugError (NULL, 0, 0001, "Error opening the input VFR file", mOptions.VfrFileName);\r
goto Fail;\r
}\r
InFileName = (mOptions.SkipCPreprocessor == TRUE) ? mOptions.VfrFileName : mOptions.PreprocessorOutputFileName;\r
\r
gCVfrErrorHandle.SetInputFile (InFileName);\r
+ gCVfrErrorHandle.SetWarningAsError(mOptions.WarningAsError);\r
\r
- if ((pInFile = fopen (InFileName, "r")) == NULL) {\r
+ if ((pInFile = fopen (LongFilePath (InFileName), "r")) == NULL) {\r
DebugError (NULL, 0, 0001, "Error opening the input file", InFileName);\r
goto Fail;\r
}\r
}\r
}\r
\r
+VOID\r
+CVfrCompiler::UpdateInfoForDynamicOpcode (\r
+ VOID\r
+ )\r
+{\r
+ SIfrRecord *pRecord;\r
+\r
+ if (!gNeedAdjustOpcode) {\r
+ return;\r
+ }\r
+ \r
+ //\r
+ // Base on the original offset info to update the record list.\r
+ //\r
+ if (!gCIfrRecordInfoDB.IfrAdjustDynamicOpcodeInRecords()) {\r
+ DebugError (NULL, 0, 1001, "Error parsing vfr file", "Can find the offset in the record.");\r
+ }\r
+\r
+ //\r
+ // Base on the opcode binary length to recalculate the offset for each opcode.\r
+ //\r
+ gCIfrRecordInfoDB.IfrAdjustOffsetForRecord();\r
+\r
+ //\r
+ // Base on the offset to find the binary address.\r
+ //\r
+ pRecord = gCIfrRecordInfoDB.GetRecordInfoFromOffset(gAdjustOpcodeOffset);\r
+ while (pRecord != NULL) {\r
+ pRecord->mIfrBinBuf = gCFormPkg.GetBufAddrBaseOnOffset(pRecord->mOffset);\r
+ if (pRecord->mIfrBinBuf == NULL) {\r
+ DebugError (NULL, 0, 0001, "Error parsing vfr file", " 0x%X. offset not allocated.", pRecord->mOffset);\r
+ }\r
+ pRecord = pRecord->mNext;\r
+ }\r
+}\r
+\r
VOID\r
CVfrCompiler::AdjustBin (\r
VOID\r
)\r
{\r
EFI_VFR_RETURN_CODE Status;\r
+\r
+ if (!IS_RUN_STATUS(STATUS_COMPILEED)) {\r
+ return;\r
+ }\r
+\r
+ UpdateInfoForDynamicOpcode ();\r
+\r
//\r
// Check Binary Code consistent between Form and IfrRecord\r
//\r
}\r
\r
if (mOptions.CreateIfrPkgFile == TRUE) {\r
- if ((pFile = fopen (mOptions.PkgOutputFileName, "wb")) == NULL) {\r
+ if ((pFile = fopen (LongFilePath (mOptions.PkgOutputFileName), "wb")) == NULL) {\r
DebugError (NULL, 0, 0001, "Error opening file", mOptions.PkgOutputFileName);\r
goto Fail;\r
}\r
}\r
\r
if (!mOptions.CreateIfrPkgFile || mOptions.CompatibleMode) {\r
- if ((pFile = fopen (mOptions.COutputFileName, "w")) == NULL) {\r
+ if ((pFile = fopen (LongFilePath (mOptions.COutputFileName), "w")) == NULL) {\r
DebugError (NULL, 0, 0001, "Error opening output C file", mOptions.COutputFileName);\r
goto Fail;\r
}\r
return;\r
}\r
\r
- if ((pInFile = fopen (InFileName, "r")) == NULL) {\r
+ if ((pInFile = fopen (LongFilePath (InFileName), "r")) == NULL) {\r
DebugError (NULL, 0, 0001, "Error opening the input VFR preprocessor output file", InFileName);\r
return;\r
}\r
\r
- if ((pOutFile = fopen (mOptions.RecordListFile, "w")) == NULL) {\r
+ if ((pOutFile = fopen (LongFilePath (mOptions.RecordListFile), "w")) == NULL) {\r
DebugError (NULL, 0, 0001, "Error opening the record list file", mOptions.RecordListFile);\r
goto Err1;\r
}\r
)\r
{\r
COMPILER_RUN_STATUS Status;\r
+\r
+ SetPrintLevel(WARNING_LOG_LEVEL);\r
CVfrCompiler Compiler(Argc, Argv);\r
\r
Compiler.PreProcess();\r
projects / mirror_edk2.git / blobdiff