Merge pull request #281 from dgeelen/dgeelen/log_improvements

Improve logging

Author: buserror

simavr/sim/run_avr.c

@@ -183,13 +183,13 @@ main(
 		exit(1);
 	}
 	avr_init(avr);
+	avr->log = (log > LOG_TRACE ? LOG_TRACE : log);
+	avr->trace = trace;
 	avr_load_firmware(avr, &f);
 	if (f.flashbase) {
 		printf("Attempted to load a bootloader at %04x\n", f.flashbase);
 		avr->pc = f.flashbase;
 	}
-	avr->log = (log > LOG_TRACE ? LOG_TRACE : log);
-	avr->trace = trace;
 	for (int ti = 0; ti < trace_vectors_count; ti++) {
 		for (int vi = 0; vi < avr->interrupts.vector_count; vi++)
 			if (avr->interrupts.vector[vi]->vector == trace_vectors[ti])

simavr/sim/sim_vcd_file.c

@@ -450,8 +450,12 @@ _avr_vcd_notify(
 {
 	avr_vcd_t * vcd = (avr_vcd_t *)param;
 
-	if (!vcd->output)
+	if (!vcd->output) {
+		AVR_LOG(vcd->avr, LOG_WARNING,
+				"%s: no output\n",
+				__FUNCTION__);
 		return;
+	}
 
 	avr_vcd_signal_t * s = (avr_vcd_signal_t*)irq;
 	avr_vcd_log_t l = {
@@ -478,8 +482,12 @@ avr_vcd_add_signal(
 		int signal_bit_size,
 		const char * name )
 {
-	if (vcd->signal_count == AVR_VCD_MAX_SIGNALS)
+	if (vcd->signal_count == AVR_VCD_MAX_SIGNALS) {
+		AVR_LOG(vcd->avr, LOG_ERROR,
+			" %s: unable add signal '%s'\n",
+			__FUNCTION__, name);
 		return -1;
+	}
 	int index = vcd->signal_count++;
 	avr_vcd_signal_t * s = &vcd->signal[index];
 	strncpy(s->name, name, sizeof(s->name));