From nobody Tue Nov 18 10:40:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707160; cv=none; d=zohomail.com; s=zohoarc; b=i/YSlDRXRWZyWCti3Fq1sOMjw7C0KNB442f4G+ygFJzHRXo6fOk2btV7nB0zb7vqj+/Q3K6kO+xO76y1KDqeljnnTVh0AeQJfIpqeRhm6s3HbcPsUo674gTzTb7r68J4iAVtmFkC5VxTJux7XTPToDsYASueCB+XzJ1VCZJ1Fqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707160; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D+Fl/Dw4XP4aoCncdK2UwY3/wzGCugYvGzMarlg1iC8=; b=Tg/MqLoo3WMeev2plbMIIynDmLBn9ond2UxZMHVFkQtiDfKsS4clZYwittDWXLQ5O/1wJleGolANLSlQNy3I+bK8/H3y/Yold6dV4I3H/20/Yv5kDhi/6Y75ckxic1awxc3w/1CU/BSHwsnBpHDYS+Em3w2K8ZmCWXs+JjKxDHM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1609707160822607.1076874172854; Sun, 3 Jan 2021 12:52:40 -0800 (PST) Received: by mail-wm1-f47.google.com with SMTP id c133so15948345wme.4 for ; Sun, 03 Jan 2021 12:52:40 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (194.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.194]) by smtp.gmail.com with ESMTPSA id g5sm85019499wro.60.2021.01.03.12.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:52:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D+Fl/Dw4XP4aoCncdK2UwY3/wzGCugYvGzMarlg1iC8=; b=pTqcQybfUzRheClpfoNh+tYTwYPB3I+xXKFwGBwHPKRVu6adzG5N3ioPEErbs8AoYa qILRZpG9MtfA38LX62bAvgOf4Vs8VIrKvzSArxjhuX6hkxOodRApI4inIOYq32nmyQoO rI1FxZGxnbCldwtAi5f08MIyUpW2msyGPAhJm+bAEpx2h0+tEaI3mtovMsZtDT1earOk Utq9rQc4jaDlplw0O50VS0/cQEWwprnT95ipq9Ixy0J0gGI+rBj0wBrurVPmTOMEk+K7 1bTi3JhqwmCv4lGt96gUweKBIxx5mZgZdnIE8E2hYEa7x1OR77e3CaVSBpmb/6HaAFia XjAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=D+Fl/Dw4XP4aoCncdK2UwY3/wzGCugYvGzMarlg1iC8=; b=HnJlqjaXWBJPzCVPj7Ezl/mwVlypILg0PtCG0KR51jTYtyfyF6gWVw99A4XOxdOSEn BTVfnVMSQdTjDCzBcBL1EVV8hDttSE4KaB5uFSr6GFpGwPpQfrzT7ZkfCyT27bdKlhkF Wo9LYcs3/Da5tBgTU+M6hIdd5ioXqNJcEq6PEEyHk5m4cijmDANkuaTzqwpatsyiAmy1 iI++8u27cW7ZyMq6Ja8MCR/wi3l0XGbPhvOYGwOeBnStcseNqQ/4WYIzBKPc+ECoNQ72 2N7qxK2U5FN7qbxNwq2vl2EN4t2b7qCfA2JvfCARr8JcTDDHHYrJZXxOcln0x6ChInhl 7JiQ== X-Gm-Message-State: AOAM532PHCRYJDZSKa50zhIlrdvTmmKOn3zgN17OQAsOuMe0hRFSqjWM 390pEnjfLo5UuEWxDoDse4s= X-Google-Smtp-Source: ABdhPJxBLMd1TrbIQvIMvz4IAbq0BX06B9javWRCgrTuxXejbrdUC03xLUmBOl0DJsqeeR+e6trC1Q== X-Received: by 2002:a1c:4954:: with SMTP id w81mr23981942wma.60.1609707159005; Sun, 03 Jan 2021 12:52:39 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 28/35] hw/mips: Make bootloader addresses unsigned Date: Sun, 3 Jan 2021 21:50:14 +0100 Message-Id: <20210103205021.2837760-29-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103205021.2837760-1-f4bug@amsat.org> References: <20210103205021.2837760-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Jiaxun Yang Address should be unsigned anyway, otherwise it may carry calculations wrongly. Signed-off-by: Jiaxun Yang Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201215064200.28751-2-jiaxun.yang@flygoat.com> [PMD: Fixed typo and convert hw/mips/mipssim.c too] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/fuloong2e.c | 12 ++++++------ hw/mips/malta.c | 22 +++++++++++----------- hw/mips/mipssim.c | 8 ++++---- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index e5d08669069..804bef94cda 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -107,9 +107,9 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *prom_= buf, int index, va_end(ap); } =20 -static int64_t load_kernel(CPUMIPSState *env) +static uint64_t load_kernel(CPUMIPSState *env) { - int64_t kernel_entry, kernel_high, initrd_size; + uint64_t kernel_entry, kernel_high, initrd_size; int index =3D 0; long kernel_size; ram_addr_t initrd_offset; @@ -118,8 +118,8 @@ static int64_t load_kernel(CPUMIPSState *env) =20 kernel_size =3D load_elf(loaderparams.kernel_filename, NULL, cpu_mips_kseg0_to_phys, NULL, - (uint64_t *)&kernel_entry, NULL, - (uint64_t *)&kernel_high, NULL, + &kernel_entry, NULL, + &kernel_high, NULL, 0, EM_MIPS, 1, 0); if (kernel_size < 0) { error_report("could not load kernel '%s': %s", @@ -180,7 +180,7 @@ static int64_t load_kernel(CPUMIPSState *env) } =20 static void write_bootloader(CPUMIPSState *env, uint8_t *base, - int64_t kernel_addr) + uint64_t kernel_addr) { uint32_t *p; =20 @@ -299,7 +299,7 @@ static void mips_fuloong2e_init(MachineState *machine) MemoryRegion *bios =3D g_new(MemoryRegion, 1); long bios_size; uint8_t *spd_data; - int64_t kernel_entry; + uint64_t kernel_entry; PCIDevice *pci_dev; PCIBus *pci_bus; ISABus *isa_bus; diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 366f4fdfcde..7db009a3e96 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -616,8 +616,8 @@ static void network_init(PCIBus *pci_bus) } } =20 -static void write_bootloader_nanomips(uint8_t *base, int64_t run_addr, - int64_t kernel_entry) +static void write_bootloader_nanomips(uint8_t *base, uint64_t run_addr, + uint64_t kernel_entry) { uint16_t *p; =20 @@ -840,8 +840,8 @@ static void write_bootloader_nanomips(uint8_t *base, in= t64_t run_addr, * a2 - 32-bit address of the environment variables table * a3 - RAM size in bytes */ -static void write_bootloader(uint8_t *base, int64_t run_addr, - int64_t kernel_entry) +static void write_bootloader(uint8_t *base, uint64_t run_addr, + uint64_t kernel_entry) { uint32_t *p; =20 @@ -1003,7 +1003,7 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *pro= m_buf, int index, const char *string, ...) { va_list ap; - int32_t table_addr; + uint32_t table_addr; =20 if (index >=3D ENVP_NB_ENTRIES) { return; @@ -1014,7 +1014,7 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *pro= m_buf, int index, return; } =20 - table_addr =3D sizeof(int32_t) * ENVP_NB_ENTRIES + index * ENVP_ENTRY_= SIZE; + table_addr =3D sizeof(uint32_t) * ENVP_NB_ENTRIES + index * ENVP_ENTRY= _SIZE; prom_buf[index] =3D tswap32(ENVP_ADDR + table_addr); =20 va_start(ap, string); @@ -1023,9 +1023,9 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *pro= m_buf, int index, } =20 /* Kernel */ -static int64_t load_kernel(void) +static uint64_t load_kernel(void) { - int64_t kernel_entry, kernel_high, initrd_size; + uint64_t kernel_entry, kernel_high, initrd_size; long kernel_size; ram_addr_t initrd_offset; int big_endian; @@ -1042,8 +1042,8 @@ static int64_t load_kernel(void) =20 kernel_size =3D load_elf(loaderparams.kernel_filename, NULL, cpu_mips_kseg0_to_phys, NULL, - (uint64_t *)&kernel_entry, NULL, - (uint64_t *)&kernel_high, NULL, big_endian, EM_= MIPS, + &kernel_entry, NULL, + &kernel_high, NULL, big_endian, EM_MIPS, 1, 0); if (kernel_size < 0) { error_report("could not load kernel '%s': %s", @@ -1234,7 +1234,7 @@ void mips_malta_init(MachineState *machine) MemoryRegion *bios, *bios_copy =3D g_new(MemoryRegion, 1); const size_t smbus_eeprom_size =3D 8 * 256; uint8_t *smbus_eeprom_buf =3D g_malloc0(smbus_eeprom_size); - int64_t kernel_entry, bootloader_run_addr; + uint64_t kernel_entry, bootloader_run_addr; PCIBus *pci_bus; ISABus *isa_bus; qemu_irq cbus_irq, i8259_irq; diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c index f2e62735255..f5d0da05aa1 100644 --- a/hw/mips/mipssim.c +++ b/hw/mips/mipssim.c @@ -60,9 +60,9 @@ typedef struct ResetData { uint64_t vector; } ResetData; =20 -static int64_t load_kernel(void) +static uint64_t load_kernel(void) { - int64_t entry, kernel_high, initrd_size; + uint64_t entry, kernel_high, initrd_size; long kernel_size; ram_addr_t initrd_offset; int big_endian; @@ -75,8 +75,8 @@ static int64_t load_kernel(void) =20 kernel_size =3D load_elf(loaderparams.kernel_filename, NULL, cpu_mips_kseg0_to_phys, NULL, - (uint64_t *)&entry, NULL, - (uint64_t *)&kernel_high, NULL, big_endian, + &entry, NULL, + &kernel_high, NULL, big_endian, EM_MIPS, 1, 0); if (kernel_size < 0) { error_report("could not load kernel '%s': %s", --=20 2.26.2