correctly identify atomic reservation CSV file field and

[openpower-isa.git] / src / openpower / decoder / power_pseudo.py

diff --git a/src/openpower/decoder/power_pseudo.py b/src/openpower/decoder/power_pseudo.py
index eb87b626e2162cd6b8f6ccd961658b27d6b7447d..05d5938a0ac14cd7a15c81b258d145088f5508ab 100644 (file)
--- a/src/openpower/decoder/power_pseudo.py
+++ b/src/openpower/decoder/power_pseudo.py
@@ -181,7 +181,53 @@ hextest = """
 RT <- 0x0001_a000_0000_0000
 """
 
-code = hextest
+SVSTATE_next = """
+SVSTATE_NEXT(5)
+"""
+
+logictest = """
+x <- (y * 5) + 3
+y <- (z + 5) * 3
+"""
+
+XLEN_test = """
+RA[XLEN:XLEN - 1]
+"""
+
+concat_test1 = """
+[0]*16
+"""
+
+concat_test2 = """
+[0]*(XLEN-16)
+"""
+
+concat_test3 = """
+[0]*XLEN
+"""
+
+assign_test = """
+prod[0:63] <- 5
+prod[0:XLEN-1] <- 5
+"""
+
+assign_test2 = """
+prod[0:XLEN-1] <- 5
+"""
+
+assign_test = """
+prod[0:XLEN-1] <- MULS((RA)[XLEN/2:XLEN-1], (RB)[XLEN/2:XLEN-1])
+RT[XLEN/2:XLEN-1] <- prod[0:(XLEN/2)-1]
+RT[0:(XLEN/2)-1] <- undefined(prod[0:(XLEN/2)-1])
+"""
+
+code = assign_test
+#code = concat_test3
+#code = concat_test1
+#code = XLEN_test
+#code = logictest
+#code = SVSTATE_next
+#code = hextest
 #code = lswx
 #code = testcond
 #code = testdo
@@ -212,10 +258,19 @@ def get_reg_hex(reg):
     return hex(reg.value)
 
 
-def convert_to_python(pcode, form, incl_carry):
+def convert_to_pure_python(pcode, helper=False):
+
+    gsc = GardenSnakeCompiler(form=None, incl_carry=False, helper=helper)
+
+    tree = gsc.compile(pcode, mode="exec", filename="string")
+    tree = ast.fix_missing_locations(tree)
+    return astor.to_source(tree)
+
+
+def convert_to_python(pcode, form, incl_carry, helper=False):
 
     print("form", form)
-    gsc = GardenSnakeCompiler(form=form, incl_carry=incl_carry)
+    gsc = GardenSnakeCompiler(form=form, incl_carry=incl_carry, helper=helper)
 
     tree = gsc.compile(pcode, mode="exec", filename="string")
     tree = ast.fix_missing_locations(tree)
@@ -234,7 +289,7 @@ def test():
     gsc.regfile = {}
     for i in range(32):
         gsc.regfile[i] = i
-    gsc.gpr = GPR(gsc.parser.sd, gsc.regfile)
+    gsc.gpr = GPR(None, None, None, gsc.regfile)
     gsc.mem = Mem()
 
     _compile = gsc.compile