Message ID | 1469806345-67852-4-git-send-email-mrolnik@gmail.com |
---|---|
State | New |
Headers | show |
On 29 July 2016 at 16:32, Michael Rolnik <mrolnik@gmail.com> wrote: > Signed-off-by: Michael Rolnik <mrolnik@gmail.com> > --- > MAINTAINERS | 6 +++ > hw/avr/Makefile.objs | 21 +++++++++ > hw/avr/sample.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 144 insertions(+) > create mode 100644 hw/avr/Makefile.objs > create mode 100644 hw/avr/sample.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index d1439a8..1435040 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -110,6 +110,12 @@ F: disas/arm.c > F: disas/arm-a64.cc > F: disas/libvixl/ > > +AVR > +M: Michael Rolnik <mrolnik@gmail.com> > +S: Maintained > +F: target-avr/ > +F: hw/avr/ > + > CRIS > M: Edgar E. Iglesias <edgar.iglesias@gmail.com> > S: Maintained > diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs > new file mode 100644 > index 0000000..8f537c9 > --- /dev/null > +++ b/hw/avr/Makefile.objs > @@ -0,0 +1,21 @@ > +# > +# QEMU AVR CPU > +# > +# Copyright (c) 2016 Michael Rolnik > +# > +# This library is free software; you can redistribute it and/or > +# modify it under the terms of the GNU Lesser General Public > +# License as published by the Free Software Foundation; either > +# version 2.1 of the License, or (at your option) any later version. > +# > +# This library is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +# Lesser General Public License for more details. > +# > +# You should have received a copy of the GNU Lesser General Public > +# License along with this library; if not, see > +# <http://www.gnu.org/licenses/lgpl-2.1.html> > +# > + > +obj-y += sample.o > diff --git a/hw/avr/sample.c b/hw/avr/sample.c > new file mode 100644 > index 0000000..2c1cd84 > --- /dev/null > +++ b/hw/avr/sample.c > @@ -0,0 +1,117 @@ > +/* > + * QEMU AVR CPU > + * > + * Copyright (c) 2016 Michael Rolnik > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see > + * <http://www.gnu.org/licenses/lgpl-2.1.html> > + */ > + > +/* > + * NOTE: > + * This is not a real AVR board !!! This is an example !!! > + * > + * This example can be used to build a real AVR board. > + * > + * This example board loads provided binary file into flash memory and > + * executes it from 0x00000000 address in the code memory space. > + * > + * This example does not implement/install any AVR specific on board > + * devices except SampleIO device which is an example as well. You forgot to update this comment when you removed the SampleIO device. > + * > + * Currently used for AVR CPU validation > + * > + */ > + > +#include "qemu/osdep.h" > +#include "qapi/error.h" > +#include "qemu-common.h" > +#include "cpu.h" > +#include "hw/hw.h" > +#include "sysemu/sysemu.h" > +#include "sysemu/qtest.h" > +#include "ui/console.h" > +#include "hw/boards.h" > +#include "hw/devices.h" > +#include "hw/loader.h" > +#include "qemu/error-report.h" > +#include "exec/address-spaces.h" > +#include "include/hw/sysbus.h" > + > +#define VIRT_BASE_FLASH 0x00000000 > +#define VIRT_BASE_ISRAM 0x00000100 > +#define VIRT_BASE_EXMEM 0x00001100 > +#define VIRT_BASE_EEPROM 0x00000000 > + > +#define SIZE_FLASH 0x00020000 > +#define SIZE_ISRAM 0x00001000 > +#define SIZE_EXMEM 0x00010000 > +#define SIZE_EEPROM 0x00001000 > +#define SIZE_IOREG SIZE_REGS > + > +#define PHYS_BASE_FLASH (PHYS_BASE_CODE) > + > +#define PHYS_BASE_ISRAM (PHYS_BASE_DATA) > +#define PHYS_BASE_EXMEM (PHYS_BASE_ISRAM + SIZE_ISRAM) > +#define PHYS_BASE_EEPROM (PHYS_BASE_EXMEM + SIZE_EXMEM) > + > +#define PHYS_BASE_IOREG (PHYS_BASE_REGS + 0x20) > + > +static void sample_init(MachineState *machine) > +{ > + MemoryRegion *address_space_mem = get_system_memory(); > + > + MemoryRegion *ram; > + MemoryRegion *flash; > + unsigned ram_size = SIZE_ISRAM + SIZE_EXMEM; > + > + AVRCPU *cpu_avr ATTRIBUTE_UNUSED; > + > + ram = g_new(MemoryRegion, 1); > + flash = g_new(MemoryRegion, 1); > + > + cpu_avr = cpu_avr_init("avr5"); > + > + memory_region_allocate_system_memory(ram, NULL, "avr.ram", ram_size); > + memory_region_add_subregion(address_space_mem, PHYS_BASE_ISRAM, ram); > + > + memory_region_init_rom(flash, NULL, "avr.flash", SIZE_FLASH, &error_fatal); > + memory_region_add_subregion(address_space_mem, PHYS_BASE_FLASH, flash); > + vmstate_register_ram_global(flash); > + > + const char *firmware = NULL; > + const char *filename; Declarations should go at the start of {} blocks, not in the middle (I said this last time too). > + > + if (machine->firmware) { > + firmware = machine->firmware; > + } > + > + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware); > + if (!filename) { > + error_report("Could not find flash image file '%s'", firmware); > + exit(1); > + } > + > + load_image_targphys(filename, PHYS_BASE_FLASH, SIZE_FLASH); > +} > + > +static void sample_machine_init(MachineClass *mc) > +{ > + mc->desc = "AVR sample/example board"; > + mc->init = sample_init; > + mc->is_default = 1; > +} > + > +DEFINE_MACHINE("sample", sample_machine_init) > + > -- > 2.4.9 (Apple Git-60) > Otherwise this patch looks OK. thanks -- PMM
diff --git a/MAINTAINERS b/MAINTAINERS index d1439a8..1435040 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -110,6 +110,12 @@ F: disas/arm.c F: disas/arm-a64.cc F: disas/libvixl/ +AVR +M: Michael Rolnik <mrolnik@gmail.com> +S: Maintained +F: target-avr/ +F: hw/avr/ + CRIS M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs new file mode 100644 index 0000000..8f537c9 --- /dev/null +++ b/hw/avr/Makefile.objs @@ -0,0 +1,21 @@ +# +# QEMU AVR CPU +# +# Copyright (c) 2016 Michael Rolnik +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, see +# <http://www.gnu.org/licenses/lgpl-2.1.html> +# + +obj-y += sample.o diff --git a/hw/avr/sample.c b/hw/avr/sample.c new file mode 100644 index 0000000..2c1cd84 --- /dev/null +++ b/hw/avr/sample.c @@ -0,0 +1,117 @@ +/* + * QEMU AVR CPU + * + * Copyright (c) 2016 Michael Rolnik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * <http://www.gnu.org/licenses/lgpl-2.1.html> + */ + +/* + * NOTE: + * This is not a real AVR board !!! This is an example !!! + * + * This example can be used to build a real AVR board. + * + * This example board loads provided binary file into flash memory and + * executes it from 0x00000000 address in the code memory space. + * + * This example does not implement/install any AVR specific on board + * devices except SampleIO device which is an example as well. + * + * Currently used for AVR CPU validation + * + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu-common.h" +#include "cpu.h" +#include "hw/hw.h" +#include "sysemu/sysemu.h" +#include "sysemu/qtest.h" +#include "ui/console.h" +#include "hw/boards.h" +#include "hw/devices.h" +#include "hw/loader.h" +#include "qemu/error-report.h" +#include "exec/address-spaces.h" +#include "include/hw/sysbus.h" + +#define VIRT_BASE_FLASH 0x00000000 +#define VIRT_BASE_ISRAM 0x00000100 +#define VIRT_BASE_EXMEM 0x00001100 +#define VIRT_BASE_EEPROM 0x00000000 + +#define SIZE_FLASH 0x00020000 +#define SIZE_ISRAM 0x00001000 +#define SIZE_EXMEM 0x00010000 +#define SIZE_EEPROM 0x00001000 +#define SIZE_IOREG SIZE_REGS + +#define PHYS_BASE_FLASH (PHYS_BASE_CODE) + +#define PHYS_BASE_ISRAM (PHYS_BASE_DATA) +#define PHYS_BASE_EXMEM (PHYS_BASE_ISRAM + SIZE_ISRAM) +#define PHYS_BASE_EEPROM (PHYS_BASE_EXMEM + SIZE_EXMEM) + +#define PHYS_BASE_IOREG (PHYS_BASE_REGS + 0x20) + +static void sample_init(MachineState *machine) +{ + MemoryRegion *address_space_mem = get_system_memory(); + + MemoryRegion *ram; + MemoryRegion *flash; + unsigned ram_size = SIZE_ISRAM + SIZE_EXMEM; + + AVRCPU *cpu_avr ATTRIBUTE_UNUSED; + + ram = g_new(MemoryRegion, 1); + flash = g_new(MemoryRegion, 1); + + cpu_avr = cpu_avr_init("avr5"); + + memory_region_allocate_system_memory(ram, NULL, "avr.ram", ram_size); + memory_region_add_subregion(address_space_mem, PHYS_BASE_ISRAM, ram); + + memory_region_init_rom(flash, NULL, "avr.flash", SIZE_FLASH, &error_fatal); + memory_region_add_subregion(address_space_mem, PHYS_BASE_FLASH, flash); + vmstate_register_ram_global(flash); + + const char *firmware = NULL; + const char *filename; + + if (machine->firmware) { + firmware = machine->firmware; + } + + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware); + if (!filename) { + error_report("Could not find flash image file '%s'", firmware); + exit(1); + } + + load_image_targphys(filename, PHYS_BASE_FLASH, SIZE_FLASH); +} + +static void sample_machine_init(MachineClass *mc) +{ + mc->desc = "AVR sample/example board"; + mc->init = sample_init; + mc->is_default = 1; +} + +DEFINE_MACHINE("sample", sample_machine_init) +
Signed-off-by: Michael Rolnik <mrolnik@gmail.com> --- MAINTAINERS | 6 +++ hw/avr/Makefile.objs | 21 +++++++++ hw/avr/sample.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 hw/avr/Makefile.objs create mode 100644 hw/avr/sample.c