From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 4 Apr 2020 21:22:46 +0000 (+0100)
Subject: add != operator
X-Git-Tag: div_pipeline~1501
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe3f2b0052320cbecac8882b7e9c45f67232a975;p=soc.git

add != operator
---

diff --git a/src/soc/decoder/pseudo/lexer.py b/src/soc/decoder/pseudo/lexer.py
index 3f666c4b..bd84e2f1 100644
--- a/src/soc/decoder/pseudo/lexer.py
+++ b/src/soc/decoder/pseudo/lexer.py
@@ -244,6 +244,7 @@ class PowerLexer:
         'ASSIGN',
         'LTU',
         'GTU',
+        'NE',
         'LE',
         'GE',
         'LT',
@@ -296,6 +297,7 @@ class PowerLexer:
     t_ASSIGN = r'<-'
     t_LTU = r'<u'
     t_GTU = r'>u'
+    t_NE = r'!='
     t_LE = r'<='
     t_GE = r'>='
     t_LT = r'<'
diff --git a/src/soc/decoder/pseudo/parser.py b/src/soc/decoder/pseudo/parser.py
index bd05b4e9..51c21a3a 100644
--- a/src/soc/decoder/pseudo/parser.py
+++ b/src/soc/decoder/pseudo/parser.py
@@ -106,6 +106,11 @@ def make_eq_compare(arg):
     return ast.Compare(left, [ast.Eq()], [right])
 
 
+def make_ne_compare(arg):
+    (left, right) = arg
+    return ast.Compare(left, [ast.NotEq()], [right])
+
+
 binary_ops = {
     "^": ast.BitXor(),
     "&": ast.BitAnd(),
@@ -120,6 +125,7 @@ binary_ops = {
     "<": make_lt_compare,
     ">": make_gt_compare,
     "=": make_eq_compare,
+    "!=": make_ne_compare,
 }
 unary_ops = {
     "+": ast.UAdd(),
@@ -208,7 +214,7 @@ def apply_trailer(atom, trailer):
 class PowerParser:
 
     precedence = (
-        ("left", "EQ", "GT", "LT", "LE", "GE", "LTU", "GTU"),
+        ("left", "EQ", "NE", "GT", "LT", "LE", "GE", "LTU", "GTU"),
         ("left", "BITOR"),
         ("left", "BITXOR"),
         ("left", "BITAND"),
@@ -436,6 +442,7 @@ class PowerParser:
                       | comparison DIV comparison
                       | comparison MOD comparison
                       | comparison EQ comparison
+                      | comparison NE comparison
                       | comparison LE comparison
                       | comparison GE comparison
                       | comparison LTU comparison
@@ -459,7 +466,7 @@ class PowerParser:
             elif p[2] == '||':
                 l = check_concat(p[1]) + check_concat(p[3])
                 p[0] = ast.Call(ast.Name("concat"), l, [])
-            elif p[2] in ['<', '>', '=', '<=', '>=']:
+            elif p[2] in ['<', '>', '=', '<=', '>=', '!=']:
                 p[0] = binary_ops[p[2]]((p[1], p[3]))
             elif identify_sint_mul_pattern(p):
                 keywords=[ast.keyword(arg='repeat', value=p[3])]