Re: [Qemu-devel] [PATCH v5 3/4] Add sample moxie system

[Blue Swirl]

On Thu, Feb 28, 2013 at 5:41 PM, Anthony Green <address@hidden> wrote:
>
> Signed-off-by: Anthony Green <address@hidden>
> ---
>  hw/moxie/Makefile.objs     |   6 ++
>  hw/moxie/moxiesim.c        | 175 
> +++++++++++++++++++++++++++++++++++++++++++++
>  include/sysemu/arch_init.h |   1 +
>  3 files changed, 182 insertions(+)
>  create mode 100644 hw/moxie/Makefile.objs
>  create mode 100644 hw/moxie/moxiesim.c
>
> diff --git a/hw/moxie/Makefile.objs b/hw/moxie/Makefile.objs
> new file mode 100644
> index 0000000..873c680
> --- /dev/null
> +++ b/hw/moxie/Makefile.objs
> @@ -0,0 +1,6 @@
> +# moxie boards
> +obj-y = serial.o mc146818rtc.o vga.o
> +obj-$(CONFIG_FDT) += device_tree.o
> +
> +obj-y := $(addprefix ../,$(obj-y))
> +obj-y += moxiesim.o
> \ No newline at end of file

Please add the missing newline.

> diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
> new file mode 100644
> index 0000000..3b04f5e
> --- /dev/null
> +++ b/hw/moxie/moxiesim.c
> @@ -0,0 +1,175 @@
> +/*
> + * QEMU/moxiesim emulation
> + *
> + * Emulates a very simple machine model similiar to the one use by the
> + * GDB moxie simulator.
> + *
> + * Copyright (c) 2008, 2009, 2010, 2013 Anthony Green
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a 
> copy
> + * of this software and associated documentation files (the "Software"), to 
> deal
> + * in the Software without restriction, including without limitation the 
> rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
> FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +#include "hw/sysbus.h"
> +#include "hw/hw.h"
> +#include "hw/pc.h"
> +#include "hw/isa.h"
> +#include "net/net.h"
> +#include "sysemu/sysemu.h"
> +#include "hw/boards.h"
> +#include "hw/loader.h"
> +#include "hw/serial.h"
> +#include "exec/address-spaces.h"
> +
> +#define PHYS_MEM_BASE 0x80000000
> +
> +static struct loaderparams {

LoaderParams, with a typedef.

> +    uint64_t ram_size;
> +    const char *kernel_filename;
> +    const char *kernel_cmdline;
> +    const char *initrd_filename;
> +} loaderparams;

Just pass the variable around instead of using globals.

> +
> +static void load_kernel(MoxieCPU *cpu)
> +{
> +    uint64_t entry, kernel_low, kernel_high;
> +    long kernel_size;
> +    long initrd_size;
> +    ram_addr_t initrd_offset;
> +    kernel_size = load_elf(loaderparams.kernel_filename,  NULL, NULL,
> +                           &entry, &kernel_low, &kernel_high, 1,
> +                           ELF_MACHINE, 0);
> +    if (kernel_size >= 0) {
> +        cpu->env.pc = (unsigned) entry;
> +    } else {
> +        fprintf(stderr, "qemu: could not load kernel '%s'\n",
> +                loaderparams.kernel_filename);
> +        exit(1);
> +    }
> +
> +    /* load initrd */
> +    initrd_size = 0;
> +    initrd_offset = 0;
> +    if (loaderparams.initrd_filename) {
> +        initrd_size = get_image_size(loaderparams.initrd_filename);
> +        if (initrd_size > 0) {
> +            initrd_offset = (kernel_high + ~TARGET_PAGE_MASK)
> +              & TARGET_PAGE_MASK;
> +            if (initrd_offset + initrd_size > loaderparams.ram_size) {
> +                fprintf(stderr,
> +                        "qemu: memory too small for initial ram disk '%s'\n",
> +                        loaderparams.initrd_filename);
> +                exit(1);
> +            }
> +            initrd_size = load_image_targphys(loaderparams.initrd_filename,
> +                                              initrd_offset,
> +                                              ram_size);
> +        }
> +        if (initrd_size == (target_ulong)-1) {
> +            fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
> +                    loaderparams.initrd_filename);
> +            exit(1);
> +        }
> +    }
> +}
> +
> +static void main_cpu_reset(void *opaque)
> +{
> +    MoxieCPU *cpu = opaque;
> +
> +    cpu_reset(CPU(cpu));
> +}
> +
> +static inline DeviceState *
> +moxie_intc_create(hwaddr base, qemu_irq irq, int kind_of_intr)
> +{
> +    DeviceState *dev;
> +
> +    dev = qdev_create(NULL, "moxie,intc");
> +    qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr);
> +    qdev_init_nofail(dev);
> +    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
> +    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
> +    return dev;
> +}
> +
> +static void moxiesim_init(QEMUMachineInitArgs *args)
> +{
> +    MoxieCPU *cpu = NULL;
> +    ram_addr_t ram_size = args->ram_size;
> +    const char *cpu_model = args->cpu_model;
> +    const char *kernel_filename = args->kernel_filename;
> +    const char *kernel_cmdline = args->kernel_cmdline;
> +    const char *initrd_filename = args->initrd_filename;
> +    CPUMoxieState *env;
> +    MemoryRegion *address_space_mem = get_system_memory();
> +    MemoryRegion *ram = g_new(MemoryRegion, 1);
> +    MemoryRegion *rom = g_new(MemoryRegion, 1);
> +    hwaddr ram_base = 0x200000;
> +
> +    /* Init CPUs. */
> +    if (cpu_model == NULL) {
> +        cpu_model = "MoxieLite-moxie-cpu";
> +    }
> +    cpu = cpu_moxie_init(cpu_model);
> +    env = &cpu->env;
> +    if (!env) {
> +        fprintf(stderr, "Unable to find CPU definition\n");
> +        exit(1);
> +    }
> +    register_savevm(NULL, "cpu", 0, 3, cpu_save, cpu_load, env);
> +
> +    qemu_register_reset(main_cpu_reset, cpu);
> +    main_cpu_reset(cpu);
> +
> +    /* Allocate RAM. */
> +    memory_region_init_ram(ram, "moxiesim.ram", ram_size);
> +    vmstate_register_ram_global(ram);
> +    memory_region_add_subregion(address_space_mem, ram_base, ram);
> +
> +    memory_region_init_ram(rom, "moxie.rom", 128*0x1000);
> +    vmstate_register_ram_global(rom);
> +    memory_region_add_subregion(get_system_memory(), 0x1000, rom);
> +
> +    if (kernel_filename) {
> +        loaderparams.ram_size = ram_size;
> +        loaderparams.kernel_filename = kernel_filename;
> +        loaderparams.kernel_cmdline = kernel_cmdline;
> +        loaderparams.initrd_filename = initrd_filename;
> +        load_kernel(cpu);
> +    }
> +
> +    /* A single 16450 sits at offset 0x3f8.  */
> +    if (serial_hds[0]) {
> +        serial_mm_init(address_space_mem, 0x3f8, 0, env->irq[4],
> +                       8000000/16, serial_hds[0], DEVICE_LITTLE_ENDIAN);
> +    }
> +}
> +
> +static QEMUMachine moxiesim_machine = {
> +    .name = "moxiesim",
> +    .desc = "Moxie simulator platform",
> +    .init = moxiesim_init,
> +    .is_default = 1,
> +};
> +
> +static void moxie_machine_init(void)
> +{
> +    qemu_register_machine(&moxiesim_machine);
> +}
> +
> +machine_init(moxie_machine_init)
> diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h
> index 5fc780c..8c8d78e 100644
> --- a/include/sysemu/arch_init.h
> +++ b/include/sysemu/arch_init.h
> @@ -20,6 +20,7 @@ enum {
>      QEMU_ARCH_XTENSA = 4096,
>      QEMU_ARCH_OPENRISC = 8192,
>      QEMU_ARCH_UNICORE32 = 0x4000,
> +    QEMU_ARCH_MOXIE = 0x8000,
>  };
>
>  extern const uint32_t arch_type;
> --
> 1.8.1.2
>
>