Got a compiling and maybe running

Author: djns1

ODIN_II/SRC/netlist_create_from_ast.cpp

@@ -3140,26 +3140,36 @@ void terminate_registered_assignment(ast_node_t* always_node, signal_list_t* ass
         }
     }
 
-#warning "Oops broke come back fix this"
-//    for (i = 0; i < assignment->count; i++) {
-//        npin_t* pin = assignment->pins[i];
-//        int dependence_variable_position = -1;
-//
-//        if (pin->net->driver_pin) {
-//            ref_string = pin->net->driver_pin->node->name;
-//
-//            for (j = i - 1; j >= 0; j--) {
-//                if (list_dependence_pin[j] && list_dependence_pin[j]->net->driver_pin && list_dependence_type[j] && list_dependence_type[j] == BLOCKING_STATEMENT && strcmp(ref_string, assignment->pins[j]->node->name) == 0) {
-//                    dependence_variable_position = j;
-//                    ref_string = list_dependence_pin[j]->net->driver_pin->node->name;
-//                }
-//            }
-//
-//            if (dependence_variable_position > -1) {
-//                pin->net = list_dependence_pin[dependence_variable_position]->net;
-//            }
-//        }
-//    }
+#warning "Oops this be broke come fix"
+    for (i = 0; i < assignment->count; i++) {
+        npin_t* pin = assignment->pins[i];
+        int dependence_variable_position = -1;
+
+        if(pin->net->num_driver_pins > 1) {
+            // TODO Come make this warning actually correct when I know what is happening
+            error_message( NETLIST, pin->node->line_number, pin->node->file_number, "Multiple drivers not supported for assignment to %s", pin->name);
+        }
+        if (pin->net->num_driver_pins) {
+            ref_string = pin->net->driver_pins[0]->node->name;
+
+            for (j = i - 1; j >= 0; j--) {
+                if(list_dependence_pin[j] && list_dependence_pin[j]->net->num_driver_pins > 1)
+                {
+                    // TODO Come make this warning actually correct when I know what is happening
+                    error_message( NETLIST, list_dependence_pin[j]->node->line_number, list_dependence_pin[j]->node->file_number, "Cannot have multiple drivers for dependant variable %s", list_dependence_pin[j]);
+                }
+                if (list_dependence_pin[j] && list_dependence_pin[j]->net->num_driver_pins && list_dependence_type[j] && list_dependence_type[j] == BLOCKING_STATEMENT && strcmp(ref_string, assignment->pins[j]->node->name) == 0) {
+                    dependence_variable_position = j;
+                    ref_string = list_dependence_pin[j]->net->driver_pins[0]->node->name;
+                }
+            }
+
+            // TODO Does this variable need reset on each loop
+            if (dependence_variable_position > -1) {
+                pin->net = list_dependence_pin[dependence_variable_position]->net;
+            }
+        }
+    }
     vtr::free(list_dependence_pin);
     vtr::free(list_dependence_type);
     for (i = 0; i < memory_inputs->count; i++) {

ODIN_II/SRC/simulate_blif.cpp

@@ -1700,17 +1700,19 @@ static void compute_add_node(nnode_t* node, int cycle, int type) {
     int* b = (int*)vtr::malloc(sizeof(int) * node->input_port_sizes[1]);
     int* c = (int*)vtr::malloc(sizeof(int) * node->input_port_sizes[2]);
 
-//    int num = node->input_port_sizes[0] + node->input_port_sizes[1];
+    int num = node->input_port_sizes[0] + node->input_port_sizes[1];
     //if cin connect to unconn(PAD_NODE), a[0] connect to ground(GND_NODE) and b[0] connect to ground, flag = 0 the initial adder for addition
     //if cin connect to unconn(PAD_NODE), a[0] connect to ground(GND_NODE) and b[0] connect to vcc, flag = 1 the initial adder for subtraction
 #warning "Oops this be broke come fix"
-//    if (node->input_pins[num]->net->driver_pin->node->type == PAD_NODE) {
-//        if (node->input_pins[0]->net->driver_pin->node->type == GND_NODE && node->input_pins[node->input_port_sizes[0]]->net->driver_pin->node->type == GND_NODE)
-//            flag = 0;
-//        else if (node->input_pins[0]->net->driver_pin->node->type == GND_NODE && node->input_pins[node->input_port_sizes[0]]->net->driver_pin->node->type == VCC_NODE)
-//            flag = 1;
-//    } else
-//        flag = 2;
+    oassert( node->input_pins[0]->net->num_driver_pins <= 1 && "Add node does not support multiple drivers yet" );
+    oassert( node->input_pins[num]->net->num_driver_pins <= 1 && "Add node does not support multiple drivers yet" );
+    if (node->input_pins[num]->net->driver_pins[0]->node->type == PAD_NODE) {
+        if (node->input_pins[0]->net->driver_pins[0]->node->type == GND_NODE && node->input_pins[node->input_port_sizes[0]]->net->driver_pins[0]->node->type == GND_NODE)
+            flag = 0;
+        else if (node->input_pins[0]->net->driver_pins[0]->node->type == GND_NODE && node->input_pins[node->input_port_sizes[0]]->net->driver_pins[0]->node->type == VCC_NODE)
+            flag = 1;
+    } else
+        flag = 2;
 
     for (i = 0; i < node->input_port_sizes[0]; i++)
         a[i] = get_pin_value(node->input_pins[i], cycle);
@@ -1830,11 +1832,12 @@ static void compute_unary_sub_node(nnode_t* node, int cycle) {
             a[i] = get_pin_value(node->input_pins[i], cycle);
 
         #warning "Oops this be broke come fix"
-//        for (i = 0; i < node->input_port_sizes[1]; i++)
-//            if (node->input_pins[node->input_port_sizes[0] + node->input_port_sizes[1] + i]->net->driver_pin->node->type == PAD_NODE)
-//                c[i] = 1;
-//            else
-//                c[i] = get_pin_value(node->input_pins[node->input_port_sizes[0] + i], cycle);
+        oassert( node->input_pins[node->input_port_sizes[0] + node->input_port_sizes[1] + i]->net->num_driver_pins <= 1 && "Sub node does not support multiple driver pins" );
+        for (i = 0; i < node->input_port_sizes[1]; i++)
+            if (node->input_pins[node->input_port_sizes[0] + node->input_port_sizes[1] + i]->net->driver_pins[0]->node->type == PAD_NODE)
+                c[i] = 1;
+            else
+                c[i] = get_pin_value(node->input_pins[node->input_port_sizes[0] + i], cycle);
 
         int* result = unary_sub_arrays(a, node->input_port_sizes[0], c, node->input_port_sizes[1]);