added irq_id_e enum

rtl/include/riscv_defines.sv

@@ -416,6 +416,30 @@ parameter EXC_CAUSE_STORE_FAULT  = 6'h07;
 parameter EXC_CAUSE_ECALL_UMODE  = 6'h08;
 parameter EXC_CAUSE_ECALL_MMODE  = 6'h0B;
 
+
+// Possible irq ids
+typedef enum logic [4:0] {
+  NMI_IRQ_ID      = 5'd31, 
+  FAST14_IRQ_ID   = 5'd30,  
+  FAST13_IRQ_ID   = 5'd29,  
+  FAST12_IRQ_ID   = 5'd28,  
+  FAST11_IRQ_ID   = 5'd27,  
+  FAST10_IRQ_ID   = 5'd26,
+  FAST9_IRQ_ID    = 5'd25,
+  FAST8_IRQ_ID    = 5'd24,
+  FAST7_IRQ_ID    = 5'd23,
+  FAST6_IRQ_ID    = 5'd22,
+  FAST5_IRQ_ID    = 5'd21,
+  FAST4_IRQ_ID    = 5'd20,
+  FAST3_IRQ_ID    = 5'd19,
+  FAST2_IRQ_ID    = 5'd18,
+  FAST1_IRQ_ID    = 5'd17,
+  FAST0_IRQ_ID    = 5'd16,
+  EXTERNAL_IRQ_ID = 5'd11,
+  TIMER_IRQ_ID    = 5'd07,
+  SOFTWARE_IRQ_ID = 5'd03
+} irq_id_e;
+
 // Interrupt lines struct
 typedef struct packed {
   logic        irq_software;

rtl/riscv_cs_registers.sv

@@ -277,7 +277,6 @@ module riscv_cs_registers
   Interrupts_t mip;
   Masked_Interrupts_t mie_q, mie_n;
 
-
   logic is_irq;
   PrivLvl_t priv_lvl_n, priv_lvl_q, priv_lvl_reg_q;
   Pmp_t pmp_reg_q, pmp_reg_n;
@@ -984,36 +983,36 @@ end //PULP_SECURE
     // TODO abet insert nmi_mode_q? 
     if (mip.irq_nmi) begin
       // EXC_CAUSE_IRQ_NM
-      irq_id_o    = {5'd31};
+      irq_id_o    = NMI_IRQ_ID;
 
     end else if(mip.irq_fast != '0)
     begin
-      if      (mip.irq_fast[14]) irq_id_o = 5'd30;
-      else if (mip.irq_fast[13]) irq_id_o = 5'd29;
-      else if (mip.irq_fast[12]) irq_id_o = 5'd28;
-      else if (mip.irq_fast[11]) irq_id_o = 5'd27;
-      else if (mip.irq_fast[10]) irq_id_o = 5'd26;
-      else if (mip.irq_fast[ 9]) irq_id_o = 5'd25; 
-      else if (mip.irq_fast[ 8]) irq_id_o = 5'd24; 
-      else if (mip.irq_fast[ 7]) irq_id_o = 5'd23; 
-      else if (mip.irq_fast[ 6]) irq_id_o = 5'd22; 
-      else if (mip.irq_fast[ 5]) irq_id_o = 5'd21;
-      else if (mip.irq_fast[ 4]) irq_id_o = 5'd20;
-      else if (mip.irq_fast[ 3]) irq_id_o = 5'd19;
-      else if (mip.irq_fast[ 2]) irq_id_o = 5'd18;
-      else if (mip.irq_fast[ 1]) irq_id_o = 5'd17;
-      else                       irq_id_o = 5'd16;
+      if      (mip.irq_fast[14]) irq_id_o = FAST14_IRQ_ID;
+      else if (mip.irq_fast[13]) irq_id_o = FAST13_IRQ_ID;
+      else if (mip.irq_fast[12]) irq_id_o = FAST12_IRQ_ID;
+      else if (mip.irq_fast[11]) irq_id_o = FAST11_IRQ_ID;
+      else if (mip.irq_fast[10]) irq_id_o = FAST10_IRQ_ID;
+      else if (mip.irq_fast[ 9]) irq_id_o = FAST9_IRQ_ID; 
+      else if (mip.irq_fast[ 8]) irq_id_o = FAST8_IRQ_ID; 
+      else if (mip.irq_fast[ 7]) irq_id_o = FAST7_IRQ_ID; 
+      else if (mip.irq_fast[ 6]) irq_id_o = FAST6_IRQ_ID; 
+      else if (mip.irq_fast[ 5]) irq_id_o = FAST5_IRQ_ID;
+      else if (mip.irq_fast[ 4]) irq_id_o = FAST4_IRQ_ID;
+      else if (mip.irq_fast[ 3]) irq_id_o = FAST3_IRQ_ID;
+      else if (mip.irq_fast[ 2]) irq_id_o = FAST2_IRQ_ID;
+      else if (mip.irq_fast[ 1]) irq_id_o = FAST1_IRQ_ID;
+      else                       irq_id_o = FAST0_IRQ_ID;
     end else if (mip.irq_external) begin
       // EXC_CAUSE_IRQ_EXTERNAL_M
-      irq_id_o    = {5'd11};
+      irq_id_o    = EXTERNAL_IRQ_ID;
 
     end else if (mip.irq_software) begin
       // EXC_CAUSE_IRQ_SOFTWARE_M;
-      irq_id_o    = {5'd03};
+      irq_id_o    = SOFTWARE_IRQ_ID;
 
     end else begin // mip.irq_timer
       // EXC_CAUSE_IRQ_TIMER_M;
-      irq_id_o    = {5'd07};
+      irq_id_o    = TIMER_IRQ_ID;
     end    
   end
 

tb/core/cobj_dir/Vtb_top_verilator.mk

@@ -0,0 +1,67 @@
+# Verilated -*- Makefile -*-
+# DESCRIPTION: Verilator output: Makefile for building Verilated archive or executable
+#
+# Execute this makefile from the object directory:
+#    make -f Vtb_top_verilator.mk
+
+default: Vtb_top_verilator
+
+### Constants...
+# Perl executable (from $PERL)
+PERL = perl
+# Path to Verilator kit (from $VERILATOR_ROOT)
+VERILATOR_ROOT = /usr/pack/verilator-4.024-af/linux-x64/share/verilator
+# SystemC include directory with systemc.h (from $SYSTEMC_INCLUDE)
+SYSTEMC_INCLUDE ?= 
+# SystemC library directory with libsystemc.a (from $SYSTEMC_LIBDIR)
+SYSTEMC_LIBDIR ?= 
+
+### Switches...
+# SystemC output mode?  0/1 (from --sc)
+VM_SC = 0
+# Legacy or SystemC output mode?  0/1 (from --sc)
+VM_SP_OR_SC = $(VM_SC)
+# Deprecated
+VM_PCLI = 1
+# Deprecated: SystemC architecture to find link library path (from $SYSTEMC_ARCH)
+VM_SC_TARGET_ARCH = linux
+
+### Vars...
+# Design prefix (from --prefix)
+VM_PREFIX = Vtb_top_verilator
+# Module prefix (from --prefix)
+VM_MODPREFIX = Vtb_top_verilator
+# User CFLAGS (from -CFLAGS on Verilator command line)
+VM_USER_CFLAGS = \
+	-std=gnu++11 -O2 \
+
+# User LDLIBS (from -LDFLAGS on Verilator command line)
+VM_USER_LDLIBS = \
+
+# User .cpp files (from .cpp's on Verilator command line)
+VM_USER_CLASSES = \
+	tb_top_verilator \
+
+# User .cpp directories (from .cpp's on Verilator command line)
+VM_USER_DIR = \
+	. \
+
+
+### Default rules...
+# Include list of all generated classes
+include Vtb_top_verilator_classes.mk
+# Include global rules
+include $(VERILATOR_ROOT)/include/verilated.mk
+
+### Executable rules... (from --exe)
+VPATH += $(VM_USER_DIR)
+
+tb_top_verilator.o: tb_top_verilator.cpp
+	$(OBJCACHE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(OPT_FAST) -c -o $@ $<
+
+### Link rules... (from --exe)
+Vtb_top_verilator: $(VK_USER_OBJS) $(VK_GLOBAL_OBJS) $(VM_PREFIX)__ALL.a
+	$(LINK) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ $(LIBS) $(SC_LIBS)
+
+
+# Verilated -*- Makefile -*-

tb/core/cobj_dir/Vtb_top_verilator__ALLcls.cpp

@@ -0,0 +1,4 @@
+// DESCRIPTION: Generated by verilator_includer via makefile
+#define VL_INCLUDE_OPT include
+#include "Vtb_top_verilator.cpp"
+#include "Vtb_top_verilator___024unit.cpp"

tb/core/cobj_dir/Vtb_top_verilator__ALLcls.d

@@ -0,0 +1,11 @@
+Vtb_top_verilator__ALLcls.o: Vtb_top_verilator__ALLcls.cpp \
+ Vtb_top_verilator.cpp Vtb_top_verilator.h \
+ /usr/pack/verilator-4.024-af/linux-x64/share/verilator/include/verilated_heavy.h \
+ /usr/pack/verilator-4.024-af/linux-x64/share/verilator/include/verilated.h \
+ /usr/pack/verilator-4.024-af/linux-x64/share/verilator/include/verilatedos.h \
+ Vtb_top_verilator__Dpi.h \
+ /usr/pack/verilator-4.024-af/linux-x64/share/verilator/include/vltstd/svdpi.h \
+ Vtb_top_verilator__Syms.h Vtb_top_verilator___024unit.h \
+ /usr/pack/verilator-4.024-af/linux-x64/share/verilator/include/verilated_dpi.h \
+ /usr/pack/verilator-4.024-af/linux-x64/share/verilator/include/verilated_sym_props.h \
+ Vtb_top_verilator___024unit.cpp

tb/core/cobj_dir/Vtb_top_verilator__ALLsup.cpp

@@ -0,0 +1,4 @@
+// DESCRIPTION: Generated by verilator_includer via makefile
+#define VL_INCLUDE_OPT include
+#include "Vtb_top_verilator__Dpi.cpp"
+#include "Vtb_top_verilator__Syms.cpp"

tb/core/cobj_dir/Vtb_top_verilator__ALLsup.d

@@ -0,0 +1,9 @@
+Vtb_top_verilator__ALLsup.o: Vtb_top_verilator__ALLsup.cpp \
+ Vtb_top_verilator__Dpi.cpp Vtb_top_verilator__Dpi.h \
+ /usr/pack/verilator-4.024-af/linux-x64/share/verilator/include/vltstd/svdpi.h \
+ Vtb_top_verilator.h \
+ /usr/pack/verilator-4.024-af/linux-x64/share/verilator/include/verilated_heavy.h \
+ /usr/pack/verilator-4.024-af/linux-x64/share/verilator/include/verilated.h \
+ /usr/pack/verilator-4.024-af/linux-x64/share/verilator/include/verilatedos.h \
+ Vtb_top_verilator__Syms.cpp Vtb_top_verilator__Syms.h \
+ Vtb_top_verilator___024unit.h

tb/core/cobj_dir/Vtb_top_verilator__Dpi.cpp

@@ -0,0 +1,32 @@
+// Verilated -*- C++ -*-
+// DESCRIPTION: Verilator output: Implementation of DPI export functions.
+//
+// Verilator compiles this file in when DPI functions are used.
+// If you have multiple Verilated designs with the same DPI exported
+// function names, you will get multiple definition link errors from here.
+// This is an unfortunate result of the DPI specification.
+// To solve this, either
+//    1. Call Vtb_top_verilator::{export_function} instead,
+//       and do not even bother to compile this file
+// or 2. Compile all __Dpi.cpp files in the same compiler run,
+//       and #ifdefs already inserted here will sort everything out.
+
+#include "Vtb_top_verilator__Dpi.h"
+#include "Vtb_top_verilator.h"
+
+#ifndef _VL_DPIDECL_read_byte
+#define _VL_DPIDECL_read_byte
+int read_byte(const svLogicVecVal* byte_addr) {
+    // DPI export at dp_ram.sv:72
+    return Vtb_top_verilator::read_byte(byte_addr);
+}
+#endif
+
+#ifndef _VL_DPIDECL_write_byte
+#define _VL_DPIDECL_write_byte
+void write_byte(const svLogicVecVal* byte_addr, const svLogicVecVal* val, svLogicVecVal* other) {
+    // DPI export at dp_ram.sv:76
+    return Vtb_top_verilator::write_byte(byte_addr, val, other);
+}
+#endif
+

tb/core/cobj_dir/Vtb_top_verilator__Dpi.h

@@ -0,0 +1,23 @@
+// Verilated -*- C++ -*-
+// DESCRIPTION: Verilator output: Prototypes for DPI import and export functions.
+//
+// Verilator includes this file in all generated .cpp files that use DPI functions.
+// Manually include this file where DPI .c import functions are declared to insure
+// the C functions match the expectations of the DPI imports.
+
+#include "svdpi.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+    // DPI EXPORTS
+    // DPI export at dp_ram.sv:72
+    extern int read_byte(const svLogicVecVal* byte_addr);
+    // DPI export at dp_ram.sv:76
+    extern void write_byte(const svLogicVecVal* byte_addr, const svLogicVecVal* val, svLogicVecVal* other);
+
+#ifdef __cplusplus
+}
+#endif

tb/core/cobj_dir/Vtb_top_verilator__Syms.cpp

@@ -0,0 +1,31 @@
+// Verilated -*- C++ -*-
+// DESCRIPTION: Verilator output: Symbol table implementation internals
+
+#include "Vtb_top_verilator__Syms.h"
+#include "Vtb_top_verilator.h"
+#include "Vtb_top_verilator___024unit.h"
+
+
+
+// FUNCTIONS
+Vtb_top_verilator__Syms::Vtb_top_verilator__Syms(Vtb_top_verilator* topp, const char* namep)
+    // Setup locals
+    : __Vm_namep(namep)
+    , __Vm_didInit(false)
+    // Setup submodule names
+{
+    // Pointer to top level
+    TOPp = topp;
+    // Setup each module's pointers to their submodules
+    // Setup each module's pointer back to symbol table (for public functions)
+    TOPp->__Vconfigure(this, true);
+    // Setup scopes
+    __Vscope_tb_top_verilator__riscv_wrapper_i__ram_i.configure(this, name(), "tb_top_verilator.riscv_wrapper_i.ram_i", "ram_i", VerilatedScope::SCOPE_OTHER);
+    __Vscope_tb_top_verilator__riscv_wrapper_i__ram_i__dp_ram_i.configure(this, name(), "tb_top_verilator.riscv_wrapper_i.ram_i.dp_ram_i", "dp_ram_i", VerilatedScope::SCOPE_OTHER);
+    __Vscope_tb_top_verilator__riscv_wrapper_i__ram_i__read_mux.configure(this, name(), "tb_top_verilator.riscv_wrapper_i.ram_i.read_mux", "read_mux", VerilatedScope::SCOPE_OTHER);
+    // Setup export functions
+    for (int __Vfinal=0; __Vfinal<2; __Vfinal++) {
+        __Vscope_tb_top_verilator__riscv_wrapper_i__ram_i__dp_ram_i.exportInsert(__Vfinal, "read_byte", (void*)(&Vtb_top_verilator::__Vdpiexp_tb_top_verilator__DOT__riscv_wrapper_i__DOT__ram_i__DOT__dp_ram_i__DOT__read_byte_TOP));
+        __Vscope_tb_top_verilator__riscv_wrapper_i__ram_i__dp_ram_i.exportInsert(__Vfinal, "write_byte", (void*)(&Vtb_top_verilator::__Vdpiexp_tb_top_verilator__DOT__riscv_wrapper_i__DOT__ram_i__DOT__dp_ram_i__DOT__write_byte_TOP));
+    }
+}

tb/core/cobj_dir/Vtb_top_verilator__Syms.h

@@ -0,0 +1,45 @@
+// Verilated -*- C++ -*-
+// DESCRIPTION: Verilator output: Symbol table internal header
+//
+// Internal details; most calling programs do not need this header,
+// unless using verilator public meta comments.
+
+#ifndef _Vtb_top_verilator__Syms_H_
+#define _Vtb_top_verilator__Syms_H_
+
+#include "verilated_heavy.h"
+
+// INCLUDE MODULE CLASSES
+#include "Vtb_top_verilator.h"
+#include "Vtb_top_verilator___024unit.h"
+
+// DPI TYPES for DPI Export callbacks (Internal use)
+typedef void (*Vtb_top_verilator__Vcb_read_byte_t) (Vtb_top_verilator__Syms* __restrict vlSymsp, const IData/*21:0*/ byte_addr, IData/*31:0*/(&  read_byte__Vfuncrtn));
+typedef void (*Vtb_top_verilator__Vcb_write_byte_t) (Vtb_top_verilator__Syms* __restrict vlSymsp, const IData/*31:0*/ byte_addr, const CData/*7:0*/ val, CData/*7:0*/(&  other));
+
+// SYMS CLASS
+class Vtb_top_verilator__Syms : public VerilatedSyms {
+  public:
+
+    // LOCAL STATE
+    const char* __Vm_namep;
+    bool __Vm_didInit;
+
+    // SUBCELL STATE
+    Vtb_top_verilator*             TOPp;
+
+    // SCOPE NAMES
+    VerilatedScope __Vscope_tb_top_verilator__riscv_wrapper_i__ram_i;
+    VerilatedScope __Vscope_tb_top_verilator__riscv_wrapper_i__ram_i__dp_ram_i;
+    VerilatedScope __Vscope_tb_top_verilator__riscv_wrapper_i__ram_i__read_mux;
+
+    // CREATORS
+    Vtb_top_verilator__Syms(Vtb_top_verilator* topp, const char* namep);
+    ~Vtb_top_verilator__Syms() {}
+
+    // METHODS
+    inline const char* name() { return __Vm_namep; }
+
+} VL_ATTR_ALIGNED(64);
+
+#endif  // guard

tb/core/cobj_dir/Vtb_top_verilator___024unit.cpp

@@ -0,0 +1,36 @@
+// Verilated -*- C++ -*-
+// DESCRIPTION: Verilator output: Design implementation internals
+// See Vtb_top_verilator.h for the primary calling header
+
+#include "Vtb_top_verilator___024unit.h"
+#include "Vtb_top_verilator__Syms.h"
+
+#include "verilated_dpi.h"
+
+
+//--------------------
+// STATIC VARIABLES
+
+
+//--------------------
+
+VL_CTOR_IMP(Vtb_top_verilator___024unit) {
+    // Reset internal values
+    // Reset structure values
+    _ctor_var_reset();
+}
+
+void Vtb_top_verilator___024unit::__Vconfigure(Vtb_top_verilator__Syms* vlSymsp, bool first) {
+    if (0 && first) {}  // Prevent unused
+    this->__VlSymsp = vlSymsp;
+}
+
+Vtb_top_verilator___024unit::~Vtb_top_verilator___024unit() {
+}
+
+//--------------------
+// Internal Methods
+
+void Vtb_top_verilator___024unit::_ctor_var_reset() {
+    VL_DEBUG_IF(VL_DBG_MSGF("+        Vtb_top_verilator___024unit::_ctor_var_reset\n"); );
+}