test commit

.gitattributes

@@ -0,0 +1 @@
+third-party/** linguist-vendored

src/Makefile

@@ -133,8 +133,8 @@ ifeq ($(slirp),yes)
 # Workaround for building with macports lua-luarocks installation
 machine.o: INCS+=$(SLIRP_INC)
 machine.clang-tidy: INCS+=$(SLIRP_INC)
-virtio-net-carrier-slirp.o: INCS+=$(SLIRP_INC)
-virtio-net-carrier-slirp.clang-tidy: INCS+=$(SLIRP_INC)
+virtio-net-user-address-range.o: INCS+=$(SLIRP_INC)
+virtio-net-user-address-range.clang-tidy: INCS+=$(SLIRP_INC)
 #INCS+=$(SLIRP_INC)
 LIBCARTESI_COMMON_LIBS+=$(SLIRP_LIB)
 else
@@ -345,48 +345,39 @@ c-api: $(LIBCARTESI) $(LIBCARTESI_MERKLE_TREE) $(LIBCARTESI_JSONRPC)
 .PHONY: all generate use clean lint format format-lua check-format check-format-lua luacartesi hash c-api compile_flags.txt
 
 LIBCARTESI_OBJS:= \
-	pma-driver.o \
-	clint.o \
-	clint-factory.o \
-	plic.o \
-	plic-factory.o \
-	virtio-factory.o \
-	virtio-device.o \
-	virtio-console.o \
-	virtio-p9fs.o \
-	virtio-net.o \
-	virtio-net-carrier-tuntap.o \
-	virtio-net-carrier-slirp.o \
-	dtb.o \
-	os.o \
-	htif.o \
-	htif-factory.o \
-	shadow-state.o \
-	shadow-state-factory.o \
-	shadow-pmas-factory.o \
-	shadow-tlb.o \
-	shadow-tlb-factory.o \
-	shadow-uarch-state.o \
-	shadow-uarch-state-factory.o \
-	pma.o \
-	machine.o \
-	machine-config.o \
-	json-util.o \
 	base64.o \
+	clint-address-range.o \
+	dtb.o \
+	htif-address-range.o \
 	interpret.o \
-	virtual-machine.o \
-	sha3.o \
+	json-util.o \
+	machine-c-api.o \
+	machine-config.o \
 	machine-merkle-tree.o \
+	machine.o \
+	memory-address-range.o \
+	os.o \
+	plic-address-range.o \
 	pristine-merkle-tree.o \
-	machine-c-api.o \
+	replay-step-state-access-interop.o \
+	send-cmio-response.o \
+	sha3.o \
+	shadow-state-address-range.o \
+	shadow-tlb-address-range.o \
+	shadow-uarch-state-address-range.o \
+	uarch-pristine-hash.o \
 	uarch-pristine-ram.o \
 	uarch-pristine-state-hash.o \
-	uarch-pristine-hash.o \
-    uarch-interpret.o \
-	uarch-step.o \
 	uarch-reset-state.o \
-	send-cmio-response.o \
-	replay-step-state-access-interop.o
+	uarch-step.o \
+	virtual-machine.o \
+	uarch-interpret.o \
+	virtio-address-range.o \
+	virtio-console-address-range.o \
+	virtio-p9fs-address-range.o \
+	virtio-net-address-range.o \
+	virtio-net-tuntap-address-range.o \
+	virtio-net-user-address-range.o
 
 CARTESI_CLUA_OBJS:= \
 	clua.o \

src/machine-memory-range-descr.h → src/address-range-description.h

@@ -14,24 +14,24 @@
 // with this program (see COPYING). If not, see <https://www.gnu.org/licenses/>.
 //
 
-#ifndef MACHINE_MEMORY_RANGE_DESCR_H
-#define MACHINE_MEMORY_RANGE_DESCR_H
+#ifndef ADDRESS_RANGE_DESCRIPTION_H
+#define ADDRESS_RANGE_DESCRIPTION_H
 
 #include <cstdint>
 #include <string>
 #include <vector>
 
 namespace cartesi {
 
-/// \brief Description of memory range used for introspection (i.e., get_memory_ranges())
-struct machine_memory_range_descr {
+/// \brief Description of an address range used for introspection (i.e., get_address_ranges())
+struct address_range_description {
     uint64_t start = 0;      ///< Start of memory range
     uint64_t length = 0;     ///< Length of memory range
     std::string description; ///< User-friendly description for memory range
 };
 
-/// \brief List of memory range descriptions used for introspection (i.e., get_memory_ranges())
-using machine_memory_range_descrs = std::vector<machine_memory_range_descr>;
+/// \brief List of address range descriptions used for introspection (i.e., get_address_ranges())
+using address_range_descriptions = std::vector<address_range_description>;
 
 } // namespace cartesi