From nobody Wed Oct 29 22:59:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152593682298542.63800154176238; Thu, 10 May 2018 00:20:22 -0700 (PDT) Received: from localhost ([::1]:60544 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGfs9-0005y8-7M for importer@patchew.org; Thu, 10 May 2018 03:20:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGfqd-00049M-UU for qemu-devel@nongnu.org; Thu, 10 May 2018 03:18:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGfqZ-0005xw-9f for qemu-devel@nongnu.org; Thu, 10 May 2018 03:18:43 -0400 Received: from smtp23.cstnet.cn ([159.226.251.23]:50517 helo=cstnet.cn) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGfqY-0005um-Bd for qemu-devel@nongnu.org; Thu, 10 May 2018 03:18:39 -0400 Received: from Water.lan (unknown [124.16.136.100]) by APP-03 (Coremail) with SMTP id rQCowAA3fyNH8vNaoC8xAA--.489S4; Thu, 10 May 2018 15:18:32 +0800 (CST) From: Su Hang To: stefanha@gmail.com, darcysail@gmail.com Date: Thu, 10 May 2018 15:18:30 +0800 Message-Id: <1525936711-24538-2-git-send-email-suhang16@mails.ucas.ac.cn> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525936711-24538-1-git-send-email-suhang16@mails.ucas.ac.cn> References: <1525936711-24538-1-git-send-email-suhang16@mails.ucas.ac.cn> X-CM-TRANSID: rQCowAA3fyNH8vNaoC8xAA--.489S4 X-Coremail-Antispam: 1UD129KBjvJXoW3ArW3try5KrWxZF1fXFWxCrg_yoWfKF1fpF Z3Gr1fXr47tFyfArW3Xr4Uur15ZrZ5KF15WFy8G34SkFZrZrn0yr18ur1fJryrGFyvgr15 XFZ0qrZ0ga47XaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPIb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv 6xkF7I0E14v26r4UJVWxJr1lnxkEFVAIw20F6cxK64vIFxWle2I262IYc4CY6c8Ij28IcV AaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0E x4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02 Avz4vE14v_GF4l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1Y6r 17MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07bo txDUUUUU= X-Originating-IP: [124.16.136.100] X-CM-SenderInfo: pvxkt0rjrwqzpdlo2hpxfd2hldfou0/ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 159.226.251.23 Subject: [Qemu-devel] [PATCH v7 1/2] Implement .hex file loader X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch adds Intel Hexadecimal Object File format support to the loader. The file format specification is available here: http://www.piclist.com/techref/fileext/hex/intel.htm The file format is mainly intended for embedded systems and microcontrollers, such as Micro:bit Arduino, ARM, STM32, etc. Suggested-by: Stefan Hajnoczi Signed-off-by: Su Hang --- hw/arm/boot.c | 10 ++- hw/core/loader.c | 246 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++ include/hw/loader.h | 15 ++++ 3 files changed, 269 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 9ae6ab2689e6..4acd5259d5fe 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -1066,12 +1066,18 @@ static void arm_load_kernel_notify(Notifier *notifi= er, void *data) kernel_size =3D load_uimage_as(info->kernel_filename, &entry, NULL, &is_linux, NULL, NULL, as); } + if (kernel_size < 0) { + entry =3D 0; + /* 32-bit ARM Intel HEX file */ + kernel_size =3D load_targphys_hex_as(info->kernel_filename, &entry= , as); + } if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) && kernel_size < 0) { kernel_size =3D load_aarch64_image(info->kernel_filename, info->loader_start, &entry, as); is_linux =3D 1; - } else if (kernel_size < 0) { - /* 32-bit ARM */ + } + if (kernel_size < 0) { + /* 32-bit ARM binary file */ entry =3D info->loader_start + KERNEL_LOAD_ADDR; kernel_size =3D load_image_targphys_as(info->kernel_filename, entr= y, info->ram_size - KERNEL_LOAD_= ADDR, diff --git a/hw/core/loader.c b/hw/core/loader.c index 06bdbca53709..c02a734743e2 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1286,3 +1286,249 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict) } } } + +typedef enum HexRecord HexRecord; +enum HexRecord { + DATA_RECORD =3D 0, + EOF_RECORD, + EXT_SEG_ADDR_RECORD, + START_SEG_ADDR_RECORD, + EXT_LINEAR_ADDR_RECORD, + START_LINEAR_ADDR_RECORD, +}; + +#define DATA_FIELD_MAX_LEN 0xff +#define LEN_EXCEPT_DATA 0x5 +/* 0x5 =3D sizeof(byte_count) + sizeof(address) + sizeof(record_type) + + * sizeof(checksum) */ +typedef struct { + uint8_t byte_count; + uint16_t address; + uint8_t record_type; + uint8_t data[DATA_FIELD_MAX_LEN]; + uint8_t checksum; +} HexLine; + +/* return 0 or -1 if error */ +static bool parse_record(HexLine *line, uint8_t *our_checksum, const uint8= _t c, + uint32_t *index, const bool in_process) +{ + /* +-------+---------------+-------+---------------------+--------+ + * | byte | |record | | | + * | count | address | type | data |checksum| + * +-------+---------------+-------+---------------------+--------+ + * ^ ^ ^ ^ ^ ^ + * |1 byte | 2 bytes |1 byte | 0-255 bytes | 1 byte | + */ + uint8_t value =3D 0; + uint32_t idx =3D *index; + /* ignore space */ + if (g_ascii_isspace(c)) { + return true; + } + if (!g_ascii_isxdigit(c) || !in_process) { + return false; + } + value =3D g_ascii_xdigit_value(c); + value =3D idx & 0x1 ? value & 0xf : value << 4; + if (idx < 2) { + line->byte_count |=3D value; + } else if (2 <=3D idx && idx < 6) { + line->address <<=3D 4; + line->address +=3D g_ascii_xdigit_value(c); + } else if (6 <=3D idx && idx < 8) { + line->record_type |=3D value; + } else if (8 <=3D idx && idx < 8 + 2 * line->byte_count) { + line->data[(idx - 8) >> 1] |=3D value; + } else if (8 + 2 * line->byte_count <=3D idx && + idx < 10 + 2 * line->byte_count) { + line->checksum |=3D value; + } else { + return false; + } + *our_checksum +=3D value; + ++(*index); + return true; +} + +typedef struct { + const char *filename; + HexLine line; + uint8_t *bin_buf; + hwaddr *start_addr; + int total_size; + uint32_t next_address_to_write; + uint32_t current_address; + uint32_t current_rom_index; + uint32_t rom_start_address; + AddressSpace *as; +} HexParser; + +/* return size or -1 if error */ +static int handle_record_type(HexParser *parser) +{ + HexLine *line =3D &(parser->line); + switch (line->record_type) { + case DATA_RECORD: + parser->current_address =3D + (parser->next_address_to_write & 0xffff0000) | line->address; + /* verify this is a contiguous block of memory */ + if (parser->current_address !=3D parser->next_address_to_write) { + if (parser->current_rom_index !=3D 0) { + rom_add_hex_blob_as(parser->filename, parser->bin_buf, + parser->current_rom_index, + parser->rom_start_address, parser->as); + } + parser->rom_start_address =3D parser->current_address; + parser->current_rom_index =3D 0; + } + + /* copy from line buffer to output bin_buf */ + memcpy(parser->bin_buf + parser->current_rom_index, line->data, + line->byte_count); + parser->current_rom_index +=3D line->byte_count; + parser->total_size +=3D line->byte_count; + /* save next address to write */ + parser->next_address_to_write =3D + parser->current_address + line->byte_count; + break; + + case EOF_RECORD: + if (parser->current_rom_index !=3D 0) { + rom_add_hex_blob_as(parser->filename, parser->bin_buf, + parser->current_rom_index, + parser->rom_start_address, parser->as); + } + return parser->total_size; + case EXT_SEG_ADDR_RECORD: + case EXT_LINEAR_ADDR_RECORD: + if (line->byte_count !=3D 2 && line->address !=3D 0) { + return -1; + } + + if (parser->current_rom_index !=3D 0) { + rom_add_hex_blob_as(parser->filename, parser->bin_buf, + parser->current_rom_index, + parser->rom_start_address, parser->as); + } + + /* save next address to write, + * in case of non-contiguous block of memory */ + parser->next_address_to_write =3D + line->record_type =3D=3D EXT_SEG_ADDR_RECORD + ? ((line->data[0] << 12) | (line->data[1] << 4)) + : ((line->data[0] << 24) | (line->data[1] << 16)); + parser->rom_start_address =3D parser->next_address_to_write; + parser->current_rom_index =3D 0; + break; + + case START_SEG_ADDR_RECORD: + /* TODO: START_SEG_ADDR_RECORD is x86-specific */ + return -1; + + case START_LINEAR_ADDR_RECORD: + if (line->byte_count !=3D 4 && line->address !=3D 0) { + return -1; + } + + *(parser->start_addr) =3D (line->data[0] << 24) | (line->data[1] <= < 16) | + (line->data[2] << 8) | (line->data[3]); + break; + + default: + return -1; + } + + return parser->total_size; +} + +/* return size or -1 if error */ +static int parse_hex_blob(const char *filename, hwaddr *addr, uint8_t *hex= _blob, + off_t hex_blob_size, uint8_t *bin_buf, + AddressSpace *as) +{ + bool in_process =3D false; /* avoid re-enter and + * check whether record begin with ':' */ + uint8_t *end =3D hex_blob + hex_blob_size; + uint8_t our_checksum =3D 0; + uint32_t record_index =3D 0; + HexParser parser =3D {0}; + parser.filename =3D filename; + parser.bin_buf =3D bin_buf; + parser.start_addr =3D addr; + parser.as =3D as; + + for (; hex_blob < end; ++hex_blob) { + switch (*hex_blob) { + case '\r': + case '\n': + if (!in_process) { + break; + } + + in_process =3D false; + if ((LEN_EXCEPT_DATA + parser.line.byte_count) * 2 !=3D + record_index || + our_checksum !=3D 0) { + return -1; + } + + if (handle_record_type(&parser) =3D=3D -1) { + return -1; + } + break; + + /* start of a new record. */ + case ':': + memset(&parser.line, 0, sizeof(HexLine)); + in_process =3D true; + record_index =3D 0; + break; + + /* decoding lines */ + default: + if (!parse_record(&parser.line, &our_checksum, *hex_blob, + &record_index, in_process)) { + return -1; + } + break; + } + } + return parser.total_size; +} + +/* return size or -1 if error */ +int load_targphys_hex_as(const char *filename, hwaddr *entry, AddressSpace= *as) +{ + off_t hex_blob_size; + uint8_t *hex_blob; + uint8_t *bin_buf; + int fd; + int total_size =3D 0; + + fd =3D open(filename, O_RDONLY); + if (fd < 0) { + return -1; + } + hex_blob_size =3D lseek(fd, 0, SEEK_END); + if (hex_blob_size < 0) { + close(fd); + return -1; + } + hex_blob =3D g_malloc(hex_blob_size); + bin_buf =3D g_malloc(hex_blob_size); + lseek(fd, 0, SEEK_SET); + if (read(fd, hex_blob, hex_blob_size) !=3D hex_blob_size) { + total_size =3D -1; + goto hex_parser_exit; + } + + total_size =3D + parse_hex_blob(filename, entry, hex_blob, hex_blob_size, bin_buf, = as); + +hex_parser_exit: + close(fd); + g_free(hex_blob); + g_free(bin_buf); + return total_size; +} diff --git a/include/hw/loader.h b/include/hw/loader.h index 5ed3fd8ae67a..ba82c9686ba3 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -28,6 +28,19 @@ ssize_t load_image_size(const char *filename, void *addr= , size_t size); int load_image_targphys_as(const char *filename, hwaddr addr, uint64_t max_sz, AddressSpace *as); =20 +/**load_image_targphys_hex_as: + * @filename: Path to the .hex file + * @entry: Store the entry point get from .hex file + * @max_sz: The maximum size of the .hex file to load + * @as: The AddressSpace to load the .hex file to. The value of + * address_space_memory is used if nothing is supplied here. + * + * Load a fixed .hex file into memory. + * + * Returns the size of the loaded .hex file on success, -1 otherwise. + */ +int load_targphys_hex_as(const char *filename, hwaddr *entry, AddressSpace= *as); + /** load_image_targphys: * Same as load_image_targphys_as(), but doesn't allow the caller to speci= fy * an AddressSpace. @@ -241,6 +254,8 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict); rom_add_file(_f, NULL, _a, _i, false, NULL, _as) #define rom_add_blob_fixed_as(_f, _b, _l, _a, _as) \ rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, _as, true) +#define rom_add_hex_blob_as(_f, _b, _l, _a, _as) \ + rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, _as, true) =20 #define PC_ROM_MIN_VGA 0xc0000 #define PC_ROM_MIN_OPTION 0xc8000 --=20 2.7.4