eeprom: honour offset

Use the real offset for the EEPROM data as specified in the hex or ELF
rather than assume it always starts from zero.

Signed-off-by: Paul Fertser <[email protected]>

Author: paulfertser

simavr/sim/sim_elf.c

@@ -174,7 +174,7 @@ avr_load_firmware(
 	if (firmware->eeprom && firmware->eesize) {
 		avr_eeprom_desc_t d = {
 				.ee = firmware->eeprom,
-				.offset = 0,
+				.offset = firmware->eeprombase,
 				.size = firmware->eesize
 		};
 		avr_ioctl(avr, AVR_IOCTL_EEPROM_SET, &d);
@@ -502,6 +502,7 @@ elf_read_firmware(
 			if (elf_handle_segment(fd, php, &firmware->eeprom, "EEPROM"))
 				continue;
 			firmware->eesize = php->p_filesz;
+			firmware->eeprombase = php->p_vaddr - 0x820000;
 		} else if (php->p_vaddr < 0x830000) {
 			/* Fuses. */
 

simavr/sim/sim_elf.h

@@ -71,6 +71,7 @@ typedef struct elf_firmware_t {
 	uint32_t 	datasize;
 	uint32_t 	bsssize;
 	// read the .eeprom section of the elf, too
+	uint32_t	eeprombase;
 	uint8_t * 	eeprom;
 	uint32_t 	eesize;
 	uint8_t *	fuse;

simavr/sim/sim_hex.c

@@ -251,6 +251,8 @@ sim_setup_firmware(const char * filename, uint32_t loadBase,
 				}
 				fp->eeprom = chunk[ci].data;
 				fp->eesize = chunk[ci].size;
+				fp->eeprombase = chunk[ci].baseaddr + loadBase -
+							AVR_SEGMENT_OFFSET_EEPROM;
 				printf("Load HEX eeprom %08x, %d\n",
 					   chunk[ci].baseaddr, fp->eesize);
 			}