From 0044ec8ae293600cd4dc6b98640e68ffe8bb7438 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 8 Apr 2021 21:38:55 +0100
Subject: [PATCH] upload over 32-bit JTAG Wishbone

---
 src/soc/debug/firmware_upload.py | 31 ++++++++++++++++++++++---------
 src/soc/simulator/program.py     |  9 +++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/soc/debug/firmware_upload.py b/src/soc/debug/firmware_upload.py
index e388243e..b16309cc 100644
--- a/src/soc/debug/firmware_upload.py
+++ b/src/soc/debug/firmware_upload.py
@@ -21,6 +21,7 @@ from nmutil.util import wrap
 from soc.debug.jtagutils import (jtag_read_write_reg,
                                  jtag_srv, jtag_set_reset,
                                  jtag_set_ir, jtag_set_get_dr)
+from soc.simulator.program import Program
 
 def test_pinset():
     return {
@@ -84,7 +85,7 @@ def jtag_sim(dut, firmware):
     # write DMI CTRL register - STOP and RESET
     status = yield from writeread_dmi_addr(dut, DBGCore.CTRL, 0b011)
     print ("dmi ctrl status", hex(status))
-    assert status == 4 # returned old value (nice! cool feature!)
+    assert status == 0 # returned old value (nice! cool feature!)
 
     # read STAT and wait for "STOPPED"
     while True:
@@ -93,23 +94,23 @@ def jtag_sim(dut, firmware):
         if (status & (1<<DBGStat.STOPPED)) or (status & (1<<DBGStat.TERM)):
             break
 
-    ####### JTAG to Wishbone ######
+    ####### JTAG to Wishbone - hard-coded 30-bit addr, 32-bit data ######
 
     # write Wishbone address
-    yield from jtag_read_write_reg(dut, WB_ADDR, 64, 0)
+    yield from jtag_read_write_reg(dut, WB_ADDR, 30, 0)
 
     # write/read wishbone data
     for val in firmware:
-        data = yield from jtag_read_write_reg(dut, WB_WRRD, 64, val)
-        print ("wb write", hex(data))
+        data = yield from jtag_read_write_reg(dut, WB_WRRD, 32, val)
+        print ("wb write", val, hex(data))
 
     # write Wishbone address
-    yield from jtag_read_write_reg(dut, WB_ADDR, 64, 0)
+    yield from jtag_read_write_reg(dut, WB_ADDR, 30, 0)
 
     # confirm data written
     for val in firmware:
-        data = yield from jtag_read_write_reg(dut, WB_READ, 64, 0)
-        print ("wb read", hex(data))
+        data = yield from jtag_read_write_reg(dut, WB_READ, 32, val)
+        print ("wb read", val, hex(data))
 
     ####### JTAG to DMI Setup (IC-Reset, start) ######
 
@@ -153,7 +154,19 @@ if __name__ == '__main__':
     sim = Simulator(m)
     sim.add_clock(1e-6, domain="sync")      # standard clock
 
-    data = [0x01, 0x02] # list of 64-bit words
+    lst = ["addi 9, 0, 0x10",  # i = 16
+           "addi 9,9,-1",    # i = i - 1
+           "cmpi 2,1,9,12",     # compare 9 to value 12, store in CR2
+           "bc 4,10,-8",        # branch if CR2 "test was != 12"
+           'attn',
+           ]
+
+    data = []
+    with Program(lst, False) as p:
+        data = list(p.generate_instructions())
+        for instruction in data:
+            print (hex(instruction))
+
     sim.add_sync_process(wrap(jtag_sim(cdut, data))) 
 
     with sim.write_vcd("jtag_firmware_upload.vcd"):
diff --git a/src/soc/simulator/program.py b/src/soc/simulator/program.py
index 1acd02da..c55a67d1 100644
--- a/src/soc/simulator/program.py
+++ b/src/soc/simulator/program.py
@@ -128,5 +128,14 @@ if __name__ == '__main__':
            'addi r2, 3, 1',
            'attn',
           ]
+    lst = ["addi 9, 0, 0x10",  # i = 16
+           "addi 9,9,-1",    # i = i - 1
+           "cmpi 2,1,9,12",     # compare 9 to value 12, store in CR2
+           "bc 4,10,-8",        # branch if CR2 "test was != 12"
+           'attn',
+           ]
+
     with Program(lst, False) as p:
+        for instruction in p.generate_instructions():
+            print (hex(instruction))
         p.write_bin("/tmp/test.bin")
-- 
2.30.2