From nobody Tue Apr 30 03:58:41 2024 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 1522768786809907.5103859849131; Tue, 3 Apr 2018 08:19:46 -0700 (PDT) Received: from localhost ([::1]:42178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3Nir-0004gj-5k for importer@patchew.org; Tue, 03 Apr 2018 11:19:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3Ngb-0003Yc-VL for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:17:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3NgX-0004Um-Ut for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:17:25 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:60030 helo=cstnet.cn) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3NgX-0004Ow-2n for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:17:21 -0400 Received: from Water.lan (unknown [124.16.136.100]) by APP-01 (Coremail) with SMTP id qwCowABnbHb6msNavr11Cg--.1182S4; Tue, 03 Apr 2018 23:17:14 +0800 (CST) From: Su Hang To: stefanha@gmail.com, jim@groklearning.com, joel@jms.id.au, qemu-devel@nongnu.org Date: Tue, 3 Apr 2018 23:17:12 +0800 Message-Id: <1522768634-5548-2-git-send-email-suhang16@mails.ucas.ac.cn> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522768634-5548-1-git-send-email-suhang16@mails.ucas.ac.cn> References: <1522768634-5548-1-git-send-email-suhang16@mails.ucas.ac.cn> X-CM-TRANSID: qwCowABnbHb6msNavr11Cg--.1182S4 X-Coremail-Antispam: 1UD129KBjvJXoW3ArW3AFW7Wr43Ar1rAFy8Grg_yoWDGryDpF ZxGrs8Jrs7trW3ZFZxJr1UuFy5CFZ5Ja43WFy8Ww1FkFs3XwnFya4jkry3uay5KrykZw43 WFZ8WFW5GasxJaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPFb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIE c7CjxVAFwI0_Cr1j6rxdM2vYz4IE04k24VAvwVAKI4IrM2AIxVAIcxkEcVAq07x20xvEnc xIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E 87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4 AK67AK6ryrMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8C rVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtw CIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x02 67AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr 0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUk89N UUUUU X-CM-SenderInfo: pvxkt0rjrwqzpdlo2hpxfd2hldfou0/ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 159.226.251.21 Subject: [Qemu-devel] [PATCH 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: , 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 Arduino, ARM, STM32, etc. Suggested-by: Stefan Hajnoczi Signed-off-by: Su Hang --- hw/arm/boot.c | 9 +- hw/core/loader.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++ include/hw/loader.h | 17 ++++ 3 files changed, 305 insertions(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 9319b12fcd2a..07ce54e5936d 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -1060,8 +1060,15 @@ static void arm_load_kernel_notify(Notifier *notifie= r, void *data) kernel_size =3D load_aarch64_image(info->kernel_filename, info->loader_start, &entry, as); is_linux =3D 1; + } else if (kernel_size < 0 && strstr(info->kernel_filename, ".hex")) { + /* 32-bit ARM .hex file */ + entry =3D info->loader_start + KERNEL_LOAD_ADDR; + kernel_size =3D load_targphys_hex_as(info->kernel_filename, entry, + info->ram_size - KERNEL_LOAD_AD= DR, + as); + is_linux =3D 1; } else if (kernel_size < 0) { - /* 32-bit ARM */ + /* 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..126832c4243c 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1286,3 +1286,283 @@ 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, +}; + +typedef union HexLine HexLine; +union HexLine { + uint8_t buf[0x25]; + struct __attribute__((packed)) { + uint8_t byte_count; + uint16_t address; + uint8_t record_type; + uint8_t data[0x25 - 0x5]; + uint8_t checksum; + }; +}; + +static uint8_t ctoh(char c) +{ + return (c & 0x10) ? /*0-9*/ c & 0xf : /*A-F, a-f*/ (c & 0xf) + 9; +} + +static uint8_t validate_checksum(HexLine *record) +{ + uint8_t result =3D 0, i =3D 0; + + for (; i < (record->byte_count + 5); ++i) { + result +=3D record->buf[i]; + } + + return result =3D=3D 0; +} + +/* return pointer of bin_blob or NULL if error */ +static uint8_t *parse_hex_blob(char *filename, size_t *p_size) +{ + int fd; + off_t hex_blob_size; + uint8_t *p_data =3D NULL; + uint8_t *hex_blob; + uint8_t *hex_blob_ori; /* used to free temporary memory */ + uint8_t *bin_buf; + uint8_t *end; + uint8_t idx =3D 0; + uint8_t in_process =3D 0; /* avoid re-enter */ + uint8_t low_nibble =3D 0; /* process two hex char into 8-bits */ + uint8_t ext_linear_record =3D 0; /* record non-constitutes block */ + uint32_t next_address_to_write =3D 0; + uint32_t current_address =3D 0; + uint32_t last_address =3D 0; + HexLine line =3D {0}; + + fd =3D open(filename, O_RDONLY); + if (fd < 0) { + return NULL; + } + hex_blob_size =3D lseek(fd, 0, SEEK_END); + if (hex_blob_size < 0) { + close(fd); + return NULL; + } + hex_blob =3D g_malloc(hex_blob_size); + hex_blob_ori =3D hex_blob; + bin_buf =3D g_malloc(hex_blob_size * 2); + lseek(fd, 0, SEEK_SET); + if (read(fd, hex_blob, hex_blob_size) !=3D hex_blob_size) { + close(fd); + goto hex_parser_exit; + } + close(fd); + + memset(line.buf, 0, sizeof(HexLine)); + end =3D (uint8_t *)hex_blob + hex_blob_size; + + do { + switch ((uint8_t)(*hex_blob)) { + case '\r': + case '\n': + if (!in_process) { + break; + } + + in_process =3D 0; + if (validate_checksum(&line) =3D=3D 0) { + p_data =3D NULL; + goto hex_parser_exit; + } + + line.address =3D bswap16(line.address); + switch (line.record_type) { + case DATA_RECORD: + current_address =3D + (next_address_to_write & 0xffff0000) | line.address; + /* verify this is a continous block of memory */ + if (current_address !=3D next_address_to_write || + ext_linear_record) { + if (!ext_linear_record) { + /* Store next address to write */ + last_address =3D next_address_to_write; + next_address_to_write =3D current_address; + } + ext_linear_record =3D 0; + memset(bin_buf + last_address, 0x0, + current_address - last_address); + } + + /* copy from line buffer to output bin_buf */ + memcpy((uint8_t *)bin_buf + current_address, + (uint8_t *)line.data, line.byte_count); + /* Save next address to write */ + last_address =3D current_address; + next_address_to_write =3D current_address + line.byte_coun= t; + break; + + case EOF_RECORD: + /* nothing to do */ + break; + case EXT_SEG_ADDR_RECORD: + /* save next address to write, + * in case of non-continous block of memory */ + ext_linear_record =3D 1; + last_address =3D next_address_to_write; + next_address_to_write =3D + ((line.data[0] << 12) | (line.data[1] << 4)); + break; + case START_SEG_ADDR_RECORD: + /* TODO */ + break; + + case EXT_LINEAR_ADDR_RECORD: + /* save next address to write, + * in case of non-continous block of memory */ + ext_linear_record =3D 1; + last_address =3D next_address_to_write; + next_address_to_write =3D + ((line.data[0] << 24) | (line.data[1] << 16)); + break; + case START_LINEAR_ADDR_RECORD: + /* TODO */ + break; + + default: + p_data =3D NULL; + goto hex_parser_exit; + } + break; + + /* start of a new record. */ + case ':': + memset(line.buf, 0, sizeof(HexLine)); + in_process =3D 1; + low_nibble =3D 0; + idx =3D 0; + break; + + /* decoding lines */ + default: + if (low_nibble) { + line.buf[idx] |=3D ctoh((uint8_t)(*hex_blob)) & 0xf; + ++idx; + } else { + line.buf[idx] =3D ctoh((uint8_t)(*hex_blob)) << 4; + } + + low_nibble =3D !low_nibble; + break; + } + + } while (++hex_blob !=3D end); + + *p_size =3D (size_t)next_address_to_write; + p_data =3D g_malloc(next_address_to_write); + + memcpy(p_data, bin_buf, next_address_to_write); +hex_parser_exit: + g_free(hex_blob_ori); + g_free(bin_buf); + return p_data; +} + +/* return size or -1 if error */ +int load_targphys_hex_as(const char *filename, hwaddr addr, uint64_t max_s= z, + AddressSpace *as) +{ + return rom_add_hex_file(filename, NULL, addr, -1, false, NULL, as); +} + +/* return size -1 if error */ +int rom_add_hex_file(const char *file, const char *fw_dir, hwaddr addr, + int32_t bootindex, bool option_rom, MemoryRegion *mr, + AddressSpace *as) +{ + MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); + Rom *rom; + char devpath[100]; + size_t datasize =3D 0; + + if (as && mr) { + fprintf(stderr, "Specifying an Address Space and Memory Region is " + "not valid when loading a rom\n"); + /* We haven't allocated anything so we don't need any cleanup */ + return -1; + } + + rom =3D g_malloc0(sizeof(*rom)); + rom->name =3D g_strdup(file); + rom->path =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, rom->name); + rom->as =3D as; + if (rom->path =3D=3D NULL) { + rom->path =3D g_strdup(file); + } + + rom->data =3D parse_hex_blob(rom->path, &datasize); + if (rom->data =3D=3D NULL) { + fprintf(stderr, "failed to parse hex file '%s': %s\n", rom->path, + strerror(errno)); + goto err; + } + rom->datasize =3D datasize; + + if (fw_dir) { + rom->fw_dir =3D g_strdup(fw_dir); + rom->fw_file =3D g_strdup(file); + } + rom->addr =3D addr; + rom->romsize =3D rom->datasize; + + rom_insert(rom); + + if (rom->fw_file && fw_cfg) { + const char *basename; + char fw_file_name[FW_CFG_MAX_FILE_PATH]; + void *data; + + basename =3D strrchr(rom->fw_file, '/'); + if (basename) { + ++basename; + } else { + basename =3D rom->fw_file; + } + snprintf(fw_file_name, sizeof(fw_file_name), "%s/%s", rom->fw_dir, + basename); + snprintf(devpath, sizeof(devpath), "/rom@%s", fw_file_name); + + if ((!option_rom || mc->option_rom_has_mr) && mc->rom_file_has_mr)= { + data =3D rom_set_mr(rom, OBJECT(fw_cfg), devpath, true); + } else { + data =3D rom->data; + } + + fw_cfg_add_file(fw_cfg, fw_file_name, data, rom->romsize); + } else { + if (mr) { + rom->mr =3D mr; + snprintf(devpath, sizeof(devpath), "/rom@%s", file); + } else { + snprintf(devpath, sizeof(devpath), "/rom@" TARGET_FMT_plx, add= r); + } + } + + add_boot_device_path(bootindex, NULL, devpath); + return rom->datasize; + +err: + g_free(rom->path); + g_free(rom->name); + if (fw_dir) { + g_free(rom->fw_dir); + g_free(rom->fw_file); + } + g_free(rom); + + return -1; +} diff --git a/include/hw/loader.h b/include/hw/loader.h index 5ed3fd8ae67a..176b11221a27 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -28,6 +28,20 @@ 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 + * @addr: Address to load the .hex file to + * @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 addr, uint64_t max_sz, AddressSpace *as); + /** load_image_targphys: * Same as load_image_targphys_as(), but doesn't allow the caller to speci= fy * an AddressSpace. @@ -210,6 +224,9 @@ void pstrcpy_targphys(const char *name, extern bool option_rom_has_mr; extern bool rom_file_has_mr; =20 +int rom_add_hex_file(const char *file, const char *fw_dir, + hwaddr addr, int32_t bootindex, + bool option_rom, MemoryRegion *mr, AddressSpace *as); int rom_add_file(const char *file, const char *fw_dir, hwaddr addr, int32_t bootindex, bool option_rom, MemoryRegion *mr, AddressSpace *as); --=20 2.7.4 From nobody Tue Apr 30 03:58:41 2024 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 1522768786728623.1965888772969; Tue, 3 Apr 2018 08:19:46 -0700 (PDT) Received: from localhost ([::1]:42177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3Nip-0004gK-A3 for importer@patchew.org; Tue, 03 Apr 2018 11:19:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3Ngb-0003Yb-VK for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:17:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3NgX-0004UQ-Sw for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:17:25 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:60045 helo=cstnet.cn) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3NgX-0004P7-6W for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:17:21 -0400 Received: from Water.lan (unknown [124.16.136.100]) by APP-01 (Coremail) with SMTP id qwCowABnbHb6msNavr11Cg--.1182S6; Tue, 03 Apr 2018 23:17:16 +0800 (CST) From: Su Hang To: stefanha@gmail.com, jim@groklearning.com, joel@jms.id.au, qemu-devel@nongnu.org Date: Tue, 3 Apr 2018 23:17:14 +0800 Message-Id: <1522768634-5548-4-git-send-email-suhang16@mails.ucas.ac.cn> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522768634-5548-1-git-send-email-suhang16@mails.ucas.ac.cn> References: <1522768634-5548-1-git-send-email-suhang16@mails.ucas.ac.cn> X-CM-TRANSID: qwCowABnbHb6msNavr11Cg--.1182S6 X-Coremail-Antispam: 1UD129KBjvJXoWxAw15WF1DJF4kAF1fKFy7GFg_yoWrCr4xpw nxtrWSkF4xtF1fJw4fKrnrGF1rArZ7A3Z8CFW3Jr18uFWfZryDCr1fKryUJr4fGa1qvryf A3ZYqF1fKFn7XaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUP2b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIE c7CjxVAFwI0_Cr1j6rxdM2vYz4IE04k24VAvwVAKI4IrM2AIxVAIcxkEcVAq07x20xvEnc xIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E 87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4 AK67AK6ryrMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8C rVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtw CIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x02 67AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr 0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUY-X o7UUUUU== X-CM-SenderInfo: pvxkt0rjrwqzpdlo2hpxfd2hldfou0/ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 159.226.251.21 Subject: [Qemu-devel] [PATCH 2/2] Add QTest testcase for the 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: , 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" 'test.hex' file is a bare metal ARM software stored in Hexadecimal Object Format. When it's loaded by QEMU, it will print "Hello world!\n" on console. `pre_store` array in 'hexloader-test.c' file, stores the binary format of 'test.hex' file, which is used to verify correctness. Signed-off-by: Su Hang --- tests/Makefile.include | 2 ++ tests/hexloader-test.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ tests/test.hex | 11 ++++++++++ 3 files changed, 69 insertions(+) create mode 100644 tests/hexloader-test.c create mode 100644 tests/test.hex diff --git a/tests/Makefile.include b/tests/Makefile.include index 3b9a5e31a2c2..f4a3e71f34ee 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -380,6 +380,7 @@ check-qtest-arm-y +=3D tests/test-arm-mptimer$(EXESUF) gcov-files-arm-y +=3D hw/timer/arm_mptimer.c check-qtest-arm-y +=3D tests/boot-serial-test$(EXESUF) check-qtest-arm-y +=3D tests/sdhci-test$(EXESUF) +check-qtest-arm-y +=3D tests/hexloader-test$(EXESUF) =20 check-qtest-aarch64-y =3D tests/numa-test$(EXESUF) check-qtest-aarch64-y +=3D tests/sdhci-test$(EXESUF) @@ -755,6 +756,7 @@ tests/qmp-test$(EXESUF): tests/qmp-test.o tests/device-introspect-test$(EXESUF): tests/device-introspect-test.o tests/rtc-test$(EXESUF): tests/rtc-test.o tests/m48t59-test$(EXESUF): tests/m48t59-test.o +tests/hexloader-test$(EXESUF): tests/hexloader-test.o tests/endianness-test$(EXESUF): tests/endianness-test.o tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y) tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y) diff --git a/tests/hexloader-test.c b/tests/hexloader-test.c new file mode 100644 index 000000000000..b1a491dcd9de --- /dev/null +++ b/tests/hexloader-test.c @@ -0,0 +1,56 @@ +/* + * QTest testcase for the Intel Hexadecimal Object File Loader + * + * Authors: + * Su Hang 2018 + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "libqtest.h" + +#define BIN_SIZE 146 + +static unsigned char pre_store[BIN_SIZE] =3D { + 4, 208, 159, 229, 22, 0, 0, 235, 254, 255, 255, 234, 152, 16, = 1, + 0, 4, 176, 45, 229, 0, 176, 141, 226, 12, 208, 77, 226, 8, = 0, + 11, 229, 6, 0, 0, 234, 8, 48, 27, 229, 0, 32, 211, 229, = 44, + 48, 159, 229, 0, 32, 131, 229, 8, 48, 27, 229, 1, 48, 131, = 226, + 8, 48, 11, 229, 8, 48, 27, 229, 0, 48, 211, 229, 0, 0, = 83, + 227, 244, 255, 255, 26, 0, 0, 160, 225, 0, 208, 139, 226, 4, = 176, + 157, 228, 30, 255, 47, 225, 0, 16, 31, 16, 0, 72, 45, 233, = 4, + 176, 141, 226, 8, 0, 159, 229, 230, 255, 255, 235, 0, 0, 160, = 225, + 0, 136, 189, 232, 132, 0, 1, 0, 0, 16, 31, 16, 72, 101, = 108, + 108, 111, 32, 119, 111, 114, 108, 100, 33, 10, 0}; + +/* success if no crash or abort */ +static void hex_loader_test(void) +{ + unsigned int i; + unsigned char memory_content[BIN_SIZE]; + const unsigned int base_addr =3D 0x00010000; + + QTestState *s =3D qtest_startf( + "-M versatilepb -m 128M -nographic -kernel ../tests/test.hex"); + + for (i =3D 0; i < BIN_SIZE; ++i) { + memory_content[i] =3D qtest_readb(s, base_addr + i); + g_assert_cmpuint(memory_content[i], =3D=3D, pre_store[i]); + } + qtest_quit(s); +} + +int main(int argc, char **argv) +{ + int ret; + + g_test_init(&argc, &argv, NULL); + + qtest_add_func("/tmp/hex_loader", hex_loader_test); + ret =3D g_test_run(); + + return ret; +} diff --git a/tests/test.hex b/tests/test.hex new file mode 100644 index 000000000000..59b96e3e6fa7 --- /dev/null +++ b/tests/test.hex @@ -0,0 +1,11 @@ +:1000000004D09FE5160000EBFEFFFFEA9810010008 +:1000100004B02DE500B08DE20CD04DE208000BE5F8 +:10002000060000EA08301BE50020D3E52C309FE5F0 +:10003000002083E508301BE5013083E208300BE542 +:1000400008301BE50030D3E5000053E3F4FFFF1A4E +:100050000000A0E100D08BE204B09DE41EFF2FE180 +:1000600000101F1000482DE904B08DE208009FE544 +:10007000E6FFFFEB0000A0E10088BDE8840001007E +:1000800000101F1048656C6C6F20776F726C6421D4 +:020090000A0064 +:00000001FF --=20 2.7.4 From nobody Tue Apr 30 03:58:41 2024 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 1522769071754203.30927423299636; Tue, 3 Apr 2018 08:24:31 -0700 (PDT) Received: from localhost ([::1]:42452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3NnS-0008LQ-Tw for importer@patchew.org; Tue, 03 Apr 2018 11:24:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3Ngb-0003YY-UI for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:17:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3NgX-0004UF-Rd for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:17:25 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:60025 helo=cstnet.cn) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3NgX-0004Oo-5i for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:17:21 -0400 Received: from Water.lan (unknown [124.16.136.100]) by APP-01 (Coremail) with SMTP id qwCowABnbHb6msNavr11Cg--.1182S5; Tue, 03 Apr 2018 23:17:15 +0800 (CST) From: Su Hang To: stefanha@gmail.com, jim@groklearning.com, joel@jms.id.au, qemu-devel@nongnu.org Date: Tue, 3 Apr 2018 23:17:13 +0800 Message-Id: <1522768634-5548-3-git-send-email-suhang16@mails.ucas.ac.cn> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522768634-5548-1-git-send-email-suhang16@mails.ucas.ac.cn> References: <1522768634-5548-1-git-send-email-suhang16@mails.ucas.ac.cn> X-CM-TRANSID: qwCowABnbHb6msNavr11Cg--.1182S5 X-Coremail-Antispam: 1UD129KBjvJXoW7Zr15WrWxZF1DAryxtFyDtrb_yoW8urWrpF 48Ka1fZrWUKF1xta9xAw18JF45W39ayrWftr9xWF1YvF9xKr48JFZ3tr15tFWUXrnxCay3 Xa10y3ya9F129a7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUP2b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIE c7CjxVAFwI0_Cr1j6rxdM2vYz4IE04k24VAvwVAKI4IrM2AIxVAIcxkEcVAq07x20xvEnc xIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E 87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4 AK67AK6ryrMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8C rVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtw CIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x02 67AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr 0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUYoM KtUUUUU== X-CM-SenderInfo: pvxkt0rjrwqzpdlo2hpxfd2hldfou0/ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 159.226.251.21 Subject: [Qemu-devel] [PATCH v2] scripts/checkpatch.pl: Bug fix 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: , 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" checkpatch.pl stops complaining about following pattern: """ do { //do somethins; } while (conditions); """ One things need to be mentioned: Becasue `if`, `while` and `for` check have been done in this `if` block(Line: 2356), and this block contains following statement: """ Line: 2379 $suppress_ifbraces{$ln + $offset} =3D 1; """ So the behind block may never run: """ Line: 2415 if (!defined $suppress_ifbraces{$linenr - 1} && $line =3D~ /\b(if|while|for|else)\b/ && $line !~ /\#\s*if/ && $line !~ /\#\s*else/) { """ I'm not sure, please give me some advice. (Sorry, I don't know this patch should base on which commit, so I generate this patch based on commit:fb8446d94ec7a3dc0c3a7e7da672406476f075ac, I choose this by `git log -2 scripts/checkpath.pl`. Sincerely say sorry, if I have misunderstand any meaning.) Signed-off-by: Su Hang --- scripts/checkpatch.pl | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index a88af61ed4ee..d6f0747ba20a 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2352,8 +2352,22 @@ sub process { } } -# check for missing bracing round if etc - if ($line =3D~ /(^.*)\bif\b/ && $line !~ /\#\s*if/) { +# check for missing bracing around if etc + if ($line =3D~ /(^.*)\b(?:if|while|for)\b/ && + $line !~ /\#\s*if/) { + my $allowed =3D 0; + + # Check the pre-context. + if ($line =3D~ /(\}.*?)$/) { + my $pre =3D $1; + + if ($line !~ /else/) { + print "APW: ALLOWED: pre<$pre> line<$line>\n" + if $dbg_adv_apw; + $allowed =3D 1; + } + } + my ($level, $endln, @chunks) =3D ctx_statement_full($linenr, $realcnt, 1); if ($dbg_adv_apw) { @@ -2362,7 +2376,6 @@ sub process { if $#chunks >=3D 1; } if ($#chunks >=3D 0 && $level =3D=3D 0) { - my $allowed =3D 0; my $seen =3D 0; my $herectx =3D $here . "\n"; my $ln =3D $linenr - 1; @@ -2406,7 +2419,7 @@ sub process { $allowed =3D 1; } } - if ($seen !=3D ($#chunks + 1)) { + if ($seen !=3D ($#chunks + 1) && !$allowed) { ERROR("braces {} are necessary for all arms of this statement\n" . $h= erectx); } } -- 2.7.4