Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <[email protected]>
Cc: Yonghong Zhu <[email protected]>
Cc: Liming Gao <[email protected]>
---
Note: Liming and I used these 4 patches when creating NASM source
files from the MASM sources for the EDK II core pacakges.
BaseTools/Scripts/ConvertMasmToNasm.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/BaseTools/Scripts/ConvertMasmToNasm.py
b/BaseTools/Scripts/ConvertMasmToNasm.py
index 6a0d27d..8b08a88 100755
--- a/BaseTools/Scripts/ConvertMasmToNasm.py
+++ b/BaseTools/Scripts/ConvertMasmToNasm.py
@@ -285,7 +285,9 @@ class ConvertAsmFile(CommonUtils):
self.oldAsmEmptyLineCount = 0
procDeclRe = re.compile(r'''
- ([\w@][\w@0-9]*) \s+
+ (?: ASM_PFX \s* [(] \s* )?
+ ([\w@][\w@0-9]*) \s*
+ [)]? \s+
PROC
(?: \s+ NEAR | FAR )?
(?: \s+ C )?
--
2.8.1
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
