input: vcd: refactor parsing a bit

[libsigrok.git] / src / input / vcd.c

diff --git a/src/input/vcd.c b/src/input/vcd.c
index 0cf495e181116abb99e7a0581ceaa4ff4a6f414e..47511c416ee90be723e6a20bcde6660ac37dd01b 100644 (file)
--- a/src/input/vcd.c
+++ b/src/input/vcd.c
@@ -206,25 +206,33 @@ static gboolean parse_header(const struct sr_input *in, GString *buf)
                                sr_err("Parsing timescale failed.");
                        }
                } else if (g_strcmp0(name, "var") == 0) {
-                       /* Format: $var type size identifier reference $end */
+                       /* Format: $var type size identifier reference [opt. index] $end */
+                       unsigned int length;
+
                        parts = g_strsplit_set(contents, " \r\n\t", 0);
                        remove_empty_parts(parts);
+                       length = g_strv_length(parts);
 
-                       if (g_strv_length(parts) != 4)
-                               sr_warn("$var section should have 4 items");
+                       if (length != 4 && length != 5)
+                               sr_warn("$var section should have 4 or 5 items");
                        else if (g_strcmp0(parts[0], "reg") != 0 && g_strcmp0(parts[0], "wire") != 0)
                                sr_info("Unsupported signal type: '%s'", parts[0]);
                        else if (strtol(parts[1], NULL, 10) != 1)
                                sr_info("Unsupported signal size: '%s'", parts[1]);
                        else if (inc->channelcount >= inc->maxchannels)
-                               sr_warn("Skipping '%s' because only %d channels requested.",
-                                               parts[3], inc->maxchannels);
+                               sr_warn("Skipping '%s%s' because only %d channels requested.",
+                                       parts[3], parts[4] ? : "", inc->maxchannels);
                        else {
-                               sr_info("Channel %d is '%s' identified by '%s'.",
-                                               inc->channelcount, parts[3], parts[2]);
                                vcd_ch = g_malloc(sizeof(struct vcd_channel));
                                vcd_ch->identifier = g_strdup(parts[2]);
-                               vcd_ch->name = g_strdup(parts[3]);
+                               if (length == 4)
+                                       vcd_ch->name = g_strdup(parts[3]);
+                               else
+                                       vcd_ch->name = g_strconcat(parts[3], parts[4], NULL);
+
+                               sr_info("Channel %d is '%s' identified by '%s'.",
+                                               inc->channelcount, vcd_ch->name, vcd_ch->identifier);
+
                                inc->channels = g_slist_append(inc->channels, vcd_ch);
                                inc->channelcount++;
                        }
@@ -328,14 +336,36 @@ static void add_samples(const struct sr_input *in, size_t count)
        }
 }
 
+/* Set the channel level depending on the identifier and parsed value. */
+static void process_bit(struct context *inc, char *identifier, unsigned int bit)
+{
+       GSList *l;
+       struct vcd_channel *vcd_ch;
+       unsigned int j;
+
+       for (j = 0, l = inc->channels; j < inc->channelcount && l; j++, l = l->next) {
+               vcd_ch = l->data;
+               if (g_strcmp0(identifier, vcd_ch->identifier) == 0) {
+                       /* Found our channel. */
+                       size_t byte_idx = (j / 8);
+                       size_t bit_idx = j - 8 * byte_idx;
+                       if (bit)
+                               inc->current_levels[byte_idx] |= (uint8_t)1 << bit_idx;
+                       else
+                               inc->current_levels[byte_idx] &= ~((uint8_t)1 << bit_idx);
+                       break;
+               }
+       }
+       if (j == inc->channelcount)
+               sr_dbg("Did not find channel for identifier '%s'.", identifier);
+}
+
 /* Parse a set of lines from the data section. */
 static void parse_contents(const struct sr_input *in, char *data)
 {
        struct context *inc;
-       struct vcd_channel *vcd_ch;
-       GSList *l;
        uint64_t timestamp, prev_timestamp;
-       unsigned int bit, i, j;
+       unsigned int bit, i;
        char **tokens;
 
        inc = in->priv;
@@ -399,9 +429,16 @@ static void parse_contents(const struct sr_input *in, char *data)
                                break;
                        }
                } else if (strchr("bBrR", tokens[i][0]) != NULL) {
-                       /* A vector value, not supported yet. */
-                       break;
+                       sr_dbg("Vector values not supported yet");
+                       if (!tokens[++i])
+                               /* No tokens left, bail out */
+                               break;
+                       else
+                               /* Process next token */
+                               continue;
                } else if (strchr("01xXzZ", tokens[i][0]) != NULL) {
+                       char *identifier;
+
                        /* A new 1-bit sample value */
                        bit = (tokens[i][0] == '1');
 
@@ -410,30 +447,15 @@ static void parse_contents(const struct sr_input *in, char *data)
                         * there was whitespace after the bit, the next token.
                         */
                        if (tokens[i][1] == '\0') {
-                               if (!tokens[++i])
-                                       /* Missing identifier */
-                                       continue;
-                       } else {
-                               for (j = 1; tokens[i][j]; j++)
-                                       tokens[i][j - 1] = tokens[i][j];
-                               tokens[i][j - 1] = '\0';
-                       }
-
-                       for (j = 0, l = inc->channels; j < inc->channelcount && l; j++, l = l->next) {
-                               vcd_ch = l->data;
-                               if (g_strcmp0(tokens[i], vcd_ch->identifier) == 0) {
-                                       /* Found our channel */
-                                       size_t byte_idx = (j / 8);
-                                       size_t bit_idx = j - 8 * byte_idx;
-                                       if (bit)
-                                               inc->current_levels[byte_idx] |= (uint8_t)1 << bit_idx;
-                                       else
-                                               inc->current_levels[byte_idx] &= ~((uint8_t)1 << bit_idx);
+                               if (!tokens[++i]) {
+                                       sr_dbg("Identifier missing!");
                                        break;
                                }
+                               identifier = tokens[i];
+                       } else {
+                               identifier = tokens[i] + 1;
                        }
-                       if (j == inc->channelcount)
-                               sr_dbg("Did not find channel for identifier '%s'.", tokens[i]);
+                       process_bit(inc, identifier, bit);
                } else {
                        sr_warn("Skipping unknown token '%s'.", tokens[i]);
                }
@@ -511,6 +533,7 @@ static int process_buffer(struct sr_input *in)
                src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(samplerate));
                meta.config = g_slist_append(NULL, src);
                sr_session_send(in->sdi, &packet);
+               g_slist_free(meta.config);
                sr_config_free(src);
 
                inc->started = TRUE;