mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-12-02 00:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

target/mips: Style improvements in mips_mipssim.c

Browse Source 
Fixes mostly errors and warnings reported by 'checkpatch.pl -f'.

Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Reviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com>
Message-Id: <1566216496-17375-17-git-send-email-aleksandar.markovic@rt-rk.com>
This commit is contained in:
Aleksandar Markovic 2019-08-19 14:07:55 +02:00
parent 94818443cf
commit 33dd6f442d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/mips/mips_mipssim.c
View File

@ -3,7 +3,7 @@
* *
* Emulates a very simple machine model similar to the one used by the * Emulates a very simple machine model similar to the one used by the
* proprietary MIPS emulator. * proprietary MIPS emulator.
* *
* Copyright (c) 2007 Thiemo Seufer * Copyright (c) 2007 Thiemo Seufer
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
@ -76,8 +76,9 @@ static int64_t load_kernel(void)
(uint64_t *)&kernel_high, big_endian, (uint64_t *)&kernel_high, big_endian,
EM_MIPS, 1, 0); EM_MIPS, 1, 0);
if (kernel_size >= 0) { if (kernel_size >= 0) {
if ((entry & ~0x7fffffffULL) == 0x80000000) if ((entry & ~0x7fffffffULL) == 0x80000000) {
entry = (int32_t)entry; entry = (int32_t)entry;
}
} else { } else {
error_report("could not load kernel '%s': %s", error_report("could not load kernel '%s': %s",
loaderparams.kernel_filename, loaderparams.kernel_filename,
@ -89,9 +90,10 @@ static int64_t load_kernel(void)
initrd_size = 0; initrd_size = 0;
initrd_offset = 0; initrd_offset = 0;
if (loaderparams.initrd_filename) { if (loaderparams.initrd_filename) {
initrd_size = get_image_size (loaderparams.initrd_filename); initrd_size = get_image_size(loaderparams.initrd_filename);
if (initrd_size > 0) { if (initrd_size > 0) {
initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) &
INITRD_PAGE_MASK;
if (initrd_offset + initrd_size > loaderparams.ram_size) { if (initrd_offset + initrd_size > loaderparams.ram_size) {
error_report("memory too small for initial ram disk '%s'", error_report("memory too small for initial ram disk '%s'",
loaderparams.initrd_filename); loaderparams.initrd_filename);
@ -175,8 +177,9 @@ mips_mipssim_init(MachineState *machine)
/* Map the BIOS / boot exception handler. */ /* Map the BIOS / boot exception handler. */
memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);
/* Load a BIOS / boot exception handler image. */ /* Load a BIOS / boot exception handler image. */
if (bios_name == NULL) if (bios_name == NULL) {
bios_name = BIOS_FILENAME; bios_name = BIOS_FILENAME;
}
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (filename) { if (filename) {
bios_size = load_image_targphys(filename, 0x1fc00000LL, BIOS_SIZE); bios_size = load_image_targphys(filename, 0x1fc00000LL, BIOS_SIZE);
@ -212,8 +215,10 @@ mips_mipssim_init(MachineState *machine)
get_system_io(), 0, 0x00010000); get_system_io(), 0, 0x00010000);
memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa); memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa);
/* A single 16450 sits at offset 0x3f8. It is attached to /*
MIPS CPU INT2, which is interrupt 4. */ * A single 16450 sits at offset 0x3f8. It is attached to
* MIPS CPU INT2, which is interrupt 4.
*/
if (serial_hd(0)) if (serial_hd(0))
serial_init(0x3f8, env->irq[4], 115200, serial_hd(0), serial_init(0x3f8, env->irq[4], 115200, serial_hd(0),
get_system_io()); get_system_io());