From: Michel Pollet <buserror@gmail.com>
Date: Thu, 5 Apr 2012 14:27:12 +0000 (+0100)
Subject: elf: Do not set values that weren't present
X-Git-Tag: v1.0b1~14
X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=6855916d10c6e7acf94765a27d9253aaddb4c22c;p=sx%2Fsimavr.git

elf: Do not set values that weren't present

Some ELF binaries without a simavr section can now be loaded

Signed-off-by: Michel Pollet <buserror@gmail.com>
---

diff --git a/simavr/sim/sim_elf.c b/simavr/sim/sim_elf.c
index 4f8cebb..7d41ddd 100644
--- a/simavr/sim/sim_elf.c
+++ b/simavr/sim/sim_elf.c
@@ -38,10 +38,14 @@
 
 void avr_load_firmware(avr_t * avr, elf_firmware_t * firmware)
 {
-	avr->frequency = firmware->frequency;
-	avr->vcc = firmware->vcc;
-	avr->avcc = firmware->avcc;
-	avr->aref = firmware->aref;
+	if (firmware->frequency)
+		avr->frequency = firmware->frequency;
+	if (firmware->vcc)
+		avr->vcc = firmware->vcc;
+	if (firmware->avcc)
+		avr->avcc = firmware->avcc;
+	if (firmware->aref)
+		avr->aref = firmware->aref;
 #if CONFIG_SIMAVR_TRACE
 	avr->trace_data->codeline = firmware->codeline;
 #endif