Merge pull request #58 from vidas/erbium-cosim-experiments

[sw-sysemu]: Changes to run sysemu within cosim context

Author: glguida

sw-sysemu/emu-er.mk

@@ -0,0 +1,90 @@
+# Copyright (c) 2026 Ainekko, Co.
+# SPDX-License-Identifier: Apache-2.0
+
+# Headers
+emu_hdrs := \
+	atomics.h \
+	cache.h \
+	csrs.h \
+	decode.h \
+	devices/DW_apb_timers.h \
+	devices/cru.h \
+	devices/efuse.h \
+	devices/i2c.h \
+	devices/plic_dev.h \
+	devices/plic_er.h \
+	devices/pll.h \
+	devices/rvtimer.h \
+	devices/spi.h \
+	devices/sysregs_er.h \
+	devices/uart.h \
+	devices/watchdog.h \
+	emu_defines.h \
+	emu_gio.h \
+	esrs.h \
+	gold.h \
+	insn.h \
+	insn_func.h \
+	insn_util.h \
+	literals.h \
+	memmap.h \
+	memory/dense_region.h \
+	memory/dump_data.h \
+	memory/main_memory.h \
+	memory/memory_error.h \
+	memory/memory_region.h \
+	memory/scratch_region.h \
+	memory/sparse_region.h \
+	memory/sysreg_region.h \
+	mmu.h \
+	processor.h \
+	state.h \
+	support/intrusive/detail/member_pointer.h \
+	support/intrusive/list.h \
+	support/lazy_array.h \
+	sysreg_error.h \
+	system.h \
+	tensor.h \
+	traps.h \
+	utility.h
+
+# Sources
+emu_cpp_srcs := \
+	agent.cpp \
+	debugmodule.cpp \
+	devices/sysregs_er.cpp \
+	emu_gio.cpp \
+	esrs_er.cpp \
+	flb.cpp \
+	gold.cpp \
+	insns/arith.cpp \
+	insns/arith_atomic.cpp \
+	insns/arith_graphics.cpp \
+	insns/arith_loadstore.cpp \
+	insns/branch.cpp \
+	insns/c_arith.cpp \
+	insns/c_branch.cpp \
+	insns/c_loadstore.cpp \
+	insns/cache_control.cpp \
+	insns/coherent_arith_loadstore.cpp \
+	insns/coherent_packed_loadstore.cpp \
+	insns/float.cpp \
+	insns/float_loadstore.cpp \
+	insns/muldiv.cpp \
+	insns/packed_arith.cpp \
+	insns/packed_atomic.cpp \
+	insns/packed_float.cpp \
+	insns/packed_graphics.cpp \
+	insns/packed_loadstore.cpp \
+	insns/packed_mask.cpp \
+	insns/packed_trans.cpp \
+	insns/system.cpp \
+	insns/tensors.cpp \
+	insns/zicsr.cpp \
+	insns/zifencei.cpp \
+	memory/main_memory.cpp \
+	mmu.cpp \
+	msgport.cpp \
+	pma_er.cpp \
+	processor.cpp \
+	system.cpp

sw-sysemu/emu.mk sw-sysemu/emu-et.mksw-sysemu/emu.mk renamed to sw-sysemu/emu-et.mk

@@ -1,6 +1,7 @@
-# Copyright (c) 2025 Ainekko, Co.
+# Copyright (c) 2026 Ainekko, Co.
 # SPDX-License-Identifier: Apache-2.0
 
+# Headers
 emu_hdrs := \
 	atomics.h \
 	cache.h \
@@ -16,7 +17,9 @@ emu_hdrs := \
 	devices/pcie_esr.h \
 	devices/pcie_nopcie_esr.h \
 	devices/pcie_usr_esr.h \
-	devices/plic.h \
+	devices/plic_dev.h \
+	devices/plic_pu.h \
+	devices/plic_sp.h \
 	devices/pll.h \
 	devices/rvtimer.h \
 	devices/shire_lpddr.h \
@@ -53,13 +56,14 @@ emu_hdrs := \
 	traps.h \
 	utility.h
 
+# Sources
 emu_cpp_srcs := \
 	agent.cpp \
 	debugmodule.cpp \
 	devices/pcie_dma.cpp \
 	devices/spio_misc_region.cpp \
 	emu_gio.cpp \
-	esrs.cpp \
+	esrs_et.cpp \
 	flb.cpp \
 	gold.cpp \
 	insns/arith.cpp \
@@ -90,5 +94,6 @@ emu_cpp_srcs := \
 	memory/main_memory.cpp \
 	mmu.cpp \
 	msgport.cpp \
+	pma_et.cpp \
 	processor.cpp \
 	system.cpp

sw-sysemu/emu_gio.cpp

@@ -26,7 +26,9 @@ void lprintf(logLevel level, const Agent& agent, const char* fmt, ...)
     auto& logger = agent.chip->log;
     logger << level << "[" << agent.name() << "] " << lbuf << endm;
 
+#ifdef SYS_EMU
     logger.dumpTraceBufferIfFatal(agent);
+#endif
 }
 
 } // namespace bemu

sw-sysemu/esrs.h

@@ -23,39 +23,39 @@ namespace bemu {
 //   bits 21-0: address within ESR space
 
 // ESR region 'pp' field in bits [23:22] - used by pma_et.cpp
-#define ESR_REGION_PROT_MASK    0x00C0'0000ull
+#define ESR_REGION_PROT_MASK    0x00C00000ull
 #define ESR_REGION_PROT_SHIFT   22
 
 // Base address and size of ESR region - used by memory/sysreg_region.h
 // Base: bit 31 = 1, all else = 0 -> 0x80000000
 // Size: 24 bits of address space (including PP) -> 0x01000000 (16MB)
-#define ESR_REGION_BASE         0x8000'0000ull
-#define ESR_REGION_SIZE         0x0100'0000ull
+#define ESR_REGION_BASE         0x80000000ull
+#define ESR_REGION_SIZE         0x01000000ull
 
 // Hart ESR addresses used by processor.cpp for debug/program buffer
 // Base 0x80000000 + PP=2 (debug) at bits 23:22 (0x00800000) + offset
-#define ESR_AXPROGBUF0          0x8080'07A0ull
-#define ESR_AXPROGBUF1          0x8080'07A8ull
-#define ESR_NXPROGBUF0          0x8080'07B0ull
-#define ESR_NXPROGBUF1          0x8080'07B8ull
-#define ESR_ABSCMD              0x8080'07C0ull
+#define ESR_AXPROGBUF0          0x808007A0ull
+#define ESR_AXPROGBUF1          0x808007A8ull
+#define ESR_NXPROGBUF0          0x808007B0ull
+#define ESR_NXPROGBUF1          0x808007B8ull
+#define ESR_ABSCMD              0x808007C0ull
 
 #elif EMU_ETSOC1
 
 // ESR region 'pp' field in bits [31:30] - used by pma_et.cpp
-#define ESR_REGION_PROT_MASK    0x00'C000'0000ull
+#define ESR_REGION_PROT_MASK    0x00C0000000ull
 #define ESR_REGION_PROT_SHIFT   30
 
 // Base address and size of ESR region - used by memory/sysreg_region.h
-#define ESR_REGION_BASE         0x01'0000'0000ull
-#define ESR_REGION_SIZE         0x01'0000'0000ull
+#define ESR_REGION_BASE         0x0100000000ull
+#define ESR_REGION_SIZE         0x0100000000ull
 
 // Hart ESR addresses used by processor.cpp for debug/program buffer
-#define ESR_AXPROGBUF0          0x01'8000'07A0ull
-#define ESR_AXPROGBUF1          0x01'8000'07A8ull
-#define ESR_NXPROGBUF0          0x01'8000'07B0ull
-#define ESR_NXPROGBUF1          0x01'8000'07B8ull
-#define ESR_ABSCMD              0x01'8000'07C0ull
+#define ESR_AXPROGBUF0          0x01800007A0ull
+#define ESR_AXPROGBUF1          0x01800007A8ull
+#define ESR_NXPROGBUF0          0x01800007B0ull
+#define ESR_NXPROGBUF1          0x01800007B8ull
+#define ESR_ABSCMD              0x01800007C0ull
 
 #endif