scope fixes

This commit is contained in:
Blaise Tine
2020-06-09 10:19:28 -04:00
parent 457783322b
commit 1688c65050
3 changed files with 13 additions and 5 deletions

0
driver/tests/basic/kernel.bin Normal file → Executable file
View File

View File

@@ -397,8 +397,16 @@
`define SCOPE_ASSIGN(d,s) assign d = s `define SCOPE_ASSIGN(d,s) assign d = s
`else `else
`define SCOPE_SIGNALS_IO `define SCOPE_SIGNALS_ICACHE_IO
`define SCOPE_SIGNALS_ATTACH `define SCOPE_SIGNALS_DCACHE_IO
`define SCOPE_SIGNALS_DRAM_IO
`define SCOPE_SIGNALS_CORE_IO
`define SCOPE_SIGNALS_ICACHE_ATTACH
`define SCOPE_SIGNALS_DCACHE_ATTACH
`define SCOPE_SIGNALS_DRAM_ATTACH
`define SCOPE_SIGNALS_CORE_ATTACH
`define SCOPE_ASSIGN(d,s) `define SCOPE_ASSIGN(d,s)
`endif `endif

View File

@@ -233,12 +233,12 @@ bool Simulator::run() {
// check riscv-tests PASSED/FAILED status // check riscv-tests PASSED/FAILED status
#if (NUM_CLUSTERS == 1 && NUM_CORES == 1) #if (NUM_CLUSTERS == 1 && NUM_CORES == 1)
int status = (int)vortex_->Vortex_Socket->genblk1__DOT__Vortex_Cluster->genblk1__BRA__0__KET____DOT__vortex_core->back_end->writeback->last_data_wb & 0xf; int status = (int)vortex_->Vortex_Socket->genblk1__DOT__Vortex_Cluster->genblk1__BRA__0__KET____DOT__vortex_core->pipeline->back_end->writeback->last_data_wb & 0xf;
#else #else
#if (NUM_CLUSTERS == 1) #if (NUM_CLUSTERS == 1)
int status = (int)vortex_->Vortex_Socket->genblk1__DOT__Vortex_Cluster->genblk1__BRA__0__KET____DOT__vortex_core->back_end->writeback->last_data_wb & 0xf; int status = (int)vortex_->Vortex_Socket->genblk1__DOT__Vortex_Cluster->genblk1__BRA__0__KET____DOT__vortex_core->pipeline->back_end->writeback->last_data_wb & 0xf;
#else #else
int status = (int)vortex_->Vortex_Socket->genblk2__DOT__genblk1__BRA__0__KET____DOT__Vortex_Cluster->genblk1__BRA__0__KET____DOT__vortex_core->back_end->writeback->last_data_wb & 0xf; int status = (int)vortex_->Vortex_Socket->genblk2__DOT__genblk1__BRA__0__KET____DOT__Vortex_Cluster->genblk1__BRA__0__KET____DOT__vortex_core->pipeline->back_end->writeback->last_data_wb & 0xf;
#endif #endif
#endif #endif