[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/12] hw/core: properly terminate loading .hex on EOF record
From: |
Alex Bennée |
Subject: |
[PATCH v3 11/12] hw/core: properly terminate loading .hex on EOF record |
Date: |
Fri, 3 Apr 2020 20:11:49 +0100 |
The https://makecode.microbit.org/#editor generates slightly weird
.hex files which work fine on a real microbit but causes QEMU to
choke. The reason is extraneous data after the EOF record which causes
the loader to attempt to write a bigger file than it should to the
"rom". According to the HEX file spec an EOF really should be the last
thing we process so lets do that.
Reported-by: Ursula Bennée <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/core/loader.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index eeef6da9a1b..8bbb1797a4c 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -1447,6 +1447,7 @@ typedef struct {
uint32_t current_rom_index;
uint32_t rom_start_address;
AddressSpace *as;
+ bool complete;
} HexParser;
/* return size or -1 if error */
@@ -1484,6 +1485,7 @@ static int handle_record_type(HexParser *parser)
parser->current_rom_index,
parser->rom_start_address, parser->as);
}
+ parser->complete = true;
return parser->total_size;
case EXT_SEG_ADDR_RECORD:
case EXT_LINEAR_ADDR_RECORD:
@@ -1548,11 +1550,12 @@ static int parse_hex_blob(const char *filename, hwaddr
*addr, uint8_t *hex_blob,
.bin_buf = g_malloc(hex_blob_size),
.start_addr = addr,
.as = as,
+ .complete = false
};
rom_transaction_begin();
- for (; hex_blob < end; ++hex_blob) {
+ for (; hex_blob < end && !parser.complete; ++hex_blob) {
switch (*hex_blob) {
case '\r':
case '\n':
--
2.20.1
- [PATCH v3 08/12] linux-user: factor out reading of /proc/self/maps, (continued)
- [PATCH v3 08/12] linux-user: factor out reading of /proc/self/maps, Alex Bennée, 2020/04/03
- [PATCH v3 04/12] linux-user: more debug for init_guest_space, Alex Bennée, 2020/04/03
- [PATCH v3 05/12] target/xtensa: add FIXME for translation memory leak, Alex Bennée, 2020/04/03
- [PATCH v3 10/12] target/arm: don't expose "ieee_half" via gdbstub, Alex Bennée, 2020/04/03
- [PATCH v3 09/12] linux-user: clean-up padding on /proc/self/maps, Alex Bennée, 2020/04/03
- [PATCH v3 12/12] configure: Add -Werror to PIE probe, Alex Bennée, 2020/04/03
- [PATCH v3 11/12] hw/core: properly terminate loading .hex on EOF record,
Alex Bennée <=