dut: move trap values to common/dut (#169)

They are used by both Verilator and VCS.
OpenXiangShan · Sep 21, 2023 · 067705f · 067705f
1 parent b42109f
commit 067705f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/test/csrc/common/dut.h b/src/test/csrc/common/dut.h
@@ -33,6 +33,18 @@ class DUT {
 #define simstats_display(s, ...) \
   eprintf(ANSI_COLOR_GREEN s ANSI_COLOR_RESET, ##__VA_ARGS__)
 
+enum {
+  STATE_GOODTRAP = 0,
+  STATE_BADTRAP = 1,
+  STATE_ABORT = 2,
+  STATE_LIMIT_EXCEEDED = 3,
+  STATE_SIG = 4,
+  STATE_AMBIGUOUS = 5,
+  STATE_SIM_EXIT = 6,
+  STATE_FUZZ_COND = 7,
+  STATE_RUNNING = -1
+};
+
 enum class SimExitCode {
   good_trap,
   exceed_limit,

diff --git a/src/test/csrc/difftest/difftest.cpp b/src/test/csrc/difftest/difftest.cpp
@@ -16,6 +16,7 @@
 
 #include "difftest.h"
 #include "difftrace.h"
+#include "dut.h"
 #include "goldenmem.h"
 #include "ram.h"
 #include "flash.h"

diff --git a/src/test/csrc/verilator/emu.h b/src/test/csrc/verilator/emu.h
@@ -79,18 +79,6 @@ struct EmuArgs {
   bool image_as_footprints = false;
 };
 
-enum {
-  STATE_GOODTRAP = 0,
-  STATE_BADTRAP = 1,
-  STATE_ABORT = 2,
-  STATE_LIMIT_EXCEEDED = 3,
-  STATE_SIG = 4,
-  STATE_AMBIGUOUS = 5,
-  STATE_SIM_EXIT = 6,
-  STATE_FUZZ_COND = 7,
-  STATE_RUNNING = -1
-};
-
 class Emulator final : public DUT {
 private:
   VSimTop *dut_ptr;