sim: Use boot_state_init and boot_state clear where required.

Replace boot_state_clear with boot_state_init where needed,
and add boot_state_clear where missed.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>

Author: de-nordic

sim/mcuboot-sys/csupport/run.c

@@ -264,7 +264,7 @@ int invoke_boot_go(struct sim_context *ctx, struct area_desc *adesc,
     sim_set_context(ctx);
 
     if (setjmp(ctx->boot_jmpbuf) == 0) {
-        boot_state_clear(state);
+        boot_state_init(state);
 
 #if BOOT_IMAGE_NUMBER > 1
         if (image_id >= 0) {
@@ -276,12 +276,14 @@ int invoke_boot_go(struct sim_context *ctx, struct area_desc *adesc,
 #endif /* BOOT_IMAGE_NUMBER > 1 */
 
         res = context_boot_go(state, rsp);
+        boot_state_clear(state);
         sim_reset_flash_areas();
         sim_reset_context();
         free(state);
         /* printf("boot_go off: %d (0x%08x)\n", res, rsp->br_image_off); */
         return res;
     } else {
+        boot_state_clear(state);
         sim_reset_flash_areas();
         sim_reset_context();
         free(state);
@@ -308,7 +310,7 @@ int invoke_boot_load_image_from_flash_to_sram(struct sim_context *ctx, struct ar
 
     sim_set_flash_areas(adesc);
     sim_set_context(ctx);
-    boot_state_clear(state);
+    boot_state_init(state);
 
     res = flash_area_open(FLASH_AREA_IMAGE_PRIMARY(0), &fa_p);
     if (res != 0) {
@@ -335,6 +337,7 @@ int invoke_boot_load_image_from_flash_to_sram(struct sim_context *ctx, struct ar
     }
 
     flash_area_close(fa_p);
+    boot_state_clear(state);
     sim_reset_flash_areas();
     sim_reset_context();
     free(state);