X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fvcd.c;h=a9963f7e7682dc136575f785f9471f2e439b7d61;hb=cd2f0fe22c35dcf3b010411ff6f123701be2a2d6;hp=5ad9ad6ce979115db97dfe62ca76ad912682222c;hpb=61a429c963fb21c3d8cb8e9166d621526724b714;p=libsigrok.git diff --git a/input/vcd.c b/input/vcd.c index 5ad9ad6c..a9963f7e 100644 --- a/input/vcd.c +++ b/input/vcd.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2010-2012 Bert Vermeulen + * Copyright (C) 2012 Petteri Aimonen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,45 @@ * along with this program. If not, see . */ -/* Based on Verilog standard IEEE Std 1364-2001 Version C */ +/* The VCD input module has the following options: + * + * numprobes: Maximum number of probes to use. The probes are + * detected in the same order as they are listed + * in the $var sections of the VCD file. + * + * skip: Allows skipping until given timestamp in the file. + * This can speed up analyzing of long captures. + * + * Value < 0: Skip until first timestamp listed in + * the file. (default) + * + * Value = 0: Do not skip, instead generate samples + * beginning from timestamp 0. + * + * Value > 0: Start at the given timestamp. + * + * downsample: Divide the samplerate by the given factor. + * This can speed up analyzing of long captures. + * + * compress: Compress idle periods longer than this value. + * This can speed up analyzing of long captures. + * Default 0 = don't compress. + * + * Based on Verilog standard IEEE Std 1364-2001 Version C + * + * Supported features: + * - $var with 'wire' and 'reg' types of scalar variables + * - $timescale definition for samplerate + * - multiple character variable identifiers + * + * Most important unsupported features: + * - vector variables (bit vectors etc.) + * - analog, integer and real number variables + * - $dumpvars initial value declaration + * - $scope namespaces + */ + +/* */ #include #include @@ -47,14 +85,15 @@ static gboolean read_until(FILE *file, GString *dest, char mode) { char prev[4] = ""; + long startpos = ftell(file); for(;;) { int c = fgetc(file); if (c == EOF) { - if (mode != 'N') - sr_err("Unexpected EOF."); + if (mode == '$') + sr_err("Unexpected EOF, read started at %ld.", startpos); return FALSE; } @@ -131,6 +170,9 @@ struct context uint64_t samplerate; int maxprobes; int probecount; + int downsample; + unsigned compress; + int64_t skip; struct probe probes[SR_MAX_NUM_PROBES]; }; @@ -192,7 +234,7 @@ static gboolean parse_header(FILE *file, struct context *ctx) if (period.q % period.p != 0) { /* Does not happen unless time value is non-standard */ - sr_warn("Inexact rounding of samplerate, %" PRIu64 " / %" PRIu64 " to %" PRIu64 ".", + sr_warn("Inexact rounding of samplerate, %" PRIu64 " / %" PRIu64 " to %" PRIu64 " Hz.", period.q, period.p, ctx->samplerate); } @@ -211,15 +253,15 @@ static gboolean parse_header(FILE *file, struct context *ctx) if (g_strv_length(parts) != 4) { - sr_err("$var section should have 4 items"); + sr_warn("$var section should have 4 items"); } else if (g_strcmp0(parts[0], "reg") != 0 && g_strcmp0(parts[0], "wire") != 0) { - sr_warn("Unsupported signal type: '%s'", parts[0]); + sr_info("Unsupported signal type: '%s'", parts[0]); } else if (strtol(parts[1], NULL, 10) != 1) { - sr_warn("Unsupported signal size: '%s'", parts[1]); + sr_info("Unsupported signal size: '%s'", parts[1]); } else if (ctx->probecount >= ctx->maxprobes) { @@ -284,6 +326,8 @@ static int init(struct sr_input *in) num_probes = DEFAULT_NUM_PROBES; ctx->samplerate = 0; + ctx->downsample = 1; + ctx->skip = -1; if (in->param) { param = g_hash_table_lookup(in->param, "numprobes"); @@ -295,6 +339,25 @@ static int init(struct sr_input *in) return SR_ERR; } } + + param = g_hash_table_lookup(in->param, "downsample"); + if (param) { + ctx->downsample = strtoul(param, NULL, 10); + if (ctx->downsample < 1) + { + ctx->downsample = 1; + } + } + + param = g_hash_table_lookup(in->param, "compress"); + if (param) { + ctx->compress = strtoul(param, NULL, 10); + } + + param = g_hash_table_lookup(in->param, "skip"); + if (param) { + ctx->skip = strtoul(param, NULL, 10) / ctx->downsample; + } } /* Maximum number of probes to parse from the VCD */ @@ -329,7 +392,7 @@ static void send_samples(const struct sr_dev_inst *sdi, uint64_t sample, uint64_ uint64_t buffer[CHUNKSIZE]; uint64_t i; unsigned chunksize = CHUNKSIZE; - + if (count < chunksize) chunksize = count; @@ -360,7 +423,6 @@ static void parse_contents(FILE *file, const struct sr_dev_inst *sdi, struct con { GString *token = g_string_sized_new(32); - gboolean first = TRUE; uint64_t prev_timestamp = 0; uint64_t prev_values = 0; @@ -373,25 +435,63 @@ static void parse_contents(FILE *file, const struct sr_dev_inst *sdi, struct con uint64_t timestamp; timestamp = strtoull(token->str + 1, NULL, 10); - if (first) + if (ctx->downsample > 1) + timestamp /= ctx->downsample; + + /* Skip < 0 => skip until first timestamp. + * Skip = 0 => don't skip + * Skip > 0 => skip until timestamp >= skip. + */ + if (ctx->skip < 0) { - first = FALSE; + ctx->skip = timestamp; + prev_timestamp = timestamp; + } + else if (ctx->skip > 0 && timestamp < (uint64_t)ctx->skip) + { + prev_timestamp = ctx->skip; + } + else if (timestamp == prev_timestamp) + { + /* Ignore repeated timestamps (e.g. sigrok outputs these) */ } else { + if (ctx->compress != 0 && timestamp - prev_timestamp > ctx->compress) + { + /* Compress long idle periods */ + prev_timestamp = timestamp - ctx->compress; + } + sr_dbg("New timestamp: %" PRIu64, timestamp); /* Generate samples from prev_timestamp up to timestamp - 1. */ send_samples(sdi, prev_values, timestamp - prev_timestamp); + prev_timestamp = timestamp; } - - prev_timestamp = timestamp; } - else if (token->str[0] == '$') + else if (token->str[0] == '$' && token->len > 1) { /* This is probably a $dumpvars, $comment or similar. - * For now, just skip it until $end. */ - read_until(file, NULL, '$'); + * $dump* contain useful data, but other tags will be skipped until $end. */ + if (g_strcmp0(token->str, "$dumpvars") == 0 || + g_strcmp0(token->str, "$dumpon") == 0 || + g_strcmp0(token->str, "$dumpoff") == 0 || + g_strcmp0(token->str, "$end") == 0) + { + /* Ignore, parse contents as normally. */ + } + else + { + /* Skip until $end */ + read_until(file, NULL, '$'); + } + } + else if (strchr("bBrR", token->str[0]) != NULL) + { + /* A vector value. Skip it and also the following identifier. */ + read_until(file, NULL, 'N'); + read_until(file, NULL, 'W'); } else if (strchr("01xXzZ", token->str[0]) != NULL) { @@ -427,9 +527,13 @@ static void parse_contents(FILE *file, const struct sr_dev_inst *sdi, struct con if (i == ctx->probecount) { - sr_info("Did not find probe for identifier '%s'.", token->str); + sr_dbg("Did not find probe for identifier '%s'.", token->str); } } + else + { + sr_warn("Skipping unknown token '%s'.", token->str); + } g_string_truncate(token, 0); } @@ -439,11 +543,12 @@ static void parse_contents(FILE *file, const struct sr_dev_inst *sdi, struct con static int loadfile(struct sr_input *in, const char *filename) { - struct sr_datafeed_header header; struct sr_datafeed_packet packet; - struct sr_datafeed_meta_logic meta; + struct sr_datafeed_meta meta; + struct sr_config *src; FILE *file; struct context *ctx; + uint64_t samplerate; ctx = in->internal; @@ -458,17 +563,14 @@ static int loadfile(struct sr_input *in, const char *filename) } /* Send header packet to the session bus. */ - header.feed_version = 1; - gettimeofday(&header.starttime, NULL); - packet.type = SR_DF_HEADER; - packet.payload = &header; - sr_session_send(in->sdi, &packet); + std_session_send_df_header(in->sdi, DRIVER_LOG_DOMAIN); /* Send metadata about the SR_DF_LOGIC packets to come. */ - packet.type = SR_DF_META_LOGIC; + packet.type = SR_DF_META; packet.payload = &meta; - meta.samplerate = ctx->samplerate; - meta.num_probes = ctx->probecount; + samplerate = ctx->samplerate / ctx->downsample; + src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&samplerate); + meta.config = g_slist_append(NULL, src); sr_session_send(in->sdi, &packet); /* Parse the contents of the VCD file */