[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 03/10] target-avr: adding a sample AVR board
From: |
Michael Rolnik |
Subject: |
[Qemu-devel] [PATCH v10 03/10] target-avr: adding a sample AVR board |
Date: |
Thu, 7 Jul 2016 01:33:08 +0300 |
Signed-off-by: Michael Rolnik <address@hidden>
---
MAINTAINERS | 6 ++
hw/avr/Makefile.objs | 21 +++++++
hw/avr/sample-io.c | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++
hw/avr/sample.c | 136 +++++++++++++++++++++++++++++++++++++++
4 files changed, 338 insertions(+)
create mode 100644 hw/avr/Makefile.objs
create mode 100644 hw/avr/sample-io.c
create mode 100644 hw/avr/sample.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 1d0e2c3..ecf10da 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 <address@hidden>
+S: Maintained
+F: target-avr/
+F: hw/avr/
+
CRIS
M: Edgar E. Iglesias <address@hidden>
S: Maintained
diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs
new file mode 100644
index 0000000..c080e4e
--- /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 sample-io.o
diff --git a/hw/avr/sample-io.c b/hw/avr/sample-io.c
new file mode 100644
index 0000000..923a617
--- /dev/null
+++ b/hw/avr/sample-io.c
@@ -0,0 +1,175 @@
+/*
+ * 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 device !!! This is an example !!!
+
+ This example can be used to build a real AVR device.
+
+ AVR has the following layout of data memory
+
+ LD/ST(addr) IN/OUT(addr)
+ ----------- ------------
+
+ 0000 #-----------------------#
+ . | |
+ . | 32 CPU registers |
+ 001f | |
+ 0020 #-----------------------# 0000
+ . | | .
+ . | 64 CPU IO registers | .
+ 005f | | 003f
+ 0060 #-----------------------#
+ . | |
+ . | 160 EXT IO registers |
+ 00ff | |
+ 0100 #-----------------------#
+ | |
+ | Internal RAM |
+ | |
+ #-----------------------#
+ | |
+ | External RAM |
+ | |
+ #-----------------------#
+
+ Current AVR/CPU implementation assumes that IO device responsible to
+ implement functionality of IO and EXT IO registers is a memory mapped
+ device, mapped to addresses in the range [0x0020 .. 0x0100)
+
+ IN/OUT are implemented as an alias to LD/ST instructions
+
+ Some of CPU IO registers are implemented within the CPU itself, any
+ access to them either by LD/ST or IN/OUT won't be routed to the device.
+
+*/
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qemu-common.h"
+#include "cpu.h"
+#include "include/hw/sysbus.h"
+
+#define TYPE_SAMPLEIO "SampleIO"
+#define SAMPLEIO(obj) OBJECT_CHECK(SAMPLEIOState, (obj), TYPE_SAMPLEIO)
+
+#ifndef DEBUG_SAMPLEIO
+#define DEBUG_SAMPLEIO 0
+#endif
+
+#define DPRINTF(fmt, args...) \
+ do { \
+ if (DEBUG_SAMPLEIO) { \
+ fprintf(stderr, "[%s]%s: " fmt , TYPE_SAMPLEIO, __func__, ##args);\
+ } \
+ } \
+ while (0)
+
+typedef struct SAMPLEIOState {
+ SysBusDevice parent;
+ MemoryRegion iomem;
+} SAMPLEIOState;
+
+static Property sample_io_properties[] = {
+ DEFINE_PROP_END_OF_LIST(),
+};
+static const VMStateDescription sample_io_vmstate = {
+ .name = TYPE_SAMPLEIO,
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[])
+ {
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static
+void sample_io_reset(DeviceState *dev)
+{
+}
+
+static uint64_t sample_io_read(void *opaque, hwaddr offset, unsigned size)
+{
+ /*
+ This is just an example. No real functionality is here.
+ */
+ qemu_log("%s addr:%2x\n", __func__, (int)offset);
+
+ return 0;
+}
+
+static void sample_io_write(void *opaque, hwaddr offset, uint64_t value,
+ unsigned size)
+{
+ /*
+ This is just an example. No real functionality is here.
+ */
+ qemu_log("%s addr:%2x data:%2x\n", __func__, (int)offset, (int)value);
+}
+
+static const MemoryRegionOps sample_io_ops = {
+ .read = sample_io_read,
+ .write = sample_io_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+static int sample_io_init(DeviceState *dev)
+{
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ SAMPLEIOState *s = SAMPLEIO(dev);
+
+ memory_region_init_io(
+ &s->iomem,
+ OBJECT(s),
+ &sample_io_ops,
+ s,
+ TYPE_SAMPLEIO,
+ AVR_IO_REGS);
+ sysbus_init_mmio(sbd, &s->iomem);
+
+ return 0;
+}
+
+static void sample_io_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->init = sample_io_init;
+ dc->reset = sample_io_reset;
+ dc->desc = "an example of AVR IO and EXT IO registers implementation";
+ dc->vmsd = &sample_io_vmstate;
+ dc->props = sample_io_properties;
+}
+
+static const
+TypeInfo sample_io_info = {
+ .name = TYPE_SAMPLEIO,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(SAMPLEIOState),
+ .class_init = sample_io_class_init,
+};
+
+static void sample_io_register_types(void)
+{
+ type_register_static(&sample_io_info);
+}
+
+type_init(sample_io_register_types)
diff --git a/hw/avr/sample.c b/hw/avr/sample.c
new file mode 100644
index 0000000..e6ad1ef
--- /dev/null
+++ b/hw/avr/sample.c
@@ -0,0 +1,136 @@
+/*
+ * 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;
+ MemoryRegion *isram;
+ MemoryRegion *exmem;
+ unsigned ram_size = SIZE_FLASH + SIZE_ISRAM + SIZE_EXMEM;
+
+ AVRCPU *cpu_avr ATTRIBUTE_UNUSED;
+ DeviceState *io;
+ SysBusDevice *bus;
+
+ ram = g_new(MemoryRegion, 1);
+ flash = g_new(MemoryRegion, 1);
+ isram = g_new(MemoryRegion, 1);
+ exmem = g_new(MemoryRegion, 1);
+
+ cpu_avr = cpu_avr_init("avr5");
+ io = qdev_create(NULL, "SampleIO");
+ qdev_init_nofail(io);
+ bus = SYS_BUS_DEVICE(io);
+
+ memory_region_allocate_system_memory(ram, NULL, "avr.ram", ram_size);
+
+ memory_region_init_ram(flash, NULL, "flash", SIZE_FLASH, &error_fatal);
+ memory_region_init_ram(isram, NULL, "isram", SIZE_ISRAM, &error_fatal);
+ memory_region_init_ram(exmem, NULL, "exmem", SIZE_EXMEM, &error_fatal);
+
+ memory_region_add_subregion(address_space_mem, PHYS_BASE_FLASH, flash);
+ memory_region_add_subregion(address_space_mem, PHYS_BASE_ISRAM, isram);
+ memory_region_add_subregion(address_space_mem, PHYS_BASE_EXMEM, exmem);
+
+ vmstate_register_ram_global(flash);
+ vmstate_register_ram_global(isram);
+ vmstate_register_ram_global(exmem);
+
+ memory_region_set_readonly(flash, true);
+
+ char const *firmware = NULL;
+ char const *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);
+
+ sysbus_mmio_map(bus, 0, PHYS_BASE_IOREG);
+}
+
+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)
- [Qemu-devel] [PATCH v10 00/10] *** 8bit AVR cores ***, Michael Rolnik, 2016/07/06
- [Qemu-devel] [PATCH v10 02/10] target-avr: adding AVR CPU features/flavors, Michael Rolnik, 2016/07/06
- [Qemu-devel] [PATCH v10 03/10] target-avr: adding a sample AVR board,
Michael Rolnik <=
- [Qemu-devel] [PATCH v10 01/10] target-avr: AVR cores support is added., Michael Rolnik, 2016/07/06
- Re: [Qemu-devel] [PATCH v10 01/10] target-avr: AVR cores support is added., Richard Henderson, 2016/07/12
- Re: [Qemu-devel] [PATCH v10 01/10] target-avr: AVR cores support is added., Michael Rolnik, 2016/07/12
- Re: [Qemu-devel] [PATCH v10 01/10] target-avr: AVR cores support is added., Richard Henderson, 2016/07/13
- Re: [Qemu-devel] [PATCH v10 01/10] target-avr: AVR cores support is added., Michael Rolnik, 2016/07/13
- Re: [Qemu-devel] [PATCH v10 01/10] target-avr: AVR cores support is added., Michael Rolnik, 2016/07/13
- Re: [Qemu-devel] [PATCH v10 01/10] target-avr: AVR cores support is added., Richard Henderson, 2016/07/13
[Qemu-devel] [PATCH v10 05/10] target-avr: adding AVR interrupt handling, Michael Rolnik, 2016/07/06
[Qemu-devel] [PATCH v10 06/10] target-avr: adding helpers for IN, OUT, SLEEP, WBR & unsupported instructions, Michael Rolnik, 2016/07/06