From 756ad8f8e9d3e345f1883546e2a3125203e234aa Mon Sep 17 00:00:00 2001 From: lgao4 Date: Tue, 3 Aug 2010 03:29:17 +0000 Subject: [PATCH] Sync EDKII BaseTools to BaseTools project r2006. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10764 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Bin/Win32/BootSectImage.exe | Bin 393216 -> 393216 bytes BaseTools/Bin/Win32/EfiLdrImage.exe | Bin 421888 -> 421888 bytes BaseTools/Bin/Win32/EfiRom.exe | Bin 446464 -> 446464 bytes BaseTools/Bin/Win32/GenBootSector.exe | Bin 425984 -> 425984 bytes BaseTools/Bin/Win32/GenCrc32.exe | Bin 425984 -> 425984 bytes BaseTools/Bin/Win32/GenFfs.exe | Bin 430080 -> 430080 bytes BaseTools/Bin/Win32/GenFv.exe | Bin 479232 -> 479232 bytes BaseTools/Bin/Win32/GenFw.exe | Bin 495616 -> 495616 bytes BaseTools/Bin/Win32/GenPage.exe | Bin 421888 -> 421888 bytes BaseTools/Bin/Win32/GenSec.exe | Bin 446464 -> 446464 bytes BaseTools/Bin/Win32/GenVtf.exe | Bin 446464 -> 446464 bytes BaseTools/Bin/Win32/LzmaCompress.exe | Bin 397312 -> 397312 bytes BaseTools/Bin/Win32/Split.exe | Bin 425984 -> 425984 bytes BaseTools/Bin/Win32/TianoCompress.exe | Bin 434176 -> 434176 bytes BaseTools/Bin/Win32/VfrCompile.exe | Bin 1187840 -> 1187840 bytes BaseTools/Bin/Win32/VolInfo.exe | Bin 471040 -> 471040 bytes BaseTools/Bin/Win32/build.exe | Bin 2616692 -> 2617426 bytes BaseTools/Conf/build_rule.template | 2 +- BaseTools/Source/C/GenFw/Elf32Convert.c | 63 +++++++- BaseTools/Source/C/GenFw/elf_common.h | 34 +++++ BaseTools/Source/Python/AutoGen/GenC.py | 2 +- BaseTools/Source/Python/AutoGen/GenMake.py | 3 +- BaseTools/Source/Python/AutoGen/StrGather.py | 26 +++- .../Source/Python/AutoGen/UniClassObject.py | 140 ++++++++++-------- 24 files changed, 199 insertions(+), 71 deletions(-) diff --git a/BaseTools/Bin/Win32/BootSectImage.exe b/BaseTools/Bin/Win32/BootSectImage.exe index 433d8de593f06dd22ecf2deeb0e605931931a535..0ddaa55734075c429a64f19b39379db8a96d91de 100755 GIT binary patch delta 61 zcmZo@kZ5R-nDBr(ZE0BJnA2V-#%<>T|w*C4;7T!Gq*^0k<7uU%<^(EFu Pu8&?*wf)OnR-PmPi5(pY delta 61 zcmZo@kZ5R-nDBr(eUD$`nA2V-#%<>T|w*C4;7T!Gq2377KV@;bK`<_gW Pi8!>fbo-aNtUO5ojx-%` diff --git a/BaseTools/Bin/Win32/EfiLdrImage.exe b/BaseTools/Bin/Win32/EfiLdrImage.exe index ab8e438560c53cde50db425e03aa5a020b393946..d18067e721824ab1f5522bba6cf7e273ed56e1db 100755 GIT binary patch delta 64 zcmZp8AldLha>4`V^rc~qk6RxzwmxQReazhYm}To@){g-o;qBK0S@%8=;9b5&c&aa_ UcT3r>(vw_CceXDvVvDf_0P~L>!2kdN delta 64 zcmZp8AldLha>4`Vj6Hshk6RxzwmxQReazhYm}To@){g-o;qBK0S@%8=kZWA1{Z&)O Uzp=My;a=tGFSai+VvDf_0RKlGY5)KL diff --git a/BaseTools/Bin/Win32/EfiRom.exe b/BaseTools/Bin/Win32/EfiRom.exe index 7c2fd61ad55643733eeef12645e6ac8e90012be1..700e3ba72b25c85e00c7e36ed8c513f4c6a844e5 100755 GIT binary patch delta 64 zcmZozAl(D7}*1h)xoEOA(m4BJy UwtBYcnMapz{NKLCfX&Ar0Qe~&KL7v# delta 64 zcmZo@kZNd(D7}*1h)x6dzY;K2v$* UzF15<_uPkfdfT@cu=)4{0P5Htp8x;= diff --git a/BaseTools/Bin/Win32/GenCrc32.exe b/BaseTools/Bin/Win32/GenCrc32.exe index bd6ba314d24fcf616fee155568d97f4cd6a23dee..6bac0d00cd31b5a82ffd5d487e8a48e3e32f1f3c 100755 GIT binary patch delta 64 zcmZo@kZNdDE0)}s#uEcCYRoWAa* U*Bln3vvtR3>TF+Q#1`TU0Pcn!jsO4v delta 64 zcmZo@kZNdDE0)}s#utPf6$6I*HF UzhV1lpD%m3M7FOnVhiyF0PmF^VgLXD diff --git a/BaseTools/Bin/Win32/GenFfs.exe b/BaseTools/Bin/Win32/GenFfs.exe index 914875176eaa2064775917570e4082d54d26b763..e7dae7a7b0ba615281b514a196693a25d1987849 100755 GIT binary patch delta 64 zcmZozAl0xyYQh8NoTXunk6RxzwmxQReazhYm}To@){hAw;qBKGS@%8=uu!=W%iV*mgE delta 64 zcmZozAl0xyYQh8N+&zAck6RxzwmxQReazhYm}To@){hAw;qBKGS@%8=@cyEF(D+)5 UdprAN(`Sn|P1?T1i7mz#0Q5*6+W-In diff --git a/BaseTools/Bin/Win32/GenFv.exe b/BaseTools/Bin/Win32/GenFv.exe index fade8eee6a90bd73be3387278f8634fa9c183840..240101306c26c94ad66fc9273ab91564b04eeac2 100755 GIT binary patch delta 64 zcmV-G0Kfl$pdEmq9gye)ZKYO$>xJt9h3f)^>jQ=B1hwl0>F@(>rB=7s@dfqZ5S*&| W=7{3@LV%6c%Ofn-uD9IM1|)q<_ai<4 delta 64 zcmZozAltA&cESthygh!6uUlU;w!UU+ea+nZnq}*2)|VeZ!rQNZWc~U;;6QJW&=vb; Uhn1o#W*+MOecSI`VpFLF02xyscK`qY diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe index 0130d6396b65146c097848a8b251c940960b7dd1..6ec43f4728df34a4b89dd0004d3341b650672a10 100755 GIT binary patch delta 199 zcmZozAlI-!Zo&iRf~8>_AK$9iU|>N2Ae(`KiJ1WmfJ|gC`C)?;7ep~gc=E-D$(!di zzGbDvfaZ*j_KXfjAZ7w$W*}zSp3%Wt(+P6j_UD3Zx=#f<9NsQuSK@Q(TU=hSqQm3T Lc9rjJcV++pMg=YA delta 141 zcmZozAlI-!Zo&iR!aaT)AK$7MV?hT@%q%PnlLZ^QCo44CZJyKkmX&~-=8TT^j1ER1 xW&&bnAZFQ~(ZO2N39@7Rb3r!UrvlqJN|~0q__$2)+?#p1(otf&%6GOqGXP9DDk=Z~ diff --git a/BaseTools/Bin/Win32/GenPage.exe b/BaseTools/Bin/Win32/GenPage.exe index 5850eede9e7d6549dbf8ba5439382f19d8e62609..8a03a51e970078305785ab7a8940ead298c7c1a9 100755 GIT binary patch delta 62 zcmV-E0Kxx&;2D768Ia)urB;FCh2sH*;{t`_1BK%Rwc`cyPy(e^x7Sexz2FdoDwOpe UnbSs-yMzJC3d@zZq%sCvJ<>NG6#xJL delta 62 zcmV-E0Kxx&;2D768Ia)uyiS4Rh2sH*;{t`_1BK%Rwc`cyPy)P8x7Sexz2Fdjm%WbK USF=Q-D2h+0?K%y&q%sCvJ>6j*EdT%j diff --git a/BaseTools/Bin/Win32/GenSec.exe b/BaseTools/Bin/Win32/GenSec.exe index d3eb98e31df7255932839e6763908da1b86c968a..9cd22fe9e487a2a4449b8ffbe2025060228ad667 100755 GIT binary patch delta 62 zcmV-E0Kxx&pc{ao8<61wrB;FCh2sH*;{t`_1BK%Rwc`cykOHMvx7U#ct>6&Wu=k^lez delta 62 zcmV-E0Kxx&pc{ao8<61wyiS4Rh2sH*;{t`_1BK%Rwc`cykOI6;x7U#ct>6&7l1QXS Ug_cR2xx#%oKtRB^lyU}aUCH1cYybcN diff --git a/BaseTools/Bin/Win32/GenVtf.exe b/BaseTools/Bin/Win32/GenVtf.exe index 98f677a765611e974d19c053f2f9531cb54faf05..ab2b374d2848fb28782a8d17f20adccdbb6b8e04 100755 GIT binary patch delta 62 zcmV-E0Kxx&pc{ao8<6P&rB;FKh3f%@>jH)A1BL4Zwd)1ypaP{jH)A1BL4Zwd)1ypaQ&3x7VQsjo}bc#?`wG UNT^4@aH0vvZDQBAbb|(rOw?W;-2eap diff --git a/BaseTools/Bin/Win32/LzmaCompress.exe b/BaseTools/Bin/Win32/LzmaCompress.exe index 34f753c890d26fca37663e1feaf97243489b102b..edca459e3f57150543b015eea46d78f3033fcc96 100755 GIT binary patch delta 62 zcmV-E0Kxx&pcsIl7?9xtrB;FCh2sH*;{t`_1BK%Rwc`cyAOfXUx7Q&Bov{$Zds;mU ULD)*2`>EXtU`lPbgwq9lJe&m__W%F@ delta 62 zcmV-E0Kxx&pcsIl7?9xtyiS4Rh2sH*;{t`_1BK%Rwc`cyAOgHjx7Q&Bov{!cORhzj Usj5J#EAaO~DGn&Ngwq9lJeo%wbN~PV diff --git a/BaseTools/Bin/Win32/Split.exe b/BaseTools/Bin/Win32/Split.exe index b73d3d1a39100fee22690792285f4a882cadc6e8..0ff13016c34c141f8fa494f99ec86132d3363111 100755 GIT binary patch delta 62 zcmZo@kZNd delta 62 zcmV-E0Kxx&fEs{+8j$e_n_#K896|=O U$Ju%}_-Cr5-`~C^iOt6r02);v+yDRo diff --git a/BaseTools/Bin/Win32/VfrCompile.exe b/BaseTools/Bin/Win32/VfrCompile.exe index 7885c5656800f03a16a7ecb45729f3d21a435e6c..daf66f23c54a84503149a64071c9e20989b93919 100755 GIT binary patch delta 105 zcmZoT;L&ivW5NsOj-_FZuUlU;w!UU+ea+nZnx*wMYwK&a*4ON;R2;rx98ynrR)&EBVHQU h@;yVAYbh3~{ji0%oX!S(AqGKpXCNRlw;u2Y;y-R9BI^JE delta 75 zcmV-R0JQ&r;2eP99FW-pyiS4Jh1&sz+X98#1BKfJwc7;>;R3u)x98ynrR)$dUbm4C hc5h6cG%WZh_EO8YoX!S(AqGlyY#=f>w;u2Y;y-3@BD4Si diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe index d73c4faeeea9d3c96152ee5a994ec5fd01482ae2..54a323996dab3f966ed6d76eea68b699006c5446 100755 GIT binary patch delta 8768 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 b&-%s(&a>Sel-%GN7;;Cm8{YXsLt6g>Qe?Ls delta 8344 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 XZKZE7;&3aE&<)?3dA5z~O;G_ diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 139289ee17..70f510aed7 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -413,7 +413,7 @@ cd $(OUTPUT_DIR)(+)${s_dir} - "$(ASM16)" /nologo /c /omf /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src} + "$(ASM16)" /nologo /c /omf $(INC) /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src} "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,, diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/GenFw/Elf32Convert.c index 9e4a9a2c9a..539fdf560a 100644 --- a/BaseTools/Source/C/GenFw/Elf32Convert.c +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c @@ -632,6 +632,7 @@ WriteSections32 ( switch (ELF32_R_TYPE(Rel->r_info)) { case R_ARM_RBASE: // No relocation - no action required + // break skipped case R_ARM_PC24: case R_ARM_XPC25: @@ -639,6 +640,35 @@ WriteSections32 ( case R_ARM_THM_JUMP19: case R_ARM_CALL: case R_ARM_JMP24: + case R_ARM_THM_JUMP24: + case R_ARM_PREL31: + case R_ARM_MOVW_PREL_NC: + case R_ARM_MOVT_PREL: + case R_ARM_THM_MOVW_PREL_NC: + case R_ARM_THM_MOVT_PREL: + case R_ARM_THM_JMP6: + case R_ARM_THM_ALU_PREL_11_0: + case R_ARM_THM_PC12: + case R_ARM_REL32_NOI: + case R_ARM_ALU_PC_G0_NC: + case R_ARM_ALU_PC_G0: + case R_ARM_ALU_PC_G1_NC: + case R_ARM_ALU_PC_G1: + case R_ARM_ALU_PC_G2: + case R_ARM_LDR_PC_G1: + case R_ARM_LDR_PC_G2: + case R_ARM_LDRS_PC_G0: + case R_ARM_LDRS_PC_G1: + case R_ARM_LDRS_PC_G2: + case R_ARM_LDC_PC_G0: + case R_ARM_LDC_PC_G1: + case R_ARM_LDC_PC_G2: + case R_ARM_GOT_PREL: + case R_ARM_THM_JUMP11: + case R_ARM_THM_JUMP8: + case R_ARM_TLS_GD32: + case R_ARM_TLS_LDM32: + case R_ARM_TLS_IE32: // Thease are all PC-relative relocations and don't require modification // GCC does not seem to have the concept of a application that just needs to get relocated. break; @@ -736,14 +766,45 @@ WriteRelocations32 ( } } else if (mEhdr->e_machine == EM_ARM) { switch (ELF32_R_TYPE(Rel->r_info)) { - case R_ARM_RBASE: + case R_ARM_RBASE: // No relocation - no action required + // break skipped + case R_ARM_PC24: case R_ARM_XPC25: case R_ARM_THM_PC22: case R_ARM_THM_JUMP19: case R_ARM_CALL: case R_ARM_JMP24: + case R_ARM_THM_JUMP24: + case R_ARM_PREL31: + case R_ARM_MOVW_PREL_NC: + case R_ARM_MOVT_PREL: + case R_ARM_THM_MOVW_PREL_NC: + case R_ARM_THM_MOVT_PREL: + case R_ARM_THM_JMP6: + case R_ARM_THM_ALU_PREL_11_0: + case R_ARM_THM_PC12: + case R_ARM_REL32_NOI: + case R_ARM_ALU_PC_G0_NC: + case R_ARM_ALU_PC_G0: + case R_ARM_ALU_PC_G1_NC: + case R_ARM_ALU_PC_G1: + case R_ARM_ALU_PC_G2: + case R_ARM_LDR_PC_G1: + case R_ARM_LDR_PC_G2: + case R_ARM_LDRS_PC_G0: + case R_ARM_LDRS_PC_G1: + case R_ARM_LDRS_PC_G2: + case R_ARM_LDC_PC_G0: + case R_ARM_LDC_PC_G1: + case R_ARM_LDC_PC_G2: + case R_ARM_GOT_PREL: + case R_ARM_THM_JUMP11: + case R_ARM_THM_JUMP8: + case R_ARM_TLS_GD32: + case R_ARM_TLS_LDM32: + case R_ARM_TLS_IE32: // Thease are all PC-relative relocations and don't require modification break; diff --git a/BaseTools/Source/C/GenFw/elf_common.h b/BaseTools/Source/C/GenFw/elf_common.h index d53f98b679..9618d48524 100644 --- a/BaseTools/Source/C/GenFw/elf_common.h +++ b/BaseTools/Source/C/GenFw/elf_common.h @@ -602,6 +602,38 @@ typedef struct { #define R_ARM_THM_MOVW_ABS_NC 47 #define R_ARM_THM_MOVT_ABS 48 +// Block of PC-relative relocations added to work around gcc putting +// object relocations in static executables. +#define R_ARM_THM_JUMP24 30 +#define R_ARM_PREL31 42 +#define R_ARM_MOVW_PREL_NC 45 +#define R_ARM_MOVT_PREL 46 +#define R_ARM_THM_MOVW_PREL_NC 49 +#define R_ARM_THM_MOVT_PREL 50 +#define R_ARM_THM_JMP6 52 +#define R_ARM_THM_ALU_PREL_11_0 53 +#define R_ARM_THM_PC12 54 +#define R_ARM_REL32_NOI 56 +#define R_ARM_ALU_PC_G0_NC 57 +#define R_ARM_ALU_PC_G0 58 +#define R_ARM_ALU_PC_G1_NC 59 +#define R_ARM_ALU_PC_G1 60 +#define R_ARM_ALU_PC_G2 61 +#define R_ARM_LDR_PC_G1 62 +#define R_ARM_LDR_PC_G2 63 +#define R_ARM_LDRS_PC_G0 64 +#define R_ARM_LDRS_PC_G1 65 +#define R_ARM_LDRS_PC_G2 66 +#define R_ARM_LDC_PC_G0 67 +#define R_ARM_LDC_PC_G1 68 +#define R_ARM_LDC_PC_G2 69 +#define R_ARM_GOT_PREL 96 +#define R_ARM_THM_JUMP11 102 +#define R_ARM_THM_JUMP8 103 +#define R_ARM_TLS_GD32 104 +#define R_ARM_TLS_LDM32 105 +#define R_ARM_TLS_IE32 107 + #define R_ARM_THM_JUMP19 51 #define R_ARM_GNU_VTENTRY 100 #define R_ARM_GNU_VTINHERIT 101 @@ -612,6 +644,8 @@ typedef struct { #define R_ARM_RPC24 254 #define R_ARM_RBASE 255 + + /* Name Value Field Calculation */ #define R_IA_64_NONE 0 /* None */ #define R_IA_64_IMM14 0x21 /* immediate14 S + A */ diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py index f0f92b0865..1db68ebec5 100644 --- a/BaseTools/Source/Python/AutoGen/GenC.py +++ b/BaseTools/Source/Python/AutoGen/GenC.py @@ -1888,7 +1888,7 @@ def CreateUnicodeStringCode(Info, AutoGenC, AutoGenH, UniGenCFlag, UniGenBinBuff else: ShellMode = False - Header, Code = GetStringFiles(Info.UnicodeFileList, SrcList, IncList, ['.uni', '.inf'], Info.Name, CompatibleMode, ShellMode, UniGenCFlag, UniGenBinBuffer) + Header, Code = GetStringFiles(Info.UnicodeFileList, SrcList, IncList, Info.IncludePathList, ['.uni', '.inf'], Info.Name, CompatibleMode, ShellMode, UniGenCFlag, UniGenBinBuffer) if CompatibleMode or UniGenCFlag: AutoGenC.Append("\n//\n//Unicode String Pack Definition\n//\n") AutoGenC.Append(Code) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py index e3f5c2b6ec..2e18f6771c 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -26,7 +26,7 @@ from BuildEngine import * import Common.GlobalData as GlobalData ## Regular expression for finding header file inclusions -gIncludePattern = re.compile(r"^[ \t]*#?[ \t]*include(?:[ \t]*(?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:[\"<]?[ \t]*)([\w.\\/]+)(?:[ \t]*[\">]?)", re.MULTILINE|re.UNICODE) +gIncludePattern = re.compile(r"^[ \t]*#?[ \t]*include(?:[ \t]*(?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:[\"<]?[ \t]*)([\w.\\/() \t]+)(?:[ \t]*[\">]?)", re.MULTILINE|re.UNICODE|re.IGNORECASE) ## Regular expression for matching macro used in header file inclusion gMacroPattern = re.compile("([_A-Z][_A-Z0-9]*)[ \t]*\((.+)\)", re.UNICODE) @@ -754,6 +754,7 @@ cleanlib: CurrentFilePath = F.Dir for Inc in IncludedFileList: + Inc = Inc.strip() # if there's macro used to reference header file, expand it HeaderList = gMacroPattern.findall(Inc) if len(HeaderList) == 1 and len(HeaderList[0]) == 2: diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py index 1759da72dd..52ab439e9b 100644 --- a/BaseTools/Source/Python/AutoGen/StrGather.py +++ b/BaseTools/Source/Python/AutoGen/StrGather.py @@ -1,4 +1,4 @@ -# Copyright (c) 2007, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2010, 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 @@ -168,6 +168,8 @@ def CreateHFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag): Str = WriteLine(Str, Line) Line = COMMENT_DEFINE_STR + ' ' + PRINTABLE_LANGUAGE_NAME_STRING_NAME + ' ' * (ValueStartPtr - len(DEFINE_STR + PRINTABLE_LANGUAGE_NAME_STRING_NAME)) + DecToHexStr(1, 4) + COMMENT_NOT_REFERENCED Str = WriteLine(Str, Line) + + #Group the referred STRING token together. for Index in range(2, len(UniObjectClass.OrderedStringList[UniObjectClass.LanguageDef[0][0]])): StringItem = UniObjectClass.OrderedStringList[UniObjectClass.LanguageDef[0][0]][Index] Name = StringItem.StringName @@ -180,12 +182,22 @@ def CreateHFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag): Line = DEFINE_STR + ' ' + Name + ' ' + DecToHexStr(Token, 4) else: Line = DEFINE_STR + ' ' + Name + ' ' * (ValueStartPtr - len(DEFINE_STR + Name)) + DecToHexStr(Token, 4) - else: + Str = WriteLine(Str, Line) + + #Group the unused STRING token together. + for Index in range(2, len(UniObjectClass.OrderedStringList[UniObjectClass.LanguageDef[0][0]])): + StringItem = UniObjectClass.OrderedStringList[UniObjectClass.LanguageDef[0][0]][Index] + Name = StringItem.StringName + Token = StringItem.Token + Referenced = StringItem.Referenced + if Name != None: + Line = '' + if Referenced == False: if (ValueStartPtr - len(DEFINE_STR + Name)) <= 0: Line = COMMENT_DEFINE_STR + ' ' + Name + ' ' + DecToHexStr(Token, 4) + COMMENT_NOT_REFERENCED else: Line = COMMENT_DEFINE_STR + ' ' + Name + ' ' * (ValueStartPtr - len(DEFINE_STR + Name)) + DecToHexStr(Token, 4) + COMMENT_NOT_REFERENCED - Str = WriteLine(Str, Line) + Str = WriteLine(Str, Line) Str = WriteLine(Str, '') if IsCompatibleMode or UniGenCFlag: @@ -506,7 +518,7 @@ def SearchString(UniObjectClass, FileList, IsCompatibleMode): # This function is used for UEFI2.1 spec # # -def GetStringFiles(UniFilList, SourceFileList, IncludeList, SkipList, BaseName, IsCompatibleMode = False, ShellMode = False, UniGenCFlag = True, UniGenBinBuffer = None): +def GetStringFiles(UniFilList, SourceFileList, IncludeList, IncludePathList, SkipList, BaseName, IsCompatibleMode = False, ShellMode = False, UniGenCFlag = True, UniGenBinBuffer = None): Status = True ErrorMessage = '' @@ -515,15 +527,15 @@ def GetStringFiles(UniFilList, SourceFileList, IncludeList, SkipList, BaseName, # # support ISO 639-2 codes in .UNI files of EDK Shell # - Uni = UniFileClassObject(UniFilList, True) + Uni = UniFileClassObject(sorted (UniFilList), True, IncludePathList) else: - Uni = UniFileClassObject(UniFilList, IsCompatibleMode) + Uni = UniFileClassObject(sorted (UniFilList), IsCompatibleMode, IncludePathList) else: EdkLogger.error("UnicodeStringGather", AUTOGEN_ERROR, 'No unicode files given') FileList = GetFileList(SourceFileList, IncludeList, SkipList) - Uni = SearchString(Uni, FileList, IsCompatibleMode) + Uni = SearchString(Uni, sorted (FileList), IsCompatibleMode) HFile = CreateHFile(BaseName, Uni, IsCompatibleMode, UniGenCFlag) CFile = None diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py index 8f929a33cb..76a0549a75 100644 --- a/BaseTools/Source/Python/AutoGen/UniClassObject.py +++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py @@ -177,18 +177,24 @@ class StringDefClassObject(object): repr(self.StringValue) + ' ' + \ repr(self.UseOtherLangDef) + def UpdateValue(self, Value = None): + if Value != None: + self.StringValue = Value + u'\x00' # Add a NULL at string tail + self.StringValueByteList = UniToHexList(self.StringValue) + self.Length = len(self.StringValueByteList) + ## UniFileClassObject # # A structure for .uni file definition # class UniFileClassObject(object): - def __init__(self, FileList = [], IsCompatibleMode = False): + def __init__(self, FileList = [], IsCompatibleMode = False, IncludePathList = []): self.FileList = FileList self.Token = 2 self.LanguageDef = [] #[ [u'LanguageIdentifier', u'PrintableName'], ... ] self.OrderedStringList = {} #{ u'LanguageIdentifier' : [StringDefClassObject] } self.IsCompatibleMode = IsCompatibleMode - + self.IncludePathList = IncludePathList if len(self.FileList) > 0: self.LoadUniFiles(FileList) @@ -226,6 +232,21 @@ class UniFileClassObject(object): self.AddStringToList(u'$LANGUAGE_NAME', LangName, LangName, 0, True, Index=0) self.AddStringToList(u'$PRINTABLE_LANGUAGE_NAME', LangName, LangPrintName, 1, True, Index=1) + if not IsLangInDef: + # + # The found STRING tokens will be added into new language string list + # so that the unique STRING identifier is reserved for all languages in the package list. + # + FirstLangName = self.LanguageDef[0][0] + if LangName != FirstLangName: + for Index in range (2, len (self.OrderedStringList[FirstLangName])): + Item = self.OrderedStringList[FirstLangName][Index] + if Item.UseOtherLangDef != '': + OtherLang = Item.UseOtherLangDef + else: + OtherLang = FirstLangName + self.OrderedStringList[LangName].append (StringDefClassObject(Item.StringName, '', Item.Referenced, Item.Token, OtherLang)) + return True # @@ -266,7 +287,6 @@ class UniFileClassObject(object): if not os.path.exists(File.Path) or not os.path.isfile(File.Path): EdkLogger.error("Unicode File Parser", FILE_NOT_FOUND, ExtraData=File.Path) - Dir = File.Dir try: FileIn = codecs.open(File.Path, mode='rb', encoding='utf-16').readlines() except UnicodeError, X: @@ -309,7 +329,13 @@ class UniFileClassObject(object): IncList = gIncludePattern.findall(Line) if len(IncList) == 1: - Lines.extend(self.PreProcess(PathClass(str(IncList[0]), Dir))) + for Dir in [File.Dir] + self.IncludePathList: + IncFile = PathClass(str(IncList[0]), Dir) + if os.path.isfile(IncFile.Path): + Lines.extend(self.PreProcess(IncFile)) + break + else: + EdkLogger.error("Unicode File Parser", FILE_NOT_FOUND, Message="Cannot find include file", ExtraData=str(IncList[0])) continue Lines.append(Line) @@ -421,15 +447,30 @@ class UniFileClassObject(object): if Language not in self.OrderedStringList: self.OrderedStringList[Language] = [] - IsAdded = False + IsAdded = True for Item in self.OrderedStringList[Language]: if Name == Item.StringName: - IsAdded = True + IsAdded = False + if Value != None: + Item.UpdateValue(Value) + Item.UseOtherLangDef = '' break - if not IsAdded: + + if IsAdded: Token = len(self.OrderedStringList[Language]) if Index == -1: self.OrderedStringList[Language].append(StringDefClassObject(Name, Value, Referenced, Token, UseOtherLangDef)) + for LangName in self.LanguageDef: + # + # New STRING token will be added into all language string lists. + # so that the unique STRING identifier is reserved for all languages in the package list. + # + if LangName[0] != Language: + if UseOtherLangDef != '': + OtherLangDef = UseOtherLangDef + else: + OtherLangDef = Language + self.OrderedStringList[LangName[0]].append(StringDefClassObject(Name, '', Referenced, Token, OtherLangDef)) else: self.OrderedStringList[Language].insert(Index, StringDefClassObject(Name, Value, Referenced, Token, UseOtherLangDef)) @@ -437,11 +478,15 @@ class UniFileClassObject(object): # Set the string as referenced # def SetStringReferenced(self, Name): - for Lang in self.OrderedStringList: - for Item in self.OrderedStringList[Lang]: - if Name == Item.StringName: - Item.Referenced = True - break + # + # String stoken are added in the same order in all language string lists. + # So, only update the status of string stoken in first language string list. + # + Lang = self.LanguageDef[0][0] + for Item in self.OrderedStringList[Lang]: + if Name == Item.StringName: + Item.Referenced = True + break # # Search the string in language definition by Name # @@ -467,61 +512,36 @@ class UniFileClassObject(object): # def ReToken(self): # - # Search each string to find if it is defined for each language - # Use secondary language value to replace if missing in any one language - # - for IndexI in range(0, len(self.LanguageDef)): - LangKey = self.LanguageDef[IndexI][0] - for Item in self.OrderedStringList[LangKey]: - Name = Item.StringName - Value = Item.StringValue[0:-1] - Referenced = Item.Referenced - Index = self.OrderedStringList[LangKey].index(Item) - for IndexJ in range(0, len(self.LanguageDef)): - LangFind = self.LanguageDef[IndexJ][0] - if self.FindStringValue(Name, LangFind) == None: - EdkLogger.debug(EdkLogger.DEBUG_5, Name) - Token = len(self.OrderedStringList[LangFind]) - self.AddStringToList(Name, LangFind, Value, Token, Referenced, LangKey, Index) - # - # Retoken + # Retoken all language strings according to the status of string stoken in the first language string. # - # First re-token the first language - LangName = self.LanguageDef[0][0] - ReferencedStringList = [] - NotReferencedStringList = [] - Token = 0 + FirstLangName = self.LanguageDef[0][0] # - # Order UNI token by their String Name + # Use small token for all referred string stoken. # - StringNameList = [] - for Item in self.OrderedStringList[LangName]: - StringNameList.append (Item.StringName) - StringNameList.sort() - - for Name in StringNameList: - Item = self.FindStringValue (Name, LangName) - if Item.Referenced == True: - Item.Token = Token - ReferencedStringList.append(Item) - Token = Token + 1 - else: - NotReferencedStringList.append(Item) - self.OrderedStringList[LangName] = ReferencedStringList - for Index in range(len(NotReferencedStringList)): - NotReferencedStringList[Index].Token = Token + Index - self.OrderedStringList[LangName].append(NotReferencedStringList[Index]) + RefToken = 0 + for Index in range (0, len (self.OrderedStringList[FirstLangName])): + FirstLangItem = self.OrderedStringList[FirstLangName][Index] + if FirstLangItem.Referenced == True: + for LangNameItem in self.LanguageDef: + LangName = LangNameItem[0] + OtherLangItem = self.OrderedStringList[LangName][Index] + OtherLangItem.Referenced = True + OtherLangItem.Token = RefToken + RefToken = RefToken + 1 # - # Adjust the orders of other languages + # Use big token for all unreferred string stoken. # - for IndexOfLanguage in range(1, len(self.LanguageDef)): - for OrderedString in self.OrderedStringList[LangName]: - for UnOrderedString in self.OrderedStringList[self.LanguageDef[IndexOfLanguage][0]]: - if OrderedString.StringName == UnOrderedString.StringName: - UnOrderedString.Token = OrderedString.Token - break + UnRefToken = 0 + for Index in range (0, len (self.OrderedStringList[FirstLangName])): + FirstLangItem = self.OrderedStringList[FirstLangName][Index] + if FirstLangItem.Referenced == False: + for LangNameItem in self.LanguageDef: + LangName = LangNameItem[0] + OtherLangItem = self.OrderedStringList[LangName][Index] + OtherLangItem.Token = RefToken + UnRefToken + UnRefToken = UnRefToken + 1 # # Show the instance itself -- 2.39.2