OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/mips: Make bootloader addresses unsigned 

Address should be unsigned anyway, otherwise it may carry
calculations wrongly.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
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é <f4bug@amsat.org>
This commit is contained in:
Jiaxun Yang 2020-12-15 14:41:53 +08:00 committed by Philippe Mathieu-Daudé
parent c7784e42c7
commit dde989943b
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/mips/fuloong2e.c
View File

@ -107,9 +107,9 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *prom_buf, int index,
va_end(ap); va_end(ap);
} }
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 = 0; int index = 0;
long kernel_size; long kernel_size;
ram_addr_t initrd_offset; ram_addr_t initrd_offset;
@ -118,8 +118,8 @@ static int64_t load_kernel(CPUMIPSState *env)
kernel_size = load_elf(loaderparams.kernel_filename, NULL, kernel_size = load_elf(loaderparams.kernel_filename, NULL,
cpu_mips_kseg0_to_phys, NULL, cpu_mips_kseg0_to_phys, NULL,
(uint64_t *)&kernel_entry, NULL, &kernel_entry, NULL,
(uint64_t *)&kernel_high, NULL, &kernel_high, NULL,
0, EM_MIPS, 1, 0); 0, EM_MIPS, 1, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("could not load kernel '%s': %s", error_report("could not load kernel '%s': %s",
@ -180,7 +180,7 @@ static int64_t load_kernel(CPUMIPSState *env)
} }
static void write_bootloader(CPUMIPSState *env, uint8_t *base, static void write_bootloader(CPUMIPSState *env, uint8_t *base,
int64_t kernel_addr) uint64_t kernel_addr)
{ {
uint32_t *p; uint32_t *p;
@ -299,7 +299,7 @@ static void mips_fuloong2e_init(MachineState *machine)
MemoryRegion *bios = g_new(MemoryRegion, 1); MemoryRegion *bios = g_new(MemoryRegion, 1);
long bios_size; long bios_size;
uint8_t *spd_data; uint8_t *spd_data;
int64_t kernel_entry; uint64_t kernel_entry;
PCIDevice *pci_dev; PCIDevice *pci_dev;
PCIBus *pci_bus; PCIBus *pci_bus;
ISABus *isa_bus; ISABus *isa_bus;

22
hw/mips/malta.c
View File

@ -616,8 +616,8 @@ static void network_init(PCIBus *pci_bus)
} }
} }
static void write_bootloader_nanomips(uint8_t *base, int64_t run_addr, static void write_bootloader_nanomips(uint8_t *base, uint64_t run_addr,
int64_t kernel_entry) uint64_t kernel_entry)
{ {
uint16_t *p; uint16_t *p;
@ -840,8 +840,8 @@ static void write_bootloader_nanomips(uint8_t *base, int64_t run_addr,
* a2 - 32-bit address of the environment variables table * a2 - 32-bit address of the environment variables table
* a3 - RAM size in bytes * a3 - RAM size in bytes
*/ */
static void write_bootloader(uint8_t *base, int64_t run_addr, static void write_bootloader(uint8_t *base, uint64_t run_addr,
int64_t kernel_entry) uint64_t kernel_entry)
{ {
uint32_t *p; uint32_t *p;
@ -1003,7 +1003,7 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *prom_buf, int index,
const char *string, ...) const char *string, ...)
{ {
va_list ap; va_list ap;
int32_t table_addr; uint32_t table_addr;
if (index >= ENVP_NB_ENTRIES) { if (index >= ENVP_NB_ENTRIES) {
return; return;
@ -1014,7 +1014,7 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *prom_buf, int index,
return; return;
} }
table_addr = sizeof(int32_t) * ENVP_NB_ENTRIES + index * ENVP_ENTRY_SIZE; table_addr = sizeof(uint32_t) * ENVP_NB_ENTRIES + index * ENVP_ENTRY_SIZE;
prom_buf[index] = tswap32(ENVP_ADDR + table_addr); prom_buf[index] = tswap32(ENVP_ADDR + table_addr);
va_start(ap, string); va_start(ap, string);
@ -1023,9 +1023,9 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *prom_buf, int index,
} }
/* Kernel */ /* 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; long kernel_size;
ram_addr_t initrd_offset; ram_addr_t initrd_offset;
int big_endian; int big_endian;
@ -1042,8 +1042,8 @@ static int64_t load_kernel(void)
kernel_size = load_elf(loaderparams.kernel_filename, NULL, kernel_size = load_elf(loaderparams.kernel_filename, NULL,
cpu_mips_kseg0_to_phys, NULL, cpu_mips_kseg0_to_phys, NULL,
(uint64_t *)&kernel_entry, NULL, &kernel_entry, NULL,
(uint64_t *)&kernel_high, NULL, big_endian, EM_MIPS, &kernel_high, NULL, big_endian, EM_MIPS,
1, 0); 1, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("could not load kernel '%s': %s", error_report("could not load kernel '%s': %s",
@ -1234,7 +1234,7 @@ void mips_malta_init(MachineState *machine)
MemoryRegion *bios, *bios_copy = g_new(MemoryRegion, 1); MemoryRegion *bios, *bios_copy = g_new(MemoryRegion, 1);
const size_t smbus_eeprom_size = 8 * 256; const size_t smbus_eeprom_size = 8 * 256;
uint8_t *smbus_eeprom_buf = g_malloc0(smbus_eeprom_size); uint8_t *smbus_eeprom_buf = g_malloc0(smbus_eeprom_size);
int64_t kernel_entry, bootloader_run_addr; uint64_t kernel_entry, bootloader_run_addr;
PCIBus *pci_bus; PCIBus *pci_bus;
ISABus *isa_bus; ISABus *isa_bus;
qemu_irq cbus_irq, i8259_irq; qemu_irq cbus_irq, i8259_irq;

8
hw/mips/mipssim.c
View File

@ -60,9 +60,9 @@ typedef struct ResetData {
uint64_t vector; uint64_t vector;
} ResetData; } ResetData;
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; long kernel_size;
ram_addr_t initrd_offset; ram_addr_t initrd_offset;
int big_endian; int big_endian;
@ -75,8 +75,8 @@ static int64_t load_kernel(void)
kernel_size = load_elf(loaderparams.kernel_filename, NULL, kernel_size = load_elf(loaderparams.kernel_filename, NULL,
cpu_mips_kseg0_to_phys, NULL, cpu_mips_kseg0_to_phys, NULL,
(uint64_t *)&entry, NULL, &entry, NULL,
(uint64_t *)&kernel_high, NULL, big_endian, &kernel_high, NULL, big_endian,
EM_MIPS, 1, 0); EM_MIPS, 1, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("could not load kernel '%s': %s", error_report("could not load kernel '%s': %s",