Make t_item_range_value a signed 64-bit value. Fixes #1153

nickg · Feb 6, 2025 · d06d576 · d06d576
1 parent 63c6af5
commit d06d576
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/lib/nvc/cover_pkg.vhd b/lib/nvc/cover_pkg.vhd
@@ -27,7 +27,7 @@ package cover_pkg is
 
     type t_item_handle is range -1 to 2147483647;
 
-    type t_item_range_value is range 0 to 2147483647;
+    type t_item_range_value is range -9223372036854775807 - 1 to 9223372036854775807;
 
     type t_item_range is record
         min : t_item_range_value;

diff --git a/src/cov/cov-api.h b/src/cov/cov-api.h
@@ -89,8 +89,8 @@ typedef enum {
 } cover_src_t;
 
 typedef struct {
-   uint32_t  min;
-   uint32_t  max;
+   int64_t min;
+   int64_t max;
 } cover_range_t;
 
 typedef struct _cover_item {

diff --git a/src/cov/cov-report.c b/src/cov/cov-report.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <libgen.h>
+#include <inttypes.h>
 
 #define MARGIN_LEFT "20%%"
 #define SIDEBAR_WIDTH "15%%"
@@ -726,9 +727,10 @@ static void cover_print_bins(FILE *f, cover_pair_t *first_pair, cov_pair_kind_t
          const char *v[item->n_ranges] LOCAL;
          for (int i = 0; i < item->n_ranges; i++)
             if (item->ranges[i].min == item->ranges[i].max)
-               v[i] = xasprintf("%d", item->ranges[i].min);
+               v[i] = xasprintf("%"PRIi64, item->ranges[i].min);
             else
-               v[i] = xasprintf("%d - %d", item->ranges[i].min, item->ranges[i].max);
+               v[i] = xasprintf("%"PRIi64" - %"PRIi64, item->ranges[i].min,
+                                item->ranges[i].max);
 
          cover_print_bin(f, pair, COV_FLAG_USER_DEFINED, pkind, item->n_ranges, v);
          break;

diff --git a/src/rt/cover.c b/src/rt/cover.c
@@ -461,7 +461,7 @@ void _nvc_add_cover_item(jit_scalar_t *args)
    item->n_ranges = ffi_array_length(args[10].integer);
    item->ranges = xcalloc_array(item->n_ranges, sizeof(cover_range_t));
 
-   int32_t *ptr = (int32_t *)args[8].pointer;
+   int64_t *ptr = (int64_t *)args[8].pointer;
 
    for (int i = 0; i < item->n_ranges; i++) {
       item->ranges[i].min = *ptr++;