From 4afd3d042215afe68d00b9ab8c32f063a3a1c03f Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Fri, 23 Aug 2013 02:18:16 +0000 Subject: Sync BaseTool trunk (version r2599) into EDKII BaseTools. Signed-off-by: Liming Gao Reviewed-by: Heshen Chen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14591 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Bin/Win32/BPDG.exe | Bin 579317 -> 1042268 bytes BaseTools/Bin/Win32/BootSectImage.exe | Bin 420864 -> 434176 bytes BaseTools/Bin/Win32/Common.PyUtility.pyd | Bin 4608 -> 6144 bytes BaseTools/Bin/Win32/EfiCompressor.pyd | Bin 15360 -> 11264 bytes BaseTools/Bin/Win32/EfiLdrImage.exe | Bin 408064 -> 421888 bytes BaseTools/Bin/Win32/EfiRom.exe | Bin 431616 -> 446464 bytes BaseTools/Bin/Win32/Eot.EfiCompressor.pyd | Bin 8192 -> 11264 bytes BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd | Bin 53248 -> 14848 bytes BaseTools/Bin/Win32/GenBootSector.exe | Bin 409088 -> 425984 bytes BaseTools/Bin/Win32/GenCrc32.exe | Bin 410624 -> 425984 bytes BaseTools/Bin/Win32/GenDepex.exe | Bin 637892 -> 1066588 bytes BaseTools/Bin/Win32/GenFds.exe | Bin 1651736 -> 1385686 bytes BaseTools/Bin/Win32/GenFfs.exe | Bin 418816 -> 430080 bytes BaseTools/Bin/Win32/GenFv.exe | Bin 463872 -> 479232 bytes BaseTools/Bin/Win32/GenFw.exe | Bin 479232 -> 499712 bytes BaseTools/Bin/Win32/GenPage.exe | Bin 409600 -> 425984 bytes BaseTools/Bin/Win32/GenPatchPcdTable.exe | Bin 631896 -> 1064073 bytes BaseTools/Bin/Win32/GenSec.exe | Bin 434688 -> 446464 bytes BaseTools/Bin/Win32/GenVtf.exe | Bin 432640 -> 446464 bytes BaseTools/Bin/Win32/LzmaCompress.exe | Bin 389632 -> 397312 bytes BaseTools/Bin/Win32/PatchPcdValue.exe | Bin 563443 -> 1036121 bytes BaseTools/Bin/Win32/Split.exe | Bin 412672 -> 425984 bytes BaseTools/Bin/Win32/TargetTool.exe | Bin 585454 -> 1044356 bytes BaseTools/Bin/Win32/TianoCompress.exe | Bin 422912 -> 434176 bytes BaseTools/Bin/Win32/Trim.exe | Bin 843332 -> 1103433 bytes BaseTools/Bin/Win32/UPT.exe | Bin 2331295 -> 1680092 bytes BaseTools/Bin/Win32/VfrCompile.exe | Bin 1263104 -> 1282048 bytes BaseTools/Bin/Win32/VolInfo.exe | Bin 459264 -> 471040 bytes BaseTools/Bin/Win32/_ctypes.pyd | Bin 86016 -> 106496 bytes BaseTools/Bin/Win32/_hashlib.pyd | Bin 323584 -> 287232 bytes BaseTools/Bin/Win32/_socket.pyd | Bin 53248 -> 38400 bytes BaseTools/Bin/Win32/_sqlite3.pyd | Bin 49152 -> 57344 bytes BaseTools/Bin/Win32/_ssl.pyd | Bin 655360 -> 720896 bytes BaseTools/Bin/Win32/build.exe | Bin 3074254 -> 1785834 bytes BaseTools/Bin/Win32/pyexpat.pyd | Bin 135168 -> 152576 bytes BaseTools/Bin/Win32/python25.dll | Bin 2117632 -> 0 bytes BaseTools/Bin/Win32/python27.dll | Bin 0 -> 2303488 bytes BaseTools/Bin/Win32/select.pyd | Bin 7680 -> 11776 bytes BaseTools/Bin/Win32/sqlite3.dll | Bin 260096 -> 635392 bytes BaseTools/Conf/XMLSchema/DistributionPackage.xsd | 2736 +++++++++----------- BaseTools/Conf/build_rule.template | 4 +- BaseTools/Conf/target.template | 3 +- BaseTools/Conf/tools_def.template | 925 ++++++- BaseTools/Contributions.txt | 188 ++ BaseTools/GNUmakefile | 2 +- BaseTools/License.txt | 25 + BaseTools/ReadMe.txt | 8 +- BaseTools/Scripts/gcc4.4-ld-script | 4 + BaseTools/Source/C/BootSectImage/GNUmakefile | 2 +- BaseTools/Source/C/Common/BasePeCoff.c | 15 +- BaseTools/Source/C/Common/GNUmakefile | 2 +- BaseTools/Source/C/Common/PeCoffLoaderEx.c | 44 +- BaseTools/Source/C/EfiLdrImage/GNUmakefile | 2 +- BaseTools/Source/C/EfiRom/GNUmakefile | 2 +- BaseTools/Source/C/GNUmakefile | 2 +- BaseTools/Source/C/GenBootSector/GenBootSector.c | 38 +- BaseTools/Source/C/GenCrc32/GNUmakefile | 2 +- BaseTools/Source/C/GenCrc32/GenCrc32.c | 35 +- BaseTools/Source/C/GenFfs/GNUmakefile | 2 +- BaseTools/Source/C/GenFv/GNUmakefile | 2 +- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 104 +- BaseTools/Source/C/GenFw/Elf64Convert.c | 140 +- BaseTools/Source/C/GenFw/GNUmakefile | 2 +- BaseTools/Source/C/GenFw/elf_common.h | 131 + BaseTools/Source/C/GenPage/GNUmakefile | 2 +- BaseTools/Source/C/GenPage/GenPage.c | 41 +- BaseTools/Source/C/GenSec/GNUmakefile | 2 +- BaseTools/Source/C/GenVtf/GNUmakefile | 2 +- BaseTools/Source/C/GnuGenBootSector/GNUmakefile | 2 +- BaseTools/Source/C/Include/AArch64/ProcessorBind.h | 159 ++ BaseTools/Source/C/Include/Arm/ProcessorBind.h | 158 ++ BaseTools/Source/C/Include/Common/BuildVersion.h | 2 +- .../Common/UefiInternalFormRepresentation.h | 10 +- BaseTools/Source/C/Include/Common/UefiMultiPhase.h | 10 +- BaseTools/Source/C/Include/Ia32/ProcessorBind.h | 4 +- .../Source/C/Include/IndustryStandard/PeImage.h | 3 + BaseTools/Source/C/Include/X64/ProcessorBind.h | 4 +- BaseTools/Source/C/LzmaCompress/GNUmakefile | 2 +- BaseTools/Source/C/Makefiles/header.makefile | 5 + BaseTools/Source/C/Split/GNUmakefile | 2 +- BaseTools/Source/C/TianoCompress/GNUmakefile | 2 +- BaseTools/Source/C/VfrCompile/EfiVfr.h | 2 + BaseTools/Source/C/VfrCompile/GNUmakefile | 2 +- BaseTools/Source/C/VfrCompile/VfrCompiler.cpp | 53 +- BaseTools/Source/C/VfrCompile/VfrCompiler.h | 2 + BaseTools/Source/C/VfrCompile/VfrError.cpp | 69 +- BaseTools/Source/C/VfrCompile/VfrError.h | 17 +- BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp | 401 ++- BaseTools/Source/C/VfrCompile/VfrFormPkg.h | 122 +- BaseTools/Source/C/VfrCompile/VfrSyntax.g | 491 ++-- BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp | 457 ++-- BaseTools/Source/C/VfrCompile/VfrUtilityLib.h | 31 +- BaseTools/Source/C/VolInfo/GNUmakefile | 2 +- BaseTools/Source/Python/AutoGen/AutoGen.py | 19 +- BaseTools/Source/Python/AutoGen/GenC.py | 4 +- BaseTools/Source/Python/AutoGen/UniClassObject.py | 12 +- BaseTools/Source/Python/Common/BuildVersion.py | 2 +- BaseTools/Source/Python/Common/DataType.py | 73 +- .../Source/Python/Common/EdkIIWorkspaceBuild.py | 2 +- BaseTools/Source/Python/Common/Expression.py | 10 +- BaseTools/Source/Python/Common/FdfParserLite.py | 6 +- .../Source/Python/Common/MigrationUtilities.py | 4 +- BaseTools/Source/Python/Common/Misc.py | 138 +- BaseTools/Source/Python/Common/PyUtility.pyd | Bin 4608 -> 6144 bytes BaseTools/Source/Python/Common/String.py | 26 +- .../Source/Python/CommonDataClass/CommonClass.py | 4 +- .../Source/Python/CommonDataClass/ModuleClass.py | 2 +- .../Source/Python/CommonDataClass/PlatformClass.py | 2 +- BaseTools/Source/Python/Ecc/Check.py | 2 +- BaseTools/Source/Python/Eot/EfiCompressor.pyd | Bin 8192 -> 11264 bytes BaseTools/Source/Python/Eot/LzmaCompressor.pyd | Bin 53248 -> 14848 bytes BaseTools/Source/Python/GNUmakefile | 2 +- BaseTools/Source/Python/GenFds/Fd.py | 9 +- BaseTools/Source/Python/GenFds/FdfParser.py | 68 +- BaseTools/Source/Python/GenFds/FfsFileStatement.py | 2 + BaseTools/Source/Python/GenFds/FfsInfStatement.py | 5 + BaseTools/Source/Python/GenFds/GenFds.py | 2 +- .../Source/Python/GenFds/GenFdsGlobalVariable.py | 22 +- BaseTools/Source/Python/GenFds/VerSection.py | 2 +- BaseTools/Source/Python/Makefile | 6 + BaseTools/Source/Python/TargetTool/TargetTool.py | 4 +- BaseTools/Source/Python/UPT/BuildVersion.py | 2 +- BaseTools/Source/Python/UPT/Library/DataType.py | 23 +- BaseTools/Source/Python/UPT/Library/GlobalData.py | 5 + BaseTools/Source/Python/UPT/Library/String.py | 4 +- .../UPT/Object/Parser/InfUserExtensionObject.py | 26 +- .../Source/Python/UPT/Parser/InfAsBuiltProcess.py | 143 +- .../Python/UPT/Parser/InfLibrarySectionParser.py | 21 +- .../Source/Python/Workspace/MetaFileParser.py | 391 +-- .../Source/Python/Workspace/WorkspaceCommon.py | 237 ++ .../Source/Python/Workspace/WorkspaceDatabase.py | 93 +- BaseTools/Source/Python/build/BuildReport.py | 18 +- BaseTools/Source/Python/build/build.py | 68 +- BaseTools/Tests/GNUmakefile | 2 +- BaseTools/building-gcc.txt | 4 +- BaseTools/toolsetup.bat | 4 +- 136 files changed, 5497 insertions(+), 2451 deletions(-) delete mode 100755 BaseTools/Bin/Win32/python25.dll create mode 100644 BaseTools/Bin/Win32/python27.dll create mode 100644 BaseTools/Contributions.txt create mode 100644 BaseTools/License.txt create mode 100644 BaseTools/Source/C/Include/AArch64/ProcessorBind.h create mode 100644 BaseTools/Source/C/Include/Arm/ProcessorBind.h create mode 100644 BaseTools/Source/Python/Workspace/WorkspaceCommon.py diff --git a/BaseTools/Bin/Win32/BPDG.exe b/BaseTools/Bin/Win32/BPDG.exe index 9f38762084..09137b6037 100644 Binary files a/BaseTools/Bin/Win32/BPDG.exe and b/BaseTools/Bin/Win32/BPDG.exe differ diff --git a/BaseTools/Bin/Win32/BootSectImage.exe b/BaseTools/Bin/Win32/BootSectImage.exe index 72bb94f3cc..a37e779ae7 100755 Binary files a/BaseTools/Bin/Win32/BootSectImage.exe and b/BaseTools/Bin/Win32/BootSectImage.exe differ diff --git a/BaseTools/Bin/Win32/Common.PyUtility.pyd b/BaseTools/Bin/Win32/Common.PyUtility.pyd index 5bb57d91e0..856b508e4e 100644 Binary files a/BaseTools/Bin/Win32/Common.PyUtility.pyd and b/BaseTools/Bin/Win32/Common.PyUtility.pyd differ diff --git a/BaseTools/Bin/Win32/EfiCompressor.pyd b/BaseTools/Bin/Win32/EfiCompressor.pyd index e0d0ae60be..9de9beb402 100755 Binary files a/BaseTools/Bin/Win32/EfiCompressor.pyd and b/BaseTools/Bin/Win32/EfiCompressor.pyd differ diff --git a/BaseTools/Bin/Win32/EfiLdrImage.exe b/BaseTools/Bin/Win32/EfiLdrImage.exe index f4a0ef8f9f..29db3e2f41 100755 Binary files a/BaseTools/Bin/Win32/EfiLdrImage.exe and b/BaseTools/Bin/Win32/EfiLdrImage.exe differ diff --git a/BaseTools/Bin/Win32/EfiRom.exe b/BaseTools/Bin/Win32/EfiRom.exe index 86ec6bb4cf..6aefa0d41a 100755 Binary files a/BaseTools/Bin/Win32/EfiRom.exe and b/BaseTools/Bin/Win32/EfiRom.exe differ diff --git a/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd b/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd index 0729100b99..9de9beb402 100644 Binary files a/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd and b/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd differ diff --git a/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd b/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd index d792a7e9fb..337c055e20 100644 Binary files a/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd and b/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd differ diff --git a/BaseTools/Bin/Win32/GenBootSector.exe b/BaseTools/Bin/Win32/GenBootSector.exe index 2b8ebe60e2..8bb35ac835 100755 Binary files a/BaseTools/Bin/Win32/GenBootSector.exe and b/BaseTools/Bin/Win32/GenBootSector.exe differ diff --git a/BaseTools/Bin/Win32/GenCrc32.exe b/BaseTools/Bin/Win32/GenCrc32.exe index 14b0677c9e..a6009cd72a 100755 Binary files a/BaseTools/Bin/Win32/GenCrc32.exe and b/BaseTools/Bin/Win32/GenCrc32.exe differ diff --git a/BaseTools/Bin/Win32/GenDepex.exe b/BaseTools/Bin/Win32/GenDepex.exe index d4d56965e8..3d05e76136 100755 Binary files a/BaseTools/Bin/Win32/GenDepex.exe and b/BaseTools/Bin/Win32/GenDepex.exe differ diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe index 88b88d63be..9bc45a846a 100755 Binary files a/BaseTools/Bin/Win32/GenFds.exe and b/BaseTools/Bin/Win32/GenFds.exe differ diff --git a/BaseTools/Bin/Win32/GenFfs.exe b/BaseTools/Bin/Win32/GenFfs.exe index 7d33a46a1b..632f7f3bb3 100755 Binary files a/BaseTools/Bin/Win32/GenFfs.exe and b/BaseTools/Bin/Win32/GenFfs.exe differ diff --git a/BaseTools/Bin/Win32/GenFv.exe b/BaseTools/Bin/Win32/GenFv.exe index 633cac7028..b87331335e 100755 Binary files a/BaseTools/Bin/Win32/GenFv.exe and b/BaseTools/Bin/Win32/GenFv.exe differ diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe index 2b1fd01f9c..d47991f919 100755 Binary files a/BaseTools/Bin/Win32/GenFw.exe and b/BaseTools/Bin/Win32/GenFw.exe differ diff --git a/BaseTools/Bin/Win32/GenPage.exe b/BaseTools/Bin/Win32/GenPage.exe index 3449ba5457..50806487c9 100755 Binary files a/BaseTools/Bin/Win32/GenPage.exe and b/BaseTools/Bin/Win32/GenPage.exe differ diff --git a/BaseTools/Bin/Win32/GenPatchPcdTable.exe b/BaseTools/Bin/Win32/GenPatchPcdTable.exe index 512134c08d..a3ce036d43 100755 Binary files a/BaseTools/Bin/Win32/GenPatchPcdTable.exe and b/BaseTools/Bin/Win32/GenPatchPcdTable.exe differ diff --git a/BaseTools/Bin/Win32/GenSec.exe b/BaseTools/Bin/Win32/GenSec.exe index 40fbe7ab02..a79833599d 100755 Binary files a/BaseTools/Bin/Win32/GenSec.exe and b/BaseTools/Bin/Win32/GenSec.exe differ diff --git a/BaseTools/Bin/Win32/GenVtf.exe b/BaseTools/Bin/Win32/GenVtf.exe index 1448486c89..a248c31f7a 100755 Binary files a/BaseTools/Bin/Win32/GenVtf.exe and b/BaseTools/Bin/Win32/GenVtf.exe differ diff --git a/BaseTools/Bin/Win32/LzmaCompress.exe b/BaseTools/Bin/Win32/LzmaCompress.exe index c5b07a40ca..456d673268 100755 Binary files a/BaseTools/Bin/Win32/LzmaCompress.exe and b/BaseTools/Bin/Win32/LzmaCompress.exe differ diff --git a/BaseTools/Bin/Win32/PatchPcdValue.exe b/BaseTools/Bin/Win32/PatchPcdValue.exe index d77b67a779..48b24e22cb 100755 Binary files a/BaseTools/Bin/Win32/PatchPcdValue.exe and b/BaseTools/Bin/Win32/PatchPcdValue.exe differ diff --git a/BaseTools/Bin/Win32/Split.exe b/BaseTools/Bin/Win32/Split.exe index e50d48dfdf..00000ac739 100755 Binary files a/BaseTools/Bin/Win32/Split.exe and b/BaseTools/Bin/Win32/Split.exe differ diff --git a/BaseTools/Bin/Win32/TargetTool.exe b/BaseTools/Bin/Win32/TargetTool.exe index f5eeef9281..bdaaf07260 100755 Binary files a/BaseTools/Bin/Win32/TargetTool.exe and b/BaseTools/Bin/Win32/TargetTool.exe differ diff --git a/BaseTools/Bin/Win32/TianoCompress.exe b/BaseTools/Bin/Win32/TianoCompress.exe index da6b82cfa2..a65ba046b5 100755 Binary files a/BaseTools/Bin/Win32/TianoCompress.exe and b/BaseTools/Bin/Win32/TianoCompress.exe differ diff --git a/BaseTools/Bin/Win32/Trim.exe b/BaseTools/Bin/Win32/Trim.exe index 418818b1b6..44edbab30d 100755 Binary files a/BaseTools/Bin/Win32/Trim.exe and b/BaseTools/Bin/Win32/Trim.exe differ diff --git a/BaseTools/Bin/Win32/UPT.exe b/BaseTools/Bin/Win32/UPT.exe index 03d6679fe3..a7060c7447 100644 Binary files a/BaseTools/Bin/Win32/UPT.exe and b/BaseTools/Bin/Win32/UPT.exe differ diff --git a/BaseTools/Bin/Win32/VfrCompile.exe b/BaseTools/Bin/Win32/VfrCompile.exe index 91681d800e..20e1b43c93 100755 Binary files a/BaseTools/Bin/Win32/VfrCompile.exe and b/BaseTools/Bin/Win32/VfrCompile.exe differ diff --git a/BaseTools/Bin/Win32/VolInfo.exe b/BaseTools/Bin/Win32/VolInfo.exe index 9655614239..593784de3a 100755 Binary files a/BaseTools/Bin/Win32/VolInfo.exe and b/BaseTools/Bin/Win32/VolInfo.exe differ diff --git a/BaseTools/Bin/Win32/_ctypes.pyd b/BaseTools/Bin/Win32/_ctypes.pyd index 06d1ed14c0..ae456be806 100644 Binary files a/BaseTools/Bin/Win32/_ctypes.pyd and b/BaseTools/Bin/Win32/_ctypes.pyd differ diff --git a/BaseTools/Bin/Win32/_hashlib.pyd b/BaseTools/Bin/Win32/_hashlib.pyd index 3690e54853..5efea4ac73 100755 Binary files a/BaseTools/Bin/Win32/_hashlib.pyd and b/BaseTools/Bin/Win32/_hashlib.pyd differ diff --git a/BaseTools/Bin/Win32/_socket.pyd b/BaseTools/Bin/Win32/_socket.pyd index 707853bd33..b4b3b1fe60 100755 Binary files a/BaseTools/Bin/Win32/_socket.pyd and b/BaseTools/Bin/Win32/_socket.pyd differ diff --git a/BaseTools/Bin/Win32/_sqlite3.pyd b/BaseTools/Bin/Win32/_sqlite3.pyd index 907de8ab47..b86f5527a4 100755 Binary files a/BaseTools/Bin/Win32/_sqlite3.pyd and b/BaseTools/Bin/Win32/_sqlite3.pyd differ diff --git a/BaseTools/Bin/Win32/_ssl.pyd b/BaseTools/Bin/Win32/_ssl.pyd index 428b51b008..c054f240d6 100755 Binary files a/BaseTools/Bin/Win32/_ssl.pyd and b/BaseTools/Bin/Win32/_ssl.pyd differ diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe index fc43d62866..2b74c9948f 100755 Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ diff --git a/BaseTools/Bin/Win32/pyexpat.pyd b/BaseTools/Bin/Win32/pyexpat.pyd index 9914173a53..03c607001c 100755 Binary files a/BaseTools/Bin/Win32/pyexpat.pyd and b/BaseTools/Bin/Win32/pyexpat.pyd differ diff --git a/BaseTools/Bin/Win32/python25.dll b/BaseTools/Bin/Win32/python25.dll deleted file mode 100755 index a116a9bded..0000000000 Binary files a/BaseTools/Bin/Win32/python25.dll and /dev/null differ diff --git a/BaseTools/Bin/Win32/python27.dll b/BaseTools/Bin/Win32/python27.dll new file mode 100644 index 0000000000..436f8d2033 Binary files /dev/null and b/BaseTools/Bin/Win32/python27.dll differ diff --git a/BaseTools/Bin/Win32/select.pyd b/BaseTools/Bin/Win32/select.pyd index cc70648a3c..e1b0ec2c49 100755 Binary files a/BaseTools/Bin/Win32/select.pyd and b/BaseTools/Bin/Win32/select.pyd differ diff --git a/BaseTools/Bin/Win32/sqlite3.dll b/BaseTools/Bin/Win32/sqlite3.dll index c99ef993cf..189ca345cd 100755 Binary files a/BaseTools/Bin/Win32/sqlite3.dll and b/BaseTools/Bin/Win32/sqlite3.dll differ diff --git a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd index 8f136ae04e..5ae85f2bc3 100644 --- a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd +++ b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd @@ -2,7 +2,7 @@ + targetNamespace="http://www.uefi.org/2012/1.0" xmlns="http://www.uefi.org/2012/1.0"> - This schema defines the UEFI/PI Distribution Package - description (PKG) file. It describes the content of: - 1) Package descriptions with definitions and - headers. - 2) Modules in either source or binary format. (Note - that Binary format is for FFS leaf section file types only, complete FFS files - cannot be distributed using this distribution format.) - 3) The distribution of custom tools used to modify - the binary images to create UEFI/PI compliant images. - 4) Finally, it can be used to distribute other - miscellaneous content that is not specific to UEFI/PI images. - The Package Surface Area describes the content of - packages, while the Module Surface Area provides information relevant to source - and/or binary distributions. + This schema defines the UEFI/PI Distribution Package description (PKG) + file. It describes the content of: + 1) Package descriptions with definitions and headers. + 2) Modules in either source or binary format. (Note that Binary format + is for FFS leaf section file types only, complete FFS files cannot be distributed using this + distribution format.) + 3) The distribution of custom tools used to modify the binary images to + create UEFI/PI compliant images. + 4) Finally, it can be used to distribute other miscellaneous content + that is not specific to UEFI/PI images. + The Package Surface Area describes the content of packages, while the + Module Surface Area provides information relevant to source and/or binary distributions. + - This header contains (legal) information - usually required for distributing both binary and/or source code. - + This header contains (legal) information usually required + for distributing both binary and/or source code. - The list of packages in this - distribution. - Packages are groups of files and/or - modules that are similar in nature. - Packages are uniquely identified by a - package GUID and a package version. - A package can declare public mappings of - C names to GUID values. - A package can provide header files for - library classes and/or other industry standard definitions. - A package can also declare public - mappings of platform configuration database (PCD) "knobs" to - control features and operation of modules within a platform. - Finally, a package lists the library - instances and/or modules that are provided in a distribution package. - + The list of packages in this distribution. + Packages are groups of files and/or modules that are similar + in nature. + Packages are uniquely identified by a package GUID and a + package version. + A package can declare public mappings of C names to GUID + values. + A package can provide header files for library classes + and/or other industry standard definitions. + A package can also declare public mappings of platform + configuration database (PCD) "knobs" to control features and operation of modules + within a platform. + Finally, a package lists the library instances and/or + modules that are provided in a distribution package. - The listing of UEFI/PI compliant modules - in this distribution that are NOT part of a Package. Every module that - is provided as part of a package needs to be described in a - PackageSurfaceArea.Modules section. - The ModuleSurfaceArea section describes - how each module in a distribution is coded, or, in the case of a binary - module distribution, how it was built. - UEFI/PI compliant libraries and modules - are uniquely identified by the Module's GUID and version number. - This section will typically be used for - modules that don't require any additional files that would be included - in a package. For example, the Enhanced FAT driver binary does not need - to have a package description, as no additional files are provided. - + The listing of UEFI/PI compliant modules in this + distribution that are NOT part of a Package. Every module that is provided as part of a + package needs to be described in a PackageSurfaceArea.Modules section. + The ModuleSurfaceArea section describes how each module in a + distribution is coded, or, in the case of a binary module distribution, how it was built. + UEFI/PI compliant libraries and modules are uniquely + identified by the Module's GUID and version number. + This section will typically be used for modules that don't + require any additional files that would be included in a package. For example, the Enhanced + FAT driver binary does not need to have a package description, as no additional files are + provided. - This section is for distributing vendor - specific executable tools, tool source code and/or configuration files. - These tools are primarily for manipulating code and/or binary images. - Tools in this section - can: - 1) Parse build meta-data files to create - source code files and build scripts. - 2) Modify image files to conform to - UEFI/PI specifications. - 3) Generate binary files from certain - types of text/unicode files. - 4) Generate PCI Option Roms or Firmware - Device images. - 5) Implement external - encoding/decoding/signature/GUIDed tools. - 6) Distribution Package - create/install/remove tools. + This section is for distributing vendor specific executable + tools, tool source code and/or configuration files. These tools are primarily for + manipulating code and/or binary images. + Tools in this section can: + 1) Parse build meta-data files to create source code files + and build scripts. + 2) Modify image files to conform to UEFI/PI specifications. + 3) Generate binary files from certain types of text/unicode + files. + 4) Generate PCI Option Roms or Firmware Device images. + 5) Implement external encoding/decoding/signature/GUIDed + tools. + 6) Distribution Package create/install/remove tools. + - The list of miscellaneous files in this - distribution. Any files that are not listed in either the Package, - Module or Tools sections can be listed here. This section can be used to - distribute specifications for packages and modules that are not - "industry standards" such as a specification for a chipset or - a video device. + The list of miscellaneous files in this distribution. Any + files that are not listed in either the Package, Module or Tools sections can be listed + here. This section can be used to distribute specifications for packages and modules that + are not "industry standards" such as a specification for a chipset or a video + device. - The UserExtensions section is used to - disseminate processing instructions that may be custom to the content - provided by the distribution. This section contains information that is - common to all aspects of this disribution. + The UserExtensions section is used to disseminate processing + instructions that may be custom to the content provided by the distribution. This section + contains information that is common to all aspects of this disribution. @@ -125,31 +113,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section defines the content of the UEIF/PI - compliant Distribution Package Header. This is the only required element of a - UEFI/PI compliant distribution package. + This section defines the content of the UEIF/PI compliant Distribution + Package Header. This is the only required element of a UEFI/PI compliant distribution package. + - This is the User Interface Name for this - Distribution Package. - Each Distribution Package is uniquely - identified by it's GUID and Version number. + This is the User Interface Name for this Distribution + Package. + Each Distribution Package is uniquely identified by it's + GUID and Version number. - The reference name of - the Distribution Package file. This single word name can - be used by tools as a keyword or for directory and/or - file creation. - White space and special - characters (dash and underscore characters may be used) - are not permitted in this name. + The reference name of the Distribution + Package file. This single word name can be used by tools as a keyword or for + directory and/or file creation. + White space and special characters (dash and + underscore characters may be used) are not permitted in this name. + @@ -158,22 +145,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This 128-bit GUID and the Version - attribute uniquely identify this Distribution Package. - Backward compatible releases of a - distribution package need only change the version number, while - non-backward compatible changes require the GUID to change (resetting - the version number to 1.0 is optional.) + This 128-bit GUID and the Version attribute uniquely + identify this Distribution Package. + Backward compatible releases of a distribution package need + only change the version number, while non-backward compatible changes require the GUID to + change (resetting the version number to 1.0 is optional.) - This value, along with - the GUID, is used to uniquely identify this object. The - higher the number, the more recent the content. - + This value, along with the GUID, is used to + uniquely identify this object. The higher the number, the more recent the + content. @@ -182,97 +167,116 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - A string identifying who created this - distribution package. + A string identifying who created this distribution package. + - The date and time this distribution was - created. The format is: YYYY-MM-DDThh:mm:ss, for example: - 2001-01-31T13:30:00 (note the T character separator between the calendar - date and the time. + The date and time this distribution was created. The format + is: YYYY-MM-DDThh:mm:ss, for example: 2001-01-31T13:30:00 (note the T character separator + between the calendar date and the time. - + - The copyright for this file that is - generated by the creator of the distribution. If a derivative work is - generated from an existing distribution, then the existing copyright - must be maintained, and additional copyrights may be appended to the end - of this element. It may also be the primary copyright for all code - provided in the Distribution Package. + The copyright for this file that is generated by the creator + of the distribution. If a derivative work is generated from an existing distribution, then + the existing copyright must be maintained, and additional copyrights may be appended to the + end of this element. It may also be the primary copyright for all code provided in the + Distribution Package. + + + + + + + + - + - A license that describes any - restrictions on the use of this distribution. If a derivative work is - allowed by the original license and a derivative work is generated from - an existing distribution, then the existing license must be maintained, - and additional licenses may be appended to the end of this element. It - may also be the primary license for all code provided in the - distribution file. Alternatively, this may point to a filename that - contains the License. The file (included in the content zip file) will - be stored in the same location as the distribution package's .pkg file. + A license that describes any restrictions on the use of this + distribution. If a derivative work is allowed by the original license and a derivative work + is generated from an existing distribution, then the existing license must be maintained, + and additional licenses may be appended to the end of this element. It may also be the + primary license for all code provided in the distribution file. Alternatively, this may + point to a filename that contains the License. The file (included in the content zip file) + will be stored in the same location as the distribution package's .pkg file. + + + + + + + - + - A one line description of the - Distribution Package. + A one line description of the Distribution Package. + + + + + + + + - + - A complete description of the - Distribution Package. This description may include the release name of - the file, the version of the file, and a complete description of the - file contents and/or features including a description of the updates - since the previous file release. + A complete description of the Distribution Package. This + description may include the release name of the file, the version of the file, and a + complete description of the file contents and/or features including a description of the + updates since the previous file release. + + + + + + + - The packaging utilities will use this - MD5 sum value of the included ZIP file containing files and/or code. If - this element is not present, then installation tools should assume that - the content is correct, or that other methods may be needed to verify - content. + The packaging utilities will use this MD5 sum value of the + included ZIP file containing files and/or code. If this element is not present, then + installation tools should assume that the content is correct, or that other methods may be + needed to verify content. - + This version of this XML Schema is 1.1 Changes to 1.1 from 1.0 - #1 Updated to present date and new - version which is important to reflect the present state of the - matter - #2 Added definition/enumeration of - UNDEFIND type 2 is important since there is a large body of legacy code - for which the GUID’s and other code/data objects were not decorated with - their usage. This document will allow for importing today’s source - artifacts and producing decorations using the ‘Undefined’ versus having - an error - #3 Allow for inclusion of ARM and future - architecture types + #1 Updated to present date and new version which is + important to reflect the present state of the matter + #2 Added definition/enumeration of UNDEFIND type 2 is + important since there is a large body of legacy code for which the GUID’s and other + code/data objects were not decorated with their usage. This document will allow for + importing today’s source artifacts and producing decorations using the ‘Undefined’ versus + having an error + #3 Allow for inclusion of ARM and future architecture + types - If set to true, all content within this - Distribution Package should NOT be modified. The default permits - modification of all content. + If set to true, all content within this Distribution Package + should NOT be modified. The default permits modification of all content. - If set to true, then the content can be - repackaged into another distribution package. The default prohibits - repackaging the Distribution content. + If set to true, then the content can be repackaged into another + distribution package. The default prohibits repackaging the Distribution content. + @@ -281,12 +285,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - A package is a collection of related objects - - Includes, Libraries and Modules. - Each package is uniquely identified by it's GUID and - Version number. Backward compatible releases of a package need only change the - version number, while non-backward compatible changes require the GUID to change - (resetting the version number to 1.0 is optional.) + A package is a collection of related objects - Includes, Libraries and + Modules. + Each package is uniquely identified by it's GUID and Version number. + Backward compatible releases of a package need only change the version number, while non-backward + compatible changes require the GUID to change (resetting the version number to 1.0 is optional.) + @@ -296,19 +300,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This is the User Interface - Name for this package. + This is the User Interface Name for this + package. - + - This is a - single word BaseName of the package. This BaseName - can be used by tools as a keyword and for - directory/file creation. + This is a single word BaseName + of the package. This BaseName can be used by tools as a keyword + and for directory/file creation. @@ -317,72 +319,93 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This GUID and the Version - attribute uniquely identify a given package. - + This GUID and the Version attribute uniquely + identify a given package. - + - This value, - along with the GUID, is used to uniquely identify - this object. - Backward - compatible changes must make sure this number is - incremented from the most recent version. - Non-backward compatible changes require a new - GUID, and the version can be reset. - + This value, along with the GUID, + is used to uniquely identify this object. + Backward compatible changes must + make sure this number is incremented from the most recent + version. Non-backward compatible changes require a new GUID, and + the version can be reset. - + - If the package requires a - different copyright than the distribution package, this - element can list one or more copyright lines. - + If the package requires a different copyright + than the distribution package, this element can list one or more copyright + lines. + + + + + + + + - + - If the package requires - licenses that are different from the distribution package - license, this element can contain one or more license text - paragraphs (or license filenames.) + If the package requires licenses that are + different from the distribution package license, this element can contain one or + more license text paragraphs (or license filenames.) + + + + + + + + - + - A one line description of - this package. + A one line description of this package. + + + + + + + + - + - A complete description of a - package. This description may include the release name of - the package, the version of the package, and a complete - description of the package contents and/or features - including a description of the updates since the previous - package’s release. + A complete description of a package. This + description may include the release name of the package, the version of the + package, and a complete description of the package contents and/or features + including a description of the updates since the previous package’s release. + + + + + + + + - + - This element is the location - (in the ZIP file) for the root directory of a package. - + This element is the location (in the ZIP file) + for the root directory of a package. @@ -392,29 +415,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - The term cloned is used here to indicate - that this package as been copied and modified to a completely different - package. An example might be for a new generation of chipsets that have - few or no elements in common with the original. + The term cloned is used here to indicate that this package + as been copied and modified to a completely different package. An example might be for a new + generation of chipsets that have few or no elements in common with the original. + - This GUID and the Version - attribute uniquely identify the Package that this Package - was copied from. + This GUID and the Version attribute uniquely + identify the Package that this Package was copied from. - + - This value, - along with the GUID, is used to uniquely identify - the package that this package was cloned from. - + This value, along with the GUID, + is used to uniquely identify the package that this package was + cloned from. @@ -428,11 +448,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - Library Classes are public interfaces - that can be used by modules. One or more library instances can implement - a library class, however only one library instance can be linked to an - individual module. This provides the platform integrator with the - flexibility of choosing one library instance's implementation over a + Library Classes are public interfaces that can be used by + modules. One or more library instances can implement a library class, however only one + library instance can be linked to an individual module. This provides the platform + integrator with the flexibility of choosing one library instance's implementation over a different library instance. @@ -440,59 +459,51 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - The header file - provides definitions and function prototypes for a - library class. Modules can be coded against these - functions, using the definitions in this header, - without concerning themselves about the libraries' - implementation details. This is a PackagePath - relative path and filename for the include file. - + The header file provides definitions + and function prototypes for a library class. Modules can be coded + against these functions, using the definitions in this header, + without concerning themselves about the libraries' implementation + details. This is a PackagePath relative path and filename for the + include file. - + - - - This GUID and - the Version attribute uniquely identify the - Recommended Library Instance. - - - - - - - This value, - along with the GUID, is used to uniquely identify - this object. If this value is not specified, then - any version of the library instance is - recommended. - - - - - - + + + This GUID and the + Version attribute uniquely identify the Recommended Library + Instance. + + + + + + + This value, along with + the GUID, is used to uniquely identify this object. If this + value is not specified, then any version of the library + instance is recommended. + + + + + + - + - The single word name - of the Library Class that module developers will use - to identify a library class dependency. - + The single word name of the Library + Class that module developers will use to identify a library class + dependency. @@ -505,28 +516,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section is used to list header - files for industry standards not under the auspices of UEFI.org. For - example, headers that contain definitions and data structures for the - USB specifications. + This section is used to list header files for industry + standards not under the auspices of UEFI.org. For example, headers that contain definitions + and data structures for the USB specifications. - + - + - The package - relative path and filename (in the content zip - file) of the industry standard include file. - + The package relative path and + filename (in the content zip file) of the industry standard include + file. - + @@ -537,13 +543,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - All top level header files that are - included by a package that are not listed above. They cannot - be: + All top level header files that are included by a package + that are not listed above. They cannot be: 1) Local to a module (module specific.) 2) An industry standard header. - 3) A library class header. - + 3) A library class header. @@ -552,20 +556,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This is the - Package relative path and filename location within - the content ZIP file. + This is the Package relative path + and filename location within the content ZIP file. + - - - + + + - + @@ -579,9 +582,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section lists the - Module Surface Area for all modules provided with this - package. + This section lists the Module Surface Area for + all modules provided with this package. @@ -591,31 +593,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section defines the mapping of GUID - C names to GUID values as a Registry Format GUID. - Modules that use these GUIDs must - specify their dependency on this package. + This section defines the mapping of GUID C names to GUID + values as a Registry Format GUID. + Modules that use these GUIDs must specify their dependency + on this package. - Individual GUID Declarations - + Individual GUID Declarations - + - + - - + + @@ -626,29 +623,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section defines the mapping of - Protocol C names to GUID values as a Registry Format GUID. - Modules that use these Protocols must - specify their dependency on this package. + This section defines the mapping of Protocol C names to GUID + values as a Registry Format GUID. + Modules that use these Protocols must specify their + dependency on this package. - Individual Protocol - Declarations + Individual Protocol Declarations + - + - + - + @@ -659,29 +653,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section defines the mapping of Ppi - C names to GUID values as a Registry Format GUID. - Modules that use these Ppis must specify - their dependency on this package. + This section defines the mapping of Ppi C names to GUID + values as a Registry Format GUID. + Modules that use these Ppis must specify their dependency on + this package. - Individual PPI Declarations - + Individual PPI Declarations - + - + - + @@ -692,63 +682,54 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section is used to declare platform - configuration knobs that are defined by this package. - Modules that use these PCD values must - specify their dependency on this package. + This section is used to declare platform configuration knobs + that are defined by this package. + Modules that use these PCD values must specify their + dependency on this package. - + - Specifies the C - name of the Token Space GUID of which this PCD - Entry is a member. This C name should also be - listed in the GUIDs section, (specified above,) - where the C name is assigned to a GUID value. - + Specifies the C name of the Token + Space GUID of which this PCD Entry is a member. This C name should + also be listed in the GUIDs section, (specified above,) where the C + name is assigned to a GUID value. - Specifies the - 32-bit token value for this PCD Entry. The Token - number must be unique to the Token Space that - declares the PCD. - The minLength of - 3 is required to handle the "0x" prefix to the hex - number. + Specifies the 32-bit token value for + this PCD Entry. The Token number must be unique to the Token Space + that declares the PCD. + The minLength of 3 is required to + handle the "0x" prefix to the hex number. - - + + - - + + - A string that - contains the data type of this PCD Entry. PCD data - types are restricted to the following set:UINT8, - UINT16, UINT32, UINT64, VOID*, BOOLEAN. + A string that contains the data type + of this PCD Entry. PCD data types are restricted to the following + set:UINT8, UINT16, UINT32, UINT64, VOID*, BOOLEAN. - + - A string that - contains one or more PCD Item types separated by - spaces. The PCD Item types are restricted to - FeaturePcd, FixedPcd, PatchPcd, Pcd and/or PcdEx. + A string that contains one or more + PCD Item types separated by spaces. The PCD Item types are + restricted to FeaturePcd, FixedPcd, PatchPcd, Pcd and/or PcdEx. @@ -756,118 +737,118 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. type="xs:normalizedString"/> - This is a - recommended maximum data size for VOID* data - types, the actual value should be defined by the - Platform Integrator. It is not required for the - other data types. - The minLength of - 3 is required to handle the "0x" prefix to the hex - number. + This is a recommended maximum data + size for VOID* data types, the actual value should be defined by the + Platform Integrator. It is not required for the other data types. + The minLength of 3 is required to + handle the "0x" prefix to the hex number. - + - + + + This entry contains prompt + information, that may used by tools to assist platform integrators + with choosing the correct values + + + + + + + + + + - + - Valid Error - messages that may be implemented in a module for - the PCD Entry. Only One Error Number per PcdError, - (multiple ErrorMessage entries are permitted) and - multiple PcdError elements are permitted. - + Valid Error messages that may be + implemented in a module for the PCD Entry. Only One Error Number per + PcdError, (multiple ErrorMessage entries are permitted) and multiple + PcdError elements are permitted. - - - One of the - following types of comparisons, which must be able - to evaluate to either true or false. - - - - - The PCD Value - must be space separated list of values. Values are - restricted to the data type of this PCD. - - - - - - - - - - - - - The PCD must - be within a specifed range of numeric values. - Restricted to C style Relational, Equality and - Logicial Operators and parenthesis are valid. Only - the CName for this PCD is permitted in the - ValidValueRange expression. All other values must - be numeric. - LValue (op - RValue)+ - - - - - A in-fix - logical expression using C style logical - operators. - - - - - - A hexadecimal - value for the error message as defined by - specifications. - The minLength - of 3 is required to handle the "0x" prefix to the - hex number. - - - - - - - - - - - This string - should be defined by specifications. There are - pre-defined error number ranges in the UEFI/PI - specificaiton. - - - - - - - - - + + + One of the following + types of comparisons, which must be able to evaluate to + either true or false. + + + + The PCD Value must be + space separated list of values. Values are restricted to the + data type of this PCD. + + + + + + + + + + + + The PCD must be within a + specifed range of numeric values. Restricted to C style + Relational, Equality and Logicial Operators and parenthesis + are valid. Only the CName for this PCD is permitted in the + ValidValueRange expression. All other values must be + numeric. + LValue (op RValue)+ + + + + + + A in-fix logical + expression using C style logical operators. + + + + + + + A hexadecimal value for + the error message as defined by specifications. + The minLength of 3 is + required to handle the "0x" prefix to the hex number. + + + + + + + + + + + This string should be + defined by specifications. There are pre-defined error + number ranges in the UEFI/PI specificaiton. + + + + + + + + + + @@ -882,22 +863,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section is used to describe any PCD - interdependencies or relationships. + This section is used to describe any PCD interdependencies + or relationships. - + This entry must used - TokenSpaceGuidCName.PcdCname for every named PCD. Restricted - to Relational, Equality and Logical Operators (NOT, AND, OR, - GT, GE, EQ, LE, LT and XOR) and parenthesis are valid. Only - the TokenSpaceGuidCName.PcdCname us permitted to name PCDs - in the expression. All other values must be numeric. - LValue (op RValue)+ - + TokenSpaceGuidCName.PcdCname for every named PCD. Restricted to Relational, + Equality and Logical Operators (NOT, AND, OR, GT, GE, EQ, LE, LT and XOR) and + parenthesis are valid. Only the TokenSpaceGuidCName.PcdCname us permitted to + name PCDs in the expression. All other values must be numeric. + LValue (op RValue)+ @@ -906,53 +884,49 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section contains files that are not - part of the code distributed with this package. + This section contains files that are not part of the code + distributed with this package. - + - Only required if different - from the Package Copyright. + Only required if different from the Package + Copyright. - Only required if different - from the Package License. + Only required if different from the Package + License. - A one line description of - this section's content. + A one line description of this section's + content. - + - A complete description of - the files in this section. + A complete description of the files in this + section. - This is the PackagePath - relative path and filename location within the ZIP file. - + This is the PackagePath relative path and + filename location within the ZIP file. - + - If true, used - by installation tools to ensure that a file that - must be executable has the correct properties to - permit execution. + If true, used by installation + tools to ensure that a file that must be executable has the + correct properties to permit execution. @@ -967,9 +941,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section is used for any processing - instructions that may be custom to the content provided by this package - that are common to this package. + This section is used for any processing instructions that + may be custom to the content provided by this package that are common to this package. + @@ -977,22 +951,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This is a single word identifier - for grouping similar content that does not fit into previously - defined sections or other sections of the Distribution. - + This is a single word identifier for grouping + similar content that does not fit into previously defined sections or other sections + of the Distribution. - This can be used to - differentiate multiple sections with a grouping. - For example, a PRE_PROCESS - Identifier might indicate specific steps and tools required - before processing module content, while a different - UserExtensions section with a POST_PROCESS Identifier might - describe steps that need to be executed after operations on the - modules in this package. + This can be used to differentiate multiple sections + with a grouping. + For example, a PRE_PROCESS Identifier might indicate + specific steps and tools required before processing module content, while a + different UserExtensions section with a POST_PROCESS Identifier might describe steps + that need to be executed after operations on the modules in this package. + @@ -1007,10 +979,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - Each module is uniquely identified by it's GUID and - Version number. Backward compatible releases of a module need only change the - version number, while non-backward compatible changes require the GUID to change - (resetting the version number to 1.0 is optional.) + Each module is uniquely identified by it's GUID and Version number. + Backward compatible releases of a module need only change the version number, while non-backward + compatible changes require the GUID to change (resetting the version number to 1.0 is optional.) + @@ -1020,21 +992,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This is the User Interface - Name for this Module. + This is the User Interface Name for this Module. + - + - This is a - single word BaseName that will be used to create a - module meta-data file. - This name - should also be used to create output file names - and directories. + This is a single word BaseName + that will be used to create a module meta-data file. + This name should also be used to + create output file names and directories. @@ -1043,63 +1012,84 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This GUID and the Version - attribute uniquely identify a given Module. - + This GUID and the Version attribute uniquely + identify a given Module. - + - This value, - along with the GUID, is used to uniquely identify - this object. - Backward - compatible changes must make sure this number is - incremented from the most recent version. - Non-backward compatible changes require a new - GUID, and the version can be reset. - + This value, along with the GUID, + is used to uniquely identify this object. + Backward compatible changes must + make sure this number is incremented from the most recent + version. Non-backward compatible changes require a new GUID, and + the version can be reset. - + - This is only required if the - Copyright is different from either the Package or - Distribution copyright. Multiple copyright lines are - permitted within this section. + This is only required if the Copyright is + different from either the Package or Distribution copyright. Multiple copyright + lines are permitted within this section. + + + + + + + - + - This is only required if the - license is different from either the Package or Distribution - license. Multiple licenses are permitted within this - section. + This is only required if the license is + different from either the Package or Distribution license. Multiple licenses are + permitted within this section. + + + + + + + - + - A brief text description of - the module. + A brief text description of the module. + + + + + + + + - + - A complete description of - the module contents and/or features including a description - of the updates since the previous module release. - + A complete description of the module contents + and/or features including a description of the updates since the previous module + release. + + + + + + + @@ -1108,35 +1098,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - List general information about a module, - including the Supported Architectures, this module's type, - specifications the module is coded against, and other informational - content. + List general information about a module, including the + Supported Architectures, this module's type, specifications the module is coded against, and + other informational content. - + - One of the Enumerated module - types that limit the use of a module. + One of the Enumerated module types that limit + the use of a module. - For stand-alone modules that - are NOT part of any package, this is the path to the root of - the module as listed in the ZIP file. For modules included - in a package, this is the location, relative to the root of - the package (PackagePath) this module belongs to. - + For stand-alone modules that are NOT part of any + package, this is the path to the root of the module as listed in the ZIP file. + For modules included in a package, this is the location, relative to the root of + the package (PackagePath) this module belongs to. - This element is only - required for the PEIM that produces the PCD PPI or the DXE - Driver that produces the PCD Protocol. + This element is only required for the PEIM that + produces the PCD PPI or the DXE Driver that produces the PCD Protocol. + @@ -1146,25 +1132,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - This is a list of other - specifications that this module is written against. These - entries can be used in #define statements (depending on the - build system implementation, they may be autogenerated.) + This is a list of other specifications that this + module is written against. These entries can be used in #define statements + (depending on the build system implementation, they may be autogenerated.) - + @@ -1172,156 +1154,139 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - Different firmware execution - paths may be taken based on a given state of the hardware, - firmware, or through feature settings. A BootMode may be - declared (PRODUCES) or discovered (CONSUMES) based on these - states and feature settings. If the usage is UNDEFINE, it - implies that a Boot Mode is used, but the package creator - does not know how it is used. The supported boot modes map - to the PI specification Boot Modes. The boot modes listed - with Recovery are to indicate that the BootMode is valid - during a recovery boot. + Different firmware execution paths may be taken + based on a given state of the hardware, firmware, or through feature settings. A + BootMode may be declared (PRODUCES) or discovered (CONSUMES) based on these + states and feature settings. If the usage is UNDEFINE, it implies that a Boot + Mode is used, but the package creator does not know how it is used. The + supported boot modes map to the PI specification Boot Modes. The boot modes + listed with Recovery are to indicate that the BootMode is valid during a + recovery boot. - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - The module - always supports the given boot modes. - - + + The module always supports + the given boot modes. + - - The module may - support a given mode on some execution paths. - - + + The module may support a + given mode on some execution paths. + - - The module - will change the boot mode. - + + The module will change the + boot mode. + - - The module - will change the boot mode on some exection paths. - - + + The module will change the + boot mode on some exection paths. + - - The package - creator does not know how the boot mode is used. - - + + The package creator does not + know how the boot mode is used. + - - + + - + - The functions that make up - the Event, Timer, and Task Priority Services are used during - preboot to create, close, signal, and wait for events; to - set timers; and to raise and restore task priority levels as - defined in the UEFI specification. GUIDed events should be - listed in the Guids section. + The functions that make up the Event, Timer, and + Task Priority Services are used during preboot to create, close, signal, and + wait for events; to set timers; and to raise and restore task priority levels as + defined in the UEFI specification. GUIDed events should be listed in the Guids + section. - + - - The module - will register a notification function and calls - the function when it is signaled. - - + + The module will register a + notification function and calls the function when it is + signaled. + - - The module - will register a notification function and calls - the function when it is signaled on some execution - paths. - + + The module will register a + notification function and calls the function when it is + signaled on some execution paths. + - - The module - will signal all events in an event group. - - + + The module will signal all + events in an event group. + - - The module - will signal all events in an event group under - some execution paths. - + + The module will signal all + events in an event group under some execution paths. + + - - The package - creator does not know how an event is used. - - + + The package creator does not + know how an event is used. + @@ -1337,24 +1302,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - + + - + - This is a list of non-GUIDed - Hand Off Blocks (HOBs) produced or consumed by this module. - + This is a list of non-GUIDed Hand Off Blocks + (HOBs) produced or consumed by this module. - + @@ -1372,44 +1332,41 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - A HOB must be - present in the system. - + + A HOB must be present in the + system. + - - If present, - the HOB will be used. - + + If present, the HOB will be + used. + - - The HOB is - always produced by the module. - + + The HOB is always produced + by the module. + - - The HOB may be - produced by the module under some execution paths. - - + + The HOB may be produced by + the module under some execution paths. + - - The package - creator knows that a HOB is used, but does not - know how it is used. - + + The package creator knows + that a HOB is used, but does not know how it is used. + + - - + + @@ -1421,26 +1378,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section may be included for Modules - that are copied from a different module. + This section may be included for Modules that are copied + from a different module. - This GUID and the Version - attribute uniquely identify the Module that this Module was - copied from. + This GUID and the Version attribute uniquely + identify the Module that this Module was copied from. - + - This value, - along with the GUID, is used to uniquely identify - this object. + This value, along with the GUID, + is used to uniquely identify this object. @@ -1454,68 +1408,59 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - A list of the different Library Classes - consumed by a driver, core and/or application module, or produced by a - Library module. + A list of the different Library Classes consumed by a + driver, core and/or application module, or produced by a Library module. - + - Used by tools - to identify different instances of libraries that - provide the library class. This keyword identifies - the library class this module needs to be linked - against. + Used by tools to identify different + instances of libraries that provide the library class. This keyword + identifies the library class this module needs to be linked against. + - + - - - This GUID and - the Version attribute uniquely identify the - recommended Library Instance for this module . - - - - - - - - This value, - along with the GUID, is used to uniquely identify - this object. - - - - - - + + + This GUID and the + Version attribute uniquely identify the recommended Library + Instance for this module . + + + + + + + This value, along with + the GUID, is used to uniquely identify this object. + + + + + + + - + - Library - instances can provide code for a library class, or - may require other library instances themselves. - Since different execution paths in a library (or - module) may need different library classes based - on some setting, library classes may not alway be - required. + Library instances can provide code + for a library class, or may require other library instances + themselves. Since different execution paths in a library (or module) + may need different library classes based on some setting, library + classes may not alway be required. @@ -1527,13 +1472,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - A FeatureFlag - attribute must evaluate to either true or false - it - may be a fixed value of true or false, a C name or - an in-fix expression. + A FeatureFlag attribute must evaluate to + either true or false - it may be a fixed value of true or false, a C + name or an in-fix expression. @@ -1549,29 +1492,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. This is the module relative - (ModuleProperties.Path) path and filename location within - the ZIP file. + (ModuleProperties.Path) path and filename location within the ZIP file. + - + - The Family - attribute is used to restrict usage to a given - family of compilers, such as GCC or MSFT. Since - not all code processing tools use the same syntax, - especially for assembly, this field can be used to - identify different syntax. + The Family attribute is used to + restrict usage to a given family of compilers, such as GCC or + MSFT. Since not all code processing tools use the same syntax, + especially for assembly, this field can be used to identify + different syntax. - - - + + + @@ -1588,316 +1526,293 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - This is the - module relative (ModuleProperties.Path) path and - filename location within the ZIP file. - + This is the module relative + (ModuleProperties.Path) path and filename location within the ZIP + file. - - - - - - Binary file - distribution is limited to UEFI/PI FFS leaf - section file types. - - - - - - - A UEFI/PI FFS - Leaf section file type, not a raw PE32 file. - - - - - - - - - - - - - - - - - - - - - + + + + + + Binary file distribution + is limited to UEFI/PI FFS leaf section file types. + + + + + + + + A UEFI/PI FFS Leaf + section file type, not a raw PE32 file. + + + + + + + + + + + + + + + + + + + + + - + - This section - contains information about how the module was - coded, such as Compiler Tools, Flags, PCDs (only - PatchPcd and/or PcdEx) and Library Class Instances - used to build the binary. + This section contains information + about how the module was coded, such as Compiler Tools, Flags, PCDs + (only PatchPcd and/or PcdEx) and Library Class Instances used to + build the binary. - - - The element is - the Patchable PCD Value that was used during the - build. - - - - - - - - The minLength - of 3 is required to handle the "0x" prefix to the - hex number. - - - - - - - - - - - - This field is - required if the Pcd Datum Type is VOID* - The minLength - of 3 is required to handle the "0x" prefix to the - hex number. - - - - - - - - - - - The minLength - of 3 is required to handle the "0x" prefix to the - hex number. - - - - - - - - - - - Error - information implemented by the module. - - - - - - - The minLength - of 3 is required to handle the "0x" prefix to the - hex number. - - - - - - - - - - - - - - - - - - - - - - - - - - The element is - the DynamicEx PCD Value that was used during the - build. - - - - - - - The minLength - of 3 is required to handle the "0x" prefix to the - hex number. - - - - - - - - - - - - This field is - required if the Pcd Datum Type is VOID* - - - - - - - - - - - - - Error - information implemented by the module. - - - - - - - The minLength - of 3 is required to handle the "0x" prefix to the - hex number. - - - - - - - - - - - - - - - - - - - - - - - - - - This is the - actual library instance that was used to link - against the module. - - - - - - This GUID and - the Version attribute uniquely identify the actual - Library Instance linked in this module. - - - - - - - - This value, - along with the GUID, is used to uniquely identify - this object. - - - - - - - - - - - - - - - Any - description of OS, Tool, and flags for the - individual tool can go in this section. - - - - - - - - + + + The element is the + Patchable PCD Value that was used during the build. + + + + + + + + + The minLength of 3 is + required to handle the "0x" prefix to the hex number. + + + + + + + + + + + + + This field is required + if the Pcd Datum Type is VOID* + The minLength of 3 is + required to handle the "0x" prefix to the hex number. + + + + + + + + + + + + The minLength of 3 is + required to handle the "0x" prefix to the hex number. + + + + + + + + + + + + Error information + implemented by the module. + + + + + + The minLength of 3 is + required to handle the "0x" prefix to the hex number. + + + + + + + + + + + + + + + + + + + + + + + + + + + The element is the + DynamicEx PCD Value that was used during the build. + + + + + + + + The minLength of 3 is + required to handle the "0x" prefix to the hex number. + + + + + + + + + + + + + This field is required + if the Pcd Datum Type is VOID* + + + + + + + + + + + + Error information + implemented by the module. + + + + + + The minLength of 3 is + required to handle the "0x" prefix to the hex number. + + + + + + + + + + + + + + + + + + + + + + + + + + + This is the actual + library instance that was used to link against the module. + + + + + + + This GUID and the + Version attribute uniquely identify the actual Library + Instance linked in this module. + + + + + + + This value, along with + the GUID, is used to uniquely identify this object. + + + + + + + + + + + + + + + + Any description of OS, + Tool, and flags for the individual tool can go in this + section. + + + + + + + - + @@ -1913,47 +1828,41 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - - - + + + - This GUID and - the Version attribute uniquely identify Package - that this Module depends on. + This GUID and the Version attribute + uniquely identify Package that this Module depends on. + - - - - This value, - along with the GUID, is used to uniquely identify - this object. If the version attribute is not - specified, the most recent version of the package - can be used. - - - + + + + This value, along with + the GUID, is used to uniquely identify this object. If the + version attribute is not specified, the most recent version + of the package can be used. + + + - - - + + + @@ -1967,68 +1876,60 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - Only valid for - Variable GUID types. - This can be either a Hex Array or - C string in unicode format: L"string" Data. - + Only valid for Variable GUID types. + This can be either a Hex Array or C string in unicode + format: L"string" Data. - + - - The module does - not install the GUID, and the GUID must be present - for the module to execute. - + + The module does not install + the GUID, and the GUID must be present for the module to + execute. + - - The module - does not install the GUID, however, the GUID will - be used if it is present. - + + The module does not install + the GUID, however, the GUID will be used if it is present. + + - - The module - always installs the GUID. - + + The module always installs + the GUID. + - - The Module - will install the GUID under certain execution - paths. - + + The Module will install the + GUID under certain execution paths. + - - The package - creator knows that a GUID is used, but does not - know how it is used. - + + The package creator knows + that a GUID is used, but does not know how it is used. + + - - - + + + @@ -2038,19 +1939,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - A listing of protocols required or - produced by this module. + A listing of protocols required or produced by this module. + - + - - + + @@ -2066,12 +1964,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - - + + + @@ -2081,19 +1976,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - A listing of PPIs required or produced - by this module. + A listing of PPIs required or produced by this module. + - + - - + + @@ -2107,12 +1999,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - - + + + @@ -2122,9 +2011,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - These elements specify additional - information about the module. This area may be used by tools to generate - code. + These elements specify additional information about the + module. This area may be used by tools to generate code. @@ -2133,26 +2021,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - + + - - + + - - - + + + @@ -2162,26 +2047,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section describes how a platform is - coded with respect to the platform configuration knobs. - + This section describes how a platform is coded with respect + to the platform configuration knobs. - + - - + - + @@ -2195,12 +2076,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - - + + + @@ -2210,18 +2088,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This is the PEI dependency expression - for a Dependency Section. + This is the PEI dependency expression for a Dependency + Section. - + - An in-fix expression, of C - identifiers and TRUE, FALSE, AND, OR, NOT, BEFORE, and AFTER - as well as parenthesis () in the in-fix notation. The - operators are restricted to grammar defined in the PI + An in-fix expression, of C identifiers and TRUE, + FALSE, AND, OR, NOT, BEFORE, and AFTER as well as parenthesis () in the in-fix + notation. The operators are restricted to grammar defined in the PI specification. @@ -2236,18 +2112,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This is the DXE dependency expression - for a Dependency Section. + This is the DXE dependency expression for a Dependency + Section. - + - An in-fix expression, of C - identifiers and TRUE, FALSE, AND, OR, NOT, BEFORE, and AFTER - as well as parenthesis () in the in-fix notation. The - operators are restricted to grammar defined in the PI + An in-fix expression, of C identifiers and TRUE, + FALSE, AND, OR, NOT, BEFORE, and AFTER as well as parenthesis () in the in-fix + notation. The operators are restricted to grammar defined in the PI specification. @@ -2262,18 +2136,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This is the SMM dependency expression - for a Dependency Section. + This is the SMM dependency expression for a Dependency + Section. - + - An in-fix expression, of C - identifiers and TRUE, FALSE, AND, OR, NOT, BEFORE, and AFTER - as well as parenthesis () in the in-fix notation. The - operators are restricted to grammar defined in the PI + An in-fix expression, of C identifiers and TRUE, + FALSE, AND, OR, NOT, BEFORE, and AFTER as well as parenthesis () in the in-fix + notation. The operators are restricted to grammar defined in the PI specification. @@ -2289,9 +2161,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section is used to provide comments - and/or list auxiliary files, such as pdb or map files. - + This section is used to provide comments and/or list + auxiliary files, such as pdb or map files. @@ -2299,27 +2170,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - This is the path and - filename location within the ZIP file. + This is the path and filename location within + the ZIP file. - + - If true, used - by installation tools to ensure that a file that - must be executable has the correct properties to - permit execution. + If true, used by installation + tools to ensure that a file that must be executable has the + correct properties to permit execution. @@ -2333,35 +2203,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section is used for any processing - instructions that may be custom to the content provided by the - distribution that are common to module. + This section is used for any processing instructions that + may be custom to the content provided by the distribution that are common to module. The content is vendor specific. - The content can be plain text as well as - any user-defined, properly formatted XML structure. + The content can be plain text as well as any user-defined, + properly formatted XML structure. - This is a single word identifier - for grouping similar content. For example, ReferenceBuild might - be used to identify non-PI compliant build steps, with two - different UserExtensions sections, one with an Identifier of - Prebuild, and another of PostBuild. Both UserExtensions sections - would use the same UserId. + This is a single word identifier for grouping + similar content. For example, ReferenceBuild might be used to identify non-PI + compliant build steps, with two different UserExtensions sections, one with an + Identifier of Prebuild, and another of PostBuild. Both UserExtensions sections would + use the same UserId. - This can be any string used to - differentiate or identify this section from other UserExtensions - sections. - For example, a PRE_PROCESS - Identifier might indicate specific steps and tools required - before processing module content, while a different - UserExtensions section with a POST_PROCESS Identifier might - describe steps that need to be executed after operations on this - module. + This can be any string used to differentiate or + identify this section from other UserExtensions sections. + For example, a PRE_PROCESS Identifier might indicate + specific steps and tools required before processing module content, while a + different UserExtensions section with a POST_PROCESS Identifier might describe steps + that need to be executed after operations on this module. @@ -2372,11 +2237,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This attribute is used when the binaries are - distributed for this module and no code generation from source files is - required. If set, then the BinaryFiles section should be used, and any files - listed in the SourceFiles section do not have to be built. Additionally, the - AsBuilt section for each binary file must be included. + This attribute is used when the binaries are distributed for + this module and no code generation from source files is required. If set, then the BinaryFiles + section should be used, and any files listed in the SourceFiles section do not have to be built. + Additionally, the AsBuilt section for each binary file must be included. @@ -2390,42 +2254,34 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - This is the User Interface - Name for this Tools Distribution. + This is the User Interface Name for this Tools + Distribution. - + - This is only required if the - Copyright is different from the Distribution Package - copyright. + This is only required if the Copyright is + different from the Distribution Package copyright. - This is only required if the - License is different from the Distribution Package license. - + This is only required if the License is + different from the Distribution Package license. - + - This is only required if the - Abstract is different from the Distribution Package - Abstract. + This is only required if the Abstract is + different from the Distribution Package Abstract. - + - This is only required if the - Description is different from the Distribution Package - Description. + This is only required if the Description is + different from the Distribution Package Description. @@ -2433,26 +2289,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This is the path and filename location - within the ZIP file. + This is the path and filename location within the ZIP file. + - This is required for - tools that execute; it should not be used for - configuration files. + This is required for tools that execute; it + should not be used for configuration files. - + - If true, used by - installation tools to ensure that a file that must be - executable has the correct properties to permit - execution. + If true, used by installation tools to + ensure that a file that must be executable has the correct properties to + permit execution. @@ -2466,44 +2319,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This section contains a list of files that are not - part of the code distributed with modules, packages or tools. + This section contains a list of files that are not part of the code + distributed with modules, packages or tools. - + - The User interface name for - this content. + The User interface name for this content. + - + - This is only required if the - Copyright is different from the Distribution Package - Copyright. + This is only required if the Copyright is + different from the Distribution Package Copyright. - This is only required if the - License is different from the Distribution Package License. - + This is only required if the License is + different from the Distribution Package License. - + - + @@ -2513,19 +2361,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This is the path and filename location - within the ZIP file. + This is the path and filename location within the ZIP file. + - + - If true, used by - installation tools to ensure that a file that must be - executable has the correct properties to permit - execution. + If true, used by installation tools to + ensure that a file that must be executable has the correct properties to + permit execution. @@ -2544,22 +2390,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This is a single word identifier for - grouping similar content. For example, ReferenceBuild might be used to - identify non-PI compliant build steps, with two different UserExtensions - sections, one with an Identifier of Prebuild, and another of PostBuild. Both - UserExtensions sections would use the same UserId. + This is a single word identifier for grouping similar content. + For example, ReferenceBuild might be used to identify non-PI compliant build steps, with two + different UserExtensions sections, one with an Identifier of Prebuild, and another of PostBuild. + Both UserExtensions sections would use the same UserId. - This can be any string used to differentiate - or identify this section from other UserExtensions sections. - For example, a PRE_PROCESS Identifier might - indicate specific steps and tools required before processing distribution - package content, while a different UserExtensions section with a - POST_PROCESS Identifier might describe steps that need to be executed after - operations on this content. + This can be any string used to differentiate or identify this + section from other UserExtensions sections. + For example, a PRE_PROCESS Identifier might indicate specific + steps and tools required before processing distribution package content, while a different + UserExtensions section with a POST_PROCESS Identifier might describe steps that need to be + executed after operations on this content. @@ -2596,11 +2440,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + - Any processor architecture not listed above. - The Architecture must be a target architecture of one or more compiler tool - chains. + Any processor architecture not listed above. The Architecture + must be a target architecture of one or more compiler tool chains. @@ -2613,8 +2457,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - Any other family of build utilities for - which compiler tools exist. + Any other family of build utilities for which compiler tools + exist. @@ -2657,70 +2501,66 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - The following module types are defined by - specifications. - Module types for components and libraries defined - for this distribution mechanism. + The following module types are defined by specifications. + Module types for components and libraries defined for this distribution + mechanism. - Use of this module is not restricted. - + Use of this module is not restricted. - This module is only applicable to the DXE - core. + This module is only applicable to the DXE core. + - This module is only applicable to a DXE - driver. + This module is only applicable to a DXE driver. + - This module is only applicable to a DXE - runtime driver. + This module is only applicable to a DXE runtime driver. + - This module is only applicable to an IPF DXE - runtime driver. + This module is only applicable to an IPF DXE runtime driver. + - This module is only applicable to a DXE SMM - driver. + This module is only applicable to a DXE SMM driver. + - This module is only applicable to the PEI - core. + This module is only applicable to the PEI core. + - This module is only valid for PEI modules. - + This module is only valid for PEI modules. - This module is only applicable to Security - phase. + This module is only applicable to Security phase. + - This module is only valid for UEFI drivers. - + This module is only valid for UEFI drivers. @@ -2731,8 +2571,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This module is only valid for UEFI - applications. + This module is only valid for UEFI applications. + @@ -2743,21 +2583,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - This content is restricted to a specific - implementation. + This content is restricted to a specific implementation. + - This enumeration is for use in a list that - where the package creator does not know the what module types are supported - by a module. + This enumeration is for use in a list that where the package + creator does not know the what module types are supported by a module. - This pattern has been added for use in a - module lists - for future expansion. + This pattern has been added for use in a module lists - for + future expansion. @@ -2765,8 +2604,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - The following data types are defined by the PCD - specification (or PCD section of the UEFI/PI specifications.) + The following data types are defined by the PCD specification (or PCD + section of the UEFI/PI specifications.) @@ -2786,82 +2625,73 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - The Feature PCD is a binary, evaluating to - either true or false. This is used during build to include/exclude content. - It can also be used during execution to force execution paths within - drivers, or to enable/disable features within a driver for a given platform. - + The Feature PCD is a binary, evaluating to either true or false. + This is used during build to include/exclude content. It can also be used during execution to + force execution paths within drivers, or to enable/disable features within a driver for a given + platform. - The Fixed PCD is a #define value that is set - at build time. + The Fixed PCD is a #define value that is set at build time. + - The Patch PCD is a #define that is set at - build time, and that can be modified within a binary file. Additional - information, such as the offset location of the value, along with it's - length may need to be provided. + The Patch PCD is a #define that is set at build time, and that + can be modified within a binary file. Additional information, such as the offset location of the + value, along with it's length may need to be provided. - This PCD type has an overloaded definition. - Prior to build, the platform integrator may choose to implement a PCD as - Fixed, Patchable or a Dynamic PCD. If the platform integrator choose to use - the PCD as dynamic, then a PCD driver is required in the platform - (PEI/DXE/both) to track the PCD in some sort of 'database' of these items. - For Dynamic PCDs, the PcdGet* must pass in the token space guid and the - token number to retrieve data (PcdSet* also needs these values.) - + This PCD type has an overloaded definition. Prior to build, the + platform integrator may choose to implement a PCD as Fixed, Patchable or a Dynamic PCD. If the + platform integrator choose to use the PCD as dynamic, then a PCD driver is required in the + platform (PEI/DXE/both) to track the PCD in some sort of 'database' of these items. For Dynamic + PCDs, the PcdGet* must pass in the token space guid and the token number to retrieve data + (PcdSet* also needs these values.) - The PCD can only be used as Dynamic, and the - platform firmware must contain a driver to maintain a 'database' of these - items. For Dynamic PCDs, the PcdGet* must pass in the token space guid and - the token number to retrieve data (PcdSet* also needs these values.) - + The PCD can only be used as Dynamic, and the platform firmware + must contain a driver to maintain a 'database' of these items. For Dynamic PCDs, the PcdGet* + must pass in the token space guid and the token number to retrieve data (PcdSet* also needs + these values.) - - - A GUID must contain five different Hexadecimal - character sets that are separated by a dash (-) character. + A GUID must contain five different Hexadecimal character sets that are + separated by a dash (-) character. - + - The EDK II build system supports workstations - running one of the following supported operating systems. This is the OS for the - developer's workstation, not the target platform. + The EDK II build system supports workstations running one of the + following supported operating systems. This is the OS for the developer's workstation, not the target + platform. - For Windows 2003, Windows XP and Windows - Vista. + For Windows 2003, Windows XP and Windows Vista. + - For Windows 2003, Windows XP and Windows - Vista. + For Windows 2003, Windows XP and Windows Vista. + @@ -2870,14 +2700,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - Typically, this is used for Windows Batch - files. + Typically, this is used for Windows Batch files. + - Typically use for shell scripts - valid for - any Linux and Mac OS/X. + Typically use for shell scripts - valid for any Linux and Mac + OS/X. diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 107e783d2e..4a21aba854 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -301,8 +301,8 @@ -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR) - $(OBJCOPY) --only-keep-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug - $(OBJCOPY) --strip-unneeded ${src} + $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug + $(OBJCOPY) --strip-unneeded -R .eh_frame ${src} # #The below 2 lines are only needed for UNIXGCC tool chain, which genereates PE image directly diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template index 67443200eb..787fc64fb1 100644 --- a/BaseTools/Conf/target.template +++ b/BaseTools/Conf/target.template @@ -34,7 +34,8 @@ ACTIVE_PLATFORM = Nt32Pkg/Nt32Pkg.dsc TARGET = DEBUG # TARGET_ARCH List Optional What kind of architecture is the binary being target for. -# One, or more, of the following, IA32, IPF, X64, EBC or ARM. +# One, or more, of the following, IA32, IPF, X64, EBC, ARM +# or AArch64. # Multiple values can be specified on a single line, using # space charaters to separate the values. These are used # during the parsing of a platform description file, diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index a82404a144..06e7d6596a 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -1,6 +1,7 @@ # -# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
# Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
+# Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -47,6 +48,14 @@ DEFINE VS2010x86_DLL = C:\Program Files (x86)\Microsoft Visual Studio 10.0\Co DEFINE VS2010x86_BINX64 = DEF(VS2010x86_BIN)\x86_amd64 DEFINE VS2010x86_BIN64 = DEF(VS2010x86_BIN)\x86_ia64 +DEFINE VS2012_BIN = C:\Program Files\Microsoft Visual Studio 11.0\Vc\bin +DEFINE VS2012_DLL = C:\Program Files\Microsoft Visual Studio 11.0\Common7\IDE;DEF(VS2012_BIN) +DEFINE VS2012_BINX64 = DEF(VS2012_BIN)\x86_amd64 + +DEFINE VS2012x86_BIN = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Vc\bin +DEFINE VS2012x86_DLL = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE;DEF(VS2012x86_BIN) +DEFINE VS2012x86_BINX64 = DEF(VS2012x86_BIN)\x86_amd64 + DEFINE WINSDK_VERSION = v6.0A DEFINE WINSDK_BIN = c:\Program Files\Microsoft SDKs\Windows\DEF(WINSDK_VERSION)\bin DEFINE WINSDKx86_BIN = c:\Program Files (x86)\Microsoft SDKs\Windows\DEF(WINSDK_VERSION)\bin @@ -147,6 +156,9 @@ DEFINE GCC45_X64_PREFIX = /usr/bin/ DEFINE GCC46_IA32_PREFIX = /usr/bin/ DEFINE GCC46_X64_PREFIX = /usr/bin/ +DEFINE GCC47_IA32_PREFIX = /usr/bin/ +DEFINE GCC47_X64_PREFIX = /usr/bin/ + DEFINE UNIX_IASL_BIN = /usr/bin/iasl #DEFINE UNIX_IASL_BIN = $(HOME)/programs/iasl DEFINE WIN_ASL_BIN_DIR = C:\ASL @@ -244,6 +256,15 @@ DEFINE CLANG_BIN = /usr/bin/ # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler (iasl.exe) v20101013 from # http://www.acpica.org/downloads/previous_releases.php +# VS2012 -win32- Requires: +# Microsoft Visual Studio 2012 Professional Edition +# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830 +# Optional: +# Required to build EBC drivers: +# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler) +# Required to build platforms or ACPI tables: +# Intel(r) ACPI Compiler (iasl.exe) v20101013 from +# http://www.acpica.org/downloads/previous_releases.php # DDK3790 -win32- Requires: # Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830 # Optional: @@ -277,6 +298,12 @@ DEFINE CLANG_BIN = /usr/bin/ # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler v20101013 from # http://www.acpica.org/downloads/previous_releases.php +# GCC47 -Linux- Requires: +# GCC 4.7 (Native) +# Optional: +# Required to build platforms or ACPI tables: +# Intel(r) ACPI Compiler v20101013 from +# http://www.acpica.org/downloads/previous_releases.php # ELFGCC -Linux- Requires: # GCC(this tool chain uses whatever version of gcc and binutils that is installed in /usr/bin) # Optional: @@ -361,6 +388,15 @@ DEFINE CLANG_BIN = /usr/bin/ # Required to build platforms or ACPI tables: # Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from # http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi +# VS2012xASL -win32- Requires: +# Microsoft Visual Studio 2012 Professional Edition +# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830 +# Optional: +# Required to build EBC drivers: +# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler) +# Required to build platforms or ACPI tables: +# Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from +# http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi # DDK3790xASL -win32- Requires: # Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830 # Optional: @@ -425,6 +461,13 @@ DEFINE CLANG_BIN = /usr/bin/ # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler (iasl.exe) v20101013 from # http://www.acpica.org/downloads/previous_releases.php +# VS2012x86 -win64- Requires: +# Microsoft Visual Studio 2012 (x86) Professional Edition +# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830 +# Optional: +# Required to build platforms or ACPI tables: +# Intel(r) ACPI Compiler (iasl.exe) v20101013 from +# http://www.acpica.org/downloads/previous_releases.php # ICCx86 -win64- Requires: # Intel C Compiler V9.1(x86) # Dependencies: @@ -472,6 +515,13 @@ DEFINE CLANG_BIN = /usr/bin/ # Required to build platforms or ACPI tables: # Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from # http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi +# VS2012x86xASL -win64- Requires: +# Microsoft Visual Studio 2012 (x86) Professional Edition +# Microsoft Windows Server 2003 Driver Development Kit(Microsoft WINDDK) version 3790.1830 +# Optional: +# Required to build platforms or ACPI tables: +# Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from +# http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi # ICCx86xASL -win64- Requires: # Intel C Compiler V9.1 (x86) # Dependencies: @@ -514,6 +564,32 @@ DEFINE CLANG_BIN = /usr/bin/ # Required to build platforms or ACPI tables: # Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from # http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi +# ARMGCC -unix- Requires: +# ARM None EABI GCC 4.6.0 +# Optional: +# Required to build platforms or ACPI tables: +# Intel(r) ACPI Compiler v20101013 from +# http://www.acpica.org/downloads/previous_releases.php +# ARMLINUXGCC -unix- Requires: +# ARM Linux GNU EABI GCC 4.6.0 +# Optional: +# Required to build platforms or ACPI tables: +# Intel(r) ACPI Compiler v20101013 from +# http://www.acpica.org/downloads/previous_releases.php +# RVCT -win- Requires: +# ARM C/C++ Compiler, 5.00 +# Optional: +# Required to build EBC drivers: +# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler) +# Required to build platforms or ACPI tables: +# Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from +# http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi +# RVCTLINUX -unix- Requires: +# ARM C/C++ Compiler, 5.00 +# Optional: +# Required to build platforms or ACPI tables: +# Intel(r) ACPI Compiler v20101013 from +# http://www.acpica.org/downloads/previous_releases.php # * Commented out - All versions of VS2005 use the same standard install directory # #################################################################################### @@ -713,7 +789,6 @@ NOOPT_VS2003xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP *_VS2003xASL_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER #################################################################################### -# # Microsoft Visual Studio 2005 # # VS2005 - Microsoft Visual Studio 2005 All Edition, including Standard, Professional, Express, TeamSuite @@ -789,7 +864,6 @@ NOOPT_VS2005_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF *_VS2005_X64_ASLPP_PATH = DEF(VS2005_BINX64)\cl.exe *_VS2005_X64_ASLDLINK_PATH = DEF(VS2005_BINX64)\link.exe - DEBUG_VS2005_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm RELEASE_VS2005_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF NOOPT_VS2005_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od @@ -926,7 +1000,6 @@ NOOPT_VS2005xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE *_VS2005xASL_X64_ASLPP_PATH = DEF(VS2005_BINX64)\cl.exe *_VS2005xASL_X64_ASLDLINK_PATH = DEF(VS2005_BINX64)\link.exe - DEBUG_VS2005xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm RELEASE_VS2005xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF NOOPT_VS2005xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od @@ -1063,7 +1136,6 @@ NOOPT_VS2005x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF *_VS2005x86_X64_ASLPP_PATH = DEF(VS2005x86_BINX64)\cl.exe *_VS2005x86_X64_ASLDLINK_PATH = DEF(VS2005x86_BINX64)\link.exe - DEBUG_VS2005x86_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm RELEASE_VS2005x86_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF NOOPT_VS2005x86_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od @@ -1200,7 +1272,6 @@ NOOPT_VS2005x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT *_VS2005x86xASL_X64_ASLPP_PATH = DEF(VS2005x86_BINX64)\cl.exe *_VS2005x86xASL_X64_ASLDLINK_PATH = DEF(VS2005x86_BINX64)\link.exe - DEBUG_VS2005x86xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm RELEASE_VS2005x86xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF NOOPT_VS2005x86xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od @@ -1261,7 +1332,6 @@ NOOPT_VS2005x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R *_VS2005x86xASL_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER - #################################################################################### # # Microsoft Visual Studio 2008 @@ -1339,7 +1409,6 @@ NOOPT_VS2008_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF *_VS2008_X64_ASLPP_PATH = DEF(VS2008_BINX64)\cl.exe *_VS2008_X64_ASLDLINK_PATH = DEF(VS2008_BINX64)\link.exe - DEBUG_VS2008_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm RELEASE_VS2008_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF NOOPT_VS2008_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od @@ -1384,13 +1453,14 @@ NOOPT_VS2008_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF # EBC definitions ################## *_VS2008_EBC_*_FAMILY = INTEL +*_VS2008_EBC_*_DLL = DEF(VS2008_DLL) *_VS2008_EBC_MAKE_PATH = DEF(VS2008_BIN)\nmake.exe *_VS2008_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe *_VS2008_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe *_VS2008_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe -*_VS2008_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe -*_VS2008_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe +*_VS2008_EBC_SLINK_PATH = DEF(VS2008_BIN)\link.exe +*_VS2008_EBC_DLINK_PATH = DEF(VS2008_BIN)\link.exe *_VS2008_EBC_MAKE_FLAGS = /nologo *_VS2008_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h @@ -1399,6 +1469,7 @@ NOOPT_VS2008_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF *_VS2008_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC *_VS2008_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER + #################################################################################### # # Microsoft Visual Studio 2008 @@ -1476,7 +1547,6 @@ NOOPT_VS2008xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE *_VS2008xASL_X64_ASLPP_PATH = DEF(VS2008_BINX64)\cl.exe *_VS2008xASL_X64_ASLDLINK_PATH = DEF(VS2008_BINX64)\link.exe - DEBUG_VS2008xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm RELEASE_VS2008xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF NOOPT_VS2008xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od @@ -1521,13 +1591,14 @@ NOOPT_VS2008xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF, # EBC definitions ################## *_VS2008xASL_EBC_*_FAMILY = INTEL +*_VS2008xASL_EBC_*_DLL = DEF(VS2008_DLL) *_VS2008xASL_EBC_MAKE_PATH = DEF(VS2008_BIN)\nmake.exe *_VS2008xASL_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe *_VS2008xASL_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe *_VS2008xASL_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe -*_VS2008xASL_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe -*_VS2008xASL_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe +*_VS2008xASL_EBC_SLINK_PATH = DEF(VS2008_BIN)\link.exe +*_VS2008xASL_EBC_DLINK_PATH = DEF(VS2008_BIN)\link.exe *_VS2008xASL_EBC_MAKE_FLAGS = /nologo *_VS2008xASL_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h @@ -1652,6 +1723,26 @@ NOOPT_VS2008x86_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d deb RELEASE_VS2008x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb NOOPT_VS2008x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG +################## +# EBC definitions +################## +*_VS2008x86_EBC_*_FAMILY = INTEL +*_VS2008x86_EBC_*_DLL = DEF(VS2008x86_DLL) + +*_VS2008x86_EBC_MAKE_PATH = DEF(VS2008x86_BIN)\nmake.exe +*_VS2008x86_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2008x86_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2008x86_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2008x86_EBC_SLINK_PATH = DEF(VS2008x86_BIN)\link.exe +*_VS2008x86_EBC_DLINK_PATH = DEF(VS2008x86_BIN)\link.exe + +*_VS2008x86_EBC_MAKE_FLAGS = /nologo +*_VS2008x86_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2008x86_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) +*_VS2008x86_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2008x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC +*_VS2008x86_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER + #################################################################################### # VS2008x86xASL - Microsoft Visual Studio 2008 with Microsoft ASL @@ -1767,12 +1858,32 @@ NOOPT_VS2008x86xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d RELEASE_VS2008x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb NOOPT_VS2008x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG +################## +# EBC definitions +################## +*_VS2008x86xASL_EBC_*_FAMILY = INTEL +*_VS2008x86xASL_EBC_*_DLL = DEF(VS2008x86_DLL) + +*_VS2008x86xASL_EBC_MAKE_PATH = DEF(VS2008x86_BIN)\nmake.exe +*_VS2008x86xASL_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2008x86xASL_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2008x86xASL_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2008x86xASL_EBC_SLINK_PATH = DEF(VS2008x86_BIN)\link.exe +*_VS2008x86xASL_EBC_DLINK_PATH = DEF(VS2008x86_BIN)\link.exe + +*_VS2008x86xASL_EBC_MAKE_FLAGS = /nologo +*_VS2008x86xASL_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2008x86xASL_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) +*_VS2008x86xASL_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2008x86xASL_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC +*_VS2008x86xASL_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER + #################################################################################### # # Microsoft Visual Studio 2010 # -# VS2010 - Microsoft Visual Studio 2010 Premium Edition +# VS2010 - Microsoft Visual Studio 2010 Premium Edition with Intel ASL # ASL - Intel ACPI Source Language Compiler #################################################################################### # VS2010 - Microsoft Visual Studio 2010 Premium Edition @@ -1845,7 +1956,6 @@ NOOPT_VS2010_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF *_VS2010_X64_ASLPP_PATH = DEF(VS2010_BINX64)\cl.exe *_VS2010_X64_ASLDLINK_PATH = DEF(VS2010_BINX64)\link.exe - DEBUG_VS2010_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm RELEASE_VS2010_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF NOOPT_VS2010_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od @@ -1890,13 +2000,14 @@ NOOPT_VS2010_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF # EBC definitions ################## *_VS2010_EBC_*_FAMILY = INTEL +*_VS2010_EBC_*_DLL = DEF(VS2010_DLL) *_VS2010_EBC_MAKE_PATH = DEF(VS2010_BIN)\nmake.exe *_VS2010_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe *_VS2010_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe *_VS2010_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe -*_VS2010_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe -*_VS2010_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe +*_VS2010_EBC_SLINK_PATH = DEF(VS2010_BIN)\link.exe +*_VS2010_EBC_DLINK_PATH = DEF(VS2010_BIN)\link.exe *_VS2010_EBC_MAKE_FLAGS = /nologo *_VS2010_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h @@ -1905,11 +2016,12 @@ NOOPT_VS2010_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF *_VS2010_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC *_VS2010_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER + #################################################################################### # # Microsoft Visual Studio 2010 # -# VS2010 - Microsoft Visual Studio 2010 Premium Edition +# VS2010xASL - Microsoft Visual Studio 2010 Premium Edition with Microsoft ASL # ASL - Microsoft ACPI Source Language Compiler (asl.exe) #################################################################################### # VS2010xASL - Microsoft Visual Studio 2010 Premium Edition @@ -1982,7 +2094,6 @@ NOOPT_VS2010xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE *_VS2010xASL_X64_ASLPP_PATH = DEF(VS2010_BINX64)\cl.exe *_VS2010xASL_X64_ASLDLINK_PATH = DEF(VS2010_BINX64)\link.exe - DEBUG_VS2010xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm RELEASE_VS2010xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF NOOPT_VS2010xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od @@ -2027,13 +2138,14 @@ NOOPT_VS2010xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF, # EBC definitions ################## *_VS2010xASL_EBC_*_FAMILY = INTEL +*_VS2010xASL_EBC_*_DLL = DEF(VS2010_DLL) *_VS2010xASL_EBC_MAKE_PATH = DEF(VS2010_BIN)\nmake.exe *_VS2010xASL_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe *_VS2010xASL_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe *_VS2010xASL_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe -*_VS2010xASL_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe -*_VS2010xASL_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe +*_VS2010xASL_EBC_SLINK_PATH = DEF(VS2010_BIN)\link.exe +*_VS2010xASL_EBC_DLINK_PATH = DEF(VS2010_BIN)\link.exe *_VS2010xASL_EBC_MAKE_FLAGS = /nologo *_VS2010xASL_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h @@ -2130,7 +2242,6 @@ NOOPT_VS2010x86_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi RELEASE_VS2010x86_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text NOOPT_VS2010x86_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG - ################## # IPF definitions ################## @@ -2159,6 +2270,26 @@ NOOPT_VS2010x86_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d deb RELEASE_VS2010x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb NOOPT_VS2010x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG +################## +# EBC definitions +################## +*_VS2010x86_EBC_*_FAMILY = INTEL +*_VS2010x86_EBC_*_DLL = DEF(VS2010x86_DLL) + +*_VS2010x86_EBC_MAKE_PATH = DEF(VS2010x86_BIN)\nmake.exe +*_VS2010x86_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2010x86_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2010x86_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2010x86_EBC_SLINK_PATH = DEF(VS2010x86_BIN)\link.exe +*_VS2010x86_EBC_DLINK_PATH = DEF(VS2010x86_BIN)\link.exe + +*_VS2010x86_EBC_MAKE_FLAGS = /nologo +*_VS2010x86_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2010x86_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) +*_VS2010x86_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2010x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC +*_VS2010x86_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER + #################################################################################### # VS2010x86xASL - Microsoft Visual Studio 2010 with Microsoft ASL @@ -2274,6 +2405,461 @@ NOOPT_VS2010x86xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d RELEASE_VS2010x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb NOOPT_VS2010x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG +################## +# EBC definitions +################## +*_VS2010x86xASL_EBC_*_FAMILY = INTEL +*_VS2010x86xASL_EBC_*_DLL = DEF(VS2010x86_DLL) + +*_VS2010x86xASL_EBC_MAKE_PATH = DEF(VS2010x86_BIN)\nmake.exe +*_VS2010x86xASL_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2010x86xASL_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2010x86xASL_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2010x86xASL_EBC_SLINK_PATH = DEF(VS2010x86_BIN)\link.exe +*_VS2010x86xASL_EBC_DLINK_PATH = DEF(VS2010x86_BIN)\link.exe + +*_VS2010x86xASL_EBC_MAKE_FLAGS = /nologo +*_VS2010x86xASL_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2010x86xASL_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) +*_VS2010x86xASL_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2010x86xASL_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC +*_VS2010x86xASL_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER + + +#################################################################################### +# +# Microsoft Visual Studio 2012 +# +# VS2012 - Microsoft Visual Studio 2012 Professional Edition with Intel ASL +# ASL - Intel ACPI Source Language Compiler +#################################################################################### +# VS2012 - Microsoft Visual Studio 2012 Premium Edition +*_VS2012_*_*_FAMILY = MSFT + +*_VS2012_*_MAKE_PATH = DEF(VS2012_BIN)\nmake.exe +*_VS2012_*_MAKE_FLAGS = /nologo +*_VS2012_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe + +*_VS2012_*_SLINK_FLAGS = /NOLOGO /LTCG +*_VS2012_*_APP_FLAGS = /nologo /E /TC +*_VS2012_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2012_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h + +*_VS2012_*_ASM16_PATH = DEF(VS2012_BIN)\ml.exe + +################## +# ASL definitions +################## +*_VS2012_*_ASL_PATH = DEF(DEFAULT_WIN_ASL_BIN) +*_VS2012_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS) +*_VS2012_*_ASL_OUTFLAGS = DEF(DEFAULT_WIN_ASL_OUTFLAGS) +*_VS2012_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS) +*_VS2012_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS) +*_VS2012_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS) + +################## +# IA32 definitions +################## +*_VS2012_IA32_*_DLL = DEF(VS2012_DLL) + +*_VS2012_IA32_MAKE_PATH = DEF(VS2012_BIN)\nmake.exe +*_VS2012_IA32_CC_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012_IA32_VFRPP_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012_IA32_SLINK_PATH = DEF(VS2012_BIN)\lib.exe +*_VS2012_IA32_DLINK_PATH = DEF(VS2012_BIN)\link.exe +*_VS2012_IA32_APP_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012_IA32_PP_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012_IA32_ASM_PATH = DEF(VS2012_BIN)\ml.exe +*_VS2012_IA32_ASLCC_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012_IA32_ASLPP_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012_IA32_ASLDLINK_PATH = DEF(VS2012_BIN)\link.exe + + *_VS2012_IA32_MAKE_FLAGS = /nologo + DEBUG_VS2012_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm +RELEASE_VS2012_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF +NOOPT_VS2012_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od + + DEBUG_VS2012_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi +RELEASE_VS2012_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd +NOOPT_VS2012_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi + + DEBUG_VS2012_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2012_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text +NOOPT_VS2012_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# X64 definitions +################## +*_VS2012_X64_*_DLL = DEF(VS2012_DLL) + +*_VS2012_X64_CC_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012_X64_PP_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012_X64_APP_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012_X64_VFRPP_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012_X64_ASM_PATH = DEF(VS2012_BINX64)\ml64.exe +*_VS2012_X64_SLINK_PATH = DEF(VS2012_BINX64)\lib.exe +*_VS2012_X64_DLINK_PATH = DEF(VS2012_BINX64)\link.exe +*_VS2012_X64_ASLCC_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012_X64_ASLPP_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012_X64_ASLDLINK_PATH = DEF(VS2012_BINX64)\link.exe + + DEBUG_VS2012_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm +RELEASE_VS2012_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF +NOOPT_VS2012_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od + + DEBUG_VS2012_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi +RELEASE_VS2012_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd +NOOPT_VS2012_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi + + DEBUG_VS2012_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2012_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text +NOOPT_VS2012_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# EBC definitions +################## +*_VS2012_EBC_*_FAMILY = INTEL +*_VS2012_EBC_*_DLL = DEF(VS2012_DLL) + +*_VS2012_EBC_MAKE_PATH = DEF(VS2012_BIN)\nmake.exe +*_VS2012_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe +*_VS2012_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe +*_VS2012_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe +*_VS2012_EBC_SLINK_PATH = DEF(VS2012_BIN)\link.exe +*_VS2012_EBC_DLINK_PATH = DEF(VS2012_BIN)\link.exe + +*_VS2012_EBC_MAKE_FLAGS = /nologo +*_VS2012_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2012_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) +*_VS2012_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2012_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC +*_VS2012_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER + + +#################################################################################### +# +# Microsoft Visual Studio 2012 +# +# VS2012 - Microsoft Visual Studio 2012 Professional Edition with Microsoft ASL +# ASL - Microsoft ACPI Source Language Compiler (asl.exe) +#################################################################################### +# VS2012xASL - Microsoft Visual Studio 2012 Premium Edition +*_VS2012xASL_*_*_FAMILY = MSFT + +*_VS2012xASL_*_MAKE_PATH = DEF(VS2012_BIN)\nmake.exe +*_VS2012xASL_*_MAKE_FLAG = /nologo +*_VS2012xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe + +*_VS2012xASL_*_SLINK_FLAGS = /NOLOGO /LTCG +*_VS2012xASL_*_APP_FLAGS = /nologo /E /TC +*_VS2012xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2012xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h + +*_VS2012xASL_*_ASM16_PATH = DEF(VS2012_BIN)\ml.exe + +################## +# ASL definitions +################## +*_VS2012xASL_*_ASL_PATH = DEF(WIN_ASL_BIN) +*_VS2012xASL_*_ASL_FLAGS = +*_VS2012xASL_*_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS) +*_VS2012xASL_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS) +*_VS2012xASL_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS) +*_VS2012xASL_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS) + +################## +# IA32 definitions +################## +*_VS2012xASL_IA32_*_DLL = DEF(VS2012_DLL) + +*_VS2012xASL_IA32_MAKE_PATH = DEF(VS2012_BIN)\nmake.exe +*_VS2012xASL_IA32_CC_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012xASL_IA32_VFRPP_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012xASL_IA32_SLINK_PATH = DEF(VS2012_BIN)\lib.exe +*_VS2012xASL_IA32_DLINK_PATH = DEF(VS2012_BIN)\link.exe +*_VS2012xASL_IA32_APP_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012xASL_IA32_PP_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012xASL_IA32_ASM_PATH = DEF(VS2012_BIN)\ml.exe +*_VS2012xASL_IA32_ASLCC_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012xASL_IA32_ASLPP_PATH = DEF(VS2012_BIN)\cl.exe +*_VS2012xASL_IA32_ASLDLINK_PATH = DEF(VS2012_BIN)\link.exe + + *_VS2012xASL_IA32_MAKE_FLAGS = /nologo + DEBUG_VS2012xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm +RELEASE_VS2012xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF +NOOPT_VS2012xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od + + DEBUG_VS2012xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi +RELEASE_VS2012xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd +NOOPT_VS2012xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi + + DEBUG_VS2012xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2012xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text +NOOPT_VS2012xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# X64 definitions +################## +*_VS2012xASL_X64_*_DLL = DEF(VS2012_DLL) + +*_VS2012xASL_X64_CC_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012xASL_X64_PP_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012xASL_X64_APP_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012xASL_X64_VFRPP_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012xASL_X64_ASM_PATH = DEF(VS2012_BINX64)\ml64.exe +*_VS2012xASL_X64_SLINK_PATH = DEF(VS2012_BINX64)\lib.exe +*_VS2012xASL_X64_DLINK_PATH = DEF(VS2012_BINX64)\link.exe +*_VS2012xASL_X64_ASLCC_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012xASL_X64_ASLPP_PATH = DEF(VS2012_BINX64)\cl.exe +*_VS2012xASL_X64_ASLDLINK_PATH = DEF(VS2012_BINX64)\link.exe + + DEBUG_VS2012xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm +RELEASE_VS2012xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF +NOOPT_VS2012xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od + + DEBUG_VS2012xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi +RELEASE_VS2012xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd +NOOPT_VS2012xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi + + DEBUG_VS2012xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2012xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text +NOOPT_VS2012xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# EBC definitions +################## +*_VS2012xASL_EBC_*_FAMILY = INTEL +*_VS2012xASL_EBC_*_DLL = DEF(VS2012_DLL) + +*_VS2012xASL_EBC_MAKE_PATH = DEF(VS2012_BIN)\nmake.exe +*_VS2012xASL_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe +*_VS2012xASL_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe +*_VS2012xASL_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe +*_VS2012xASL_EBC_SLINK_PATH = DEF(VS2012_BIN)\link.exe +*_VS2012xASL_EBC_DLINK_PATH = DEF(VS2012_BIN)\link.exe + +*_VS2012xASL_EBC_MAKE_FLAGS = /nologo +*_VS2012xASL_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2012xASL_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) +*_VS2012xASL_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2012xASL_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC +*_VS2012xASL_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER + + +#################################################################################### +# VS2012x86 - Microsoft Visual Studio 2012 (x86) professional with Intel ASL +# ASL - Intel ACPI Source Language Compiler (iasl.exe) +#################################################################################### +# VS2012x86 - Microsoft Visual Studio 2012 (x86) professional Edition with Intel ASL +*_VS2012x86_*_*_FAMILY = MSFT + +*_VS2012x86_*_MAKE_PATH = DEF(VS2012x86_BIN)\nmake.exe +*_VS2012x86_*_MAKE_FLAG = /nologo +*_VS2012x86_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe + +*_VS2012x86_*_MAKE_FLAGS = /nologo +*_VS2012x86_*_SLINK_FLAGS = /NOLOGO /LTCG +*_VS2012x86_*_APP_FLAGS = /nologo /E /TC +*_VS2012x86_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2012x86_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h + +*_VS2012x86_*_ASM16_PATH = DEF(VS2012x86_BIN)\ml.exe + +################## +# ASL definitions +################## +*_VS2012x86_*_ASL_PATH = DEF(WIN_IASL_BIN) +*_VS2012x86_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS) +*_VS2012x86_*_ASL_OUTFLAGS = DEF(DEFAULT_WIN_ASL_OUTFLAGS) +*_VS2012x86_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS) +*_VS2012x86_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS) +*_VS2012x86_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS) + +################## +# IA32 definitions +################## +*_VS2012x86_IA32_*_DLL = DEF(VS2012x86_DLL) + +*_VS2012x86_IA32_MAKE_PATH = DEF(VS2012x86_BIN)\nmake.exe +*_VS2012x86_IA32_CC_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86_IA32_VFRPP_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86_IA32_ASLCC_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86_IA32_ASLPP_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86_IA32_SLINK_PATH = DEF(VS2012x86_BIN)\lib.exe +*_VS2012x86_IA32_DLINK_PATH = DEF(VS2012x86_BIN)\link.exe +*_VS2012x86_IA32_ASLDLINK_PATH= DEF(VS2012x86_BIN)\link.exe +*_VS2012x86_IA32_APP_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86_IA32_PP_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86_IA32_ASM_PATH = DEF(VS2012x86_BIN)\ml.exe + + *_VS2012x86_IA32_MAKE_FLAGS = /nologo + DEBUG_VS2012x86_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm +RELEASE_VS2012x86_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF +NOOPT_VS2012x86_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od + + DEBUG_VS2012x86_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi +RELEASE_VS2012x86_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd +NOOPT_VS2012x86_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi + + DEBUG_VS2012x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2012x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text +NOOPT_VS2012x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# X64 definitions +################## +*_VS2012x86_X64_*_DLL = DEF(VS2012x86_DLL) + +*_VS2012x86_X64_CC_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86_X64_PP_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86_X64_APP_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86_X64_VFRPP_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86_X64_ASLCC_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86_X64_ASLPP_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86_X64_ASM_PATH = DEF(VS2012x86_BINX64)\ml64.exe +*_VS2012x86_X64_SLINK_PATH = DEF(VS2012x86_BINX64)\lib.exe +*_VS2012x86_X64_DLINK_PATH = DEF(VS2012x86_BINX64)\link.exe +*_VS2012x86_X64_ASLDLINK_PATH = DEF(VS2012x86_BINX64)\link.exe + + DEBUG_VS2012x86_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm +RELEASE_VS2012x86_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF +NOOPT_VS2012x86_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od + + DEBUG_VS2012x86_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi +RELEASE_VS2012x86_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd +NOOPT_VS2012x86_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi + + DEBUG_VS2012x86_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2012x86_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text +NOOPT_VS2012x86_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# EBC definitions +################## +*_VS2012x86_EBC_*_FAMILY = INTEL +*_VS2012x86_EBC_*_DLL = DEF(VS2012x86_DLL) + +*_VS2012x86_EBC_MAKE_PATH = DEF(VS2012x86_BIN)\nmake.exe +*_VS2012x86_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2012x86_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2012x86_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2012x86_EBC_SLINK_PATH = DEF(VS2012x86_BIN)\link.exe +*_VS2012x86_EBC_DLINK_PATH = DEF(VS2012x86_BIN)\link.exe + +*_VS2012x86_EBC_MAKE_FLAGS = /nologo +*_VS2012x86_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2012x86_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) +*_VS2012x86_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2012x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC +*_VS2012x86_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER + + +#################################################################################### +# VS2012x86xASL - Microsoft Visual Studio 2012 (x86) professional with Microsoft ASL +# ASL - Microsoft ACPI Source Language Compiler (asl.exe) +#################################################################################### +*_VS2012x86xASL_*_*_FAMILY = MSFT + +*_VS2012x86xASL_*_MAKE_PATH = DEF(VS2012x86_BIN)\nmake.exe +*_VS2012x86xASL_*_MAKE_FLAG = /nologo +*_VS2012x86xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe + +*_VS2012x86xASL_*_MAKE_FLAGS = /nologo +*_VS2012x86xASL_*_SLINK_FLAGS = /NOLOGO /LTCG +*_VS2012x86xASL_*_APP_FLAGS = /nologo /E /TC +*_VS2012x86xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2012x86xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h + +*_VS2012x86xASL_*_ASM16_PATH = DEF(VS2012x86_BIN)\ml.exe + +################## +# ASL definitions +################## +*_VS2012x86xASL_*_ASL_PATH = DEF(WIN_ASL_BIN) +*_VS2012x86xASL_*_ASL_FLAGS = DEF(MS_ASL_FLAGS) +*_VS2012x86xASL_*_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS) +*_VS2012x86xASL_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS) +*_VS2012x86xASL_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS) +*_VS2012x86xASL_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS) + +################## +# IA32 definitions +################## +*_VS2012x86xASL_IA32_*_DLL = DEF(VS2012x86_DLL) + +*_VS2012x86xASL_IA32_MAKE_PATH = DEF(VS2012x86_BIN)\nmake.exe +*_VS2012x86xASL_IA32_CC_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86xASL_IA32_VFRPP_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86xASL_IA32_ASLCC_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86xASL_IA32_ASLPP_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86xASL_IA32_SLINK_PATH = DEF(VS2012x86_BIN)\lib.exe +*_VS2012x86xASL_IA32_DLINK_PATH = DEF(VS2012x86_BIN)\link.exe +*_VS2012x86xASL_IA32_ASLDLINK_PATH= DEF(VS2012x86_BIN)\link.exe +*_VS2012x86xASL_IA32_APP_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86xASL_IA32_PP_PATH = DEF(VS2012x86_BIN)\cl.exe +*_VS2012x86xASL_IA32_ASM_PATH = DEF(VS2012x86_BIN)\ml.exe + + *_VS2012x86xASL_IA32_MAKE_FLAGS = /nologo + DEBUG_VS2012x86xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm +RELEASE_VS2012x86xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF +NOOPT_VS2012x86xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od + + DEBUG_VS2012x86xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi +RELEASE_VS2012x86xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd +NOOPT_VS2012x86xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi + + DEBUG_VS2012x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2012x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text +NOOPT_VS2012x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# X64 definitions +################## +*_VS2012x86xASL_X64_*_DLL = DEF(VS2012x86_DLL) + +*_VS2012x86xASL_X64_CC_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86xASL_X64_PP_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86xASL_X64_APP_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86xASL_X64_VFRPP_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86xASL_X64_ASLCC_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86xASL_X64_ASLPP_PATH = DEF(VS2012x86_BINX64)\cl.exe +*_VS2012x86xASL_X64_ASM_PATH = DEF(VS2012x86_BINX64)\ml64.exe +*_VS2012x86xASL_X64_SLINK_PATH = DEF(VS2012x86_BINX64)\lib.exe +*_VS2012x86xASL_X64_DLINK_PATH = DEF(VS2012x86_BINX64)\link.exe +*_VS2012x86xASL_X64_ASLDLINK_PATH = DEF(VS2012x86_BINX64)\link.exe + + DEBUG_VS2012x86xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm +RELEASE_VS2012x86xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF +NOOPT_VS2012x86xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od + + DEBUG_VS2012x86xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi +RELEASE_VS2012x86xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd +NOOPT_VS2012x86xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi + + DEBUG_VS2012x86xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2012x86xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text +NOOPT_VS2012x86xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# EBC definitions +################## +*_VS2012x86xASL_EBC_*_FAMILY = INTEL +*_VS2012x86xASL_EBC_*_DLL = DEF(VS2012x86_DLL) + +*_VS2012x86xASL_EBC_MAKE_PATH = DEF(VS2012x86_BIN)\nmake.exe +*_VS2012x86xASL_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2012x86xASL_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2012x86xASL_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe +*_VS2012x86xASL_EBC_SLINK_PATH = DEF(VS2012x86_BIN)\link.exe +*_VS2012x86xASL_EBC_DLINK_PATH = DEF(VS2012x86_BIN)\link.exe + +*_VS2012x86xASL_EBC_MAKE_FLAGS = /nologo +*_VS2012x86xASL_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_VS2012x86xASL_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) +*_VS2012x86xASL_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2012x86xASL_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC +*_VS2012x86xASL_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER + #################################################################################### # @@ -2541,9 +3127,11 @@ DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-strict-aliasing - DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe DEFINE GCC_IPF_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency -DEFINE GCC_ARMGCC_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer +DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address +DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mcmodel=large -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections +DEFINE GCC_ARM_AARCH64_DLINK_COMMON= -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map DEFINE GCC_IA32_X64_ASLDLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map DEFINE GCC_IPF_DLINK_FLAGS = -nostdlib -O2 --gc-sections --dll -static --entry $(IMAGE_ENTRY_POINT) --undefined $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map @@ -2555,9 +3143,11 @@ DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(DEST_DI DEFINE GCC_ASLPP_FLAGS = -x c -E -P DEFINE GCC_ASLCC_FLAGS = -x c DEFINE GCC_WINDRES_FLAGS = -J rc -O coff -DEFINE GCC_IA32_RC_FLAGS = -I binary -O elf32-i386 -B i386 --rename-section .data=.hii -DEFINE GCC_X64_RC_FLAGS = -I binary -O elf64-x86-64 -B i386 --rename-section .data=.hii -DEFINE GCC_IPF_RC_FLAGS = -I binary -O elf64-ia64-little -B ia64 --rename-section .data=.hii +DEFINE GCC_IA32_RC_FLAGS = -I binary -O elf32-i386 -B i386 --rename-section .data=.hii +DEFINE GCC_X64_RC_FLAGS = -I binary -O elf64-x86-64 -B i386 --rename-section .data=.hii +DEFINE GCC_IPF_RC_FLAGS = -I binary -O elf64-ia64-little -B ia64 --rename-section .data=.hii +DEFINE GCC_ARM_RC_FLAGS = -I binary -O elf32-littlearm -B arm --rename-section .data=.hii +DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii DEFINE GCC44_ALL_CC_FLAGS = -g -fshort-wchar -fno-stack-protector -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-array-bounds -ffunction-sections -fdata-sections -c -include AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings DEFINE GCC44_IA32_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m32 -malign-double -D EFI32 @@ -2583,6 +3173,23 @@ DEFINE GCC46_IA32_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) DEFINE GCC46_IA32_X64_DLINK_FLAGS = DEF(GCC45_IA32_X64_DLINK_FLAGS) DEFINE GCC46_X64_DLINK_FLAGS = DEF(GCC45_X64_DLINK_FLAGS) DEFINE GCC46_ASM_FLAGS = DEF(GCC45_ASM_FLAGS) +DEFINE GCC46_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian +DEFINE GCC46_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -mno-unaligned-access -Wno-address -fomit-frame-pointer +DEFINE GCC46_ARM_DLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON) --oformat=elf32-littlearm + +DEFINE GCC47_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) +DEFINE GCC47_X64_CC_FLAGS = DEF(GCC46_X64_CC_FLAGS) +DEFINE GCC47_IA32_X64_DLINK_COMMON = DEF(GCC46_IA32_X64_DLINK_COMMON) +DEFINE GCC47_IA32_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) +DEFINE GCC47_IA32_X64_DLINK_FLAGS = DEF(GCC46_IA32_X64_DLINK_FLAGS) +DEFINE GCC47_X64_DLINK_FLAGS = DEF(GCC46_X64_DLINK_FLAGS) +DEFINE GCC47_ASM_FLAGS = DEF(GCC46_ASM_FLAGS) +DEFINE GCC47_ARM_ASM_FLAGS = DEF(GCC46_ARM_ASM_FLAGS) +DEFINE GCC47_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian +DEFINE GCC47_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) +DEFINE GCC47_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) -mcmodel=large -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address +DEFINE GCC47_ARM_DLINK_FLAGS = DEF(GCC46_ARM_DLINK_FLAGS) +DEFINE GCC47_AARCH64_DLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON) #################################################################################### # @@ -2865,6 +3472,150 @@ DEFINE GCC46_ASM_FLAGS = DEF(GCC45_ASM_FLAGS) *_GCC46_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC46_X64_OBJCOPY_FLAGS = +################## +# GCC46 ARM definitions +################## +*_GCC46_ARM_OBJCOPY_PATH = echo +*_GCC46_ARM_CC_PATH = ENV(GCC46_ARM_PREFIX)gcc +*_GCC46_ARM_SLINK_PATH = ENV(GCC46_ARM_PREFIX)ar +*_GCC46_ARM_DLINK_PATH = ENV(GCC46_ARM_PREFIX)ld +*_GCC46_ARM_ASLDLINK_PATH = ENV(GCC46_ARM_PREFIX)ld +*_GCC46_ARM_ASM_PATH = ENV(GCC46_ARM_PREFIX)gcc +*_GCC46_ARM_PP_PATH = ENV(GCC46_ARM_PREFIX)gcc +*_GCC46_ARM_VFRPP_PATH = ENV(GCC46_ARM_PREFIX)gcc +*_GCC46_ARM_ASLCC_PATH = ENV(GCC46_ARM_PREFIX)gcc +*_GCC46_ARM_ASLPP_PATH = ENV(GCC46_ARM_PREFIX)gcc +*_GCC46_ARM_RC_PATH = ENV(GCC46_ARM_PREFIX)objcopy + +*_GCC46_ARM_ARCHCC_FLAGS = -mthumb +*_GCC46_ARM_PLATFORM_FLAGS = -march=armv7-a + +*_GCC46_ARM_ASM_FLAGS = DEF(GCC46_ARM_ASM_FLAGS) +*_GCC46_ARM_DLINK_FLAGS = DEF(GCC46_ARM_DLINK_FLAGS) +*_GCC46_ARM_PLATFORM_FLAGS = -march=armv7-a +*_GCC46_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS) +*_GCC46_ARM_RC_FLAGS = DEF(GCC_ARM_RC_FLAGS) +*_GCC46_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS) + + DEBUG_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -O0 +RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-variable + +#################################################################################### +# +# GCC 4.7 - This configuration is used to compile under Linux to produce +# PE/COFF binaries using GCC 4.7. +# +#################################################################################### +*_GCC47_*_*_FAMILY = GCC + +*_GCC47_*_MAKE_PATH = make +*_GCC47_*_ASL_PATH = DEF(UNIX_IASL_BIN) + +*_GCC47_*_PP_FLAGS = DEF(GCC_PP_FLAGS) +*_GCC47_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) +*_GCC47_*_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) +*_GCC47_*_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) +*_GCC47_*_APP_FLAGS = +*_GCC47_*_ASL_FLAGS = DEF(IASL_FLAGS) +*_GCC47_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS) + +################## +# GCC47 IA32 definitions +################## +*_GCC47_IA32_OBJCOPY_PATH = DEF(GCC47_IA32_PREFIX)objcopy +*_GCC47_IA32_CC_PATH = DEF(GCC47_IA32_PREFIX)gcc +*_GCC47_IA32_SLINK_PATH = DEF(GCC47_IA32_PREFIX)ar +*_GCC47_IA32_DLINK_PATH = DEF(GCC47_IA32_PREFIX)ld +*_GCC47_IA32_ASLDLINK_PATH = DEF(GCC47_IA32_PREFIX)ld +*_GCC47_IA32_ASM_PATH = DEF(GCC47_IA32_PREFIX)gcc +*_GCC47_IA32_PP_PATH = DEF(GCC47_IA32_PREFIX)gcc +*_GCC47_IA32_VFRPP_PATH = DEF(GCC47_IA32_PREFIX)gcc +*_GCC47_IA32_ASLCC_PATH = DEF(GCC47_IA32_PREFIX)gcc +*_GCC47_IA32_ASLPP_PATH = DEF(GCC47_IA32_PREFIX)gcc +*_GCC47_IA32_RC_PATH = DEF(GCC47_IA32_PREFIX)objcopy + +*_GCC47_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 +*_GCC47_IA32_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -m elf_i386 +*_GCC47_IA32_ASM_FLAGS = DEF(GCC47_ASM_FLAGS) -m32 -march=i386 +*_GCC47_IA32_CC_FLAGS = DEF(GCC47_IA32_CC_FLAGS) -Os +*_GCC47_IA32_DLINK_FLAGS = DEF(GCC47_IA32_X64_DLINK_FLAGS) -m elf_i386 --oformat=elf32-i386 +*_GCC47_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) +*_GCC47_IA32_OBJCOPY_FLAGS = + +################## +# GCC47 X64 definitions +################## +*_GCC47_X64_OBJCOPY_PATH = DEF(GCC47_X64_PREFIX)objcopy +*_GCC47_X64_CC_PATH = DEF(GCC47_X64_PREFIX)gcc +*_GCC47_X64_SLINK_PATH = DEF(GCC47_X64_PREFIX)ar +*_GCC47_X64_DLINK_PATH = DEF(GCC47_X64_PREFIX)ld +*_GCC47_X64_ASLDLINK_PATH = DEF(GCC47_X64_PREFIX)ld +*_GCC47_X64_ASM_PATH = DEF(GCC47_X64_PREFIX)gcc +*_GCC47_X64_PP_PATH = DEF(GCC47_X64_PREFIX)gcc +*_GCC47_X64_VFRPP_PATH = DEF(GCC47_X64_PREFIX)gcc +*_GCC47_X64_ASLCC_PATH = DEF(GCC47_X64_PREFIX)gcc +*_GCC47_X64_ASLPP_PATH = DEF(GCC47_X64_PREFIX)gcc +*_GCC47_X64_RC_PATH = DEF(GCC47_X64_PREFIX)objcopy + +*_GCC47_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 +*_GCC47_X64_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64 +*_GCC47_X64_ASM_FLAGS = DEF(GCC47_ASM_FLAGS) -m64 +*_GCC47_X64_CC_FLAGS = DEF(GCC47_X64_CC_FLAGS) +*_GCC47_X64_DLINK_FLAGS = DEF(GCC47_X64_DLINK_FLAGS) +*_GCC47_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) +*_GCC47_X64_OBJCOPY_FLAGS = + +################## +# GCC47 ARM definitions +################## +*_GCC47_ARM_CC_PATH = ENV(GCC47_ARM_PREFIX)gcc +*_GCC47_ARM_SLINK_PATH = ENV(GCC47_ARM_PREFIX)ar +*_GCC47_ARM_DLINK_PATH = ENV(GCC47_ARM_PREFIX)ld +*_GCC47_ARM_ASLDLINK_PATH = ENV(GCC47_ARM_PREFIX)ld +*_GCC47_ARM_ASM_PATH = ENV(GCC47_ARM_PREFIX)gcc +*_GCC47_ARM_PP_PATH = ENV(GCC47_ARM_PREFIX)gcc +*_GCC47_ARM_VFRPP_PATH = ENV(GCC47_ARM_PREFIX)gcc +*_GCC47_ARM_ASLCC_PATH = ENV(GCC47_ARM_PREFIX)gcc +*_GCC47_ARM_ASLPP_PATH = ENV(GCC47_ARM_PREFIX)gcc +*_GCC47_ARM_RC_PATH = ENV(GCC47_ARM_PREFIX)objcopy + +*_GCC46_ARM_ARCHCC_FLAGS = -mthumb +*_GCC46_ARM_PLATFORM_FLAGS = -march=armv7-a + +*_GCC47_ARM_ASM_FLAGS = DEF(GCC47_ARM_ASM_FLAGS) +*_GCC47_ARM_DLINK_FLAGS = DEF(GCC47_ARM_DLINK_FLAGS) +*_GCC47_ARM_PLATFORM_FLAGS = -march=armv7-a +*_GCC47_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS) +*_GCC47_ARM_RC_FLAGS = DEF(GCC_ARM_RC_FLAGS) +*_GCC47_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS) + + DEBUG_GCC47_ARM_CC_FLAGS = DEF(GCC47_ARM_CC_FLAGS) -O0 +RELEASE_GCC47_ARM_CC_FLAGS = DEF(GCC47_ARM_CC_FLAGS) -Wno-unused-but-set-variable + +################## +# GCC47 AARCH64 definitions +################## +*_GCC47_AARCH64_CC_PATH = ENV(GCC47_AARCH64_PREFIX)gcc +*_GCC47_AARCH64_SLINK_PATH = ENV(GCC47_AARCH64_PREFIX)ar +*_GCC47_AARCH64_DLINK_PATH = ENV(GCC47_AARCH64_PREFIX)ld +*_GCC47_AARCH64_ASLDLINK_PATH = ENV(GCC47_AARCH64_PREFIX)ld +*_GCC47_AARCH64_ASM_PATH = ENV(GCC47_AARCH64_PREFIX)gcc +*_GCC47_AARCH64_PP_PATH = ENV(GCC47_AARCH64_PREFIX)gcc +*_GCC47_AARCH64_VFRPP_PATH = ENV(GCC47_AARCH64_PREFIX)gcc +*_GCC47_AARCH64_ASLCC_PATH = ENV(GCC47_AARCH64_PREFIX)gcc +*_GCC47_AARCH64_ASLPP_PATH = ENV(GCC47_AARCH64_PREFIX)gcc +*_GCC47_AARCH64_RC_PATH = ENV(GCC47_AARCH64_PREFIX)objcopy + +*_GCC47_AARCH64_ASM_FLAGS = DEF(GCC47_AARCH64_ASM_FLAGS) +*_GCC47_AARCH64_DLINK_FLAGS = DEF(GCC47_AARCH64_DLINK_FLAGS) +*_GCC47_AARCH64_PLATFORM_FLAGS = +*_GCC47_AARCH64_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS) +*_GCC47_AARCH64_RC_FLAGS = DEF(GCC_AARCH64_RC_FLAGS) +*_GCC47_AARCH64_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS) + + DEBUG_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -O0 +RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-set-variable + #################################################################################### # # Cygwin GCC And Intel ACPI Compiler @@ -3106,9 +3857,9 @@ DEFINE GCC46_ASM_FLAGS = DEF(GCC45_ASM_FLAGS) *_ELFGCC_IA32_ASM_PATH = DEF(ELFGCC_BIN)/gcc *_ELFGCC_IA32_PP_PATH = DEF(ELFGCC_BIN)/gcc *_ELFGCC_IA32_VFRPP_PATH = DEF(ELFGCC_BIN)/gcc -*_ELFGCC32_IA32_ASLCC_PATH = DEF(ELFGCC_BIN)/gcc -*_ELFGCC32_IA32_ASLPP_PATH = DEF(ELFGCC_BIN)/gcc -*_ELFGCC32_IA32_ASLDLINK_PATH = DEF(ELFGCC_BIN)/ld +*_ELFGCC_IA32_ASLCC_PATH = DEF(ELFGCC_BIN)/gcc +*_ELFGCC_IA32_ASLPP_PATH = DEF(ELFGCC_BIN)/gcc +*_ELFGCC_IA32_ASLDLINK_PATH = DEF(ELFGCC_BIN)/ld *_ELFGCC_IA32_RC_PATH = DEF(ELFGCC_BIN)/objcopy *_ELFGCC_IA32_CC_FLAGS = -m32 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings @@ -4628,7 +5379,8 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os # #################################################################################### -DEFINE RVCT_ALL_CC_FLAGS = --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide +DEFINE RVCT_ALL_ASM_FLAGS = --diag_suppress=1786 --diag_error=warning --apcs /interwork +DEFINE RVCT_ALL_CC_FLAGS = --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_suppress=186 --diag_warning 167 --diag_error=warning --diag_style=ide DEFINE RVCT_ALL_DLINK_FLAGS = --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --diag_style=ide #################################################################################### @@ -4652,13 +5404,13 @@ DEFINE RVCT_ALL_DLINK_FLAGS = --ro-base 0 --no_scanlib --reloc --no_exceptions RELEASE_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map -*_RVCT_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork +*_RVCT_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS) *_RVCT_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E *_RVCT_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h *_RVCT_ARM_MAKE_PATH = nmake /NOLOGO *_RVCT_ARM_SLINK_FLAGS = --partial -o DEBUG_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g -RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2 +RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2 ################## # ARM definitions @@ -4680,6 +5432,8 @@ RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_F *_RVCTLINUX_*_*_FAMILY = RVCT *_RVCTLINUX_*_*_BUILDRULEFAMILY = RVCTLINUX +*_RVCTLINUX_*_MAKE_PATH = make + # # Use default values, or override in DSC file # @@ -4691,13 +5445,12 @@ RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_F DEBUG_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map RELEASE_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map -*_RVCTLINUX_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork +*_RVCTLINUX_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS) *_RVCTLINUX_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E *_RVCTLINUX_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h -*_RVCTLINUX_ARM_MAKE_PATH = make *_RVCTLINUX_ARM_SLINK_FLAGS = --partial -o DEBUG_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g -RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2 +RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2 ################## # ARM definitions @@ -4739,13 +5492,13 @@ RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` -*_RVCTCYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork +*_RVCTCYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS) *_RVCTCYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E *_RVCTCYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h` *_RVCTCYGWIN_ARM_MAKE_PATH = make *_RVCTCYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial -o DEBUG_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g -RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2 +RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2 ################## # ARM definitions @@ -4785,16 +5538,16 @@ RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_F # ARM definitions ################## -*_ARMGCC_ARM_ASLCC_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc -*_ARMGCC_ARM_ASLDLINK_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld -*_ARMGCC_ARM_ASLPP_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc +*_ARMGCC_ARM_ASLCC_PATH = ENV(CROSS_COMPILE)gcc +*_ARMGCC_ARM_ASLDLINK_PATH = ENV(CROSS_COMPILE)ld +*_ARMGCC_ARM_ASLPP_PATH = ENV(CROSS_COMPILE)gcc -*_ARMGCC_ARM_CC_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc -*_ARMGCC_ARM_SLINK_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ar -*_ARMGCC_ARM_DLINK_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld -*_ARMGCC_ARM_ASM_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-as -*_ARMGCC_ARM_PP_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc -*_ARMGCC_ARM_VFRPP_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc +*_ARMGCC_ARM_CC_PATH = ENV(CROSS_COMPILE)gcc +*_ARMGCC_ARM_SLINK_PATH = ENV(CROSS_COMPILE)ar +*_ARMGCC_ARM_DLINK_PATH = ENV(CROSS_COMPILE)ld +*_ARMGCC_ARM_ASM_PATH = ENV(CROSS_COMPILE)as +*_ARMGCC_ARM_PP_PATH = ENV(CROSS_COMPILE)gcc +*_ARMGCC_ARM_VFRPP_PATH = ENV(CROSS_COMPILE)gcc # # Use default values, or override in DSC file @@ -4813,8 +5566,44 @@ RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-end *_ARMGCC_ARM_SLINK_FLAGS = -rc *_ARMGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map - DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -O0 -RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -Wno-unused + DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -O0 +RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -Wno-unused + +###################### +# AArch64 definitions +###################### +# AARCH64 64bit ARM Bare-metal GCC (ARM Architecture 64) + +*_ARMGCC_AARCH64_ASLCC_PATH = ENV(CROSS_COMPILE)gcc +*_ARMGCC_AARCH64_ASLDLINK_PATH = ENV(CROSS_COMPILE)ld +*_ARMGCC_AARCH64_ASLPP_PATH = ENV(CROSS_COMPILE)gcc + +*_ARMGCC_AARCH64_CC_PATH = ENV(CROSS_COMPILE)gcc +*_ARMGCC_AARCH64_SLINK_PATH = ENV(CROSS_COMPILE)ar +*_ARMGCC_AARCH64_DLINK_PATH = ENV(CROSS_COMPILE)ld +*_ARMGCC_AARCH64_ASM_PATH = ENV(CROSS_COMPILE)as +*_ARMGCC_AARCH64_PP_PATH = ENV(CROSS_COMPILE)gcc +*_ARMGCC_AARCH64_VFRPP_PATH = ENV(CROSS_COMPILE)gcc + +# +# Use default values, or override in DSC file +# +*_ARMGCC_AARCH64_ARCHCC_FLAGS = +*_ARMGCC_AARCH64_ARCHASM_FLAGS = +*_ARMGCC_AARCH64_ARCHDLINK_FLAGS = +*_ARMGCC_AARCH64_PLATFORM_FLAGS = + + DEBUG_ARMGCC_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -g +RELEASE_ARMGCC_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) + +*_ARMGCC_AARCH64_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h +*_ARMGCC_AARCH64_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h + +*_ARMGCC_AARCH64_SLINK_FLAGS = -rc +*_ARMGCC_AARCH64_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map + + DEBUG_ARMGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -O0 +RELEASE_ARMGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable #################################################################################### # @@ -4871,8 +5660,44 @@ RELEASE_ARMLINUXGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittl *_ARMLINUXGCC_ARM_SLINK_FLAGS = -rc *_ARMLINUXGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map - DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -O0 -RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable + DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fno-stack-protector -mno-unaligned-access -O0 +RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fno-stack-protector -mno-unaligned-access -Wno-unused-but-set-variable + +###################### +# AArch64 definitions +###################### +# AARCH64 64bit ARM GNU/Linux GCC (ARM Architecture 64) + +*_ARMLINUXGCC_AARCH64_ASLCC_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc +*_ARMLINUXGCC_AARCH64_ASLDLINK_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ld +*_ARMLINUXGCC_AARCH64_ASLPP_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc + +*_ARMLINUXGCC_AARCH64_CC_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc +*_ARMLINUXGCC_AARCH64_SLINK_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ar +*_ARMLINUXGCC_AARCH64_DLINK_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ld +*_ARMLINUXGCC_AARCH64_ASM_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-as +*_ARMLINUXGCC_AARCH64_PP_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc +*_ARMLINUXGCC_AARCH64_VFRPP_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc + +# +# Use default values, or override in DSC file +# +*_ARMLINUXGCC_AARCH64_ARCHCC_FLAGS = +*_ARMLINUXGCC_AARCH64_ARCHASM_FLAGS = +*_ARMLINUXGCC_AARCH64_ARCHDLINK_FLAGS = +*_ARMLINUXGCC_AARCH64_PLATFORM_FLAGS = + + DEBUG_ARMLINUXGCC_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -g +RELEASE_ARMLINUXGCC_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) + +*_ARMLINUXGCC_AARCH64_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h +*_ARMLINUXGCC_AARCH64_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h + +*_ARMLINUXGCC_AARCH64_SLINK_FLAGS = -rc +*_ARMLINUXGCC_AARCH64_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map + + DEBUG_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -O0 +RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable ################# # ASM 16 linker defintions diff --git a/BaseTools/Contributions.txt b/BaseTools/Contributions.txt new file mode 100644 index 0000000000..667ca1035c --- /dev/null +++ b/BaseTools/Contributions.txt @@ -0,0 +1,188 @@ + +====================== += Code Contributions = +====================== + +To make a contribution to a TianoCore project, follow these steps. +1. Create a change description in the format specified below to + use in the source control commit log. +2. Your commit message must include your "Signed-off-by" signature, + and "Contributed-under" message. +3. Your "Contributed-under" message explicitly states that the + contribution is made under the terms of the specified + contribution agreement. Your "Contributed-under" message + must include the name of contribution agreement and version. + For example: Contributed-under: TianoCore Contribution Agreement 1.0 + The "TianoCore Contribution Agreement" is included below in + this document. +4. Submit your code to the TianoCore project using the process + that the project documents on its web page. If the process is + not documented, then submit the code on development email list + for the project. + +======================================= += Change Description / Commit Message = +======================================= + +Your change description should use the standard format for a +commit message, and must include your "Signed-off-by" signature +and the "Contributed-under" message. + +== Sample Change Description / Commit Message = + +=== Definitions for sample change description === + +* "CodeModule" is a short idenfier for the affected code. For + example MdePkg, or MdeModulePkg UsbBusDxe. +* "Brief-single-line-summary" is a short summary of the change. +* The entire first line should be less than ~70 characters. +* "Full-commit-message" a verbose multiple line comment describing + the change. Each line should be less than ~70 characters. +* "Contributed-under" explicitely states that the contribution is + made under the terms of the contribtion agreement. This + agreement is included below in this document. +* "Signed-off-by" is the contributor's signature identifying them + by their real/legal name and their email address. + +=== Start of sample change description / commit message === +CodeModule: Brief-single-line-summary + +Full-commit-message + +Contributed-under: TianoCore Contribution Agreement 1.0 +Signed-off-by: Contributor Name +=== End of sample change description / commit message === + +======================================== += TianoCore Contribution Agreement 1.0 = +======================================== + +INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION, +INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE OPEN SOURCE +PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE +TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL AND/OR THE +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR +REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE +CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS +OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED +BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS +AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE +AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT +USE THE CONTENT. + +Unless otherwise indicated, all Content made available on the TianoCore +site is provided to you under the terms and conditions of the BSD +License ("BSD"). A copy of the BSD License is available at +http://opensource.org/licenses/bsd-license.php +or when applicable, in the associated License.txt file. + +Certain other content may be made available under other licenses as +indicated in or with such Content. (For example, in a License.txt file.) + +You accept and agree to the following terms and conditions for Your +present and future Contributions submitted to TianoCore site. Except +for the license granted to Intel hereunder, You reserve all right, +title, and interest in and to Your Contributions. + +== SECTION 1: Definitions == +* "You" or "Contributor" shall mean the copyright owner or legal + entity authorized by the copyright owner that is making a + Contribution hereunder. All other entities that control, are + controlled by, or are under common control with that entity are + considered to be a single Contributor. For the purposes of this + definition, "control" means (i) the power, direct or indirect, to + cause the direction or management of such entity, whether by + contract or otherwise, or (ii) ownership of fifty percent (50%) + or more of the outstanding shares, or (iii) beneficial ownership + of such entity. +* "Contribution" shall mean any original work of authorship, + including any modifications or additions to an existing work, + that is intentionally submitted by You to the TinaoCore site for + inclusion in, or documentation of, any of the Content. For the + purposes of this definition, "submitted" means any form of + electronic, verbal, or written communication sent to the + TianoCore site or its representatives, including but not limited + to communication on electronic mailing lists, source code + control systems, and issue tracking systems that are managed by, + or on behalf of, the TianoCore site for the purpose of + discussing and improving the Content, but excluding + communication that is conspicuously marked or otherwise + designated in writing by You as "Not a Contribution." + +== SECTION 2: License for Contributions == +* Contributor hereby agrees that redistribution and use of the + Contribution in source and binary forms, with or without + modification, are permitted provided that the following + conditions are met: +** Redistributions of source code must retain the Contributor's + copyright notice, this list of conditions and the following + disclaimer. +** Redistributions in binary form must reproduce the Contributor's + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. +* Disclaimer. None of the names of Contributor, Intel, or the names + of their respective contributors may be used to endorse or + promote products derived from this software without specific + prior written permission. +* Contributor grants a license (with the right to sublicense) under + claims of Contributor's patents that Contributor can license that + are infringed by the Contribution (as delivered by Contributor) to + make, use, distribute, sell, offer for sale, and import the + Contribution and derivative works thereof solely to the minimum + extent necessary for licensee to exercise the granted copyright + license; this patent license applies solely to those portions of + the Contribution that are unmodified. No hardware per se is + licensed. +* EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE + CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS IS" AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE + CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. + +== SECTION 3: Representations == +* You represent that You are legally entitled to grant the above + license. If your employer(s) has rights to intellectual property + that You create that includes Your Contributions, You represent + that You have received permission to make Contributions on behalf + of that employer, that Your employer has waived such rights for + Your Contributions. +* You represent that each of Your Contributions is Your original + creation (see Section 4 for submissions on behalf of others). + You represent that Your Contribution submissions include complete + details of any third-party license or other restriction + (including, but not limited to, related patents and trademarks) + of which You are personally aware and which are associated with + any part of Your Contributions. + +== SECTION 4: Third Party Contributions == +* Should You wish to submit work that is not Your original creation, + You may submit it to TianoCore site separately from any + Contribution, identifying the complete details of its source + and of any license or other restriction (including, but not + limited to, related patents, trademarks, and license agreements) + of which You are personally aware, and conspicuously marking the + work as "Submitted on behalf of a third-party: [named here]". + +== SECTION 5: Miscellaneous == +* Applicable Laws. Any claims arising under or relating to this + Agreement shall be governed by the internal substantive laws of + the State of Delaware or federal courts located in Delaware, + without regard to principles of conflict of laws. +* Language. This Agreement is in the English language only, which + language shall be controlling in all respects, and all versions + of this Agreement in any other language shall be for accommodation + only and shall not be binding. All communications and notices made + or given pursuant to this Agreement, and all documentation and + support to be provided, unless otherwise noted, shall be in the + English language. + diff --git a/BaseTools/GNUmakefile b/BaseTools/GNUmakefile index a3fa905c90..790d33a2f3 100644 --- a/BaseTools/GNUmakefile +++ b/BaseTools/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for Base Tools project build. +# GNU/Linux makefile for Base Tools project build. # # Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/License.txt b/BaseTools/License.txt new file mode 100644 index 0000000000..160be01d2a --- /dev/null +++ b/BaseTools/License.txt @@ -0,0 +1,25 @@ +Copyright (c) 2013, Intel Corporation. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/BaseTools/ReadMe.txt b/BaseTools/ReadMe.txt index beda3a81a6..858b124db8 100644 --- a/BaseTools/ReadMe.txt +++ b/BaseTools/ReadMe.txt @@ -33,7 +33,7 @@ the base directory of the project. On Ubuntu, the following command should install all the necessary build packages to build all the C BaseTools: - sudo apt-get install build-essentials uuid-dev + sudo apt-get install build-essential uuid-dev === Python sqlite3 module === On Windows, the cx_freeze will not copy the sqlite3.dll to the frozen @@ -43,10 +43,4 @@ Please copy it manually from \DLLs. The Python distributed with most recent Linux will have sqlite3 module built in. If not, please install sqlit3 package separately. -2. The binary tools will be updated only after passing developer testing. - -Current state of the tools is Proto-Type - not all tool functions have been implemented -and there may be bugs in these tools. These tools are under constant development at -this time. - 26-OCT-2011 diff --git a/BaseTools/Scripts/gcc4.4-ld-script b/BaseTools/Scripts/gcc4.4-ld-script index d71dd9ca82..68b2767590 100644 --- a/BaseTools/Scripts/gcc4.4-ld-script +++ b/BaseTools/Scripts/gcc4.4-ld-script @@ -18,6 +18,10 @@ SECTIONS ) . = ALIGN(0x20); } + .eh_frame ALIGN(0x20) : + { + KEEP (*(.eh_frame)) + } .got ALIGN(0x20) : { *(.got .got.*) diff --git a/BaseTools/Source/C/BootSectImage/GNUmakefile b/BaseTools/Source/C/BootSectImage/GNUmakefile index 7703928dfc..5f7cb98461 100644 --- a/BaseTools/Source/C/BootSectImage/GNUmakefile +++ b/BaseTools/Source/C/BootSectImage/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'BootSectImage' module build. +# GNU/Linux makefile for 'BootSectImage' module build. # # Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/Common/BasePeCoff.c b/BaseTools/Source/C/Common/BasePeCoff.c index 816f309f66..afb45df40b 100644 --- a/BaseTools/Source/C/Common/BasePeCoff.c +++ b/BaseTools/Source/C/Common/BasePeCoff.c @@ -3,6 +3,7 @@ Functions to get info and load PE/COFF image. Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.
+Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -79,6 +80,14 @@ PeCoffLoaderRelocateArmImage ( IN UINT64 Adjust ); +RETURN_STATUS +PeCoffLoaderRelocateAArch64Image ( + IN UINT16 *Reloc, + IN OUT CHAR8 *Fixup, + IN OUT CHAR8 **FixupData, + IN UINT64 Adjust + ); + STATIC RETURN_STATUS PeCoffLoaderGetPeHeader ( @@ -194,7 +203,8 @@ Returns: ImageContext->Machine != EFI_IMAGE_MACHINE_IA64 && \ ImageContext->Machine != EFI_IMAGE_MACHINE_X64 && \ ImageContext->Machine != EFI_IMAGE_MACHINE_ARMT && \ - ImageContext->Machine != EFI_IMAGE_MACHINE_EBC) { + ImageContext->Machine != EFI_IMAGE_MACHINE_EBC && \ + ImageContext->Machine != EFI_IMAGE_MACHINE_AARCH64) { if (ImageContext->Machine == IMAGE_FILE_MACHINE_ARM) { // // There are two types of ARM images. Pure ARM and ARM/Thumb. @@ -791,6 +801,9 @@ Returns: case EFI_IMAGE_MACHINE_IA64: Status = PeCoffLoaderRelocateIpfImage (Reloc, Fixup, &FixupData, Adjust); break; + case EFI_IMAGE_MACHINE_AARCH64: + Status = PeCoffLoaderRelocateAArch64Image (Reloc, Fixup, &FixupData, Adjust); + break; default: Status = RETURN_UNSUPPORTED; break; diff --git a/BaseTools/Source/C/Common/GNUmakefile b/BaseTools/Source/C/Common/GNUmakefile index 1aade7f7b8..a193557817 100644 --- a/BaseTools/Source/C/Common/GNUmakefile +++ b/BaseTools/Source/C/Common/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'Common' module build. +# GNU/Linux makefile for 'Common' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/Common/PeCoffLoaderEx.c b/BaseTools/Source/C/Common/PeCoffLoaderEx.c index 2afd441845..8d6b3961f5 100644 --- a/BaseTools/Source/C/Common/PeCoffLoaderEx.c +++ b/BaseTools/Source/C/Common/PeCoffLoaderEx.c @@ -1,6 +1,7 @@ /** @file Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.
+Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -15,7 +16,7 @@ Module Name: Abstract: - IA32, X64 and IPF Specific relocation fixups + IA32, X64, IPF, ARM and AArch64 Specific relocation fixups Revision History @@ -25,6 +26,7 @@ Revision History #include #include "PeCoffLib.h" #include "CommonLib.h" +#include "EfiUtilityMsgs.h" #define EXT_IMM64(Value, Address, Size, InstPos, ValPos) \ @@ -472,3 +474,43 @@ PeCoffLoaderRelocateArmImage ( return RETURN_SUCCESS; } + +RETURN_STATUS +PeCoffLoaderRelocateAArch64Image ( + IN UINT16 *Reloc, + IN OUT CHAR8 *Fixup, + IN OUT CHAR8 **FixupData, + IN UINT64 Adjust + ) +/** + Performs an AArch64 specific relocation fixup + + @param Reloc Pointer to the relocation record + @param Fixup Pointer to the address to fix up + @param FixupData Pointer to a buffer to log the fixups + @param Adjust The offset to adjust the fixup + + @retval RETURN_SUCCESS Success to perform relocation + @retval RETURN_UNSUPPORTED Unsupported. +**/ +{ + UINT64 *F64; + + switch ((*Reloc) >> 12) { + + case EFI_IMAGE_REL_BASED_DIR64: + F64 = (UINT64 *) Fixup; + *F64 = *F64 + (UINT64) Adjust; + if (*FixupData != NULL) { + *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64)); + *(UINT64 *)(*FixupData) = *F64; + *FixupData = *FixupData + sizeof(UINT64); + } + break; + + default: + return RETURN_UNSUPPORTED; + } + + return RETURN_SUCCESS; +} diff --git a/BaseTools/Source/C/EfiLdrImage/GNUmakefile b/BaseTools/Source/C/EfiLdrImage/GNUmakefile index e33b97866c..99f786f370 100644 --- a/BaseTools/Source/C/EfiLdrImage/GNUmakefile +++ b/BaseTools/Source/C/EfiLdrImage/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'EfiLdrImage' module build. +# GNU/Linux makefile for 'EfiLdrImage' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/EfiRom/GNUmakefile b/BaseTools/Source/C/EfiRom/GNUmakefile index eb76913713..433c126cf2 100644 --- a/BaseTools/Source/C/EfiRom/GNUmakefile +++ b/BaseTools/Source/C/EfiRom/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'EfiRom' module build. +# GNU/Linux makefile for 'EfiRom' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile index e0dde3e085..ae07509496 100644 --- a/BaseTools/Source/C/GNUmakefile +++ b/BaseTools/Source/C/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# GNU Make makefile for C tools build. +# GNU/Linux makefile for C tools build. # # Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.
# diff --git a/BaseTools/Source/C/GenBootSector/GenBootSector.c b/BaseTools/Source/C/GenBootSector/GenBootSector.c index 169d81e031..f102ee139a 100644 --- a/BaseTools/Source/C/GenBootSector/GenBootSector.c +++ b/BaseTools/Source/C/GenBootSector/GenBootSector.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -542,8 +542,7 @@ Returns: --*/ { - printf ("%s v%d.%d %s -Utility to retrieve and update the boot sector or MBR.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION); - printf ("Copyright (c) 2009 - 2010 Intel Corporation. All rights reserved.\n"); + printf ("%s Version %d.%d Build%s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION); } VOID @@ -551,18 +550,27 @@ PrintUsage ( void ) { - Version(); - printf ("\nUsage: \n\ - GenBootSector\n\ - [-l, --list list disks]\n\ - [-i, --input Filename]\n\ - [-o, --output Filename]\n\ - [-m, --mbr process the MBR also]\n\ - [-v, --verbose]\n\ - [--version]\n\ - [-q, --quiet disable all messages except fatal errors]\n\ - [-d, --debug[#]\n\ - [-h, --help]\n"); + printf ("Usage: GenBootSector [options] --cfg-file CFG_FILE\n\n\ +Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.\n\n\ + Utility to retrieve and update the boot sector or MBR.\n\n\ +optional arguments:\n\ + -h, --help Show this help message and exit\n\ + --version Show program's version number and exit\n\ + -d [DEBUG], --debug [DEBUG]\n\ + Output DEBUG statements, where DEBUG_LEVEL is 0 (min)\n\ + - 9 (max)\n\ + -v, --verbose Print informational statements\n\ + -q, --quiet Returns the exit code, error messages will be\n\ + displayed\n\ + -s, --silent Returns only the exit code; informational and error\n\ + messages are not displayed\n\ + -l, --list List disk drives\n\ + -i INPUT_FILENAME, --input INPUT_FILENAME\n\ + Input file name\n\ + -o OUTPUT_FILENAME, --output OUTPUT_FILENAME\n\ + Output file name\n\ + -m, --mbr Also process the MBR\n\ + --sfo Reserved for future use\n"); } diff --git a/BaseTools/Source/C/GenCrc32/GNUmakefile b/BaseTools/Source/C/GenCrc32/GNUmakefile index 4f055c9b4e..15b4dad4b5 100644 --- a/BaseTools/Source/C/GenCrc32/GNUmakefile +++ b/BaseTools/Source/C/GenCrc32/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'GenCrc32' module build. +# GNU/Linux makefile for 'GenCrc32' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/GenCrc32/GenCrc32.c b/BaseTools/Source/C/GenCrc32/GenCrc32.c index 681fe4f1e6..8ece9a8412 100644 --- a/BaseTools/Source/C/GenCrc32/GenCrc32.c +++ b/BaseTools/Source/C/GenCrc32/GenCrc32.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -55,7 +55,7 @@ Returns: --*/ { - fprintf (stdout, "%s Version %d.%d %s \n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION); + fprintf (stdout, "%s Version %d.%d Build %s \n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION); } VOID @@ -81,26 +81,32 @@ Returns: // // Summary usage // - fprintf (stdout, "\nUsage: %s -e|-d [options] \n\n", UTILITY_NAME); + fprintf (stdout, "Usage: GenCrc32 -e|-d [options] \n\n"); // // Copyright declaration // - fprintf (stdout, "Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.\n\n"); + fprintf (stdout, "Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.\n\n"); // // Details Option // - fprintf (stdout, "Options:\n"); - fprintf (stdout, " -o FileName, --output FileName\n\ - File will be created to store the ouput content.\n"); - fprintf (stdout, " -e, --encode Calculate CRC32 value for the input file.\n"); - fprintf (stdout, " -d, --decode Verify CRC32 value for the input file.\n"); - fprintf (stdout, " -v, --verbose Turn on verbose output with informational messages.\n"); - fprintf (stdout, " -q, --quiet Disable all messages except key message and fatal error\n"); - fprintf (stdout, " --debug level Enable debug messages, at input debug level.\n"); - fprintf (stdout, " --version Show program's version number and exit.\n"); - fprintf (stdout, " -h, --help Show this help message and exit.\n"); + fprintf (stdout, "optional arguments:\n"); + fprintf (stdout, " -h, --help Show this help message and exit\n"); + fprintf (stdout, " --version Show program's version number and exit\n"); + fprintf (stdout, " --debug [DEBUG] Output DEBUG statements, where DEBUG_LEVEL is 0 (min)\n\ + - 9 (max)\n"); + fprintf (stdout, " -v, --verbose Print informational statements\n"); + fprintf (stdout, " -q, --quiet Returns the exit code, error messages will be\n\ + displayed\n"); + fprintf (stdout, " -s, --silent Returns only the exit code; informational and error\n\ + messages are not displayed\n"); + fprintf (stdout, " -e, --encode Calculate CRC32 value for the input file\n"); + fprintf (stdout, " -d, --decode Verify CRC32 value for the input file\n"); + fprintf (stdout, " -o OUTPUT_FILENAME, --output OUTPUT_FILENAME\n\ + Output file name\n"); + fprintf (stdout, " --sfo Reserved for future use\n"); + } int @@ -164,7 +170,6 @@ Returns: argv ++; if ((stricmp (argv[0], "-h") == 0) || (stricmp (argv[0], "--help") == 0)) { - Version (); Usage (); return STATUS_SUCCESS; } diff --git a/BaseTools/Source/C/GenFfs/GNUmakefile b/BaseTools/Source/C/GenFfs/GNUmakefile index 2dc4159744..04f5bb83f9 100644 --- a/BaseTools/Source/C/GenFfs/GNUmakefile +++ b/BaseTools/Source/C/GenFfs/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'GenFfs' module build. +# GNU/Linux makefile for 'GenFfs' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/GenFv/GNUmakefile b/BaseTools/Source/C/GenFv/GNUmakefile index 6ecf4bcca6..58ad16ce61 100644 --- a/BaseTools/Source/C/GenFv/GNUmakefile +++ b/BaseTools/Source/C/GenFv/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'GenFv' module build. +# GNU/Linux makefile for 'GenFv' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index c01e504cbe..dd0e9ec3be 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -1,6 +1,7 @@ /** @file Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
+Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -1580,6 +1581,11 @@ Returns: // Since the ARM reset vector is in the FV Header you really don't need a // Volume Top File, but if you have one for some reason don't crash... // + } else if (MachineType == EFI_IMAGE_MACHINE_AARCH64) { + // + // Since the AArch64 reset vector is in the FV Header you really don't need a + // Volume Top File, but if you have one for some reason don't crash... + // } else { Error (NULL, 0, 3000, "Invalid", "machine type=0x%X in PEI core.", MachineType); return EFI_ABORTED; @@ -1617,9 +1623,11 @@ Routine Description: This parses the FV looking for SEC and patches that address into the beginning of the FV header. - For ARM the reset vector is at 0x00000000 or 0xFFFF0000. + For ARM32 the reset vector is at 0x00000000 or 0xFFFF0000. + For AArch64 the reset vector is at 0x00000000. + This would commonly map to the first entry in the ROM. - ARM Exceptions: + ARM32 Exceptions: Reset +0 Undefined +4 SWI +8 @@ -1633,11 +1641,10 @@ Routine Description: 2) Reset vector is data bytes FDF file and that code branches to reset vector in the beginning of the FV (fixed size offset). - Need to have the jump for the reset vector at location zero. We also need to store the address or PEI (if it exists). We stub out a return from interrupt in case the debugger - is using SWI. + is using SWI (not done for AArch64, not enough space in struct). The optional entry to the common exception handler is to support full featured exception handling from ROM and is currently not support by this tool. @@ -1664,10 +1671,14 @@ Returns: UINT16 MachineType; EFI_PHYSICAL_ADDRESS PeiCorePhysicalAddress; EFI_PHYSICAL_ADDRESS SecCorePhysicalAddress; - INT32 ResetVector[4]; // 0 - is branch relative to SEC entry point + INT32 ResetVector[4]; // ARM32: + // 0 - is branch relative to SEC entry point // 1 - PEI Entry Point // 2 - movs pc,lr for a SWI handler // 3 - Place holder for Common Exception Handler + // AArch64: Used as UINT64 ResetVector[2] + // 0 - is branch relative to SEC entry point + // 1 - PEI Entry Point // // Verify input parameters @@ -1727,7 +1738,7 @@ Returns: PeiCorePhysicalAddress += EntryPoint; DebugMsg (NULL, 0, 9, "PeiCore physical entry point address", "Address = 0x%llX", (unsigned long long) PeiCorePhysicalAddress); - if (MachineType == EFI_IMAGE_MACHINE_ARMT) { + if (MachineType == EFI_IMAGE_MACHINE_ARMT || MachineType == EFI_IMAGE_MACHINE_AARCH64) { memset (ResetVector, 0, sizeof (ResetVector)); // Address of PEI Core, if we have one ResetVector[1] = (UINT32)PeiCorePhysicalAddress; @@ -1767,7 +1778,7 @@ Returns: return EFI_ABORTED; } - if (MachineType != EFI_IMAGE_MACHINE_ARMT) { + if ((MachineType != EFI_IMAGE_MACHINE_ARMT) && (MachineType != EFI_IMAGE_MACHINE_AARCH64)) { // // If SEC is not ARM we have nothing to do // @@ -1821,31 +1832,60 @@ Returns: DebugMsg (NULL, 0, 9, "PeiCore physical entry point address", "Address = 0x%llX", (unsigned long long) PeiCorePhysicalAddress); } + if (MachineType == EFI_IMAGE_MACHINE_ARMT) { + // B SecEntryPoint - signed_immed_24 part +/-32MB offset + // on ARM, the PC is always 8 ahead, so we're not really jumping from the base address, but from base address + 8 + ResetVector[0] = (INT32)(SecCorePhysicalAddress - FvInfo->BaseAddress - 8) >> 2; + + if (ResetVector[0] > 0x00FFFFFF) { + Error (NULL, 0, 3000, "Invalid", "SEC Entry point must be within 32MB of the start of the FV"); + return EFI_ABORTED; + } - // B SecEntryPoint - signed_immed_24 part +/-32MB offset - // on ARM, the PC is always 8 ahead, so we're not really jumping from the base address, but from base address + 8 - ResetVector[0] = (INT32)(SecCorePhysicalAddress - FvInfo->BaseAddress - 8) >> 2; - - if (ResetVector[0] > 0x00FFFFFF) { - Error (NULL, 0, 3000, "Invalid", "SEC Entry point must be within 32MB of the start of the FV"); - return EFI_ABORTED; - } - - // Add opcode for an uncondional branch with no link. AKA B SecEntryPoint - ResetVector[0] |= 0xEB000000; + // Add opcode for an uncondional branch with no link. AKA B SecEntryPoint + ResetVector[0] |= 0xEB000000; - // Address of PEI Core, if we have one - ResetVector[1] = (UINT32)PeiCorePhysicalAddress; + // Address of PEI Core, if we have one + ResetVector[1] = (UINT32)PeiCorePhysicalAddress; - // SWI handler movs pc,lr. Just in case a debugger uses SWI - ResetVector[2] = 0xE1B0F07E; + // 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 - // 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; + // 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 + // 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; + } else if (MachineType == EFI_IMAGE_MACHINE_AARCH64) { + + /* NOTE: + 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 + 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. + */ + + ((UINT64*)ResetVector)[0] = (UINT64)(SecCorePhysicalAddress - FvInfo->BaseAddress) >> 2; + + // B SecEntryPoint - signed_immed_26 part +/-128MB offset + if ( ((UINT64*)ResetVector)[0] > 0x03FFFFFF) { + 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. AKA B SecEntryPoint + ((UINT64*)ResetVector)[0] |= 0x14000000; + + // Address of PEI Core, if we have one + ((UINT64*)ResetVector)[1] = (UINT64)PeiCorePhysicalAddress; + + } else { + Error (NULL, 0, 3000, "Invalid", "Unknown ARM machine type"); + return EFI_ABORTED; + } // // Copy to the beginning of the FV @@ -1948,8 +1988,8 @@ Returns: // // Verify machine type is supported // - if (*MachineType != EFI_IMAGE_MACHINE_IA32 && *MachineType != EFI_IMAGE_MACHINE_IA64 && *MachineType != EFI_IMAGE_MACHINE_X64 && *MachineType != EFI_IMAGE_MACHINE_EBC && - *MachineType != EFI_IMAGE_MACHINE_ARMT) { + if ((*MachineType != EFI_IMAGE_MACHINE_IA32) && (*MachineType != EFI_IMAGE_MACHINE_IA64) && (*MachineType != EFI_IMAGE_MACHINE_X64) && (*MachineType != EFI_IMAGE_MACHINE_EBC) && + (*MachineType != EFI_IMAGE_MACHINE_ARMT) && (*MachineType != EFI_IMAGE_MACHINE_AARCH64)) { Error (NULL, 0, 3000, "Invalid", "Unrecognized machine type in the PE32 file."); return EFI_UNSUPPORTED; } @@ -2895,7 +2935,8 @@ Returns: return Status; } - if (ImageContext.Machine == EFI_IMAGE_MACHINE_ARMT) { + if ( (ImageContext.Machine == EFI_IMAGE_MACHINE_ARMT) || + (ImageContext.Machine == EFI_IMAGE_MACHINE_AARCH64) ) { mArm = TRUE; } @@ -3163,7 +3204,8 @@ Returns: return Status; } - if (ImageContext.Machine == EFI_IMAGE_MACHINE_ARMT) { + if ( (ImageContext.Machine == EFI_IMAGE_MACHINE_ARMT) || + (ImageContext.Machine == EFI_IMAGE_MACHINE_AARCH64) ) { mArm = TRUE; } diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c index e7c5d4997a..72d6cd16d7 100644 --- a/BaseTools/Source/C/GenFw/Elf64Convert.c +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c @@ -1,6 +1,7 @@ /** @file Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
+Portions copyright (c) 2013, ARM Ltd. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this @@ -146,8 +147,8 @@ InitializeElf64 ( Error (NULL, 0, 3000, "Unsupported", "ELF e_type not ET_EXEC or ET_DYN"); return FALSE; } - if (!((mEhdr->e_machine == EM_X86_64))) { - Error (NULL, 0, 3000, "Unsupported", "ELF e_machine not EM_X86_64"); + if (!((mEhdr->e_machine == EM_X86_64) || (mEhdr->e_machine == EM_AARCH64))) { + Error (NULL, 0, 3000, "Unsupported", "ELF e_machine not EM_X86_64 or EM_AARCH64"); return FALSE; } if (mEhdr->e_version != EV_CURRENT) { @@ -269,6 +270,7 @@ ScanSections64 ( switch (mEhdr->e_machine) { case EM_X86_64: case EM_IA_64: + case EM_AARCH64: mCoffOffset += sizeof (EFI_IMAGE_NT_HEADERS64); break; default: @@ -412,6 +414,10 @@ ScanSections64 ( NtHdr->Pe32Plus.FileHeader.Machine = EFI_IMAGE_MACHINE_IPF; NtHdr->Pe32Plus.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC; break; + case EM_AARCH64: + NtHdr->Pe32Plus.FileHeader.Machine = EFI_IMAGE_MACHINE_AARCH64; + NtHdr->Pe32Plus.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC; + break; default: VerboseMsg ("%s unknown e_machine type. Assume X64", (UINTN)mEhdr->e_machine); NtHdr->Pe32Plus.FileHeader.Machine = EFI_IMAGE_MACHINE_X64; @@ -542,22 +548,55 @@ WriteSections64 ( // VerboseMsg ("Applying Relocations..."); for (Idx = 0; Idx < mEhdr->e_shnum; Idx++) { + // + // Determine if this is a relocation section. + // Elf_Shdr *RelShdr = GetShdrByIndex(Idx); if ((RelShdr->sh_type != SHT_REL) && (RelShdr->sh_type != SHT_RELA)) { continue; } + + // + // Relocation section found. Now extract section information that the relocations + // apply to in the ELF data and the new COFF data. + // SecShdr = GetShdrByIndex(RelShdr->sh_info); SecOffset = mCoffSectionsOffset[RelShdr->sh_info]; + + // + // Only process relocations for the current filter type. + // if (RelShdr->sh_type == SHT_RELA && (*Filter)(SecShdr)) { UINT64 RelIdx; + + // + // Determine the symbol table referenced by the relocation data. + // Elf_Shdr *SymtabShdr = GetShdrByIndex(RelShdr->sh_link); UINT8 *Symtab = (UINT8*)mEhdr + SymtabShdr->sh_offset; + + // + // Process all relocation entries for this section. + // for (RelIdx = 0; RelIdx < RelShdr->sh_size; RelIdx += (UINT32) RelShdr->sh_entsize) { + + // + // Set pointer to relocation entry + // Elf_Rela *Rel = (Elf_Rela *)((UINT8*)mEhdr + RelShdr->sh_offset + RelIdx); + + // + // Set pointer to symbol table entry associated with the relocation entry. + // Elf_Sym *Sym = (Elf_Sym *)(Symtab + ELF_R_SYM(Rel->r_info) * SymtabShdr->sh_entsize); + Elf_Shdr *SymShdr; UINT8 *Targ; + // + // Check section header index found in symbol table and get the section + // header location. + // if (Sym->st_shndx == SHN_UNDEF || Sym->st_shndx == SHN_ABS || Sym->st_shndx > mEhdr->e_shnum) { @@ -566,11 +605,20 @@ WriteSections64 ( SymShdr = GetShdrByIndex(Sym->st_shndx); // - // Note: r_offset in a memory address. - // Convert it to a pointer in the coff file. + // Convert the relocation data to a pointer into the coff file. + // + // Note: + // r_offset is the virtual address of the storage unit to be relocated. + // sh_addr is the virtual address for the base of the section. + // + // r_offset in a memory address. + // Convert it to a pointer in the coff file. // Targ = mCoffFile + SecOffset + (Rel->r_offset - SecShdr->sh_addr); + // + // Determine how to handle each relocation type based on the machine type. + // if (mEhdr->e_machine == EM_X86_64) { switch (ELF_R_TYPE(Rel->r_info)) { case R_X86_64_NONE: @@ -618,8 +666,51 @@ WriteSections64 ( default: Error (NULL, 0, 3000, "Invalid", "%s unsupported ELF EM_X86_64 relocation 0x%x.", mInImageName, (unsigned) ELF_R_TYPE(Rel->r_info)); } + } else if (mEhdr->e_machine == EM_AARCH64) { + + // AARCH64 GCC uses RELA relocation, so all relocations have to be fixed up. + // As opposed to ARM32 using REL. + + switch (ELF_R_TYPE(Rel->r_info)) { + + case R_AARCH64_LD_PREL_LO19: + if (Rel->r_addend != 0 ) { /* TODO */ + Error (NULL, 0, 3000, "Invalid", "AArch64: R_AARCH64_LD_PREL_LO19 Need to fixup with addend!."); + } + break; + + case R_AARCH64_CALL26: + if (Rel->r_addend != 0 ) { /* TODO */ + Error (NULL, 0, 3000, "Invalid", "AArch64: R_AARCH64_CALL26 Need to fixup with addend!."); + } + break; + + case R_AARCH64_JUMP26: + if (Rel->r_addend != 0 ) { /* TODO : AArch64 '-O2' optimisation. */ + Error (NULL, 0, 3000, "Invalid", "AArch64: R_AARCH64_JUMP26 Need to fixup with addend!."); + } + break; + + case R_AARCH64_ADR_PREL_PG_HI21: + // TODO : AArch64 'small' memory model. + Error (NULL, 0, 3000, "Invalid", "WriteSections64(): %s unsupported ELF EM_AARCH64 relocation R_AARCH64_ADR_PREL_PG_HI21.", mInImageName); + break; + + case R_AARCH64_ADD_ABS_LO12_NC: + // TODO : AArch64 'small' memory model. + Error (NULL, 0, 3000, "Invalid", "WriteSections64(): %s unsupported ELF EM_AARCH64 relocation R_AARCH64_ADD_ABS_LO12_NC.", mInImageName); + break; + + // Absolute relocations. + case R_AARCH64_ABS64: + *(UINT64 *)Targ = *(UINT64 *)Targ - SymShdr->sh_addr + mCoffSectionsOffset[Sym->st_shndx]; + break; + + default: + Error (NULL, 0, 3000, "Invalid", "WriteSections64(): %s unsupported ELF EM_AARCH64 relocation 0x%x.", mInImageName, (unsigned) ELF_R_TYPE(Rel->r_info)); + } } else { - Error (NULL, 0, 3000, "Invalid", "Not EM_X86_X64"); + Error (NULL, 0, 3000, "Invalid", "Not a supported machine type"); } } } @@ -673,6 +764,45 @@ WriteRelocations64 ( default: Error (NULL, 0, 3000, "Invalid", "%s unsupported ELF EM_X86_64 relocation 0x%x.", mInImageName, (unsigned) ELF_R_TYPE(Rel->r_info)); } + } else if (mEhdr->e_machine == EM_AARCH64) { + // AArch64 GCC uses RELA relocation, so all relocations has to be fixed up. ARM32 uses REL. + switch (ELF_R_TYPE(Rel->r_info)) { + case R_AARCH64_LD_PREL_LO19: + break; + + case R_AARCH64_CALL26: + break; + + case R_AARCH64_JUMP26: + break; + + case R_AARCH64_ADR_PREL_PG_HI21: + // TODO : AArch64 'small' memory model. + Error (NULL, 0, 3000, "Invalid", "WriteRelocations64(): %s unsupported ELF EM_AARCH64 relocation R_AARCH64_ADR_PREL_PG_HI21.", mInImageName); + break; + + case R_AARCH64_ADD_ABS_LO12_NC: + // TODO : AArch64 'small' memory model. + Error (NULL, 0, 3000, "Invalid", "WriteRelocations64(): %s unsupported ELF EM_AARCH64 relocation R_AARCH64_ADD_ABS_LO12_NC.", mInImageName); + break; + + case R_AARCH64_ABS64: + CoffAddFixup( + (UINT32) ((UINT64) mCoffSectionsOffset[RelShdr->sh_info] + + (Rel->r_offset - SecShdr->sh_addr)), + EFI_IMAGE_REL_BASED_DIR64); + break; + + case R_AARCH64_ABS32: + CoffAddFixup( + (UINT32) ((UINT64) mCoffSectionsOffset[RelShdr->sh_info] + + (Rel->r_offset - SecShdr->sh_addr)), + EFI_IMAGE_REL_BASED_HIGHLOW); + break; + + default: + Error (NULL, 0, 3000, "Invalid", "WriteRelocations64(): %s unsupported ELF EM_AARCH64 relocation 0x%x.", mInImageName, (unsigned) ELF_R_TYPE(Rel->r_info)); + } } else { Error (NULL, 0, 3000, "Not Supported", "This tool does not support relocations for ELF with e_machine %u (processor type).", (unsigned) mEhdr->e_machine); } diff --git a/BaseTools/Source/C/GenFw/GNUmakefile b/BaseTools/Source/C/GenFw/GNUmakefile index 2a0f058b86..ec5b87265f 100644 --- a/BaseTools/Source/C/GenFw/GNUmakefile +++ b/BaseTools/Source/C/GenFw/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'GenFw' module build. +# GNU/Linux makefile for 'GenFw' module build. # # Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/GenFw/elf_common.h b/BaseTools/Source/C/GenFw/elf_common.h index 9618d48524..df22472dc2 100644 --- a/BaseTools/Source/C/GenFw/elf_common.h +++ b/BaseTools/Source/C/GenFw/elf_common.h @@ -2,6 +2,7 @@ Ported ELF include files from FreeBSD Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.
+Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -183,6 +184,7 @@ typedef struct { #define EM_TINYJ 61 /* Advanced Logic Corp. TinyJ processor. */ #define EM_X86_64 62 /* Advanced Micro Devices x86-64 */ #define EM_AMD64 EM_X86_64 /* Advanced Micro Devices x86-64 (compat) */ +#define EM_AARCH64 183 /* ARM 64bit Architecture */ /* Non-standard or deprecated. */ #define EM_486 6 /* Intel i486. */ @@ -543,6 +545,135 @@ typedef struct { #define R_386_TLS_DTPOFF32 36 /* GOT entry containing TLS offset */ #define R_386_TLS_TPOFF32 37 /* GOT entry of -ve static TLS offset */ +/* Null relocation */ +#define R_AARCH64_NONE 256 /* No relocation */ +/* Static AArch64 relocations */ + /* Static data relocations */ +#define R_AARCH64_ABS64 257 /* S + A */ +#define R_AARCH64_ABS32 258 /* S + A */ +#define R_AARCH64_ABS16 259 /* S + A */ +#define R_AARCH64_PREL64 260 /* S + A - P */ +#define R_AARCH64_PREL32 261 /* S + A - P */ +#define R_AARCH64_PREL16 262 /* S + A - P */ + /* Group relocations to create a 16, 32, 48, or 64 bit unsigned data value or address inline */ +#define R_AARCH64_MOVW_UABS_G0 263 /* S + A */ +#define R_AARCH64_MOVW_UABS_G0_NC 264 /* S + A */ +#define R_AARCH64_MOVW_UABS_G1 265 /* S + A */ +#define R_AARCH64_MOVW_UABS_G1_NC 266 /* S + A */ +#define R_AARCH64_MOVW_UABS_G2 267 /* S + A */ +#define R_AARCH64_MOVW_UABS_G2_NC 268 /* S + A */ +#define R_AARCH64_MOVW_UABS_G3 269 /* S + A */ + /* Group relocations to create a 16, 32, 48, or 64 bit signed data or offset value inline */ +#define R_AARCH64_MOVW_SABS_G0 270 /* S + A */ +#define R_AARCH64_MOVW_SABS_G1 271 /* S + A */ +#define R_AARCH64_MOVW_SABS_G2 272 /* S + A */ + /* Relocations to generate 19, 21 and 33 bit PC-relative addresses */ +#define R_AARCH64_LD_PREL_LO19 273 /* S + A - P */ +#define R_AARCH64_ADR_PREL_LO21 274 /* S + A - P */ +#define R_AARCH64_ADR_PREL_PG_HI21 275 /* Page(S+A) - Page(P) */ +#define R_AARCH64_ADR_PREL_PG_HI21_NC 276 /* Page(S+A) - Page(P) */ +#define R_AARCH64_ADD_ABS_LO12_NC 277 /* S + A */ +#define R_AARCH64_LDST8_ABS_LO12_NC 278 /* S + A */ +#define R_AARCH64_LDST16_ABS_LO12_NC 284 /* S + A */ +#define R_AARCH64_LDST32_ABS_LO12_NC 285 /* S + A */ +#define R_AARCH64_LDST64_ABS_LO12_NC 286 /* S + A */ +#define R_AARCH64_LDST128_ABS_LO12_NC 299 /* S + A */ + /* Relocations for control-flow instructions - all offsets are a multiple of 4 */ +#define R_AARCH64_TSTBR14 279 /* S+A-P */ +#define R_AARCH64_CONDBR19 280 /* S+A-P */ +#define R_AARCH64_JUMP26 282 /* S+A-P */ +#define R_AARCH64_CALL26 283 /* S+A-P */ + /* Group relocations to create a 16, 32, 48, or 64 bit PC-relative offset inline */ +#define R_AARCH64_MOVW_PREL_G0 287 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G0_NC 288 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G1 289 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G1_NC 290 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G2 291 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G2_NC 292 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G3 293 /* S+A-P */ + /* Group relocations to create a 16, 32, 48, or 64 bit GOT-relative offsets inline */ +#define R_AARCH64_MOVW_GOTOFF_G0 300 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G0_NC 301 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G1 302 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G1_NC 303 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G2 304 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G2_NC 305 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G3 306 /* G(S)-GOT */ + /* GOT-relative data relocations */ +#define R_AARCH64_GOTREL64 307 /* S+A-GOT */ +#define R_AARCH64_GOTREL32 308 /* S+A-GOT */ + /* GOT-relative instruction relocations */ +#define R_AARCH64_GOT_LD_PREL19 309 /* G(S)-P */ +#define R_AARCH64_LD64_GOTOFF_LO15 310 /* G(S)-GOT */ +#define R_AARCH64_ADR_GOT_PAGE 311 /* Page(G(S))-Page(P) */ +#define R_AARCH64_LD64_GOT_LO12_NC 312 /* G(S) */ +#define R_AARCH64_LD64_GOTPAGE_LO15 313 /* G(S)-Page(GOT) */ +/* Relocations for thread-local storage */ + /* General Dynamic TLS relocations */ +#define R_AARCH64_TLSGD_ADR_PREL21 512 /* G(TLSIDX(S+A)) - P */ +#define R_AARCH64_TLSGD_ADR_PAGE21 513 /* Page(G(TLSIDX(S+A))) - Page(P) */ +#define R_AARCH64_TLSGD_ADD_LO12_NC 514 /* G(TLSIDX(S+A)) */ +#define R_AARCH64_TLSGD_MOVW_G1 515 /* G(TLSIDX(S+A)) - GOT */ +#define R_AARCH64_TLSGD_MOVW_G0_NC 516 /* G(TLSIDX(S+A)) - GOT */ + /* Local Dynamic TLS relocations */ +#define R_AARCH64_TLSLD_ADR_PREL21 517 /* G(LDM(S))) - P */ +#define R_AARCH64_TLSLD_ADR_PAGE21 518 /* Page(G(LDM(S)))-Page(P) */ +#define R_AARCH64_TLSLD_ADD_LO12_NC 519 /* G(LDM(S)) */ +#define R_AARCH64_TLSLD_MOVW_G1 520 /* G(LDM(S)) - GOT */ +#define R_AARCH64_TLSLD_MOVW_G0_NC 521 /* G(LDM(S)) - GOT */ +#define R_AARCH64_TLSLD_LD_PREL19 522 /* G(LDM(S)) - P */ +#define R_AARCH64_TLSLD_MOVW_DTPREL_G2 523 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_MOVW_DTPREL_G1 524 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC 525 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_MOVW_DTPREL_G0 526 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC 527 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_ADD_DTPREL_HI12 528 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_ADD_DTPREL_LO12 529 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC 530 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12 531 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC 532 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12 533 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC 534 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12 535 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC 536 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12 537 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC 538 /* DTPREL(S+A) */ + /* Initial Exec TLS relocations */ +#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G1 539 /* G(TPREL(S+A)) - GOT */ +#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC 540 /* G(TPREL(S+A)) - GOT */ +#define R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 541 /* Page(G(TPREL(S+A))) - Page(P) */ +#define R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC 542 /* G(TPREL(S+A)) */ +#define R_AARCH64_TLSIE_LD_GOTTPREL_PREL19 543 /* G(TPREL(S+A)) - P */ + /* Local Exec TLS relocations */ +#define R_AARCH64_TLSLE_MOVW_TPREL_G2 544 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_MOVW_TPREL_G1 545 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_MOVW_TPREL_G1_NC 546 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_MOVW_TPREL_G0 547 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_MOVW_TPREL_G0_NC 548 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_ADD_TPREL_HI12 549 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_ADD_TPREL_LO12 550 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_ADD_TPREL_LO12_NC 551 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST8_TPREL_LO12 552 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC 553 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST16_TPREL_LO12 554 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC 555 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST32_TPREL_LO12 556 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC 557 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST64_TPREL_LO12 558 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC 559 /* TPREL(S+A) */ +/* Dynamic relocations */ + /* Dynamic relocations */ +#define R_AARCH64_COPY 1024 +#define R_AARCH64_GLOB_DAT 1025 /* S + A */ +#define R_AARCH64_JUMP_SLOT 1026 /* S + A */ +#define R_AARCH64_RELATIVE 1027 /* Delta(S) + A , Delta(P) + A */ +#define R_AARCH64_TLS_DTPREL64 1028 /* DTPREL(S+A) */ +#define R_AARCH64_TLS_DTPMOD64 1029 /* LDM(S) */ +#define R_AARCH64_TLS_TPREL64 1030 /* TPREL(S+A) */ +#define R_AARCH64_TLS_DTPREL32 1031 /* DTPREL(S+A) */ +#define R_AARCH64_TLS_DTPMOD32 1032 /* LDM(S) */ +#define R_AARCH64_TLS_TPREL32 1033 /* DTPREL(S+A) */ + #define R_ALPHA_NONE 0 /* No reloc */ #define R_ALPHA_REFLONG 1 /* Direct 32 bit */ #define R_ALPHA_REFQUAD 2 /* Direct 64 bit */ diff --git a/BaseTools/Source/C/GenPage/GNUmakefile b/BaseTools/Source/C/GenPage/GNUmakefile index 11ee115622..e1eab8747c 100644 --- a/BaseTools/Source/C/GenPage/GNUmakefile +++ b/BaseTools/Source/C/GenPage/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'GenPage' module build. +# GNU/Linux makefile for 'GenPage' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/GenPage/GenPage.c b/BaseTools/Source/C/GenPage/GenPage.c index 6c24a2f9ec..78047ba9be 100644 --- a/BaseTools/Source/C/GenPage/GenPage.c +++ b/BaseTools/Source/C/GenPage/GenPage.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -91,8 +91,7 @@ Returns: --*/ { - printf ("%s v%d.%d %s -Utility to generate the EfiLoader image containing page table.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION); - printf ("Copyright (c) 2008 - 2011 Intel Corporation. All rights reserved.\n"); + printf ("%s Version %d.%d Build %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION); } VOID @@ -100,25 +99,29 @@ Usage ( void ) { - Version(); - printf ("\nUsage: \n\ - GenPage\n\ - -o, --output Filename\n\ - The file that contains both non-page table part and\n\ - page table\n\ - [-b, --baseaddr baseaddress]\n\ + printf ("Usage: GenPage.exe [options] EfiLoaderImageName \n\n\ +Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.\n\n\ + Utility to generate the EfiLoader image containing a page table.\n\n\ +optional arguments:\n\ + -h, --help Show this help message and exit\n\ + --version Show program's version number and exit\n\ + -d [DEBUG], --debug [DEBUG]\n\ + Output DEBUG statements, where DEBUG_LEVEL is 0 (min)\n\ + - 9 (max)\n\ + -v, --verbose Print informational statements\n\ + -q, --quiet Returns the exit code, error messages will be\n\ + displayed\n\ + -s, --silent Returns only the exit code; informational and error\n\ + messages are not displayed\n\ + -o OUTPUT_FILENAME, --output OUTPUT_FILENAME\n\ + Output file contain both the non-page table part and\n\ + the page table\n\ + -b BASE_ADDRESS, --baseaddr BASE_ADDRESS\n\ The page table location\n\ - [-f, --offset offset]\n\ + -f OFFSET, --offset OFFSET\n\ The position that the page table will appear in the\n\ output file\n\ - [-v, --verbose] Turn on verbose output with informational messages\n\ - printed\n\ - [--version] Print version and copyright of this program and exit\n\ - [-q, --quiet] Disable all messages except unrecoverable errors\n\ - [-d, --debug[#]] Enable debug messages, at level #\n\ - [-h, --help] Print copyright, version and usage of this program\n\ - and exit\n\ - EfiLoaderImageName\n"); + --sfo Reserved for future use\n"); } diff --git a/BaseTools/Source/C/GenSec/GNUmakefile b/BaseTools/Source/C/GenSec/GNUmakefile index d41e9dc9a7..c2d289cd20 100644 --- a/BaseTools/Source/C/GenSec/GNUmakefile +++ b/BaseTools/Source/C/GenSec/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'GenSec' module build. +# GNU/Linux makefile for 'GenSec' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/GenVtf/GNUmakefile b/BaseTools/Source/C/GenVtf/GNUmakefile index 7ff752bf11..ff6599f1c9 100644 --- a/BaseTools/Source/C/GenVtf/GNUmakefile +++ b/BaseTools/Source/C/GenVtf/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'GenVtf' module build. +# GNU/Linux makefile for 'GenVtf' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/GnuGenBootSector/GNUmakefile b/BaseTools/Source/C/GnuGenBootSector/GNUmakefile index f9888704f9..e9d32f8195 100644 --- a/BaseTools/Source/C/GnuGenBootSector/GNUmakefile +++ b/BaseTools/Source/C/GnuGenBootSector/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'GnuGenBootSector' module build. +# GNU/Linux makefile for 'GnuGenBootSector' module build. # # Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/Include/AArch64/ProcessorBind.h b/BaseTools/Source/C/Include/AArch64/ProcessorBind.h new file mode 100644 index 0000000000..4d184c4c41 --- /dev/null +++ b/BaseTools/Source/C/Include/AArch64/ProcessorBind.h @@ -0,0 +1,159 @@ +/** @file + Processor or Compiler specific defines and types for AArch64. + + Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+ Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
+ Portions copyright (c) 2013, ARM Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#ifndef __PROCESSOR_BIND_H__ +#define __PROCESSOR_BIND_H__ + +/// +/// Define the processor type so other code can make processor based choices +/// +#define MDE_CPU_AARCH64 + +// +// Make sure we are using the correct packing rules per EFI specification +// +#ifndef __GNUC__ +#pragma pack() +#endif + +#if _MSC_EXTENSIONS + // + // use Microsoft* C complier dependent integer width types + // + typedef unsigned __int64 UINT64; + typedef __int64 INT64; + typedef unsigned __int32 UINT32; + typedef __int32 INT32; + typedef unsigned short UINT16; + typedef unsigned short CHAR16; + typedef short INT16; + typedef unsigned char BOOLEAN; + typedef unsigned char UINT8; + typedef char CHAR8; + typedef signed char INT8; +#else + // + // Assume standard AARCH64 alignment. + // + typedef unsigned long long UINT64; + typedef long long INT64; + typedef unsigned int UINT32; + typedef int INT32; + typedef unsigned short UINT16; + typedef unsigned short CHAR16; + typedef short INT16; + typedef unsigned char BOOLEAN; + typedef unsigned char UINT8; + typedef char CHAR8; + typedef signed char INT8; + + #define UINT8_MAX 0xff +#endif + +/// +/// Unsigned value of native width. (4 bytes on supported 32-bit processor instructions, +/// 8 bytes on supported 64-bit processor instructions) +/// +typedef UINT64 UINTN; + +/// +/// Signed value of native width. (4 bytes on supported 32-bit processor instructions, +/// 8 bytes on supported 64-bit processor instructions) +/// +typedef INT64 INTN; + +// +// Processor specific defines +// + +/// +/// A value of native width with the highest bit set. +/// +#define MAX_BIT 0x8000000000000000 + +/// +/// A value of native width with the two highest bits set. +/// +#define MAX_2_BITS 0xC000000000000000 + +/// +/// Maximum legal AARCH64 address +/// +#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFF + +/// +/// The stack alignment required for AARCH64 +/// +#define CPU_STACK_ALIGNMENT 16 + +// +// 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 their member functions with EFIAPI. +// +#define EFIAPI + +#if defined(__GNUC__) + /// + /// For GNU assembly code, .global or .globl can declare global symbols. + /// Define this macro to unify the usage. + /// + #define ASM_GLOBAL .globl + + #if !defined(__APPLE__) + /// + /// ARM EABI defines that the linker should not manipulate call relocations + /// (do bl/blx conversion) unless the target symbol has function type. + /// CodeSourcery 2010.09 started requiring the .type to function properly + /// + #define INTERWORK_FUNC(func__) .type ASM_PFX(func__), %function + + #define GCC_ASM_EXPORT(func__) \ + .global _CONCATENATE (__USER_LABEL_PREFIX__, func__) ;\ + .type ASM_PFX(func__), %function + + #define GCC_ASM_IMPORT(func__) \ + .extern _CONCATENATE (__USER_LABEL_PREFIX__, func__) + + #else + // + // .type not supported by Apple Xcode tools + // + #define INTERWORK_FUNC(func__) + + #define GCC_ASM_EXPORT(func__) \ + .globl _CONCATENATE (__USER_LABEL_PREFIX__, func__) \ + + #define GCC_ASM_IMPORT(name) + + #endif +#endif + +/** + Return the pointer to the first instruction of a function given a function pointer. + On ARM CPU architectures, these two pointer values are the same, + so the implementation of this macro is very simple. + + @param FunctionPointer A pointer to a function. + + @return The pointer to the first instruction of a function given a function pointer. + +**/ +#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer) + +#endif + diff --git a/BaseTools/Source/C/Include/Arm/ProcessorBind.h b/BaseTools/Source/C/Include/Arm/ProcessorBind.h new file mode 100644 index 0000000000..1ca26ab6f3 --- /dev/null +++ b/BaseTools/Source/C/Include/Arm/ProcessorBind.h @@ -0,0 +1,158 @@ +/** @file + Processor or Compiler specific defines and types for ARM. + + Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
+ Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#ifndef __PROCESSOR_BIND_H__ +#define __PROCESSOR_BIND_H__ + +/// +/// Define the processor type so other code can make processor based choices +/// +#define MDE_CPU_ARM + +// +// Make sure we are using the correct packing rules per EFI specification +// +#ifndef __GNUC__ +#pragma pack() +#endif + +#if _MSC_EXTENSIONS + // + // use Microsoft* C complier dependent integer width types + // + typedef unsigned __int64 UINT64; + typedef __int64 INT64; + typedef unsigned __int32 UINT32; + typedef __int32 INT32; + typedef unsigned short UINT16; + typedef unsigned short CHAR16; + typedef short INT16; + typedef unsigned char BOOLEAN; + typedef unsigned char UINT8; + typedef char CHAR8; + typedef signed char INT8; +#else + // + // Assume standard ARM alignment. + // + typedef unsigned long long UINT64; + typedef long long INT64; + typedef unsigned int UINT32; + typedef int INT32; + typedef unsigned short UINT16; + typedef unsigned short CHAR16; + typedef short INT16; + typedef unsigned char BOOLEAN; + typedef unsigned char UINT8; + typedef char CHAR8; + typedef signed char INT8; + + #define UINT8_MAX 0xff +#endif + +/// +/// Unsigned value of native width. (4 bytes on supported 32-bit processor instructions, +/// 8 bytes on supported 64-bit processor instructions) +/// +typedef UINT32 UINTN; + +/// +/// Signed value of native width. (4 bytes on supported 32-bit processor instructions, +/// 8 bytes on supported 64-bit processor instructions) +/// +typedef INT32 INTN; + +// +// Processor specific defines +// + +/// +/// A value of native width with the highest bit set. +/// +#define MAX_BIT 0x80000000 + +/// +/// A value of native width with the two highest bits set. +/// +#define MAX_2_BITS 0xC0000000 + +/// +/// Maximum legal ARM address +/// +#define MAX_ADDRESS 0xFFFFFFFF + +/// +/// The stack alignment required for ARM +/// +#define CPU_STACK_ALIGNMENT sizeof(UINT64) + +// +// 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 their member functions with EFIAPI. +// +#define EFIAPI + +#if defined(__GNUC__) + /// + /// For GNU assembly code, .global or .globl can declare global symbols. + /// Define this macro to unify the usage. + /// + #define ASM_GLOBAL .globl + + #if !defined(__APPLE__) + /// + /// ARM EABI defines that the linker should not manipulate call relocations + /// (do bl/blx conversion) unless the target symbol has function type. + /// CodeSourcery 2010.09 started requiring the .type to function properly + /// + #define INTERWORK_FUNC(func__) .type ASM_PFX(func__), %function + + #define GCC_ASM_EXPORT(func__) \ + .global _CONCATENATE (__USER_LABEL_PREFIX__, func__) ;\ + .type ASM_PFX(func__), %function + + #define GCC_ASM_IMPORT(func__) \ + .extern _CONCATENATE (__USER_LABEL_PREFIX__, func__) + + #else + // + // .type not supported by Apple Xcode tools + // + #define INTERWORK_FUNC(func__) + + #define GCC_ASM_EXPORT(func__) \ + .globl _CONCATENATE (__USER_LABEL_PREFIX__, func__) \ + + #define GCC_ASM_IMPORT(name) + + #endif +#endif + +/** + Return the pointer to the first instruction of a function given a function pointer. + On ARM CPU architectures, these two pointer values are the same, + so the implementation of this macro is very simple. + + @param FunctionPointer A pointer to a function. + + @return The pointer to the first instruction of a function given a function pointer. + +**/ +#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer) + +#endif + + diff --git a/BaseTools/Source/C/Include/Common/BuildVersion.h b/BaseTools/Source/C/Include/Common/BuildVersion.h index 5b50a5c28e..764bebfa93 100644 --- a/BaseTools/Source/C/Include/Common/BuildVersion.h +++ b/BaseTools/Source/C/Include/Common/BuildVersion.h @@ -14,4 +14,4 @@ **/ -#define __BUILD_VERSION "Build 2524" +#define __BUILD_VERSION "" diff --git a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h index 82d391ce3a..3cd22d1347 100644 --- a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h +++ b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h @@ -783,9 +783,9 @@ typedef struct _EFI_IFR_IMAGE { EFI_IMAGE_ID Id; } EFI_IFR_IMAGE; -typedef struct _EFI_IFR_MODAL { +typedef struct _EFI_IFR_MODAL_TAG { EFI_IFR_OP_HEADER Header; -} EFI_IFR_MODAL; +} EFI_IFR_MODAL_TAG; typedef struct _EFI_IFR_LOCKED { EFI_IFR_OP_HEADER Header; @@ -803,6 +803,12 @@ typedef struct _EFI_IFR_DEFAULT { EFI_IFR_TYPE_VALUE Value; } EFI_IFR_DEFAULT; +typedef struct _EFI_IFR_DEFAULT_2 { + EFI_IFR_OP_HEADER Header; + UINT16 DefaultId; + UINT8 Type; +} EFI_IFR_DEFAULT_2; + typedef struct _EFI_IFR_VALUE { EFI_IFR_OP_HEADER Header; } EFI_IFR_VALUE; diff --git a/BaseTools/Source/C/Include/Common/UefiMultiPhase.h b/BaseTools/Source/C/Include/Common/UefiMultiPhase.h index 11c587e862..7c487471a8 100644 --- a/BaseTools/Source/C/Include/Common/UefiMultiPhase.h +++ b/BaseTools/Source/C/Include/Common/UefiMultiPhase.h @@ -1,7 +1,7 @@ /** @file This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases. - Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this @@ -117,9 +117,9 @@ typedef struct _WIN_CERTIFICATE { // WIN_CERTIFICATE_UEFI_GUID.CertData // typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 { - UINT32 HashType; - UINT8 PublicKey[256]; - UINT8 Signature[256]; + EFI_GUID HashType; + UINT8 PublicKey[256]; + UINT8 Signature[256]; } EFI_CERT_BLOCK_RSA_2048_SHA256; @@ -127,7 +127,7 @@ typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 { @param Hdr This is the standard WIN_CERTIFICATE header, where wCertificateType is set to - WIN_CERT_TYPE_UEFI_GUID. + WIN_CERT_TYPE_EFI_GUID. @param CertType This is the unique id which determines the format of the CertData. In this case, the diff --git a/BaseTools/Source/C/Include/Ia32/ProcessorBind.h b/BaseTools/Source/C/Include/Ia32/ProcessorBind.h index 20d559e2fd..f1ed522b42 100644 --- a/BaseTools/Source/C/Include/Ia32/ProcessorBind.h +++ b/BaseTools/Source/C/Include/Ia32/ProcessorBind.h @@ -1,7 +1,7 @@ /** @file Processor or Compiler specific defines and types for x64. - Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this @@ -70,7 +70,7 @@ #if _MSC_EXTENSIONS // - // use Microsoft* C complier dependent interger width types + // use Microsoft* C complier dependent integer width types // typedef unsigned __int64 UINT64; typedef __int64 INT64; diff --git a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h index 8eaf4c3e78..7e7c0ea46a 100644 --- a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h +++ b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h @@ -5,6 +5,7 @@ @bug Fix text - doc as defined in MSFT EFI specification. Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+ Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this @@ -48,6 +49,7 @@ #define IMAGE_FILE_MACHINE_X64 0x8664 #define IMAGE_FILE_MACHINE_ARM 0x01c0 // Thumb only #define IMAGE_FILE_MACHINE_ARMT 0x01c2 // 32bit Mixed ARM and Thumb/Thumb 2 Little Endian +#define IMAGE_FILE_MACHINE_ARM64 0xAA64 // 64bit ARM Architecture, Little Endian // // Support old names for backward compatible @@ -58,6 +60,7 @@ #define EFI_IMAGE_MACHINE_EBC IMAGE_FILE_MACHINE_EBC #define EFI_IMAGE_MACHINE_X64 IMAGE_FILE_MACHINE_X64 #define EFI_IMAGE_MACHINE_ARMT IMAGE_FILE_MACHINE_ARMT +#define EFI_IMAGE_MACHINE_AARCH64 IMAGE_FILE_MACHINE_ARM64 #define EFI_IMAGE_DOS_SIGNATURE 0x5A4D // MZ #define EFI_IMAGE_OS2_SIGNATURE 0x454E // NE diff --git a/BaseTools/Source/C/Include/X64/ProcessorBind.h b/BaseTools/Source/C/Include/X64/ProcessorBind.h index 0bc02f043a..6f03dfa67d 100644 --- a/BaseTools/Source/C/Include/X64/ProcessorBind.h +++ b/BaseTools/Source/C/Include/X64/ProcessorBind.h @@ -1,7 +1,7 @@ /** @file Processor or Compiler specific defines and types x64 (Intel(r) EM64T, AMD64). - Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this @@ -73,7 +73,7 @@ // - // use Microsoft C complier dependent interger width types + // use Microsoft C complier dependent integer width types // typedef unsigned __int64 UINT64; typedef __int64 INT64; diff --git a/BaseTools/Source/C/LzmaCompress/GNUmakefile b/BaseTools/Source/C/LzmaCompress/GNUmakefile index 07f0a90b60..21c75ef7df 100644 --- a/BaseTools/Source/C/LzmaCompress/GNUmakefile +++ b/BaseTools/Source/C/LzmaCompress/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'LzmaCompress' module build. +# GNU/Linux makefile for 'LzmaCompress' module build. # # Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile index 9aa83c0390..6895f98c6e 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile @@ -4,6 +4,7 @@ # ARCH = x86_64 or x64 for EM64T build # ARCH = ia32 or IA32 for IA32 build # ARCH = ia64 or IA64 for IA64 build +# ARCH = Arm or ARM for ARM build # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials @@ -34,6 +35,10 @@ ifeq ($(ARCH), X64) ARCH_INCLUDE = -I $(MAKEROOT)/Include/X64/ endif +ifeq ($(ARCH), ARM) +ARCH_INCLUDE = -I $(MAKEROOT)/Include/Arm/ +endif + INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) CPPFLAGS = $(INCLUDE) CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fno-merge-constants -nostdlib -Wall -Werror -c -g diff --git a/BaseTools/Source/C/Split/GNUmakefile b/BaseTools/Source/C/Split/GNUmakefile index 2c62a270cb..e38a01f8c1 100644 --- a/BaseTools/Source/C/Split/GNUmakefile +++ b/BaseTools/Source/C/Split/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'Split' module build. +# GNU/Linux makefile for 'Split' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/TianoCompress/GNUmakefile b/BaseTools/Source/C/TianoCompress/GNUmakefile index e58b89bc83..e4f3a69638 100644 --- a/BaseTools/Source/C/TianoCompress/GNUmakefile +++ b/BaseTools/Source/C/TianoCompress/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'TianoCompress' module build. +# GNU/Linux makefile for 'TianoCompress' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/VfrCompile/EfiVfr.h b/BaseTools/Source/C/VfrCompile/EfiVfr.h index aad9417156..4b9aed0adb 100644 --- a/BaseTools/Source/C/VfrCompile/EfiVfr.h +++ b/BaseTools/Source/C/VfrCompile/EfiVfr.h @@ -38,6 +38,8 @@ Abstract: #define EFI_STRING_ID_INVALID 0x0 #define EFI_IMAGE_ID_INVALID 0xFFFF +#define EFI_IFR_MAX_DEFAULT_TYPE 0x10 + typedef enum { QUESTION_NORMAL, QUESTION_DATE, diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile index 7f18e78eb6..82005e11f1 100644 --- a/BaseTools/Source/C/VfrCompile/GNUmakefile +++ b/BaseTools/Source/C/VfrCompile/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'VfrCompile' module build. +# GNU/Linux makefile for 'VfrCompile' module build. # # Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp index 58be497230..da8c529894 100644 --- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp @@ -2,7 +2,7 @@ VfrCompiler main class and main function. -Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -82,6 +82,7 @@ CVfrCompiler::OptionInitialization ( mOptions.CPreprocessorOptions = NULL; mOptions.CompatibleMode = FALSE; mOptions.HasOverrideClassGuid = FALSE; + mOptions.WarningAsError = FALSE; memset (&mOptions.OverrideClassGuid, 0, sizeof (EFI_GUID)); if (Argc == 1) { @@ -153,6 +154,8 @@ CVfrCompiler::OptionInitialization ( goto Fail; } mOptions.HasOverrideClassGuid = TRUE; + } else if (stricmp(Argv[Index], "-w") == 0 || stricmp(Argv[Index], "--warning-as-error") == 0) { + mOptions.WarningAsError = TRUE; } else { DebugError (NULL, 0, 1000, "Unknown option", "unrecognized option %s", Argv[Index]); goto Fail; @@ -425,6 +428,8 @@ CVfrCompiler::Usage ( " -g, --guid", " override class guid input", " format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", + " -w --warning-as-error", + " treat warning as an error", NULL }; for (Index = 0; Help[Index] != NULL; Index++) { @@ -516,6 +521,7 @@ CVfrCompiler::Compile ( InFileName = (mOptions.SkipCPreprocessor == TRUE) ? mOptions.VfrFileName : mOptions.PreprocessorOutputFileName; gCVfrErrorHandle.SetInputFile (InFileName); + gCVfrErrorHandle.SetWarningAsError(mOptions.WarningAsError); if ((pInFile = fopen (InFileName, "r")) == NULL) { DebugError (NULL, 0, 0001, "Error opening the input file", InFileName); @@ -553,12 +559,55 @@ Fail: } } +VOID +CVfrCompiler::UpdateInfoForDynamicOpcode ( + VOID + ) +{ + SIfrRecord *pRecord; + + if (!gNeedAdjustOpcode) { + return; + } + + // + // Base on the original offset info to update the record list. + // + if (!gCIfrRecordInfoDB.IfrAdjustDynamicOpcodeInRecords()) { + DebugError (NULL, 0, 1001, "Error parsing vfr file", "Can find the offset in the record."); + } + + // + // Base on the opcode binary length to recalculate the offset for each opcode. + // + gCIfrRecordInfoDB.IfrAdjustOffsetForRecord(); + + // + // Base on the offset to find the binary address. + // + pRecord = gCIfrRecordInfoDB.GetRecordInfoFromOffset(gAdjustOpcodeOffset); + while (pRecord != NULL) { + pRecord->mIfrBinBuf = gCFormPkg.GetBufAddrBaseOnOffset(pRecord->mOffset); + if (pRecord->mIfrBinBuf == NULL) { + DebugError (NULL, 0, 0001, "Error parsing vfr file", " 0x%X. offset not allocated.", pRecord->mOffset); + } + pRecord = pRecord->mNext; + } +} + VOID CVfrCompiler::AdjustBin ( VOID ) { EFI_VFR_RETURN_CODE Status; + + if (!IS_RUN_STATUS(STATUS_COMPILEED)) { + return; + } + + UpdateInfoForDynamicOpcode (); + // // Check Binary Code consistent between Form and IfrRecord // @@ -759,6 +808,8 @@ main ( ) { COMPILER_RUN_STATUS Status; + + SetPrintLevel(WARNING_LOG_LEVEL); CVfrCompiler Compiler(Argc, Argv); Compiler.PreProcess(); diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.h b/BaseTools/Source/C/VfrCompile/VfrCompiler.h index 1c83e87f5f..fe29f7e3af 100644 --- a/BaseTools/Source/C/VfrCompile/VfrCompiler.h +++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.h @@ -57,6 +57,7 @@ typedef struct { BOOLEAN CompatibleMode; BOOLEAN HasOverrideClassGuid; EFI_GUID OverrideClassGuid; + BOOLEAN WarningAsError; } OPTIONS; typedef enum { @@ -87,6 +88,7 @@ private: VOID SET_RUN_STATUS (IN COMPILER_RUN_STATUS); BOOLEAN IS_RUN_STATUS (IN COMPILER_RUN_STATUS); + VOID UpdateInfoForDynamicOpcode (VOID); public: COMPILER_RUN_STATUS RunStatus (VOID) { diff --git a/BaseTools/Source/C/VfrCompile/VfrError.cpp b/BaseTools/Source/C/VfrCompile/VfrError.cpp index b0f9197e36..71305364f6 100644 --- a/BaseTools/Source/C/VfrCompile/VfrError.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrError.cpp @@ -2,7 +2,7 @@ VfrCompiler error handler. -Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -45,17 +45,24 @@ 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_CODEUNDEFINED, ": undefined Error Code" } }; +static SVFR_WARNING_HANDLE VFR_WARNING_HANDLE_TABLE [] = { + { VFR_WARNING_DEFAULT_VALUE_REDEFINED, ": default value re-defined with different value"}, + { VFR_WARNING_CODEUNDEFINED, ": undefined Warning Code" } +}; + CVfrErrorHandle::CVfrErrorHandle ( VOID ) { - mInputFileName = NULL; - mScopeRecordListHead = NULL; - mScopeRecordListTail = NULL; - mVfrErrorHandleTable = VFR_ERROR_HANDLE_TABLE; + mInputFileName = NULL; + mScopeRecordListHead = NULL; + mScopeRecordListTail = NULL; + mVfrErrorHandleTable = VFR_ERROR_HANDLE_TABLE; + mVfrWarningHandleTable = VFR_WARNING_HANDLE_TABLE; } CVfrErrorHandle::~CVfrErrorHandle ( @@ -74,9 +81,18 @@ CVfrErrorHandle::~CVfrErrorHandle ( delete pNode; } - mScopeRecordListHead = NULL; - mScopeRecordListTail = NULL; - mVfrErrorHandleTable = NULL; + mScopeRecordListHead = NULL; + mScopeRecordListTail = NULL; + mVfrErrorHandleTable = NULL; + mVfrWarningHandleTable = NULL; +} + +VOID +CVfrErrorHandle::SetWarningAsError ( + IN BOOLEAN WarningAsError + ) +{ + mWarningAsError = WarningAsError; } VOID @@ -242,4 +258,41 @@ CVfrErrorHandle::HandleError ( } } +UINT8 +CVfrErrorHandle::HandleWarning ( + IN EFI_VFR_WARNING_CODE WarningCode, + IN UINT32 LineNum, + IN CHAR8 *TokName + ) +{ + UINT32 Index; + CHAR8 *FileName = NULL; + UINT32 FileLine; + CONST CHAR8 *WarningMsg = NULL; + + if (mVfrWarningHandleTable == NULL) { + return 1; + } + + GetFileNameLineNum (LineNum, &FileName, &FileLine); + + if (mWarningAsError) { + Error (FileName, FileLine, 0x2220, "warning treated as error", NULL); + } + + for (Index = 0; mVfrWarningHandleTable[Index].mWarningCode != VFR_WARNING_CODEUNDEFINED; Index++) { + if (WarningCode == mVfrWarningHandleTable[Index].mWarningCode) { + WarningMsg = mVfrWarningHandleTable[Index].mWarningMsg; + break; + } + } + + if (WarningMsg != NULL) { + Warning (FileName, FileLine, 0, TokName, (CHAR8 *) "\t%s\n", (CHAR8 *) WarningMsg); + return 1; + } else { + return 0; + } +} + CVfrErrorHandle gCVfrErrorHandle; diff --git a/BaseTools/Source/C/VfrCompile/VfrError.h b/BaseTools/Source/C/VfrCompile/VfrError.h index 258ae9b8af..8e73e2e997 100644 --- a/BaseTools/Source/C/VfrCompile/VfrError.h +++ b/BaseTools/Source/C/VfrCompile/VfrError.h @@ -2,7 +2,7 @@ VfrCompiler Error definition -Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -43,14 +43,25 @@ typedef enum { VFR_RETURN_DATA_STRING_ERROR, VFR_RETURN_DEFAULT_VALUE_REDEFINED, VFR_RETURN_CONSTANT_ONLY, + VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR, VFR_RETURN_CODEUNDEFINED } EFI_VFR_RETURN_CODE; +typedef enum { + VFR_WARNING_DEFAULT_VALUE_REDEFINED = 0, + VFR_WARNING_CODEUNDEFINED +} EFI_VFR_WARNING_CODE; + typedef struct _SVFR_ERROR_HANDLE { EFI_VFR_RETURN_CODE mErrorCode; CONST CHAR8 *mErrorMsg; } SVFR_ERROR_HANDLE; +typedef struct _SVFR_WARNING_HANDLE { + EFI_VFR_WARNING_CODE mWarningCode; + CONST CHAR8 *mWarningMsg; +} SVFR_WARNING_HANDLE; + struct SVfrFileScopeRecord { CHAR8 *mFileName; UINT32 mWholeScopeLine; @@ -65,17 +76,21 @@ class CVfrErrorHandle { private: CHAR8 *mInputFileName; SVFR_ERROR_HANDLE *mVfrErrorHandleTable; + SVFR_WARNING_HANDLE *mVfrWarningHandleTable; SVfrFileScopeRecord *mScopeRecordListHead; SVfrFileScopeRecord *mScopeRecordListTail; + BOOLEAN mWarningAsError; public: CVfrErrorHandle (VOID); ~CVfrErrorHandle (VOID); + VOID SetWarningAsError (IN BOOLEAN); VOID SetInputFile (IN CHAR8 *); VOID ParseFileScopeRecord (IN CHAR8 *, IN UINT32); VOID GetFileNameLineNum (IN UINT32, OUT CHAR8 **, OUT UINT32 *); UINT8 HandleError (IN EFI_VFR_RETURN_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL); + UINT8 HandleWarning (IN EFI_VFR_WARNING_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL); VOID PrintMsg (IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL, IN CONST CHAR8 *MsgType = "Error", IN CONST CHAR8 *ErrorMsg = ""); }; diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp index 2e859b8dfa..7cadf0f42b 100644 --- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp @@ -2,7 +2,7 @@ The definition of CFormPkg's member function -Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -152,12 +152,39 @@ CFormPkg::~CFormPkg () PendingAssignList = NULL; } +SBufferNode * +CFormPkg::CreateNewNode ( + VOID + ) +{ + SBufferNode *Node; + + Node = new SBufferNode; + if (Node == NULL) { + return NULL; + } + + Node->mBufferStart = new CHAR8[mBufferSize]; + if (Node->mBufferStart == NULL) { + delete Node; + return NULL; + } else { + memset (Node->mBufferStart, 0, mBufferSize); + Node->mBufferEnd = Node->mBufferStart + mBufferSize; + Node->mBufferFree = Node->mBufferStart; + Node->mNext = NULL; + } + + return Node; +} + CHAR8 * CFormPkg::IfrBinBufferGet ( IN UINT32 Len ) { - CHAR8 *BinBuffer = NULL; + CHAR8 *BinBuffer = NULL; + SBufferNode *Node = NULL; if ((Len == 0) || (Len > mBufferSize)) { return NULL; @@ -167,24 +194,11 @@ CFormPkg::IfrBinBufferGet ( BinBuffer = mCurrBufferNode->mBufferFree; mCurrBufferNode->mBufferFree += Len; } else { - SBufferNode *Node; - - Node = new SBufferNode; + Node = CreateNewNode (); if (Node == NULL) { return NULL; } - Node->mBufferStart = new CHAR8[mBufferSize]; - if (Node->mBufferStart == NULL) { - delete Node; - return NULL; - } else { - memset (Node->mBufferStart, 0, mBufferSize); - Node->mBufferEnd = Node->mBufferStart + mBufferSize; - Node->mBufferFree = Node->mBufferStart; - Node->mNext = NULL; - } - if (mBufferNodeQueueTail == NULL) { mBufferNodeQueueHead = mBufferNodeQueueTail = Node; } else { @@ -245,7 +259,7 @@ CFormPkg::Read ( } if (mReadBufferNode == NULL) { - return 0; + return 0; } for (Index = 0; Index < Size; Index++) { @@ -256,7 +270,7 @@ CFormPkg::Read ( return Index; } else { mReadBufferOffset = 0; - Buffer[Index] = mReadBufferNode->mBufferStart[mReadBufferOffset++]; + Index --; } } } @@ -402,6 +416,9 @@ CFormPkg::_WRITE_PKG_END ( } #define BYTES_PRE_LINE 0x10 +UINT32 gAdjustOpcodeOffset = 0; +BOOLEAN gNeedAdjustOpcode = FALSE; +UINT32 gAdjustOpcodeLen = 0; EFI_VFR_RETURN_CODE CFormPkg::GenCFile ( @@ -548,13 +565,236 @@ CFormPkg::PendingAssignPrintAll ( } } +SBufferNode * +CFormPkg::GetBinBufferNodeForAddr ( + IN CHAR8 *BinBuffAddr + ) +{ + SBufferNode *TmpNode; + + TmpNode = mBufferNodeQueueHead; + + while (TmpNode != NULL) { + if (TmpNode->mBufferStart <= BinBuffAddr && TmpNode->mBufferFree >= BinBuffAddr) { + return TmpNode; + } + + TmpNode = TmpNode->mNext; + } + + return NULL; +} + +SBufferNode * +CFormPkg::GetNodeBefore( + IN SBufferNode *CurrentNode + ) +{ + SBufferNode *FirstNode = mBufferNodeQueueHead; + SBufferNode *LastNode = mBufferNodeQueueHead; + + while (FirstNode != NULL) { + if (FirstNode == CurrentNode) { + break; + } + + LastNode = FirstNode; + FirstNode = FirstNode->mNext; + } + + if (FirstNode == NULL) { + LastNode = NULL; + } + + return LastNode; +} + +EFI_VFR_RETURN_CODE +CFormPkg::InsertNodeBefore( + IN SBufferNode *CurrentNode, + IN SBufferNode *NewNode + ) +{ + SBufferNode *LastNode = GetNodeBefore (CurrentNode); + + if (LastNode == NULL) { + return VFR_RETURN_MISMATCHED; + } + + NewNode->mNext = LastNode->mNext; + LastNode->mNext = NewNode; + + return VFR_RETURN_SUCCESS; +} + +CHAR8 * +CFormPkg::GetBufAddrBaseOnOffset ( + IN UINT32 Offset + ) +{ + SBufferNode *TmpNode; + UINT32 TotalBufLen; + UINT32 CurrentBufLen; + + TotalBufLen = 0; + + for (TmpNode = mBufferNodeQueueHead; TmpNode != NULL; TmpNode = TmpNode->mNext) { + CurrentBufLen = TmpNode->mBufferFree - TmpNode->mBufferStart; + if (Offset >= TotalBufLen && Offset < TotalBufLen + CurrentBufLen) { + return TmpNode->mBufferStart + (Offset - TotalBufLen); + } + + TotalBufLen += CurrentBufLen; + } + + return NULL; +} + +EFI_VFR_RETURN_CODE +CFormPkg::AdjustDynamicInsertOpcode ( + IN CHAR8 *LastFormEndAddr, + IN CHAR8 *InsertOpcodeAddr + ) +{ + SBufferNode *LastFormEndNode; + SBufferNode *InsertOpcodeNode; + SBufferNode *NewRestoreNodeBegin; + SBufferNode *NewRestoreNodeEnd; + SBufferNode *NewLastEndNode; + SBufferNode *TmpNode; + UINT32 NeedRestoreCodeLen; + + NewRestoreNodeEnd = NULL; + + LastFormEndNode = GetBinBufferNodeForAddr(LastFormEndAddr); + InsertOpcodeNode = GetBinBufferNodeForAddr(InsertOpcodeAddr); + + if (LastFormEndNode == InsertOpcodeNode) { + // + // Create New Node to save the restore opcode. + // + NeedRestoreCodeLen = InsertOpcodeAddr - LastFormEndAddr; + gAdjustOpcodeLen = NeedRestoreCodeLen; + NewRestoreNodeBegin = CreateNewNode (); + if (NewRestoreNodeBegin == NULL) { + return VFR_RETURN_OUT_FOR_RESOURCES; + } + memcpy (NewRestoreNodeBegin->mBufferFree, LastFormEndAddr, NeedRestoreCodeLen); + NewRestoreNodeBegin->mBufferFree += NeedRestoreCodeLen; + + // + // Override the restore buffer data. + // + memcpy (LastFormEndAddr, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr); + InsertOpcodeNode->mBufferFree -= NeedRestoreCodeLen; + memset (InsertOpcodeNode->mBufferFree, 0, NeedRestoreCodeLen); + } else { + // + // Create New Node to save the restore opcode. + // + NeedRestoreCodeLen = LastFormEndNode->mBufferFree - LastFormEndAddr; + gAdjustOpcodeLen = NeedRestoreCodeLen; + NewRestoreNodeBegin = CreateNewNode (); + if (NewRestoreNodeBegin == NULL) { + return VFR_RETURN_OUT_FOR_RESOURCES; + } + memcpy (NewRestoreNodeBegin->mBufferFree, LastFormEndAddr, NeedRestoreCodeLen); + NewRestoreNodeBegin->mBufferFree += NeedRestoreCodeLen; + // + // Override the restore buffer data. + // + LastFormEndNode->mBufferFree -= NeedRestoreCodeLen; + // + // Link the restore data to new node. + // + NewRestoreNodeBegin->mNext = LastFormEndNode->mNext; + + // + // Count the Adjust opcode len. + // + TmpNode = LastFormEndNode->mNext; + while (TmpNode != InsertOpcodeNode) { + gAdjustOpcodeLen += TmpNode->mBufferFree - TmpNode->mBufferStart; + TmpNode = TmpNode->mNext; + } + + // + // Create New Node to save the last node of restore opcode. + // + NeedRestoreCodeLen = InsertOpcodeAddr - InsertOpcodeNode->mBufferStart; + gAdjustOpcodeLen += NeedRestoreCodeLen; + if (NeedRestoreCodeLen > 0) { + NewRestoreNodeEnd = CreateNewNode (); + if (NewRestoreNodeEnd == NULL) { + return VFR_RETURN_OUT_FOR_RESOURCES; + } + memcpy (NewRestoreNodeEnd->mBufferFree, InsertOpcodeNode->mBufferStart, NeedRestoreCodeLen); + NewRestoreNodeEnd->mBufferFree += NeedRestoreCodeLen; + // + // Override the restore buffer data. + // + memcpy (InsertOpcodeNode->mBufferStart, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr); + InsertOpcodeNode->mBufferFree -= InsertOpcodeAddr - InsertOpcodeNode->mBufferStart; + + // + // Insert the last restore data node. + // + TmpNode = GetNodeBefore (InsertOpcodeNode); + if (TmpNode == LastFormEndNode) { + NewRestoreNodeBegin->mNext = NewRestoreNodeEnd; + } else { + TmpNode->mNext = NewRestoreNodeEnd; + } + // + // Connect the dynamic opcode node to the node before last form end node. + // + LastFormEndNode->mNext = InsertOpcodeNode; + } + } + + if (mBufferNodeQueueTail->mBufferFree - mBufferNodeQueueTail->mBufferStart > 2) { + // + // End form set opcode all in the mBufferNodeQueueTail node. + // + NewLastEndNode = CreateNewNode (); + if (NewLastEndNode == NULL) { + return VFR_RETURN_OUT_FOR_RESOURCES; + } + NewLastEndNode->mBufferStart[0] = 0x29; + NewLastEndNode->mBufferStart[1] = 0x02; + NewLastEndNode->mBufferFree += 2; + + mBufferNodeQueueTail->mBufferFree -= 2; + + mBufferNodeQueueTail->mNext = NewRestoreNodeBegin; + if (NewRestoreNodeEnd != NULL) { + NewRestoreNodeEnd->mNext = NewLastEndNode; + } else { + NewRestoreNodeBegin->mNext = NewLastEndNode; + } + + mBufferNodeQueueTail = NewLastEndNode; + } else if (mBufferNodeQueueTail->mBufferFree - mBufferNodeQueueTail->mBufferStart == 2) { + TmpNode = GetNodeBefore(mBufferNodeQueueTail); + TmpNode->mNext = NewRestoreNodeBegin; + if (NewRestoreNodeEnd != NULL) { + NewRestoreNodeEnd->mNext = mBufferNodeQueueTail; + } else { + NewRestoreNodeBegin->mNext = mBufferNodeQueueTail; + } + } + + return VFR_RETURN_SUCCESS; +} + EFI_VFR_RETURN_CODE CFormPkg::DeclarePendingQuestion ( IN CVfrVarDataTypeDB &lCVfrVarDataTypeDB, IN CVfrDataStorage &lCVfrDataStorage, IN CVfrQuestionDB &lCVfrQuestionDB, IN EFI_GUID *LocalFormSetGuid, - IN UINT32 LineNo + IN UINT32 LineNo, + OUT CHAR8 **InsertOpcodeAddr ) { SPendingAssign *pNode; @@ -563,8 +803,10 @@ CFormPkg::DeclarePendingQuestion ( CHAR8 FName[MAX_NAME_LEN]; CHAR8 *SName; CHAR8 *NewStr; + UINT32 ShrinkSize; EFI_VFR_RETURN_CODE ReturnCode; EFI_VFR_VARSTORE_TYPE VarStoreType = EFI_VFR_VARSTORE_INVALID; + EFI_VARSTORE_ID VarStoreId = EFI_VARSTORE_ID_INVALID; // // Declare all questions as Numeric in DisableIf True @@ -572,6 +814,7 @@ CFormPkg::DeclarePendingQuestion ( // DisableIf CIfrDisableIf DIObj; DIObj.SetLineNo (LineNo); + *InsertOpcodeAddr = DIObj.GetObjBinAddr (); //TrueOpcode CIfrTrue TObj (LineNo); @@ -581,7 +824,7 @@ CFormPkg::DeclarePendingQuestion ( if (pNode->mFlag == PENDING) { CIfrNumeric CNObj; EFI_VARSTORE_INFO Info; - EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID; + EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID; CNObj.SetLineNo (LineNo); CNObj.SetPrompt (0x0); @@ -611,7 +854,7 @@ CFormPkg::DeclarePendingQuestion ( // // Get VarStoreType // - ReturnCode = lCVfrDataStorage.GetVarStoreType (FName, VarStoreType); + ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId); if (ReturnCode == VFR_RETURN_UNDEFINED) { lCVfrDataStorage.DeclareBufferVarStore ( FName, @@ -621,18 +864,13 @@ CFormPkg::DeclarePendingQuestion ( EFI_VARSTORE_ID_INVALID, FALSE ); - ReturnCode = lCVfrDataStorage.GetVarStoreType (FName, VarStoreType); + ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId, LocalFormSetGuid); } if (ReturnCode != VFR_RETURN_SUCCESS) { gCVfrErrorHandle.PrintMsg (pNode->mLineNo, FName, "Error", "Var Store Type is not defined"); return ReturnCode; } - - ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId); - if (ReturnCode != VFR_RETURN_SUCCESS) { - gCVfrErrorHandle.PrintMsg (pNode->mLineNo, FName, "Error", "Var Store Type is not defined"); - return ReturnCode; - } + VarStoreType = lCVfrDataStorage.GetVarStoreType (Info.mVarStoreId); if (*VarStr == '\0' && ArrayIdx != INVALID_ARRAY_INDEX) { ReturnCode = lCVfrDataStorage.GetNameVarStoreInfo (&Info, ArrayIdx); @@ -642,7 +880,7 @@ CFormPkg::DeclarePendingQuestion ( } else if (VarStoreType == EFI_VFR_VARSTORE_BUFFER) { VarStr = pNode->mKey; //convert VarStr with store name to VarStr with structure name - ReturnCode = lCVfrDataStorage.GetBufferVarStoreDataTypeName (FName, &SName); + ReturnCode = lCVfrDataStorage.GetBufferVarStoreDataTypeName (Info.mVarStoreId, &SName); if (ReturnCode == VFR_RETURN_SUCCESS) { NewStr = new CHAR8[strlen (VarStr) + strlen (SName) + 1]; NewStr[0] = '\0'; @@ -676,19 +914,24 @@ CFormPkg::DeclarePendingQuestion ( switch (Info.mVarType) { case EFI_IFR_TYPE_NUM_SIZE_64: CNObj.SetMinMaxStepData ((UINT64) 0, (UINT64) -1 , (UINT64) 0); + ShrinkSize = 0; break; case EFI_IFR_TYPE_NUM_SIZE_32: CNObj.SetMinMaxStepData ((UINT32) 0, (UINT32) -1 , (UINT32) 0); + ShrinkSize = 12; break; case EFI_IFR_TYPE_NUM_SIZE_16: CNObj.SetMinMaxStepData ((UINT16) 0, (UINT16) -1 , (UINT16) 0); + ShrinkSize = 18; break; case EFI_IFR_TYPE_NUM_SIZE_8: CNObj.SetMinMaxStepData ((UINT8) 0, (UINT8) -1 , (UINT8) 0); + ShrinkSize = 21; break; default: break; } + CNObj.ShrinkBinSize (ShrinkSize); // // For undefined Efi VarStore type question @@ -698,7 +941,7 @@ CFormPkg::DeclarePendingQuestion ( CIfrVarEqName CVNObj (QId, Info.mInfo.mVarName); CVNObj.SetLineNo (LineNo); } - + // // End for Numeric // @@ -983,6 +1226,94 @@ CIfrRecordInfoDB::GetOpcodeQuestionId ( return QuestionHead->QuestionId; } +SIfrRecord * +CIfrRecordInfoDB::GetRecordInfoFromOffset ( + IN UINT32 Offset + ) +{ + SIfrRecord *pNode = NULL; + + for (pNode = mIfrRecordListHead; pNode != NULL; pNode = pNode->mNext) { + if (pNode->mOffset == Offset) { + return pNode; + } + } + + return pNode; +} + +/* + Add just the op code position. + + From + + | form end opcode + end of if opcode for form ... + Dynamic opcode + form set end opcode | + + To + + | Dynamic opcode + form end opcode + end of if opcode for form ... + form set end opcode | + +*/ +BOOLEAN +CIfrRecordInfoDB::IfrAdjustDynamicOpcodeInRecords ( + VOID + ) +{ + UINT32 OpcodeOffset; + SIfrRecord *pNode, *pPreNode; + SIfrRecord *pStartNode, *pNodeBeforeStart; + SIfrRecord *pEndNode; + + pStartNode = NULL; + pEndNode = NULL; + OpcodeOffset = 0; + + // + // Base on the offset info to get the node. + // + for (pNode = mIfrRecordListHead; pNode->mNext != NULL; pPreNode = pNode,pNode = pNode->mNext) { + if (OpcodeOffset == gAdjustOpcodeOffset) { + pStartNode = pNode; + pNodeBeforeStart = pPreNode; + } else if (OpcodeOffset == gAdjustOpcodeOffset + gAdjustOpcodeLen) { + pEndNode = pPreNode; + } + + OpcodeOffset += pNode->mBinBufLen; + } + + // + // Check the value. + // + if (pEndNode == NULL || pStartNode == NULL) { + return FALSE; + } + + // + // Adjust the node. pPreNode save the Node before mIfrRecordListTail + // + pNodeBeforeStart->mNext = pEndNode->mNext; + pPreNode->mNext = pStartNode; + pEndNode->mNext = mIfrRecordListTail; + + return TRUE; +} + +VOID +CIfrRecordInfoDB::IfrAdjustOffsetForRecord ( + VOID + ) +{ + UINT32 OpcodeOffset; + SIfrRecord *pNode; + + OpcodeOffset = 0; + for (pNode = mIfrRecordListHead; pNode != NULL; pNode = pNode->mNext) { + pNode->mOffset = OpcodeOffset; + OpcodeOffset += pNode->mBinBufLen; + } +} + EFI_VFR_RETURN_CODE CIfrRecordInfoDB::IfrRecordAdjust ( VOID @@ -1195,11 +1526,7 @@ CIfrRecordInfoDB::IfrRecordAdjust ( // Update Ifr Opcode Offset // if (Status == VFR_RETURN_SUCCESS) { - OpcodeOffset = 0; - for (pNode = mIfrRecordListHead; pNode != NULL; pNode = pNode->mNext) { - pNode->mOffset = OpcodeOffset; - OpcodeOffset += pNode->mBinBufLen; - } + IfrAdjustOffsetForRecord (); } return Status; } @@ -1344,7 +1671,7 @@ static struct { { sizeof (EFI_IFR_CATENATE), 0 }, // EFI_IFR_CATENATE_OP { sizeof (EFI_IFR_GUID), 0 }, // EFI_IFR_GUID_OP { sizeof (EFI_IFR_SECURITY), 0 }, // EFI_IFR_SECURITY_OP - 0x60 - { sizeof (EFI_IFR_MODAL), 0}, // EFI_IFR_MODAL_OP - 0x61 + { sizeof (EFI_IFR_MODAL_TAG), 0}, // EFI_IFR_MODAL_TAG_OP - 0x61 { sizeof (EFI_IFR_REFRESH_ID), 0}, // EFI_IFR_REFRESH_ID_OP - 0x62 }; @@ -1368,7 +1695,7 @@ static struct { "EFI_IFR_STRING_REF1","EFI_IFR_STRING_REF2", "EFI_IFR_CONDITIONAL", "EFI_IFR_QUESTION_REF3", "EFI_IFR_ZERO", "EFI_IFR_ONE", "EFI_IFR_ONES", "EFI_IFR_UNDEFINED", "EFI_IFR_LENGTH", "EFI_IFR_DUP", "EFI_IFR_THIS", "EFI_IFR_SPAN", "EFI_IFR_VALUE", "EFI_IFR_DEFAULT", "EFI_IFR_DEFAULTSTORE", "EFI_IFR_FORM_MAP", "EFI_IFR_CATENATE", "EFI_IFR_GUID", - "EFI_IFR_SECURITY", "EFI_IFR_MODAL", "EFI_IFR_REFRESH_ID", + "EFI_IFR_SECURITY", "EFI_IFR_MODAL_TAG", "EFI_IFR_REFRESH_ID", }; VOID diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h index 5f4d87aa0a..614471060d 100644 --- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h +++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h @@ -2,7 +2,7 @@ The definition of CFormPkg's member function -Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -115,6 +115,10 @@ private: VOID _WRITE_PKG_LINE (IN FILE *, IN UINT32 , IN CONST CHAR8 *, IN CHAR8 *, IN UINT32); VOID _WRITE_PKG_END (IN FILE *, IN UINT32 , IN CONST CHAR8 *, IN CHAR8 *, IN UINT32); + SBufferNode * GetBinBufferNodeForAddr (IN CHAR8 *); + SBufferNode * CreateNewNode (); + SBufferNode * GetNodeBefore (IN SBufferNode *); + EFI_VFR_RETURN_CODE InsertNodeBefore (IN SBufferNode *, IN SBufferNode *); private: SPendingAssign *PendingAssignList; @@ -145,12 +149,22 @@ public: IN CVfrDataStorage &lCVfrDataStorage, IN CVfrQuestionDB &lCVfrQuestionDB, IN EFI_GUID *LocalFormSetGuid, - IN UINT32 LineNo + IN UINT32 LineNo, + OUT CHAR8 **InsertOpcodeAddr + ); + EFI_VFR_RETURN_CODE AdjustDynamicInsertOpcode ( + IN CHAR8 *LastFormEndAddr, + IN CHAR8 *InsertOpcodeAddr + ); + CHAR8 * GetBufAddrBaseOnOffset ( + IN UINT32 Offset ); }; extern CFormPkg gCFormPkg; extern CVfrStringDB gCVfrStringDB; +extern UINT32 gAdjustOpcodeOffset; +extern BOOLEAN gNeedAdjustOpcode; struct SIfrRecord { UINT32 mLineNo; @@ -189,6 +203,10 @@ public: mSwitch = FALSE; } + SIfrRecord * GetRecordInfoFromOffset (IN UINT32); + VOID IfrAdjustOffsetForRecord (VOID); + BOOLEAN IfrAdjustDynamicOpcodeInRecords (VOID); + UINT32 IfrRecordRegister (IN UINT32, IN CHAR8 *, IN UINT8, IN UINT32); VOID IfrRecordInfoUpdate (IN UINT32, IN UINT32, IN CHAR8*, IN UINT8, IN UINT32); VOID IfrRecordOutput (IN FILE *, IN UINT32 LineNo); @@ -227,6 +245,10 @@ public: return mObjBinBuf; } + inline UINT32 GetObjBinOffset (VOID) { + return mPkgOffset; + } + inline UINT8 GetObjBinLen (VOID) { return mObjBinLen; } @@ -411,6 +433,10 @@ public: return _FLAGS_ZERO (Flags) ? VFR_RETURN_SUCCESS : VFR_RETURN_FLAGS_UNSUPPORTED; } + + VOID UpdateCIfrQuestionHeader (IN EFI_IFR_QUESTION_HEADER *Header) { + mHeader = Header; + } }; /* @@ -561,6 +587,10 @@ public: BOOLEAN IsNumericOpcode () { return IsNumeric; } + + VOID UpdateCIfrMinMaxStepData (IN MINMAXSTEP_DATA *MinMaxStepData) { + mMinMaxStepData = MinMaxStepData; + } }; static CIfrQuestionHeader *gCurrentQuestion = NULL; @@ -858,7 +888,7 @@ public: class CIfrModal : public CIfrObj, public CIfrOpHeader { private: - EFI_IFR_MODAL *mModal; + EFI_IFR_MODAL_TAG *mModal; public: CIfrModal () : CIfrObj (EFI_IFR_MODAL_TAG_OP, (CHAR8 **)&mModal), @@ -900,14 +930,15 @@ private: public: CIfrDefault ( + IN UINT8 Size, IN UINT16 DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD, IN UINT8 Type = EFI_IFR_TYPE_OTHER, IN EFI_IFR_TYPE_VALUE Value = gZeroEfiIfrTypeValue - ) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault), - CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header) { + ) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault, Size), + CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header, Size) { mDefault->Type = Type; - mDefault->Value = Value; mDefault->DefaultId = DefaultId; + memcpy (&(mDefault->Value), &Value, Size - OFFSET_OF (EFI_IFR_DEFAULT, Value)); } VOID SetDefaultId (IN UINT16 DefaultId) { @@ -919,7 +950,30 @@ public: } VOID SetValue (IN EFI_IFR_TYPE_VALUE Value) { - mDefault->Value = Value; + memcpy (&mDefault->Value, &Value, mDefault->Header.Length - OFFSET_OF (EFI_IFR_DEFAULT, Value)); + } +}; + +class CIfrDefault2 : public CIfrObj, public CIfrOpHeader { +private: + EFI_IFR_DEFAULT_2 *mDefault; + +public: + CIfrDefault2 ( + IN UINT16 DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD, + IN UINT8 Type = EFI_IFR_TYPE_OTHER + ) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault, sizeof (EFI_IFR_DEFAULT_2)), + CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header, sizeof (EFI_IFR_DEFAULT_2)) { + mDefault->Type = Type; + mDefault->DefaultId = DefaultId; + } + + VOID SetDefaultId (IN UINT16 DefaultId) { + mDefault->DefaultId = DefaultId; + } + + VOID SetType (IN UINT8 Type) { + mDefault->Type = Type; } }; @@ -1254,7 +1308,7 @@ private: EFI_IFR_NUMERIC *mNumeric; public: - CIfrNumeric () : CIfrObj (EFI_IFR_NUMERIC_OP, (CHAR8 **)&mNumeric), + CIfrNumeric () : CIfrObj (EFI_IFR_NUMERIC_OP, (CHAR8 **)&mNumeric, sizeof (EFI_IFR_NUMERIC), TRUE), CIfrOpHeader (EFI_IFR_NUMERIC_OP, &mNumeric->Header), CIfrQuestionHeader (&mNumeric->Question), CIfrMinMaxStepData (&mNumeric->data, TRUE) { @@ -1268,6 +1322,27 @@ public: gCurrentMinMaxData = NULL; } + VOID ShrinkBinSize (IN UINT16 Size) { + // + // Update the buffer size which is truly be used later. + // + ShrinkObjBin(Size); + DecLength(Size); + + // + // Allocate buffer in gCFormPkg. + // + _EMIT_PENDING_OBJ(); + + // + // Update the buffer pointer used by other class. + // + mNumeric = (EFI_IFR_NUMERIC *) GetObjBinAddr(); + UpdateHeader (&mNumeric->Header); + UpdateCIfrQuestionHeader(&mNumeric->Question); + UpdateCIfrMinMaxStepData(&mNumeric->data); + } + EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, IN UINT8 LFlags) { EFI_VFR_RETURN_CODE Ret; @@ -1290,7 +1365,7 @@ private: EFI_IFR_ONE_OF *mOneOf; public: - CIfrOneOf () : CIfrObj (EFI_IFR_ONE_OF_OP, (CHAR8 **)&mOneOf), + CIfrOneOf () : CIfrObj (EFI_IFR_ONE_OF_OP, (CHAR8 **)&mOneOf, sizeof (EFI_IFR_ONE_OF), TRUE), CIfrOpHeader (EFI_IFR_ONE_OF_OP, &mOneOf->Header), CIfrQuestionHeader (&mOneOf->Question), CIfrMinMaxStepData (&mOneOf->data) { @@ -1319,6 +1394,27 @@ public: } return VFR_RETURN_SUCCESS; } + + VOID ShrinkBinSize (IN UINT16 Size) { + // + // Update the buffer size which is truly be used later. + // + ShrinkObjBin(Size); + DecLength(Size); + + // + // Allocate buffer in gCFormPkg. + // + _EMIT_PENDING_OBJ(); + + // + // Update the buffer pointer used by other class. + // + mOneOf = (EFI_IFR_ONE_OF *) GetObjBinAddr(); + UpdateHeader (&mOneOf->Header); + UpdateCIfrQuestionHeader(&mOneOf->Question); + UpdateCIfrMinMaxStepData(&mOneOf->data); + } }; class CIfrString : public CIfrObj, public CIfrOpHeader, public CIfrQuestionHeader { @@ -1581,12 +1677,12 @@ private: EFI_IFR_ONE_OF_OPTION *mOneOfOption; public: - CIfrOneOfOption () : CIfrObj (EFI_IFR_ONE_OF_OPTION_OP, (CHAR8 **)&mOneOfOption), - CIfrOpHeader (EFI_IFR_ONE_OF_OPTION_OP, &mOneOfOption->Header) { + CIfrOneOfOption (UINT8 Size) : CIfrObj (EFI_IFR_ONE_OF_OPTION_OP, (CHAR8 **)&mOneOfOption, Size), + CIfrOpHeader (EFI_IFR_ONE_OF_OPTION_OP, &mOneOfOption->Header, Size) { mOneOfOption->Flags = 0; mOneOfOption->Option = EFI_STRING_ID_INVALID; mOneOfOption->Type = EFI_IFR_TYPE_OTHER; - memset (&mOneOfOption->Value, 0, sizeof (mOneOfOption->Value)); + memset (&mOneOfOption->Value, 0, Size - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value)); } VOID SetOption (IN EFI_STRING_ID Option) { @@ -1639,7 +1735,7 @@ public: } VOID SetValue (IN EFI_IFR_TYPE_VALUE Value) { - mOneOfOption->Value = Value; + memcpy (&mOneOfOption->Value, &Value, mOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value)); } UINT8 GetFlags (VOID) { diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g index d55a80672b..253834508a 100644 --- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g +++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g @@ -1,5 +1,5 @@ /*++ -Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -494,6 +494,7 @@ vfrFormSetDefinition : UINT8 ClassGuidNum = 0; CIfrFormSet *FSObj = NULL; UINT16 C, SC; + CHAR8* InsertOpcodeAddr = NULL; >> L:FormSet Uuid "=" guidDefinition[Guid] "," @@ -585,7 +586,38 @@ vfrFormSetDefinition : // _DeclareDefaultFrameworkVarStore (GET_LINENO(E)); } - CRT_END_OP (E); if (FSObj != NULL) delete FSObj; + + // + // Declare undefined Question so that they can be used in expression. + // + if (gCFormPkg.HavePendingUnassigned()) { + mParserStatus += gCFormPkg.DeclarePendingQuestion ( + gCVfrVarDataTypeDB, + mCVfrDataStorage, + mCVfrQuestionDB, + &mFormsetGuid, + E->getLine(), + &InsertOpcodeAddr + ); + gNeedAdjustOpcode = TRUE; + } + + CRT_END_OP (E); + + // + // Adjust the pending question position. + // Move the position from current to before the end of the last form in the form set. + // + if (gNeedAdjustOpcode) { + gCFormPkg.AdjustDynamicInsertOpcode ( + mLastFormEndAddr, + InsertOpcodeAddr + ); + } + + if (FSObj != NULL) { + delete FSObj; + } >> ";" ; @@ -866,7 +898,7 @@ vfrStatementVarStoreLinear : VarStoreId ), LineNum); VSObj.SetGuid (&Guid); - _PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId), SN); + _PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId, &Guid), SN); VSObj.SetVarStoreId (VarStoreId); _PCATCH(gCVfrVarDataTypeDB.GetDataTypeSize(TypeName, &Size), LineNum); VSObj.SetSize ((UINT16) Size); @@ -952,7 +984,7 @@ vfrStatementVarStoreEfi : TypeName, VarStoreId ), LineNum); - _PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId), SN); + _PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId, &Guid), SN); _PCATCH(gCVfrVarDataTypeDB.GetDataTypeSize(TypeName, &Size), LineNum); } else { _PCATCH(mCVfrDataStorage.DeclareBufferVarStore ( @@ -962,7 +994,7 @@ vfrStatementVarStoreEfi : TypeName, VarStoreId ), LineNum); - _PCATCH(mCVfrDataStorage.GetVarStoreId(TN->getText(), &VarStoreId), VN); + _PCATCH(mCVfrDataStorage.GetVarStoreId(TN->getText(), &VarStoreId, &Guid), VN); _PCATCH(gCVfrVarDataTypeDB.GetDataTypeSize(TypeName, &Size), N->getLine()); } VSEObj.SetGuid (&Guid); @@ -995,7 +1027,7 @@ vfrStatementVarStoreNameValue : Uuid "=" guidDefinition[Guid] << _PCATCH(mCVfrDataStorage.DeclareNameVarStoreEnd (&Guid), SN); >> << VSNVObj.SetGuid (&Guid); - _PCATCH(mCVfrDataStorage.GetVarStoreId(SN->getText(), &VarStoreId), SN); + _PCATCH(mCVfrDataStorage.GetVarStoreId(SN->getText(), &VarStoreId, &Guid), SN); VSNVObj.SetVarStoreId (VarStoreId); >> ";" @@ -1069,9 +1101,14 @@ vfrStatementHeader[CIfrStatementHeader *SHObj] : vfrQuestionHeader[CIfrQuestionHeader & QHObj, EFI_QUESION_TYPE QType = QUESTION_NORMAL]: << EFI_VARSTORE_INFO Info; + Info.mVarType = EFI_IFR_TYPE_OTHER; + Info.mVarTotalSize = 0; + Info.mInfo.mVarOffset = EFI_VAROFFSET_INVALID; + Info.mVarStoreId = EFI_VARSTORE_ID_INVALID; EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID; CHAR8 *QName = NULL; CHAR8 *VarIdStr = NULL; + mUsedDefaultCount = 0; >> { Name "=" QN:StringIdentifier "," << @@ -1119,8 +1156,8 @@ vfrQuestionHeader[CIfrQuestionHeader & QHObj, EFI_QUESION_TYPE QType = QUESTION_ << if (VarIdStr != NULL) { delete VarIdStr; - _SAVE_CURRQEST_VARINFO (Info); } + _SAVE_CURRQEST_VARINFO (Info); >> ; @@ -1144,6 +1181,7 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl CHAR8 *TName = NULL; EFI_VFR_RETURN_CODE VfrReturnCode = VFR_RETURN_SUCCESS; EFI_IFR_TYPE_VALUE Dummy = gZeroEfiIfrTypeValue; + EFI_GUID *VarGuid = NULL; >> ( SN1:StringIdentifier << SName = SN1->getText(); _STRCAT(&VarIdStr, SN1->getText()); >> @@ -1154,7 +1192,7 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl _STRCAT(&VarIdStr, "]"); >> << - VfrReturnCode = mCVfrDataStorage.GetVarStoreType (SName, VarStoreType); + VfrReturnCode = mCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId); if (mCompatibleMode && VfrReturnCode == VFR_RETURN_UNDEFINED) { mCVfrDataStorage.DeclareBufferVarStore ( SName, @@ -1164,11 +1202,10 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl EFI_VARSTORE_ID_INVALID, FALSE ); - VfrReturnCode = mCVfrDataStorage.GetVarStoreType (SName, VarStoreType); + VfrReturnCode = mCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId, &mFormsetGuid); } if (CheckFlag || VfrReturnCode == VFR_RETURN_SUCCESS) { _PCATCH(VfrReturnCode, SN1); - _PCATCH(mCVfrDataStorage.GetVarStoreId (SName, &$Info.mVarStoreId), SN1); _PCATCH(mCVfrDataStorage.GetNameVarStoreInfo (&$Info, Idx), SN1); } @@ -1179,7 +1216,7 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl ( SN2:StringIdentifier << SName = SN2->getText(); _STRCAT(&VarIdStr, SName); >> << - VfrReturnCode = mCVfrDataStorage.GetVarStoreType (SName, VarStoreType); + VfrReturnCode = mCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId); if (mCompatibleMode && VfrReturnCode == VFR_RETURN_UNDEFINED) { mCVfrDataStorage.DeclareBufferVarStore ( SName, @@ -1189,13 +1226,13 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl EFI_VARSTORE_ID_INVALID, FALSE ); - VfrReturnCode = mCVfrDataStorage.GetVarStoreType (SName, VarStoreType); + VfrReturnCode = mCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId, &mFormsetGuid); } if (CheckFlag || VfrReturnCode == VFR_RETURN_SUCCESS) { _PCATCH(VfrReturnCode, SN2); - _PCATCH(mCVfrDataStorage.GetVarStoreId (SName, &$Info.mVarStoreId), SN2); + VarStoreType = mCVfrDataStorage.GetVarStoreType ($Info.mVarStoreId); if (VarStoreType == EFI_VFR_VARSTORE_BUFFER) { - _PCATCH(mCVfrDataStorage.GetBufferVarStoreDataTypeName(SName, &TName), SN2); + _PCATCH(mCVfrDataStorage.GetBufferVarStoreDataTypeName(Info.mVarStoreId, &TName), SN2); _STRCAT(&VarStr, TName); } } @@ -1234,13 +1271,16 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl break; case EFI_VFR_VARSTORE_BUFFER: _PCATCH(gCVfrVarDataTypeDB.GetDataFieldInfo (VarStr, $Info.mInfo.mVarOffset, $Info.mVarType, $Info.mVarTotalSize), SN2->getLine(), VarStr); + VarGuid = mCVfrDataStorage.GetVarStoreGuid($Info.mVarStoreId); _PCATCH((EFI_VFR_RETURN_CODE)gCVfrBufferConfig.Register ( SName, + VarGuid, NULL), SN2->getLine()); _PCATCH((EFI_VFR_RETURN_CODE)gCVfrBufferConfig.Write ( 'a', SName, + VarGuid, NULL, $Info.mVarType, $Info.mInfo.mVarOffset, @@ -1389,23 +1429,7 @@ vfrFormDefinition : LObj3.SetNumber (0xffff); //add end label for UEFI, label number hardcode 0xffff } - // - // Declare undefined Question so that they can be used in expression. - // - if (gCFormPkg.HavePendingUnassigned()) { - gCFormPkg.DeclarePendingQuestion ( - gCVfrVarDataTypeDB, - mCVfrDataStorage, - mCVfrQuestionDB, - &mFormsetGuid, - E->getLine() - ); - } - - // - // mCVfrQuestionDB.PrintAllQuestion(); - // - CRT_END_OP (E); + {CIfrEnd EObj; EObj.SetLineNo (E->getLine()); mLastFormEndAddr = EObj.GetObjBinAddr (); gAdjustOpcodeOffset = EObj.GetObjBinOffset ();} >> ";" ; @@ -1455,42 +1479,72 @@ vfrStatementDefault : << BOOLEAN IsExp = FALSE; EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; - CIfrDefault DObj; + CIfrDefault *DObj = NULL; + CIfrDefault2 *DObj2 = NULL; EFI_DEFAULT_ID DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD; CHAR8 *VarStoreName = NULL; EFI_VFR_VARSTORE_TYPE VarStoreType = EFI_VFR_VARSTORE_INVALID; + UINT32 Size = 0; + EFI_GUID *VarGuid = NULL; >> - D:Default << DObj.SetLineNo(D->getLine()); >> + D:Default ( ( - vfrStatementValue "," << IsExp = TRUE; DObj.SetScope (1); CIfrEnd EndObj1; EndObj1.SetLineNo(D->getLine()); >> - | "=" vfrConstantValueField[_GET_CURRQEST_DATATYPE()] > [Val] "," << + "=" vfrConstantValueField[_GET_CURRQEST_DATATYPE()] > [Val] "," + << if (gCurrentMinMaxData != NULL && gCurrentMinMaxData->IsNumericOpcode()) { //check default value is valid for Numeric Opcode if (Val.u64 < gCurrentMinMaxData->GetMinData(_GET_CURRQEST_DATATYPE()) || Val.u64 > gCurrentMinMaxData->GetMaxData(_GET_CURRQEST_DATATYPE())) { _PCATCH (VFR_RETURN_INVALID_PARAMETER, D->getLine(), "Numeric default value must be between MinValue and MaxValue."); } } - DObj.SetType (_GET_CURRQEST_DATATYPE()); - DObj.SetValue(Val); + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + _PCATCH (VFR_RETURN_FATAL_ERROR, D->getLine(), "Default data type error."); + Size = sizeof (EFI_IFR_TYPE_VALUE); + } else { + _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &Size), D->getLine()); + } + Size += OFFSET_OF (EFI_IFR_DEFAULT, Value); + DObj = new CIfrDefault ((UINT8)Size); + DObj->SetLineNo(D->getLine()); + DObj->SetType (_GET_CURRQEST_DATATYPE()); + DObj->SetValue(Val); >> + | << IsExp = TRUE; DObj2 = new CIfrDefault2; DObj2->SetLineNo(D->getLine()); DObj2->SetScope (1); >> + vfrStatementValue "," << CIfrEnd EndObj1; EndObj1.SetLineNo(D->getLine()); >> ) { - DefaultStore "=" SN:StringIdentifier "," << _PCATCH(mCVfrDefaultStore.GetDefaultId (SN->getText(), &DefaultId), SN); DObj.SetDefaultId (DefaultId); >> + DefaultStore "=" SN:StringIdentifier "," << + _PCATCH(mCVfrDefaultStore.GetDefaultId (SN->getText(), &DefaultId), SN); + if (DObj != NULL) { + DObj->SetDefaultId (DefaultId); + } + + if (DObj2 != NULL) { + DObj2->SetDefaultId (DefaultId); + } + >> } << + CheckDuplicateDefaultValue (DefaultId, D); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), D->getLine()); - _PCATCH(mCVfrDataStorage.GetVarStoreType (VarStoreName, VarStoreType), D->getLine()); + VarGuid = mCVfrDataStorage.GetVarStoreGuid(_GET_CURRQEST_VARTINFO().mVarStoreId); + VarStoreType = mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId); if ((IsExp == FALSE) && (VarStoreType == EFI_VFR_VARSTORE_BUFFER)) { _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( DefaultId, _GET_CURRQEST_VARTINFO(), VarStoreName, + VarGuid, _GET_CURRQEST_DATATYPE (), - Val), - D->getLine() - ); + Val), + D->getLine() + ); + } } + if (DObj != NULL) {delete DObj;} + if (DObj2 != NULL) {delete DObj2;} >> ) ; @@ -1755,7 +1809,11 @@ vfrStatementGoto : default: break; } >> - vfrQuestionHeader[*QHObj, QUESTION_REF] + vfrQuestionHeader[*QHObj, QUESTION_REF] << + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + _GET_CURRQEST_VARTINFO().mVarType = EFI_IFR_TYPE_REF; + } + >> { "," F:FLAGS "=" vfrGotoFlags[QHObj, F->getLine()] } { "," Key "=" KN:Number << AssignQuestionKey (*QHObj, KN); >> @@ -1824,49 +1882,62 @@ vfrStatementCheckBox : EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; CHAR8 *VarStoreName = NULL; UINT32 DataTypeSize; + EFI_GUID *VarStoreGuid = NULL; >> L:CheckBox << CBObj.SetLineNo(L->getLine()); >> vfrQuestionHeader[CBObj] "," << //check data type - _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "CheckBox varid is not the valid data type"); - if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { - _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "CheckBox varid doesn't support array"); - } else if ((mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId) == EFI_VFR_VARSTORE_BUFFER) && - (_GET_CURRQEST_VARSIZE() != sizeof (BOOLEAN))) { - _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "CheckBox varid only support BOOLEAN data type"); + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + _GET_CURRQEST_VARTINFO().mVarType = EFI_IFR_TYPE_BOOLEAN; + } + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "CheckBox varid is not the valid data type"); + if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "CheckBox varid doesn't support array"); + } else if ((mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId) == EFI_VFR_VARSTORE_BUFFER) && + (_GET_CURRQEST_VARSIZE() != sizeof (BOOLEAN))) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "CheckBox varid only support BOOLEAN data type"); + } } >> { F:FLAGS "=" vfrCheckBoxFlags[CBObj, F->getLine()] "," << - _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), VFR_RETURN_SUCCESS, L, "Failed to retrieve varstore name"); - Val.b = TRUE; - if (CBObj.GetFlags () & 0x01) { - _PCATCH( - mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( - EFI_HII_DEFAULT_CLASS_STANDARD, - _GET_CURRQEST_VARTINFO(), - VarStoreName, - _GET_CURRQEST_DATATYPE (), - Val - ), - VFR_RETURN_SUCCESS, - L, - "No standard default storage found" - ); - } - if (CBObj.GetFlags () & 0x02) { - _PCATCH( - mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( - EFI_HII_DEFAULT_CLASS_MANUFACTURING, - _GET_CURRQEST_VARTINFO(), - VarStoreName, - _GET_CURRQEST_DATATYPE (), - Val - ), - VFR_RETURN_SUCCESS, - L, - "No manufacturing default storage found" - ); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), VFR_RETURN_SUCCESS, L, "Failed to retrieve varstore name"); + VarStoreGuid = mCVfrDataStorage.GetVarStoreGuid(_GET_CURRQEST_VARTINFO().mVarStoreId); + Val.b = TRUE; + if (CBObj.GetFlags () & 0x01) { + CheckDuplicateDefaultValue (EFI_HII_DEFAULT_CLASS_STANDARD, F); + _PCATCH( + mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( + EFI_HII_DEFAULT_CLASS_STANDARD, + _GET_CURRQEST_VARTINFO(), + VarStoreName, + VarStoreGuid, + _GET_CURRQEST_DATATYPE (), + Val + ), + VFR_RETURN_SUCCESS, + L, + "No standard default storage found" + ); + } + if (CBObj.GetFlags () & 0x02) { + CheckDuplicateDefaultValue (EFI_HII_DEFAULT_CLASS_MANUFACTURING, F); + _PCATCH( + mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( + EFI_HII_DEFAULT_CLASS_MANUFACTURING, + _GET_CURRQEST_VARTINFO(), + VarStoreName, + VarStoreGuid, + _GET_CURRQEST_DATATYPE (), + Val + ), + VFR_RETURN_SUCCESS, + L, + "No manufacturing default storage found" + ); + } } >> } @@ -1962,11 +2033,16 @@ vfrStatementDate : CHAR8 *VarIdStr[3] = {NULL, }; CIfrDate DObj; EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; + UINT8 Size = OFFSET_OF (EFI_IFR_DEFAULT, Value) + sizeof (EFI_HII_DATE); >> L:Date << DObj.SetLineNo(L->getLine()); >> ( ( - vfrQuestionHeader[DObj, QUESTION_DATE] "," + vfrQuestionHeader[DObj, QUESTION_DATE] "," << + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + _GET_CURRQEST_VARTINFO().mVarType = EFI_IFR_TYPE_DATE; + } + >> { F:FLAGS "=" vfrDateFlags[DObj, F->getLine()] "," } vfrStatementQuestionOptionList ) @@ -1998,7 +2074,7 @@ vfrStatementDate : DObj.SetHelp (_STOSID(YH->getText())); if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; } >> - << {CIfrDefault DefaultObj(EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_DATE, Val); DefaultObj.SetLineNo(L->getLine());} >> + << {CIfrDefault DefaultObj(Size, EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_DATE, Val); DefaultObj.SetLineNo(L->getLine());} >> ) ( vfrStatementInconsistentIf )* ) @@ -2126,38 +2202,45 @@ vfrSetMinMaxStep[CIfrMinMaxStepData & MMSDObj] : vfrStatementNumeric : << CIfrNumeric NObj; - UINT32 DataTypeSize; - BOOLEAN IsSupported; + UINT32 DataTypeSize; + BOOLEAN IsSupported = TRUE; + UINT8 ShrinkSize = 0; >> L:Numeric << NObj.SetLineNo(L->getLine()); >> vfrQuestionHeader[NObj] "," << // check data type - _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "Numeric varid is not the valid data type"); - if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { - _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Numeric varid doesn't support array"); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "Numeric varid is not the valid data type"); + if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Numeric varid doesn't support array"); + } + _PCATCH(NObj.SetFlags (NObj.FLAGS(), _GET_CURRQEST_DATATYPE()), L->getLine()); } - _PCATCH(NObj.SetFlags (NObj.FLAGS(), _GET_CURRQEST_DATATYPE()), L->getLine()); >> { F:FLAGS "=" vfrNumericFlags[NObj, F->getLine()] "," } { Key "=" KN:Number "," << AssignQuestionKey (NObj, KN); >> } - vfrSetMinMaxStep[NObj] - vfrStatementQuestionOptionList - E:EndNumeric << - IsSupported = FALSE; + vfrSetMinMaxStep[NObj] << switch (_GET_CURRQEST_DATATYPE()) { - case EFI_IFR_TYPE_NUM_SIZE_8: - case EFI_IFR_TYPE_NUM_SIZE_16: - case EFI_IFR_TYPE_NUM_SIZE_32: - case EFI_IFR_TYPE_NUM_SIZE_64: - IsSupported = TRUE; - break; - default: + // + // Base on the type to know the actual used size,shrink the buffer + // size allocate before. + // + case EFI_IFR_TYPE_NUM_SIZE_8: ShrinkSize = 21;break; + case EFI_IFR_TYPE_NUM_SIZE_16:ShrinkSize = 18;break; + case EFI_IFR_TYPE_NUM_SIZE_32:ShrinkSize = 12;break; + case EFI_IFR_TYPE_NUM_SIZE_64:break; + default: + IsSupported = FALSE; break; } + NObj.ShrinkBinSize (ShrinkSize); if (!IsSupported) { _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Numeric question only support UINT8, UINT16, UINT32 and UINT64 data type."); } + >> + vfrStatementQuestionOptionList + E:EndNumeric << CRT_END_OP (E); >> ";" @@ -2168,32 +2251,37 @@ vfrNumericFlags [CIfrNumeric & NObj, UINT32 LineNum] : UINT8 LFlags = _GET_CURRQEST_DATATYPE() & EFI_IFR_NUMERIC_SIZE; UINT8 HFlags = 0; EFI_VFR_VARSTORE_TYPE VarStoreType = EFI_VFR_VARSTORE_INVALID; + BOOLEAN IsSetType = FALSE; >> - numericFlagsField[HFlags, LFlags] ( "\|" numericFlagsField[HFlags, LFlags] )* + numericFlagsField[HFlags, LFlags, IsSetType] ( "\|" numericFlagsField[HFlags, LFlags, IsSetType] )* << //check data type flag - VarStoreType = mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId); - if (VarStoreType == EFI_VFR_VARSTORE_BUFFER || VarStoreType == EFI_VFR_VARSTORE_EFI) { - if (_GET_CURRQEST_DATATYPE() != (LFlags & EFI_IFR_NUMERIC_SIZE)) { - _PCATCH(VFR_RETURN_INVALID_PARAMETER, LineNum, "Numeric Flag is not same to Numeric VarData type"); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + VarStoreType = mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId); + if (VarStoreType == EFI_VFR_VARSTORE_BUFFER || VarStoreType == EFI_VFR_VARSTORE_EFI) { + if (_GET_CURRQEST_DATATYPE() != (LFlags & EFI_IFR_NUMERIC_SIZE)) { + _PCATCH(VFR_RETURN_INVALID_PARAMETER, LineNum, "Numeric Flag is not same to Numeric VarData type"); + } + } else { + // update data type for name/value store + UINT32 DataTypeSize; + _GET_CURRQEST_VARTINFO().mVarType = LFlags & EFI_IFR_NUMERIC_SIZE; + gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize); + _GET_CURRQEST_VARTINFO().mVarTotalSize = DataTypeSize; } - } else { - // update data type for name/value store - UINT32 DataTypeSize; + } else if (IsSetType){ _GET_CURRQEST_VARTINFO().mVarType = LFlags & EFI_IFR_NUMERIC_SIZE; - gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize); - _GET_CURRQEST_VARTINFO().mVarTotalSize = DataTypeSize; } _PCATCH(NObj.SetFlags (HFlags, LFlags), LineNum); >> ; -numericFlagsField [UINT8 & HFlags, UINT8 & LFlags] : +numericFlagsField [UINT8 & HFlags, UINT8 & LFlags, BOOLEAN & IsSetType] : N:Number << _PCATCH(_STOU8(N->getText()) == 0 ? VFR_RETURN_SUCCESS : VFR_RETURN_UNSUPPORTED, N->getLine()); >> - | "NUMERIC_SIZE_1" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_1; >> - | "NUMERIC_SIZE_2" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_2; >> - | "NUMERIC_SIZE_4" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_4; >> - | "NUMERIC_SIZE_8" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_8; >> + | "NUMERIC_SIZE_1" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_1; IsSetType = TRUE;>> + | "NUMERIC_SIZE_2" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_2; IsSetType = TRUE;>> + | "NUMERIC_SIZE_4" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_4; IsSetType = TRUE;>> + | "NUMERIC_SIZE_8" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_8; IsSetType = TRUE;>> | "DISPLAY_INT_DEC" << $LFlags = ($LFlags & ~EFI_IFR_DISPLAY) | EFI_IFR_DISPLAY_INT_DEC; >> | "DISPLAY_UINT_DEC" << $LFlags = ($LFlags & ~EFI_IFR_DISPLAY) | EFI_IFR_DISPLAY_UINT_DEC; >> | "DISPLAY_UINT_HEX" << $LFlags = ($LFlags & ~EFI_IFR_DISPLAY) | EFI_IFR_DISPLAY_UINT_HEX; >> @@ -2204,36 +2292,44 @@ vfrStatementOneOf : << CIfrOneOf OObj; UINT32 DataTypeSize; - BOOLEAN IsSupported; + BOOLEAN IsSupported = TRUE; + UINT8 ShrinkSize = 0; >> L:OneOf << OObj.SetLineNo(L->getLine()); >> vfrQuestionHeader[OObj] "," << //check data type - _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "OneOf varid is not the valid data type"); - if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { - _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "OneOf varid doesn't support array"); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "OneOf varid is not the valid data type"); + if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "OneOf varid doesn't support array"); + } + _PCATCH(OObj.SetFlags (OObj.FLAGS(), _GET_CURRQEST_DATATYPE()), L->getLine()); } - _PCATCH(OObj.SetFlags (OObj.FLAGS(), _GET_CURRQEST_DATATYPE()), L->getLine()); >> { F:FLAGS "=" vfrOneofFlagsField[OObj, F->getLine()] "," } { vfrSetMinMaxStep[OObj] } - vfrStatementQuestionOptionList - E:EndOneOf << - IsSupported = FALSE; + << switch (_GET_CURRQEST_DATATYPE()) { - case EFI_IFR_TYPE_NUM_SIZE_8: - case EFI_IFR_TYPE_NUM_SIZE_16: - case EFI_IFR_TYPE_NUM_SIZE_32: - case EFI_IFR_TYPE_NUM_SIZE_64: - IsSupported = TRUE; - break; + // + // Base on the type to know the actual used size,shrink the buffer + // size allocate before. + // + case EFI_IFR_TYPE_NUM_SIZE_8: ShrinkSize = 21;break; + case EFI_IFR_TYPE_NUM_SIZE_16:ShrinkSize = 18;break; + case EFI_IFR_TYPE_NUM_SIZE_32:ShrinkSize = 12;break; + case EFI_IFR_TYPE_NUM_SIZE_64:break; default: + IsSupported = FALSE; break; } + OObj.ShrinkBinSize (ShrinkSize); if (!IsSupported) { _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "OneOf question only support UINT8, UINT16, UINT32 and UINT64 data type."); } + >> + vfrStatementQuestionOptionList + E:EndOneOf << CRT_END_OP (E); >> ";" @@ -2244,21 +2340,26 @@ vfrOneofFlagsField [CIfrOneOf & OObj, UINT32 LineNum] : UINT8 LFlags = _GET_CURRQEST_DATATYPE() & EFI_IFR_NUMERIC_SIZE; UINT8 HFlags = 0; EFI_VFR_VARSTORE_TYPE VarStoreType = EFI_VFR_VARSTORE_INVALID; + BOOLEAN IsSetType = FALSE; >> - numericFlagsField[HFlags, LFlags] ( "\|" numericFlagsField[HFlags, LFlags] )* + numericFlagsField[HFlags, LFlags, IsSetType] ( "\|" numericFlagsField[HFlags, LFlags, IsSetType] )* << //check data type flag - VarStoreType = mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId); - if (VarStoreType == EFI_VFR_VARSTORE_BUFFER || VarStoreType == EFI_VFR_VARSTORE_EFI) { - if (_GET_CURRQEST_DATATYPE() != (LFlags & EFI_IFR_NUMERIC_SIZE)) { - _PCATCH(VFR_RETURN_INVALID_PARAMETER, LineNum, "Numeric Flag is not same to Numeric VarData type"); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + VarStoreType = mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId); + if (VarStoreType == EFI_VFR_VARSTORE_BUFFER || VarStoreType == EFI_VFR_VARSTORE_EFI) { + if (_GET_CURRQEST_DATATYPE() != (LFlags & EFI_IFR_NUMERIC_SIZE)) { + _PCATCH(VFR_RETURN_INVALID_PARAMETER, LineNum, "Numeric Flag is not same to Numeric VarData type"); + } + } else { + // update data type for Name/Value store + UINT32 DataTypeSize; + _GET_CURRQEST_VARTINFO().mVarType = LFlags & EFI_IFR_NUMERIC_SIZE; + gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize); + _GET_CURRQEST_VARTINFO().mVarTotalSize = DataTypeSize; } - } else { - // update data type for Name/Value store - UINT32 DataTypeSize; + } else if (IsSetType){ _GET_CURRQEST_VARTINFO().mVarType = LFlags & EFI_IFR_NUMERIC_SIZE; - gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize); - _GET_CURRQEST_VARTINFO().mVarTotalSize = DataTypeSize; } _PCATCH(OObj.SetFlags (HFlags, LFlags), LineNum); >> @@ -2423,11 +2524,16 @@ vfrStatementTime : CHAR8 *VarIdStr[3] = {NULL, }; CIfrTime TObj; EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; + UINT8 Size = OFFSET_OF (EFI_IFR_DEFAULT, Value) + sizeof (EFI_HII_TIME); >> L:Time << TObj.SetLineNo(L->getLine()); >> ( ( - vfrQuestionHeader[TObj, QUESTION_TIME] "," + vfrQuestionHeader[TObj, QUESTION_TIME] "," << + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + _GET_CURRQEST_VARTINFO().mVarType = EFI_IFR_TYPE_TIME; + } + >> { F:FLAGS "=" vfrTimeFlags[TObj, F->getLine()] "," } vfrStatementQuestionOptionList ) @@ -2459,7 +2565,7 @@ vfrStatementTime : TObj.SetHelp (_STOSID(HH->getText())); if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; } >> - << {CIfrDefault DefaultObj(EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_TIME, Val); DefaultObj.SetLineNo(L->getLine());} >> + << {CIfrDefault DefaultObj(Size, EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_TIME, Val); DefaultObj.SetLineNo(L->getLine());} >> ) ( vfrStatementInconsistentIf )* ) @@ -2774,11 +2880,32 @@ vfrStatementOptions : vfrStatementOneOfOption : << - EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; - CIfrOneOfOption OOOObj; + EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; CHAR8 *VarStoreName = NULL; + UINT32 Size = 0; + BOOLEAN TypeError = FALSE; + EFI_VFR_RETURN_CODE ReturnCode = VFR_RETURN_SUCCESS; + EFI_GUID *VarStoreGuid = NULL; + + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + TypeError = TRUE; + Size = sizeof (EFI_IFR_TYPE_VALUE); + } else { + ReturnCode = gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &Size); + } + + Size += OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value); + CIfrOneOfOption OOOObj ((UINT8)Size); >> - L:Option << OOOObj.SetLineNo(L->getLine()); >> + L:Option << + OOOObj.SetLineNo(L->getLine()); + if (TypeError) { + _PCATCH (VFR_RETURN_FATAL_ERROR, L->getLine(), "Get data type error."); + } + if (ReturnCode != VFR_RETURN_SUCCESS) { + _PCATCH (ReturnCode, L->getLine()); + } + >> Text "=" "STRING_TOKEN" "\(" S:Number "\)" "," << OOOObj.SetOption (_STOSID(S->getText())); >> Value "=" vfrConstantValueField[_GET_CURRQEST_DATATYPE()] >[Val] "," << @@ -2807,24 +2934,31 @@ vfrStatementOneOfOption : >> F:FLAGS "=" vfrOneOfOptionFlags[OOOObj, F->getLine()] << - _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), L->getLine()); - if (OOOObj.GetFlags () & 0x10) { - _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( - EFI_HII_DEFAULT_CLASS_STANDARD, - _GET_CURRQEST_VARTINFO(), - VarStoreName, - _GET_CURRQEST_DATATYPE (), - Val - ), L->getLine()); - } - if (OOOObj.GetFlags () & 0x20) { - _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( - EFI_HII_DEFAULT_CLASS_MANUFACTURING, - _GET_CURRQEST_VARTINFO(), - VarStoreName, - _GET_CURRQEST_DATATYPE (), - Val - ), L->getLine()); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), L->getLine()); + VarStoreGuid = mCVfrDataStorage.GetVarStoreGuid(_GET_CURRQEST_VARTINFO().mVarStoreId); + if (OOOObj.GetFlags () & 0x10) { + CheckDuplicateDefaultValue (EFI_HII_DEFAULT_CLASS_STANDARD, F); + _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( + EFI_HII_DEFAULT_CLASS_STANDARD, + _GET_CURRQEST_VARTINFO(), + VarStoreName, + VarStoreGuid, + _GET_CURRQEST_DATATYPE (), + Val + ), L->getLine()); + } + if (OOOObj.GetFlags () & 0x20) { + CheckDuplicateDefaultValue (EFI_HII_DEFAULT_CLASS_MANUFACTURING, F); + _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( + EFI_HII_DEFAULT_CLASS_MANUFACTURING, + _GET_CURRQEST_VARTINFO(), + VarStoreName, + VarStoreGuid, + _GET_CURRQEST_DATATYPE (), + Val + ), L->getLine()); + } } >> { @@ -3237,8 +3371,8 @@ vareqvalExp [UINT32 & RootLevel, UINT32 & ExpOpCount] : UINT16 ConstVal; CHAR8 *VarIdStr; UINT32 LineNo; - EFI_VFR_VARSTORE_TYPE VarStoreType = EFI_VFR_VARSTORE_INVALID; EFI_VFR_RETURN_CODE VfrReturnCode = VFR_RETURN_SUCCESS; + EFI_VARSTORE_ID VarStoreId = EFI_VARSTORE_ID_INVALID; >> L:VarEqVal << if (!mCompatibleMode) { @@ -3249,7 +3383,7 @@ vareqvalExp [UINT32 & RootLevel, UINT32 & ExpOpCount] : OpenParen VN:Number << VarIdStr = NULL; _STRCAT(&VarIdStr, VK->getText()); _STRCAT(&VarIdStr, VN->getText()); - VfrReturnCode = mCVfrDataStorage.GetVarStoreType (VarIdStr, VarStoreType); + VfrReturnCode = mCVfrDataStorage.GetVarStoreId (VarIdStr, &VarStoreId); if (VfrReturnCode == VFR_RETURN_UNDEFINED) { _PCATCH (mCVfrDataStorage.DeclareEfiVarStore ( VarIdStr, @@ -3887,6 +4021,13 @@ private: EFI_VARSTORE_INFO mCurrQestVarInfo; EFI_GUID *mOverrideClassGuid; + CHAR8* mLastFormEndAddr; + +// +// Whether the question already has default value. +// + UINT16 mUsedDefaultArray[EFI_IFR_MAX_DEFAULT_TYPE]; + UINT16 mUsedDefaultCount; // // For framework vfr compatibility @@ -3902,6 +4043,7 @@ private: UINT8 _GET_CURRQEST_DATATYPE (); UINT32 _GET_CURRQEST_VARSIZE (); UINT32 _GET_CURRQEST_ARRAY_SIZE(); + VOID CheckDuplicateDefaultValue (IN EFI_DEFAULT_ID, IN ANTLRTokenPtr); public: VOID _PCATCH (IN INTN, IN INTN, IN ANTLRTokenPtr, IN CONST CHAR8 *); @@ -4485,7 +4627,7 @@ EfiVfrParser::_DeclareDefaultLinearVarStore ( TypeNameList[Index], EFI_VARSTORE_ID_INVALID ); - mCVfrDataStorage.GetVarStoreId(TypeNameList[Index], &VarStoreId); + mCVfrDataStorage.GetVarStoreId(TypeNameList[Index], &VarStoreId, &mFormsetGuid); VSObj.SetVarStoreId (VarStoreId); gCVfrVarDataTypeDB.GetDataTypeSize(TypeNameList[Index], &Size); VSObj.SetSize ((UINT16) Size); @@ -4510,7 +4652,7 @@ EfiVfrParser::_DeclareDefaultLinearVarStore ( (CHAR8 *) DateType, EFI_VARSTORE_ID_INVALID ); - mCVfrDataStorage.GetVarStoreId((CHAR8 *) DateName, &VarStoreId); + mCVfrDataStorage.GetVarStoreId((CHAR8 *) DateName, &VarStoreId, &mFormsetGuid); VSObj.SetVarStoreId (VarStoreId); gCVfrVarDataTypeDB.GetDataTypeSize((CHAR8 *) DateType, &Size); VSObj.SetSize ((UINT16) Size); @@ -4531,7 +4673,7 @@ EfiVfrParser::_DeclareDefaultLinearVarStore ( (CHAR8 *) TimeType, EFI_VARSTORE_ID_INVALID ); - mCVfrDataStorage.GetVarStoreId((CHAR8 *) TimeName, &VarStoreId); + mCVfrDataStorage.GetVarStoreId((CHAR8 *) TimeName, &VarStoreId, &mFormsetGuid); VSObj.SetVarStoreId (VarStoreId); gCVfrVarDataTypeDB.GetDataTypeSize((CHAR8 *) TimeType, &Size); VSObj.SetSize ((UINT16) Size); @@ -4762,4 +4904,25 @@ EfiVfrParser::SetCompatibleMode (IN BOOLEAN Mode) mCompatibleMode = Mode; mCVfrQuestionDB.SetCompatibleMode (Mode); } + +VOID +EfiVfrParser::CheckDuplicateDefaultValue ( + IN EFI_DEFAULT_ID DefaultId, + IN ANTLRTokenPtr Tok + ) +{ + UINT16 Index; + + for(Index = 0; Index < mUsedDefaultCount; Index++) { + if (mUsedDefaultArray[Index] == DefaultId) { + gCVfrErrorHandle.HandleWarning (VFR_WARNING_DEFAULT_VALUE_REDEFINED, Tok->getLine(), Tok->getText()); + } + } + + if (mUsedDefaultCount >= EFI_IFR_MAX_DEFAULT_TYPE - 1) { + gCVfrErrorHandle.HandleError (VFR_RETURN_FATAL_ERROR, Tok->getLine(), Tok->getText()); + } + + mUsedDefaultArray[mUsedDefaultCount++] = DefaultId; +} >> diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp index 0444677e86..21a479db68 100644 --- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp @@ -2,7 +2,7 @@ Vfr common library functions. -Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -123,11 +123,13 @@ SConfigInfo::~SConfigInfo ( SConfigItem::SConfigItem ( IN CHAR8 *Name, + IN EFI_GUID *Guid, IN CHAR8 *Id ) { mName = NULL; - mId = 0; + mGuid = NULL; + mId = NULL; mInfoStrList = NULL; mNext = NULL; @@ -137,6 +139,12 @@ SConfigItem::SConfigItem ( } } + if (Guid != NULL) { + if ((mGuid = (EFI_GUID *) new CHAR8[sizeof (EFI_GUID)]) != NULL) { + memcpy (mGuid, Guid, sizeof (EFI_GUID)); + } + } + if (Id != NULL) { if ((mId = new CHAR8[strlen (Id) + 1]) != NULL) { strcpy (mId, Id); @@ -146,6 +154,7 @@ SConfigItem::SConfigItem ( SConfigItem::SConfigItem ( IN CHAR8 *Name, + IN EFI_GUID *Guid, IN CHAR8 *Id, IN UINT8 Type, IN UINT16 Offset, @@ -154,6 +163,7 @@ SConfigItem::SConfigItem ( ) { mName = NULL; + mGuid = NULL; mId = NULL; mInfoStrList = NULL; mNext = NULL; @@ -164,6 +174,12 @@ SConfigItem::SConfigItem ( } } + if (Guid != NULL) { + if ((mGuid = (EFI_GUID *) new CHAR8[sizeof (EFI_GUID)]) != NULL) { + memcpy (mGuid, Guid, sizeof (EFI_GUID)); + } + } + if (Id != NULL) { if ((mId = new CHAR8[strlen (Id) + 1]) != NULL) { strcpy (mId, Id); @@ -180,6 +196,7 @@ SConfigItem::~SConfigItem ( SConfigInfo *Info; BUFFER_SAFE_FREE (mName); + BUFFER_SAFE_FREE (mGuid); BUFFER_SAFE_FREE (mId); while (mInfoStrList != NULL) { Info = mInfoStrList; @@ -192,18 +209,20 @@ SConfigItem::~SConfigItem ( UINT8 CVfrBufferConfig::Register ( IN CHAR8 *Name, + IN EFI_GUID *Guid, IN CHAR8 *Id ) { SConfigItem *pNew; - if (Select (Name) == 0) { + if (Select (Name, Guid) == 0) { return 1; } - if ((pNew = new SConfigItem (Name, Id)) == NULL) { + if ((pNew = new SConfigItem (Name, Guid, Id)) == NULL) { return 2; } + if (mItemListHead == NULL) { mItemListHead = pNew; mItemListTail = pNew; @@ -234,18 +253,19 @@ CVfrBufferConfig::Eof( UINT8 CVfrBufferConfig::Select ( - IN CHAR8 *Name, - IN CHAR8 *Id + IN CHAR8 *Name, + IN EFI_GUID *Guid, + IN CHAR8 *Id ) { SConfigItem *p; - if (Name == NULL) { + if (Name == NULL || Guid == NULL) { mItemListPos = mItemListHead; return 0; } else { for (p = mItemListHead; p != NULL; p = p->mNext) { - if (strcmp (p->mName, Name) != 0) { + if ((strcmp (p->mName, Name) != 0) || (memcmp (p->mGuid, Guid, sizeof (EFI_GUID)) != 0)) { continue; } @@ -269,6 +289,7 @@ UINT8 CVfrBufferConfig::Write ( IN CONST CHAR8 Mode, IN CHAR8 *Name, + IN EFI_GUID *Guid, IN CHAR8 *Id, IN UINT8 Type, IN UINT16 Offset, @@ -280,14 +301,14 @@ CVfrBufferConfig::Write ( SConfigItem *pItem; SConfigInfo *pInfo; - if ((Ret = Select (Name)) != 0) { + if ((Ret = Select (Name, Guid)) != 0) { return Ret; } switch (Mode) { case 'a' : // add - if (Select (Name, Id) != 0) { - if ((pItem = new SConfigItem (Name, Id, Type, Offset, (UINT16) Width, Value)) == NULL) { + if (Select (Name, Guid, Id) != 0) { + if ((pItem = new SConfigItem (Name, Guid, Id, Type, Offset, (UINT16) Width, Value)) == NULL) { return 2; } if (mItemListHead == NULL) { @@ -302,10 +323,6 @@ CVfrBufferConfig::Write ( // tranverse the list to find out if there's already the value for the same offset for (pInfo = mItemListPos->mInfoStrList; pInfo != NULL; pInfo = pInfo->mNext) { if (pInfo->mOffset == Offset) { - // check if the value and width are the same; return error if not - if ((Id != NULL) && (pInfo->mWidth != Width || memcmp(pInfo->mValue, &Value, Width) != 0)) { - return VFR_RETURN_DEFAULT_VALUE_REDEFINED; - } return 0; } } @@ -1578,7 +1595,7 @@ CVfrDataStorage::DeclareEfiVarStore ( return VFR_RETURN_EFIVARSTORE_SIZE_ERROR; } - if (GetVarStoreId (StoreName, &VarStoreId) == VFR_RETURN_SUCCESS) { + if (GetVarStoreId (StoreName, &VarStoreId, Guid) == VFR_RETURN_SUCCESS) { return VFR_RETURN_REDEFINED; } @@ -1611,7 +1628,7 @@ CVfrDataStorage::DeclareBufferVarStore ( return VFR_RETURN_FATAL_ERROR; } - if (GetVarStoreId (StoreName, &TempVarStoreId) == VFR_RETURN_SUCCESS) { + if (GetVarStoreId (StoreName, &TempVarStoreId, Guid) == VFR_RETURN_SUCCESS) { return VFR_RETURN_REDEFINED; } @@ -1633,7 +1650,7 @@ CVfrDataStorage::DeclareBufferVarStore ( pNew->mNext = mBufferVarStoreList; mBufferVarStoreList = pNew; - if (gCVfrBufferConfig.Register(StoreName) != 0) { + if (gCVfrBufferConfig.Register(StoreName, Guid) != 0) { return VFR_RETURN_FATAL_ERROR; } @@ -1643,7 +1660,8 @@ CVfrDataStorage::DeclareBufferVarStore ( EFI_VFR_RETURN_CODE CVfrDataStorage::GetVarStoreByDataType ( IN CHAR8 *DataTypeName, - OUT SVfrVarStorageNode **VarNode + OUT SVfrVarStorageNode **VarNode, + IN EFI_GUID *VarGuid ) { SVfrVarStorageNode *pNode; @@ -1658,7 +1676,16 @@ CVfrDataStorage::GetVarStoreByDataType ( MatchNode = NULL; for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) { - if (strcmp (pNode->mStorageInfo.mDataType->mTypeName, DataTypeName) == 0) { + if (strcmp (pNode->mStorageInfo.mDataType->mTypeName, DataTypeName) != 0) { + continue; + } + + if ((VarGuid != NULL)) { + if (memcmp (VarGuid, &pNode->mGuid, sizeof (EFI_GUID)) == 0) { + *VarNode = pNode; + return VFR_RETURN_SUCCESS; + } + } else { if (MatchNode == NULL) { MatchNode = pNode; } else { @@ -1678,46 +1705,108 @@ CVfrDataStorage::GetVarStoreByDataType ( return VFR_RETURN_SUCCESS; } +EFI_VARSTORE_ID +CVfrDataStorage::CheckGuidField ( + IN SVfrVarStorageNode *pNode, + IN EFI_GUID *StoreGuid, + IN BOOLEAN *HasFoundOne, + OUT EFI_VFR_RETURN_CODE *ReturnCode + ) +{ + if (StoreGuid != NULL) { + // + // If has guid info, compare the guid filed. + // + if (memcmp (StoreGuid, &pNode->mGuid, sizeof (EFI_GUID)) == 0) { + // + // Both name and guid are same, this this varstore. + // + mCurrVarStorageNode = pNode; + *ReturnCode = VFR_RETURN_SUCCESS; + return TRUE; + } + } else { + // + // Not has Guid field, check whether this name is the only one. + // + if (*HasFoundOne) { + // + // The name has conflict, return name redefined. + // + *ReturnCode = VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR; + return TRUE; + } + + *HasFoundOne = TRUE; + mCurrVarStorageNode = pNode; + } + + return FALSE; +} + +/** + Base on the input store name and guid to find the varstore id. + + If both name and guid are inputed, base on the name and guid to + found the varstore. If only name inputed, base on the name to + found the varstore and go on to check whether more than one varstore + has the same name. If only has found one varstore, return this + varstore; if more than one varstore has same name, return varstore + name redefined error. If no varstore found by varstore name, call + function GetVarStoreByDataType and use inputed varstore name as + data type name to search. +**/ EFI_VFR_RETURN_CODE CVfrDataStorage::GetVarStoreId ( IN CHAR8 *StoreName, - OUT EFI_VARSTORE_ID *VarStoreId + OUT EFI_VARSTORE_ID *VarStoreId, + IN EFI_GUID *StoreGuid ) { EFI_VFR_RETURN_CODE ReturnCode; SVfrVarStorageNode *pNode; + BOOLEAN HasFoundOne = FALSE; + + mCurrVarStorageNode = NULL; for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) { if (strcmp (pNode->mVarStoreName, StoreName) == 0) { - mCurrVarStorageNode = pNode; - *VarStoreId = pNode->mVarStoreId; - return VFR_RETURN_SUCCESS; + if (CheckGuidField(pNode, StoreGuid, &HasFoundOne, &ReturnCode)) { + *VarStoreId = mCurrVarStorageNode->mVarStoreId; + return ReturnCode; + } } } for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) { if (strcmp (pNode->mVarStoreName, StoreName) == 0) { - mCurrVarStorageNode = pNode; - *VarStoreId = pNode->mVarStoreId; - return VFR_RETURN_SUCCESS; + if (CheckGuidField(pNode, StoreGuid, &HasFoundOne, &ReturnCode)) { + *VarStoreId = mCurrVarStorageNode->mVarStoreId; + return ReturnCode; + } } } for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) { if (strcmp (pNode->mVarStoreName, StoreName) == 0) { - mCurrVarStorageNode = pNode; - *VarStoreId = pNode->mVarStoreId; - return VFR_RETURN_SUCCESS; + if (CheckGuidField(pNode, StoreGuid, &HasFoundOne, &ReturnCode)) { + *VarStoreId = mCurrVarStorageNode->mVarStoreId; + return ReturnCode; + } } } - mCurrVarStorageNode = NULL; + if (HasFoundOne) { + *VarStoreId = mCurrVarStorageNode->mVarStoreId; + return VFR_RETURN_SUCCESS; + } + *VarStoreId = EFI_VARSTORE_ID_INVALID; // // Assume that Data strucutre name is used as StoreName, and check again. // - ReturnCode = GetVarStoreByDataType (StoreName, &pNode); + ReturnCode = GetVarStoreByDataType (StoreName, &pNode, StoreGuid); if (pNode != NULL) { mCurrVarStorageNode = pNode; *VarStoreId = pNode->mVarStoreId; @@ -1728,126 +1817,100 @@ CVfrDataStorage::GetVarStoreId ( EFI_VFR_RETURN_CODE CVfrDataStorage::GetBufferVarStoreDataTypeName ( - IN CHAR8 *StoreName, + IN EFI_VARSTORE_ID VarStoreId, OUT CHAR8 **DataTypeName ) { SVfrVarStorageNode *pNode; - EFI_VFR_RETURN_CODE ReturnCode; - if ((StoreName == NULL) || (DataTypeName == NULL)) { + if (VarStoreId == EFI_VARSTORE_ID_INVALID) { return VFR_RETURN_FATAL_ERROR; } for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) { - if (strcmp (pNode->mVarStoreName, StoreName) == 0) { - break; + if (pNode->mVarStoreId == VarStoreId) { + *DataTypeName = pNode->mStorageInfo.mDataType->mTypeName; + return VFR_RETURN_SUCCESS; } } - ReturnCode = VFR_RETURN_UNDEFINED; - // - // Assume that Data strucutre name is used as StoreName, and check again. - // - if (pNode == NULL) { - ReturnCode = GetVarStoreByDataType (StoreName, &pNode); - } - - if (pNode == NULL) { - return ReturnCode; - } - - if (pNode->mStorageInfo.mDataType == NULL) { - return VFR_RETURN_FATAL_ERROR; - } - - *DataTypeName = pNode->mStorageInfo.mDataType->mTypeName; - return VFR_RETURN_SUCCESS; + return VFR_RETURN_UNDEFINED; } -EFI_VFR_RETURN_CODE +EFI_VFR_VARSTORE_TYPE CVfrDataStorage::GetVarStoreType ( - IN CHAR8 *StoreName, - OUT EFI_VFR_VARSTORE_TYPE &VarStoreType + IN EFI_VARSTORE_ID VarStoreId ) { SVfrVarStorageNode *pNode; - EFI_VFR_RETURN_CODE ReturnCode; + EFI_VFR_VARSTORE_TYPE VarStoreType; - if (StoreName == NULL) { - return VFR_RETURN_FATAL_ERROR; + VarStoreType = EFI_VFR_VARSTORE_INVALID; + + if (VarStoreId == EFI_VARSTORE_ID_INVALID) { + return VarStoreType; } for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) { - if (strcmp (pNode->mVarStoreName, StoreName) == 0) { + if (pNode->mVarStoreId == VarStoreId) { VarStoreType = pNode->mVarStoreType; - return VFR_RETURN_SUCCESS; + return VarStoreType; } } for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) { - if (strcmp (pNode->mVarStoreName, StoreName) == 0) { + if (pNode->mVarStoreId == VarStoreId) { VarStoreType = pNode->mVarStoreType; - return VFR_RETURN_SUCCESS; + return VarStoreType; } } for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) { - if (strcmp (pNode->mVarStoreName, StoreName) == 0) { + if (pNode->mVarStoreId == VarStoreId) { VarStoreType = pNode->mVarStoreType; - return VFR_RETURN_SUCCESS; + return VarStoreType; } } - VarStoreType = EFI_VFR_VARSTORE_INVALID; - - // - // Assume that Data strucutre name is used as StoreName, and check again. - // - ReturnCode = GetVarStoreByDataType (StoreName, &pNode); - if (pNode != NULL) { - VarStoreType = pNode->mVarStoreType; - } - - return ReturnCode; + return VarStoreType; } -EFI_VFR_VARSTORE_TYPE -CVfrDataStorage::GetVarStoreType ( +EFI_GUID * +CVfrDataStorage::GetVarStoreGuid ( IN EFI_VARSTORE_ID VarStoreId ) { SVfrVarStorageNode *pNode; - EFI_VFR_VARSTORE_TYPE VarStoreType; + EFI_GUID *VarGuid; - VarStoreType = EFI_VFR_VARSTORE_INVALID; + VarGuid = NULL; if (VarStoreId == EFI_VARSTORE_ID_INVALID) { - return VarStoreType; + return VarGuid; } for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) { if (pNode->mVarStoreId == VarStoreId) { - VarStoreType = pNode->mVarStoreType; - return VarStoreType; + VarGuid = &pNode->mGuid; + return VarGuid; } } for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) { if (pNode->mVarStoreId == VarStoreId) { - VarStoreType = pNode->mVarStoreType; - return VarStoreType; + VarGuid = &pNode->mGuid; + return VarGuid; } } for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) { if (pNode->mVarStoreId == VarStoreId) { - VarStoreType = pNode->mVarStoreType; - return VarStoreType; + VarGuid = &pNode->mGuid; + return VarGuid; } } - return VarStoreType; + return VarGuid; } EFI_VFR_RETURN_CODE @@ -1951,44 +2014,6 @@ CVfrDataStorage::GetNameVarStoreInfo ( return VFR_RETURN_SUCCESS; } -EFI_VFR_RETURN_CODE -CVfrDataStorage::BufferVarStoreRequestElementAdd ( - IN CHAR8 *StoreName, - IN EFI_VARSTORE_INFO &Info - ) -{ - SVfrVarStorageNode *pNode = NULL; - EFI_IFR_TYPE_VALUE Value = gZeroEfiIfrTypeValue; - EFI_VFR_RETURN_CODE ReturnCode; - - for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) { - if (strcmp (pNode->mVarStoreName, StoreName) == 0) { - break; - } - } - - ReturnCode = VFR_RETURN_UNDEFINED; - // - // Assume that Data strucutre name is used as StoreName, and check again. - // - if (pNode == NULL) { - ReturnCode = GetVarStoreByDataType (StoreName, &pNode); - } - - if (pNode == NULL) { - return ReturnCode; - } - - gCVfrBufferConfig.Open (); - Value.u8 = 0; - if (gCVfrBufferConfig.Write ('a', StoreName, NULL, EFI_IFR_TYPE_NUM_SIZE_8, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value) != 0) { - return VFR_RETURN_FATAL_ERROR; - } - gCVfrBufferConfig.Close (); - - return VFR_RETURN_SUCCESS; -} - SVfrDefaultStoreNode::SVfrDefaultStoreNode ( IN EFI_IFR_DEFAULTSTORE *ObjBinAddr, IN CHAR8 *RefName, @@ -2155,6 +2180,7 @@ CVfrDefaultStore::BufferVarStoreAltConfigAdd ( IN EFI_VARSTORE_ID DefaultId, IN EFI_VARSTORE_INFO &Info, IN CHAR8 *VarStoreName, + IN EFI_GUID *VarStoreGuid, IN UINT8 Type, IN EFI_IFR_TYPE_VALUE Value ) @@ -2180,8 +2206,8 @@ CVfrDefaultStore::BufferVarStoreAltConfigAdd ( gCVfrBufferConfig.Open (); sprintf (NewAltCfg, "%04x", pNode->mDefaultId); - if ((Returnvalue = gCVfrBufferConfig.Select(VarStoreName)) == 0) { - if ((Returnvalue = gCVfrBufferConfig.Write ('a', VarStoreName, NewAltCfg, Type, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value)) != 0) { + if ((Returnvalue = gCVfrBufferConfig.Select(VarStoreName, VarStoreGuid)) == 0) { + if ((Returnvalue = gCVfrBufferConfig.Write ('a', VarStoreName, VarStoreGuid, NewAltCfg, Type, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value)) != 0) { goto WriteError; } } @@ -2592,26 +2618,46 @@ CVfrQuestionDB::RegisterNewDateQuestion ( CHAR8 *VarIdStr[3] = {NULL, }; CHAR8 Index; - if (BaseVarId == NULL) { + if (BaseVarId == NULL && Name == NULL) { return; } - Len = strlen (BaseVarId); + if (BaseVarId != NULL) { + Len = strlen (BaseVarId); - VarIdStr[0] = new CHAR8[Len + strlen (".Year") + 1]; - if (VarIdStr[0] != NULL) { - strcpy (VarIdStr[0], BaseVarId); - strcat (VarIdStr[0], ".Year"); - } - VarIdStr[1] = new CHAR8[Len + strlen (".Month") + 1]; - if (VarIdStr[1] != NULL) { - strcpy (VarIdStr[1], BaseVarId); - strcat (VarIdStr[1], ".Month"); - } - VarIdStr[2] = new CHAR8[Len + strlen (".Day") + 1]; - if (VarIdStr[2] != NULL) { - strcpy (VarIdStr[2], BaseVarId); - strcat (VarIdStr[2], ".Day"); + VarIdStr[0] = new CHAR8[Len + strlen (".Year") + 1]; + if (VarIdStr[0] != NULL) { + strcpy (VarIdStr[0], BaseVarId); + strcat (VarIdStr[0], ".Year"); + } + VarIdStr[1] = new CHAR8[Len + strlen (".Month") + 1]; + if (VarIdStr[1] != NULL) { + strcpy (VarIdStr[1], BaseVarId); + strcat (VarIdStr[1], ".Month"); + } + VarIdStr[2] = new CHAR8[Len + strlen (".Day") + 1]; + if (VarIdStr[2] != NULL) { + strcpy (VarIdStr[2], BaseVarId); + strcat (VarIdStr[2], ".Day"); + } + } else { + Len = strlen (Name); + + VarIdStr[0] = new CHAR8[Len + strlen (".Year") + 1]; + if (VarIdStr[0] != NULL) { + strcpy (VarIdStr[0], Name); + strcat (VarIdStr[0], ".Year"); + } + VarIdStr[1] = new CHAR8[Len + strlen (".Month") + 1]; + if (VarIdStr[1] != NULL) { + strcpy (VarIdStr[1], Name); + strcat (VarIdStr[1], ".Month"); + } + VarIdStr[2] = new CHAR8[Len + strlen (".Day") + 1]; + if (VarIdStr[2] != NULL) { + strcpy (VarIdStr[2], Name); + strcat (VarIdStr[2], ".Day"); + } } if ((pNode[0] = new SVfrQuestionNode (Name, VarIdStr[0], DATE_YEAR_BITMASK)) == NULL) { @@ -2740,26 +2786,46 @@ CVfrQuestionDB::RegisterNewTimeQuestion ( CHAR8 *VarIdStr[3] = {NULL, }; CHAR8 Index; - if (BaseVarId == NULL) { + if (BaseVarId == NULL && Name == NULL) { return; } - Len = strlen (BaseVarId); + if (BaseVarId != NULL) { + Len = strlen (BaseVarId); - VarIdStr[0] = new CHAR8[Len + strlen (".Hour") + 1]; - if (VarIdStr[0] != NULL) { - strcpy (VarIdStr[0], BaseVarId); - strcat (VarIdStr[0], ".Hour"); - } - VarIdStr[1] = new CHAR8[Len + strlen (".Minute") + 1]; - if (VarIdStr[1] != NULL) { - strcpy (VarIdStr[1], BaseVarId); - strcat (VarIdStr[1], ".Minute"); - } - VarIdStr[2] = new CHAR8[Len + strlen (".Second") + 1]; - if (VarIdStr[2] != NULL) { - strcpy (VarIdStr[2], BaseVarId); - strcat (VarIdStr[2], ".Second"); + VarIdStr[0] = new CHAR8[Len + strlen (".Hour") + 1]; + if (VarIdStr[0] != NULL) { + strcpy (VarIdStr[0], BaseVarId); + strcat (VarIdStr[0], ".Hour"); + } + VarIdStr[1] = new CHAR8[Len + strlen (".Minute") + 1]; + if (VarIdStr[1] != NULL) { + strcpy (VarIdStr[1], BaseVarId); + strcat (VarIdStr[1], ".Minute"); + } + VarIdStr[2] = new CHAR8[Len + strlen (".Second") + 1]; + if (VarIdStr[2] != NULL) { + strcpy (VarIdStr[2], BaseVarId); + strcat (VarIdStr[2], ".Second"); + } + } else { + Len = strlen (Name); + + VarIdStr[0] = new CHAR8[Len + strlen (".Hour") + 1]; + if (VarIdStr[0] != NULL) { + strcpy (VarIdStr[0], Name); + strcat (VarIdStr[0], ".Hour"); + } + VarIdStr[1] = new CHAR8[Len + strlen (".Minute") + 1]; + if (VarIdStr[1] != NULL) { + strcpy (VarIdStr[1], Name); + strcat (VarIdStr[1], ".Minute"); + } + VarIdStr[2] = new CHAR8[Len + strlen (".Second") + 1]; + if (VarIdStr[2] != NULL) { + strcpy (VarIdStr[2], Name); + strcat (VarIdStr[2], ".Second"); + } } if ((pNode[0] = new SVfrQuestionNode (Name, VarIdStr[0], TIME_HOUR_BITMASK)) == NULL) { @@ -2828,31 +2894,56 @@ CVfrQuestionDB::RegisterRefQuestion ( CHAR8 *VarIdStr[4] = {NULL, }; CHAR8 Index; - if (BaseVarId == NULL) { + if (BaseVarId == NULL && Name == NULL) { return; } - Len = strlen (BaseVarId); + if (BaseVarId != NULL) { + Len = strlen (BaseVarId); - VarIdStr[0] = new CHAR8[Len + strlen (".QuestionId") + 1]; - if (VarIdStr[0] != NULL) { - strcpy (VarIdStr[0], BaseVarId); - strcat (VarIdStr[0], ".QuestionId"); - } - VarIdStr[1] = new CHAR8[Len + strlen (".FormId") + 1]; - if (VarIdStr[1] != NULL) { - strcpy (VarIdStr[1], BaseVarId); - strcat (VarIdStr[1], ".FormId"); - } - VarIdStr[2] = new CHAR8[Len + strlen (".FormSetGuid") + 1]; - if (VarIdStr[2] != NULL) { - strcpy (VarIdStr[2], BaseVarId); - strcat (VarIdStr[2], ".FormSetGuid"); - } - VarIdStr[3] = new CHAR8[Len + strlen (".DevicePath") + 1]; - if (VarIdStr[3] != NULL) { - strcpy (VarIdStr[3], BaseVarId); - strcat (VarIdStr[3], ".DevicePath"); + VarIdStr[0] = new CHAR8[Len + strlen (".QuestionId") + 1]; + if (VarIdStr[0] != NULL) { + strcpy (VarIdStr[0], BaseVarId); + strcat (VarIdStr[0], ".QuestionId"); + } + VarIdStr[1] = new CHAR8[Len + strlen (".FormId") + 1]; + if (VarIdStr[1] != NULL) { + strcpy (VarIdStr[1], BaseVarId); + strcat (VarIdStr[1], ".FormId"); + } + VarIdStr[2] = new CHAR8[Len + strlen (".FormSetGuid") + 1]; + if (VarIdStr[2] != NULL) { + strcpy (VarIdStr[2], BaseVarId); + strcat (VarIdStr[2], ".FormSetGuid"); + } + VarIdStr[3] = new CHAR8[Len + strlen (".DevicePath") + 1]; + if (VarIdStr[3] != NULL) { + strcpy (VarIdStr[3], BaseVarId); + strcat (VarIdStr[3], ".DevicePath"); + } + } else { + Len = strlen (Name); + + VarIdStr[0] = new CHAR8[Len + strlen (".QuestionId") + 1]; + if (VarIdStr[0] != NULL) { + strcpy (VarIdStr[0], Name); + strcat (VarIdStr[0], ".QuestionId"); + } + VarIdStr[1] = new CHAR8[Len + strlen (".FormId") + 1]; + if (VarIdStr[1] != NULL) { + strcpy (VarIdStr[1], Name); + strcat (VarIdStr[1], ".FormId"); + } + VarIdStr[2] = new CHAR8[Len + strlen (".FormSetGuid") + 1]; + if (VarIdStr[2] != NULL) { + strcpy (VarIdStr[2], Name); + strcat (VarIdStr[2], ".FormSetGuid"); + } + VarIdStr[3] = new CHAR8[Len + strlen (".DevicePath") + 1]; + if (VarIdStr[3] != NULL) { + strcpy (VarIdStr[3], Name); + strcat (VarIdStr[3], ".DevicePath"); + } } if ((pNode[0] = new SVfrQuestionNode (Name, VarIdStr[0])) == NULL) { diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h index 2c0ed7bd54..2847a74a7b 100644 --- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h +++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h @@ -2,7 +2,7 @@ Vfr common library functions. -Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -57,13 +57,14 @@ struct SConfigInfo { struct SConfigItem { CHAR8 *mName; // varstore name - CHAR8 *mId; // varstore ID + EFI_GUID *mGuid; // varstore guid, varstore name + guid deside one varstore + CHAR8 *mId; // default ID SConfigInfo *mInfoStrList; // list of Offset/Value in the varstore SConfigItem *mNext; public: - SConfigItem (IN CHAR8 *, IN CHAR8 *); - SConfigItem (IN CHAR8 *, IN CHAR8 *, IN UINT8, IN UINT16, IN UINT16, IN EFI_IFR_TYPE_VALUE); + SConfigItem (IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *); + SConfigItem (IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *, IN UINT8, IN UINT16, IN UINT16, IN EFI_IFR_TYPE_VALUE); virtual ~SConfigItem (); }; @@ -77,11 +78,11 @@ public: CVfrBufferConfig (VOID); virtual ~CVfrBufferConfig (VOID); - virtual UINT8 Register (IN CHAR8 *, IN CHAR8 *Info = NULL); + virtual UINT8 Register (IN CHAR8 *, IN EFI_GUID *,IN CHAR8 *Info = NULL); virtual VOID Open (VOID); virtual BOOLEAN Eof(VOID); - virtual UINT8 Select (IN CHAR8 *, IN CHAR8 *Info = NULL); - virtual UINT8 Write (IN CONST CHAR8, IN CHAR8 *, IN CHAR8 *, IN UINT8, IN UINT16, IN UINT32, IN EFI_IFR_TYPE_VALUE); + virtual UINT8 Select (IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *Info = NULL); + virtual UINT8 Write (IN CONST CHAR8, IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *, IN UINT8, IN UINT16, IN UINT32, IN EFI_IFR_TYPE_VALUE); #if 0 virtual UINT8 Read (OUT CHAR8 **, OUT CHAR8 **, OUT CHAR8 **, OUT CHAR8 **, OUT CHAR8 **); #endif @@ -284,6 +285,10 @@ private: BOOLEAN ChekVarStoreIdFree (IN EFI_VARSTORE_ID); VOID MarkVarStoreIdUsed (IN EFI_VARSTORE_ID); VOID MarkVarStoreIdUnused (IN EFI_VARSTORE_ID); + EFI_VARSTORE_ID CheckGuidField (IN SVfrVarStorageNode *, + IN EFI_GUID *, + IN BOOLEAN *, + OUT EFI_VFR_RETURN_CODE *); public: CVfrDataStorage (); @@ -303,17 +308,15 @@ public: EFI_VFR_RETURN_CODE DeclareBufferVarStore (IN CHAR8 *, IN EFI_GUID *, IN CVfrVarDataTypeDB *, IN CHAR8 *, IN EFI_VARSTORE_ID, IN BOOLEAN Flag = TRUE); - EFI_VFR_RETURN_CODE GetVarStoreId (IN CHAR8 *, OUT EFI_VARSTORE_ID *); - EFI_VFR_RETURN_CODE GetVarStoreType (IN CHAR8 *, OUT EFI_VFR_VARSTORE_TYPE &); + EFI_VFR_RETURN_CODE GetVarStoreId (IN CHAR8 *, OUT EFI_VARSTORE_ID *, IN EFI_GUID *VarGuid = NULL); EFI_VFR_VARSTORE_TYPE GetVarStoreType (IN EFI_VARSTORE_ID); + EFI_GUID * GetVarStoreGuid (IN EFI_VARSTORE_ID); EFI_VFR_RETURN_CODE GetVarStoreName (IN EFI_VARSTORE_ID, OUT CHAR8 **); - EFI_VFR_RETURN_CODE GetVarStoreByDataType (IN CHAR8 *, OUT SVfrVarStorageNode **); + EFI_VFR_RETURN_CODE GetVarStoreByDataType (IN CHAR8 *, OUT SVfrVarStorageNode **, IN EFI_GUID *VarGuid = NULL); - EFI_VFR_RETURN_CODE GetBufferVarStoreDataTypeName (IN CHAR8 *, OUT CHAR8 **); + EFI_VFR_RETURN_CODE GetBufferVarStoreDataTypeName (IN EFI_VARSTORE_ID, OUT CHAR8 **); EFI_VFR_RETURN_CODE GetEfiVarStoreInfo (IN EFI_VARSTORE_INFO *); EFI_VFR_RETURN_CODE GetNameVarStoreInfo (IN EFI_VARSTORE_INFO *, IN UINT32); - - EFI_VFR_RETURN_CODE BufferVarStoreRequestElementAdd (IN CHAR8 *, IN EFI_VARSTORE_INFO &); }; #define EFI_QUESTION_ID_MAX 0xFFFF @@ -396,7 +399,7 @@ public: EFI_VFR_RETURN_CODE ReRegisterDefaultStoreById (IN UINT16, IN CHAR8 *, IN EFI_STRING_ID); BOOLEAN DefaultIdRegistered (IN UINT16); EFI_VFR_RETURN_CODE GetDefaultId (IN CHAR8 *, OUT UINT16 *); - EFI_VFR_RETURN_CODE BufferVarStoreAltConfigAdd (IN EFI_VARSTORE_ID, IN EFI_VARSTORE_INFO &, IN CHAR8 *, IN UINT8, IN EFI_IFR_TYPE_VALUE); + EFI_VFR_RETURN_CODE BufferVarStoreAltConfigAdd (IN EFI_VARSTORE_ID, IN EFI_VARSTORE_INFO &, IN CHAR8 *, IN EFI_GUID *, IN UINT8, IN EFI_IFR_TYPE_VALUE); }; #define EFI_RULE_ID_START 0x01 diff --git a/BaseTools/Source/C/VolInfo/GNUmakefile b/BaseTools/Source/C/VolInfo/GNUmakefile index d5594d07a0..d5f115abed 100644 --- a/BaseTools/Source/C/VolInfo/GNUmakefile +++ b/BaseTools/Source/C/VolInfo/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'VolInfo' module build. +# GNU/Linux makefile for 'VolInfo' module build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 3261892bc5..6711880f60 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -293,12 +293,13 @@ class WorkspaceAutoGen(AutoGen): Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain] DecPcds = {} + DecPcdsKey = set() PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch) Pkgs = PGen.PackageList for Pkg in Pkgs: for Pcd in Pkg.Pcds: DecPcds[Pcd[0], Pcd[1]] = Pkg.Pcds[Pcd] - Platform.IsPlatformPcdDeclared(DecPcds) + DecPcdsKey.add((Pcd[0], Pcd[1], Pcd[2])) Platform.SkuName = self.SkuId for Name, Guid in PcdSet: @@ -310,7 +311,21 @@ class WorkspaceAutoGen(AutoGen): File = self.FdfProfile.PcdFileLineDict[Name, Guid][0], Line = self.FdfProfile.PcdFileLineDict[Name, Guid][1] ) - Platform.AddPcd(Name, Guid, PcdSet[Name, Guid]) + else: + # Check whether Dynamic or DynamicEx PCD used in FDF file. If used, build break and give a error message. + if (Name, Guid, TAB_PCDS_FIXED_AT_BUILD) in DecPcdsKey \ + or (Name, Guid, TAB_PCDS_PATCHABLE_IN_MODULE) in DecPcdsKey \ + or (Name, Guid, TAB_PCDS_FEATURE_FLAG) in DecPcdsKey: + Platform.AddPcd(Name, Guid, PcdSet[Name, Guid]) + continue + elif (Name, Guid, TAB_PCDS_DYNAMIC) in DecPcdsKey or (Name, Guid, TAB_PCDS_DYNAMIC_EX) in DecPcdsKey: + EdkLogger.error( + 'build', + PARSER_ERROR, + "Using Dynamic or DynamicEx type of PCD [%s.%s] in FDF file is not allowed." % (Guid, Name), + File = self.FdfProfile.PcdFileLineDict[Name, Guid][0], + Line = self.FdfProfile.PcdFileLineDict[Name, Guid][1] + ) Pa = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch) # diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py index fafcd70b86..2eb920417e 100644 --- a/BaseTools/Source/Python/AutoGen/GenC.py +++ b/BaseTools/Source/Python/AutoGen/GenC.py @@ -2043,7 +2043,8 @@ def CreateHeaderCode(Info, AutoGenC, AutoGenH): if 'PcdLib' in Info.Module.LibraryClasses or Info.Module.Pcds: AutoGenH.Append("#include \n") - AutoGenH.Append('\nextern GUID gEfiCallerIdGuid;\n\n') + AutoGenH.Append('\nextern GUID gEfiCallerIdGuid;') + AutoGenH.Append('\nextern CHAR8 *gEfiCallerBaseName;\n\n') if Info.IsLibrary: return @@ -2066,6 +2067,7 @@ def CreateHeaderCode(Info, AutoGenC, AutoGenH): # Publish the CallerId Guid # AutoGenC.Append('\nGLOBAL_REMOVE_IF_UNREFERENCED GUID gEfiCallerIdGuid = %s;\n' % GuidStringToGuidStructureString(Info.Guid)) + AutoGenC.Append('\nGLOBAL_REMOVE_IF_UNREFERENCED CHAR8 *gEfiCallerBaseName = "%s";\n' % Info.Name) ## Create common code for header file # diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py index ea27607fce..7b1ce72ea7 100644 --- a/BaseTools/Source/Python/AutoGen/UniClassObject.py +++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py @@ -1,4 +1,4 @@ -# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -38,6 +38,9 @@ LF = u'\u000A' NULL = u'\u0000' TAB = u'\t' BACK_SPLASH = u'\\' +DOBULE_QUOTED_SPLASH = u'\\"' +SIGLE_QUOTED_SPLASH = u"\\'" +TAB_BACK_SLASH = u"\\/" gIncludePattern = re.compile("^#include +[\"<]+([^\"< >]+)[>\"]+$", re.MULTILINE | re.UNICODE) @@ -334,11 +337,11 @@ class UniFileClassObject(object): Line = Line.replace(u'/language', u'#language') Line = Line.replace(u'/include', u'#include') + Line = Line.replace(u'\\\\', u'\u0006') Line = Line.replace(UNICODE_WIDE_CHAR, WIDE_CHAR) Line = Line.replace(UNICODE_NARROW_CHAR, NARROW_CHAR) Line = Line.replace(UNICODE_NON_BREAKING_CHAR, NON_BREAKING_CHAR) - Line = Line.replace(u'\\\\', u'\u0006') Line = Line.replace(u'\\r\\n', CR + LF) Line = Line.replace(u'\\n', CR + LF) Line = Line.replace(u'\\r', CR) @@ -346,7 +349,10 @@ class UniFileClassObject(object): Line = Line.replace(u'''\"''', u'''"''') Line = Line.replace(u'\t', u' ') Line = Line.replace(u'\u0006', u'\\') - + Line = Line.replace(DOBULE_QUOTED_SPLASH, u'"') + Line = Line.replace(SIGLE_QUOTED_SPLASH, u"'") + Line = Line.replace(TAB_BACK_SLASH, u"/") + # if Line.find(u'\\x'): # hex = Line[Line.find(u'\\x') + 2 : Line.find(u'\\x') + 6] # hex = "u'\\u" + hex + "'" diff --git a/BaseTools/Source/Python/Common/BuildVersion.py b/BaseTools/Source/Python/Common/BuildVersion.py index 0323fafa3c..7414d30f49 100644 --- a/BaseTools/Source/Python/Common/BuildVersion.py +++ b/BaseTools/Source/Python/Common/BuildVersion.py @@ -13,4 +13,4 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # -gBUILD_VERSION = "Build 2524" +gBUILD_VERSION = "" diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/Python/Common/DataType.py index e5e7eaeede..3a82362100 100644 --- a/BaseTools/Source/Python/Common/DataType.py +++ b/BaseTools/Source/Python/Common/DataType.py @@ -1,7 +1,8 @@ ## @file # This file is used to define common static strings used by INF/DEC/DSC files # -# Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.
+# Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -18,6 +19,7 @@ TAB_COMMENT_EDK_START = '/*' TAB_COMMENT_EDK_END = '*/' TAB_COMMENT_EDK_SPLIT = '//' TAB_COMMENT_SPLIT = '#' +TAB_SPECIAL_COMMENT = '##' TAB_EQUAL_SPLIT = '=' TAB_VALUE_SPLIT = '|' TAB_COMMA_SPLIT = ',' @@ -26,10 +28,18 @@ TAB_SEMI_COLON_SPLIT = ';' TAB_SECTION_START = '[' TAB_SECTION_END = ']' TAB_OPTION_START = '<' -TAB_OPTION_END = '>' +TAB_OPTION_END = '>' TAB_SLASH = '\\' TAB_BACK_SLASH = '/' TAB_LINE_BREAK = '\n' +TAB_PRINTCHAR_VT = '\x0b' +TAB_PRINTCHAR_BS = '\b' +TAB_PRINTCHAR_NUL = '\0' +TAB_UINT8 = 'UINT8' +TAB_UINT16 = 'UINT16' +TAB_UINT32 = 'UINT32' +TAB_UINT64 = 'UINT64' +TAB_VOID = 'VOID*' TAB_EDK_SOURCE = '$(EDK_SOURCE)' TAB_EFI_SOURCE = '$(EFI_SOURCE)' @@ -42,8 +52,9 @@ TAB_ARCH_X64 = 'X64' TAB_ARCH_IPF = 'IPF' TAB_ARCH_ARM = 'ARM' TAB_ARCH_EBC = 'EBC' +TAB_ARCH_AARCH64 = 'AARCH64' -ARCH_LIST = [TAB_ARCH_IA32, TAB_ARCH_X64, TAB_ARCH_IPF, TAB_ARCH_ARM, TAB_ARCH_EBC] +ARCH_LIST = [TAB_ARCH_IA32, TAB_ARCH_X64, TAB_ARCH_IPF, TAB_ARCH_ARM, TAB_ARCH_EBC, TAB_ARCH_AARCH64] ARCH_LIST_FULL = [TAB_ARCH_COMMON] + ARCH_LIST SUP_MODULE_BASE = 'BASE' @@ -75,7 +86,7 @@ EDK_COMPONENT_TYPE_BS_DRIVER = 'BS_DRIVER' EDK_COMPONENT_TYPE_RT_DRIVER = 'RT_DRIVER' EDK_COMPONENT_TYPE_SAL_RT_DRIVER = 'SAL_RT_DRIVER' EDK_COMPONENT_TYPE_APPLICATION = 'APPLICATION' -EDK_NAME = 'EDK' +EDK_NAME = 'EDK' EDKII_NAME = 'EDKII' BINARY_FILE_TYPE_FW = 'FW' @@ -109,6 +120,7 @@ TAB_SOURCES_X64 = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_X64 TAB_SOURCES_IPF = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_IPF TAB_SOURCES_ARM = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_ARM TAB_SOURCES_EBC = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_EBC +TAB_SOURCES_AARCH64 = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_BINARIES = 'Binaries' TAB_BINARIES_COMMON = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_COMMON @@ -117,6 +129,7 @@ TAB_BINARIES_X64 = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_X64 TAB_BINARIES_IPF = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_IPF TAB_BINARIES_ARM = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_ARM TAB_BINARIES_EBC = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_EBC +TAB_BINARIES_AARCH64 = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_INCLUDES = 'Includes' TAB_INCLUDES_COMMON = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_COMMON @@ -125,6 +138,7 @@ TAB_INCLUDES_X64 = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_X64 TAB_INCLUDES_IPF = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_IPF TAB_INCLUDES_ARM = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_ARM TAB_INCLUDES_EBC = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_EBC +TAB_INCLUDES_AARCH64 = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_GUIDS = 'Guids' TAB_GUIDS_COMMON = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_COMMON @@ -133,6 +147,7 @@ TAB_GUIDS_X64 = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_X64 TAB_GUIDS_IPF = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_IPF TAB_GUIDS_ARM = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_ARM TAB_GUIDS_EBC = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_EBC +TAB_GUIDS_AARCH64 = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PROTOCOLS = 'Protocols' TAB_PROTOCOLS_COMMON = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_COMMON @@ -141,6 +156,7 @@ TAB_PROTOCOLS_X64 = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_X64 TAB_PROTOCOLS_IPF = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_IPF TAB_PROTOCOLS_ARM = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_ARM TAB_PROTOCOLS_EBC = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_EBC +TAB_PROTOCOLS_AARCH64 = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PPIS = 'Ppis' TAB_PPIS_COMMON = TAB_PPIS + TAB_SPLIT + TAB_ARCH_COMMON @@ -149,6 +165,7 @@ TAB_PPIS_X64 = TAB_PPIS + TAB_SPLIT + TAB_ARCH_X64 TAB_PPIS_IPF = TAB_PPIS + TAB_SPLIT + TAB_ARCH_IPF TAB_PPIS_ARM = TAB_PPIS + TAB_SPLIT + TAB_ARCH_ARM TAB_PPIS_EBC = TAB_PPIS + TAB_SPLIT + TAB_ARCH_EBC +TAB_PPIS_AARCH64 = TAB_PPIS + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_LIBRARY_CLASSES = 'LibraryClasses' TAB_LIBRARY_CLASSES_COMMON = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_COMMON @@ -157,6 +174,7 @@ TAB_LIBRARY_CLASSES_X64 = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_X64 TAB_LIBRARY_CLASSES_IPF = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_IPF TAB_LIBRARY_CLASSES_ARM = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_ARM TAB_LIBRARY_CLASSES_EBC = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_EBC +TAB_LIBRARY_CLASSES_AARCH64 = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PACKAGES = 'Packages' TAB_PACKAGES_COMMON = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_COMMON @@ -165,6 +183,7 @@ TAB_PACKAGES_X64 = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_X64 TAB_PACKAGES_IPF = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_IPF TAB_PACKAGES_ARM = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_ARM TAB_PACKAGES_EBC = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_EBC +TAB_PACKAGES_AARCH64 = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PCDS = 'Pcds' TAB_PCDS_FIXED_AT_BUILD = 'FixedAtBuild' @@ -192,6 +211,7 @@ TAB_PCDS_FIXED_AT_BUILD_X64 = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + T TAB_PCDS_FIXED_AT_BUILD_IPF = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_IPF TAB_PCDS_FIXED_AT_BUILD_ARM = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_ARM TAB_PCDS_FIXED_AT_BUILD_EBC = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_EBC +TAB_PCDS_FIXED_AT_BUILD_AARCH64 = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PCDS_PATCHABLE_IN_MODULE_NULL = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE TAB_PCDS_PATCHABLE_IN_MODULE_COMMON = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_COMMON @@ -200,6 +220,7 @@ TAB_PCDS_PATCHABLE_IN_MODULE_X64 = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB TAB_PCDS_PATCHABLE_IN_MODULE_IPF = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_IPF TAB_PCDS_PATCHABLE_IN_MODULE_ARM = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_ARM TAB_PCDS_PATCHABLE_IN_MODULE_EBC = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_EBC +TAB_PCDS_PATCHABLE_IN_MODULE_AARCH64 = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PCDS_FEATURE_FLAG_NULL = TAB_PCDS + TAB_PCDS_FEATURE_FLAG TAB_PCDS_FEATURE_FLAG_COMMON = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_COMMON @@ -208,6 +229,7 @@ TAB_PCDS_FEATURE_FLAG_X64 = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_A TAB_PCDS_FEATURE_FLAG_IPF = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_IPF TAB_PCDS_FEATURE_FLAG_ARM = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_ARM TAB_PCDS_FEATURE_FLAG_EBC = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_EBC +TAB_PCDS_FEATURE_FLAG_AARCH64 = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PCDS_DYNAMIC_EX_NULL = TAB_PCDS + TAB_PCDS_DYNAMIC_EX TAB_PCDS_DYNAMIC_EX_DEFAULT_NULL = TAB_PCDS + TAB_PCDS_DYNAMIC_EX_DEFAULT @@ -219,6 +241,7 @@ TAB_PCDS_DYNAMIC_EX_X64 = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_ TAB_PCDS_DYNAMIC_EX_IPF = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_IPF TAB_PCDS_DYNAMIC_EX_ARM = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_ARM TAB_PCDS_DYNAMIC_EX_EBC = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_EBC +TAB_PCDS_DYNAMIC_EX_AARCH64 = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PCDS_DYNAMIC_NULL = TAB_PCDS + TAB_PCDS_DYNAMIC TAB_PCDS_DYNAMIC_DEFAULT_NULL = TAB_PCDS + TAB_PCDS_DYNAMIC_DEFAULT @@ -230,6 +253,7 @@ TAB_PCDS_DYNAMIC_X64 = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_X64 TAB_PCDS_DYNAMIC_IPF = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_IPF TAB_PCDS_DYNAMIC_ARM = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_ARM TAB_PCDS_DYNAMIC_EBC = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_EBC +TAB_PCDS_DYNAMIC_AARCH64 = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PCD_DYNAMIC_TYPE_LIST = [TAB_PCDS_DYNAMIC_DEFAULT_NULL, TAB_PCDS_DYNAMIC_VPD_NULL, TAB_PCDS_DYNAMIC_HII_NULL] TAB_PCD_DYNAMIC_EX_TYPE_LIST = [TAB_PCDS_DYNAMIC_EX_DEFAULT_NULL, TAB_PCDS_DYNAMIC_EX_VPD_NULL, TAB_PCDS_DYNAMIC_EX_HII_NULL] @@ -254,6 +278,7 @@ TAB_DEPEX_X64 = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_X64 TAB_DEPEX_IPF = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_IPF TAB_DEPEX_ARM = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_ARM TAB_DEPEX_EBC = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_EBC +TAB_DEPEX_AARCH64 = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_SKUIDS = 'SkuIds' @@ -264,6 +289,7 @@ TAB_LIBRARIES_X64 = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_X64 TAB_LIBRARIES_IPF = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_IPF TAB_LIBRARIES_ARM = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_ARM TAB_LIBRARIES_EBC = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_EBC +TAB_LIBRARIES_AARCH64 = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_COMPONENTS = 'Components' TAB_COMPONENTS_COMMON = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_COMMON @@ -272,6 +298,7 @@ TAB_COMPONENTS_X64 = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_X64 TAB_COMPONENTS_IPF = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_IPF TAB_COMPONENTS_ARM = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_ARM TAB_COMPONENTS_EBC = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_EBC +TAB_COMPONENTS_AARCH64 = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_COMPONENTS_SOURCE_OVERRIDE_PATH = 'SOURCE_OVERRIDE_PATH' @@ -328,6 +355,25 @@ TAB_INF_FEATURE_PCD = 'FeaturePcd' TAB_INF_PATCH_PCD = 'PatchPcd' TAB_INF_PCD = 'Pcd' TAB_INF_PCD_EX = 'PcdEx' +TAB_INF_USAGE_PRO = 'PRODUCES' +TAB_INF_USAGE_SOME_PRO = 'SOMETIMES_PRODUCES' +TAB_INF_USAGE_CON = 'CONSUMES' +TAB_INF_USAGE_SOME_CON = 'SOMETIMES_CONSUMES' +TAB_INF_USAGE_NOTIFY = 'NOTIFY' +TAB_INF_USAGE_TO_START = 'TO_START' +TAB_INF_USAGE_BY_START = 'BY_START' +TAB_INF_GUIDTYPE_EVENT = 'Event' +TAB_INF_GUIDTYPE_FILE = 'File' +TAB_INF_GUIDTYPE_FV = 'FV' +TAB_INF_GUIDTYPE_GUID = 'GUID' +TAB_INF_GUIDTYPE_HII = 'HII' +TAB_INF_GUIDTYPE_HOB = 'HOB' +TAB_INF_GUIDTYPE_ST = 'SystemTable' +TAB_INF_GUIDTYPE_TSG = 'TokenSpaceGuid' +TAB_INF_GUIDTYPE_VAR = 'Variable' +TAB_INF_GUIDTYPE_PROTOCOL = 'PROTOCOL' +TAB_INF_GUIDTYPE_PPI = 'PPI' +TAB_INF_GUIDTYPE_UNDEFINED = 'UNDEFINED' # # Dec Definitions @@ -430,3 +476,22 @@ TAB_BRG_LIBRARY = 'Library' # Build Rule File Version Definition # TAB_BUILD_RULE_VERSION = "build_rule_version" + +# section name for PCDs +PCDS_DYNAMIC_DEFAULT = "PcdsDynamicDefault" +PCDS_DYNAMIC_VPD = "PcdsDynamicVpd" +PCDS_DYNAMIC_HII = "PcdsDynamicHii" +PCDS_DYNAMICEX_DEFAULT = "PcdsDynamicExDefault" +PCDS_DYNAMICEX_VPD = "PcdsDynamicExVpd" +PCDS_DYNAMICEX_HII = "PcdsDynamicExHii" + +# Section allowed to have items after arch +SECTIONS_HAVE_ITEM_AFTER_ARCH = [TAB_LIBRARY_CLASSES.upper(), TAB_DEPEX.upper(), TAB_USER_EXTENSIONS.upper(), + PCDS_DYNAMIC_DEFAULT.upper(), + PCDS_DYNAMIC_VPD.upper(), + PCDS_DYNAMIC_HII.upper(), + PCDS_DYNAMICEX_DEFAULT.upper(), + PCDS_DYNAMICEX_VPD.upper(), + PCDS_DYNAMICEX_HII.upper(), + TAB_BUILD_OPTIONS.upper(), + TAB_INCLUDES.upper()] diff --git a/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py b/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py index 26a9b324e6..2b5990ebe7 100644 --- a/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py +++ b/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py @@ -405,7 +405,7 @@ class ItemBuild(object): # # @var WorkspaceDir: To store value for WorkspaceDir # @var SupArchList: To store value for SupArchList, selection scope is in below list -# EBC | IA32 | X64 | IPF | ARM | PPC +# EBC | IA32 | X64 | IPF | ARM | PPC | AARCH64 # @var BuildTarget: To store value for WorkspaceDir, selection scope is in below list # RELEASE | DEBUG # @var SkuId: To store value for SkuId diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py index 80fad7563d..3c8d14e6ce 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -246,12 +246,14 @@ class ValueExpression(object): # @return: True or False if RealValue is False # Evaluated value of string format if RealValue is True # - def __call__(self, RealValue=False): + def __call__(self, RealValue=False, Depth=0): if self._NoProcess: return self._Expr + self._Depth = Depth + self._Expr = self._Expr.strip() - if RealValue: + if RealValue and Depth == 0: self._Token = self._Expr if self.__IsNumberToken(): return self._Expr @@ -471,7 +473,7 @@ class ValueExpression(object): Ex = BadExpression(ERR_PCD_RESOLVE % self._Token) Ex.Pcd = self._Token raise Ex - self._Token = ValueExpression(self._Symb[self._Token], self._Symb)(True) + self._Token = ValueExpression(self._Symb[self._Token], self._Symb)(True, self._Depth+1) if type(self._Token) != type(''): self._LiteralToken = hex(self._Token) return @@ -551,7 +553,7 @@ class ValueExpression(object): if Match and not Expr[Match.end():Match.end()+1].isalnum() \ and Expr[Match.end():Match.end()+1] != '_': self._Idx += Match.end() - self._Token = ValueExpression(GuidStringToGuidStructureString(Expr[0:Match.end()]))(True) + self._Token = ValueExpression(GuidStringToGuidStructureString(Expr[0:Match.end()]))(True, self._Depth+1) return self._Token elif self.__IsIdChar(Ch): return self.__GetIdToken() diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py index 87595df1e7..031dc15bc7 100644 --- a/BaseTools/Source/Python/Common/FdfParserLite.py +++ b/BaseTools/Source/Python/Common/FdfParserLite.py @@ -2769,7 +2769,7 @@ class FdfParser(object): raise Warning("expected '.' At Line ", self.FileName, self.CurrentLineNumber) Arch = self.__SkippedChars.rstrip(".") - if Arch.upper() not in ("IA32", "X64", "IPF", "EBC", "ARM", "COMMON"): + if Arch.upper() not in ("IA32", "X64", "IPF", "EBC", "ARM", "AARCH64", "COMMON"): raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.CurrentLineNumber) ModuleType = self.__GetModuleType() @@ -3356,7 +3356,7 @@ class FdfParser(object): raise Warning("expected '.' At Line ", self.FileName, self.CurrentLineNumber) Arch = self.__SkippedChars.rstrip(".").upper() - if Arch not in ("IA32", "X64", "IPF", "ARM"): + if Arch not in ("IA32", "X64", "IPF", "ARM", "AARCH64"): raise Warning("Unknown Arch At line ", self.FileName, self.CurrentLineNumber) if not self.__GetNextWord(): @@ -3370,7 +3370,7 @@ class FdfParser(object): if self.__IsToken(","): if not self.__GetNextWord(): raise Warning("expected Arch list At Line ", self.FileName, self.CurrentLineNumber) - if self.__Token.upper() not in ("IA32", "X64", "IPF", "ARM"): + if self.__Token.upper() not in ("IA32", "X64", "IPF", "ARM", "AARCH64"): raise Warning("Unknown Arch At line ", self.FileName, self.CurrentLineNumber) VtfObj.ArchList = self.__Token.upper() diff --git a/BaseTools/Source/Python/Common/MigrationUtilities.py b/BaseTools/Source/Python/Common/MigrationUtilities.py index b15daa8448..7c69704596 100644 --- a/BaseTools/Source/Python/Common/MigrationUtilities.py +++ b/BaseTools/Source/Python/Common/MigrationUtilities.py @@ -360,7 +360,7 @@ def StoreTextFile(TextFile, Content): # The possible duplication is ensured to be removed. # # @param Section Section dictionary indexed by CPU architecture. -# @param Arch CPU architecture: Ia32, X64, Ipf, ARM, Ebc or Common. +# @param Arch CPU architecture: Ia32, X64, Ipf, ARM, AARCH64, Ebc or Common. # @param Item The Item to be added to section dictionary. # def AddToSection(Section, Arch, Item): @@ -382,7 +382,7 @@ def AddToSection(Section, Arch, Item): # @retval Section The string content of a section. # def GetSection(SectionName, Method, ObjectList): - SupportedArches = ["common", "Ia32", "X64", "Ipf", "Ebc", "ARM"] + SupportedArches = ["common", "Ia32", "X64", "Ipf", "Ebc", "ARM", "AARCH64"] SectionDict = {} for Object in ObjectList: Item = Method(Object) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index 8b5598b5f0..afdfb93ad6 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -30,6 +30,7 @@ from Common import EdkLogger as EdkLogger from Common import GlobalData as GlobalData from DataType import * from BuildToolError import * +from CommonDataClass.DataClass import * ## Regular expression used to find out place holders in string template gPlaceholderPattern = re.compile("\$\{([^$()\s]+)\}", re.MULTILINE|re.UNICODE) @@ -1176,6 +1177,113 @@ def ParseConsoleLog(Filename): Opr.close() Opw.close() +## AnalyzeDscPcd +# +# Analyze DSC PCD value, since there is no data type info in DSC +# This fuction is used to match functions (AnalyzePcdData, AnalyzeHiiPcdData, AnalyzeVpdPcdData) used for retrieving PCD value from database +# 1. Feature flag: TokenSpace.PcdCName|PcdValue +# 2. Fix and Patch:TokenSpace.PcdCName|PcdValue[|MaxSize] +# 3. Dynamic default: +# TokenSpace.PcdCName|PcdValue[|VOID*[|MaxSize]] +# TokenSpace.PcdCName|PcdValue +# 4. Dynamic VPD: +# TokenSpace.PcdCName|VpdOffset[|VpdValue] +# TokenSpace.PcdCName|VpdOffset[|MaxSize[|VpdValue]] +# 5. Dynamic HII: +# TokenSpace.PcdCName|HiiString|VaiableGuid|VariableOffset[|HiiValue] +# PCD value needs to be located in such kind of string, and the PCD value might be an expression in which +# there might have "|" operator, also in string value. +# +# @param Setting: String contain information described above with "TokenSpace.PcdCName|" stripped +# @param PcdType: PCD type: feature, fixed, dynamic default VPD HII +# @param DataType: The datum type of PCD: VOID*, UNIT, BOOL +# @retval: +# ValueList: A List contain fields described above +# IsValid: True if conforming EBNF, otherwise False +# Index: The index where PcdValue is in ValueList +# +def AnalyzeDscPcd(Setting, PcdType, DataType=''): + Setting = Setting.strip() + # There might be escaped quote in a string: \", \\\" + Data = Setting.replace('\\\\', '//').replace('\\\"', '\\\'') + # There might be '|' in string and in ( ... | ... ), replace it with '-' + NewStr = '' + InStr = False + Pair = 0 + for ch in Data: + if ch == '"': + InStr = not InStr + elif ch == '(' and not InStr: + Pair += 1 + elif ch == ')' and not InStr: + Pair -= 1 + + if (Pair > 0 or InStr) and ch == TAB_VALUE_SPLIT: + NewStr += '-' + else: + NewStr += ch + FieldList = [] + StartPos = 0 + while True: + Pos = NewStr.find(TAB_VALUE_SPLIT, StartPos) + if Pos < 0: + FieldList.append(Setting[StartPos:].strip()) + break + FieldList.append(Setting[StartPos:Pos].strip()) + StartPos = Pos + 1 + + IsValid = True + if PcdType in (MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE, MODEL_PCD_FEATURE_FLAG): + Value = FieldList[0] + Size = '' + if len(FieldList) > 1: + Size = FieldList[1] + if DataType == 'VOID*': + IsValid = (len(FieldList) <= 2) + else: + IsValid = (len(FieldList) <= 1) + return [Value, '', Size], IsValid, 0 + elif PcdType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT): + Value = FieldList[0] + Size = Type = '' + if len(FieldList) > 1: + Type = FieldList[1] + if len(FieldList) > 2: + Size = FieldList[2] + if DataType == 'VOID*': + IsValid = (len(FieldList) <= 3) + else: + IsValid = (len(FieldList) <= 1) + return [Value, Type, Size], IsValid, 0 + elif PcdType in (MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_VPD): + VpdOffset = FieldList[0] + Value = Size = '' + if not DataType == 'VOID*': + if len(FieldList) > 1: + Value = FieldList[1] + else: + if len(FieldList) > 1: + Size = FieldList[1] + if len(FieldList) > 2: + Value = FieldList[2] + if DataType == 'VOID*': + IsValid = (len(FieldList) <= 3) + else: + IsValid = (len(FieldList) <= 2) + return [VpdOffset, Size, Value], IsValid, 2 + elif PcdType in (MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_EX_HII): + HiiString = FieldList[0] + Guid = Offset = Value = '' + if len(FieldList) > 1: + Guid = FieldList[1] + if len(FieldList) > 2: + Offset = FieldList[2] + if len(FieldList) > 3: + Value = FieldList[3] + IsValid = (3 <= len(FieldList) <= 4) + return [HiiString, Guid, Offset, Value], IsValid, 3 + return [], False, 0 + ## AnalyzePcdData # # Analyze the pcd Value, Datum type and TokenNumber. @@ -1236,12 +1344,12 @@ def AnalyzeHiiPcdData(Setting): ## AnalyzeVpdPcdData # -# Analyze the vpd pcd Value, Datum type and TokenNumber. +# Analyze the vpd pcd VpdOffset, MaxDatumSize and InitialValue. # Used to avoid split issue while the value string contain "|" character # -# @param[in] Setting: A String contain value/datum type/token number information; +# @param[in] Setting: A String contain VpdOffset/MaxDatumSize/InitialValue information; # -# @retval ValueList: A List contain value, datum type and toke number. +# @retval ValueList: A List contain VpdOffset, MaxDatumSize and InitialValue. # def AnalyzeVpdPcdData(Setting): ValueList = ['', '', ''] @@ -1269,22 +1377,38 @@ def AnalyzeVpdPcdData(Setting): # def CheckPcdDatum(Type, Value): if Type == "VOID*": + ValueRe = re.compile(r'\s*L?\".*\"\s*$') if not (((Value.startswith('L"') or Value.startswith('"')) and Value.endswith('"')) or (Value.startswith('{') and Value.endswith('}')) ): return False, "Invalid value [%s] of type [%s]; must be in the form of {...} for array"\ - ", or \"...\" for string, or L\"...\" for unicode string" % (Value, Type) + ", or \"...\" for string, or L\"...\" for unicode string" % (Value, Type) + elif ValueRe.match(Value): + # Check the chars in UnicodeString or CString is printable + if Value.startswith("L"): + Value = Value[2:-1] + else: + Value = Value[1:-1] + Printset = set(string.printable) + Printset.remove(TAB_PRINTCHAR_VT) + Printset.add(TAB_PRINTCHAR_BS) + Printset.add(TAB_PRINTCHAR_NUL) + if not set(Value).issubset(Printset): + PrintList = list(Printset) + PrintList.sort() + return False, "Invalid PCD string value of type [%s]; must be printable chars %s." % (Type, PrintList) elif Type == 'BOOLEAN': if Value not in ['TRUE', 'True', 'true', '0x1', '0x01', '1', 'FALSE', 'False', 'false', '0x0', '0x00', '0']: return False, "Invalid value [%s] of type [%s]; must be one of TRUE, True, true, 0x1, 0x01, 1"\ ", FALSE, False, false, 0x0, 0x00, 0" % (Value, Type) - elif type(Value) == type(""): + elif Type in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64]: try: Value = long(Value, 0) except: return False, "Invalid value [%s] of type [%s];"\ - " must be a hexadecimal, decimal or octal in C language format."\ - % (Value, Type) + " must be a hexadecimal, decimal or octal in C language format." % (Value, Type) + else: + return False, "Invalid type [%s]; must be one of VOID*, BOOLEAN, UINT8, UINT16, UINT32, UINT64." % (Type) return True, "" diff --git a/BaseTools/Source/Python/Common/PyUtility.pyd b/BaseTools/Source/Python/Common/PyUtility.pyd index 5bb57d91e0..856b508e4e 100644 Binary files a/BaseTools/Source/Python/Common/PyUtility.pyd and b/BaseTools/Source/Python/Common/PyUtility.pyd differ diff --git a/BaseTools/Source/Python/Common/String.py b/BaseTools/Source/Python/Common/String.py index 068a63d1c1..c282326677 100644 --- a/BaseTools/Source/Python/Common/String.py +++ b/BaseTools/Source/Python/Common/String.py @@ -368,7 +368,7 @@ def CleanString(Line, CommentCharacter=DataType.TAB_COMMENT_SPLIT, AllowCppStyle ## CleanString2 # -# Split comments in a string +# Split statement with comments in a string # Remove spaces # # @param Line: The string to be cleaned @@ -387,15 +387,21 @@ def CleanString2(Line, CommentCharacter=DataType.TAB_COMMENT_SPLIT, AllowCppStyl if AllowCppStyleComment: Line = Line.replace(DataType.TAB_COMMENT_EDK_SPLIT, CommentCharacter) # - # separate comments and statements + # separate comments and statements, but we should escape comment character in string # - LineParts = Line.split(CommentCharacter, 1); - # - # remove whitespace again - # - Line = LineParts[0].strip(); - if len(LineParts) > 1: - Comment = LineParts[1].strip() + InString = False + CommentInString = False + Comment = '' + for Index in range(0, len(Line)): + if Line[Index] == '"': + InString = not InString + elif Line[Index] == CommentCharacter and InString: + CommentInString = True + elif Line[Index] == CommentCharacter and not InString: + Comment = Line[Index:].strip() + Line = Line[0:Index].strip() + break + if Comment: # Remove prefixed and trailing comment characters Start = 0 End = len(Comment) @@ -405,8 +411,6 @@ def CleanString2(Line, CommentCharacter=DataType.TAB_COMMENT_SPLIT, AllowCppStyl End -= 1 Comment = Comment[Start:End] Comment = Comment.strip() - else: - Comment = '' return Line, Comment diff --git a/BaseTools/Source/Python/CommonDataClass/CommonClass.py b/BaseTools/Source/Python/CommonDataClass/CommonClass.py index 7a0123b1d9..bb4b434af8 100644 --- a/BaseTools/Source/Python/CommonDataClass/CommonClass.py +++ b/BaseTools/Source/Python/CommonDataClass/CommonClass.py @@ -38,7 +38,7 @@ def GenerateHelpText(Text, Lang): # ALWAYS_CONSUMED | SOMETIMES_CONSUMED | ALWAYS_PRODUCED | SOMETIMES_PRODUCED | TO_START | BY_START | PRIVATE # @var FeatureFlag: To store value for FeatureFlag # @var SupArchList: To store value for SupArchList, selection scope is in below list -# EBC | IA32 | X64 | IPF | ARM | PPC +# EBC | IA32 | X64 | IPF | ARM | PPC | AARCH64 # @var HelpText: To store value for HelpText # class CommonClass(object): @@ -400,7 +400,7 @@ class PcdClass(CommonClass): # @var TagName: To store value for TagName # @var ToolCode: To store value for ToolCode # @var SupArchList: To store value for SupArchList, selection scope is in below list -# EBC | IA32 | X64 | IPF | ARM | PPC +# EBC | IA32 | X64 | IPF | ARM | PPC | AARCH64 # class BuildOptionClass(IncludeStatementClass): def __init__(self, ToolChainFamily = '', ToolChain = '', Option = ''): diff --git a/BaseTools/Source/Python/CommonDataClass/ModuleClass.py b/BaseTools/Source/Python/CommonDataClass/ModuleClass.py index c0738b996c..c5ea15af5b 100644 --- a/BaseTools/Source/Python/CommonDataClass/ModuleClass.py +++ b/BaseTools/Source/Python/CommonDataClass/ModuleClass.py @@ -25,7 +25,7 @@ from CommonClass import * # # @var ModuleType: To store value for ModuleType # @var SupArchList: To store value for SupArchList, selection scope is in below list -# EBC | IA32 | X64 | IPF | ARM | PPC +# EBC | IA32 | X64 | IPF | ARM | PPC | AARCH64 # @var BinaryModule: To store value for BinaryModule # @var OutputFileBasename: To store value for OutputFileBasename # @var ClonedFrom: To store value for ClonedFrom, it is a set structure as diff --git a/BaseTools/Source/Python/CommonDataClass/PlatformClass.py b/BaseTools/Source/Python/CommonDataClass/PlatformClass.py index 46329ba1d7..a95ec068b1 100644 --- a/BaseTools/Source/Python/CommonDataClass/PlatformClass.py +++ b/BaseTools/Source/Python/CommonDataClass/PlatformClass.py @@ -39,7 +39,7 @@ class SkuInfoListClass(IncludeStatementClass): # # @var DscSpecification: To store value for DscSpecification # @var SupArchList: To store value for SupArchList, selection scope is in below list -# EBC | IA32 | X64 | IPF | ARM | PPC +# EBC | IA32 | X64 | IPF | ARM | PPC | AARCH64 # @var BuildTargets: To store value for BuildTargets, selection scope is in below list # RELEASE | DEBUG # @var IntermediateDirectories: To store value for IntermediateDirectories, selection scope is in below list diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python/Ecc/Check.py index 73d7318de0..c1ac07e852 100644 --- a/BaseTools/Source/Python/Ecc/Check.py +++ b/BaseTools/Source/Python/Ecc/Check.py @@ -821,7 +821,7 @@ class Check(object): RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand) for Record in RecordSet: Path = Record[1] - Path = Path.upper().replace('\X64', '').replace('\IA32', '').replace('\EBC', '').replace('\IPF', '').replace('\ARM', '') + Path = Path.upper().replace('\X64', '').replace('\IA32', '').replace('\EBC', '').replace('\IPF', '').replace('\ARM', '').replace('\AARCH64', '') if Path in InfPathList: if not EccGlobalData.gException.IsException(ERROR_META_DATA_FILE_CHECK_MODULE_FILE_NO_USE, Record[2]): EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_MODULE_FILE_NO_USE, OtherMsg="The source file [%s] is existing in module directory but it is not described in INF file." % (Record[2]), BelongsToTable='File', BelongsToItem=Record[0]) diff --git a/BaseTools/Source/Python/Eot/EfiCompressor.pyd b/BaseTools/Source/Python/Eot/EfiCompressor.pyd index 0729100b99..9de9beb402 100644 Binary files a/BaseTools/Source/Python/Eot/EfiCompressor.pyd and b/BaseTools/Source/Python/Eot/EfiCompressor.pyd differ diff --git a/BaseTools/Source/Python/Eot/LzmaCompressor.pyd b/BaseTools/Source/Python/Eot/LzmaCompressor.pyd index d792a7e9fb..337c055e20 100644 Binary files a/BaseTools/Source/Python/Eot/LzmaCompressor.pyd and b/BaseTools/Source/Python/Eot/LzmaCompressor.pyd differ diff --git a/BaseTools/Source/Python/GNUmakefile b/BaseTools/Source/Python/GNUmakefile index 9fe46f6edf..ed00a7b178 100644 --- a/BaseTools/Source/Python/GNUmakefile +++ b/BaseTools/Source/Python/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Linux makefile for Python tools build. +# GNU/Linux makefile for Python tools build. # # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/Source/Python/GenFds/Fd.py b/BaseTools/Source/Python/GenFds/Fd.py index aa4d2e8262..3716549cba 100644 --- a/BaseTools/Source/Python/GenFds/Fd.py +++ b/BaseTools/Source/Python/GenFds/Fd.py @@ -113,10 +113,15 @@ class FD(FDClassObject): PreviousRegionStart = RegionObj.Offset PreviousRegionSize = RegionObj.Size # + # Verify current region fits within allocated FD section Size + # + if PreviousRegionStart + PreviousRegionSize > self.Size: + EdkLogger.error("GenFds", GENFDS_ERROR, + 'FD %s size too small to fit region with offset 0x%X and size 0x%X' + % (self.FdUiName, PreviousRegionStart, PreviousRegionSize)) + # # Call each region's AddToBuffer function # - if PreviousRegionSize > self.Size: - EdkLogger.error("GenFds", GENFDS_ERROR, 'FD %s size too small' % self.FdUiName) GenFdsGlobalVariable.VerboseLogger('Call each region\'s AddToBuffer function') RegionObj.AddToBuffer (FdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFds.ImageBinDict, self.vtfRawDict, self.DefineVarDict) # diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py index c9c620d853..a468a5ec99 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -1707,6 +1707,38 @@ class FdfParser: return False + ## __CalcRegionExpr(self) + # + # Calculate expression for offset or size of a region + # + # @return: None if invalid expression + # Calculated number if successfully + # + def __CalcRegionExpr(self): + StartPos = self.GetFileBufferPos() + Expr = '' + PairCount = 0 + while not self.__EndOfFile(): + CurCh = self.__CurrentChar() + if CurCh == '(': + PairCount += 1 + elif CurCh == ')': + PairCount -= 1 + + if CurCh in '|\r\n' and PairCount == 0: + break + Expr += CurCh + self.__GetOneChar() + try: + return long( + ValueExpression(Expr, + dict(['%s.%s' % (Pcd[1], Pcd[0]), Val] + for Pcd, Val in self.Profile.PcdDict.iteritems()) + )(True),0) + except Exception: + self.SetFileBufferPos(StartPos) + return None + ## __GetRegionLayout() method # # Get region layout for FD @@ -1717,19 +1749,21 @@ class FdfParser: # @retval False Not able to find # def __GetRegionLayout(self, Fd): - if not self.__GetNextHexNumber(): + Offset = self.__CalcRegionExpr() + if Offset == None: return False RegionObj = Region.Region() - RegionObj.Offset = long(self.__Token, 0) + RegionObj.Offset = Offset Fd.RegionList.append(RegionObj) if not self.__IsToken( "|"): raise Warning("expected '|'", self.FileName, self.CurrentLineNumber) - if not self.__GetNextHexNumber(): + Size = self.__CalcRegionExpr() + if Size == None: raise Warning("expected Region Size", self.FileName, self.CurrentLineNumber) - RegionObj.Size = long(self.__Token, 0) + RegionObj.Size = Size if not self.__GetNextWord(): return True @@ -2503,16 +2537,16 @@ class FdfParser: self.__GetFileOpts( FfsFileObj) if not self.__IsToken("{"): -# if self.__IsKeyword('RELOCS_STRIPPED') or self.__IsKeyword('RELOCS_RETAINED'): -# if self.__FileCouldHaveRelocFlag(FfsFileObj.FvFileType): -# if self.__Token == 'RELOCS_STRIPPED': -# FfsFileObj.KeepReloc = False -# else: -# FfsFileObj.KeepReloc = True -# else: -# raise Warning("File type %s could not have reloc strip flag%d" % (FfsFileObj.FvFileType, self.CurrentLineNumber), self.FileName, self.CurrentLineNumber) -# -# if not self.__IsToken("{"): + if self.__IsKeyword('RELOCS_STRIPPED') or self.__IsKeyword('RELOCS_RETAINED'): + if self.__FileCouldHaveRelocFlag(FfsFileObj.FvFileType): + if self.__Token == 'RELOCS_STRIPPED': + FfsFileObj.KeepReloc = False + else: + FfsFileObj.KeepReloc = True + else: + raise Warning("File type %s could not have reloc strip flag%d" % (FfsFileObj.FvFileType, self.CurrentLineNumber), self.FileName, self.CurrentLineNumber) + + if not self.__IsToken("{"): raise Warning("expected '{'", self.FileName, self.CurrentLineNumber) if not self.__GetNextToken(): @@ -3186,7 +3220,7 @@ class FdfParser: raise Warning("expected '.'", self.FileName, self.CurrentLineNumber) Arch = self.__SkippedChars.rstrip(".") - if Arch.upper() not in ("IA32", "X64", "IPF", "EBC", "ARM", "COMMON"): + if Arch.upper() not in ("IA32", "X64", "IPF", "EBC", "ARM", "AARCH64", "COMMON"): raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.CurrentLineNumber) ModuleType = self.__GetModuleType() @@ -3764,7 +3798,7 @@ class FdfParser: raise Warning("expected '.'", self.FileName, self.CurrentLineNumber) Arch = self.__SkippedChars.rstrip(".").upper() - if Arch not in ("IA32", "X64", "IPF", "ARM"): + if Arch not in ("IA32", "X64", "IPF", "ARM", "AARCH64"): raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.CurrentLineNumber) if not self.__GetNextWord(): @@ -3778,7 +3812,7 @@ class FdfParser: if self.__IsToken(","): if not self.__GetNextWord(): raise Warning("expected Arch list", self.FileName, self.CurrentLineNumber) - if self.__Token.upper() not in ("IA32", "X64", "IPF", "ARM"): + if self.__Token.upper() not in ("IA32", "X64", "IPF", "ARM", "AARCH64"): raise Warning("Unknown Arch '%s'" % self.__Token, self.FileName, self.CurrentLineNumber) VtfObj.ArchList = self.__Token.upper() diff --git a/BaseTools/Source/Python/GenFds/FfsFileStatement.py b/BaseTools/Source/Python/GenFds/FfsFileStatement.py index 04527fe00f..d0dec380fb 100644 --- a/BaseTools/Source/Python/GenFds/FfsFileStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsFileStatement.py @@ -110,6 +110,8 @@ class FileStatement (FileStatementClassObject) : if FvParentAddr != None and isinstance(section, GuidSection): section.FvParentAddr = FvParentAddr + if self.KeepReloc == False: + section.KeepReloc = False sectList, align = section.GenSection(OutputDir, self.NameGuid, SecIndex, self.KeyStringList, None, Dict) if sectList != []: for sect in sectList: diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py index 96e212cae7..71acd2992c 100644 --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py @@ -388,6 +388,11 @@ class FfsInfStatement(FfsInfStatementClassObject): if InfFileKey in (PlatformDataBase.Modules): DscArchList.append ('EBC') + PlatformDataBase = GenFdsGlobalVariable.WorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, 'AARCH64', GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag] + if PlatformDataBase != None: + if InfFileKey in (PlatformDataBase.Modules): + DscArchList.append ('AARCH64') + return DscArchList ## GetCurrentArch() method diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py index fb86a152b6..400008e815 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -301,7 +301,7 @@ def myOptionParser(): usage = "%prog [options] -f input_file -a arch_list -b build_target -p active_platform -t tool_chain_tag -D \"MacroName [= MacroValue]\"" Parser = OptionParser(usage=usage,description=__copyright__,version="%prog " + str(versionNumber)) Parser.add_option("-f", "--file", dest="filename", type="string", help="Name of FDF file to convert", action="callback", callback=SingleCheckCallback) - Parser.add_option("-a", "--arch", dest="archList", help="comma separated list containing one or more of: IA32, X64, IPF, ARM or EBC which should be built, overrides target.txt?s TARGET_ARCH") + Parser.add_option("-a", "--arch", dest="archList", help="comma separated list containing one or more of: IA32, X64, IPF, ARM, AARCH64 or EBC which should be built, overrides target.txt?s TARGET_ARCH") Parser.add_option("-q", "--quiet", action="store_true", type=None, help="Disable all messages except FATAL ERRORS.") Parser.add_option("-v", "--verbose", action="store_true", type=None, help="Turn on verbose output with informational messages printed.") Parser.add_option("-d", "--debug", action="store", type="int", help="Enable debug messages at specified level.") diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py index b457937628..2fa4cb8c0d 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -345,7 +345,7 @@ class GenFdsGlobalVariable: @staticmethod def GenerateSection(Output, Input, Type=None, CompressionType=None, Guid=None, - GuidHdrLen=None, GuidAttr=[], Ui=None, Ver=None, InputAlign=None): + GuidHdrLen=None, GuidAttr=[], Ui=None, Ver=None, InputAlign=None, BuildNumber=None): Cmd = ["GenSec"] if Type not in [None, '']: Cmd += ["-s", Type] @@ -364,6 +364,7 @@ class GenFdsGlobalVariable: for SecAlign in InputAlign: Cmd += ["--sectionalign", SecAlign] + CommandFile = Output + '.txt' if Ui not in [None, '']: #Cmd += ["-n", '"' + Ui + '"'] SectionData = array.array('B', [0,0,0,0]) @@ -374,19 +375,20 @@ class GenFdsGlobalVariable: GenFdsGlobalVariable.SectionHeader.pack_into(SectionData, 0, Len & 0xff, (Len >> 8) & 0xff, (Len >> 16) & 0xff, 0x15) SaveFileOnChange(Output, SectionData.tostring()) elif Ver not in [None, '']: - #Cmd += ["-j", Ver] - SectionData = array.array('B', [0,0,0,0]) - SectionData.fromstring(Ver.encode("utf_16_le")) - SectionData.append(0) - SectionData.append(0) - Len = len(SectionData) - GenFdsGlobalVariable.SectionHeader.pack_into(SectionData, 0, Len & 0xff, (Len >> 8) & 0xff, (Len >> 16) & 0xff, 0x14) - SaveFileOnChange(Output, SectionData.tostring()) + Cmd += ["-n", Ver] + if BuildNumber: + Cmd += ["-j", BuildNumber] + Cmd += ["-o", Output] + + SaveFileOnChange(CommandFile, ' '.join(Cmd), False) + if not GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + [CommandFile]): + return + + GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate section") else: Cmd += ["-o", Output] Cmd += Input - CommandFile = Output + '.txt' SaveFileOnChange(CommandFile, ' '.join(Cmd), False) if not GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + [CommandFile]): return diff --git a/BaseTools/Source/Python/GenFds/VerSection.py b/BaseTools/Source/Python/GenFds/VerSection.py index 3fca4064f0..8f6da9624f 100644 --- a/BaseTools/Source/Python/GenFds/VerSection.py +++ b/BaseTools/Source/Python/GenFds/VerSection.py @@ -76,7 +76,7 @@ class VerSection (VerSectionClassObject): StringData = '' GenFdsGlobalVariable.GenerateSection(OutputFile, None, 'EFI_SECTION_VERSION', - Ui=StringData, Ver=self.BuildNum) + Ver=StringData, BuildNumber=self.BuildNum) OutputFileList = [] OutputFileList.append(OutputFile) return OutputFileList, self.Alignment diff --git a/BaseTools/Source/Python/Makefile b/BaseTools/Source/Python/Makefile index fec8b43646..a3a537c352 100644 --- a/BaseTools/Source/Python/Makefile +++ b/BaseTools/Source/Python/Makefile @@ -15,7 +15,13 @@ !ERROR PYTHON_FREEZER_PATH must be defined! !ENDIF +!IF EXIST ($(PYTHON_FREEZER_PATH)\cxfreeze) +# Using cx_Freeze 4.2.3 with Python 2.7.2 +FREEZE=$(PYTHON_FREEZER_PATH)\cxfreeze +!ELSE +# Using cx_Freeze 3.0.3 with Python 2.5.4 FREEZE=$(PYTHON_FREEZER_PATH)\FreezePython.exe +!ENDIF MODULES=encodings.cp437,encodings.gbk,encodings.utf_16,encodings.utf_8,encodings.utf_16_le,encodings.latin_1,encodings.ascii diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/Source/Python/TargetTool/TargetTool.py index 476e927a88..8126aac59c 100644 --- a/BaseTools/Source/Python/TargetTool/TargetTool.py +++ b/BaseTools/Source/Python/TargetTool/TargetTool.py @@ -200,8 +200,8 @@ def RangeCheckCallback(option, opt_str, value, parser): def MyOptionParser(): parser = OptionParser(version=__version__,prog="TargetTool.exe",usage=__usage__,description=__copyright__) - parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32','X64','IPF','EBC', 'ARM','0'], dest="TARGET_ARCH", - help="ARCHS is one of list: IA32, X64, IPF, ARM or EBC, which replaces target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option. 0 will clear this setting in target.txt and can't combine with other value.") + parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32','X64','IPF','EBC', 'ARM', 'AARCH64','0'], dest="TARGET_ARCH", + help="ARCHS is one of list: IA32, X64, IPF, ARM, AARCH64 or EBC, which replaces target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option. 0 will clear this setting in target.txt and can't combine with other value.") parser.add_option("-p", "--platform", action="callback", type="string", dest="DSCFILE", callback=SingleCheckCallback, help="Specify a DSC file, which replace target.txt's ACTIVE_PLATFORM definition. 0 will clear this setting in target.txt and can't combine with other value.") parser.add_option("-c", "--tooldef", action="callback", type="string", dest="TOOL_DEFINITION_FILE", callback=SingleCheckCallback, diff --git a/BaseTools/Source/Python/UPT/BuildVersion.py b/BaseTools/Source/Python/UPT/BuildVersion.py index e2dca6130f..edd4696753 100644 --- a/BaseTools/Source/Python/UPT/BuildVersion.py +++ b/BaseTools/Source/Python/UPT/BuildVersion.py @@ -17,4 +17,4 @@ Build version information ''' -gBUILD_VERSION = "Build 2524" +gBUILD_VERSION = "" diff --git a/BaseTools/Source/Python/UPT/Library/DataType.py b/BaseTools/Source/Python/UPT/Library/DataType.py index da6b69d82b..de3c7092ad 100644 --- a/BaseTools/Source/Python/UPT/Library/DataType.py +++ b/BaseTools/Source/Python/UPT/Library/DataType.py @@ -353,9 +353,10 @@ TAB_ARCH_X64 = 'X64' TAB_ARCH_IPF = 'IPF' TAB_ARCH_ARM = 'ARM' TAB_ARCH_EBC = 'EBC' +TAB_ARCH_AARCH64 = 'AARCH64' ARCH_LIST = \ -[TAB_ARCH_IA32, TAB_ARCH_X64, TAB_ARCH_IPF, TAB_ARCH_ARM, TAB_ARCH_EBC] +[TAB_ARCH_IA32, TAB_ARCH_X64, TAB_ARCH_IPF, TAB_ARCH_ARM, TAB_ARCH_EBC, TAB_ARCH_AARCH64] SUP_MODULE_BASE = 'BASE' SUP_MODULE_SEC = 'SEC' @@ -440,6 +441,7 @@ TAB_SOURCES_X64 = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_X64 TAB_SOURCES_IPF = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_IPF TAB_SOURCES_ARM = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_ARM TAB_SOURCES_EBC = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_EBC +TAB_SOURCES_AARCH64 = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_BINARIES = 'Binaries' TAB_BINARIES_COMMON = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_COMMON @@ -448,6 +450,7 @@ TAB_BINARIES_X64 = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_X64 TAB_BINARIES_IPF = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_IPF TAB_BINARIES_ARM = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_ARM TAB_BINARIES_EBC = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_EBC +TAB_BINARIES_AARCH64 = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_INCLUDES = 'Includes' TAB_INCLUDES_COMMON = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_COMMON @@ -456,6 +459,7 @@ TAB_INCLUDES_X64 = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_X64 TAB_INCLUDES_IPF = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_IPF TAB_INCLUDES_ARM = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_ARM TAB_INCLUDES_EBC = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_EBC +TAB_INCLUDES_AARCH64 = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_GUIDS = 'Guids' TAB_GUIDS_COMMON = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_COMMON @@ -464,6 +468,7 @@ TAB_GUIDS_X64 = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_X64 TAB_GUIDS_IPF = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_IPF TAB_GUIDS_ARM = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_ARM TAB_GUIDS_EBC = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_EBC +TAB_GUIDS_AARCH64 = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PROTOCOLS = 'Protocols' TAB_PROTOCOLS_COMMON = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_COMMON @@ -472,6 +477,7 @@ TAB_PROTOCOLS_X64 = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_X64 TAB_PROTOCOLS_IPF = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_IPF TAB_PROTOCOLS_ARM = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_ARM TAB_PROTOCOLS_EBC = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_EBC +TAB_PROTOCOLS_AARCH64 = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PPIS = 'Ppis' TAB_PPIS_COMMON = TAB_PPIS + TAB_SPLIT + TAB_ARCH_COMMON @@ -480,6 +486,7 @@ TAB_PPIS_X64 = TAB_PPIS + TAB_SPLIT + TAB_ARCH_X64 TAB_PPIS_IPF = TAB_PPIS + TAB_SPLIT + TAB_ARCH_IPF TAB_PPIS_ARM = TAB_PPIS + TAB_SPLIT + TAB_ARCH_ARM TAB_PPIS_EBC = TAB_PPIS + TAB_SPLIT + TAB_ARCH_EBC +TAB_PPIS_AARCH64 = TAB_PPIS + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_LIBRARY_CLASSES = 'LibraryClasses' TAB_LIBRARY_CLASSES_COMMON = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_COMMON @@ -488,6 +495,7 @@ TAB_LIBRARY_CLASSES_X64 = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_X64 TAB_LIBRARY_CLASSES_IPF = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_IPF TAB_LIBRARY_CLASSES_ARM = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_ARM TAB_LIBRARY_CLASSES_EBC = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_EBC +TAB_LIBRARY_CLASSES_AARCH64 = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PACKAGES = 'Packages' TAB_PACKAGES_COMMON = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_COMMON @@ -496,6 +504,7 @@ TAB_PACKAGES_X64 = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_X64 TAB_PACKAGES_IPF = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_IPF TAB_PACKAGES_ARM = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_ARM TAB_PACKAGES_EBC = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_EBC +TAB_PACKAGES_AARCH64 = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PCDS = 'Pcds' TAB_PCDS_FIXED_AT_BUILD = 'FixedAtBuild' @@ -535,6 +544,8 @@ TAB_PCDS_FIXED_AT_BUILD_ARM = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + \ TAB_SPLIT + TAB_ARCH_ARM TAB_PCDS_FIXED_AT_BUILD_EBC = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + \ TAB_SPLIT + TAB_ARCH_EBC +TAB_PCDS_FIXED_AT_BUILD_AARCH64 = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + \ +TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PCDS_PATCHABLE_IN_MODULE_NULL = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE TAB_PCDS_PATCHABLE_IN_MODULE_COMMON = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE \ @@ -549,6 +560,8 @@ TAB_PCDS_PATCHABLE_IN_MODULE_ARM = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + \ TAB_SPLIT + TAB_ARCH_ARM TAB_PCDS_PATCHABLE_IN_MODULE_EBC = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + \ TAB_SPLIT + TAB_ARCH_EBC +TAB_PCDS_PATCHABLE_IN_MODULE_AARCH64 = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + \ +TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PCDS_FEATURE_FLAG_NULL = TAB_PCDS + TAB_PCDS_FEATURE_FLAG TAB_PCDS_FEATURE_FLAG_COMMON = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT \ @@ -563,6 +576,8 @@ TAB_PCDS_FEATURE_FLAG_ARM = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + \ TAB_ARCH_ARM TAB_PCDS_FEATURE_FLAG_EBC = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + \ TAB_ARCH_EBC +TAB_PCDS_FEATURE_FLAG_AARCH64 = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + \ +TAB_ARCH_AARCH64 TAB_PCDS_DYNAMIC_EX_NULL = TAB_PCDS + TAB_PCDS_DYNAMIC_EX TAB_PCDS_DYNAMIC_EX_DEFAULT_NULL = TAB_PCDS + TAB_PCDS_DYNAMIC_EX_DEFAULT @@ -580,6 +595,8 @@ TAB_PCDS_DYNAMIC_EX_ARM = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + \ TAB_ARCH_ARM TAB_PCDS_DYNAMIC_EX_EBC = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + \ TAB_ARCH_EBC +TAB_PCDS_DYNAMIC_EX_AARCH64 = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + \ +TAB_ARCH_AARCH64 TAB_PCDS_DYNAMIC_NULL = TAB_PCDS + TAB_PCDS_DYNAMIC TAB_PCDS_DYNAMIC_DEFAULT_NULL = TAB_PCDS + TAB_PCDS_DYNAMIC_DEFAULT @@ -592,6 +609,7 @@ TAB_PCDS_DYNAMIC_X64 = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_X64 TAB_PCDS_DYNAMIC_IPF = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_IPF TAB_PCDS_DYNAMIC_ARM = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_ARM TAB_PCDS_DYNAMIC_EBC = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_EBC +TAB_PCDS_DYNAMIC_AARCH64 = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_PCD_DYNAMIC_TYPE_LIST = [TAB_PCDS_DYNAMIC_DEFAULT_NULL, \ TAB_PCDS_DYNAMIC_VPD_NULL, \ @@ -632,6 +650,7 @@ TAB_DEPEX_X64 = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_X64 TAB_DEPEX_IPF = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_IPF TAB_DEPEX_ARM = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_ARM TAB_DEPEX_EBC = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_EBC +TAB_DEPEX_AARCH64 = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_SKUIDS = 'SkuIds' @@ -642,6 +661,7 @@ TAB_LIBRARIES_X64 = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_X64 TAB_LIBRARIES_IPF = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_IPF TAB_LIBRARIES_ARM = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_ARM TAB_LIBRARIES_EBC = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_EBC +TAB_LIBRARIES_AARCH64 = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_COMPONENTS = 'Components' TAB_COMPONENTS_COMMON = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_COMMON @@ -650,6 +670,7 @@ TAB_COMPONENTS_X64 = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_X64 TAB_COMPONENTS_IPF = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_IPF TAB_COMPONENTS_ARM = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_ARM TAB_COMPONENTS_EBC = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_EBC +TAB_COMPONENTS_AARCH64 = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_AARCH64 TAB_COMPONENTS_SOURCE_OVERRIDE_PATH = 'SOURCE_OVERRIDE_PATH' diff --git a/BaseTools/Source/Python/UPT/Library/GlobalData.py b/BaseTools/Source/Python/UPT/Library/GlobalData.py index fedd981529..3f72f22738 100644 --- a/BaseTools/Source/Python/UPT/Library/GlobalData.py +++ b/BaseTools/Source/Python/UPT/Library/GlobalData.py @@ -92,3 +92,8 @@ gUNPACK_DIR = None # Flag used to mark whether the INF file is Binary INF or not. # gIS_BINARY_INF = False +# +# Used by Library instance parser +# {FilePath: FileObj} +# +gLIBINSTANCEDICT = {} \ No newline at end of file diff --git a/BaseTools/Source/Python/UPT/Library/String.py b/BaseTools/Source/Python/UPT/Library/String.py index 2c5853ca93..0953e47cb1 100644 --- a/BaseTools/Source/Python/UPT/Library/String.py +++ b/BaseTools/Source/Python/UPT/Library/String.py @@ -2,7 +2,7 @@ # This file is used to define common string related functions used in parsing # process # -# Copyright (c) 2011, Intel Corporation. All rights reserved.
+# Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are licensed and made available # under the terms and conditions of the BSD License which accompanies this @@ -737,7 +737,7 @@ def IsHexDigit(Str): return False return False -## Check if the string is HexDgit and its interger value within limit of UINT32 +## Check if the string is HexDgit and its integer value within limit of UINT32 # # Return true if all characters in the string are digits and there is at # least one character diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py index d576cffbd0..27a1c6ad25 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py @@ -89,19 +89,19 @@ class InfUserExtensionObject(): InfUserExtensionItemObj.SetContent(UserExtensionCont) InfUserExtensionItemObj.SetSupArchList(IdContentItem[2]) - for CheckItem in self.UserExtension: - if IdContentItem[0] == CheckItem[0] and IdContentItem[1] == CheckItem[1]: - if IdContentItem[2].upper() == 'COMMON' or CheckItem[2].upper() == 'COMMON': - # - # For COMMON ARCH type, do special check. - # - Logger.Error('InfParser', - ToolError.FORMAT_INVALID, - ST.ERR_INF_PARSER_UE_SECTION_DUPLICATE_ERROR%\ - (IdContentItem[0] + '.' + IdContentItem[1] + '.' + IdContentItem[2]), - File=GlobalData.gINF_MODULE_NAME, - Line=LineNo, - ExtraData=None) +# for CheckItem in self.UserExtension: +# if IdContentItem[0] == CheckItem[0] and IdContentItem[1] == CheckItem[1]: +# if IdContentItem[2].upper() == 'COMMON' or CheckItem[2].upper() == 'COMMON': +# # +# # For COMMON ARCH type, do special check. +# # +# Logger.Error('InfParser', +# ToolError.FORMAT_INVALID, +# ST.ERR_INF_PARSER_UE_SECTION_DUPLICATE_ERROR%\ +# (IdContentItem[0] + '.' + IdContentItem[1] + '.' + IdContentItem[2]), +# File=GlobalData.gINF_MODULE_NAME, +# Line=LineNo, +# ExtraData=None) if self.UserExtension.has_key(IdContentItem): # diff --git a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py index 12c46f1954..6bf070be41 100644 --- a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py +++ b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py @@ -42,12 +42,12 @@ from Library import DataType as DT # @param WorkSpace. The WorkSpace directory used to combined with INF file path. # # @return GUID, Version -def GetLibInstanceInfo(String, WorkSpace, LineNo): - +def GetLibInstanceInfo(String, WorkSpace, LineNo, CurrentInfFileName): + FileGuidString = "" VerString = "" - - OrignalString = String + + OrignalString = String String = String.strip() if not String: return None, None @@ -56,28 +56,48 @@ def GetLibInstanceInfo(String, WorkSpace, LineNo): # String = GetHelpStringByRemoveHashKey(String) String = String.strip() - + + # + # To deal with library instance specified by GUID and version + # + RegFormatGuidPattern = re.compile("\s*([0-9a-fA-F]){8}-" + "([0-9a-fA-F]){4}-" + "([0-9a-fA-F]){4}-" + "([0-9a-fA-F]){4}-" + "([0-9a-fA-F]){12}\s*") + VersionPattern = re.compile('[\t\s]*\d+(\.\d+)?[\t\s]*') + GuidMatchedObj = RegFormatGuidPattern.search(String) + + if String.upper().startswith('GUID') and GuidMatchedObj and 'Version' in String: + VersionStr = String[String.upper().find('VERSION') + 8:] + VersionMatchedObj = VersionPattern.search(VersionStr) + if VersionMatchedObj: + Guid = GuidMatchedObj.group().strip() + Version = VersionMatchedObj.group().strip() + return GetGuidVerFormLibInstance(Guid, Version, WorkSpace, CurrentInfFileName) + + # + # To deal with library instance specified by file name + # FileLinesList = GetFileLineContent(String, WorkSpace, LineNo, OrignalString) - + ReFindFileGuidPattern = re.compile("^\s*FILE_GUID\s*=.*$") ReFindVerStringPattern = re.compile("^\s*VERSION_STRING\s*=.*$") - - FileLinesList = ProcessLineExtender(FileLinesList) for Line in FileLinesList: if ReFindFileGuidPattern.match(Line): FileGuidString = Line if ReFindVerStringPattern.match(Line): VerString = Line - + if FileGuidString: FileGuidString = GetSplitValueList(FileGuidString, '=', 1)[1] if VerString: VerString = GetSplitValueList(VerString, '=', 1)[1] - + return FileGuidString, VerString - + ## GetPackageListInfo # # Get the package information from INF file. @@ -184,36 +204,97 @@ def GetFileLineContent(FileName, WorkSpace, LineNo, OriginalString): # # Validate file exist/format. # - if IsValidPath(FileName, WorkSpace): - IsValidFileFlag = True - else: + if not IsValidPath(FileName, WorkSpace): Logger.Error("InfParser", ToolError.FORMAT_INVALID, ST.ERR_INF_PARSER_FILE_NOT_EXIST_OR_NAME_INVALID%(FileName), File=GlobalData.gINF_MODULE_NAME, Line=LineNo, ExtraData=OriginalString) - return False FileLinesList = [] - if IsValidFileFlag: + try: + FullFileName = FullFileName.replace('\\', '/') + Inputfile = open(FullFileName, "rb", 0) try: - FullFileName = FullFileName.replace('\\', '/') - Inputfile = open(FullFileName, "rb", 0) - try: - FileLinesList = Inputfile.readlines() - except BaseException: - Logger.Error("InfParser", ToolError.FILE_READ_FAILURE, ST.ERR_FILE_OPEN_FAILURE, File=FullFileName) - finally: - Inputfile.close() + FileLinesList = Inputfile.readlines() except BaseException: - Logger.Error("InfParser", - ToolError.FILE_READ_FAILURE, - ST.ERR_FILE_OPEN_FAILURE, - File=FullFileName) - - FileLinesList = ProcessLineExtender(FileLinesList) + Logger.Error("InfParser", ToolError.FILE_READ_FAILURE, ST.ERR_FILE_OPEN_FAILURE, File=FullFileName) + finally: + Inputfile.close() + except BaseException: + Logger.Error("InfParser", + ToolError.FILE_READ_FAILURE, + ST.ERR_FILE_OPEN_FAILURE, + File=FullFileName) + + FileLinesList = ProcessLineExtender(FileLinesList) return FileLinesList - \ No newline at end of file + +## +# Get all INF files from current workspace +# +# +def GetInfsFromWorkSpace(WorkSpace): + InfFiles = [] + for top, dirs, files in os.walk(WorkSpace): + dirs = dirs # just for pylint + for File in files: + if File.upper().endswith(".INF"): + InfFiles.append(os.path.join(top, File)) + + return InfFiles + +## +# Get GUID and version from library instance file +# +# +def GetGuidVerFormLibInstance(Guid, Version, WorkSpace, CurrentInfFileName): + for InfFile in GetInfsFromWorkSpace(WorkSpace): + try: + if InfFile.strip().upper() == CurrentInfFileName.strip().upper(): + continue + InfFile = InfFile.replace('\\', '/') + if InfFile not in GlobalData.gLIBINSTANCEDICT: + InfFileObj = open(InfFile, "rb", 0) + GlobalData.gLIBINSTANCEDICT[InfFile] = InfFileObj + else: + InfFileObj = GlobalData.gLIBINSTANCEDICT[InfFile] + + except BaseException: + Logger.Error("InfParser", + ToolError.FILE_READ_FAILURE, + ST.ERR_FILE_OPEN_FAILURE, + File=InfFile) + try: + FileLinesList = InfFileObj.readlines() + FileLinesList = ProcessLineExtender(FileLinesList) + + ReFindFileGuidPattern = re.compile("^\s*FILE_GUID\s*=.*$") + ReFindVerStringPattern = re.compile("^\s*VERSION_STRING\s*=.*$") + + for Line in FileLinesList: + if ReFindFileGuidPattern.match(Line): + FileGuidString = Line + if ReFindVerStringPattern.match(Line): + VerString = Line + + if FileGuidString: + FileGuidString = GetSplitValueList(FileGuidString, '=', 1)[1] + if VerString: + VerString = GetSplitValueList(VerString, '=', 1)[1] + + if FileGuidString.strip().upper() == Guid.upper() and \ + VerString.strip().upper() == Version.upper(): + return Guid, Version + + except BaseException: + Logger.Error("InfParser", ToolError.FILE_READ_FAILURE, ST.ERR_FILE_OPEN_FAILURE, File=InfFile) + finally: + InfFileObj.close() + + return '', '' + + diff --git a/BaseTools/Source/Python/UPT/Parser/InfLibrarySectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfLibrarySectionParser.py index 8f9427cf4f..4540fe2754 100644 --- a/BaseTools/Source/Python/UPT/Parser/InfLibrarySectionParser.py +++ b/BaseTools/Source/Python/UPT/Parser/InfLibrarySectionParser.py @@ -170,28 +170,29 @@ class InfLibrarySectionParser(InfParserSectionRoot): File=FileName, Line=LineNo, ExtraData=LineContent) - + if IsLibInstanceInfo(LineContent): LibInsFlag = True continue - + if LibInsFlag: - LibGuid, LibVer = GetLibInstanceInfo(LineContent, GlobalData.gWORKSPACE, LineNo) + LibGuid, LibVer = GetLibInstanceInfo(LineContent, GlobalData.gWORKSPACE, LineNo, FileName) # # If the VERSION_STRING is missing from the INF file, tool should default to "0". # if LibVer == '': LibVer = '0' if LibGuid != '': - LibraryList.append((LibGuid, LibVer)) + if (LibGuid, LibVer) not in LibraryList: + LibraryList.append((LibGuid, LibVer)) else: - Logger.Error('InfParser', + Logger.Error('InfParser', FORMAT_INVALID, - ST.ERR_LIB_INSTANCE_MISS_GUID, - File=FileName, - Line=LineNo, - ExtraData=LineContent) - + ST.ERR_LIB_INSTANCE_MISS_GUID, + File=FileName, + Line=LineNo, + ExtraData=LineContent) + # # Current section archs # diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py index a6668774b5..b2e98633af 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -1,7 +1,7 @@ ## @file # This file is used to parse meta files # -# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -25,7 +25,7 @@ import Common.GlobalData as GlobalData from CommonDataClass.DataClass import * from Common.DataType import * from Common.String import * -from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClass, AnalyzePcdData +from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClass, AnalyzePcdData, AnalyzeDscPcd from Common.Expression import * from CommonDataClass.Exceptions import * @@ -44,7 +44,7 @@ def ParseMacro(Parser): # Syntax check if not TokenList[0]: EdkLogger.error('Parser', FORMAT_INVALID, "No macro name given", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) if len(TokenList) < 2: TokenList.append('') @@ -53,11 +53,11 @@ def ParseMacro(Parser): # Global macros can be only defined via environment variable if Name in GlobalData.gGlobalDefines: EdkLogger.error('Parser', FORMAT_INVALID, "%s can only be defined via environment variable" % Name, - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) # Only upper case letters, digit and '_' are allowed if not gMacroNamePattern.match(Name): EdkLogger.error('Parser', FORMAT_INVALID, "The macro name must be in the pattern [A-Z][A-Z0-9_]*", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) Value = ReplaceMacro(Value, self._Macros) if Type in self.DataType: @@ -85,14 +85,14 @@ def ParseMacro(Parser): # EDK_GLOBAL defined macros elif type(self) != DscParser: EdkLogger.error('Parser', FORMAT_INVALID, "EDK_GLOBAL can only be used in .dsc file", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) elif self._SectionType != MODEL_META_DATA_HEADER: EdkLogger.error('Parser', FORMAT_INVALID, "EDK_GLOBAL can only be used under [Defines] section", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) elif (Name in self._FileLocalMacros) and (self._FileLocalMacros[Name] != Value): EdkLogger.error('Parser', FORMAT_INVALID, "EDK_GLOBAL defined a macro with the same name and different value as one defined by 'DEFINE'", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) - + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) + self._ValueList = [Type, Name, Value] return MacroParser @@ -146,7 +146,7 @@ class MetaFileParser(object): # @param Owner Owner ID (for sub-section parsing) # @param From ID from which the data comes (for !INCLUDE directive) # - def __init__(self, FilePath, FileType, Table, Owner=-1, From=-1): + def __init__(self, FilePath, FileType, Table, Owner= -1, From= -1): self._Table = Table self._RawTable = Table self._FileType = FileType @@ -262,7 +262,7 @@ class MetaFileParser(object): ## Skip unsupported data def _Skip(self): EdkLogger.warn("Parser", "Unrecognized content", File=self.MetaFile, - Line=self._LineIndex+1, ExtraData=self._CurrentLine); + Line=self._LineIndex + 1, ExtraData=self._CurrentLine); self._ValueList[0:1] = [self._CurrentLine] ## Section header parser @@ -282,20 +282,27 @@ class MetaFileParser(object): # different section should not mix in one section if self._SectionName != '' and self._SectionName != ItemList[0].upper(): EdkLogger.error('Parser', FORMAT_INVALID, "Different section names in the same section", - File=self.MetaFile, Line=self._LineIndex+1, ExtraData=self._CurrentLine) + File=self.MetaFile, Line=self._LineIndex + 1, ExtraData=self._CurrentLine) self._SectionName = ItemList[0].upper() if self._SectionName in self.DataType: self._SectionType = self.DataType[self._SectionName] + # Check if the section name is valid + if self._SectionName not in SECTIONS_HAVE_ITEM_AFTER_ARCH and len(ItemList) > 2: + EdkLogger.error("Parser", FORMAT_UNKNOWN_ERROR, "%s is not a valid section name" % Item, + self.MetaFile, self._LineIndex + 1, self._CurrentLine) + elif self._Version >= 0x00010005: + EdkLogger.error("Parser", FORMAT_UNKNOWN_ERROR, "%s is not a valid section name" % Item, + self.MetaFile, self._LineIndex + 1, self._CurrentLine) else: self._SectionType = MODEL_UNKNOWN - EdkLogger.warn("Parser", "Unrecognized section", File=self.MetaFile, - Line=self._LineIndex+1, ExtraData=self._CurrentLine) + # S1 is always Arch if len(ItemList) > 1: S1 = ItemList[1].upper() else: S1 = 'COMMON' ArchList.add(S1) + # S2 may be Platform or ModuleType if len(ItemList) > 2: S2 = ItemList[2].upper() @@ -306,7 +313,7 @@ class MetaFileParser(object): # 'COMMON' must not be used with specific ARCHs at the same section if 'COMMON' in ArchList and len(ArchList) > 1: EdkLogger.error('Parser', FORMAT_INVALID, "'common' ARCH must not be used with specific ARCHs", - File=self.MetaFile, Line=self._LineIndex+1, ExtraData=self._CurrentLine) + File=self.MetaFile, Line=self._LineIndex + 1, ExtraData=self._CurrentLine) # If the section information is needed later, it should be stored in database self._ValueList[0] = self._SectionName @@ -317,10 +324,10 @@ class MetaFileParser(object): self._ValueList[1:len(TokenList)] = TokenList if not self._ValueList[1]: EdkLogger.error('Parser', FORMAT_INVALID, "No name specified", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) if not self._ValueList[2]: EdkLogger.error('Parser', FORMAT_INVALID, "No value specified", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) self._ValueList = [ReplaceMacro(Value, self._Macros) for Value in self._ValueList] Name, Value = self._ValueList[1], self._ValueList[2] @@ -330,7 +337,7 @@ class MetaFileParser(object): self._Version = int(Value, 0) except: EdkLogger.error('Parser', FORMAT_INVALID, "Invalid version number", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) if type(self) == InfParser and self._Version < 0x00010005: # EDK module allows using defines as macros @@ -358,7 +365,7 @@ class MetaFileParser(object): "'%s' must be in format of ____FLAGS" % self._ValueList[1], ExtraData=self._CurrentLine, File=self.MetaFile, - Line=self._LineIndex+1 + Line=self._LineIndex + 1 ) def _GetMacros(self): @@ -391,11 +398,11 @@ class MetaFileParser(object): ComComMacroDict = {} ComSpeMacroDict = {} SpeSpeMacroDict = {} - + ActiveSectionType = self._SectionType if type(self) == DecParser: ActiveSectionType = self._SectionType[0] - + for (SectionType, Scope) in self._SectionsMacroDict: if SectionType != ActiveSectionType: continue @@ -406,7 +413,7 @@ class MetaFileParser(object): break else: SpeSpeMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)]) - + for ActiveScope in self._Scope: Scope0, Scope1 = ActiveScope[0], ActiveScope[1] if(Scope0, Scope1) not in Scope and (Scope0, "COMMON") not in Scope and ("COMMON", Scope1) not in Scope: @@ -423,9 +430,9 @@ class MetaFileParser(object): return Macros - _SectionParser = {} - Finished = property(_GetFinished, _SetFinished) - _Macros = property(_GetMacros) + _SectionParser = {} + Finished = property(_GetFinished, _SetFinished) + _Macros = property(_GetMacros) ## INF file parser class @@ -475,6 +482,7 @@ class InfParser(MetaFileParser): if hasattr(self, "_Table"): return MetaFileParser.__init__(self, FilePath, FileType, Table) + self.PcdsDict = {} ## Parser starter def Start(self): @@ -527,13 +535,13 @@ class InfParser(MetaFileParser): MODEL_META_DATA_USER_EXTENSION]: EdkLogger.error('Parser', FORMAT_INVALID, "Section [%s] is not allowed in inf file without version" % (self._SectionName), - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) elif self._SectionType in [MODEL_EFI_INCLUDE, MODEL_EFI_LIBRARY_INSTANCE, MODEL_META_DATA_NMAKE]: EdkLogger.error('Parser', FORMAT_INVALID, "Section [%s] is not allowed in inf file with version 0x%08x" % (self._SectionName, self._Version), - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) continue # merge two lines specified by '\' in section NMAKE elif self._SectionType == MODEL_META_DATA_NMAKE: @@ -553,7 +561,7 @@ class InfParser(MetaFileParser): NmakeLine = '' # section content - self._ValueList = ['','',''] + self._ValueList = ['', '', ''] # parse current line, result will be put in self._ValueList self._SectionParser[self._SectionType](self) if self._ValueList == None or self._ItemType == MODEL_META_DATA_DEFINE: @@ -571,14 +579,14 @@ class InfParser(MetaFileParser): Arch, Platform, self._Owner[-1], - self._LineIndex+1, - -1, - self._LineIndex+1, - -1, + self._LineIndex + 1, + - 1, + self._LineIndex + 1, + - 1, 0 ) if IsFindBlockComment: - EdkLogger.error("Parser", FORMAT_INVALID, "Open block comments (starting with /*) are expected to end with */", + EdkLogger.error("Parser", FORMAT_INVALID, "Open block comments (starting with /*) are expected to end with */", File=self.MetaFile) self._Done() @@ -636,15 +644,15 @@ class InfParser(MetaFileParser): if len(TokenList) < 2: EdkLogger.error('Parser', FORMAT_INVALID, "No file type or path specified", ExtraData=self._CurrentLine + " ( | [| ])", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) if not TokenList[0]: EdkLogger.error('Parser', FORMAT_INVALID, "No file type specified", ExtraData=self._CurrentLine + " ( | [| ])", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) if not TokenList[1]: EdkLogger.error('Parser', FORMAT_INVALID, "No file path specified", ExtraData=self._CurrentLine + " ( | [| ])", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) self._ValueList[0:len(TokenList)] = TokenList self._ValueList[1] = ReplaceMacro(self._ValueList[1], self._Macros) @@ -665,14 +673,14 @@ class InfParser(MetaFileParser): if len(ValueList) != 2: EdkLogger.error('Parser', FORMAT_INVALID, "Illegal token space GUID and PCD name format", ExtraData=self._CurrentLine + " (.)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) self._ValueList[0:1] = ValueList if len(TokenList) > 1: self._ValueList[2] = TokenList[1] if self._ValueList[0] == '' or self._ValueList[1] == '': EdkLogger.error('Parser', FORMAT_INVALID, "No token space GUID or PCD name specified", ExtraData=self._CurrentLine + " (.)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) # if value are 'True', 'true', 'TRUE' or 'False', 'false', 'FALSE', replace with integer 1 or 0. if self._ValueList[2] != '': @@ -681,6 +689,12 @@ class InfParser(MetaFileParser): self._ValueList[2] = TokenList[1].replace(InfPcdValueList[0], '1', 1); elif InfPcdValueList[0] in ['False', 'false', 'FALSE']: self._ValueList[2] = TokenList[1].replace(InfPcdValueList[0], '0', 1); + if (self._ValueList[0], self._ValueList[1]) not in self.PcdsDict: + self.PcdsDict[self._ValueList[0], self._ValueList[1]] = self._SectionType + elif self.PcdsDict[self._ValueList[0], self._ValueList[1]] != self._SectionType: + EdkLogger.error('Parser', FORMAT_INVALID, "It is not permissible to list a specified PCD in different PCD type sections.", + ExtraData=self._CurrentLine + " (.)", + File=self.MetaFile, Line=self._LineIndex + 1) ## [depex] section parser @ParseMacro @@ -691,11 +705,11 @@ class InfParser(MetaFileParser): MODEL_UNKNOWN : MetaFileParser._Skip, MODEL_META_DATA_HEADER : MetaFileParser._DefineParser, MODEL_META_DATA_BUILD_OPTION : MetaFileParser._BuildOptionParser, - MODEL_EFI_INCLUDE : _IncludeParser, # for Edk.x modules - MODEL_EFI_LIBRARY_INSTANCE : MetaFileParser._CommonParser, # for Edk.x modules + MODEL_EFI_INCLUDE : _IncludeParser, # for Edk.x modules + MODEL_EFI_LIBRARY_INSTANCE : MetaFileParser._CommonParser, # for Edk.x modules MODEL_EFI_LIBRARY_CLASS : MetaFileParser._PathParser, MODEL_META_DATA_PACKAGE : MetaFileParser._PathParser, - MODEL_META_DATA_NMAKE : _NmakeParser, # for Edk.x modules + MODEL_META_DATA_NMAKE : _NmakeParser, # for Edk.x modules MODEL_PCD_FIXED_AT_BUILD : _PcdParser, MODEL_PCD_PATCHABLE_IN_MODULE : _PcdParser, MODEL_PCD_FEATURE_FLAG : _PcdParser, @@ -781,7 +795,7 @@ class DscParser(MetaFileParser): # @param Owner Owner ID (for sub-section parsing) # @param From ID from which the data comes (for !INCLUDE directive) # - def __init__(self, FilePath, FileType, Table, Owner=-1, From=-1): + def __init__(self, FilePath, FileType, Table, Owner= -1, From= -1): # prevent re-initialization if hasattr(self, "_Table"): return @@ -791,12 +805,12 @@ class DscParser(MetaFileParser): self._DirectiveStack = [] self._DirectiveEvalStack = [] self._Enabled = 1 - + # # Specify whether current line is in uncertain condition # self._InDirective = -1 - + # Final valid replacable symbols self._Symbols = {} # @@ -823,7 +837,7 @@ class DscParser(MetaFileParser): self._LineIndex = Index if self._InSubsection and self._Owner[-1] == -1: self._Owner.append(self._LastItem) - + # section header if Line[0] == TAB_SECTION_START and Line[-1] == TAB_SECTION_END: self._SectionType = MODEL_META_DATA_SECTION_HEADER @@ -866,10 +880,10 @@ class DscParser(MetaFileParser): ModuleType, self._Owner[-1], self._From, - self._LineIndex+1, - -1, - self._LineIndex+1, - -1, + self._LineIndex + 1, + - 1, + self._LineIndex + 1, + - 1, self._Enabled ) @@ -887,12 +901,12 @@ class DscParser(MetaFileParser): else: self._SubsectionType = MODEL_UNKNOWN EdkLogger.warn("Parser", "Unrecognized sub-section", File=self.MetaFile, - Line=self._LineIndex+1, ExtraData=self._CurrentLine) + Line=self._LineIndex + 1, ExtraData=self._CurrentLine) self._ValueList[0] = self._SubsectionName ## Directive statement parser def _DirectiveParser(self): - self._ValueList = ['','',''] + self._ValueList = ['', '', ''] TokenList = GetSplitValueList(self._CurrentLine, ' ', 1) self._ValueList[0:len(TokenList)] = TokenList @@ -900,7 +914,7 @@ class DscParser(MetaFileParser): DirectiveName = self._ValueList[0].upper() if DirectiveName not in self.DataType: EdkLogger.error("Parser", FORMAT_INVALID, "Unknown directive [%s]" % DirectiveName, - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) if DirectiveName in ['!IF', '!IFDEF', '!IFNDEF']: self._InDirective += 1 @@ -910,7 +924,7 @@ class DscParser(MetaFileParser): if DirectiveName in ['!IF', '!IFDEF', '!INCLUDE', '!IFNDEF', '!ELSEIF'] and self._ValueList[1] == '': EdkLogger.error("Parser", FORMAT_INVALID, "Missing expression", - File=self.MetaFile, Line=self._LineIndex+1, + File=self.MetaFile, Line=self._LineIndex + 1, ExtraData=self._CurrentLine) ItemType = self.DataType[DirectiveName] @@ -928,7 +942,7 @@ class DscParser(MetaFileParser): break else: EdkLogger.error("Parser", FORMAT_INVALID, "Redundant '!endif'", - File=self.MetaFile, Line=self._LineIndex+1, + File=self.MetaFile, Line=self._LineIndex + 1, ExtraData=self._CurrentLine) elif ItemType != MODEL_META_DATA_INCLUDE: # Break if there's a !else is followed by a !elseif @@ -936,14 +950,14 @@ class DscParser(MetaFileParser): self._DirectiveStack and \ self._DirectiveStack[-1][0] == MODEL_META_DATA_CONDITIONAL_STATEMENT_ELSE: EdkLogger.error("Parser", FORMAT_INVALID, "'!elseif' after '!else'", - File=self.MetaFile, Line=self._LineIndex+1, + File=self.MetaFile, Line=self._LineIndex + 1, ExtraData=self._CurrentLine) - self._DirectiveStack.append((ItemType, self._LineIndex+1, self._CurrentLine)) + self._DirectiveStack.append((ItemType, self._LineIndex + 1, self._CurrentLine)) elif self._From > 0: EdkLogger.error('Parser', FORMAT_INVALID, "No '!include' allowed in included file", - ExtraData=self._CurrentLine, File=self.MetaFile, - Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, + Line=self._LineIndex + 1) # # Model, Value1, Value2, Value3, Arch, ModuleType, BelongsToItem=-1, BelongsToFile=-1, @@ -959,10 +973,10 @@ class DscParser(MetaFileParser): ModuleType, self._Owner[-1], self._From, - self._LineIndex+1, - -1, - self._LineIndex+1, - -1, + self._LineIndex + 1, + - 1, + self._LineIndex + 1, + - 1, 0 ) @@ -975,16 +989,16 @@ class DscParser(MetaFileParser): # Syntax check if not self._ValueList[1]: EdkLogger.error('Parser', FORMAT_INVALID, "No name specified", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) if not self._ValueList[2]: EdkLogger.error('Parser', FORMAT_INVALID, "No value specified", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) if not self._ValueList[1] in self.DefineKeywords: EdkLogger.error('Parser', FORMAT_INVALID, "Unknown keyword found: %s. " "If this is a macro you must " "add it as a DEFINE in the DSC" % self._ValueList[1], - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) self._Defines[self._ValueList[1]] = self._ValueList[2] self._ItemType = self.DataType[TAB_DSC_DEFINES.upper()] @@ -993,7 +1007,7 @@ class DscParser(MetaFileParser): TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT) if len(TokenList) != 2: EdkLogger.error('Parser', FORMAT_INVALID, "Correct format is '|'", - ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) self._ValueList[0:len(TokenList)] = TokenList ## Parse Edk style of library modules @@ -1024,11 +1038,19 @@ class DscParser(MetaFileParser): if self._ValueList[0] == '' or self._ValueList[1] == '': EdkLogger.error('Parser', FORMAT_INVALID, "No token space GUID or PCD name specified", ExtraData=self._CurrentLine + " (.|)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) if self._ValueList[2] == '': EdkLogger.error('Parser', FORMAT_INVALID, "No PCD value given", ExtraData=self._CurrentLine + " (.|)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) + + # Validate the datum type of Dynamic Defaul PCD and DynamicEx Default PCD + ValueList = GetSplitValueList(self._ValueList[2]) + if len(ValueList) > 1 and ValueList[1] != TAB_VOID \ + and self._ItemType in [MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT]: + EdkLogger.error('Parser', FORMAT_INVALID, "The datum type '%s' of PCD is wrong" % ValueList[1], + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) + # if value are 'True', 'true', 'TRUE' or 'False', 'false', 'FALSE', replace with integer 1 or 0. DscPcdValueList = GetSplitValueList(TokenList[1], TAB_VALUE_SPLIT, 1) if DscPcdValueList[0] in ['True', 'true', 'TRUE']: @@ -1036,6 +1058,7 @@ class DscParser(MetaFileParser): elif DscPcdValueList[0] in ['False', 'false', 'FALSE']: self._ValueList[2] = TokenList[1].replace(DscPcdValueList[0], '0', 1); + ## [components] section parser @ParseMacro def _ComponentParser(self): @@ -1052,15 +1075,15 @@ class DscParser(MetaFileParser): if len(TokenList) < 2: EdkLogger.error('Parser', FORMAT_INVALID, "No library class or instance specified", ExtraData=self._CurrentLine + " (|)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) if TokenList[0] == '': EdkLogger.error('Parser', FORMAT_INVALID, "No library class specified", ExtraData=self._CurrentLine + " (|)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) if TokenList[1] == '': EdkLogger.error('Parser', FORMAT_INVALID, "No library instance specified", ExtraData=self._CurrentLine + " (|)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) self._ValueList[0:len(TokenList)] = TokenList @@ -1088,7 +1111,7 @@ class DscParser(MetaFileParser): "'%s' must be in format of ____FLAGS" % self._ValueList[1], ExtraData=self._CurrentLine, File=self.MetaFile, - Line=self._LineIndex+1 + Line=self._LineIndex + 1 ) ## Override parent's method since we'll do all macro replacements in parser @@ -1192,23 +1215,23 @@ class DscParser(MetaFileParser): " it must be defined in a [PcdsFixedAtBuild] or [PcdsFeatureFlag] section" " of the DSC file, and it is currently defined in this section:" " %s, line #: %d." % (Excpt.Pcd, Info[0], Info[1]), - File=self._FileWithError, ExtraData=' '.join(self._ValueList), - Line=self._LineIndex+1) + File=self._FileWithError, ExtraData=' '.join(self._ValueList), + Line=self._LineIndex + 1) else: EdkLogger.error('Parser', FORMAT_INVALID, "PCD (%s) is not defined in DSC file" % Excpt.Pcd, - File=self._FileWithError, ExtraData=' '.join(self._ValueList), - Line=self._LineIndex+1) + File=self._FileWithError, ExtraData=' '.join(self._ValueList), + Line=self._LineIndex + 1) else: EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expression: %s" % str(Excpt), - File=self._FileWithError, ExtraData=' '.join(self._ValueList), - Line=self._LineIndex+1) + File=self._FileWithError, ExtraData=' '.join(self._ValueList), + Line=self._LineIndex + 1) except MacroException, Excpt: EdkLogger.error('Parser', FORMAT_INVALID, str(Excpt), - File=self._FileWithError, ExtraData=' '.join(self._ValueList), - Line=self._LineIndex+1) + File=self._FileWithError, ExtraData=' '.join(self._ValueList), + Line=self._LineIndex + 1) if self._ValueList == None: - continue + continue NewOwner = self._IdMapping.get(Owner, -1) self._Enabled = int((not self._DirectiveEvalStack) or (False not in self._DirectiveEvalStack)) @@ -1221,10 +1244,10 @@ class DscParser(MetaFileParser): S2, NewOwner, self._From, - self._LineIndex+1, - -1, - self._LineIndex+1, - -1, + self._LineIndex + 1, + - 1, + self._LineIndex + 1, + - 1, self._Enabled ) self._IdMapping[Id] = self._LastItem @@ -1248,25 +1271,25 @@ class DscParser(MetaFileParser): self._SubsectionType = MODEL_UNKNOWN def __RetrievePcdValue(self): - Records = self._RawTable.Query(MODEL_PCD_FEATURE_FLAG, BelongsToItem=-1.0) - for TokenSpaceGuid,PcdName,Value,Dummy2,Dummy3,ID,Line in Records: - Value, DatumType, MaxDatumSize = AnalyzePcdData(Value) + Records = self._RawTable.Query(MODEL_PCD_FEATURE_FLAG, BelongsToItem= -1.0) + for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, ID, Line in Records: Name = TokenSpaceGuid + '.' + PcdName - self._Symbols[Name] = Value + ValList, Valid, Index = AnalyzeDscPcd(Value, MODEL_PCD_FEATURE_FLAG) + self._Symbols[Name] = ValList[Index] - Records = self._RawTable.Query(MODEL_PCD_FIXED_AT_BUILD, BelongsToItem=-1.0) - for TokenSpaceGuid,PcdName,Value,Dummy2,Dummy3,ID,Line in Records: - Value, DatumType, MaxDatumSize = AnalyzePcdData(Value) + Records = self._RawTable.Query(MODEL_PCD_FIXED_AT_BUILD, BelongsToItem= -1.0) + for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, ID, Line in Records: Name = TokenSpaceGuid + '.' + PcdName - self._Symbols[Name] = Value + ValList, Valid, Index = AnalyzeDscPcd(Value, MODEL_PCD_FIXED_AT_BUILD) + self._Symbols[Name] = ValList[Index] Content = open(str(self.MetaFile), 'r').readlines() GlobalData.gPlatformOtherPcds['DSCFILE'] = str(self.MetaFile) for PcdType in (MODEL_PCD_PATCHABLE_IN_MODULE, MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_DYNAMIC_EX_HII, MODEL_PCD_DYNAMIC_EX_VPD): - Records = self._RawTable.Query(PcdType, BelongsToItem=-1.0) - for TokenSpaceGuid,PcdName,Value,Dummy2,Dummy3,ID,Line in Records: + Records = self._RawTable.Query(PcdType, BelongsToItem= -1.0) + for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, ID, Line in Records: Name = TokenSpaceGuid + '.' + PcdName if Name not in GlobalData.gPlatformOtherPcds: PcdLine = Line @@ -1287,13 +1310,13 @@ class DscParser(MetaFileParser): self._ConstructSectionMacroDict(Name, Value) elif self._ItemType == MODEL_META_DATA_GLOBAL_DEFINE: GlobalData.gEdkGlobal[Name] = Value - + # # Keyword in [Defines] section can be used as Macros # if (self._ItemType == MODEL_META_DATA_HEADER) and (self._SectionType == MODEL_META_DATA_HEADER): self._FileLocalMacros[Name] = Value - + self._ValueList = [Type, Name, Value] def __ProcessDirective(self): @@ -1313,8 +1336,8 @@ class DscParser(MetaFileParser): # the precise number of line and return the evaluation result # EdkLogger.warn('Parser', "Suspicious expression: %s" % str(Excpt), - File=self._FileWithError, ExtraData=' '.join(self._ValueList), - Line=self._LineIndex+1) + File=self._FileWithError, ExtraData=' '.join(self._ValueList), + Line=self._LineIndex + 1) Result = Excpt.result if self._ItemType in [MODEL_META_DATA_CONDITIONAL_STATEMENT_IF, @@ -1368,7 +1391,7 @@ class DscParser(MetaFileParser): # Allow using MACROs comes from [Defines] section to keep compatible. # __IncludeMacros.update(self._Macros) - + IncludedFile = NormPath(ReplaceMacro(self._ValueList[1], __IncludeMacros, RaiseError=True)) # # First search the include file under the same directory as DSC file @@ -1382,14 +1405,14 @@ class DscParser(MetaFileParser): IncludedFile1 = PathClass(IncludedFile, GlobalData.gWorkspace) ErrorCode, ErrorInfo2 = IncludedFile1.Validate() if ErrorCode != 0: - EdkLogger.error('parser', ErrorCode, File=self._FileWithError, - Line=self._LineIndex+1, ExtraData=ErrorInfo1 + "\n"+ ErrorInfo2) + EdkLogger.error('parser', ErrorCode, File=self._FileWithError, + Line=self._LineIndex + 1, ExtraData=ErrorInfo1 + "\n" + ErrorInfo2) self._FileWithError = IncludedFile1 IncludedFileTable = MetaFileStorage(self._Table.Cur, IncludedFile1, MODEL_FILE_DSC, False) - Owner = self._Content[self._ContentIndex-1][0] - Parser = DscParser(IncludedFile1, self._FileType, IncludedFileTable, + Owner = self._Content[self._ContentIndex - 1][0] + Parser = DscParser(IncludedFile1, self._FileType, IncludedFileTable, Owner=Owner, From=Owner) # set the parser status with current status @@ -1403,17 +1426,17 @@ class DscParser(MetaFileParser): # update current status with sub-parser's status self._SectionName = Parser._SectionName self._SectionType = Parser._SectionType - self._Scope = Parser._Scope - self._Enabled = Parser._Enabled + self._Scope = Parser._Scope + self._Enabled = Parser._Enabled # Insert all records in the table for the included file into dsc file table Records = IncludedFileTable.GetAll() if Records: self._Content[self._ContentIndex:self._ContentIndex] = Records - self._Content.pop(self._ContentIndex-1) + self._Content.pop(self._ContentIndex - 1) self._ValueList = None self._ContentIndex -= 1 - + def __ProcessSkuId(self): self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=True) for Value in self._ValueList] @@ -1425,48 +1448,28 @@ class DscParser(MetaFileParser): self._ValueList[1] = ReplaceMacro(self._ValueList[1], self._Macros, RaiseError=True) def __ProcessPcd(self): - PcdValue = None - ValueList = GetSplitValueList(self._ValueList[2]) - # - # PCD value can be an expression - # - if len(ValueList) > 1 and ValueList[1] == 'VOID*': - PcdValue = ValueList[0] + if self._ItemType not in [MODEL_PCD_FEATURE_FLAG, MODEL_PCD_FIXED_AT_BUILD]: + self._ValueList[2] = ReplaceMacro(self._ValueList[2], self._Macros, RaiseError=True) + return + + ValList, Valid, Index = AnalyzeDscPcd(self._ValueList[2], self._ItemType) + if not Valid: + EdkLogger.error('build', FORMAT_INVALID, "Pcd format incorrect.", File=self._FileWithError, Line=self._LineIndex+1, + ExtraData="%s.%s|%s" % (self._ValueList[0], self._ValueList[1], self._ValueList[2])) + PcdValue = ValList[Index] + if PcdValue: try: - ValueList[0] = ValueExpression(PcdValue, self._Macros)(True) + ValList[Index] = ValueExpression(PcdValue, self._Macros)(True) except WrnExpression, Value: - ValueList[0] = Value.result - PcdValue = ValueList[0] - else: - # - # Int*/Boolean VPD PCD - # TokenSpace | PcdCName | Offset | [Value] - # - # VOID* VPD PCD - # TokenSpace | PcdCName | Offset | [Size] | [Value] - # - if self._ItemType == MODEL_PCD_DYNAMIC_VPD: - if len(ValueList) >= 4: - PcdValue = ValueList[-1] - else: - PcdValue = ValueList[-1] - # - # For the VPD PCD, there may not have PcdValue data in DSC file - # - if PcdValue: - try: - ValueList[-1] = ValueExpression(PcdValue, self._Macros)(True) - except WrnExpression, Value: - ValueList[-1] = Value.result - - if ValueList[-1] == 'True': - ValueList[-1] = '1' - if ValueList[-1] == 'False': - ValueList[-1] = '0' - PcdValue = ValueList[-1] - if PcdValue and self._ItemType in [MODEL_PCD_FEATURE_FLAG, MODEL_PCD_FIXED_AT_BUILD]: - GlobalData.gPlatformPcds[TAB_SPLIT.join(self._ValueList[0:2])] = PcdValue - self._ValueList[2] = '|'.join(ValueList) + ValList[Index] = Value.result + + if ValList[Index] == 'True': + ValList[Index] = '1' + if ValList[Index] == 'False': + ValList[Index] = '0' + + GlobalData.gPlatformPcds[TAB_SPLIT.join(self._ValueList[0:2])] = PcdValue + self._ValueList[2] = '|'.join(ValList) def __ProcessComponent(self): self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros) @@ -1501,7 +1504,7 @@ class DscParser(MetaFileParser): MODEL_META_DATA_SUBSECTION_HEADER : _SubsectionHeaderParser, } - _Macros = property(_GetMacros) + _Macros = property(_GetMacros) ## DEC file parser class # @@ -1543,6 +1546,7 @@ class DecParser(MetaFileParser): MetaFileParser.__init__(self, FilePath, FileType, Table, -1) self._Comments = [] self._Version = 0x00010005 # Only EDK2 dec file is supported + self._AllPCDs = [] # Only for check duplicate PCD ## Parser starter def Start(self): @@ -1559,7 +1563,7 @@ class DecParser(MetaFileParser): # save comment for later use if Comment: - self._Comments.append((Comment, self._LineIndex+1)) + self._Comments.append((Comment, self._LineIndex + 1)) # skip empty line if Line == '': continue @@ -1574,7 +1578,7 @@ class DecParser(MetaFileParser): continue # section content - self._ValueList = ['','',''] + self._ValueList = ['', '', ''] self._SectionParser[self._SectionType[0]](self) if self._ValueList == None or self._ItemType == MODEL_META_DATA_DEFINE: self._ItemType = -1 @@ -1594,10 +1598,10 @@ class DecParser(MetaFileParser): Arch, ModuleType, self._Owner[-1], - self._LineIndex+1, - -1, - self._LineIndex+1, - -1, + self._LineIndex + 1, + - 1, + self._LineIndex + 1, + - 1, 0 ) for Comment, LineNo in self._Comments: @@ -1610,9 +1614,9 @@ class DecParser(MetaFileParser): ModuleType, self._LastItem, LineNo, - -1, + - 1, LineNo, - -1, + - 1, 0 ) self._Comments = [] @@ -1630,10 +1634,13 @@ class DecParser(MetaFileParser): self._SectionName = '' self._SectionType = [] ArchList = set() - for Item in GetSplitValueList(self._CurrentLine[1:-1], TAB_COMMA_SPLIT): + Line = self._CurrentLine.replace("%s%s" % (TAB_COMMA_SPLIT, TAB_SPACE_SPLIT), TAB_COMMA_SPLIT) + for Item in Line[1:-1].split(TAB_COMMA_SPLIT): if Item == '': - continue - ItemList = GetSplitValueList(Item, TAB_SPLIT) + EdkLogger.error("Parser", FORMAT_UNKNOWN_ERROR, + "section name can NOT be empty or incorrectly use separator comma", + self.MetaFile, self._LineIndex + 1, self._CurrentLine) + ItemList = Item.split(TAB_SPLIT) # different types of PCD are permissible in one section self._SectionName = ItemList[0].upper() @@ -1641,9 +1648,8 @@ class DecParser(MetaFileParser): if self.DataType[self._SectionName] not in self._SectionType: self._SectionType.append(self.DataType[self._SectionName]) else: - EdkLogger.warn("Parser", "Unrecognized section", File=self.MetaFile, - Line=self._LineIndex+1, ExtraData=self._CurrentLine) - continue + EdkLogger.error("Parser", FORMAT_UNKNOWN_ERROR, "%s is not a valid section name" % Item, + self.MetaFile, self._LineIndex + 1, self._CurrentLine) if MODEL_PCD_FEATURE_FLAG in self._SectionType and len(self._SectionType) > 1: EdkLogger.error( @@ -1651,7 +1657,7 @@ class DecParser(MetaFileParser): FORMAT_INVALID, "%s must not be in the same section of other types of PCD" % TAB_PCDS_FEATURE_FLAG_NULL, File=self.MetaFile, - Line=self._LineIndex+1, + Line=self._LineIndex + 1, ExtraData=self._CurrentLine ) # S1 is always Arch @@ -1671,7 +1677,7 @@ class DecParser(MetaFileParser): # 'COMMON' must not be used with specific ARCHs at the same section if 'COMMON' in ArchList and len(ArchList) > 1: EdkLogger.error('Parser', FORMAT_INVALID, "'common' ARCH must not be used with specific ARCHs", - File=self.MetaFile, Line=self._LineIndex+1, ExtraData=self._CurrentLine) + File=self.MetaFile, Line=self._LineIndex + 1, ExtraData=self._CurrentLine) ## [guids], [ppis] and [protocols] section parser @ParseMacro @@ -1680,20 +1686,20 @@ class DecParser(MetaFileParser): if len(TokenList) < 2: EdkLogger.error('Parser', FORMAT_INVALID, "No GUID name or value specified", ExtraData=self._CurrentLine + " ( = )", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) if TokenList[0] == '': EdkLogger.error('Parser', FORMAT_INVALID, "No GUID name specified", ExtraData=self._CurrentLine + " ( = )", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) if TokenList[1] == '': EdkLogger.error('Parser', FORMAT_INVALID, "No GUID value specified", ExtraData=self._CurrentLine + " ( = )", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) if TokenList[1][0] != '{' or TokenList[1][-1] != '}' or GuidStructureStringToGuidString(TokenList[1]) == '': EdkLogger.error('Parser', FORMAT_INVALID, "Invalid GUID value format", ExtraData=self._CurrentLine + \ " ( = )", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) self._ValueList[0] = TokenList[0] self._ValueList[1] = TokenList[1] @@ -1709,67 +1715,88 @@ class DecParser(MetaFileParser): def _PcdParser(self): TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT, 1) self._ValueList[0:1] = GetSplitValueList(TokenList[0], TAB_SPLIT) + ValueRe = re.compile(r'^[a-zA-Z_][a-zA-Z0-9_]*') # check PCD information if self._ValueList[0] == '' or self._ValueList[1] == '': EdkLogger.error('Parser', FORMAT_INVALID, "No token space GUID or PCD name specified", ExtraData=self._CurrentLine + \ " (.|||)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) + # check format of token space GUID CName + if not ValueRe.match(self._ValueList[0]): + EdkLogger.error('Parser', FORMAT_INVALID, "The format of the token space GUID CName is invalid. The correct format is '(a-zA-Z_)[a-zA-Z0-9_]*'", + ExtraData=self._CurrentLine + \ + " (.|||)", + File=self.MetaFile, Line=self._LineIndex + 1) + # check format of PCD CName + if not ValueRe.match(self._ValueList[1]): + EdkLogger.error('Parser', FORMAT_INVALID, "The format of the PCD CName is invalid. The correct format is '(a-zA-Z_)[a-zA-Z0-9_]*'", + ExtraData=self._CurrentLine + \ + " (.|||)", + File=self.MetaFile, Line=self._LineIndex + 1) # check PCD datum information if len(TokenList) < 2 or TokenList[1] == '': EdkLogger.error('Parser', FORMAT_INVALID, "No PCD Datum information given", ExtraData=self._CurrentLine + \ " (.|||)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) + - - ValueRe = re.compile(r'^\s*L?\".*\|.*\"') + ValueRe = re.compile(r'^\s*L?\".*\|.*\"') PtrValue = ValueRe.findall(TokenList[1]) - + # Has VOID* type string, may contain "|" character in the string. if len(PtrValue) != 0: ptrValueList = re.sub(ValueRe, '', TokenList[1]) - ValueList = GetSplitValueList(ptrValueList) + ValueList = GetSplitValueList(ptrValueList) ValueList[0] = PtrValue[0] else: ValueList = GetSplitValueList(TokenList[1]) - - + + # check if there's enough datum information given if len(ValueList) != 3: EdkLogger.error('Parser', FORMAT_INVALID, "Invalid PCD Datum information given", ExtraData=self._CurrentLine + \ " (.|||)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) # check default value if ValueList[0] == '': EdkLogger.error('Parser', FORMAT_INVALID, "Missing DefaultValue in PCD Datum information", ExtraData=self._CurrentLine + \ " (.|||)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) # check datum type if ValueList[1] == '': EdkLogger.error('Parser', FORMAT_INVALID, "Missing DatumType in PCD Datum information", ExtraData=self._CurrentLine + \ " (.|||)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) # check token of the PCD if ValueList[2] == '': EdkLogger.error('Parser', FORMAT_INVALID, "Missing Token in PCD Datum information", ExtraData=self._CurrentLine + \ " (.|||)", - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) # check format of default value against the datum type IsValid, Cause = CheckPcdDatum(ValueList[1], ValueList[0]) if not IsValid: EdkLogger.error('Parser', FORMAT_INVALID, Cause, ExtraData=self._CurrentLine, - File=self.MetaFile, Line=self._LineIndex+1) + File=self.MetaFile, Line=self._LineIndex + 1) if ValueList[0] in ['True', 'true', 'TRUE']: ValueList[0] = '1' elif ValueList[0] in ['False', 'false', 'FALSE']: ValueList[0] = '0' + # check for duplicate PCD definition + if (self._Scope[0], self._ValueList[0], self._ValueList[1]) in self._AllPCDs: + EdkLogger.error('Parser', FORMAT_INVALID, + "The same PCD name and GUID have been already defined", + ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) + else: + self._AllPCDs.append((self._Scope[0], self._ValueList[0], self._ValueList[1])) + self._ValueList[2] = ValueList[0].strip() + '|' + ValueList[1].strip() + '|' + ValueList[2].strip() _SectionParser = { diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py new file mode 100644 index 0000000000..60acc914e9 --- /dev/null +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py @@ -0,0 +1,237 @@ +## @file +# Common routines used by workspace +# +# Copyright (c) 2012, Intel Corporation. All rights reserved.
+# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# + +from Common.Misc import sdict +from Common.DataType import SUP_MODULE_USER_DEFINED +from BuildClassObject import LibraryClassObject + +## Get all packages from platform for specified arch, target and toolchain +# +# @param Platform: DscBuildData instance +# @param BuildDatabase: The database saves all data for all metafiles +# @param Arch: Current arch +# @param Target: Current target +# @param Toolchain: Current toolchain +# @retval: List of packages which are DecBuildData instances +# +def GetPackageList(Platform, BuildDatabase, Arch, Target, Toolchain): + PkgSet = set() + for ModuleFile in Platform.Modules: + Data = BuildDatabase[ModuleFile, Arch, Target, Toolchain] + PkgSet.update(Data.Packages) + for Lib in GetLiabraryInstances(Data, Platform, BuildDatabase, Arch, Target, Toolchain): + PkgSet.update(Lib.Packages) + return list(PkgSet) + +## Get all declared PCD from platform for specified arch, target and toolchain +# +# @param Platform: DscBuildData instance +# @param BuildDatabase: The database saves all data for all metafiles +# @param Arch: Current arch +# @param Target: Current target +# @param Toolchain: Current toolchain +# @retval: A dictionary contains instances of PcdClassObject with key (PcdCName, TokenSpaceGuid) +# +def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain): + PkgList = GetPackageList(Platform, BuildDatabase, Arch, Target, Toolchain) + DecPcds = {} + for Pkg in PkgList: + for Pcd in Pkg.Pcds: + DecPcds[Pcd[0], Pcd[1]] = Pkg.Pcds[Pcd] + return DecPcds + +## Get all dependent libraries for a module +# +# @param Module: InfBuildData instance +# @param Platform: DscBuildData instance +# @param BuildDatabase: The database saves all data for all metafiles +# @param Arch: Current arch +# @param Target: Current target +# @param Toolchain: Current toolchain +# @retval: List of dependent libraries which are InfBuildData instances +# +def GetLiabraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain): + if Module.AutoGenVersion >= 0x00010005: + return _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain) + else: + return _ResolveLibraryReference(Module, Platform) + +def _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain): + ModuleType = Module.ModuleType + + # for overriding library instances with module specific setting + PlatformModule = Platform.Modules[str(Module)] + + # add forced library instances (specified under LibraryClasses sections) + # + # If a module has a MODULE_TYPE of USER_DEFINED, + # do not link in NULL library class instances from the global [LibraryClasses.*] sections. + # + if Module.ModuleType != SUP_MODULE_USER_DEFINED: + for LibraryClass in Platform.LibraryClasses.GetKeys(): + if LibraryClass.startswith("NULL") and Platform.LibraryClasses[LibraryClass, Module.ModuleType]: + Module.LibraryClasses[LibraryClass] = Platform.LibraryClasses[LibraryClass, Module.ModuleType] + + # add forced library instances (specified in module overrides) + for LibraryClass in PlatformModule.LibraryClasses: + if LibraryClass.startswith("NULL"): + Module.LibraryClasses[LibraryClass] = PlatformModule.LibraryClasses[LibraryClass] + + # EdkII module + LibraryConsumerList = [Module] + Constructor = [] + ConsumedByList = sdict() + LibraryInstance = sdict() + + while len(LibraryConsumerList) > 0: + M = LibraryConsumerList.pop() + for LibraryClassName in M.LibraryClasses: + if LibraryClassName not in LibraryInstance: + # override library instance for this module + if LibraryClassName in PlatformModule.LibraryClasses: + LibraryPath = PlatformModule.LibraryClasses[LibraryClassName] + else: + LibraryPath = Platform.LibraryClasses[LibraryClassName, ModuleType] + if LibraryPath == None or LibraryPath == "": + LibraryPath = M.LibraryClasses[LibraryClassName] + if LibraryPath == None or LibraryPath == "": + return [] + + LibraryModule = BuildDatabase[LibraryPath, Arch, Target, Toolchain] + # for those forced library instance (NULL library), add a fake library class + if LibraryClassName.startswith("NULL"): + LibraryModule.LibraryClass.append(LibraryClassObject(LibraryClassName, [ModuleType])) + elif LibraryModule.LibraryClass == None \ + or len(LibraryModule.LibraryClass) == 0 \ + or (ModuleType != 'USER_DEFINED' + and ModuleType not in LibraryModule.LibraryClass[0].SupModList): + # only USER_DEFINED can link against any library instance despite of its SupModList + return [] + + LibraryInstance[LibraryClassName] = LibraryModule + LibraryConsumerList.append(LibraryModule) + else: + LibraryModule = LibraryInstance[LibraryClassName] + + if LibraryModule == None: + continue + + if LibraryModule.ConstructorList != [] and LibraryModule not in Constructor: + Constructor.append(LibraryModule) + + if LibraryModule not in ConsumedByList: + ConsumedByList[LibraryModule] = [] + # don't add current module itself to consumer list + if M != Module: + if M in ConsumedByList[LibraryModule]: + continue + ConsumedByList[LibraryModule].append(M) + # + # Initialize the sorted output list to the empty set + # + SortedLibraryList = [] + # + # Q <- Set of all nodes with no incoming edges + # + LibraryList = [] #LibraryInstance.values() + Q = [] + for LibraryClassName in LibraryInstance: + M = LibraryInstance[LibraryClassName] + LibraryList.append(M) + if ConsumedByList[M] == []: + Q.append(M) + + # + # start the DAG algorithm + # + while True: + EdgeRemoved = True + while Q == [] and EdgeRemoved: + EdgeRemoved = False + # for each node Item with a Constructor + for Item in LibraryList: + if Item not in Constructor: + continue + # for each Node without a constructor with an edge e from Item to Node + for Node in ConsumedByList[Item]: + if Node in Constructor: + continue + # remove edge e from the graph if Node has no constructor + ConsumedByList[Item].remove(Node) + EdgeRemoved = True + if ConsumedByList[Item] == []: + # insert Item into Q + Q.insert(0, Item) + break + if Q != []: + break + # DAG is done if there's no more incoming edge for all nodes + if Q == []: + break + + # remove node from Q + Node = Q.pop() + # output Node + SortedLibraryList.append(Node) + + # for each node Item with an edge e from Node to Item do + for Item in LibraryList: + if Node not in ConsumedByList[Item]: + continue + # remove edge e from the graph + ConsumedByList[Item].remove(Node) + + if ConsumedByList[Item] != []: + continue + # insert Item into Q, if Item has no other incoming edges + Q.insert(0, Item) + + # + # if any remaining node Item in the graph has a constructor and an incoming edge, then the graph has a cycle + # + for Item in LibraryList: + if ConsumedByList[Item] != [] and Item in Constructor and len(Constructor) > 1: + return [] + if Item not in SortedLibraryList: + SortedLibraryList.append(Item) + + # + # Build the list of constructor and destructir names + # The DAG Topo sort produces the destructor order, so the list of constructors must generated in the reverse order + # + SortedLibraryList.reverse() + return SortedLibraryList + +def _ResolveLibraryReference(Module, Platform): + LibraryConsumerList = [Module] + + # "CompilerStub" is a must for Edk modules + if Module.Libraries: + Module.Libraries.append("CompilerStub") + LibraryList = [] + while len(LibraryConsumerList) > 0: + M = LibraryConsumerList.pop() + for LibraryName in M.Libraries: + Library = Platform.LibraryClasses[LibraryName, ':dummy:'] + if Library == None: + for Key in Platform.LibraryClasses.data.keys(): + if LibraryName.upper() == Key.upper(): + Library = Platform.LibraryClasses[Key, ':dummy:'] + break + if Library == None: + continue + + if Library not in LibraryList: + LibraryList.append(Library) + LibraryConsumerList.append(Library) + return LibraryList diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py index e5fb41a8e0..19c00ca78d 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py @@ -34,6 +34,8 @@ from MetaDataTable import * from MetaFileTable import * from MetaFileParser import * from BuildClassObject import * +from WorkspaceCommon import GetDeclaredPcd +from Common.Misc import AnalyzeDscPcd ## Platform build information from DSC file # @@ -134,6 +136,7 @@ class DscBuildData(PlatformBuildClassObject): self._LibraryInstances = None self._LibraryClasses = None self._Pcds = None + self._DecPcds = None self._BuildOptions = None self._LoadFixAddress = None self._RFCLanguages = None @@ -613,6 +616,46 @@ class DscBuildData(PlatformBuildClassObject): self._LibraryClasses[Library.BaseName, ':dummy:'] = Library return self._LibraryClasses + def _ValidatePcd(self, PcdCName, TokenSpaceGuid, Setting, PcdType, LineNo): + if self._DecPcds == None: + self._DecPcds = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain) + if (PcdCName, TokenSpaceGuid) not in self._DecPcds: + EdkLogger.error('build', PARSER_ERROR, + "Pcd (%s.%s) defined in DSC is not declared in DEC files." % (TokenSpaceGuid, PcdCName), + File=self.MetaFile, Line=LineNo) + ValueList, IsValid, Index = AnalyzeDscPcd(Setting, PcdType, self._DecPcds[PcdCName, TokenSpaceGuid].DatumType) + if not IsValid and PcdType not in [MODEL_PCD_FEATURE_FLAG, MODEL_PCD_FIXED_AT_BUILD]: + EdkLogger.error('build', FORMAT_INVALID, "Pcd format incorrect.", File=self.MetaFile, Line=LineNo, + ExtraData="%s.%s|%s" % (TokenSpaceGuid, PcdCName, Setting)) + if ValueList[Index] and PcdType not in [MODEL_PCD_FEATURE_FLAG, MODEL_PCD_FIXED_AT_BUILD]: + try: + ValueList[Index] = ValueExpression(ValueList[Index], GlobalData.gPlatformPcds)(True) + except WrnExpression, Value: + ValueList[Index] = Value.result + except EvaluationException, Excpt: + if hasattr(Excpt, 'Pcd'): + if Excpt.Pcd in GlobalData.gPlatformOtherPcds: + EdkLogger.error('Parser', FORMAT_INVALID, "Cannot use this PCD (%s) in an expression as" + " it must be defined in a [PcdsFixedAtBuild] or [PcdsFeatureFlag] section" + " of the DSC file" % Excpt.Pcd, + File=self.MetaFile, Line=LineNo) + else: + EdkLogger.error('Parser', FORMAT_INVALID, "PCD (%s) is not defined in DSC file" % Excpt.Pcd, + File=self.MetaFile, Line=LineNo) + else: + EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expression: %s" % str(Excpt), + File=self.MetaFile, Line=LineNo) + if ValueList[Index] == 'True': + ValueList[Index] = '1' + elif ValueList[Index] == 'False': + ValueList[Index] = '0' + if ValueList[Index]: + Valid, ErrStr = CheckPcdDatum(self._DecPcds[PcdCName, TokenSpaceGuid].DatumType, ValueList[Index]) + if not Valid: + EdkLogger.error('build', FORMAT_INVALID, ErrStr, File=self.MetaFile, Line=LineNo, + ExtraData="%s.%s" % (TokenSpaceGuid, PcdCName)) + return ValueList + ## Retrieve all PCD settings in platform def _GetPcds(self): if self._Pcds == None: @@ -663,14 +706,14 @@ class DscBuildData(PlatformBuildClassObject): # Find out all possible PCD candidates for self._Arch RecordList = self._RawData[Type, self._Arch] for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList: - PcdSet.add((PcdCName, TokenSpaceGuid)) + PcdSet.add((PcdCName, TokenSpaceGuid, Dummy4)) PcdDict[Arch, PcdCName, TokenSpaceGuid] = Setting # Remove redundant PCD candidates - for PcdCName, TokenSpaceGuid in PcdSet: + for PcdCName, TokenSpaceGuid, Dummy4 in PcdSet: Setting = PcdDict[self._Arch, PcdCName, TokenSpaceGuid] if Setting == None: continue - PcdValue, DatumType, MaxDatumSize = AnalyzePcdData(Setting) + PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4) Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject( PcdCName, TokenSpaceGuid, @@ -702,15 +745,15 @@ class DscBuildData(PlatformBuildClassObject): # Find out all possible PCD candidates for self._Arch RecordList = self._RawData[Type, self._Arch] for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList: - PcdList.append((PcdCName, TokenSpaceGuid)) + PcdList.append((PcdCName, TokenSpaceGuid, Dummy4)) PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting # Remove redundant PCD candidates, per the ARCH and SKU - for PcdCName, TokenSpaceGuid in PcdList: + for PcdCName, TokenSpaceGuid, Dummy4 in PcdList: Setting = PcdDict[self._Arch, self.SkuName, PcdCName, TokenSpaceGuid] if Setting == None: continue - PcdValue, DatumType, MaxDatumSize = AnalyzePcdData(Setting) + PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4) SkuInfo = SkuInfoClass(self.SkuName, self.SkuIds[self.SkuName], '', '', '', '', '', PcdValue) Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject( @@ -744,14 +787,14 @@ class DscBuildData(PlatformBuildClassObject): RecordList = self._RawData[Type, self._Arch] # Find out all possible PCD candidates for self._Arch for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList: - PcdSet.add((PcdCName, TokenSpaceGuid)) + PcdSet.add((PcdCName, TokenSpaceGuid, Dummy4)) PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting # Remove redundant PCD candidates, per the ARCH and SKU - for PcdCName, TokenSpaceGuid in PcdSet: + for PcdCName, TokenSpaceGuid, Dummy4 in PcdSet: Setting = PcdDict[self._Arch, self.SkuName, PcdCName, TokenSpaceGuid] if Setting == None: continue - VariableName, VariableGuid, VariableOffset, DefaultValue = AnalyzeHiiPcdData(Setting) + VariableName, VariableGuid, VariableOffset, DefaultValue = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4) SkuInfo = SkuInfoClass(self.SkuName, self.SkuIds[self.SkuName], VariableName, VariableGuid, VariableOffset, DefaultValue) Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject( PcdCName, @@ -784,10 +827,10 @@ class DscBuildData(PlatformBuildClassObject): # Find out all possible PCD candidates for self._Arch RecordList = self._RawData[Type, self._Arch] for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList: - PcdList.append((PcdCName, TokenSpaceGuid)) + PcdList.append((PcdCName, TokenSpaceGuid, Dummy4)) PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting # Remove redundant PCD candidates, per the ARCH and SKU - for PcdCName, TokenSpaceGuid in PcdList: + for PcdCName, TokenSpaceGuid, Dummy4 in PcdList: Setting = PcdDict[self._Arch, self.SkuName, PcdCName, TokenSpaceGuid] if Setting == None: continue @@ -797,7 +840,7 @@ class DscBuildData(PlatformBuildClassObject): # At this point, we put all the data into the PcdClssObject for we don't know the PCD's datumtype # until the DEC parser has been called. # - VpdOffset, MaxDatumSize, InitialValue = AnalyzeVpdPcdData(Setting) + VpdOffset, MaxDatumSize, InitialValue = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4) SkuInfo = SkuInfoClass(self.SkuName, self.SkuIds[self.SkuName], '', '', '', '', VpdOffset, InitialValue) Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject( @@ -842,32 +885,6 @@ class DscBuildData(PlatformBuildClassObject): self.Pcds[Name, Guid] = PcdClassObject(Name, Guid, '', '', '', '', '', {}, False, None) self.Pcds[Name, Guid].DefaultValue = Value - def IsPlatformPcdDeclared(self, DecPcds): - for PcdType in (MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE, MODEL_PCD_FEATURE_FLAG, - MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_VPD, - MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_DYNAMIC_EX_HII, MODEL_PCD_DYNAMIC_EX_VPD): - RecordList = self._RawData[PcdType, self._Arch] - for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList: - if (PcdCName, TokenSpaceGuid) not in DecPcds: - EdkLogger.error('build', PARSER_ERROR, - "Pcd (%s.%s) defined in DSC is not declared in DEC files." % (TokenSpaceGuid, PcdCName), - File=self.MetaFile, Line=Dummy4) - PcdValue = '' - if PcdType in (MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_VPD): - if DecPcds[PcdCName, TokenSpaceGuid].DatumType == "VOID*": - PcdValue = AnalyzeVpdPcdData(Setting)[2] - else: - PcdValue = AnalyzeVpdPcdData(Setting)[1] - elif PcdType in (MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_EX_HII): - PcdValue = AnalyzeHiiPcdData(Setting)[3] - else: - PcdValue = AnalyzePcdData(Setting)[0] - if PcdValue: - Valid, ErrStr = CheckPcdDatum(DecPcds[PcdCName, TokenSpaceGuid].DatumType, PcdValue) - if not Valid: - EdkLogger.error('build', FORMAT_INVALID, ErrStr, File=self.MetaFile, Line=Dummy4, - ExtraData="%s.%s" % (TokenSpaceGuid, PcdCName)) - _Macros = property(_GetMacros) Arch = property(_GetArch, _SetArch) Platform = property(_GetPlatformName) diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py index d5ea3bd3e5..2058a7bae7 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -4,7 +4,7 @@ # This module contains the functionality to generate build report after # build all target completes successfully. # -# Copyright (c) 2010, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -72,6 +72,9 @@ gGlueLibEntryPoint = re.compile(r"__EDKII_GLUE_MODULE_ENTRY_POINT__\s*=\s*(\w+)" ## Tags for MaxLength of line in report gLineMaxLength = 120 +## Tags for end of line in report +gEndOfLine = "\r\n" + ## Tags for section start, end and separator gSectionStart = ">" + "=" * (gLineMaxLength-2) + "<" gSectionEnd = "<" + "=" * (gLineMaxLength-2) + ">" + "\n" @@ -91,9 +94,9 @@ gPcdTypeMap = { 'Dynamic' : ('DYN', 'Dynamic'), 'DynamicHii' : ('DYNHII', 'Dynamic'), 'DynamicVpd' : ('DYNVPD', 'Dynamic'), - 'DynamicEx' : ('DEX', 'Dynamic'), - 'DynamicExHii' : ('DEXHII', 'Dynamic'), - 'DynamicExVpd' : ('DEXVPD', 'Dynamic'), + 'DynamicEx' : ('DEX', 'DynamicEx'), + 'DynamicExHii' : ('DEXHII', 'DynamicEx'), + 'DynamicExVpd' : ('DEXVPD', 'DynamicEx'), } ## The look up table to map module type to driver type @@ -128,7 +131,7 @@ gOpCodeList = ["BEFORE", "AFTER", "PUSH", "AND", "OR", "NOT", "TRUE", "FALSE", " def FileWrite(File, String, Wrapper=False): if Wrapper: String = textwrap.fill(String, 120) - File.write(String + "\r\n") + File.write(String + gEndOfLine) ## # Find all the header file that the module source directly includes. @@ -203,6 +206,8 @@ def FileLinesSplit(Content=None, MaxLength=None): NewContentList.append(Line) for NewLine in NewContentList: NewContent += NewLine + TAB_LINE_BREAK + + NewContent = NewContent.replace(TAB_LINE_BREAK, gEndOfLine).replace('\r\r\n', gEndOfLine) return NewContent @@ -694,7 +699,8 @@ class PcdReport(object): # Collect PCDs defined in DSC common section # self.DscPcdDefault = {} - for Platform in Wa.BuildDatabase.WorkspaceDb.PlatformList: + for Arch in Wa.ArchList: + Platform = Wa.BuildDatabase[Wa.MetaFile, Arch, Wa.BuildTarget, Wa.ToolChain] for (TokenCName, TokenSpaceGuidCName) in Platform.Pcds: DscDefaultValue = Platform.Pcds[(TokenCName, TokenSpaceGuidCName)].DefaultValue if DscDefaultValue: diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index a463c527be..24a6ed8168 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -1,7 +1,7 @@ ## @file # build a platform or a module # -# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -23,7 +23,7 @@ import glob import time import platform import traceback -import encodings.ascii +import encodings.ascii from struct import * from threading import * @@ -47,9 +47,9 @@ import Common.EdkLogger import Common.GlobalData as GlobalData # Version and Copyright -VersionNumber = "0.5" + ' ' + gBUILD_VERSION +VersionNumber = "0.51" + ' ' + gBUILD_VERSION __version__ = "%prog Version " + VersionNumber -__copyright__ = "Copyright (c) 2007 - 2010, Intel Corporation All rights reserved." +__copyright__ = "Copyright (c) 2007 - 2013, Intel Corporation All rights reserved." ## standard targets of build command gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run'] @@ -119,12 +119,12 @@ def CheckEnvVariable(): EfiSourceDir = os.path.normcase(os.path.normpath(os.environ["EFI_SOURCE"])) EdkSourceDir = os.path.normcase(os.path.normpath(os.environ["EDK_SOURCE"])) EcpSourceDir = os.path.normcase(os.path.normpath(os.environ["ECP_SOURCE"])) - + os.environ["EFI_SOURCE"] = EfiSourceDir os.environ["EDK_SOURCE"] = EdkSourceDir os.environ["ECP_SOURCE"] = EcpSourceDir os.environ["EDK_TOOLS_PATH"] = os.path.normcase(os.environ["EDK_TOOLS_PATH"]) - + if not os.path.exists(EcpSourceDir): EdkLogger.verbose("ECP_SOURCE = %s doesn't exist. Edk modules could not be built." % EcpSourceDir) elif ' ' in EcpSourceDir: @@ -313,7 +313,7 @@ class BuildUnit: if not BuildCommand: EdkLogger.error("build", OPTION_MISSING, "No build command found for this module. " - "Please check your setting of %s_%s_%s_MAKE_PATH in Conf/tools_def.txt file." % + "Please check your setting of %s_%s_%s_MAKE_PATH in Conf/tools_def.txt file." % (Obj.BuildTarget, Obj.ToolChain, Obj.Arch), ExtraData=str(Obj)) @@ -669,7 +669,7 @@ class PeImageInfo(): # # Constructor will load all required image information. # - # @param BaseName The full file path of image. + # @param BaseName The full file path of image. # @param Guid The GUID for image. # @param Arch Arch of this image. # @param OutputDir The output directory for image. @@ -838,7 +838,7 @@ class Build(): # def InitBuild(self): # parse target.txt, tools_def.txt, and platform file - self.LoadConfiguration() + self.LoadConfiguration() # Allow case-insensitive for those from command line or configuration file ErrorCode, ErrorInfo = self.PlatformFile.Validate(".dsc", False) @@ -897,7 +897,7 @@ class Build(): if BuildCommand == None or len(BuildCommand) == 0: EdkLogger.error("build", OPTION_MISSING, "No build command found for this module. " - "Please check your setting of %s_%s_%s_MAKE_PATH in Conf/tools_def.txt file." % + "Please check your setting of %s_%s_%s_MAKE_PATH in Conf/tools_def.txt file." % (AutoGenObject.BuildTarget, AutoGenObject.ToolChain, AutoGenObject.Arch), ExtraData=str(AutoGenObject)) @@ -994,9 +994,9 @@ class Build(): elif SectionHeader[0] in ['.data', '.sdata']: DataSectionAddress = SectionHeader[1] if AddrIsOffset: - MapBuffer.write('(GUID=%s, .textbaseaddress=-0x%010X, .databaseaddress=-0x%010X)\n' % (ModuleInfo.Guid, 0 - (BaseAddress + TextSectionAddress), 0 - (BaseAddress + DataSectionAddress))) + MapBuffer.write('(GUID=%s, .textbaseaddress=-0x%010X, .databaseaddress=-0x%010X)\n' % (ModuleInfo.Guid, 0 - (BaseAddress + TextSectionAddress), 0 - (BaseAddress + DataSectionAddress))) else: - MapBuffer.write('(GUID=%s, .textbaseaddress=0x%010X, .databaseaddress=0x%010X)\n' % (ModuleInfo.Guid, BaseAddress + TextSectionAddress, BaseAddress + DataSectionAddress)) + MapBuffer.write('(GUID=%s, .textbaseaddress=0x%010X, .databaseaddress=0x%010X)\n' % (ModuleInfo.Guid, BaseAddress + TextSectionAddress, BaseAddress + DataSectionAddress)) # # Add debug image full path. # @@ -1076,7 +1076,7 @@ class Build(): for ModuleGuid in ModuleList: Module = ModuleList[ModuleGuid] GlobalData.gProcessingFile = "%s [%s, %s, %s]" % (Module.MetaFile, Module.Arch, Module.ToolChain, Module.BuildTarget) - + OutputImageFile = '' for ResultFile in Module.CodaTargetList: if str(ResultFile.Target).endswith('.efi'): @@ -1127,15 +1127,15 @@ class Build(): if Pcd.Type == TAB_PCDS_PATCHABLE_IN_MODULE and Pcd.TokenCName in TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_LIST: ModuleIsPatch = True break - + if not ModuleIsPatch: continue # # Module includes the patchable load fix address PCDs. - # It will be fixed up later. + # It will be fixed up later. # PatchEfiImageList.append (OutputImageFile) - + # # Get Top Memory address # @@ -1155,14 +1155,14 @@ class Build(): # # Patch FixAddress related PCDs into EFI image # - for EfiImage in PatchEfiImageList: + for EfiImage in PatchEfiImageList: EfiImageMap = EfiImage.replace('.efi', '.map') if not os.path.exists(EfiImageMap): continue # # Get PCD offset in EFI image by GenPatchPcdTable function # - PcdTable = parsePcdInfoFromMapFile(EfiImageMap, EfiImage) + PcdTable = parsePcdInfoFromMapFile(EfiImageMap, EfiImage) # # Patch real PCD value by PatchPcdValue tool # @@ -1178,16 +1178,16 @@ class Build(): ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SMM_PAGE_SIZE_DATA_TYPE, str (SmmSize/0x1000)) if ReturnValue != 0: EdkLogger.error("build", PARAMETER_INVALID, "Patch PCD value failed", ExtraData=ErrorInfo) - + MapBuffer.write('PEI_CODE_PAGE_NUMBER = 0x%x\n' % (PeiSize/0x1000)) MapBuffer.write('BOOT_CODE_PAGE_NUMBER = 0x%x\n' % (BtSize/0x1000)) MapBuffer.write('RUNTIME_CODE_PAGE_NUMBER = 0x%x\n' % (RtSize/0x1000)) if len (SmmModuleList) > 0: MapBuffer.write('SMM_CODE_PAGE_NUMBER = 0x%x\n' % (SmmSize/0x1000)) - - PeiBaseAddr = TopMemoryAddress - RtSize - BtSize + + PeiBaseAddr = TopMemoryAddress - RtSize - BtSize BtBaseAddr = TopMemoryAddress - RtSize - RtBaseAddr = TopMemoryAddress - ReservedRuntimeMemorySize + RtBaseAddr = TopMemoryAddress - ReservedRuntimeMemorySize self._RebaseModule (MapBuffer, PeiBaseAddr, PeiModuleList, TopMemoryAddress == 0) self._RebaseModule (MapBuffer, BtBaseAddr, BtModuleList, TopMemoryAddress == 0) @@ -1196,7 +1196,7 @@ class Build(): MapBuffer.write('\n\n') sys.stdout.write ("\n") sys.stdout.flush() - + ## Save platform Map file # def _SaveMapFile (self, MapBuffer, Wa): @@ -1243,7 +1243,7 @@ class Build(): self.BuildReport.AddPlatformReport(Wa) self.Progress.Stop("done!") self._Build(self.Target, Wa) - + # Create MAP file when Load Fix Address is enabled. if self.Target in ["", "all", "fds"]: for Arch in Wa.ArchList: @@ -1292,7 +1292,7 @@ class Build(): GlobalData.gGlobalDefines['TARGET'] = BuildTarget for ToolChain in self.ToolChainList: GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain - GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain + GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain # # module build needs platform build information, so get platform # AutoGen first @@ -1383,7 +1383,7 @@ class Build(): GlobalData.gGlobalDefines['TARGET'] = BuildTarget for ToolChain in self.ToolChainList: GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain - GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain + GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain Wa = WorkspaceAutoGen( self.WorkspaceDir, self.PlatformFile, @@ -1414,6 +1414,7 @@ class Build(): Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch) if Pa == None: continue + pModules = [] for Module in Pa.Platform.Modules: # Get ModuleAutoGen object to generate C code file and makefile Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile) @@ -1433,6 +1434,9 @@ class Build(): if self.Target == "genmake": continue self.Progress.Stop("done!") + pModules.append(Ma) + + for Ma in pModules: # Generate build task for the module Bt = BuildTask.New(ModuleMakeUnit(Ma, self.Target)) # Break build if any build thread has error @@ -1537,10 +1541,10 @@ class Build(): if not os.path.exists(FvDir): continue - for Arch in self.ArchList: + for Arch in self.ArchList: # Build up the list of supported architectures for this build prefix = '%s_%s_%s_' % (BuildTarget, ToolChain, Arch) - + # Look through the tool definitions for GUIDed tools guidAttribs = [] for (attrib, value) in self.ToolDef.ToolsDefTxtDictionary.iteritems(): @@ -1555,7 +1559,7 @@ class Build(): path = self.ToolDef.ToolsDefTxtDictionary[path] path = self.GetFullPathOfTool(path) guidAttribs.append((guid, toolName, path)) - + # Write out GuidedSecTools.txt toolsFile = os.path.join(FvDir, 'GuidedSectionTools.txt') toolsFile = open(toolsFile, 'wt') @@ -1632,7 +1636,7 @@ def ParseDefines(DefineList=[]): EdkLogger.error('build', FORMAT_INVALID, "The macro name must be in the pattern [A-Z][A-Z0-9_]*", ExtraData=DefineTokenList[0]) - + if len(DefineTokenList) == 1: DefineDict[DefineTokenList[0]] = "TRUE" else: @@ -1656,8 +1660,8 @@ def SingleCheckCallback(option, opt_str, value, parser): # def MyOptionParser(): Parser = OptionParser(description=__copyright__,version=__version__,prog="build.exe",usage="%prog [options] [all|fds|genc|genmake|clean|cleanall|cleanlib|modules|libraries|run]") - Parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32','X64','IPF','EBC','ARM'], dest="TargetArch", - help="ARCHS is one of list: IA32, X64, IPF, ARM or EBC, which overrides target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option.") + Parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32','X64','IPF','EBC','ARM', 'AARCH64'], dest="TargetArch", + help="ARCHS is one of list: IA32, X64, IPF, ARM, AARCH64 or EBC, which overrides target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option.") Parser.add_option("-p", "--platform", action="callback", type="string", dest="PlatformFile", callback=SingleCheckCallback, help="Build the platform specified by the DSC file name argument, overriding target.txt's ACTIVE_PLATFORM definition.") Parser.add_option("-m", "--module", action="callback", type="string", dest="ModuleFile", callback=SingleCheckCallback, diff --git a/BaseTools/Tests/GNUmakefile b/BaseTools/Tests/GNUmakefile index c63c2166c3..b7cb226da9 100644 --- a/BaseTools/Tests/GNUmakefile +++ b/BaseTools/Tests/GNUmakefile @@ -1,5 +1,5 @@ ## @file -# Windows makefile for 'Tests' module build. +# GNU/Linux makefile for 'Tests' module build. # # Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
# This program and the accompanying materials diff --git a/BaseTools/building-gcc.txt b/BaseTools/building-gcc.txt index 886e2da552..ed9cecee28 100644 --- a/BaseTools/building-gcc.txt +++ b/BaseTools/building-gcc.txt @@ -9,7 +9,7 @@ If you do not have a tianocore.org account, you can make use of the 'guest' account with an empty password. In a web browser, you can 'browse' the relavent source at this location: - https://buildtools.tianocore.org/source/browse/buildtools/trunk/BaseTools/gcc + http://sourceforge.net/p/edk2-buildtools/code/HEAD/tree/trunk/BaseTools/gcc Or, with subversion, you can download the relavent source with this command: - svn co https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools/gcc + svn co https://svn.code.sf.net/p/edk2-buildtools/code/trunk/BaseTools/gcc diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 561cc408cb..98d0247aa1 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -3,10 +3,10 @@ @REM however it may be executed directly from the BaseTools project folder @REM if the file is not executed within a WORKSPACE\BaseTools folder. @REM -@REM Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
@REM @REM This program and the accompanying materials are licensed and made available -@REM under the terms and conditions of the BSD Licensewhich accompanies this +@REM under the terms and conditions of the BSD License which accompanies this @REM distribution. The full text of the license may be found at: @REM http://opensource.org/licenses/bsd-license.php @REM -- cgit v1.2.3