X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=riscv%2Fjtag_dtm.cc;h=365528a49a7566919c7b0742151f3fab846b5435;hb=aa8cbb1ccd3856fd5e0437b0e24cfd7a3b794b8e;hp=c099e3307b2ea1f14abd3bc6f56e76a55736567b;hpb=4695be7cea868b34082787d5728c35577d0c05d1;p=riscv-isa-sim.git

diff --git a/riscv/jtag_dtm.cc b/riscv/jtag_dtm.cc
index c099e33..365528a 100644
--- a/riscv/jtag_dtm.cc
+++ b/riscv/jtag_dtm.cc
@@ -1,18 +1,80 @@
 #include <stdio.h>
 
+#include "decode.h"
 #include "jtag_dtm.h"
+#include "debug_module.h"
+#include "debug_defines.h"
 
-#if 1
+#if 0
 #  define D(x) x
 #else
 #  define D(x)
 #endif
 
+enum {
+  IR_IDCODE=1,
+  IR_DTMCONTROL=0x10,
+  IR_DBUS=0x11,
+  IR_RESET=0x1c
+};
+
+#define DTMCONTROL_VERSION      0xf
+#define DTMCONTROL_ABITS        (0x3f << 4)
+#define DTMCONTROL_DBUSSTAT     (3<<10)
+#define DTMCONTROL_IDLE         (7<<12)
+#define DTMCONTROL_DBUSRESET    (1<<16)
+
+#define DMI_OP                 3
+#define DMI_DATA               (0xffffffffL<<2)
+#define DMI_ADDRESS            ((1L<<(abits+34)) - (1L<<34))
+
+#define DMI_OP_STATUS_SUCCESS	0
+#define DMI_OP_STATUS_RESERVED	1
+#define DMI_OP_STATUS_FAILED	2
+#define DMI_OP_STATUS_BUSY	3
+
+#define DMI_OP_NOP	        0
+#define DMI_OP_READ	        1
+#define DMI_OP_WRITE	        2
+#define DMI_OP_RESERVED	        3
+
+jtag_dtm_t::jtag_dtm_t(debug_module_t *dm) :
+  dm(dm),
+  _tck(false), _tms(false), _tdi(false), _tdo(false),
+  dtmcontrol((abits << DTM_DTMCS_ABITS_OFFSET) | 1),
+  dmi(DMI_OP_STATUS_SUCCESS << DTM_DMI_OP_OFFSET),
+  _state(TEST_LOGIC_RESET)
+{
+}
+
+void jtag_dtm_t::reset() {
+  _state = TEST_LOGIC_RESET;
+}
+
 void jtag_dtm_t::set_pins(bool tck, bool tms, bool tdi) {
+  const jtag_state_t next[16][2] = {
+    /* TEST_LOGIC_RESET */    { RUN_TEST_IDLE, TEST_LOGIC_RESET },
+    /* RUN_TEST_IDLE */       { RUN_TEST_IDLE, SELECT_DR_SCAN },
+    /* SELECT_DR_SCAN */      { CAPTURE_DR, SELECT_IR_SCAN },
+    /* CAPTURE_DR */          { SHIFT_DR, EXIT1_DR },
+    /* SHIFT_DR */            { SHIFT_DR, EXIT1_DR },
+    /* EXIT1_DR */            { PAUSE_DR, UPDATE_DR },
+    /* PAUSE_DR */            { PAUSE_DR, EXIT2_DR },
+    /* EXIT2_DR */            { SHIFT_DR, UPDATE_DR },
+    /* UPDATE_DR */           { RUN_TEST_IDLE, SELECT_DR_SCAN },
+    /* SELECT_IR_SCAN */      { CAPTURE_IR, TEST_LOGIC_RESET },
+    /* CAPTURE_IR */          { SHIFT_IR, EXIT1_IR },
+    /* SHIFT_IR */            { SHIFT_IR, EXIT1_IR },
+    /* EXIT1_IR */            { PAUSE_IR, UPDATE_IR },
+    /* PAUSE_IR */            { PAUSE_IR, EXIT2_IR },
+    /* EXIT2_IR */            { SHIFT_IR, UPDATE_IR },
+    /* UPDATE_IR */           { RUN_TEST_IDLE, SELECT_DR_SCAN }
+  };
+
   if (!_tck && tck) {
     // Positive clock edge.
 
-    switch (state) {
+    switch (_state) {
       case SHIFT_DR:
         dr >>= 1;
         dr |= (uint64_t) _tdi << (dr_length-1);
@@ -24,10 +86,10 @@ void jtag_dtm_t::set_pins(bool tck, bool tms, bool tdi) {
       default:
         break;
     }
-    state = next[state][_tms];
-    switch (state) {
+    _state = next[_state][_tms];
+    switch (_state) {
       case TEST_LOGIC_RESET:
-        ir = idcode_ir;
+        ir = IR_IDCODE;
         break;
       case CAPTURE_DR:
         capture_dr();
@@ -43,31 +105,40 @@ void jtag_dtm_t::set_pins(bool tck, bool tms, bool tdi) {
       case SHIFT_IR:
         _tdo = ir & 1;
         break;
-      case UPDATE_IR:
-        break;
+      //case UPDATE_IR:
+        //if (ir == IR_RESET) {
+          // Make a reset happen
+        //}
+        //break;
       default:
         break;
     }
   }
 
+  D(fprintf(stderr, "state=%2d, tdi=%d, tdo=%d, tms=%d, tck=%d, ir=0x%02x, "
+        "dr=0x%lx\n",
+        _state, _tdi, _tdo, _tms, _tck, ir, dr));
+
   _tck = tck;
   _tms = tms;
   _tdi = tdi;
-
-  D(fprintf(stderr, "state=%2d tck=%d tms=%d tdi=%d tdo=%d ir=0x%x dr=0x%lx\n",
-        state, _tck, _tms, _tdi, _tdo, ir, dr));
 }
 
 void jtag_dtm_t::capture_dr()
 {
   switch (ir) {
-    case idcode_ir:
-      dr = 0xdeadbeef;
+    case IR_IDCODE:
+      dr = idcode;
       dr_length = 32;
       break;
-    case dtmcontrol_ir:
+    case IR_DTMCONTROL:
       dr = dtmcontrol;
       dr_length = 32;
+      break;
+    case IR_DBUS:
+      dr = dmi;
+      dr_length = abits + 34;
+      break;
     default:
       D(fprintf(stderr, "Unsupported IR: 0x%x\n", ir));
       break;
@@ -78,4 +149,36 @@ void jtag_dtm_t::capture_dr()
 
 void jtag_dtm_t::update_dr()
 {
+  D(fprintf(stderr, "Update DR; IR=0x%x, DR=0x%lx (%d bits)\n",
+        ir, dr, dr_length));
+  switch (ir) {
+    case IR_DBUS:
+      {
+        unsigned op = get_field(dr, DMI_OP);
+        uint32_t data = get_field(dr, DMI_DATA);
+        unsigned address = get_field(dr, DMI_ADDRESS);
+
+        dmi = dr;
+
+        bool success = true;
+        if (op == DMI_OP_READ) {
+          uint32_t value;
+          if (dm->dmi_read(address, &value)) {
+            dmi = set_field(dmi, DMI_DATA, value);
+          } else {
+            success = false;
+          }
+        } else if (op == DMI_OP_WRITE) {
+          success = dm->dmi_write(address, data);
+        }
+
+        if (success) {
+          dmi = set_field(dmi, DMI_OP, DMI_OP_STATUS_SUCCESS);
+        } else {
+          dmi = set_field(dmi, DMI_OP, DMI_OP_STATUS_FAILED);
+        }
+        D(fprintf(stderr, "dmi=0x%lx\n", dmi));
+      }
+      break;
+  }
 }