src, test: Rename S_PORT to S_SIGNAL since it tracks both nets and po…

…rts.
nickg · Aug 26, 2024 · 8a0bcab · 8a0bcab
1 parent c3dc17a
commit 8a0bcab
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 128 deletions.
diff --git a/src/sdf/sdf-dump.c b/src/sdf/sdf-dump.c
@@ -49,7 +49,7 @@ void sdf_dump_number(sdf_node_t number)
    }
 }
 
-void sdf_dump_port(sdf_node_t port)
+void sdf_dump_signal(sdf_node_t port)
 {
    sdf_flags_t flags = sdf_flags(port);
    bool port_edge = !!((flags & S_F_POSEDGE) || (flags & S_F_NEGEDGE));
@@ -155,8 +155,8 @@ void sdf_dump_expr(sdf_node_t expr)
 {
    sdf_kind_t kind = sdf_kind(expr);
    switch (kind) {
-   case S_PORT:
-      sdf_dump_port(expr);
+   case S_SIGNAL:
+      sdf_dump_signal(expr);
       break;
    default:
       fatal_trace("cannot dump expression kind: %s", sdf_kind_str(kind));
@@ -208,8 +208,8 @@ void sdf_dump_delay(sdf_node_t delay, int indent)
       break;
    }
 
-   for (int i = 0; i < sdf_ports(delay); i++)
-      sdf_dump_port(sdf_port(delay, i));
+   for (int i = 0; i < sdf_signals(delay); i++)
+      sdf_dump_signal(sdf_signal(delay, i));
 
    sdf_dump_value_list(delay);
    print_syntax(")\n");

diff --git a/src/sdf/sdf-node.c b/src/sdf/sdf-node.c
@@ -43,7 +43,7 @@ static const imask_t has_map[S_LAST_NODE_KIND] = {
    // S_COND
    (I_IDENT | I_VALUE),
 
-   // S_PORT
+   // S_SIGNAL
    (I_SUBKIND | I_IDENT | I_DIMS | I_FLAGS | I_VALUE),
 
    // S_DELVAL
@@ -82,7 +82,7 @@ static const imask_t has_map[S_LAST_NODE_KIND] = {
 
 static const char *kind_text_map[S_LAST_NODE_KIND] = {
    "S_DELAY_FILE",   "S_HEADER_ITEM",  "S_CELL",         "S_DELAY",
-   "S_TIMING_CHECK", "S_LABEL",        "S_COND",         "S_PORT",
+   "S_TIMING_CHECK", "S_LABEL",        "S_COND",         "S_SIGNAL",
    "S_DELVAL",       "S_VALUE",        "S_TRIPPLE",      "S_NUMBER",
    "S_TIMING_ENV",   "S_EXCEPTION",    "S_CONSTR_PATH",  "S_TIMING_ENV",
    "S_UNARY",        "S_BINARY",       "S_COMPLEX"
@@ -192,19 +192,19 @@ sdf_node_t sdf_cell(sdf_node_t s, unsigned int n)
    return sdf_array_nth(item, n);
 }
 
-void sdf_add_port(sdf_node_t s, sdf_node_t port)
+void sdf_add_signal(sdf_node_t s, sdf_node_t port)
 {
    sdf_array_add(lookup_item(&sdf_object, s, I_PORTS), port);
    object_write_barrier(&(s->object), &(port->object));
 }
 
-unsigned sdf_ports(sdf_node_t s)
+unsigned sdf_signals(sdf_node_t s)
 {
    item_t *item = lookup_item(&sdf_object, s, I_PORTS);
    return obj_array_count(item->obj_array);
 }
 
-sdf_node_t sdf_port(sdf_node_t s, unsigned int n)
+sdf_node_t sdf_signal(sdf_node_t s, unsigned int n)
 {
    item_t *item = lookup_item(&sdf_object, s, I_PORTS);
    return sdf_array_nth(item, n);
@@ -470,7 +470,7 @@ sdf_node_t sdf_label(sdf_node_t s, unsigned int n)
 
 void sdf_add_dim(sdf_node_t s, sdf_node_t dim)
 {
-   assert(sdf_kind(s) == S_PORT);
+   assert(sdf_kind(s) == S_SIGNAL);
 
    sdf_array_add(lookup_item(&sdf_object, s, I_DIMS), dim);
    object_write_barrier(&(s->object), &(dim->object));

diff --git a/src/sdf/sdf-node.h b/src/sdf/sdf-node.h
@@ -36,9 +36,9 @@ typedef enum {
 } sdf_header_item_kind_t;
 
 typedef enum {
-   S_PORT_SCALAR,
-   S_PORT_BUS
-} sdf_port_kind_t;
+   S_SIGNAL_SCALAR,
+   S_SIGNAL_BUS
+} sdf_signal_kind_t;
 
 typedef enum {
    S_DELAY_KIND_IOPATH,
@@ -148,7 +148,7 @@ typedef enum {
    S_TIMING_CHECK,
    S_LABEL,
    S_COND,
-   S_PORT,
+   S_SIGNAL,
    S_DELVAL,
    S_VALUE,
    S_TRIPPLE,
@@ -200,9 +200,9 @@ void sdf_add_cell(sdf_node_t s, sdf_node_t cell);
 unsigned sdf_cells(sdf_node_t s);
 sdf_node_t sdf_cell(sdf_node_t s, unsigned int n);
 
-void sdf_add_port(sdf_node_t s, sdf_node_t port);
-unsigned sdf_ports(sdf_node_t s);
-sdf_node_t sdf_port(sdf_node_t s, unsigned int n);
+void sdf_add_signal(sdf_node_t s, sdf_node_t port);
+unsigned sdf_signals(sdf_node_t s);
+sdf_node_t sdf_signal(sdf_node_t s, unsigned int n);
 
 void sdf_add_value(sdf_node_t s, sdf_node_t literal);
 unsigned sdf_values(sdf_node_t s);