Commit d3449830 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/avr-port-20200711' into staging 

8bit AVR port from Michael Rolnik.

Michael started to work on the AVR port few years ago [*] and kept
improving the code over various series.

List of people who help him (in chronological order):
- Richard Henderson
- Sarah Harris and Edward Robbins
- Philippe Mathieu-Daudé and Aleksandar Markovic
- Pavel Dovgalyuk
- Thomas Huth

[*] The oldest contribution I could find on the list is from 2016:
https://lists.nongnu.org/archive/html/qemu-devel/2016-06/msg02985.html

Tests included:

$ avocado --show=app run -t arch:avr tests/acceptance/
Fetching asset from tests/acceptance/machine_avr6.py:AVR6Machine.test_freertos
 (1/1) tests/acceptance/machine_avr6.py:AVR6Machine.test_freertos: PASS (2.13 s)
RESULTS    : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0
JOB TIME   : 2.35 s

$ make check-qtest-avr
  TEST    check-qtest-avr: tests/qtest/boot-serial-test
  TEST    check-qtest-avr: tests/qtest/cdrom-test
  TEST    check-qtest-avr: tests/qtest/device-introspect-test
  TEST    check-qtest-avr: tests/qtest/machine-none-test
  TEST    check-qtest-avr: tests/qtest/qmp-test
  TEST    check-qtest-avr: tests/qtest/qmp-cmd-test
  TEST    check-qtest-avr: tests/qtest/qom-test
  TEST    check-qtest-avr: tests/qtest/test-hmp
  TEST    check-qtest-avr: tests/qtest/qos-test

CI results:
. https://cirrus-ci.com/build/5697049146425344
. https://gitlab.com/philmd/qemu/-/pipelines/165328058
. https://travis-ci.org/github/philmd/qemu/builds/705817933
. https://app.shippable.com/github/philmd/qemu/runs/822/summary/console



# gpg: Signature made Sat 11 Jul 2020 10:03:11 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/avr-port-20200711: (32 commits)
  target/avr/disas: Fix store instructions display order
  target/avr/cpu: Fix $PC displayed address
  target/avr/cpu: Drop tlb_flush() in avr_cpu_reset()
  target/avr: Add section into QEMU documentation
  tests/acceptance: Test the Arduino MEGA2560 board
  tests/boot-serial: Test some Arduino boards (AVR based)
  hw/avr: Add limited support for some Arduino boards
  hw/avr: Add some ATmega microcontrollers
  hw/avr: Add support for loading ELF/raw binaries
  hw/misc: avr: Add limited support for power reduction device
  hw/timer: avr: Add limited support for 16-bit timer peripheral
  hw/char: avr: Add limited support for USART peripheral
  tests/machine-none: Add AVR support
  target/avr: Register AVR support with the rest of QEMU
  target/avr: Add support for disassembling via option '-d in_asm'
  target/avr: Initialize TCG register variables
  target/avr: Add instruction translation - CPU main translation function
  target/avr: Add instruction translation - MCU Control Instructions
  target/avr: Add instruction translation - Bit and Bit-test Instructions
  target/avr: Add instruction translation - Data Transfer Instructions
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2033cc6e 19b29347

MAINTAINERS

+30 −0
Original line number Diff line number Diff line
@@ -167,6 +167,14 @@ S: Maintained 
F: hw/arm/smmu*

F: include/hw/arm/smmu*



AVR TCG CPUs

M: Michael Rolnik <mrolnik@gmail.com>

R: Sarah Harris <S.E.Harris@kent.ac.uk>

S: Maintained

F: gdb-xml/avr-cpu.xml

F: target/avr/

F: tests/acceptance/machine_avr6.py



CRIS TCG CPUs

M: Edgar E. Iglesias <edgar.iglesias@gmail.com>

S: Maintained
@@ -982,6 +990,28 @@ F: include/hw/*/nrf51*.h 
F: include/hw/*/microbit*.h

F: tests/qtest/microbit-test.c



AVR Machines

-------------



AVR MCUs

M: Michael Rolnik <mrolnik@gmail.com>

R: Sarah Harris <S.E.Harris@kent.ac.uk>

S: Maintained

F: default-configs/avr-softmmu.mak

F: hw/avr/

F: include/hw/char/avr_usart.h

F: hw/char/avr_usart.c

F: include/hw/timer/avr_timer16.h

F: hw/timer/avr_timer16.c

F: include/hw/misc/avr_power.h

F: hw/misc/avr_power.c



Arduino

M: Philippe Mathieu-Daudé <f4bug@amsat.org>

R: Sarah Harris <S.E.Harris@kent.ac.uk>

S: Maintained

F: hw/avr/arduino.c



CRIS Machines

-------------

Axis Dev88

configure

+7 −0
Original line number Diff line number Diff line
@@ -8143,6 +8143,10 @@ case "$target_name" in 
    mttcg="yes"

    gdb_xml_files="aarch64-core.xml aarch64-fpu.xml arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml arm-m-profile.xml"

  ;;

  avr)

    gdb_xml_files="avr-cpu.xml"

    target_compiler=$cross_cc_avr

  ;;

  cris)

  ;;

  hppa)
@@ -8387,6 +8391,9 @@ for i in $ARCH $TARGET_BASE_ARCH ; do 
      disas_config "ARM_A64"

    fi

  ;;

  avr)

    disas_config "AVR"

  ;;

  cris)

    disas_config "CRIS"

  ;;

default-configs/avr-softmmu.mak

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# Default configuration for avr-softmmu



# Boards:

#

CONFIG_ARDUINO=y

docs/system/target-avr.rst

0 → 100644
+37 −0
Original line number Diff line number Diff line 
.. _AVR-System-emulator:



AVR System emulator

-------------------



Use the executable ``qemu-system-avr`` to emulate a AVR 8 bit based machine.

These can have one of the following cores: avr1, avr2, avr25, avr3, avr31,

avr35, avr4, avr5, avr51, avr6, avrtiny, xmega2, xmega3, xmega4, xmega5,

xmega6 and xmega7.



As for now it supports few Arduino boards for educational and testing purposes.

These boards use a ATmega controller, which model is limited to USART & 16-bit

timer devices, enought to run FreeRTOS based applications (like

https://github.com/seharris/qemu-avr-tests/blob/master/free-rtos/Demo/AVR_ATMega2560_GCC/demo.elf

).



Following are examples of possible usages, assuming demo.elf is compiled for

AVR cpu



 - Continuous non interrupted execution:

   ``qemu-system-avr -machine mega2560 -bios demo.elf``



 - Continuous non interrupted execution with serial output into telnet window:

   ``qemu-system-avr -machine mega2560 -bios demo.elf -serial

   tcp::5678,server,nowait -nographic``

   and then in another shell

   ``telnet localhost 5678``



 - Debugging wit GDB debugger:

   ``qemu-system-avr -machine mega2560 -bios demo.elf -s -S``

   and then in another shell

   ``avr-gdb demo.elf``

   and then within GDB shell

   ``target remote :1234``



 - Print out executed instructions:

   ``qemu-system-avr -machine mega2560 -bios demo.elf -d in_asm``

docs/system/targets.rst

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ Contents: 
   target-xtensa

   target-s390x

   target-rx

   target-avr