f1ce544edfec2a00d171ccac805c3336b50e704a

allows programs like the simduino example to modify the init/deinit function
to fix a crash

Signed-off-by: Christian Balles <code@ballessay.de>

diff --git a/simavr/sim/sim_avr.c b/simavr/sim/sim_avr.c
index 7add4147ce63eb95cbd6f6e9654f5438fa2a36fe..d21f10998819b7d6db3d9311e75b623c6862866e 100644 (file)
--- a/simavr/sim/sim_avr.c
+++ b/simavr/sim/sim_avr.c
@@ -41,6 +41,8 @@ int avr_init(avr_t * avr)
        // cpu is in limbo before init is finished.
        avr->state = cpu_Limbo;
        avr->frequency = 1000000;       // can be overriden via avr_mcu_section
+       if (avr->special_init)
+               avr->special_init(avr);
        if (avr->init)
                avr->init(avr);
        avr->state = cpu_Running;
@@ -50,13 +52,16 @@ int avr_init(avr_t * avr)
 
 void avr_terminate(avr_t * avr)
 {
-       if (avr->vcd)
+       if (avr->special_deinit)
+               avr->special_deinit(avr);
+       if (avr->vcd) {
                avr_vcd_close(avr->vcd);
-       avr->vcd = NULL;
+               avr->vcd = NULL;
+       }
        avr_deallocate_ios(avr);
 
-       free(avr->flash);
-       free(avr->data);
+       if (avr->flash) free(avr->flash);
+       if (avr->data) free(avr->data);
        avr->flash = avr->data = NULL;
 }
 

diff --git a/simavr/sim/sim_avr.h b/simavr/sim/sim_avr.h
index 9695c057dd9cee89d7d778f214475aac8154157b..6d205d462ced20ca267e97d260320499b5f04d3c 100644 (file)
--- a/simavr/sim/sim_avr.h
+++ b/simavr/sim/sim_avr.h
@@ -100,6 +100,10 @@ typedef struct avr_t {
        
        // called at init time
        void (*init)(struct avr_t * avr);
+       // called at init time (for special purposes like using a memory mapped file as flash see: simduino)
+       void (*special_init)(struct avr_t * avr);
+       // called at termination time ( to clean special initalizations)
+       void (*special_deinit)(struct avr_t * avr);
        // called at reset time
        void (*reset)(struct avr_t * avr);