refactor: standardize interrupt signal naming across the codebase

3 files changed, 23 insertions, 23 deletions

diff --git a/rv64cpu/tb/compliance/compliance_runner.cc b/rv64cpu/tb/compliance/compliance_runner.cc
index 5cc4709..b29662a 100644
--- a/rv64cpu/tb/compliance/compliance_runner.cc
+++ b/rv64cpu/tb/compliance/compliance_runner.cc
@@ -306,9 +306,9 @@ bool load_elf64(const std::string& path, ByteMemory* memory, Symbols* symbols) {
 void tick(Vrichard_core* top, ByteMemory* memory) {
     top->imem_rdata = memory->read_u32(top->imem_addr);
     top->dmem_rdata = top->dmem_read_en ? memory->read_u64(top->dmem_addr & ~0x7ULL) : 0;
-    top->ext_timer_int = 0;
-    top->ext_software_int = 0;
-    top->ext_external_int = 0;
+    top->ext_timer_interrupt = 0;
+    top->ext_software_interrupt = 0;
+    top->ext_external_interrupt = 0;
 
     top->clk = 0;
     top->eval();
diff --git a/rv64cpu/tb/core/tb_core.cc b/rv64cpu/tb/core/tb_core.cc
index 39d4f19..b915df4 100644
--- a/rv64cpu/tb/core/tb_core.cc
+++ b/rv64cpu/tb/core/tb_core.cc
@@ -352,17 +352,17 @@ public:
     Vrichard_core* top;
     MemoryModel mem;
     uint64_t sim_time;
-    bool ext_timer_int_level;
-    bool ext_software_int_level;
-    bool ext_external_int_level;
+    bool ext_timer_interrupt_level;
+    bool ext_software_interrupt_level;
+    bool ext_external_interrupt_level;
 #if VM_TRACE
     VerilatedVcdC* tfp;
 #endif
 
     CoreSim() : sim_time(0),
-                ext_timer_int_level(false),
-                ext_software_int_level(false),
-                ext_external_int_level(false) {
+                ext_timer_interrupt_level(false),
+                ext_software_interrupt_level(false),
+                ext_external_interrupt_level(false) {
         top = new Vrichard_core;
 #if VM_TRACE
         Verilated::traceEverOn(true);
@@ -401,9 +401,9 @@ public:
             top->dmem_rdata = 0;
         }
 
-        top->ext_timer_int = ext_timer_int_level;
-        top->ext_software_int = ext_software_int_level;
-        top->ext_external_int = ext_external_int_level;
+        top->ext_timer_interrupt = ext_timer_interrupt_level;
+        top->ext_software_interrupt = ext_software_interrupt_level;
+        top->ext_external_interrupt = ext_external_interrupt_level;
 
         // Rising edge
         top->clk = 0;
@@ -432,9 +432,9 @@ public:
     }
 
     void set_interrupt_lines(bool timer, bool software, bool external) {
-        ext_timer_int_level = timer;
-        ext_software_int_level = software;
-        ext_external_int_level = external;
+        ext_timer_interrupt_level = timer;
+        ext_software_interrupt_level = software;
+        ext_external_interrupt_level = external;
     }
 
     void clear_interrupts() {
diff --git a/rv64cpu/tb/unit/tb_trap_ctrl.cc b/rv64cpu/tb/unit/tb_trap_ctrl.cc
index c57e6da..29d3439 100644
--- a/rv64cpu/tb/unit/tb_trap_ctrl.cc
+++ b/rv64cpu/tb/unit/tb_trap_ctrl.cc
@@ -56,9 +56,9 @@ void drive_defaults(Vtrap_ctrl* dut) {
     dut->trap_bad_addr = 0;
     dut->trap_bad_instr = 0;
 
-    dut->ext_timer_int = 0;
-    dut->ext_software_int = 0;
-    dut->ext_external_int = 0;
+    dut->ext_timer_interrupt = 0;
+    dut->ext_software_interrupt = 0;
+    dut->ext_external_interrupt = 0;
 
     dut->csr_mstatus_mie = 0;
     dut->csr_mtvec = 0x800ULL;
@@ -157,9 +157,9 @@ int main(int argc, char** argv) {
     dut->csr_priv_mode = PRIV_MODE_M;
     dut->csr_mtvec = 0x300ULL | 0x1ULL;  // vectored mode
     dut->wb_pc = 0x4000ULL;
-    dut->ext_timer_int = 1;
-    dut->ext_software_int = 1;
-    dut->ext_external_int = 1;
+    dut->ext_timer_interrupt = 1;
+    dut->ext_software_interrupt = 1;
+    dut->ext_external_interrupt = 1;
     dut->eval();
     const uint64_t expected_vectored_pc = 0x300ULL + (INT_M_EXTERNAL << 2);
     check(dut->trap_trigger, "InterruptPriority_Triggers");
@@ -169,7 +169,7 @@ int main(int argc, char** argv) {
 
     drive_defaults(dut);
     dut->csr_mstatus_mie = 0;
-    dut->ext_external_int = 1;
+    dut->ext_external_interrupt = 1;
     dut->eval();
     check(!dut->trap_trigger, "InterruptMasked_NoTrigger");
 
@@ -179,7 +179,7 @@ int main(int argc, char** argv) {
     dut->csr_stvec = 0x880ULL | 0x1ULL;  // vectored supervisor mode
     dut->csr_mideleg = (1ULL << INT_M_TIMER);
     dut->wb_pc = 0xABCDULL;
-    dut->ext_timer_int = 1;
+    dut->ext_timer_interrupt = 1;
     dut->eval();
     const uint64_t expected_sv_pc = 0x880ULL + (INT_M_TIMER << 2);
     check(dut->trap_to_s_mode, "InterruptDelegation_ToSupervisor");