Skip to content

[PARTSELECT PLUS MINUS FIX] Fixed the MSB or LSB computation for the … #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: fix_partselect
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions pyverilog/vparser/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -854,12 +854,14 @@ def p_lpartselect_lpointer(self, p):

def p_lpartselect_lpointer_plus(self, p):
'lpartselect : pointer LBRACKET expression PLUSCOLON expression RBRACKET'
p[0] = Partselect(p[1], p[3], Plus(p[3], p[5]), lineno=p.lineno(1))
inc_value = Minus(p[5], IntConst('1'))
p[0] = Partselect(p[1], p[3], Plus(p[3], inc_value), lineno=p.lineno(1))
p.set_lineno(0, p.lineno(1))

def p_lpartselect_lpointer_minus(self, p):
'lpartselect : pointer LBRACKET expression MINUSCOLON expression RBRACKET'
p[0] = Partselect(p[1], p[3], Minus(p[3], p[5]), lineno=p.lineno(1))
dec_value = Minus(p[5], IntConst('1'))
p[0] = Partselect(p[1], p[3], Minus(p[3], dec_value), lineno=p.lineno(1))
p.set_lineno(0, p.lineno(1))

def p_lpartselect(self, p):
Expand All @@ -869,12 +871,14 @@ def p_lpartselect(self, p):

def p_lpartselect_plus(self, p):
'lpartselect : identifier LBRACKET expression PLUSCOLON expression RBRACKET'
p[0] = Partselect(p[1], p[3], Plus(p[3], p[5]), lineno=p.lineno(1))
inc_value = Minus(p[5], IntConst('1'))
p[0] = Partselect(p[1], p[3], Plus(p[3], inc_value), lineno=p.lineno(1))
p.set_lineno(0, p.lineno(1))

def p_lpartselect_minus(self, p):
'lpartselect : identifier LBRACKET expression MINUSCOLON expression RBRACKET'
p[0] = Partselect(p[1], p[3], Minus(p[3], p[5]), lineno=p.lineno(1))
dec_value = Minus(p[5], IntConst('1'))
p[0] = Partselect(p[1], p[3], Minus(p[3], dec_value), lineno=p.lineno(1))
p.set_lineno(0, p.lineno(1))

def p_lpointer(self, p):
Expand Down Expand Up @@ -1215,14 +1219,16 @@ def p_partselect(self, p):

def p_partselect_plus(self, p):
'partselect : identifier LBRACKET expression PLUSCOLON expression RBRACKET'
inc_value = Minus(p[5], IntConst('1'))
p[0] = Partselect(p[1], p[3], Plus(
p[3], p[5], lineno=p.lineno(1)), lineno=p.lineno(1))
p[3], inc_value, lineno=p.lineno(1)), lineno=p.lineno(1))
p.set_lineno(0, p.lineno(1))

def p_partselect_minus(self, p):
'partselect : identifier LBRACKET expression MINUSCOLON expression RBRACKET'
dec_value = Minus(p[5], IntConst('1'))
p[0] = Partselect(p[1], p[3], Minus(
p[3], p[5], lineno=p.lineno(1)), lineno=p.lineno(1))
p[3], dec_value, lineno=p.lineno(1)), lineno=p.lineno(1))
p.set_lineno(0, p.lineno(1))

def p_partselect_pointer(self, p):
Expand All @@ -1232,14 +1238,16 @@ def p_partselect_pointer(self, p):

def p_partselect_pointer_plus(self, p):
'partselect : pointer LBRACKET expression PLUSCOLON expression RBRACKET'
inc_value = Minus(p[5], IntConst('1'))
p[0] = Partselect(p[1], p[3], Plus(
p[3], p[5], lineno=p.lineno(1)), lineno=p.lineno(1))
p[3], inc_value, lineno=p.lineno(1)), lineno=p.lineno(1))
p.set_lineno(0, p.lineno(1))

def p_partselect_pointer_minus(self, p):
'partselect : pointer LBRACKET expression MINUSCOLON expression RBRACKET'
dec_value = Minus(p[5], IntConst('1'))
p[0] = Partselect(p[1], p[3], Minus(
p[3], p[5], lineno=p.lineno(1)), lineno=p.lineno(1))
p[3], dec_value, lineno=p.lineno(1)), lineno=p.lineno(1))
p.set_lineno(0, p.lineno(1))

def p_pointer(self, p):
Expand Down