From 6e2add9ea8343ff02295f1813f7965500b2385c5 Mon Sep 17 00:00:00 2001
From: Michael Nolan <mtnolan2640@gmail.com>
Date: Sat, 29 Feb 2020 14:27:03 -0500
Subject: [PATCH] Add internal op field to major decoder

---
 src/decoder/decoder.py           | 18 ++++++++++++++++++
 src/decoder/test/test_decoder.py | 12 +++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/decoder/decoder.py b/src/decoder/decoder.py
index 65aa3338..6aa96d61 100644
--- a/src/decoder/decoder.py
+++ b/src/decoder/decoder.py
@@ -3,10 +3,26 @@ import csv
 import os
 from enum import Enum, unique
 
+@unique
 class Function(Enum):
     ALU = 0
     LDST = 1
 
+@unique
+class InternalOp(Enum):
+    OP_ADD = 0
+    OP_AND = 1
+    OP_B = 2
+    OP_BC = 3
+    OP_CMP = 4
+    OP_LOAD = 5
+    OP_MUL_L64 = 6
+    OP_OR = 7
+    OP_RLC = 8
+    OP_STORE = 9
+    OP_TDI = 10
+    OP_XOR = 11
+
 def get_csv(name):
     file_dir = os.path.dirname(os.path.realpath(__file__))
     with open(os.path.join(file_dir, name)) as csvfile:
@@ -20,6 +36,7 @@ class PowerDecoder(Elaboratable):
         self.opcode_in = Signal(6, reset_less=True)
 
         self.function_unit = Signal(Function, reset_less=True)
+        self.internal_op = Signal(InternalOp, reset_less=True)
     def elaborate(self, platform):
         m = Module()
         comb = m.d.comb
@@ -29,6 +46,7 @@ class PowerDecoder(Elaboratable):
                 opcode = int(row['opcode'])
                 with m.Case(opcode):
                     comb += self.function_unit.eq(Function[row['unit']])
+                    comb += self.internal_op.eq(InternalOp[row['internal op']])
         return m
 
 
diff --git a/src/decoder/test/test_decoder.py b/src/decoder/test/test_decoder.py
index 37faddd1..222dedab 100644
--- a/src/decoder/test/test_decoder.py
+++ b/src/decoder/test/test_decoder.py
@@ -5,7 +5,7 @@ from nmigen.cli import rtlil
 import sys
 import unittest
 sys.path.append("../")
-from decoder import PowerDecoder, Function, major_opcodes
+from decoder import PowerDecoder, Function, InternalOp, major_opcodes
 
 class DecoderTestCase(FHDLTestCase):
     def test_function_unit(self):
@@ -13,10 +13,12 @@ class DecoderTestCase(FHDLTestCase):
         comb = m.d.comb
         opcode = Signal(6)
         function_unit = Signal(Function)
+        internal_op = Signal(InternalOp)
 
         m.submodules.dut = dut = PowerDecoder()
         comb += [dut.opcode_in.eq(opcode),
-                 function_unit.eq(dut.function_unit)]
+                 function_unit.eq(dut.function_unit),
+                 internal_op.eq(dut.internal_op)]
 
         sim = Simulator(m)
         def process():
@@ -26,8 +28,12 @@ class DecoderTestCase(FHDLTestCase):
                 result = yield function_unit
                 expected = Function[row['unit']].value
                 self.assertEqual(expected, result)
+
+                result = yield internal_op
+                expected = InternalOp[row['internal op']].value
+                self.assertEqual(expected, result)
         sim.add_process(process)
-        with sim.write_vcd("test.vcd", "test.gtkw", traces=[opcode, function_unit]):
+        with sim.write_vcd("test.vcd", "test.gtkw", traces=[opcode, function_unit, internal_op]):
             sim.run()
 
     def test_ilang(self):
-- 
2.30.2