Revert "Merge pull request #12 from ponty/logger2"

[simavr] / simavr / sim / sim_avr.c

diff --git a/simavr/sim/sim_avr.c b/simavr/sim/sim_avr.c
index 79560d9..0eb7c9e 100644 (file)
--- a/simavr/sim/sim_avr.c
+++ b/simavr/sim/sim_avr.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdarg.h>
 #include "sim_avr.h"
 #include "sim_core.h"
 #include "sim_time.h"
@@ -35,9 +34,6 @@
 #define AVR_KIND_DECL
 #include "sim_core_decl.h"
 
-void std_logger(avr_t* avr, const int level, const char * format, ... );
-logger_t global_logger = std_logger;
-
 int avr_init(avr_t * avr)
 {
        avr->flash = malloc(avr->flashend + 1);
@@ -48,7 +44,7 @@ int avr_init(avr_t * avr)
        avr->trace_data = calloc(1, sizeof(struct avr_trace_data_t));
 #endif
        
-       AVR_LOG(avr, LOG_TRACE, "%s init\n", avr->mmcu);
+       printf("%s init\n", avr->mmcu);
 
        // cpu is in limbo before init is finished.
        avr->state = cpu_Limbo;
@@ -87,7 +83,7 @@ void avr_terminate(avr_t * avr)
 
 void avr_reset(avr_t * avr)
 {
-       AVR_LOG(avr, LOG_TRACE, "%s reset\n", avr->mmcu);
+       printf("%s reset\n", avr->mmcu);
 
        memset(avr->data, 0x0, avr->ramend + 1);
        _avr_sp_set(avr, avr->ramend);
@@ -108,7 +104,7 @@ void avr_reset(avr_t * avr)
 
 void avr_sadly_crashed(avr_t *avr, uint8_t signal)
 {
-       AVR_LOG(avr, LOG_ERROR, "%s\n", __FUNCTION__);
+       printf("%s\n", __FUNCTION__);
        avr->state = cpu_Stopped;
        if (avr->gdb_port) {
                // enable gdb server, and wait
@@ -121,7 +117,7 @@ void avr_sadly_crashed(avr_t *avr, uint8_t signal)
 
 static void _avr_io_command_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t v, void * param)
 {
-       AVR_LOG(avr, LOG_TRACE, "%s %02x\n", __FUNCTION__, v);
+       printf("%s %02x\n", __FUNCTION__, v);
        switch (v) {
                case SIMAVR_CMD_VCD_START_TRACE:
                        if (avr->vcd)
@@ -135,7 +131,7 @@ static void _avr_io_command_write(struct avr_t * avr, avr_io_addr_t addr, uint8_
                        avr_irq_t * src = avr_io_getirq(avr, AVR_IOCTL_UART_GETIRQ('0'), UART_IRQ_OUTPUT);
                        avr_irq_t * dst = avr_io_getirq(avr, AVR_IOCTL_UART_GETIRQ('0'), UART_IRQ_INPUT);
                        if (src && dst) {
-                               AVR_LOG(avr, LOG_TRACE, "%s activating uart local echo IRQ src %p dst %p\n", __FUNCTION__, src, dst);
+                               printf("%s activating uart local echo IRQ src %p dst %p\n", __FUNCTION__, src, dst);
                                avr_connect_irq(src, dst);
                        }
                }       break;
@@ -156,7 +152,7 @@ static void _avr_io_console_write(struct avr_t * avr, avr_io_addr_t addr, uint8_
 
        if (v == '\r' && buf) {
                buf[len] = 0;
-               AVR_LOG(avr, LOG_TRACE, "O:" "%s" "" "\n", buf);
+               printf("O:" "%s" "" "\n", buf);
                fflush(stdout);
                len = 0;
                return;
@@ -178,7 +174,7 @@ void avr_set_console_register(avr_t * avr, avr_io_addr_t addr)
 void avr_loadcode(avr_t * avr, uint8_t * code, uint32_t size, avr_flashaddr_t address)
 {
        if (size > avr->flashend+1) {
-               AVR_LOG(avr, LOG_ERROR, "avr_loadcode(): Attempted to load code of size %d but flash size is only %d.\n",
+               fprintf(stderr, "avr_loadcode(): Attempted to load code of size %d but flash size is only %d.\n",
                        size, avr->flashend+1);
                abort();
        }
@@ -244,7 +240,7 @@ void avr_callback_run_gdb(avr_t * avr)
        if (avr->state == cpu_Sleeping) {
                if (!avr->sreg[S_I]) {
                        if (avr->log)
-                               AVR_LOG(avr, LOG_TRACE, "simavr: sleeping with interrupts off, quitting gracefully\n");
+                               printf("simavr: sleeping with interrupts off, quitting gracefully\n");
                        avr->state = cpu_Done;
                        return;
                }
@@ -298,7 +294,7 @@ void avr_callback_run_raw(avr_t * avr)
        if (avr->state == cpu_Sleeping) {
                if (!avr->sreg[S_I]) {
                        if (avr->log)
-                               AVR_LOG(avr, LOG_TRACE, "simavr: sleeping with interrupts off, quitting gracefully\n");
+                               printf("simavr: sleeping with interrupts off, quitting gracefully\n");
                        avr->state = cpu_Done;
                        return;
                }
@@ -343,23 +339,12 @@ avr_make_mcu_by_name(
                        }
        }
        if (!maker) {
-               AVR_LOG(((avr_t*)0), LOG_ERROR, "%s: AVR '%s' not known\n", __FUNCTION__, name);
+               fprintf(stderr, "%s: AVR '%s' not known\n", __FUNCTION__, name);
                return NULL;
        }
 
        avr_t * avr = maker->make();
-       AVR_LOG(avr, LOG_TRACE, "Starting %s - flashend %04x ramend %04x e2end %04x\n", avr->mmcu, avr->flashend, avr->ramend, avr->e2end);
+       printf("Starting %s - flashend %04x ramend %04x e2end %04x\n", avr->mmcu, avr->flashend, avr->ramend, avr->e2end);
        return avr;     
 }
 
-void std_logger(avr_t* avr, const int level, const char * format, ... ) {
-    if (!avr || avr->log >= level)
-    {
-        va_list args;
-        va_start(args, format);
-        vfprintf((level > LOG_ERROR) ?  stdout : stderr , format, args);
-        va_end(args);
-    }
-}
-
-