From bd2b67961e5da850043d03ed9ec8e73f042cd211 Mon Sep 17 00:00:00 2001
From: mole99 <leomoser99@gmail.com>
Date: Mon, 14 Aug 2023 15:31:33 +0200
Subject: [PATCH 1/2] Connect nodes with vvp_fun_modpath_src always to head of
 list

---
 vvp/vvp_net.cc | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/vvp/vvp_net.cc b/vvp/vvp_net.cc
index 028bdde71..4ac71fefa 100644
--- a/vvp/vvp_net.cc
+++ b/vvp/vvp_net.cc
@@ -199,8 +199,38 @@ vvp_net_t::vvp_net_t()
 void vvp_net_t::link(vvp_net_ptr_t port_to_link)
 {
       vvp_net_t*net = port_to_link.ptr();
-      net->port[port_to_link.port()] = out_;
-      out_ = port_to_link;
+
+      // Connect nodes with vvp_fun_modpath_src to the head of the
+      // linked list, so that vvp_fun_modpath_src are always evaluated
+      // before their respective vvp_fun_modpath
+      if (dynamic_cast<vvp_fun_modpath_src*>(net->fun))
+      {
+	      net->port[port_to_link.port()] = out_;
+	      out_ = port_to_link;
+      }
+      // All other nodes connect to the tail of the linked list
+      else
+      {
+	      // List is empty, just point to port_to_link
+	      if (out_.ptr() == nullptr)
+	      {
+		      out_ = port_to_link;
+		      net->port[port_to_link.port()] = vvp_net_ptr_t(nullptr,0);
+		      return;
+	      }
+
+	      vvp_net_ptr_t cur = out_;
+
+	      // Traverse through linked list
+	      while (cur.ptr()->port[cur.port()].ptr())
+	      {
+		      cur = cur.ptr()->port[cur.port()];
+	      }
+
+	      // Connect to the tail of list
+	      cur.ptr()->port[cur.port()] = port_to_link;
+	      net->port[port_to_link.port()] = vvp_net_ptr_t(nullptr,0);
+      }
 }
 
 /*

From 5a87d2fa38e61d358f30abd659ef39d984754b4b Mon Sep 17 00:00:00 2001
From: mole99 <leomoser99@gmail.com>
Date: Tue, 15 Aug 2023 10:18:12 +0200
Subject: [PATCH 2/2] Keep the order of other nodes

---
 vvp/vvp_net.cc | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/vvp/vvp_net.cc b/vvp/vvp_net.cc
index 4ac71fefa..a5a2ed870 100644
--- a/vvp/vvp_net.cc
+++ b/vvp/vvp_net.cc
@@ -208,28 +208,34 @@ void vvp_net_t::link(vvp_net_ptr_t port_to_link)
 	      net->port[port_to_link.port()] = out_;
 	      out_ = port_to_link;
       }
-      // All other nodes connect to the tail of the linked list
+      // All other nodes connect after the last vvp_fun_modpath_src
       else
       {
-	      // List is empty, just point to port_to_link
-	      if (out_.ptr() == nullptr)
+	      // List is empty or first node has no vvp_fun_modpath_src
+	      // then just insert the node into the head of linked list
+	      if (out_.ptr() == nullptr || ! dynamic_cast<vvp_fun_modpath_src*>(out_.ptr()->fun))
 	      {
+		      net->port[port_to_link.port()] = out_;
 		      out_ = port_to_link;
-		      net->port[port_to_link.port()] = vvp_net_ptr_t(nullptr,0);
 		      return;
 	      }
 
 	      vvp_net_ptr_t cur = out_;
+	      vvp_net_ptr_t prev = vvp_net_ptr_t(nullptr,0);
 
 	      // Traverse through linked list
-	      while (cur.ptr()->port[cur.port()].ptr())
+	      while (dynamic_cast<vvp_fun_modpath_src*>(cur.ptr()->fun))
 	      {
+		      prev = cur;
 		      cur = cur.ptr()->port[cur.port()];
+		      if (!cur.ptr()) break; // End of list
 	      }
 
-	      // Connect to the tail of list
-	      cur.ptr()->port[cur.port()] = port_to_link;
-	      net->port[port_to_link.port()] = vvp_net_ptr_t(nullptr,0);
+	      assert(prev.ptr());
+
+	      // Insert after last vvp_fun_modpath_src (or end of list)
+	      net->port[port_to_link.port()] = cur;
+	      prev.ptr()->port[prev.port()] = port_to_link;
       }
 }