From 96380b56dc9320ecb6da953e57415700105e8b80 Mon Sep 17 00:00:00 2001
From: alexkharl <sasha_xarlamov@mail.ru>
Date: Thu, 8 Feb 2024 13:46:36 +0300
Subject: [PATCH] =?UTF-8?q?Ref(01=5FAdder):=D0=94=D0=BE=D0=B1-=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=B8=D0=BD=D1=84=D1=8B=20=D0=B2=20=D1=82=D0=B1=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=2032=20=D0=B1=D0=B8=D1=82=D0=BD=D0=BE=D0=B3=D0=BE?=
 =?UTF-8?q?=20=D1=81=D1=83=D0=BC=D0=BC=D0=B0=D1=82=D0=BE=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Labs/01. Adder/tb_fulladder32.sv | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/Labs/01. Adder/tb_fulladder32.sv b/Labs/01. Adder/tb_fulladder32.sv
index 6049afa..af7956e 100644
--- a/Labs/01. Adder/tb_fulladder32.sv	
+++ b/Labs/01. Adder/tb_fulladder32.sv	
@@ -42,7 +42,7 @@ module tb_fulladder32();
     assign carry_o_dump = running_line[32];
 
     initial begin
-        $timeformat(-9, 2, " ns");
+        $timeformat(-9, 2, " ns", 0);
 
         #1; // wait initial line_dump
 
@@ -50,11 +50,26 @@ module tb_fulladder32();
         $display("You should run simmulation until the message 'FINISH simulation' appears in the log.");
         $display("If you don't see the message then click the button 'Run All'");
         for ( i = 0; i < TEST_VALUES; i = i + 1 ) begin
+            bit fail;
+            fail = 1'b0;
             running_line = line_dump[i*98+:98];
             #TIME_OPERATION;
-            if( (tb_carry_o !== carry_o_dump) || (tb_sum_o !== sum_dump) ) begin
-                $display("ERROR! carry_i = %b; (a)%h + (b)%h = ", tb_carry_i, tb_a_i, tb_b_i, "(carry_o)%b (sum_o)%h;", tb_carry_o, tb_sum_o, " carry_o_dump: %b, sum_dump: %h", carry_o_dump, sum_dump, " time == %t", $realtime);
-                err_count = err_count + 1'b1;
+            if (tb_carry_o !== carry_o_dump) begin
+                $write("ERROR! time == %t. ", $realtime, "Carry mismatch. Received: carry = %b, but Expected: carry = %b. ",
+                    tb_carry_o, carry_o_dump);
+                fail = 1'b1;
+            end
+            if (tb_sum_o !== sum_dump) begin
+                if (!fail) $write("ERROR! time == %t. ", $realtime);
+                $write("Sum mismatch. Received: sum = 0x%x, but Expected: sum = 0x%x. ",
+                    tb_sum_o, sum_dump);
+                fail = 1'b1;
+            end
+
+            if (fail) begin
+                $display("It should be: 0x%x + 0x%x + %d = {sum: 0x%x, carry: %d}. ",
+                tb_a_i, tb_b_i, tb_carry_i, sum_dump, carry_o_dump);
+                ++err_count;
             end
         end
         $display("Number of errors: %d", err_count);