libsvp64: support paired operands

diff --git a/src/libsvp64/codegen.py b/src/libsvp64/codegen.py
index f41e244c58bccaee57f949f290bef52fb8d2cb06..8bad6a162e1ebae799b21db404334e3c4c2d3b47 100644 (file)
--- a/src/libsvp64/codegen.py
+++ b/src/libsvp64/codegen.py
@@ -301,16 +301,24 @@ class DisGenSource(Source):
             yield "flags = SVP64_OPERAND_SIGNED;"
             self.emit("break;")
 
-        def gpr_handler(span):
-            yield from generic_handler(span, "SVP64_OPERAND_GPR")
-
-        def fpr_handler(span):
-            yield from generic_handler(span, "SVP64_OPERAND_FPR")
+        def gpr_handler(span, pair=False):
+            if not pair:
+                yield from generic_handler(span, "SVP64_OPERAND_GPR")
+            else:
+                yield from generic_handler(span, "(SVP64_OPERAND_GPR | SVP64_OPERAND_PAIR)")
+
+        def fpr_handler(span, pair=False):
+            if not pair:
+                yield from generic_handler(span, "SVP64_OPERAND_FPR")
+            else:
+                yield from generic_handler(span, "(SVP64_OPERAND_FPR | SVP64_OPERAND_PAIR)")
 
         handlers = {
             insndb.SignedOperand: signed_handler,
             insndb.GPROperand: gpr_handler,
             insndb.GPROperand: fpr_handler,
+            insndb.GPRPairOperand: lambda span: gpr_handler(span, True),
+            insndb.FPRPairOperand: lambda span: fpr_handler(span, True),
         }
         self.emit(f"case 0x{(path + 1):02x}: /* {', '.join(node.names)} */")
         with self:

diff --git a/src/libsvp64/svp64.h b/src/libsvp64/svp64.h
index 7b502024926cd40c7c39e6cbff5bda69978faf06..f377c97a8e063e39f2f384eb75ce0fda16e19da7 100644 (file)
--- a/src/libsvp64/svp64.h
+++ b/src/libsvp64/svp64.h
@@ -35,6 +35,7 @@ struct svp64_operand {
 #define SVP64_OPERAND_SIGNED    (UINT32_C(1) << UINT32_C(0))
 #define SVP64_OPERAND_GPR       (UINT32_C(1) << UINT32_C(1))
 #define SVP64_OPERAND_FPR       (UINT32_C(1) << UINT32_C(2))
+#define SVP64_OPERAND_PAIR      (UINT32_C(1) << UINT32_C(3))
 
 struct svp64_ctx {
     struct svp64_record const *record;