The long value substitution must move to the front of
HEX substitution, and updated build_rule to add --trim-long
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yingke Liu <yingke.d.liu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18170
6f19259b-4bc3-4df7-8a09-
765794883524
\r
<Command.MSFT, Command.INTEL>\r
"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
\r
<Command.MSFT, Command.INTEL>\r
"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
- Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+ Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii\r
\r
<Command.GCC, Command.RVCT>\r
"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii\r
\r
<Command.GCC, Command.RVCT>\r
\r
<Command.MSFT, Command.INTEL>\r
"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
\r
<Command.MSFT, Command.INTEL>\r
"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
- Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+ Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
cd $(OUTPUT_DIR)(+)${s_dir}\r
"$(ASM16)" /nologo /c /omf $(INC) /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${d_path}(+)${s_base}.iii\r
"$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,\r
cd $(OUTPUT_DIR)(+)${s_dir}\r
"$(ASM16)" /nologo /c /omf $(INC) /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${d_path}(+)${s_base}.iii\r
"$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,\r
EdkLogger.verbose("Found original file content starting from line %d"\r
% (LineIndexOfOriginalFile + 1))\r
\r
EdkLogger.verbose("Found original file content starting from line %d"\r
% (LineIndexOfOriginalFile + 1))\r
\r
+ if TrimLong:\r
+ Line = gLongNumberPattern.sub(r"\1", Line)\r
# convert HEX number format if indicated\r
if ConvertHex:\r
Line = gHexNumberPattern.sub(r"0\2h", Line)\r
else:\r
Line = gHexNumberPattern.sub(r"\1\2", Line)\r
# convert HEX number format if indicated\r
if ConvertHex:\r
Line = gHexNumberPattern.sub(r"0\2h", Line)\r
else:\r
Line = gHexNumberPattern.sub(r"\1\2", Line)\r
- if TrimLong:\r
- Line = gLongNumberPattern.sub(r"\1", Line)\r
\r
# convert Decimal number format\r
Line = gDecNumberPattern.sub(r"\1", Line)\r
\r
# convert Decimal number format\r
Line = gDecNumberPattern.sub(r"\1", Line)\r