sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed line number accounting

Browse source 
--HG--
extra : convert_revision : 4c046493b98ce4a766c2121710d70650cb6a801e
This commit is contained in:
Gabe Black 2007-07-20 23:12:26 -07:00
parent 75f6c6a016
commit 009df5ff1e
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/arch/isa_parser.py
View file

@ -134,7 +134,7 @@ def t_INTLIT(t):
try: try:
t.value = int(t.value,0) t.value = int(t.value,0)
except ValueError: except ValueError:
error(t.lineno, 'Integer value "%s" too large' % t.value) error(t.lexer.lineno, 'Integer value "%s" too large' % t.value)
t.value = 0 t.value = 0
return t return t
@ -144,7 +144,7 @@ def t_STRLIT(t):
r"(?m)'([^'])+'" r"(?m)'([^'])+'"
# strip off quotes # strip off quotes
t.value = t.value[1:-1] t.value = t.value[1:-1]
t.lineno += t.value.count('\n') t.lexer.lineno += t.value.count('\n')
return t return t
@ -154,22 +154,22 @@ def t_CODELIT(t):
r"(?m)\{\{([^\}]|}(?!\}))+\}\}" r"(?m)\{\{([^\}]|}(?!\}))+\}\}"
# strip off {{ & }} # strip off {{ & }}
t.value = t.value[2:-2] t.value = t.value[2:-2]
t.lineno += t.value.count('\n') t.lexer.lineno += t.value.count('\n')
return t return t
def t_CPPDIRECTIVE(t): def t_CPPDIRECTIVE(t):
r'^\#[^\#].*\n' r'^\#[^\#].*\n'
t.lineno += t.value.count('\n') t.lexer.lineno += t.value.count('\n')
return t return t
def t_NEWFILE(t): def t_NEWFILE(t):
r'^\#\#newfile\s+"[\w/.-]*"' r'^\#\#newfile\s+"[\w/.-]*"'
fileNameStack.push((t.value[11:-1], t.lineno)) fileNameStack.push((t.value[11:-1], t.lexer.lineno))
t.lineno = 0 t.lexer.lineno = 0
def t_ENDFILE(t): def t_ENDFILE(t):
r'^\#\#endfile' r'^\#\#endfile'
(old_filename, t.lineno) = fileNameStack.pop() (old_filename, t.lexer.lineno) = fileNameStack.pop()
# #
# The functions t_NEWLINE, t_ignore, and t_error are # The functions t_NEWLINE, t_ignore, and t_error are
@ -179,7 +179,7 @@ def t_ENDFILE(t):
# Newlines # Newlines
def t_NEWLINE(t): def t_NEWLINE(t):
r'\n+' r'\n+'
t.lineno += t.value.count('\n') t.lexer.lineno += t.value.count('\n')
# Comments # Comments
def t_comment(t): def t_comment(t):
@ -190,7 +190,7 @@ t_ignore = ' \t\x0c'
# Error handler # Error handler
def t_error(t): def t_error(t):
error(t.lineno, "illegal character '%s'" % t.value[0]) error(t.lexer.lineno, "illegal character '%s'" % t.value[0])
t.skip(1) t.skip(1)
# Build the lexer # Build the lexer
@ -318,7 +318,7 @@ def p_global_let(t):
try: try:
exec fixPythonIndentation(t[2]) in exportContext exec fixPythonIndentation(t[2]) in exportContext
except Exception, exc: except Exception, exc:
error(t.lineno(1), error(t.lexer.lineno,
'error: %s in global let block "%s".' % (exc, t[2])) 'error: %s in global let block "%s".' % (exc, t[2]))
t[0] = GenCode(header_output = exportContext["header_output"], t[0] = GenCode(header_output = exportContext["header_output"],
decoder_output = exportContext["decoder_output"], decoder_output = exportContext["decoder_output"],
@ -332,9 +332,9 @@ def p_def_operand_types(t):
try: try:
userDict = eval('{' + t[3] + '}') userDict = eval('{' + t[3] + '}')
except Exception, exc: except Exception, exc:
error(t.lineno(1), error(t.lexer.lineno,
'error: %s in def operand_types block "%s".' % (exc, t[3])) 'error: %s in def operand_types block "%s".' % (exc, t[3]))
buildOperandTypeMap(userDict, t.lineno(1)) buildOperandTypeMap(userDict, t.lexer.lineno)
t[0] = GenCode() # contributes nothing to the output C++ file t[0] = GenCode() # contributes nothing to the output C++ file
# Define the mapping from operand names to operand classes and other # Define the mapping from operand names to operand classes and other
@ -342,14 +342,14 @@ def p_def_operand_types(t):
def p_def_operands(t): def p_def_operands(t):
'def_operands : DEF OPERANDS CODELIT SEMI' 'def_operands : DEF OPERANDS CODELIT SEMI'
if not globals().has_key('operandTypeMap'): if not globals().has_key('operandTypeMap'):
error(t.lineno(1), error(t.lexer.lineno,
'error: operand types must be defined before operands') 'error: operand types must be defined before operands')
try: try:
userDict = eval('{' + t[3] + '}') userDict = eval('{' + t[3] + '}')
except Exception, exc: except Exception, exc:
error(t.lineno(1), error(t.lexer.lineno,
'error: %s in def operands block "%s".' % (exc, t[3])) 'error: %s in def operands block "%s".' % (exc, t[3]))
buildOperandNameMap(userDict, t.lineno(1)) buildOperandNameMap(userDict, t.lexer.lineno)
t[0] = GenCode() # contributes nothing to the output C++ file t[0] = GenCode() # contributes nothing to the output C++ file
# A bitfield definition looks like: # A bitfield definition looks like:
@ -376,7 +376,7 @@ def p_def_bitfield_1(t):
def p_def_bitfield_struct(t): def p_def_bitfield_struct(t):
'def_bitfield_struct : DEF opt_signed BITFIELD ID id_with_dot SEMI' 'def_bitfield_struct : DEF opt_signed BITFIELD ID id_with_dot SEMI'
if (t[2] != ''): if (t[2] != ''):
error(t.lineno(1), 'error: structure bitfields are always unsigned.') error(t.lexer.lineno, 'error: structure bitfields are always unsigned.')
expr = 'machInst.%s' % t[5] expr = 'machInst.%s' % t[5]
hash_define = '#undef %s\n#define %s\t%s\n' % (t[4], t[4], expr) hash_define = '#undef %s\n#define %s\t%s\n' % (t[4], t[4], expr)
t[0] = GenCode(header_output = hash_define) t[0] = GenCode(header_output = hash_define)
@ -410,7 +410,7 @@ def p_def_template(t):
def p_def_format(t): def p_def_format(t):
'def_format : DEF FORMAT ID LPAREN param_list RPAREN CODELIT SEMI' 'def_format : DEF FORMAT ID LPAREN param_list RPAREN CODELIT SEMI'
(id, params, code) = (t[3], t[5], t[7]) (id, params, code) = (t[3], t[5], t[7])
defFormat(id, params, code, t.lineno(1)) defFormat(id, params, code, t.lexer.lineno)
t[0] = GenCode() t[0] = GenCode()
# The formal parameter list for an instruction format is a possibly # The formal parameter list for an instruction format is a possibly
@ -520,7 +520,7 @@ def p_decode_stmt_list_0(t):
def p_decode_stmt_list_1(t): def p_decode_stmt_list_1(t):
'decode_stmt_list : decode_stmt decode_stmt_list' 'decode_stmt_list : decode_stmt decode_stmt_list'
if (t[1].has_decode_default and t[2].has_decode_default): if (t[1].has_decode_default and t[2].has_decode_default):
error(t.lineno(1), 'Two default cases in decode block') error(t.lexer.lineno, 'Two default cases in decode block')
t[0] = t[1] + t[2] t[0] = t[1] + t[2]
# #
@ -565,7 +565,7 @@ def p_push_format_id(t):
formatStack.push(formatMap[t[1]]) formatStack.push(formatMap[t[1]])
t[0] = ('', '// format %s' % t[1]) t[0] = ('', '// format %s' % t[1])
except KeyError: except KeyError:
error(t.lineno(1), 'instruction format "%s" not defined.' % t[1]) error(t.lexer.lineno, 'instruction format "%s" not defined.' % t[1])
# Nested decode block: if the value of the current field matches the # Nested decode block: if the value of the current field matches the
# specified constant, do a nested decode on some other field. # specified constant, do a nested decode on some other field.
@ -617,7 +617,7 @@ def p_inst_0(t):
'inst : ID LPAREN arg_list RPAREN' 'inst : ID LPAREN arg_list RPAREN'
# Pass the ID and arg list to the current format class to deal with. # Pass the ID and arg list to the current format class to deal with.
currentFormat = formatStack.top() currentFormat = formatStack.top()
codeObj = currentFormat.defineInst(t[1], t[3], t.lineno(1)) codeObj = currentFormat.defineInst(t[1], t[3], t.lexer.lineno)
args = ','.join(map(str, t[3])) args = ','.join(map(str, t[3]))
args = re.sub('(?m)^', '//', args) args = re.sub('(?m)^', '//', args)
args = re.sub('^//', '', args) args = re.sub('^//', '', args)
@ -632,8 +632,8 @@ def p_inst_1(t):
try: try:
format = formatMap[t[1]] format = formatMap[t[1]]
except KeyError: except KeyError:
error(t.lineno(1), 'instruction format "%s" not defined.' % t[1]) error(t.lexer.lineno, 'instruction format "%s" not defined.' % t[1])
codeObj = format.defineInst(t[3], t[5], t.lineno(1)) codeObj = format.defineInst(t[3], t[5], t.lexer.lineno)
comment = '\n// %s::%s(%s)\n' % (t[1], t[3], t[5]) comment = '\n// %s::%s(%s)\n' % (t[1], t[3], t[5])
codeObj.prepend_all(comment) codeObj.prepend_all(comment)
t[0] = codeObj t[0] = codeObj
@ -722,7 +722,7 @@ def p_empty(t):
# *token*, not a grammar symbol (hence the need to use t.value) # *token*, not a grammar symbol (hence the need to use t.value)
def p_error(t): def p_error(t):
if t: if t:
error(t.lineno, "syntax error at '%s'" % t.value) error(t.lexer.lineno, "syntax error at '%s'" % t.value)
else: else:
error(0, "unknown syntax error", True) error(0, "unknown syntax error", True)