wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename interrupt/exception to raise_interrupt/raise_exception

Browse Source 
Verilator takes issue with a parameter named "interrupt" in DPI calls
This commit is contained in:
Jerry Zhao
2023-02-02 19:07:56 -08:00
parent 043526a855
commit 2968151d24
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
generators/chipyard/src/main/resources/csrc/cospike.cc
View File

@@ -58,8 +58,8 @@ extern "C" void cospike_cosim(long long int cycle,
int valid, int valid,
long long int iaddr, long long int iaddr,
unsigned long int insn, unsigned long int insn,
int exception, int raise_exception,
int interrupt, int raise_interrupt,
unsigned long long int cause, unsigned long long int cause,
unsigned long long int wdata) unsigned long long int wdata)
{ {
@@ -161,7 +161,7 @@ extern "C" void cospike_cosim(long long int cycle,
processor_t* p = sim->get_core(hartid); processor_t* p = sim->get_core(hartid);
state_t* s = p->get_state(); state_t* s = p->get_state();
uint64_t s_pc = s->pc; uint64_t s_pc = s->pc;
if (interrupt) { if (raise_interrupt) {
printf("%d interrupt %lx\n", cycle, cause); printf("%d interrupt %lx\n", cycle, cause);
uint64_t interrupt_cause = cause & 0x7FFFFFFFFFFFFFFF; uint64_t interrupt_cause = cause & 0x7FFFFFFFFFFFFFFF;
if (interrupt_cause == 3) { if (interrupt_cause == 3) {
@@ -170,7 +170,7 @@ extern "C" void cospike_cosim(long long int cycle,
printf("Unknown interrupt %lx\n", interrupt_cause); printf("Unknown interrupt %lx\n", interrupt_cause);
} }
} }
if (exception) if (raise_exception)
printf("%d exception %lx\n", cycle, cause); printf("%d exception %lx\n", cycle, cause);
if (valid) { if (valid) {
printf("%d Cosim: %lx", cycle, iaddr); printf("%d Cosim: %lx", cycle, iaddr);
@@ -179,7 +179,7 @@ extern "C" void cospike_cosim(long long int cycle,
} }
printf("\n"); printf("\n");
} }
if (valid || interrupt || exception) if (valid || raise_interrupt || raise_exception)
p->step(1); p->step(1);
if (valid) { if (valid) {

4
generators/chipyard/src/main/resources/vsrc/cospike.v
View File

@@ -13,8 +13,8 @@ import "DPI-C" function void cospike_cosim(input longint cycle,
input bit valid, input bit valid,
input longint iaddr, input longint iaddr,
input int insn, input int insn,
input bit exception, input bit raise_exception,
input bit interrupt, input bit raise_interrupt,
input longint cause, input longint cause,
input longint wdata input longint wdata
); );