| Message ID | 20200705140315.260514-23-huth@tuxfamily.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/avr merger | expand |
On 7/5/20 9:03 AM, Thomas Huth wrote: > From: Michael Rolnik <mrolnik@gmail.com> > > Add AVR related definitions into QEMU. > > [AM: Remove word 'Atmel' from filenames and all elements of code] > Suggested-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com> > Signed-off-by: Michael Rolnik <mrolnik@gmail.com> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com> > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > Signed-off-by: Thomas Huth <huth@tuxfamily.org> > --- > +++ b/qapi/machine.json > @@ -25,7 +25,7 @@ > # Since: 3.0 > ## Missing a line that resembles: # @avr since 5.1 > { 'enum' : 'SysEmuTarget', > - 'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32', > + 'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'cris', 'hppa', 'i386', 'lm32', > 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64', > 'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc', > 'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4', >
On 06/07/2020 16.56, Eric Blake wrote: > On 7/5/20 9:03 AM, Thomas Huth wrote: >> From: Michael Rolnik <mrolnik@gmail.com> >> >> Add AVR related definitions into QEMU. >> >> [AM: Remove word 'Atmel' from filenames and all elements of code] >> Suggested-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com> >> Signed-off-by: Michael Rolnik <mrolnik@gmail.com> >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >> Signed-off-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com> >> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> >> Signed-off-by: Thomas Huth <huth@tuxfamily.org> >> --- > >> +++ b/qapi/machine.json >> @@ -25,7 +25,7 @@ >> # Since: 3.0 >> ## > > Missing a line that resembles: > > # @avr since 5.1 I thought that we stopped doing that ... but apparently, my memory was wrong and this was only about the "dropped" statements (see commit id bb5ccf225e81d2). Ok, I can add that again (though it's somewhat strange that we removed the "dropped" statements but still keep the "since" statements...?) Thomas
diff --git a/arch_init.c b/arch_init.c index 8afea4748b..7fd5c09b2b 100644 --- a/arch_init.c +++ b/arch_init.c @@ -90,6 +90,8 @@ int graphic_depth = 32; #define QEMU_ARCH QEMU_ARCH_UNICORE32 #elif defined(TARGET_XTENSA) #define QEMU_ARCH QEMU_ARCH_XTENSA +#elif defined(TARGET_AVR) +#define QEMU_ARCH QEMU_ARCH_AVR #endif const uint32_t arch_type = QEMU_ARCH; diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h index c5f9fa08ab..9856bf7921 100644 --- a/include/disas/dis-asm.h +++ b/include/disas/dis-asm.h @@ -211,6 +211,25 @@ enum bfd_architecture #define bfd_mach_m32r 0 /* backwards compatibility */ bfd_arch_mn10200, /* Matsushita MN10200 */ bfd_arch_mn10300, /* Matsushita MN10300 */ + bfd_arch_avr, /* AVR microcontrollers */ +#define bfd_mach_avr1 1 +#define bfd_mach_avr2 2 +#define bfd_mach_avr25 25 +#define bfd_mach_avr3 3 +#define bfd_mach_avr31 31 +#define bfd_mach_avr35 35 +#define bfd_mach_avr4 4 +#define bfd_mach_avr5 5 +#define bfd_mach_avr51 51 +#define bfd_mach_avr6 6 +#define bfd_mach_avrtiny 100 +#define bfd_mach_avrxmega1 101 +#define bfd_mach_avrxmega2 102 +#define bfd_mach_avrxmega3 103 +#define bfd_mach_avrxmega4 104 +#define bfd_mach_avrxmega5 105 +#define bfd_mach_avrxmega6 106 +#define bfd_mach_avrxmega7 107 bfd_arch_cris, /* Axis CRIS */ #define bfd_mach_cris_v0_v10 255 #define bfd_mach_cris_v32 32 diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 71a7a285ee..54f069d491 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -25,6 +25,7 @@ enum { QEMU_ARCH_HPPA = (1 << 18), QEMU_ARCH_RISCV = (1 << 19), QEMU_ARCH_RX = (1 << 20), + QEMU_ARCH_AVR = (1 << 21), QEMU_ARCH_NONE = (1 << 31), }; diff --git a/qapi/machine.json b/qapi/machine.json index ff7b5032e3..39b6b6d089 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -25,7 +25,7 @@ # Since: 3.0 ## { 'enum' : 'SysEmuTarget', - 'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32', + 'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'cris', 'hppa', 'i386', 'lm32', 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64', 'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc', 'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4',