misc: Point to correct simavr include dirs

[simavr] / simavr / sim / sim_vcd_file.c

diff --git a/simavr/sim/sim_vcd_file.c b/simavr/sim/sim_vcd_file.c
index f17e2af..8d87f87 100644 (file)
--- a/simavr/sim/sim_vcd_file.c
+++ b/simavr/sim/sim_vcd_file.c
@@ -24,8 +24,10 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include "sim_vcd_file.h"
 #include "sim_avr.h"
+#include "sim_time.h"
 
 void _avr_vcd_notify(struct avr_irq_t * irq, uint32_t value, void * param);
 
@@ -37,7 +39,7 @@ int avr_vcd_init(struct avr_t * avr, const char * filename, avr_vcd_t * vcd, uin
        vcd->period = avr_usec_to_cycles(vcd->avr, period);
        
        for (int i = 0; i < AVR_VCD_MAX_SIGNALS; i++) {
-               avr_init_irq(&vcd->signal[i].irq, i, 1);
+               avr_init_irq(&avr->irq_pool, &vcd->signal[i].irq, i, 1, NULL /* TODO IRQ name */);
                avr_irq_register_notify(&vcd->signal[i].irq, _avr_vcd_notify, vcd);
        }
        
@@ -54,11 +56,28 @@ void _avr_vcd_notify(struct avr_irq_t * irq, uint32_t value, void * param)
        avr_vcd_t * vcd = (avr_vcd_t *)param;
        if (!vcd->output)
                return;
-       avr_vcd_signal_t * s = (avr_vcd_signal_t*)irq;
-       if (vcd->logindex == AVR_VCD_LOG_SIZE) {
-               printf("_avr_vcd_notify %s overrun value buffer %d\n", s->name, AVR_VCD_LOG_SIZE);
-               return;
+
+       /*
+        * buffer starts empty, the first trace will resize it to AVR_VCD_LOG_CHUNK_SIZE,
+        * further growth will resize it accordingly. There's a bit of
+        */
+       if (vcd->logindex >= vcd->logsize) {
+               vcd->logsize += AVR_VCD_LOG_CHUNK_SIZE;
+               vcd->log = (avr_vcd_log_p)realloc(vcd->log, vcd->logsize * sizeof(vcd->log[0]));
+               AVR_LOG(vcd->avr, LOG_TRACE, "%s trace buffer resized to %d\n",
+                               __func__, (int)vcd->logsize);
+               if ((vcd->logsize / AVR_VCD_LOG_CHUNK_SIZE) == 5) {
+                       AVR_LOG(vcd->avr, LOG_WARNING, "%s log size runnaway (%d) flush problem?\n",
+                                       __func__, (int)vcd->logsize);
+               }
+               if (!vcd->log) {
+                       AVR_LOG(vcd->avr, LOG_ERROR, "%s log resizing, out of memory (%d)!\n",
+                                       __func__, (int)vcd->logsize);
+                       vcd->logsize = 0;
+                       return;
+               }
        }
+       avr_vcd_signal_t * s = (avr_vcd_signal_t*)irq;
        avr_vcd_log_t *l = &vcd->log[vcd->logindex++];
        l->signal = s;
        l->when = vcd->avr->cycle;
@@ -83,23 +102,25 @@ static char * _avr_vcd_get_signal_text(avr_vcd_signal_t * s, char * out, uint32_
 
 static void avr_vcd_flush_log(avr_vcd_t * vcd)
 {
-       if (!vcd->logindex)
-               return;
-//     printf("avr_vcd_flush_log %d\n", vcd->logindex);
-       uint32_t oldbase = 0;   // make sure it's different
-       char out[48];
-
 #if AVR_VCD_MAX_SIGNALS > 32
        uint64_t seen = 0;
 #else
        uint32_t seen = 0;
 #endif
-       for (int li = 0; li < vcd->logindex; li++) {
+       uint64_t oldbase = 0;   // make sure it's different
+       char out[48];
+
+       if (!vcd->logindex)
+               return;
+//     printf("avr_vcd_flush_log %d\n", vcd->logindex);
+
+
+       for (uint32_t li = 0; li < vcd->logindex; li++) {
                avr_vcd_log_t *l = &vcd->log[li];
-               uint32_t base = avr_cycles_to_usec(vcd->avr, l->when - vcd->start);
+               uint64_t base = avr_cycles_to_nsec(vcd->avr, l->when - vcd->start);     // 1ns base
 
-               // if that trace was seen in this usec already, we fudge the base time
-               // to make sure the new value is offset by one usec, to make sure we get
+               // if that trace was seen in this nsec already, we fudge the base time
+               // to make sure the new value is offset by one nsec, to make sure we get
                // at least a small pulse on the waveform
                // This is a bit of a fudge, but it is the only way to represent very 
                // short"pulses" that are still visible on the waveform.
@@ -108,7 +129,7 @@ static void avr_vcd_flush_log(avr_vcd_t * vcd)
                        
                if (base > oldbase || li == 0) {
                        seen = 0;
-                       fprintf(vcd->output, "#%uld\n", base);
+                       fprintf(vcd->output, "#%llu\n", (long long unsigned int)base);
                        oldbase = base;
                }
                seen |= (1 << l->signal->irq.irq);      // mark this trace as seen for this timestamp
@@ -149,8 +170,8 @@ int avr_vcd_start(avr_vcd_t * vcd)
                perror(vcd->filename);
                return -1;
        }
-               
-       fprintf(vcd->output, "$timescale 1us $end\n");
+
+       fprintf(vcd->output, "$timescale 1ns $end\n");  // 1ns base
        fprintf(vcd->output, "$scope module logic $end\n");
 
        for (int i = 0; i < vcd->signal_count; i++) {