diff options
Diffstat (limited to 'src/arch/isa_parser.py')
| -rwxr-xr-x | src/arch/isa_parser.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py index a0d671da1..4c8d0706d 100755 --- a/src/arch/isa_parser.py +++ b/src/arch/isa_parser.py @@ -866,7 +866,11 @@ class Format: context = {} updateExportContext() context.update(exportContext) - context.update({ 'name': name, 'Name': string.capitalize(name) }) + if len(name): + Name = name[0].upper() + if len(name) > 1: + Name += name[1:] + context.update({ 'name': name, 'Name': Name }) try: vars = self.func(self.user_code, context, *args[0], **args[1]) except Exception, exc: @@ -1028,7 +1032,7 @@ def substBitOps(code): # Template objects are format strings that allow substitution from # the attribute spaces of other objects (e.g. InstObjParams instances). -labelRE = re.compile(r'[^%]%\(([^\)]+)\)[sd]') +labelRE = re.compile(r'(?<!%)%\(([^\)]+)\)[sd]') class Template: def __init__(self, t): |