summaryrefslogtreecommitdiffstats
path: root/BaseTools
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2016-03-16 16:01:55 -0700
committerJordan Justen <jordan.l.justen@intel.com>2016-06-28 13:16:19 -0700
commitc8102434ba8703ff3bd18d8f53675c2de3830f97 (patch)
tree4357a312f95804fec7f629c11bbebd3ea0983333 /BaseTools
parent402dde68aff982d8a22cf032a002053d2081eb95 (diff)
downloadedk2-c8102434ba8703ff3bd18d8f53675c2de3830f97.tar.gz
edk2-c8102434ba8703ff3bd18d8f53675c2de3830f97.tar.bz2
edk2-c8102434ba8703ff3bd18d8f53675c2de3830f97.zip
BaseTools ConvertMasmToNasm: Support ASM_PFX in .asm files
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools')
-rwxr-xr-xBaseTools/Scripts/ConvertMasmToNasm.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/BaseTools/Scripts/ConvertMasmToNasm.py b/BaseTools/Scripts/ConvertMasmToNasm.py
index 6a0d27dadb..8b08a88557 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 )?