Merge branch 'master' of github.com:FreakyPenguin/endhostsim-code

Makefile

+all: \
+	corundum/corundum_verilator \
+	corundum_bm/corundum_bm \
+	net_tap/net_tap \
+	net_wire/net_wire
+
+clean:
+	make -C corundum/ clean
+	make -C corundum_bm/ clean
+	make -C net_tap/ clean
+	make -C net_wire/ clean
+	make -C nicsim_common/ clean
+	make -C netsim_common/ clean
+
+corundum/corundum_verilator: nicsim_common/libnicsim_common.a
+	make -C corundum/ all
+
+corundum_bm/corundum_bm: nicsim_common/libnicsim_common.a
+	make -C corundum_bm/ all
+
+net_tap/net_tap: netsim_common/libnetsim_common.a
+	make -C net_tap/
+
+net_wire/net_wire: netsim_common/libnetsim_common.a
+	make -C net_wire/
+
+nicsim_common/libnicsim_common.a:
+	make -C nicsim_common/
+
+netsim_common/libnetsim_common.a:
+	make -C netsim_common/

corundum/Makefile

@@ -7,16 +7,20 @@ VFLAGS = +1364-2005ext+v \
 
 SRCS = corundum_verilator.cpp dma.cpp mem.cpp
 
+
+mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
+BASEDIR := $(abspath $(dir $(mkfile_path))/../)
+
 all: corundum_verilator
 
 obj_dir/Vinterface.cpp: rtl/interface.v
 	$(VERILATOR) $(VFLAGS) --cc -O3 \
-	    -CFLAGS "-I$(PWD)/../nicsim_common/include -I$(PWD)/../proto -O3 -g -Wall" \
+	    -CFLAGS "-I$(BASEDIR)/nicsim_common/include -I$(BASEDIR)/proto -O3 -g -Wall" \
 	    -y rtl \
 	    -y lib/axi/rtl \
 	    -y lib/eth/lib/axis/rtl/ \
 	    -y ./lib/pcie/rtl \
-	    rtl/interface.v --exe $(SRCS) "$(PWD)/../nicsim_common/libnicsim_common.a"
+	    rtl/interface.v --exe $(SRCS) "$(BASEDIR)/nicsim_common/libnicsim_common.a"
 
 obj_dir/Vinterface: obj_dir/Vinterface.cpp $(SRCS)
 	 $(MAKE) -C obj_dir -f Vinterface.mk

proto/cosim_eth_proto.h

@@ -58,20 +58,25 @@ struct cosim_eth_proto_net_intro {
 #define COSIM_ETH_PROTO_D2N_MSG_SEND 0x2
 
 struct cosim_eth_proto_d2n_dummy {
-    uint8_t pad[63];
+    uint8_t pad[48];
+    uint64_t timestamp;
+    uint8_t pad_[7];
     uint8_t own_type;
 } __attribute__((packed));
 
 struct cosim_eth_proto_d2n_sync {
+    uint8_t pad[48];
     uint64_t timestamp;
-    uint8_t pad[55];
+    uint8_t pad_[7];
     uint8_t own_type;
 } __attribute__((packed));
 
 struct cosim_eth_proto_d2n_send {
     uint16_t len;
     uint8_t port;
-    uint8_t pad[60];
+    uint8_t pad[45];
+    uint64_t timestamp;
+    uint8_t pad_[7];
     uint8_t own_type;
     uint8_t data[];
 } __attribute__((packed));
@@ -97,20 +102,25 @@ union cosim_eth_proto_d2n {
 #define COSIM_ETH_PROTO_N2D_MSG_RECV 0x2
 
 struct cosim_eth_proto_n2d_dummy {
-    uint8_t pad[63];
+    uint8_t pad[48];
+    uint64_t timestamp;
+    uint8_t pad_[7];
     uint8_t own_type;
 } __attribute__((packed));
 
 struct cosim_eth_proto_n2d_sync {
+    uint8_t pad[48];
     uint64_t timestamp;
-    uint8_t pad[55];
+    uint8_t pad_[7];
     uint8_t own_type;
 } __attribute__((packed));
 
 struct cosim_eth_proto_n2d_recv {
     uint16_t len;
     uint8_t port;
-    uint8_t pad[60];
+    uint8_t pad[45];
+    uint64_t timestamp;
+    uint8_t pad_[7];
     uint8_t own_type;
     uint8_t data[];
 };