diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-25 13:30:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-25 13:30:23 +0000 |
| commit | ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf (patch) | |
| tree | 93369341e12120f48c7c7a550fb969578dc5268d /include | |
| parent | ffb5a69c31b3c2a79ad5b4b9a8e47da83eef6115 (diff) | |
| parent | e671711c9a8c1de540f035095e18458bc03968de (diff) | |
| download | focaccia-qemu-ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf.tar.gz focaccia-qemu-ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-nios-20170124' into staging
nios2 target support # gpg: Signature made Tue 24 Jan 2017 21:11:47 GMT # gpg: using RSA key 0xAD1270CC4DD0279B # gpg: Good signature from "Richard Henderson <rth7680@gmail.com>" # gpg: aka "Richard Henderson <rth@redhat.com>" # gpg: aka "Richard Henderson <rth@twiddle.net>" # Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B * remotes/rth/tags/pull-nios-20170124: nios2: Add support for Nios-II R1 nios2: Add Altera 10M50 GHRD emulation nios2: Add periodic timer emulation nios2: Add IIC interrupt controller emulation nios2: Add usermode binaries emulation nios2: Add disas entries nios2: Add architecture emulation support Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/disas/bfd.h | 6 | ||||
| -rw-r--r-- | include/elf.h | 2 | ||||
| -rw-r--r-- | include/sysemu/arch_init.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/disas/bfd.h b/include/disas/bfd.h index 8a3488c2c5..0435b8c9f9 100644 --- a/include/disas/bfd.h +++ b/include/disas/bfd.h @@ -222,6 +222,10 @@ enum bfd_architecture bfd_arch_ia64, /* HP/Intel ia64 */ #define bfd_mach_ia64_elf64 64 #define bfd_mach_ia64_elf32 32 + bfd_arch_nios2, /* Nios II */ +#define bfd_mach_nios2 0 +#define bfd_mach_nios2r1 1 +#define bfd_mach_nios2r2 2 bfd_arch_lm32, /* Lattice Mico32 */ #define bfd_mach_lm32 1 bfd_arch_last @@ -415,6 +419,8 @@ int print_insn_crisv10 (bfd_vma, disassemble_info*); int print_insn_microblaze (bfd_vma, disassemble_info*); int print_insn_ia64 (bfd_vma, disassemble_info*); int print_insn_lm32 (bfd_vma, disassemble_info*); +int print_insn_big_nios2 (bfd_vma, disassemble_info*); +int print_insn_little_nios2 (bfd_vma, disassemble_info*); #if 0 /* Fetch the disassembler for a given BFD, if that support is available. */ diff --git a/include/elf.h b/include/elf.h index 1c2975dc82..0dbd3e968b 100644 --- a/include/elf.h +++ b/include/elf.h @@ -126,6 +126,8 @@ typedef int64_t Elf64_Sxword; */ #define EM_S390_OLD 0xA390 +#define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */ + #define EM_MICROBLAZE 189 #define EM_MICROBLAZE_OLD 0xBAAB diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 20b01e3004..2bf16b203c 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -23,6 +23,7 @@ enum { QEMU_ARCH_UNICORE32 = (1 << 14), QEMU_ARCH_MOXIE = (1 << 15), QEMU_ARCH_TRICORE = (1 << 16), + QEMU_ARCH_NIOS2 = (1 << 17), }; extern const uint32_t arch_type; |