diff options
| author |   Sandra Loosemore <sloosemore@baylibre.com> | 2024-11-26 19:13:07 +0000 |
|---|---|---|
| committer | Sandra Loosemore <sloosemore@baylibre.com> | 2024-11-26 19:13:07 +0000 |
| commit | e7a16d9fd65098045ef5959bf98d990f12314111 (patch) | |
| tree | e153d6439138061de1da42cadae64f7c1f5fafb9 | |
| parent | nios2: Remove all GDB support for Nios II targets. (diff) | |
| download | binutils-gdb-e7a16d9fd65098045ef5959bf98d990f12314111.tar.gz binutils-gdb-e7a16d9fd65098045ef5959bf98d990f12314111.tar.bz2 binutils-gdb-e7a16d9fd65098045ef5959bf98d990f12314111.zip | |
nios2: Remove binutils support for Nios II target.
The Nios II architecture has been EOL'ed by the vendor. This patch
removes all binutils, bfd, gas, binutils, and opcodes support for this
target with the exception of the readelf utility. (The ELF EM_*
number remains valid and the relocation definitions from the Nios II
ABI will never change in future, so retaining the readelf support
seems consistent with its purpose as a utility that tries to parse the
headers in any ELF file provided as an argument regardless of target.)
337 files changed, 12 insertions, 23162 deletions
diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 0dc733eaba9..dadbd0f7882 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -144,7 +144,6 @@ ALL_MACHINES = \ cpu-mt.lo \ cpu-nds32.lo \ cpu-nfp.lo \ - cpu-nios2.lo \ cpu-ns32k.lo \ cpu-or1k.lo \ cpu-pdp11.lo \ @@ -228,7 +227,6 @@ ALL_MACHINES_CFILES = \ cpu-mt.c \ cpu-nds32.c \ cpu-nfp.c \ - cpu-nios2.c \ cpu-ns32k.c \ cpu-or1k.c \ cpu-pdp11.c \ @@ -333,7 +331,6 @@ BFD32_BACKENDS = \ elf32-msp430.lo \ elf32-mt.lo \ elf32-nds32.lo \ - elf32-nios2.lo \ elf32-or1k.lo \ elf32-pj.lo \ elf32-ppc.lo \ @@ -468,7 +465,6 @@ BFD32_BACKENDS_CFILES = \ elf32-msp430.c \ elf32-mt.c \ elf32-nds32.c \ - elf32-nios2.c \ elf32-or1k.c \ elf32-pj.c \ elf32-ppc.c \ @@ -708,7 +704,7 @@ SOURCE_HFILES = \ ecoff-bfd.h ecoffswap.h \ elf32-arm.h elf32-avr.h elf32-bfin.h elf32-cr16.h elf32-csky.h \ elf32-dlx.h elf32-hppa.h elf32-m68hc1x.h elf32-m68k.h \ - elf32-metag.h elf32-nds32.h elf32-nios2.h elf32-ppc.h \ + elf32-metag.h elf32-nds32.h elf32-ppc.h \ elf32-rx.h elf32-score.h elf32-sh-relocs.h elf32-spu.h \ elf32-tic6x.h elf32-tilegx.h elf32-tilepro.h elf32-v850.h \ elf64-hppa.h elf64-ppc.h elf64-tilegx.h \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 38364f4b2ba..a781e2b8959 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -610,7 +610,6 @@ ALL_MACHINES = \ cpu-mt.lo \ cpu-nds32.lo \ cpu-nfp.lo \ - cpu-nios2.lo \ cpu-ns32k.lo \ cpu-or1k.lo \ cpu-pdp11.lo \ @@ -694,7 +693,6 @@ ALL_MACHINES_CFILES = \ cpu-mt.c \ cpu-nds32.c \ cpu-nfp.c \ - cpu-nios2.c \ cpu-ns32k.c \ cpu-or1k.c \ cpu-pdp11.c \ @@ -800,7 +798,6 @@ BFD32_BACKENDS = \ elf32-msp430.lo \ elf32-mt.lo \ elf32-nds32.lo \ - elf32-nios2.lo \ elf32-or1k.lo \ elf32-pj.lo \ elf32-ppc.lo \ @@ -935,7 +932,6 @@ BFD32_BACKENDS_CFILES = \ elf32-msp430.c \ elf32-mt.c \ elf32-nds32.c \ - elf32-nios2.c \ elf32-or1k.c \ elf32-pj.c \ elf32-ppc.c \ @@ -1172,7 +1168,7 @@ SOURCE_HFILES = \ ecoff-bfd.h ecoffswap.h \ elf32-arm.h elf32-avr.h elf32-bfin.h elf32-cr16.h elf32-csky.h \ elf32-dlx.h elf32-hppa.h elf32-m68hc1x.h elf32-m68k.h \ - elf32-metag.h elf32-nds32.h elf32-nios2.h elf32-ppc.h \ + elf32-metag.h elf32-nds32.h elf32-ppc.h \ elf32-rx.h elf32-score.h elf32-sh-relocs.h elf32-spu.h \ elf32-tic6x.h elf32-tilegx.h elf32-tilepro.h elf32-v850.h \ elf64-hppa.h elf64-ppc.h elf64-tilegx.h \ @@ -1524,7 +1520,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-nds32.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-nfp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-nios2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-ns32k.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-or1k.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-pdp11.Plo@am__quote@ @@ -1614,7 +1609,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-msp430.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-mt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-nds32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-nios2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-or1k.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-pj.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-ppc.Plo@am__quote@ diff --git a/bfd/archures.c b/bfd/archures.c index c4decc59e4a..5c104af6ef3 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -536,10 +536,6 @@ DESCRIPTION .#define bfd_mach_aarch64_8R 1 .#define bfd_mach_aarch64_ilp32 32 .#define bfd_mach_aarch64_llp64 64 -. bfd_arch_nios2, {* Nios II. *} -.#define bfd_mach_nios2 0 -.#define bfd_mach_nios2r1 1 -.#define bfd_mach_nios2r2 2 . bfd_arch_visium, {* Visium. *} .#define bfd_mach_visium 1 . bfd_arch_wasm32, {* WebAssembly. *} @@ -681,7 +677,6 @@ extern const bfd_arch_info_type bfd_msp430_arch; extern const bfd_arch_info_type bfd_mt_arch; extern const bfd_arch_info_type bfd_nds32_arch; extern const bfd_arch_info_type bfd_nfp_arch; -extern const bfd_arch_info_type bfd_nios2_arch; extern const bfd_arch_info_type bfd_ns32k_arch; extern const bfd_arch_info_type bfd_or1k_arch; extern const bfd_arch_info_type bfd_pdp11_arch; @@ -770,7 +765,6 @@ static const bfd_arch_info_type * const bfd_archures_list[] = &bfd_mt_arch, &bfd_nds32_arch, &bfd_nfp_arch, - &bfd_nios2_arch, &bfd_ns32k_arch, &bfd_or1k_arch, &bfd_pdp11_arch, diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 3b047d922f3..092a6587c1c 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1802,10 +1802,6 @@ enum bfd_architecture #define bfd_mach_aarch64_8R 1 #define bfd_mach_aarch64_ilp32 32 #define bfd_mach_aarch64_llp64 64 - bfd_arch_nios2, /* Nios II. */ -#define bfd_mach_nios2 0 -#define bfd_mach_nios2r1 1 -#define bfd_mach_nios2r2 2 bfd_arch_visium, /* Visium. */ #define bfd_mach_visium 1 bfd_arch_wasm32, /* WebAssembly. */ @@ -6164,60 +6160,6 @@ enum bfd_reloc_code_real BFD_RELOC_MSP430_SET_ULEB128, BFD_RELOC_MSP430_SUB_ULEB128, - /* Relocations used by the Altera Nios II core. */ - BFD_RELOC_NIOS2_S16, - BFD_RELOC_NIOS2_U16, - BFD_RELOC_NIOS2_CALL26, - BFD_RELOC_NIOS2_IMM5, - BFD_RELOC_NIOS2_CACHE_OPX, - BFD_RELOC_NIOS2_IMM6, - BFD_RELOC_NIOS2_IMM8, - BFD_RELOC_NIOS2_HI16, - BFD_RELOC_NIOS2_LO16, - BFD_RELOC_NIOS2_HIADJ16, - BFD_RELOC_NIOS2_GPREL, - BFD_RELOC_NIOS2_UJMP, - BFD_RELOC_NIOS2_CJMP, - BFD_RELOC_NIOS2_CALLR, - BFD_RELOC_NIOS2_ALIGN, - BFD_RELOC_NIOS2_GOT16, - BFD_RELOC_NIOS2_CALL16, - BFD_RELOC_NIOS2_GOTOFF_LO, - BFD_RELOC_NIOS2_GOTOFF_HA, - BFD_RELOC_NIOS2_PCREL_LO, - BFD_RELOC_NIOS2_PCREL_HA, - BFD_RELOC_NIOS2_TLS_GD16, - BFD_RELOC_NIOS2_TLS_LDM16, - BFD_RELOC_NIOS2_TLS_LDO16, - BFD_RELOC_NIOS2_TLS_IE16, - BFD_RELOC_NIOS2_TLS_LE16, - BFD_RELOC_NIOS2_TLS_DTPMOD, - BFD_RELOC_NIOS2_TLS_DTPREL, - BFD_RELOC_NIOS2_TLS_TPREL, - BFD_RELOC_NIOS2_COPY, - BFD_RELOC_NIOS2_GLOB_DAT, - BFD_RELOC_NIOS2_JUMP_SLOT, - BFD_RELOC_NIOS2_RELATIVE, - BFD_RELOC_NIOS2_GOTOFF, - BFD_RELOC_NIOS2_CALL26_NOAT, - BFD_RELOC_NIOS2_GOT_LO, - BFD_RELOC_NIOS2_GOT_HA, - BFD_RELOC_NIOS2_CALL_LO, - BFD_RELOC_NIOS2_CALL_HA, - BFD_RELOC_NIOS2_R2_S12, - BFD_RELOC_NIOS2_R2_I10_1_PCREL, - BFD_RELOC_NIOS2_R2_T1I7_1_PCREL, - BFD_RELOC_NIOS2_R2_T1I7_2, - BFD_RELOC_NIOS2_R2_T2I4, - BFD_RELOC_NIOS2_R2_T2I4_1, - BFD_RELOC_NIOS2_R2_T2I4_2, - BFD_RELOC_NIOS2_R2_X1I7_2, - BFD_RELOC_NIOS2_R2_X2L5, - BFD_RELOC_NIOS2_R2_F1I5_2, - BFD_RELOC_NIOS2_R2_L5I4X1, - BFD_RELOC_NIOS2_R2_T1X1I6, - BFD_RELOC_NIOS2_R2_T1X1I6_2, - /* PRU LDI 16-bit unsigned data-memory relocation. */ BFD_RELOC_PRU_U16, diff --git a/bfd/config.bfd b/bfd/config.bfd index 6553aac1e99..e2b09a2a92e 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -204,7 +204,6 @@ m68*) targ_archs=bfd_m68k_arch ;; microblaze*) targ_archs=bfd_microblaze_arch ;; mips*) targ_archs=bfd_mips_arch ;; nds32*) targ_archs=bfd_nds32_arch ;; -nios2*) targ_archs=bfd_nios2_arch ;; or1k*|or1knd*) targ_archs=bfd_or1k_arch ;; pdp11*) targ_archs=bfd_pdp11_arch ;; pj*) targ_archs="bfd_pj_arch bfd_i386_arch";; @@ -1070,21 +1069,6 @@ case "${targ}" in targ_underscore=yes ;; - nios2eb-*-*) - targ_defvec=nios2_elf32_be_vec - targ_selvecs=nios2_elf32_le_vec - ;; - - nios2el-*-*) - targ_defvec=nios2_elf32_le_vec - targ_selvecs=nios2_elf32_be_vec - ;; - - nios2-*-*) - targ_defvec=nios2_elf32_le_vec - targ_selvecs=nios2_elf32_be_vec - ;; - or1k-*-elf | or1k-*-linux* | or1k-*-rtems*) targ_defvec=or1k_elf32_vec ;; diff --git a/bfd/configure b/bfd/configure index b50cb7571d8..2db9f76b9eb 100755 --- a/bfd/configure +++ b/bfd/configure @@ -15977,8 +15977,6 @@ do nds32_elf32_linux_be_vec) tb="$tb elf32-nds32.lo elf32.lo $elf" ;; nds32_elf32_linux_le_vec) tb="$tb elf32-nds32.lo elf32.lo $elf" ;; nfp_elf64_vec) tb="$tb elf64-nfp.lo elf64.lo $elf" ;; - nios2_elf32_be_vec) tb="$tb elf32-nios2.lo elf32.lo $elf" ;; - nios2_elf32_le_vec) tb="$tb elf32-nios2.lo elf32.lo $elf" ;; ns32k_aout_pc532mach_vec) tb="$tb pc532-mach.lo aout-ns32k.lo" ;; ns32k_aout_pc532nbsd_vec) tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;; or1k_elf32_vec) tb="$tb elf32-or1k.lo elf32.lo $elf" ;; diff --git a/bfd/configure.ac b/bfd/configure.ac index 6bcfd1b7368..465a7463d48 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -563,8 +563,6 @@ do nds32_elf32_linux_be_vec) tb="$tb elf32-nds32.lo elf32.lo $elf" ;; nds32_elf32_linux_le_vec) tb="$tb elf32-nds32.lo elf32.lo $elf" ;; nfp_elf64_vec) tb="$tb elf64-nfp.lo elf64.lo $elf" ;; - nios2_elf32_be_vec) tb="$tb elf32-nios2.lo elf32.lo $elf" ;; - nios2_elf32_le_vec) tb="$tb elf32-nios2.lo elf32.lo $elf" ;; ns32k_aout_pc532mach_vec) tb="$tb pc532-mach.lo aout-ns32k.lo" ;; ns32k_aout_pc532nbsd_vec) tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;; or1k_elf32_vec) tb="$tb elf32-or1k.lo elf32.lo $elf" ;; diff --git a/bfd/cpu-nios2.c b/bfd/cpu-nios2.c deleted file mode 100644 index 4b81b3ec9f5..00000000000 --- a/bfd/cpu-nios2.c +++ /dev/null @@ -1,75 +0,0 @@ -/* BFD support for the Altera Nios II processor. - Copyright (C) 2012-2024 Free Software Foundation, Inc. - Contributed by Nigel Gray (ngray@altera.com). - Contributed by Mentor Graphics, Inc. - - This file is part of BFD, the Binary File Descriptor library. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, - MA 02110-1301, USA. */ - -#include "sysdep.h" -#include "bfd.h" -#include "libbfd.h" - -static const bfd_arch_info_type * -nios2_compatible (const bfd_arch_info_type *a, - const bfd_arch_info_type *b) -{ - if (a->arch != b->arch) - return NULL; - - if (a->bits_per_word != b->bits_per_word) - return NULL; - - if (a->mach == bfd_mach_nios2) - return a; - else if (b->mach == bfd_mach_nios2) - return b; - else if (a->mach != b->mach) - return NULL; - - return a; -} - -#define N(NUMBER, PRINT, DEFAULT, NEXT) \ - { \ - 32, /* Bits in a word. */ \ - 32, /* Bits in an address. */ \ - 8, /* Bits in a byte. */ \ - bfd_arch_nios2, \ - NUMBER, \ - "nios2", \ - PRINT, \ - 3, \ - DEFAULT, \ - nios2_compatible, \ - bfd_default_scan, \ - bfd_arch_default_fill, \ - NEXT, \ - 0 /* Maximum offset of a reloc from the start of an insn. */ \ - } - -#define NIOS2R1_NEXT &arch_info_struct[0] -#define NIOS2R2_NEXT &arch_info_struct[1] - -static const bfd_arch_info_type arch_info_struct[2] = -{ - N (bfd_mach_nios2r1, "nios2:r1", false, NIOS2R2_NEXT), - N (bfd_mach_nios2r2, "nios2:r2", false, NULL), -}; - -const bfd_arch_info_type bfd_nios2_arch = - N (bfd_mach_nios2, "nios2", true, NIOS2R1_NEXT); diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 96cf11936ae..b756e73736e 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -558,7 +558,6 @@ enum elf_target_id MIPS_ELF_DATA, MN10300_ELF_DATA, NDS32_ELF_DATA, - NIOS2_ELF_DATA, OR1K_ELF_DATA, PPC32_ELF_DATA, PPC64_ELF_DATA, diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c index ebe162f2e5f..6e0da8c4dd8 100644 --- a/bfd/elf-eh-frame.c +++ b/bfd/elf-eh-frame.c @@ -2145,7 +2145,6 @@ _bfd_elf_write_section_eh_frame (bfd *abfd, /* Fall thru */ case bfd_arch_frv: case bfd_arch_i386: - case bfd_arch_nios2: BFD_ASSERT (htab->hgot != NULL && ((htab->hgot->root.type == bfd_link_hash_defined) diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c deleted file mode 100644 index f6580af9519..00000000000 --- a/bfd/elf32-nios2.c +++ /dev/null @@ -1,6086 +0,0 @@ -/* 32-bit ELF support for Nios II. - Copyright (C) 2012-2024 Free Software Foundation, Inc. - Contributed by Nigel Gray (ngray@altera.com). - Contributed by Mentor Graphics, Inc. - - This file is part of BFD, the Binary File Descriptor library. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, - MA 02110-1301, USA. */ - -/* This file handles Altera Nios II ELF targets. */ - -#include "sysdep.h" -#include "bfd.h" -#include "libbfd.h" -#include "bfdlink.h" -#include "genlink.h" -#include "elf-bfd.h" -#include "elf/nios2.h" -#include "opcode/nios2.h" -#include "elf32-nios2.h" -#include "libiberty.h" - -/* Use RELA relocations. */ -#ifndef USE_RELA -#define USE_RELA -#endif - -#ifdef USE_REL -#undef USE_REL -#endif - -/* Forward declarations. */ -static bfd_reloc_status_type nios2_elf32_ignore_reloc - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_hi16_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_lo16_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_hiadj16_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_pcrel_lo16_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_pcrel_hiadj16_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_pcrel16_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_call26_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_gprel_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_ujmp_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_cjmp_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -static bfd_reloc_status_type nios2_elf32_callr_relocate - (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); - -/* Target vector. */ -extern const bfd_target nios2_elf32_le_vec; -extern const bfd_target nios2_elf32_be_vec; - -/* Offset of tp and dtp pointers from start of TLS block. */ -#define TP_OFFSET 0x7000 -#define DTP_OFFSET 0x8000 - -/* The relocation tables used for SHT_REL sections. There are separate - tables for R1 and R2 encodings. */ -static reloc_howto_type elf_nios2_r1_howto_table_rel[] = { - /* No relocation. */ - HOWTO (R_NIOS2_NONE, /* type */ - 0, /* rightshift */ - 0, /* size */ - 0, /* bitsize */ - false, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_dont, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ - "R_NIOS2_NONE", /* name */ - false, /* partial_inplace */ - 0, /* src_mask */ - 0, /* dst_mask */ - false), /* pcrel_offset */ - - /* 16-bit signed immediate relocation. */ - HOWTO (R_NIOS2_S16, /* type */ - 0, /* rightshift */ - 4, /* size */ - 16, /* bitsize */ - false, /* pc_relative */ - 6, /* bitpos */ - complain_overflow_signed, /* complain on overflow */ - bfd_elf_generic_reloc, /* special function */ - "R_NIOS2_S16", /* name */ - false, /* partial_inplace */ - 0x003fffc0, /* src_mask */ - 0x003fffc0, /* dest_mask */ - false), /* pcrel_offset */ - - /* 16-bit unsigned immediate relocation. */ - HOWTO (R_NIOS2_U16, /* type */ - 0, /* rightshift */ - 4, /* size */ - 16, /* bitsize */ - false, /* pc_relative */ - 6, /* bitpos */ - complain_overflow_unsigned, /* complain on overflow */ - bfd_elf_generic_reloc, /* special function */ - "R_NIOS2_U16", /* name */ - false, /* partial_inplace */ - 0x003fffc0, /* src_mask */ - 0x003fffc0, /* dest_mask */ - false), /* pcrel_offset */ - - HOWTO (R_NIOS2_PCREL16, /* type */ - 0, /* rightshift */ - 4, /* size */ - 16, /* bitsize */ - true, /* pc_relative */ - 6, /* bitpos */ - complain_overflow_signed, /* complain on overflow */ - nios2_elf32_pcrel16_relocate, /* special function */ - "R_NIOS2_PCREL16", /* name */ - false, /* partial_inplace */ - 0x003fffc0, /* src_mask */ - 0x003fffc0, /* dest_mask */ - true), /* pcrel_offset */ - - HOWTO (R_NIOS2_CALL26, /* type */ - 2, /* rightshift */ - 4, /* size */ - 26, /* bitsize */ - false, /* pc_relative */ - 6, /* bitpos */ - complain_overflow_dont, /* complain on overflow */ - nios2_elf32_call26_relocate, /* special function */ - "R_NIOS2_CALL26", /* name */ - false, /* partial_inplace */ - 0xffffffc0, /* src_mask */ - 0xffffffc0, /* dst_mask */ - false), /* pcrel_offset */ - - HOWTO (R_NIOS2_IMM5, - 0, - 4, - 5, - false, - 6, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_IMM5", - false, - 0x000007c0, - 0x000007c0, - false), - - HOWTO (R_NIOS2_CACHE_OPX, - 0, - 4, - 5, - false, - 22, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_CACHE_OPX", - false, - 0x07c00000, - 0x07c00000, - false), - - HOWTO (R_NIOS2_IMM6, - 0, - 4, - 6, - false, - 6, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_IMM6", - false, - 0x00000fc0, - 0x00000fc0, - false), - - HOWTO (R_NIOS2_IMM8, - 0, - 4, - 8, - false, - 6, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_IMM8", - false, - 0x00003fc0, - 0x00003fc0, - false), - - HOWTO (R_NIOS2_HI16, - 0, - 4, - 32, - false, - 6, - complain_overflow_dont, - nios2_elf32_hi16_relocate, - "R_NIOS2_HI16", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_LO16, - 0, - 4, - 32, - false, - 6, - complain_overflow_dont, - nios2_elf32_lo16_relocate, - "R_NIOS2_LO16", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_HIADJ16, - 0, - 4, - 32, - false, - 6, - complain_overflow_dont, - nios2_elf32_hiadj16_relocate, - "R_NIOS2_HIADJ16", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_BFD_RELOC_32, - 0, - 4, /* long */ - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_BFD_RELOC32", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_BFD_RELOC_16, - 0, - 2, /* short */ - 16, - false, - 0, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_BFD_RELOC16", - false, - 0x0000ffff, - 0x0000ffff, - false), - - HOWTO (R_NIOS2_BFD_RELOC_8, - 0, - 1, /* byte */ - 8, - false, - 0, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_BFD_RELOC8", - false, - 0x000000ff, - 0x000000ff, - false), - - HOWTO (R_NIOS2_GPREL, - 0, - 4, - 32, - false, - 6, - complain_overflow_dont, - nios2_elf32_gprel_relocate, - "R_NIOS2_GPREL", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_GNU_VTINHERIT, - 0, - 4, - 0, - false, - 0, - complain_overflow_dont, - NULL, - "R_NIOS2_GNU_VTINHERIT", - false, - 0, - 0, - false), - - HOWTO (R_NIOS2_GNU_VTENTRY, - 0, - 4, - 0, - false, - 0, - complain_overflow_dont, - _bfd_elf_rel_vtable_reloc_fn, - "R_NIOS2_GNU_VTENTRY", - false, - 0, - 0, - false), - - HOWTO (R_NIOS2_UJMP, - 0, - 4, - 32, - false, - 6, - complain_overflow_dont, - nios2_elf32_ujmp_relocate, - "R_NIOS2_UJMP", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_CJMP, - 0, - 4, - 32, - false, - 6, - complain_overflow_dont, - nios2_elf32_cjmp_relocate, - "R_NIOS2_CJMP", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_CALLR, - 0, - 4, - 32, - false, - 6, - complain_overflow_dont, - nios2_elf32_callr_relocate, - "R_NIOS2_CALLR", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_ALIGN, - 0, - 4, - 0, - false, - 0, - complain_overflow_dont, - nios2_elf32_ignore_reloc, - "R_NIOS2_ALIGN", - false, - 0, - 0, - true), - - - HOWTO (R_NIOS2_GOT16, - 0, - 4, - 16, - false, - 6, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_GOT16", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_CALL16, - 0, - 4, - 16, - false, - 6, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_CALL16", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_GOTOFF_LO, - 0, - 4, - 16, - false, - 6, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GOTOFF_LO", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_GOTOFF_HA, - 0, - 4, - 16, - false, - 6, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GOTOFF_HA", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_PCREL_LO, - 0, - 4, - 16, - true, - 6, - complain_overflow_dont, - nios2_elf32_pcrel_lo16_relocate, - "R_NIOS2_PCREL_LO", - false, - 0x003fffc0, - 0x003fffc0, - true), - - HOWTO (R_NIOS2_PCREL_HA, - 0, - 4, - 16, - false, /* This is a PC-relative relocation, but we need to subtract - PC ourselves before the HIADJ. */ - 6, - complain_overflow_dont, - nios2_elf32_pcrel_hiadj16_relocate, - "R_NIOS2_PCREL_HA", - false, - 0x003fffc0, - 0x003fffc0, - true), - - HOWTO (R_NIOS2_TLS_GD16, - 0, - 4, - 16, - false, - 6, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_GD16", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_TLS_LDM16, - 0, - 4, - 16, - false, - 6, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_LDM16", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_TLS_LDO16, - 0, - 4, - 16, - false, - 6, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_LDO16", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_TLS_IE16, - 0, - 4, - 16, - false, - 6, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_IE16", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_TLS_LE16, - 0, - 4, - 16, - false, - 6, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_LE16", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_TLS_DTPMOD, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_DTPMOD", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_TLS_DTPREL, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_DTPREL", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_TLS_TPREL, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_TPREL", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_COPY, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_COPY", - false, - 0, - 0, - false), - - HOWTO (R_NIOS2_GLOB_DAT, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GLOB_DAT", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_JUMP_SLOT, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_JUMP_SLOT", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_RELATIVE, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_RELATIVE", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_GOTOFF, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GOTOFF", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_CALL26_NOAT, /* type */ - 2, /* rightshift */ - 4, /* size */ - 26, /* bitsize */ - false, /* pc_relative */ - 6, /* bitpos */ - complain_overflow_dont, /* complain on overflow */ - nios2_elf32_call26_relocate, /* special function */ - "R_NIOS2_CALL26_NOAT", /* name */ - false, /* partial_inplace */ - 0xffffffc0, /* src_mask */ - 0xffffffc0, /* dst_mask */ - false), /* pcrel_offset */ - - HOWTO (R_NIOS2_GOT_LO, - 0, - 4, - 16, - false, - 6, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GOT_LO", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_GOT_HA, - 0, - 4, - 16, - false, - 6, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GOT_HA", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_CALL_LO, - 0, - 4, - 16, - false, - 6, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_CALL_LO", - false, - 0x003fffc0, - 0x003fffc0, - false), - - HOWTO (R_NIOS2_CALL_HA, - 0, - 4, - 16, - false, - 6, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_CALL_HA", - false, - 0x003fffc0, - 0x003fffc0, - false), - -/* Add other relocations here. */ -}; - -static reloc_howto_type elf_nios2_r2_howto_table_rel[] = { - /* No relocation. */ - HOWTO (R_NIOS2_NONE, /* type */ - 0, /* rightshift */ - 0, /* size */ - 0, /* bitsize */ - false, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_dont, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ - "R_NIOS2_NONE", /* name */ - false, /* partial_inplace */ - 0, /* src_mask */ - 0, /* dst_mask */ - false), /* pcrel_offset */ - - /* 16-bit signed immediate relocation. */ - HOWTO (R_NIOS2_S16, /* type */ - 0, /* rightshift */ - 4, /* size */ - 16, /* bitsize */ - false, /* pc_relative */ - 16, /* bitpos */ - complain_overflow_signed, /* complain on overflow */ - bfd_elf_generic_reloc, /* special function */ - "R_NIOS2_S16", /* name */ - false, /* partial_inplace */ - 0xffff0000, /* src_mask */ - 0xffff0000, /* dest_mask */ - false), /* pcrel_offset */ - - /* 16-bit unsigned immediate relocation. */ - HOWTO (R_NIOS2_U16, /* type */ - 0, /* rightshift */ - 4, /* size */ - 16, /* bitsize */ - false, /* pc_relative */ - 16, /* bitpos */ - complain_overflow_unsigned, /* complain on overflow */ - bfd_elf_generic_reloc, /* special function */ - "R_NIOS2_U16", /* name */ - false, /* partial_inplace */ - 0xffff0000, /* src_mask */ - 0xffff0000, /* dest_mask */ - false), /* pcrel_offset */ - - HOWTO (R_NIOS2_PCREL16, /* type */ - 0, /* rightshift */ - 4, /* size */ - 16, /* bitsize */ - true, /* pc_relative */ - 16, /* bitpos */ - complain_overflow_signed, /* complain on overflow */ - nios2_elf32_pcrel16_relocate, /* special function */ - "R_NIOS2_PCREL16", /* name */ - false, /* partial_inplace */ - 0xffff0000, /* src_mask */ - 0xffff0000, /* dest_mask */ - true), /* pcrel_offset */ - - HOWTO (R_NIOS2_CALL26, /* type */ - 2, /* rightshift */ - 4, /* size */ - 26, /* bitsize */ - false, /* pc_relative */ - 6, /* bitpos */ - complain_overflow_dont, /* complain on overflow */ - nios2_elf32_call26_relocate, /* special function */ - "R_NIOS2_CALL26", /* name */ - false, /* partial_inplace */ - 0xffffffc0, /* src_mask */ - 0xffffffc0, /* dst_mask */ - false), /* pcrel_offset */ - - HOWTO (R_NIOS2_IMM5, - 0, - 4, - 5, - false, - 21, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_IMM5", - false, - 0x03e00000, - 0x03e00000, - false), - - HOWTO (R_NIOS2_CACHE_OPX, - 0, - 4, - 5, - false, - 11, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_CACHE_OPX", - false, - 0x0000f800, - 0x0000f800, - false), - - HOWTO (R_NIOS2_IMM6, - 0, - 4, - 6, - false, - 26, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_IMM6", - false, - 0xfc000000, - 0xfc000000, - false), - - HOWTO (R_NIOS2_IMM8, - 0, - 4, - 8, - false, - 24, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_IMM8", - false, - 0xff000000, - 0xff000000, - false), - - HOWTO (R_NIOS2_HI16, - 0, - 4, - 32, - false, - 16, - complain_overflow_dont, - nios2_elf32_hi16_relocate, - "R_NIOS2_HI16", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_LO16, - 0, - 4, - 32, - false, - 16, - complain_overflow_dont, - nios2_elf32_lo16_relocate, - "R_NIOS2_LO16", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_HIADJ16, - 0, - 4, - 32, - false, - 16, - complain_overflow_dont, - nios2_elf32_hiadj16_relocate, - "R_NIOS2_HIADJ16", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_BFD_RELOC_32, - 0, - 4, /* long */ - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_BFD_RELOC32", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_BFD_RELOC_16, - 0, - 2, /* short */ - 16, - false, - 0, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_BFD_RELOC16", - false, - 0x0000ffff, - 0x0000ffff, - false), - - HOWTO (R_NIOS2_BFD_RELOC_8, - 0, - 1, /* byte */ - 8, - false, - 0, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_BFD_RELOC8", - false, - 0x000000ff, - 0x000000ff, - false), - - HOWTO (R_NIOS2_GPREL, - 0, - 4, - 32, - false, - 16, - complain_overflow_dont, - nios2_elf32_gprel_relocate, - "R_NIOS2_GPREL", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_GNU_VTINHERIT, - 0, - 4, - 0, - false, - 0, - complain_overflow_dont, - NULL, - "R_NIOS2_GNU_VTINHERIT", - false, - 0, - 0, - false), - - HOWTO (R_NIOS2_GNU_VTENTRY, - 0, - 4, - 0, - false, - 0, - complain_overflow_dont, - _bfd_elf_rel_vtable_reloc_fn, - "R_NIOS2_GNU_VTENTRY", - false, - 0, - 0, - false), - - HOWTO (R_NIOS2_UJMP, - 0, - 4, - 32, - false, - 16, - complain_overflow_dont, - nios2_elf32_ujmp_relocate, - "R_NIOS2_UJMP", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_CJMP, - 0, - 4, - 32, - false, - 16, - complain_overflow_dont, - nios2_elf32_cjmp_relocate, - "R_NIOS2_CJMP", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_CALLR, - 0, - 4, - 32, - false, - 16, - complain_overflow_dont, - nios2_elf32_callr_relocate, - "R_NIOS2_CALLR", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_ALIGN, - 0, - 4, - 0, - false, - 0, - complain_overflow_dont, - nios2_elf32_ignore_reloc, - "R_NIOS2_ALIGN", - false, - 0, - 0, - true), - - HOWTO (R_NIOS2_GOT16, - 0, - 4, - 16, - false, - 16, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_GOT16", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_CALL16, - 0, - 4, - 16, - false, - 16, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_CALL16", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_GOTOFF_LO, - 0, - 4, - 16, - false, - 16, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GOTOFF_LO", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_GOTOFF_HA, - 0, - 4, - 16, - false, - 16, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GOTOFF_HA", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_PCREL_LO, - 0, - 4, - 16, - true, - 16, - complain_overflow_dont, - nios2_elf32_pcrel_lo16_relocate, - "R_NIOS2_PCREL_LO", - false, - 0xffff0000, - 0xffff0000, - true), - - HOWTO (R_NIOS2_PCREL_HA, - 0, - 4, - 16, - false, /* This is a PC-relative relocation, but we need to subtract - PC ourselves before the HIADJ. */ - 16, - complain_overflow_dont, - nios2_elf32_pcrel_hiadj16_relocate, - "R_NIOS2_PCREL_HA", - false, - 0xffff0000, - 0xffff0000, - true), - - HOWTO (R_NIOS2_TLS_GD16, - 0, - 4, - 16, - false, - 16, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_GD16", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_TLS_LDM16, - 0, - 4, - 16, - false, - 16, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_LDM16", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_TLS_LDO16, - 0, - 4, - 16, - false, - 16, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_LDO16", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_TLS_IE16, - 0, - 4, - 16, - false, - 16, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_IE16", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_TLS_LE16, - 0, - 4, - 16, - false, - 16, - complain_overflow_bitfield, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_LE16", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_TLS_DTPMOD, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_DTPMOD", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_TLS_DTPREL, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_DTPREL", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_TLS_TPREL, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_TLS_TPREL", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_COPY, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_COPY", - false, - 0, - 0, - false), - - HOWTO (R_NIOS2_GLOB_DAT, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GLOB_DAT", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_JUMP_SLOT, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_JUMP_SLOT", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_RELATIVE, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_RELATIVE", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_GOTOFF, - 0, - 4, - 32, - false, - 0, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GOTOFF", - false, - 0xffffffff, - 0xffffffff, - false), - - HOWTO (R_NIOS2_CALL26_NOAT, /* type */ - 2, /* rightshift */ - 4, /* size */ - 26, /* bitsize */ - false, /* pc_relative */ - 6, /* bitpos */ - complain_overflow_dont, /* complain on overflow */ - nios2_elf32_call26_relocate, /* special function */ - "R_NIOS2_CALL26_NOAT", /* name */ - false, /* partial_inplace */ - 0xffffffc0, /* src_mask */ - 0xffffffc0, /* dst_mask */ - false), /* pcrel_offset */ - - HOWTO (R_NIOS2_GOT_LO, - 0, - 4, - 16, - false, - 16, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GOT_LO", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_GOT_HA, - 0, - 4, - 16, - false, - 16, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_GOT_HA", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_CALL_LO, - 0, - 4, - 16, - false, - 16, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_CALL_LO", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_CALL_HA, - 0, - 4, - 16, - false, - 16, - complain_overflow_dont, - bfd_elf_generic_reloc, - "R_NIOS2_CALL_HA", - false, - 0xffff0000, - 0xffff0000, - false), - - HOWTO (R_NIOS2_R2_S12, - 0, - 4, - 12, - false, - 16, - complain_overflow_signed, - bfd_elf_generic_reloc, - "R_NIOS2_R2_S12", - false, - 0x0fff0000, - 0x0fff0000, - false), - - HOWTO (R_NIOS2_R2_I10_1_PCREL, - 1, - 2, - 10, - true, - 6, - complain_overflow_signed, - bfd_elf_generic_reloc, /* FIXME? */ - "R_NIOS2_R2_I10_1_PCREL", - false, - 0xffc0, - 0xffc0, - true), - - HOWTO (R_NIOS2_R2_T1I7_1_PCREL, - 1, - 2, - 7, - true, - 9, - complain_overflow_signed, - bfd_elf_generic_reloc, /* FIXME? */ - "R_NIOS2_R2_T1I7_1_PCREL", - false, - 0xfe00, - 0xfe00, - true), - - HOWTO (R_NIOS2_R2_T1I7_2, - 2, - 2, - 7, - false, - 9, - complain_overflow_unsigned, - bfd_elf_generic_reloc, - "R_NIOS2_R2_T1I7_2", - false, - 0xfe00, - 0xfe00, - false), - - HOWTO (R_NIOS2_R2_T2I4, - 0, - 2, - 4, - false, - 12, - complain_overflow_unsigned, - bfd_elf_generic_reloc, - "R_NIOS2_R2_T2I4", - false, - 0xf000, - 0xf000, - false), - - HOWTO (R_NIOS2_R2_T2I4_1, - 1, - 2, - 4, - false, - 12, - complain_overflow_unsigned, - bfd_elf_generic_reloc, - "R_NIOS2_R2_T2I4_1", - false, - 0xf000, - 0xf000, - false), - - HOWTO (R_NIOS2_R2_T2I4_2, - 2, - 2, - 4, - false, - 12, - complain_overflow_unsigned, - bfd_elf_generic_reloc, - "R_NIOS2_R2_T2I4_2", - false, - 0xf000, - 0xf000, - false), - - HOWTO (R_NIOS2_R2_X1I7_2, - 2, - 2, - 7, - false, - 6, - complain_overflow_unsigned, - bfd_elf_generic_reloc, - "R_NIOS2_R2_X1I7_2", - false, - 0x1fc0, - 0x1fc0, - false), - - HOWTO (R_NIOS2_R2_X2L5, - 0, - 2, - 5, - false, - 6, - complain_overflow_unsigned, - bfd_elf_generic_reloc, - "R_NIOS2_R2_X2L5", - false, - 0x07c0, - 0x07c0, - false), - - HOWTO (R_NIOS2_R2_F1I5_2, - 2, - 2, - 5, - false, - 6, - complain_overflow_unsigned, - bfd_elf_generic_reloc, - "R_NIOS2_R2_F1L5_2", - false, - 0x07c0, - 0x07c0, - false), - - HOWTO (R_NIOS2_R2_L5I4X1, - 2, - 2, - 4, - false, - 6, - complain_overflow_unsigned, - bfd_elf_generic_reloc, - "R_NIOS2_R2_L5I4X1", - false, - 0x03c0, - 0x03c0, - false), - - HOWTO (R_NIOS2_R2_T1X1I6, - 0, - 2, - 6, - false, - 9, - complain_overflow_unsigned, - bfd_elf_generic_reloc, - "R_NIOS2_R2_T1X1I6", - false, - 0x7e00, - 0x7e00, - false), - - HOWTO (R_NIOS2_R2_T1X1I6_2, - 2, - 4, - 6, - false, - 9, - complain_overflow_unsigned, - bfd_elf_generic_reloc, - "R_NIOS2_R2_T1I1X6_2", - false, - 0x7e00, - 0x7e00, - false), - -/* Add other relocations here. */ -}; - -static unsigned char elf_code_to_howto_index[R_NIOS2_ILLEGAL + 1]; - - -/* Return true if producing output for a R2 BFD. */ -#define BFD_IS_R2(abfd) (bfd_get_mach (abfd) == bfd_mach_nios2r2) - -/* Return the howto for relocation RTYPE. */ -static reloc_howto_type * -lookup_howto (unsigned int rtype, bfd *abfd) -{ - static int initialized = 0; - int i; - /* R2 relocations are a superset of R1, so use that for the lookup - table. */ - int r1_howto_tbl_size = (int) ARRAY_SIZE (elf_nios2_r1_howto_table_rel); - int r2_howto_tbl_size = (int) ARRAY_SIZE (elf_nios2_r2_howto_table_rel); - - if (!initialized) - { - initialized = 1; - memset (elf_code_to_howto_index, 0xff, - sizeof (elf_code_to_howto_index)); - for (i = 0; i < r2_howto_tbl_size; i++) - { - elf_code_to_howto_index[elf_nios2_r2_howto_table_rel[i].type] = i; - if (i < r1_howto_tbl_size) - BFD_ASSERT (elf_nios2_r2_howto_table_rel[i].type - == elf_nios2_r1_howto_table_rel[i].type); - } - } - - if (rtype > R_NIOS2_ILLEGAL) - return NULL; - i = elf_code_to_howto_index[rtype]; - if (BFD_IS_R2 (abfd)) - { - if (i >= r2_howto_tbl_size) - return NULL; - return elf_nios2_r2_howto_table_rel + i; - } - else - { - if (i >= r1_howto_tbl_size) - return NULL; - return elf_nios2_r1_howto_table_rel + i; - } -} - -/* Map for converting BFD reloc types to Nios II reloc types. */ -struct elf_reloc_map -{ - bfd_reloc_code_real_type bfd_val; - enum elf_nios2_reloc_type elf_val; -}; - -static const struct elf_reloc_map nios2_reloc_map[] = -{ - {BFD_RELOC_NONE, R_NIOS2_NONE}, - {BFD_RELOC_NIOS2_S16, R_NIOS2_S16}, - {BFD_RELOC_NIOS2_U16, R_NIOS2_U16}, - {BFD_RELOC_16_PCREL, R_NIOS2_PCREL16}, - {BFD_RELOC_NIOS2_CALL26, R_NIOS2_CALL26}, - {BFD_RELOC_NIOS2_IMM5, R_NIOS2_IMM5}, - {BFD_RELOC_NIOS2_CACHE_OPX, R_NIOS2_CACHE_OPX}, - {BFD_RELOC_NIOS2_IMM6, R_NIOS2_IMM6}, - {BFD_RELOC_NIOS2_IMM8, R_NIOS2_IMM8}, - {BFD_RELOC_NIOS2_HI16, R_NIOS2_HI16}, - {BFD_RELOC_NIOS2_LO16, R_NIOS2_LO16}, - {BFD_RELOC_NIOS2_HIADJ16, R_NIOS2_HIADJ16}, - {BFD_RELOC_32, R_NIOS2_BFD_RELOC_32}, - {BFD_RELOC_16, R_NIOS2_BFD_RELOC_16}, - {BFD_RELOC_8, R_NIOS2_BFD_RELOC_8}, - {BFD_RELOC_NIOS2_GPREL, R_NIOS2_GPREL}, - {BFD_RELOC_VTABLE_INHERIT, R_NIOS2_GNU_VTINHERIT}, - {BFD_RELOC_VTABLE_ENTRY, R_NIOS2_GNU_VTENTRY}, - {BFD_RELOC_NIOS2_UJMP, R_NIOS2_UJMP}, - {BFD_RELOC_NIOS2_CJMP, R_NIOS2_CJMP}, - {BFD_RELOC_NIOS2_CALLR, R_NIOS2_CALLR}, - {BFD_RELOC_NIOS2_ALIGN, R_NIOS2_ALIGN}, - {BFD_RELOC_NIOS2_GOT16, R_NIOS2_GOT16}, - {BFD_RELOC_NIOS2_CALL16, R_NIOS2_CALL16}, - {BFD_RELOC_NIOS2_GOTOFF_LO, R_NIOS2_GOTOFF_LO}, - {BFD_RELOC_NIOS2_GOTOFF_HA, R_NIOS2_GOTOFF_HA}, - {BFD_RELOC_NIOS2_PCREL_LO, R_NIOS2_PCREL_LO}, - {BFD_RELOC_NIOS2_PCREL_HA, R_NIOS2_PCREL_HA}, - {BFD_RELOC_NIOS2_TLS_GD16, R_NIOS2_TLS_GD16}, - {BFD_RELOC_NIOS2_TLS_LDM16, R_NIOS2_TLS_LDM16}, - {BFD_RELOC_NIOS2_TLS_LDO16, R_NIOS2_TLS_LDO16}, - {BFD_RELOC_NIOS2_TLS_IE16, R_NIOS2_TLS_IE16}, - {BFD_RELOC_NIOS2_TLS_LE16, R_NIOS2_TLS_LE16}, - {BFD_RELOC_NIOS2_TLS_DTPMOD, R_NIOS2_TLS_DTPMOD}, - {BFD_RELOC_NIOS2_TLS_DTPREL, R_NIOS2_TLS_DTPREL}, - {BFD_RELOC_NIOS2_TLS_TPREL, R_NIOS2_TLS_TPREL}, - {BFD_RELOC_NIOS2_COPY, R_NIOS2_COPY}, - {BFD_RELOC_NIOS2_GLOB_DAT, R_NIOS2_GLOB_DAT}, - {BFD_RELOC_NIOS2_JUMP_SLOT, R_NIOS2_JUMP_SLOT}, - {BFD_RELOC_NIOS2_RELATIVE, R_NIOS2_RELATIVE}, - {BFD_RELOC_NIOS2_GOTOFF, R_NIOS2_GOTOFF}, - {BFD_RELOC_NIOS2_CALL26_NOAT, R_NIOS2_CALL26_NOAT}, - {BFD_RELOC_NIOS2_GOT_LO, R_NIOS2_GOT_LO}, - {BFD_RELOC_NIOS2_GOT_HA, R_NIOS2_GOT_HA}, - {BFD_RELOC_NIOS2_CALL_LO, R_NIOS2_CALL_LO}, - {BFD_RELOC_NIOS2_CALL_HA, R_NIOS2_CALL_HA}, - {BFD_RELOC_NIOS2_R2_S12, R_NIOS2_R2_S12}, - {BFD_RELOC_NIOS2_R2_I10_1_PCREL, R_NIOS2_R2_I10_1_PCREL}, - {BFD_RELOC_NIOS2_R2_T1I7_1_PCREL, R_NIOS2_R2_T1I7_1_PCREL}, - {BFD_RELOC_NIOS2_R2_T1I7_2, R_NIOS2_R2_T1I7_2}, - {BFD_RELOC_NIOS2_R2_T2I4, R_NIOS2_R2_T2I4}, - {BFD_RELOC_NIOS2_R2_T2I4_1, R_NIOS2_R2_T2I4_1}, - {BFD_RELOC_NIOS2_R2_T2I4_2, R_NIOS2_R2_T2I4_2}, - {BFD_RELOC_NIOS2_R2_X1I7_2, R_NIOS2_R2_X1I7_2}, - {BFD_RELOC_NIOS2_R2_X2L5, R_NIOS2_R2_X2L5}, - {BFD_RELOC_NIOS2_R2_F1I5_2, R_NIOS2_R2_F1I5_2}, - {BFD_RELOC_NIOS2_R2_L5I4X1, R_NIOS2_R2_L5I4X1}, - {BFD_RELOC_NIOS2_R2_T1X1I6, R_NIOS2_R2_T1X1I6}, - {BFD_RELOC_NIOS2_R2_T1X1I6_2, R_NIOS2_R2_T1X1I6_2}, -}; - -enum elf32_nios2_stub_type -{ - nios2_stub_call26_before, - nios2_stub_call26_after, - nios2_stub_none -}; - -struct elf32_nios2_stub_hash_entry -{ - /* Base hash table entry structure. */ - struct bfd_hash_entry bh_root; - - /* The stub section. */ - asection *stub_sec; - - /* Offset within stub_sec of the beginning of this stub. */ - bfd_vma stub_offset; - - /* Given the symbol's value and its section we can determine its final - value when building the stubs (so the stub knows where to jump. */ - bfd_vma target_value; - asection *target_section; - - enum elf32_nios2_stub_type stub_type; - - /* The symbol table entry, if any, that this was derived from. */ - struct elf32_nios2_link_hash_entry *hh; - - /* And the reloc addend that this was derived from. */ - bfd_vma addend; - - /* Where this stub is being called from, or, in the case of combined - stub sections, the first input section in the group. */ - asection *id_sec; -}; - -#define nios2_stub_hash_entry(ent) \ - ((struct elf32_nios2_stub_hash_entry *)(ent)) - -#define nios2_stub_hash_lookup(table, string, create, copy) \ - ((struct elf32_nios2_stub_hash_entry *) \ - bfd_hash_lookup ((table), (string), (create), (copy))) - - -/* Nios II ELF linker hash entry. */ - -struct elf32_nios2_link_hash_entry -{ - struct elf_link_hash_entry root; - - /* A pointer to the most recently used stub hash entry against this - symbol. */ - struct elf32_nios2_stub_hash_entry *hsh_cache; - -#define GOT_UNKNOWN 0 -#define GOT_NORMAL 1 -#define GOT_TLS_GD 2 -#define GOT_TLS_IE 4 - unsigned char tls_type; - - /* We need to detect and take special action for symbols which are only - referenced with %call() and not with %got(). Such symbols do not need - a dynamic GOT reloc in shared objects, only a dynamic PLT reloc. Lazy - linking will not work if the dynamic GOT reloc exists. - To check for this condition efficiently, we compare got_types_used against - CALL_USED, meaning - (got_types_used & (GOT_USED | CALL_USED)) == CALL_USED. - */ -#define GOT_USED 1 -#define CALL_USED 2 - unsigned char got_types_used; -}; - -#define elf32_nios2_hash_entry(ent) \ - ((struct elf32_nios2_link_hash_entry *) (ent)) - -/* Get the Nios II elf linker hash table from a link_info structure. */ -#define elf32_nios2_hash_table(info) \ - ((struct elf32_nios2_link_hash_table *) ((info)->hash)) - -/* Nios II ELF linker hash table. */ -struct elf32_nios2_link_hash_table - { - /* The main hash table. */ - struct elf_link_hash_table root; - - /* The stub hash table. */ - struct bfd_hash_table bstab; - - /* Linker stub bfd. */ - bfd *stub_bfd; - - /* Linker call-backs. */ - asection * (*add_stub_section) (const char *, asection *, bool); - void (*layout_sections_again) (void); - - /* Array to keep track of which stub sections have been created, and - information on stub grouping. */ - struct map_stub - { - /* These are the section to which stubs in the group will be - attached. */ - asection *first_sec, *last_sec; - /* The stub sections. There might be stubs inserted either before - or after the real section.*/ - asection *first_stub_sec, *last_stub_sec; - } *stub_group; - - /* Assorted information used by nios2_elf32_size_stubs. */ - unsigned int bfd_count; - unsigned int top_index; - asection **input_list; - Elf_Internal_Sym **all_local_syms; - - /* Short-cuts to get to dynamic linker sections. */ - asection *sbss; - - /* GOT pointer symbol _gp_got. */ - struct elf_link_hash_entry *h_gp_got; - - union { - bfd_signed_vma refcount; - bfd_vma offset; - } tls_ldm_got; - - bfd_vma res_n_size; - }; - -struct nios2_elf32_obj_tdata -{ - struct elf_obj_tdata root; - - /* tls_type for each local got entry. */ - char *local_got_tls_type; - - /* TRUE if TLS GD relocs have been seen for this object. */ - bool has_tlsgd; -}; - -#define elf32_nios2_tdata(abfd) \ - ((struct nios2_elf32_obj_tdata *) (abfd)->tdata.any) - -#define elf32_nios2_local_got_tls_type(abfd) \ - (elf32_nios2_tdata (abfd)->local_got_tls_type) - -/* The name of the dynamic interpreter. This is put in the .interp - section. */ -#define ELF_DYNAMIC_INTERPRETER "/lib/ld.so.1" - -/* PLT implementation for position-dependent code. */ -static const bfd_vma nios2_plt_entry[] = { /* .PLTn: */ - 0x03c00034, /* movhi r15, %hiadj(plt_got_slot_address) */ - 0x7bc00017, /* ldw r15, %lo(plt_got_slot_address)(r15) */ - 0x7800683a /* jmp r15 */ -}; - -static const bfd_vma nios2_plt0_entry[] = { /* .PLTresolve */ - 0x03800034, /* movhi r14, %hiadj(res_0) */ - 0x73800004, /* addi r14, r14, %lo(res_0) */ - 0x7b9fc83a, /* sub r15, r15, r14 */ - 0x03400034, /* movhi r13, %hiadj(_GLOBAL_OFFSET_TABLE_) */ - 0x6b800017, /* ldw r14, %lo(_GLOBAL_OFFSET_TABLE_+4)(r13) */ - 0x6b400017, /* ldw r13, %lo(_GLOBAL_OFFSET_TABLE_+8)(r13) */ - 0x6800683a /* jmp r13 */ -}; - -/* PLT implementation for position-independent code. */ -static const bfd_vma nios2_so_plt_entry[] = { /* .PLTn */ - 0x03c00034, /* movhi r15, %hiadj(index * 4) */ - 0x7bc00004, /* addi r15, r15, %lo(index * 4) */ - 0x00000006 /* br .PLTresolve */ -}; - -static const bfd_vma nios2_so_plt0_entry[] = { /* .PLTresolve */ - 0x001ce03a, /* nextpc r14 */ - 0x03400034, /* movhi r13, %hiadj(_GLOBAL_OFFSET_TABLE_) */ - 0x6b9b883a, /* add r13, r13, r14 */ - 0x6b800017, /* ldw r14, %lo(_GLOBAL_OFFSET_TABLE_+4)(r13) */ - 0x6b400017, /* ldw r13, %lo(_GLOBAL_OFFSET_TABLE_+8)(r13) */ - 0x6800683a /* jmp r13 */ -}; - -/* CALL26 stub. */ -static const bfd_vma nios2_call26_stub_entry[] = { - 0x00400034, /* orhi at, r0, %hiadj(dest) */ - 0x08400004, /* addi at, at, %lo(dest) */ - 0x0800683a /* jmp at */ -}; - -/* Install 16-bit immediate value VALUE at offset OFFSET into section SEC. */ -static void -nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) -{ - bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); - - bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), - sec->contents + offset); -} - -/* Install COUNT 32-bit values DATA starting at offset OFFSET into - section SEC. */ -static void -nios2_elf32_install_data (asection *sec, const bfd_vma *data, bfd_vma offset, - int count) -{ - while (count--) - { - bfd_put_32 (sec->owner, *data, sec->contents + offset); - offset += 4; - ++data; - } -} - -/* The usual way of loading a 32-bit constant into a Nios II register is to - load the high 16 bits in one instruction and then add the low 16 bits with - a signed add. This means that the high halfword needs to be adjusted to - compensate for the sign bit of the low halfword. This function returns the - adjusted high halfword for a given 32-bit constant. */ -static -bfd_vma hiadj (bfd_vma symbol_value) -{ - return ((symbol_value + 0x8000) >> 16) & 0xffff; -} - -/* Implement elf_backend_grok_prstatus: - Support for core dump NOTE sections. */ -static bool -nios2_grok_prstatus (bfd *abfd, Elf_Internal_Note *note) -{ - int offset; - size_t size; - - switch (note->descsz) - { - default: - return false; - - case 212: /* Linux/Nios II */ - /* pr_cursig */ - elf_tdata (abfd)->core->signal = bfd_get_16 (abfd, note->descdata + 12); - - /* pr_pid */ - elf_tdata (abfd)->core->pid = bfd_get_32 (abfd, note->descdata + 24); - - /* pr_reg */ - offset = 72; - size = 136; - - break; - } - - /* Make a ".reg/999" section. */ - return _bfd_elfcore_make_pseudosection (abfd, ".reg", - size, note->descpos + offset); -} - -/* Implement elf_backend_grok_psinfo. */ -static bool -nios2_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) -{ - switch (note->descsz) - { - default: - return false; - - case 124: /* Linux/Nios II elf_prpsinfo */ - elf_tdata (abfd)->core->program - = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16); - elf_tdata (abfd)->core->command - = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80); - } - - /* Note that for some reason, a spurious space is tacked - onto the end of the args in some (at least one anyway) - implementations, so strip it off if it exists. */ - - { - char *command = elf_tdata (abfd)->core->command; - int n = strlen (command); - - if (0 < n && command[n - 1] == ' ') - command[n - 1] = '\0'; - } - - return true; -} - -/* Assorted hash table functions. */ - -/* Initialize an entry in the stub hash table. */ -static struct bfd_hash_entry * -stub_hash_newfunc (struct bfd_hash_entry *entry, - struct bfd_hash_table *table, - const char *string) -{ - /* Allocate the structure if it has not already been allocated by a - subclass. */ - if (entry == NULL) - { - entry = bfd_hash_allocate (table, - sizeof (struct elf32_nios2_stub_hash_entry)); - if (entry == NULL) - return entry; - } - - /* Call the allocation method of the superclass. */ - entry = bfd_hash_newfunc (entry, table, string); - if (entry != NULL) - { - struct elf32_nios2_stub_hash_entry *hsh; - - /* Initialize the local fields. */ - hsh = (struct elf32_nios2_stub_hash_entry *) entry; - hsh->stub_sec = NULL; - hsh->stub_offset = 0; - hsh->target_value = 0; - hsh->target_section = NULL; - hsh->stub_type = nios2_stub_none; - hsh->hh = NULL; - hsh->id_sec = NULL; - } - - return entry; -} - -/* Create an entry in a Nios II ELF linker hash table. */ -static struct bfd_hash_entry * -link_hash_newfunc (struct bfd_hash_entry *entry, - struct bfd_hash_table *table, const char *string) -{ - /* Allocate the structure if it has not already been allocated by a - subclass. */ - if (entry == NULL) - { - entry = bfd_hash_allocate (table, - sizeof (struct elf32_nios2_link_hash_entry)); - if (entry == NULL) - return entry; - } - - /* Call the allocation method of the superclass. */ - entry = _bfd_elf_link_hash_newfunc (entry, table, string); - if (entry) - { - struct elf32_nios2_link_hash_entry *eh; - - eh = (struct elf32_nios2_link_hash_entry *) entry; - eh->hsh_cache = NULL; - eh->tls_type = GOT_UNKNOWN; - eh->got_types_used = 0; - } - - return entry; -} - -/* Section name for stubs is the associated section name plus this - string. */ -#define STUB_SUFFIX ".stub" - -/* Build a name for an entry in the stub hash table. */ -static char * -nios2_stub_name (const asection *input_section, - const asection *sym_sec, - const struct elf32_nios2_link_hash_entry *hh, - const Elf_Internal_Rela *rel, - enum elf32_nios2_stub_type stub_type) -{ - char *stub_name; - bfd_size_type len; - char stubpos = (stub_type == nios2_stub_call26_before) ? 'b' : 'a'; - - if (hh) - { - len = 8 + 1 + 1 + 1+ strlen (hh->root.root.root.string) + 1 + 8 + 1; - stub_name = bfd_malloc (len); - if (stub_name != NULL) - { - sprintf (stub_name, "%08x_%c_%s+%x", - input_section->id & 0xffffffff, - stubpos, - hh->root.root.root.string, - (int) rel->r_addend & 0xffffffff); - } - } - else - { - len = 8 + 1 + 1 + 1+ 8 + 1 + 8 + 1 + 8 + 1; - stub_name = bfd_malloc (len); - if (stub_name != NULL) - { - sprintf (stub_name, "%08x_%c_%x:%x+%x", - input_section->id & 0xffffffff, - stubpos, - sym_sec->id & 0xffffffff, - (int) ELF32_R_SYM (rel->r_info) & 0xffffffff, - (int) rel->r_addend & 0xffffffff); - } - } - return stub_name; -} - -/* Look up an entry in the stub hash. Stub entries are cached because - creating the stub name takes a bit of time. */ -static struct elf32_nios2_stub_hash_entry * -nios2_get_stub_entry (const asection *input_section, - const asection *sym_sec, - struct elf32_nios2_link_hash_entry *hh, - const Elf_Internal_Rela *rel, - struct elf32_nios2_link_hash_table *htab, - enum elf32_nios2_stub_type stub_type) -{ - struct elf32_nios2_stub_hash_entry *hsh; - const asection *id_sec; - - /* If this input section is part of a group of sections sharing one - stub section, then use the id of the first/last section in the group, - depending on the stub section placement relative to the group. - Stub names need to include a section id, as there may well be - more than one stub used to reach say, printf, and we need to - distinguish between them. */ - if (stub_type == nios2_stub_call26_before) - id_sec = htab->stub_group[input_section->id].first_sec; - else - id_sec = htab->stub_group[input_section->id].last_sec; - - if (hh != NULL && hh->hsh_cache != NULL - && hh->hsh_cache->hh == hh - && hh->hsh_cache->id_sec == id_sec - && hh->hsh_cache->stub_type == stub_type) - { - hsh = hh->hsh_cache; - } - else - { - char *stub_name; - - stub_name = nios2_stub_name (id_sec, sym_sec, hh, rel, stub_type); - if (stub_name == NULL) - return NULL; - - hsh = nios2_stub_hash_lookup (&htab->bstab, - stub_name, false, false); - - if (hh != NULL) - hh->hsh_cache = hsh; - - free (stub_name); - } - - return hsh; -} - -/* Add a new stub entry to the stub hash. Not all fields of the new - stub entry are initialised. */ -static struct elf32_nios2_stub_hash_entry * -nios2_add_stub (const char *stub_name, - asection *section, - struct elf32_nios2_link_hash_table *htab, - enum elf32_nios2_stub_type stub_type) -{ - asection *link_sec; - asection *stub_sec; - asection **secptr, **linkptr; - struct elf32_nios2_stub_hash_entry *hsh; - bool afterp; - - if (stub_type == nios2_stub_call26_before) - { - link_sec = htab->stub_group[section->id].first_sec; - secptr = &(htab->stub_group[section->id].first_stub_sec); - linkptr = &(htab->stub_group[link_sec->id].first_stub_sec); - afterp = false; - } - else - { - link_sec = htab->stub_group[section->id].last_sec; - secptr = &(htab->stub_group[section->id].last_stub_sec); - linkptr = &(htab->stub_group[link_sec->id].last_stub_sec); - afterp = true; - } - stub_sec = *secptr; - if (stub_sec == NULL) - { - stub_sec = *linkptr; - if (stub_sec == NULL) - { - size_t namelen; - bfd_size_type len; - char *s_name; - - namelen = strlen (link_sec->name); - len = namelen + sizeof (STUB_SUFFIX); - s_name = bfd_alloc (htab->stub_bfd, len); - if (s_name == NULL) - return NULL; - - memcpy (s_name, link_sec->name, namelen); - memcpy (s_name + namelen, STUB_SUFFIX, sizeof (STUB_SUFFIX)); - - stub_sec = (*htab->add_stub_section) (s_name, link_sec, afterp); - if (stub_sec == NULL) - return NULL; - *linkptr = stub_sec; - } - *secptr = stub_sec; - } - - /* Enter this entry into the linker stub hash table. */ - hsh = nios2_stub_hash_lookup (&htab->bstab, stub_name, - true, false); - if (hsh == NULL) - { - /* xgettext:c-format */ - _bfd_error_handler (_("%pB: cannot create stub entry %s"), - section->owner, - stub_name); - return NULL; - } - - hsh->stub_sec = stub_sec; - hsh->stub_offset = 0; - hsh->id_sec = link_sec; - return hsh; -} - -/* Set up various things so that we can make a list of input sections - for each output section included in the link. Returns -1 on error, - 0 when no stubs will be needed, and 1 on success. */ -int -nios2_elf32_setup_section_lists (bfd *output_bfd, struct bfd_link_info *info) -{ - bfd *input_bfd; - unsigned int bfd_count; - unsigned int top_id, top_index; - asection *section; - asection **input_list, **list; - size_t amt; - struct elf32_nios2_link_hash_table *htab = elf32_nios2_hash_table (info); - - /* Count the number of input BFDs and find the top input section id. */ - for (input_bfd = info->input_bfds, bfd_count = 0, top_id = 0; - input_bfd != NULL; - input_bfd = input_bfd->link.next) - { - bfd_count += 1; - for (section = input_bfd->sections; - section != NULL; - section = section->next) - { - if (top_id < section->id) - top_id = section->id; - } - } - - htab->bfd_count = bfd_count; - - amt = sizeof (struct map_stub) * (top_id + 1); - htab->stub_group = bfd_zmalloc (amt); - if (htab->stub_group == NULL) - return -1; - - /* We can't use output_bfd->section_count here to find the top output - section index as some sections may have been removed, and - strip_excluded_output_sections doesn't renumber the indices. */ - for (section = output_bfd->sections, top_index = 0; - section != NULL; - section = section->next) - { - if (top_index < section->index) - top_index = section->index; - } - - htab->top_index = top_index; - amt = sizeof (asection *) * (top_index + 1); - input_list = bfd_malloc (amt); - htab->input_list = input_list; - if (input_list == NULL) - return -1; - - /* For sections we aren't interested in, mark their entries with a - value we can check later. */ - list = input_list + top_index; - do - *list = bfd_abs_section_ptr; - while (list-- != input_list); - - for (section = output_bfd->sections; - section != NULL; - section = section->next) - { - /* FIXME: This is a bit of hack. Currently our .ctors and .dtors - * have PC relative relocs in them but no code flag set. */ - if (((section->flags & SEC_CODE) != 0) || - strcmp(".ctors", section->name) || - strcmp(".dtors", section->name)) - input_list[section->index] = NULL; - } - - return 1; -} - -/* The linker repeatedly calls this function for each input section, - in the order that input sections are linked into output sections. - Build lists of input sections to determine groupings between which - we may insert linker stubs. */ -void -nios2_elf32_next_input_section (struct bfd_link_info *info, asection *isec) -{ - struct elf32_nios2_link_hash_table *htab = elf32_nios2_hash_table (info); - - if (isec->output_section->index <= htab->top_index) - { - asection **list = htab->input_list + isec->output_section->index; - if (*list != bfd_abs_section_ptr) - { - /* Steal the last_sec pointer for our list. - This happens to make the list in reverse order, - which is what we want. */ - htab->stub_group[isec->id].last_sec = *list; - *list = isec; - } - } -} - -/* Segment mask for CALL26 relocation relaxation. */ -#define CALL26_SEGMENT(x) ((x) & 0xf0000000) - -/* Fudge factor for approximate maximum size of all stubs that might - be inserted by the linker. This does not actually limit the number - of stubs that might be inserted, and only affects strategy for grouping - and placement of stubs. Perhaps this should be computed based on number - of relocations seen, or be specifiable on the command line. */ -#define MAX_STUB_SECTION_SIZE 0xffff - -/* See whether we can group stub sections together. Grouping stub - sections may result in fewer stubs. More importantly, we need to - put all .init* and .fini* stubs at the end of the .init or - .fini output sections respectively, because glibc splits the - _init and _fini functions into multiple parts. Putting a stub in - the middle of a function is not a good idea. - Rather than computing groups of a maximum fixed size, for Nios II - CALL26 relaxation it makes more sense to compute the groups based on - sections that fit within a 256MB address segment. Also do not allow - a group to span more than one output section, since different output - sections might correspond to different memory banks on a bare-metal - target, etc. */ -static void -group_sections (struct elf32_nios2_link_hash_table *htab) -{ - asection **list = htab->input_list + htab->top_index; - do - { - /* The list is in reverse order so we'll search backwards looking - for the first section that begins in the same memory segment, - marking sections along the way to point at the tail for this - group. */ - asection *tail = *list; - if (tail == bfd_abs_section_ptr) - continue; - while (tail != NULL) - { - bfd_vma start = tail->output_section->vma + tail->output_offset; - bfd_vma end = start + tail->size; - bfd_vma segment = CALL26_SEGMENT (end); - asection *prev; - - if (segment != CALL26_SEGMENT (start) - || segment != CALL26_SEGMENT (end + MAX_STUB_SECTION_SIZE)) - /* This section spans more than one memory segment, or is - close enough to the end of the segment that adding stub - sections before it might cause it to move so that it - spans memory segments, or that stubs added at the end of - this group might overflow into the next memory segment. - Put it in a group by itself to localize the effects. */ - { - prev = htab->stub_group[tail->id].last_sec; - htab->stub_group[tail->id].last_sec = tail; - htab->stub_group[tail->id].first_sec = tail; - } - else - /* Collect more sections for this group. */ - { - asection *curr, *first; - for (curr = tail; ; curr = prev) - { - prev = htab->stub_group[curr->id].last_sec; - if (!prev - || tail->output_section != prev->output_section - || (CALL26_SEGMENT (prev->output_section->vma - + prev->output_offset) - != segment)) - break; - } - first = curr; - for (curr = tail; ; curr = prev) - { - prev = htab->stub_group[curr->id].last_sec; - htab->stub_group[curr->id].last_sec = tail; - htab->stub_group[curr->id].first_sec = first; - if (curr == first) - break; - } - } - - /* Reset tail for the next group. */ - tail = prev; - } - } - while (list-- != htab->input_list); - free (htab->input_list); -} - -/* Determine the type of stub needed, if any, for a call. */ -static enum elf32_nios2_stub_type -nios2_type_of_stub (asection *input_sec, - const Elf_Internal_Rela *rel, - struct elf32_nios2_link_hash_entry *hh, - struct elf32_nios2_link_hash_table *htab, - bfd_vma destination, - struct bfd_link_info *info ATTRIBUTE_UNUSED) -{ - bfd_vma location, segment, start, end; - asection *s0, *s1, *s; - - if (hh != NULL && - !(hh->root.root.type == bfd_link_hash_defined - || hh->root.root.type == bfd_link_hash_defweak)) - return nios2_stub_none; - - /* Determine where the call point is. */ - location = (input_sec->output_section->vma - + input_sec->output_offset + rel->r_offset); - segment = CALL26_SEGMENT (location); - - /* Nios II CALL and JMPI instructions can transfer control to addresses - within the same 256MB segment as the PC. */ - if (segment == CALL26_SEGMENT (destination)) - return nios2_stub_none; - - /* Find the start and end addresses of the stub group. Also account for - any already-created stub sections for this group. Note that for stubs - in the end section, only the first instruction of the last stub - (12 bytes long) needs to be within range. */ - s0 = htab->stub_group[input_sec->id].first_sec; - s = htab->stub_group[s0->id].first_stub_sec; - if (s != NULL && s->size > 0) - start = s->output_section->vma + s->output_offset; - else - start = s0->output_section->vma + s0->output_offset; - - s1 = htab->stub_group[input_sec->id].last_sec; - s = htab->stub_group[s1->id].last_stub_sec; - if (s != NULL && s->size > 0) - end = s->output_section->vma + s->output_offset + s->size - 8; - else - end = s1->output_section->vma + s1->output_offset + s1->size; - - BFD_ASSERT (start < end); - BFD_ASSERT (start <= location); - BFD_ASSERT (location < end); - - /* Put stubs at the end of the group unless that is not a valid - location and the beginning of the group is. It might be that - neither the beginning nor end works if we have an input section - so large that it spans multiple segment boundaries. In that - case, punt; the end result will be a relocation overflow error no - matter what we do here. - - Note that adding stubs pushes up the addresses of all subsequent - sections, so that stubs allocated on one pass through the - relaxation loop may not be valid on the next pass. (E.g., we may - allocate a stub at the beginning of the section on one pass and - find that the call site has been bumped into the next memory - segment on the next pass.) The important thing to note is that - we never try to reclaim the space allocated to such unused stubs, - so code size and section addresses can only increase with each - iteration. Accounting for the start and end addresses of the - already-created stub sections ensures that when the algorithm - converges, it converges accurately, with the entire appropriate - stub section accessible from the call site and not just the - address at the start or end of the stub group proper. */ - - if (segment == CALL26_SEGMENT (end)) - return nios2_stub_call26_after; - else if (segment == CALL26_SEGMENT (start)) - return nios2_stub_call26_before; - else - /* Perhaps this should be a dedicated error code. */ - return nios2_stub_none; -} - -static bool -nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_UNUSED) -{ - struct elf32_nios2_stub_hash_entry *hsh - = (struct elf32_nios2_stub_hash_entry *) gen_entry; - asection *stub_sec = hsh->stub_sec; - bfd_vma sym_value; - struct bfd_link_info *info; - - info = (struct bfd_link_info *) in_arg; - - /* Fail if the target section could not be assigned to an output - section. The user should fix his linker script. */ - if (hsh->target_section->output_section == NULL - && info->non_contiguous_regions) - info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. " - "Retry without --enable-non-contiguous-regions.\n"), - hsh->target_section); - - /* Make a note of the offset within the stubs for this entry. */ - hsh->stub_offset = stub_sec->size; - - switch (hsh->stub_type) - { - case nios2_stub_call26_before: - case nios2_stub_call26_after: - /* A call26 stub looks like: - orhi at, %hiadj(dest) - addi at, at, %lo(dest) - jmp at - Note that call/jmpi instructions can't be used in PIC code - so there is no reason for the stub to be PIC, either. */ - sym_value = (hsh->target_value - + hsh->target_section->output_offset - + hsh->target_section->output_section->vma - + hsh->addend); - - nios2_elf32_install_data (stub_sec, nios2_call26_stub_entry, - hsh->stub_offset, 3); - nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, - hiadj (sym_value)); - nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, - sym_value); - stub_sec->size += 12; - break; - default: - BFD_FAIL (); - return false; - } - - return true; -} - -/* As above, but don't actually build the stub. Just bump offset so - we know stub section sizes. */ -static bool -nios2_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_UNUSED) -{ - struct elf32_nios2_stub_hash_entry *hsh - = (struct elf32_nios2_stub_hash_entry *) gen_entry; - - switch (hsh->stub_type) - { - case nios2_stub_call26_before: - case nios2_stub_call26_after: - hsh->stub_sec->size += 12; - break; - default: - BFD_FAIL (); - return false; - } - return true; -} - -/* Read in all local syms for all input bfds. - Returns -1 on error, 0 otherwise. */ - -static int -get_local_syms (bfd *output_bfd ATTRIBUTE_UNUSED, bfd *input_bfd, - struct bfd_link_info *info) -{ - unsigned int bfd_indx; - Elf_Internal_Sym *local_syms, **all_local_syms; - struct elf32_nios2_link_hash_table *htab = elf32_nios2_hash_table (info); - - /* We want to read in symbol extension records only once. To do this - we need to read in the local symbols in parallel and save them for - later use; so hold pointers to the local symbols in an array. */ - size_t amt = sizeof (Elf_Internal_Sym *) * htab->bfd_count; - all_local_syms = bfd_zmalloc (amt); - htab->all_local_syms = all_local_syms; - if (all_local_syms == NULL) - return -1; - - /* Walk over all the input BFDs, swapping in local symbols. */ - for (bfd_indx = 0; - input_bfd != NULL; - input_bfd = input_bfd->link.next, bfd_indx++) - { - Elf_Internal_Shdr *symtab_hdr; - - /* We'll need the symbol table in a second. */ - symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; - if (symtab_hdr->sh_info == 0) - continue; - - /* We need an array of the local symbols attached to the input bfd. */ - local_syms = (Elf_Internal_Sym *) symtab_hdr->contents; - if (local_syms == NULL) - { - local_syms = bfd_elf_get_elf_syms (input_bfd, symtab_hdr, - symtab_hdr->sh_info, 0, - NULL, NULL, NULL); - /* Cache them for elf_link_input_bfd. */ - symtab_hdr->contents = (unsigned char *) local_syms; - } - if (local_syms == NULL) - return -1; - - all_local_syms[bfd_indx] = local_syms; - } - - return 0; -} - -/* Determine and set the size of the stub section for a final link. */ -bool -nios2_elf32_size_stubs (bfd *output_bfd, bfd *stub_bfd, - struct bfd_link_info *info, - asection *(*add_stub_section) (const char *, - asection *, bool), - void (*layout_sections_again) (void)) -{ - bool stub_changed = false; - struct elf32_nios2_link_hash_table *htab = elf32_nios2_hash_table (info); - - /* Stash our params away. */ - htab->stub_bfd = stub_bfd; - htab->add_stub_section = add_stub_section; - htab->layout_sections_again = layout_sections_again; - - /* FIXME: We only compute the section groups once. This could cause - problems if adding a large stub section causes following sections, - or parts of them, to move into another segment. However, this seems - to be consistent with the way other back ends handle this.... */ - group_sections (htab); - - if (get_local_syms (output_bfd, info->input_bfds, info)) - { - if (htab->all_local_syms) - goto error_ret_free_local; - return false; - } - - while (1) - { - bfd *input_bfd; - unsigned int bfd_indx; - asection *stub_sec; - - for (input_bfd = info->input_bfds, bfd_indx = 0; - input_bfd != NULL; - input_bfd = input_bfd->link.next, bfd_indx++) - { - Elf_Internal_Shdr *symtab_hdr; - asection *section; - Elf_Internal_Sym *local_syms; - - /* We'll need the symbol table in a second. */ - symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; - if (symtab_hdr->sh_info == 0) - continue; - - local_syms = htab->all_local_syms[bfd_indx]; - - /* Walk over each section attached to the input bfd. */ - for (section = input_bfd->sections; - section != NULL; - section = section->next) - { - Elf_Internal_Rela *internal_relocs, *irelaend, *irela; - - /* If there aren't any relocs, then there's nothing more - to do. */ - if ((section->flags & SEC_RELOC) == 0 - || section->reloc_count == 0) - continue; - - /* If this section is a link-once section that will be - discarded, then don't create any stubs. */ - if (section->output_section == NULL - || section->output_section->owner != output_bfd) - continue; - - /* Get the relocs. */ - internal_relocs - = _bfd_elf_link_read_relocs (input_bfd, section, NULL, NULL, - info->keep_memory); - if (internal_relocs == NULL) - goto error_ret_free_local; - - /* Now examine each relocation. */ - irela = internal_relocs; - irelaend = irela + section->reloc_count; - for (; irela < irelaend; irela++) - { - unsigned int r_type, r_indx; - enum elf32_nios2_stub_type stub_type; - struct elf32_nios2_stub_hash_entry *hsh; - asection *sym_sec; - bfd_vma sym_value; - bfd_vma destination; - struct elf32_nios2_link_hash_entry *hh; - char *stub_name; - const asection *id_sec; - - r_type = ELF32_R_TYPE (irela->r_info); - r_indx = ELF32_R_SYM (irela->r_info); - - if (r_type >= (unsigned int) R_NIOS2_ILLEGAL) - { - bfd_set_error (bfd_error_bad_value); - error_ret_free_internal: - if (elf_section_data (section)->relocs == NULL) - free (internal_relocs); - goto error_ret_free_local; - } - - /* Only look for stubs on CALL and JMPI instructions. */ - if (r_type != (unsigned int) R_NIOS2_CALL26) - continue; - - /* Now determine the call target, its name, value, - section. */ - sym_sec = NULL; - sym_value = 0; - destination = 0; - hh = NULL; - if (r_indx < symtab_hdr->sh_info) - { - /* It's a local symbol. */ - Elf_Internal_Sym *sym; - Elf_Internal_Shdr *hdr; - unsigned int shndx; - - sym = local_syms + r_indx; - if (ELF_ST_TYPE (sym->st_info) != STT_SECTION) - sym_value = sym->st_value; - shndx = sym->st_shndx; - if (shndx < elf_numsections (input_bfd)) - { - hdr = elf_elfsections (input_bfd)[shndx]; - sym_sec = hdr->bfd_section; - destination = (sym_value + irela->r_addend - + sym_sec->output_offset - + sym_sec->output_section->vma); - } - } - else - { - /* It's an external symbol. */ - int e_indx; - - e_indx = r_indx - symtab_hdr->sh_info; - hh = ((struct elf32_nios2_link_hash_entry *) - elf_sym_hashes (input_bfd)[e_indx]); - - while (hh->root.root.type == bfd_link_hash_indirect - || hh->root.root.type == bfd_link_hash_warning) - hh = ((struct elf32_nios2_link_hash_entry *) - hh->root.root.u.i.link); - - if (hh->root.root.type == bfd_link_hash_defined - || hh->root.root.type == bfd_link_hash_defweak) - { - sym_sec = hh->root.root.u.def.section; - sym_value = hh->root.root.u.def.value; - - if (sym_sec->output_section != NULL) - destination = (sym_value + irela->r_addend - + sym_sec->output_offset - + sym_sec->output_section->vma); - else - continue; - } - else if (hh->root.root.type == bfd_link_hash_undefweak) - { - if (! bfd_link_pic (info)) - continue; - } - else if (hh->root.root.type == bfd_link_hash_undefined) - { - if (! (info->unresolved_syms_in_objects == RM_IGNORE - && (ELF_ST_VISIBILITY (hh->root.other) - == STV_DEFAULT))) - continue; - } - else - { - bfd_set_error (bfd_error_bad_value); - goto error_ret_free_internal; - } - } - - /* Determine what (if any) linker stub is needed. */ - stub_type = nios2_type_of_stub (section, irela, hh, htab, - destination, info); - if (stub_type == nios2_stub_none) - continue; - - /* Support for grouping stub sections. */ - if (stub_type == nios2_stub_call26_before) - id_sec = htab->stub_group[section->id].first_sec; - else - id_sec = htab->stub_group[section->id].last_sec; - - /* Get the name of this stub. */ - stub_name = nios2_stub_name (id_sec, sym_sec, hh, irela, - stub_type); - if (!stub_name) - goto error_ret_free_internal; - - hsh = nios2_stub_hash_lookup (&htab->bstab, - stub_name, - false, false); - if (hsh != NULL) - { - /* The proper stub has already been created. */ - free (stub_name); - continue; - } - - hsh = nios2_add_stub (stub_name, section, htab, stub_type); - if (hsh == NULL) - { - free (stub_name); - goto error_ret_free_internal; - } - hsh->target_value = sym_value; - hsh->target_section = sym_sec; - hsh->stub_type = stub_type; - hsh->hh = hh; - hsh->addend = irela->r_addend; - stub_changed = true; - } - - /* We're done with the internal relocs, free them. */ - if (elf_section_data (section)->relocs == NULL) - free (internal_relocs); - } - } - - if (!stub_changed) - break; - - /* OK, we've added some stubs. Find out the new size of the - stub sections. */ - for (stub_sec = htab->stub_bfd->sections; - stub_sec != NULL; - stub_sec = stub_sec->next) - stub_sec->size = 0; - - bfd_hash_traverse (&htab->bstab, nios2_size_one_stub, htab); - - /* Ask the linker to do its stuff. */ - (*htab->layout_sections_again) (); - stub_changed = false; - } - - free (htab->all_local_syms); - return true; - - error_ret_free_local: - free (htab->all_local_syms); - return false; -} - -/* Build all the stubs associated with the current output file. The - stubs are kept in a hash table attached to the main linker hash - table. This function is called via nios2elf_finish in the linker. */ -bool -nios2_elf32_build_stubs (struct bfd_link_info *info) -{ - asection *stub_sec; - struct bfd_hash_table *table; - struct elf32_nios2_link_hash_table *htab; - - htab = elf32_nios2_hash_table (info); - - for (stub_sec = htab->stub_bfd->sections; - stub_sec != NULL; - stub_sec = stub_sec->next) - /* The stub_bfd may contain non-stub sections if it is also the - dynobj. Any such non-stub sections are created with the - SEC_LINKER_CREATED flag set, while stub sections do not - have that flag. Ignore any non-stub sections here. */ - if ((stub_sec->flags & SEC_LINKER_CREATED) == 0) - { - bfd_size_type size; - - /* Allocate memory to hold the linker stubs. */ - size = stub_sec->size; - stub_sec->contents = bfd_zalloc (htab->stub_bfd, size); - if (stub_sec->contents == NULL && size != 0) - return false; - stub_sec->size = 0; - } - - /* Build the stubs as directed by the stub hash table. */ - table = &htab->bstab; - bfd_hash_traverse (table, nios2_build_one_stub, info); - - return true; -} - - -#define is_nios2_elf(bfd) \ - (bfd_get_flavour (bfd) == bfd_target_elf_flavour \ - && elf_object_id (bfd) == NIOS2_ELF_DATA) - -/* Merge backend specific data from an object file to the output - object file when linking. */ - -static bool -nios2_elf32_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) -{ - bfd *obfd = info->output_bfd; - flagword old_flags; - flagword new_flags; - - if (!is_nios2_elf (ibfd) || !is_nios2_elf (obfd)) - return true; - - /* Check if we have the same endianness. */ - if (! _bfd_generic_verify_endian_match (ibfd, info)) - return false; - - new_flags = elf_elfheader (ibfd)->e_flags; - old_flags = elf_elfheader (obfd)->e_flags; - if (!elf_flags_init (obfd)) - { - /* First call, no flags set. */ - elf_flags_init (obfd) = true; - elf_elfheader (obfd)->e_flags = new_flags; - - switch (new_flags) - { - default: - case EF_NIOS2_ARCH_R1: - bfd_default_set_arch_mach (obfd, bfd_arch_nios2, bfd_mach_nios2r1); - break; - case EF_NIOS2_ARCH_R2: - if (bfd_big_endian (ibfd)) - { - _bfd_error_handler - (_("error: %pB: big-endian R2 is not supported"), ibfd); - bfd_set_error (bfd_error_bad_value); - return false; - } - bfd_default_set_arch_mach (obfd, bfd_arch_nios2, bfd_mach_nios2r2); - break; - } - } - - /* Incompatible flags. */ - else if (new_flags != old_flags) - { - /* So far, the only incompatible flags denote incompatible - architectures. */ - _bfd_error_handler - /* xgettext:c-format */ - (_("error: %pB: conflicting CPU architectures %d/%d"), - ibfd, new_flags, old_flags); - bfd_set_error (bfd_error_bad_value); - return false; - } - - /* Merge Tag_compatibility attributes and any common GNU ones. */ - _bfd_elf_merge_object_attributes (ibfd, info); - - return true; -} - -/* Implement bfd_elf32_bfd_reloc_type_lookup: - Given a BFD reloc type, return a howto structure. */ - -static reloc_howto_type * -nios2_elf32_bfd_reloc_type_lookup (bfd *abfd, - bfd_reloc_code_real_type code) -{ - int i; - - for (i = 0; i < (int) ARRAY_SIZE (nios2_reloc_map); ++i) - if (nios2_reloc_map[i].bfd_val == code) - return lookup_howto (nios2_reloc_map[i].elf_val, abfd); - return NULL; -} - -/* Implement bfd_elf32_bfd_reloc_name_lookup: - Given a reloc name, return a howto structure. */ - -static reloc_howto_type * -nios2_elf32_bfd_reloc_name_lookup (bfd *abfd, - const char *r_name) -{ - int i; - reloc_howto_type *howto_tbl; - int howto_tbl_size; - - if (BFD_IS_R2 (abfd)) - { - howto_tbl = elf_nios2_r2_howto_table_rel; - howto_tbl_size = (int) ARRAY_SIZE (elf_nios2_r2_howto_table_rel); - } - else - { - howto_tbl = elf_nios2_r1_howto_table_rel; - howto_tbl_size = (int) ARRAY_SIZE (elf_nios2_r1_howto_table_rel); - } - - for (i = 0; i < howto_tbl_size; i++) - if (howto_tbl[i].name && strcasecmp (howto_tbl[i].name, r_name) == 0) - return howto_tbl + i; - - return NULL; -} - -/* Implement elf_info_to_howto: - Given a ELF32 relocation, fill in a arelent structure. */ - -static bool -nios2_elf32_info_to_howto (bfd *abfd, arelent *cache_ptr, - Elf_Internal_Rela *dst) -{ - unsigned int r_type; - - r_type = ELF32_R_TYPE (dst->r_info); - if ((cache_ptr->howto = lookup_howto (r_type, abfd)) == NULL) - { - /* xgettext:c-format */ - _bfd_error_handler (_("%pB: unsupported relocation type %#x"), - abfd, r_type); - bfd_set_error (bfd_error_bad_value); - return false; - } - return true; -} - -/* Return the base VMA address which should be subtracted from real addresses - when resolving @dtpoff relocation. - This is PT_TLS segment p_vaddr. */ -static bfd_vma -dtpoff_base (struct bfd_link_info *info) -{ - /* If tls_sec is NULL, we should have signalled an error already. */ - if (elf_hash_table (info)->tls_sec == NULL) - return 0; - return elf_hash_table (info)->tls_sec->vma; -} - -/* Return the relocation value for @tpoff relocation - if STT_TLS virtual address is ADDRESS. */ -static bfd_vma -tpoff (struct bfd_link_info *info, bfd_vma address) -{ - struct elf_link_hash_table *htab = elf_hash_table (info); - - /* If tls_sec is NULL, we should have signalled an error already. */ - if (htab->tls_sec == NULL) - return 0; - return address - htab->tls_sec->vma; -} - -/* Set the GP value for OUTPUT_BFD. Returns FALSE if this is a - dangerous relocation. */ -static bool -nios2_elf_assign_gp (bfd *output_bfd, bfd_vma *pgp, struct bfd_link_info *info) -{ - - bool gp_found; - struct bfd_hash_entry *h; - struct bfd_link_hash_entry *lh; - - /* If we've already figured out what GP will be, just return it. */ - *pgp = _bfd_get_gp_value (output_bfd); - if (*pgp) - return true; - - h = bfd_hash_lookup (&info->hash->table, "_gp", false, false); - lh = (struct bfd_link_hash_entry *) h; - lookup: - if (lh) - { - switch (lh->type) - { - case bfd_link_hash_undefined: - case bfd_link_hash_undefweak: - case bfd_link_hash_common: - gp_found = false; - break; - case bfd_link_hash_defined: - case bfd_link_hash_defweak: - gp_found = true; - { - asection *sym_sec = lh->u.def.section; - bfd_vma sym_value = lh->u.def.value; - - if (sym_sec->output_section) - sym_value = (sym_value + sym_sec->output_offset - + sym_sec->output_section->vma); - *pgp = sym_value; - } - break; - case bfd_link_hash_indirect: - case bfd_link_hash_warning: - lh = lh->u.i.link; - /* @@FIXME ignoring warning for now */ - goto lookup; - case bfd_link_hash_new: - default: - abort (); - } - } - else - gp_found = false; - - if (!gp_found) - { - /* Only get the error once. */ - *pgp = 4; - _bfd_set_gp_value (output_bfd, *pgp); - return false; - } - - _bfd_set_gp_value (output_bfd, *pgp); - - return true; -} - -/* Retrieve the previously cached _gp pointer, returning bfd_reloc_dangerous - if it's not available as we don't have a link_info pointer available here - to look it up in the output symbol table. We don't need to adjust the - symbol value for an external symbol if we are producing relocatable - output. */ -static bfd_reloc_status_type -nios2_elf_final_gp (bfd *output_bfd, asymbol *symbol, bool relocatable, - char **error_message, bfd_vma *pgp) -{ - if (bfd_is_und_section (symbol->section) && !relocatable) - { - *pgp = 0; - return bfd_reloc_undefined; - } - - *pgp = _bfd_get_gp_value (output_bfd); - if (*pgp == 0 && (!relocatable || (symbol->flags & BSF_SECTION_SYM) != 0)) - { - if (relocatable) - { - /* Make up a value. */ - *pgp = symbol->section->output_section->vma + 0x4000; - _bfd_set_gp_value (output_bfd, *pgp); - } - else - { - *error_message - = (char *) _("global pointer relative relocation when _gp not defined"); - return bfd_reloc_dangerous; - } - } - - return bfd_reloc_ok; -} - -/* Do the relocations that require special handling. */ -static bfd_reloc_status_type -nios2_elf32_do_hi16_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - symbol_value = symbol_value + addend; - addend = 0; - symbol_value = (symbol_value >> 16) & 0xffff; - return _bfd_final_link_relocate (howto, abfd, input_section, - data, offset, symbol_value, addend); -} - -static bfd_reloc_status_type -nios2_elf32_do_lo16_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - symbol_value = symbol_value + addend; - addend = 0; - symbol_value = symbol_value & 0xffff; - return _bfd_final_link_relocate (howto, abfd, input_section, - data, offset, symbol_value, addend); -} - -static bfd_reloc_status_type -nios2_elf32_do_hiadj16_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - symbol_value = symbol_value + addend; - addend = 0; - symbol_value = hiadj(symbol_value); - return _bfd_final_link_relocate (howto, abfd, input_section, data, offset, - symbol_value, addend); -} - -static bfd_reloc_status_type -nios2_elf32_do_pcrel_lo16_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - symbol_value = symbol_value + addend; - addend = 0; - symbol_value = symbol_value & 0xffff; - return _bfd_final_link_relocate (howto, abfd, input_section, - data, offset, symbol_value, addend); -} - -static bfd_reloc_status_type -nios2_elf32_do_pcrel_hiadj16_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - symbol_value = symbol_value + addend; - symbol_value -= (input_section->output_section->vma - + input_section->output_offset); - symbol_value -= offset; - addend = 0; - symbol_value = hiadj(symbol_value); - return _bfd_final_link_relocate (howto, abfd, input_section, data, offset, - symbol_value, addend); -} - -static bfd_reloc_status_type -nios2_elf32_do_pcrel16_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - /* NIOS2 pc relative relocations are relative to the next 32-bit instruction - so we need to subtract 4 before doing a final_link_relocate. */ - symbol_value = symbol_value + addend - 4; - addend = 0; - return _bfd_final_link_relocate (howto, abfd, input_section, - data, offset, symbol_value, addend); -} - -static bfd_reloc_status_type -nios2_elf32_do_call26_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - /* Check that the relocation is in the same page as the current address. */ - if (CALL26_SEGMENT (symbol_value + addend) - != CALL26_SEGMENT (input_section->output_section->vma - + input_section->output_offset - + offset)) - return bfd_reloc_overflow; - - /* Check that the target address is correctly aligned on a 4-byte - boundary. */ - if ((symbol_value + addend) & 0x3) - return bfd_reloc_overflow; - - return _bfd_final_link_relocate (howto, abfd, input_section, - data, offset, symbol_value, addend); -} - -static bfd_reloc_status_type -nios2_elf32_do_gprel_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - /* Because we need the output_bfd, the special handling is done - in nios2_elf32_relocate_section or in nios2_elf32_gprel_relocate. */ - return _bfd_final_link_relocate (howto, abfd, input_section, - data, offset, symbol_value, addend); -} - -static bfd_reloc_status_type -nios2_elf32_do_ujmp_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - bfd_vma symbol_lo16, symbol_hi16; - bfd_reloc_status_type r; - symbol_value = symbol_value + addend; - addend = 0; - symbol_hi16 = (symbol_value >> 16) & 0xffff; - symbol_lo16 = symbol_value & 0xffff; - - r = _bfd_final_link_relocate (howto, abfd, input_section, - data, offset, symbol_hi16, addend); - - if (r == bfd_reloc_ok) - return _bfd_final_link_relocate (howto, abfd, input_section, - data, offset + 4, symbol_lo16, addend); - - return r; -} - -static bfd_reloc_status_type -nios2_elf32_do_cjmp_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - bfd_vma symbol_lo16, symbol_hi16; - bfd_reloc_status_type r; - symbol_value = symbol_value + addend; - addend = 0; - symbol_hi16 = (symbol_value >> 16) & 0xffff; - symbol_lo16 = symbol_value & 0xffff; - - r = _bfd_final_link_relocate (howto, abfd, input_section, - data, offset, symbol_hi16, addend); - - if (r == bfd_reloc_ok) - return _bfd_final_link_relocate (howto, abfd, input_section, - data, offset + 4, symbol_lo16, addend); - - return r; -} - -static bfd_reloc_status_type -nios2_elf32_do_callr_relocate (bfd *abfd, reloc_howto_type *howto, - asection *input_section, - bfd_byte *data, bfd_vma offset, - bfd_vma symbol_value, bfd_vma addend) -{ - bfd_vma symbol_lo16, symbol_hi16; - bfd_reloc_status_type r; - symbol_value = symbol_value + addend; - addend = 0; - symbol_hi16 = (symbol_value >> 16) & 0xffff; - symbol_lo16 = symbol_value & 0xffff; - - r = _bfd_final_link_relocate (howto, abfd, input_section, - data, offset, symbol_hi16, addend); - - if (r == bfd_reloc_ok) - return _bfd_final_link_relocate (howto, abfd, input_section, - data, offset + 4, symbol_lo16, addend); - - return r; -} - -/* HOWTO handlers for relocations that require special handling. */ - -/* This is for relocations used only when relaxing to ensure - changes in size of section don't screw up .align. */ -static bfd_reloc_status_type -nios2_elf32_ignore_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry, - asymbol *symbol ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED, asection *input_section, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - if (output_bfd != NULL) - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; -} - -static bfd_reloc_status_type -nios2_elf32_hi16_relocate (bfd *abfd, arelent *reloc_entry, asymbol *symbol, - void *data, asection *input_section, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - return nios2_elf32_do_hi16_relocate (abfd, reloc_entry->howto, - input_section, - data, reloc_entry->address, - (symbol->value - + symbol->section->output_section->vma - + symbol->section->output_offset), - reloc_entry->addend); -} - -static bfd_reloc_status_type -nios2_elf32_lo16_relocate (bfd *abfd, arelent *reloc_entry, asymbol *symbol, - void *data, asection *input_section, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - return nios2_elf32_do_lo16_relocate (abfd, reloc_entry->howto, - input_section, - data, reloc_entry->address, - (symbol->value - + symbol->section->output_section->vma - + symbol->section->output_offset), - reloc_entry->addend); -} - -static bfd_reloc_status_type -nios2_elf32_hiadj16_relocate (bfd *abfd, arelent *reloc_entry, asymbol *symbol, - void *data, asection *input_section, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - return nios2_elf32_do_hiadj16_relocate (abfd, reloc_entry->howto, - input_section, - data, reloc_entry->address, - (symbol->value - + symbol->section->output_section->vma - + symbol->section->output_offset), - reloc_entry->addend); -} - -static bfd_reloc_status_type -nios2_elf32_pcrel_lo16_relocate (bfd *abfd, arelent *reloc_entry, - asymbol *symbol, void *data, - asection *input_section, bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - return nios2_elf32_do_pcrel_lo16_relocate ( - abfd, reloc_entry->howto, input_section, data, reloc_entry->address, - (symbol->value + symbol->section->output_section->vma - + symbol->section->output_offset), - reloc_entry->addend); -} - -static bfd_reloc_status_type -nios2_elf32_pcrel_hiadj16_relocate (bfd *abfd, arelent *reloc_entry, - asymbol *symbol, void *data, - asection *input_section, bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - return nios2_elf32_do_pcrel_hiadj16_relocate ( - abfd, reloc_entry->howto, input_section, data, reloc_entry->address, - (symbol->value + symbol->section->output_section->vma - + symbol->section->output_offset), - reloc_entry->addend); -} - -static bfd_reloc_status_type -nios2_elf32_pcrel16_relocate (bfd *abfd, arelent *reloc_entry, asymbol *symbol, - void *data, asection *input_section, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - return nios2_elf32_do_pcrel16_relocate (abfd, reloc_entry->howto, - input_section, - data, reloc_entry->address, - (symbol->value - + symbol->section->output_section->vma - + symbol->section->output_offset), - reloc_entry->addend); -} - -static bfd_reloc_status_type -nios2_elf32_call26_relocate (bfd *abfd, arelent *reloc_entry, asymbol *symbol, - void *data, asection *input_section, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) -{ - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - return nios2_elf32_do_call26_relocate (abfd, reloc_entry->howto, - input_section, - data, reloc_entry->address, - (symbol->value - + symbol->section->output_section->vma - + symbol->section->output_offset), - reloc_entry->addend); -} - -static bfd_reloc_status_type -nios2_elf32_gprel_relocate (bfd *abfd, arelent *reloc_entry, asymbol *symbol, - void *data, asection *input_section, - bfd *output_bfd, char **msg) -{ - bfd_vma relocation; - bfd_vma gp; - bfd_reloc_status_type r; - - - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - relocation = (symbol->value - + symbol->section->output_section->vma - + symbol->section->output_offset); - - /* This assumes we've already cached the _gp symbol. */ - r = nios2_elf_final_gp (abfd, symbol, false, msg, &gp); - if (r == bfd_reloc_ok) - { - relocation = relocation + reloc_entry->addend - gp; - reloc_entry->addend = 0; - if ((signed) relocation < -32768 || (signed) relocation > 32767) - { - *msg = _("global pointer relative address out of range"); - r = bfd_reloc_outofrange; - } - else - r = nios2_elf32_do_gprel_relocate (abfd, reloc_entry->howto, - input_section, - data, reloc_entry->address, - relocation, reloc_entry->addend); - } - - return r; -} - -static bfd_reloc_status_type -nios2_elf32_ujmp_relocate (bfd *abfd, arelent *reloc_entry, asymbol *symbol, - void *data, asection *input_section, - bfd *output_bfd, char **msg ATTRIBUTE_UNUSED) -{ - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - return nios2_elf32_do_ujmp_relocate (abfd, reloc_entry->howto, - input_section, - data, reloc_entry->address, - (symbol->value - + symbol->section->output_section->vma - + symbol->section->output_offset), - reloc_entry->addend); -} - -static bfd_reloc_status_type -nios2_elf32_cjmp_relocate (bfd *abfd, arelent *reloc_entry, asymbol *symbol, - void *data, asection *input_section, - bfd *output_bfd, char **msg ATTRIBUTE_UNUSED) -{ - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - return nios2_elf32_do_cjmp_relocate (abfd, reloc_entry->howto, - input_section, - data, reloc_entry->address, - (symbol->value - + symbol->section->output_section->vma - + symbol->section->output_offset), - reloc_entry->addend); -} - -static bfd_reloc_status_type -nios2_elf32_callr_relocate (bfd *abfd, arelent *reloc_entry, asymbol *symbol, - void *data, asection *input_section, - bfd *output_bfd, char **msg ATTRIBUTE_UNUSED) -{ - /* This part is from bfd_elf_generic_reloc. */ - if (output_bfd != NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0)) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (output_bfd != NULL) - /* FIXME: See bfd_perform_relocation. Is this right? */ - return bfd_reloc_continue; - - return nios2_elf32_do_callr_relocate (abfd, reloc_entry->howto, - input_section, - data, reloc_entry->address, - (symbol->value - + symbol->section->output_section->vma - + symbol->section->output_offset), - reloc_entry->addend); -} - - -/* Implement elf_backend_relocate_section. */ -static int -nios2_elf32_relocate_section (bfd *output_bfd, - struct bfd_link_info *info, - bfd *input_bfd, - asection *input_section, - bfd_byte *contents, - Elf_Internal_Rela *relocs, - Elf_Internal_Sym *local_syms, - asection **local_sections) -{ - Elf_Internal_Shdr *symtab_hdr; - struct elf_link_hash_entry **sym_hashes; - Elf_Internal_Rela *rel; - Elf_Internal_Rela *relend; - struct elf32_nios2_link_hash_table *htab; - asection *sgot; - asection *splt; - asection *sreloc = NULL; - bfd_vma *local_got_offsets; - bfd_vma got_base; - - symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; - sym_hashes = elf_sym_hashes (input_bfd); - relend = relocs + input_section->reloc_count; - - htab = elf32_nios2_hash_table (info); - sgot = htab->root.sgot; - splt = htab->root.splt; - local_got_offsets = elf_local_got_offsets (input_bfd); - - if (htab->h_gp_got == NULL) - got_base = 0; - else - got_base = htab->h_gp_got->root.u.def.value; - - for (rel = relocs; rel < relend; rel++) - { - reloc_howto_type *howto; - unsigned long r_symndx; - Elf_Internal_Sym *sym; - asection *sec; - struct elf_link_hash_entry *h; - struct elf32_nios2_link_hash_entry *eh; - bfd_vma relocation; - bfd_vma gp; - bfd_reloc_status_type r = bfd_reloc_ok; - const char *name = NULL; - int r_type; - const char *format; - char *msg = NULL; - bool unresolved_reloc; - bfd_vma off; - int use_plt; - - r_type = ELF32_R_TYPE (rel->r_info); - r_symndx = ELF32_R_SYM (rel->r_info); - - howto = lookup_howto ((unsigned) ELF32_R_TYPE (rel->r_info), output_bfd); - h = NULL; - sym = NULL; - sec = NULL; - - if (r_symndx < symtab_hdr->sh_info) - { - sym = local_syms + r_symndx; - sec = local_sections[r_symndx]; - relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel); - } - else - { - bool warned, ignored; - - RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel, - r_symndx, symtab_hdr, sym_hashes, - h, sec, relocation, - unresolved_reloc, warned, ignored); - } - - if (sec && discarded_section (sec)) - RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section, - rel, 1, relend, howto, 0, contents); - - /* Nothing more to do unless this is a final link. */ - if (bfd_link_relocatable (info)) - continue; - - if (howto) - { - bool resolved_to_zero; - - resolved_to_zero = (h != NULL - && UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)); - switch (howto->type) - { - case R_NIOS2_HI16: - r = nios2_elf32_do_hi16_relocate (input_bfd, howto, - input_section, - contents, rel->r_offset, - relocation, rel->r_addend); - break; - case R_NIOS2_LO16: - r = nios2_elf32_do_lo16_relocate (input_bfd, howto, - input_section, - contents, rel->r_offset, - relocation, rel->r_addend); - break; - case R_NIOS2_PCREL_LO: - r = nios2_elf32_do_pcrel_lo16_relocate (input_bfd, howto, - input_section, - contents, - rel->r_offset, - relocation, - rel->r_addend); - break; - case R_NIOS2_HIADJ16: - r = nios2_elf32_do_hiadj16_relocate (input_bfd, howto, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - case R_NIOS2_PCREL_HA: - r = nios2_elf32_do_pcrel_hiadj16_relocate (input_bfd, howto, - input_section, - contents, - rel->r_offset, - relocation, - rel->r_addend); - break; - case R_NIOS2_PCREL16: - r = nios2_elf32_do_pcrel16_relocate (input_bfd, howto, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - case R_NIOS2_GPREL: - /* Turns an absolute address into a gp-relative address. */ - if (!nios2_elf_assign_gp (output_bfd, &gp, info)) - { - bfd_vma reloc_address; - - if (sec && sec->output_section) - reloc_address = (sec->output_section->vma - + sec->output_offset - + rel->r_offset); - else - reloc_address = 0; - - format = _("global pointer relative relocation at address " - "%#" PRIx64 " when _gp not defined\n"); - msg = bfd_asprintf (format, (uint64_t) reloc_address); - r = bfd_reloc_dangerous; - } - else - { - bfd_vma symbol_address = rel->r_addend + relocation; - relocation = symbol_address - gp; - rel->r_addend = 0; - if (((signed) relocation < -32768 - || (signed) relocation > 32767) - && (!h - || h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak)) - { - if (h) - name = h->root.root.string; - else - { - name = (bfd_elf_string_from_elf_section - (input_bfd, symtab_hdr->sh_link, - sym->st_name)); - if (name == NULL || *name == '\0') - name = bfd_section_name (sec); - } - /* xgettext:c-format */ - format = _("unable to reach %s (at %#" PRIx64 ") from " - "the global pointer (at %#" PRIx64 ") " - "because the offset (%" PRId64 ") is out of " - "the allowed range, -32678 to 32767\n" ); - msg = bfd_asprintf (format, name, - (uint64_t) symbol_address, - (uint64_t) gp, - (int64_t) relocation); - r = bfd_reloc_outofrange; - } - else - r = _bfd_final_link_relocate (howto, input_bfd, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - } - break; - case R_NIOS2_UJMP: - r = nios2_elf32_do_ujmp_relocate (input_bfd, howto, - input_section, - contents, rel->r_offset, - relocation, rel->r_addend); - break; - case R_NIOS2_CJMP: - r = nios2_elf32_do_cjmp_relocate (input_bfd, howto, - input_section, - contents, rel->r_offset, - relocation, rel->r_addend); - break; - case R_NIOS2_CALLR: - r = nios2_elf32_do_callr_relocate (input_bfd, howto, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - case R_NIOS2_CALL26: - case R_NIOS2_CALL26_NOAT: - /* If we have a call to an undefined weak symbol, we just want - to stuff a zero in the bits of the call instruction and - bypass the normal call26 relocation handling, because it'll - diagnose an overflow error if address 0 isn't in the same - 256MB segment as the call site. Presumably the call - should be guarded by a null check anyway. */ - if (h != NULL && h->root.type == bfd_link_hash_undefweak) - { - BFD_ASSERT (relocation == 0 && rel->r_addend == 0); - r = _bfd_final_link_relocate (howto, input_bfd, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - } - /* Handle relocations which should use the PLT entry. - NIOS2_BFD_RELOC_32 relocations will use the symbol's value, - which may point to a PLT entry, but we don't need to handle - that here. If we created a PLT entry, all branches in this - object should go to it. */ - if (h != NULL && splt != NULL && h->plt.offset != (bfd_vma) -1) - { - /* If we've created a .plt section, and assigned a PLT entry - to this function, it should not be known to bind locally. - If it were, we would have cleared the PLT entry. */ - BFD_ASSERT (!SYMBOL_CALLS_LOCAL (info, h)); - - relocation = (splt->output_section->vma - + splt->output_offset - + h->plt.offset); - - unresolved_reloc = false; - } - /* Detect R_NIOS2_CALL26 relocations that would overflow the - 256MB segment. Replace the target with a reference to a - trampoline instead. - Note that htab->stub_group is null if relaxation has been - disabled by the --no-relax linker command-line option, so - we can use that to skip this processing entirely. */ - if (howto->type == R_NIOS2_CALL26 && htab->stub_group) - { - bfd_vma dest = relocation + rel->r_addend; - enum elf32_nios2_stub_type stub_type; - - eh = (struct elf32_nios2_link_hash_entry *)h; - stub_type = nios2_type_of_stub (input_section, rel, eh, - htab, dest, NULL); - - if (stub_type != nios2_stub_none) - { - struct elf32_nios2_stub_hash_entry *hsh; - - hsh = nios2_get_stub_entry (input_section, sec, - eh, rel, htab, stub_type); - if (hsh == NULL) - { - r = bfd_reloc_undefined; - break; - } - - dest = (hsh->stub_offset - + hsh->stub_sec->output_offset - + hsh->stub_sec->output_section->vma); - r = nios2_elf32_do_call26_relocate (input_bfd, howto, - input_section, - contents, - rel->r_offset, - dest, 0); - break; - } - } - - /* Normal case. */ - r = nios2_elf32_do_call26_relocate (input_bfd, howto, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - case R_NIOS2_ALIGN: - r = bfd_reloc_ok; - /* For symmetry this would be - r = nios2_elf32_do_ignore_reloc (input_bfd, howto, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - but do_ignore_reloc would do no more than return - bfd_reloc_ok. */ - break; - - case R_NIOS2_GOT16: - case R_NIOS2_CALL16: - case R_NIOS2_GOT_LO: - case R_NIOS2_GOT_HA: - case R_NIOS2_CALL_LO: - case R_NIOS2_CALL_HA: - /* Relocation is to the entry for this symbol in the - global offset table. */ - if (sgot == NULL) - { - r = bfd_reloc_notsupported; - break; - } - - use_plt = 0; - - if (h != NULL) - { - bool dyn; - - eh = (struct elf32_nios2_link_hash_entry *)h; - use_plt = (eh->got_types_used == CALL_USED - && h->plt.offset != (bfd_vma) -1); - - off = h->got.offset; - BFD_ASSERT (off != (bfd_vma) -1); - dyn = htab->root.dynamic_sections_created; - if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, - bfd_link_pic (info), - h) - || (bfd_link_pic (info) - && SYMBOL_REFERENCES_LOCAL (info, h)) - || ((ELF_ST_VISIBILITY (h->other) - || resolved_to_zero) - && h->root.type == bfd_link_hash_undefweak)) - { - /* This is actually a static link, or it is a -Bsymbolic - link and the symbol is defined locally. We must - initialize this entry in the global offset table. - Since the offset must always be a multiple of 4, we - use the least significant bit to record whether we - have initialized it already. - - When doing a dynamic link, we create a .rela.got - relocation entry to initialize the value. This is - done in the finish_dynamic_symbol routine. */ - if ((off & 1) != 0) - off &= ~1; - else - { - bfd_put_32 (output_bfd, relocation, - sgot->contents + off); - h->got.offset |= 1; - } - } - else - unresolved_reloc = false; - } - else - { - BFD_ASSERT (local_got_offsets != NULL - && local_got_offsets[r_symndx] != (bfd_vma) -1); - - off = local_got_offsets[r_symndx]; - - /* The offset must always be a multiple of 4. We use the - least significant bit to record whether we have already - generated the necessary reloc. */ - if ((off & 1) != 0) - off &= ~1; - else - { - bfd_put_32 (output_bfd, relocation, - sgot->contents + off); - - if (bfd_link_pic (info)) - { - asection *srelgot; - Elf_Internal_Rela outrel; - bfd_byte *loc; - - srelgot = htab->root.srelgot; - BFD_ASSERT (srelgot != NULL); - - outrel.r_addend = relocation; - outrel.r_offset = (sgot->output_section->vma - + sgot->output_offset - + off); - outrel.r_info = ELF32_R_INFO (0, R_NIOS2_RELATIVE); - loc = srelgot->contents; - loc += (srelgot->reloc_count++ * - sizeof (Elf32_External_Rela)); - bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc); - } - - local_got_offsets[r_symndx] |= 1; - } - } - - if (use_plt && bfd_link_pic (info)) - { - off = ((h->plt.offset - 24) / 12 + 3) * 4; - relocation = (htab->root.sgotplt->output_offset + off - - got_base); - } - else - relocation = sgot->output_offset + off - got_base; - - /* This relocation does not use the addend. */ - rel->r_addend = 0; - - switch (howto->type) - { - case R_NIOS2_GOT_LO: - case R_NIOS2_CALL_LO: - r = nios2_elf32_do_lo16_relocate (input_bfd, howto, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - case R_NIOS2_GOT_HA: - case R_NIOS2_CALL_HA: - r = nios2_elf32_do_hiadj16_relocate (input_bfd, howto, - input_section, contents, - rel->r_offset, - relocation, - rel->r_addend); - break; - default: - r = _bfd_final_link_relocate (howto, input_bfd, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - } - break; - - case R_NIOS2_GOTOFF_LO: - case R_NIOS2_GOTOFF_HA: - case R_NIOS2_GOTOFF: - /* Relocation is relative to the global offset table pointer. */ - - BFD_ASSERT (sgot != NULL); - if (sgot == NULL) - { - r = bfd_reloc_notsupported; - break; - } - - /* Note that sgot->output_offset is not involved in this - calculation. We always want the start of .got. */ - relocation -= sgot->output_section->vma; - - /* Now we adjust the relocation to be relative to the GOT pointer - (the _gp_got symbol), which possibly contains the 0x8000 bias. */ - relocation -= got_base; - - switch (howto->type) - { - case R_NIOS2_GOTOFF_LO: - r = nios2_elf32_do_lo16_relocate (input_bfd, howto, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - case R_NIOS2_GOTOFF_HA: - r = nios2_elf32_do_hiadj16_relocate (input_bfd, howto, - input_section, contents, - rel->r_offset, - relocation, - rel->r_addend); - break; - default: - r = _bfd_final_link_relocate (howto, input_bfd, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - } - break; - - case R_NIOS2_TLS_LDO16: - relocation -= dtpoff_base (info) + DTP_OFFSET; - - r = _bfd_final_link_relocate (howto, input_bfd, input_section, - contents, rel->r_offset, - relocation, rel->r_addend); - break; - case R_NIOS2_TLS_LDM16: - if (htab->root.sgot == NULL) - abort (); - - off = htab->tls_ldm_got.offset; - - if ((off & 1) != 0) - off &= ~1; - else - { - /* If we don't know the module number, create a relocation - for it. */ - if (bfd_link_pic (info)) - { - Elf_Internal_Rela outrel; - bfd_byte *loc; - - if (htab->root.srelgot == NULL) - abort (); - - outrel.r_addend = 0; - outrel.r_offset = (htab->root.sgot->output_section->vma - + htab->root.sgot->output_offset - + off); - outrel.r_info = ELF32_R_INFO (0, R_NIOS2_TLS_DTPMOD); - - loc = htab->root.srelgot->contents; - loc += (htab->root.srelgot->reloc_count++ - * sizeof (Elf32_External_Rela)); - bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc); - } - else - bfd_put_32 (output_bfd, 1, - htab->root.sgot->contents + off); - - htab->tls_ldm_got.offset |= 1; - } - - relocation = htab->root.sgot->output_offset + off - got_base; - - r = _bfd_final_link_relocate (howto, input_bfd, input_section, - contents, rel->r_offset, - relocation, rel->r_addend); - - break; - case R_NIOS2_TLS_GD16: - case R_NIOS2_TLS_IE16: - { - int indx; - char tls_type; - - if (htab->root.sgot == NULL) - abort (); - - indx = 0; - if (h != NULL) - { - bool dyn; - dyn = htab->root.dynamic_sections_created; - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, - bfd_link_pic (info), - h) - && (!bfd_link_pic (info) - || !SYMBOL_REFERENCES_LOCAL (info, h))) - { - unresolved_reloc = false; - indx = h->dynindx; - } - off = h->got.offset; - tls_type = (((struct elf32_nios2_link_hash_entry *) h) - ->tls_type); - } - else - { - if (local_got_offsets == NULL) - abort (); - off = local_got_offsets[r_symndx]; - tls_type = (elf32_nios2_local_got_tls_type (input_bfd) - [r_symndx]); - } - - if (tls_type == GOT_UNKNOWN) - abort (); - - if ((off & 1) != 0) - off &= ~1; - else - { - bool need_relocs = false; - Elf_Internal_Rela outrel; - bfd_byte *loc = NULL; - int cur_off = off; - - /* The GOT entries have not been initialized yet. Do it - now, and emit any relocations. If both an IE GOT and a - GD GOT are necessary, we emit the GD first. */ - - if ((bfd_link_pic (info) || indx != 0) - && (h == NULL - || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT - && !resolved_to_zero) - || h->root.type != bfd_link_hash_undefweak)) - { - need_relocs = true; - if (htab->root.srelgot == NULL) - abort (); - loc = htab->root.srelgot->contents; - loc += (htab->root.srelgot->reloc_count * - sizeof (Elf32_External_Rela)); - } - - if (tls_type & GOT_TLS_GD) - { - if (need_relocs) - { - outrel.r_addend = 0; - outrel.r_offset = (htab->root.sgot->output_section->vma - + htab->root.sgot->output_offset - + cur_off); - outrel.r_info = ELF32_R_INFO (indx, - R_NIOS2_TLS_DTPMOD); - - bfd_elf32_swap_reloca_out (output_bfd, &outrel, - loc); - htab->root.srelgot->reloc_count++; - loc += sizeof (Elf32_External_Rela); - - if (indx == 0) - bfd_put_32 (output_bfd, - (relocation - dtpoff_base (info) - - DTP_OFFSET), - htab->root.sgot->contents + cur_off + 4); - else - { - outrel.r_addend = 0; - outrel.r_info = ELF32_R_INFO (indx, - R_NIOS2_TLS_DTPREL); - outrel.r_offset += 4; - - bfd_elf32_swap_reloca_out (output_bfd, &outrel, - loc); - htab->root.srelgot->reloc_count++; - loc += sizeof (Elf32_External_Rela); - } - } - else - { - /* If we are not emitting relocations for a - general dynamic reference, then we must be in a - static link or an executable link with the - symbol binding locally. Mark it as belonging - to module 1, the executable. */ - bfd_put_32 (output_bfd, 1, - htab->root.sgot->contents + cur_off); - bfd_put_32 (output_bfd, (relocation - - dtpoff_base (info) - - DTP_OFFSET), - htab->root.sgot->contents + cur_off + 4); - } - - cur_off += 8; - } - - if (tls_type & GOT_TLS_IE) - { - if (need_relocs) - { - if (indx == 0) - outrel.r_addend = (relocation - - dtpoff_base (info)); - else - outrel.r_addend = 0; - outrel.r_offset = (htab->root.sgot->output_section->vma - + htab->root.sgot->output_offset - + cur_off); - outrel.r_info = ELF32_R_INFO (indx, - R_NIOS2_TLS_TPREL); - - bfd_elf32_swap_reloca_out (output_bfd, &outrel, - loc); - htab->root.srelgot->reloc_count++; - loc += sizeof (Elf32_External_Rela); - } - else - bfd_put_32 (output_bfd, (tpoff (info, relocation) - - TP_OFFSET), - htab->root.sgot->contents + cur_off); - cur_off += 4; - } - - if (h != NULL) - h->got.offset |= 1; - else - local_got_offsets[r_symndx] |= 1; - } - - if ((tls_type & GOT_TLS_GD) && r_type != R_NIOS2_TLS_GD16) - off += 8; - relocation = htab->root.sgot->output_offset + off - got_base; - - r = _bfd_final_link_relocate (howto, input_bfd, input_section, - contents, rel->r_offset, - relocation, rel->r_addend); - } - - break; - case R_NIOS2_TLS_LE16: - if (bfd_link_dll (info)) - { - _bfd_error_handler - /* xgettext:c-format */ - (_("%pB(%pA+%#" PRIx64 "): %s relocation not " - "permitted in shared object"), - input_bfd, input_section, - (uint64_t) rel->r_offset, howto->name); - return false; - } - else - relocation = tpoff (info, relocation) - TP_OFFSET; - - r = _bfd_final_link_relocate (howto, input_bfd, input_section, - contents, rel->r_offset, - relocation, rel->r_addend); - break; - - case R_NIOS2_BFD_RELOC_32: - if (bfd_link_pic (info) - && (input_section->flags & SEC_ALLOC) != 0 - && (h == NULL - || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT - && !resolved_to_zero) - || h->root.type != bfd_link_hash_undefweak)) - { - Elf_Internal_Rela outrel; - bfd_byte *loc; - bool skip, relocate; - - /* When generating a shared object, these relocations - are copied into the output file to be resolved at run - time. */ - - skip = false; - relocate = false; - - outrel.r_offset - = _bfd_elf_section_offset (output_bfd, info, - input_section, rel->r_offset); - if (outrel.r_offset == (bfd_vma) -1) - skip = true; - else if (outrel.r_offset == (bfd_vma) -2) - skip = true, relocate = true; - outrel.r_offset += (input_section->output_section->vma - + input_section->output_offset); - - if (skip) - memset (&outrel, 0, sizeof outrel); - else if (h != NULL - && h->dynindx != -1 - && (!bfd_link_pic (info) - || !SYMBOLIC_BIND (info, h) - || !h->def_regular)) - { - outrel.r_info = ELF32_R_INFO (h->dynindx, r_type); - outrel.r_addend = rel->r_addend; - } - else - { - /* This symbol is local, or marked to become local. */ - outrel.r_addend = relocation + rel->r_addend; - relocate = true; - outrel.r_info = ELF32_R_INFO (0, R_NIOS2_RELATIVE); - } - - sreloc = elf_section_data (input_section)->sreloc; - if (sreloc == NULL) - abort (); - - loc = sreloc->contents; - loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela); - bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc); - - /* This reloc will be computed at runtime, so there's no - need to do anything now, except for R_NIOS2_BFD_RELOC_32 - relocations that have been turned into - R_NIOS2_RELATIVE. */ - if (!relocate) - break; - } - - r = _bfd_final_link_relocate (howto, input_bfd, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - - case R_NIOS2_TLS_DTPREL: - relocation -= dtpoff_base (info); - /* Fall through. */ - - default: - r = _bfd_final_link_relocate (howto, input_bfd, - input_section, contents, - rel->r_offset, relocation, - rel->r_addend); - break; - } - } - else - r = bfd_reloc_notsupported; - - if (r != bfd_reloc_ok) - { - if (h != NULL) - name = h->root.root.string; - else - { - name = bfd_elf_string_from_elf_section (input_bfd, - symtab_hdr->sh_link, - sym->st_name); - if (name == NULL || *name == '\0') - name = bfd_section_name (sec); - } - - switch (r) - { - case bfd_reloc_overflow: - (*info->callbacks->reloc_overflow) (info, NULL, name, - howto->name, (bfd_vma) 0, - input_bfd, input_section, - rel->r_offset); - break; - - case bfd_reloc_undefined: - (*info->callbacks->undefined_symbol) (info, name, input_bfd, - input_section, - rel->r_offset, true); - break; - - case bfd_reloc_outofrange: - if (msg == NULL) - msg = _("relocation out of range"); - break; - - case bfd_reloc_notsupported: - if (msg == NULL) - msg = _("unsupported relocation"); - break; - - case bfd_reloc_dangerous: - if (msg == NULL) - msg = _("dangerous relocation"); - break; - - default: - if (msg == NULL) - msg = _("unknown error"); - break; - } - - if (msg) - { - (*info->callbacks->warning) (info, msg, name, input_bfd, - input_section, rel->r_offset); - return false; - } - } - } - return true; -} - -/* Implement elf-backend_section_flags: - Convert NIOS2 specific section flags to bfd internal section flags. */ -static bool -nios2_elf32_section_flags (const Elf_Internal_Shdr *hdr) -{ - if (hdr->sh_flags & SHF_NIOS2_GPREL) - hdr->bfd_section->flags |= SEC_SMALL_DATA; - - return true; -} - -/* Implement elf_backend_fake_sections: - Set the correct type for an NIOS2 ELF section. We do this by the - section name, which is a hack, but ought to work. */ -static bool -nios2_elf32_fake_sections (bfd *abfd ATTRIBUTE_UNUSED, - Elf_Internal_Shdr *hdr, asection *sec) -{ - const char *name = bfd_section_name (sec); - - if ((sec->flags & SEC_SMALL_DATA) - || strcmp (name, ".sdata") == 0 - || strcmp (name, ".sbss") == 0 - || strcmp (name, ".lit4") == 0 || strcmp (name, ".lit8") == 0) - hdr->sh_flags |= SHF_NIOS2_GPREL; - - return true; -} - -/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up - shortcuts to them in our hash table. */ -static bool -create_got_section (bfd *dynobj, struct bfd_link_info *info) -{ - struct elf32_nios2_link_hash_table *htab; - struct elf_link_hash_entry *h; - - htab = elf32_nios2_hash_table (info); - - if (! _bfd_elf_create_got_section (dynobj, info)) - return false; - - /* In order for the two loads in .PLTresolve to share the same %hiadj, - _GLOBAL_OFFSET_TABLE_ must be aligned to a 16-byte boundary. */ - if (!bfd_set_section_alignment (htab->root.sgotplt, 4)) - return false; - - /* The Nios II ABI specifies that GOT-relative relocations are relative - to the linker-created symbol _gp_got, rather than using - _GLOBAL_OFFSET_TABLE_ directly. In particular, the latter always - points to the base of the GOT while _gp_got may include a bias. */ - h = _bfd_elf_define_linkage_sym (dynobj, info, htab->root.sgotplt, - "_gp_got"); - htab->h_gp_got = h; - if (h == NULL) - return false; - - return true; -} - -/* Implement elf_backend_create_dynamic_sections: - Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and - .rela.bss sections in DYNOBJ, and set up shortcuts to them in our - hash table. */ -static bool -nios2_elf32_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info) -{ - struct elf32_nios2_link_hash_table *htab; - - htab = elf32_nios2_hash_table (info); - if (!htab->root.sgot && !create_got_section (dynobj, info)) - return false; - - if (!_bfd_elf_create_dynamic_sections (dynobj, info)) - return false; - - /* In order for the two loads in a shared object .PLTresolve to share the - same %hiadj, the start of the PLT (as well as the GOT) must be aligned - to a 16-byte boundary. This is because the addresses for these loads - include the -(.plt+4) PIC correction. */ - return bfd_set_section_alignment (htab->root.splt, 4); -} - -/* Implement elf_backend_copy_indirect_symbol: - Copy the extra info we tack onto an elf_link_hash_entry. */ -static void -nios2_elf32_copy_indirect_symbol (struct bfd_link_info *info, - struct elf_link_hash_entry *dir, - struct elf_link_hash_entry *ind) -{ - struct elf32_nios2_link_hash_entry *edir, *eind; - - edir = (struct elf32_nios2_link_hash_entry *) dir; - eind = (struct elf32_nios2_link_hash_entry *) ind; - - if (ind->root.type == bfd_link_hash_indirect - && dir->got.refcount <= 0) - { - edir->tls_type = eind->tls_type; - eind->tls_type = GOT_UNKNOWN; - } - - edir->got_types_used |= eind->got_types_used; - - _bfd_elf_link_hash_copy_indirect (info, dir, ind); -} - -/* Set the right machine number for a NIOS2 ELF file. */ - -static bool -nios2_elf32_object_p (bfd *abfd) -{ - unsigned long mach; - - mach = elf_elfheader (abfd)->e_flags; - - switch (mach) - { - default: - case EF_NIOS2_ARCH_R1: - bfd_default_set_arch_mach (abfd, bfd_arch_nios2, bfd_mach_nios2r1); - break; - case EF_NIOS2_ARCH_R2: - bfd_default_set_arch_mach (abfd, bfd_arch_nios2, bfd_mach_nios2r2); - break; - } - - return true; -} - -/* Implement elf_backend_check_relocs: - Look through the relocs for a section during the first phase. */ -static bool -nios2_elf32_check_relocs (bfd *abfd, struct bfd_link_info *info, - asection *sec, const Elf_Internal_Rela *relocs) -{ - Elf_Internal_Shdr *symtab_hdr; - struct elf_link_hash_entry **sym_hashes; - const Elf_Internal_Rela *rel; - const Elf_Internal_Rela *rel_end; - struct elf32_nios2_link_hash_table *htab; - asection *sreloc = NULL; - bfd_signed_vma *local_got_refcounts; - - if (bfd_link_relocatable (info)) - return true; - - symtab_hdr = &elf_tdata (abfd)->symtab_hdr; - sym_hashes = elf_sym_hashes (abfd); - local_got_refcounts = elf_local_got_refcounts (abfd); - - htab = elf32_nios2_hash_table (info); - - rel_end = relocs + sec->reloc_count; - for (rel = relocs; rel < rel_end; rel++) - { - unsigned int r_type; - struct elf_link_hash_entry *h; - unsigned long r_symndx; - - r_symndx = ELF32_R_SYM (rel->r_info); - if (r_symndx < symtab_hdr->sh_info) - h = NULL; - else - { - h = sym_hashes[r_symndx - symtab_hdr->sh_info]; - while (h->root.type == bfd_link_hash_indirect - || h->root.type == bfd_link_hash_warning) - h = (struct elf_link_hash_entry *) h->root.u.i.link; - } - - r_type = ELF32_R_TYPE (rel->r_info); - - switch (r_type) - { - case R_NIOS2_GOT16: - case R_NIOS2_GOT_LO: - case R_NIOS2_GOT_HA: - case R_NIOS2_CALL16: - case R_NIOS2_CALL_LO: - case R_NIOS2_CALL_HA: - case R_NIOS2_TLS_GD16: - case R_NIOS2_TLS_IE16: - /* This symbol requires a global offset table entry. */ - { - int tls_type, old_tls_type; - - switch (r_type) - { - default: - case R_NIOS2_GOT16: - case R_NIOS2_GOT_LO: - case R_NIOS2_GOT_HA: - case R_NIOS2_CALL16: - case R_NIOS2_CALL_LO: - case R_NIOS2_CALL_HA: - tls_type = GOT_NORMAL; - break; - case R_NIOS2_TLS_GD16: - tls_type = GOT_TLS_GD; - break; - case R_NIOS2_TLS_IE16: - tls_type = GOT_TLS_IE; - break; - } - - if (h != NULL) - { - struct elf32_nios2_link_hash_entry *eh - = (struct elf32_nios2_link_hash_entry *)h; - h->got.refcount++; - old_tls_type = elf32_nios2_hash_entry(h)->tls_type; - if (r_type == R_NIOS2_CALL16 - || r_type == R_NIOS2_CALL_LO - || r_type == R_NIOS2_CALL_HA) - { - /* Make sure a plt entry is created for this symbol if - it turns out to be a function defined by a dynamic - object. */ - h->plt.refcount++; - h->needs_plt = 1; - h->type = STT_FUNC; - eh->got_types_used |= CALL_USED; - } - else - eh->got_types_used |= GOT_USED; - } - else - { - /* This is a global offset table entry for a local symbol. */ - if (local_got_refcounts == NULL) - { - bfd_size_type size; - - size = symtab_hdr->sh_info; - size *= (sizeof (bfd_signed_vma) + sizeof (char)); - local_got_refcounts - = ((bfd_signed_vma *) bfd_zalloc (abfd, size)); - if (local_got_refcounts == NULL) - return false; - elf_local_got_refcounts (abfd) = local_got_refcounts; - elf32_nios2_local_got_tls_type (abfd) - = (char *) (local_got_refcounts + symtab_hdr->sh_info); - } - local_got_refcounts[r_symndx]++; - old_tls_type = elf32_nios2_local_got_tls_type (abfd) [r_symndx]; - } - - /* We will already have issued an error message if there is a - TLS / non-TLS mismatch, based on the symbol type. We don't - support any linker relaxations. So just combine any TLS - types needed. */ - if (old_tls_type != GOT_UNKNOWN && old_tls_type != GOT_NORMAL - && tls_type != GOT_NORMAL) - tls_type |= old_tls_type; - - if (old_tls_type != tls_type) - { - if (h != NULL) - elf32_nios2_hash_entry (h)->tls_type = tls_type; - else - elf32_nios2_local_got_tls_type (abfd) [r_symndx] = tls_type; - } - } - make_got: - if (htab->root.sgot == NULL) - { - if (htab->root.dynobj == NULL) - htab->root.dynobj = abfd; - if (!create_got_section (htab->root.dynobj, info)) - return false; - } - break; - - case R_NIOS2_TLS_LDM16: - htab->tls_ldm_got.refcount++; - goto make_got; - - /* This relocation describes the C++ object vtable hierarchy. - Reconstruct it for later use during GC. */ - case R_NIOS2_GNU_VTINHERIT: - if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset)) - return false; - break; - - /* This relocation describes which C++ vtable entries are actually - used. Record for later use during GC. */ - case R_NIOS2_GNU_VTENTRY: - if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend)) - return false; - break; - - case R_NIOS2_BFD_RELOC_32: - case R_NIOS2_CALL26: - case R_NIOS2_CALL26_NOAT: - case R_NIOS2_HIADJ16: - case R_NIOS2_LO16: - - if (h != NULL) - { - /* If this reloc is in a read-only section, we might - need a copy reloc. We can't check reliably at this - stage whether the section is read-only, as input - sections have not yet been mapped to output sections. - Tentatively set the flag for now, and correct in - adjust_dynamic_symbol. */ - if (!bfd_link_pic (info)) - h->non_got_ref = 1; - - /* Make sure a plt entry is created for this symbol if it - turns out to be a function defined by a dynamic object. */ - h->plt.refcount++; - - if (r_type == R_NIOS2_CALL26 || r_type == R_NIOS2_CALL26_NOAT) - h->needs_plt = 1; - } - - /* If we are creating a shared library, we need to copy the - reloc into the shared library. */ - if (bfd_link_pic (info) - && (sec->flags & SEC_ALLOC) != 0 - && (r_type == R_NIOS2_BFD_RELOC_32 - || (h != NULL && ! h->needs_plt - && (! SYMBOLIC_BIND (info, h) || ! h->def_regular)))) - { - struct elf_dyn_relocs *p; - struct elf_dyn_relocs **head; - - /* When creating a shared object, we must copy these - reloc types into the output file. We create a reloc - section in dynobj and make room for this reloc. */ - if (sreloc == NULL) - { - if (htab->root.dynobj == NULL) - htab->root.dynobj = abfd; - - sreloc = _bfd_elf_make_dynamic_reloc_section - (sec, htab->root.dynobj, 2, abfd, true); - if (sreloc == NULL) - return false; - } - - /* If this is a global symbol, we count the number of - relocations we need for this symbol. */ - if (h != NULL) - head = &h->dyn_relocs; - else - { - /* Track dynamic relocs needed for local syms too. - We really need local syms available to do this - easily. Oh well. */ - - asection *s; - void *vpp; - Elf_Internal_Sym *isym; - - isym = bfd_sym_from_r_symndx (&htab->root.sym_cache, - abfd, r_symndx); - if (isym == NULL) - return false; - - s = bfd_section_from_elf_index (abfd, isym->st_shndx); - if (s == NULL) - s = sec; - - vpp = &elf_section_data (s)->local_dynrel; - head = (struct elf_dyn_relocs **) vpp; - } - - p = *head; - if (p == NULL || p->sec != sec) - { - size_t amt = sizeof *p; - p = ((struct elf_dyn_relocs *) - bfd_alloc (htab->root.dynobj, amt)); - if (p == NULL) - return false; - p->next = *head; - *head = p; - p->sec = sec; - p->count = 0; - p->pc_count = 0; - } - - p->count += 1; - - } - break; - } - } - - return true; -} - - -/* Implement elf_backend_gc_mark_hook: - Return the section that should be marked against GC for a given - relocation. */ -static asection * -nios2_elf32_gc_mark_hook (asection *sec, - struct bfd_link_info *info, - Elf_Internal_Rela *rel, - struct elf_link_hash_entry *h, - Elf_Internal_Sym *sym) -{ - if (h != NULL) - switch (ELF32_R_TYPE (rel->r_info)) - { - case R_NIOS2_GNU_VTINHERIT: - case R_NIOS2_GNU_VTENTRY: - return NULL; - } - return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym); -} - -/* Implement elf_backend_finish_dynamic_symbols: - Finish up dynamic symbol handling. We set the contents of various - dynamic sections here. */ -static bool -nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, - struct bfd_link_info *info, - struct elf_link_hash_entry *h, - Elf_Internal_Sym *sym) -{ - struct elf32_nios2_link_hash_table *htab; - struct elf32_nios2_link_hash_entry *eh - = (struct elf32_nios2_link_hash_entry *)h; - int use_plt; - - htab = elf32_nios2_hash_table (info); - - if (h->plt.offset != (bfd_vma) -1) - { - asection *splt; - asection *sgotplt; - asection *srela; - bfd_vma plt_index; - bfd_vma got_offset; - Elf_Internal_Rela rela; - bfd_byte *loc; - bfd_vma got_address; - - /* This symbol has an entry in the procedure linkage table. Set - it up. */ - BFD_ASSERT (h->dynindx != -1); - splt = htab->root.splt; - sgotplt = htab->root.sgotplt; - srela = htab->root.srelplt; - BFD_ASSERT (splt != NULL && sgotplt != NULL && srela != NULL); - - /* Emit the PLT entry. */ - if (bfd_link_pic (info)) - { - bfd_vma br_offset; - - nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, - 3); - plt_index = (h->plt.offset - 24) / 12; - got_offset = (plt_index + 3) * 4; - nios2_elf32_install_imm16 (splt, h->plt.offset, - hiadj (plt_index * 4)); - nios2_elf32_install_imm16 (splt, h->plt.offset + 4, - plt_index * 4); - br_offset = -(h->plt.offset + 12); - /* If this plt entry is too far away from the start of .plt - for the "br" to reach .PLTresolve, bounce through one or - more of the previous "br" instructions. */ - if (br_offset < (bfd_vma) -32768) - { - br_offset += 32768 / 12 * 12 - 4; - while (br_offset < (bfd_vma) -32768) - br_offset += 32768 / 12 * 12; - } - nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); - - got_address = (sgotplt->output_section->vma + sgotplt->output_offset - + got_offset); - - /* Fill in the entry in the global offset table. There are no - res_n slots for a shared object PLT, instead the .got.plt entries - point to the PLT entries. */ - bfd_put_32 (output_bfd, - splt->output_section->vma + splt->output_offset - + h->plt.offset, sgotplt->contents + got_offset); - } - else - { - plt_index = (h->plt.offset - 28 - htab->res_n_size) / 12; - got_offset = (plt_index + 3) * 4; - - nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); - got_address = (sgotplt->output_section->vma + sgotplt->output_offset - + got_offset); - nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); - nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); - - /* Fill in the entry in the global offset table. */ - bfd_put_32 (output_bfd, - splt->output_section->vma + splt->output_offset - + plt_index * 4, sgotplt->contents + got_offset); - } - - /* Fill in the entry in the .rela.plt section. */ - rela.r_offset = got_address; - rela.r_info = ELF32_R_INFO (h->dynindx, R_NIOS2_JUMP_SLOT); - rela.r_addend = 0; - loc = srela->contents + plt_index * sizeof (Elf32_External_Rela); - bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); - - if (!h->def_regular) - { - /* Mark the symbol as undefined, rather than as defined in - the .plt section. Leave the value alone. */ - sym->st_shndx = SHN_UNDEF; - /* If the symbol is weak, we do need to clear the value. - Otherwise, the PLT entry would provide a definition for - the symbol even if the symbol wasn't defined anywhere, - and so the symbol would never be NULL. */ - if (!h->ref_regular_nonweak) - sym->st_value = 0; - } - } - - use_plt = (eh->got_types_used == CALL_USED - && h->plt.offset != (bfd_vma) -1); - - if (!use_plt && h->got.offset != (bfd_vma) -1 - && (elf32_nios2_hash_entry (h)->tls_type & GOT_TLS_GD) == 0 - && (elf32_nios2_hash_entry (h)->tls_type & GOT_TLS_IE) == 0) - { - asection *sgot; - asection *srela; - Elf_Internal_Rela rela; - bfd_byte *loc; - bfd_vma offset; - - /* This symbol has an entry in the global offset table. Set it - up. */ - sgot = htab->root.sgot; - srela = htab->root.srelgot; - BFD_ASSERT (sgot != NULL && srela != NULL); - - offset = (h->got.offset & ~(bfd_vma) 1); - rela.r_offset = (sgot->output_section->vma - + sgot->output_offset + offset); - - /* If this is a -Bsymbolic link, and the symbol is defined - locally, we just want to emit a RELATIVE reloc. Likewise if - the symbol was forced to be local because of a version file. - The entry in the global offset table will already have been - initialized in the relocate_section function. */ - - if (bfd_link_pic (info) && SYMBOL_REFERENCES_LOCAL (info, h)) - { - rela.r_info = ELF32_R_INFO (0, R_NIOS2_RELATIVE); - rela.r_addend = bfd_get_signed_32 (output_bfd, - (sgot->contents + offset)); - bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + offset); - } - else - { - bfd_put_32 (output_bfd, (bfd_vma) 0, - sgot->contents + offset); - rela.r_info = ELF32_R_INFO (h->dynindx, R_NIOS2_GLOB_DAT); - rela.r_addend = 0; - } - - loc = srela->contents; - loc += srela->reloc_count++ * sizeof (Elf32_External_Rela); - bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); - } - - if (use_plt && h->got.offset != (bfd_vma) -1) - { - bfd_vma offset = (h->got.offset & ~(bfd_vma) 1); - asection *sgot = htab->root.sgot; - asection *splt = htab->root.splt; - bfd_put_32 (output_bfd, (splt->output_section->vma + splt->output_offset - + h->plt.offset), - sgot->contents + offset); - } - - if (h->needs_copy) - { - asection *s; - Elf_Internal_Rela rela; - bfd_byte *loc; - - /* This symbol needs a copy reloc. Set it up. */ - BFD_ASSERT (h->dynindx != -1 - && (h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak)); - - rela.r_offset = (h->root.u.def.value - + h->root.u.def.section->output_section->vma - + h->root.u.def.section->output_offset); - rela.r_info = ELF32_R_INFO (h->dynindx, R_NIOS2_COPY); - rela.r_addend = 0; - if (h->root.u.def.section == htab->root.sdynrelro) - s = htab->root.sreldynrelro; - else - s = htab->root.srelbss; - BFD_ASSERT (s != NULL); - loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela); - bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); - } - - /* Mark _DYNAMIC, _GLOBAL_OFFSET_TABLE_, and _gp_got as absolute. */ - if (strcmp (h->root.root.string, "_DYNAMIC") == 0 - || h == htab->root.hgot - || h == htab->h_gp_got) - sym->st_shndx = SHN_ABS; - - return true; -} - -/* Implement elf_backend_finish_dynamic_sections. */ -static bool -nios2_elf32_finish_dynamic_sections (bfd *output_bfd, - struct bfd_link_info *info) -{ - asection *sgotplt; - asection *sdyn; - struct elf32_nios2_link_hash_table *htab; - - htab = elf32_nios2_hash_table (info); - sgotplt = htab->root.sgotplt; - sdyn = NULL; - - if (htab->root.dynamic_sections_created) - { - asection *splt; - Elf32_External_Dyn *dyncon, *dynconend; - - splt = htab->root.splt; - sdyn = bfd_get_linker_section (htab->root.dynobj, ".dynamic"); - BFD_ASSERT (splt != NULL && sdyn != NULL && sgotplt != NULL); - - dyncon = (Elf32_External_Dyn *) sdyn->contents; - dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size); - for (; dyncon < dynconend; dyncon++) - { - Elf_Internal_Dyn dyn; - asection *s; - - bfd_elf32_swap_dyn_in (htab->root.dynobj, dyncon, &dyn); - - switch (dyn.d_tag) - { - default: - break; - - case DT_PLTGOT: - s = htab->root.sgotplt; - dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; - bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); - break; - - case DT_JMPREL: - s = htab->root.srelplt; - dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; - bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); - break; - - case DT_PLTRELSZ: - s = htab->root.srelplt; - dyn.d_un.d_val = s->size; - bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); - break; - - case DT_NIOS2_GP: - s = htab->root.sgotplt; - dyn.d_un.d_ptr - = s->output_section->vma + s->output_offset + 0x7ff0; - bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); - break; - } - } - - /* Fill in the first entry in the procedure linkage table. */ - if (splt->size > 0) - { - bfd_vma got_address = (sgotplt->output_section->vma - + sgotplt->output_offset); - if (bfd_link_pic (info)) - { - bfd_vma got_pcrel = got_address - (splt->output_section->vma - + splt->output_offset); - /* Both GOT and PLT must be aligned to a 16-byte boundary - for the two loads to share the %hiadj part. The 4-byte - offset for nextpc is accounted for in the %lo offsets - on the loads. */ - BFD_ASSERT ((got_pcrel & 0xf) == 0); - nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); - nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); - nios2_elf32_install_imm16 (splt, 12, got_pcrel); - nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); - } - else - { - /* Divide by 4 here, not 3 because we already corrected for the - res_N branches. */ - bfd_vma res_size = (splt->size - 28) / 4; - bfd_vma res_start = (splt->output_section->vma - + splt->output_offset); - bfd_vma res_offset; - - for (res_offset = 0; res_offset < res_size; res_offset += 4) - bfd_put_32 (output_bfd, - 6 | ((res_size - (res_offset + 4)) << 6), - splt->contents + res_offset); - - /* The GOT must be aligned to a 16-byte boundary for the - two loads to share the same %hiadj part. */ - BFD_ASSERT ((got_address & 0xf) == 0); - - nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); - nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); - nios2_elf32_install_imm16 (splt, res_size + 4, res_start); - nios2_elf32_install_imm16 (splt, res_size + 12, - hiadj (got_address)); - nios2_elf32_install_imm16 (splt, res_size + 16, - got_address + 4); - nios2_elf32_install_imm16 (splt, res_size + 20, - got_address + 8); - } - } - } - - /* Fill in the first three entries in the global offset table. */ - if (sgotplt != NULL && sgotplt->size > 0) - { - if (sdyn == NULL) - bfd_put_32 (output_bfd, (bfd_vma) 0, sgotplt->contents); - else - bfd_put_32 (output_bfd, - sdyn->output_section->vma + sdyn->output_offset, - sgotplt->contents); - bfd_put_32 (output_bfd, (bfd_vma) 0, sgotplt->contents + 4); - bfd_put_32 (output_bfd, (bfd_vma) 0, sgotplt->contents + 8); - - if (sgotplt->output_section != bfd_abs_section_ptr) - elf_section_data (sgotplt->output_section)->this_hdr.sh_entsize = 4; - } - - return true; -} - -/* Implement elf_backend_adjust_dynamic_symbol: - Adjust a symbol defined by a dynamic object and referenced by a - regular object. The current definition is in some section of the - dynamic object, but we're not including those sections. We have to - change the definition to something the rest of the link can - understand. */ -static bool -nios2_elf32_adjust_dynamic_symbol (struct bfd_link_info *info, - struct elf_link_hash_entry *h) -{ - struct elf32_nios2_link_hash_table *htab; - bfd *dynobj; - asection *s, *srel; - unsigned align2; - - htab = elf32_nios2_hash_table (info); - dynobj = htab->root.dynobj; - - /* Make sure we know what is going on here. */ - BFD_ASSERT (dynobj != NULL - && (h->needs_plt - || h->is_weakalias - || (h->def_dynamic - && h->ref_regular - && !h->def_regular))); - - /* If this is a function, put it in the procedure linkage table. We - will fill in the contents of the procedure linkage table later, - when we know the address of the .got section. */ - if (h->type == STT_FUNC || h->needs_plt) - { - if (h->plt.refcount <= 0 - || SYMBOL_CALLS_LOCAL (info, h) - || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT - && h->root.type == bfd_link_hash_undefweak)) - { - /* This case can occur if we saw a PLT reloc in an input - file, but the symbol was never referred to by a dynamic - object, or if all references were garbage collected. In - such a case, we don't actually need to build a procedure - linkage table, and we can just do a PCREL reloc instead. */ - h->plt.offset = (bfd_vma) -1; - h->needs_plt = 0; - } - - return true; - } - - /* Reinitialize the plt offset now that it is not used as a reference - count any more. */ - h->plt.offset = (bfd_vma) -1; - - /* If this is a weak symbol, and there is a real definition, the - processor independent code will have arranged for us to see the - real definition first, and we can just use the same value. */ - if (h->is_weakalias) - { - struct elf_link_hash_entry *def = weakdef (h); - BFD_ASSERT (def->root.type == bfd_link_hash_defined); - h->root.u.def.section = def->root.u.def.section; - h->root.u.def.value = def->root.u.def.value; - return true; - } - - /* If there are no non-GOT references, we do not need a copy - relocation. */ - if (!h->non_got_ref) - return true; - - /* This is a reference to a symbol defined by a dynamic object which - is not a function. - If we are creating a shared library, we must presume that the - only references to the symbol are via the global offset table. - For such cases we need not do anything here; the relocations will - be handled correctly by relocate_section. */ - if (bfd_link_pic (info)) - return true; - - if (h->size == 0) - { - _bfd_error_handler (_("dynamic variable `%s' is zero size"), - h->root.root.string); - return true; - } - - /* We must allocate the symbol in our .dynbss section, which will - become part of the .bss section of the executable. There will be - an entry for this symbol in the .dynsym section. The dynamic - object will contain position independent code, so all references - from the dynamic object to this symbol will go through the global - offset table. The dynamic linker will use the .dynsym entry to - determine the address it must put in the global offset table, so - both the dynamic object and the regular object will refer to the - same memory location for the variable. */ - /* We must generate a R_NIOS2_COPY reloc to tell the dynamic linker to - copy the initial value out of the dynamic object and into the - runtime process image. We need to remember the offset into the - .rela.bss section we are going to use. */ - if ((h->root.u.def.section->flags & SEC_READONLY) != 0) - { - s = htab->root.sdynrelro; - srel = htab->root.sreldynrelro; - } - else - { - s = htab->root.sdynbss; - srel = htab->root.srelbss; - } - if ((h->root.u.def.section->flags & SEC_ALLOC) != 0) - { - srel->size += sizeof (Elf32_External_Rela); - h->needs_copy = 1; - } - - align2 = bfd_log2 (h->size); - if (align2 > h->root.u.def.section->alignment_power) - align2 = h->root.u.def.section->alignment_power; - - /* Align dynbss. */ - s->size = BFD_ALIGN (s->size, (bfd_size_type)1 << align2); - if (align2 > bfd_section_alignment (s) - && !bfd_set_section_alignment (s, align2)) - return false; - - /* Define the symbol as being at this point in the section. */ - h->root.u.def.section = s; - h->root.u.def.value = s->size; - - /* Increment the section size to make room for the symbol. */ - s->size += h->size; - - return true; -} - -/* Worker function for nios2_elf32_late_size_sections. */ -static bool -adjust_dynrelocs (struct elf_link_hash_entry *h, void *inf) -{ - struct bfd_link_info *info; - struct elf32_nios2_link_hash_table *htab; - - if (h->root.type == bfd_link_hash_indirect) - return true; - - if (h->root.type == bfd_link_hash_warning) - /* When warning symbols are created, they **replace** the "real" - entry in the hash table, thus we never get to see the real - symbol in a hash traversal. So look at it now. */ - h = (struct elf_link_hash_entry *) h->root.u.i.link; - - info = (struct bfd_link_info *) inf; - htab = elf32_nios2_hash_table (info); - - if (h->plt.offset != (bfd_vma)-1) - h->plt.offset += htab->res_n_size; - if (htab->root.splt == h->root.u.def.section) - h->root.u.def.value += htab->res_n_size; - - return true; -} - -/* Another worker function for nios2_elf32_late_size_sections. - Allocate space in .plt, .got and associated reloc sections for - dynamic relocs. */ -static bool -allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) -{ - struct bfd_link_info *info; - struct elf32_nios2_link_hash_table *htab; - struct elf32_nios2_link_hash_entry *eh; - struct elf_dyn_relocs *p; - int use_plt; - - if (h->root.type == bfd_link_hash_indirect) - return true; - - if (h->root.type == bfd_link_hash_warning) - /* When warning symbols are created, they **replace** the "real" - entry in the hash table, thus we never get to see the real - symbol in a hash traversal. So look at it now. */ - h = (struct elf_link_hash_entry *) h->root.u.i.link; - - info = (struct bfd_link_info *) inf; - htab = elf32_nios2_hash_table (info); - - if (htab->root.dynamic_sections_created - && h->plt.refcount > 0) - { - /* Make sure this symbol is output as a dynamic symbol. - Undefined weak syms won't yet be marked as dynamic. */ - if (h->dynindx == -1 - && !h->forced_local - && !bfd_elf_link_record_dynamic_symbol (info, h)) - return false; - - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h)) - { - asection *s = htab->root.splt; - - /* Allocate room for the header. */ - if (s->size == 0) - { - if (bfd_link_pic (info)) - s->size = 24; - else - s->size = 28; - } - - h->plt.offset = s->size; - - /* If this symbol is not defined in a regular file, and we are - not generating a shared library, then set the symbol to this - location in the .plt. This is required to make function - pointers compare as equal between the normal executable and - the shared library. */ - if (! bfd_link_pic (info) - && !h->def_regular) - { - h->root.u.def.section = s; - h->root.u.def.value = h->plt.offset; - } - - /* Make room for this entry. */ - s->size += 12; - - /* We also need to make an entry in the .rela.plt section. */ - htab->root.srelplt->size += sizeof (Elf32_External_Rela); - - /* And the .got.plt section. */ - htab->root.sgotplt->size += 4; - } - else - { - h->plt.offset = (bfd_vma) -1; - h->needs_plt = 0; - } - } - else - { - h->plt.offset = (bfd_vma) -1; - h->needs_plt = 0; - } - - eh = (struct elf32_nios2_link_hash_entry *) h; - use_plt = (eh->got_types_used == CALL_USED - && h->plt.offset != (bfd_vma) -1); - - if (h->got.refcount > 0) - { - asection *s; - bool dyn; - int tls_type = eh->tls_type; - int indx; - - /* Make sure this symbol is output as a dynamic symbol. - Undefined weak syms won't yet be marked as dynamic. */ - if (h->dynindx == -1 - && !h->forced_local - && !bfd_elf_link_record_dynamic_symbol (info, h)) - return false; - - s = htab->root.sgot; - h->got.offset = s->size; - - if (tls_type == GOT_UNKNOWN) - abort (); - - if (tls_type == GOT_NORMAL) - /* Non-TLS symbols need one GOT slot. */ - s->size += 4; - else - { - if (tls_type & GOT_TLS_GD) - /* R_NIOS2_TLS_GD16 needs 2 consecutive GOT slots. */ - s->size += 8; - if (tls_type & GOT_TLS_IE) - /* R_NIOS2_TLS_IE16 needs one GOT slot. */ - s->size += 4; - } - - dyn = htab->root.dynamic_sections_created; - - indx = 0; - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h) - && (!bfd_link_pic (info) - || !SYMBOL_REFERENCES_LOCAL (info, h))) - indx = h->dynindx; - - if (tls_type != GOT_NORMAL - && (bfd_link_pic (info) || indx != 0) - && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT - || h->root.type != bfd_link_hash_undefweak)) - { - if (tls_type & GOT_TLS_IE) - htab->root.srelgot->size += sizeof (Elf32_External_Rela); - - if (tls_type & GOT_TLS_GD) - htab->root.srelgot->size += sizeof (Elf32_External_Rela); - - if ((tls_type & GOT_TLS_GD) && indx != 0) - htab->root.srelgot->size += sizeof (Elf32_External_Rela); - } - else if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT - || h->root.type != bfd_link_hash_undefweak) - && !use_plt - && (bfd_link_pic (info) - || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))) - htab->root.srelgot->size += sizeof (Elf32_External_Rela); - } - else - h->got.offset = (bfd_vma) -1; - - if (h->dyn_relocs == NULL) - return true; - - /* In the shared -Bsymbolic case, discard space allocated for - dynamic pc-relative relocs against symbols which turn out to be - defined in regular objects. For the normal shared case, discard - space for pc-relative relocs that have become local due to symbol - visibility changes. */ - - if (bfd_link_pic (info)) - { - if (h->def_regular - && (h->forced_local || SYMBOLIC_BIND (info, h))) - { - struct elf_dyn_relocs **pp; - - for (pp = &h->dyn_relocs; (p = *pp) != NULL; ) - { - p->count -= p->pc_count; - p->pc_count = 0; - if (p->count == 0) - *pp = p->next; - else - pp = &p->next; - } - } - - /* Also discard relocs on undefined weak syms with non-default - visibility. */ - if (h->dyn_relocs != NULL - && h->root.type == bfd_link_hash_undefweak) - { - if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT - || UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)) - h->dyn_relocs = NULL; - - /* Make sure undefined weak symbols are output as a dynamic - symbol in PIEs. */ - else if (h->dynindx == -1 - && !h->forced_local - && !bfd_elf_link_record_dynamic_symbol (info, h)) - return false; - } - } - else - { - /* For the non-shared case, discard space for relocs against - symbols which turn out to need copy relocs or are not - dynamic. */ - - if (!h->non_got_ref - && ((h->def_dynamic && !h->def_regular) - || (htab->root.dynamic_sections_created - && (h->root.type == bfd_link_hash_undefweak - || h->root.type == bfd_link_hash_undefined)))) - { - /* Make sure this symbol is output as a dynamic symbol. - Undefined weak syms won't yet be marked as dynamic. */ - if (h->dynindx == -1 - && !h->forced_local - && !bfd_elf_link_record_dynamic_symbol (info, h)) - return false; - - /* If that succeeded, we know we'll be keeping all the - relocs. */ - if (h->dynindx != -1) - goto keep; - } - - h->dyn_relocs = NULL; - - keep: ; - } - - /* Finally, allocate space. */ - for (p = h->dyn_relocs; p != NULL; p = p->next) - { - asection *sreloc = elf_section_data (p->sec)->sreloc; - sreloc->size += p->count * sizeof (Elf32_External_Rela); - } - - return true; -} - -/* Implement elf_backend_late_size_sections: - Set the sizes of the dynamic sections. */ -static bool -nios2_elf32_late_size_sections (bfd *output_bfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info) -{ - bfd *dynobj; - asection *s; - bool relocs; - bfd *ibfd; - struct elf32_nios2_link_hash_table *htab; - - htab = elf32_nios2_hash_table (info); - dynobj = htab->root.dynobj; - if (dynobj == NULL) - return true; - - htab->res_n_size = 0; - if (htab->root.dynamic_sections_created) - { - /* Set the contents of the .interp section to the interpreter. */ - if (bfd_link_executable (info) && !info->nointerp) - { - s = bfd_get_linker_section (dynobj, ".interp"); - BFD_ASSERT (s != NULL); - s->size = sizeof ELF_DYNAMIC_INTERPRETER; - s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER; - } - } - else - { - /* We may have created entries in the .rela.got section. - However, if we are not creating the dynamic sections, we will - not actually use these entries. Reset the size of .rela.got, - which will cause it to get stripped from the output file - below. */ - s = htab->root.srelgot; - if (s != NULL) - s->size = 0; - } - - /* Set up .got offsets for local syms, and space for local dynamic - relocs. */ - for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next) - { - bfd_signed_vma *local_got; - bfd_signed_vma *end_local_got; - char *local_tls_type; - bfd_size_type locsymcount; - Elf_Internal_Shdr *symtab_hdr; - asection *srel; - - if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour) - continue; - - for (s = ibfd->sections; s != NULL; s = s->next) - { - struct elf_dyn_relocs *p; - - for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next) - { - if (!bfd_is_abs_section (p->sec) - && bfd_is_abs_section (p->sec->output_section)) - { - /* Input section has been discarded, either because - it is a copy of a linkonce section or due to - linker script /DISCARD/, so we'll be discarding - the relocs too. */ - } - else if (p->count != 0) - { - srel = elf_section_data (p->sec)->sreloc; - srel->size += p->count * sizeof (Elf32_External_Rela); - } - } - } - - local_got = elf_local_got_refcounts (ibfd); - if (!local_got) - continue; - - symtab_hdr = &elf_tdata (ibfd)->symtab_hdr; - locsymcount = symtab_hdr->sh_info; - end_local_got = local_got + locsymcount; - local_tls_type = elf32_nios2_local_got_tls_type (ibfd); - s = htab->root.sgot; - srel = htab->root.srelgot; - for (; local_got < end_local_got; ++local_got, ++local_tls_type) - { - if (*local_got > 0) - { - *local_got = s->size; - if (*local_tls_type & GOT_TLS_GD) - /* TLS_GD relocs need an 8-byte structure in the GOT. */ - s->size += 8; - if (*local_tls_type & GOT_TLS_IE) - s->size += 4; - if (*local_tls_type == GOT_NORMAL) - s->size += 4; - - if (bfd_link_pic (info) || *local_tls_type == GOT_TLS_GD) - srel->size += sizeof (Elf32_External_Rela); - } - else - *local_got = (bfd_vma) -1; - } - } - - if (htab->tls_ldm_got.refcount > 0) - { - /* Allocate two GOT entries and one dynamic relocation (if necessary) - for R_NIOS2_TLS_LDM16 relocations. */ - htab->tls_ldm_got.offset = htab->root.sgot->size; - htab->root.sgot->size += 8; - if (bfd_link_pic (info)) - htab->root.srelgot->size += sizeof (Elf32_External_Rela); - } - else - htab->tls_ldm_got.offset = -1; - - /* Allocate global sym .plt and .got entries, and space for global - sym dynamic relocs. */ - elf_link_hash_traverse (& htab->root, allocate_dynrelocs, info); - - if (htab->root.dynamic_sections_created) - { - /* If the .got section is more than 0x8000 bytes, we add - 0x8000 to the value of _gp_got, so that 16-bit relocations - have a greater chance of working. */ - if (htab->root.sgot->size >= 0x8000 - && htab->h_gp_got->root.u.def.value == 0) - htab->h_gp_got->root.u.def.value = 0x8000; - } - - /* The check_relocs and adjust_dynamic_symbol entry points have - determined the sizes of the various dynamic sections. Allocate - memory for them. */ - relocs = false; - for (s = dynobj->sections; s != NULL; s = s->next) - { - const char *name; - - if ((s->flags & SEC_LINKER_CREATED) == 0) - continue; - - /* It's OK to base decisions on the section name, because none - of the dynobj section names depend upon the input files. */ - name = bfd_section_name (s); - - if (startswith (name, ".rela")) - { - if (s->size != 0) - { - if (s != htab->root.srelplt) - relocs = true; - - /* We use the reloc_count field as a counter if we need - to copy relocs into the output file. */ - s->reloc_count = 0; - } - } - else if (s == htab->root.splt) - { - /* Correct for the number of res_N branches. */ - if (s->size != 0 && !bfd_link_pic (info)) - { - htab->res_n_size = (s->size - 28) / 3; - s->size += htab->res_n_size; - } - } - else if (s != htab->sbss - && s != htab->root.sgot - && s != htab->root.sgotplt - && s != htab->root.sdynbss - && s != htab->root.sdynrelro) - /* It's not one of our sections, so don't allocate space. */ - continue; - - if (s->size == 0) - { - s->flags |= SEC_EXCLUDE; - continue; - } - - if ((s->flags & SEC_HAS_CONTENTS) == 0) - continue; - - /* Allocate memory for the section contents. */ - s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size); - if (s->contents == NULL) - return false; - } - - /* Adjust dynamic symbols that point to the plt to account for the - now-known number of resN slots. */ - if (htab->res_n_size) - elf_link_hash_traverse (& htab->root, adjust_dynrelocs, info); - - return _bfd_elf_add_dynamic_tags (output_bfd, info, relocs); -} - -/* Free the derived linker hash table. */ -static void -nios2_elf32_link_hash_table_free (bfd *obfd) -{ - struct elf32_nios2_link_hash_table *htab - = (struct elf32_nios2_link_hash_table *) obfd->link.hash; - - bfd_hash_table_free (&htab->bstab); - _bfd_elf_link_hash_table_free (obfd); -} - -/* Implement bfd_elf32_bfd_link_hash_table_create. */ -static struct bfd_link_hash_table * -nios2_elf32_link_hash_table_create (bfd *abfd) -{ - struct elf32_nios2_link_hash_table *ret; - size_t amt = sizeof (struct elf32_nios2_link_hash_table); - - ret = bfd_zmalloc (amt); - if (ret == NULL) - return NULL; - - if (!_bfd_elf_link_hash_table_init (&ret->root, abfd, - link_hash_newfunc, - sizeof (struct - elf32_nios2_link_hash_entry), - NIOS2_ELF_DATA)) - { - free (ret); - return NULL; - } - - /* Init the stub hash table too. */ - if (!bfd_hash_table_init (&ret->bstab, stub_hash_newfunc, - sizeof (struct elf32_nios2_stub_hash_entry))) - { - _bfd_elf_link_hash_table_free (abfd); - return NULL; - } - ret->root.root.hash_table_free = nios2_elf32_link_hash_table_free; - - return &ret->root.root; -} - -/* Implement elf_backend_reloc_type_class. */ -static enum elf_reloc_type_class -nios2_elf32_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED, - const asection *rel_sec ATTRIBUTE_UNUSED, - const Elf_Internal_Rela *rela) -{ - switch ((int) ELF32_R_TYPE (rela->r_info)) - { - case R_NIOS2_RELATIVE: - return reloc_class_relative; - case R_NIOS2_JUMP_SLOT: - return reloc_class_plt; - case R_NIOS2_COPY: - return reloc_class_copy; - default: - return reloc_class_normal; - } -} - -/* Return 1 if target is one of ours. */ -static bool -is_nios2_elf_target (const struct bfd_target *targ) -{ - return (targ == &nios2_elf32_le_vec - || targ == &nios2_elf32_be_vec); -} - -/* Implement elf_backend_add_symbol_hook. - This hook is called by the linker when adding symbols from an object - file. We use it to put .comm items in .sbss, and not .bss. */ -static bool -nios2_elf_add_symbol_hook (bfd *abfd, - struct bfd_link_info *info, - Elf_Internal_Sym *sym, - const char **namep ATTRIBUTE_UNUSED, - flagword *flagsp ATTRIBUTE_UNUSED, - asection **secp, - bfd_vma *valp) -{ - if (sym->st_shndx == SHN_COMMON - && !bfd_link_relocatable (info) - && sym->st_size <= elf_gp_size (abfd) - && is_nios2_elf_target (info->output_bfd->xvec)) - { - /* Common symbols less than or equal to -G nn bytes are automatically - put into .sbss. */ - struct elf32_nios2_link_hash_table *htab; - - htab = elf32_nios2_hash_table (info); - if (htab->sbss == NULL) - { - flagword flags = SEC_IS_COMMON | SEC_SMALL_DATA | SEC_LINKER_CREATED; - - if (htab->root.dynobj == NULL) - htab->root.dynobj = abfd; - - htab->sbss = bfd_make_section_anyway_with_flags (htab->root.dynobj, - ".sbss", flags); - if (htab->sbss == NULL) - return false; - } - - *secp = htab->sbss; - *valp = sym->st_size; - } - - return true; -} - -/* Implement elf_backend_can_make_relative_eh_frame: - Decide whether to attempt to turn absptr or lsda encodings in - shared libraries into pcrel within the given input section. */ -static bool -nios2_elf32_can_make_relative_eh_frame (bfd *input_bfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info - ATTRIBUTE_UNUSED, - asection *eh_frame_section - ATTRIBUTE_UNUSED) -{ - /* We can't use PC-relative encodings in the .eh_frame section. */ - return false; -} - -/* Implement elf_backend_special_sections. */ -const struct bfd_elf_special_section elf32_nios2_special_sections[] = -{ - { STRING_COMMA_LEN (".sbss"), -2, SHT_NOBITS, - SHF_ALLOC + SHF_WRITE + SHF_NIOS2_GPREL }, - { STRING_COMMA_LEN (".sdata"), -2, SHT_PROGBITS, - SHF_ALLOC + SHF_WRITE + SHF_NIOS2_GPREL }, - { NULL, 0, 0, 0, 0 } -}; - -#define ELF_ARCH bfd_arch_nios2 -#define ELF_TARGET_ID NIOS2_ELF_DATA -#define ELF_MACHINE_CODE EM_ALTERA_NIOS2 - -/* The Nios II MMU uses a 4K page size. */ - -#define ELF_MAXPAGESIZE 0x1000 - -#define bfd_elf32_bfd_link_hash_table_create \ - nios2_elf32_link_hash_table_create - -#define bfd_elf32_bfd_merge_private_bfd_data \ - nios2_elf32_merge_private_bfd_data - -/* Relocation table lookup macros. */ - -#define bfd_elf32_bfd_reloc_type_lookup nios2_elf32_bfd_reloc_type_lookup -#define bfd_elf32_bfd_reloc_name_lookup nios2_elf32_bfd_reloc_name_lookup - -/* JUMP_TABLE_LINK macros. */ - -/* elf_info_to_howto (using RELA relocations). */ - -#define elf_info_to_howto nios2_elf32_info_to_howto - -/* elf backend functions. */ - -#define elf_backend_can_gc_sections 1 -#define elf_backend_can_refcount 1 -#define elf_backend_plt_readonly 1 -#define elf_backend_want_got_plt 1 -#define elf_backend_want_dynrelro 1 -#define elf_backend_rela_normal 1 -#define elf_backend_dtrel_excludes_plt 1 - -#define elf_backend_relocate_section nios2_elf32_relocate_section -#define elf_backend_section_flags nios2_elf32_section_flags -#define elf_backend_fake_sections nios2_elf32_fake_sections -#define elf_backend_check_relocs nios2_elf32_check_relocs - -#define elf_backend_gc_mark_hook nios2_elf32_gc_mark_hook -#define elf_backend_create_dynamic_sections \ - nios2_elf32_create_dynamic_sections -#define elf_backend_finish_dynamic_symbol nios2_elf32_finish_dynamic_symbol -#define elf_backend_finish_dynamic_sections \ - nios2_elf32_finish_dynamic_sections -#define elf_backend_adjust_dynamic_symbol nios2_elf32_adjust_dynamic_symbol -#define elf_backend_reloc_type_class nios2_elf32_reloc_type_class -#define elf_backend_late_size_sections nios2_elf32_late_size_sections -#define elf_backend_add_symbol_hook nios2_elf_add_symbol_hook -#define elf_backend_copy_indirect_symbol nios2_elf32_copy_indirect_symbol -#define elf_backend_object_p nios2_elf32_object_p - -#define elf_backend_grok_prstatus nios2_grok_prstatus -#define elf_backend_grok_psinfo nios2_grok_psinfo - -#undef elf_backend_can_make_relative_eh_frame -#define elf_backend_can_make_relative_eh_frame \ - nios2_elf32_can_make_relative_eh_frame - -#define elf_backend_special_sections elf32_nios2_special_sections - -#define TARGET_LITTLE_SYM nios2_elf32_le_vec -#define TARGET_LITTLE_NAME "elf32-littlenios2" -#define TARGET_BIG_SYM nios2_elf32_be_vec -#define TARGET_BIG_NAME "elf32-bignios2" - -#define elf_backend_got_header_size 12 -#define elf_backend_default_execstack 0 - -#include "elf32-target.h" diff --git a/bfd/elf32-nios2.h b/bfd/elf32-nios2.h deleted file mode 100644 index 2f5e484b569..00000000000 --- a/bfd/elf32-nios2.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Nios II support for 32-bit ELF - Copyright (C) 2013-2024 Free Software Foundation, Inc. - Contributed by Mentor Graphics - - This file is part of BFD, the Binary File Descriptor library. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, - MA 02110-1301, USA. */ - -#ifndef _ELF32_NIOS2_H -#define _ELF32_NIOS2_H - -extern int nios2_elf32_setup_section_lists - (bfd *, struct bfd_link_info *); - -extern void nios2_elf32_next_input_section - (struct bfd_link_info *, asection *); - -extern bool nios2_elf32_size_stubs - (bfd *, bfd *, struct bfd_link_info *, - asection * (*) (const char *, asection *, bool), void (*) (void)); - -extern bool nios2_elf32_build_stubs - (struct bfd_link_info *); - -#endif /* _ELF32_NIOS2_H */ diff --git a/bfd/libbfd.h b/bfd/libbfd.h index 5da7541e06e..7d7ae1eaec9 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -2895,58 +2895,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_MSP430_SYM_DIFF", "BFD_RELOC_MSP430_SET_ULEB128", "BFD_RELOC_MSP430_SUB_ULEB128", - "BFD_RELOC_NIOS2_S16", - "BFD_RELOC_NIOS2_U16", - "BFD_RELOC_NIOS2_CALL26", - "BFD_RELOC_NIOS2_IMM5", - "BFD_RELOC_NIOS2_CACHE_OPX", - "BFD_RELOC_NIOS2_IMM6", - "BFD_RELOC_NIOS2_IMM8", - "BFD_RELOC_NIOS2_HI16", - "BFD_RELOC_NIOS2_LO16", - "BFD_RELOC_NIOS2_HIADJ16", - "BFD_RELOC_NIOS2_GPREL", - "BFD_RELOC_NIOS2_UJMP", - "BFD_RELOC_NIOS2_CJMP", - "BFD_RELOC_NIOS2_CALLR", - "BFD_RELOC_NIOS2_ALIGN", - "BFD_RELOC_NIOS2_GOT16", - "BFD_RELOC_NIOS2_CALL16", - "BFD_RELOC_NIOS2_GOTOFF_LO", - "BFD_RELOC_NIOS2_GOTOFF_HA", - "BFD_RELOC_NIOS2_PCREL_LO", - "BFD_RELOC_NIOS2_PCREL_HA", - "BFD_RELOC_NIOS2_TLS_GD16", - "BFD_RELOC_NIOS2_TLS_LDM16", - "BFD_RELOC_NIOS2_TLS_LDO16", - "BFD_RELOC_NIOS2_TLS_IE16", - "BFD_RELOC_NIOS2_TLS_LE16", - "BFD_RELOC_NIOS2_TLS_DTPMOD", - "BFD_RELOC_NIOS2_TLS_DTPREL", - "BFD_RELOC_NIOS2_TLS_TPREL", - "BFD_RELOC_NIOS2_COPY", - "BFD_RELOC_NIOS2_GLOB_DAT", - "BFD_RELOC_NIOS2_JUMP_SLOT", - "BFD_RELOC_NIOS2_RELATIVE", - "BFD_RELOC_NIOS2_GOTOFF", - "BFD_RELOC_NIOS2_CALL26_NOAT", - "BFD_RELOC_NIOS2_GOT_LO", - "BFD_RELOC_NIOS2_GOT_HA", - "BFD_RELOC_NIOS2_CALL_LO", - "BFD_RELOC_NIOS2_CALL_HA", - "BFD_RELOC_NIOS2_R2_S12", - "BFD_RELOC_NIOS2_R2_I10_1_PCREL", - "BFD_RELOC_NIOS2_R2_T1I7_1_PCREL", - "BFD_RELOC_NIOS2_R2_T1I7_2", - "BFD_RELOC_NIOS2_R2_T2I4", - "BFD_RELOC_NIOS2_R2_T2I4_1", - "BFD_RELOC_NIOS2_R2_T2I4_2", - "BFD_RELOC_NIOS2_R2_X1I7_2", - "BFD_RELOC_NIOS2_R2_X2L5", - "BFD_RELOC_NIOS2_R2_F1I5_2", - "BFD_RELOC_NIOS2_R2_L5I4X1", - "BFD_RELOC_NIOS2_R2_T1X1I6", - "BFD_RELOC_NIOS2_R2_T1X1I6_2", "BFD_RELOC_PRU_U16", "BFD_RELOC_PRU_U16_PMEMIMM", "BFD_RELOC_PRU_LDI32", diff --git a/bfd/reloc.c b/bfd/reloc.c index a187afe9b56..f60776299c8 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -6187,113 +6187,6 @@ ENUMDOC msp430 specific relocation codes. ENUM - BFD_RELOC_NIOS2_S16 -ENUMX - BFD_RELOC_NIOS2_U16 -ENUMX - BFD_RELOC_NIOS2_CALL26 -ENUMX - BFD_RELOC_NIOS2_IMM5 -ENUMX - BFD_RELOC_NIOS2_CACHE_OPX -ENUMX - BFD_RELOC_NIOS2_IMM6 -ENUMX - BFD_RELOC_NIOS2_IMM8 -ENUMX - BFD_RELOC_NIOS2_HI16 -ENUMX - BFD_RELOC_NIOS2_LO16 -ENUMX - BFD_RELOC_NIOS2_HIADJ16 -ENUMX - BFD_RELOC_NIOS2_GPREL -ENUMX - BFD_RELOC_NIOS2_UJMP -ENUMX - BFD_RELOC_NIOS2_CJMP -ENUMX - BFD_RELOC_NIOS2_CALLR -ENUMX - BFD_RELOC_NIOS2_ALIGN -ENUMX - BFD_RELOC_NIOS2_GOT16 -ENUMX - BFD_RELOC_NIOS2_CALL16 -ENUMX - BFD_RELOC_NIOS2_GOTOFF_LO -ENUMX - BFD_RELOC_NIOS2_GOTOFF_HA -ENUMX - BFD_RELOC_NIOS2_PCREL_LO -ENUMX - BFD_RELOC_NIOS2_PCREL_HA -ENUMX - BFD_RELOC_NIOS2_TLS_GD16 -ENUMX - BFD_RELOC_NIOS2_TLS_LDM16 -ENUMX - BFD_RELOC_NIOS2_TLS_LDO16 -ENUMX - BFD_RELOC_NIOS2_TLS_IE16 -ENUMX - BFD_RELOC_NIOS2_TLS_LE16 -ENUMX - BFD_RELOC_NIOS2_TLS_DTPMOD -ENUMX - BFD_RELOC_NIOS2_TLS_DTPREL -ENUMX - BFD_RELOC_NIOS2_TLS_TPREL -ENUMX - BFD_RELOC_NIOS2_COPY -ENUMX - BFD_RELOC_NIOS2_GLOB_DAT -ENUMX - BFD_RELOC_NIOS2_JUMP_SLOT -ENUMX - BFD_RELOC_NIOS2_RELATIVE -ENUMX - BFD_RELOC_NIOS2_GOTOFF -ENUMX - BFD_RELOC_NIOS2_CALL26_NOAT -ENUMX - BFD_RELOC_NIOS2_GOT_LO -ENUMX - BFD_RELOC_NIOS2_GOT_HA -ENUMX - BFD_RELOC_NIOS2_CALL_LO -ENUMX - BFD_RELOC_NIOS2_CALL_HA -ENUMX - BFD_RELOC_NIOS2_R2_S12 -ENUMX - BFD_RELOC_NIOS2_R2_I10_1_PCREL -ENUMX - BFD_RELOC_NIOS2_R2_T1I7_1_PCREL -ENUMX - BFD_RELOC_NIOS2_R2_T1I7_2 -ENUMX - BFD_RELOC_NIOS2_R2_T2I4 -ENUMX - BFD_RELOC_NIOS2_R2_T2I4_1 -ENUMX - BFD_RELOC_NIOS2_R2_T2I4_2 -ENUMX - BFD_RELOC_NIOS2_R2_X1I7_2 -ENUMX - BFD_RELOC_NIOS2_R2_X2L5 -ENUMX - BFD_RELOC_NIOS2_R2_F1I5_2 -ENUMX - BFD_RELOC_NIOS2_R2_L5I4X1 -ENUMX - BFD_RELOC_NIOS2_R2_T1X1I6 -ENUMX - BFD_RELOC_NIOS2_R2_T1X1I6_2 -ENUMDOC - Relocations used by the Altera Nios II core. - -ENUM BFD_RELOC_PRU_U16 ENUMDOC PRU LDI 16-bit unsigned data-memory relocation. diff --git a/bfd/targets.c b/bfd/targets.c index 0d5d73ba462..178e9d30a2b 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -833,8 +833,6 @@ extern const bfd_target nds32_elf32_le_vec; extern const bfd_target nds32_elf32_linux_be_vec; extern const bfd_target nds32_elf32_linux_le_vec; extern const bfd_target nfp_elf64_vec; -extern const bfd_target nios2_elf32_be_vec; -extern const bfd_target nios2_elf32_le_vec; extern const bfd_target ns32k_aout_pc532mach_vec; extern const bfd_target ns32k_aout_pc532nbsd_vec; extern const bfd_target or1k_elf32_vec; @@ -1217,9 +1215,6 @@ static const bfd_target * const _bfd_target_vector[] = &nfp_elf64_vec, #endif - &nios2_elf32_be_vec, - &nios2_elf32_le_vec, - &ns32k_aout_pc532mach_vec, &ns32k_aout_pc532nbsd_vec, diff --git a/binutils/MAINTAINERS b/binutils/MAINTAINERS index 6a584b5492d..fa991e3700d 100644 --- a/binutils/MAINTAINERS +++ b/binutils/MAINTAINERS @@ -117,8 +117,6 @@ responsibility among the other maintainers. Moxie Anthony Green <green@moxielogic.com> NDS32 Kuan-Lin Chen <kuanlinchentw@gmail.com> NDS32 Wei-Cheng Wang <cole945@gmail.com> - Nios II Sandra Loosemore <sloosemore@baylibre.com> - Nios II Andrew Jenner <andrew@codesourcery.com> OR1K Christian Svensson <blue@cmd.nu> OR1K Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> OR1K Stafford Horne <shorne@gmail.com> diff --git a/binutils/NEWS b/binutils/NEWS index 92cc9506c80..6da2258befe 100644 --- a/binutils/NEWS +++ b/binutils/NEWS @@ -1,5 +1,8 @@ -*- text -*- +* Support for Nios II targets has been removed except in the readelf utility, + as this architecture has been EOL'ed by Intel. + * RISC-V disassembly now supports -M,max option like QEMU to dump instruction without checking architecture support as usual. diff --git a/configure b/configure index d6b4ea5094a..bbfb5979546 100755 --- a/configure +++ b/configure @@ -10742,9 +10742,6 @@ case "${target}" in mips*-*-*linux* | mips*-*-gnu*) target_makefile_frag="config/mt-mips-gnu" ;; - nios2-*-elf*) - target_makefile_frag="config/mt-nios2-elf" - ;; *-*-linux-android*) target_makefile_frag="config/mt-android" ;; diff --git a/configure.ac b/configure.ac index b31f0eaf6aa..f9694cdf901 100644 --- a/configure.ac +++ b/configure.ac @@ -2979,9 +2979,6 @@ case "${target}" in mips*-*-*linux* | mips*-*-gnu*) target_makefile_frag="config/mt-mips-gnu" ;; - nios2-*-elf*) - target_makefile_frag="config/mt-nios2-elf" - ;; *-*-linux-android*) target_makefile_frag="config/mt-android" ;; diff --git a/gas/Makefile.am b/gas/Makefile.am index d025b759875..54bc43ae6ff 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -186,7 +186,6 @@ TARGET_CPU_CFILES = \ config/tc-msp430.c \ config/tc-mt.c \ config/tc-nds32.c \ - config/tc-nios2.c \ config/tc-ns32k.c \ config/tc-or1k.c \ config/tc-pdp11.c \ @@ -260,7 +259,6 @@ TARGET_CPU_HFILES = \ config/tc-msp430.h \ config/tc-mt.h \ config/tc-nds32.h \ - config/tc-nios2.h \ config/tc-ns32k.h \ config/tc-or1k.h \ config/tc-pdp11.h \ diff --git a/gas/Makefile.in b/gas/Makefile.in index fde7aa7d2c3..68db33d58bc 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -685,7 +685,6 @@ TARGET_CPU_CFILES = \ config/tc-msp430.c \ config/tc-mt.c \ config/tc-nds32.c \ - config/tc-nios2.c \ config/tc-ns32k.c \ config/tc-or1k.c \ config/tc-pdp11.c \ @@ -759,7 +758,6 @@ TARGET_CPU_HFILES = \ config/tc-msp430.h \ config/tc-mt.h \ config/tc-nds32.h \ - config/tc-nios2.h \ config/tc-ns32k.h \ config/tc-or1k.h \ config/tc-pdp11.h \ @@ -993,7 +991,6 @@ CPU_DOCS = \ doc/c-mmix.texi \ doc/c-mt.texi \ doc/c-msp430.texi \ - doc/c-nios2.texi \ doc/c-nds32.texi \ doc/c-ns32k.texi \ doc/c-or1k.texi \ @@ -1187,8 +1184,6 @@ config/tc-mt.$(OBJEXT): config/$(am__dirstamp) \ config/$(DEPDIR)/$(am__dirstamp) config/tc-nds32.$(OBJEXT): config/$(am__dirstamp) \ config/$(DEPDIR)/$(am__dirstamp) -config/tc-nios2.$(OBJEXT): config/$(am__dirstamp) \ - config/$(DEPDIR)/$(am__dirstamp) config/tc-ns32k.$(OBJEXT): config/$(am__dirstamp) \ config/$(DEPDIR)/$(am__dirstamp) config/tc-or1k.$(OBJEXT): config/$(am__dirstamp) \ @@ -1419,7 +1414,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@config/$(DEPDIR)/tc-msp430.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@config/$(DEPDIR)/tc-mt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@config/$(DEPDIR)/tc-nds32.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@config/$(DEPDIR)/tc-nios2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@config/$(DEPDIR)/tc-ns32k.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@config/$(DEPDIR)/tc-or1k.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@config/$(DEPDIR)/tc-pdp11.Po@am__quote@ @@ -1,5 +1,8 @@ -*- text -*- +* Support for Nios II targets has been dropped, as the architecture has + been EOL'ed by Intel. + * Add support for the x86 Intel MSR_IMM instructions. * Add support for the x86 Zhaoxin GMI instructions. diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c index 7d6d1737446..96394a5edf9 100644 --- a/gas/config/obj-elf.c +++ b/gas/config/obj-elf.c @@ -57,10 +57,6 @@ #include "elf/mep.h" #endif -#ifdef TC_NIOS2 -#include "elf/nios2.h" -#endif - #ifdef TC_PRU #include "elf/pru.h" #endif diff --git a/gas/config/tc-nios2.c b/gas/config/tc-nios2.c deleted file mode 100644 index bd96629fe91..00000000000 --- a/gas/config/tc-nios2.c +++ /dev/null @@ -1,4103 +0,0 @@ -/* Altera Nios II assembler. - Copyright (C) 2012-2024 Free Software Foundation, Inc. - Contributed by Nigel Gray (ngray@altera.com). - Contributed by Mentor Graphics, Inc. - - This file is part of GAS, the GNU Assembler. - - GAS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - GAS 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GAS; see the file COPYING. If not, write to the Free - Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA - 02110-1301, USA. */ - -#include "as.h" -#include "opcode/nios2.h" -#include "elf/nios2.h" -#include "tc-nios2.h" -#include "bfd.h" -#include "dwarf2dbg.h" -#include "subsegs.h" -#include "safe-ctype.h" -#include "dw2gencfi.h" - -#ifndef OBJ_ELF -/* We are not supporting any other target so we throw a compile time error. */ -OBJ_ELF not defined -#endif - -/* We can choose our endianness at run-time, regardless of configuration. */ -extern int target_big_endian; - -/* This array holds the chars that always start a comment. If the - pre-processor is disabled, these aren't very useful. */ -const char comment_chars[] = "#"; - -/* This array holds the chars that only start a comment at the beginning of - a line. If the line seems to have the form '# 123 filename' - .line and .file directives will appear in the pre-processed output. */ -/* Note that input_file.c hand checks for '#' at the beginning of the - first line of the input file. This is because the compiler outputs - #NO_APP at the beginning of its output. */ -/* Also note that C style comments are always supported. */ -const char line_comment_chars[] = "#"; - -/* This array holds machine specific line separator characters. */ -const char line_separator_chars[] = ";"; - -/* Chars that can be used to separate mant from exp in floating point nums. */ -const char EXP_CHARS[] = "eE"; - -/* Chars that mean this number is a floating point constant. */ -/* As in 0f12.456 */ -/* or 0d1.2345e12 */ -const char FLT_CHARS[] = "rRsSfFdDxXpP"; - -/* Also be aware that MAXIMUM_NUMBER_OF_CHARS_FOR_FLOAT may have to be - changed in read.c. Ideally it shouldn't have to know about it at all, - but nothing is ideal around here. */ - -/* Machine-dependent command-line options. */ - -const char md_shortopts[] = "r"; - -const struct option md_longopts[] = { -#define OPTION_RELAX_ALL (OPTION_MD_BASE + 0) - {"relax-all", no_argument, NULL, OPTION_RELAX_ALL}, -#define OPTION_NORELAX (OPTION_MD_BASE + 1) - {"no-relax", no_argument, NULL, OPTION_NORELAX}, -#define OPTION_RELAX_SECTION (OPTION_MD_BASE + 2) - {"relax-section", no_argument, NULL, OPTION_RELAX_SECTION}, -#define OPTION_EB (OPTION_MD_BASE + 3) - {"EB", no_argument, NULL, OPTION_EB}, -#define OPTION_EL (OPTION_MD_BASE + 4) - {"EL", no_argument, NULL, OPTION_EL}, -#define OPTION_MARCH (OPTION_MD_BASE + 5) - {"march", required_argument, NULL, OPTION_MARCH} -}; - -const size_t md_longopts_size = sizeof (md_longopts); - -/* The assembler supports three different relaxation modes, controlled by - command-line options. */ -typedef enum -{ - relax_section = 0, - relax_none, - relax_all -} relax_optionT; - -/* Struct contains all assembler options set with .set. */ -static struct -{ - /* .set noat -> noat = 1 allows assembly code to use at without warning - and macro expansions generate a warning. - .set at -> noat = 0, assembly code using at warn but macro expansions - do not generate warnings. */ - bool noat; - - /* .set nobreak -> nobreak = 1 allows assembly code to use ba,bt without - warning. - .set break -> nobreak = 0, assembly code using ba,bt warns. */ - bool nobreak; - - /* .cmd line option -relax-all allows all branches and calls to be replaced - with longer versions. - -no-relax inhibits branch/call conversion. - The default value is relax_section, which relaxes branches within - a section. */ - relax_optionT relax; - -} nios2_as_options = {false, false, relax_section}; - - -typedef struct nios2_insn_reloc -{ - /* Any expression in the instruction is parsed into this field, - which is passed to fix_new_exp() to generate a fixup. */ - expressionS reloc_expression; - - /* The type of the relocation to be applied. */ - bfd_reloc_code_real_type reloc_type; - - /* PC-relative. */ - unsigned int reloc_pcrel; - - /* The next relocation to be applied to the instruction. */ - struct nios2_insn_reloc *reloc_next; -} nios2_insn_relocS; - -/* This struct is used to hold state when assembling instructions. */ -typedef struct nios2_insn_info -{ - /* Assembled instruction. */ - unsigned long insn_code; - - /* Constant bits masked into insn_code for self-check mode. */ - unsigned long constant_bits; - - /* Pointer to the relevant bit of the opcode table. */ - const struct nios2_opcode *insn_nios2_opcode; - /* After parsing ptrs to the tokens in the instruction fill this array - it is terminated with a null pointer (hence the first +1). - The second +1 is because in some parts of the code the opcode - is not counted as a token, but still placed in this array. */ - const char *insn_tokens[NIOS2_MAX_INSN_TOKENS + 1 + 1]; - - /* This holds information used to generate fixups - and eventually relocations if it is not null. */ - nios2_insn_relocS *insn_reloc; -} nios2_insn_infoS; - - -/* This struct is used to convert Nios II pseudo-ops into the - corresponding real op. */ -typedef struct nios2_ps_insn_info -{ - /* Map this pseudo_op... */ - const char *pseudo_insn; - - /* ...to this real instruction. */ - const char *insn; - - /* Call this function to modify the operands.... */ - void (*arg_modifer_func) (char ** parsed_args, const char *arg, int num, - int start); - - /* ...with these arguments. */ - const char *arg_modifier; - int num; - int index; - - /* If arg_modifier_func allocates new memory, provide this function - to free it afterwards. */ - void (*arg_cleanup_func) (char **parsed_args, int num, int start); -} nios2_ps_insn_infoS; - -/* Opcode hash table. */ -static htab_t nios2_opcode_hash = NULL; -#define nios2_opcode_lookup(NAME) \ - ((struct nios2_opcode *) str_hash_find (nios2_opcode_hash, (NAME))) - -/* Register hash table. */ -static htab_t nios2_reg_hash = NULL; -#define nios2_reg_lookup(NAME) \ - ((struct nios2_reg *) str_hash_find (nios2_reg_hash, (NAME))) - - -/* Pseudo-op hash table. */ -static htab_t nios2_ps_hash = NULL; -#define nios2_ps_lookup(NAME) \ - ((nios2_ps_insn_infoS *) str_hash_find (nios2_ps_hash, (NAME))) - -/* The known current alignment of the current section. */ -static int nios2_current_align; -static segT nios2_current_align_seg; - -static int nios2_auto_align_on = 1; - -/* The last seen label in the current section. This is used to auto-align - labels preceding instructions. */ -static symbolS *nios2_last_label; - -/* If we saw a 16-bit CDX instruction, we can align on 2-byte boundaries - instead of 4-bytes. Use this to keep track of the minimum power-of-2 - alignment. */ -static int nios2_min_align = 2; - -#ifdef OBJ_ELF -/* Pre-defined "_GLOBAL_OFFSET_TABLE_" */ -symbolS *GOT_symbol; -#endif - -/* The processor architecture value, EF_NIOS2_ARCH_R1 by default. */ -static int nios2_architecture = EF_NIOS2_ARCH_R1; - - -/** Utility routines. */ -/* Function md_chars_to_number takes the sequence of - bytes in buf and returns the corresponding value - in an int. n must be 1, 2 or 4. */ -static valueT -md_chars_to_number (char *buf, int n) -{ - int i; - valueT val; - - gas_assert (n == 1 || n == 2 || n == 4); - - val = 0; - if (target_big_endian) - for (i = 0; i < n; ++i) - val = val | ((valueT) (buf[i] & 0xff) << 8 * (n - (i + 1))); - else - for (i = 0; i < n; ++i) - val = val | ((valueT) (buf[i] & 0xff) << 8 * i); - return val; -} - - -/* This function turns a C long int, short int or char - into the series of bytes that represent the number - on the target machine. */ -void -md_number_to_chars (char *buf, valueT val, int n) -{ - gas_assert (n == 1 || n == 2 || n == 4 || n == 8); - if (target_big_endian) - number_to_chars_bigendian (buf, val, n); - else - number_to_chars_littleendian (buf, val, n); -} - -/* Turn a string in input_line_pointer into a floating point constant - of type TYPE, and store the appropriate bytes in *LITP. The number - of LITTLENUMS emitted is stored in *SIZEP. An error message is - returned, or NULL on OK. */ -const char * -md_atof (int type, char *litP, int *sizeP) -{ - int prec; - LITTLENUM_TYPE words[4]; - char *t; - int i; - - switch (type) - { - case 'f': - prec = 2; - break; - case 'd': - prec = 4; - break; - default: - *sizeP = 0; - return _("bad call to md_atof"); - } - - t = atof_ieee (input_line_pointer, type, words); - if (t) - input_line_pointer = t; - - *sizeP = prec * 2; - - if (! target_big_endian) - for (i = prec - 1; i >= 0; i--, litP += 2) - md_number_to_chars (litP, (valueT) words[i], 2); - else - for (i = 0; i < prec; i++, litP += 2) - md_number_to_chars (litP, (valueT) words[i], 2); - - return NULL; -} - -/* Return true if STR is prefixed with a special relocation operator. */ -static int -nios2_special_relocation_p (const char *str) -{ - return (startswith (str, "%lo") - || startswith (str, "%hi") - || startswith (str, "%hiadj") - || startswith (str, "%gprel") - || startswith (str, "%got") - || startswith (str, "%call") - || startswith (str, "%gotoff_lo") - || startswith (str, "%gotoff_hiadj") - || startswith (str, "%tls_gd") - || startswith (str, "%tls_ldm") - || startswith (str, "%tls_ldo") - || startswith (str, "%tls_ie") - || startswith (str, "%tls_le") - || startswith (str, "%gotoff")); -} - - -/* nop fill patterns for text section. */ -static char const nop_r1[4] = { 0x3a, 0x88, 0x01, 0x00 }; -static char const nop_r2[4] = { 0x20, 0x00, 0x00, 0xc4 }; -static char const nop_r2_cdx[2] = { 0x3b, 0x00 }; -static char const *nop32 = nop_r1; -static char const *nop16 = NULL; - -/* Handles all machine-dependent alignment needs. */ -static void -nios2_align (int log_size, const char *pfill, symbolS *label) -{ - int align; - long max_alignment = 15; - - /* The front end is prone to changing segments out from under us - temporarily when -g is in effect. */ - int switched_seg_p = (nios2_current_align_seg != now_seg); - - align = log_size; - if (align > max_alignment) - { - align = max_alignment; - as_bad (_("Alignment too large: %d. assumed"), align); - } - else if (align < 0) - { - as_warn (_("Alignment negative: 0 assumed")); - align = 0; - } - - if (align != 0) - { - if (subseg_text_p (now_seg) && align >= nios2_min_align) - { - /* First, make sure we're on the minimum boundary, in case - someone has been putting .byte values the text section. */ - if (nios2_current_align < nios2_min_align || switched_seg_p) - frag_align (nios2_min_align, 0, 0); - - /* If we might be on a 2-byte boundary, first align to a - 4-byte boundary using the 2-byte nop as fill. */ - if (nios2_min_align == 1 - && align > nios2_min_align - && pfill == nop32 ) - { - gas_assert (nop16); - frag_align_pattern (2, nop16, 2, 0); - } - - /* Now fill in the alignment pattern. */ - if (pfill != NULL) - frag_align_pattern (align, pfill, 4, 0); - else - frag_align (align, 0, 0); - } - else - frag_align (align, 0, 0); - - if (!switched_seg_p) - nios2_current_align = align; - - /* If the last label was in a different section we can't align it. */ - if (label != NULL && !switched_seg_p) - { - symbolS *sym; - int label_seen = false; - struct frag *old_frag; - valueT old_value; - valueT new_value; - - gas_assert (S_GET_SEGMENT (label) == now_seg); - - old_frag = symbol_get_frag (label); - old_value = S_GET_VALUE (label); - new_value = (valueT) frag_now_fix (); - - /* It is possible to have more than one label at a particular - address, especially if debugging is enabled, so we must - take care to adjust all the labels at this address in this - fragment. To save time we search from the end of the symbol - list, backwards, since the symbols we are interested in are - almost certainly the ones that were most recently added. - Also to save time we stop searching once we have seen at least - one matching label, and we encounter a label that is no longer - in the target fragment. Note, this search is guaranteed to - find at least one match when sym == label, so no special case - code is necessary. */ - for (sym = symbol_lastP; sym != NULL; sym = symbol_previous (sym)) - if (symbol_get_frag (sym) == old_frag - && S_GET_VALUE (sym) == old_value) - { - label_seen = true; - symbol_set_frag (sym, frag_now); - S_SET_VALUE (sym, new_value); - } - else if (label_seen && symbol_get_frag (sym) != old_frag) - break; - } - record_alignment (now_seg, align); - } -} - - -/** Support for self-check mode. */ - -/* Mode of the assembler. */ -typedef enum -{ - NIOS2_MODE_ASSEMBLE, /* Ordinary operation. */ - NIOS2_MODE_TEST /* Hidden mode used for self testing. */ -} NIOS2_MODE; - -static NIOS2_MODE nios2_mode = NIOS2_MODE_ASSEMBLE; - -/* This function is used to in self-checking mode - to check the assembled instruction - opcode should be the assembled opcode, and exp_opcode - the parsed string representing the expected opcode. */ -static void -nios2_check_assembly (unsigned int opcode, const char *exp_opcode) -{ - if (nios2_mode == NIOS2_MODE_TEST) - { - if (exp_opcode == NULL) - as_bad (_("expecting opcode string in self test mode")); - else if (opcode != strtoul (exp_opcode, NULL, 16)) - as_bad (_("assembly 0x%08x, expected %s"), opcode, exp_opcode); - } -} - - -/** Support for machine-dependent assembler directives. */ -/* Handle the .align pseudo-op. This aligns to a power of two. It - also adjusts any current instruction label. We treat this the same - way the MIPS port does: .align 0 turns off auto alignment. */ -static void -s_nios2_align (int ignore ATTRIBUTE_UNUSED) -{ - int align; - char fill; - const char *pfill = NULL; - long max_alignment = 15; - - align = get_absolute_expression (); - if (align > max_alignment) - { - align = max_alignment; - as_bad (_("Alignment too large: %d. assumed"), align); - } - else if (align < 0) - { - as_warn (_("Alignment negative: 0 assumed")); - align = 0; - } - - if (*input_line_pointer == ',') - { - input_line_pointer++; - fill = get_absolute_expression (); - pfill = (const char *) &fill; - } - else if (subseg_text_p (now_seg)) - pfill = (const char *) nop32; - else - { - pfill = NULL; - nios2_last_label = NULL; - } - - if (align != 0) - { - nios2_auto_align_on = 1; - nios2_align (align, pfill, nios2_last_label); - nios2_last_label = NULL; - } - else - nios2_auto_align_on = 0; - - demand_empty_rest_of_line (); -} - -/* Handle the .text pseudo-op. This is like the usual one, but it - clears the saved last label and resets known alignment. */ -static void -s_nios2_text (int i) -{ - obj_elf_text (i); - nios2_last_label = NULL; - nios2_current_align = 0; - nios2_current_align_seg = now_seg; -} - -/* Handle the .data pseudo-op. This is like the usual one, but it - clears the saved last label and resets known alignment. */ -static void -s_nios2_data (int i) -{ - obj_elf_data (i); - nios2_last_label = NULL; - nios2_current_align = 0; - nios2_current_align_seg = now_seg; -} - -/* Handle the .section pseudo-op. This is like the usual one, but it - clears the saved last label and resets known alignment. */ -static void -s_nios2_section (int ignore) -{ - obj_elf_section (ignore); - nios2_last_label = NULL; - nios2_current_align = 0; - nios2_current_align_seg = now_seg; -} - -/* Explicitly unaligned cons. */ -static void -s_nios2_ucons (int nbytes) -{ - int hold; - hold = nios2_auto_align_on; - nios2_auto_align_on = 0; - cons (nbytes); - nios2_auto_align_on = hold; -} - -/* Handle the .sdata directive. */ -static void -s_nios2_sdata (int ignore ATTRIBUTE_UNUSED) -{ - get_absolute_expression (); /* Ignored. */ - subseg_new (".sdata", 0); - demand_empty_rest_of_line (); -} - -/* .set sets assembler options eg noat/at and is also used - to set symbol values (.equ, .equiv ). */ -static void -s_nios2_set (int equiv) -{ - char *save = input_line_pointer; - char *directive; - char delim = get_symbol_name (&directive); - char *endline = input_line_pointer; - - (void) restore_line_pointer (delim); - - /* We only want to handle ".set XXX" if the - user has tried ".set XXX, YYY" they are not - trying a directive. This prevents - us from polluting the name space. */ - SKIP_WHITESPACE (); - if (is_end_of_line[(unsigned char) *input_line_pointer]) - { - bool done = true; - *endline = 0; - - if (!strcmp (directive, "noat")) - nios2_as_options.noat = true; - else if (!strcmp (directive, "at")) - nios2_as_options.noat = false; - else if (!strcmp (directive, "nobreak")) - nios2_as_options.nobreak = true; - else if (!strcmp (directive, "break")) - nios2_as_options.nobreak = false; - else if (!strcmp (directive, "norelax")) - nios2_as_options.relax = relax_none; - else if (!strcmp (directive, "relaxsection")) - nios2_as_options.relax = relax_section; - else if (!strcmp (directive, "relaxall")) - nios2_as_options.relax = relax_all; - else - done = false; - - if (done) - { - *endline = delim; - demand_empty_rest_of_line (); - return; - } - } - - /* If we fall through to here, either we have ".set XXX, YYY" - or we have ".set XXX" where XXX is unknown or we have - a syntax error. */ - input_line_pointer = save; - s_set (equiv); -} - -/* Machine-dependent assembler directives. - Format of each entry is: - { "directive", handler_func, param } */ -const pseudo_typeS md_pseudo_table[] = { - {"align", s_nios2_align, 0}, - {"text", s_nios2_text, 0}, - {"data", s_nios2_data, 0}, - {"section", s_nios2_section, 0}, - {"section.s", s_nios2_section, 0}, - {"sect", s_nios2_section, 0}, - {"sect.s", s_nios2_section, 0}, - /* .dword and .half are included for compatibility with MIPS. */ - {"dword", cons, 8}, - {"half", cons, 2}, - /* NIOS2 native word size is 4 bytes, so we override - the GAS default of 2. */ - {"word", cons, 4}, - /* Explicitly unaligned directives. */ - {"2byte", s_nios2_ucons, 2}, - {"4byte", s_nios2_ucons, 4}, - {"8byte", s_nios2_ucons, 8}, - {"16byte", s_nios2_ucons, 16}, -#ifdef OBJ_ELF - {"sdata", s_nios2_sdata, 0}, -#endif - {"set", s_nios2_set, 0}, - {NULL, NULL, 0} -}; - - -/** Relaxation support. */ - -/* We support two relaxation modes: a limited PC-relative mode with - -relax-section (the default), and an absolute jump mode with -relax-all. - - Nios II PC-relative branch instructions only support 16-bit offsets. - And, there's no good way to add a 32-bit constant to the PC without - using two registers. - - To deal with this, for the pc-relative relaxation mode we convert - br label - into a series of 16-bit adds, like: - nextpc at - addi at, at, 32767 - ... - addi at, at, remainder - jmp at - - Similarly, conditional branches are converted from - b(condition) r, s, label - into a series like: - b(opposite condition) r, s, skip - nextpc at - addi at, at, 32767 - ... - addi at, at, remainder - jmp at - skip: - - The compiler can do a better job, either by converting the branch - directly into a JMP (going through the GOT for PIC) or by allocating - a second register for the 32-bit displacement. - - For the -relax-all relaxation mode, the conversions are - movhi at, %hi(symbol+offset) - ori at, %lo(symbol+offset) - jmp at - and - b(opposite condition), r, s, skip - movhi at, %hi(symbol+offset) - ori at, %lo(symbol+offset) - jmp at - skip: - respectively. - - 16-bit CDX branch instructions are relaxed first into equivalent - 32-bit branches and then the above transformations are applied - if necessary. - -*/ - -/* Arbitrarily limit the number of addis we can insert; we need to be able - to specify the maximum growth size for each frag that contains a - relaxable branch. There's no point in specifying a huge number here - since that means the assembler needs to allocate that much extra - memory for every branch, and almost no real code will ever need it. - Plus, as already noted a better solution is to just use a jmp, or - allocate a second register to hold a 32-bit displacement. - FIXME: Rather than making this a constant, it could be controlled by - a command-line argument. */ -#define RELAX_MAX_ADDI 32 - -/* The fr_subtype field represents the target-specific relocation state. - It has type relax_substateT (unsigned int). We use it to track the - number of addis necessary, plus a bit to track whether this is a - conditional branch and a bit for 16-bit CDX instructions. - Regardless of the smaller RELAX_MAX_ADDI limit, we reserve 16 bits - in the fr_subtype to encode the number of addis so that the whole - theoretically-valid range is representable. - For the -relax-all mode, N = 0 represents an in-range branch and N = 1 - represents a branch that needs to be relaxed. */ -#define UBRANCH (0 << 16) -#define CBRANCH (1 << 16) -#define CDXBRANCH (1 << 17) -#define IS_CBRANCH(SUBTYPE) ((SUBTYPE) & CBRANCH) -#define IS_UBRANCH(SUBTYPE) (!IS_CBRANCH (SUBTYPE)) -#define IS_CDXBRANCH(SUBTYPE) ((SUBTYPE) & CDXBRANCH) -#define UBRANCH_SUBTYPE(N) (UBRANCH | (N)) -#define CBRANCH_SUBTYPE(N) (CBRANCH | (N)) -#define CDX_UBRANCH_SUBTYPE(N) (CDXBRANCH | UBRANCH | (N)) -#define CDX_CBRANCH_SUBTYPE(N) (CDXBRANCH | CBRANCH | (N)) -#define SUBTYPE_ADDIS(SUBTYPE) ((SUBTYPE) & 0xffff) - -/* For the -relax-section mode, unconditional branches require 2 extra - instructions besides the addis, conditional branches require 3. */ -#define UBRANCH_ADDIS_TO_SIZE(N) (((N) + 2) * 4) -#define CBRANCH_ADDIS_TO_SIZE(N) (((N) + 3) * 4) - -/* For the -relax-all mode, unconditional branches require 3 instructions - and conditional branches require 4. */ -#define UBRANCH_JUMP_SIZE 12 -#define CBRANCH_JUMP_SIZE 16 - -/* Maximum sizes of relaxation sequences. */ -#define UBRANCH_MAX_SIZE \ - (nios2_as_options.relax == relax_all \ - ? UBRANCH_JUMP_SIZE \ - : UBRANCH_ADDIS_TO_SIZE (RELAX_MAX_ADDI)) -#define CBRANCH_MAX_SIZE \ - (nios2_as_options.relax == relax_all \ - ? CBRANCH_JUMP_SIZE \ - : CBRANCH_ADDIS_TO_SIZE (RELAX_MAX_ADDI)) - -/* Register number of AT, the assembler temporary. */ -#define AT_REGNUM 1 - -/* Determine how many bytes are required to represent the sequence - indicated by SUBTYPE. */ -static int -nios2_relax_subtype_size (relax_substateT subtype) -{ - int n = SUBTYPE_ADDIS (subtype); - if (n == 0) - /* Regular conditional/unconditional branch instruction. */ - return (IS_CDXBRANCH (subtype) ? 2 : 4); - else if (nios2_as_options.relax == relax_all) - return (IS_CBRANCH (subtype) ? CBRANCH_JUMP_SIZE : UBRANCH_JUMP_SIZE); - else if (IS_CBRANCH (subtype)) - return CBRANCH_ADDIS_TO_SIZE (n); - else - return UBRANCH_ADDIS_TO_SIZE (n); -} - -/* Estimate size of fragp before relaxation. - This could also examine the offset in fragp and adjust - fragp->fr_subtype, but we will do that in nios2_relax_frag anyway. */ -int -md_estimate_size_before_relax (fragS *fragp, segT segment ATTRIBUTE_UNUSED) -{ - return nios2_relax_subtype_size (fragp->fr_subtype); -} - -/* Implement md_relax_frag, returning the change in size of the frag. */ -long -nios2_relax_frag (segT segment, fragS *fragp, long stretch) -{ - addressT target = fragp->fr_offset; - relax_substateT subtype = fragp->fr_subtype; - symbolS *symbolp = fragp->fr_symbol; - - if (symbolp) - { - fragS *sym_frag = symbol_get_frag (symbolp); - offsetT offset; - int n; - bool is_cdx = false; - - target += S_GET_VALUE (symbolp); - - /* See comments in write.c:relax_frag about handling of stretch. */ - if (stretch != 0 - && sym_frag->relax_marker != fragp->relax_marker) - { - if (stretch < 0 || sym_frag->region == fragp->region) - target += stretch; - else if (target < fragp->fr_address) - target = fragp->fr_next->fr_address + stretch; - } - - /* We subtract fr_var (4 for 32-bit insns) because all pc relative - branches are from the next instruction. */ - offset = target - fragp->fr_address - fragp->fr_fix - fragp->fr_var; - if (IS_CDXBRANCH (subtype) && IS_UBRANCH (subtype) - && offset >= -1024 && offset < 1024) - /* PC-relative CDX branch with 11-bit offset. */ - is_cdx = true; - else if (IS_CDXBRANCH (subtype) && IS_CBRANCH (subtype) - && offset >= -128 && offset < 128) - /* PC-relative CDX branch with 8-bit offset. */ - is_cdx = true; - else if (offset >= -32768 && offset < 32768) - /* Fits in PC-relative branch. */ - n = 0; - else if (nios2_as_options.relax == relax_all) - /* Convert to jump. */ - n = 1; - else if (nios2_as_options.relax == relax_section - && S_GET_SEGMENT (symbolp) == segment - && S_IS_DEFINED (symbolp)) - /* Attempt a PC-relative relaxation on a branch to a defined - symbol in the same segment. */ - { - /* The relaxation for conditional branches is offset by 4 - bytes because we insert the inverted branch around the - sequence. */ - if (IS_CBRANCH (subtype)) - offset = offset - 4; - if (offset > 0) - n = offset / 32767 + 1; - else - n = offset / -32768 + 1; - - /* Bail out immediately if relaxation has failed. If we try to - defer the diagnostic to md_convert_frag, some pathological test - cases (e.g. gcc/testsuite/gcc.c-torture/compile/20001226-1.c) - apparently never converge. By returning 0 here we could pretend - to the caller that nothing has changed, but that leaves things - in an inconsistent state when we get to md_convert_frag. */ - if (n > RELAX_MAX_ADDI) - { - as_bad_where (fragp->fr_file, fragp->fr_line, - _("branch offset out of range\n")); - as_fatal (_("branch relaxation failed\n")); - } - } - else - /* We cannot handle this case, diagnose overflow later. */ - return 0; - - if (is_cdx) - fragp->fr_subtype = subtype; - else if (IS_CBRANCH (subtype)) - fragp->fr_subtype = CBRANCH_SUBTYPE (n); - else - fragp->fr_subtype = UBRANCH_SUBTYPE (n); - - return (nios2_relax_subtype_size (fragp->fr_subtype) - - nios2_relax_subtype_size (subtype)); - } - - /* If we got here, it's probably an error. */ - return 0; -} - - -/* Complete fragp using the data from the relaxation pass. */ -void -md_convert_frag (bfd *headers ATTRIBUTE_UNUSED, segT segment ATTRIBUTE_UNUSED, - fragS *fragp) -{ - char *buffer = fragp->fr_literal + fragp->fr_fix; - relax_substateT subtype = fragp->fr_subtype; - int n = SUBTYPE_ADDIS (subtype); - addressT target = fragp->fr_offset; - symbolS *symbolp = fragp->fr_symbol; - offsetT offset; - unsigned int addend_mask, addi_mask, op; - offsetT addend, remainder; - int i; - bool is_r2 = (bfd_get_mach (stdoutput) == bfd_mach_nios2r2); - - /* If this is a CDX branch we're not relaxing, just generate the fixup. */ - if (IS_CDXBRANCH (subtype)) - { - gas_assert (is_r2); - fix_new (fragp, fragp->fr_fix, 2, fragp->fr_symbol, - fragp->fr_offset, 1, - (IS_UBRANCH (subtype) - ? BFD_RELOC_NIOS2_R2_I10_1_PCREL - : BFD_RELOC_NIOS2_R2_T1I7_1_PCREL)); - fragp->fr_fix += 2; - return; - } - - /* If this is a CDX branch we are relaxing, turn it into an equivalent - 32-bit branch and then fall through to the normal non-CDX cases. */ - if (fragp->fr_var == 2) - { - unsigned int opcode = md_chars_to_number (buffer, 2); - gas_assert (is_r2); - if (IS_CBRANCH (subtype)) - { - unsigned int reg = nios2_r2_reg3_mappings[GET_IW_T1I7_A3 (opcode)]; - if (GET_IW_R2_OP (opcode) == R2_OP_BNEZ_N) - opcode = MATCH_R2_BNE | SET_IW_F2I16_A (reg); - else - opcode = MATCH_R2_BEQ | SET_IW_F2I16_A (reg); - } - else - opcode = MATCH_R2_BR; - md_number_to_chars (buffer, opcode, 4); - fragp->fr_var = 4; - } - - /* If we didn't or can't relax, this is a regular branch instruction. - We just need to generate the fixup for the symbol and offset. */ - if (n == 0) - { - fix_new (fragp, fragp->fr_fix, 4, fragp->fr_symbol, - fragp->fr_offset, 1, BFD_RELOC_16_PCREL); - fragp->fr_fix += 4; - return; - } - - /* Replace the cbranch at fr_fix with one that has the opposite condition - in order to jump around the block of instructions we'll be adding. */ - if (IS_CBRANCH (subtype)) - { - unsigned int br_opcode; - unsigned int old_op, new_op; - int nbytes; - - /* Account for the nextpc and jmp in the pc-relative case, or the two - load instructions and jump in the absolute case. */ - if (nios2_as_options.relax == relax_section) - nbytes = (n + 2) * 4; - else - nbytes = 12; - - br_opcode = md_chars_to_number (buffer, 4); - if (is_r2) - { - old_op = GET_IW_R2_OP (br_opcode); - switch (old_op) - { - case R2_OP_BEQ: - new_op = R2_OP_BNE; - break; - case R2_OP_BNE: - new_op = R2_OP_BEQ; - break; - case R2_OP_BGE: - new_op = R2_OP_BLT; - break; - case R2_OP_BGEU: - new_op = R2_OP_BLTU; - break; - case R2_OP_BLT: - new_op = R2_OP_BGE; - break; - case R2_OP_BLTU: - new_op = R2_OP_BGEU; - break; - default: - abort (); - } - br_opcode = ((br_opcode & ~IW_R2_OP_SHIFTED_MASK) - | SET_IW_R2_OP (new_op)); - br_opcode = br_opcode | SET_IW_F2I16_IMM16 (nbytes); - } - else - { - old_op = GET_IW_R1_OP (br_opcode); - switch (old_op) - { - case R1_OP_BEQ: - new_op = R1_OP_BNE; - break; - case R1_OP_BNE: - new_op = R1_OP_BEQ; - break; - case R1_OP_BGE: - new_op = R1_OP_BLT; - break; - case R1_OP_BGEU: - new_op = R1_OP_BLTU; - break; - case R1_OP_BLT: - new_op = R1_OP_BGE; - break; - case R1_OP_BLTU: - new_op = R1_OP_BGEU; - break; - default: - abort (); - } - br_opcode = ((br_opcode & ~IW_R1_OP_SHIFTED_MASK) - | SET_IW_R1_OP (new_op)); - br_opcode = br_opcode | SET_IW_I_IMM16 (nbytes); - } - md_number_to_chars (buffer, br_opcode, 4); - fragp->fr_fix += 4; - buffer += 4; - } - - /* Load at for the PC-relative case. */ - if (nios2_as_options.relax == relax_section) - { - /* Insert the nextpc instruction. */ - if (is_r2) - op = MATCH_R2_NEXTPC | SET_IW_F3X6L5_C (AT_REGNUM); - else - op = MATCH_R1_NEXTPC | SET_IW_R_C (AT_REGNUM); - md_number_to_chars (buffer, op, 4); - fragp->fr_fix += 4; - buffer += 4; - - /* We need to know whether the offset is positive or negative. */ - target += S_GET_VALUE (symbolp); - offset = target - fragp->fr_address - fragp->fr_fix; - if (offset > 0) - addend = 32767; - else - addend = -32768; - if (is_r2) - addend_mask = SET_IW_F2I16_IMM16 ((unsigned int)addend); - else - addend_mask = SET_IW_I_IMM16 ((unsigned int)addend); - - /* Insert n-1 addi instructions. */ - if (is_r2) - addi_mask = (MATCH_R2_ADDI - | SET_IW_F2I16_B (AT_REGNUM) - | SET_IW_F2I16_A (AT_REGNUM)); - else - addi_mask = (MATCH_R1_ADDI - | SET_IW_I_B (AT_REGNUM) - | SET_IW_I_A (AT_REGNUM)); - for (i = 0; i < n - 1; i ++) - { - md_number_to_chars (buffer, addi_mask | addend_mask, 4); - fragp->fr_fix += 4; - buffer += 4; - } - - /* Insert the last addi instruction to hold the remainder. */ - remainder = offset - addend * (n - 1); - gas_assert (remainder >= -32768 && remainder <= 32767); - if (is_r2) - addend_mask = SET_IW_F2I16_IMM16 ((unsigned int)remainder); - else - addend_mask = SET_IW_I_IMM16 ((unsigned int)remainder); - md_number_to_chars (buffer, addi_mask | addend_mask, 4); - fragp->fr_fix += 4; - buffer += 4; - } - - /* Load at for the absolute case. */ - else - { - if (is_r2) - op = MATCH_R2_ORHI | SET_IW_F2I16_B (AT_REGNUM) | SET_IW_F2I16_A (0); - else - op = MATCH_R1_ORHI | SET_IW_I_B (AT_REGNUM) | SET_IW_I_A (0); - md_number_to_chars (buffer, op, 4); - fix_new (fragp, fragp->fr_fix, 4, fragp->fr_symbol, fragp->fr_offset, - 0, BFD_RELOC_NIOS2_HI16); - fragp->fr_fix += 4; - buffer += 4; - if (is_r2) - op = (MATCH_R2_ORI | SET_IW_F2I16_B (AT_REGNUM) - | SET_IW_F2I16_A (AT_REGNUM)); - else - op = (MATCH_R1_ORI | SET_IW_I_B (AT_REGNUM) - | SET_IW_I_A (AT_REGNUM)); - md_number_to_chars (buffer, op, 4); - fix_new (fragp, fragp->fr_fix, 4, fragp->fr_symbol, fragp->fr_offset, - 0, BFD_RELOC_NIOS2_LO16); - fragp->fr_fix += 4; - buffer += 4; - } - - /* Insert the jmp instruction. */ - if (is_r2) - op = MATCH_R2_JMP | SET_IW_F3X6L5_A (AT_REGNUM); - else - op = MATCH_R1_JMP | SET_IW_R_A (AT_REGNUM); - md_number_to_chars (buffer, op, 4); - fragp->fr_fix += 4; - buffer += 4; -} - - -/** Fixups and overflow checking. */ - -/* Check a fixup for overflow. */ -static bool -nios2_check_overflow (valueT fixup, reloc_howto_type *howto) -{ - /* If there is a rightshift, check that the low-order bits are - zero before applying it. */ - if (howto->rightshift) - { - if ((~(~((valueT) 0) << howto->rightshift) & fixup) - && howto->complain_on_overflow != complain_overflow_dont) - return true; - fixup = ((signed)fixup) >> howto->rightshift; - } - - /* Check for overflow - return TRUE if overflow, FALSE if not. */ - switch (howto->complain_on_overflow) - { - case complain_overflow_dont: - break; - case complain_overflow_bitfield: - if ((fixup >> howto->bitsize) != 0 - && ((signed) fixup >> howto->bitsize) != -1) - return true; - break; - case complain_overflow_signed: - if ((fixup & 0x80000000) > 0) - { - /* Check for negative overflow. */ - if ((signed) fixup < (signed) (~0U << (howto->bitsize - 1))) - return true; - } - else - { - /* Check for positive overflow. */ - if (fixup >= ((unsigned) 1 << (howto->bitsize - 1))) - return true; - } - break; - case complain_overflow_unsigned: - if ((fixup >> howto->bitsize) != 0) - return true; - break; - default: - as_bad (_("error checking for overflow - broken assembler")); - break; - } - return false; -} - -/* Emit diagnostic for fixup overflow. */ -static void -nios2_diagnose_overflow (valueT fixup, reloc_howto_type *howto, - fixS *fixP, valueT value) -{ - if (fixP->fx_r_type == BFD_RELOC_8 - || fixP->fx_r_type == BFD_RELOC_16 - || fixP->fx_r_type == BFD_RELOC_32) - /* These relocs are against data, not instructions. */ - as_bad_where (fixP->fx_file, fixP->fx_line, - _("immediate value 0x%x truncated to 0x%x"), - (unsigned int) fixup, - (unsigned int) (~(~(valueT) 0 << howto->bitsize) & fixup)); - else - { - /* What opcode is the instruction? This will determine - whether we check for overflow in immediate values - and what error message we get. */ - const struct nios2_opcode *opcode; - enum overflow_type overflow_msg_type; - unsigned int range_min; - unsigned int range_max; - unsigned int address; - - opcode = nios2_find_opcode_hash (value, bfd_get_mach (stdoutput)); - gas_assert (opcode); - gas_assert (fixP->fx_size == opcode->size); - overflow_msg_type = opcode->overflow_msg; - switch (overflow_msg_type) - { - case call_target_overflow: - range_min - = ((fixP->fx_frag->fr_address + fixP->fx_where) & 0xf0000000); - range_max = range_min + 0x0fffffff; - address = fixup | range_min; - - as_bad_where (fixP->fx_file, fixP->fx_line, - _("call target address 0x%08x out of range 0x%08x to 0x%08x"), - address, range_min, range_max); - break; - case branch_target_overflow: - if (opcode->format == iw_i_type || opcode->format == iw_F2I16_type) - as_bad_where (fixP->fx_file, fixP->fx_line, - _("branch offset %d out of range %d to %d"), - (int)fixup, -32768, 32767); - else - as_bad_where (fixP->fx_file, fixP->fx_line, - _("branch offset %d out of range"), - (int)fixup); - break; - case address_offset_overflow: - if (opcode->format == iw_i_type || opcode->format == iw_F2I16_type) - as_bad_where (fixP->fx_file, fixP->fx_line, - _("%s offset %d out of range %d to %d"), - opcode->name, (int)fixup, -32768, 32767); - else - as_bad_where (fixP->fx_file, fixP->fx_line, - _("%s offset %d out of range"), - opcode->name, (int)fixup); - break; - case signed_immed16_overflow: - as_bad_where (fixP->fx_file, fixP->fx_line, - _("immediate value %d out of range %d to %d"), - (int)fixup, -32768, 32767); - break; - case unsigned_immed16_overflow: - as_bad_where (fixP->fx_file, fixP->fx_line, - _("immediate value %u out of range %u to %u"), - (unsigned int)fixup, 0, 65535); - break; - case unsigned_immed5_overflow: - as_bad_where (fixP->fx_file, fixP->fx_line, - _("immediate value %u out of range %u to %u"), - (unsigned int)fixup, 0, 31); - break; - case signed_immed12_overflow: - as_bad_where (fixP->fx_file, fixP->fx_line, - _("immediate value %d out of range %d to %d"), - (int)fixup, -2048, 2047); - break; - case custom_opcode_overflow: - as_bad_where (fixP->fx_file, fixP->fx_line, - _("custom instruction opcode %u out of range %u to %u"), - (unsigned int)fixup, 0, 255); - break; - default: - as_bad_where (fixP->fx_file, fixP->fx_line, - _("overflow in immediate argument")); - break; - } - } -} - -/* Apply a fixup to the object file. */ -void -md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) -{ - /* Assert that the fixup is one we can handle. */ - gas_assert (fixP != NULL && valP != NULL - && (fixP->fx_r_type == BFD_RELOC_8 - || fixP->fx_r_type == BFD_RELOC_16 - || fixP->fx_r_type == BFD_RELOC_32 - || fixP->fx_r_type == BFD_RELOC_64 - || fixP->fx_r_type == BFD_RELOC_NIOS2_S16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_U16 - || fixP->fx_r_type == BFD_RELOC_16_PCREL - || fixP->fx_r_type == BFD_RELOC_NIOS2_CALL26 - || fixP->fx_r_type == BFD_RELOC_NIOS2_IMM5 - || fixP->fx_r_type == BFD_RELOC_NIOS2_CACHE_OPX - || fixP->fx_r_type == BFD_RELOC_NIOS2_IMM6 - || fixP->fx_r_type == BFD_RELOC_NIOS2_IMM8 - || fixP->fx_r_type == BFD_RELOC_NIOS2_HI16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_LO16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_HIADJ16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_GPREL - || fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT - || fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY - || fixP->fx_r_type == BFD_RELOC_NIOS2_UJMP - || fixP->fx_r_type == BFD_RELOC_NIOS2_CJMP - || fixP->fx_r_type == BFD_RELOC_NIOS2_CALLR - || fixP->fx_r_type == BFD_RELOC_NIOS2_ALIGN - || fixP->fx_r_type == BFD_RELOC_NIOS2_GOT16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_CALL16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_GOTOFF_LO - || fixP->fx_r_type == BFD_RELOC_NIOS2_GOTOFF_HA - || fixP->fx_r_type == BFD_RELOC_NIOS2_TLS_GD16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_TLS_LDM16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_TLS_LDO16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_TLS_IE16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_TLS_LE16 - || fixP->fx_r_type == BFD_RELOC_NIOS2_GOTOFF - || fixP->fx_r_type == BFD_RELOC_NIOS2_TLS_DTPREL - || fixP->fx_r_type == BFD_RELOC_NIOS2_CALL26_NOAT - || fixP->fx_r_type == BFD_RELOC_NIOS2_GOT_LO - || fixP->fx_r_type == BFD_RELOC_NIOS2_GOT_HA - || fixP->fx_r_type == BFD_RELOC_NIOS2_CALL_LO - || fixP->fx_r_type == BFD_RELOC_NIOS2_CALL_HA - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_S12 - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_I10_1_PCREL - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_T1I7_1_PCREL - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_T1I7_2 - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_T2I4 - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_T2I4_1 - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_T2I4_2 - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_X1I7_2 - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_X2L5 - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_F1I5_2 - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_L5I4X1 - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_T1X1I6 - || fixP->fx_r_type == BFD_RELOC_NIOS2_R2_T1X1I6_2 - /* Add other relocs here as we generate them. */ - )); - - if (fixP->fx_r_type == BFD_RELOC_64) - { - /* We may reach here due to .8byte directives, but we never output - BFD_RELOC_64; it must be resolved. */ - if (fixP->fx_addsy != NULL) - as_bad_where (fixP->fx_file, fixP->fx_line, - _("cannot create 64-bit relocation")); - else - { - md_number_to_chars (fixP->fx_frag->fr_literal + fixP->fx_where, - *valP, 8); - fixP->fx_done = 1; - } - return; - } - - /* The value passed in valP can be the value of a fully - resolved expression, or it can be the value of a partially - resolved expression. In the former case, both fixP->fx_addsy - and fixP->fx_subsy are NULL, and fixP->fx_offset == *valP, and - we can fix up the instruction that fixP relates to. - In the latter case, one or both of fixP->fx_addsy and - fixP->fx_subsy are not NULL, and fixP->fx_offset may or may not - equal *valP. We don't need to check for fixP->fx_subsy being null - because the generic part of the assembler generates an error if - it is not an absolute symbol. */ - if (fixP->fx_addsy != NULL) - /* Partially resolved expression. */ - { - fixP->fx_addnumber = fixP->fx_offset; - fixP->fx_done = 0; - - switch (fixP->fx_r_type) - { - case BFD_RELOC_NIOS2_TLS_GD16: - case BFD_RELOC_NIOS2_TLS_LDM16: - case BFD_RELOC_NIOS2_TLS_LDO16: - case BFD_RELOC_NIOS2_TLS_IE16: - case BFD_RELOC_NIOS2_TLS_LE16: - case BFD_RELOC_NIOS2_TLS_DTPMOD: - case BFD_RELOC_NIOS2_TLS_DTPREL: - case BFD_RELOC_NIOS2_TLS_TPREL: - S_SET_THREAD_LOCAL (fixP->fx_addsy); - break; - default: - break; - } - } - else - /* Fully resolved fixup. */ - { - reloc_howto_type *howto - = bfd_reloc_type_lookup (stdoutput, fixP->fx_r_type); - - if (howto == NULL) - as_bad_where (fixP->fx_file, fixP->fx_line, - _("relocation is not supported")); - else - { - valueT fixup = *valP; - valueT value; - char *buf; - - /* If this is a pc-relative relocation, we need to - subtract the current offset within the object file - FIXME : for some reason fixP->fx_pcrel isn't 1 when it should be - so I'm using the howto structure instead to determine this. */ - if (howto->pc_relative == 1) - { - fixup = (fixup - (fixP->fx_frag->fr_address + fixP->fx_where - + fixP->fx_size)); - *valP = fixup; - } - - /* Get the instruction or data to be fixed up. */ - buf = fixP->fx_frag->fr_literal + fixP->fx_where; - value = md_chars_to_number (buf, fixP->fx_size); - - /* Check for overflow, emitting a diagnostic if necessary. */ - if (nios2_check_overflow (fixup, howto)) - nios2_diagnose_overflow (fixup, howto, fixP, value); - - /* Apply the right shift. */ - fixup = (offsetT) fixup >> howto->rightshift; - - /* Truncate the fixup to right size. */ - switch (fixP->fx_r_type) - { - case BFD_RELOC_NIOS2_HI16: - fixup = (fixup >> 16) & 0xFFFF; - break; - case BFD_RELOC_NIOS2_LO16: - fixup = fixup & 0xFFFF; - break; - case BFD_RELOC_NIOS2_HIADJ16: - fixup = ((fixup + 0x8000) >> 16) & 0xFFFF; - break; - default: - { - fixup &= ((valueT) 2 << (howto->bitsize - 1)) - 1; - break; - } - } - - /* Fix up the instruction. */ - value = (value & ~howto->dst_mask) | (fixup << howto->bitpos); - md_number_to_chars (buf, value, fixP->fx_size); - } - - fixP->fx_done = 1; - } - - if (fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT) - { - fixP->fx_done = 0; - if (fixP->fx_addsy - && !S_IS_DEFINED (fixP->fx_addsy) && !S_IS_WEAK (fixP->fx_addsy)) - S_SET_WEAK (fixP->fx_addsy); - } - else if (fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY) - fixP->fx_done = 0; -} - - - -/** Instruction parsing support. */ - -/* General internal error routine. */ - -static void -bad_opcode (const struct nios2_opcode *op) -{ - fprintf (stderr, _("internal error: broken opcode descriptor for `%s %s'\n"), - op->name, op->args); - as_fatal (_("Broken assembler. No assembly attempted.")); -} - -/* Special relocation directive strings. */ - -struct nios2_special_relocS -{ - const char *string; - bfd_reloc_code_real_type reloc_type; -}; - -/* This table is sorted so that prefix strings are listed after the longer - strings that include them -- e.g., %got after %got_hiadj, etc. */ - -struct nios2_special_relocS nios2_special_reloc[] = { - {"%hiadj", BFD_RELOC_NIOS2_HIADJ16}, - {"%hi", BFD_RELOC_NIOS2_HI16}, - {"%lo", BFD_RELOC_NIOS2_LO16}, - {"%gprel", BFD_RELOC_NIOS2_GPREL}, - {"%call_lo", BFD_RELOC_NIOS2_CALL_LO}, - {"%call_hiadj", BFD_RELOC_NIOS2_CALL_HA}, - {"%call", BFD_RELOC_NIOS2_CALL16}, - {"%gotoff_lo", BFD_RELOC_NIOS2_GOTOFF_LO}, - {"%gotoff_hiadj", BFD_RELOC_NIOS2_GOTOFF_HA}, - {"%gotoff", BFD_RELOC_NIOS2_GOTOFF}, - {"%got_hiadj", BFD_RELOC_NIOS2_GOT_HA}, - {"%got_lo", BFD_RELOC_NIOS2_GOT_LO}, - {"%got", BFD_RELOC_NIOS2_GOT16}, - {"%tls_gd", BFD_RELOC_NIOS2_TLS_GD16}, - {"%tls_ldm", BFD_RELOC_NIOS2_TLS_LDM16}, - {"%tls_ldo", BFD_RELOC_NIOS2_TLS_LDO16}, - {"%tls_ie", BFD_RELOC_NIOS2_TLS_IE16}, - {"%tls_le", BFD_RELOC_NIOS2_TLS_LE16}, -}; - -#define NIOS2_NUM_SPECIAL_RELOCS \ - (sizeof(nios2_special_reloc)/sizeof(nios2_special_reloc[0])) -const int nios2_num_special_relocs = NIOS2_NUM_SPECIAL_RELOCS; - -/* Creates a new nios2_insn_relocS and returns a pointer to it. */ -static nios2_insn_relocS * -nios2_insn_reloc_new (bfd_reloc_code_real_type reloc_type, unsigned int pcrel) -{ - nios2_insn_relocS *retval; - retval = XNEW (nios2_insn_relocS); - if (retval == NULL) - { - as_bad (_("can't create relocation")); - abort (); - } - - /* Fill out the fields with default values. */ - retval->reloc_next = NULL; - retval->reloc_type = reloc_type; - retval->reloc_pcrel = pcrel; - return retval; -} - -/* Frees up memory previously allocated by nios2_insn_reloc_new(). */ -/* FIXME: this is never called; memory leak? */ -#if 0 -static void -nios2_insn_reloc_destroy (nios2_insn_relocS *reloc) -{ - gas_assert (reloc != NULL); - free (reloc); -} -#endif - -/* Look up a register name and validate it for the given regtype. - Return the register mapping or NULL on failure. */ -static struct nios2_reg * -nios2_parse_reg (const char *token, unsigned long regtype) -{ - struct nios2_reg *reg = nios2_reg_lookup (token); - - if (reg == NULL) - { - as_bad (_("unknown register %s"), token); - return NULL; - } - - /* Matched a register, but is it the wrong type? */ - if (!(regtype & reg->regtype)) - { - if (regtype & REG_CONTROL) - as_bad (_("expecting control register")); - else if (reg->regtype & REG_CONTROL) - as_bad (_("illegal use of control register")); - else if (reg->regtype & REG_COPROCESSOR) - as_bad (_("illegal use of coprocessor register")); - else - as_bad (_("invalid register %s"), token); - return NULL; - } - - /* Warn for explicit use of special registers. */ - if (reg->regtype & REG_NORMAL) - { - if (!nios2_as_options.noat && reg->index == 1) - as_warn (_("Register at (r1) can sometimes be corrupted by " - "assembler optimizations.\n" - "Use .set noat to turn off those optimizations " - "(and this warning).")); - if (!nios2_as_options.nobreak && reg->index == 25) - as_warn (_("The debugger will corrupt bt (r25).\n" - "If you don't need to debug this " - "code use .set nobreak to turn off this warning.")); - if (!nios2_as_options.nobreak && reg->index == 30) - as_warn (_("The debugger will corrupt sstatus/ba (r30).\n" - "If you don't need to debug this " - "code use .set nobreak to turn off this warning.")); - } - - return reg; -} - -/* This function parses a reglist for ldwm/stwm and push.n/pop.n - instructions, given as a brace-enclosed register list. The tokenizer - has replaced commas in the token with spaces. - The return value is a bitmask of registers in the set. It also - sets nios2_reglist_mask and nios2_reglist_dir to allow error checking - when parsing the base register. */ - -static unsigned long nios2_reglist_mask; -static int nios2_reglist_dir; - -static unsigned long -nios2_parse_reglist (char *token, const struct nios2_opcode *op) -{ - unsigned long mask = 0; - int dir = 0; - unsigned long regtype = 0; - int last = -1; - const char *regname; - - nios2_reglist_mask = 0; - nios2_reglist_dir = 0; - - if (op->match == MATCH_R2_LDWM || op->match == MATCH_R2_STWM) - { - regtype = REG_LDWM; - dir = 0; - } - else if (op->match == MATCH_R2_PUSH_N) - { - regtype = REG_POP; - dir = -1; - } - else if (op->match == MATCH_R2_POP_N) - { - regtype = REG_POP; - dir = 1; - } - else - bad_opcode (op); - - for (regname = strtok (token, "{ }"); - regname; - regname = strtok (NULL, "{ }")) - { - int regno; - struct nios2_reg *reg = nios2_parse_reg (regname, regtype); - - if (!reg) - break; - regno = reg->index; - - /* Make sure registers are listed in proper sequence. */ - if (last >= 0) - { - if (regno == last) - { - as_bad ("duplicate register %s\n", reg->name); - return 0; - } - else if (dir == 0) - dir = (regno < last ? -1 : 1); - else if ((dir > 0 && regno < last) - || (dir < 0 && regno > last) - || (op->match == MATCH_R2_PUSH_N - && ! ((last == 31 && regno == 28) - || (last == 31 && regno <= 23) - || (last == 28 && regno <= 23) - || (regno < 23 && regno == last - 1))) - || (op->match == MATCH_R2_POP_N - && ! ((regno == 31 && last == 28) - || (regno == 31 && last <= 23) - || (regno == 28 && last <= 23) - || (last < 23 && last == regno - 1)))) - { - as_bad ("invalid register order"); - return 0; - } - } - - mask |= 1UL << regno; - last = regno; - } - - /* Check that all ldwm/stwm regs belong to the same set. */ - if ((op->match == MATCH_R2_LDWM || op->match == MATCH_R2_STWM) - && (mask & 0x00003ffc) && (mask & 0x90ffc000)) - { - as_bad ("invalid register set in reglist"); - return 0; - } - - /* Check that push.n/pop.n regs include RA. */ - if ((op->match == MATCH_R2_PUSH_N || op->match == MATCH_R2_POP_N) - && ((mask & 0x80000000) == 0)) - { - as_bad ("reglist must include ra (r31)"); - return 0; - } - - /* Check that there is at least one register in the set. */ - if (!mask) - { - as_bad ("reglist must include at least one register"); - return 0; - } - - /* OK, reglist passed validation. */ - nios2_reglist_mask = mask; - nios2_reglist_dir = dir; - return mask; -} - -/* This function parses the base register and options used by the ldwm/stwm - instructions. Returns the base register and sets the option arguments - accordingly. On failure, returns NULL. */ -static struct nios2_reg * -nios2_parse_base_register (char *str, int *direction, int *writeback, int *ret) -{ - char *regname; - struct nios2_reg *reg; - - *direction = 0; - *writeback = 0; - *ret = 0; - - /* Check for --. */ - if (startswith (str, "--")) - { - str += 2; - *direction -= 1; - } - - /* Extract the base register. */ - if (*str != '(') - { - as_bad ("expected '(' before base register"); - return NULL; - } - str++; - regname = str; - str = strchr (str, ')'); - if (!str) - { - as_bad ("expected ')' after base register"); - return NULL; - } - *str = '\0'; - str++; - reg = nios2_parse_reg (regname, REG_NORMAL); - if (reg == NULL) - return NULL; - - /* Check for ++. */ - if (startswith (str, "++")) - { - str += 2; - *direction += 1; - } - - /* Ensure that either -- or ++ is specified, but not both. */ - if (*direction == 0) - { - as_bad ("invalid base register syntax"); - return NULL;; - } - - /* Check for options. The tokenizer has replaced commas with spaces. */ - while (*str) - { - while (*str == ' ') - str++; - if (startswith (str, "writeback")) - { - *writeback = 1; - str += 9; - } - else if (startswith (str, "ret")) - { - *ret = 1; - str += 3; - } - else if (*str) - { - as_bad ("invalid option syntax"); - return NULL; - } - } - - return reg; -} - - -/* The various nios2_assemble_* functions call this - function to generate an expression from a string representing an expression. - It then tries to evaluate the expression, and if it can, returns its value. - If not, it creates a new nios2_insn_relocS and stores the expression and - reloc_type for future use. */ -static unsigned long -nios2_assemble_expression (const char *exprstr, - nios2_insn_infoS *insn, - bfd_reloc_code_real_type orig_reloc_type, - unsigned int pcrel) -{ - nios2_insn_relocS *reloc; - char *saved_line_ptr; - unsigned long value = 0; - int i; - bfd_reloc_code_real_type reloc_type = orig_reloc_type; - - gas_assert (exprstr != NULL); - gas_assert (insn != NULL); - - /* Check for relocation operators. - Change the relocation type and advance the ptr to the start of - the expression proper. */ - for (i = 0; i < nios2_num_special_relocs; i++) - if (strstr (exprstr, nios2_special_reloc[i].string) != NULL) - { - reloc_type = nios2_special_reloc[i].reloc_type; - exprstr += strlen (nios2_special_reloc[i].string) + 1; - - /* %lo and %hiadj have different meanings for PC-relative - expressions. */ - if (pcrel) - { - if (reloc_type == BFD_RELOC_NIOS2_LO16) - reloc_type = BFD_RELOC_NIOS2_PCREL_LO; - if (reloc_type == BFD_RELOC_NIOS2_HIADJ16) - reloc_type = BFD_RELOC_NIOS2_PCREL_HA; - } - - break; - } - - /* No relocation allowed; we must have a constant expression. */ - if (orig_reloc_type == BFD_RELOC_NONE) - { - expressionS exp; - - /* Parse the expression string. */ - saved_line_ptr = input_line_pointer; - input_line_pointer = (char *) exprstr; - expression (&exp); - input_line_pointer = saved_line_ptr; - - /* If we don't have a constant, give an error. */ - if (reloc_type != orig_reloc_type || exp.X_op != O_constant) - as_bad (_("expression must be constant")); - else - value = exp.X_add_number; - return (unsigned long) value; - } - - /* We potentially have a relocation. */ - reloc = nios2_insn_reloc_new (reloc_type, pcrel); - reloc->reloc_next = insn->insn_reloc; - insn->insn_reloc = reloc; - - /* Parse the expression string. */ - saved_line_ptr = input_line_pointer; - input_line_pointer = (char *) exprstr; - expression (&reloc->reloc_expression); - input_line_pointer = saved_line_ptr; - - /* This is redundant as the fixup will put this into - the instruction, but it is included here so that - self-test mode (-r) works. */ - if (nios2_mode == NIOS2_MODE_TEST - && reloc->reloc_expression.X_op == O_constant) - value = reloc->reloc_expression.X_add_number; - - return (unsigned long) value; -} - -/* Encode a 3-bit register number, giving an error if this is not possible. */ -static unsigned int -nios2_assemble_reg3 (const char *token) -{ - struct nios2_reg *reg = nios2_parse_reg (token, REG_3BIT); - int j; - - if (reg == NULL) - return 0; - - for (j = 0; j < nios2_num_r2_reg3_mappings; j++) - if (nios2_r2_reg3_mappings[j] == reg->index) - return j; - - /* Should never get here if we passed validation. */ - as_bad (_("invalid register %s"), token); - return 0; -} - -/* Argument assemble functions. */ - - -/* Control register index. */ -static void -nios2_assemble_arg_c (const char *token, nios2_insn_infoS *insn) -{ - struct nios2_reg *reg = nios2_parse_reg (token, REG_CONTROL); - const struct nios2_opcode *op = insn->insn_nios2_opcode; - - if (reg == NULL) - return; - - switch (op->format) - { - case iw_r_type: - insn->insn_code |= SET_IW_R_IMM5 (reg->index); - break; - case iw_F3X6L5_type: - insn->insn_code |= SET_IW_F3X6L5_IMM5 (reg->index); - break; - default: - bad_opcode (op); - } -} - -/* Destination register. */ -static void -nios2_assemble_arg_d (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned long regtype = REG_NORMAL; - struct nios2_reg *reg; - - if (op->format == iw_custom_type || op->format == iw_F3X8_type) - regtype |= REG_COPROCESSOR; - reg = nios2_parse_reg (token, regtype); - if (reg == NULL) - return; - - switch (op->format) - { - case iw_r_type: - insn->insn_code |= SET_IW_R_C (reg->index); - break; - case iw_custom_type: - insn->insn_code |= SET_IW_CUSTOM_C (reg->index); - if (reg->regtype & REG_COPROCESSOR) - insn->insn_code |= SET_IW_CUSTOM_READC (0); - else - insn->insn_code |= SET_IW_CUSTOM_READC (1); - break; - case iw_F3X6L5_type: - case iw_F3X6_type: - insn->insn_code |= SET_IW_F3X6L5_C (reg->index); - break; - case iw_F3X8_type: - insn->insn_code |= SET_IW_F3X8_C (reg->index); - if (reg->regtype & REG_COPROCESSOR) - insn->insn_code |= SET_IW_F3X8_READC (0); - else - insn->insn_code |= SET_IW_F3X8_READC (1); - break; - case iw_F2_type: - insn->insn_code |= SET_IW_F2_B (reg->index); - break; - default: - bad_opcode (op); - } -} - -/* Source register 1. */ -static void -nios2_assemble_arg_s (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned long regtype = REG_NORMAL; - struct nios2_reg *reg; - - if (op->format == iw_custom_type || op->format == iw_F3X8_type) - regtype |= REG_COPROCESSOR; - reg = nios2_parse_reg (token, regtype); - if (reg == NULL) - return; - - switch (op->format) - { - case iw_r_type: - if (op->match == MATCH_R1_JMP && reg->index == 31) - as_bad (_("r31 cannot be used with jmp; use ret instead")); - insn->insn_code |= SET_IW_R_A (reg->index); - break; - case iw_i_type: - insn->insn_code |= SET_IW_I_A (reg->index); - break; - case iw_custom_type: - insn->insn_code |= SET_IW_CUSTOM_A (reg->index); - if (reg->regtype & REG_COPROCESSOR) - insn->insn_code |= SET_IW_CUSTOM_READA (0); - else - insn->insn_code |= SET_IW_CUSTOM_READA (1); - break; - case iw_F2I16_type: - insn->insn_code |= SET_IW_F2I16_A (reg->index); - break; - case iw_F2X4I12_type: - insn->insn_code |= SET_IW_F2X4I12_A (reg->index); - break; - case iw_F1X4I12_type: - insn->insn_code |= SET_IW_F1X4I12_A (reg->index); - break; - case iw_F1X4L17_type: - insn->insn_code |= SET_IW_F1X4L17_A (reg->index); - break; - case iw_F3X6L5_type: - case iw_F3X6_type: - if (op->match == MATCH_R2_JMP && reg->index == 31) - as_bad (_("r31 cannot be used with jmp; use ret instead")); - insn->insn_code |= SET_IW_F3X6L5_A (reg->index); - break; - case iw_F2X6L10_type: - insn->insn_code |= SET_IW_F2X6L10_A (reg->index); - break; - case iw_F3X8_type: - insn->insn_code |= SET_IW_F3X8_A (reg->index); - if (reg->regtype & REG_COPROCESSOR) - insn->insn_code |= SET_IW_F3X8_READA (0); - else - insn->insn_code |= SET_IW_F3X8_READA (1); - break; - case iw_F1X1_type: - if (op->match == MATCH_R2_JMPR_N && reg->index == 31) - as_bad (_("r31 cannot be used with jmpr.n; use ret.n instead")); - insn->insn_code |= SET_IW_F1X1_A (reg->index); - break; - case iw_F1I5_type: - /* Implicit stack pointer reference. */ - if (reg->index != 27) - as_bad (_("invalid register %s"), token); - break; - case iw_F2_type: - insn->insn_code |= SET_IW_F2_A (reg->index); - break; - default: - bad_opcode (op); - } -} - -/* Source register 2. */ -static void -nios2_assemble_arg_t (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned long regtype = REG_NORMAL; - struct nios2_reg *reg; - - if (op->format == iw_custom_type || op->format == iw_F3X8_type) - regtype |= REG_COPROCESSOR; - reg = nios2_parse_reg (token, regtype); - if (reg == NULL) - return; - - switch (op->format) - { - case iw_r_type: - insn->insn_code |= SET_IW_R_B (reg->index); - break; - case iw_i_type: - insn->insn_code |= SET_IW_I_B (reg->index); - break; - case iw_custom_type: - insn->insn_code |= SET_IW_CUSTOM_B (reg->index); - if (reg->regtype & REG_COPROCESSOR) - insn->insn_code |= SET_IW_CUSTOM_READB (0); - else - insn->insn_code |= SET_IW_CUSTOM_READB (1); - break; - case iw_F2I16_type: - insn->insn_code |= SET_IW_F2I16_B (reg->index); - break; - case iw_F2X4I12_type: - insn->insn_code |= SET_IW_F2X4I12_B (reg->index); - break; - case iw_F3X6L5_type: - case iw_F3X6_type: - insn->insn_code |= SET_IW_F3X6L5_B (reg->index); - break; - case iw_F2X6L10_type: - insn->insn_code |= SET_IW_F2X6L10_B (reg->index); - break; - case iw_F3X8_type: - insn->insn_code |= SET_IW_F3X8_B (reg->index); - if (reg->regtype & REG_COPROCESSOR) - insn->insn_code |= SET_IW_F3X8_READB (0); - else - insn->insn_code |= SET_IW_F3X8_READB (1); - break; - case iw_F1I5_type: - insn->insn_code |= SET_IW_F1I5_B (reg->index); - break; - case iw_F2_type: - insn->insn_code |= SET_IW_F2_B (reg->index); - break; - case iw_T1X1I6_type: - /* Implicit zero register reference. */ - if (reg->index != 0) - as_bad (_("invalid register %s"), token); - break; - - default: - bad_opcode (op); - } -} - -/* Destination register w/3-bit encoding. */ -static void -nios2_assemble_arg_D (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - int reg = nios2_assemble_reg3 (token); - - switch (op->format) - { - case iw_T1I7_type: - insn->insn_code |= SET_IW_T1I7_A3 (reg); - break; - case iw_T2X1L3_type: - insn->insn_code |= SET_IW_T2X1L3_B3 (reg); - break; - case iw_T2X1I3_type: - insn->insn_code |= SET_IW_T2X1I3_B3 (reg); - break; - case iw_T3X1_type: - insn->insn_code |= SET_IW_T3X1_C3 (reg); - break; - case iw_T2X3_type: - /* Some instructions using this encoding take 3 register arguments, - requiring the destination register to be the same as the first - source register. */ - if (op->num_args == 3) - insn->insn_code |= SET_IW_T2X3_A3 (reg); - else - insn->insn_code |= SET_IW_T2X3_B3 (reg); - break; - default: - bad_opcode (op); - } -} - -/* Source register w/3-bit encoding. */ -static void -nios2_assemble_arg_S (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - int reg = nios2_assemble_reg3 (token); - - switch (op->format) - { - case iw_T1I7_type: - insn->insn_code |= SET_IW_T1I7_A3 (reg); - break; - case iw_T2I4_type: - insn->insn_code |= SET_IW_T2I4_A3 (reg); - break; - case iw_T2X1L3_type: - insn->insn_code |= SET_IW_T2X1L3_A3 (reg); - break; - case iw_T2X1I3_type: - insn->insn_code |= SET_IW_T2X1I3_A3 (reg); - break; - case iw_T3X1_type: - insn->insn_code |= SET_IW_T3X1_A3 (reg); - break; - case iw_T2X3_type: - /* Some instructions using this encoding take 3 register arguments, - requiring the destination register to be the same as the first - source register. */ - if (op->num_args == 3) - { - int dreg = GET_IW_T2X3_A3 (insn->insn_code); - if (dreg != reg) - as_bad ("source and destination registers must be the same"); - } - else - insn->insn_code |= SET_IW_T2X3_A3 (reg); - break; - case iw_T1X1I6_type: - insn->insn_code |= SET_IW_T1X1I6_A3 (reg); - break; - default: - bad_opcode (op); - } -} - -/* Source register 2 w/3-bit encoding. */ -static void -nios2_assemble_arg_T (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - int reg = nios2_assemble_reg3 (token); - - switch (op->format) - { - case iw_T2I4_type: - insn->insn_code |= SET_IW_T2I4_B3 (reg); - break; - case iw_T3X1_type: - insn->insn_code |= SET_IW_T3X1_B3 (reg); - break; - case iw_T2X3_type: - insn->insn_code |= SET_IW_T2X3_B3 (reg); - break; - default: - bad_opcode (op); - } -} - -/* 16-bit signed immediate. */ -static void -nios2_assemble_arg_i (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_i_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_S16, 0); - insn->constant_bits |= SET_IW_I_IMM16 (val); - break; - case iw_F2I16_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_S16, 0); - insn->constant_bits |= SET_IW_F2I16_IMM16 (val); - break; - default: - bad_opcode (op); - } -} - -/* 12-bit signed immediate. */ -static void -nios2_assemble_arg_I (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_F2X4I12_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_S12, 0); - insn->constant_bits |= SET_IW_F2X4I12_IMM12 (val); - break; - case iw_F1X4I12_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_S12, 0); - insn->constant_bits |= SET_IW_F2X4I12_IMM12 (val); - break; - default: - bad_opcode (op); - } -} - -/* 16-bit unsigned immediate. */ -static void -nios2_assemble_arg_u (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_i_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_U16, 0); - insn->constant_bits |= SET_IW_I_IMM16 (val); - break; - case iw_F2I16_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_U16, 0); - insn->constant_bits |= SET_IW_F2I16_IMM16 (val); - break; - default: - bad_opcode (op); - } -} - -/* 7-bit unsigned immediate with 2-bit shift. */ -static void -nios2_assemble_arg_U (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_T1I7_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_T1I7_2, 0); - insn->constant_bits |= SET_IW_T1I7_IMM7 (val >> 2); - break; - case iw_X1I7_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_X1I7_2, 0); - insn->constant_bits |= SET_IW_X1I7_IMM7 (val >> 2); - break; - default: - bad_opcode (op); - } -} - -/* 5-bit unsigned immediate with 2-bit shift. */ -static void -nios2_assemble_arg_V (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_F1I5_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_F1I5_2, 0); - insn->constant_bits |= SET_IW_F1I5_IMM5 (val >> 2); - break; - default: - bad_opcode (op); - } -} - -/* 4-bit unsigned immediate with 2-bit shift. */ -static void -nios2_assemble_arg_W (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_T2I4_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_T2I4_2, 0); - insn->constant_bits |= SET_IW_T2I4_IMM4 (val >> 2); - break; - case iw_L5I4X1_type: - /* This argument is optional for push.n/pop.n, and defaults to - zero if unspecified. */ - if (token == NULL) - return; - - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_L5I4X1, 0); - insn->constant_bits |= SET_IW_L5I4X1_IMM4 (val >> 2); - break; - default: - bad_opcode (op); - } -} - -/* 4-bit unsigned immediate with 1-bit shift. */ -static void -nios2_assemble_arg_X (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_T2I4_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_T2I4_1, 0); - insn->constant_bits |= SET_IW_T2I4_IMM4 (val >> 1); - break; - default: - bad_opcode (op); - } -} - -/* 4-bit unsigned immediate without shift. */ -static void -nios2_assemble_arg_Y (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_T2I4_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_T2I4, 0); - insn->constant_bits |= SET_IW_T2I4_IMM4 (val); - break; - default: - bad_opcode (op); - } -} - - -/* 16-bit signed immediate address offset. */ -static void -nios2_assemble_arg_o (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_i_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_16_PCREL, 1); - insn->constant_bits |= SET_IW_I_IMM16 (val); - break; - case iw_F2I16_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_16_PCREL, 1); - insn->constant_bits |= SET_IW_F2I16_IMM16 (val); - break; - default: - bad_opcode (op); - } -} - -/* 10-bit signed address offset with 1-bit shift. */ -static void -nios2_assemble_arg_O (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_I10_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_I10_1_PCREL, 1); - insn->constant_bits |= SET_IW_I10_IMM10 (val >> 1); - break; - default: - bad_opcode (op); - } -} - -/* 7-bit signed address offset with 1-bit shift. */ -static void -nios2_assemble_arg_P (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_T1I7_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_T1I7_1_PCREL, 1); - insn->constant_bits |= SET_IW_T1I7_IMM7 (val >> 1); - break; - default: - bad_opcode (op); - } -} - -/* 5-bit unsigned immediate. */ -static void -nios2_assemble_arg_j (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_r_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_IMM5, 0); - insn->constant_bits |= SET_IW_R_IMM5 (val); - break; - case iw_F3X6L5_type: - if (op->match == MATCH_R2_ENI) - /* Value must be constant 0 or 1. */ - { - val = nios2_assemble_expression (token, insn, BFD_RELOC_NONE, 0); - if (val != 0 && val != 1) - as_bad ("invalid eni argument %u", val); - insn->insn_code |= SET_IW_F3X6L5_IMM5 (val); - } - else - { - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_IMM5, 0); - insn->constant_bits |= SET_IW_F3X6L5_IMM5 (val); - } - break; - case iw_F2X6L10_type: - /* Only constant expression without relocation permitted for - bit position. */ - val = nios2_assemble_expression (token, insn, BFD_RELOC_NONE, 0); - if (val > 31) - as_bad ("invalid bit position %u", val); - insn->insn_code |= SET_IW_F2X6L10_MSB (val); - break; - case iw_X2L5_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_X2L5, 0); - insn->constant_bits |= SET_IW_X2L5_IMM5 (val); - break; - default: - bad_opcode (op); - } -} - -/* Second 5-bit unsigned immediate field. */ -static void -nios2_assemble_arg_k (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_F2X6L10_type: - /* Only constant expression without relocation permitted for - bit position. */ - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NONE, 0); - if (val > 31) - as_bad ("invalid bit position %u", val); - else if (GET_IW_F2X6L10_MSB (insn->insn_code) < val) - as_bad ("MSB must be greater than or equal to LSB"); - insn->insn_code |= SET_IW_F2X6L10_LSB (val); - break; - default: - bad_opcode (op); - } -} - -/* 8-bit unsigned immediate. */ -static void -nios2_assemble_arg_l (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_custom_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_IMM8, 0); - insn->constant_bits |= SET_IW_CUSTOM_N (val); - break; - case iw_F3X8_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_IMM8, 0); - insn->constant_bits |= SET_IW_F3X8_N (val); - break; - default: - bad_opcode (op); - } -} - -/* 26-bit unsigned immediate. */ -static void -nios2_assemble_arg_m (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_j_type: - val = nios2_assemble_expression (token, insn, - (nios2_as_options.noat - ? BFD_RELOC_NIOS2_CALL26_NOAT - : BFD_RELOC_NIOS2_CALL26), - 0); - insn->constant_bits |= SET_IW_J_IMM26 (val); - break; - case iw_L26_type: - val = nios2_assemble_expression (token, insn, - (nios2_as_options.noat - ? BFD_RELOC_NIOS2_CALL26_NOAT - : BFD_RELOC_NIOS2_CALL26), - 0); - insn->constant_bits |= SET_IW_L26_IMM26 (val); - break; - default: - bad_opcode (op); - } -} - -/* 6-bit unsigned immediate with no shifting. */ -static void -nios2_assemble_arg_M (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_T1X1I6_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_T1X1I6, 0); - insn->constant_bits |= SET_IW_T1X1I6_IMM6 (val); - break; - default: - bad_opcode (op); - } -} - -/* 6-bit unsigned immediate with 2-bit shift. */ -static void -nios2_assemble_arg_N (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - - switch (op->format) - { - case iw_T1X1I6_type: - val = nios2_assemble_expression (token, insn, - BFD_RELOC_NIOS2_R2_T1X1I6_2, 0); - insn->constant_bits |= SET_IW_T1X1I6_IMM6 (val >> 2); - break; - default: - bad_opcode (op); - } -} - - -/* Encoded enumeration for addi.n/subi.n. */ -static void -nios2_assemble_arg_e (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - int i; - - switch (op->format) - { - case iw_T2X1I3_type: - val = nios2_assemble_expression (token, insn, BFD_RELOC_NONE, 0); - for (i = 0; i < nios2_num_r2_asi_n_mappings; i++) - if (val == nios2_r2_asi_n_mappings[i]) - break; - if (i == nios2_num_r2_asi_n_mappings) - { - as_bad (_("Invalid constant operand %s"), token); - return; - } - insn->insn_code |= SET_IW_T2X1I3_IMM3 ((unsigned)i); - break; - default: - bad_opcode (op); - } -} - -/* Encoded enumeration for slli.n/srli.n. */ -static void -nios2_assemble_arg_f (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - int i; - - switch (op->format) - { - case iw_T2X1L3_type: - val = nios2_assemble_expression (token, insn, BFD_RELOC_NONE, 0); - for (i = 0; i < nios2_num_r2_shi_n_mappings; i++) - if (val == nios2_r2_shi_n_mappings[i]) - break; - if (i == nios2_num_r2_shi_n_mappings) - { - as_bad (_("Invalid constant operand %s"), token); - return; - } - insn->insn_code |= SET_IW_T2X1L3_SHAMT ((unsigned)i); - break; - default: - bad_opcode (op); - } -} - -/* Encoded enumeration for andi.n. */ -static void -nios2_assemble_arg_g (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - int i; - - switch (op->format) - { - case iw_T2I4_type: - val = nios2_assemble_expression (token, insn, BFD_RELOC_NONE, 0); - for (i = 0; i < nios2_num_r2_andi_n_mappings; i++) - if (val == nios2_r2_andi_n_mappings[i]) - break; - if (i == nios2_num_r2_andi_n_mappings) - { - as_bad (_("Invalid constant operand %s"), token); - return; - } - insn->insn_code |= SET_IW_T2I4_IMM4 ((unsigned)i); - break; - default: - bad_opcode (op); - } -} - -/* Encoded enumeration for movi.n. */ -static void -nios2_assemble_arg_h (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned int val; - int i; - - switch (op->format) - { - case iw_T1I7_type: - val = nios2_assemble_expression (token, insn, BFD_RELOC_NONE, 0); - i = (signed) val; - if ((signed) i == -1) - val = 127; - else if (i == -2) - val = 126; - else if (i == 0xff) - val = 125; - else if (i < 0 || i > 125) - { - as_bad (_("Invalid constant operand %s"), token); - return; - } - insn->insn_code |= SET_IW_T1I7_IMM7 (val); - break; - default: - bad_opcode (op); - } -} - -/* Encoded REGMASK for ldwm/stwm or push.n/pop.n. */ -static void -nios2_assemble_arg_R (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - unsigned long mask; - char *buf = strdup (token); - unsigned long reglist = nios2_parse_reglist (buf, op); - free (buf); - - if (reglist == 0) - return; - - switch (op->format) - { - case iw_F1X4L17_type: - /* Encoding for ldwm/stwm. */ - if (reglist & 0x00003ffc) - mask = reglist >> 2; - else - { - insn->insn_code |= SET_IW_F1X4L17_RS (1); - mask = (reglist & 0x00ffc000) >> 14; - if (reglist & (1 << 28)) - mask |= 1 << 10; - if (reglist & (1u << 31)) - mask |= 1 << 11; - } - insn->insn_code |= SET_IW_F1X4L17_REGMASK (mask); - break; - - case iw_L5I4X1_type: - /* Encoding for push.n/pop.n. */ - if (reglist & (1 << 28)) - insn->insn_code |= SET_IW_L5I4X1_FP (1); - mask = reglist & 0x00ff0000; - if (mask) - { - int i; - - for (i = 0; i < nios2_num_r2_reg_range_mappings; i++) - if (nios2_r2_reg_range_mappings[i] == mask) - break; - if (i == nios2_num_r2_reg_range_mappings) - { - as_bad ("invalid reglist"); - return; - } - insn->insn_code |= SET_IW_L5I4X1_REGRANGE (i); - insn->insn_code |= SET_IW_L5I4X1_CS (1); - } - break; - - default: - bad_opcode (op); - } -} - -/* Base register for ldwm/stwm. */ -static void -nios2_assemble_arg_B (const char *token, nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - int direction, writeback, ret; - char *str = strdup (token); - struct nios2_reg *reg - = nios2_parse_base_register (str, &direction, &writeback, &ret); - - free (str); - if (!reg) - return; - - switch (op->format) - { - case iw_F1X4L17_type: - /* For ldwm, check to see if the base register is already inside the - register list. */ - if (op->match == MATCH_R2_LDWM - && (nios2_reglist_mask & (1 << reg->index))) - { - as_bad ("invalid base register; %s is inside the reglist", reg->name); - return; - } - - /* For stwm, ret option is not allowed. */ - if (op->match == MATCH_R2_STWM && ret) - { - as_bad ("invalid option syntax"); - return; - } - - /* Check that the direction matches the ordering of the reglist. */ - if (nios2_reglist_dir && direction != nios2_reglist_dir) - { - as_bad ("reglist order does not match increment/decrement mode"); - return; - } - - insn->insn_code |= SET_IW_F1X4L17_A (reg->index); - if (direction > 0) - insn->insn_code |= SET_IW_F1X4L17_ID (1); - if (writeback) - insn->insn_code |= SET_IW_F1X4L17_WB (1); - if (ret) - insn->insn_code |= SET_IW_F1X4L17_PC (1); - break; - - default: - bad_opcode (op); - } -} - -static void -nios2_assemble_args (nios2_insn_infoS *insn) -{ - const struct nios2_opcode *op = insn->insn_nios2_opcode; - const char *argptr; - unsigned int tokidx, ntok; - - /* Make sure there are enough arguments. */ - ntok = (op->pinfo & NIOS2_INSN_OPTARG) ? op->num_args - 1 : op->num_args; - for (tokidx = 1; tokidx <= ntok; tokidx++) - if (insn->insn_tokens[tokidx] == NULL) - { - as_bad ("missing argument"); - return; - } - - for (argptr = op->args, tokidx = 1; - *argptr && insn->insn_tokens[tokidx]; - argptr++) - switch (*argptr) - { - case ',': - case '(': - case ')': - break; - - case 'c': - nios2_assemble_arg_c (insn->insn_tokens[tokidx++], insn); - break; - - case 'd': - nios2_assemble_arg_d (insn->insn_tokens[tokidx++], insn); - break; - - case 's': - nios2_assemble_arg_s (insn->insn_tokens[tokidx++], insn); - break; - - case 't': - nios2_assemble_arg_t (insn->insn_tokens[tokidx++], insn); - break; - - case 'D': - nios2_assemble_arg_D (insn->insn_tokens[tokidx++], insn); - break; - - case 'S': - nios2_assemble_arg_S (insn->insn_tokens[tokidx++], insn); - break; - - case 'T': - nios2_assemble_arg_T (insn->insn_tokens[tokidx++], insn); - break; - - case 'i': - nios2_assemble_arg_i (insn->insn_tokens[tokidx++], insn); - break; - - case 'I': - nios2_assemble_arg_I (insn->insn_tokens[tokidx++], insn); - break; - - case 'u': - nios2_assemble_arg_u (insn->insn_tokens[tokidx++], insn); - break; - - case 'U': - nios2_assemble_arg_U (insn->insn_tokens[tokidx++], insn); - break; - - case 'V': - nios2_assemble_arg_V (insn->insn_tokens[tokidx++], insn); - break; - - case 'W': - nios2_assemble_arg_W (insn->insn_tokens[tokidx++], insn); - break; - - case 'X': - nios2_assemble_arg_X (insn->insn_tokens[tokidx++], insn); - break; - - case 'Y': - nios2_assemble_arg_Y (insn->insn_tokens[tokidx++], insn); - break; - - case 'o': - nios2_assemble_arg_o (insn->insn_tokens[tokidx++], insn); - break; - - case 'O': - nios2_assemble_arg_O (insn->insn_tokens[tokidx++], insn); - break; - - case 'P': - nios2_assemble_arg_P (insn->insn_tokens[tokidx++], insn); - break; - - case 'j': - nios2_assemble_arg_j (insn->insn_tokens[tokidx++], insn); - break; - - case 'k': - nios2_assemble_arg_k (insn->insn_tokens[tokidx++], insn); - break; - - case 'l': - nios2_assemble_arg_l (insn->insn_tokens[tokidx++], insn); - break; - - case 'm': - nios2_assemble_arg_m (insn->insn_tokens[tokidx++], insn); - break; - - case 'M': - nios2_assemble_arg_M (insn->insn_tokens[tokidx++], insn); - break; - - case 'N': - nios2_assemble_arg_N (insn->insn_tokens[tokidx++], insn); - break; - - case 'e': - nios2_assemble_arg_e (insn->insn_tokens[tokidx++], insn); - break; - - case 'f': - nios2_assemble_arg_f (insn->insn_tokens[tokidx++], insn); - break; - - case 'g': - nios2_assemble_arg_g (insn->insn_tokens[tokidx++], insn); - break; - - case 'h': - nios2_assemble_arg_h (insn->insn_tokens[tokidx++], insn); - break; - - case 'R': - nios2_assemble_arg_R (insn->insn_tokens[tokidx++], insn); - break; - - case 'B': - nios2_assemble_arg_B (insn->insn_tokens[tokidx++], insn); - break; - - default: - bad_opcode (op); - break; - } - - /* Perform argument checking. */ - nios2_check_assembly (insn->insn_code | insn->constant_bits, - insn->insn_tokens[tokidx]); -} - - -/* The function consume_arg takes a pointer into a string - of instruction tokens (args) and a pointer into a string - representing the expected sequence of tokens and separators. - It checks whether the first argument in argstr is of the - expected type, throwing an error if it is not, and returns - the pointer argstr. */ -static char * -nios2_consume_arg (char *argstr, const char *parsestr) -{ - char *temp; - - switch (*parsestr) - { - case 'c': - case 'd': - case 's': - case 't': - case 'D': - case 'S': - case 'T': - break; - - case 'i': - case 'u': - if (*argstr == '%') - { - if (nios2_special_relocation_p (argstr)) - { - /* We zap the parentheses because we don't want them confused - with separators. */ - temp = strchr (argstr, '('); - if (temp != NULL) - *temp = ' '; - temp = strchr (argstr, ')'); - if (temp != NULL) - *temp = ' '; - } - else - as_bad (_("badly formed expression near %s"), argstr); - } - break; - case 'm': - case 'j': - case 'k': - case 'l': - case 'I': - case 'U': - case 'V': - case 'W': - case 'X': - case 'Y': - case 'O': - case 'P': - case 'e': - case 'f': - case 'g': - case 'h': - case 'M': - case 'N': - - /* We can't have %hi, %lo or %hiadj here. */ - if (*argstr == '%') - as_bad (_("badly formed expression near %s"), argstr); - break; - - case 'R': - /* Register list for ldwm/stwm or push.n/pop.n. Replace the commas - in the list with spaces so we don't confuse them with separators. */ - if (*argstr != '{') - { - as_bad ("missing '{' in register list"); - break; - } - for (temp = argstr + 1; *temp; temp++) - { - if (*temp == '}') - break; - else if (*temp == ',') - *temp = ' '; - } - if (!*temp) - { - as_bad ("missing '}' in register list"); - break; - } - break; - - case 'B': - /* Base register and options for ldwm/stwm. This is the final argument - and consumes the rest of the argument string; replace commas - with spaces so that the token splitter doesn't think they are - separate arguments. */ - for (temp = argstr; *temp; temp++) - if (*temp == ',') - *temp = ' '; - break; - - case 'o': - case 'E': - break; - default: - BAD_CASE (*parsestr); - break; - } - - return argstr; -} - -/* The function consume_separator takes a pointer into a string - of instruction tokens (args) and a pointer into a string representing - the expected sequence of tokens and separators. It finds the first - instance of the character pointed to by separator in argstr, and - returns a pointer to the next element of argstr, which is the - following token in the sequence. */ -static char * -nios2_consume_separator (char *argstr, const char *separator) -{ - char *p; - - /* If we have a opcode reg, expr(reg) type instruction, and - * we are separating the expr from the (reg), we find the last - * (, just in case the expression has parentheses. */ - - if (*separator == '(') - p = strrchr (argstr, *separator); - else - p = strchr (argstr, *separator); - - if (p != NULL) - *p++ = 0; - return p; -} - -/* The principal argument parsing function which takes a string argstr - representing the instruction arguments for insn, and extracts the argument - tokens matching parsestr into parsed_args. */ -static void -nios2_parse_args (nios2_insn_infoS *insn, char *argstr, - const char *parsestr, char **parsed_args) -{ - char *p; - char *end = NULL; - int i; - p = argstr; - i = 0; - bool terminate = false; - - /* This rest of this function is it too fragile and it mostly works, - therefore special case this one. */ - if (*parsestr == 0 && argstr != 0) - { - as_bad (_("too many arguments")); - parsed_args[0] = NULL; - return; - } - - while (p != NULL && !terminate && i < NIOS2_MAX_INSN_TOKENS) - { - parsed_args[i] = nios2_consume_arg (p, parsestr); - ++parsestr; - while (*parsestr == '(' || *parsestr == ')' || *parsestr == ',') - { - char *context = p; - p = nios2_consume_separator (p, parsestr); - /* Check for missing separators. */ - if (!p && !(insn->insn_nios2_opcode->pinfo & NIOS2_INSN_OPTARG)) - { - as_bad (_("expecting %c near %s"), *parsestr, context); - break; - } - ++parsestr; - } - - if (*parsestr == '\0') - { - /* Check that the argument string has no trailing arguments. */ - end = strpbrk (p, ","); - if (end != NULL) - as_bad (_("too many arguments")); - } - - if (*parsestr == '\0' || (p != NULL && *p == '\0')) - terminate = true; - ++i; - } - - parsed_args[i] = NULL; -} - - - -/** Support for pseudo-op parsing. These are macro-like opcodes that - expand into real insns by suitable fiddling with the operands. */ - -/* Append the string modifier to the string contained in the argument at - parsed_args[ndx]. */ -static void -nios2_modify_arg (char **parsed_args, const char *modifier, - int unused ATTRIBUTE_UNUSED, int ndx) -{ - char *tmp = parsed_args[ndx]; - - parsed_args[ndx] = concat (tmp, modifier, (char *) NULL); -} - -/* Modify parsed_args[ndx] by negating that argument. */ -static void -nios2_negate_arg (char **parsed_args, const char *modifier ATTRIBUTE_UNUSED, - int unused ATTRIBUTE_UNUSED, int ndx) -{ - char *tmp = parsed_args[ndx]; - - parsed_args[ndx] = concat ("~(", tmp, ")+1", (char *) NULL); -} - -/* The function nios2_swap_args swaps the pointers at indices index_1 and - index_2 in the array parsed_args[] - this is used for operand swapping - for comparison operations. */ -static void -nios2_swap_args (char **parsed_args, const char *unused ATTRIBUTE_UNUSED, - int index_1, int index_2) -{ - char *tmp; - gas_assert (index_1 < NIOS2_MAX_INSN_TOKENS - && index_2 < NIOS2_MAX_INSN_TOKENS); - tmp = parsed_args[index_1]; - parsed_args[index_1] = parsed_args[index_2]; - parsed_args[index_2] = tmp; -} - -/* This function appends the string appnd to the array of strings in - parsed_args num times starting at index start in the array. */ -static void -nios2_append_arg (char **parsed_args, const char *appnd, int num, - int start) -{ - int i, count; - char *tmp; - - gas_assert ((start + num) < NIOS2_MAX_INSN_TOKENS); - - if (nios2_mode == NIOS2_MODE_TEST) - tmp = parsed_args[start]; - else - tmp = NULL; - - for (i = start, count = num; count > 0; ++i, --count) - parsed_args[i] = (char *) appnd; - - gas_assert (i == (start + num)); - parsed_args[i] = tmp; - parsed_args[i + 1] = NULL; -} - -/* This function inserts the string insert num times in the array - parsed_args, starting at the index start. */ -static void -nios2_insert_arg (char **parsed_args, const char *insert, int num, - int start) -{ - int i, count; - - gas_assert ((start + num) < NIOS2_MAX_INSN_TOKENS); - - /* Move the existing arguments up to create space. */ - for (i = NIOS2_MAX_INSN_TOKENS; i - num >= start; --i) - parsed_args[i] = parsed_args[i - num]; - - for (i = start, count = num; count > 0; ++i, --count) - parsed_args[i] = (char *) insert; -} - -/* Cleanup function to free malloc'ed arg strings. */ -static void -nios2_free_arg (char **parsed_args, int num ATTRIBUTE_UNUSED, int start) -{ - free (parsed_args[start]); - parsed_args[start] = NULL; -} - -/* This function swaps the pseudo-op for a real op. */ -static nios2_ps_insn_infoS* -nios2_translate_pseudo_insn (nios2_insn_infoS *insn) -{ - - const struct nios2_opcode *op = insn->insn_nios2_opcode; - nios2_ps_insn_infoS *ps_insn; - unsigned int tokidx, ntok; - - /* Find which real insn the pseudo-op translates to and - switch the insn_info ptr to point to it. */ - ps_insn = nios2_ps_lookup (op->name); - - if (ps_insn != NULL) - { - insn->insn_nios2_opcode = nios2_opcode_lookup (ps_insn->insn); - insn->insn_tokens[0] = insn->insn_nios2_opcode->name; - - /* Make sure there are enough arguments. */ - ntok = ((op->pinfo & NIOS2_INSN_OPTARG) - ? op->num_args - 1 : op->num_args); - for (tokidx = 1; tokidx <= ntok; tokidx++) - if (insn->insn_tokens[tokidx] == NULL) - { - as_bad ("missing argument"); - return NULL; - } - - /* Modify the args so they work with the real insn. */ - ps_insn->arg_modifer_func ((char **) insn->insn_tokens, - ps_insn->arg_modifier, ps_insn->num, - ps_insn->index); - } - else - /* we cannot recover from this. */ - as_fatal (_("unrecognized pseudo-instruction %s"), - insn->insn_nios2_opcode->name); - return ps_insn; -} - -/* Invoke the cleanup handler for pseudo-insn ps_insn on insn. */ -static void -nios2_cleanup_pseudo_insn (nios2_insn_infoS *insn, - nios2_ps_insn_infoS *ps_insn) -{ - if (ps_insn->arg_cleanup_func) - (ps_insn->arg_cleanup_func) ((char **) insn->insn_tokens, - ps_insn->num, ps_insn->index); -} - -const nios2_ps_insn_infoS nios2_ps_insn_info_structs[] = { - /* pseudo-op, real-op, arg, arg_modifier_func, num, index, arg_cleanup_func */ - {"mov", "add", nios2_append_arg, "zero", 1, 3, NULL}, - {"movi", "addi", nios2_insert_arg, "zero", 1, 2, NULL}, - {"movhi", "orhi", nios2_insert_arg, "zero", 1, 2, NULL}, - {"movui", "ori", nios2_insert_arg, "zero", 1, 2, NULL}, - {"movia", "orhi", nios2_insert_arg, "zero", 1, 2, NULL}, - {"nop", "add", nios2_append_arg, "zero", 3, 1, NULL}, - {"bgt", "blt", nios2_swap_args, "", 1, 2, NULL}, - {"bgtu", "bltu", nios2_swap_args, "", 1, 2, NULL}, - {"ble", "bge", nios2_swap_args, "", 1, 2, NULL}, - {"bleu", "bgeu", nios2_swap_args, "", 1, 2, NULL}, - {"cmpgt", "cmplt", nios2_swap_args, "", 2, 3, NULL}, - {"cmpgtu", "cmpltu", nios2_swap_args, "", 2, 3, NULL}, - {"cmple", "cmpge", nios2_swap_args, "", 2, 3, NULL}, - {"cmpleu", "cmpgeu", nios2_swap_args, "", 2, 3, NULL}, - {"cmpgti", "cmpgei", nios2_modify_arg, "+1", 0, 3, nios2_free_arg}, - {"cmpgtui", "cmpgeui", nios2_modify_arg, "+1", 0, 3, nios2_free_arg}, - {"cmplei", "cmplti", nios2_modify_arg, "+1", 0, 3, nios2_free_arg}, - {"cmpleui", "cmpltui", nios2_modify_arg, "+1", 0, 3, nios2_free_arg}, - {"subi", "addi", nios2_negate_arg, "", 0, 3, nios2_free_arg}, - {"nop.n", "mov.n", nios2_append_arg, "zero", 2, 1, NULL} - /* Add further pseudo-ops here. */ -}; - -#define NIOS2_NUM_PSEUDO_INSNS \ - ((sizeof(nios2_ps_insn_info_structs)/ \ - sizeof(nios2_ps_insn_info_structs[0]))) -const int nios2_num_ps_insn_info_structs = NIOS2_NUM_PSEUDO_INSNS; - - -/** Assembler output support. */ - -/* Output a normal instruction. */ -static void -output_insn (nios2_insn_infoS *insn) -{ - char *f; - nios2_insn_relocS *reloc; - f = frag_more (insn->insn_nios2_opcode->size); - /* This allocates enough space for the instruction - and puts it in the current frag. */ - md_number_to_chars (f, insn->insn_code, insn->insn_nios2_opcode->size); - /* Emit debug info. */ - dwarf2_emit_insn (insn->insn_nios2_opcode->size); - /* Create any fixups to be acted on later. */ - - for (reloc = insn->insn_reloc; reloc != NULL; reloc = reloc->reloc_next) - fix_new_exp (frag_now, f - frag_now->fr_literal, - insn->insn_nios2_opcode->size, - &reloc->reloc_expression, reloc->reloc_pcrel, - reloc->reloc_type); -} - -/* Output an unconditional branch. */ -static void -output_ubranch (nios2_insn_infoS *insn) -{ - nios2_insn_relocS *reloc = insn->insn_reloc; - - /* If the reloc is NULL, there was an error assembling the branch. */ - if (reloc != NULL) - { - symbolS *symp = reloc->reloc_expression.X_add_symbol; - offsetT offset = reloc->reloc_expression.X_add_number; - char *f; - bool is_cdx = (insn->insn_nios2_opcode->size == 2); - - /* Tag dwarf2 debug info to the address at the start of the insn. - We must do it before frag_var() below closes off the frag. */ - dwarf2_emit_insn (0); - - /* We create a machine dependent frag which can grow - to accommodate the largest possible instruction sequence - this may generate. */ - f = frag_var (rs_machine_dependent, - UBRANCH_MAX_SIZE, insn->insn_nios2_opcode->size, - (is_cdx ? CDX_UBRANCH_SUBTYPE (0) : UBRANCH_SUBTYPE (0)), - symp, offset, NULL); - - md_number_to_chars (f, insn->insn_code, insn->insn_nios2_opcode->size); - - /* We leave fixup generation to md_convert_frag. */ - } -} - -/* Output a conditional branch. */ -static void -output_cbranch (nios2_insn_infoS *insn) -{ - nios2_insn_relocS *reloc = insn->insn_reloc; - - /* If the reloc is NULL, there was an error assembling the branch. */ - if (reloc != NULL) - { - symbolS *symp = reloc->reloc_expression.X_add_symbol; - offsetT offset = reloc->reloc_expression.X_add_number; - char *f; - bool is_cdx = (insn->insn_nios2_opcode->size == 2); - - /* Tag dwarf2 debug info to the address at the start of the insn. - We must do it before frag_var() below closes off the frag. */ - dwarf2_emit_insn (0); - - /* We create a machine dependent frag which can grow - to accommodate the largest possible instruction sequence - this may generate. */ - f = frag_var (rs_machine_dependent, - CBRANCH_MAX_SIZE, insn->insn_nios2_opcode->size, - (is_cdx ? CDX_CBRANCH_SUBTYPE (0) : CBRANCH_SUBTYPE (0)), - symp, offset, NULL); - - md_number_to_chars (f, insn->insn_code, insn->insn_nios2_opcode->size); - - /* We leave fixup generation to md_convert_frag. */ - } -} - -/* Output a call sequence. Since calls are not pc-relative for NIOS2, - but are page-relative, we cannot tell at any stage in assembly - whether a call will be out of range since a section may be linked - at any address. So if we are relaxing, we convert all call instructions - to long call sequences, and rely on the linker to relax them back to - short calls. */ -static void -output_call (nios2_insn_infoS *insn) -{ - /* This allocates enough space for the instruction - and puts it in the current frag. */ - char *f = frag_more (12); - nios2_insn_relocS *reloc = insn->insn_reloc; - const struct nios2_opcode *op = insn->insn_nios2_opcode; - - switch (op->format) - { - case iw_j_type: - md_number_to_chars (f, - (MATCH_R1_ORHI | SET_IW_I_B (AT_REGNUM) - | SET_IW_I_A (0)), - 4); - dwarf2_emit_insn (4); - fix_new_exp (frag_now, f - frag_now->fr_literal, 4, - &reloc->reloc_expression, 0, BFD_RELOC_NIOS2_HI16); - md_number_to_chars (f + 4, - (MATCH_R1_ORI | SET_IW_I_B (AT_REGNUM) - | SET_IW_I_A (AT_REGNUM)), - 4); - dwarf2_emit_insn (4); - fix_new_exp (frag_now, f - frag_now->fr_literal + 4, 4, - &reloc->reloc_expression, 0, BFD_RELOC_NIOS2_LO16); - md_number_to_chars (f + 8, MATCH_R1_CALLR | SET_IW_R_A (AT_REGNUM), 4); - dwarf2_emit_insn (4); - break; - case iw_L26_type: - md_number_to_chars (f, - (MATCH_R2_ORHI | SET_IW_F2I16_B (AT_REGNUM) - | SET_IW_F2I16_A (0)), - 4); - dwarf2_emit_insn (4); - fix_new_exp (frag_now, f - frag_now->fr_literal, 4, - &reloc->reloc_expression, 0, BFD_RELOC_NIOS2_HI16); - md_number_to_chars (f + 4, - (MATCH_R2_ORI | SET_IW_F2I16_B (AT_REGNUM) - | SET_IW_F2I16_A (AT_REGNUM)), - 4); - dwarf2_emit_insn (4); - fix_new_exp (frag_now, f - frag_now->fr_literal + 4, 4, - &reloc->reloc_expression, 0, BFD_RELOC_NIOS2_LO16); - md_number_to_chars (f + 8, MATCH_R2_CALLR | SET_IW_F3X6L5_A (AT_REGNUM), - 4); - dwarf2_emit_insn (4); - break; - default: - bad_opcode (op); - } -} - -/* Output a movhi/addi pair for the movia pseudo-op. */ -static void -output_movia (nios2_insn_infoS *insn) -{ - /* This allocates enough space for the instruction - and puts it in the current frag. */ - char *f = frag_more (8); - nios2_insn_relocS *reloc = insn->insn_reloc; - unsigned long reg, code = 0; - const struct nios2_opcode *op = insn->insn_nios2_opcode; - - /* If the reloc is NULL, there was an error assembling the movia. */ - if (reloc != NULL) - { - switch (op->format) - { - case iw_i_type: - reg = GET_IW_I_B (insn->insn_code); - code = MATCH_R1_ADDI | SET_IW_I_A (reg) | SET_IW_I_B (reg); - break; - case iw_F2I16_type: - reg = GET_IW_F2I16_B (insn->insn_code); - code = MATCH_R2_ADDI | SET_IW_F2I16_A (reg) | SET_IW_F2I16_B (reg); - break; - default: - bad_opcode (op); - } - - md_number_to_chars (f, insn->insn_code, 4); - dwarf2_emit_insn (4); - fix_new (frag_now, f - frag_now->fr_literal, 4, - reloc->reloc_expression.X_add_symbol, - reloc->reloc_expression.X_add_number, 0, - BFD_RELOC_NIOS2_HIADJ16); - md_number_to_chars (f + 4, code, 4); - dwarf2_emit_insn (4); - fix_new (frag_now, f + 4 - frag_now->fr_literal, 4, - reloc->reloc_expression.X_add_symbol, - reloc->reloc_expression.X_add_number, 0, BFD_RELOC_NIOS2_LO16); - } -} - - - -/** External interfaces. */ - -/* Update the selected architecture based on ARCH, giving an error if - ARCH is an invalid value. */ - -static void -nios2_use_arch (const char *arch) -{ - if (strcmp (arch, "nios2") == 0 || strcmp (arch, "r1") == 0) - { - nios2_architecture |= EF_NIOS2_ARCH_R1; - nios2_opcodes = (struct nios2_opcode *) nios2_r1_opcodes; - nios2_num_opcodes = nios2_num_r1_opcodes; - nop32 = nop_r1; - nop16 = NULL; - return; - } - else if (strcmp (arch, "r2") == 0) - { - nios2_architecture |= EF_NIOS2_ARCH_R2; - nios2_opcodes = (struct nios2_opcode *) nios2_r2_opcodes; - nios2_num_opcodes = nios2_num_r2_opcodes; - nop32 = nop_r2; - nop16 = nop_r2_cdx; - return; - } - - as_bad (_("unknown architecture '%s'"), arch); -} - -/* The following functions are called by machine-independent parts of - the assembler. */ -int -md_parse_option (int c, const char *arg ATTRIBUTE_UNUSED) -{ - switch (c) - { - case 'r': - /* Hidden option for self-test mode. */ - nios2_mode = NIOS2_MODE_TEST; - break; - case OPTION_RELAX_ALL: - nios2_as_options.relax = relax_all; - break; - case OPTION_NORELAX: - nios2_as_options.relax = relax_none; - break; - case OPTION_RELAX_SECTION: - nios2_as_options.relax = relax_section; - break; - case OPTION_EB: - target_big_endian = 1; - break; - case OPTION_EL: - target_big_endian = 0; - break; - case OPTION_MARCH: - nios2_use_arch (arg); - break; - default: - return 0; - break; - } - - return 1; -} - -/* Implement TARGET_FORMAT. We can choose to be big-endian or - little-endian at runtime based on a switch. */ -const char * -nios2_target_format (void) -{ - return target_big_endian ? "elf32-bignios2" : "elf32-littlenios2"; -} - -/* Machine-dependent usage message. */ -void -md_show_usage (FILE *stream) -{ - fprintf (stream, " NIOS2 options:\n" - " -relax-all replace all branch and call " - "instructions with jmp and callr sequences\n" - " -relax-section replace identified out of range " - "branches with jmp sequences (default)\n" - " -no-relax do not replace any branches or calls\n" - " -EB force big-endian byte ordering\n" - " -EL force little-endian byte ordering\n" - " -march=ARCH enable instructions from architecture ARCH\n"); -} - - -/* This function is called once, at assembler startup time. - It should set up all the tables, etc. that the MD part of the - assembler will need. */ -void -md_begin (void) -{ - int i; - - switch (nios2_architecture) - { - default: - case EF_NIOS2_ARCH_R1: - bfd_default_set_arch_mach (stdoutput, bfd_arch_nios2, bfd_mach_nios2r1); - break; - case EF_NIOS2_ARCH_R2: - if (target_big_endian) - as_fatal (_("Big-endian R2 is not supported.")); - bfd_default_set_arch_mach (stdoutput, bfd_arch_nios2, bfd_mach_nios2r2); - break; - } - - /* Create and fill a hashtable for the Nios II opcodes, registers and - arguments. */ - nios2_opcode_hash = str_htab_create (); - nios2_reg_hash = str_htab_create (); - nios2_ps_hash = str_htab_create (); - - for (i = 0; i < nios2_num_opcodes; ++i) - if (str_hash_insert (nios2_opcode_hash, nios2_opcodes[i].name, - &nios2_opcodes[i], 0) != NULL) - as_fatal (_("duplicate %s"), nios2_opcodes[i].name); - - for (i = 0; i < nios2_num_regs; ++i) - if (str_hash_insert (nios2_reg_hash, nios2_regs[i].name, - &nios2_regs[i], 0) != NULL) - as_fatal (_("duplicate %s"), nios2_regs[i].name); - - for (i = 0; i < nios2_num_ps_insn_info_structs; ++i) - if (str_hash_insert (nios2_ps_hash, - nios2_ps_insn_info_structs[i].pseudo_insn, - &nios2_ps_insn_info_structs[i], 0) != NULL) - as_fatal (_("duplicate %s"), nios2_ps_insn_info_structs[i].pseudo_insn); - - /* Assembler option defaults. */ - nios2_as_options.noat = false; - nios2_as_options.nobreak = false; - - /* Initialize the alignment data. */ - nios2_current_align_seg = now_seg; - nios2_last_label = NULL; - nios2_current_align = 0; - nios2_min_align = 2; -} - - -/* Assembles a single line of Nios II assembly language. */ -void -md_assemble (char *op_str) -{ - char *argstr; - char *op_strdup = NULL; - unsigned long saved_pinfo = 0; - nios2_insn_infoS thisinsn; - nios2_insn_infoS *insn = &thisinsn; - bool ps_error = false; - - /* Make sure we are aligned on an appropriate boundary. */ - if (nios2_current_align < nios2_min_align) - nios2_align (nios2_min_align, NULL, nios2_last_label); - else if (nios2_current_align > nios2_min_align) - nios2_current_align = nios2_min_align; - nios2_last_label = NULL; - - /* We don't want to clobber to op_str - because we want to be able to use it in messages. */ - op_strdup = strdup (op_str); - insn->insn_tokens[0] = strtok (op_strdup, " "); - argstr = strtok (NULL, ""); - - /* Assemble the opcode. */ - insn->insn_nios2_opcode = nios2_opcode_lookup (insn->insn_tokens[0]); - insn->insn_reloc = NULL; - - if (insn->insn_nios2_opcode != NULL) - { - nios2_ps_insn_infoS *ps_insn = NULL; - - /* Note if we've seen a 16-bit instruction. */ - if (insn->insn_nios2_opcode->size == 2) - nios2_min_align = 1; - - /* Set the opcode for the instruction. */ - insn->insn_code = insn->insn_nios2_opcode->match; - insn->constant_bits = 0; - - /* Parse the arguments pointed to by argstr. */ - if (nios2_mode == NIOS2_MODE_ASSEMBLE) - nios2_parse_args (insn, argstr, insn->insn_nios2_opcode->args, - (char **) &insn->insn_tokens[1]); - else - nios2_parse_args (insn, argstr, insn->insn_nios2_opcode->args_test, - (char **) &insn->insn_tokens[1]); - - /* We need to preserve the MOVIA macro as this is clobbered by - translate_pseudo_insn. */ - if (insn->insn_nios2_opcode->pinfo == NIOS2_INSN_MACRO_MOVIA) - saved_pinfo = NIOS2_INSN_MACRO_MOVIA; - /* If the instruction is an pseudo-instruction, we want to replace it - with its real equivalent, and then continue. */ - if ((insn->insn_nios2_opcode->pinfo & NIOS2_INSN_MACRO) - == NIOS2_INSN_MACRO) - { - ps_insn = nios2_translate_pseudo_insn (insn); - if (!ps_insn) - ps_error = true; - } - - /* If we found invalid pseudo-instruction syntax, the error's already - been diagnosed in nios2_translate_pseudo_insn, so skip - remaining processing. */ - if (!ps_error) - { - /* Assemble the parsed arguments into the instruction word. */ - nios2_assemble_args (insn); - - /* Handle relaxation and other transformations. */ - if (nios2_as_options.relax != relax_none - && !nios2_as_options.noat - && insn->insn_nios2_opcode->pinfo & NIOS2_INSN_UBRANCH) - output_ubranch (insn); - else if (nios2_as_options.relax != relax_none - && !nios2_as_options.noat - && insn->insn_nios2_opcode->pinfo & NIOS2_INSN_CBRANCH) - output_cbranch (insn); - else if (nios2_as_options.relax == relax_all - && !nios2_as_options.noat - && insn->insn_nios2_opcode->pinfo & NIOS2_INSN_CALL - && insn->insn_reloc - && ((insn->insn_reloc->reloc_type - == BFD_RELOC_NIOS2_CALL26) - || (insn->insn_reloc->reloc_type - == BFD_RELOC_NIOS2_CALL26_NOAT))) - output_call (insn); - else if (saved_pinfo == NIOS2_INSN_MACRO_MOVIA) - output_movia (insn); - else - output_insn (insn); - if (ps_insn) - nios2_cleanup_pseudo_insn (insn, ps_insn); - } - } - else - /* Unrecognised instruction - error. */ - as_bad (_("unrecognised instruction %s"), insn->insn_tokens[0]); - - /* Don't leak memory. */ - free (op_strdup); -} - -/* Round up section size. */ -valueT -md_section_align (asection *seg ATTRIBUTE_UNUSED, valueT size) -{ - /* I think byte alignment is fine here. */ - return size; -} - -/* Implement TC_FORCE_RELOCATION. */ -int -nios2_force_relocation (fixS *fixp) -{ - if (fixp->fx_r_type == BFD_RELOC_VTABLE_INHERIT - || fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY - || fixp->fx_r_type == BFD_RELOC_NIOS2_ALIGN) - return 1; - - return generic_force_reloc (fixp); -} - -/* Implement tc_fix_adjustable. */ -int -nios2_fix_adjustable (fixS *fixp) -{ - if (fixp->fx_addsy == NULL) - return 1; - -#ifdef OBJ_ELF - /* Prevent all adjustments to global symbols. */ - if (OUTPUT_FLAVOR == bfd_target_elf_flavour - && (S_IS_EXTERNAL (fixp->fx_addsy) || S_IS_WEAK (fixp->fx_addsy))) - return 0; -#endif - if (fixp->fx_r_type == BFD_RELOC_VTABLE_INHERIT - || fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY) - return 0; - - /* Preserve relocations against symbols with function type. */ - if (symbol_get_bfdsym (fixp->fx_addsy)->flags & BSF_FUNCTION) - return 0; - - /* Don't allow symbols to be discarded on GOT related relocs. */ - if (fixp->fx_r_type == BFD_RELOC_NIOS2_GOT16 - || fixp->fx_r_type == BFD_RELOC_NIOS2_CALL16 - || fixp->fx_r_type == BFD_RELOC_NIOS2_GOTOFF_LO - || fixp->fx_r_type == BFD_RELOC_NIOS2_GOTOFF_HA - || fixp->fx_r_type == BFD_RELOC_NIOS2_TLS_GD16 - || fixp->fx_r_type == BFD_RELOC_NIOS2_TLS_LDM16 - || fixp->fx_r_type == BFD_RELOC_NIOS2_TLS_LDO16 - || fixp->fx_r_type == BFD_RELOC_NIOS2_TLS_IE16 - || fixp->fx_r_type == BFD_RELOC_NIOS2_TLS_LE16 - || fixp->fx_r_type == BFD_RELOC_NIOS2_TLS_DTPMOD - || fixp->fx_r_type == BFD_RELOC_NIOS2_TLS_DTPREL - || fixp->fx_r_type == BFD_RELOC_NIOS2_TLS_TPREL - || fixp->fx_r_type == BFD_RELOC_NIOS2_GOTOFF - || fixp->fx_r_type == BFD_RELOC_NIOS2_GOT_LO - || fixp->fx_r_type == BFD_RELOC_NIOS2_GOT_HA - || fixp->fx_r_type == BFD_RELOC_NIOS2_CALL_LO - || fixp->fx_r_type == BFD_RELOC_NIOS2_CALL_HA - ) - return 0; - - return 1; -} - -/* Implement tc_frob_symbol. This is called in adjust_reloc_syms; - it is used to remove *ABS* references from the symbol table. */ -int -nios2_frob_symbol (symbolS *symp) -{ - if ((OUTPUT_FLAVOR == bfd_target_elf_flavour - && symp == section_symbol (absolute_section)) - || !S_IS_DEFINED (symp)) - return 1; - else - return 0; -} - -/* The function tc_gen_reloc creates a relocation structure for the - fixup fixp, and returns a pointer to it. This structure is passed - to bfd_install_relocation so that it can be written to the object - file for linking. */ -arelent * -tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp) -{ - arelent *reloc = XNEW (arelent); - reloc->sym_ptr_ptr = XNEW (asymbol *); - *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); - - reloc->address = fixp->fx_frag->fr_address + fixp->fx_where; - reloc->addend = fixp->fx_offset; /* fixp->fx_addnumber; */ - - if (fixp->fx_pcrel) - { - switch (fixp->fx_r_type) - { - case BFD_RELOC_16: - fixp->fx_r_type = BFD_RELOC_16_PCREL; - break; - case BFD_RELOC_NIOS2_LO16: - fixp->fx_r_type = BFD_RELOC_NIOS2_PCREL_LO; - break; - case BFD_RELOC_NIOS2_HIADJ16: - fixp->fx_r_type = BFD_RELOC_NIOS2_PCREL_HA; - break; - default: - break; - } - } - - reloc->howto = bfd_reloc_type_lookup (stdoutput, fixp->fx_r_type); - if (reloc->howto == NULL) - { - as_bad_where (fixp->fx_file, fixp->fx_line, - _("can't represent relocation type %s"), - bfd_get_reloc_code_name (fixp->fx_r_type)); - - /* Set howto to a garbage value so that we can keep going. */ - reloc->howto = bfd_reloc_type_lookup (stdoutput, BFD_RELOC_32); - gas_assert (reloc->howto != NULL); - } - return reloc; -} - -long -md_pcrel_from (fixS *fixP ATTRIBUTE_UNUSED) -{ - return 0; -} - -/* Called just before the assembler exits. */ -void -md_end (void) -{ - /* FIXME - not yet implemented */ -} - -/* Under ELF we need to default _GLOBAL_OFFSET_TABLE. - Otherwise we have no need to default values of symbols. */ -symbolS * -md_undefined_symbol (char *name ATTRIBUTE_UNUSED) -{ -#ifdef OBJ_ELF - if (name[0] == '_' && name[1] == 'G' - && strcmp (name, GLOBAL_OFFSET_TABLE_NAME) == 0) - { - if (!GOT_symbol) - { - if (symbol_find (name)) - as_bad ("GOT already in the symbol table"); - - GOT_symbol = symbol_new (name, undefined_section, - &zero_address_frag, 0); - } - - return GOT_symbol; - } -#endif - - return 0; -} - -/* Implement tc_frob_label. */ -void -nios2_frob_label (symbolS *lab) -{ - /* Emit dwarf information. */ - dwarf2_emit_label (lab); - - /* Update the label's address with the current output pointer. */ - symbol_set_frag (lab, frag_now); - S_SET_VALUE (lab, (valueT) frag_now_fix ()); - - /* Record this label for future adjustment after we find out what - kind of data it references, and the required alignment therewith. */ - nios2_last_label = lab; -} - -/* Implement md_cons_align. */ -void -nios2_cons_align (int size) -{ - int log_size = 0; - const char *pfill = NULL; - - while ((size >>= 1) != 0) - ++log_size; - - if (subseg_text_p (now_seg)) - pfill = (const char *) nop32; - else - pfill = NULL; - - if (nios2_auto_align_on) - nios2_align (log_size, pfill, NULL); - - nios2_last_label = NULL; -} - -/* Map 's' to SHF_NIOS2_GPREL. */ -/* This is from the Alpha code tc-alpha.c. */ -int -nios2_elf_section_letter (int letter, const char **ptr_msg) -{ - if (letter == 's') - return SHF_NIOS2_GPREL; - - *ptr_msg = _("Bad .section directive: want a,s,w,x,M,S,G,T in string"); - return -1; -} - -/* Map SHF_ALPHA_GPREL to SEC_SMALL_DATA. */ -/* This is from the Alpha code tc-alpha.c. */ -flagword -nios2_elf_section_flags (flagword flags, int attr, int type ATTRIBUTE_UNUSED) -{ - if (attr & SHF_NIOS2_GPREL) - flags |= SEC_SMALL_DATA; - return flags; -} - -/* Implement TC_PARSE_CONS_EXPRESSION to handle %tls_ldo(...) and - %gotoff(...). */ -bfd_reloc_code_real_type -nios2_cons (expressionS *exp, int size) -{ - bfd_reloc_code_real_type explicit_reloc = BFD_RELOC_NONE; - const char *reloc_name = NULL; - - SKIP_WHITESPACE (); - if (input_line_pointer[0] == '%') - { - if (startswith (input_line_pointer + 1, "tls_ldo")) - { - reloc_name = "%tls_ldo"; - if (size != 4) - as_bad (_("Illegal operands: %%tls_ldo in %d-byte data field"), - size); - else - { - input_line_pointer += 8; - explicit_reloc = BFD_RELOC_NIOS2_TLS_DTPREL; - } - } - else if (startswith (input_line_pointer + 1, "gotoff")) - { - reloc_name = "%gotoff"; - if (size != 4) - as_bad (_("Illegal operands: %%gotoff in %d-byte data field"), - size); - else - { - input_line_pointer += 7; - explicit_reloc = BFD_RELOC_NIOS2_GOTOFF; - } - } - - if (explicit_reloc != BFD_RELOC_NONE) - { - SKIP_WHITESPACE (); - if (input_line_pointer[0] != '(') - as_bad (_("Illegal operands: %s requires arguments in ()"), - reloc_name); - else - { - int c; - char *end = ++input_line_pointer; - int npar = 0; - - for (c = *end; !is_end_of_line[c]; end++, c = *end) - if (c == '(') - npar++; - else if (c == ')') - { - if (!npar) - break; - npar--; - } - - if (c != ')') - as_bad (_("Illegal operands: %s requires arguments in ()"), - reloc_name); - else - { - *end = '\0'; - expression (exp); - *end = c; - if (input_line_pointer != end) - as_bad (_("Illegal operands: %s requires arguments in ()"), - reloc_name); - else - { - input_line_pointer++; - SKIP_WHITESPACE (); - c = *input_line_pointer; - if (! is_end_of_line[c] && c != ',') - as_bad (_("Illegal operands: garbage after %s()"), - reloc_name); - } - } - } - } - } - if (explicit_reloc == BFD_RELOC_NONE) - expression (exp); - return explicit_reloc; -} - -/* Implement HANDLE_ALIGN. */ -void -nios2_handle_align (fragS *fragp) -{ - /* If we are expecting to relax in the linker, then we must output a - relocation to tell the linker we are aligning code. */ - if (nios2_as_options.relax == relax_all - && (fragp->fr_type == rs_align || fragp->fr_type == rs_align_code) - && fragp->fr_address + fragp->fr_fix > 0 - && fragp->fr_offset > 1 - && now_seg != bss_section) - fix_new (fragp, fragp->fr_fix, 0, &abs_symbol, fragp->fr_offset, 0, - BFD_RELOC_NIOS2_ALIGN); -} - -/* Implement tc_regname_to_dw2regnum, to convert REGNAME to a DWARF-2 - register number. */ -int -nios2_regname_to_dw2regnum (char *regname) -{ - struct nios2_reg *r = nios2_reg_lookup (regname); - if (r == NULL) - return -1; - return r->index; -} - -/* Implement tc_cfi_frame_initial_instructions, to initialize the DWARF-2 - unwind information for this procedure. */ -void -nios2_frame_initial_instructions (void) -{ - cfi_add_CFA_def_cfa (27, 0); -} - -#ifdef OBJ_ELF -/* Some special processing for a Nios II ELF file. */ - -void -nios2_elf_final_processing (void) -{ - elf_elfheader (stdoutput)->e_flags = nios2_architecture; -} -#endif diff --git a/gas/config/tc-nios2.h b/gas/config/tc-nios2.h deleted file mode 100644 index bc78d55cf6d..00000000000 --- a/gas/config/tc-nios2.h +++ /dev/null @@ -1,132 +0,0 @@ -/* Definitions for Altera Nios II assembler. - Copyright (C) 2012-2024 Free Software Foundation, Inc. - Contributed by Nigel Gray (ngray@altera.com). - Contributed by Mentor Graphics, Inc. - - This file is part of GAS, the GNU Assembler. - - GAS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - GAS 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GAS; see the file COPYING. If not, write to the Free - Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA - 02110-1301, USA. */ - -#ifndef TC_NIOS2 -#define TC_NIOS2 - -/* If unspecified, default to little endian. We can explicitly specify - * a big-endian default by configuring with --target=nios2eb-elf. We - * can override the default with the -EB and -EL options. */ -#ifndef TARGET_BYTES_BIG_ENDIAN -#define TARGET_BYTES_BIG_ENDIAN 0 -#endif - -/* Words are big enough to hold addresses. */ -#define WORKING_DOT_WORD 1 - -#ifdef OBJ_ELF -extern const char *nios2_target_format (void); -#define TARGET_FORMAT nios2_target_format () -#define TARGET_ARCH bfd_arch_nios2 -#endif - -/* A NIOS2 instruction consists of tokens and separator characters - the tokens are things like the instruction name (add, or jmp etc), - the register indices ($5, $7 etc), and constant expressions. The - separator characters are commas, brackets and space. - The instruction name is always separated from other tokens by a space - The maximum number of tokens in an instruction is 5 (the instruction name, - 3 arguments, and a 4th string representing the expected instruct in opcode - after assembly. The latter is only used when the assemble is running in - self test mode, otherwise its presence will generate an error. */ -#define NIOS2_MAX_INSN_TOKENS 6 - -/* There are no machine-specific operands so we #define this to nothing. */ -#define md_operand(x) - -/* Function prototypes exported to rest of GAS. */ -extern void md_assemble (char *op_str); -extern void md_end (void); -extern void md_begin (void); - -#define TC_FORCE_RELOCATION(fixp) nios2_force_relocation (fixp) -extern int nios2_force_relocation (struct fix *); - -#define tc_fix_adjustable(fixp) nios2_fix_adjustable (fixp) -extern int nios2_fix_adjustable (struct fix *); - -#define tc_frob_label(lab) nios2_frob_label (lab) -extern void nios2_frob_label (symbolS *); - -#define tc_frob_symbol(symp, punt) punt = nios2_frob_symbol (symp) ? 1 : punt -extern int nios2_frob_symbol (symbolS * symp); - -#define md_cons_align(nbytes) nios2_cons_align (nbytes) -extern void nios2_cons_align (int); - -extern void md_convert_frag (bfd * headers, segT sec, fragS * fragP); - -/* When relaxing, we need to generate relocations for alignment - directives. */ -#define HANDLE_ALIGN(frag) nios2_handle_align (frag) -extern void nios2_handle_align (fragS *); - -#define md_relax_frag nios2_relax_frag -extern long nios2_relax_frag (segT segment, fragS * fragP, long stretch); - -#ifdef OBJ_ELF -#define ELF_TC_SPECIAL_SECTIONS \ - { ".sdata", SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_NIOS2_GPREL }, \ - { ".sbss", SHT_NOBITS, SHF_ALLOC + SHF_WRITE + SHF_NIOS2_GPREL }, \ - { ".lit4", SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_NIOS2_GPREL }, \ - { ".lit8", SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_NIOS2_GPREL }, - -/* Processor-specific section directives. */ -#define md_elf_section_letter nios2_elf_section_letter -extern int nios2_elf_section_letter (int, const char **); -#define md_elf_section_flags nios2_elf_section_flags -extern flagword nios2_elf_section_flags (flagword, int, int); -#endif - -#define GLOBAL_OFFSET_TABLE_NAME "_GLOBAL_OFFSET_TABLE_" - -#define DIFF_EXPR_OK - -/* Don't allow the generic code to convert fixups involving the - subtraction of a label in the current section to pc-relative if we - don't have the necessary pc-relative relocation. */ -#define TC_FORCE_RELOCATION_SUB_LOCAL(FIX, SEG) \ - (!((FIX)->fx_r_type == BFD_RELOC_16 \ - || (FIX)->fx_r_type == BFD_RELOC_NIOS2_LO16 \ - || (FIX)->fx_r_type == BFD_RELOC_NIOS2_HIADJ16)) - -/* Nios2 ABI doesn't have 32-bit PCREL relocation, and, as relocations for - CFI information will be in section other than .text, we can't use PC-biased - relocs. */ -#define CFI_DIFF_EXPR_OK 0 - -#define TC_PARSE_CONS_EXPRESSION(EXP, NBYTES) nios2_cons (EXP, NBYTES) -extern bfd_reloc_code_real_type nios2_cons (expressionS *exp, int size); - -/* We want .cfi_* pseudo-ops for generating unwind info. */ -#define TARGET_USE_CFIPOP 1 -#define DWARF2_DEFAULT_RETURN_COLUMN 31 -#define DWARF2_CIE_DATA_ALIGNMENT (-4) -#define tc_regname_to_dw2regnum nios2_regname_to_dw2regnum -extern int nios2_regname_to_dw2regnum (char *regname); -#define tc_cfi_frame_initial_instructions nios2_frame_initial_instructions -extern void nios2_frame_initial_instructions (void); - -#define elf_tc_final_processing nios2_elf_final_processing -extern void nios2_elf_final_processing (void); - -#endif /* TC_NIOS2 */ diff --git a/gas/configure.tgt b/gas/configure.tgt index d58f21873a3..d91787342c7 100644 --- a/gas/configure.tgt +++ b/gas/configure.tgt @@ -347,8 +347,6 @@ case ${generic_target} in nds32-*-elf*) fmt=elf ;; nds32-*-linux*) fmt=elf em=linux ;; - nios2*-linux*) fmt=elf em=linux ;; - ns32k-pc532-mach*) fmt=aout em=pc532mach ;; ns32k-pc532-ux*) fmt=aout em=pc532mach ;; ns32k-pc532-lites*) fmt=aout em=nbsd532 ;; diff --git a/gas/doc/all.texi b/gas/doc/all.texi index 815909c7cd7..f297a122f48 100644 --- a/gas/doc/all.texi +++ b/gas/doc/all.texi @@ -57,7 +57,6 @@ @set MMIX @set MS1 @set MSP430 -@set NIOSII @set NDS32 @set NS32K @set OPENRISC diff --git a/gas/doc/as.texi b/gas/doc/as.texi index a5535845e40..725029c867d 100644 --- a/gas/doc/as.texi +++ b/gas/doc/as.texi @@ -496,12 +496,6 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}. [@b{--no-expand}] [@b{--no-merge-gregs}] [@b{-x}] [@b{--linker-allocated-gregs}] @end ifset -@ifset NIOSII - -@emph{Target Nios II options:} - [@b{-relax-all}] [@b{-relax-section}] [@b{-no-relax}] - [@b{-EB}] [@b{-EL}] -@end ifset @ifset NDS32 @emph{Target NDS32 options:} @@ -1328,24 +1322,6 @@ unit coprocessor. The default is to assume an MMU for 68020 and up. @end table @end ifset -@ifset NIOSII - -@ifclear man -@xref{Nios II Options}, for the options available when @value{AS} is configured -for an Altera Nios II processor. -@end ifclear - -@ifset man -@c man begin OPTIONS -The following options are available when @value{AS} is configured for an -Altera Nios II processor. -@c man end -@c man begin INCLUDE -@include c-nios2.texi -@c ended inside the included file -@end ifset -@end ifset - @ifset PDP11 For details about the PDP-11 machine dependent features options, @@ -8173,9 +8149,6 @@ subject, see the hardware manufacturer's manual. @ifset NDS32 * NDS32-Dependent:: Andes NDS32 Dependent Features @end ifset -@ifset NIOSII -* NiosII-Dependent:: Altera Nios II Dependent Features -@end ifset @ifset NS32K * NS32K-Dependent:: NS32K Dependent Features @end ifset @@ -8413,10 +8386,6 @@ family. @include c-nds32.texi @end ifset -@ifset NIOSII -@include c-nios2.texi -@end ifset - @ifset NS32K @include c-ns32k.texi @end ifset diff --git a/gas/doc/c-nios2.texi b/gas/doc/c-nios2.texi deleted file mode 100644 index abdd56167b7..00000000000 --- a/gas/doc/c-nios2.texi +++ /dev/null @@ -1,267 +0,0 @@ -@c Copyright (C) 2012-2024 Free Software Foundation, Inc. -@c This is part of the GAS manual. -@c For copying conditions, see the file as.texinfo. -@c man end -@ifset GENERIC -@page -@node NiosII-Dependent -@chapter Nios II Dependent Features -@end ifset -@ifclear GENERIC -@node Machine Dependencies -@chapter Nios II Dependent Features -@end ifclear - -@cindex Altera Nios II support -@cindex Nios support -@cindex Nios II support -@menu -* Nios II Options:: Options -* Nios II Syntax:: Syntax -* Nios II Relocations:: Relocations -* Nios II Directives:: Nios II Machine Directives -* Nios II Opcodes:: Opcodes -@end menu - -@node Nios II Options -@section Options -@cindex Nios II options -@cindex options for Nios II - -@c man begin OPTIONS -@table @gcctabopt - -@cindex @code{relax-section} command-line option, Nios II -@item -relax-section -Replace identified out-of-range branches with PC-relative @code{jmp} -sequences when possible. The generated code sequences are suitable -for use in position-independent code, but there is a practical limit -on the extended branch range because of the length of the sequences. -This option is the default. - -@cindex @code{relax-all} command-line option, Nios II -@item -relax-all -Replace branch instructions not determinable to be in range -and all call instructions with @code{jmp} and @code{callr} sequences -(respectively). This option generates absolute relocations against the -target symbols and is not appropriate for position-independent code. - -@cindex @code{no-relax} command-line option, Nios II -@item -no-relax -Do not replace any branches or calls. - -@cindex @code{EB} command-line option, Nios II -@item -EB -Generate big-endian output. - -@cindex @code{EL} command-line option, Nios II -@item -EL -Generate little-endian output. This is the default. - -@cindex @code{march} command-line option, Nios II -@item -march=@var{architecture} -This option specifies the target architecture. The assembler issues -an error message if an attempt is made to assemble an instruction which -will not execute on the target architecture. The following architecture -names are recognized: -@code{r1}, -@code{r2}. -The default is @code{r1}. - -@end table -@c man end - -@node Nios II Syntax -@section Syntax -@menu -* Nios II Chars:: Special Characters -@end menu - - -@node Nios II Chars -@subsection Special Characters - -@cindex line comment character, Nios II -@cindex Nios II line comment character -@cindex line separator character, Nios II -@cindex Nios II line separator character -@samp{#} is the line comment character. -@samp{;} is the line separator character. - - -@node Nios II Relocations -@section Nios II Machine Relocations - -@cindex machine relocations, Nios II -@cindex Nios II machine relocations - -@table @code -@cindex @code{hiadj} directive, Nios II -@item %hiadj(@var{expression}) -Extract the upper 16 bits of @var{expression} and add -one if the 15th bit is set. - -The value of @code{%hiadj(@var{expression})} is: -@smallexample -((@var{expression} >> 16) & 0xffff) + ((@var{expression} >> 15) & 0x01) -@end smallexample - -The @code{%hiadj} relocation is intended to be used with -the @code{addi}, @code{ld} or @code{st} instructions -along with a @code{%lo}, in order to load a 32-bit constant. - -@smallexample -movhi r2, %hiadj(symbol) -addi r2, r2, %lo(symbol) -@end smallexample - -@cindex @code{hi} directive, Nios II -@item %hi(@var{expression}) -Extract the upper 16 bits of @var{expression}. - -@cindex @code{lo} directive, Nios II -@item %lo(@var{expression}) -Extract the lower 16 bits of @var{expression}. - -@cindex @code{gprel} directive, Nios II -@item %gprel(@var{expression}) -Subtract the value of the symbol @code{_gp} from -@var{expression}. - -The intention of the @code{%gprel} relocation is -to have a fast small area of memory which only -takes a 16-bit immediate to access. - -@smallexample - .section .sdata -fastint: - .int 123 - .section .text - ldw r4, %gprel(fastint)(gp) -@end smallexample - -@cindex @code{call} directive, Nios II -@cindex @code{call_lo} directive, Nios II -@cindex @code{call_hiadj} directive, Nios II -@cindex @code{got} directive, Nios II -@cindex @code{got_lo} directive, Nios II -@cindex @code{got_hiadj} directive, Nios II -@cindex @code{gotoff} directive, Nios II -@cindex @code{gotoff_lo} directive, Nios II -@cindex @code{gotoff_hiadj} directive, Nios II -@cindex @code{tls_gd} directive, Nios II -@cindex @code{tls_ie} directive, Nios II -@cindex @code{tls_le} directive, Nios II -@cindex @code{tls_ldm} directive, Nios II -@cindex @code{tls_ldo} directive, Nios II -@item %call(@var{expression}) -@item %call_lo(@var{expression}) -@item %call_hiadj(@var{expression}) -@itemx %got(@var{expression}) -@itemx %got_lo(@var{expression}) -@itemx %got_hiadj(@var{expression}) -@itemx %gotoff(@var{expression}) -@itemx %gotoff_lo(@var{expression}) -@itemx %gotoff_hiadj(@var{expression}) -@itemx %tls_gd(@var{expression}) -@itemx %tls_ie(@var{expression}) -@itemx %tls_le(@var{expression}) -@itemx %tls_ldm(@var{expression}) -@itemx %tls_ldo(@var{expression}) - -These relocations support the ABI for Linux Systems documented in the -@cite{Nios II Processor Reference Handbook}. -@end table - - -@node Nios II Directives -@section Nios II Machine Directives - -@cindex machine directives, Nios II -@cindex Nios II machine directives - -@table @code - -@cindex @code{align} directive, Nios II -@item .align @var{expression} [, @var{expression}] -This is the generic @code{.align} directive, however -this aligns to a power of two. - -@cindex @code{half} directive, Nios II -@item .half @var{expression} -Create an aligned constant 2 bytes in size. - -@cindex @code{word} directive, Nios II -@item .word @var{expression} -Create an aligned constant 4 bytes in size. - -@cindex @code{dword} directive, Nios II -@item .dword @var{expression} -Create an aligned constant 8 bytes in size. - -@cindex @code{2byte} directive, Nios II -@item .2byte @var{expression} -Create an unaligned constant 2 bytes in size. - -@cindex @code{4byte} directive, Nios II -@item .4byte @var{expression} -Create an unaligned constant 4 bytes in size. - -@cindex @code{8byte} directive, Nios II -@item .8byte @var{expression} -Create an unaligned constant 8 bytes in size. - -@cindex @code{16byte} directive, Nios II -@item .16byte @var{expression} -Create an unaligned constant 16 bytes in size. - -@cindex @code{set noat} directive, Nios II -@item .set noat -Allows assembly code to use @code{at} register without -warning. Macro or relaxation expansions -generate warnings. - -@cindex @code{set at} directive, Nios II -@item .set at -Assembly code using @code{at} register generates -warnings, and macro expansion and relaxation are -enabled. - -@cindex @code{set nobreak} directive, Nios II -@item .set nobreak -Allows assembly code to use @code{ba} and @code{bt} -registers without warning. - -@cindex @code{set break} directive, Nios II -@item .set break -Turns warnings back on for using @code{ba} and @code{bt} -registers. - -@cindex @code{set norelax} directive, Nios II -@item .set norelax -Do not replace any branches or calls. - -@cindex @code{set relaxsection} directive, Nios II -@item .set relaxsection -Replace identified out-of-range branches with -@code{jmp} sequences (default). - -@cindex @code{set relaxall} directive, Nios II -@item .set relaxsection -Replace all branch and call instructions with -@code{jmp} and @code{callr} sequences. - -@cindex @code{set} directive, Nios II -@item .set @dots{} -All other @code{.set} are the normal use. - -@end table - -@node Nios II Opcodes -@section Opcodes - -@cindex Nios II opcodes -@cindex opcodes for Nios II -@code{@value{AS}} implements all the standard Nios II opcodes documented in the -@cite{Nios II Processor Reference Handbook}, including the assembler -pseudo-instructions. diff --git a/gas/doc/local.mk b/gas/doc/local.mk index c83b98a779d..397b4143c74 100644 --- a/gas/doc/local.mk +++ b/gas/doc/local.mk @@ -74,7 +74,6 @@ CPU_DOCS = \ %D%/c-mmix.texi \ %D%/c-mt.texi \ %D%/c-msp430.texi \ - %D%/c-nios2.texi \ %D%/c-nds32.texi \ %D%/c-ns32k.texi \ %D%/c-or1k.texi \ diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp index 5fff61f86ed..09073241ef8 100644 --- a/gas/testsuite/gas/all/gas.exp +++ b/gas/testsuite/gas/all/gas.exp @@ -398,7 +398,6 @@ if { ![istarget avr-*-*] && ![istarget dlx-*-*] && ![istarget hppa*-*-*] && ![istarget m68k-*-*] - && ![istarget nios2-*-*] && ![istarget pj-*-*] && ![istarget sh*-*-*] && ![istarget *c4x-*-*] diff --git a/gas/testsuite/gas/nios2/add-r2.d b/gas/testsuite/gas/nios2/add-r2.d deleted file mode 100644 index 99582431fe7..00000000000 --- a/gas/testsuite/gas/nios2/add-r2.d +++ /dev/null @@ -1,18 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 add -#as: -march=r2 -#source: add.s - -# Test the add instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> c4042120 add r4,r4,r4 -0+0004 <[^>]*> 7fff2104 addi r4,r4,32767 -0+0008 <[^>]*> 80002104 addi r4,r4,-32768 -0+000c <[^>]*> 00002104 addi r4,r4,0 -0+0010 <[^>]*> ffff2104 addi r4,r4,-1 -0+0014 <[^>]*> ffff2104 addi r4,r4,-1 -0+0018 <[^>]*> 34562104 addi r4,r4,13398 -0+001c <[^>]*> c4000020 nop diff --git a/gas/testsuite/gas/nios2/add.d b/gas/testsuite/gas/nios2/add.d deleted file mode 100644 index 3eb685ada03..00000000000 --- a/gas/testsuite/gas/nios2/add.d +++ /dev/null @@ -1,16 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 add - -# Test the add instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 2109883a add r4,r4,r4 -0+0004 <[^>]*> 211fffc4 addi r4,r4,32767 -0+0008 <[^>]*> 21200004 addi r4,r4,-32768 -0+000c <[^>]*> 21000004 addi r4,r4,0 -0+0010 <[^>]*> 213fffc4 addi r4,r4,-1 -0+0014 <[^>]*> 213fffc4 addi r4,r4,-1 -0+0018 <[^>]*> 210d1584 addi r4,r4,13398 -0+001c <[^>]*> 0001883a nop diff --git a/gas/testsuite/gas/nios2/add.s b/gas/testsuite/gas/nios2/add.s deleted file mode 100644 index 5b72a82741d..00000000000 --- a/gas/testsuite/gas/nios2/add.s +++ /dev/null @@ -1,13 +0,0 @@ -# Source file used to test the add and addi instructions. - -foo: - add r4,r4,r4 - addi r4,r4,0x7fff - addi r4,r4,-0x8000 - addi r4,r4,0x0 - addi r4,r4,-0x01 - subi r4,r4,0x01 - addi r4,r4,0x3456 - -# should disassemble to add r0,0,r0 - nop diff --git a/gas/testsuite/gas/nios2/align_fill-r2.d b/gas/testsuite/gas/nios2/align_fill-r2.d deleted file mode 100644 index 8e99882c01f..00000000000 --- a/gas/testsuite/gas/nios2/align_fill-r2.d +++ /dev/null @@ -1,25 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 align_fill -#as: -march=r2 -#source: align_fill.s - -# Test the and macro. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> fff8dec4 addi sp,sp,-8 -0+0004 <[^>]*> 0004e6f7 stw fp,4\(sp\) -0+0008 <[^>]*> c41c06e0 mov fp,sp -0+000c <[^>]*> c4030020 mov r3,zero -0+0010 <[^>]*> c4000020 nop -0+0014 <[^>]*> c4000020 nop -0+0018 <[^>]*> c4000020 nop -0+001c <[^>]*> c4000020 nop -0+0020 <[^>]*> 000118c4 addi r3,r3,1 -0+0024 <[^>]*> 006410de cmplti r2,r3,100 -0+0028 <[^>]*> fff400a2 bne r2,zero,00000020 <[^>]*> -0+002c <[^>]*> 0004e6d7 ldw fp,4\(sp\) -0+0030 <[^>]*> 0008dec4 addi sp,sp,8 -0+0034 <[^>]*> 140007e0 ret - ... diff --git a/gas/testsuite/gas/nios2/align_fill.d b/gas/testsuite/gas/nios2/align_fill.d deleted file mode 100644 index ecee94d4411..00000000000 --- a/gas/testsuite/gas/nios2/align_fill.d +++ /dev/null @@ -1,23 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 align_fill - -# Test the and macro. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> defffe04 addi sp,sp,-8 -0+0004 <[^>]*> df000115 stw fp,4\(sp\) -0+0008 <[^>]*> d839883a mov fp,sp -0+000c <[^>]*> 0007883a mov r3,zero -0+0010 <[^>]*> 0001883a nop -0+0014 <[^>]*> 0001883a nop -0+0018 <[^>]*> 0001883a nop -0+001c <[^>]*> 0001883a nop -0+0020 <[^>]*> 18c00044 addi r3,r3,1 -0+0024 <[^>]*> 18801910 cmplti r2,r3,100 -0+0028 <[^>]*> 103ffd1e bne r2,zero,00000020 <[^>]*> -0+002c <[^>]*> df000117 ldw fp,4\(sp\) -0+0030 <[^>]*> dec00204 addi sp,sp,8 -0+0034 <[^>]*> f800283a ret - ... diff --git a/gas/testsuite/gas/nios2/align_fill.s b/gas/testsuite/gas/nios2/align_fill.s deleted file mode 100644 index 56838395465..00000000000 --- a/gas/testsuite/gas/nios2/align_fill.s +++ /dev/null @@ -1,20 +0,0 @@ - .file "a.c" - .section .text - .align 3 - .global x - .type x, @function -x: - addi sp, sp, -8 - stw fp, 4(sp) - mov fp, sp - mov r3, zero - .align 5 -.L6: - addi r3, r3, 1 - cmplti r2, r3, 100 - bne r2, zero, .L6 - ldw fp, 4(sp) - addi sp, sp, 8 - ret - .size x, .-x - .ident "GCC: (GNU) 3.3.3 (Altera Nios II 1.0 b302)" diff --git a/gas/testsuite/gas/nios2/align_text-r2.d b/gas/testsuite/gas/nios2/align_text-r2.d deleted file mode 100644 index a2f32d954fa..00000000000 --- a/gas/testsuite/gas/nios2/align_text-r2.d +++ /dev/null @@ -1,24 +0,0 @@ -#objdump: -dr -#name: NIOS2 R2 align_test -#as: -march=r2 -#source: align_text.s - -# Test alignment in text sections. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -00000000 <label-0x20>: - 0: 00000000 call 0 <label-0x20> - 4: c4000020 nop - 8: c4000020 nop - c: c4000020 nop - 10: c4000020 nop - 14: c4000020 nop - 18: c4000020 nop - 1c: c4000020 nop - -00000020 <label>: - 20: c4000020 nop -00000024 <label2>: - ... diff --git a/gas/testsuite/gas/nios2/align_text.d b/gas/testsuite/gas/nios2/align_text.d deleted file mode 100644 index 80611e76c61..00000000000 --- a/gas/testsuite/gas/nios2/align_text.d +++ /dev/null @@ -1,22 +0,0 @@ -#objdump: -dr -#name: NIOS2 align_test - -# Test alignment in text sections. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -00000000 <label-0x20>: - 0: 00000000 call 0 <label-0x20> - 4: 0001883a nop - 8: 0001883a nop - c: 0001883a nop - 10: 0001883a nop - 14: 0001883a nop - 18: 0001883a nop - 1c: 0001883a nop - -00000020 <label>: - 20: 0001883a nop -00000024 <label2>: - ... diff --git a/gas/testsuite/gas/nios2/align_text.s b/gas/testsuite/gas/nios2/align_text.s deleted file mode 100644 index d073b6f2794..00000000000 --- a/gas/testsuite/gas/nios2/align_text.s +++ /dev/null @@ -1,15 +0,0 @@ - .asciz "" # empty string - .align 2 - - nop - nop - label: - .align 5 - nop - label2: - .section mysection - .align 2 - - - - diff --git a/gas/testsuite/gas/nios2/aligned_text-r2.d b/gas/testsuite/gas/nios2/aligned_text-r2.d deleted file mode 100644 index a2f32d954fa..00000000000 --- a/gas/testsuite/gas/nios2/aligned_text-r2.d +++ /dev/null @@ -1,24 +0,0 @@ -#objdump: -dr -#name: NIOS2 R2 align_test -#as: -march=r2 -#source: align_text.s - -# Test alignment in text sections. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -00000000 <label-0x20>: - 0: 00000000 call 0 <label-0x20> - 4: c4000020 nop - 8: c4000020 nop - c: c4000020 nop - 10: c4000020 nop - 14: c4000020 nop - 18: c4000020 nop - 1c: c4000020 nop - -00000020 <label>: - 20: c4000020 nop -00000024 <label2>: - ... diff --git a/gas/testsuite/gas/nios2/and-r2.d b/gas/testsuite/gas/nios2/and-r2.d deleted file mode 100644 index 4485b7d5b7f..00000000000 --- a/gas/testsuite/gas/nios2/and-r2.d +++ /dev/null @@ -1,19 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 and -#as: -march=r2 -#source: and.s - -# Test the and macro. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 38042120 and r4,r4,r4 -0+0004 <[^>]*> 7fff210c andi r4,r4,32767 -0+0008 <[^>]*> 8000210c andi r4,r4,32768 -0+000c <[^>]*> ffff210c andi r4,r4,65535 -0+0010 <[^>]*> 0000210c andi r4,r4,0 -0+0014 <[^>]*> 7fff212c andhi r4,r4,32767 -0+0018 <[^>]*> 8000212c andhi r4,r4,32768 -0+001c <[^>]*> ffff212c andhi r4,r4,65535 -0+0020 <[^>]*> 0000212c andhi r4,r4,0 diff --git a/gas/testsuite/gas/nios2/and.d b/gas/testsuite/gas/nios2/and.d deleted file mode 100644 index 8ae122c1a87..00000000000 --- a/gas/testsuite/gas/nios2/and.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 and - -# Test the and macro. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 2108703a and r4,r4,r4 -0+0004 <[^>]*> 211fffcc andi r4,r4,32767 -0+0008 <[^>]*> 2120000c andi r4,r4,32768 -0+000c <[^>]*> 213fffcc andi r4,r4,65535 -0+0010 <[^>]*> 2100000c andi r4,r4,0 -0+0014 <[^>]*> 211fffec andhi r4,r4,32767 -0+0018 <[^>]*> 2120002c andhi r4,r4,32768 -0+001c <[^>]*> 213fffec andhi r4,r4,65535 -0+0020 <[^>]*> 2100002c andhi r4,r4,0 diff --git a/gas/testsuite/gas/nios2/and.s b/gas/testsuite/gas/nios2/and.s deleted file mode 100644 index 946a8b881a4..00000000000 --- a/gas/testsuite/gas/nios2/and.s +++ /dev/null @@ -1,13 +0,0 @@ -# Source file used to test the and, andhi and andi instructions - -foo: - and r4,r4,r4 - andi r4,r4,0x7fff - andi r4,r4,0x8000 - andi r4,r4,0xffff - andi r4,r4,0x0 - andhi r4,r4,0x7fff - andhi r4,r4,0x8000 - andhi r4,r4,0xffff - andhi r4,r4,0x0 - diff --git a/gas/testsuite/gas/nios2/andc.d b/gas/testsuite/gas/nios2/andc.d deleted file mode 100644 index b7080479386..00000000000 --- a/gas/testsuite/gas/nios2/andc.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 andc -#as: -march=r2 - -# Test the and macro. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 7fff211f andci r4,r4,32767 -0+0004 <[^>]*> 8000211f andci r4,r4,32768 -0+0008 <[^>]*> ffff211f andci r4,r4,65535 -0+000c <[^>]*> 0000211f andci r4,r4,0 -0+0010 <[^>]*> 7fff213f andchi r4,r4,32767 -0+0014 <[^>]*> 8000213f andchi r4,r4,32768 -0+0018 <[^>]*> ffff213f andchi r4,r4,65535 -0+001c <[^>]*> 0000213f andchi r4,r4,0 diff --git a/gas/testsuite/gas/nios2/andc.s b/gas/testsuite/gas/nios2/andc.s deleted file mode 100644 index c1aeaddaaa6..00000000000 --- a/gas/testsuite/gas/nios2/andc.s +++ /dev/null @@ -1,12 +0,0 @@ -# Source file used to test the andci and andchi instructions - -foo: - andci r4,r4,0x7fff - andci r4,r4,0x8000 - andci r4,r4,0xffff - andci r4,r4,0x0 - andchi r4,r4,0x7fff - andchi r4,r4,0x8000 - andchi r4,r4,0xffff - andchi r4,r4,0x0 - diff --git a/gas/testsuite/gas/nios2/bmx.d b/gas/testsuite/gas/nios2/bmx.d deleted file mode 100644 index 09f79643084..00000000000 --- a/gas/testsuite/gas/nios2/bmx.d +++ /dev/null @@ -1,21 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 BMX instructions -#as: -march=r2 - -# Test the BMX instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> cfe0f820 extract ra,zero,31,0 -0+0004 <[^>]*> cf0707e0 extract zero,ra,24,7 -0+0008 <[^>]*> cfe022a0 extract r4,r10,31,0 -0+000c <[^>]*> ce8fbae0 extract r23,r11,20,15 -0+0010 <[^>]*> 8fe0f820 insert ra,zero,31,0 -0+0014 <[^>]*> 8f0707e0 insert zero,ra,24,7 -0+0018 <[^>]*> 8fe022a0 insert r4,r10,31,0 -0+001c <[^>]*> 8e8fbae0 insert r23,r11,20,15 -0+0020 <[^>]*> afe0f820 merge ra,zero,31,0 -0+0024 <[^>]*> af0707e0 merge zero,ra,24,7 -0+0028 <[^>]*> afe022a0 merge r4,r10,31,0 -0+002c <[^>]*> ae8fbae0 merge r23,r11,20,15 diff --git a/gas/testsuite/gas/nios2/bmx.s b/gas/testsuite/gas/nios2/bmx.s deleted file mode 100644 index 382ec9dee99..00000000000 --- a/gas/testsuite/gas/nios2/bmx.s +++ /dev/null @@ -1,15 +0,0 @@ -# Source file used to test the BMX instruction - -foo: - extract r31,r0,31,0 - extract r0,r31,24,7 - extract r4,r10,31,0 - extract r23,r11,20,15 - insert r31,r0,31,0 - insert r0,r31,24,7 - insert r4,r10,31,0 - insert r23,r11,20,15 - merge r31,r0,31,0 - merge r0,r31,24,7 - merge r4,r10,31,0 - merge r23,r11,20,15 diff --git a/gas/testsuite/gas/nios2/branch-r2.d b/gas/testsuite/gas/nios2/branch-r2.d deleted file mode 100644 index 6b34f529480..00000000000 --- a/gas/testsuite/gas/nios2/branch-r2.d +++ /dev/null @@ -1,23 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 branch -#as: -march=r2 -#source: branch.s - -# Test the branch instructions. -.*: file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0000292a beq r4,r5,00000004 <[^>]*> -[ ]*0: R_NIOS2_PCREL16 text_label -0+0004 <[^>]*> 00002912 bge r4,r5,00000008 <[^>]*> -[ ]*4: R_NIOS2_PCREL16 text_label -0+0008 <[^>]*> 00002932 bgeu r4,r5,0000000c <[^>]*> -[ ]*8: R_NIOS2_PCREL16 text_label -0+000c <[^>]*> 0000291a blt r4,r5,00000010 <[^>]*> -[ ]*c: R_NIOS2_PCREL16 text_label -0+0010 <[^>]*> 0000293a bltu r4,r5,00000014 <[^>]*> -[ ]*10: R_NIOS2_PCREL16 text_label -0+0014 <[^>]*> 00002922 bne r4,r5,00000018 <[^>]*> -[ ]*14: R_NIOS2_PCREL16 text_label -0+0018 <[^>]*> 00000002 br 0000001c <[^>]*> -[ ]*18: R_NIOS2_PCREL16 external_label diff --git a/gas/testsuite/gas/nios2/branch.d b/gas/testsuite/gas/nios2/branch.d deleted file mode 100644 index 6f3ad13ee64..00000000000 --- a/gas/testsuite/gas/nios2/branch.d +++ /dev/null @@ -1,21 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 branch - -# Test the branch instructions. -.*: file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 21400026 beq r4,r5,00000004 <[^>]*> -[ ]*0: R_NIOS2_PCREL16 text_label -0+0004 <[^>]*> 2140000e bge r4,r5,00000008 <[^>]*> -[ ]*4: R_NIOS2_PCREL16 text_label -0+0008 <[^>]*> 2140002e bgeu r4,r5,0000000c <[^>]*> -[ ]*8: R_NIOS2_PCREL16 text_label -0+000c <[^>]*> 21400016 blt r4,r5,00000010 <[^>]*> -[ ]*c: R_NIOS2_PCREL16 text_label -0+0010 <[^>]*> 21400036 bltu r4,r5,00000014 <[^>]*> -[ ]*10: R_NIOS2_PCREL16 text_label -0+0014 <[^>]*> 2140001e bne r4,r5,00000018 <[^>]*> -[ ]*14: R_NIOS2_PCREL16 text_label -0+0018 <[^>]*> 00000006 br 0000001c <[^>]*> -[ ]*18: R_NIOS2_PCREL16 external_label diff --git a/gas/testsuite/gas/nios2/branch.s b/gas/testsuite/gas/nios2/branch.s deleted file mode 100644 index 0853167ee09..00000000000 --- a/gas/testsuite/gas/nios2/branch.s +++ /dev/null @@ -1,15 +0,0 @@ -# Source file used to test the beq macro. - .globl text_label - .text -.set norelax -text_label: - beq r4,r5,text_label - bge r4,r5,text_label - bgeu r4,r5,text_label - blt r4,r5,text_label - bltu r4,r5,text_label - bne r4,r5,text_label - -# Branch to an external label. - br external_label - diff --git a/gas/testsuite/gas/nios2/break-r2.d b/gas/testsuite/gas/nios2/break-r2.d deleted file mode 100644 index 5e2770c53f1..00000000000 --- a/gas/testsuite/gas/nios2/break-r2.d +++ /dev/null @@ -1,14 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 break -#as: -march=r2 -#source: break.s - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> d01e0020 break 0 -0+0004 <[^>]*> d01e0020 break 0 -0+0008 <[^>]*> d3fe0020 break 31 -0+000c <[^>]*> d1de0020 break 14 - - diff --git a/gas/testsuite/gas/nios2/break.d b/gas/testsuite/gas/nios2/break.d deleted file mode 100644 index 8d4853b1a5b..00000000000 --- a/gas/testsuite/gas/nios2/break.d +++ /dev/null @@ -1,12 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 break - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 003da03a break 0 -0+0004 <[^>]*> 003da03a break 0 -0+0008 <[^>]*> 003da7fa break 31 -0+000c <[^>]*> 003da3ba break 14 - - diff --git a/gas/testsuite/gas/nios2/break.s b/gas/testsuite/gas/nios2/break.s deleted file mode 100644 index 88d3422e745..00000000000 --- a/gas/testsuite/gas/nios2/break.s +++ /dev/null @@ -1,8 +0,0 @@ -# Source file used to test the 20-bit break instructions -foo: - break - break 0 - break 31 - break 14 - - diff --git a/gas/testsuite/gas/nios2/bret-r2.d b/gas/testsuite/gas/nios2/bret-r2.d deleted file mode 100644 index 63792e68a47..00000000000 --- a/gas/testsuite/gas/nios2/bret-r2.d +++ /dev/null @@ -1,10 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 bret -#as: -march=r2 -#source: bret.s - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 240007a0 bret - diff --git a/gas/testsuite/gas/nios2/bret.d b/gas/testsuite/gas/nios2/bret.d deleted file mode 100644 index 80462fd299f..00000000000 --- a/gas/testsuite/gas/nios2/bret.d +++ /dev/null @@ -1,8 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 bret - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> f000483a bret - diff --git a/gas/testsuite/gas/nios2/bret.s b/gas/testsuite/gas/nios2/bret.s deleted file mode 100644 index d368e6441e6..00000000000 --- a/gas/testsuite/gas/nios2/bret.s +++ /dev/null @@ -1,5 +0,0 @@ -# Source file used to test the bret instructions -foo: - bret - - diff --git a/gas/testsuite/gas/nios2/brn.d b/gas/testsuite/gas/nios2/brn.d deleted file mode 100644 index a9ed472229a..00000000000 --- a/gas/testsuite/gas/nios2/brn.d +++ /dev/null @@ -1,10 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 br.n -#as: -march=r2 - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> c4000020 nop -0+0004 <[^>]*> ff43 br.n 00000000 <foo> - ... diff --git a/gas/testsuite/gas/nios2/brn.s b/gas/testsuite/gas/nios2/brn.s deleted file mode 100644 index 84d9cf1c8f1..00000000000 --- a/gas/testsuite/gas/nios2/brn.s +++ /dev/null @@ -1,4 +0,0 @@ -# Source file used to test the br.n instructions -foo: - nop - br.n foo diff --git a/gas/testsuite/gas/nios2/cache-r2.d b/gas/testsuite/gas/nios2/cache-r2.d deleted file mode 100644 index 5403ea4544d..00000000000 --- a/gas/testsuite/gas/nios2/cache-r2.d +++ /dev/null @@ -1,18 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 cache -#as: -march=r2 - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 380011a8 flushd -2048\(r6\) -0+0004 <[^>]*> 37ff11a8 flushd 2047\(r6\) -0+0008 <[^>]*> 300011a8 flushd 0\(r6\) -0+000c <[^>]*> 3fff11a8 flushd -1\(r6\) -0+0010 <[^>]*> 300011a8 flushd 0\(r6\) -[ ]*10: R_NIOS2_R2_S12 .text -0+0014 <[^>]*> 300011a8 flushd 0\(r6\) -[ ]*14: R_NIOS2_R2_S12 external -0+0018 <[^>]*> 300000a0 flushi r2 -0+001c <[^>]*> 10000020 flushp - diff --git a/gas/testsuite/gas/nios2/cache-r2.s b/gas/testsuite/gas/nios2/cache-r2.s deleted file mode 100644 index ec689aa24e4..00000000000 --- a/gas/testsuite/gas/nios2/cache-r2.s +++ /dev/null @@ -1,21 +0,0 @@ -# Source file used to test the cache instruction -foo: - flushd -0x800(r6) - flushd 0x7ff(r6) - flushd 0x0(r6) - flushd -0x001(r6) - -# use symbol for offset - flushd foo(r6) - -# use external symbol - .global external - flushd external(r6) - -# flushi - flushi r2 - -#flushp - flushp - - diff --git a/gas/testsuite/gas/nios2/cache.d b/gas/testsuite/gas/nios2/cache.d deleted file mode 100644 index 061ceb608cf..00000000000 --- a/gas/testsuite/gas/nios2/cache.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 cache - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 3020003b flushd -32768\(r6\) -0+0004 <[^>]*> 301ffffb flushd 32767\(r6\) -0+0008 <[^>]*> 3000003b flushd 0\(r6\) -0+000c <[^>]*> 303ffffb flushd -1\(r6\) -0+0010 <[^>]*> 3000003b flushd 0\(r6\) -[ ]*10: R_NIOS2_S16 .text -0+0014 <[^>]*> 3000003b flushd 0\(r6\) -[ ]*14: R_NIOS2_S16 external -0+0018 <[^>]*> 1000603a flushi r2 -0+001c <[^>]*> 0000203a flushp - diff --git a/gas/testsuite/gas/nios2/cache.s b/gas/testsuite/gas/nios2/cache.s deleted file mode 100644 index 1701c191bcc..00000000000 --- a/gas/testsuite/gas/nios2/cache.s +++ /dev/null @@ -1,21 +0,0 @@ -# Source file used to test the cache instruction -foo: - flushd -0x8000(r6) - flushd 0x7fff(r6) - flushd 0x0(r6) - flushd -0x0001(r6) - -# use symbol for offset - flushd foo(r6) - -# use external symbol - .global external - flushd external(r6) - -# flushi - flushi r2 - -#flushp - flushp - - diff --git a/gas/testsuite/gas/nios2/call-r2.d b/gas/testsuite/gas/nios2/call-r2.d deleted file mode 100644 index bf31471140d..00000000000 --- a/gas/testsuite/gas/nios2/call-r2.d +++ /dev/null @@ -1,13 +0,0 @@ -# objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 call -#as: -march=r2 -#source: call.s - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00000000 call 00000000 <[^>]*> -[ ]*0: R_NIOS2_CALL26 .text\+0xc -0+0004 <[^>]*> 741f02a0 callr r10 -0+0008 <[^>]*> 00000000 call 00000000 <[^>]*> -[ ]*8: R_NIOS2_CALL26 external diff --git a/gas/testsuite/gas/nios2/call.d b/gas/testsuite/gas/nios2/call.d deleted file mode 100644 index 44ce885ca46..00000000000 --- a/gas/testsuite/gas/nios2/call.d +++ /dev/null @@ -1,11 +0,0 @@ -# objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 call - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00000000 call 00000000 <[^>]*> -[ ]*0: R_NIOS2_CALL26 .text\+0xc -0+0004 <[^>]*> 503ee83a callr r10 -0+0008 <[^>]*> 00000000 call 00000000 <[^>]*> -[ ]*8: R_NIOS2_CALL26 external diff --git a/gas/testsuite/gas/nios2/call.s b/gas/testsuite/gas/nios2/call.s deleted file mode 100644 index 39409b7de0a..00000000000 --- a/gas/testsuite/gas/nios2/call.s +++ /dev/null @@ -1,13 +0,0 @@ -# Source file used to test the call and callr instructions -.text -.set norelax -foo: - call func1 - callr r10 -# use external symbol - .global external - call external -func1: - - - diff --git a/gas/testsuite/gas/nios2/call26-r2.d b/gas/testsuite/gas/nios2/call26-r2.d deleted file mode 100644 index 6b1d60b9771..00000000000 --- a/gas/testsuite/gas/nios2/call26-r2.d +++ /dev/null @@ -1,78 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 nios2-reloc-r-nios2-call26 -#as: -march=r2 -#source: call26.s - -# Test the branch instructions. -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -[ ]*\.\.\. -[ ]*0: R_NIOS2_CALL26 .text\+0x100 -[ ]*4: R_NIOS2_CALL26 globalfunc -0+0008 <[^>]*> c4000020 nop -0+000c <[^>]*> c4000020 nop -0+0010 <[^>]*> c4000020 nop -0+0014 <[^>]*> c4000020 nop -0+0018 <[^>]*> c4000020 nop -0+001c <[^>]*> c4000020 nop -0+0020 <[^>]*> c4000020 nop -0+0024 <[^>]*> c4000020 nop -0+0028 <[^>]*> c4000020 nop -0+002c <[^>]*> c4000020 nop -0+0030 <[^>]*> c4000020 nop -0+0034 <[^>]*> c4000020 nop -0+0038 <[^>]*> c4000020 nop -0+003c <[^>]*> c4000020 nop -0+0040 <[^>]*> c4000020 nop -0+0044 <[^>]*> c4000020 nop -0+0048 <[^>]*> c4000020 nop -0+004c <[^>]*> c4000020 nop -0+0050 <[^>]*> c4000020 nop -0+0054 <[^>]*> c4000020 nop -0+0058 <[^>]*> c4000020 nop -0+005c <[^>]*> c4000020 nop -0+0060 <[^>]*> c4000020 nop -0+0064 <[^>]*> c4000020 nop -0+0068 <[^>]*> c4000020 nop -0+006c <[^>]*> c4000020 nop -0+0070 <[^>]*> c4000020 nop -0+0074 <[^>]*> c4000020 nop -0+0078 <[^>]*> c4000020 nop -0+007c <[^>]*> c4000020 nop -0+0080 <[^>]*> c4000020 nop -0+0084 <[^>]*> c4000020 nop -0+0088 <[^>]*> c4000020 nop -0+008c <[^>]*> c4000020 nop -0+0090 <[^>]*> c4000020 nop -0+0094 <[^>]*> c4000020 nop -0+0098 <[^>]*> c4000020 nop -0+009c <[^>]*> c4000020 nop -0+00a0 <[^>]*> c4000020 nop -0+00a4 <[^>]*> c4000020 nop -0+00a8 <[^>]*> c4000020 nop -0+00ac <[^>]*> c4000020 nop -0+00b0 <[^>]*> c4000020 nop -0+00b4 <[^>]*> c4000020 nop -0+00b8 <[^>]*> c4000020 nop -0+00bc <[^>]*> c4000020 nop -0+00c0 <[^>]*> c4000020 nop -0+00c4 <[^>]*> c4000020 nop -0+00c8 <[^>]*> c4000020 nop -0+00cc <[^>]*> c4000020 nop -0+00d0 <[^>]*> c4000020 nop -0+00d4 <[^>]*> c4000020 nop -0+00d8 <[^>]*> c4000020 nop -0+00dc <[^>]*> c4000020 nop -0+00e0 <[^>]*> c4000020 nop -0+00e4 <[^>]*> c4000020 nop -0+00e8 <[^>]*> c4000020 nop -0+00ec <[^>]*> c4000020 nop -0+00f0 <[^>]*> c4000020 nop -0+00f4 <[^>]*> c4000020 nop -0+00f8 <[^>]*> c4000020 nop -0+00fc <[^>]*> c4000020 nop -0+0100 <[^>]*> c4000020 nop - ... - - diff --git a/gas/testsuite/gas/nios2/call26.d b/gas/testsuite/gas/nios2/call26.d deleted file mode 100644 index 30376e7e24e..00000000000 --- a/gas/testsuite/gas/nios2/call26.d +++ /dev/null @@ -1,76 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 nios2-reloc-r-nios2-call26 - -# Test the branch instructions. -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -[ ]*\.\.\. -[ ]*0: R_NIOS2_CALL26 .text\+0x100 -[ ]*4: R_NIOS2_CALL26 globalfunc -0+0008 <[^>]*> 0001883a nop -0+000c <[^>]*> 0001883a nop -0+0010 <[^>]*> 0001883a nop -0+0014 <[^>]*> 0001883a nop -0+0018 <[^>]*> 0001883a nop -0+001c <[^>]*> 0001883a nop -0+0020 <[^>]*> 0001883a nop -0+0024 <[^>]*> 0001883a nop -0+0028 <[^>]*> 0001883a nop -0+002c <[^>]*> 0001883a nop -0+0030 <[^>]*> 0001883a nop -0+0034 <[^>]*> 0001883a nop -0+0038 <[^>]*> 0001883a nop -0+003c <[^>]*> 0001883a nop -0+0040 <[^>]*> 0001883a nop -0+0044 <[^>]*> 0001883a nop -0+0048 <[^>]*> 0001883a nop -0+004c <[^>]*> 0001883a nop -0+0050 <[^>]*> 0001883a nop -0+0054 <[^>]*> 0001883a nop -0+0058 <[^>]*> 0001883a nop -0+005c <[^>]*> 0001883a nop -0+0060 <[^>]*> 0001883a nop -0+0064 <[^>]*> 0001883a nop -0+0068 <[^>]*> 0001883a nop -0+006c <[^>]*> 0001883a nop -0+0070 <[^>]*> 0001883a nop -0+0074 <[^>]*> 0001883a nop -0+0078 <[^>]*> 0001883a nop -0+007c <[^>]*> 0001883a nop -0+0080 <[^>]*> 0001883a nop -0+0084 <[^>]*> 0001883a nop -0+0088 <[^>]*> 0001883a nop -0+008c <[^>]*> 0001883a nop -0+0090 <[^>]*> 0001883a nop -0+0094 <[^>]*> 0001883a nop -0+0098 <[^>]*> 0001883a nop -0+009c <[^>]*> 0001883a nop -0+00a0 <[^>]*> 0001883a nop -0+00a4 <[^>]*> 0001883a nop -0+00a8 <[^>]*> 0001883a nop -0+00ac <[^>]*> 0001883a nop -0+00b0 <[^>]*> 0001883a nop -0+00b4 <[^>]*> 0001883a nop -0+00b8 <[^>]*> 0001883a nop -0+00bc <[^>]*> 0001883a nop -0+00c0 <[^>]*> 0001883a nop -0+00c4 <[^>]*> 0001883a nop -0+00c8 <[^>]*> 0001883a nop -0+00cc <[^>]*> 0001883a nop -0+00d0 <[^>]*> 0001883a nop -0+00d4 <[^>]*> 0001883a nop -0+00d8 <[^>]*> 0001883a nop -0+00dc <[^>]*> 0001883a nop -0+00e0 <[^>]*> 0001883a nop -0+00e4 <[^>]*> 0001883a nop -0+00e8 <[^>]*> 0001883a nop -0+00ec <[^>]*> 0001883a nop -0+00f0 <[^>]*> 0001883a nop -0+00f4 <[^>]*> 0001883a nop -0+00f8 <[^>]*> 0001883a nop -0+00fc <[^>]*> 0001883a nop -0+0100 <[^>]*> 0001883a nop - ... - - diff --git a/gas/testsuite/gas/nios2/call26.s b/gas/testsuite/gas/nios2/call26.s deleted file mode 100644 index dd128a70309..00000000000 --- a/gas/testsuite/gas/nios2/call26.s +++ /dev/null @@ -1,12 +0,0 @@ -# Test for Nios II 32-bit relocations - -.global globalfunc -.text -.set norelax -start: - call localfunc - call globalfunc - -.align 8 -localfunc: - nop diff --git a/gas/testsuite/gas/nios2/call26_noat-r2.d b/gas/testsuite/gas/nios2/call26_noat-r2.d deleted file mode 100644 index 8235e63ca3e..00000000000 --- a/gas/testsuite/gas/nios2/call26_noat-r2.d +++ /dev/null @@ -1,78 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 nios2-reloc-r-nios2-call26-noat -#as: -march=r2 -#source: call26_noat.s - -# Test the branch instructions. -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -[ ]*\.\.\. -[ ]*0: R_NIOS2_CALL26_NOAT .text\+0x100 -[ ]*4: R_NIOS2_CALL26_NOAT globalfunc -0+0008 <[^>]*> c4000020 nop -0+000c <[^>]*> c4000020 nop -0+0010 <[^>]*> c4000020 nop -0+0014 <[^>]*> c4000020 nop -0+0018 <[^>]*> c4000020 nop -0+001c <[^>]*> c4000020 nop -0+0020 <[^>]*> c4000020 nop -0+0024 <[^>]*> c4000020 nop -0+0028 <[^>]*> c4000020 nop -0+002c <[^>]*> c4000020 nop -0+0030 <[^>]*> c4000020 nop -0+0034 <[^>]*> c4000020 nop -0+0038 <[^>]*> c4000020 nop -0+003c <[^>]*> c4000020 nop -0+0040 <[^>]*> c4000020 nop -0+0044 <[^>]*> c4000020 nop -0+0048 <[^>]*> c4000020 nop -0+004c <[^>]*> c4000020 nop -0+0050 <[^>]*> c4000020 nop -0+0054 <[^>]*> c4000020 nop -0+0058 <[^>]*> c4000020 nop -0+005c <[^>]*> c4000020 nop -0+0060 <[^>]*> c4000020 nop -0+0064 <[^>]*> c4000020 nop -0+0068 <[^>]*> c4000020 nop -0+006c <[^>]*> c4000020 nop -0+0070 <[^>]*> c4000020 nop -0+0074 <[^>]*> c4000020 nop -0+0078 <[^>]*> c4000020 nop -0+007c <[^>]*> c4000020 nop -0+0080 <[^>]*> c4000020 nop -0+0084 <[^>]*> c4000020 nop -0+0088 <[^>]*> c4000020 nop -0+008c <[^>]*> c4000020 nop -0+0090 <[^>]*> c4000020 nop -0+0094 <[^>]*> c4000020 nop -0+0098 <[^>]*> c4000020 nop -0+009c <[^>]*> c4000020 nop -0+00a0 <[^>]*> c4000020 nop -0+00a4 <[^>]*> c4000020 nop -0+00a8 <[^>]*> c4000020 nop -0+00ac <[^>]*> c4000020 nop -0+00b0 <[^>]*> c4000020 nop -0+00b4 <[^>]*> c4000020 nop -0+00b8 <[^>]*> c4000020 nop -0+00bc <[^>]*> c4000020 nop -0+00c0 <[^>]*> c4000020 nop -0+00c4 <[^>]*> c4000020 nop -0+00c8 <[^>]*> c4000020 nop -0+00cc <[^>]*> c4000020 nop -0+00d0 <[^>]*> c4000020 nop -0+00d4 <[^>]*> c4000020 nop -0+00d8 <[^>]*> c4000020 nop -0+00dc <[^>]*> c4000020 nop -0+00e0 <[^>]*> c4000020 nop -0+00e4 <[^>]*> c4000020 nop -0+00e8 <[^>]*> c4000020 nop -0+00ec <[^>]*> c4000020 nop -0+00f0 <[^>]*> c4000020 nop -0+00f4 <[^>]*> c4000020 nop -0+00f8 <[^>]*> c4000020 nop -0+00fc <[^>]*> c4000020 nop -0+0100 <[^>]*> c4000020 nop - ... - - diff --git a/gas/testsuite/gas/nios2/call26_noat.d b/gas/testsuite/gas/nios2/call26_noat.d deleted file mode 100644 index 34bfe4ed559..00000000000 --- a/gas/testsuite/gas/nios2/call26_noat.d +++ /dev/null @@ -1,76 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 nios2-reloc-r-nios2-call26-noat - -# Test the branch instructions. -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -[ ]*\.\.\. -[ ]*0: R_NIOS2_CALL26_NOAT .text\+0x100 -[ ]*4: R_NIOS2_CALL26_NOAT globalfunc -0+0008 <[^>]*> 0001883a nop -0+000c <[^>]*> 0001883a nop -0+0010 <[^>]*> 0001883a nop -0+0014 <[^>]*> 0001883a nop -0+0018 <[^>]*> 0001883a nop -0+001c <[^>]*> 0001883a nop -0+0020 <[^>]*> 0001883a nop -0+0024 <[^>]*> 0001883a nop -0+0028 <[^>]*> 0001883a nop -0+002c <[^>]*> 0001883a nop -0+0030 <[^>]*> 0001883a nop -0+0034 <[^>]*> 0001883a nop -0+0038 <[^>]*> 0001883a nop -0+003c <[^>]*> 0001883a nop -0+0040 <[^>]*> 0001883a nop -0+0044 <[^>]*> 0001883a nop -0+0048 <[^>]*> 0001883a nop -0+004c <[^>]*> 0001883a nop -0+0050 <[^>]*> 0001883a nop -0+0054 <[^>]*> 0001883a nop -0+0058 <[^>]*> 0001883a nop -0+005c <[^>]*> 0001883a nop -0+0060 <[^>]*> 0001883a nop -0+0064 <[^>]*> 0001883a nop -0+0068 <[^>]*> 0001883a nop -0+006c <[^>]*> 0001883a nop -0+0070 <[^>]*> 0001883a nop -0+0074 <[^>]*> 0001883a nop -0+0078 <[^>]*> 0001883a nop -0+007c <[^>]*> 0001883a nop -0+0080 <[^>]*> 0001883a nop -0+0084 <[^>]*> 0001883a nop -0+0088 <[^>]*> 0001883a nop -0+008c <[^>]*> 0001883a nop -0+0090 <[^>]*> 0001883a nop -0+0094 <[^>]*> 0001883a nop -0+0098 <[^>]*> 0001883a nop -0+009c <[^>]*> 0001883a nop -0+00a0 <[^>]*> 0001883a nop -0+00a4 <[^>]*> 0001883a nop -0+00a8 <[^>]*> 0001883a nop -0+00ac <[^>]*> 0001883a nop -0+00b0 <[^>]*> 0001883a nop -0+00b4 <[^>]*> 0001883a nop -0+00b8 <[^>]*> 0001883a nop -0+00bc <[^>]*> 0001883a nop -0+00c0 <[^>]*> 0001883a nop -0+00c4 <[^>]*> 0001883a nop -0+00c8 <[^>]*> 0001883a nop -0+00cc <[^>]*> 0001883a nop -0+00d0 <[^>]*> 0001883a nop -0+00d4 <[^>]*> 0001883a nop -0+00d8 <[^>]*> 0001883a nop -0+00dc <[^>]*> 0001883a nop -0+00e0 <[^>]*> 0001883a nop -0+00e4 <[^>]*> 0001883a nop -0+00e8 <[^>]*> 0001883a nop -0+00ec <[^>]*> 0001883a nop -0+00f0 <[^>]*> 0001883a nop -0+00f4 <[^>]*> 0001883a nop -0+00f8 <[^>]*> 0001883a nop -0+00fc <[^>]*> 0001883a nop -0+0100 <[^>]*> 0001883a nop - ... - - diff --git a/gas/testsuite/gas/nios2/call26_noat.s b/gas/testsuite/gas/nios2/call26_noat.s deleted file mode 100644 index f0a93e797e1..00000000000 --- a/gas/testsuite/gas/nios2/call26_noat.s +++ /dev/null @@ -1,13 +0,0 @@ -# Test for Nios II 32-bit relocations - -.global globalfunc -.text -.set norelax -.set noat -start: - call localfunc - call globalfunc - -.align 8 -localfunc: - nop diff --git a/gas/testsuite/gas/nios2/call_noat-r2.d b/gas/testsuite/gas/nios2/call_noat-r2.d deleted file mode 100644 index 8f3747e4d81..00000000000 --- a/gas/testsuite/gas/nios2/call_noat-r2.d +++ /dev/null @@ -1,13 +0,0 @@ -# objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 call noat -#as: -march=r2 -#source: call_noat.s - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00000000 call 00000000 <[^>]*> -[ ]*0: R_NIOS2_CALL26_NOAT .text\+0xc -0+0004 <[^>]*> 741f02a0 callr r10 -0+0008 <[^>]*> 00000000 call 00000000 <[^>]*> -[ ]*8: R_NIOS2_CALL26_NOAT external diff --git a/gas/testsuite/gas/nios2/call_noat.d b/gas/testsuite/gas/nios2/call_noat.d deleted file mode 100644 index 03aadb561d9..00000000000 --- a/gas/testsuite/gas/nios2/call_noat.d +++ /dev/null @@ -1,11 +0,0 @@ -# objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 call noat - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00000000 call 00000000 <[^>]*> -[ ]*0: R_NIOS2_CALL26_NOAT .text\+0xc -0+0004 <[^>]*> 503ee83a callr r10 -0+0008 <[^>]*> 00000000 call 00000000 <[^>]*> -[ ]*8: R_NIOS2_CALL26_NOAT external diff --git a/gas/testsuite/gas/nios2/call_noat.s b/gas/testsuite/gas/nios2/call_noat.s deleted file mode 100644 index 67613b7851f..00000000000 --- a/gas/testsuite/gas/nios2/call_noat.s +++ /dev/null @@ -1,14 +0,0 @@ -# Source file used to test the call and callr instructions -.text -.set norelax -.set noat -foo: - call func1 - callr r10 -# use external symbol - .global external - call external -func1: - - - diff --git a/gas/testsuite/gas/nios2/cdx_add.d b/gas/testsuite/gas/nios2/cdx_add.d deleted file mode 100644 index cfc0cc776dd..00000000000 --- a/gas/testsuite/gas/nios2/cdx_add.d +++ /dev/null @@ -1,19 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX add.n -#as: -march=r2 - -# Test the add.n and addi.n instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 4901 add.n r4,r4,r4 -0+0002 <[^>]*> 0911 addi.n r4,r4,1 -0+0004 <[^>]*> 1911 addi.n r4,r4,2 -0+0006 <[^>]*> 2911 addi.n r4,r4,4 -0+0008 <[^>]*> 3911 addi.n r4,r4,8 -0+000a <[^>]*> 4911 addi.n r4,r4,16 -0+000c <[^>]*> 5911 addi.n r4,r4,32 -0+000e <[^>]*> 6911 addi.n r4,r4,64 -0+0010 <[^>]*> 7911 addi.n r4,r4,128 - ... diff --git a/gas/testsuite/gas/nios2/cdx_add.s b/gas/testsuite/gas/nios2/cdx_add.s deleted file mode 100644 index 4d8f2b2257a..00000000000 --- a/gas/testsuite/gas/nios2/cdx_add.s +++ /dev/null @@ -1,12 +0,0 @@ -# Source file used to test the add and addi instructions. - -foo: - add.n r4,r4,r4 - addi.n r4,r4,1 - addi.n r4,r4,2 - addi.n r4,r4,4 - addi.n r4,r4,8 - addi.n r4,r4,16 - addi.n r4,r4,32 - addi.n r4,r4,64 - addi.n r4,r4,128 diff --git a/gas/testsuite/gas/nios2/cdx_and.d b/gas/testsuite/gas/nios2/cdx_and.d deleted file mode 100644 index e641dbb0152..00000000000 --- a/gas/testsuite/gas/nios2/cdx_and.d +++ /dev/null @@ -1,27 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX and.n -#as: -march=r2 - -# Test the and.n and andi.n instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0909 and.n r4,r4,r4 -0+0002 <[^>]*> 090b andi.n r4,r4,1 -0+0004 <[^>]*> 190b andi.n r4,r4,2 -0+0006 <[^>]*> 290b andi.n r4,r4,3 -0+0008 <[^>]*> 390b andi.n r4,r4,4 -0+000a <[^>]*> 490b andi.n r4,r4,8 -0+000c <[^>]*> 590b andi.n r4,r4,15 -0+000e <[^>]*> 690b andi.n r4,r4,16 -0+0010 <[^>]*> 790b andi.n r4,r4,31 -0+0012 <[^>]*> 890b andi.n r4,r4,32 -0+0014 <[^>]*> 990b andi.n r4,r4,63 -0+0016 <[^>]*> a90b andi.n r4,r4,127 -0+0018 <[^>]*> b90b andi.n r4,r4,128 -0+001a <[^>]*> c90b andi.n r4,r4,255 -0+001c <[^>]*> d90b andi.n r4,r4,2047 -0+001e <[^>]*> e90b andi.n r4,r4,65280 -0+0020 <[^>]*> f90b andi.n r4,r4,65535 - ... diff --git a/gas/testsuite/gas/nios2/cdx_and.s b/gas/testsuite/gas/nios2/cdx_and.s deleted file mode 100644 index d666fa314e0..00000000000 --- a/gas/testsuite/gas/nios2/cdx_and.s +++ /dev/null @@ -1,20 +0,0 @@ -# Source file used to test the and.n and andi.n instructions - -foo: - and.n r4,r4,r4 - andi.n r4,r4,0x1 - andi.n r4,r4,0x2 - andi.n r4,r4,0x3 - andi.n r4,r4,0x4 - andi.n r4,r4,0x8 - andi.n r4,r4,0xf - andi.n r4,r4,0x10 - andi.n r4,r4,0x1f - andi.n r4,r4,0x20 - andi.n r4,r4,0x3f - andi.n r4,r4,0x7f - andi.n r4,r4,0x80 - andi.n r4,r4,0xff - andi.n r4,r4,0x7ff - andi.n r4,r4,0xff00 - andi.n r4,r4,0xffff diff --git a/gas/testsuite/gas/nios2/cdx_break.d b/gas/testsuite/gas/nios2/cdx_break.d deleted file mode 100644 index 30c155b597e..00000000000 --- a/gas/testsuite/gas/nios2/cdx_break.d +++ /dev/null @@ -1,11 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX break -#as: -march=r2 - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> c009 break.n 0 -0+0002 <[^>]*> c009 break.n 0 -0+0004 <[^>]*> c7c9 break.n 31 -0+0006 <[^>]*> c389 break.n 14 diff --git a/gas/testsuite/gas/nios2/cdx_break.s b/gas/testsuite/gas/nios2/cdx_break.s deleted file mode 100644 index b1869351b9b..00000000000 --- a/gas/testsuite/gas/nios2/cdx_break.s +++ /dev/null @@ -1,8 +0,0 @@ -# Source file used to test the CDX break.n instructions -foo: - break.n - break.n 0 - break.n 31 - break.n 14 - - diff --git a/gas/testsuite/gas/nios2/cdx_callr.d b/gas/testsuite/gas/nios2/cdx_callr.d deleted file mode 100644 index a2114cc4711..00000000000 --- a/gas/testsuite/gas/nios2/cdx_callr.d +++ /dev/null @@ -1,9 +0,0 @@ -# objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX callr.n -#as: -march=r2 - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 8109 callr.n r4 - ... diff --git a/gas/testsuite/gas/nios2/cdx_callr.s b/gas/testsuite/gas/nios2/cdx_callr.s deleted file mode 100644 index 84e9d699bd3..00000000000 --- a/gas/testsuite/gas/nios2/cdx_callr.s +++ /dev/null @@ -1,6 +0,0 @@ -# Source file used to test the callr instruction - -.text -.set norelax -foo: - callr.n r4 diff --git a/gas/testsuite/gas/nios2/cdx_jmpr.d b/gas/testsuite/gas/nios2/cdx_jmpr.d deleted file mode 100644 index 95ea8866961..00000000000 --- a/gas/testsuite/gas/nios2/cdx_jmpr.d +++ /dev/null @@ -1,11 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX jmpr.n -#as: -march=r2 - -# Test the jmpr.n instruction. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> a1c9 jmpr.n r7 - ... diff --git a/gas/testsuite/gas/nios2/cdx_jmpr.s b/gas/testsuite/gas/nios2/cdx_jmpr.s deleted file mode 100644 index 67d54e22df5..00000000000 --- a/gas/testsuite/gas/nios2/cdx_jmpr.s +++ /dev/null @@ -1,6 +0,0 @@ -# Source file used to test the jmpr.n instruction. -.text -.set nobreak -foo: - jmpr.n r7 - diff --git a/gas/testsuite/gas/nios2/cdx_ldbu.d b/gas/testsuite/gas/nios2/cdx_ldbu.d deleted file mode 100644 index acb581f13a9..00000000000 --- a/gas/testsuite/gas/nios2/cdx_ldbu.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX ldbu.n -#as: -march=r2 - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0845 ldbu.n r4,0\(r17\) -0+0002 <[^>]*> 4845 ldbu.n r4,4\(r17\) -0+0004 <[^>]*> 7845 ldbu.n r4,7\(r17\) -0+0006 <[^>]*> f845 ldbu.n r4,15\(r17\) -0+0008 <[^>]*> 0945 ldbu.n r4,0\(r5\) -0+000a <[^>]*> 4945 ldbu.n r4,4\(r5\) -0+000c <[^>]*> 7945 ldbu.n r4,7\(r5\) -0+000e <[^>]*> f945 ldbu.n r4,15\(r5\) diff --git a/gas/testsuite/gas/nios2/cdx_ldbu.s b/gas/testsuite/gas/nios2/cdx_ldbu.s deleted file mode 100644 index f4593663058..00000000000 --- a/gas/testsuite/gas/nios2/cdx_ldbu.s +++ /dev/null @@ -1,11 +0,0 @@ -# Source file used to test the ldbu.n instruction - -foo: - ldbu.n r4,0(r17) - ldbu.n r4,4(r17) - ldbu.n r4,7(r17) - ldbu.n r4,0xf(r17) - ldbu.n r4,0(r5) - ldbu.n r4,4(r5) - ldbu.n r4,7(r5) - ldbu.n r4,0xf(r5) diff --git a/gas/testsuite/gas/nios2/cdx_ldhu.d b/gas/testsuite/gas/nios2/cdx_ldhu.d deleted file mode 100644 index efc7467c3fb..00000000000 --- a/gas/testsuite/gas/nios2/cdx_ldhu.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX ldhu.n -#as: -march=r2 - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 084d ldhu.n r4,0\(r17\) -0+0002 <[^>]*> 284d ldhu.n r4,4\(r17\) -0+0004 <[^>]*> 784d ldhu.n r4,14\(r17\) -0+0006 <[^>]*> f84d ldhu.n r4,30\(r17\) -0+0008 <[^>]*> 094d ldhu.n r4,0\(r5\) -0+000a <[^>]*> 294d ldhu.n r4,4\(r5\) -0+000c <[^>]*> 794d ldhu.n r4,14\(r5\) -0+000e <[^>]*> f94d ldhu.n r4,30\(r5\) diff --git a/gas/testsuite/gas/nios2/cdx_ldhu.s b/gas/testsuite/gas/nios2/cdx_ldhu.s deleted file mode 100644 index afa55d94f80..00000000000 --- a/gas/testsuite/gas/nios2/cdx_ldhu.s +++ /dev/null @@ -1,11 +0,0 @@ -# Source file used to test the ldhu.n instruction - -foo: - ldhu.n r4,0(r17) - ldhu.n r4,4(r17) - ldhu.n r4,0xe(r17) - ldhu.n r4,0x1e(r17) - ldhu.n r4,0(r5) - ldhu.n r4,4(r5) - ldhu.n r4,0xe(r5) - ldhu.n r4,0x1e(r5) diff --git a/gas/testsuite/gas/nios2/cdx_ldw.d b/gas/testsuite/gas/nios2/cdx_ldw.d deleted file mode 100644 index d23ae46c914..00000000000 --- a/gas/testsuite/gas/nios2/cdx_ldw.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX ldw.n -#as: -march=r2 - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0855 ldw.n r4,0\(r17\) -0+0002 <[^>]*> 1855 ldw.n r4,4\(r17\) -0+0004 <[^>]*> 7855 ldw.n r4,28\(r17\) -0+0006 <[^>]*> f855 ldw.n r4,60\(r17\) -0+0008 <[^>]*> 0955 ldw.n r4,0\(r5\) -0+000a <[^>]*> 1955 ldw.n r4,4\(r5\) -0+000c <[^>]*> 7955 ldw.n r4,28\(r5\) -0+000e <[^>]*> f955 ldw.n r4,60\(r5\) diff --git a/gas/testsuite/gas/nios2/cdx_ldw.s b/gas/testsuite/gas/nios2/cdx_ldw.s deleted file mode 100644 index 4a7a5037977..00000000000 --- a/gas/testsuite/gas/nios2/cdx_ldw.s +++ /dev/null @@ -1,11 +0,0 @@ -# Source file used to test the ldw.n instruction - -foo: - ldw.n r4,0(r17) - ldw.n r4,4(r17) - ldw.n r4,0x1c(r17) - ldw.n r4,0x3c(r17) - ldw.n r4,0(r5) - ldw.n r4,4(r5) - ldw.n r4,0x1c(r5) - ldw.n r4,0x3c(r5) diff --git a/gas/testsuite/gas/nios2/cdx_ldwsp.d b/gas/testsuite/gas/nios2/cdx_ldwsp.d deleted file mode 100644 index 3b0563b0fa0..00000000000 --- a/gas/testsuite/gas/nios2/cdx_ldwsp.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX ldwsp.n -#as: -march=r2 - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 2013 ldwsp.n r4,0\(sp\) -0+0002 <[^>]*> 2053 ldwsp.n r4,4\(sp\) -0+0004 <[^>]*> 23d3 ldwsp.n r4,60\(sp\) -0+0006 <[^>]*> 27d3 ldwsp.n r4,124\(sp\) diff --git a/gas/testsuite/gas/nios2/cdx_ldwsp.s b/gas/testsuite/gas/nios2/cdx_ldwsp.s deleted file mode 100644 index 3560aa3ca91..00000000000 --- a/gas/testsuite/gas/nios2/cdx_ldwsp.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the ldwsp.n instruction - -foo: - ldwsp.n r4,0(sp) - ldwsp.n r4,4(sp) - ldwsp.n r4,0x3c(sp) - ldwsp.n r4,0x7c(sp) diff --git a/gas/testsuite/gas/nios2/cdx_mov.d b/gas/testsuite/gas/nios2/cdx_mov.d deleted file mode 100644 index 1bec020b46d..00000000000 --- a/gas/testsuite/gas/nios2/cdx_mov.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX mov.n -#as: -march=r2 - -# Test the mov.n and movi.n instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 213b mov.n r4,r4 -0+0002 <[^>]*> 011b movi.n r4,0 -0+0004 <[^>]*> 031b movi.n r4,1 -0+0006 <[^>]*> 7f1b movi.n r4,63 -0+0008 <[^>]*> f91b movi.n r4,124 -0+000a <[^>]*> fb1b movi.n r4,255 -0+000c <[^>]*> fd1b movi.n r4,-2 -0+000e <[^>]*> ff1b movi.n r4,-1 diff --git a/gas/testsuite/gas/nios2/cdx_mov.s b/gas/testsuite/gas/nios2/cdx_mov.s deleted file mode 100644 index b3ebc481492..00000000000 --- a/gas/testsuite/gas/nios2/cdx_mov.s +++ /dev/null @@ -1,11 +0,0 @@ -# Source file used to test the mov.n mov movi.n instructions - -foo: - mov.n r4,r4 - movi.n r4,0x0 - movi.n r4,0x1 - movi.n r4,0x3f - movi.n r4,0x7c - movi.n r4,0xff - movi.n r4,-2 - movi.n r4,-1 diff --git a/gas/testsuite/gas/nios2/cdx_neg.d b/gas/testsuite/gas/nios2/cdx_neg.d deleted file mode 100644 index 8ac99d095f7..00000000000 --- a/gas/testsuite/gas/nios2/cdx_neg.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX neg.n -#as: -march=r2 - -# Test the neg.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 7909 neg.n r4,r4 -0+0002 <[^>]*> 7e49 neg.n r17,r7 -0+0004 <[^>]*> 73c9 neg.n r7,r17 -0+0006 <[^>]*> 7fc9 neg.n r7,r7 diff --git a/gas/testsuite/gas/nios2/cdx_neg.s b/gas/testsuite/gas/nios2/cdx_neg.s deleted file mode 100644 index 27d0ed0e46b..00000000000 --- a/gas/testsuite/gas/nios2/cdx_neg.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the neg.n instructions. - -foo: - neg.n r4,r4 - neg.n r17,r7 - neg.n r7,r17 - neg.n r7,r7 diff --git a/gas/testsuite/gas/nios2/cdx_not.d b/gas/testsuite/gas/nios2/cdx_not.d deleted file mode 100644 index 6310183dc58..00000000000 --- a/gas/testsuite/gas/nios2/cdx_not.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX not.n -#as: -march=r2 - -# Test the not.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 6909 not.n r4,r4 -0+0002 <[^>]*> 63c9 not.n r17,r7 -0+0004 <[^>]*> 6e49 not.n r7,r17 -0+0006 <[^>]*> 6fc9 not.n r7,r7 diff --git a/gas/testsuite/gas/nios2/cdx_not.s b/gas/testsuite/gas/nios2/cdx_not.s deleted file mode 100644 index ae0f70b1179..00000000000 --- a/gas/testsuite/gas/nios2/cdx_not.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the not.n instructions. - -foo: - not.n r4,r4 - not.n r17,r7 - not.n r7,r17 - not.n r7,r7 diff --git a/gas/testsuite/gas/nios2/cdx_or.d b/gas/testsuite/gas/nios2/cdx_or.d deleted file mode 100644 index 259a015914c..00000000000 --- a/gas/testsuite/gas/nios2/cdx_or.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX or.n -#as: -march=r2 - -# Test the or.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 2909 or.n r4,r4,r4 -0+0002 <[^>]*> 2e49 or.n r17,r17,r7 -0+0004 <[^>]*> 23c9 or.n r7,r7,r17 -0+0006 <[^>]*> 2fc9 or.n r7,r7,r7 diff --git a/gas/testsuite/gas/nios2/cdx_or.s b/gas/testsuite/gas/nios2/cdx_or.s deleted file mode 100644 index cae561573c8..00000000000 --- a/gas/testsuite/gas/nios2/cdx_or.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the or.n instructions. - -foo: - or.n r4,r4,r4 - or.n r17,r17,r7 - or.n r7,r7,r17 - or.n r7,r7,r7 diff --git a/gas/testsuite/gas/nios2/cdx_pop.d b/gas/testsuite/gas/nios2/cdx_pop.d deleted file mode 100644 index 0066e591eaa..00000000000 --- a/gas/testsuite/gas/nios2/cdx_pop.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX pop.n -#as: -march=r2 - -# Test the pop.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0021 pop.n {ra},0 -0+0002 <[^>]*> 2021 pop.n {fp,ra},0 -0+0004 <[^>]*> 4021 pop.n {r16,ra},0 -0+0006 <[^>]*> 6021 pop.n {r16,fp,ra},0 -0+0008 <[^>]*> 7c21 pop.n {r16,r17,r18,r19,r20,r21,r22,r23,fp,ra},0 -0+000a <[^>]*> 0021 pop.n {ra},0 -0+000c <[^>]*> 03e1 pop.n {ra},60 -0+000e <[^>]*> 7fe1 pop.n {r16,r17,r18,r19,r20,r21,r22,r23,fp,ra},60 diff --git a/gas/testsuite/gas/nios2/cdx_pop.s b/gas/testsuite/gas/nios2/cdx_pop.s deleted file mode 100644 index d25d69a6ff5..00000000000 --- a/gas/testsuite/gas/nios2/cdx_pop.s +++ /dev/null @@ -1,11 +0,0 @@ -# Source file used to test the pop.n instruction - -foo: - pop.n {ra} - pop.n {fp,ra} - pop.n {r16,ra} - pop.n {r16,fp,ra} - pop.n {r16,r17,r18,r19,r20,r21,r22,r23,fp,ra} - pop.n {ra},0x0 - pop.n {ra},0x3c - pop.n {r16,r17,r18,r19,r20,r21,r22,r23,fp,ra},0x3c diff --git a/gas/testsuite/gas/nios2/cdx_push.d b/gas/testsuite/gas/nios2/cdx_push.d deleted file mode 100644 index b9d4be76d14..00000000000 --- a/gas/testsuite/gas/nios2/cdx_push.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX push.n -#as: -march=r2 - -# Test the push.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 8021 push.n {ra},0 -0+0002 <[^>]*> a021 push.n {ra,fp},0 -0+0004 <[^>]*> c021 push.n {ra,r16},0 -0+0006 <[^>]*> e021 push.n {ra,fp,r16},0 -0+0008 <[^>]*> fc21 push.n {ra,fp,r23,r22,r21,r20,r19,r18,r17,r16},0 -0+000a <[^>]*> 8021 push.n {ra},0 -0+000c <[^>]*> 83e1 push.n {ra},60 -0+000e <[^>]*> ffe1 push.n {ra,fp,r23,r22,r21,r20,r19,r18,r17,r16},60 diff --git a/gas/testsuite/gas/nios2/cdx_push.s b/gas/testsuite/gas/nios2/cdx_push.s deleted file mode 100644 index f6ca4375089..00000000000 --- a/gas/testsuite/gas/nios2/cdx_push.s +++ /dev/null @@ -1,11 +0,0 @@ -# Source file used to test the push.n instruction - -foo: - push.n {ra} - push.n {ra,fp} - push.n {ra,r16} - push.n {ra,fp,r16} - push.n {ra,fp,r23,r22,r21,r20,r19,r18,r17,r16} - push.n {ra},0x0 - push.n {ra},0x3c - push.n {ra,fp,r23,r22,r21,r20,r19,r18,r17,r16},0x3c diff --git a/gas/testsuite/gas/nios2/cdx_relax.d b/gas/testsuite/gas/nios2/cdx_relax.d deleted file mode 100644 index ce6f6401a94..00000000000 --- a/gas/testsuite/gas/nios2/cdx_relax.d +++ /dev/null @@ -1,22 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX branch relaxation -#as: -march=r2 - -# Test relaxation of beqz.n, bnez.n, and br.n instructions to -# equivalent 32-bit instructions when the branch target is out of range. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <label0> 04a3 bnez.n r2,00000006 <label1> -0+0002 <[^>]*> 02eb beqz.n r3,00000006 <label1> -0+0004 <[^>]*> 0003 br.n 00000006 <label1> -0+0006 <label1> 04b800a2 bne r2,zero,000004c2 <label2> -0+000a <[^>]*> 04b400ea beq r3,zero,000004c2 <label2> -0+000e <[^>]*> 04b00002 br 000004c2 <label2> -0+0012 <[^>]*> c4000020 nop -#... -0+04c2 <label2> fb4000a2 bne r2,zero,00000006 <label1> -0+04c6 <[^>]*> fb3c00ea beq r3,zero,00000006 <label1> -0+04ca <[^>]*> fb380002 br 00000006 <label1> - ... diff --git a/gas/testsuite/gas/nios2/cdx_relax.s b/gas/testsuite/gas/nios2/cdx_relax.s deleted file mode 100644 index 152154b078b..00000000000 --- a/gas/testsuite/gas/nios2/cdx_relax.s +++ /dev/null @@ -1,27 +0,0 @@ -# Test relaxation of beqz.n, bnez.n, and br.n instructions to -# equivalent 32-bit instructions when the branch target is out of range. - - .text - -# These branches are within range. -label0: - bnez.n r2, label1 - beqz.n r3, label1 - br.n label1 - -# These branches have an out-of-range positive offset. -label1: - bnez.n r2, label2 - beqz.n r3, label2 - br.n label2 - - .rept 300 - nop - .endr - -# These branches have an out-of-range negative offset. -label2: - bnez.n r2, label1 - beqz.n r3, label1 - br.n label1 - diff --git a/gas/testsuite/gas/nios2/cdx_ret.d b/gas/testsuite/gas/nios2/cdx_ret.d deleted file mode 100644 index 71623c978fb..00000000000 --- a/gas/testsuite/gas/nios2/cdx_ret.d +++ /dev/null @@ -1,11 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX ret.n -#as: -march=r2 - -# Test the ret.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> e009 ret.n - ...
\ No newline at end of file diff --git a/gas/testsuite/gas/nios2/cdx_ret.s b/gas/testsuite/gas/nios2/cdx_ret.s deleted file mode 100644 index 3ee9ab35f9c..00000000000 --- a/gas/testsuite/gas/nios2/cdx_ret.s +++ /dev/null @@ -1,4 +0,0 @@ -# Source file used to test the ret.n instruction - -foo: - ret.n diff --git a/gas/testsuite/gas/nios2/cdx_sll.d b/gas/testsuite/gas/nios2/cdx_sll.d deleted file mode 100644 index 9305c5c25c5..00000000000 --- a/gas/testsuite/gas/nios2/cdx_sll.d +++ /dev/null @@ -1,21 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX sll.n -#as: -march=r2 - -# Test the sll.n and slli.n instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 4909 sll.n r4,r4,r4 -0+0002 <[^>]*> 0919 slli.n r4,r4,1 -0+0004 <[^>]*> 1919 slli.n r4,r4,2 -0+0006 <[^>]*> 2919 slli.n r4,r4,3 -0+0008 <[^>]*> 3919 slli.n r4,r4,8 -0+000a <[^>]*> 4919 slli.n r4,r4,12 -0+000c <[^>]*> 5919 slli.n r4,r4,16 -0+000e <[^>]*> 6919 slli.n r4,r4,24 -0+0010 <[^>]*> 7919 slli.n r4,r4,31 -0+0012 <[^>]*> 41c9 sll.n r7,r7,r16 -0+0014 <[^>]*> 4e09 sll.n r16,r16,r7 - ... diff --git a/gas/testsuite/gas/nios2/cdx_sll.s b/gas/testsuite/gas/nios2/cdx_sll.s deleted file mode 100644 index 4cbcf558abd..00000000000 --- a/gas/testsuite/gas/nios2/cdx_sll.s +++ /dev/null @@ -1,14 +0,0 @@ -# Source file used to test the sll.n and slli.n instructions - -foo: - sll.n r4,r4,r4 - slli.n r4,r4,0x1 - slli.n r4,r4,0x2 - slli.n r4,r4,0x3 - slli.n r4,r4,0x8 - slli.n r4,r4,0xc - slli.n r4,r4,0x10 - slli.n r4,r4,0x18 - slli.n r4,r4,0x1f - sll.n r7,r7,r16 - sll.n r16,r16,r7 diff --git a/gas/testsuite/gas/nios2/cdx_spaddi.d b/gas/testsuite/gas/nios2/cdx_spaddi.d deleted file mode 100644 index 196b83de1a9..00000000000 --- a/gas/testsuite/gas/nios2/cdx_spaddi.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX spaddi.n -#as: -march=r2 - -# Test the spaddi.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 007d spaddi.n r17,0 -0+0002 <[^>]*> 01fd spaddi.n r7,0 -0+0004 <[^>]*> 7e7d spaddi.n r17,252 -0+0006 <[^>]*> 7ffd spaddi.n r7,252 diff --git a/gas/testsuite/gas/nios2/cdx_spaddi.s b/gas/testsuite/gas/nios2/cdx_spaddi.s deleted file mode 100644 index eeaa3d48ec4..00000000000 --- a/gas/testsuite/gas/nios2/cdx_spaddi.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the spaddi.n instruction - -foo: - spaddi.n r17,0 - spaddi.n r7,0 - spaddi.n r17,252 - spaddi.n r7,252 diff --git a/gas/testsuite/gas/nios2/cdx_spdeci.d b/gas/testsuite/gas/nios2/cdx_spdeci.d deleted file mode 100644 index b21caa73aa0..00000000000 --- a/gas/testsuite/gas/nios2/cdx_spdeci.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX spdeci.n -#as: -march=r2 - -# Test the spdeci.n and spinci.n instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 8029 spdeci.n 0 -0+0002 <[^>]*> 9fe9 spdeci.n 508 -0+0004 <[^>]*> 0029 spinci.n 0 -0+0006 <[^>]*> 1fe9 spinci.n 508 diff --git a/gas/testsuite/gas/nios2/cdx_spdeci.s b/gas/testsuite/gas/nios2/cdx_spdeci.s deleted file mode 100644 index 746c0b6c389..00000000000 --- a/gas/testsuite/gas/nios2/cdx_spdeci.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the spdeci.n and spinci.n instructions - -foo: - spdeci.n 0 - spdeci.n 0x1fc - spinci.n 0 - spinci.n 0x1fc diff --git a/gas/testsuite/gas/nios2/cdx_srl.d b/gas/testsuite/gas/nios2/cdx_srl.d deleted file mode 100644 index ea7a1d18855..00000000000 --- a/gas/testsuite/gas/nios2/cdx_srl.d +++ /dev/null @@ -1,21 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX srl.n -#as: -march=r2 - -# Test the srl.n and srli.n instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 5909 srl.n r4,r4,r4 -0+0002 <[^>]*> 8919 srli.n r4,r4,1 -0+0004 <[^>]*> 9919 srli.n r4,r4,2 -0+0006 <[^>]*> a919 srli.n r4,r4,3 -0+0008 <[^>]*> b919 srli.n r4,r4,8 -0+000a <[^>]*> c919 srli.n r4,r4,12 -0+000c <[^>]*> d919 srli.n r4,r4,16 -0+000e <[^>]*> e919 srli.n r4,r4,24 -0+0010 <[^>]*> f919 srli.n r4,r4,31 -0+0012 <[^>]*> 51c9 srl.n r7,r7,r16 -0+0014 <[^>]*> 5e09 srl.n r16,r16,r7 - ... diff --git a/gas/testsuite/gas/nios2/cdx_srl.s b/gas/testsuite/gas/nios2/cdx_srl.s deleted file mode 100644 index 36f8357d87f..00000000000 --- a/gas/testsuite/gas/nios2/cdx_srl.s +++ /dev/null @@ -1,14 +0,0 @@ -# Source file used to test the srl.n and srli.n instructions - -foo: - srl.n r4,r4,r4 - srli.n r4,r4,0x1 - srli.n r4,r4,0x2 - srli.n r4,r4,0x3 - srli.n r4,r4,0x8 - srli.n r4,r4,0xc - srli.n r4,r4,0x10 - srli.n r4,r4,0x18 - srli.n r4,r4,0x1f - srl.n r7,r7,r16 - srl.n r16,r16,r7 diff --git a/gas/testsuite/gas/nios2/cdx_stb.d b/gas/testsuite/gas/nios2/cdx_stb.d deleted file mode 100644 index eb7e2dfbef6..00000000000 --- a/gas/testsuite/gas/nios2/cdx_stb.d +++ /dev/null @@ -1,21 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX stb.n -#as: -march=r2 - -# Test the stb.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0865 stb.n r4,0\(r17\) -0+0002 <[^>]*> 4865 stb.n r4,4\(r17\) -0+0004 <[^>]*> 7865 stb.n r4,7\(r17\) -0+0006 <[^>]*> f865 stb.n r4,15\(r17\) -0+0008 <[^>]*> 0965 stb.n r4,0\(r5\) -0+000a <[^>]*> 4965 stb.n r4,4\(r5\) -0+000c <[^>]*> 7965 stb.n r4,7\(r5\) -0+000e <[^>]*> f965 stb.n r4,15\(r5\) -0+0010 <[^>]*> 801d stbz.n zero,0\(r16\) -0+0012 <[^>]*> 801d stbz.n zero,0\(r16\) -0+0014 <[^>]*> fe1d stbz.n zero,63\(r16\) -0+0016 <[^>]*> ffdd stbz.n zero,63\(r7\) diff --git a/gas/testsuite/gas/nios2/cdx_stb.s b/gas/testsuite/gas/nios2/cdx_stb.s deleted file mode 100644 index 3f79c68f477..00000000000 --- a/gas/testsuite/gas/nios2/cdx_stb.s +++ /dev/null @@ -1,15 +0,0 @@ -# Source file used to test the stb.n instruction - -foo: - stb.n r4,0(r17) - stb.n r4,4(r17) - stb.n r4,0x7(r17) - stb.n r4,0xf(r17) - stb.n r4,0(r5) - stb.n r4,4(r5) - stb.n r4,0x7(r5) - stb.n r4,0xf(r5) - stbz.n zero,0(r16) - stbz.n r0,0(r16) - stbz.n zero,63(r16) - stbz.n zero,63(r7) diff --git a/gas/testsuite/gas/nios2/cdx_sth.d b/gas/testsuite/gas/nios2/cdx_sth.d deleted file mode 100644 index cb2077cad31..00000000000 --- a/gas/testsuite/gas/nios2/cdx_sth.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX sth.n -#as: -march=r2 - -# Test the sth.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 086d sth.n r4,0\(r17\) -0+0002 <[^>]*> 286d sth.n r4,4\(r17\) -0+0004 <[^>]*> 786d sth.n r4,14\(r17\) -0+0006 <[^>]*> f86d sth.n r4,30\(r17\) -0+0008 <[^>]*> 096d sth.n r4,0\(r5\) -0+000a <[^>]*> 296d sth.n r4,4\(r5\) -0+000c <[^>]*> 796d sth.n r4,14\(r5\) -0+000e <[^>]*> f96d sth.n r4,30\(r5\) diff --git a/gas/testsuite/gas/nios2/cdx_sth.s b/gas/testsuite/gas/nios2/cdx_sth.s deleted file mode 100644 index 6a5ca66a9b5..00000000000 --- a/gas/testsuite/gas/nios2/cdx_sth.s +++ /dev/null @@ -1,11 +0,0 @@ -# Source file used to test the sth.n instruction - -foo: - sth.n r4,0(r17) - sth.n r4,4(r17) - sth.n r4,0xe(r17) - sth.n r4,0x1e(r17) - sth.n r4,0(r5) - sth.n r4,4(r5) - sth.n r4,0xe(r5) - sth.n r4,0x1e(r5) diff --git a/gas/testsuite/gas/nios2/cdx_stw.d b/gas/testsuite/gas/nios2/cdx_stw.d deleted file mode 100644 index cc70958e1b5..00000000000 --- a/gas/testsuite/gas/nios2/cdx_stw.d +++ /dev/null @@ -1,21 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX stw.n -#as: -march=r2 - -# Test the stw.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0875 stw.n r4,0\(r17\) -0+0002 <[^>]*> 1875 stw.n r4,4\(r17\) -0+0004 <[^>]*> 7875 stw.n r4,28\(r17\) -0+0006 <[^>]*> f875 stw.n r4,60\(r17\) -0+0008 <[^>]*> 0975 stw.n r4,0\(r5\) -0+000a <[^>]*> 1975 stw.n r4,4\(r5\) -0+000c <[^>]*> 7975 stw.n r4,28\(r5\) -0+000e <[^>]*> f975 stw.n r4,60\(r5\) -0+0010 <[^>]*> 001d stwz.n zero,0\(r16\) -0+0012 <[^>]*> 001d stwz.n zero,0\(r16\) -0+0014 <[^>]*> 7e1d stwz.n zero,252\(r16\) -0+0016 <[^>]*> 7fdd stwz.n zero,252\(r7\) diff --git a/gas/testsuite/gas/nios2/cdx_stw.s b/gas/testsuite/gas/nios2/cdx_stw.s deleted file mode 100644 index d17fd6ab947..00000000000 --- a/gas/testsuite/gas/nios2/cdx_stw.s +++ /dev/null @@ -1,15 +0,0 @@ -# Source file used to test the stw.n instruction - -foo: - stw.n r4,0(r17) - stw.n r4,4(r17) - stw.n r4,0x1c(r17) - stw.n r4,0x3c(r17) - stw.n r4,0(r5) - stw.n r4,4(r5) - stw.n r4,0x1c(r5) - stw.n r4,0x3c(r5) - stwz.n zero,0(r16) - stwz.n r0,0(r16) - stwz.n zero,252(r16) - stwz.n zero,252(r7) diff --git a/gas/testsuite/gas/nios2/cdx_stwsp.d b/gas/testsuite/gas/nios2/cdx_stwsp.d deleted file mode 100644 index bc89b6cc621..00000000000 --- a/gas/testsuite/gas/nios2/cdx_stwsp.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX stwsp.n -#as: -march=r2 - -# Test the stwsp.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 2033 stwsp.n r4,0\(sp\) -0+0002 <[^>]*> 2073 stwsp.n r4,4\(sp\) -0+0004 <[^>]*> 23f3 stwsp.n r4,60\(sp\) -0+0006 <[^>]*> 27f3 stwsp.n r4,124\(sp\) diff --git a/gas/testsuite/gas/nios2/cdx_stwsp.s b/gas/testsuite/gas/nios2/cdx_stwsp.s deleted file mode 100644 index 6ed8be34d21..00000000000 --- a/gas/testsuite/gas/nios2/cdx_stwsp.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the stwsp.n instruction - -foo: - stwsp.n r4,0(sp) - stwsp.n r4,4(sp) - stwsp.n r4,0x3c(sp) - stwsp.n r4,0x7c(sp) diff --git a/gas/testsuite/gas/nios2/cdx_sub.d b/gas/testsuite/gas/nios2/cdx_sub.d deleted file mode 100644 index 54434b068bf..00000000000 --- a/gas/testsuite/gas/nios2/cdx_sub.d +++ /dev/null @@ -1,19 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX sub.n -#as: -march=r2 - -# Test the sub.n and subi.n instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> c901 sub.n r4,r4,r4 -0+0002 <[^>]*> 8911 subi.n r4,r4,1 -0+0004 <[^>]*> 9911 subi.n r4,r4,2 -0+0006 <[^>]*> a911 subi.n r4,r4,4 -0+0008 <[^>]*> b911 subi.n r4,r4,8 -0+000a <[^>]*> c911 subi.n r4,r4,16 -0+000c <[^>]*> d911 subi.n r4,r4,32 -0+000e <[^>]*> e911 subi.n r4,r4,64 -0+0010 <[^>]*> f911 subi.n r4,r4,128 - ... diff --git a/gas/testsuite/gas/nios2/cdx_sub.s b/gas/testsuite/gas/nios2/cdx_sub.s deleted file mode 100644 index 53470ee712e..00000000000 --- a/gas/testsuite/gas/nios2/cdx_sub.s +++ /dev/null @@ -1,12 +0,0 @@ -# Source file used to test the sub and subi instructions. - -foo: - sub.n r4,r4,r4 - subi.n r4,r4,1 - subi.n r4,r4,2 - subi.n r4,r4,4 - subi.n r4,r4,8 - subi.n r4,r4,16 - subi.n r4,r4,32 - subi.n r4,r4,64 - subi.n r4,r4,128 diff --git a/gas/testsuite/gas/nios2/cdx_trap.d b/gas/testsuite/gas/nios2/cdx_trap.d deleted file mode 100644 index bd65d012cfd..00000000000 --- a/gas/testsuite/gas/nios2/cdx_trap.d +++ /dev/null @@ -1,11 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX trap -#as: -march=r2 - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> d009 trap.n 0 -0+0002 <[^>]*> d009 trap.n 0 -0+0004 <[^>]*> d7c9 trap.n 31 -0+0006 <[^>]*> d389 trap.n 14 diff --git a/gas/testsuite/gas/nios2/cdx_trap.s b/gas/testsuite/gas/nios2/cdx_trap.s deleted file mode 100644 index 1714edbe80f..00000000000 --- a/gas/testsuite/gas/nios2/cdx_trap.s +++ /dev/null @@ -1,8 +0,0 @@ -# Source file used to test the CDX trap.n instructions -foo: - trap.n - trap.n 0 - trap.n 31 - trap.n 14 - - diff --git a/gas/testsuite/gas/nios2/cdx_xor.d b/gas/testsuite/gas/nios2/cdx_xor.d deleted file mode 100644 index fa47dbfd557..00000000000 --- a/gas/testsuite/gas/nios2/cdx_xor.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 CDX xor.n -#as: -march=r2 - -# Test the xor.n instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 3909 xor.n r4,r4,r4 -0+0002 <[^>]*> 3e49 xor.n r17,r17,r7 -0+0004 <[^>]*> 33c9 xor.n r7,r7,r17 -0+0006 <[^>]*> 3fc9 xor.n r7,r7,r7 diff --git a/gas/testsuite/gas/nios2/cdx_xor.s b/gas/testsuite/gas/nios2/cdx_xor.s deleted file mode 100644 index 20e9776c5c7..00000000000 --- a/gas/testsuite/gas/nios2/cdx_xor.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the xor.n instructions. - -foo: - xor.n r4,r4,r4 - xor.n r17,r17,r7 - xor.n r7,r7,r17 - xor.n r7,r7,r7 diff --git a/gas/testsuite/gas/nios2/cmp-r2.d b/gas/testsuite/gas/nios2/cmp-r2.d deleted file mode 100644 index 247bdf2ef7a..00000000000 --- a/gas/testsuite/gas/nios2/cmp-r2.d +++ /dev/null @@ -1,26 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 cmp -#as: -march=r2 -#source: cmp.s - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> a00b18a0 cmpeq r11,r2,r3 -0+0004 <[^>]*> 400b18a0 cmpge r11,r2,r3 -0+0008 <[^>]*> c00b18a0 cmpgeu r11,r2,r3 -0+000c <[^>]*> 600b18a0 cmplt r11,r2,r3 -0+0010 <[^>]*> e00b18a0 cmpltu r11,r2,r3 -0+0014 <[^>]*> 800b18a0 cmpne r11,r2,r3 -0+0018 <[^>]*> 00005896 cmpgei r11,r2,0 -[ ]*18: R_NIOS2_S16 value -0+001c <[^>]*> 000058b6 cmpgeui r11,r2,0 -[ ]*1c: R_NIOS2_U16 value\+0x200 -0+0020 <[^>]*> 0000589e cmplti r11,r2,0 -[ ]*20: R_NIOS2_S16 value -0+0024 <[^>]*> 000058be cmpltui r11,r2,0 -[ ]*24: R_NIOS2_U16 value\+0x200 -0+0028 <[^>]*> 7fff5896 cmpgei r11,r2,32767 -0+002c <[^>]*> 800058b6 cmpgeui r11,r2,32768 -0+0030 <[^>]*> 8000589e cmplti r11,r2,-32768 -0+0034 <[^>]*> ffff58be cmpltui r11,r2,65535 diff --git a/gas/testsuite/gas/nios2/cmp.d b/gas/testsuite/gas/nios2/cmp.d deleted file mode 100644 index bb588ebb618..00000000000 --- a/gas/testsuite/gas/nios2/cmp.d +++ /dev/null @@ -1,24 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 cmp - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 10d7003a cmpeq r11,r2,r3 -0+0004 <[^>]*> 10d6403a cmpge r11,r2,r3 -0+0008 <[^>]*> 10d7403a cmpgeu r11,r2,r3 -0+000c <[^>]*> 10d6803a cmplt r11,r2,r3 -0+0010 <[^>]*> 10d7803a cmpltu r11,r2,r3 -0+0014 <[^>]*> 10d6c03a cmpne r11,r2,r3 -0+0018 <[^>]*> 12c00008 cmpgei r11,r2,0 -[ ]*18: R_NIOS2_S16 value -0+001c <[^>]*> 12c00028 cmpgeui r11,r2,0 -[ ]*1c: R_NIOS2_U16 value\+0x200 -0+0020 <[^>]*> 12c00010 cmplti r11,r2,0 -[ ]*20: R_NIOS2_S16 value -0+0024 <[^>]*> 12c00030 cmpltui r11,r2,0 -[ ]*24: R_NIOS2_U16 value\+0x200 -0+0028 <[^>]*> 12dfffc8 cmpgei r11,r2,32767 -0+002c <[^>]*> 12e00028 cmpgeui r11,r2,32768 -0+0030 <[^>]*> 12e00010 cmplti r11,r2,-32768 -0+0034 <[^>]*> 12fffff0 cmpltui r11,r2,65535 diff --git a/gas/testsuite/gas/nios2/cmp.s b/gas/testsuite/gas/nios2/cmp.s deleted file mode 100644 index 6f7c15b443e..00000000000 --- a/gas/testsuite/gas/nios2/cmp.s +++ /dev/null @@ -1,22 +0,0 @@ -# Source file used to test the compare instructions -foo: - cmpeq r11,r2,r3 - cmpge r11,r2,r3 - cmpgeu r11,r2,r3 - cmplt r11,r2,r3 - cmpltu r11,r2,r3 - cmpne r11,r2,r3 -# test that cmp generates relocations correctly - cmpgei r11,r2,value - cmpgeui r11,r2,value+0x200 - cmplti r11,r2,value - cmpltui r11,r2,value+0x200 - - cmpgei r11,r2,0x7fff - cmpgeui r11,r2,0x8000 - cmplti r11,r2,-0x8000 - cmpltui r11,r2,0xFFFF -.global value - - - diff --git a/gas/testsuite/gas/nios2/comments-r2.d b/gas/testsuite/gas/nios2/comments-r2.d deleted file mode 100644 index 5511242d96a..00000000000 --- a/gas/testsuite/gas/nios2/comments-r2.d +++ /dev/null @@ -1,28 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 comments -#as: -march=r2 -#source: comments.s - -# Test the add instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00180002 br 0000001c <start> -0+0004 <[^>]*> 00000002 br 00000008 <abort> -0+0008 <[^>]*> 00001814 movui r3,0 -0+000c <[^>]*> 00011014 movui r2,1 -0+0010 <[^>]*> 00001814 movui r3,0 -0+0014 <[^>]*> 00001014 movui r2,0 -0+0018 <[^>]*> 00280002 br 00000044 <exit> -0+001c <[^>]*> fffc1084 addi r2,r2,-4 -0+0020 <[^>]*> 00015814 movui r11,1 -0+0024 <[^>]*> 00002814 movui r5,0 -0+0028 <[^>]*> 00003014 movui r6,0 -0+002c <[^>]*> 00000002 br 00000030 <ldst> -0+0030 <[^>]*> f00c1014 movui r2,61452 -0+0034 <[^>]*> facea014 movui r20,64206 -0+0038 <[^>]*> 0000a0b7 stw r20,0\(r2\) -0+003c <[^>]*> 0000a897 ldw r21,0\(r2\) -0+0040 <[^>]*> ffcc0002 br 00000010 <end> -0+0044 <[^>]*> fffc0002 br 00000044 <exit> diff --git a/gas/testsuite/gas/nios2/comments.d b/gas/testsuite/gas/nios2/comments.d deleted file mode 100644 index a116d876cd6..00000000000 --- a/gas/testsuite/gas/nios2/comments.d +++ /dev/null @@ -1,26 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 comments - -# Test the add instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00000606 br 0000001c <start> -0+0004 <[^>]*> 00000006 br 00000008 <abort> -0+0008 <[^>]*> 00c00014 movui r3,0 -0+000c <[^>]*> 00800054 movui r2,1 -0+0010 <[^>]*> 00c00014 movui r3,0 -0+0014 <[^>]*> 00800014 movui r2,0 -0+0018 <[^>]*> 00000a06 br 00000044 <exit> -0+001c <[^>]*> 10bfff04 addi r2,r2,-4 -0+0020 <[^>]*> 02c00054 movui r11,1 -0+0024 <[^>]*> 01400014 movui r5,0 -0+0028 <[^>]*> 01800014 movui r6,0 -0+002c <[^>]*> 00000006 br 00000030 <ldst> -0+0030 <[^>]*> 00bc0314 movui r2,61452 -0+0034 <[^>]*> 053eb394 movui r20,64206 -0+0038 <[^>]*> 15000015 stw r20,0\(r2\) -0+003c <[^>]*> 15400017 ldw r21,0\(r2\) -0+0040 <[^>]*> 003ff306 br 00000010 <end> -0+0044 <[^>]*> 003fff06 br 00000044 <exit> diff --git a/gas/testsuite/gas/nios2/comments.s b/gas/testsuite/gas/nios2/comments.s deleted file mode 100644 index 7ab2027829f..00000000000 --- a/gas/testsuite/gas/nios2/comments.s +++ /dev/null @@ -1,28 +0,0 @@ -.set norelax -_main: br start -trap: - br abort -.globl _main -abort: movui r3, 0x0 - movui r2, 0x1 - -end: movui r3, 0x0 - movui r2, 0x0 - br exit - -start: - addi r2, r2, -4 # test for ve numbers - movui r11, 0x1 - ori r5, r0, %lo(0x0) # r5 = 0x0 - ori r6, r0, %lo(0x0) # r6 = 0x0 - br ldst - -ldst: - movui r2, 0xF00C - movui r20, 0xFACE - stw r20,(r2) - ldw r21, (r2) - br end - - -exit: br exit diff --git a/gas/testsuite/gas/nios2/complex-r2.d b/gas/testsuite/gas/nios2/complex-r2.d deleted file mode 100644 index 8b51be1d773..00000000000 --- a/gas/testsuite/gas/nios2/complex-r2.d +++ /dev/null @@ -1,14 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 complex -#as: -march=r2 -#source: complex.s - -# Test complex expression parsing - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> ffff10d7 ldw r2,-1\(r3\) -0+0004 <[^>]*> 000110d7 ldw r2,1\(r3\) -0+0008 <[^>]*> 000010d7 ldw r2,0\(r3\) - 8: R_NIOS2_S16 stack_top-0x1 diff --git a/gas/testsuite/gas/nios2/complex.d b/gas/testsuite/gas/nios2/complex.d deleted file mode 100644 index 81224d828a5..00000000000 --- a/gas/testsuite/gas/nios2/complex.d +++ /dev/null @@ -1,12 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 complex - -# Test complex expression parsing - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 18bfffd7 ldw r2,-1\(r3\) -0+0004 <[^>]*> 18800057 ldw r2,1\(r3\) -0+0008 <[^>]*> 18800017 ldw r2,0\(r3\) - 8: R_NIOS2_S16 stack_top-0x1 diff --git a/gas/testsuite/gas/nios2/complex.s b/gas/testsuite/gas/nios2/complex.s deleted file mode 100644 index 65141f9d62a..00000000000 --- a/gas/testsuite/gas/nios2/complex.s +++ /dev/null @@ -1,5 +0,0 @@ -foo: - ldw r2, (2-3)(r3) - ldw r2, 2 + (2-3)(r3) - ldw r2, 2 + (stack_top-3)(r3) - diff --git a/gas/testsuite/gas/nios2/ctl-r2.d b/gas/testsuite/gas/nios2/ctl-r2.d deleted file mode 100644 index 27edd3defc6..00000000000 --- a/gas/testsuite/gas/nios2/ctl-r2.d +++ /dev/null @@ -1,22 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 ctl -#as: -march=r2 -#source: ctl.s - -# Test the ctl instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 9be80020 rdctl r8,ctl31 -0+0004 <[^>]*> 9bc80020 rdctl r8,ctl30 -0+0008 <[^>]*> 9ba80020 rdctl r8,ctl29 -0+000c <[^>]*> 98080020 rdctl r8,status -0+0010 <[^>]*> 98480020 rdctl r8,bstatus -0+0014 <[^>]*> 98280020 rdctl r8,estatus -0+0018 <[^>]*> bbe00220 wrctl ctl31,r8 -0+001c <[^>]*> bbc00220 wrctl ctl30,r8 -0+0020 <[^>]*> bba00220 wrctl ctl29,r8 -0+0024 <[^>]*> b8000220 wrctl status,r8 -0+0028 <[^>]*> b8400220 wrctl bstatus,r8 -0+002c <[^>]*> b8200220 wrctl estatus,r8 diff --git a/gas/testsuite/gas/nios2/ctl.d b/gas/testsuite/gas/nios2/ctl.d deleted file mode 100644 index ce7450a439d..00000000000 --- a/gas/testsuite/gas/nios2/ctl.d +++ /dev/null @@ -1,20 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 ctl - -# Test the ctl instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 001137fa rdctl r8,ctl31 -0+0004 <[^>]*> 001137ba rdctl r8,ctl30 -0+0008 <[^>]*> 0011377a rdctl r8,ctl29 -0+000c <[^>]*> 0011303a rdctl r8,status -0+0010 <[^>]*> 001130ba rdctl r8,bstatus -0+0014 <[^>]*> 0011307a rdctl r8,estatus -0+0018 <[^>]*> 400177fa wrctl ctl31,r8 -0+001c <[^>]*> 400177ba wrctl ctl30,r8 -0+0020 <[^>]*> 4001777a wrctl ctl29,r8 -0+0024 <[^>]*> 4001703a wrctl status,r8 -0+0028 <[^>]*> 400170ba wrctl bstatus,r8 -0+002c <[^>]*> 4001707a wrctl estatus,r8 diff --git a/gas/testsuite/gas/nios2/ctl.s b/gas/testsuite/gas/nios2/ctl.s deleted file mode 100644 index dc6c98399cf..00000000000 --- a/gas/testsuite/gas/nios2/ctl.s +++ /dev/null @@ -1,18 +0,0 @@ -# Source file used to test the nor instruction - -foo: - rdctl r8,ctl31 - rdctl r8,ctl30 - rdctl r8,ctl29 - rdctl r8,status - rdctl r8,bstatus - rdctl r8,estatus - wrctl ctl31,r8 - wrctl ctl30,r8 - wrctl ctl29,r8 - wrctl status,r8 - wrctl bstatus,r8 - wrctl estatus,r8 - - - diff --git a/gas/testsuite/gas/nios2/custom-r2.d b/gas/testsuite/gas/nios2/custom-r2.d deleted file mode 100644 index 005258e3eae..00000000000 --- a/gas/testsuite/gas/nios2/custom-r2.d +++ /dev/null @@ -1,15 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 custom -#as: -march=r2 -#source: custom.s - -# Test the custom instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00eb18b0 custom 0,r11,r2,r3 -0+0004 <[^>]*> ffeb18b0 custom 255,r11,r2,r3 -0+0008 <[^>]*> 966118b0 custom 150,c1,r2,r3 -0+000c <[^>]*> 184118b0 custom 24,c1,c2,r3 -0+0010 <[^>]*> 380118b0 custom 56,c1,c2,c3 diff --git a/gas/testsuite/gas/nios2/custom.d b/gas/testsuite/gas/nios2/custom.d deleted file mode 100644 index c7f7a1cd6b4..00000000000 --- a/gas/testsuite/gas/nios2/custom.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 custom - -# Test the custom instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 10d7c032 custom 0,r11,r2,r3 -0+0004 <[^>]*> 10d7fff2 custom 255,r11,r2,r3 -0+0008 <[^>]*> 10c3a5b2 custom 150,c1,r2,r3 -0+000c <[^>]*> 10c28632 custom 24,c1,c2,r3 -0+0010 <[^>]*> 10c20e32 custom 56,c1,c2,c3 diff --git a/gas/testsuite/gas/nios2/custom.s b/gas/testsuite/gas/nios2/custom.s deleted file mode 100644 index 903122ab45e..00000000000 --- a/gas/testsuite/gas/nios2/custom.s +++ /dev/null @@ -1,8 +0,0 @@ -# test progam for assembling user instructions - -foo: - custom 0, r11, r2, r3 - custom 255, r11, r2, r3 - custom 150, c1, r2, r3 - custom 0x18, c1, c2, r3 - custom 070, c1, c2, c3 diff --git a/gas/testsuite/gas/nios2/eni.d b/gas/testsuite/gas/nios2/eni.d deleted file mode 100644 index 905a72b161a..00000000000 --- a/gas/testsuite/gas/nios2/eni.d +++ /dev/null @@ -1,12 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 eni -#as: -march=r2 - -# Test the eni instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 20000020 eni 0 -0+0004 <[^>]*> 20000020 eni 0 -0+0008 <[^>]*> 20200020 eni 1 diff --git a/gas/testsuite/gas/nios2/eni.s b/gas/testsuite/gas/nios2/eni.s deleted file mode 100644 index 5c136c5f780..00000000000 --- a/gas/testsuite/gas/nios2/eni.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the eni instruction. - -foo: - eni - eni 0 - eni 1 -
\ No newline at end of file diff --git a/gas/testsuite/gas/nios2/etbt-r2.d b/gas/testsuite/gas/nios2/etbt-r2.d deleted file mode 100644 index d778f0b7d96..00000000000 --- a/gas/testsuite/gas/nios2/etbt-r2.d +++ /dev/null @@ -1,12 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 etbt -#as: -march=r2 -#source: etbt.s - -# Test the et, bt registers - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> c4183660 add et,bt,r6 -0+0004 <[^>]*> c4183660 add et,bt,r6 diff --git a/gas/testsuite/gas/nios2/etbt.d b/gas/testsuite/gas/nios2/etbt.d deleted file mode 100644 index f43eb9ccbcf..00000000000 --- a/gas/testsuite/gas/nios2/etbt.d +++ /dev/null @@ -1,10 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 etbt - -# Test the et, bt registers - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> c9b1883a add et,bt,r6 -0+0004 <[^>]*> c9b1883a add et,bt,r6 diff --git a/gas/testsuite/gas/nios2/etbt.s b/gas/testsuite/gas/nios2/etbt.s deleted file mode 100644 index 3e5fc24a3ed..00000000000 --- a/gas/testsuite/gas/nios2/etbt.s +++ /dev/null @@ -1,4 +0,0 @@ -.set nobreak -foo: - add r24, r25, r6 - add et, bt, r6 diff --git a/gas/testsuite/gas/nios2/flushda-r2.d b/gas/testsuite/gas/nios2/flushda-r2.d deleted file mode 100644 index 34444ee77a7..00000000000 --- a/gas/testsuite/gas/nios2/flushda-r2.d +++ /dev/null @@ -1,12 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 flushda -#as: -march=r2 -#source: flushda.s - -# Test the jmp instruction. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 300c18a8 flushda 12\(r2\) - diff --git a/gas/testsuite/gas/nios2/flushda.d b/gas/testsuite/gas/nios2/flushda.d deleted file mode 100644 index 3af1850bf9e..00000000000 --- a/gas/testsuite/gas/nios2/flushda.d +++ /dev/null @@ -1,10 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 flushda - -# Test the jmp instruction. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 1000031b flushda 12\(r2\) - diff --git a/gas/testsuite/gas/nios2/flushda.s b/gas/testsuite/gas/nios2/flushda.s deleted file mode 100644 index 3a3247484bd..00000000000 --- a/gas/testsuite/gas/nios2/flushda.s +++ /dev/null @@ -1,6 +0,0 @@ -# Source file used to test the flushda instruction. -.text -.set nobreak -foo: - flushda 12(r2) - diff --git a/gas/testsuite/gas/nios2/illegal.l b/gas/testsuite/gas/nios2/illegal.l deleted file mode 100644 index 6248567b955..00000000000 --- a/gas/testsuite/gas/nios2/illegal.l +++ /dev/null @@ -1,14 +0,0 @@ -.*illegal.s: Assembler messages: -.*illegal.s:5: Error: unknown register r56 -.*illegal.s:8: Error: expecting \( near 0x1000 -.*illegal.s:8: Error: missing argument -.*illegal.s:9: Error: expecting \) near r5 -.*illegal.s:10: Error: expecting \( near 0x1000r5\) -.*illegal.s:10: Error: missing argument -.*illegal.s:11: Error: expecting \( near 0x1000,r5 -.*illegal.s:11: Error: missing argument -.*illegal.s:12: Error: unknown register 0x1000 -.*illegal.s:14: Error: unrecognised instruction fop -.*illegal.s:16: Error: too many arguments -.*illegal.s:17: Error: too many arguments -.*illegal.s:17: Error: unknown register r2,r4 diff --git a/gas/testsuite/gas/nios2/illegal.s b/gas/testsuite/gas/nios2/illegal.s deleted file mode 100644 index 75b6d89f20e..00000000000 --- a/gas/testsuite/gas/nios2/illegal.s +++ /dev/null @@ -1,17 +0,0 @@ -# Source file used to test illegal operands. - -foo: -# Illegal registers - add r3,r4,r56 - add r4,r0,r2 -# Illegal syntax - ldw r4,0x1000 - ldw r4,0x1000(r5 - ldw r4,0x1000r5) - ldw r4,0x1000,r5 - ldw r4,(0x1000)r5 -# Illegal opcodes - fop r3,r4,r5 -# Extra operands - nop Crapola - add r2, r2, r2, r4 diff --git a/gas/testsuite/gas/nios2/illegal_pseudoinst.l b/gas/testsuite/gas/nios2/illegal_pseudoinst.l deleted file mode 100644 index 7d4ffdff59f..00000000000 --- a/gas/testsuite/gas/nios2/illegal_pseudoinst.l +++ /dev/null @@ -1,35 +0,0 @@ -.*illegal_pseudoinst.s: Assembler messages: -.*illegal_pseudoinst.s:5: Error: missing argument -.*illegal_pseudoinst.s:6: Error: expecting , near r2 -.*illegal_pseudoinst.s:6: Error: missing argument -.*illegal_pseudoinst.s:7: Error: missing argument -.*illegal_pseudoinst.s:8: Error: expecting , near r2 -.*illegal_pseudoinst.s:8: Error: missing argument -.*illegal_pseudoinst.s:9: Error: missing argument -.*illegal_pseudoinst.s:10: Error: missing argument -.*illegal_pseudoinst.s:11: Error: missing argument -.*illegal_pseudoinst.s:14: Error: missing argument -.*illegal_pseudoinst.s:15: Error: missing argument -.*illegal_pseudoinst.s:16: Error: expecting , near r2 -.*illegal_pseudoinst.s:16: Error: missing argument -.*illegal_pseudoinst.s:17: Error: missing argument -.*illegal_pseudoinst.s:18: Error: missing argument -.*illegal_pseudoinst.s:19: Error: missing argument -.*illegal_pseudoinst.s:22: Error: missing argument -.*illegal_pseudoinst.s:23: Error: missing argument -.*illegal_pseudoinst.s:24: Error: missing argument -.*illegal_pseudoinst.s:25: Error: missing argument -.*illegal_pseudoinst.s:26: Error: missing argument -.*illegal_pseudoinst.s:27: Error: missing argument -.*illegal_pseudoinst.s:28: Error: missing argument -.*illegal_pseudoinst.s:29: Error: missing argument -.*illegal_pseudoinst.s:30: Error: missing argument -.*illegal_pseudoinst.s:31: Error: missing argument -.*illegal_pseudoinst.s:34: Error: missing argument -.*illegal_pseudoinst.s:35: Error: missing argument -.*illegal_pseudoinst.s:36: Error: unknown register -.*illegal_pseudoinst.s:37: Error: missing argument -.*illegal_pseudoinst.s:38: Error: missing argument -.*illegal_pseudoinst.s:41: Error: missing argument -.*illegal_pseudoinst.s:42: Error: missing argument -.*illegal_pseudoinst.s:43: Error: missing argument diff --git a/gas/testsuite/gas/nios2/illegal_pseudoinst.s b/gas/testsuite/gas/nios2/illegal_pseudoinst.s deleted file mode 100644 index 94b48cbef9e..00000000000 --- a/gas/testsuite/gas/nios2/illegal_pseudoinst.s +++ /dev/null @@ -1,45 +0,0 @@ -# Source file used to test missing (and illegal) operands for pseudo-instructions. - -foo: -# nios2_modify_arg - cmpgti r2, r3, - cmpgtui r2, r2 - cmplei r2, r3, - cmpleui r2, r2 - cmpgti ,, - cmplei , - cmpleui - -# nios2_negate_arg - subi Lorem ipsum dolor sit amet, consectetur adipiscing elit, - subi r2, r2, - subi r2, r2 - subi ,, - subi , - subi - -# nios2_swap_args - bgt r0, r2, - bgtu ,, - ble , r0, - bleu foo,, - cmpgt r2, r3, - cmpgtu r2,, - cmple , r3, - cmpleu ,, - bgtu , - ble - -# nios2_insert_arg - movi , - movhi r0, - movui ,r2 - movia , - movi - -# nios2_append_arg - mov r0, - mov , - mov - - diff --git a/gas/testsuite/gas/nios2/jmp-r2.d b/gas/testsuite/gas/nios2/jmp-r2.d deleted file mode 100644 index b57a9b68b70..00000000000 --- a/gas/testsuite/gas/nios2/jmp-r2.d +++ /dev/null @@ -1,12 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 jmp -#as: -march=r2 -#source: jmp.s - -# Test the jmp instruction. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 34000660 jmp bt - diff --git a/gas/testsuite/gas/nios2/jmp.d b/gas/testsuite/gas/nios2/jmp.d deleted file mode 100644 index 8a8309d54da..00000000000 --- a/gas/testsuite/gas/nios2/jmp.d +++ /dev/null @@ -1,10 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 jmp - -# Test the jmp instruction. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> c800683a jmp bt - diff --git a/gas/testsuite/gas/nios2/jmp.s b/gas/testsuite/gas/nios2/jmp.s deleted file mode 100644 index 8d859f2b6c4..00000000000 --- a/gas/testsuite/gas/nios2/jmp.s +++ /dev/null @@ -1,6 +0,0 @@ -# Source file used to test the jmp instruction. -.text -.set nobreak -foo: - jmp r25 - diff --git a/gas/testsuite/gas/nios2/ldb-r2.d b/gas/testsuite/gas/nios2/ldb-r2.d deleted file mode 100644 index 76989fa6267..00000000000 --- a/gas/testsuite/gas/nios2/ldb-r2.d +++ /dev/null @@ -1,197 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 ldb -#as: -march=r2 - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00002007 ldb r4,0\(zero\) -0+0004 <[^>]*> 00042007 ldb r4,4\(zero\) -0+0008 <[^>]*> 7ffc2007 ldb r4,32764\(zero\) -0+000c <[^>]*> 80002007 ldb r4,-32768\(zero\) -0+0010 <[^>]*> 00002147 ldb r4,0\(r5\) -0+0014 <[^>]*> 00042147 ldb r4,4\(r5\) -0+0018 <[^>]*> 7ffc2147 ldb r4,32764\(r5\) -0+001c <[^>]*> 80002147 ldb r4,-32768\(r5\) -0+0020 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x4000 -0+003c <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x4004 -0+0058 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x8000 -0+005c <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000 -0+0060 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000 -0+0064 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x8000 -0+0068 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x8000 -0+006c <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x8000 -0+0070 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x4000 -0+0074 <[^>]*> 00002007 ldb r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x4000 -0+0094 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x4004 -0+00b0 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x8000 -0+00b4 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000 -0+00b8 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000 -0+00bc <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x8000 -0+00c0 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x8000 -0+00c4 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x8000 -0+00c8 <[^>]*> 00002147 ldb r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x4000 -0+00cc <[^>]*> 00002028 ldbio r4,0\(zero\) -0+00d0 <[^>]*> 00042028 ldbio r4,4\(zero\) -0+00d4 <[^>]*> 07fc2028 ldbio r4,2044\(zero\) -0+00d8 <[^>]*> 08002028 ldbio r4,-2048\(zero\) -0+00dc <[^>]*> 00002168 ldbio r4,0\(r5\) -0+00e0 <[^>]*> 00042168 ldbio r4,4\(r5\) -0+00e4 <[^>]*> 07fc2168 ldbio r4,2044\(r5\) -0+00e8 <[^>]*> 08002168 ldbio r4,-2048\(r5\) -0+00ec <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*ec: R_NIOS2_R2_S12 .data -0+00f0 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*f0: R_NIOS2_R2_S12 big_external_data_label -0+00f4 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*f4: R_NIOS2_R2_S12 small_external_data_label -0+00f8 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*f8: R_NIOS2_R2_S12 big_external_common -0+00fc <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*fc: R_NIOS2_R2_S12 small_external_common -0+0100 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*100: R_NIOS2_R2_S12 .bss -0+0104 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*104: R_NIOS2_R2_S12 .bss\+0x4000 -0+0108 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*108: R_NIOS2_R2_S12 .data\+0x4 -0+010c <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*10c: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0110 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*110: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+0114 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*114: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0118 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*118: R_NIOS2_R2_S12 small_external_common\+0x4 -0+011c <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*11c: R_NIOS2_R2_S12 .bss\+0x4 -0+0120 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*120: R_NIOS2_R2_S12 .bss\+0x4004 -0+0124 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*124: R_NIOS2_R2_S12 .data-0x800 -0+0128 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*128: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+012c <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*12c: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0130 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*130: R_NIOS2_R2_S12 big_external_common-0x800 -0+0134 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*134: R_NIOS2_R2_S12 small_external_common-0x800 -0+0138 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*138: R_NIOS2_R2_S12 .bss-0x800 -0+013c <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*13c: R_NIOS2_R2_S12 .bss\+0x3800 -0+0140 <[^>]*> 00002028 ldbio r4,0\(zero\) -[ ]*140: R_NIOS2_R2_S12 .data\+0x10000 -0+0144 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*144: R_NIOS2_R2_S12 .data -0+0148 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*148: R_NIOS2_R2_S12 big_external_data_label -0+014c <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*14c: R_NIOS2_R2_S12 small_external_data_label -0+0150 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*150: R_NIOS2_R2_S12 big_external_common -0+0154 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*154: R_NIOS2_R2_S12 small_external_common -0+0158 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*158: R_NIOS2_R2_S12 .bss -0+015c <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*15c: R_NIOS2_R2_S12 .bss\+0x4000 -0+0160 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*160: R_NIOS2_R2_S12 .data\+0x4 -0+0164 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*164: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0168 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*168: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+016c <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*16c: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0170 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*170: R_NIOS2_R2_S12 small_external_common\+0x4 -0+0174 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*174: R_NIOS2_R2_S12 .bss\+0x4 -0+0178 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*178: R_NIOS2_R2_S12 .bss\+0x4004 -0+017c <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*17c: R_NIOS2_R2_S12 .data-0x800 -0+0180 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*180: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+0184 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*184: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0188 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*188: R_NIOS2_R2_S12 big_external_common-0x800 -0+018c <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*18c: R_NIOS2_R2_S12 small_external_common-0x800 -0+0190 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*190: R_NIOS2_R2_S12 .bss-0x800 -0+0194 <[^>]*> 00002168 ldbio r4,0\(r5\) -[ ]*194: R_NIOS2_R2_S12 .bss\+0x3800 diff --git a/gas/testsuite/gas/nios2/ldb-r2.s b/gas/testsuite/gas/nios2/ldb-r2.s deleted file mode 100644 index 8d567bf073f..00000000000 --- a/gas/testsuite/gas/nios2/ldb-r2.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x4000 - .extern small_external_data_label,4 - .comm big_external_common,0x4000 - .comm small_external_common,4 - .lcomm big_local_common,0x4000 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - ldb r4,0(r0) - ldb r4,4(r0) - ldb r4,0x7ffc(r0) - ldb r4,-0x8000(r0) - ldb r4,0(r5) - ldb r4,4(r5) - ldb r4,0x7ffc(r5) - ldb r4,-0x8000(r5) - ldb r4,data_label(r0) - ldb r4,big_external_data_label(r0) - ldb r4,small_external_data_label(r0) - ldb r4,big_external_common(r0) - ldb r4,small_external_common(r0) - ldb r4,big_local_common(r0) - ldb r4,small_local_common(r0) - ldb r4,data_label+4(r0) - ldb r4,big_external_data_label+4(r0) - ldb r4,small_external_data_label+4(r0) - ldb r4,big_external_common+4(r0) - ldb r4,small_external_common+4(r0) - ldb r4,big_local_common+4(r0) - ldb r4,small_local_common+4(r0) - ldb r4,data_label-0x8000(r0) - ldb r4,big_external_data_label-0x8000(r0) - ldb r4,small_external_data_label-0x8000(r0) - ldb r4,big_external_common-0x8000(r0) - ldb r4,small_external_common-0x8000(r0) - ldb r4,big_local_common-0x8000(r0) - ldb r4,small_local_common-0x8000(r0) - ldb r4,data_label+0x10000(r0) - ldb r4,data_label(r5) - ldb r4,big_external_data_label(r5) - ldb r4,small_external_data_label(r5) - ldb r4,big_external_common(r5) - ldb r4,small_external_common(r5) - ldb r4,big_local_common(r5) - ldb r4,small_local_common(r5) - ldb r4,data_label+4(r5) - ldb r4,big_external_data_label+4(r5) - ldb r4,small_external_data_label+4(r5) - ldb r4,big_external_common+4(r5) - ldb r4,small_external_common+4(r5) - ldb r4,big_local_common+4(r5) - ldb r4,small_local_common+4(r5) - ldb r4,data_label-0x8000(r5) - ldb r4,big_external_data_label-0x8000(r5) - ldb r4,small_external_data_label-0x8000(r5) - ldb r4,big_external_common-0x8000(r5) - ldb r4,small_external_common-0x8000(r5) - ldb r4,big_local_common-0x8000(r5) - ldb r4,small_local_common-0x8000(r5) - - ldbio r4,0(r0) - ldbio r4,4(r0) - ldbio r4,0x7fc(r0) - ldbio r4,-0x800(r0) - ldbio r4,0(r5) - ldbio r4,4(r5) - ldbio r4,0x7fc(r5) - ldbio r4,-0x800(r5) - ldbio r4,data_label(r0) - ldbio r4,big_external_data_label(r0) - ldbio r4,small_external_data_label(r0) - ldbio r4,big_external_common(r0) - ldbio r4,small_external_common(r0) - ldbio r4,big_local_common(r0) - ldbio r4,small_local_common(r0) - ldbio r4,data_label+4(r0) - ldbio r4,big_external_data_label+4(r0) - ldbio r4,small_external_data_label+4(r0) - ldbio r4,big_external_common+4(r0) - ldbio r4,small_external_common+4(r0) - ldbio r4,big_local_common+4(r0) - ldbio r4,small_local_common+4(r0) - ldbio r4,data_label-0x800(r0) - ldbio r4,big_external_data_label-0x800(r0) - ldbio r4,small_external_data_label-0x800(r0) - ldbio r4,big_external_common-0x800(r0) - ldbio r4,small_external_common-0x800(r0) - ldbio r4,big_local_common-0x800(r0) - ldbio r4,small_local_common-0x800(r0) - ldbio r4,data_label+0x10000(r0) - ldbio r4,data_label(r5) - ldbio r4,big_external_data_label(r5) - ldbio r4,small_external_data_label(r5) - ldbio r4,big_external_common(r5) - ldbio r4,small_external_common(r5) - ldbio r4,big_local_common(r5) - ldbio r4,small_local_common(r5) - ldbio r4,data_label+4(r5) - ldbio r4,big_external_data_label+4(r5) - ldbio r4,small_external_data_label+4(r5) - ldbio r4,big_external_common+4(r5) - ldbio r4,small_external_common+4(r5) - ldbio r4,big_local_common+4(r5) - ldbio r4,small_local_common+4(r5) - ldbio r4,data_label-0x800(r5) - ldbio r4,big_external_data_label-0x800(r5) - ldbio r4,small_external_data_label-0x800(r5) - ldbio r4,big_external_common-0x800(r5) - ldbio r4,small_external_common-0x800(r5) - ldbio r4,big_local_common-0x800(r5) - ldbio r4,small_local_common-0x800(r5) diff --git a/gas/testsuite/gas/nios2/ldb.d b/gas/testsuite/gas/nios2/ldb.d deleted file mode 100644 index 25ad6b417d1..00000000000 --- a/gas/testsuite/gas/nios2/ldb.d +++ /dev/null @@ -1,196 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 ldb - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 01000007 ldb r4,0\(zero\) -0+0004 <[^>]*> 01000107 ldb r4,4\(zero\) -0+0008 <[^>]*> 011fff07 ldb r4,32764\(zero\) -0+000c <[^>]*> 01200007 ldb r4,-32768\(zero\) -0+0010 <[^>]*> 29000007 ldb r4,0\(r5\) -0+0014 <[^>]*> 29000107 ldb r4,4\(r5\) -0+0018 <[^>]*> 291fff07 ldb r4,32764\(r5\) -0+001c <[^>]*> 29200007 ldb r4,-32768\(r5\) -0+0020 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x4000 -0+003c <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x4004 -0+0058 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x8000 -0+005c <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000 -0+0060 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000 -0+0064 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x8000 -0+0068 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x8000 -0+006c <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x8000 -0+0070 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x4000 -0+0074 <[^>]*> 01000007 ldb r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x4000 -0+0094 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x4004 -0+00b0 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x8000 -0+00b4 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000 -0+00b8 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000 -0+00bc <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x8000 -0+00c0 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x8000 -0+00c4 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x8000 -0+00c8 <[^>]*> 29000007 ldb r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x4000 -0+00cc <[^>]*> 01000027 ldbio r4,0\(zero\) -0+00d0 <[^>]*> 01000127 ldbio r4,4\(zero\) -0+00d4 <[^>]*> 011fff27 ldbio r4,32764\(zero\) -0+00d8 <[^>]*> 01200027 ldbio r4,-32768\(zero\) -0+00dc <[^>]*> 29000027 ldbio r4,0\(r5\) -0+00e0 <[^>]*> 29000127 ldbio r4,4\(r5\) -0+00e4 <[^>]*> 291fff27 ldbio r4,32764\(r5\) -0+00e8 <[^>]*> 29200027 ldbio r4,-32768\(r5\) -0+00ec <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*ec: R_NIOS2_S16 .data -0+00f0 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*f0: R_NIOS2_S16 big_external_data_label -0+00f4 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*f4: R_NIOS2_S16 small_external_data_label -0+00f8 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*f8: R_NIOS2_S16 big_external_common -0+00fc <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*fc: R_NIOS2_S16 small_external_common -0+0100 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*100: R_NIOS2_S16 .bss -0+0104 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*104: R_NIOS2_S16 .bss\+0x4000 -0+0108 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*108: R_NIOS2_S16 .data\+0x4 -0+010c <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4 -0+0110 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4 -0+0114 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*114: R_NIOS2_S16 big_external_common\+0x4 -0+0118 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*118: R_NIOS2_S16 small_external_common\+0x4 -0+011c <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*11c: R_NIOS2_S16 .bss\+0x4 -0+0120 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*120: R_NIOS2_S16 .bss\+0x4004 -0+0124 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*124: R_NIOS2_S16 .data-0x8000 -0+0128 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000 -0+012c <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000 -0+0130 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*130: R_NIOS2_S16 big_external_common-0x8000 -0+0134 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*134: R_NIOS2_S16 small_external_common-0x8000 -0+0138 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*138: R_NIOS2_S16 .bss-0x8000 -0+013c <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*13c: R_NIOS2_S16 .bss-0x4000 -0+0140 <[^>]*> 01000027 ldbio r4,0\(zero\) -[ ]*140: R_NIOS2_S16 .data\+0x10000 -0+0144 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*144: R_NIOS2_S16 .data -0+0148 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*148: R_NIOS2_S16 big_external_data_label -0+014c <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*14c: R_NIOS2_S16 small_external_data_label -0+0150 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*150: R_NIOS2_S16 big_external_common -0+0154 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*154: R_NIOS2_S16 small_external_common -0+0158 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*158: R_NIOS2_S16 .bss -0+015c <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*15c: R_NIOS2_S16 .bss\+0x4000 -0+0160 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*160: R_NIOS2_S16 .data\+0x4 -0+0164 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4 -0+0168 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4 -0+016c <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*16c: R_NIOS2_S16 big_external_common\+0x4 -0+0170 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*170: R_NIOS2_S16 small_external_common\+0x4 -0+0174 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*174: R_NIOS2_S16 .bss\+0x4 -0+0178 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*178: R_NIOS2_S16 .bss\+0x4004 -0+017c <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*17c: R_NIOS2_S16 .data-0x8000 -0+0180 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000 -0+0184 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000 -0+0188 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*188: R_NIOS2_S16 big_external_common-0x8000 -0+018c <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*18c: R_NIOS2_S16 small_external_common-0x8000 -0+0190 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*190: R_NIOS2_S16 .bss-0x8000 -0+0194 <[^>]*> 29000027 ldbio r4,0\(r5\) -[ ]*194: R_NIOS2_S16 .bss-0x4000 diff --git a/gas/testsuite/gas/nios2/ldb.s b/gas/testsuite/gas/nios2/ldb.s deleted file mode 100644 index 71c51f18578..00000000000 --- a/gas/testsuite/gas/nios2/ldb.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x4000 - .extern small_external_data_label,4 - .comm big_external_common,0x4000 - .comm small_external_common,4 - .lcomm big_local_common,0x4000 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - ldb r4,0(r0) - ldb r4,4(r0) - ldb r4,0x7ffc(r0) - ldb r4,-0x8000(r0) - ldb r4,0(r5) - ldb r4,4(r5) - ldb r4,0x7ffc(r5) - ldb r4,-0x8000(r5) - ldb r4,data_label(r0) - ldb r4,big_external_data_label(r0) - ldb r4,small_external_data_label(r0) - ldb r4,big_external_common(r0) - ldb r4,small_external_common(r0) - ldb r4,big_local_common(r0) - ldb r4,small_local_common(r0) - ldb r4,data_label+4(r0) - ldb r4,big_external_data_label+4(r0) - ldb r4,small_external_data_label+4(r0) - ldb r4,big_external_common+4(r0) - ldb r4,small_external_common+4(r0) - ldb r4,big_local_common+4(r0) - ldb r4,small_local_common+4(r0) - ldb r4,data_label-0x8000(r0) - ldb r4,big_external_data_label-0x8000(r0) - ldb r4,small_external_data_label-0x8000(r0) - ldb r4,big_external_common-0x8000(r0) - ldb r4,small_external_common-0x8000(r0) - ldb r4,big_local_common-0x8000(r0) - ldb r4,small_local_common-0x8000(r0) - ldb r4,data_label+0x10000(r0) - ldb r4,data_label(r5) - ldb r4,big_external_data_label(r5) - ldb r4,small_external_data_label(r5) - ldb r4,big_external_common(r5) - ldb r4,small_external_common(r5) - ldb r4,big_local_common(r5) - ldb r4,small_local_common(r5) - ldb r4,data_label+4(r5) - ldb r4,big_external_data_label+4(r5) - ldb r4,small_external_data_label+4(r5) - ldb r4,big_external_common+4(r5) - ldb r4,small_external_common+4(r5) - ldb r4,big_local_common+4(r5) - ldb r4,small_local_common+4(r5) - ldb r4,data_label-0x8000(r5) - ldb r4,big_external_data_label-0x8000(r5) - ldb r4,small_external_data_label-0x8000(r5) - ldb r4,big_external_common-0x8000(r5) - ldb r4,small_external_common-0x8000(r5) - ldb r4,big_local_common-0x8000(r5) - ldb r4,small_local_common-0x8000(r5) - - ldbio r4,0(r0) - ldbio r4,4(r0) - ldbio r4,0x7ffc(r0) - ldbio r4,-0x8000(r0) - ldbio r4,0(r5) - ldbio r4,4(r5) - ldbio r4,0x7ffc(r5) - ldbio r4,-0x8000(r5) - ldbio r4,data_label(r0) - ldbio r4,big_external_data_label(r0) - ldbio r4,small_external_data_label(r0) - ldbio r4,big_external_common(r0) - ldbio r4,small_external_common(r0) - ldbio r4,big_local_common(r0) - ldbio r4,small_local_common(r0) - ldbio r4,data_label+4(r0) - ldbio r4,big_external_data_label+4(r0) - ldbio r4,small_external_data_label+4(r0) - ldbio r4,big_external_common+4(r0) - ldbio r4,small_external_common+4(r0) - ldbio r4,big_local_common+4(r0) - ldbio r4,small_local_common+4(r0) - ldbio r4,data_label-0x8000(r0) - ldbio r4,big_external_data_label-0x8000(r0) - ldbio r4,small_external_data_label-0x8000(r0) - ldbio r4,big_external_common-0x8000(r0) - ldbio r4,small_external_common-0x8000(r0) - ldbio r4,big_local_common-0x8000(r0) - ldbio r4,small_local_common-0x8000(r0) - ldbio r4,data_label+0x10000(r0) - ldbio r4,data_label(r5) - ldbio r4,big_external_data_label(r5) - ldbio r4,small_external_data_label(r5) - ldbio r4,big_external_common(r5) - ldbio r4,small_external_common(r5) - ldbio r4,big_local_common(r5) - ldbio r4,small_local_common(r5) - ldbio r4,data_label+4(r5) - ldbio r4,big_external_data_label+4(r5) - ldbio r4,small_external_data_label+4(r5) - ldbio r4,big_external_common+4(r5) - ldbio r4,small_external_common+4(r5) - ldbio r4,big_local_common+4(r5) - ldbio r4,small_local_common+4(r5) - ldbio r4,data_label-0x8000(r5) - ldbio r4,big_external_data_label-0x8000(r5) - ldbio r4,small_external_data_label-0x8000(r5) - ldbio r4,big_external_common-0x8000(r5) - ldbio r4,small_external_common-0x8000(r5) - ldbio r4,big_local_common-0x8000(r5) - ldbio r4,small_local_common-0x8000(r5) diff --git a/gas/testsuite/gas/nios2/ldh-r2.d b/gas/testsuite/gas/nios2/ldh-r2.d deleted file mode 100644 index d62f2c8b0d9..00000000000 --- a/gas/testsuite/gas/nios2/ldh-r2.d +++ /dev/null @@ -1,197 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 ldh -#as: -march=r2 - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0000200f ldh r4,0\(zero\) -0+0004 <[^>]*> 0004200f ldh r4,4\(zero\) -0+0008 <[^>]*> 07fc200f ldh r4,2044\(zero\) -0+000c <[^>]*> f800200f ldh r4,-2048\(zero\) -0+0010 <[^>]*> 0000214f ldh r4,0\(r5\) -0+0014 <[^>]*> 0004214f ldh r4,4\(r5\) -0+0018 <[^>]*> 07fc214f ldh r4,2044\(r5\) -0+001c <[^>]*> f800214f ldh r4,-2048\(r5\) -0+0020 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x400 -0+003c <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x404 -0+0058 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x800 -0+005c <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x800 -0+0060 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x800 -0+0064 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x800 -0+0068 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x800 -0+006c <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x800 -0+0070 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x400 -0+0074 <[^>]*> 0000200f ldh r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x400 -0+0094 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x404 -0+00b0 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x800 -0+00b4 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x800 -0+00b8 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x800 -0+00bc <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x800 -0+00c0 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x800 -0+00c4 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x800 -0+00c8 <[^>]*> 0000214f ldh r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x400 -0+00cc <[^>]*> 40002028 ldhio r4,0\(zero\) -0+00d0 <[^>]*> 40042028 ldhio r4,4\(zero\) -0+00d4 <[^>]*> 47fc2028 ldhio r4,2044\(zero\) -0+00d8 <[^>]*> 48002028 ldhio r4,-2048\(zero\) -0+00dc <[^>]*> 40002168 ldhio r4,0\(r5\) -0+00e0 <[^>]*> 40042168 ldhio r4,4\(r5\) -0+00e4 <[^>]*> 47fc2168 ldhio r4,2044\(r5\) -0+00e8 <[^>]*> 48002168 ldhio r4,-2048\(r5\) -0+00ec <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*ec: R_NIOS2_R2_S12 .data -0+00f0 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*f0: R_NIOS2_R2_S12 big_external_data_label -0+00f4 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*f4: R_NIOS2_R2_S12 small_external_data_label -0+00f8 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*f8: R_NIOS2_R2_S12 big_external_common -0+00fc <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*fc: R_NIOS2_R2_S12 small_external_common -0+0100 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*100: R_NIOS2_R2_S12 .bss -0+0104 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*104: R_NIOS2_R2_S12 .bss\+0x400 -0+0108 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*108: R_NIOS2_R2_S12 .data\+0x4 -0+010c <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*10c: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0110 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*110: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+0114 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*114: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0118 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*118: R_NIOS2_R2_S12 small_external_common\+0x4 -0+011c <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*11c: R_NIOS2_R2_S12 .bss\+0x4 -0+0120 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*120: R_NIOS2_R2_S12 .bss\+0x404 -0+0124 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*124: R_NIOS2_R2_S12 .data-0x800 -0+0128 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*128: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+012c <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*12c: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0130 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*130: R_NIOS2_R2_S12 big_external_common-0x800 -0+0134 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*134: R_NIOS2_R2_S12 small_external_common-0x800 -0+0138 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*138: R_NIOS2_R2_S12 .bss-0x800 -0+013c <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*13c: R_NIOS2_R2_S12 .bss-0x400 -0+0140 <[^>]*> 40002028 ldhio r4,0\(zero\) -[ ]*140: R_NIOS2_R2_S12 .data\+0x10000 -0+0144 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*144: R_NIOS2_R2_S12 .data -0+0148 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*148: R_NIOS2_R2_S12 big_external_data_label -0+014c <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*14c: R_NIOS2_R2_S12 small_external_data_label -0+0150 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*150: R_NIOS2_R2_S12 big_external_common -0+0154 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*154: R_NIOS2_R2_S12 small_external_common -0+0158 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*158: R_NIOS2_R2_S12 .bss -0+015c <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*15c: R_NIOS2_R2_S12 .bss\+0x400 -0+0160 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*160: R_NIOS2_R2_S12 .data\+0x4 -0+0164 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*164: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0168 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*168: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+016c <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*16c: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0170 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*170: R_NIOS2_R2_S12 small_external_common\+0x4 -0+0174 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*174: R_NIOS2_R2_S12 .bss\+0x4 -0+0178 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*178: R_NIOS2_R2_S12 .bss\+0x404 -0+017c <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*17c: R_NIOS2_R2_S12 .data-0x800 -0+0180 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*180: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+0184 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*184: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0188 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*188: R_NIOS2_R2_S12 big_external_common-0x800 -0+018c <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*18c: R_NIOS2_R2_S12 small_external_common-0x800 -0+0190 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*190: R_NIOS2_R2_S12 .bss-0x800 -0+0194 <[^>]*> 40002168 ldhio r4,0\(r5\) -[ ]*194: R_NIOS2_R2_S12 .bss-0x400 diff --git a/gas/testsuite/gas/nios2/ldh-r2.s b/gas/testsuite/gas/nios2/ldh-r2.s deleted file mode 100644 index 04098f4c5df..00000000000 --- a/gas/testsuite/gas/nios2/ldh-r2.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x400 - .extern small_external_data_label,4 - .comm big_external_common,0x400 - .comm small_external_common,4 - .lcomm big_local_common,0x400 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - ldh r4,0(r0) - ldh r4,4(r0) - ldh r4,0x7fc(r0) - ldh r4,-0x800(r0) - ldh r4,0(r5) - ldh r4,4(r5) - ldh r4,0x7fc(r5) - ldh r4,-0x800(r5) - ldh r4,data_label(r0) - ldh r4,big_external_data_label(r0) - ldh r4,small_external_data_label(r0) - ldh r4,big_external_common(r0) - ldh r4,small_external_common(r0) - ldh r4,big_local_common(r0) - ldh r4,small_local_common(r0) - ldh r4,data_label+4(r0) - ldh r4,big_external_data_label+4(r0) - ldh r4,small_external_data_label+4(r0) - ldh r4,big_external_common+4(r0) - ldh r4,small_external_common+4(r0) - ldh r4,big_local_common+4(r0) - ldh r4,small_local_common+4(r0) - ldh r4,data_label-0x800(r0) - ldh r4,big_external_data_label-0x800(r0) - ldh r4,small_external_data_label-0x800(r0) - ldh r4,big_external_common-0x800(r0) - ldh r4,small_external_common-0x800(r0) - ldh r4,big_local_common-0x800(r0) - ldh r4,small_local_common-0x800(r0) - ldh r4,data_label+0x10000(r0) - ldh r4,data_label(r5) - ldh r4,big_external_data_label(r5) - ldh r4,small_external_data_label(r5) - ldh r4,big_external_common(r5) - ldh r4,small_external_common(r5) - ldh r4,big_local_common(r5) - ldh r4,small_local_common(r5) - ldh r4,data_label+4(r5) - ldh r4,big_external_data_label+4(r5) - ldh r4,small_external_data_label+4(r5) - ldh r4,big_external_common+4(r5) - ldh r4,small_external_common+4(r5) - ldh r4,big_local_common+4(r5) - ldh r4,small_local_common+4(r5) - ldh r4,data_label-0x800(r5) - ldh r4,big_external_data_label-0x800(r5) - ldh r4,small_external_data_label-0x800(r5) - ldh r4,big_external_common-0x800(r5) - ldh r4,small_external_common-0x800(r5) - ldh r4,big_local_common-0x800(r5) - ldh r4,small_local_common-0x800(r5) - - ldhio r4,0(r0) - ldhio r4,4(r0) - ldhio r4,0x7fc(r0) - ldhio r4,-0x800(r0) - ldhio r4,0(r5) - ldhio r4,4(r5) - ldhio r4,0x7fc(r5) - ldhio r4,-0x800(r5) - ldhio r4,data_label(r0) - ldhio r4,big_external_data_label(r0) - ldhio r4,small_external_data_label(r0) - ldhio r4,big_external_common(r0) - ldhio r4,small_external_common(r0) - ldhio r4,big_local_common(r0) - ldhio r4,small_local_common(r0) - ldhio r4,data_label+4(r0) - ldhio r4,big_external_data_label+4(r0) - ldhio r4,small_external_data_label+4(r0) - ldhio r4,big_external_common+4(r0) - ldhio r4,small_external_common+4(r0) - ldhio r4,big_local_common+4(r0) - ldhio r4,small_local_common+4(r0) - ldhio r4,data_label-0x800(r0) - ldhio r4,big_external_data_label-0x800(r0) - ldhio r4,small_external_data_label-0x800(r0) - ldhio r4,big_external_common-0x800(r0) - ldhio r4,small_external_common-0x800(r0) - ldhio r4,big_local_common-0x800(r0) - ldhio r4,small_local_common-0x800(r0) - ldhio r4,data_label+0x10000(r0) - ldhio r4,data_label(r5) - ldhio r4,big_external_data_label(r5) - ldhio r4,small_external_data_label(r5) - ldhio r4,big_external_common(r5) - ldhio r4,small_external_common(r5) - ldhio r4,big_local_common(r5) - ldhio r4,small_local_common(r5) - ldhio r4,data_label+4(r5) - ldhio r4,big_external_data_label+4(r5) - ldhio r4,small_external_data_label+4(r5) - ldhio r4,big_external_common+4(r5) - ldhio r4,small_external_common+4(r5) - ldhio r4,big_local_common+4(r5) - ldhio r4,small_local_common+4(r5) - ldhio r4,data_label-0x800(r5) - ldhio r4,big_external_data_label-0x800(r5) - ldhio r4,small_external_data_label-0x800(r5) - ldhio r4,big_external_common-0x800(r5) - ldhio r4,small_external_common-0x800(r5) - ldhio r4,big_local_common-0x800(r5) - ldhio r4,small_local_common-0x800(r5) diff --git a/gas/testsuite/gas/nios2/ldh.d b/gas/testsuite/gas/nios2/ldh.d deleted file mode 100644 index 190d5a688f2..00000000000 --- a/gas/testsuite/gas/nios2/ldh.d +++ /dev/null @@ -1,196 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 ldh - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0100000f ldh r4,0\(zero\) -0+0004 <[^>]*> 0100010f ldh r4,4\(zero\) -0+0008 <[^>]*> 011fff0f ldh r4,32764\(zero\) -0+000c <[^>]*> 0120000f ldh r4,-32768\(zero\) -0+0010 <[^>]*> 2900000f ldh r4,0\(r5\) -0+0014 <[^>]*> 2900010f ldh r4,4\(r5\) -0+0018 <[^>]*> 291fff0f ldh r4,32764\(r5\) -0+001c <[^>]*> 2920000f ldh r4,-32768\(r5\) -0+0020 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x4000 -0+003c <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x4004 -0+0058 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x8000 -0+005c <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000 -0+0060 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000 -0+0064 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x8000 -0+0068 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x8000 -0+006c <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x8000 -0+0070 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x4000 -0+0074 <[^>]*> 0100000f ldh r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x4000 -0+0094 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x4004 -0+00b0 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x8000 -0+00b4 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000 -0+00b8 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000 -0+00bc <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x8000 -0+00c0 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x8000 -0+00c4 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x8000 -0+00c8 <[^>]*> 2900000f ldh r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x4000 -0+00cc <[^>]*> 0100002f ldhio r4,0\(zero\) -0+00d0 <[^>]*> 0100012f ldhio r4,4\(zero\) -0+00d4 <[^>]*> 011fff2f ldhio r4,32764\(zero\) -0+00d8 <[^>]*> 0120002f ldhio r4,-32768\(zero\) -0+00dc <[^>]*> 2900002f ldhio r4,0\(r5\) -0+00e0 <[^>]*> 2900012f ldhio r4,4\(r5\) -0+00e4 <[^>]*> 291fff2f ldhio r4,32764\(r5\) -0+00e8 <[^>]*> 2920002f ldhio r4,-32768\(r5\) -0+00ec <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*ec: R_NIOS2_S16 .data -0+00f0 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*f0: R_NIOS2_S16 big_external_data_label -0+00f4 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*f4: R_NIOS2_S16 small_external_data_label -0+00f8 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*f8: R_NIOS2_S16 big_external_common -0+00fc <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*fc: R_NIOS2_S16 small_external_common -0+0100 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*100: R_NIOS2_S16 .bss -0+0104 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*104: R_NIOS2_S16 .bss\+0x4000 -0+0108 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*108: R_NIOS2_S16 .data\+0x4 -0+010c <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4 -0+0110 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4 -0+0114 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*114: R_NIOS2_S16 big_external_common\+0x4 -0+0118 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*118: R_NIOS2_S16 small_external_common\+0x4 -0+011c <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*11c: R_NIOS2_S16 .bss\+0x4 -0+0120 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*120: R_NIOS2_S16 .bss\+0x4004 -0+0124 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*124: R_NIOS2_S16 .data-0x8000 -0+0128 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000 -0+012c <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000 -0+0130 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*130: R_NIOS2_S16 big_external_common-0x8000 -0+0134 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*134: R_NIOS2_S16 small_external_common-0x8000 -0+0138 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*138: R_NIOS2_S16 .bss-0x8000 -0+013c <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*13c: R_NIOS2_S16 .bss-0x4000 -0+0140 <[^>]*> 0100002f ldhio r4,0\(zero\) -[ ]*140: R_NIOS2_S16 .data\+0x10000 -0+0144 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*144: R_NIOS2_S16 .data -0+0148 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*148: R_NIOS2_S16 big_external_data_label -0+014c <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*14c: R_NIOS2_S16 small_external_data_label -0+0150 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*150: R_NIOS2_S16 big_external_common -0+0154 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*154: R_NIOS2_S16 small_external_common -0+0158 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*158: R_NIOS2_S16 .bss -0+015c <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*15c: R_NIOS2_S16 .bss\+0x4000 -0+0160 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*160: R_NIOS2_S16 .data\+0x4 -0+0164 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4 -0+0168 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4 -0+016c <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*16c: R_NIOS2_S16 big_external_common\+0x4 -0+0170 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*170: R_NIOS2_S16 small_external_common\+0x4 -0+0174 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*174: R_NIOS2_S16 .bss\+0x4 -0+0178 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*178: R_NIOS2_S16 .bss\+0x4004 -0+017c <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*17c: R_NIOS2_S16 .data-0x8000 -0+0180 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000 -0+0184 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000 -0+0188 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*188: R_NIOS2_S16 big_external_common-0x8000 -0+018c <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*18c: R_NIOS2_S16 small_external_common-0x8000 -0+0190 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*190: R_NIOS2_S16 .bss-0x8000 -0+0194 <[^>]*> 2900002f ldhio r4,0\(r5\) -[ ]*194: R_NIOS2_S16 .bss-0x4000 diff --git a/gas/testsuite/gas/nios2/ldh.s b/gas/testsuite/gas/nios2/ldh.s deleted file mode 100644 index 87040eeb79f..00000000000 --- a/gas/testsuite/gas/nios2/ldh.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x4000 - .extern small_external_data_label,4 - .comm big_external_common,0x4000 - .comm small_external_common,4 - .lcomm big_local_common,0x4000 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - ldh r4,0(r0) - ldh r4,4(r0) - ldh r4,0x7ffc(r0) - ldh r4,-0x8000(r0) - ldh r4,0(r5) - ldh r4,4(r5) - ldh r4,0x7ffc(r5) - ldh r4,-0x8000(r5) - ldh r4,data_label(r0) - ldh r4,big_external_data_label(r0) - ldh r4,small_external_data_label(r0) - ldh r4,big_external_common(r0) - ldh r4,small_external_common(r0) - ldh r4,big_local_common(r0) - ldh r4,small_local_common(r0) - ldh r4,data_label+4(r0) - ldh r4,big_external_data_label+4(r0) - ldh r4,small_external_data_label+4(r0) - ldh r4,big_external_common+4(r0) - ldh r4,small_external_common+4(r0) - ldh r4,big_local_common+4(r0) - ldh r4,small_local_common+4(r0) - ldh r4,data_label-0x8000(r0) - ldh r4,big_external_data_label-0x8000(r0) - ldh r4,small_external_data_label-0x8000(r0) - ldh r4,big_external_common-0x8000(r0) - ldh r4,small_external_common-0x8000(r0) - ldh r4,big_local_common-0x8000(r0) - ldh r4,small_local_common-0x8000(r0) - ldh r4,data_label+0x10000(r0) - ldh r4,data_label(r5) - ldh r4,big_external_data_label(r5) - ldh r4,small_external_data_label(r5) - ldh r4,big_external_common(r5) - ldh r4,small_external_common(r5) - ldh r4,big_local_common(r5) - ldh r4,small_local_common(r5) - ldh r4,data_label+4(r5) - ldh r4,big_external_data_label+4(r5) - ldh r4,small_external_data_label+4(r5) - ldh r4,big_external_common+4(r5) - ldh r4,small_external_common+4(r5) - ldh r4,big_local_common+4(r5) - ldh r4,small_local_common+4(r5) - ldh r4,data_label-0x8000(r5) - ldh r4,big_external_data_label-0x8000(r5) - ldh r4,small_external_data_label-0x8000(r5) - ldh r4,big_external_common-0x8000(r5) - ldh r4,small_external_common-0x8000(r5) - ldh r4,big_local_common-0x8000(r5) - ldh r4,small_local_common-0x8000(r5) - - ldhio r4,0(r0) - ldhio r4,4(r0) - ldhio r4,0x7ffc(r0) - ldhio r4,-0x8000(r0) - ldhio r4,0(r5) - ldhio r4,4(r5) - ldhio r4,0x7ffc(r5) - ldhio r4,-0x8000(r5) - ldhio r4,data_label(r0) - ldhio r4,big_external_data_label(r0) - ldhio r4,small_external_data_label(r0) - ldhio r4,big_external_common(r0) - ldhio r4,small_external_common(r0) - ldhio r4,big_local_common(r0) - ldhio r4,small_local_common(r0) - ldhio r4,data_label+4(r0) - ldhio r4,big_external_data_label+4(r0) - ldhio r4,small_external_data_label+4(r0) - ldhio r4,big_external_common+4(r0) - ldhio r4,small_external_common+4(r0) - ldhio r4,big_local_common+4(r0) - ldhio r4,small_local_common+4(r0) - ldhio r4,data_label-0x8000(r0) - ldhio r4,big_external_data_label-0x8000(r0) - ldhio r4,small_external_data_label-0x8000(r0) - ldhio r4,big_external_common-0x8000(r0) - ldhio r4,small_external_common-0x8000(r0) - ldhio r4,big_local_common-0x8000(r0) - ldhio r4,small_local_common-0x8000(r0) - ldhio r4,data_label+0x10000(r0) - ldhio r4,data_label(r5) - ldhio r4,big_external_data_label(r5) - ldhio r4,small_external_data_label(r5) - ldhio r4,big_external_common(r5) - ldhio r4,small_external_common(r5) - ldhio r4,big_local_common(r5) - ldhio r4,small_local_common(r5) - ldhio r4,data_label+4(r5) - ldhio r4,big_external_data_label+4(r5) - ldhio r4,small_external_data_label+4(r5) - ldhio r4,big_external_common+4(r5) - ldhio r4,small_external_common+4(r5) - ldhio r4,big_local_common+4(r5) - ldhio r4,small_local_common+4(r5) - ldhio r4,data_label-0x8000(r5) - ldhio r4,big_external_data_label-0x8000(r5) - ldhio r4,small_external_data_label-0x8000(r5) - ldhio r4,big_external_common-0x8000(r5) - ldhio r4,small_external_common-0x8000(r5) - ldhio r4,big_local_common-0x8000(r5) - ldhio r4,small_local_common-0x8000(r5) diff --git a/gas/testsuite/gas/nios2/ldw-r2.d b/gas/testsuite/gas/nios2/ldw-r2.d deleted file mode 100644 index cdf52f34d93..00000000000 --- a/gas/testsuite/gas/nios2/ldw-r2.d +++ /dev/null @@ -1,197 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 ldw -#as: -march=r2 - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00002017 ldw r4,0\(zero\) -0+0004 <[^>]*> 00042017 ldw r4,4\(zero\) -0+0008 <[^>]*> 07fc2017 ldw r4,2044\(zero\) -0+000c <[^>]*> f8002017 ldw r4,-2048\(zero\) -0+0010 <[^>]*> 00002157 ldw r4,0\(r5\) -0+0014 <[^>]*> 00042157 ldw r4,4\(r5\) -0+0018 <[^>]*> 07fc2157 ldw r4,2044\(r5\) -0+001c <[^>]*> f8002157 ldw r4,-2048\(r5\) -0+0020 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x400 -0+003c <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x404 -0+0058 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x800 -0+005c <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x800 -0+0060 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x800 -0+0064 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x800 -0+0068 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x800 -0+006c <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x800 -0+0070 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x400 -0+0074 <[^>]*> 00002017 ldw r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x400 -0+0094 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x404 -0+00b0 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x800 -0+00b4 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x800 -0+00b8 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x800 -0+00bc <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x800 -0+00c0 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x800 -0+00c4 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x800 -0+00c8 <[^>]*> 00002157 ldw r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x400 -0+00cc <[^>]*> 80002028 ldwio r4,0\(zero\) -0+00d0 <[^>]*> 80042028 ldwio r4,4\(zero\) -0+00d4 <[^>]*> 87fc2028 ldwio r4,2044\(zero\) -0+00d8 <[^>]*> 88002028 ldwio r4,-2048\(zero\) -0+00dc <[^>]*> 80002168 ldwio r4,0\(r5\) -0+00e0 <[^>]*> 80042168 ldwio r4,4\(r5\) -0+00e4 <[^>]*> 87fc2168 ldwio r4,2044\(r5\) -0+00e8 <[^>]*> 88002168 ldwio r4,-2048\(r5\) -0+00ec <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*ec: R_NIOS2_R2_S12 .data -0+00f0 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*f0: R_NIOS2_R2_S12 big_external_data_label -0+00f4 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*f4: R_NIOS2_R2_S12 small_external_data_label -0+00f8 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*f8: R_NIOS2_R2_S12 big_external_common -0+00fc <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*fc: R_NIOS2_R2_S12 small_external_common -0+0100 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*100: R_NIOS2_R2_S12 .bss -0+0104 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*104: R_NIOS2_R2_S12 .bss\+0x400 -0+0108 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*108: R_NIOS2_R2_S12 .data\+0x4 -0+010c <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*10c: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0110 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*110: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+0114 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*114: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0118 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*118: R_NIOS2_R2_S12 small_external_common\+0x4 -0+011c <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*11c: R_NIOS2_R2_S12 .bss\+0x4 -0+0120 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*120: R_NIOS2_R2_S12 .bss\+0x404 -0+0124 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*124: R_NIOS2_R2_S12 .data-0x800 -0+0128 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*128: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+012c <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*12c: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0130 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*130: R_NIOS2_R2_S12 big_external_common-0x800 -0+0134 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*134: R_NIOS2_R2_S12 small_external_common-0x800 -0+0138 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*138: R_NIOS2_R2_S12 .bss-0x800 -0+013c <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*13c: R_NIOS2_R2_S12 .bss-0x400 -0+0140 <[^>]*> 80002028 ldwio r4,0\(zero\) -[ ]*140: R_NIOS2_R2_S12 .data\+0x10000 -0+0144 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*144: R_NIOS2_R2_S12 .data -0+0148 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*148: R_NIOS2_R2_S12 big_external_data_label -0+014c <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*14c: R_NIOS2_R2_S12 small_external_data_label -0+0150 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*150: R_NIOS2_R2_S12 big_external_common -0+0154 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*154: R_NIOS2_R2_S12 small_external_common -0+0158 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*158: R_NIOS2_R2_S12 .bss -0+015c <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*15c: R_NIOS2_R2_S12 .bss\+0x400 -0+0160 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*160: R_NIOS2_R2_S12 .data\+0x4 -0+0164 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*164: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0168 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*168: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+016c <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*16c: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0170 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*170: R_NIOS2_R2_S12 small_external_common\+0x4 -0+0174 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*174: R_NIOS2_R2_S12 .bss\+0x4 -0+0178 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*178: R_NIOS2_R2_S12 .bss\+0x404 -0+017c <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*17c: R_NIOS2_R2_S12 .data-0x800 -0+0180 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*180: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+0184 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*184: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0188 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*188: R_NIOS2_R2_S12 big_external_common-0x800 -0+018c <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*18c: R_NIOS2_R2_S12 small_external_common-0x800 -0+0190 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*190: R_NIOS2_R2_S12 .bss-0x800 -0+0194 <[^>]*> 80002168 ldwio r4,0\(r5\) -[ ]*194: R_NIOS2_R2_S12 .bss-0x400 diff --git a/gas/testsuite/gas/nios2/ldw-r2.s b/gas/testsuite/gas/nios2/ldw-r2.s deleted file mode 100644 index 33db49bc287..00000000000 --- a/gas/testsuite/gas/nios2/ldw-r2.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x400 - .extern small_external_data_label,4 - .comm big_external_common,0x400 - .comm small_external_common,4 - .lcomm big_local_common,0x400 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - ldw r4,0(r0) - ldw r4,4(r0) - ldw r4,0x7fc(r0) - ldw r4,-0x800(r0) - ldw r4,0(r5) - ldw r4,4(r5) - ldw r4,0x7fc(r5) - ldw r4,-0x800(r5) - ldw r4,data_label(r0) - ldw r4,big_external_data_label(r0) - ldw r4,small_external_data_label(r0) - ldw r4,big_external_common(r0) - ldw r4,small_external_common(r0) - ldw r4,big_local_common(r0) - ldw r4,small_local_common(r0) - ldw r4,data_label+4(r0) - ldw r4,big_external_data_label+4(r0) - ldw r4,small_external_data_label+4(r0) - ldw r4,big_external_common+4(r0) - ldw r4,small_external_common+4(r0) - ldw r4,big_local_common+4(r0) - ldw r4,small_local_common+4(r0) - ldw r4,data_label-0x800(r0) - ldw r4,big_external_data_label-0x800(r0) - ldw r4,small_external_data_label-0x800(r0) - ldw r4,big_external_common-0x800(r0) - ldw r4,small_external_common-0x800(r0) - ldw r4,big_local_common-0x800(r0) - ldw r4,small_local_common-0x800(r0) - ldw r4,data_label+0x10000(r0) - ldw r4,data_label(r5) - ldw r4,big_external_data_label(r5) - ldw r4,small_external_data_label(r5) - ldw r4,big_external_common(r5) - ldw r4,small_external_common(r5) - ldw r4,big_local_common(r5) - ldw r4,small_local_common(r5) - ldw r4,data_label+4(r5) - ldw r4,big_external_data_label+4(r5) - ldw r4,small_external_data_label+4(r5) - ldw r4,big_external_common+4(r5) - ldw r4,small_external_common+4(r5) - ldw r4,big_local_common+4(r5) - ldw r4,small_local_common+4(r5) - ldw r4,data_label-0x800(r5) - ldw r4,big_external_data_label-0x800(r5) - ldw r4,small_external_data_label-0x800(r5) - ldw r4,big_external_common-0x800(r5) - ldw r4,small_external_common-0x800(r5) - ldw r4,big_local_common-0x800(r5) - ldw r4,small_local_common-0x800(r5) - - ldwio r4,0(r0) - ldwio r4,4(r0) - ldwio r4,0x7fc(r0) - ldwio r4,-0x800(r0) - ldwio r4,0(r5) - ldwio r4,4(r5) - ldwio r4,0x7fc(r5) - ldwio r4,-0x800(r5) - ldwio r4,data_label(r0) - ldwio r4,big_external_data_label(r0) - ldwio r4,small_external_data_label(r0) - ldwio r4,big_external_common(r0) - ldwio r4,small_external_common(r0) - ldwio r4,big_local_common(r0) - ldwio r4,small_local_common(r0) - ldwio r4,data_label+4(r0) - ldwio r4,big_external_data_label+4(r0) - ldwio r4,small_external_data_label+4(r0) - ldwio r4,big_external_common+4(r0) - ldwio r4,small_external_common+4(r0) - ldwio r4,big_local_common+4(r0) - ldwio r4,small_local_common+4(r0) - ldwio r4,data_label-0x800(r0) - ldwio r4,big_external_data_label-0x800(r0) - ldwio r4,small_external_data_label-0x800(r0) - ldwio r4,big_external_common-0x800(r0) - ldwio r4,small_external_common-0x800(r0) - ldwio r4,big_local_common-0x800(r0) - ldwio r4,small_local_common-0x800(r0) - ldwio r4,data_label+0x10000(r0) - ldwio r4,data_label(r5) - ldwio r4,big_external_data_label(r5) - ldwio r4,small_external_data_label(r5) - ldwio r4,big_external_common(r5) - ldwio r4,small_external_common(r5) - ldwio r4,big_local_common(r5) - ldwio r4,small_local_common(r5) - ldwio r4,data_label+4(r5) - ldwio r4,big_external_data_label+4(r5) - ldwio r4,small_external_data_label+4(r5) - ldwio r4,big_external_common+4(r5) - ldwio r4,small_external_common+4(r5) - ldwio r4,big_local_common+4(r5) - ldwio r4,small_local_common+4(r5) - ldwio r4,data_label-0x800(r5) - ldwio r4,big_external_data_label-0x800(r5) - ldwio r4,small_external_data_label-0x800(r5) - ldwio r4,big_external_common-0x800(r5) - ldwio r4,small_external_common-0x800(r5) - ldwio r4,big_local_common-0x800(r5) - ldwio r4,small_local_common-0x800(r5) diff --git a/gas/testsuite/gas/nios2/ldw.d b/gas/testsuite/gas/nios2/ldw.d deleted file mode 100644 index 8b86019401b..00000000000 --- a/gas/testsuite/gas/nios2/ldw.d +++ /dev/null @@ -1,196 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 ldw - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 01000017 ldw r4,0\(zero\) -0+0004 <[^>]*> 01000117 ldw r4,4\(zero\) -0+0008 <[^>]*> 011fff17 ldw r4,32764\(zero\) -0+000c <[^>]*> 01200017 ldw r4,-32768\(zero\) -0+0010 <[^>]*> 29000017 ldw r4,0\(r5\) -0+0014 <[^>]*> 29000117 ldw r4,4\(r5\) -0+0018 <[^>]*> 291fff17 ldw r4,32764\(r5\) -0+001c <[^>]*> 29200017 ldw r4,-32768\(r5\) -0+0020 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x4000 -0+003c <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x4004 -0+0058 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x8000 -0+005c <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000 -0+0060 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000 -0+0064 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x8000 -0+0068 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x8000 -0+006c <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x8000 -0+0070 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x4000 -0+0074 <[^>]*> 01000017 ldw r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x4000 -0+0094 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x4004 -0+00b0 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x8000 -0+00b4 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000 -0+00b8 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000 -0+00bc <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x8000 -0+00c0 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x8000 -0+00c4 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x8000 -0+00c8 <[^>]*> 29000017 ldw r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x4000 -0+00cc <[^>]*> 01000037 ldwio r4,0\(zero\) -0+00d0 <[^>]*> 01000137 ldwio r4,4\(zero\) -0+00d4 <[^>]*> 011fff37 ldwio r4,32764\(zero\) -0+00d8 <[^>]*> 01200037 ldwio r4,-32768\(zero\) -0+00dc <[^>]*> 29000037 ldwio r4,0\(r5\) -0+00e0 <[^>]*> 29000137 ldwio r4,4\(r5\) -0+00e4 <[^>]*> 291fff37 ldwio r4,32764\(r5\) -0+00e8 <[^>]*> 29200037 ldwio r4,-32768\(r5\) -0+00ec <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*ec: R_NIOS2_S16 .data -0+00f0 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*f0: R_NIOS2_S16 big_external_data_label -0+00f4 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*f4: R_NIOS2_S16 small_external_data_label -0+00f8 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*f8: R_NIOS2_S16 big_external_common -0+00fc <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*fc: R_NIOS2_S16 small_external_common -0+0100 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*100: R_NIOS2_S16 .bss -0+0104 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*104: R_NIOS2_S16 .bss\+0x4000 -0+0108 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*108: R_NIOS2_S16 .data\+0x4 -0+010c <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4 -0+0110 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4 -0+0114 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*114: R_NIOS2_S16 big_external_common\+0x4 -0+0118 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*118: R_NIOS2_S16 small_external_common\+0x4 -0+011c <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*11c: R_NIOS2_S16 .bss\+0x4 -0+0120 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*120: R_NIOS2_S16 .bss\+0x4004 -0+0124 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*124: R_NIOS2_S16 .data-0x8000 -0+0128 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000 -0+012c <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000 -0+0130 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*130: R_NIOS2_S16 big_external_common-0x8000 -0+0134 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*134: R_NIOS2_S16 small_external_common-0x8000 -0+0138 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*138: R_NIOS2_S16 .bss-0x8000 -0+013c <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*13c: R_NIOS2_S16 .bss-0x4000 -0+0140 <[^>]*> 01000037 ldwio r4,0\(zero\) -[ ]*140: R_NIOS2_S16 .data\+0x10000 -0+0144 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*144: R_NIOS2_S16 .data -0+0148 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*148: R_NIOS2_S16 big_external_data_label -0+014c <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*14c: R_NIOS2_S16 small_external_data_label -0+0150 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*150: R_NIOS2_S16 big_external_common -0+0154 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*154: R_NIOS2_S16 small_external_common -0+0158 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*158: R_NIOS2_S16 .bss -0+015c <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*15c: R_NIOS2_S16 .bss\+0x4000 -0+0160 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*160: R_NIOS2_S16 .data\+0x4 -0+0164 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4 -0+0168 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4 -0+016c <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*16c: R_NIOS2_S16 big_external_common\+0x4 -0+0170 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*170: R_NIOS2_S16 small_external_common\+0x4 -0+0174 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*174: R_NIOS2_S16 .bss\+0x4 -0+0178 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*178: R_NIOS2_S16 .bss\+0x4004 -0+017c <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*17c: R_NIOS2_S16 .data-0x8000 -0+0180 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000 -0+0184 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000 -0+0188 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*188: R_NIOS2_S16 big_external_common-0x8000 -0+018c <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*18c: R_NIOS2_S16 small_external_common-0x8000 -0+0190 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*190: R_NIOS2_S16 .bss-0x8000 -0+0194 <[^>]*> 29000037 ldwio r4,0\(r5\) -[ ]*194: R_NIOS2_S16 .bss-0x4000 diff --git a/gas/testsuite/gas/nios2/ldw.s b/gas/testsuite/gas/nios2/ldw.s deleted file mode 100644 index cf6de19d219..00000000000 --- a/gas/testsuite/gas/nios2/ldw.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x4000 - .extern small_external_data_label,4 - .comm big_external_common,0x4000 - .comm small_external_common,4 - .lcomm big_local_common,0x4000 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - ldw r4,0(r0) - ldw r4,4(r0) - ldw r4,0x7ffc(r0) - ldw r4,-0x8000(r0) - ldw r4,0(r5) - ldw r4,4(r5) - ldw r4,0x7ffc(r5) - ldw r4,-0x8000(r5) - ldw r4,data_label(r0) - ldw r4,big_external_data_label(r0) - ldw r4,small_external_data_label(r0) - ldw r4,big_external_common(r0) - ldw r4,small_external_common(r0) - ldw r4,big_local_common(r0) - ldw r4,small_local_common(r0) - ldw r4,data_label+4(r0) - ldw r4,big_external_data_label+4(r0) - ldw r4,small_external_data_label+4(r0) - ldw r4,big_external_common+4(r0) - ldw r4,small_external_common+4(r0) - ldw r4,big_local_common+4(r0) - ldw r4,small_local_common+4(r0) - ldw r4,data_label-0x8000(r0) - ldw r4,big_external_data_label-0x8000(r0) - ldw r4,small_external_data_label-0x8000(r0) - ldw r4,big_external_common-0x8000(r0) - ldw r4,small_external_common-0x8000(r0) - ldw r4,big_local_common-0x8000(r0) - ldw r4,small_local_common-0x8000(r0) - ldw r4,data_label+0x10000(r0) - ldw r4,data_label(r5) - ldw r4,big_external_data_label(r5) - ldw r4,small_external_data_label(r5) - ldw r4,big_external_common(r5) - ldw r4,small_external_common(r5) - ldw r4,big_local_common(r5) - ldw r4,small_local_common(r5) - ldw r4,data_label+4(r5) - ldw r4,big_external_data_label+4(r5) - ldw r4,small_external_data_label+4(r5) - ldw r4,big_external_common+4(r5) - ldw r4,small_external_common+4(r5) - ldw r4,big_local_common+4(r5) - ldw r4,small_local_common+4(r5) - ldw r4,data_label-0x8000(r5) - ldw r4,big_external_data_label-0x8000(r5) - ldw r4,small_external_data_label-0x8000(r5) - ldw r4,big_external_common-0x8000(r5) - ldw r4,small_external_common-0x8000(r5) - ldw r4,big_local_common-0x8000(r5) - ldw r4,small_local_common-0x8000(r5) - - ldwio r4,0(r0) - ldwio r4,4(r0) - ldwio r4,0x7ffc(r0) - ldwio r4,-0x8000(r0) - ldwio r4,0(r5) - ldwio r4,4(r5) - ldwio r4,0x7ffc(r5) - ldwio r4,-0x8000(r5) - ldwio r4,data_label(r0) - ldwio r4,big_external_data_label(r0) - ldwio r4,small_external_data_label(r0) - ldwio r4,big_external_common(r0) - ldwio r4,small_external_common(r0) - ldwio r4,big_local_common(r0) - ldwio r4,small_local_common(r0) - ldwio r4,data_label+4(r0) - ldwio r4,big_external_data_label+4(r0) - ldwio r4,small_external_data_label+4(r0) - ldwio r4,big_external_common+4(r0) - ldwio r4,small_external_common+4(r0) - ldwio r4,big_local_common+4(r0) - ldwio r4,small_local_common+4(r0) - ldwio r4,data_label-0x8000(r0) - ldwio r4,big_external_data_label-0x8000(r0) - ldwio r4,small_external_data_label-0x8000(r0) - ldwio r4,big_external_common-0x8000(r0) - ldwio r4,small_external_common-0x8000(r0) - ldwio r4,big_local_common-0x8000(r0) - ldwio r4,small_local_common-0x8000(r0) - ldwio r4,data_label+0x10000(r0) - ldwio r4,data_label(r5) - ldwio r4,big_external_data_label(r5) - ldwio r4,small_external_data_label(r5) - ldwio r4,big_external_common(r5) - ldwio r4,small_external_common(r5) - ldwio r4,big_local_common(r5) - ldwio r4,small_local_common(r5) - ldwio r4,data_label+4(r5) - ldwio r4,big_external_data_label+4(r5) - ldwio r4,small_external_data_label+4(r5) - ldwio r4,big_external_common+4(r5) - ldwio r4,small_external_common+4(r5) - ldwio r4,big_local_common+4(r5) - ldwio r4,small_local_common+4(r5) - ldwio r4,data_label-0x8000(r5) - ldwio r4,big_external_data_label-0x8000(r5) - ldwio r4,small_external_data_label-0x8000(r5) - ldwio r4,big_external_common-0x8000(r5) - ldwio r4,small_external_common-0x8000(r5) - ldwio r4,big_local_common-0x8000(r5) - ldwio r4,small_local_common-0x8000(r5) diff --git a/gas/testsuite/gas/nios2/ldwm.d b/gas/testsuite/gas/nios2/ldwm.d deleted file mode 100644 index ae82a6728e6..00000000000 --- a/gas/testsuite/gas/nios2/ldwm.d +++ /dev/null @@ -1,37 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 LDWM instructions -#as: -march=r2 - -# Test the LDWM instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> c00105e8 ldwm \{r2\},--\(r23\) -0+0004 <[^>]*> c00205e8 ldwm \{r3\},--\(r23\) -0+0008 <[^>]*> c00405e8 ldwm \{r4\},--\(r23\) -0+000c <[^>]*> c00805e8 ldwm \{r5\},--\(r23\) -0+0010 <[^>]*> c01005e8 ldwm \{r6\},--\(r23\) -0+0014 <[^>]*> c02005e8 ldwm \{r7\},--\(r23\) -0+0018 <[^>]*> c04005e8 ldwm \{r8\},--\(r23\) -0+001c <[^>]*> c08005e8 ldwm \{r9\},--\(r23\) -0+0020 <[^>]*> c10005e8 ldwm \{r10\},--\(r23\) -0+0024 <[^>]*> c20005e8 ldwm \{r11\},--\(r23\) -0+0028 <[^>]*> c40005e8 ldwm \{r12\},--\(r23\) -0+002c <[^>]*> c80005e8 ldwm \{r13\},--\(r23\) -0+0030 <[^>]*> c00128a8 ldwm \{r14\},\(r2\)\+\+ -0+0034 <[^>]*> c00328a8 ldwm \{r14,r15\},\(r2\)\+\+ -0+0038 <[^>]*> c00728a8 ldwm \{r14,r15,r16\},\(r2\)\+\+ -0+003c <[^>]*> c00f28a8 ldwm \{r14,r15,r16,r17\},\(r2\)\+\+ -0+0040 <[^>]*> c01f28a8 ldwm \{r14,r15,r16,r17,r18\},\(r2\)\+\+ -0+0044 <[^>]*> c03f28a8 ldwm \{r14,r15,r16,r17,r18,r19\},\(r2\)\+\+ -0+0048 <[^>]*> c07f28a8 ldwm \{r14,r15,r16,r17,r18,r19,r20\},\(r2\)\+\+ -0+004c <[^>]*> c0ff28a8 ldwm \{r14,r15,r16,r17,r18,r19,r20,r21\},\(r2\)\+\+ -0+0050 <[^>]*> c1ff28a8 ldwm \{r14,r15,r16,r17,r18,r19,r20,r21,r22\},\(r2\)\+\+ -0+0054 <[^>]*> c3ff28a8 ldwm \{r14,r15,r16,r17,r18,r19,r20,r21,r22,r23\},\(r2\)\+\+ -0+0058 <[^>]*> c7ff28a8 ldwm \{r14,r15,r16,r17,r18,r19,r20,r21,r22,r23,fp\},\(r2\)\+\+ -0+005c <[^>]*> cfff28a8 ldwm \{r14,r15,r16,r17,r18,r19,r20,r21,r22,r23,fp,ra\},\(r2\)\+\+ -0+0060 <[^>]*> c2210b68 ldwm \{r2,r7,r11\},\(r13\)\+\+ -0+0064 <[^>]*> c2214b68 ldwm \{r2,r7,r11\},\(r13\)\+\+,ret -0+0068 <[^>]*> c2211b68 ldwm \{r2,r7,r11\},\(r13\)\+\+,writeback -0+006c <[^>]*> c2215b68 ldwm \{r2,r7,r11\},\(r13\)\+\+,writeback,ret diff --git a/gas/testsuite/gas/nios2/ldwm.s b/gas/testsuite/gas/nios2/ldwm.s deleted file mode 100644 index e6566018364..00000000000 --- a/gas/testsuite/gas/nios2/ldwm.s +++ /dev/null @@ -1,31 +0,0 @@ -# Source file used to test the LDWM instruction - -foo: - ldwm {r2},--(r23) - ldwm {r3},--(r23) - ldwm {r4},--(r23) - ldwm {r5},--(r23) - ldwm {r6},--(r23) - ldwm {r7},--(r23) - ldwm {r8},--(r23) - ldwm {r9},--(r23) - ldwm {r10},--(r23) - ldwm {r11},--(r23) - ldwm {r12},--(r23) - ldwm {r13},--(r23) - ldwm {r14},(r2)++ - ldwm {r14,r15},(r2)++ - ldwm {r14,r15,r16},(r2)++ - ldwm {r14,r15,r16,r17},(r2)++ - ldwm {r14,r15,r16,r17,r18},(r2)++ - ldwm {r14,r15,r16,r17,r18,r19},(r2)++ - ldwm {r14,r15,r16,r17,r18,r19,r20},(r2)++ - ldwm {r14,r15,r16,r17,r18,r19,r20,r21},(r2)++ - ldwm {r14,r15,r16,r17,r18,r19,r20,r21,r22},(r2)++ - ldwm {r14,r15,r16,r17,r18,r19,r20,r21,r22,r23},(r2)++ - ldwm {r14,r15,r16,r17,r18,r19,r20,r21,r22,r23,fp},(r2)++ - ldwm {r14,r15,r16,r17,r18,r19,r20,r21,r22,r23,fp,ra},(r2)++ - ldwm {r2,r7,r11},(r13)++ - ldwm {r2,r7,r11},(r13)++,ret - ldwm {r2,r7,r11},(r13)++,writeback - ldwm {r2,r7,r11},(r13)++,ret,writeback diff --git a/gas/testsuite/gas/nios2/lineseparator-r2.d b/gas/testsuite/gas/nios2/lineseparator-r2.d deleted file mode 100644 index 264f2965944..00000000000 --- a/gas/testsuite/gas/nios2/lineseparator-r2.d +++ /dev/null @@ -1,12 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 lineseparator -#as: -march=r2 -#source: lineseparator.s - -# Test the add instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0x0+0000 c4050120 mov r5,r4 -0x0+0004 c4040160 mov r4,r5 diff --git a/gas/testsuite/gas/nios2/lineseparator.d b/gas/testsuite/gas/nios2/lineseparator.d deleted file mode 100644 index 41ce204859a..00000000000 --- a/gas/testsuite/gas/nios2/lineseparator.d +++ /dev/null @@ -1,10 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 lineseparator - -# Test the add instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0x0+0000 200b883a mov r5,r4 -0x0+0004 2809883a mov r4,r5 diff --git a/gas/testsuite/gas/nios2/lineseparator.s b/gas/testsuite/gas/nios2/lineseparator.s deleted file mode 100644 index d16efc35ebc..00000000000 --- a/gas/testsuite/gas/nios2/lineseparator.s +++ /dev/null @@ -1,4 +0,0 @@ -mov r5, r4 ; mov r4, r5 - - - diff --git a/gas/testsuite/gas/nios2/movi.l b/gas/testsuite/gas/nios2/movi.l deleted file mode 100644 index 2eb47a10dd5..00000000000 --- a/gas/testsuite/gas/nios2/movi.l +++ /dev/null @@ -1,6 +0,0 @@ -.*movi.s: Assembler messages: -.*movi.s:9: Error: immediate value 536870912 out of range -32768 to 32767 -.*movi.s:12: Error: immediate value -65536 out of range -32768 to 32767 -.*movi.s:15: Error: immediate value 4294901760 out of range 0 to 65535 -.*movi.s:16: Error: immediate value 4294901760 out of range 0 to 65535 -.*movi.s:17: Error: immediate value 4294901760 out of range 0 to 65535 diff --git a/gas/testsuite/gas/nios2/movi.s b/gas/testsuite/gas/nios2/movi.s deleted file mode 100644 index 20df564f734..00000000000 --- a/gas/testsuite/gas/nios2/movi.s +++ /dev/null @@ -1,21 +0,0 @@ -# Source file used to test that former silent conversion of -# movi to orhi etc now gives range errors instead. - -foo: -# This doesn't get converted. -movi r2, 0x20 - -# This used to convert. -movi r2, 0x20000000 - -# addi used to convert only if the source register is r0. -addi r2, r0, 0xffff0000 - -# Logical ops used to convert to equivalent *hi for any register. -ori r2, r5, 0xffff0000 -xori r2, r10, 0xffff0000 -andi r2, r15, 0xffff0000 - -# This one used to be buggy and convert even though it wasn't supposed to, -# because it was failing to take the %lo relocation into account. -ori r23,r23,%lo(0x12340000) diff --git a/gas/testsuite/gas/nios2/movia-r2.d b/gas/testsuite/gas/nios2/movia-r2.d deleted file mode 100644 index e4c78a815f1..00000000000 --- a/gas/testsuite/gas/nios2/movia-r2.d +++ /dev/null @@ -1,22 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 movia -#as: -march=r2 -#source: movia.s - -# Test the movia instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 80811034 movhi r2,32897 -0+0004 <[^>]*> 80801084 addi r2,r2,-32640 -0+0008 <[^>]*> 00001834 movhi r3,0 - 8: R_NIOS2_HIADJ16 sym-0x80000000 -0+000c <[^>]*> 000018c4 addi r3,r3,0 - c: R_NIOS2_LO16 sym-0x80000000 -0+0010 <[^>]*> 00002034 movhi r4,0 - 10: R_NIOS2_HIADJ16 sym-0x7fffffff -0+0014 <[^>]*> 00002104 addi r4,r4,0 - 14: R_NIOS2_LO16 sym-0x7fffffff -0+0018 <[^>]*> 00001034 movhi r2,0 -0+001c <[^>]*> fff01084 addi r2,r2,-16 diff --git a/gas/testsuite/gas/nios2/movia.d b/gas/testsuite/gas/nios2/movia.d deleted file mode 100644 index 9b04a9d1035..00000000000 --- a/gas/testsuite/gas/nios2/movia.d +++ /dev/null @@ -1,20 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 movia - -# Test the movia instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00a02074 movhi r2,32897 -0+0004 <[^>]*> 10a02004 addi r2,r2,-32640 -0+0008 <[^>]*> 00c00034 movhi r3,0 - 8: R_NIOS2_HIADJ16 sym-0x80000000 -0+000c <[^>]*> 18c00004 addi r3,r3,0 - c: R_NIOS2_LO16 sym-0x80000000 -0+0010 <[^>]*> 01000034 movhi r4,0 - 10: R_NIOS2_HIADJ16 sym-0x7fffffff -0+0014 <[^>]*> 21000004 addi r4,r4,0 - 14: R_NIOS2_LO16 sym-0x7fffffff -0+0018 <[^>]*> 00800034 movhi r2,0 -0+001c <[^>]*> 10bffc04 addi r2,r2,-16 diff --git a/gas/testsuite/gas/nios2/movia.s b/gas/testsuite/gas/nios2/movia.s deleted file mode 100644 index 9bc921b6bf0..00000000000 --- a/gas/testsuite/gas/nios2/movia.s +++ /dev/null @@ -1,7 +0,0 @@ -# Test program for movia reg, immed32 macro - -foo: - movia r2, 0x80808080 - movia r3, sym + 0x80000000 - movia r4, sym - 0x7fffffff - movia r2, 0xfffffff0 diff --git a/gas/testsuite/gas/nios2/mpx.d b/gas/testsuite/gas/nios2/mpx.d deleted file mode 100644 index 5d03d27c7d1..00000000000 --- a/gas/testsuite/gas/nios2/mpx.d +++ /dev/null @@ -1,14 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 mpx -#as: -march=r2 - -# Test the MPX instructions - -.*: +file format elf32-littlenios2 -Disassembly of section .text: -0+0000 <[^>]*> dc000020 ldsex zero,\(zero\) -0+0004 <[^>]*> dc0007e0 ldsex zero,\(ra\) -0+0008 <[^>]*> dc1f0020 ldsex ra,\(zero\) -0+000c <[^>]*> fc000020 stsex zero,zero,\(zero\) -0+0010 <[^>]*> fc1fffe0 stsex ra,ra,\(ra\) -0+0014 <[^>]*> fc04fc20 stsex r4,ra,\(r16\) diff --git a/gas/testsuite/gas/nios2/mpx.s b/gas/testsuite/gas/nios2/mpx.s deleted file mode 100644 index 925c3070f8f..00000000000 --- a/gas/testsuite/gas/nios2/mpx.s +++ /dev/null @@ -1,9 +0,0 @@ -# Source file used to test the BMX instruction - -foo: - ldsex r0,(r0) - ldsex r0,(r31) - ldsex r31,(r0) - stsex r0,r0,(r0) - stsex r31,r31,(r31) - stsex r4,r31,(r16) diff --git a/gas/testsuite/gas/nios2/mul-r2.d b/gas/testsuite/gas/nios2/mul-r2.d deleted file mode 100644 index 1e68d53d2e1..00000000000 --- a/gas/testsuite/gas/nios2/mul-r2.d +++ /dev/null @@ -1,21 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 mul -#as: -march=r2 -#source: mul.s - -# Test the mul macro. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 9c043160 mul r4,r5,r6 -0+0004 <[^>]*> 00002164 muli r4,r5,0 -0+0008 <[^>]*> 00012164 muli r4,r5,1 -0+000c <[^>]*> 80002164 muli r4,r5,-32768 -0+0010 <[^>]*> 7fff2164 muli r4,r5,32767 -0+0014 <[^>]*> 00002164 muli r4,r5,0 -[ ]*14: R_NIOS2_S16 undefined_symbol -0+0018 <[^>]*> 40402164 muli r4,r5,16448 -0+001c <[^>]*> 7c043160 mulxss r4,r5,r6 -0+0020 <[^>]*> 5c043160 mulxsu r4,r5,r6 -0+0024 <[^>]*> 1c043160 mulxuu r4,r5,r6 diff --git a/gas/testsuite/gas/nios2/mul.d b/gas/testsuite/gas/nios2/mul.d deleted file mode 100644 index 84577b1b2bb..00000000000 --- a/gas/testsuite/gas/nios2/mul.d +++ /dev/null @@ -1,19 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 mul - -# Test the mul macro. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 2989383a mul r4,r5,r6 -0+0004 <[^>]*> 29000024 muli r4,r5,0 -0+0008 <[^>]*> 29000064 muli r4,r5,1 -0+000c <[^>]*> 29200024 muli r4,r5,-32768 -0+0010 <[^>]*> 291fffe4 muli r4,r5,32767 -0+0014 <[^>]*> 29000024 muli r4,r5,0 -[ ]*14: R_NIOS2_S16 undefined_symbol -0+0018 <[^>]*> 29101024 muli r4,r5,16448 -0+001c <[^>]*> 2988f83a mulxss r4,r5,r6 -0+0020 <[^>]*> 2988b83a mulxsu r4,r5,r6 -0+0024 <[^>]*> 2988383a mulxuu r4,r5,r6 diff --git a/gas/testsuite/gas/nios2/mul.s b/gas/testsuite/gas/nios2/mul.s deleted file mode 100644 index 3e47bc7b96c..00000000000 --- a/gas/testsuite/gas/nios2/mul.s +++ /dev/null @@ -1,15 +0,0 @@ -# Source file used to test the mul macro. - -foo: - mul r4,r5,r6 - muli r4,r5,0 - muli r4,r5,1 - muli r4,r5,-0x8000 - muli r4,r5,0x7fff - muli r4,r5,undefined_symbol - muli r4,r5,defined_symbol - mulxss r4,r5,r6 - mulxsu r4,r5,r6 - mulxuu r4,r5,r6 -.data -.set defined_symbol, 0x4040 diff --git a/gas/testsuite/gas/nios2/nios2.exp b/gas/testsuite/gas/nios2/nios2.exp deleted file mode 100644 index d4059a3605d..00000000000 --- a/gas/testsuite/gas/nios2/nios2.exp +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2012-2024 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. - -# -# Some generic Nios II tests -# - -if { [istarget nios2-*-*] } { - run_dump_tests [lsort [glob -nocomplain $srcdir/$subdir/*.d]] - - run_list_test "illegal" "" - run_list_test "illegal_pseudoinst" "" - run_list_test "warn_nobreak" "" - run_list_test "warn_noat" "" - run_list_test "movi" "" -} diff --git a/gas/testsuite/gas/nios2/nop-r2.d b/gas/testsuite/gas/nios2/nop-r2.d deleted file mode 100644 index a32310638b9..00000000000 --- a/gas/testsuite/gas/nios2/nop-r2.d +++ /dev/null @@ -1,11 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 nop.n -#as: -march=r2 - -# Test the nop.n pseudo-instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 003b nop.n - ... diff --git a/gas/testsuite/gas/nios2/nop-r2.s b/gas/testsuite/gas/nios2/nop-r2.s deleted file mode 100644 index f6fd527b272..00000000000 --- a/gas/testsuite/gas/nios2/nop-r2.s +++ /dev/null @@ -1,8 +0,0 @@ - .section .text - .align 2 - .global foo - .type foo, @function -foo: - nop.n - .section .text - .size foo, .-foo diff --git a/gas/testsuite/gas/nios2/nor-r2.d b/gas/testsuite/gas/nios2/nor-r2.d deleted file mode 100644 index a136dbbbef5..00000000000 --- a/gas/testsuite/gas/nios2/nor-r2.d +++ /dev/null @@ -1,11 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 nor -#as: -march=r2 -#source: nor.s - -# Test the nor instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 18065220 nor r6,r8,r10 diff --git a/gas/testsuite/gas/nios2/nor.d b/gas/testsuite/gas/nios2/nor.d deleted file mode 100644 index d38553c5bfd..00000000000 --- a/gas/testsuite/gas/nios2/nor.d +++ /dev/null @@ -1,9 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 nor - -# Test the nor instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 428c303a nor r6,r8,r10 diff --git a/gas/testsuite/gas/nios2/nor.s b/gas/testsuite/gas/nios2/nor.s deleted file mode 100644 index da7825478de..00000000000 --- a/gas/testsuite/gas/nios2/nor.s +++ /dev/null @@ -1,5 +0,0 @@ -# Source file used to test the nor instruction - -foo: - nor r6,r8,r10 - diff --git a/gas/testsuite/gas/nios2/or-r2.d b/gas/testsuite/gas/nios2/or-r2.d deleted file mode 100644 index dfa10f8f46f..00000000000 --- a/gas/testsuite/gas/nios2/or-r2.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 or -#as: -march=r2 -#source: or.s - -# Test the nor instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 58065220 or r6,r8,r10 -0+0004 <[^>]*> ffff31f4 orhi r6,r7,65535 -0+0008 <[^>]*> ffff31d4 ori r6,r7,65535 diff --git a/gas/testsuite/gas/nios2/or.d b/gas/testsuite/gas/nios2/or.d deleted file mode 100644 index e796a300fbb..00000000000 --- a/gas/testsuite/gas/nios2/or.d +++ /dev/null @@ -1,11 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 or - -# Test the nor instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 428cb03a or r6,r8,r10 -0+0004 <[^>]*> 39bffff4 orhi r6,r7,65535 -0+0008 <[^>]*> 39bfffd4 ori r6,r7,65535 diff --git a/gas/testsuite/gas/nios2/or.s b/gas/testsuite/gas/nios2/or.s deleted file mode 100644 index 675df170559..00000000000 --- a/gas/testsuite/gas/nios2/or.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the nor instruction - -foo: - or r6,r8,r10 - orhi r6,r7,0xffff - ori r6,r7,0xffff - diff --git a/gas/testsuite/gas/nios2/rdprs-r2.d b/gas/testsuite/gas/nios2/rdprs-r2.d deleted file mode 100644 index 5caebccff08..00000000000 --- a/gas/testsuite/gas/nios2/rdprs-r2.d +++ /dev/null @@ -1,32 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 rdprs -#as: -march=r2 - -# Test the rdprs instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 70000028 rdprs zero,zero,0 -0+0004 <[^>]*> 70010028 rdprs zero,zero,1 -0+0008 <[^>]*> 70020028 rdprs zero,zero,2 -0+000c <[^>]*> 70040028 rdprs zero,zero,4 -0+0010 <[^>]*> 70080028 rdprs zero,zero,8 -0+0014 <[^>]*> 70100028 rdprs zero,zero,16 -0+0018 <[^>]*> 70200028 rdprs zero,zero,32 -0+001c <[^>]*> 70400028 rdprs zero,zero,64 -0+0020 <[^>]*> 70800028 rdprs zero,zero,128 -0+0024 <[^>]*> 71000028 rdprs zero,zero,256 -0+0028 <[^>]*> 72000028 rdprs zero,zero,512 -0+002c <[^>]*> 74000028 rdprs zero,zero,1024 -0+0030 <[^>]*> 78000028 rdprs zero,zero,-2048 -0+0034 <[^>]*> 70000828 rdprs at,zero,0 -0+0038 <[^>]*> 70001028 rdprs r2,zero,0 -0+003c <[^>]*> 70002028 rdprs r4,zero,0 -0+0040 <[^>]*> 70004028 rdprs r8,zero,0 -0+0044 <[^>]*> 70008028 rdprs r16,zero,0 -0+0048 <[^>]*> 70000068 rdprs zero,at,0 -0+004c <[^>]*> 700000a8 rdprs zero,r2,0 -0+0050 <[^>]*> 70000128 rdprs zero,r4,0 -0+0054 <[^>]*> 70000228 rdprs zero,r8,0 -0+0058 <[^>]*> 70000428 rdprs zero,r16,0 diff --git a/gas/testsuite/gas/nios2/rdprs-r2.s b/gas/testsuite/gas/nios2/rdprs-r2.s deleted file mode 100644 index 47d4840ad01..00000000000 --- a/gas/testsuite/gas/nios2/rdprs-r2.s +++ /dev/null @@ -1,28 +0,0 @@ -# Source file used to test the rdprs instruction - -.set noat - -foo: - rdprs zero, zero, 0 - rdprs zero, zero, 1 - rdprs zero, zero, 2 - rdprs zero, zero, 4 - rdprs zero, zero, 8 - rdprs zero, zero, 16 - rdprs zero, zero, 32 - rdprs zero, zero, 64 - rdprs zero, zero, 128 - rdprs zero, zero, 256 - rdprs zero, zero, 512 - rdprs zero, zero, 1024 - rdprs zero, zero, -2048 - rdprs at, zero, 0 - rdprs r2, zero, 0 - rdprs r4, zero, 0 - rdprs r8, zero, 0 - rdprs r16, zero, 0 - rdprs zero, at, 0 - rdprs zero, r2, 0 - rdprs zero, r4, 0 - rdprs zero, r8, 0 - rdprs zero, r16, 0 diff --git a/gas/testsuite/gas/nios2/rdprs.d b/gas/testsuite/gas/nios2/rdprs.d deleted file mode 100644 index f5a87cd4456..00000000000 --- a/gas/testsuite/gas/nios2/rdprs.d +++ /dev/null @@ -1,35 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 rdprs - -# Test the rdprs instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00000038 rdprs zero,zero,0 -0+0004 <[^>]*> 00000078 rdprs zero,zero,1 -0+0008 <[^>]*> 000000b8 rdprs zero,zero,2 -0+000c <[^>]*> 00000138 rdprs zero,zero,4 -0+0010 <[^>]*> 00000238 rdprs zero,zero,8 -0+0014 <[^>]*> 00000438 rdprs zero,zero,16 -0+0018 <[^>]*> 00000838 rdprs zero,zero,32 -0+001c <[^>]*> 00001038 rdprs zero,zero,64 -0+0020 <[^>]*> 00002038 rdprs zero,zero,128 -0+0024 <[^>]*> 00004038 rdprs zero,zero,256 -0+0028 <[^>]*> 00008038 rdprs zero,zero,512 -0+002c <[^>]*> 00010038 rdprs zero,zero,1024 -0+0030 <[^>]*> 00020038 rdprs zero,zero,2048 -0+0034 <[^>]*> 00040038 rdprs zero,zero,4096 -0+0038 <[^>]*> 00080038 rdprs zero,zero,8192 -0+003c <[^>]*> 00100038 rdprs zero,zero,16384 -0+0040 <[^>]*> 00200038 rdprs zero,zero,-32768 -0+0044 <[^>]*> 00400038 rdprs at,zero,0 -0+0048 <[^>]*> 00800038 rdprs r2,zero,0 -0+004c <[^>]*> 01000038 rdprs r4,zero,0 -0+0050 <[^>]*> 02000038 rdprs r8,zero,0 -0+0054 <[^>]*> 04000038 rdprs r16,zero,0 -0+0058 <[^>]*> 08000038 rdprs zero,at,0 -0+005c <[^>]*> 10000038 rdprs zero,r2,0 -0+0060 <[^>]*> 20000038 rdprs zero,r4,0 -0+0064 <[^>]*> 40000038 rdprs zero,r8,0 -0+0068 <[^>]*> 80000038 rdprs zero,r16,0 diff --git a/gas/testsuite/gas/nios2/rdprs.s b/gas/testsuite/gas/nios2/rdprs.s deleted file mode 100644 index fb4909db40b..00000000000 --- a/gas/testsuite/gas/nios2/rdprs.s +++ /dev/null @@ -1,32 +0,0 @@ -# Source file used to test the rdprs instruction - -.set noat - -foo: - rdprs zero, zero, 0 - rdprs zero, zero, 1 - rdprs zero, zero, 2 - rdprs zero, zero, 4 - rdprs zero, zero, 8 - rdprs zero, zero, 16 - rdprs zero, zero, 32 - rdprs zero, zero, 64 - rdprs zero, zero, 128 - rdprs zero, zero, 256 - rdprs zero, zero, 512 - rdprs zero, zero, 1024 - rdprs zero, zero, 2048 - rdprs zero, zero, 4096 - rdprs zero, zero, 8192 - rdprs zero, zero, 16384 - rdprs zero, zero, -32768 - rdprs at, zero, 0 - rdprs r2, zero, 0 - rdprs r4, zero, 0 - rdprs r8, zero, 0 - rdprs r16, zero, 0 - rdprs zero, at, 0 - rdprs zero, r2, 0 - rdprs zero, r4, 0 - rdprs zero, r8, 0 - rdprs zero, r16, 0 diff --git a/gas/testsuite/gas/nios2/registers-r2.d b/gas/testsuite/gas/nios2/registers-r2.d deleted file mode 100644 index 95ad9799241..00000000000 --- a/gas/testsuite/gas/nios2/registers-r2.d +++ /dev/null @@ -1,53 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 registers -#as: -march=r2 -#source: registers.s - -# Test the register names - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 007b0004 movi zero,123 -0+0004 <[^>]*> 007b0804 movi at,123 -0+0008 <[^>]*> 007b1004 movi r2,123 -0+000c <[^>]*> 007b1804 movi r3,123 -0+0010 <[^>]*> 007b2004 movi r4,123 -0+0014 <[^>]*> 007b2804 movi r5,123 -0+0018 <[^>]*> 007b3004 movi r6,123 -0+001c <[^>]*> 007b3804 movi r7,123 -0+0020 <[^>]*> 007b4004 movi r8,123 -0+0024 <[^>]*> 007b4804 movi r9,123 -0+0028 <[^>]*> 007b5004 movi r10,123 -0+002c <[^>]*> 007b5804 movi r11,123 -0+0030 <[^>]*> 007b6004 movi r12,123 -0+0034 <[^>]*> 007b6804 movi r13,123 -0+0038 <[^>]*> 007b7004 movi r14,123 -0+003c <[^>]*> 007b7804 movi r15,123 -0+0040 <[^>]*> 007b8004 movi r16,123 -0+0044 <[^>]*> 007b8804 movi r17,123 -0+0048 <[^>]*> 007b9004 movi r18,123 -0+004c <[^>]*> 007b9804 movi r19,123 -0+0050 <[^>]*> 007ba004 movi r20,123 -0+0054 <[^>]*> 007ba804 movi r21,123 -0+0058 <[^>]*> 007bb004 movi r22,123 -0+005c <[^>]*> 007bb804 movi r23,123 -0+0060 <[^>]*> 007bc004 movi et,123 -0+0064 <[^>]*> 007bc804 movi bt,123 -0+0068 <[^>]*> 007bd004 movi gp,123 -0+006c <[^>]*> 007bd804 movi sp,123 -0+0070 <[^>]*> 007be004 movi fp,123 -0+0074 <[^>]*> 007be804 movi ea,123 -0+0078 <[^>]*> 007bf004 movi sstatus,123 -0+007c <[^>]*> 007bf804 movi ra,123 -0+0080 <[^>]*> 007b0004 movi zero,123 -0+0084 <[^>]*> 007b0804 movi at,123 -0+0088 <[^>]*> 007bc004 movi et,123 -0+008c <[^>]*> 007bc804 movi bt,123 -0+0090 <[^>]*> 007bd004 movi gp,123 -0+0094 <[^>]*> 007bd804 movi sp,123 -0+0098 <[^>]*> 007be004 movi fp,123 -0+009c <[^>]*> 007be804 movi ea,123 -0+00a0 <[^>]*> 007bf004 movi sstatus,123 -0+00a4 <[^>]*> 007bf004 movi sstatus,123 -0+00a8 <[^>]*> 007bf804 movi ra,123 diff --git a/gas/testsuite/gas/nios2/registers.d b/gas/testsuite/gas/nios2/registers.d deleted file mode 100644 index 7fd64d0773b..00000000000 --- a/gas/testsuite/gas/nios2/registers.d +++ /dev/null @@ -1,51 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 registers - -# Test the register names - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00001ec4 movi zero,123 -0+0004 <[^>]*> 00401ec4 movi at,123 -0+0008 <[^>]*> 00801ec4 movi r2,123 -0+000c <[^>]*> 00c01ec4 movi r3,123 -0+0010 <[^>]*> 01001ec4 movi r4,123 -0+0014 <[^>]*> 01401ec4 movi r5,123 -0+0018 <[^>]*> 01801ec4 movi r6,123 -0+001c <[^>]*> 01c01ec4 movi r7,123 -0+0020 <[^>]*> 02001ec4 movi r8,123 -0+0024 <[^>]*> 02401ec4 movi r9,123 -0+0028 <[^>]*> 02801ec4 movi r10,123 -0+002c <[^>]*> 02c01ec4 movi r11,123 -0+0030 <[^>]*> 03001ec4 movi r12,123 -0+0034 <[^>]*> 03401ec4 movi r13,123 -0+0038 <[^>]*> 03801ec4 movi r14,123 -0+003c <[^>]*> 03c01ec4 movi r15,123 -0+0040 <[^>]*> 04001ec4 movi r16,123 -0+0044 <[^>]*> 04401ec4 movi r17,123 -0+0048 <[^>]*> 04801ec4 movi r18,123 -0+004c <[^>]*> 04c01ec4 movi r19,123 -0+0050 <[^>]*> 05001ec4 movi r20,123 -0+0054 <[^>]*> 05401ec4 movi r21,123 -0+0058 <[^>]*> 05801ec4 movi r22,123 -0+005c <[^>]*> 05c01ec4 movi r23,123 -0+0060 <[^>]*> 06001ec4 movi et,123 -0+0064 <[^>]*> 06401ec4 movi bt,123 -0+0068 <[^>]*> 06801ec4 movi gp,123 -0+006c <[^>]*> 06c01ec4 movi sp,123 -0+0070 <[^>]*> 07001ec4 movi fp,123 -0+0074 <[^>]*> 07401ec4 movi ea,123 -0+0078 <[^>]*> 07801ec4 movi sstatus,123 -0+007c <[^>]*> 07c01ec4 movi ra,123 -0+0080 <[^>]*> 00001ec4 movi zero,123 -0+0084 <[^>]*> 00401ec4 movi at,123 -0+0088 <[^>]*> 06001ec4 movi et,123 -0+008c <[^>]*> 06401ec4 movi bt,123 -0+0090 <[^>]*> 06801ec4 movi gp,123 -0+0094 <[^>]*> 06c01ec4 movi sp,123 -0+0098 <[^>]*> 07001ec4 movi fp,123 -0+009c <[^>]*> 07401ec4 movi ea,123 -0+00a0 <[^>]*> 07801ec4 movi sstatus,123 -0+00a4 <[^>]*> 07801ec4 movi sstatus,123 -0+00a8 <[^>]*> 07c01ec4 movi ra,123 diff --git a/gas/testsuite/gas/nios2/registers.s b/gas/testsuite/gas/nios2/registers.s deleted file mode 100644 index 6c2b124904a..00000000000 --- a/gas/testsuite/gas/nios2/registers.s +++ /dev/null @@ -1,51 +0,0 @@ -# Source file used to test the register names - -.set noat -.set nobreak - -foo: -# Standard register names - movi zero, 123 - movi at, 123 - movi r2, 123 - movi r3, 123 - movi r4, 123 - movi r5, 123 - movi r6, 123 - movi r7, 123 - movi r8, 123 - movi r9, 123 - movi r10, 123 - movi r11, 123 - movi r12, 123 - movi r13, 123 - movi r14, 123 - movi r15, 123 - movi r16, 123 - movi r17, 123 - movi r18, 123 - movi r19, 123 - movi r20, 123 - movi r21, 123 - movi r22, 123 - movi r23, 123 - movi et, 123 - movi bt, 123 - movi gp, 123 - movi sp, 123 - movi fp, 123 - movi ea, 123 - movi sstatus, 123 - movi ra, 123 -# Alternative names for special registers - movi r0, 123 - movi r1, 123 - movi r24, 123 - movi r25, 123 - movi r26, 123 - movi r27, 123 - movi r28, 123 - movi r29, 123 - movi r30, 123 - movi ba, 123 - movi r31, 123 diff --git a/gas/testsuite/gas/nios2/relax.d b/gas/testsuite/gas/nios2/relax.d deleted file mode 100644 index 85627f8d5dc..00000000000 --- a/gas/testsuite/gas/nios2/relax.d +++ /dev/null @@ -1,25 +0,0 @@ -#source: relax.s -#as: --gdwarf-5 -#objdump: -w -WL -dr --prefix-addresses --show-raw-insn -#name: NIOS2 relax with --gdwarf-5 - -# Test relaxation with assembler generated debug info. -.*: file format elf32-littlenios2 - -Contents of the .debug_line section: - -CU: .*relax.s: -File +name +Line +number +Starting +address +View +Stmt -relax.s +2 +0 +x -relax.s +5 +0x10018 +x -relax.s +- +0x1001c - -Disassembly of section .text: -0x00000000 21400526 beq r4,r5,0x00000018 -0x00000004 0002e03a nextpc at -0x00000008 085fffc4 addi at,at,32767 -0x0000000c 085fffc4 addi at,at,32767 -0x00000010 08400484 addi at,at,18 -0x00000014 0800683a jmp at - ... -0x00010018 f800283a ret diff --git a/gas/testsuite/gas/nios2/relax.s b/gas/testsuite/gas/nios2/relax.s deleted file mode 100644 index ef417fdc33b..00000000000 --- a/gas/testsuite/gas/nios2/relax.s +++ /dev/null @@ -1,5 +0,0 @@ - .text - bne r4, r5, 1f - .zero 0x10000 -1: - ret diff --git a/gas/testsuite/gas/nios2/ret-r2.d b/gas/testsuite/gas/nios2/ret-r2.d deleted file mode 100644 index 72d537f4f7c..00000000000 --- a/gas/testsuite/gas/nios2/ret-r2.d +++ /dev/null @@ -1,10 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 ret -#as: -march=r2 -#source: ret.s - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 140007e0 ret - diff --git a/gas/testsuite/gas/nios2/ret.d b/gas/testsuite/gas/nios2/ret.d deleted file mode 100644 index fe924e10610..00000000000 --- a/gas/testsuite/gas/nios2/ret.d +++ /dev/null @@ -1,8 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 ret - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> f800283a ret - diff --git a/gas/testsuite/gas/nios2/ret.s b/gas/testsuite/gas/nios2/ret.s deleted file mode 100644 index 69b76bc5513..00000000000 --- a/gas/testsuite/gas/nios2/ret.s +++ /dev/null @@ -1,5 +0,0 @@ -# Source file used to test the ret instructions -foo: - ret - - diff --git a/gas/testsuite/gas/nios2/rotate-r2.d b/gas/testsuite/gas/nios2/rotate-r2.d deleted file mode 100644 index 625e2dd5dfa..00000000000 --- a/gas/testsuite/gas/nios2/rotate-r2.d +++ /dev/null @@ -1,19 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 rotate -#source: rotate.s -#as: -march=r2 - -# Test the and macro. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0c042120 rol r4,r4,r4 -0+0004 <[^>]*> 0be40120 roli r4,r4,31 -0+0008 <[^>]*> 2c042120 ror r4,r4,r4 -0+000c <[^>]*> 4c042120 sll r4,r4,r4 -0+0010 <[^>]*> 4b040120 slli r4,r4,24 -0+0014 <[^>]*> ec042120 sra r4,r4,r4 -0+0018 <[^>]*> e9440120 srai r4,r4,10 -0+001c <[^>]*> 6c042120 srl r4,r4,r4 -0+0020 <[^>]*> 68a40120 srli r4,r4,5 diff --git a/gas/testsuite/gas/nios2/rotate.d b/gas/testsuite/gas/nios2/rotate.d deleted file mode 100644 index 72338dae18c..00000000000 --- a/gas/testsuite/gas/nios2/rotate.d +++ /dev/null @@ -1,17 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 rotate - -# Test the and macro. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 2108183a rol r4,r4,r4 -0+0004 <[^>]*> 200817fa roli r4,r4,31 -0+0008 <[^>]*> 2108583a ror r4,r4,r4 -0+000c <[^>]*> 2108983a sll r4,r4,r4 -0+0010 <[^>]*> 2008963a slli r4,r4,24 -0+0014 <[^>]*> 2109d83a sra r4,r4,r4 -0+0018 <[^>]*> 2009d2ba srai r4,r4,10 -0+001c <[^>]*> 2108d83a srl r4,r4,r4 -0+0020 <[^>]*> 2008d17a srli r4,r4,5 diff --git a/gas/testsuite/gas/nios2/rotate.s b/gas/testsuite/gas/nios2/rotate.s deleted file mode 100644 index a960e192b63..00000000000 --- a/gas/testsuite/gas/nios2/rotate.s +++ /dev/null @@ -1,13 +0,0 @@ -# test Nios II rotate instructions - -.text -foo: - rol r4,r4,r4 - roli r4,r4,31 - ror r4,r4,r4 - sll r4,r4,r4 - slli r4,r4,24 - sra r4,r4,r4 - srai r4,r4,10 - srl r4,r4,r4 - srli r4,r4,5 diff --git a/gas/testsuite/gas/nios2/selftest.d b/gas/testsuite/gas/nios2/selftest.d deleted file mode 100644 index 84b33a468d7..00000000000 --- a/gas/testsuite/gas/nios2/selftest.d +++ /dev/null @@ -1,18 +0,0 @@ -#as: -r -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 selftest - -# Test the assembler self-test mode on some instructions that -# manipulate control registers. The purpose of this test is to make -# sure the assembler doesn't choke, rather than to match the encodings -# of the particular instructions in the test here. - -.*: +file format elf32-littlenios2 - - -Disassembly of section .text: -0+0000 <[^>]*> 1001703a wrctl status,r2 -0+0004 <[^>]*> 1001703a wrctl status,r2 -0+0008 <[^>]*> 1001707a wrctl estatus,r2 -0+000c <[^>]*> 1001707a wrctl estatus,r2 -#... diff --git a/gas/testsuite/gas/nios2/selftest.s b/gas/testsuite/gas/nios2/selftest.s deleted file mode 100644 index bbfad1a020f..00000000000 --- a/gas/testsuite/gas/nios2/selftest.s +++ /dev/null @@ -1,134 +0,0 @@ -# Use self-test mode to verify that all the expected control register -# names assemble correctly. - -_start: - wrctl ctl0, r2, 0x1001703a - wrctl status, r2, 0x1001703a - - wrctl ctl1, r2, 0x1001707a - wrctl estatus, r2, 0x1001707a - - wrctl ctl2, r2, 0x100170ba - wrctl bstatus, r2, 0x100170ba - - wrctl ctl3, r2, 0x100170fa - wrctl ienable, r2, 0x100170fa - -# wrctl ctl4, r2, 0x1001713a # write-only register -# wrctl ipending, r2, 0x1001713a # - - wrctl ctl5, r2, 0x1001717a - wrctl cpuid, r2, 0x1001717a - - wrctl ctl6, r2, 0x100171ba - - wrctl ctl7, r2, 0x100171fa - wrctl exception,r2, 0x100171fa - - wrctl ctl8, r2, 0x1001723a - wrctl pteaddr, r2, 0x1001723a - - wrctl ctl9, r2, 0x1001727a - wrctl tlbacc, r2, 0x1001727a - - wrctl ctl10, r2, 0x100172ba - wrctl tlbmisc, r2, 0x100172ba - - wrctl ctl11, r2, 0x100172fa - wrctl eccinj, r2, 0x100172fa - - wrctl ctl12, r2, 0x1001733a - wrctl badaddr, r2, 0x1001733a - - wrctl ctl13, r2, 0x1001737a - wrctl config, r2, 0x1001737a - - wrctl ctl14, r2, 0x100173ba - wrctl mpubase, r2, 0x100173ba - - wrctl ctl15, r2, 0x100173fa - wrctl mpuacc, r2, 0x100173fa - - wrctl ctl16, r2, 0x1001743a - wrctl ctl17, r2, 0x1001747a - wrctl ctl18, r2, 0x100174ba - wrctl ctl19, r2, 0x100174fa - wrctl ctl20, r2, 0x1001753a - wrctl ctl21, r2, 0x1001757a - wrctl ctl22, r2, 0x100175ba - wrctl ctl23, r2, 0x100175fa - wrctl ctl24, r2, 0x1001763a - wrctl ctl25, r2, 0x1001767a - wrctl ctl26, r2, 0x100176ba - wrctl ctl27, r2, 0x100176fa - wrctl ctl28, r2, 0x1001773a - wrctl ctl29, r2, 0x1001777a - wrctl ctl30, r2, 0x100177ba - wrctl ctl31, r2, 0x100177fa - - - rdctl r2,ctl0, 0x0005303a - rdctl r2,status, 0x0005303a - - rdctl r2,ctl1, 0x0005307a - rdctl r2,estatus, 0x0005307a - - rdctl r2,ctl2, 0x000530ba - rdctl r2,bstatus, 0x000530ba - - rdctl r2,ctl3, 0x000530fa - rdctl r2,ienable, 0x000530fa - - rdctl r2,ctl4, 0x0005313a - rdctl r2,ipending, 0x0005313a - - rdctl r2,ctl5, 0x0005317a - rdctl r2,cpuid, 0x0005317a - - rdctl r2,ctl6, 0x000531ba - - rdctl r2,ctl7, 0x000531fa - rdctl r2,exception,0x000531fa - - rdctl r2,ctl8, 0x0005323a - rdctl r2,pteaddr, 0x0005323a - - rdctl r2,ctl9, 0x0005327a - rdctl r2,tlbacc, 0x0005327a - - rdctl r2,ctl10, 0x000532ba - rdctl r2,tlbmisc, 0x000532ba - - rdctl r2,ctl11, 0x000532fa - rdctl r2,eccinj, 0x000532fa - - rdctl r2,ctl12, 0x0005333a - rdctl r2,badaddr, 0x0005333a - - rdctl r2,ctl13, 0x0005337a - rdctl r2,config, 0x0005337a - - rdctl r2,ctl14, 0x000533ba - rdctl r2,mpubase, 0x000533ba - - rdctl r2,ctl15, 0x000533fa - rdctl r2,mpuacc, 0x000533fa - - rdctl r2,ctl16, 0x0005343a - rdctl r2,ctl17, 0x0005347a - rdctl r2,ctl18, 0x000534ba - rdctl r2,ctl19, 0x000534fa - rdctl r2,ctl20, 0x0005353a - rdctl r2,ctl21, 0x0005357a - rdctl r2,ctl22, 0x000535ba - rdctl r2,ctl23, 0x000535fa - rdctl r2,ctl24, 0x0005363a - rdctl r2,ctl25, 0x0005367a - rdctl r2,ctl26, 0x000536ba - rdctl r2,ctl27, 0x000536fa - rdctl r2,ctl28, 0x0005373a - rdctl r2,ctl29, 0x0005377a - rdctl r2,ctl30, 0x000537ba - rdctl r2,ctl31, 0x000537fa - - diff --git a/gas/testsuite/gas/nios2/stb-r2.d b/gas/testsuite/gas/nios2/stb-r2.d deleted file mode 100644 index d0285cb6155..00000000000 --- a/gas/testsuite/gas/nios2/stb-r2.d +++ /dev/null @@ -1,197 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 stb -#as: -march=r2 - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00002027 stb r4,0\(zero\) -0+0004 <[^>]*> 00042027 stb r4,4\(zero\) -0+0008 <[^>]*> 07fc2027 stb r4,2044\(zero\) -0+000c <[^>]*> f8002027 stb r4,-2048\(zero\) -0+0010 <[^>]*> 00002167 stb r4,0\(r5\) -0+0014 <[^>]*> 00042167 stb r4,4\(r5\) -0+0018 <[^>]*> 07fc2167 stb r4,2044\(r5\) -0+001c <[^>]*> f8002167 stb r4,-2048\(r5\) -0+0020 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x400 -0+003c <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x404 -0+0058 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x800 -0+005c <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x800 -0+0060 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x800 -0+0064 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x800 -0+0068 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x800 -0+006c <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x800 -0+0070 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x400 -0+0074 <[^>]*> 00002027 stb r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x400 -0+0094 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x404 -0+00b0 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x800 -0+00b4 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x800 -0+00b8 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x800 -0+00bc <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x800 -0+00c0 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x800 -0+00c4 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x800 -0+00c8 <[^>]*> 00002167 stb r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x400 -0+00cc <[^>]*> 10002028 stbio r4,0\(zero\) -0+00d0 <[^>]*> 10042028 stbio r4,4\(zero\) -0+00d4 <[^>]*> 17fc2028 stbio r4,2044\(zero\) -0+00d8 <[^>]*> 18002028 stbio r4,-2048\(zero\) -0+00dc <[^>]*> 10002168 stbio r4,0\(r5\) -0+00e0 <[^>]*> 10042168 stbio r4,4\(r5\) -0+00e4 <[^>]*> 17fc2168 stbio r4,2044\(r5\) -0+00e8 <[^>]*> 18002168 stbio r4,-2048\(r5\) -0+00ec <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*ec: R_NIOS2_R2_S12 .data -0+00f0 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*f0: R_NIOS2_R2_S12 big_external_data_label -0+00f4 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*f4: R_NIOS2_R2_S12 small_external_data_label -0+00f8 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*f8: R_NIOS2_R2_S12 big_external_common -0+00fc <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*fc: R_NIOS2_R2_S12 small_external_common -0+0100 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*100: R_NIOS2_R2_S12 .bss -0+0104 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*104: R_NIOS2_R2_S12 .bss\+0x400 -0+0108 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*108: R_NIOS2_R2_S12 .data\+0x4 -0+010c <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*10c: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0110 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*110: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+0114 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*114: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0118 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*118: R_NIOS2_R2_S12 small_external_common\+0x4 -0+011c <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*11c: R_NIOS2_R2_S12 .bss\+0x4 -0+0120 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*120: R_NIOS2_R2_S12 .bss\+0x404 -0+0124 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*124: R_NIOS2_R2_S12 .data-0x800 -0+0128 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*128: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+012c <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*12c: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0130 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*130: R_NIOS2_R2_S12 big_external_common-0x800 -0+0134 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*134: R_NIOS2_R2_S12 small_external_common-0x800 -0+0138 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*138: R_NIOS2_R2_S12 .bss-0x800 -0+013c <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*13c: R_NIOS2_R2_S12 .bss-0x400 -0+0140 <[^>]*> 10002028 stbio r4,0\(zero\) -[ ]*140: R_NIOS2_R2_S12 .data\+0x10000 -0+0144 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*144: R_NIOS2_R2_S12 .data -0+0148 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*148: R_NIOS2_R2_S12 big_external_data_label -0+014c <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*14c: R_NIOS2_R2_S12 small_external_data_label -0+0150 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*150: R_NIOS2_R2_S12 big_external_common -0+0154 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*154: R_NIOS2_R2_S12 small_external_common -0+0158 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*158: R_NIOS2_R2_S12 .bss -0+015c <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*15c: R_NIOS2_R2_S12 .bss\+0x400 -0+0160 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*160: R_NIOS2_R2_S12 .data\+0x4 -0+0164 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*164: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0168 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*168: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+016c <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*16c: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0170 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*170: R_NIOS2_R2_S12 small_external_common\+0x4 -0+0174 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*174: R_NIOS2_R2_S12 .bss\+0x4 -0+0178 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*178: R_NIOS2_R2_S12 .bss\+0x404 -0+017c <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*17c: R_NIOS2_R2_S12 .data-0x800 -0+0180 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*180: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+0184 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*184: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0188 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*188: R_NIOS2_R2_S12 big_external_common-0x800 -0+018c <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*18c: R_NIOS2_R2_S12 small_external_common-0x800 -0+0190 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*190: R_NIOS2_R2_S12 .bss-0x800 -0+0194 <[^>]*> 10002168 stbio r4,0\(r5\) -[ ]*194: R_NIOS2_R2_S12 .bss-0x400 diff --git a/gas/testsuite/gas/nios2/stb-r2.s b/gas/testsuite/gas/nios2/stb-r2.s deleted file mode 100644 index a19daf718db..00000000000 --- a/gas/testsuite/gas/nios2/stb-r2.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x400 - .extern small_external_data_label,4 - .comm big_external_common,0x400 - .comm small_external_common,4 - .lcomm big_local_common,0x400 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - stb r4,0(r0) - stb r4,4(r0) - stb r4,0x7fc(r0) - stb r4,-0x800(r0) - stb r4,0(r5) - stb r4,4(r5) - stb r4,0x7fc(r5) - stb r4,-0x800(r5) - stb r4,data_label(r0) - stb r4,big_external_data_label(r0) - stb r4,small_external_data_label(r0) - stb r4,big_external_common(r0) - stb r4,small_external_common(r0) - stb r4,big_local_common(r0) - stb r4,small_local_common(r0) - stb r4,data_label+4(r0) - stb r4,big_external_data_label+4(r0) - stb r4,small_external_data_label+4(r0) - stb r4,big_external_common+4(r0) - stb r4,small_external_common+4(r0) - stb r4,big_local_common+4(r0) - stb r4,small_local_common+4(r0) - stb r4,data_label-0x800(r0) - stb r4,big_external_data_label-0x800(r0) - stb r4,small_external_data_label-0x800(r0) - stb r4,big_external_common-0x800(r0) - stb r4,small_external_common-0x800(r0) - stb r4,big_local_common-0x800(r0) - stb r4,small_local_common-0x800(r0) - stb r4,data_label+0x10000(r0) - stb r4,data_label(r5) - stb r4,big_external_data_label(r5) - stb r4,small_external_data_label(r5) - stb r4,big_external_common(r5) - stb r4,small_external_common(r5) - stb r4,big_local_common(r5) - stb r4,small_local_common(r5) - stb r4,data_label+4(r5) - stb r4,big_external_data_label+4(r5) - stb r4,small_external_data_label+4(r5) - stb r4,big_external_common+4(r5) - stb r4,small_external_common+4(r5) - stb r4,big_local_common+4(r5) - stb r4,small_local_common+4(r5) - stb r4,data_label-0x800(r5) - stb r4,big_external_data_label-0x800(r5) - stb r4,small_external_data_label-0x800(r5) - stb r4,big_external_common-0x800(r5) - stb r4,small_external_common-0x800(r5) - stb r4,big_local_common-0x800(r5) - stb r4,small_local_common-0x800(r5) - - stbio r4,0(r0) - stbio r4,4(r0) - stbio r4,0x7fc(r0) - stbio r4,-0x800(r0) - stbio r4,0(r5) - stbio r4,4(r5) - stbio r4,0x7fc(r5) - stbio r4,-0x800(r5) - stbio r4,data_label(r0) - stbio r4,big_external_data_label(r0) - stbio r4,small_external_data_label(r0) - stbio r4,big_external_common(r0) - stbio r4,small_external_common(r0) - stbio r4,big_local_common(r0) - stbio r4,small_local_common(r0) - stbio r4,data_label+4(r0) - stbio r4,big_external_data_label+4(r0) - stbio r4,small_external_data_label+4(r0) - stbio r4,big_external_common+4(r0) - stbio r4,small_external_common+4(r0) - stbio r4,big_local_common+4(r0) - stbio r4,small_local_common+4(r0) - stbio r4,data_label-0x800(r0) - stbio r4,big_external_data_label-0x800(r0) - stbio r4,small_external_data_label-0x800(r0) - stbio r4,big_external_common-0x800(r0) - stbio r4,small_external_common-0x800(r0) - stbio r4,big_local_common-0x800(r0) - stbio r4,small_local_common-0x800(r0) - stbio r4,data_label+0x10000(r0) - stbio r4,data_label(r5) - stbio r4,big_external_data_label(r5) - stbio r4,small_external_data_label(r5) - stbio r4,big_external_common(r5) - stbio r4,small_external_common(r5) - stbio r4,big_local_common(r5) - stbio r4,small_local_common(r5) - stbio r4,data_label+4(r5) - stbio r4,big_external_data_label+4(r5) - stbio r4,small_external_data_label+4(r5) - stbio r4,big_external_common+4(r5) - stbio r4,small_external_common+4(r5) - stbio r4,big_local_common+4(r5) - stbio r4,small_local_common+4(r5) - stbio r4,data_label-0x800(r5) - stbio r4,big_external_data_label-0x800(r5) - stbio r4,small_external_data_label-0x800(r5) - stbio r4,big_external_common-0x800(r5) - stbio r4,small_external_common-0x800(r5) - stbio r4,big_local_common-0x800(r5) - stbio r4,small_local_common-0x800(r5) diff --git a/gas/testsuite/gas/nios2/stb.d b/gas/testsuite/gas/nios2/stb.d deleted file mode 100644 index c8b4ba5ad32..00000000000 --- a/gas/testsuite/gas/nios2/stb.d +++ /dev/null @@ -1,196 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 stb - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 01000005 stb r4,0\(zero\) -0+0004 <[^>]*> 01000105 stb r4,4\(zero\) -0+0008 <[^>]*> 011fff05 stb r4,32764\(zero\) -0+000c <[^>]*> 01200005 stb r4,-32768\(zero\) -0+0010 <[^>]*> 29000005 stb r4,0\(r5\) -0+0014 <[^>]*> 29000105 stb r4,4\(r5\) -0+0018 <[^>]*> 291fff05 stb r4,32764\(r5\) -0+001c <[^>]*> 29200005 stb r4,-32768\(r5\) -0+0020 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x4000 -0+003c <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x4004 -0+0058 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x8000 -0+005c <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000 -0+0060 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000 -0+0064 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x8000 -0+0068 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x8000 -0+006c <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x8000 -0+0070 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x4000 -0+0074 <[^>]*> 01000005 stb r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x4000 -0+0094 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x4004 -0+00b0 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x8000 -0+00b4 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000 -0+00b8 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000 -0+00bc <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x8000 -0+00c0 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x8000 -0+00c4 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x8000 -0+00c8 <[^>]*> 29000005 stb r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x4000 -0+00cc <[^>]*> 01000025 stbio r4,0\(zero\) -0+00d0 <[^>]*> 01000125 stbio r4,4\(zero\) -0+00d4 <[^>]*> 011fff25 stbio r4,32764\(zero\) -0+00d8 <[^>]*> 01200025 stbio r4,-32768\(zero\) -0+00dc <[^>]*> 29000025 stbio r4,0\(r5\) -0+00e0 <[^>]*> 29000125 stbio r4,4\(r5\) -0+00e4 <[^>]*> 291fff25 stbio r4,32764\(r5\) -0+00e8 <[^>]*> 29200025 stbio r4,-32768\(r5\) -0+00ec <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*ec: R_NIOS2_S16 .data -0+00f0 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*f0: R_NIOS2_S16 big_external_data_label -0+00f4 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*f4: R_NIOS2_S16 small_external_data_label -0+00f8 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*f8: R_NIOS2_S16 big_external_common -0+00fc <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*fc: R_NIOS2_S16 small_external_common -0+0100 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*100: R_NIOS2_S16 .bss -0+0104 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*104: R_NIOS2_S16 .bss\+0x4000 -0+0108 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*108: R_NIOS2_S16 .data\+0x4 -0+010c <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4 -0+0110 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4 -0+0114 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*114: R_NIOS2_S16 big_external_common\+0x4 -0+0118 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*118: R_NIOS2_S16 small_external_common\+0x4 -0+011c <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*11c: R_NIOS2_S16 .bss\+0x4 -0+0120 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*120: R_NIOS2_S16 .bss\+0x4004 -0+0124 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*124: R_NIOS2_S16 .data-0x8000 -0+0128 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000 -0+012c <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000 -0+0130 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*130: R_NIOS2_S16 big_external_common-0x8000 -0+0134 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*134: R_NIOS2_S16 small_external_common-0x8000 -0+0138 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*138: R_NIOS2_S16 .bss-0x8000 -0+013c <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*13c: R_NIOS2_S16 .bss-0x4000 -0+0140 <[^>]*> 01000025 stbio r4,0\(zero\) -[ ]*140: R_NIOS2_S16 .data\+0x10000 -0+0144 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*144: R_NIOS2_S16 .data -0+0148 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*148: R_NIOS2_S16 big_external_data_label -0+014c <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*14c: R_NIOS2_S16 small_external_data_label -0+0150 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*150: R_NIOS2_S16 big_external_common -0+0154 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*154: R_NIOS2_S16 small_external_common -0+0158 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*158: R_NIOS2_S16 .bss -0+015c <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*15c: R_NIOS2_S16 .bss\+0x4000 -0+0160 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*160: R_NIOS2_S16 .data\+0x4 -0+0164 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4 -0+0168 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4 -0+016c <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*16c: R_NIOS2_S16 big_external_common\+0x4 -0+0170 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*170: R_NIOS2_S16 small_external_common\+0x4 -0+0174 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*174: R_NIOS2_S16 .bss\+0x4 -0+0178 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*178: R_NIOS2_S16 .bss\+0x4004 -0+017c <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*17c: R_NIOS2_S16 .data-0x8000 -0+0180 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000 -0+0184 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000 -0+0188 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*188: R_NIOS2_S16 big_external_common-0x8000 -0+018c <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*18c: R_NIOS2_S16 small_external_common-0x8000 -0+0190 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*190: R_NIOS2_S16 .bss-0x8000 -0+0194 <[^>]*> 29000025 stbio r4,0\(r5\) -[ ]*194: R_NIOS2_S16 .bss-0x4000 diff --git a/gas/testsuite/gas/nios2/stb.s b/gas/testsuite/gas/nios2/stb.s deleted file mode 100644 index 8078e9413b7..00000000000 --- a/gas/testsuite/gas/nios2/stb.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x4000 - .extern small_external_data_label,4 - .comm big_external_common,0x4000 - .comm small_external_common,4 - .lcomm big_local_common,0x4000 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - stb r4,0(r0) - stb r4,4(r0) - stb r4,0x7ffc(r0) - stb r4,-0x8000(r0) - stb r4,0(r5) - stb r4,4(r5) - stb r4,0x7ffc(r5) - stb r4,-0x8000(r5) - stb r4,data_label(r0) - stb r4,big_external_data_label(r0) - stb r4,small_external_data_label(r0) - stb r4,big_external_common(r0) - stb r4,small_external_common(r0) - stb r4,big_local_common(r0) - stb r4,small_local_common(r0) - stb r4,data_label+4(r0) - stb r4,big_external_data_label+4(r0) - stb r4,small_external_data_label+4(r0) - stb r4,big_external_common+4(r0) - stb r4,small_external_common+4(r0) - stb r4,big_local_common+4(r0) - stb r4,small_local_common+4(r0) - stb r4,data_label-0x8000(r0) - stb r4,big_external_data_label-0x8000(r0) - stb r4,small_external_data_label-0x8000(r0) - stb r4,big_external_common-0x8000(r0) - stb r4,small_external_common-0x8000(r0) - stb r4,big_local_common-0x8000(r0) - stb r4,small_local_common-0x8000(r0) - stb r4,data_label+0x10000(r0) - stb r4,data_label(r5) - stb r4,big_external_data_label(r5) - stb r4,small_external_data_label(r5) - stb r4,big_external_common(r5) - stb r4,small_external_common(r5) - stb r4,big_local_common(r5) - stb r4,small_local_common(r5) - stb r4,data_label+4(r5) - stb r4,big_external_data_label+4(r5) - stb r4,small_external_data_label+4(r5) - stb r4,big_external_common+4(r5) - stb r4,small_external_common+4(r5) - stb r4,big_local_common+4(r5) - stb r4,small_local_common+4(r5) - stb r4,data_label-0x8000(r5) - stb r4,big_external_data_label-0x8000(r5) - stb r4,small_external_data_label-0x8000(r5) - stb r4,big_external_common-0x8000(r5) - stb r4,small_external_common-0x8000(r5) - stb r4,big_local_common-0x8000(r5) - stb r4,small_local_common-0x8000(r5) - - stbio r4,0(r0) - stbio r4,4(r0) - stbio r4,0x7ffc(r0) - stbio r4,-0x8000(r0) - stbio r4,0(r5) - stbio r4,4(r5) - stbio r4,0x7ffc(r5) - stbio r4,-0x8000(r5) - stbio r4,data_label(r0) - stbio r4,big_external_data_label(r0) - stbio r4,small_external_data_label(r0) - stbio r4,big_external_common(r0) - stbio r4,small_external_common(r0) - stbio r4,big_local_common(r0) - stbio r4,small_local_common(r0) - stbio r4,data_label+4(r0) - stbio r4,big_external_data_label+4(r0) - stbio r4,small_external_data_label+4(r0) - stbio r4,big_external_common+4(r0) - stbio r4,small_external_common+4(r0) - stbio r4,big_local_common+4(r0) - stbio r4,small_local_common+4(r0) - stbio r4,data_label-0x8000(r0) - stbio r4,big_external_data_label-0x8000(r0) - stbio r4,small_external_data_label-0x8000(r0) - stbio r4,big_external_common-0x8000(r0) - stbio r4,small_external_common-0x8000(r0) - stbio r4,big_local_common-0x8000(r0) - stbio r4,small_local_common-0x8000(r0) - stbio r4,data_label+0x10000(r0) - stbio r4,data_label(r5) - stbio r4,big_external_data_label(r5) - stbio r4,small_external_data_label(r5) - stbio r4,big_external_common(r5) - stbio r4,small_external_common(r5) - stbio r4,big_local_common(r5) - stbio r4,small_local_common(r5) - stbio r4,data_label+4(r5) - stbio r4,big_external_data_label+4(r5) - stbio r4,small_external_data_label+4(r5) - stbio r4,big_external_common+4(r5) - stbio r4,small_external_common+4(r5) - stbio r4,big_local_common+4(r5) - stbio r4,small_local_common+4(r5) - stbio r4,data_label-0x8000(r5) - stbio r4,big_external_data_label-0x8000(r5) - stbio r4,small_external_data_label-0x8000(r5) - stbio r4,big_external_common-0x8000(r5) - stbio r4,small_external_common-0x8000(r5) - stbio r4,big_local_common-0x8000(r5) - stbio r4,small_local_common-0x8000(r5) diff --git a/gas/testsuite/gas/nios2/sth-r2.d b/gas/testsuite/gas/nios2/sth-r2.d deleted file mode 100644 index c51d99c5c47..00000000000 --- a/gas/testsuite/gas/nios2/sth-r2.d +++ /dev/null @@ -1,197 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 sth -#as: -march=r2 - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0000202f sth r4,0\(zero\) -0+0004 <[^>]*> 0004202f sth r4,4\(zero\) -0+0008 <[^>]*> 07fc202f sth r4,2044\(zero\) -0+000c <[^>]*> f800202f sth r4,-2048\(zero\) -0+0010 <[^>]*> 0000216f sth r4,0\(r5\) -0+0014 <[^>]*> 0004216f sth r4,4\(r5\) -0+0018 <[^>]*> 07fc216f sth r4,2044\(r5\) -0+001c <[^>]*> f800216f sth r4,-2048\(r5\) -0+0020 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x400 -0+003c <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x404 -0+0058 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x800 -0+005c <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x800 -0+0060 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x800 -0+0064 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x800 -0+0068 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x800 -0+006c <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x800 -0+0070 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x400 -0+0074 <[^>]*> 0000202f sth r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x400 -0+0094 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x404 -0+00b0 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x800 -0+00b4 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x800 -0+00b8 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x800 -0+00bc <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x800 -0+00c0 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x800 -0+00c4 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x800 -0+00c8 <[^>]*> 0000216f sth r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x400 -0+00cc <[^>]*> 50002028 sthio r4,0\(zero\) -0+00d0 <[^>]*> 50042028 sthio r4,4\(zero\) -0+00d4 <[^>]*> 57fc2028 sthio r4,2044\(zero\) -0+00d8 <[^>]*> 58002028 sthio r4,-2048\(zero\) -0+00dc <[^>]*> 50002168 sthio r4,0\(r5\) -0+00e0 <[^>]*> 50042168 sthio r4,4\(r5\) -0+00e4 <[^>]*> 57fc2168 sthio r4,2044\(r5\) -0+00e8 <[^>]*> 58002168 sthio r4,-2048\(r5\) -0+00ec <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*ec: R_NIOS2_R2_S12 .data -0+00f0 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*f0: R_NIOS2_R2_S12 big_external_data_label -0+00f4 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*f4: R_NIOS2_R2_S12 small_external_data_label -0+00f8 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*f8: R_NIOS2_R2_S12 big_external_common -0+00fc <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*fc: R_NIOS2_R2_S12 small_external_common -0+0100 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*100: R_NIOS2_R2_S12 .bss -0+0104 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*104: R_NIOS2_R2_S12 .bss\+0x400 -0+0108 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*108: R_NIOS2_R2_S12 .data\+0x4 -0+010c <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*10c: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0110 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*110: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+0114 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*114: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0118 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*118: R_NIOS2_R2_S12 small_external_common\+0x4 -0+011c <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*11c: R_NIOS2_R2_S12 .bss\+0x4 -0+0120 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*120: R_NIOS2_R2_S12 .bss\+0x404 -0+0124 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*124: R_NIOS2_R2_S12 .data-0x800 -0+0128 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*128: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+012c <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*12c: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0130 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*130: R_NIOS2_R2_S12 big_external_common-0x800 -0+0134 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*134: R_NIOS2_R2_S12 small_external_common-0x800 -0+0138 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*138: R_NIOS2_R2_S12 .bss-0x800 -0+013c <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*13c: R_NIOS2_R2_S12 .bss-0x400 -0+0140 <[^>]*> 50002028 sthio r4,0\(zero\) -[ ]*140: R_NIOS2_R2_S12 .data\+0x10000 -0+0144 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*144: R_NIOS2_R2_S12 .data -0+0148 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*148: R_NIOS2_R2_S12 big_external_data_label -0+014c <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*14c: R_NIOS2_R2_S12 small_external_data_label -0+0150 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*150: R_NIOS2_R2_S12 big_external_common -0+0154 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*154: R_NIOS2_R2_S12 small_external_common -0+0158 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*158: R_NIOS2_R2_S12 .bss -0+015c <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*15c: R_NIOS2_R2_S12 .bss\+0x400 -0+0160 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*160: R_NIOS2_R2_S12 .data\+0x4 -0+0164 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*164: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0168 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*168: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+016c <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*16c: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0170 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*170: R_NIOS2_R2_S12 small_external_common\+0x4 -0+0174 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*174: R_NIOS2_R2_S12 .bss\+0x4 -0+0178 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*178: R_NIOS2_R2_S12 .bss\+0x404 -0+017c <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*17c: R_NIOS2_R2_S12 .data-0x800 -0+0180 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*180: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+0184 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*184: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0188 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*188: R_NIOS2_R2_S12 big_external_common-0x800 -0+018c <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*18c: R_NIOS2_R2_S12 small_external_common-0x800 -0+0190 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*190: R_NIOS2_R2_S12 .bss-0x800 -0+0194 <[^>]*> 50002168 sthio r4,0\(r5\) -[ ]*194: R_NIOS2_R2_S12 .bss-0x400 diff --git a/gas/testsuite/gas/nios2/sth-r2.s b/gas/testsuite/gas/nios2/sth-r2.s deleted file mode 100644 index abbdf9b54e1..00000000000 --- a/gas/testsuite/gas/nios2/sth-r2.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x400 - .extern small_external_data_label,4 - .comm big_external_common,0x400 - .comm small_external_common,4 - .lcomm big_local_common,0x400 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - sth r4,0(r0) - sth r4,4(r0) - sth r4,0x7fc(r0) - sth r4,-0x800(r0) - sth r4,0(r5) - sth r4,4(r5) - sth r4,0x7fc(r5) - sth r4,-0x800(r5) - sth r4,data_label(r0) - sth r4,big_external_data_label(r0) - sth r4,small_external_data_label(r0) - sth r4,big_external_common(r0) - sth r4,small_external_common(r0) - sth r4,big_local_common(r0) - sth r4,small_local_common(r0) - sth r4,data_label+4(r0) - sth r4,big_external_data_label+4(r0) - sth r4,small_external_data_label+4(r0) - sth r4,big_external_common+4(r0) - sth r4,small_external_common+4(r0) - sth r4,big_local_common+4(r0) - sth r4,small_local_common+4(r0) - sth r4,data_label-0x800(r0) - sth r4,big_external_data_label-0x800(r0) - sth r4,small_external_data_label-0x800(r0) - sth r4,big_external_common-0x800(r0) - sth r4,small_external_common-0x800(r0) - sth r4,big_local_common-0x800(r0) - sth r4,small_local_common-0x800(r0) - sth r4,data_label+0x10000(r0) - sth r4,data_label(r5) - sth r4,big_external_data_label(r5) - sth r4,small_external_data_label(r5) - sth r4,big_external_common(r5) - sth r4,small_external_common(r5) - sth r4,big_local_common(r5) - sth r4,small_local_common(r5) - sth r4,data_label+4(r5) - sth r4,big_external_data_label+4(r5) - sth r4,small_external_data_label+4(r5) - sth r4,big_external_common+4(r5) - sth r4,small_external_common+4(r5) - sth r4,big_local_common+4(r5) - sth r4,small_local_common+4(r5) - sth r4,data_label-0x800(r5) - sth r4,big_external_data_label-0x800(r5) - sth r4,small_external_data_label-0x800(r5) - sth r4,big_external_common-0x800(r5) - sth r4,small_external_common-0x800(r5) - sth r4,big_local_common-0x800(r5) - sth r4,small_local_common-0x800(r5) - - sthio r4,0(r0) - sthio r4,4(r0) - sthio r4,0x7fc(r0) - sthio r4,-0x800(r0) - sthio r4,0(r5) - sthio r4,4(r5) - sthio r4,0x7fc(r5) - sthio r4,-0x800(r5) - sthio r4,data_label(r0) - sthio r4,big_external_data_label(r0) - sthio r4,small_external_data_label(r0) - sthio r4,big_external_common(r0) - sthio r4,small_external_common(r0) - sthio r4,big_local_common(r0) - sthio r4,small_local_common(r0) - sthio r4,data_label+4(r0) - sthio r4,big_external_data_label+4(r0) - sthio r4,small_external_data_label+4(r0) - sthio r4,big_external_common+4(r0) - sthio r4,small_external_common+4(r0) - sthio r4,big_local_common+4(r0) - sthio r4,small_local_common+4(r0) - sthio r4,data_label-0x800(r0) - sthio r4,big_external_data_label-0x800(r0) - sthio r4,small_external_data_label-0x800(r0) - sthio r4,big_external_common-0x800(r0) - sthio r4,small_external_common-0x800(r0) - sthio r4,big_local_common-0x800(r0) - sthio r4,small_local_common-0x800(r0) - sthio r4,data_label+0x10000(r0) - sthio r4,data_label(r5) - sthio r4,big_external_data_label(r5) - sthio r4,small_external_data_label(r5) - sthio r4,big_external_common(r5) - sthio r4,small_external_common(r5) - sthio r4,big_local_common(r5) - sthio r4,small_local_common(r5) - sthio r4,data_label+4(r5) - sthio r4,big_external_data_label+4(r5) - sthio r4,small_external_data_label+4(r5) - sthio r4,big_external_common+4(r5) - sthio r4,small_external_common+4(r5) - sthio r4,big_local_common+4(r5) - sthio r4,small_local_common+4(r5) - sthio r4,data_label-0x800(r5) - sthio r4,big_external_data_label-0x800(r5) - sthio r4,small_external_data_label-0x800(r5) - sthio r4,big_external_common-0x800(r5) - sthio r4,small_external_common-0x800(r5) - sthio r4,big_local_common-0x800(r5) - sthio r4,small_local_common-0x800(r5) diff --git a/gas/testsuite/gas/nios2/sth.d b/gas/testsuite/gas/nios2/sth.d deleted file mode 100644 index 2625f6df9aa..00000000000 --- a/gas/testsuite/gas/nios2/sth.d +++ /dev/null @@ -1,196 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 sth - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0100000d sth r4,0\(zero\) -0+0004 <[^>]*> 0100010d sth r4,4\(zero\) -0+0008 <[^>]*> 011fff0d sth r4,32764\(zero\) -0+000c <[^>]*> 0120000d sth r4,-32768\(zero\) -0+0010 <[^>]*> 2900000d sth r4,0\(r5\) -0+0014 <[^>]*> 2900010d sth r4,4\(r5\) -0+0018 <[^>]*> 291fff0d sth r4,32764\(r5\) -0+001c <[^>]*> 2920000d sth r4,-32768\(r5\) -0+0020 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x4000 -0+003c <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x4004 -0+0058 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x8000 -0+005c <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000 -0+0060 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000 -0+0064 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x8000 -0+0068 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x8000 -0+006c <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x8000 -0+0070 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x4000 -0+0074 <[^>]*> 0100000d sth r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x4000 -0+0094 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x4004 -0+00b0 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x8000 -0+00b4 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000 -0+00b8 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000 -0+00bc <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x8000 -0+00c0 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x8000 -0+00c4 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x8000 -0+00c8 <[^>]*> 2900000d sth r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x4000 -0+00cc <[^>]*> 0100002d sthio r4,0\(zero\) -0+00d0 <[^>]*> 0100012d sthio r4,4\(zero\) -0+00d4 <[^>]*> 011fff2d sthio r4,32764\(zero\) -0+00d8 <[^>]*> 0120002d sthio r4,-32768\(zero\) -0+00dc <[^>]*> 2900002d sthio r4,0\(r5\) -0+00e0 <[^>]*> 2900012d sthio r4,4\(r5\) -0+00e4 <[^>]*> 291fff2d sthio r4,32764\(r5\) -0+00e8 <[^>]*> 2920002d sthio r4,-32768\(r5\) -0+00ec <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*ec: R_NIOS2_S16 .data -0+00f0 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*f0: R_NIOS2_S16 big_external_data_label -0+00f4 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*f4: R_NIOS2_S16 small_external_data_label -0+00f8 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*f8: R_NIOS2_S16 big_external_common -0+00fc <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*fc: R_NIOS2_S16 small_external_common -0+0100 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*100: R_NIOS2_S16 .bss -0+0104 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*104: R_NIOS2_S16 .bss\+0x4000 -0+0108 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*108: R_NIOS2_S16 .data\+0x4 -0+010c <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4 -0+0110 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4 -0+0114 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*114: R_NIOS2_S16 big_external_common\+0x4 -0+0118 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*118: R_NIOS2_S16 small_external_common\+0x4 -0+011c <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*11c: R_NIOS2_S16 .bss\+0x4 -0+0120 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*120: R_NIOS2_S16 .bss\+0x4004 -0+0124 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*124: R_NIOS2_S16 .data-0x8000 -0+0128 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000 -0+012c <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000 -0+0130 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*130: R_NIOS2_S16 big_external_common-0x8000 -0+0134 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*134: R_NIOS2_S16 small_external_common-0x8000 -0+0138 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*138: R_NIOS2_S16 .bss-0x8000 -0+013c <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*13c: R_NIOS2_S16 .bss-0x4000 -0+0140 <[^>]*> 0100002d sthio r4,0\(zero\) -[ ]*140: R_NIOS2_S16 .data\+0x10000 -0+0144 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*144: R_NIOS2_S16 .data -0+0148 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*148: R_NIOS2_S16 big_external_data_label -0+014c <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*14c: R_NIOS2_S16 small_external_data_label -0+0150 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*150: R_NIOS2_S16 big_external_common -0+0154 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*154: R_NIOS2_S16 small_external_common -0+0158 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*158: R_NIOS2_S16 .bss -0+015c <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*15c: R_NIOS2_S16 .bss\+0x4000 -0+0160 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*160: R_NIOS2_S16 .data\+0x4 -0+0164 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4 -0+0168 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4 -0+016c <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*16c: R_NIOS2_S16 big_external_common\+0x4 -0+0170 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*170: R_NIOS2_S16 small_external_common\+0x4 -0+0174 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*174: R_NIOS2_S16 .bss\+0x4 -0+0178 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*178: R_NIOS2_S16 .bss\+0x4004 -0+017c <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*17c: R_NIOS2_S16 .data-0x8000 -0+0180 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000 -0+0184 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000 -0+0188 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*188: R_NIOS2_S16 big_external_common-0x8000 -0+018c <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*18c: R_NIOS2_S16 small_external_common-0x8000 -0+0190 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*190: R_NIOS2_S16 .bss-0x8000 -0+0194 <[^>]*> 2900002d sthio r4,0\(r5\) -[ ]*194: R_NIOS2_S16 .bss-0x4000 diff --git a/gas/testsuite/gas/nios2/sth.s b/gas/testsuite/gas/nios2/sth.s deleted file mode 100644 index 4b9390bb5c4..00000000000 --- a/gas/testsuite/gas/nios2/sth.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x4000 - .extern small_external_data_label,4 - .comm big_external_common,0x4000 - .comm small_external_common,4 - .lcomm big_local_common,0x4000 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - sth r4,0(r0) - sth r4,4(r0) - sth r4,0x7ffc(r0) - sth r4,-0x8000(r0) - sth r4,0(r5) - sth r4,4(r5) - sth r4,0x7ffc(r5) - sth r4,-0x8000(r5) - sth r4,data_label(r0) - sth r4,big_external_data_label(r0) - sth r4,small_external_data_label(r0) - sth r4,big_external_common(r0) - sth r4,small_external_common(r0) - sth r4,big_local_common(r0) - sth r4,small_local_common(r0) - sth r4,data_label+4(r0) - sth r4,big_external_data_label+4(r0) - sth r4,small_external_data_label+4(r0) - sth r4,big_external_common+4(r0) - sth r4,small_external_common+4(r0) - sth r4,big_local_common+4(r0) - sth r4,small_local_common+4(r0) - sth r4,data_label-0x8000(r0) - sth r4,big_external_data_label-0x8000(r0) - sth r4,small_external_data_label-0x8000(r0) - sth r4,big_external_common-0x8000(r0) - sth r4,small_external_common-0x8000(r0) - sth r4,big_local_common-0x8000(r0) - sth r4,small_local_common-0x8000(r0) - sth r4,data_label+0x10000(r0) - sth r4,data_label(r5) - sth r4,big_external_data_label(r5) - sth r4,small_external_data_label(r5) - sth r4,big_external_common(r5) - sth r4,small_external_common(r5) - sth r4,big_local_common(r5) - sth r4,small_local_common(r5) - sth r4,data_label+4(r5) - sth r4,big_external_data_label+4(r5) - sth r4,small_external_data_label+4(r5) - sth r4,big_external_common+4(r5) - sth r4,small_external_common+4(r5) - sth r4,big_local_common+4(r5) - sth r4,small_local_common+4(r5) - sth r4,data_label-0x8000(r5) - sth r4,big_external_data_label-0x8000(r5) - sth r4,small_external_data_label-0x8000(r5) - sth r4,big_external_common-0x8000(r5) - sth r4,small_external_common-0x8000(r5) - sth r4,big_local_common-0x8000(r5) - sth r4,small_local_common-0x8000(r5) - - sthio r4,0(r0) - sthio r4,4(r0) - sthio r4,0x7ffc(r0) - sthio r4,-0x8000(r0) - sthio r4,0(r5) - sthio r4,4(r5) - sthio r4,0x7ffc(r5) - sthio r4,-0x8000(r5) - sthio r4,data_label(r0) - sthio r4,big_external_data_label(r0) - sthio r4,small_external_data_label(r0) - sthio r4,big_external_common(r0) - sthio r4,small_external_common(r0) - sthio r4,big_local_common(r0) - sthio r4,small_local_common(r0) - sthio r4,data_label+4(r0) - sthio r4,big_external_data_label+4(r0) - sthio r4,small_external_data_label+4(r0) - sthio r4,big_external_common+4(r0) - sthio r4,small_external_common+4(r0) - sthio r4,big_local_common+4(r0) - sthio r4,small_local_common+4(r0) - sthio r4,data_label-0x8000(r0) - sthio r4,big_external_data_label-0x8000(r0) - sthio r4,small_external_data_label-0x8000(r0) - sthio r4,big_external_common-0x8000(r0) - sthio r4,small_external_common-0x8000(r0) - sthio r4,big_local_common-0x8000(r0) - sthio r4,small_local_common-0x8000(r0) - sthio r4,data_label+0x10000(r0) - sthio r4,data_label(r5) - sthio r4,big_external_data_label(r5) - sthio r4,small_external_data_label(r5) - sthio r4,big_external_common(r5) - sthio r4,small_external_common(r5) - sthio r4,big_local_common(r5) - sthio r4,small_local_common(r5) - sthio r4,data_label+4(r5) - sthio r4,big_external_data_label+4(r5) - sthio r4,small_external_data_label+4(r5) - sthio r4,big_external_common+4(r5) - sthio r4,small_external_common+4(r5) - sthio r4,big_local_common+4(r5) - sthio r4,small_local_common+4(r5) - sthio r4,data_label-0x8000(r5) - sthio r4,big_external_data_label-0x8000(r5) - sthio r4,small_external_data_label-0x8000(r5) - sthio r4,big_external_common-0x8000(r5) - sthio r4,small_external_common-0x8000(r5) - sthio r4,big_local_common-0x8000(r5) - sthio r4,small_local_common-0x8000(r5) diff --git a/gas/testsuite/gas/nios2/stw-r2.d b/gas/testsuite/gas/nios2/stw-r2.d deleted file mode 100644 index 718739f6c5c..00000000000 --- a/gas/testsuite/gas/nios2/stw-r2.d +++ /dev/null @@ -1,197 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 stw -#as: -march=r2 - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00002037 stw r4,0\(zero\) -0+0004 <[^>]*> 00042037 stw r4,4\(zero\) -0+0008 <[^>]*> 07fc2037 stw r4,2044\(zero\) -0+000c <[^>]*> f8002037 stw r4,-2048\(zero\) -0+0010 <[^>]*> 00002177 stw r4,0\(r5\) -0+0014 <[^>]*> 00042177 stw r4,4\(r5\) -0+0018 <[^>]*> 07fc2177 stw r4,2044\(r5\) -0+001c <[^>]*> f8002177 stw r4,-2048\(r5\) -0+0020 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x400 -0+003c <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x404 -0+0058 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x800 -0+005c <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x800 -0+0060 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x800 -0+0064 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x800 -0+0068 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x800 -0+006c <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x800 -0+0070 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x400 -0+0074 <[^>]*> 00002037 stw r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x400 -0+0094 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x404 -0+00b0 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x800 -0+00b4 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x800 -0+00b8 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x800 -0+00bc <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x800 -0+00c0 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x800 -0+00c4 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x800 -0+00c8 <[^>]*> 00002177 stw r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x400 -0+00cc <[^>]*> 90002028 stwio r4,0\(zero\) -0+00d0 <[^>]*> 90042028 stwio r4,4\(zero\) -0+00d4 <[^>]*> 97fc2028 stwio r4,2044\(zero\) -0+00d8 <[^>]*> 98002028 stwio r4,-2048\(zero\) -0+00dc <[^>]*> 90002168 stwio r4,0\(r5\) -0+00e0 <[^>]*> 90042168 stwio r4,4\(r5\) -0+00e4 <[^>]*> 97fc2168 stwio r4,2044\(r5\) -0+00e8 <[^>]*> 98002168 stwio r4,-2048\(r5\) -0+00ec <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*ec: R_NIOS2_R2_S12 .data -0+00f0 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*f0: R_NIOS2_R2_S12 big_external_data_label -0+00f4 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*f4: R_NIOS2_R2_S12 small_external_data_label -0+00f8 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*f8: R_NIOS2_R2_S12 big_external_common -0+00fc <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*fc: R_NIOS2_R2_S12 small_external_common -0+0100 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*100: R_NIOS2_R2_S12 .bss -0+0104 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*104: R_NIOS2_R2_S12 .bss\+0x400 -0+0108 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*108: R_NIOS2_R2_S12 .data\+0x4 -0+010c <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*10c: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0110 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*110: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+0114 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*114: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0118 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*118: R_NIOS2_R2_S12 small_external_common\+0x4 -0+011c <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*11c: R_NIOS2_R2_S12 .bss\+0x4 -0+0120 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*120: R_NIOS2_R2_S12 .bss\+0x404 -0+0124 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*124: R_NIOS2_R2_S12 .data-0x800 -0+0128 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*128: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+012c <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*12c: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0130 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*130: R_NIOS2_R2_S12 big_external_common-0x800 -0+0134 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*134: R_NIOS2_R2_S12 small_external_common-0x800 -0+0138 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*138: R_NIOS2_R2_S12 .bss-0x800 -0+013c <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*13c: R_NIOS2_R2_S12 .bss-0x400 -0+0140 <[^>]*> 90002028 stwio r4,0\(zero\) -[ ]*140: R_NIOS2_R2_S12 .data\+0x10000 -0+0144 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*144: R_NIOS2_R2_S12 .data -0+0148 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*148: R_NIOS2_R2_S12 big_external_data_label -0+014c <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*14c: R_NIOS2_R2_S12 small_external_data_label -0+0150 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*150: R_NIOS2_R2_S12 big_external_common -0+0154 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*154: R_NIOS2_R2_S12 small_external_common -0+0158 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*158: R_NIOS2_R2_S12 .bss -0+015c <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*15c: R_NIOS2_R2_S12 .bss\+0x400 -0+0160 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*160: R_NIOS2_R2_S12 .data\+0x4 -0+0164 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*164: R_NIOS2_R2_S12 big_external_data_label\+0x4 -0+0168 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*168: R_NIOS2_R2_S12 small_external_data_label\+0x4 -0+016c <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*16c: R_NIOS2_R2_S12 big_external_common\+0x4 -0+0170 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*170: R_NIOS2_R2_S12 small_external_common\+0x4 -0+0174 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*174: R_NIOS2_R2_S12 .bss\+0x4 -0+0178 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*178: R_NIOS2_R2_S12 .bss\+0x404 -0+017c <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*17c: R_NIOS2_R2_S12 .data-0x800 -0+0180 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*180: R_NIOS2_R2_S12 big_external_data_label-0x800 -0+0184 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*184: R_NIOS2_R2_S12 small_external_data_label-0x800 -0+0188 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*188: R_NIOS2_R2_S12 big_external_common-0x800 -0+018c <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*18c: R_NIOS2_R2_S12 small_external_common-0x800 -0+0190 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*190: R_NIOS2_R2_S12 .bss-0x800 -0+0194 <[^>]*> 90002168 stwio r4,0\(r5\) -[ ]*194: R_NIOS2_R2_S12 .bss-0x400 diff --git a/gas/testsuite/gas/nios2/stw-r2.s b/gas/testsuite/gas/nios2/stw-r2.s deleted file mode 100644 index 761c817aed4..00000000000 --- a/gas/testsuite/gas/nios2/stw-r2.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x400 - .extern small_external_data_label,4 - .comm big_external_common,0x400 - .comm small_external_common,4 - .lcomm big_local_common,0x400 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - stw r4,0(r0) - stw r4,4(r0) - stw r4,0x7fc(r0) - stw r4,-0x800(r0) - stw r4,0(r5) - stw r4,4(r5) - stw r4,0x7fc(r5) - stw r4,-0x800(r5) - stw r4,data_label(r0) - stw r4,big_external_data_label(r0) - stw r4,small_external_data_label(r0) - stw r4,big_external_common(r0) - stw r4,small_external_common(r0) - stw r4,big_local_common(r0) - stw r4,small_local_common(r0) - stw r4,data_label+4(r0) - stw r4,big_external_data_label+4(r0) - stw r4,small_external_data_label+4(r0) - stw r4,big_external_common+4(r0) - stw r4,small_external_common+4(r0) - stw r4,big_local_common+4(r0) - stw r4,small_local_common+4(r0) - stw r4,data_label-0x800(r0) - stw r4,big_external_data_label-0x800(r0) - stw r4,small_external_data_label-0x800(r0) - stw r4,big_external_common-0x800(r0) - stw r4,small_external_common-0x800(r0) - stw r4,big_local_common-0x800(r0) - stw r4,small_local_common-0x800(r0) - stw r4,data_label+0x10000(r0) - stw r4,data_label(r5) - stw r4,big_external_data_label(r5) - stw r4,small_external_data_label(r5) - stw r4,big_external_common(r5) - stw r4,small_external_common(r5) - stw r4,big_local_common(r5) - stw r4,small_local_common(r5) - stw r4,data_label+4(r5) - stw r4,big_external_data_label+4(r5) - stw r4,small_external_data_label+4(r5) - stw r4,big_external_common+4(r5) - stw r4,small_external_common+4(r5) - stw r4,big_local_common+4(r5) - stw r4,small_local_common+4(r5) - stw r4,data_label-0x800(r5) - stw r4,big_external_data_label-0x800(r5) - stw r4,small_external_data_label-0x800(r5) - stw r4,big_external_common-0x800(r5) - stw r4,small_external_common-0x800(r5) - stw r4,big_local_common-0x800(r5) - stw r4,small_local_common-0x800(r5) - - stwio r4,0(r0) - stwio r4,4(r0) - stwio r4,0x7fc(r0) - stwio r4,-0x800(r0) - stwio r4,0(r5) - stwio r4,4(r5) - stwio r4,0x7fc(r5) - stwio r4,-0x800(r5) - stwio r4,data_label(r0) - stwio r4,big_external_data_label(r0) - stwio r4,small_external_data_label(r0) - stwio r4,big_external_common(r0) - stwio r4,small_external_common(r0) - stwio r4,big_local_common(r0) - stwio r4,small_local_common(r0) - stwio r4,data_label+4(r0) - stwio r4,big_external_data_label+4(r0) - stwio r4,small_external_data_label+4(r0) - stwio r4,big_external_common+4(r0) - stwio r4,small_external_common+4(r0) - stwio r4,big_local_common+4(r0) - stwio r4,small_local_common+4(r0) - stwio r4,data_label-0x800(r0) - stwio r4,big_external_data_label-0x800(r0) - stwio r4,small_external_data_label-0x800(r0) - stwio r4,big_external_common-0x800(r0) - stwio r4,small_external_common-0x800(r0) - stwio r4,big_local_common-0x800(r0) - stwio r4,small_local_common-0x800(r0) - stwio r4,data_label+0x10000(r0) - stwio r4,data_label(r5) - stwio r4,big_external_data_label(r5) - stwio r4,small_external_data_label(r5) - stwio r4,big_external_common(r5) - stwio r4,small_external_common(r5) - stwio r4,big_local_common(r5) - stwio r4,small_local_common(r5) - stwio r4,data_label+4(r5) - stwio r4,big_external_data_label+4(r5) - stwio r4,small_external_data_label+4(r5) - stwio r4,big_external_common+4(r5) - stwio r4,small_external_common+4(r5) - stwio r4,big_local_common+4(r5) - stwio r4,small_local_common+4(r5) - stwio r4,data_label-0x800(r5) - stwio r4,big_external_data_label-0x800(r5) - stwio r4,small_external_data_label-0x800(r5) - stwio r4,big_external_common-0x800(r5) - stwio r4,small_external_common-0x800(r5) - stwio r4,big_local_common-0x800(r5) - stwio r4,small_local_common-0x800(r5) diff --git a/gas/testsuite/gas/nios2/stw.d b/gas/testsuite/gas/nios2/stw.d deleted file mode 100644 index 6253d7d8af8..00000000000 --- a/gas/testsuite/gas/nios2/stw.d +++ /dev/null @@ -1,196 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 stw - -# Test the ld instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 01000015 stw r4,0\(zero\) -0+0004 <[^>]*> 01000115 stw r4,4\(zero\) -0+0008 <[^>]*> 011fff15 stw r4,32764\(zero\) -0+000c <[^>]*> 01200015 stw r4,-32768\(zero\) -0+0010 <[^>]*> 29000015 stw r4,0\(r5\) -0+0014 <[^>]*> 29000115 stw r4,4\(r5\) -0+0018 <[^>]*> 291fff15 stw r4,32764\(r5\) -0+001c <[^>]*> 29200015 stw r4,-32768\(r5\) -0+0020 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*20: R_NIOS2_S16 .data -0+0024 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*24: R_NIOS2_S16 big_external_data_label -0+0028 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*28: R_NIOS2_S16 small_external_data_label -0+002c <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*2c: R_NIOS2_S16 big_external_common -0+0030 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*30: R_NIOS2_S16 small_external_common -0+0034 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*34: R_NIOS2_S16 .bss -0+0038 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*38: R_NIOS2_S16 .bss\+0x4000 -0+003c <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*3c: R_NIOS2_S16 .data\+0x4 -0+0040 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*40: R_NIOS2_S16 big_external_data_label\+0x4 -0+0044 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*44: R_NIOS2_S16 small_external_data_label\+0x4 -0+0048 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*48: R_NIOS2_S16 big_external_common\+0x4 -0+004c <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*4c: R_NIOS2_S16 small_external_common\+0x4 -0+0050 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*50: R_NIOS2_S16 .bss\+0x4 -0+0054 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*54: R_NIOS2_S16 .bss\+0x4004 -0+0058 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*58: R_NIOS2_S16 .data-0x8000 -0+005c <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*5c: R_NIOS2_S16 big_external_data_label-0x8000 -0+0060 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*60: R_NIOS2_S16 small_external_data_label-0x8000 -0+0064 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*64: R_NIOS2_S16 big_external_common-0x8000 -0+0068 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*68: R_NIOS2_S16 small_external_common-0x8000 -0+006c <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*6c: R_NIOS2_S16 .bss-0x8000 -0+0070 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*70: R_NIOS2_S16 .bss-0x4000 -0+0074 <[^>]*> 01000015 stw r4,0\(zero\) -[ ]*74: R_NIOS2_S16 .data\+0x10000 -0+0078 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*78: R_NIOS2_S16 .data -0+007c <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*7c: R_NIOS2_S16 big_external_data_label -0+0080 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*80: R_NIOS2_S16 small_external_data_label -0+0084 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*84: R_NIOS2_S16 big_external_common -0+0088 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*88: R_NIOS2_S16 small_external_common -0+008c <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*8c: R_NIOS2_S16 .bss -0+0090 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*90: R_NIOS2_S16 .bss\+0x4000 -0+0094 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*94: R_NIOS2_S16 .data\+0x4 -0+0098 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*98: R_NIOS2_S16 big_external_data_label\+0x4 -0+009c <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*9c: R_NIOS2_S16 small_external_data_label\+0x4 -0+00a0 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*a0: R_NIOS2_S16 big_external_common\+0x4 -0+00a4 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*a4: R_NIOS2_S16 small_external_common\+0x4 -0+00a8 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*a8: R_NIOS2_S16 .bss\+0x4 -0+00ac <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*ac: R_NIOS2_S16 .bss\+0x4004 -0+00b0 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*b0: R_NIOS2_S16 .data-0x8000 -0+00b4 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*b4: R_NIOS2_S16 big_external_data_label-0x8000 -0+00b8 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*b8: R_NIOS2_S16 small_external_data_label-0x8000 -0+00bc <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*bc: R_NIOS2_S16 big_external_common-0x8000 -0+00c0 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*c0: R_NIOS2_S16 small_external_common-0x8000 -0+00c4 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*c4: R_NIOS2_S16 .bss-0x8000 -0+00c8 <[^>]*> 29000015 stw r4,0\(r5\) -[ ]*c8: R_NIOS2_S16 .bss-0x4000 -0+00cc <[^>]*> 01000035 stwio r4,0\(zero\) -0+00d0 <[^>]*> 01000135 stwio r4,4\(zero\) -0+00d4 <[^>]*> 011fff35 stwio r4,32764\(zero\) -0+00d8 <[^>]*> 01200035 stwio r4,-32768\(zero\) -0+00dc <[^>]*> 29000035 stwio r4,0\(r5\) -0+00e0 <[^>]*> 29000135 stwio r4,4\(r5\) -0+00e4 <[^>]*> 291fff35 stwio r4,32764\(r5\) -0+00e8 <[^>]*> 29200035 stwio r4,-32768\(r5\) -0+00ec <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*ec: R_NIOS2_S16 .data -0+00f0 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*f0: R_NIOS2_S16 big_external_data_label -0+00f4 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*f4: R_NIOS2_S16 small_external_data_label -0+00f8 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*f8: R_NIOS2_S16 big_external_common -0+00fc <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*fc: R_NIOS2_S16 small_external_common -0+0100 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*100: R_NIOS2_S16 .bss -0+0104 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*104: R_NIOS2_S16 .bss\+0x4000 -0+0108 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*108: R_NIOS2_S16 .data\+0x4 -0+010c <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*10c: R_NIOS2_S16 big_external_data_label\+0x4 -0+0110 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*110: R_NIOS2_S16 small_external_data_label\+0x4 -0+0114 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*114: R_NIOS2_S16 big_external_common\+0x4 -0+0118 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*118: R_NIOS2_S16 small_external_common\+0x4 -0+011c <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*11c: R_NIOS2_S16 .bss\+0x4 -0+0120 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*120: R_NIOS2_S16 .bss\+0x4004 -0+0124 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*124: R_NIOS2_S16 .data-0x8000 -0+0128 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*128: R_NIOS2_S16 big_external_data_label-0x8000 -0+012c <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*12c: R_NIOS2_S16 small_external_data_label-0x8000 -0+0130 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*130: R_NIOS2_S16 big_external_common-0x8000 -0+0134 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*134: R_NIOS2_S16 small_external_common-0x8000 -0+0138 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*138: R_NIOS2_S16 .bss-0x8000 -0+013c <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*13c: R_NIOS2_S16 .bss-0x4000 -0+0140 <[^>]*> 01000035 stwio r4,0\(zero\) -[ ]*140: R_NIOS2_S16 .data\+0x10000 -0+0144 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*144: R_NIOS2_S16 .data -0+0148 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*148: R_NIOS2_S16 big_external_data_label -0+014c <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*14c: R_NIOS2_S16 small_external_data_label -0+0150 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*150: R_NIOS2_S16 big_external_common -0+0154 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*154: R_NIOS2_S16 small_external_common -0+0158 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*158: R_NIOS2_S16 .bss -0+015c <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*15c: R_NIOS2_S16 .bss\+0x4000 -0+0160 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*160: R_NIOS2_S16 .data\+0x4 -0+0164 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*164: R_NIOS2_S16 big_external_data_label\+0x4 -0+0168 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*168: R_NIOS2_S16 small_external_data_label\+0x4 -0+016c <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*16c: R_NIOS2_S16 big_external_common\+0x4 -0+0170 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*170: R_NIOS2_S16 small_external_common\+0x4 -0+0174 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*174: R_NIOS2_S16 .bss\+0x4 -0+0178 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*178: R_NIOS2_S16 .bss\+0x4004 -0+017c <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*17c: R_NIOS2_S16 .data-0x8000 -0+0180 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*180: R_NIOS2_S16 big_external_data_label-0x8000 -0+0184 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*184: R_NIOS2_S16 small_external_data_label-0x8000 -0+0188 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*188: R_NIOS2_S16 big_external_common-0x8000 -0+018c <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*18c: R_NIOS2_S16 small_external_common-0x8000 -0+0190 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*190: R_NIOS2_S16 .bss-0x8000 -0+0194 <[^>]*> 29000035 stwio r4,0\(r5\) -[ ]*194: R_NIOS2_S16 .bss-0x4000 diff --git a/gas/testsuite/gas/nios2/stw.s b/gas/testsuite/gas/nios2/stw.s deleted file mode 100644 index fa5c72fdfa0..00000000000 --- a/gas/testsuite/gas/nios2/stw.s +++ /dev/null @@ -1,117 +0,0 @@ - .data -data_label: - .extern big_external_data_label,0x4000 - .extern small_external_data_label,4 - .comm big_external_common,0x4000 - .comm small_external_common,4 - .lcomm big_local_common,0x4000 - .lcomm small_local_common,4 - -# the small symbols should have space allocated in the sbss section -# but this is not yet supported in the assembler, so space is allocated -# in the .bss section and the relocations are not gp-relative. this will -# be updated when gp-relative relocations are added - .text - stw r4,0(r0) - stw r4,4(r0) - stw r4,0x7ffc(r0) - stw r4,-0x8000(r0) - stw r4,0(r5) - stw r4,4(r5) - stw r4,0x7ffc(r5) - stw r4,-0x8000(r5) - stw r4,data_label(r0) - stw r4,big_external_data_label(r0) - stw r4,small_external_data_label(r0) - stw r4,big_external_common(r0) - stw r4,small_external_common(r0) - stw r4,big_local_common(r0) - stw r4,small_local_common(r0) - stw r4,data_label+4(r0) - stw r4,big_external_data_label+4(r0) - stw r4,small_external_data_label+4(r0) - stw r4,big_external_common+4(r0) - stw r4,small_external_common+4(r0) - stw r4,big_local_common+4(r0) - stw r4,small_local_common+4(r0) - stw r4,data_label-0x8000(r0) - stw r4,big_external_data_label-0x8000(r0) - stw r4,small_external_data_label-0x8000(r0) - stw r4,big_external_common-0x8000(r0) - stw r4,small_external_common-0x8000(r0) - stw r4,big_local_common-0x8000(r0) - stw r4,small_local_common-0x8000(r0) - stw r4,data_label+0x10000(r0) - stw r4,data_label(r5) - stw r4,big_external_data_label(r5) - stw r4,small_external_data_label(r5) - stw r4,big_external_common(r5) - stw r4,small_external_common(r5) - stw r4,big_local_common(r5) - stw r4,small_local_common(r5) - stw r4,data_label+4(r5) - stw r4,big_external_data_label+4(r5) - stw r4,small_external_data_label+4(r5) - stw r4,big_external_common+4(r5) - stw r4,small_external_common+4(r5) - stw r4,big_local_common+4(r5) - stw r4,small_local_common+4(r5) - stw r4,data_label-0x8000(r5) - stw r4,big_external_data_label-0x8000(r5) - stw r4,small_external_data_label-0x8000(r5) - stw r4,big_external_common-0x8000(r5) - stw r4,small_external_common-0x8000(r5) - stw r4,big_local_common-0x8000(r5) - stw r4,small_local_common-0x8000(r5) - - stwio r4,0(r0) - stwio r4,4(r0) - stwio r4,0x7ffc(r0) - stwio r4,-0x8000(r0) - stwio r4,0(r5) - stwio r4,4(r5) - stwio r4,0x7ffc(r5) - stwio r4,-0x8000(r5) - stwio r4,data_label(r0) - stwio r4,big_external_data_label(r0) - stwio r4,small_external_data_label(r0) - stwio r4,big_external_common(r0) - stwio r4,small_external_common(r0) - stwio r4,big_local_common(r0) - stwio r4,small_local_common(r0) - stwio r4,data_label+4(r0) - stwio r4,big_external_data_label+4(r0) - stwio r4,small_external_data_label+4(r0) - stwio r4,big_external_common+4(r0) - stwio r4,small_external_common+4(r0) - stwio r4,big_local_common+4(r0) - stwio r4,small_local_common+4(r0) - stwio r4,data_label-0x8000(r0) - stwio r4,big_external_data_label-0x8000(r0) - stwio r4,small_external_data_label-0x8000(r0) - stwio r4,big_external_common-0x8000(r0) - stwio r4,small_external_common-0x8000(r0) - stwio r4,big_local_common-0x8000(r0) - stwio r4,small_local_common-0x8000(r0) - stwio r4,data_label+0x10000(r0) - stwio r4,data_label(r5) - stwio r4,big_external_data_label(r5) - stwio r4,small_external_data_label(r5) - stwio r4,big_external_common(r5) - stwio r4,small_external_common(r5) - stwio r4,big_local_common(r5) - stwio r4,small_local_common(r5) - stwio r4,data_label+4(r5) - stwio r4,big_external_data_label+4(r5) - stwio r4,small_external_data_label+4(r5) - stwio r4,big_external_common+4(r5) - stwio r4,small_external_common+4(r5) - stwio r4,big_local_common+4(r5) - stwio r4,small_local_common+4(r5) - stwio r4,data_label-0x8000(r5) - stwio r4,big_external_data_label-0x8000(r5) - stwio r4,small_external_data_label-0x8000(r5) - stwio r4,big_external_common-0x8000(r5) - stwio r4,small_external_common-0x8000(r5) - stwio r4,big_local_common-0x8000(r5) - stwio r4,small_local_common-0x8000(r5) diff --git a/gas/testsuite/gas/nios2/stwm.d b/gas/testsuite/gas/nios2/stwm.d deleted file mode 100644 index f10721876d8..00000000000 --- a/gas/testsuite/gas/nios2/stwm.d +++ /dev/null @@ -1,35 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 STWM instructions -#as: -march=r2 - -# Test the STWM instructions - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> d00105e8 stwm \{r2\},--\(r23\) -0+0004 <[^>]*> d00205e8 stwm \{r3\},--\(r23\) -0+0008 <[^>]*> d00405e8 stwm \{r4\},--\(r23\) -0+000c <[^>]*> d00805e8 stwm \{r5\},--\(r23\) -0+0010 <[^>]*> d01005e8 stwm \{r6\},--\(r23\) -0+0014 <[^>]*> d02005e8 stwm \{r7\},--\(r23\) -0+0018 <[^>]*> d04005e8 stwm \{r8\},--\(r23\) -0+001c <[^>]*> d08005e8 stwm \{r9\},--\(r23\) -0+0020 <[^>]*> d10005e8 stwm \{r10\},--\(r23\) -0+0024 <[^>]*> d20005e8 stwm \{r11\},--\(r23\) -0+0028 <[^>]*> d40005e8 stwm \{r12\},--\(r23\) -0+002c <[^>]*> d80005e8 stwm \{r13\},--\(r23\) -0+0030 <[^>]*> d00128a8 stwm \{r14\},\(r2\)\+\+ -0+0034 <[^>]*> d00328a8 stwm \{r14,r15\},\(r2\)\+\+ -0+0038 <[^>]*> d00728a8 stwm \{r14,r15,r16\},\(r2\)\+\+ -0+003c <[^>]*> d00f28a8 stwm \{r14,r15,r16,r17\},\(r2\)\+\+ -0+0040 <[^>]*> d01f28a8 stwm \{r14,r15,r16,r17,r18\},\(r2\)\+\+ -0+0044 <[^>]*> d03f28a8 stwm \{r14,r15,r16,r17,r18,r19\},\(r2\)\+\+ -0+0048 <[^>]*> d07f28a8 stwm \{r14,r15,r16,r17,r18,r19,r20\},\(r2\)\+\+ -0+004c <[^>]*> d0ff28a8 stwm \{r14,r15,r16,r17,r18,r19,r20,r21\},\(r2\)\+\+ -0+0050 <[^>]*> d1ff28a8 stwm \{r14,r15,r16,r17,r18,r19,r20,r21,r22\},\(r2\)\+\+ -0+0054 <[^>]*> d3ff28a8 stwm \{r14,r15,r16,r17,r18,r19,r20,r21,r22,r23\},\(r2\)\+\+ -0+0058 <[^>]*> d7ff28a8 stwm \{r14,r15,r16,r17,r18,r19,r20,r21,r22,r23,fp\},\(r2\)\+\+ -0+005c <[^>]*> dfff28a8 stwm \{r14,r15,r16,r17,r18,r19,r20,r21,r22,r23,fp,ra\},\(r2\)\+\+ -0+0060 <[^>]*> d2210b68 stwm \{r2,r7,r11\},\(r13\)\+\+ -0+0064 <[^>]*> d2211b68 stwm \{r2,r7,r11\},\(r13\)\+\+,writeback diff --git a/gas/testsuite/gas/nios2/stwm.s b/gas/testsuite/gas/nios2/stwm.s deleted file mode 100644 index cefad83a3df..00000000000 --- a/gas/testsuite/gas/nios2/stwm.s +++ /dev/null @@ -1,29 +0,0 @@ -# Source file used to test the SDWM instruction - -foo: - stwm {r2},--(r23) - stwm {r3},--(r23) - stwm {r4},--(r23) - stwm {r5},--(r23) - stwm {r6},--(r23) - stwm {r7},--(r23) - stwm {r8},--(r23) - stwm {r9},--(r23) - stwm {r10},--(r23) - stwm {r11},--(r23) - stwm {r12},--(r23) - stwm {r13},--(r23) - stwm {r14},(r2)++ - stwm {r14,r15},(r2)++ - stwm {r14,r15,r16},(r2)++ - stwm {r14,r15,r16,r17},(r2)++ - stwm {r14,r15,r16,r17,r18},(r2)++ - stwm {r14,r15,r16,r17,r18,r19},(r2)++ - stwm {r14,r15,r16,r17,r18,r19,r20},(r2)++ - stwm {r14,r15,r16,r17,r18,r19,r20,r21},(r2)++ - stwm {r14,r15,r16,r17,r18,r19,r20,r21,r22},(r2)++ - stwm {r14,r15,r16,r17,r18,r19,r20,r21,r22,r23},(r2)++ - stwm {r14,r15,r16,r17,r18,r19,r20,r21,r22,r23,fp},(r2)++ - stwm {r14,r15,r16,r17,r18,r19,r20,r21,r22,r23,fp,ra},(r2)++ - stwm {r2,r7,r11},(r13)++ - stwm {r2,r7,r11},(r13)++,writeback diff --git a/gas/testsuite/gas/nios2/sub-r2.d b/gas/testsuite/gas/nios2/sub-r2.d deleted file mode 100644 index 153824b4bce..00000000000 --- a/gas/testsuite/gas/nios2/sub-r2.d +++ /dev/null @@ -1,12 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 sub -#as: -march=r2 -#source: sub.s - -# Test the add instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> e4042120 sub r4,r4,r4 - diff --git a/gas/testsuite/gas/nios2/sub.d b/gas/testsuite/gas/nios2/sub.d deleted file mode 100644 index 9ff2b7db247..00000000000 --- a/gas/testsuite/gas/nios2/sub.d +++ /dev/null @@ -1,10 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 sub - -# Test the add instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 2109c83a sub r4,r4,r4 - diff --git a/gas/testsuite/gas/nios2/sub.s b/gas/testsuite/gas/nios2/sub.s deleted file mode 100644 index 34f00da7705..00000000000 --- a/gas/testsuite/gas/nios2/sub.s +++ /dev/null @@ -1,4 +0,0 @@ -# Source file used to test the add and addi instructions. - -foo: - sub r4,r4,r4 diff --git a/gas/testsuite/gas/nios2/sync-r2.d b/gas/testsuite/gas/nios2/sync-r2.d deleted file mode 100644 index 21f93360930..00000000000 --- a/gas/testsuite/gas/nios2/sync-r2.d +++ /dev/null @@ -1,10 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 sync -#as: -march=r2 -#source: sync.s - -.*: +file format elf32-littlenios2 - -Disassembly of section \.text: -0+0000 <[^>]*> d8000020 sync - diff --git a/gas/testsuite/gas/nios2/sync.d b/gas/testsuite/gas/nios2/sync.d deleted file mode 100644 index a039c0def95..00000000000 --- a/gas/testsuite/gas/nios2/sync.d +++ /dev/null @@ -1,8 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 sync - -.*: +file format elf32-littlenios2 - -Disassembly of section \.text: -0+0000 <[^>]*> 0001b03a sync - diff --git a/gas/testsuite/gas/nios2/sync.s b/gas/testsuite/gas/nios2/sync.s deleted file mode 100644 index fe05d471677..00000000000 --- a/gas/testsuite/gas/nios2/sync.s +++ /dev/null @@ -1,5 +0,0 @@ -# Source file used to test the sync instructions -foo: - sync - - diff --git a/gas/testsuite/gas/nios2/trap-r2.d b/gas/testsuite/gas/nios2/trap-r2.d deleted file mode 100644 index beb6ca3d9a2..00000000000 --- a/gas/testsuite/gas/nios2/trap-r2.d +++ /dev/null @@ -1,12 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 trap -#as: -march=r2 -#source: trap.s - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> b41d0020 trap 0 -0+0004 <[^>]*> b41d0020 trap 0 -0+0008 <[^>]*> b7fd0020 trap 31 -0+000c <[^>]*> b5dd0020 trap 14 diff --git a/gas/testsuite/gas/nios2/trap.d b/gas/testsuite/gas/nios2/trap.d deleted file mode 100644 index 0712d86ea04..00000000000 --- a/gas/testsuite/gas/nios2/trap.d +++ /dev/null @@ -1,10 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 trap - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 003b683a trap 0 -0+0004 <[^>]*> 003b683a trap 0 -0+0008 <[^>]*> 003b6ffa trap 31 -0+000c <[^>]*> 003b6bba trap 14 diff --git a/gas/testsuite/gas/nios2/trap.s b/gas/testsuite/gas/nios2/trap.s deleted file mode 100644 index df260fa1231..00000000000 --- a/gas/testsuite/gas/nios2/trap.s +++ /dev/null @@ -1,6 +0,0 @@ -# Source file used to test the trap instructions -foo: - trap - trap 0 - trap 31 - trap 14 diff --git a/gas/testsuite/gas/nios2/tret-r2.d b/gas/testsuite/gas/nios2/tret-r2.d deleted file mode 100644 index 0e66d90f952..00000000000 --- a/gas/testsuite/gas/nios2/tret-r2.d +++ /dev/null @@ -1,9 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 tret -#as: -march=r2 -#source: tret.s - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0400f760 eret diff --git a/gas/testsuite/gas/nios2/tret.d b/gas/testsuite/gas/nios2/tret.d deleted file mode 100644 index 09bb09ac0f7..00000000000 --- a/gas/testsuite/gas/nios2/tret.d +++ /dev/null @@ -1,7 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 tret - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> ef80083a eret diff --git a/gas/testsuite/gas/nios2/tret.s b/gas/testsuite/gas/nios2/tret.s deleted file mode 100644 index 42179f1fe1d..00000000000 --- a/gas/testsuite/gas/nios2/tret.s +++ /dev/null @@ -1,5 +0,0 @@ -# Source file used to test the ret instructions -foo: - eret - - diff --git a/gas/testsuite/gas/nios2/warn_noat.l b/gas/testsuite/gas/nios2/warn_noat.l deleted file mode 100644 index 6bc5150f88f..00000000000 --- a/gas/testsuite/gas/nios2/warn_noat.l +++ /dev/null @@ -1,5 +0,0 @@ -.*warn_noat.s: Assembler messages: -.*warn_noat.s:2: Warning: Register at \(r1\) can sometimes be corrupted by assembler optimizations. -Use .set noat to turn off those optimizations \(and this warning\). -.*warn_noat.s:8: Warning: Register at \(r1\) can sometimes be corrupted by assembler optimizations. -Use .set noat to turn off those optimizations \(and this warning\). diff --git a/gas/testsuite/gas/nios2/warn_noat.s b/gas/testsuite/gas/nios2/warn_noat.s deleted file mode 100644 index e99126e6f04..00000000000 --- a/gas/testsuite/gas/nios2/warn_noat.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat, 2 # This should not cause warning for at to be turned off -add at, r2, r2 -.set noat # this should turn the warnings off -add at, r2, r2 -.set at, 3 # this should not turn the warnings on -add at, r2, r2 -.set at # this should turn the warnings on -add at, r2, r2 diff --git a/gas/testsuite/gas/nios2/warn_nobreak.l b/gas/testsuite/gas/nios2/warn_nobreak.l deleted file mode 100644 index d68949d8954..00000000000 --- a/gas/testsuite/gas/nios2/warn_nobreak.l +++ /dev/null @@ -1,9 +0,0 @@ -.*warn_nobreak.s: Assembler messages: -.*warn_nobreak.s:2: Warning: The debugger will corrupt sstatus/ba \(r30\). -If you don't need to debug this code use .set nobreak to turn off this warning. -.*warn_nobreak.s:3: Warning: The debugger will corrupt bt \(r25\). -If you don't need to debug this code use .set nobreak to turn off this warning. -.*warn_nobreak.s:11: Warning: The debugger will corrupt sstatus/ba \(r30\). -If you don't need to debug this code use .set nobreak to turn off this warning. -.*warn_nobreak.s:12: Warning: The debugger will corrupt bt \(r25\). -If you don't need to debug this code use .set nobreak to turn off this warning. diff --git a/gas/testsuite/gas/nios2/warn_nobreak.s b/gas/testsuite/gas/nios2/warn_nobreak.s deleted file mode 100644 index 8e495c06de1..00000000000 --- a/gas/testsuite/gas/nios2/warn_nobreak.s +++ /dev/null @@ -1,12 +0,0 @@ -.set nobreak , 2 # This should not cause warning for ba, bt to be turned off -add ba, r2, r2 -add bt, r2, r2 -.set nobreak # this should turn the warnings off -add ba, r3, r4 -add bt, r3, r4 -.set break, 3 # this should not turn the warnings on -add ba, r3, r4 -add bt, r3, r4 -.set break # this should turn the warnings on -add ba, r3, r4 -add bt, r3, r4 diff --git a/gas/testsuite/gas/nios2/wrpie.d b/gas/testsuite/gas/nios2/wrpie.d deleted file mode 100644 index f45610f6a8d..00000000000 --- a/gas/testsuite/gas/nios2/wrpie.d +++ /dev/null @@ -1,20 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 wrpie -#as: -march=r2 - -# Test the wrpie instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 00000020 wrpie zero,zero -0+0004 <[^>]*> 00010020 wrpie at,zero -0+0008 <[^>]*> 00020020 wrpie r2,zero -0+000c <[^>]*> 00040020 wrpie r4,zero -0+0010 <[^>]*> 00080020 wrpie r8,zero -0+0014 <[^>]*> 00100020 wrpie r16,zero -0+0018 <[^>]*> 00000060 wrpie zero,at -0+001c <[^>]*> 000000a0 wrpie zero,r2 -0+0020 <[^>]*> 00000120 wrpie zero,r4 -0+0024 <[^>]*> 00000220 wrpie zero,r8 -0+0028 <[^>]*> 00000420 wrpie zero,r16 diff --git a/gas/testsuite/gas/nios2/wrpie.s b/gas/testsuite/gas/nios2/wrpie.s deleted file mode 100644 index 3718115d929..00000000000 --- a/gas/testsuite/gas/nios2/wrpie.s +++ /dev/null @@ -1,16 +0,0 @@ -# Source file used to test the WRPIE instruction - -.set noat - -foo: - wrpie zero, zero - wrpie at, zero - wrpie r2, zero - wrpie r4, zero - wrpie r8, zero - wrpie r16, zero - wrpie zero, at - wrpie zero, r2 - wrpie zero, r4 - wrpie zero, r8 - wrpie zero, r16 diff --git a/gas/testsuite/gas/nios2/wrprs-r2.d b/gas/testsuite/gas/nios2/wrprs-r2.d deleted file mode 100644 index f3d4dff8c64..00000000000 --- a/gas/testsuite/gas/nios2/wrprs-r2.d +++ /dev/null @@ -1,21 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 wrprs -#as: -march=r2 -#source: wrprs.s - -# Test the wrprs instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 50000020 wrprs zero,zero -0+0004 <[^>]*> 50010020 wrprs at,zero -0+0008 <[^>]*> 50020020 wrprs r2,zero -0+000c <[^>]*> 50040020 wrprs r4,zero -0+0010 <[^>]*> 50080020 wrprs r8,zero -0+0014 <[^>]*> 50100020 wrprs r16,zero -0+0018 <[^>]*> 50000060 wrprs zero,at -0+001c <[^>]*> 500000a0 wrprs zero,r2 -0+0020 <[^>]*> 50000120 wrprs zero,r4 -0+0024 <[^>]*> 50000220 wrprs zero,r8 -0+0028 <[^>]*> 50000420 wrprs zero,r16 diff --git a/gas/testsuite/gas/nios2/wrprs.d b/gas/testsuite/gas/nios2/wrprs.d deleted file mode 100644 index 2e6de5738af..00000000000 --- a/gas/testsuite/gas/nios2/wrprs.d +++ /dev/null @@ -1,19 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 wrprs - -# Test the wrprs instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 0000a03a wrprs zero,zero -0+0004 <[^>]*> 0002a03a wrprs at,zero -0+0008 <[^>]*> 0004a03a wrprs r2,zero -0+000c <[^>]*> 0008a03a wrprs r4,zero -0+0010 <[^>]*> 0010a03a wrprs r8,zero -0+0014 <[^>]*> 0020a03a wrprs r16,zero -0+0018 <[^>]*> 0800a03a wrprs zero,at -0+001c <[^>]*> 1000a03a wrprs zero,r2 -0+0020 <[^>]*> 2000a03a wrprs zero,r4 -0+0024 <[^>]*> 4000a03a wrprs zero,r8 -0+0028 <[^>]*> 8000a03a wrprs zero,r16 diff --git a/gas/testsuite/gas/nios2/wrprs.s b/gas/testsuite/gas/nios2/wrprs.s deleted file mode 100644 index c722ce5eca9..00000000000 --- a/gas/testsuite/gas/nios2/wrprs.s +++ /dev/null @@ -1,16 +0,0 @@ -# Source file used to test the wrprs instruction - -.set noat - -foo: - wrprs zero, zero - wrprs at, zero - wrprs r2, zero - wrprs r4, zero - wrprs r8, zero - wrprs r16, zero - wrprs zero, at - wrprs zero, r2 - wrprs zero, r4 - wrprs zero, r8 - wrprs zero, r16 diff --git a/gas/testsuite/gas/nios2/xor-r2.d b/gas/testsuite/gas/nios2/xor-r2.d deleted file mode 100644 index 14148c7194a..00000000000 --- a/gas/testsuite/gas/nios2/xor-r2.d +++ /dev/null @@ -1,13 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 R2 xor -#as: -march=r2 -#source: xor.s - -# Test the nor instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 78065220 xor r6,r8,r10 -0+0004 <[^>]*> ffff31fc xorhi r6,r7,65535 -0+0008 <[^>]*> ffff31dc xori r6,r7,65535 diff --git a/gas/testsuite/gas/nios2/xor.d b/gas/testsuite/gas/nios2/xor.d deleted file mode 100644 index a7d609e4212..00000000000 --- a/gas/testsuite/gas/nios2/xor.d +++ /dev/null @@ -1,11 +0,0 @@ -#objdump: -dr --prefix-addresses --show-raw-insn -#name: NIOS2 xor - -# Test the nor instruction - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -0+0000 <[^>]*> 428cf03a xor r6,r8,r10 -0+0004 <[^>]*> 39bffffc xorhi r6,r7,65535 -0+0008 <[^>]*> 39bfffdc xori r6,r7,65535 diff --git a/gas/testsuite/gas/nios2/xor.s b/gas/testsuite/gas/nios2/xor.s deleted file mode 100644 index 2c558f77f0b..00000000000 --- a/gas/testsuite/gas/nios2/xor.s +++ /dev/null @@ -1,7 +0,0 @@ -# Source file used to test the nor instruction - -foo: - xor r6,r8,r10 - xorhi r6,r7,0xffff - xori r6,r7,0xffff - diff --git a/include/opcode/nios2.h b/include/opcode/nios2.h deleted file mode 100644 index 6e312421665..00000000000 --- a/include/opcode/nios2.h +++ /dev/null @@ -1,235 +0,0 @@ -/* Nios II opcode list for GAS, the GNU assembler. - Copyright (C) 2012-2024 Free Software Foundation, Inc. - Contributed by Nigel Gray (ngray@altera.com). - Contributed by Mentor Graphics, Inc. - - This file is part of the GNU opcodes library. - - GAS/GDB is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - GAS/GDB 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GAS or GDB; see the file COPYING3. If not, write to - the Free Software Foundation, 51 Franklin Street - Fifth Floor, - Boston, MA 02110-1301, USA. */ - -#ifndef _NIOS2_H_ -#define _NIOS2_H_ - -#include "bfd.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/**************************************************************************** - * This file contains structures, bit masks and shift counts used - * by the GNU toolchain to define the Nios II instruction set and - * access various opcode fields. - ****************************************************************************/ - -/* Instruction encoding formats. */ -enum iw_format_type { - /* R1 formats. */ - iw_i_type, - iw_r_type, - iw_j_type, - iw_custom_type, - - /* 32-bit R2 formats. */ - iw_L26_type, - iw_F2I16_type, - iw_F2X4I12_type, - iw_F1X4I12_type, - iw_F1X4L17_type, - iw_F3X6L5_type, - iw_F2X6L10_type, - iw_F3X6_type, - iw_F3X8_type, - - /* 16-bit R2 formats. */ - iw_I10_type, - iw_T1I7_type, - iw_T2I4_type, - iw_T1X1I6_type, - iw_X1I7_type, - iw_L5I4X1_type, - iw_T2X1L3_type, - iw_T2X1I3_type, - iw_T3X1_type, - iw_T2X3_type, - iw_F1X1_type, - iw_X2L5_type, - iw_F1I5_type, - iw_F2_type -}; - -/* Identify different overflow situations for error messages. */ -enum overflow_type -{ - call_target_overflow = 0, - branch_target_overflow, - address_offset_overflow, - signed_immed16_overflow, - unsigned_immed16_overflow, - unsigned_immed5_overflow, - signed_immed12_overflow, - custom_opcode_overflow, - enumeration_overflow, - no_overflow -}; - -/* This structure holds information for a particular instruction. - - The args field is a string describing the operands. The following - letters can appear in the args: - c - a 5-bit control register index - d - a 5-bit destination register index - s - a 5-bit left source register index - t - a 5-bit right source register index - D - a 3-bit encoded destination register - S - a 3-bit encoded left source register - T - a 3-bit encoded right source register - i - a 16-bit signed immediate - j - a 5-bit unsigned immediate - k - a (second) 5-bit unsigned immediate - l - a 8-bit custom instruction constant - m - a 26-bit unsigned immediate - o - a 16-bit signed pc-relative offset - u - a 16-bit unsigned immediate - I - a 12-bit signed immediate - M - a 6-bit unsigned immediate - N - a 6-bit unsigned immediate with 2-bit shift - O - a 10-bit signed pc-relative offset with 1-bit shift - P - a 7-bit signed pc-relative offset with 1-bit shift - U - a 7-bit unsigned immediate with 2-bit shift - V - a 5-bit unsigned immediate with 2-bit shift - W - a 4-bit unsigned immediate with 2-bit shift - X - a 4-bit unsigned immediate with 1-bit shift - Y - a 4-bit unsigned immediate - e - an immediate coded as an enumeration for addi.n/subi.n - f - an immediate coded as an enumeration for slli.n/srli.n - g - an immediate coded as an enumeration for andi.n - h - an immediate coded as an enumeration for movi.n - R - a reglist for ldwm/stwm or push.n/pop.n - B - a base register specifier and option list for ldwm/stwm - Literal ',', '(', and ')' characters may also appear in the args as - delimiters. - - Note that the args describe the semantics and assembly-language syntax - of the operands, not their encoding into the instruction word. - - The pinfo field is INSN_MACRO for a macro. Otherwise, it is a collection - of bits describing the instruction, notably any relevant hazard - information. - - When assembling, the match field contains the opcode template, which - is modified by the arguments to produce the actual opcode - that is emitted. If pinfo is INSN_MACRO, then this is 0. - - If pinfo is INSN_MACRO, the mask field stores the macro identifier. - Otherwise this is a bit mask for the relevant portions of the opcode - when disassembling. If the actual opcode anded with the match field - equals the opcode field, then we have found the correct instruction. */ - -struct nios2_opcode -{ - const char *name; /* The name of the instruction. */ - const char *args; /* A string describing the arguments for this - instruction. */ - const char *args_test; /* Like args, but with an extra argument for - the expected opcode. */ - unsigned long num_args; /* The number of arguments the instruction - takes. */ - unsigned size; /* Size in bytes of the instruction. */ - enum iw_format_type format; /* Instruction format. */ - unsigned long match; /* The basic opcode for the instruction. */ - unsigned long mask; /* Mask for the opcode field of the - instruction. */ - unsigned long pinfo; /* Is this a real instruction or instruction - macro? */ - enum overflow_type overflow_msg; /* Used to generate informative - message when fixup overflows. */ -}; - -/* This value is used in the nios2_opcode.pinfo field to indicate that the - instruction is a macro or pseudo-op. This requires special treatment by - the assembler, and is used by the disassembler to determine whether to - check for a nop. */ -#define NIOS2_INSN_MACRO 0x80000000 -#define NIOS2_INSN_MACRO_MOV 0x80000001 -#define NIOS2_INSN_MACRO_MOVI 0x80000002 -#define NIOS2_INSN_MACRO_MOVIA 0x80000004 - -#define NIOS2_INSN_RELAXABLE 0x40000000 -#define NIOS2_INSN_UBRANCH 0x00000010 -#define NIOS2_INSN_CBRANCH 0x00000020 -#define NIOS2_INSN_CALL 0x00000040 - -#define NIOS2_INSN_OPTARG 0x00000080 - -/* Register attributes. */ -#define REG_NORMAL (1<<0) /* Normal registers. */ -#define REG_CONTROL (1<<1) /* Control registers. */ -#define REG_COPROCESSOR (1<<2) /* For custom instructions. */ -#define REG_3BIT (1<<3) /* For R2 CDX instructions. */ -#define REG_LDWM (1<<4) /* For R2 ldwm/stwm. */ -#define REG_POP (1<<5) /* For R2 pop.n/push.n. */ - -struct nios2_reg -{ - const char *name; - const int index; - unsigned long regtype; -}; - -/* Pull in the instruction field accessors, opcodes, and masks. */ -#include "nios2r1.h" -#include "nios2r2.h" - -/* These are the data structures used to hold the instruction information. */ -extern const struct nios2_opcode nios2_r1_opcodes[]; -extern const int nios2_num_r1_opcodes; -extern const struct nios2_opcode nios2_r2_opcodes[]; -extern const int nios2_num_r2_opcodes; -extern struct nios2_opcode *nios2_opcodes; -extern int nios2_num_opcodes; - -/* These are the data structures used to hold the register information. */ -extern const struct nios2_reg nios2_builtin_regs[]; -extern struct nios2_reg *nios2_regs; -extern const int nios2_num_builtin_regs; -extern int nios2_num_regs; - -/* Return the opcode descriptor for a single instruction. */ -extern const struct nios2_opcode * -nios2_find_opcode_hash (unsigned long, unsigned long); - -/* Lookup tables for R2 immediate decodings. */ -extern unsigned int nios2_r2_asi_n_mappings[]; -extern const int nios2_num_r2_asi_n_mappings; -extern unsigned int nios2_r2_shi_n_mappings[]; -extern const int nios2_num_r2_shi_n_mappings; -extern unsigned int nios2_r2_andi_n_mappings[]; -extern const int nios2_num_r2_andi_n_mappings; - -/* Lookup table for 3-bit register decodings. */ -extern int nios2_r2_reg3_mappings[]; -extern const int nios2_num_r2_reg3_mappings; - -/* Lookup table for REG_RANGE value list decodings. */ -extern unsigned long nios2_r2_reg_range_mappings[]; -extern const int nios2_num_r2_reg_range_mappings; - -#ifdef __cplusplus -} -#endif - -#endif /* _NIOS2_H */ diff --git a/include/opcode/nios2r1.h b/include/opcode/nios2r1.h deleted file mode 100644 index 7d4125f2352..00000000000 --- a/include/opcode/nios2r1.h +++ /dev/null @@ -1,474 +0,0 @@ -/* Nios II R1 opcode list for GAS, the GNU assembler. - Copyright (C) 2013-2024 Free Software Foundation, Inc. - Contributed by Mentor Graphics, Inc. - - This file is part of the GNU opcodes library. - - GAS/GDB is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - GAS/GDB 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GAS or GDB; see the file COPYING3. If not, write to - the Free Software Foundation, 51 Franklin Street - Fifth Floor, - Boston, MA 02110-1301, USA. */ - -#ifndef _NIOS2R1_H_ -#define _NIOS2R1_H_ - -/* R1 fields. */ -#define IW_R1_OP_LSB 0 -#define IW_R1_OP_SIZE 6 -#define IW_R1_OP_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_R1_OP_SIZE)) -#define IW_R1_OP_SHIFTED_MASK (IW_R1_OP_UNSHIFTED_MASK << IW_R1_OP_LSB) -#define GET_IW_R1_OP(W) (((W) >> IW_R1_OP_LSB) & IW_R1_OP_UNSHIFTED_MASK) -#define SET_IW_R1_OP(V) (((V) & IW_R1_OP_UNSHIFTED_MASK) << IW_R1_OP_LSB) - -#define IW_I_A_LSB 27 -#define IW_I_A_SIZE 5 -#define IW_I_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_I_A_SIZE)) -#define IW_I_A_SHIFTED_MASK (IW_I_A_UNSHIFTED_MASK << IW_I_A_LSB) -#define GET_IW_I_A(W) (((W) >> IW_I_A_LSB) & IW_I_A_UNSHIFTED_MASK) -#define SET_IW_I_A(V) (((V) & IW_I_A_UNSHIFTED_MASK) << IW_I_A_LSB) - -#define IW_I_B_LSB 22 -#define IW_I_B_SIZE 5 -#define IW_I_B_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_I_B_SIZE)) -#define IW_I_B_SHIFTED_MASK (IW_I_B_UNSHIFTED_MASK << IW_I_B_LSB) -#define GET_IW_I_B(W) (((W) >> IW_I_B_LSB) & IW_I_B_UNSHIFTED_MASK) -#define SET_IW_I_B(V) (((V) & IW_I_B_UNSHIFTED_MASK) << IW_I_B_LSB) - -#define IW_I_IMM16_LSB 6 -#define IW_I_IMM16_SIZE 16 -#define IW_I_IMM16_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_I_IMM16_SIZE)) -#define IW_I_IMM16_SHIFTED_MASK (IW_I_IMM16_UNSHIFTED_MASK << IW_I_IMM16_LSB) -#define GET_IW_I_IMM16(W) (((W) >> IW_I_IMM16_LSB) & IW_I_IMM16_UNSHIFTED_MASK) -#define SET_IW_I_IMM16(V) (((V) & IW_I_IMM16_UNSHIFTED_MASK) << IW_I_IMM16_LSB) - -#define IW_R_A_LSB 27 -#define IW_R_A_SIZE 5 -#define IW_R_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_R_A_SIZE)) -#define IW_R_A_SHIFTED_MASK (IW_R_A_UNSHIFTED_MASK << IW_R_A_LSB) -#define GET_IW_R_A(W) (((W) >> IW_R_A_LSB) & IW_R_A_UNSHIFTED_MASK) -#define SET_IW_R_A(V) (((V) & IW_R_A_UNSHIFTED_MASK) << IW_R_A_LSB) - -#define IW_R_B_LSB 22 -#define IW_R_B_SIZE 5 -#define IW_R_B_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_R_B_SIZE)) -#define IW_R_B_SHIFTED_MASK (IW_R_B_UNSHIFTED_MASK << IW_R_B_LSB) -#define GET_IW_R_B(W) (((W) >> IW_R_B_LSB) & IW_R_B_UNSHIFTED_MASK) -#define SET_IW_R_B(V) (((V) & IW_R_B_UNSHIFTED_MASK) << IW_R_B_LSB) - -#define IW_R_C_LSB 17 -#define IW_R_C_SIZE 5 -#define IW_R_C_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_R_C_SIZE)) -#define IW_R_C_SHIFTED_MASK (IW_R_C_UNSHIFTED_MASK << IW_R_C_LSB) -#define GET_IW_R_C(W) (((W) >> IW_R_C_LSB) & IW_R_C_UNSHIFTED_MASK) -#define SET_IW_R_C(V) (((V) & IW_R_C_UNSHIFTED_MASK) << IW_R_C_LSB) - -#define IW_R_OPX_LSB 11 -#define IW_R_OPX_SIZE 6 -#define IW_R_OPX_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_R_OPX_SIZE)) -#define IW_R_OPX_SHIFTED_MASK (IW_R_OPX_UNSHIFTED_MASK << IW_R_OPX_LSB) -#define GET_IW_R_OPX(W) (((W) >> IW_R_OPX_LSB) & IW_R_OPX_UNSHIFTED_MASK) -#define SET_IW_R_OPX(V) (((V) & IW_R_OPX_UNSHIFTED_MASK) << IW_R_OPX_LSB) - -#define IW_R_IMM5_LSB 6 -#define IW_R_IMM5_SIZE 5 -#define IW_R_IMM5_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_R_IMM5_SIZE)) -#define IW_R_IMM5_SHIFTED_MASK (IW_R_IMM5_UNSHIFTED_MASK << IW_R_IMM5_LSB) -#define GET_IW_R_IMM5(W) (((W) >> IW_R_IMM5_LSB) & IW_R_IMM5_UNSHIFTED_MASK) -#define SET_IW_R_IMM5(V) (((V) & IW_R_IMM5_UNSHIFTED_MASK) << IW_R_IMM5_LSB) - -#define IW_J_IMM26_LSB 6 -#define IW_J_IMM26_SIZE 26 -#define IW_J_IMM26_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_J_IMM26_SIZE)) -#define IW_J_IMM26_SHIFTED_MASK (IW_J_IMM26_UNSHIFTED_MASK << IW_J_IMM26_LSB) -#define GET_IW_J_IMM26(W) (((W) >> IW_J_IMM26_LSB) & IW_J_IMM26_UNSHIFTED_MASK) -#define SET_IW_J_IMM26(V) (((V) & IW_J_IMM26_UNSHIFTED_MASK) << IW_J_IMM26_LSB) - -#define IW_CUSTOM_A_LSB 27 -#define IW_CUSTOM_A_SIZE 5 -#define IW_CUSTOM_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_CUSTOM_A_SIZE)) -#define IW_CUSTOM_A_SHIFTED_MASK (IW_CUSTOM_A_UNSHIFTED_MASK << IW_CUSTOM_A_LSB) -#define GET_IW_CUSTOM_A(W) (((W) >> IW_CUSTOM_A_LSB) & IW_CUSTOM_A_UNSHIFTED_MASK) -#define SET_IW_CUSTOM_A(V) (((V) & IW_CUSTOM_A_UNSHIFTED_MASK) << IW_CUSTOM_A_LSB) - -#define IW_CUSTOM_B_LSB 22 -#define IW_CUSTOM_B_SIZE 5 -#define IW_CUSTOM_B_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_CUSTOM_B_SIZE)) -#define IW_CUSTOM_B_SHIFTED_MASK (IW_CUSTOM_B_UNSHIFTED_MASK << IW_CUSTOM_B_LSB) -#define GET_IW_CUSTOM_B(W) (((W) >> IW_CUSTOM_B_LSB) & IW_CUSTOM_B_UNSHIFTED_MASK) -#define SET_IW_CUSTOM_B(V) (((V) & IW_CUSTOM_B_UNSHIFTED_MASK) << IW_CUSTOM_B_LSB) - -#define IW_CUSTOM_C_LSB 17 -#define IW_CUSTOM_C_SIZE 5 -#define IW_CUSTOM_C_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_CUSTOM_C_SIZE)) -#define IW_CUSTOM_C_SHIFTED_MASK (IW_CUSTOM_C_UNSHIFTED_MASK << IW_CUSTOM_C_LSB) -#define GET_IW_CUSTOM_C(W) (((W) >> IW_CUSTOM_C_LSB) & IW_CUSTOM_C_UNSHIFTED_MASK) -#define SET_IW_CUSTOM_C(V) (((V) & IW_CUSTOM_C_UNSHIFTED_MASK) << IW_CUSTOM_C_LSB) - -#define IW_CUSTOM_READA_LSB 16 -#define IW_CUSTOM_READA_SIZE 1 -#define IW_CUSTOM_READA_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_CUSTOM_READA_SIZE)) -#define IW_CUSTOM_READA_SHIFTED_MASK (IW_CUSTOM_READA_UNSHIFTED_MASK << IW_CUSTOM_READA_LSB) -#define GET_IW_CUSTOM_READA(W) (((W) >> IW_CUSTOM_READA_LSB) & IW_CUSTOM_READA_UNSHIFTED_MASK) -#define SET_IW_CUSTOM_READA(V) (((V) & IW_CUSTOM_READA_UNSHIFTED_MASK) << IW_CUSTOM_READA_LSB) - -#define IW_CUSTOM_READB_LSB 15 -#define IW_CUSTOM_READB_SIZE 1 -#define IW_CUSTOM_READB_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_CUSTOM_READB_SIZE)) -#define IW_CUSTOM_READB_SHIFTED_MASK (IW_CUSTOM_READB_UNSHIFTED_MASK << IW_CUSTOM_READB_LSB) -#define GET_IW_CUSTOM_READB(W) (((W) >> IW_CUSTOM_READB_LSB) & IW_CUSTOM_READB_UNSHIFTED_MASK) -#define SET_IW_CUSTOM_READB(V) (((V) & IW_CUSTOM_READB_UNSHIFTED_MASK) << IW_CUSTOM_READB_LSB) - -#define IW_CUSTOM_READC_LSB 14 -#define IW_CUSTOM_READC_SIZE 1 -#define IW_CUSTOM_READC_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_CUSTOM_READC_SIZE)) -#define IW_CUSTOM_READC_SHIFTED_MASK (IW_CUSTOM_READC_UNSHIFTED_MASK << IW_CUSTOM_READC_LSB) -#define GET_IW_CUSTOM_READC(W) (((W) >> IW_CUSTOM_READC_LSB) & IW_CUSTOM_READC_UNSHIFTED_MASK) -#define SET_IW_CUSTOM_READC(V) (((V) & IW_CUSTOM_READC_UNSHIFTED_MASK) << IW_CUSTOM_READC_LSB) - -#define IW_CUSTOM_N_LSB 6 -#define IW_CUSTOM_N_SIZE 8 -#define IW_CUSTOM_N_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_CUSTOM_N_SIZE)) -#define IW_CUSTOM_N_SHIFTED_MASK (IW_CUSTOM_N_UNSHIFTED_MASK << IW_CUSTOM_N_LSB) -#define GET_IW_CUSTOM_N(W) (((W) >> IW_CUSTOM_N_LSB) & IW_CUSTOM_N_UNSHIFTED_MASK) -#define SET_IW_CUSTOM_N(V) (((V) & IW_CUSTOM_N_UNSHIFTED_MASK) << IW_CUSTOM_N_LSB) - -/* R1 opcodes. */ -#define R1_OP_CALL 0 -#define R1_OP_JMPI 1 -#define R1_OP_LDBU 3 -#define R1_OP_ADDI 4 -#define R1_OP_STB 5 -#define R1_OP_BR 6 -#define R1_OP_LDB 7 -#define R1_OP_CMPGEI 8 -#define R1_OP_LDHU 11 -#define R1_OP_ANDI 12 -#define R1_OP_STH 13 -#define R1_OP_BGE 14 -#define R1_OP_LDH 15 -#define R1_OP_CMPLTI 16 -#define R1_OP_INITDA 19 -#define R1_OP_ORI 20 -#define R1_OP_STW 21 -#define R1_OP_BLT 22 -#define R1_OP_LDW 23 -#define R1_OP_CMPNEI 24 -#define R1_OP_FLUSHDA 27 -#define R1_OP_XORI 28 -#define R1_OP_BNE 30 -#define R1_OP_CMPEQI 32 -#define R1_OP_LDBUIO 35 -#define R1_OP_MULI 36 -#define R1_OP_STBIO 37 -#define R1_OP_BEQ 38 -#define R1_OP_LDBIO 39 -#define R1_OP_CMPGEUI 40 -#define R1_OP_LDHUIO 43 -#define R1_OP_ANDHI 44 -#define R1_OP_STHIO 45 -#define R1_OP_BGEU 46 -#define R1_OP_LDHIO 47 -#define R1_OP_CMPLTUI 48 -#define R1_OP_CUSTOM 50 -#define R1_OP_INITD 51 -#define R1_OP_ORHI 52 -#define R1_OP_STWIO 53 -#define R1_OP_BLTU 54 -#define R1_OP_LDWIO 55 -#define R1_OP_RDPRS 56 -#define R1_OP_OPX 58 -#define R1_OP_FLUSHD 59 -#define R1_OP_XORHI 60 - -#define R1_OPX_ERET 1 -#define R1_OPX_ROLI 2 -#define R1_OPX_ROL 3 -#define R1_OPX_FLUSHP 4 -#define R1_OPX_RET 5 -#define R1_OPX_NOR 6 -#define R1_OPX_MULXUU 7 -#define R1_OPX_CMPGE 8 -#define R1_OPX_BRET 9 -#define R1_OPX_ROR 11 -#define R1_OPX_FLUSHI 12 -#define R1_OPX_JMP 13 -#define R1_OPX_AND 14 -#define R1_OPX_CMPLT 16 -#define R1_OPX_SLLI 18 -#define R1_OPX_SLL 19 -#define R1_OPX_WRPRS 20 -#define R1_OPX_OR 22 -#define R1_OPX_MULXSU 23 -#define R1_OPX_CMPNE 24 -#define R1_OPX_SRLI 26 -#define R1_OPX_SRL 27 -#define R1_OPX_NEXTPC 28 -#define R1_OPX_CALLR 29 -#define R1_OPX_XOR 30 -#define R1_OPX_MULXSS 31 -#define R1_OPX_CMPEQ 32 -#define R1_OPX_DIVU 36 -#define R1_OPX_DIV 37 -#define R1_OPX_RDCTL 38 -#define R1_OPX_MUL 39 -#define R1_OPX_CMPGEU 40 -#define R1_OPX_INITI 41 -#define R1_OPX_TRAP 45 -#define R1_OPX_WRCTL 46 -#define R1_OPX_CMPLTU 48 -#define R1_OPX_ADD 49 -#define R1_OPX_BREAK 52 -#define R1_OPX_SYNC 54 -#define R1_OPX_SUB 57 -#define R1_OPX_SRAI 58 -#define R1_OPX_SRA 59 - -/* Some convenience macros for R1 encodings, for use in instruction tables. - MATCH_R1_OPX0(NAME) and MASK_R1_OPX0 are used for R-type instructions - with 3 register operands and constant 0 in the immediate field. - The general forms are MATCH_R1_OPX(NAME, A, B, C) where the arguments specify - constant values and MASK_R1_OPX(A, B, C, N) where the arguments are booleans - that are true if the field should be included in the mask. - */ -#define MATCH_R1_OP(NAME) \ - (SET_IW_R1_OP (R1_OP_##NAME)) -#define MASK_R1_OP \ - IW_R1_OP_SHIFTED_MASK - -#define MATCH_R1_OPX0(NAME) \ - (SET_IW_R1_OP (R1_OP_OPX) | SET_IW_R_OPX (R1_OPX_##NAME)) -#define MASK_R1_OPX0 \ - (IW_R1_OP_SHIFTED_MASK | IW_R_OPX_SHIFTED_MASK | IW_R_IMM5_SHIFTED_MASK) - -#define MATCH_R1_OPX(NAME, A, B, C) \ - (MATCH_R1_OPX0 (NAME) | SET_IW_R_A (A) | SET_IW_R_B (B) | SET_IW_R_C (C)) -#define MASK_R1_OPX(A, B, C, N) \ - (IW_R1_OP_SHIFTED_MASK | IW_R_OPX_SHIFTED_MASK \ - | (A ? IW_R_A_SHIFTED_MASK : 0) \ - | (B ? IW_R_B_SHIFTED_MASK : 0) \ - | (C ? IW_R_C_SHIFTED_MASK : 0) \ - | (N ? IW_R_IMM5_SHIFTED_MASK : 0)) - -/* And here's the match/mask macros for the R1 instruction set. */ -#define MATCH_R1_ADD MATCH_R1_OPX0 (ADD) -#define MASK_R1_ADD MASK_R1_OPX0 -#define MATCH_R1_ADDI MATCH_R1_OP (ADDI) -#define MASK_R1_ADDI MASK_R1_OP -#define MATCH_R1_AND MATCH_R1_OPX0 (AND) -#define MASK_R1_AND MASK_R1_OPX0 -#define MATCH_R1_ANDHI MATCH_R1_OP (ANDHI) -#define MASK_R1_ANDHI MASK_R1_OP -#define MATCH_R1_ANDI MATCH_R1_OP (ANDI) -#define MASK_R1_ANDI MASK_R1_OP -#define MATCH_R1_BEQ MATCH_R1_OP (BEQ) -#define MASK_R1_BEQ MASK_R1_OP -#define MATCH_R1_BGE MATCH_R1_OP (BGE) -#define MASK_R1_BGE MASK_R1_OP -#define MATCH_R1_BGEU MATCH_R1_OP (BGEU) -#define MASK_R1_BGEU MASK_R1_OP -#define MATCH_R1_BGT MATCH_R1_OP (BLT) -#define MASK_R1_BGT MASK_R1_OP -#define MATCH_R1_BGTU MATCH_R1_OP (BLTU) -#define MASK_R1_BGTU MASK_R1_OP -#define MATCH_R1_BLE MATCH_R1_OP (BGE) -#define MASK_R1_BLE MASK_R1_OP -#define MATCH_R1_BLEU MATCH_R1_OP (BGEU) -#define MASK_R1_BLEU MASK_R1_OP -#define MATCH_R1_BLT MATCH_R1_OP (BLT) -#define MASK_R1_BLT MASK_R1_OP -#define MATCH_R1_BLTU MATCH_R1_OP (BLTU) -#define MASK_R1_BLTU MASK_R1_OP -#define MATCH_R1_BNE MATCH_R1_OP (BNE) -#define MASK_R1_BNE MASK_R1_OP -#define MATCH_R1_BR MATCH_R1_OP (BR) -#define MASK_R1_BR MASK_R1_OP | IW_I_A_SHIFTED_MASK | IW_I_B_SHIFTED_MASK -#define MATCH_R1_BREAK MATCH_R1_OPX (BREAK, 0, 0, 0x1e) -#define MASK_R1_BREAK MASK_R1_OPX (1, 1, 1, 0) -#define MATCH_R1_BRET MATCH_R1_OPX (BRET, 0x1e, 0, 0) -#define MASK_R1_BRET MASK_R1_OPX (1, 1, 1, 1) -#define MATCH_R1_CALL MATCH_R1_OP (CALL) -#define MASK_R1_CALL MASK_R1_OP -#define MATCH_R1_CALLR MATCH_R1_OPX (CALLR, 0, 0, 0x1f) -#define MASK_R1_CALLR MASK_R1_OPX (0, 1, 1, 1) -#define MATCH_R1_CMPEQ MATCH_R1_OPX0 (CMPEQ) -#define MASK_R1_CMPEQ MASK_R1_OPX0 -#define MATCH_R1_CMPEQI MATCH_R1_OP (CMPEQI) -#define MASK_R1_CMPEQI MASK_R1_OP -#define MATCH_R1_CMPGE MATCH_R1_OPX0 (CMPGE) -#define MASK_R1_CMPGE MASK_R1_OPX0 -#define MATCH_R1_CMPGEI MATCH_R1_OP (CMPGEI) -#define MASK_R1_CMPGEI MASK_R1_OP -#define MATCH_R1_CMPGEU MATCH_R1_OPX0 (CMPGEU) -#define MASK_R1_CMPGEU MASK_R1_OPX0 -#define MATCH_R1_CMPGEUI MATCH_R1_OP (CMPGEUI) -#define MASK_R1_CMPGEUI MASK_R1_OP -#define MATCH_R1_CMPGT MATCH_R1_OPX0 (CMPLT) -#define MASK_R1_CMPGT MASK_R1_OPX0 -#define MATCH_R1_CMPGTI MATCH_R1_OP (CMPGEI) -#define MASK_R1_CMPGTI MASK_R1_OP -#define MATCH_R1_CMPGTU MATCH_R1_OPX0 (CMPLTU) -#define MASK_R1_CMPGTU MASK_R1_OPX0 -#define MATCH_R1_CMPGTUI MATCH_R1_OP (CMPGEUI) -#define MASK_R1_CMPGTUI MASK_R1_OP -#define MATCH_R1_CMPLE MATCH_R1_OPX0 (CMPGE) -#define MASK_R1_CMPLE MASK_R1_OPX0 -#define MATCH_R1_CMPLEI MATCH_R1_OP (CMPLTI) -#define MASK_R1_CMPLEI MASK_R1_OP -#define MATCH_R1_CMPLEU MATCH_R1_OPX0 (CMPGEU) -#define MASK_R1_CMPLEU MASK_R1_OPX0 -#define MATCH_R1_CMPLEUI MATCH_R1_OP (CMPLTUI) -#define MASK_R1_CMPLEUI MASK_R1_OP -#define MATCH_R1_CMPLT MATCH_R1_OPX0 (CMPLT) -#define MASK_R1_CMPLT MASK_R1_OPX0 -#define MATCH_R1_CMPLTI MATCH_R1_OP (CMPLTI) -#define MASK_R1_CMPLTI MASK_R1_OP -#define MATCH_R1_CMPLTU MATCH_R1_OPX0 (CMPLTU) -#define MASK_R1_CMPLTU MASK_R1_OPX0 -#define MATCH_R1_CMPLTUI MATCH_R1_OP (CMPLTUI) -#define MASK_R1_CMPLTUI MASK_R1_OP -#define MATCH_R1_CMPNE MATCH_R1_OPX0 (CMPNE) -#define MASK_R1_CMPNE MASK_R1_OPX0 -#define MATCH_R1_CMPNEI MATCH_R1_OP (CMPNEI) -#define MASK_R1_CMPNEI MASK_R1_OP -#define MATCH_R1_CUSTOM MATCH_R1_OP (CUSTOM) -#define MASK_R1_CUSTOM MASK_R1_OP -#define MATCH_R1_DIV MATCH_R1_OPX0 (DIV) -#define MASK_R1_DIV MASK_R1_OPX0 -#define MATCH_R1_DIVU MATCH_R1_OPX0 (DIVU) -#define MASK_R1_DIVU MASK_R1_OPX0 -#define MATCH_R1_ERET MATCH_R1_OPX (ERET, 0x1d, 0x1e, 0) -#define MASK_R1_ERET MASK_R1_OPX (1, 1, 1, 1) -#define MATCH_R1_FLUSHD MATCH_R1_OP (FLUSHD) | SET_IW_I_B (0) -#define MASK_R1_FLUSHD MASK_R1_OP | IW_I_B_SHIFTED_MASK -#define MATCH_R1_FLUSHDA MATCH_R1_OP (FLUSHDA) | SET_IW_I_B (0) -#define MASK_R1_FLUSHDA MASK_R1_OP | IW_I_B_SHIFTED_MASK -#define MATCH_R1_FLUSHI MATCH_R1_OPX (FLUSHI, 0, 0, 0) -#define MASK_R1_FLUSHI MASK_R1_OPX (0, 1, 1, 1) -#define MATCH_R1_FLUSHP MATCH_R1_OPX (FLUSHP, 0, 0, 0) -#define MASK_R1_FLUSHP MASK_R1_OPX (1, 1, 1, 1) -#define MATCH_R1_INITD MATCH_R1_OP (INITD) | SET_IW_I_B (0) -#define MASK_R1_INITD MASK_R1_OP | IW_I_B_SHIFTED_MASK -#define MATCH_R1_INITDA MATCH_R1_OP (INITDA) | SET_IW_I_B (0) -#define MASK_R1_INITDA MASK_R1_OP | IW_I_B_SHIFTED_MASK -#define MATCH_R1_INITI MATCH_R1_OPX (INITI, 0, 0, 0) -#define MASK_R1_INITI MASK_R1_OPX (0, 1, 1, 1) -#define MATCH_R1_JMP MATCH_R1_OPX (JMP, 0, 0, 0) -#define MASK_R1_JMP MASK_R1_OPX (0, 1, 1, 1) -#define MATCH_R1_JMPI MATCH_R1_OP (JMPI) -#define MASK_R1_JMPI MASK_R1_OP -#define MATCH_R1_LDB MATCH_R1_OP (LDB) -#define MASK_R1_LDB MASK_R1_OP -#define MATCH_R1_LDBIO MATCH_R1_OP (LDBIO) -#define MASK_R1_LDBIO MASK_R1_OP -#define MATCH_R1_LDBU MATCH_R1_OP (LDBU) -#define MASK_R1_LDBU MASK_R1_OP -#define MATCH_R1_LDBUIO MATCH_R1_OP (LDBUIO) -#define MASK_R1_LDBUIO MASK_R1_OP -#define MATCH_R1_LDH MATCH_R1_OP (LDH) -#define MASK_R1_LDH MASK_R1_OP -#define MATCH_R1_LDHIO MATCH_R1_OP (LDHIO) -#define MASK_R1_LDHIO MASK_R1_OP -#define MATCH_R1_LDHU MATCH_R1_OP (LDHU) -#define MASK_R1_LDHU MASK_R1_OP -#define MATCH_R1_LDHUIO MATCH_R1_OP (LDHUIO) -#define MASK_R1_LDHUIO MASK_R1_OP -#define MATCH_R1_LDW MATCH_R1_OP (LDW) -#define MASK_R1_LDW MASK_R1_OP -#define MATCH_R1_LDWIO MATCH_R1_OP (LDWIO) -#define MASK_R1_LDWIO MASK_R1_OP -#define MATCH_R1_MOV MATCH_R1_OPX (ADD, 0, 0, 0) -#define MASK_R1_MOV MASK_R1_OPX (0, 1, 0, 1) -#define MATCH_R1_MOVHI MATCH_R1_OP (ORHI) | SET_IW_I_A (0) -#define MASK_R1_MOVHI MASK_R1_OP | IW_I_A_SHIFTED_MASK -#define MATCH_R1_MOVI MATCH_R1_OP (ADDI) | SET_IW_I_A (0) -#define MASK_R1_MOVI MASK_R1_OP | IW_I_A_SHIFTED_MASK -#define MATCH_R1_MOVUI MATCH_R1_OP (ORI) | SET_IW_I_A (0) -#define MASK_R1_MOVUI MASK_R1_OP | IW_I_A_SHIFTED_MASK -#define MATCH_R1_MUL MATCH_R1_OPX0 (MUL) -#define MASK_R1_MUL MASK_R1_OPX0 -#define MATCH_R1_MULI MATCH_R1_OP (MULI) -#define MASK_R1_MULI MASK_R1_OP -#define MATCH_R1_MULXSS MATCH_R1_OPX0 (MULXSS) -#define MASK_R1_MULXSS MASK_R1_OPX0 -#define MATCH_R1_MULXSU MATCH_R1_OPX0 (MULXSU) -#define MASK_R1_MULXSU MASK_R1_OPX0 -#define MATCH_R1_MULXUU MATCH_R1_OPX0 (MULXUU) -#define MASK_R1_MULXUU MASK_R1_OPX0 -#define MATCH_R1_NEXTPC MATCH_R1_OPX (NEXTPC, 0, 0, 0) -#define MASK_R1_NEXTPC MASK_R1_OPX (1, 1, 0, 1) -#define MATCH_R1_NOP MATCH_R1_OPX (ADD, 0, 0, 0) -#define MASK_R1_NOP MASK_R1_OPX (1, 1, 1, 1) -#define MATCH_R1_NOR MATCH_R1_OPX0 (NOR) -#define MASK_R1_NOR MASK_R1_OPX0 -#define MATCH_R1_OR MATCH_R1_OPX0 (OR) -#define MASK_R1_OR MASK_R1_OPX0 -#define MATCH_R1_ORHI MATCH_R1_OP (ORHI) -#define MASK_R1_ORHI MASK_R1_OP -#define MATCH_R1_ORI MATCH_R1_OP (ORI) -#define MASK_R1_ORI MASK_R1_OP -#define MATCH_R1_RDCTL MATCH_R1_OPX (RDCTL, 0, 0, 0) -#define MASK_R1_RDCTL MASK_R1_OPX (1, 1, 0, 0) -#define MATCH_R1_RDPRS MATCH_R1_OP (RDPRS) -#define MASK_R1_RDPRS MASK_R1_OP -#define MATCH_R1_RET MATCH_R1_OPX (RET, 0x1f, 0, 0) -#define MASK_R1_RET MASK_R1_OPX (1, 1, 1, 1) -#define MATCH_R1_ROL MATCH_R1_OPX0 (ROL) -#define MASK_R1_ROL MASK_R1_OPX0 -#define MATCH_R1_ROLI MATCH_R1_OPX (ROLI, 0, 0, 0) -#define MASK_R1_ROLI MASK_R1_OPX (0, 1, 0, 0) -#define MATCH_R1_ROR MATCH_R1_OPX0 (ROR) -#define MASK_R1_ROR MASK_R1_OPX0 -#define MATCH_R1_SLL MATCH_R1_OPX0 (SLL) -#define MASK_R1_SLL MASK_R1_OPX0 -#define MATCH_R1_SLLI MATCH_R1_OPX (SLLI, 0, 0, 0) -#define MASK_R1_SLLI MASK_R1_OPX (0, 1, 0, 0) -#define MATCH_R1_SRA MATCH_R1_OPX0 (SRA) -#define MASK_R1_SRA MASK_R1_OPX0 -#define MATCH_R1_SRAI MATCH_R1_OPX (SRAI, 0, 0, 0) -#define MASK_R1_SRAI MASK_R1_OPX (0, 1, 0, 0) -#define MATCH_R1_SRL MATCH_R1_OPX0 (SRL) -#define MASK_R1_SRL MASK_R1_OPX0 -#define MATCH_R1_SRLI MATCH_R1_OPX (SRLI, 0, 0, 0) -#define MASK_R1_SRLI MASK_R1_OPX (0, 1, 0, 0) -#define MATCH_R1_STB MATCH_R1_OP (STB) -#define MASK_R1_STB MASK_R1_OP -#define MATCH_R1_STBIO MATCH_R1_OP (STBIO) -#define MASK_R1_STBIO MASK_R1_OP -#define MATCH_R1_STH MATCH_R1_OP (STH) -#define MASK_R1_STH MASK_R1_OP -#define MATCH_R1_STHIO MATCH_R1_OP (STHIO) -#define MASK_R1_STHIO MASK_R1_OP -#define MATCH_R1_STW MATCH_R1_OP (STW) -#define MASK_R1_STW MASK_R1_OP -#define MATCH_R1_STWIO MATCH_R1_OP (STWIO) -#define MASK_R1_STWIO MASK_R1_OP -#define MATCH_R1_SUB MATCH_R1_OPX0 (SUB) -#define MASK_R1_SUB MASK_R1_OPX0 -#define MATCH_R1_SUBI MATCH_R1_OP (ADDI) -#define MASK_R1_SUBI MASK_R1_OP -#define MATCH_R1_SYNC MATCH_R1_OPX (SYNC, 0, 0, 0) -#define MASK_R1_SYNC MASK_R1_OPX (1, 1, 1, 1) -#define MATCH_R1_TRAP MATCH_R1_OPX (TRAP, 0, 0, 0x1d) -#define MASK_R1_TRAP MASK_R1_OPX (1, 1, 1, 0) -#define MATCH_R1_WRCTL MATCH_R1_OPX (WRCTL, 0, 0, 0) -#define MASK_R1_WRCTL MASK_R1_OPX (0, 1, 1, 0) -#define MATCH_R1_WRPRS MATCH_R1_OPX (WRPRS, 0, 0, 0) -#define MASK_R1_WRPRS MASK_R1_OPX (0, 1, 0, 1) -#define MATCH_R1_XOR MATCH_R1_OPX0 (XOR) -#define MASK_R1_XOR MASK_R1_OPX0 -#define MATCH_R1_XORHI MATCH_R1_OP (XORHI) -#define MASK_R1_XORHI MASK_R1_OP -#define MATCH_R1_XORI MATCH_R1_OP (XORI) -#define MASK_R1_XORI MASK_R1_OP - -#endif /* _NIOS2R1_H */ diff --git a/include/opcode/nios2r2.h b/include/opcode/nios2r2.h deleted file mode 100644 index cddbf28c598..00000000000 --- a/include/opcode/nios2r2.h +++ /dev/null @@ -1,1081 +0,0 @@ -/* Nios II R2 opcode list for GAS, the GNU assembler. - Copyright (C) 2013-2024 Free Software Foundation, Inc. - Contributed by Mentor Graphics, Inc. - - This file is part of the GNU opcodes library. - - GAS/GDB is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - GAS/GDB 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GAS or GDB; see the file COPYING3. If not, write to - the Free Software Foundation, 51 Franklin Street - Fifth Floor, - Boston, MA 02110-1301, USA. */ - -#ifndef _NIOS2R2_H_ -#define _NIOS2R2_H_ - -/* Fields for 32-bit R2 instructions. */ - -#define IW_R2_OP_LSB 0 -#define IW_R2_OP_SIZE 6 -#define IW_R2_OP_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_R2_OP_SIZE)) -#define IW_R2_OP_SHIFTED_MASK (IW_R2_OP_UNSHIFTED_MASK << IW_R2_OP_LSB) -#define GET_IW_R2_OP(W) (((W) >> IW_R2_OP_LSB) & IW_R2_OP_UNSHIFTED_MASK) -#define SET_IW_R2_OP(V) (((V) & IW_R2_OP_UNSHIFTED_MASK) << IW_R2_OP_LSB) - -#define IW_L26_IMM26_LSB 6 -#define IW_L26_IMM26_SIZE 26 -#define IW_L26_IMM26_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_L26_IMM26_SIZE)) -#define IW_L26_IMM26_SHIFTED_MASK (IW_L26_IMM26_UNSHIFTED_MASK << IW_L26_IMM26_LSB) -#define GET_IW_L26_IMM26(W) (((W) >> IW_L26_IMM26_LSB) & IW_L26_IMM26_UNSHIFTED_MASK) -#define SET_IW_L26_IMM26(V) (((V) & IW_L26_IMM26_UNSHIFTED_MASK) << IW_L26_IMM26_LSB) - -#define IW_F2I16_A_LSB 6 -#define IW_F2I16_A_SIZE 5 -#define IW_F2I16_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2I16_A_SIZE)) -#define IW_F2I16_A_SHIFTED_MASK (IW_F2I16_A_UNSHIFTED_MASK << IW_F2I16_A_LSB) -#define GET_IW_F2I16_A(W) (((W) >> IW_F2I16_A_LSB) & IW_F2I16_A_UNSHIFTED_MASK) -#define SET_IW_F2I16_A(V) (((V) & IW_F2I16_A_UNSHIFTED_MASK) << IW_F2I16_A_LSB) - -#define IW_F2I16_B_LSB 11 -#define IW_F2I16_B_SIZE 5 -#define IW_F2I16_B_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2I16_B_SIZE)) -#define IW_F2I16_B_SHIFTED_MASK (IW_F2I16_B_UNSHIFTED_MASK << IW_F2I16_B_LSB) -#define GET_IW_F2I16_B(W) (((W) >> IW_F2I16_B_LSB) & IW_F2I16_B_UNSHIFTED_MASK) -#define SET_IW_F2I16_B(V) (((V) & IW_F2I16_B_UNSHIFTED_MASK) << IW_F2I16_B_LSB) - -#define IW_F2I16_IMM16_LSB 16 -#define IW_F2I16_IMM16_SIZE 16 -#define IW_F2I16_IMM16_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2I16_IMM16_SIZE)) -#define IW_F2I16_IMM16_SHIFTED_MASK (IW_F2I16_IMM16_UNSHIFTED_MASK << IW_F2I16_IMM16_LSB) -#define GET_IW_F2I16_IMM16(W) (((W) >> IW_F2I16_IMM16_LSB) & IW_F2I16_IMM16_UNSHIFTED_MASK) -#define SET_IW_F2I16_IMM16(V) (((V) & IW_F2I16_IMM16_UNSHIFTED_MASK) << IW_F2I16_IMM16_LSB) - -/* Common to all three I12-group formats F2X4I12, F1X4I12, F1X4L17. */ -#define IW_I12_X_LSB 28 -#define IW_I12_X_SIZE 4 -#define IW_I12_X_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_I12_X_SIZE)) -#define IW_I12_X_SHIFTED_MASK (IW_I12_X_UNSHIFTED_MASK << IW_I12_X_LSB) -#define GET_IW_I12_X(W) (((W) >> IW_I12_X_LSB) & IW_I12_X_UNSHIFTED_MASK) -#define SET_IW_I12_X(V) (((V) & IW_I12_X_UNSHIFTED_MASK) << IW_I12_X_LSB) - -#define IW_F2X4I12_A_LSB 6 -#define IW_F2X4I12_A_SIZE 5 -#define IW_F2X4I12_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2X4I12_A_SIZE)) -#define IW_F2X4I12_A_SHIFTED_MASK (IW_F2X4I12_A_UNSHIFTED_MASK << IW_F2X4I12_A_LSB) -#define GET_IW_F2X4I12_A(W) (((W) >> IW_F2X4I12_A_LSB) & IW_F2X4I12_A_UNSHIFTED_MASK) -#define SET_IW_F2X4I12_A(V) (((V) & IW_F2X4I12_A_UNSHIFTED_MASK) << IW_F2X4I12_A_LSB) - -#define IW_F2X4I12_B_LSB 11 -#define IW_F2X4I12_B_SIZE 5 -#define IW_F2X4I12_B_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2X4I12_B_SIZE)) -#define IW_F2X4I12_B_SHIFTED_MASK (IW_F2X4I12_B_UNSHIFTED_MASK << IW_F2X4I12_B_LSB) -#define GET_IW_F2X4I12_B(W) (((W) >> IW_F2X4I12_B_LSB) & IW_F2X4I12_B_UNSHIFTED_MASK) -#define SET_IW_F2X4I12_B(V) (((V) & IW_F2X4I12_B_UNSHIFTED_MASK) << IW_F2X4I12_B_LSB) - -#define IW_F2X4I12_IMM12_LSB 16 -#define IW_F2X4I12_IMM12_SIZE 12 -#define IW_F2X4I12_IMM12_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2X4I12_IMM12_SIZE)) -#define IW_F2X4I12_IMM12_SHIFTED_MASK (IW_F2X4I12_IMM12_UNSHIFTED_MASK << IW_F2X4I12_IMM12_LSB) -#define GET_IW_F2X4I12_IMM12(W) (((W) >> IW_F2X4I12_IMM12_LSB) & IW_F2X4I12_IMM12_UNSHIFTED_MASK) -#define SET_IW_F2X4I12_IMM12(V) (((V) & IW_F2X4I12_IMM12_UNSHIFTED_MASK) << IW_F2X4I12_IMM12_LSB) - -#define IW_F1X4I12_A_LSB 6 -#define IW_F1X4I12_A_SIZE 5 -#define IW_F1X4I12_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X4I12_A_SIZE)) -#define IW_F1X4I12_A_SHIFTED_MASK (IW_F1X4I12_A_UNSHIFTED_MASK << IW_F1X4I12_A_LSB) -#define GET_IW_F1X4I12_A(W) (((W) >> IW_F1X4I12_A_LSB) & IW_F1X4I12_A_UNSHIFTED_MASK) -#define SET_IW_F1X4I12_A(V) (((V) & IW_F1X4I12_A_UNSHIFTED_MASK) << IW_F1X4I12_A_LSB) - -#define IW_F1X4I12_X_LSB 11 -#define IW_F1X4I12_X_SIZE 5 -#define IW_F1X4I12_X_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X4I12_X_SIZE)) -#define IW_F1X4I12_X_SHIFTED_MASK (IW_F1X4I12_X_UNSHIFTED_MASK << IW_F1X4I12_X_LSB) -#define GET_IW_F1X4I12_X(W) (((W) >> IW_F1X4I12_X_LSB) & IW_F1X4I12_X_UNSHIFTED_MASK) -#define SET_IW_F1X4I12_X(V) (((V) & IW_F1X4I12_X_UNSHIFTED_MASK) << IW_F1X4I12_X_LSB) - -#define IW_F1X4I12_IMM12_LSB 16 -#define IW_F1X4I12_IMM12_SIZE 12 -#define IW_F1X4I12_IMM12_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X4I12_IMM12_SIZE)) -#define IW_F1X4I12_IMM12_SHIFTED_MASK (IW_F1X4I12_IMM12_UNSHIFTED_MASK << IW_F1X4I12_IMM12_LSB) -#define GET_IW_F1X4I12_IMM12(W) (((W) >> IW_F1X4I12_IMM12_LSB) & IW_F1X4I12_IMM12_UNSHIFTED_MASK) -#define SET_IW_F1X4I12_IMM12(V) (((V) & IW_F1X4I12_IMM12_UNSHIFTED_MASK) << IW_F1X4I12_IMM12_LSB) - -#define IW_F1X4L17_A_LSB 6 -#define IW_F1X4L17_A_SIZE 5 -#define IW_F1X4L17_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X4L17_A_SIZE)) -#define IW_F1X4L17_A_SHIFTED_MASK (IW_F1X4L17_A_UNSHIFTED_MASK << IW_F1X4L17_A_LSB) -#define GET_IW_F1X4L17_A(W) (((W) >> IW_F1X4L17_A_LSB) & IW_F1X4L17_A_UNSHIFTED_MASK) -#define SET_IW_F1X4L17_A(V) (((V) & IW_F1X4L17_A_UNSHIFTED_MASK) << IW_F1X4L17_A_LSB) - -#define IW_F1X4L17_ID_LSB 11 -#define IW_F1X4L17_ID_SIZE 1 -#define IW_F1X4L17_ID_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X4L17_ID_SIZE)) -#define IW_F1X4L17_ID_SHIFTED_MASK (IW_F1X4L17_ID_UNSHIFTED_MASK << IW_F1X4L17_ID_LSB) -#define GET_IW_F1X4L17_ID(W) (((W) >> IW_F1X4L17_ID_LSB) & IW_F1X4L17_ID_UNSHIFTED_MASK) -#define SET_IW_F1X4L17_ID(V) (((V) & IW_F1X4L17_ID_UNSHIFTED_MASK) << IW_F1X4L17_ID_LSB) - -#define IW_F1X4L17_WB_LSB 12 -#define IW_F1X4L17_WB_SIZE 1 -#define IW_F1X4L17_WB_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X4L17_WB_SIZE)) -#define IW_F1X4L17_WB_SHIFTED_MASK (IW_F1X4L17_WB_UNSHIFTED_MASK << IW_F1X4L17_WB_LSB) -#define GET_IW_F1X4L17_WB(W) (((W) >> IW_F1X4L17_WB_LSB) & IW_F1X4L17_WB_UNSHIFTED_MASK) -#define SET_IW_F1X4L17_WB(V) (((V) & IW_F1X4L17_WB_UNSHIFTED_MASK) << IW_F1X4L17_WB_LSB) - -#define IW_F1X4L17_RS_LSB 13 -#define IW_F1X4L17_RS_SIZE 1 -#define IW_F1X4L17_RS_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X4L17_RS_SIZE)) -#define IW_F1X4L17_RS_SHIFTED_MASK (IW_F1X4L17_RS_UNSHIFTED_MASK << IW_F1X4L17_RS_LSB) -#define GET_IW_F1X4L17_RS(W) (((W) >> IW_F1X4L17_RS_LSB) & IW_F1X4L17_RS_UNSHIFTED_MASK) -#define SET_IW_F1X4L17_RS(V) (((V) & IW_F1X4L17_RS_UNSHIFTED_MASK) << IW_F1X4L17_RS_LSB) - -#define IW_F1X4L17_PC_LSB 14 -#define IW_F1X4L17_PC_SIZE 1 -#define IW_F1X4L17_PC_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X4L17_PC_SIZE)) -#define IW_F1X4L17_PC_SHIFTED_MASK (IW_F1X4L17_PC_UNSHIFTED_MASK << IW_F1X4L17_PC_LSB) -#define GET_IW_F1X4L17_PC(W) (((W) >> IW_F1X4L17_PC_LSB) & IW_F1X4L17_PC_UNSHIFTED_MASK) -#define SET_IW_F1X4L17_PC(V) (((V) & IW_F1X4L17_PC_UNSHIFTED_MASK) << IW_F1X4L17_PC_LSB) - -#define IW_F1X4L17_RSV_LSB 15 -#define IW_F1X4L17_RSV_SIZE 1 -#define IW_F1X4L17_RSV_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X4L17_RSV_SIZE)) -#define IW_F1X4L17_RSV_SHIFTED_MASK (IW_F1X4L17_RSV_UNSHIFTED_MASK << IW_F1X4L17_RSV_LSB) -#define GET_IW_F1X4L17_RSV(W) (((W) >> IW_F1X4L17_RSV_LSB) & IW_F1X4L17_RSV_UNSHIFTED_MASK) -#define SET_IW_F1X4L17_RSV(V) (((V) & IW_F1X4L17_RSV_UNSHIFTED_MASK) << IW_F1X4L17_RSV_LSB) - -#define IW_F1X4L17_REGMASK_LSB 16 -#define IW_F1X4L17_REGMASK_SIZE 12 -#define IW_F1X4L17_REGMASK_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X4L17_REGMASK_SIZE)) -#define IW_F1X4L17_REGMASK_SHIFTED_MASK (IW_F1X4L17_REGMASK_UNSHIFTED_MASK << IW_F1X4L17_REGMASK_LSB) -#define GET_IW_F1X4L17_REGMASK(W) (((W) >> IW_F1X4L17_REGMASK_LSB) & IW_F1X4L17_REGMASK_UNSHIFTED_MASK) -#define SET_IW_F1X4L17_REGMASK(V) (((V) & IW_F1X4L17_REGMASK_UNSHIFTED_MASK) << IW_F1X4L17_REGMASK_LSB) - -/* Shared by OPX-group formats F3X6L5, F2X6L10, F3X6. */ -#define IW_OPX_X_LSB 26 -#define IW_OPX_X_SIZE 6 -#define IW_OPX_X_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_OPX_X_SIZE)) -#define IW_OPX_X_SHIFTED_MASK (IW_OPX_X_UNSHIFTED_MASK << IW_OPX_X_LSB) -#define GET_IW_OPX_X(W) (((W) >> IW_OPX_X_LSB) & IW_OPX_X_UNSHIFTED_MASK) -#define SET_IW_OPX_X(V) (((V) & IW_OPX_X_UNSHIFTED_MASK) << IW_OPX_X_LSB) - -/* F3X6L5 accessors are also used for F3X6 formats. */ -#define IW_F3X6L5_A_LSB 6 -#define IW_F3X6L5_A_SIZE 5 -#define IW_F3X6L5_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X6L5_A_SIZE)) -#define IW_F3X6L5_A_SHIFTED_MASK (IW_F3X6L5_A_UNSHIFTED_MASK << IW_F3X6L5_A_LSB) -#define GET_IW_F3X6L5_A(W) (((W) >> IW_F3X6L5_A_LSB) & IW_F3X6L5_A_UNSHIFTED_MASK) -#define SET_IW_F3X6L5_A(V) (((V) & IW_F3X6L5_A_UNSHIFTED_MASK) << IW_F3X6L5_A_LSB) - -#define IW_F3X6L5_B_LSB 11 -#define IW_F3X6L5_B_SIZE 5 -#define IW_F3X6L5_B_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X6L5_B_SIZE)) -#define IW_F3X6L5_B_SHIFTED_MASK (IW_F3X6L5_B_UNSHIFTED_MASK << IW_F3X6L5_B_LSB) -#define GET_IW_F3X6L5_B(W) (((W) >> IW_F3X6L5_B_LSB) & IW_F3X6L5_B_UNSHIFTED_MASK) -#define SET_IW_F3X6L5_B(V) (((V) & IW_F3X6L5_B_UNSHIFTED_MASK) << IW_F3X6L5_B_LSB) - -#define IW_F3X6L5_C_LSB 16 -#define IW_F3X6L5_C_SIZE 5 -#define IW_F3X6L5_C_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X6L5_C_SIZE)) -#define IW_F3X6L5_C_SHIFTED_MASK (IW_F3X6L5_C_UNSHIFTED_MASK << IW_F3X6L5_C_LSB) -#define GET_IW_F3X6L5_C(W) (((W) >> IW_F3X6L5_C_LSB) & IW_F3X6L5_C_UNSHIFTED_MASK) -#define SET_IW_F3X6L5_C(V) (((V) & IW_F3X6L5_C_UNSHIFTED_MASK) << IW_F3X6L5_C_LSB) - -#define IW_F3X6L5_IMM5_LSB 21 -#define IW_F3X6L5_IMM5_SIZE 5 -#define IW_F3X6L5_IMM5_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X6L5_IMM5_SIZE)) -#define IW_F3X6L5_IMM5_SHIFTED_MASK (IW_F3X6L5_IMM5_UNSHIFTED_MASK << IW_F3X6L5_IMM5_LSB) -#define GET_IW_F3X6L5_IMM5(W) (((W) >> IW_F3X6L5_IMM5_LSB) & IW_F3X6L5_IMM5_UNSHIFTED_MASK) -#define SET_IW_F3X6L5_IMM5(V) (((V) & IW_F3X6L5_IMM5_UNSHIFTED_MASK) << IW_F3X6L5_IMM5_LSB) - -#define IW_F2X6L10_A_LSB 6 -#define IW_F2X6L10_A_SIZE 5 -#define IW_F2X6L10_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2X6L10_A_SIZE)) -#define IW_F2X6L10_A_SHIFTED_MASK (IW_F2X6L10_A_UNSHIFTED_MASK << IW_F2X6L10_A_LSB) -#define GET_IW_F2X6L10_A(W) (((W) >> IW_F2X6L10_A_LSB) & IW_F2X6L10_A_UNSHIFTED_MASK) -#define SET_IW_F2X6L10_A(V) (((V) & IW_F2X6L10_A_UNSHIFTED_MASK) << IW_F2X6L10_A_LSB) - -#define IW_F2X6L10_B_LSB 11 -#define IW_F2X6L10_B_SIZE 5 -#define IW_F2X6L10_B_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2X6L10_B_SIZE)) -#define IW_F2X6L10_B_SHIFTED_MASK (IW_F2X6L10_B_UNSHIFTED_MASK << IW_F2X6L10_B_LSB) -#define GET_IW_F2X6L10_B(W) (((W) >> IW_F2X6L10_B_LSB) & IW_F2X6L10_B_UNSHIFTED_MASK) -#define SET_IW_F2X6L10_B(V) (((V) & IW_F2X6L10_B_UNSHIFTED_MASK) << IW_F2X6L10_B_LSB) - -#define IW_F2X6L10_LSB_LSB 16 -#define IW_F2X6L10_LSB_SIZE 5 -#define IW_F2X6L10_LSB_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2X6L10_LSB_SIZE)) -#define IW_F2X6L10_LSB_SHIFTED_MASK (IW_F2X6L10_LSB_UNSHIFTED_MASK << IW_F2X6L10_LSB_LSB) -#define GET_IW_F2X6L10_LSB(W) (((W) >> IW_F2X6L10_LSB_LSB) & IW_F2X6L10_LSB_UNSHIFTED_MASK) -#define SET_IW_F2X6L10_LSB(V) (((V) & IW_F2X6L10_LSB_UNSHIFTED_MASK) << IW_F2X6L10_LSB_LSB) - -#define IW_F2X6L10_MSB_LSB 21 -#define IW_F2X6L10_MSB_SIZE 5 -#define IW_F2X6L10_MSB_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2X6L10_MSB_SIZE)) -#define IW_F2X6L10_MSB_SHIFTED_MASK (IW_F2X6L10_MSB_UNSHIFTED_MASK << IW_F2X6L10_MSB_LSB) -#define GET_IW_F2X6L10_MSB(W) (((W) >> IW_F2X6L10_MSB_LSB) & IW_F2X6L10_MSB_UNSHIFTED_MASK) -#define SET_IW_F2X6L10_MSB(V) (((V) & IW_F2X6L10_MSB_UNSHIFTED_MASK) << IW_F2X6L10_MSB_LSB) - -#define IW_F3X8_A_LSB 6 -#define IW_F3X8_A_SIZE 5 -#define IW_F3X8_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X8_A_SIZE)) -#define IW_F3X8_A_SHIFTED_MASK (IW_F3X8_A_UNSHIFTED_MASK << IW_F3X8_A_LSB) -#define GET_IW_F3X8_A(W) (((W) >> IW_F3X8_A_LSB) & IW_F3X8_A_UNSHIFTED_MASK) -#define SET_IW_F3X8_A(V) (((V) & IW_F3X8_A_UNSHIFTED_MASK) << IW_F3X8_A_LSB) - -#define IW_F3X8_B_LSB 11 -#define IW_F3X8_B_SIZE 5 -#define IW_F3X8_B_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X8_B_SIZE)) -#define IW_F3X8_B_SHIFTED_MASK (IW_F3X8_B_UNSHIFTED_MASK << IW_F3X8_B_LSB) -#define GET_IW_F3X8_B(W) (((W) >> IW_F3X8_B_LSB) & IW_F3X8_B_UNSHIFTED_MASK) -#define SET_IW_F3X8_B(V) (((V) & IW_F3X8_B_UNSHIFTED_MASK) << IW_F3X8_B_LSB) - -#define IW_F3X8_C_LSB 16 -#define IW_F3X8_C_SIZE 5 -#define IW_F3X8_C_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X8_C_SIZE)) -#define IW_F3X8_C_SHIFTED_MASK (IW_F3X8_C_UNSHIFTED_MASK << IW_F3X8_C_LSB) -#define GET_IW_F3X8_C(W) (((W) >> IW_F3X8_C_LSB) & IW_F3X8_C_UNSHIFTED_MASK) -#define SET_IW_F3X8_C(V) (((V) & IW_F3X8_C_UNSHIFTED_MASK) << IW_F3X8_C_LSB) - -#define IW_F3X8_READA_LSB 21 -#define IW_F3X8_READA_SIZE 1 -#define IW_F3X8_READA_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X8_READA_SIZE)) -#define IW_F3X8_READA_SHIFTED_MASK (IW_F3X8_READA_UNSHIFTED_MASK << IW_F3X8_READA_LSB) -#define GET_IW_F3X8_READA(W) (((W) >> IW_F3X8_READA_LSB) & IW_F3X8_READA_UNSHIFTED_MASK) -#define SET_IW_F3X8_READA(V) (((V) & IW_F3X8_READA_UNSHIFTED_MASK) << IW_F3X8_READA_LSB) - -#define IW_F3X8_READB_LSB 22 -#define IW_F3X8_READB_SIZE 1 -#define IW_F3X8_READB_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X8_READB_SIZE)) -#define IW_F3X8_READB_SHIFTED_MASK (IW_F3X8_READB_UNSHIFTED_MASK << IW_F3X8_READB_LSB) -#define GET_IW_F3X8_READB(W) (((W) >> IW_F3X8_READB_LSB) & IW_F3X8_READB_UNSHIFTED_MASK) -#define SET_IW_F3X8_READB(V) (((V) & IW_F3X8_READB_UNSHIFTED_MASK) << IW_F3X8_READB_LSB) - -#define IW_F3X8_READC_LSB 23 -#define IW_F3X8_READC_SIZE 1 -#define IW_F3X8_READC_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X8_READC_SIZE)) -#define IW_F3X8_READC_SHIFTED_MASK (IW_F3X8_READC_UNSHIFTED_MASK << IW_F3X8_READC_LSB) -#define GET_IW_F3X8_READC(W) (((W) >> IW_F3X8_READC_LSB) & IW_F3X8_READC_UNSHIFTED_MASK) -#define SET_IW_F3X8_READC(V) (((V) & IW_F3X8_READC_UNSHIFTED_MASK) << IW_F3X8_READC_LSB) - -#define IW_F3X8_N_LSB 24 -#define IW_F3X8_N_SIZE 8 -#define IW_F3X8_N_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F3X8_N_SIZE)) -#define IW_F3X8_N_SHIFTED_MASK (IW_F3X8_N_UNSHIFTED_MASK << IW_F3X8_N_LSB) -#define GET_IW_F3X8_N(W) (((W) >> IW_F3X8_N_LSB) & IW_F3X8_N_UNSHIFTED_MASK) -#define SET_IW_F3X8_N(V) (((V) & IW_F3X8_N_UNSHIFTED_MASK) << IW_F3X8_N_LSB) - -/* 16-bit R2 fields. */ - -#define IW_I10_IMM10_LSB 6 -#define IW_I10_IMM10_SIZE 10 -#define IW_I10_IMM10_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_I10_IMM10_SIZE)) -#define IW_I10_IMM10_SHIFTED_MASK (IW_I10_IMM10_UNSHIFTED_MASK << IW_I10_IMM10_LSB) -#define GET_IW_I10_IMM10(W) (((W) >> IW_I10_IMM10_LSB) & IW_I10_IMM10_UNSHIFTED_MASK) -#define SET_IW_I10_IMM10(V) (((V) & IW_I10_IMM10_UNSHIFTED_MASK) << IW_I10_IMM10_LSB) - -#define IW_T1I7_A3_LSB 6 -#define IW_T1I7_A3_SIZE 3 -#define IW_T1I7_A3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T1I7_A3_SIZE)) -#define IW_T1I7_A3_SHIFTED_MASK (IW_T1I7_A3_UNSHIFTED_MASK << IW_T1I7_A3_LSB) -#define GET_IW_T1I7_A3(W) (((W) >> IW_T1I7_A3_LSB) & IW_T1I7_A3_UNSHIFTED_MASK) -#define SET_IW_T1I7_A3(V) (((V) & IW_T1I7_A3_UNSHIFTED_MASK) << IW_T1I7_A3_LSB) - -#define IW_T1I7_IMM7_LSB 9 -#define IW_T1I7_IMM7_SIZE 7 -#define IW_T1I7_IMM7_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T1I7_IMM7_SIZE)) -#define IW_T1I7_IMM7_SHIFTED_MASK (IW_T1I7_IMM7_UNSHIFTED_MASK << IW_T1I7_IMM7_LSB) -#define GET_IW_T1I7_IMM7(W) (((W) >> IW_T1I7_IMM7_LSB) & IW_T1I7_IMM7_UNSHIFTED_MASK) -#define SET_IW_T1I7_IMM7(V) (((V) & IW_T1I7_IMM7_UNSHIFTED_MASK) << IW_T1I7_IMM7_LSB) - -#define IW_T2I4_A3_LSB 6 -#define IW_T2I4_A3_SIZE 3 -#define IW_T2I4_A3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2I4_A3_SIZE)) -#define IW_T2I4_A3_SHIFTED_MASK (IW_T2I4_A3_UNSHIFTED_MASK << IW_T2I4_A3_LSB) -#define GET_IW_T2I4_A3(W) (((W) >> IW_T2I4_A3_LSB) & IW_T2I4_A3_UNSHIFTED_MASK) -#define SET_IW_T2I4_A3(V) (((V) & IW_T2I4_A3_UNSHIFTED_MASK) << IW_T2I4_A3_LSB) - -#define IW_T2I4_B3_LSB 9 -#define IW_T2I4_B3_SIZE 3 -#define IW_T2I4_B3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2I4_B3_SIZE)) -#define IW_T2I4_B3_SHIFTED_MASK (IW_T2I4_B3_UNSHIFTED_MASK << IW_T2I4_B3_LSB) -#define GET_IW_T2I4_B3(W) (((W) >> IW_T2I4_B3_LSB) & IW_T2I4_B3_UNSHIFTED_MASK) -#define SET_IW_T2I4_B3(V) (((V) & IW_T2I4_B3_UNSHIFTED_MASK) << IW_T2I4_B3_LSB) - -#define IW_T2I4_IMM4_LSB 12 -#define IW_T2I4_IMM4_SIZE 4 -#define IW_T2I4_IMM4_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2I4_IMM4_SIZE)) -#define IW_T2I4_IMM4_SHIFTED_MASK (IW_T2I4_IMM4_UNSHIFTED_MASK << IW_T2I4_IMM4_LSB) -#define GET_IW_T2I4_IMM4(W) (((W) >> IW_T2I4_IMM4_LSB) & IW_T2I4_IMM4_UNSHIFTED_MASK) -#define SET_IW_T2I4_IMM4(V) (((V) & IW_T2I4_IMM4_UNSHIFTED_MASK) << IW_T2I4_IMM4_LSB) - -#define IW_T1X1I6_A3_LSB 6 -#define IW_T1X1I6_A3_SIZE 3 -#define IW_T1X1I6_A3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T1X1I6_A3_SIZE)) -#define IW_T1X1I6_A3_SHIFTED_MASK (IW_T1X1I6_A3_UNSHIFTED_MASK << IW_T1X1I6_A3_LSB) -#define GET_IW_T1X1I6_A3(W) (((W) >> IW_T1X1I6_A3_LSB) & IW_T1X1I6_A3_UNSHIFTED_MASK) -#define SET_IW_T1X1I6_A3(V) (((V) & IW_T1X1I6_A3_UNSHIFTED_MASK) << IW_T1X1I6_A3_LSB) - -#define IW_T1X1I6_IMM6_LSB 9 -#define IW_T1X1I6_IMM6_SIZE 6 -#define IW_T1X1I6_IMM6_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T1X1I6_IMM6_SIZE)) -#define IW_T1X1I6_IMM6_SHIFTED_MASK (IW_T1X1I6_IMM6_UNSHIFTED_MASK << IW_T1X1I6_IMM6_LSB) -#define GET_IW_T1X1I6_IMM6(W) (((W) >> IW_T1X1I6_IMM6_LSB) & IW_T1X1I6_IMM6_UNSHIFTED_MASK) -#define SET_IW_T1X1I6_IMM6(V) (((V) & IW_T1X1I6_IMM6_UNSHIFTED_MASK) << IW_T1X1I6_IMM6_LSB) - -#define IW_T1X1I6_X_LSB 15 -#define IW_T1X1I6_X_SIZE 1 -#define IW_T1X1I6_X_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T1X1I6_X_SIZE)) -#define IW_T1X1I6_X_SHIFTED_MASK (IW_T1X1I6_X_UNSHIFTED_MASK << IW_T1X1I6_X_LSB) -#define GET_IW_T1X1I6_X(W) (((W) >> IW_T1X1I6_X_LSB) & IW_T1X1I6_X_UNSHIFTED_MASK) -#define SET_IW_T1X1I6_X(V) (((V) & IW_T1X1I6_X_UNSHIFTED_MASK) << IW_T1X1I6_X_LSB) - -#define IW_X1I7_IMM7_LSB 6 -#define IW_X1I7_IMM7_SIZE 7 -#define IW_X1I7_IMM7_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_X1I7_IMM7_SIZE)) -#define IW_X1I7_IMM7_SHIFTED_MASK (IW_X1I7_IMM7_UNSHIFTED_MASK << IW_X1I7_IMM7_LSB) -#define GET_IW_X1I7_IMM7(W) (((W) >> IW_X1I7_IMM7_LSB) & IW_X1I7_IMM7_UNSHIFTED_MASK) -#define SET_IW_X1I7_IMM7(V) (((V) & IW_X1I7_IMM7_UNSHIFTED_MASK) << IW_X1I7_IMM7_LSB) - -#define IW_X1I7_RSV_LSB 13 -#define IW_X1I7_RSV_SIZE 2 -#define IW_X1I7_RSV_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_X1I7_RSV_SIZE)) -#define IW_X1I7_RSV_SHIFTED_MASK (IW_X1I7_RSV_UNSHIFTED_MASK << IW_X1I7_RSV_LSB) -#define GET_IW_X1I7_RSV(W) (((W) >> IW_X1I7_RSV_LSB) & IW_X1I7_RSV_UNSHIFTED_MASK) -#define SET_IW_X1I7_RSV(V) (((V) & IW_X1I7_RSV_UNSHIFTED_MASK) << IW_X1I7_RSV_LSB) - -#define IW_X1I7_X_LSB 15 -#define IW_X1I7_X_SIZE 1 -#define IW_X1I7_X_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_X1I7_X_SIZE)) -#define IW_X1I7_X_SHIFTED_MASK (IW_X1I7_X_UNSHIFTED_MASK << IW_X1I7_X_LSB) -#define GET_IW_X1I7_X(W) (((W) >> IW_X1I7_X_LSB) & IW_X1I7_X_UNSHIFTED_MASK) -#define SET_IW_X1I7_X(V) (((V) & IW_X1I7_X_UNSHIFTED_MASK) << IW_X1I7_X_LSB) - -#define IW_L5I4X1_IMM4_LSB 6 -#define IW_L5I4X1_IMM4_SIZE 4 -#define IW_L5I4X1_IMM4_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_L5I4X1_IMM4_SIZE)) -#define IW_L5I4X1_IMM4_SHIFTED_MASK (IW_L5I4X1_IMM4_UNSHIFTED_MASK << IW_L5I4X1_IMM4_LSB) -#define GET_IW_L5I4X1_IMM4(W) (((W) >> IW_L5I4X1_IMM4_LSB) & IW_L5I4X1_IMM4_UNSHIFTED_MASK) -#define SET_IW_L5I4X1_IMM4(V) (((V) & IW_L5I4X1_IMM4_UNSHIFTED_MASK) << IW_L5I4X1_IMM4_LSB) - -#define IW_L5I4X1_REGRANGE_LSB 10 -#define IW_L5I4X1_REGRANGE_SIZE 3 -#define IW_L5I4X1_REGRANGE_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_L5I4X1_REGRANGE_SIZE)) -#define IW_L5I4X1_REGRANGE_SHIFTED_MASK (IW_L5I4X1_REGRANGE_UNSHIFTED_MASK << IW_L5I4X1_REGRANGE_LSB) -#define GET_IW_L5I4X1_REGRANGE(W) (((W) >> IW_L5I4X1_REGRANGE_LSB) & IW_L5I4X1_REGRANGE_UNSHIFTED_MASK) -#define SET_IW_L5I4X1_REGRANGE(V) (((V) & IW_L5I4X1_REGRANGE_UNSHIFTED_MASK) << IW_L5I4X1_REGRANGE_LSB) - -#define IW_L5I4X1_FP_LSB 13 -#define IW_L5I4X1_FP_SIZE 1 -#define IW_L5I4X1_FP_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_L5I4X1_FP_SIZE)) -#define IW_L5I4X1_FP_SHIFTED_MASK (IW_L5I4X1_FP_UNSHIFTED_MASK << IW_L5I4X1_FP_LSB) -#define GET_IW_L5I4X1_FP(W) (((W) >> IW_L5I4X1_FP_LSB) & IW_L5I4X1_FP_UNSHIFTED_MASK) -#define SET_IW_L5I4X1_FP(V) (((V) & IW_L5I4X1_FP_UNSHIFTED_MASK) << IW_L5I4X1_FP_LSB) - -#define IW_L5I4X1_CS_LSB 14 -#define IW_L5I4X1_CS_SIZE 1 -#define IW_L5I4X1_CS_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_L5I4X1_CS_SIZE)) -#define IW_L5I4X1_CS_SHIFTED_MASK (IW_L5I4X1_CS_UNSHIFTED_MASK << IW_L5I4X1_CS_LSB) -#define GET_IW_L5I4X1_CS(W) (((W) >> IW_L5I4X1_CS_LSB) & IW_L5I4X1_CS_UNSHIFTED_MASK) -#define SET_IW_L5I4X1_CS(V) (((V) & IW_L5I4X1_CS_UNSHIFTED_MASK) << IW_L5I4X1_CS_LSB) - -#define IW_L5I4X1_X_LSB 15 -#define IW_L5I4X1_X_SIZE 1 -#define IW_L5I4X1_X_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_L5I4X1_X_SIZE)) -#define IW_L5I4X1_X_SHIFTED_MASK (IW_L5I4X1_X_UNSHIFTED_MASK << IW_L5I4X1_X_LSB) -#define GET_IW_L5I4X1_X(W) (((W) >> IW_L5I4X1_X_LSB) & IW_L5I4X1_X_UNSHIFTED_MASK) -#define SET_IW_L5I4X1_X(V) (((V) & IW_L5I4X1_X_UNSHIFTED_MASK) << IW_L5I4X1_X_LSB) - -#define IW_T2X1L3_A3_LSB 6 -#define IW_T2X1L3_A3_SIZE 3 -#define IW_T2X1L3_A3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2X1L3_A3_SIZE)) -#define IW_T2X1L3_A3_SHIFTED_MASK (IW_T2X1L3_A3_UNSHIFTED_MASK << IW_T2X1L3_A3_LSB) -#define GET_IW_T2X1L3_A3(W) (((W) >> IW_T2X1L3_A3_LSB) & IW_T2X1L3_A3_UNSHIFTED_MASK) -#define SET_IW_T2X1L3_A3(V) (((V) & IW_T2X1L3_A3_UNSHIFTED_MASK) << IW_T2X1L3_A3_LSB) - -#define IW_T2X1L3_B3_LSB 9 -#define IW_T2X1L3_B3_SIZE 3 -#define IW_T2X1L3_B3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2X1L3_B3_SIZE)) -#define IW_T2X1L3_B3_SHIFTED_MASK (IW_T2X1L3_B3_UNSHIFTED_MASK << IW_T2X1L3_B3_LSB) -#define GET_IW_T2X1L3_B3(W) (((W) >> IW_T2X1L3_B3_LSB) & IW_T2X1L3_B3_UNSHIFTED_MASK) -#define SET_IW_T2X1L3_B3(V) (((V) & IW_T2X1L3_B3_UNSHIFTED_MASK) << IW_T2X1L3_B3_LSB) - -#define IW_T2X1L3_SHAMT_LSB 12 -#define IW_T2X1L3_SHAMT_SIZE 3 -#define IW_T2X1L3_SHAMT_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2X1L3_SHAMT_SIZE)) -#define IW_T2X1L3_SHAMT_SHIFTED_MASK (IW_T2X1L3_SHAMT_UNSHIFTED_MASK << IW_T2X1L3_SHAMT_LSB) -#define GET_IW_T2X1L3_SHAMT(W) (((W) >> IW_T2X1L3_SHAMT_LSB) & IW_T2X1L3_SHAMT_UNSHIFTED_MASK) -#define SET_IW_T2X1L3_SHAMT(V) (((V) & IW_T2X1L3_SHAMT_UNSHIFTED_MASK) << IW_T2X1L3_SHAMT_LSB) - -#define IW_T2X1L3_X_LSB 15 -#define IW_T2X1L3_X_SIZE 1 -#define IW_T2X1L3_X_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2X1L3_X_SIZE)) -#define IW_T2X1L3_X_SHIFTED_MASK (IW_T2X1L3_X_UNSHIFTED_MASK << IW_T2X1L3_X_LSB) -#define GET_IW_T2X1L3_X(W) (((W) >> IW_T2X1L3_X_LSB) & IW_T2X1L3_X_UNSHIFTED_MASK) -#define SET_IW_T2X1L3_X(V) (((V) & IW_T2X1L3_X_UNSHIFTED_MASK) << IW_T2X1L3_X_LSB) - -#define IW_T2X1I3_A3_LSB 6 -#define IW_T2X1I3_A3_SIZE 3 -#define IW_T2X1I3_A3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2X1I3_A3_SIZE)) -#define IW_T2X1I3_A3_SHIFTED_MASK (IW_T2X1I3_A3_UNSHIFTED_MASK << IW_T2X1I3_A3_LSB) -#define GET_IW_T2X1I3_A3(W) (((W) >> IW_T2X1I3_A3_LSB) & IW_T2X1I3_A3_UNSHIFTED_MASK) -#define SET_IW_T2X1I3_A3(V) (((V) & IW_T2X1I3_A3_UNSHIFTED_MASK) << IW_T2X1I3_A3_LSB) - -#define IW_T2X1I3_B3_LSB 9 -#define IW_T2X1I3_B3_SIZE 3 -#define IW_T2X1I3_B3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2X1I3_B3_SIZE)) -#define IW_T2X1I3_B3_SHIFTED_MASK (IW_T2X1I3_B3_UNSHIFTED_MASK << IW_T2X1I3_B3_LSB) -#define GET_IW_T2X1I3_B3(W) (((W) >> IW_T2X1I3_B3_LSB) & IW_T2X1I3_B3_UNSHIFTED_MASK) -#define SET_IW_T2X1I3_B3(V) (((V) & IW_T2X1I3_B3_UNSHIFTED_MASK) << IW_T2X1I3_B3_LSB) - -#define IW_T2X1I3_IMM3_LSB 12 -#define IW_T2X1I3_IMM3_SIZE 3 -#define IW_T2X1I3_IMM3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2X1I3_IMM3_SIZE)) -#define IW_T2X1I3_IMM3_SHIFTED_MASK (IW_T2X1I3_IMM3_UNSHIFTED_MASK << IW_T2X1I3_IMM3_LSB) -#define GET_IW_T2X1I3_IMM3(W) (((W) >> IW_T2X1I3_IMM3_LSB) & IW_T2X1I3_IMM3_UNSHIFTED_MASK) -#define SET_IW_T2X1I3_IMM3(V) (((V) & IW_T2X1I3_IMM3_UNSHIFTED_MASK) << IW_T2X1I3_IMM3_LSB) - -#define IW_T2X1I3_X_LSB 15 -#define IW_T2X1I3_X_SIZE 1 -#define IW_T2X1I3_X_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2X1I3_X_SIZE)) -#define IW_T2X1I3_X_SHIFTED_MASK (IW_T2X1I3_X_UNSHIFTED_MASK << IW_T2X1I3_X_LSB) -#define GET_IW_T2X1I3_X(W) (((W) >> IW_T2X1I3_X_LSB) & IW_T2X1I3_X_UNSHIFTED_MASK) -#define SET_IW_T2X1I3_X(V) (((V) & IW_T2X1I3_X_UNSHIFTED_MASK) << IW_T2X1I3_X_LSB) - -#define IW_T3X1_A3_LSB 6 -#define IW_T3X1_A3_SIZE 3 -#define IW_T3X1_A3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T3X1_A3_SIZE)) -#define IW_T3X1_A3_SHIFTED_MASK (IW_T3X1_A3_UNSHIFTED_MASK << IW_T3X1_A3_LSB) -#define GET_IW_T3X1_A3(W) (((W) >> IW_T3X1_A3_LSB) & IW_T3X1_A3_UNSHIFTED_MASK) -#define SET_IW_T3X1_A3(V) (((V) & IW_T3X1_A3_UNSHIFTED_MASK) << IW_T3X1_A3_LSB) - -#define IW_T3X1_B3_LSB 9 -#define IW_T3X1_B3_SIZE 3 -#define IW_T3X1_B3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T3X1_B3_SIZE)) -#define IW_T3X1_B3_SHIFTED_MASK (IW_T3X1_B3_UNSHIFTED_MASK << IW_T3X1_B3_LSB) -#define GET_IW_T3X1_B3(W) (((W) >> IW_T3X1_B3_LSB) & IW_T3X1_B3_UNSHIFTED_MASK) -#define SET_IW_T3X1_B3(V) (((V) & IW_T3X1_B3_UNSHIFTED_MASK) << IW_T3X1_B3_LSB) - -#define IW_T3X1_C3_LSB 12 -#define IW_T3X1_C3_SIZE 3 -#define IW_T3X1_C3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T3X1_C3_SIZE)) -#define IW_T3X1_C3_SHIFTED_MASK (IW_T3X1_C3_UNSHIFTED_MASK << IW_T3X1_C3_LSB) -#define GET_IW_T3X1_C3(W) (((W) >> IW_T3X1_C3_LSB) & IW_T3X1_C3_UNSHIFTED_MASK) -#define SET_IW_T3X1_C3(V) (((V) & IW_T3X1_C3_UNSHIFTED_MASK) << IW_T3X1_C3_LSB) - -#define IW_T3X1_X_LSB 15 -#define IW_T3X1_X_SIZE 1 -#define IW_T3X1_X_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T3X1_X_SIZE)) -#define IW_T3X1_X_SHIFTED_MASK (IW_T3X1_X_UNSHIFTED_MASK << IW_T3X1_X_LSB) -#define GET_IW_T3X1_X(W) (((W) >> IW_T3X1_X_LSB) & IW_T3X1_X_UNSHIFTED_MASK) -#define SET_IW_T3X1_X(V) (((V) & IW_T3X1_X_UNSHIFTED_MASK) << IW_T3X1_X_LSB) - -/* The X field for all three R.N-class instruction formats is represented - here as 4 bits, including the bits defined as constant 0 or 1 that - determine which of the formats T2X3, F1X1, or X2L5 it is. */ -#define IW_R_N_X_LSB 12 -#define IW_R_N_X_SIZE 4 -#define IW_R_N_X_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_R_N_X_SIZE)) -#define IW_R_N_X_SHIFTED_MASK (IW_R_N_X_UNSHIFTED_MASK << IW_R_N_X_LSB) -#define GET_IW_R_N_X(W) (((W) >> IW_R_N_X_LSB) & IW_R_N_X_UNSHIFTED_MASK) -#define SET_IW_R_N_X(V) (((V) & IW_R_N_X_UNSHIFTED_MASK) << IW_R_N_X_LSB) - -#define IW_T2X3_A3_LSB 6 -#define IW_T2X3_A3_SIZE 3 -#define IW_T2X3_A3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2X3_A3_SIZE)) -#define IW_T2X3_A3_SHIFTED_MASK (IW_T2X3_A3_UNSHIFTED_MASK << IW_T2X3_A3_LSB) -#define GET_IW_T2X3_A3(W) (((W) >> IW_T2X3_A3_LSB) & IW_T2X3_A3_UNSHIFTED_MASK) -#define SET_IW_T2X3_A3(V) (((V) & IW_T2X3_A3_UNSHIFTED_MASK) << IW_T2X3_A3_LSB) - -#define IW_T2X3_B3_LSB 9 -#define IW_T2X3_B3_SIZE 3 -#define IW_T2X3_B3_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_T2X3_B3_SIZE)) -#define IW_T2X3_B3_SHIFTED_MASK (IW_T2X3_B3_UNSHIFTED_MASK << IW_T2X3_B3_LSB) -#define GET_IW_T2X3_B3(W) (((W) >> IW_T2X3_B3_LSB) & IW_T2X3_B3_UNSHIFTED_MASK) -#define SET_IW_T2X3_B3(V) (((V) & IW_T2X3_B3_UNSHIFTED_MASK) << IW_T2X3_B3_LSB) - -#define IW_F1X1_A_LSB 6 -#define IW_F1X1_A_SIZE 5 -#define IW_F1X1_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X1_A_SIZE)) -#define IW_F1X1_A_SHIFTED_MASK (IW_F1X1_A_UNSHIFTED_MASK << IW_F1X1_A_LSB) -#define GET_IW_F1X1_A(W) (((W) >> IW_F1X1_A_LSB) & IW_F1X1_A_UNSHIFTED_MASK) -#define SET_IW_F1X1_A(V) (((V) & IW_F1X1_A_UNSHIFTED_MASK) << IW_F1X1_A_LSB) - -#define IW_F1X1_RSV_LSB 11 -#define IW_F1X1_RSV_SIZE 1 -#define IW_F1X1_RSV_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1X1_RSV_SIZE)) -#define IW_F1X1_RSV_SHIFTED_MASK (IW_F1X1_RSV_UNSHIFTED_MASK << IW_F1X1_RSV_LSB) -#define GET_IW_F1X1_RSV(W) (((W) >> IW_F1X1_RSV_LSB) & IW_F1X1_RSV_UNSHIFTED_MASK) -#define SET_IW_F1X1_RSV(V) (((V) & IW_F1X1_RSV_UNSHIFTED_MASK) << IW_F1X1_RSV_LSB) - -#define IW_X2L5_IMM5_LSB 6 -#define IW_X2L5_IMM5_SIZE 5 -#define IW_X2L5_IMM5_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_X2L5_IMM5_SIZE)) -#define IW_X2L5_IMM5_SHIFTED_MASK (IW_X2L5_IMM5_UNSHIFTED_MASK << IW_X2L5_IMM5_LSB) -#define GET_IW_X2L5_IMM5(W) (((W) >> IW_X2L5_IMM5_LSB) & IW_X2L5_IMM5_UNSHIFTED_MASK) -#define SET_IW_X2L5_IMM5(V) (((V) & IW_X2L5_IMM5_UNSHIFTED_MASK) << IW_X2L5_IMM5_LSB) - -#define IW_X2L5_RSV_LSB 11 -#define IW_X2L5_RSV_SIZE 1 -#define IW_X2L5_RSV_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_X2L5_RSV_SIZE)) -#define IW_X2L5_RSV_SHIFTED_MASK (IW_X2L5_RSV_UNSHIFTED_MASK << IW_X2L5_RSV_LSB) -#define GET_IW_X2L5_RSV(W) (((W) >> IW_X2L5_RSV_LSB) & IW_X2L5_RSV_UNSHIFTED_MASK) -#define SET_IW_X2L5_RSV(V) (((V) & IW_X2L5_RSV_UNSHIFTED_MASK) << IW_X2L5_RSV_LSB) - -#define IW_F1I5_IMM5_LSB 6 -#define IW_F1I5_IMM5_SIZE 5 -#define IW_F1I5_IMM5_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1I5_IMM5_SIZE)) -#define IW_F1I5_IMM5_SHIFTED_MASK (IW_F1I5_IMM5_UNSHIFTED_MASK << IW_F1I5_IMM5_LSB) -#define GET_IW_F1I5_IMM5(W) (((W) >> IW_F1I5_IMM5_LSB) & IW_F1I5_IMM5_UNSHIFTED_MASK) -#define SET_IW_F1I5_IMM5(V) (((V) & IW_F1I5_IMM5_UNSHIFTED_MASK) << IW_F1I5_IMM5_LSB) - -#define IW_F1I5_B_LSB 11 -#define IW_F1I5_B_SIZE 5 -#define IW_F1I5_B_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F1I5_B_SIZE)) -#define IW_F1I5_B_SHIFTED_MASK (IW_F1I5_B_UNSHIFTED_MASK << IW_F1I5_B_LSB) -#define GET_IW_F1I5_B(W) (((W) >> IW_F1I5_B_LSB) & IW_F1I5_B_UNSHIFTED_MASK) -#define SET_IW_F1I5_B(V) (((V) & IW_F1I5_B_UNSHIFTED_MASK) << IW_F1I5_B_LSB) - -#define IW_F2_A_LSB 6 -#define IW_F2_A_SIZE 5 -#define IW_F2_A_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2_A_SIZE)) -#define IW_F2_A_SHIFTED_MASK (IW_F2_A_UNSHIFTED_MASK << IW_F2_A_LSB) -#define GET_IW_F2_A(W) (((W) >> IW_F2_A_LSB) & IW_F2_A_UNSHIFTED_MASK) -#define SET_IW_F2_A(V) (((V) & IW_F2_A_UNSHIFTED_MASK) << IW_F2_A_LSB) - -#define IW_F2_B_LSB 11 -#define IW_F2_B_SIZE 5 -#define IW_F2_B_UNSHIFTED_MASK (0xffffffffu >> (32 - IW_F2_B_SIZE)) -#define IW_F2_B_SHIFTED_MASK (IW_F2_B_UNSHIFTED_MASK << IW_F2_B_LSB) -#define GET_IW_F2_B(W) (((W) >> IW_F2_B_LSB) & IW_F2_B_UNSHIFTED_MASK) -#define SET_IW_F2_B(V) (((V) & IW_F2_B_UNSHIFTED_MASK) << IW_F2_B_LSB) - -/* R2 opcodes. */ -#define R2_OP_CALL 0 -#define R2_OP_AS_N 1 -#define R2_OP_BR 2 -#define R2_OP_BR_N 3 -#define R2_OP_ADDI 4 -#define R2_OP_LDBU_N 5 -#define R2_OP_LDBU 6 -#define R2_OP_LDB 7 -#define R2_OP_JMPI 8 -#define R2_OP_R_N 9 -#define R2_OP_ANDI_N 11 -#define R2_OP_ANDI 12 -#define R2_OP_LDHU_N 13 -#define R2_OP_LDHU 14 -#define R2_OP_LDH 15 -#define R2_OP_ASI_N 17 -#define R2_OP_BGE 18 -#define R2_OP_LDWSP_N 19 -#define R2_OP_ORI 20 -#define R2_OP_LDW_N 21 -#define R2_OP_CMPGEI 22 -#define R2_OP_LDW 23 -#define R2_OP_SHI_N 25 -#define R2_OP_BLT 26 -#define R2_OP_MOVI_N 27 -#define R2_OP_XORI 28 -#define R2_OP_STZ_N 29 -#define R2_OP_CMPLTI 30 -#define R2_OP_ANDCI 31 -#define R2_OP_OPX 32 -#define R2_OP_PP_N 33 -#define R2_OP_BNE 34 -#define R2_OP_BNEZ_N 35 -#define R2_OP_MULI 36 -#define R2_OP_STB_N 37 -#define R2_OP_CMPNEI 38 -#define R2_OP_STB 39 -#define R2_OP_I12 40 -#define R2_OP_SPI_N 41 -#define R2_OP_BEQ 42 -#define R2_OP_BEQZ_N 43 -#define R2_OP_ANDHI 44 -#define R2_OP_STH_N 45 -#define R2_OP_CMPEQI 46 -#define R2_OP_STH 47 -#define R2_OP_CUSTOM 48 -#define R2_OP_BGEU 50 -#define R2_OP_STWSP_N 51 -#define R2_OP_ORHI 52 -#define R2_OP_STW_N 53 -#define R2_OP_CMPGEUI 54 -#define R2_OP_STW 55 -#define R2_OP_BLTU 58 -#define R2_OP_MOV_N 59 -#define R2_OP_XORHI 60 -#define R2_OP_SPADDI_N 61 -#define R2_OP_CMPLTUI 62 -#define R2_OP_ANDCHI 63 - -#define R2_OPX_WRPIE 0 -#define R2_OPX_ERET 1 -#define R2_OPX_ROLI 2 -#define R2_OPX_ROL 3 -#define R2_OPX_FLUSHP 4 -#define R2_OPX_RET 5 -#define R2_OPX_NOR 6 -#define R2_OPX_MULXUU 7 -#define R2_OPX_ENI 8 -#define R2_OPX_BRET 9 -#define R2_OPX_ROR 11 -#define R2_OPX_FLUSHI 12 -#define R2_OPX_JMP 13 -#define R2_OPX_AND 14 -#define R2_OPX_CMPGE 16 -#define R2_OPX_SLLI 18 -#define R2_OPX_SLL 19 -#define R2_OPX_WRPRS 20 -#define R2_OPX_OR 22 -#define R2_OPX_MULXSU 23 -#define R2_OPX_CMPLT 24 -#define R2_OPX_SRLI 26 -#define R2_OPX_SRL 27 -#define R2_OPX_NEXTPC 28 -#define R2_OPX_CALLR 29 -#define R2_OPX_XOR 30 -#define R2_OPX_MULXSS 31 -#define R2_OPX_CMPNE 32 -#define R2_OPX_INSERT 35 -#define R2_OPX_DIVU 36 -#define R2_OPX_DIV 37 -#define R2_OPX_RDCTL 38 -#define R2_OPX_MUL 39 -#define R2_OPX_CMPEQ 40 -#define R2_OPX_INITI 41 -#define R2_OPX_MERGE 43 -#define R2_OPX_HBREAK 44 -#define R2_OPX_TRAP 45 -#define R2_OPX_WRCTL 46 -#define R2_OPX_CMPGEU 48 -#define R2_OPX_ADD 49 -#define R2_OPX_EXTRACT 51 -#define R2_OPX_BREAK 52 -#define R2_OPX_LDEX 53 -#define R2_OPX_SYNC 54 -#define R2_OPX_LDSEX 55 -#define R2_OPX_CMPLTU 56 -#define R2_OPX_SUB 57 -#define R2_OPX_SRAI 58 -#define R2_OPX_SRA 59 -#define R2_OPX_STEX 61 -#define R2_OPX_STSEX 63 - -#define R2_I12_LDBIO 0 -#define R2_I12_STBIO 1 -#define R2_I12_LDBUIO 2 -#define R2_I12_DCACHE 3 -#define R2_I12_LDHIO 4 -#define R2_I12_STHIO 5 -#define R2_I12_LDHUIO 6 -#define R2_I12_RDPRS 7 -#define R2_I12_LDWIO 8 -#define R2_I12_STWIO 9 -#define R2_I12_LDWM 12 -#define R2_I12_STWM 13 - -#define R2_DCACHE_INITD 0 -#define R2_DCACHE_INITDA 1 -#define R2_DCACHE_FLUSHD 2 -#define R2_DCACHE_FLUSHDA 3 - -#define R2_AS_N_ADD_N 0 -#define R2_AS_N_SUB_N 1 - -#define R2_R_N_AND_N 0 -#define R2_R_N_OR_N 2 -#define R2_R_N_XOR_N 3 -#define R2_R_N_SLL_N 4 -#define R2_R_N_SRL_N 5 -#define R2_R_N_NOT_N 6 -#define R2_R_N_NEG_N 7 -#define R2_R_N_CALLR_N 8 -#define R2_R_N_JMPR_N 10 -#define R2_R_N_BREAK_N 12 -#define R2_R_N_TRAP_N 13 -#define R2_R_N_RET_N 14 - -#define R2_SPI_N_SPINCI_N 0 -#define R2_SPI_N_SPDECI_N 1 - -#define R2_ASI_N_ADDI_N 0 -#define R2_ASI_N_SUBI_N 1 - -#define R2_SHI_N_SLLI_N 0 -#define R2_SHI_N_SRLI_N 1 - -#define R2_PP_N_POP_N 0 -#define R2_PP_N_PUSH_N 1 - -#define R2_STZ_N_STWZ_N 0 -#define R2_STZ_N_STBZ_N 1 - -/* Convenience macros for R2 encodings. */ - -#define MATCH_R2_OP(NAME) \ - (SET_IW_R2_OP (R2_OP_##NAME)) -#define MASK_R2_OP \ - IW_R2_OP_SHIFTED_MASK - -#define MATCH_R2_OPX0(NAME) \ - (SET_IW_R2_OP (R2_OP_OPX) | SET_IW_OPX_X (R2_OPX_##NAME)) -#define MASK_R2_OPX0 \ - (IW_R2_OP_SHIFTED_MASK | IW_OPX_X_SHIFTED_MASK \ - | IW_F3X6L5_IMM5_SHIFTED_MASK) - -#define MATCH_R2_OPX(NAME, A, B, C) \ - (MATCH_R2_OPX0 (NAME) | SET_IW_F3X6L5_A (A) | SET_IW_F3X6L5_B (B) \ - | SET_IW_F3X6L5_C (C)) -#define MASK_R2_OPX(A, B, C, N) \ - (IW_R2_OP_SHIFTED_MASK | IW_OPX_X_SHIFTED_MASK \ - | (A ? IW_F3X6L5_A_SHIFTED_MASK : 0) \ - | (B ? IW_F3X6L5_B_SHIFTED_MASK : 0) \ - | (C ? IW_F3X6L5_C_SHIFTED_MASK : 0) \ - | (N ? IW_F3X6L5_IMM5_SHIFTED_MASK : 0)) - -#define MATCH_R2_I12(NAME) \ - (SET_IW_R2_OP (R2_OP_I12) | SET_IW_I12_X (R2_I12_##NAME)) -#define MASK_R2_I12 \ - (IW_R2_OP_SHIFTED_MASK | IW_I12_X_SHIFTED_MASK ) - -#define MATCH_R2_DCACHE(NAME) \ - (MATCH_R2_I12(DCACHE) | SET_IW_F1X4I12_X (R2_DCACHE_##NAME)) -#define MASK_R2_DCACHE \ - (MASK_R2_I12 | IW_F1X4I12_X_SHIFTED_MASK) - -#define MATCH_R2_R_N(NAME) \ - (SET_IW_R2_OP (R2_OP_R_N) | SET_IW_R_N_X (R2_R_N_##NAME)) -#define MASK_R2_R_N \ - (IW_R2_OP_SHIFTED_MASK | IW_R_N_X_SHIFTED_MASK ) - -/* Match/mask macros for R2 instructions. */ - -#define MATCH_R2_ADD MATCH_R2_OPX0 (ADD) -#define MASK_R2_ADD MASK_R2_OPX0 -#define MATCH_R2_ADDI MATCH_R2_OP (ADDI) -#define MASK_R2_ADDI MASK_R2_OP -#define MATCH_R2_ADD_N (MATCH_R2_OP (AS_N) | SET_IW_T3X1_X (R2_AS_N_ADD_N)) -#define MASK_R2_ADD_N (MASK_R2_OP | IW_T3X1_X_SHIFTED_MASK) -#define MATCH_R2_ADDI_N (MATCH_R2_OP (ASI_N) | SET_IW_T2X1I3_X (R2_ASI_N_ADDI_N)) -#define MASK_R2_ADDI_N (MASK_R2_OP | IW_T2X1I3_X_SHIFTED_MASK) -#define MATCH_R2_AND MATCH_R2_OPX0 (AND) -#define MASK_R2_AND MASK_R2_OPX0 -#define MATCH_R2_ANDCHI MATCH_R2_OP (ANDCHI) -#define MASK_R2_ANDCHI MASK_R2_OP -#define MATCH_R2_ANDCI MATCH_R2_OP (ANDCI) -#define MASK_R2_ANDCI MASK_R2_OP -#define MATCH_R2_ANDHI MATCH_R2_OP (ANDHI) -#define MASK_R2_ANDHI MASK_R2_OP -#define MATCH_R2_ANDI MATCH_R2_OP (ANDI) -#define MASK_R2_ANDI MASK_R2_OP -#define MATCH_R2_ANDI_N MATCH_R2_OP (ANDI_N) -#define MASK_R2_ANDI_N MASK_R2_OP -#define MATCH_R2_AND_N MATCH_R2_R_N (AND_N) -#define MASK_R2_AND_N MASK_R2_R_N -#define MATCH_R2_BEQ MATCH_R2_OP (BEQ) -#define MASK_R2_BEQ MASK_R2_OP -#define MATCH_R2_BEQZ_N MATCH_R2_OP (BEQZ_N) -#define MASK_R2_BEQZ_N MASK_R2_OP -#define MATCH_R2_BGE MATCH_R2_OP (BGE) -#define MASK_R2_BGE MASK_R2_OP -#define MATCH_R2_BGEU MATCH_R2_OP (BGEU) -#define MASK_R2_BGEU MASK_R2_OP -#define MATCH_R2_BGT MATCH_R2_OP (BLT) -#define MASK_R2_BGT MASK_R2_OP -#define MATCH_R2_BGTU MATCH_R2_OP (BLTU) -#define MASK_R2_BGTU MASK_R2_OP -#define MATCH_R2_BLE MATCH_R2_OP (BGE) -#define MASK_R2_BLE MASK_R2_OP -#define MATCH_R2_BLEU MATCH_R2_OP (BGEU) -#define MASK_R2_BLEU MASK_R2_OP -#define MATCH_R2_BLT MATCH_R2_OP (BLT) -#define MASK_R2_BLT MASK_R2_OP -#define MATCH_R2_BLTU MATCH_R2_OP (BLTU) -#define MASK_R2_BLTU MASK_R2_OP -#define MATCH_R2_BNE MATCH_R2_OP (BNE) -#define MASK_R2_BNE MASK_R2_OP -#define MATCH_R2_BNEZ_N MATCH_R2_OP (BNEZ_N) -#define MASK_R2_BNEZ_N MASK_R2_OP -#define MATCH_R2_BR MATCH_R2_OP (BR) -#define MASK_R2_BR MASK_R2_OP | IW_F2I16_A_SHIFTED_MASK | IW_F2I16_B_SHIFTED_MASK -#define MATCH_R2_BREAK MATCH_R2_OPX (BREAK, 0, 0, 0x1e) -#define MASK_R2_BREAK MASK_R2_OPX (1, 1, 1, 0) -#define MATCH_R2_BREAK_N MATCH_R2_R_N (BREAK_N) -#define MASK_R2_BREAK_N MASK_R2_R_N -#define MATCH_R2_BRET MATCH_R2_OPX (BRET, 0x1e, 0, 0) -#define MASK_R2_BRET MASK_R2_OPX (1, 1, 1, 1) -#define MATCH_R2_BR_N MATCH_R2_OP (BR_N) -#define MASK_R2_BR_N MASK_R2_OP -#define MATCH_R2_CALL MATCH_R2_OP (CALL) -#define MASK_R2_CALL MASK_R2_OP -#define MATCH_R2_CALLR MATCH_R2_OPX (CALLR, 0, 0, 0x1f) -#define MASK_R2_CALLR MASK_R2_OPX (0, 1, 1, 1) -#define MATCH_R2_CALLR_N MATCH_R2_R_N (CALLR_N) -#define MASK_R2_CALLR_N MASK_R2_R_N -#define MATCH_R2_CMPEQ MATCH_R2_OPX0 (CMPEQ) -#define MASK_R2_CMPEQ MASK_R2_OPX0 -#define MATCH_R2_CMPEQI MATCH_R2_OP (CMPEQI) -#define MASK_R2_CMPEQI MASK_R2_OP -#define MATCH_R2_CMPGE MATCH_R2_OPX0 (CMPGE) -#define MASK_R2_CMPGE MASK_R2_OPX0 -#define MATCH_R2_CMPGEI MATCH_R2_OP (CMPGEI) -#define MASK_R2_CMPGEI MASK_R2_OP -#define MATCH_R2_CMPGEU MATCH_R2_OPX0 (CMPGEU) -#define MASK_R2_CMPGEU MASK_R2_OPX0 -#define MATCH_R2_CMPGEUI MATCH_R2_OP (CMPGEUI) -#define MASK_R2_CMPGEUI MASK_R2_OP -#define MATCH_R2_CMPGT MATCH_R2_OPX0 (CMPLT) -#define MASK_R2_CMPGT MASK_R2_OPX0 -#define MATCH_R2_CMPGTI MATCH_R2_OP (CMPGEI) -#define MASK_R2_CMPGTI MASK_R2_OP -#define MATCH_R2_CMPGTU MATCH_R2_OPX0 (CMPLTU) -#define MASK_R2_CMPGTU MASK_R2_OPX0 -#define MATCH_R2_CMPGTUI MATCH_R2_OP (CMPGEUI) -#define MASK_R2_CMPGTUI MASK_R2_OP -#define MATCH_R2_CMPLE MATCH_R2_OPX0 (CMPGE) -#define MASK_R2_CMPLE MASK_R2_OPX0 -#define MATCH_R2_CMPLEI MATCH_R2_OP (CMPLTI) -#define MASK_R2_CMPLEI MASK_R2_OP -#define MATCH_R2_CMPLEU MATCH_R2_OPX0 (CMPGEU) -#define MASK_R2_CMPLEU MASK_R2_OPX0 -#define MATCH_R2_CMPLEUI MATCH_R2_OP (CMPLTUI) -#define MASK_R2_CMPLEUI MASK_R2_OP -#define MATCH_R2_CMPLT MATCH_R2_OPX0 (CMPLT) -#define MASK_R2_CMPLT MASK_R2_OPX0 -#define MATCH_R2_CMPLTI MATCH_R2_OP (CMPLTI) -#define MASK_R2_CMPLTI MASK_R2_OP -#define MATCH_R2_CMPLTU MATCH_R2_OPX0 (CMPLTU) -#define MASK_R2_CMPLTU MASK_R2_OPX0 -#define MATCH_R2_CMPLTUI MATCH_R2_OP (CMPLTUI) -#define MASK_R2_CMPLTUI MASK_R2_OP -#define MATCH_R2_CMPNE MATCH_R2_OPX0 (CMPNE) -#define MASK_R2_CMPNE MASK_R2_OPX0 -#define MATCH_R2_CMPNEI MATCH_R2_OP (CMPNEI) -#define MASK_R2_CMPNEI MASK_R2_OP -#define MATCH_R2_CUSTOM MATCH_R2_OP (CUSTOM) -#define MASK_R2_CUSTOM MASK_R2_OP -#define MATCH_R2_DIV MATCH_R2_OPX0 (DIV) -#define MASK_R2_DIV MASK_R2_OPX0 -#define MATCH_R2_DIVU MATCH_R2_OPX0 (DIVU) -#define MASK_R2_DIVU MASK_R2_OPX0 -#define MATCH_R2_ENI MATCH_R2_OPX (ENI, 0, 0, 0) -#define MASK_R2_ENI MASK_R2_OPX (1, 1, 1, 0) -#define MATCH_R2_ERET MATCH_R2_OPX (ERET, 0x1d, 0x1e, 0) -#define MASK_R2_ERET MASK_R2_OPX (1, 1, 1, 1) -#define MATCH_R2_EXTRACT MATCH_R2_OPX (EXTRACT, 0, 0, 0) -#define MASK_R2_EXTRACT MASK_R2_OPX (0, 0, 0, 0) -#define MATCH_R2_FLUSHD MATCH_R2_DCACHE (FLUSHD) -#define MASK_R2_FLUSHD MASK_R2_DCACHE -#define MATCH_R2_FLUSHDA MATCH_R2_DCACHE (FLUSHDA) -#define MASK_R2_FLUSHDA MASK_R2_DCACHE -#define MATCH_R2_FLUSHI MATCH_R2_OPX (FLUSHI, 0, 0, 0) -#define MASK_R2_FLUSHI MASK_R2_OPX (0, 1, 1, 1) -#define MATCH_R2_FLUSHP MATCH_R2_OPX (FLUSHP, 0, 0, 0) -#define MASK_R2_FLUSHP MASK_R2_OPX (1, 1, 1, 1) -#define MATCH_R2_INITD MATCH_R2_DCACHE (INITD) -#define MASK_R2_INITD MASK_R2_DCACHE -#define MATCH_R2_INITDA MATCH_R2_DCACHE (INITDA) -#define MASK_R2_INITDA MASK_R2_DCACHE -#define MATCH_R2_INITI MATCH_R2_OPX (INITI, 0, 0, 0) -#define MASK_R2_INITI MASK_R2_OPX (0, 1, 1, 1) -#define MATCH_R2_INSERT MATCH_R2_OPX (INSERT, 0, 0, 0) -#define MASK_R2_INSERT MASK_R2_OPX (0, 0, 0, 0) -#define MATCH_R2_JMP MATCH_R2_OPX (JMP, 0, 0, 0) -#define MASK_R2_JMP MASK_R2_OPX (0, 1, 1, 1) -#define MATCH_R2_JMPI MATCH_R2_OP (JMPI) -#define MASK_R2_JMPI MASK_R2_OP -#define MATCH_R2_JMPR_N MATCH_R2_R_N (JMPR_N) -#define MASK_R2_JMPR_N MASK_R2_R_N -#define MATCH_R2_LDB MATCH_R2_OP (LDB) -#define MASK_R2_LDB MASK_R2_OP -#define MATCH_R2_LDBIO MATCH_R2_I12 (LDBIO) -#define MASK_R2_LDBIO MASK_R2_I12 -#define MATCH_R2_LDBU MATCH_R2_OP (LDBU) -#define MASK_R2_LDBU MASK_R2_OP -#define MATCH_R2_LDBUIO MATCH_R2_I12 (LDBUIO) -#define MASK_R2_LDBUIO MASK_R2_I12 -#define MATCH_R2_LDBU_N MATCH_R2_OP (LDBU_N) -#define MASK_R2_LDBU_N MASK_R2_OP -#define MATCH_R2_LDEX MATCH_R2_OPX (LDEX, 0, 0, 0) -#define MASK_R2_LDEX MASK_R2_OPX (0, 1, 0, 1) -#define MATCH_R2_LDH MATCH_R2_OP (LDH) -#define MASK_R2_LDH MASK_R2_OP -#define MATCH_R2_LDHIO MATCH_R2_I12 (LDHIO) -#define MASK_R2_LDHIO MASK_R2_I12 -#define MATCH_R2_LDHU MATCH_R2_OP (LDHU) -#define MASK_R2_LDHU MASK_R2_OP -#define MATCH_R2_LDHUIO MATCH_R2_I12 (LDHUIO) -#define MASK_R2_LDHUIO MASK_R2_I12 -#define MATCH_R2_LDHU_N MATCH_R2_OP (LDHU_N) -#define MASK_R2_LDHU_N MASK_R2_OP -#define MATCH_R2_LDSEX MATCH_R2_OPX (LDSEX, 0, 0, 0) -#define MASK_R2_LDSEX MASK_R2_OPX (0, 1, 0, 1) -#define MATCH_R2_LDW MATCH_R2_OP (LDW) -#define MASK_R2_LDW MASK_R2_OP -#define MATCH_R2_LDWIO MATCH_R2_I12 (LDWIO) -#define MASK_R2_LDWIO MASK_R2_I12 -#define MATCH_R2_LDWM MATCH_R2_I12 (LDWM) -#define MASK_R2_LDWM MASK_R2_I12 -#define MATCH_R2_LDWSP_N MATCH_R2_OP (LDWSP_N) -#define MASK_R2_LDWSP_N MASK_R2_OP -#define MATCH_R2_LDW_N MATCH_R2_OP (LDW_N) -#define MASK_R2_LDW_N MASK_R2_OP -#define MATCH_R2_MERGE MATCH_R2_OPX (MERGE, 0, 0, 0) -#define MASK_R2_MERGE MASK_R2_OPX (0, 0, 0, 0) -#define MATCH_R2_MOV MATCH_R2_OPX (ADD, 0, 0, 0) -#define MASK_R2_MOV MASK_R2_OPX (0, 1, 0, 1) -#define MATCH_R2_MOVHI MATCH_R2_OP (ORHI) | SET_IW_F2I16_A (0) -#define MASK_R2_MOVHI MASK_R2_OP | IW_F2I16_A_SHIFTED_MASK -#define MATCH_R2_MOVI MATCH_R2_OP (ADDI) | SET_IW_F2I16_A (0) -#define MASK_R2_MOVI MASK_R2_OP | IW_F2I16_A_SHIFTED_MASK -#define MATCH_R2_MOVUI MATCH_R2_OP (ORI) | SET_IW_F2I16_A (0) -#define MASK_R2_MOVUI MASK_R2_OP | IW_F2I16_A_SHIFTED_MASK -#define MATCH_R2_MOV_N MATCH_R2_OP (MOV_N) -#define MASK_R2_MOV_N MASK_R2_OP -#define MATCH_R2_MOVI_N MATCH_R2_OP (MOVI_N) -#define MASK_R2_MOVI_N MASK_R2_OP -#define MATCH_R2_MUL MATCH_R2_OPX0 (MUL) -#define MASK_R2_MUL MASK_R2_OPX0 -#define MATCH_R2_MULI MATCH_R2_OP (MULI) -#define MASK_R2_MULI MASK_R2_OP -#define MATCH_R2_MULXSS MATCH_R2_OPX0 (MULXSS) -#define MASK_R2_MULXSS MASK_R2_OPX0 -#define MATCH_R2_MULXSU MATCH_R2_OPX0 (MULXSU) -#define MASK_R2_MULXSU MASK_R2_OPX0 -#define MATCH_R2_MULXUU MATCH_R2_OPX0 (MULXUU) -#define MASK_R2_MULXUU MASK_R2_OPX0 -#define MATCH_R2_NEG_N MATCH_R2_R_N (NEG_N) -#define MASK_R2_NEG_N MASK_R2_R_N -#define MATCH_R2_NEXTPC MATCH_R2_OPX (NEXTPC, 0, 0, 0) -#define MASK_R2_NEXTPC MASK_R2_OPX (1, 1, 0, 1) -#define MATCH_R2_NOP MATCH_R2_OPX (ADD, 0, 0, 0) -#define MASK_R2_NOP MASK_R2_OPX (1, 1, 1, 1) -#define MATCH_R2_NOP_N (MATCH_R2_OP (MOV_N) | SET_IW_F2_A (0) | SET_IW_F2_B (0)) -#define MASK_R2_NOP_N (MASK_R2_OP | IW_F2_A_SHIFTED_MASK | IW_F2_B_SHIFTED_MASK) -#define MATCH_R2_NOR MATCH_R2_OPX0 (NOR) -#define MASK_R2_NOR MASK_R2_OPX0 -#define MATCH_R2_NOT_N MATCH_R2_R_N (NOT_N) -#define MASK_R2_NOT_N MASK_R2_R_N -#define MATCH_R2_OR MATCH_R2_OPX0 (OR) -#define MASK_R2_OR MASK_R2_OPX0 -#define MATCH_R2_OR_N MATCH_R2_R_N (OR_N) -#define MASK_R2_OR_N MASK_R2_R_N -#define MATCH_R2_ORHI MATCH_R2_OP (ORHI) -#define MASK_R2_ORHI MASK_R2_OP -#define MATCH_R2_ORI MATCH_R2_OP (ORI) -#define MASK_R2_ORI MASK_R2_OP -#define MATCH_R2_POP_N (MATCH_R2_OP (PP_N) | SET_IW_L5I4X1_X (R2_PP_N_POP_N)) -#define MASK_R2_POP_N (MASK_R2_OP | IW_L5I4X1_X_SHIFTED_MASK) -#define MATCH_R2_PUSH_N (MATCH_R2_OP (PP_N) | SET_IW_L5I4X1_X (R2_PP_N_PUSH_N)) -#define MASK_R2_PUSH_N (MASK_R2_OP | IW_L5I4X1_X_SHIFTED_MASK) -#define MATCH_R2_RDCTL MATCH_R2_OPX (RDCTL, 0, 0, 0) -#define MASK_R2_RDCTL MASK_R2_OPX (1, 1, 0, 0) -#define MATCH_R2_RDPRS MATCH_R2_I12 (RDPRS) -#define MASK_R2_RDPRS MASK_R2_I12 -#define MATCH_R2_RET MATCH_R2_OPX (RET, 0x1f, 0, 0) -#define MASK_R2_RET MASK_R2_OPX (1, 1, 1, 1) -#define MATCH_R2_RET_N (MATCH_R2_R_N (RET_N) | SET_IW_X2L5_IMM5 (0)) -#define MASK_R2_RET_N (MASK_R2_R_N | IW_X2L5_IMM5_SHIFTED_MASK) -#define MATCH_R2_ROL MATCH_R2_OPX0 (ROL) -#define MASK_R2_ROL MASK_R2_OPX0 -#define MATCH_R2_ROLI MATCH_R2_OPX (ROLI, 0, 0, 0) -#define MASK_R2_ROLI MASK_R2_OPX (0, 1, 0, 0) -#define MATCH_R2_ROR MATCH_R2_OPX0 (ROR) -#define MASK_R2_ROR MASK_R2_OPX0 -#define MATCH_R2_SLL MATCH_R2_OPX0 (SLL) -#define MASK_R2_SLL MASK_R2_OPX0 -#define MATCH_R2_SLLI MATCH_R2_OPX (SLLI, 0, 0, 0) -#define MASK_R2_SLLI MASK_R2_OPX (0, 1, 0, 0) -#define MATCH_R2_SLL_N MATCH_R2_R_N (SLL_N) -#define MASK_R2_SLL_N MASK_R2_R_N -#define MATCH_R2_SLLI_N (MATCH_R2_OP (SHI_N) | SET_IW_T2X1L3_X (R2_SHI_N_SLLI_N)) -#define MASK_R2_SLLI_N (MASK_R2_OP | IW_T2X1L3_X_SHIFTED_MASK) -#define MATCH_R2_SPADDI_N MATCH_R2_OP (SPADDI_N) -#define MASK_R2_SPADDI_N MASK_R2_OP -#define MATCH_R2_SPDECI_N (MATCH_R2_OP (SPI_N) | SET_IW_X1I7_X (R2_SPI_N_SPDECI_N)) -#define MASK_R2_SPDECI_N (MASK_R2_OP | IW_X1I7_X_SHIFTED_MASK) -#define MATCH_R2_SPINCI_N (MATCH_R2_OP (SPI_N) | SET_IW_X1I7_X (R2_SPI_N_SPINCI_N)) -#define MASK_R2_SPINCI_N (MASK_R2_OP | IW_X1I7_X_SHIFTED_MASK) -#define MATCH_R2_SRA MATCH_R2_OPX0 (SRA) -#define MASK_R2_SRA MASK_R2_OPX0 -#define MATCH_R2_SRAI MATCH_R2_OPX (SRAI, 0, 0, 0) -#define MASK_R2_SRAI MASK_R2_OPX (0, 1, 0, 0) -#define MATCH_R2_SRL MATCH_R2_OPX0 (SRL) -#define MASK_R2_SRL MASK_R2_OPX0 -#define MATCH_R2_SRLI MATCH_R2_OPX (SRLI, 0, 0, 0) -#define MASK_R2_SRLI MASK_R2_OPX (0, 1, 0, 0) -#define MATCH_R2_SRL_N MATCH_R2_R_N (SRL_N) -#define MASK_R2_SRL_N MASK_R2_R_N -#define MATCH_R2_SRLI_N (MATCH_R2_OP (SHI_N) | SET_IW_T2X1L3_X (R2_SHI_N_SRLI_N)) -#define MASK_R2_SRLI_N (MASK_R2_OP | IW_T2X1L3_X_SHIFTED_MASK) -#define MATCH_R2_STB MATCH_R2_OP (STB) -#define MASK_R2_STB MASK_R2_OP -#define MATCH_R2_STBIO MATCH_R2_I12 (STBIO) -#define MASK_R2_STBIO MASK_R2_I12 -#define MATCH_R2_STB_N MATCH_R2_OP (STB_N) -#define MASK_R2_STB_N MASK_R2_OP -#define MATCH_R2_STBZ_N (MATCH_R2_OP (STZ_N) | SET_IW_T1X1I6_X (R2_STZ_N_STBZ_N)) -#define MASK_R2_STBZ_N (MASK_R2_OP | IW_T1X1I6_X_SHIFTED_MASK) -#define MATCH_R2_STEX MATCH_R2_OPX0 (STEX) -#define MASK_R2_STEX MASK_R2_OPX0 -#define MATCH_R2_STH MATCH_R2_OP (STH) -#define MASK_R2_STH MASK_R2_OP -#define MATCH_R2_STHIO MATCH_R2_I12 (STHIO) -#define MASK_R2_STHIO MASK_R2_I12 -#define MATCH_R2_STH_N MATCH_R2_OP (STH_N) -#define MASK_R2_STH_N MASK_R2_OP -#define MATCH_R2_STSEX MATCH_R2_OPX0 (STSEX) -#define MASK_R2_STSEX MASK_R2_OPX0 -#define MATCH_R2_STW MATCH_R2_OP (STW) -#define MASK_R2_STW MASK_R2_OP -#define MATCH_R2_STWIO MATCH_R2_I12 (STWIO) -#define MASK_R2_STWIO MASK_R2_I12 -#define MATCH_R2_STWM MATCH_R2_I12 (STWM) -#define MASK_R2_STWM MASK_R2_I12 -#define MATCH_R2_STWSP_N MATCH_R2_OP (STWSP_N) -#define MASK_R2_STWSP_N MASK_R2_OP -#define MATCH_R2_STW_N MATCH_R2_OP (STW_N) -#define MASK_R2_STW_N MASK_R2_OP -#define MATCH_R2_STWZ_N MATCH_R2_OP (STZ_N) -#define MASK_R2_STWZ_N MASK_R2_OP -#define MATCH_R2_SUB MATCH_R2_OPX0 (SUB) -#define MASK_R2_SUB MASK_R2_OPX0 -#define MATCH_R2_SUBI MATCH_R2_OP (ADDI) -#define MASK_R2_SUBI MASK_R2_OP -#define MATCH_R2_SUB_N (MATCH_R2_OP (AS_N) | SET_IW_T3X1_X (R2_AS_N_SUB_N)) -#define MASK_R2_SUB_N (MASK_R2_OP | IW_T3X1_X_SHIFTED_MASK) -#define MATCH_R2_SUBI_N (MATCH_R2_OP (ASI_N) | SET_IW_T2X1I3_X (R2_ASI_N_SUBI_N)) -#define MASK_R2_SUBI_N (MASK_R2_OP | IW_T2X1I3_X_SHIFTED_MASK) -#define MATCH_R2_SYNC MATCH_R2_OPX (SYNC, 0, 0, 0) -#define MASK_R2_SYNC MASK_R2_OPX (1, 1, 1, 1) -#define MATCH_R2_TRAP MATCH_R2_OPX (TRAP, 0, 0, 0x1d) -#define MASK_R2_TRAP MASK_R2_OPX (1, 1, 1, 0) -#define MATCH_R2_TRAP_N MATCH_R2_R_N (TRAP_N) -#define MASK_R2_TRAP_N MASK_R2_R_N -#define MATCH_R2_WRCTL MATCH_R2_OPX (WRCTL, 0, 0, 0) -#define MASK_R2_WRCTL MASK_R2_OPX (0, 1, 1, 0) -#define MATCH_R2_WRPIE MATCH_R2_OPX (WRPIE, 0, 0, 0) -#define MASK_R2_WRPIE MASK_R2_OPX (0, 1, 0, 1) -#define MATCH_R2_WRPRS MATCH_R2_OPX (WRPRS, 0, 0, 0) -#define MASK_R2_WRPRS MASK_R2_OPX (0, 1, 0, 1) -#define MATCH_R2_XOR MATCH_R2_OPX0 (XOR) -#define MASK_R2_XOR MASK_R2_OPX0 -#define MATCH_R2_XORHI MATCH_R2_OP (XORHI) -#define MASK_R2_XORHI MASK_R2_OP -#define MATCH_R2_XORI MATCH_R2_OP (XORI) -#define MASK_R2_XORI MASK_R2_OP -#define MATCH_R2_XOR_N MATCH_R2_R_N (XOR_N) -#define MASK_R2_XOR_N MASK_R2_R_N - -#endif /* _NIOS2R2_H */ - - diff --git a/ld/Makefile.am b/ld/Makefile.am index 6a9833e5775..a7fb6e12055 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -333,8 +333,6 @@ ALL_EMULATION_SOURCES = \ ends32elf.c \ ends32elf16m.c \ ends32elf_linux.c \ - enios2elf.c \ - enios2linux.c \ ens32knbsd.c \ epc532macha.c \ epdp11.c \ diff --git a/ld/Makefile.in b/ld/Makefile.in index 8639e782cdf..666e3755a9e 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -844,8 +844,6 @@ ALL_EMULATION_SOURCES = \ ends32elf.c \ ends32elf16m.c \ ends32elf_linux.c \ - enios2elf.c \ - enios2linux.c \ ens32knbsd.c \ epc532macha.c \ epdp11.c \ @@ -1543,8 +1541,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ends32elf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ends32elf16m.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ends32elf_linux.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enios2elf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enios2linux.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ens32knbsd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epc532macha.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epdp11.Po@am__quote@ @@ -1,5 +1,8 @@ -*- text -*- +* Support for Nios II target has been removed, as this architecture has been + EOL'ed by Intel. + Changes in 2.44: * Add --image-base=<ADDR> option to the ELF linker to behave the same diff --git a/ld/configure.tgt b/ld/configure.tgt index 74ddac49863..b5f272e5ba2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -670,10 +670,6 @@ nds32*le-*-linux-gnu*) targ_emul=nds32elf_linux ;; nds32*be-*-linux-gnu*) targ_emul=nds32belf_linux ;; -nios2*-*-linux*) targ_emul=nios2linux - ;; -nios2*-*-*) targ_emul=nios2elf - ;; ns32k-pc532-mach* | ns32k-pc532-ux*) targ_emul=pc532macha targ_extra_ofiles= ;; diff --git a/ld/emulparams/nios2elf.sh b/ld/emulparams/nios2elf.sh deleted file mode 100644 index 90979449478..00000000000 --- a/ld/emulparams/nios2elf.sh +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_NAME=elf -TEMPLATE_NAME=elf -EXTRA_EM_FILE=nios2elf -OUTPUT_FORMAT="elf32-littlenios2" -LITTLE_OUTPUT_FORMAT="elf32-littlenios2" -BIG_OUTPUT_FORMAT="elf32-bignios2" -TEXT_START_ADDR=0x1000 -OTHER_GOT_SYMBOLS=' - _gp = ALIGN(16) + 0x7ff0; - PROVIDE(gp = _gp); -' -ARCH=nios2 -MACHINE= -MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" -ENTRY=_start -NOP=0x0001883a - -GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/nios2linux.sh b/ld/emulparams/nios2linux.sh deleted file mode 100644 index 2c04d062b1b..00000000000 --- a/ld/emulparams/nios2linux.sh +++ /dev/null @@ -1,20 +0,0 @@ -SCRIPT_NAME=elf -TEMPLATE_NAME=elf -EXTRA_EM_FILE="nios2elf" -OUTPUT_FORMAT="elf32-littlenios2" -LITTLE_OUTPUT_FORMAT="elf32-littlenios2" -BIG_OUTPUT_FORMAT="elf32-bignios2" -TEXT_START_ADDR=0x2000 -OTHER_GOT_SYMBOLS=' - HIDDEN (_gp = ALIGN(16) + 0x7ff0); - PROVIDE_HIDDEN (gp = _gp); -' -ARCH=nios2 -MACHINE= -MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" -ENTRY=_start -NOP=0x0001883a - -GENERATE_SHLIB_SCRIPT=yes -GENERATE_PIE_SCRIPT=yes diff --git a/ld/emultempl/nios2elf.em b/ld/emultempl/nios2elf.em deleted file mode 100644 index 60c698ebb20..00000000000 --- a/ld/emultempl/nios2elf.em +++ /dev/null @@ -1,304 +0,0 @@ -# This shell script emits a C file. -*- C -*- -# Copyright (C) 2013-2024 Free Software Foundation, Inc. -# -# This file is part of GNU Binutils. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, -# MA 02110-1301, USA. -# - -# This file is sourced from elf.em, and defines extra Nios II ELF -# specific routines. Taken from metagelf.em. -# -fragment <<EOF - -#include "ldctor.h" -#include "elf32-nios2.h" - - -/* Fake input file for stubs. */ -static lang_input_statement_type *stub_file; - -/* Whether we need to call nios2_layout_sections_again. */ -static int need_laying_out = 0; - - -/* This is called before the input files are opened. We create a new - fake input file to hold the stub sections. */ - -static void -nios2elf_create_output_section_statements (void) -{ - extern const bfd_target nios2_elf32_le_vec, nios2_elf32_be_vec; - - if (link_info.output_bfd->xvec != &nios2_elf32_le_vec - && link_info.output_bfd->xvec != &nios2_elf32_be_vec) - return; - - /* If --no-relax was not explicitly specified by the user, enable - relaxation. If it's not enabled (either explicitly or by default), - we're done, as we won't need to create any stubs. */ - if (!bfd_link_relocatable (&link_info) && RELAXATION_DISABLED_BY_DEFAULT) - ENABLE_RELAXATION; - if (!RELAXATION_ENABLED) - return; - - stub_file = lang_add_input_file ("linker stubs", - lang_input_file_is_fake_enum, - NULL); - stub_file->the_bfd = bfd_create ("linker stubs", link_info.output_bfd); - if (stub_file->the_bfd == NULL - || ! bfd_set_arch_mach (stub_file->the_bfd, - bfd_get_arch (link_info.output_bfd), - bfd_get_mach (link_info.output_bfd))) - { - einfo (_("%F%P: can not create BFD: %E\n")); - return; - } - - stub_file->the_bfd->flags |= BFD_LINKER_CREATED; - ldlang_add_file (stub_file); -} - - -struct hook_stub_info -{ - lang_statement_list_type add; - asection *input_section; -}; - -/* Traverse the linker tree to find the spot where the stub goes. */ - -static bool -hook_in_stub (struct hook_stub_info *info, lang_statement_union_type **lp, - bool afterp) -{ - lang_statement_union_type *l; - bool ret; - - for (; (l = *lp) != NULL; lp = &l->header.next) - { - switch (l->header.type) - { - case lang_constructors_statement_enum: - ret = hook_in_stub (info, &constructor_list.head, afterp); - if (ret) - return ret; - break; - - case lang_output_section_statement_enum: - ret = hook_in_stub (info, - &l->output_section_statement.children.head, - afterp); - if (ret) - return ret; - break; - - case lang_wild_statement_enum: - ret = hook_in_stub (info, &l->wild_statement.children.head, afterp); - if (ret) - return ret; - break; - - case lang_group_statement_enum: - ret = hook_in_stub (info, &l->group_statement.children.head, afterp); - if (ret) - return ret; - break; - - case lang_input_section_enum: - if (l->input_section.section == info->input_section) - { - /* We've found our section. Insert the stub immediately - before or after its associated input section. */ - if (afterp) - { - *(info->add.tail) = l->header.next; - l->header.next = info->add.head; - } - else - { - *lp = info->add.head; - *(info->add.tail) = l; - } - return true; - } - break; - - case lang_data_statement_enum: - case lang_reloc_statement_enum: - case lang_object_symbols_statement_enum: - case lang_output_statement_enum: - case lang_target_statement_enum: - case lang_input_statement_enum: - case lang_assignment_statement_enum: - case lang_padding_statement_enum: - case lang_address_statement_enum: - case lang_fill_statement_enum: - break; - - default: - FAIL (); - break; - } - } - return false; -} - -/* Call-back for elf32_nios2_size_stubs. */ - -/* Create a new stub section, and arrange for it to be linked - immediately before or after INPUT_SECTION, according to AFTERP. */ - -static asection * -nios2elf_add_stub_section (const char *stub_sec_name, asection *input_section, - bool afterp) -{ - asection *stub_sec; - flagword flags; - asection *output_section; - const char *secname; - lang_output_section_statement_type *os; - struct hook_stub_info info; - - flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE - | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP); - stub_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd, - stub_sec_name, flags); - if (stub_sec == NULL) - goto err_ret; - - output_section = input_section->output_section; - secname = bfd_section_name (output_section); - os = lang_output_section_find (secname); - - info.input_section = input_section; - lang_list_init (&info.add); - lang_add_section (&info.add, stub_sec, NULL, NULL, os); - - if (info.add.head == NULL) - goto err_ret; - - if (hook_in_stub (&info, &os->children.head, afterp)) - return stub_sec; - - err_ret: - einfo (_("%X%P: can not make stub section: %E\n")); - return NULL; -} - - -/* Another call-back for elf32_nios2_size_stubs. */ - -static void -nios2elf_layout_sections_again (void) -{ - /* If we have changed sizes of the stub sections, then we need - to recalculate all the section offsets. This may mean we need to - add even more stubs. */ - ldelf_map_segments (true); - need_laying_out = -1; -} - - -static void -build_section_lists (lang_statement_union_type *statement) -{ - if (statement->header.type == lang_input_section_enum) - { - asection *i = statement->input_section.section; - - if (i->sec_info_type != SEC_INFO_TYPE_JUST_SYMS - && (i->flags & SEC_EXCLUDE) == 0 - && i->output_section != NULL - && i->output_section->owner == link_info.output_bfd) - { - nios2_elf32_next_input_section (&link_info, i); - } - } -} - - -/* For Nios II we use this opportunity to build linker stubs. */ - -static void -gld${EMULATION_NAME}_after_allocation (void) -{ - int ret; - - /* bfd_elf_discard_info just plays with data and debugging sections, - ie. doesn't affect code size, so we can delay resizing the - sections. It's likely we'll resize everything in the process of - adding stubs. */ - ret = bfd_elf_discard_info (link_info.output_bfd, &link_info); - if (ret < 0) - { - einfo (_("%X%P: .eh_frame/.stab edit: %E\n")); - return; - } - else if (ret > 0) - need_laying_out = 1; - - /* If generating a relocatable output file, then we don't - have to examine the relocs. */ - if (stub_file != NULL - && !bfd_link_relocatable (&link_info) - && RELAXATION_ENABLED) - { - ret = nios2_elf32_setup_section_lists (link_info.output_bfd, &link_info); - if (ret != 0) - { - if (ret < 0) - { - einfo (_("%X%P: can not size stub section: %E\n")); - return; - } - - lang_for_each_statement (build_section_lists); - - /* Call into the BFD backend to do the real work. */ - if (! nios2_elf32_size_stubs (link_info.output_bfd, - stub_file->the_bfd, - &link_info, - &nios2elf_add_stub_section, - &nios2elf_layout_sections_again)) - { - einfo (_("%X%P: can not size stub section: %E\n")); - return; - } - } - } - - if (need_laying_out != -1) - ldelf_map_segments (need_laying_out); - - if (!bfd_link_relocatable (&link_info) && RELAXATION_ENABLED) - { - /* Now build the linker stubs. */ - if (stub_file != NULL && stub_file->the_bfd->sections != NULL) - { - if (! nios2_elf32_build_stubs (&link_info)) - einfo (_("%X%P: can not build stubs: %E\n")); - } - } -} - -EOF - - -# Put these extra nios2elf routines in ld_${EMULATION_NAME}_emulation -# -LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation -LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=nios2elf_create_output_section_statements diff --git a/ld/gen-doc.texi b/ld/gen-doc.texi index b6ffb9fdb11..6f86530e329 100644 --- a/ld/gen-doc.texi +++ b/ld/gen-doc.texi @@ -18,7 +18,6 @@ @set MMIX @set MSP430 @set NDS32 -@set NIOSII @set PDP11 @set POWERPC @set POWERPC64 diff --git a/ld/ld.texi b/ld/ld.texi index 417af3e948d..f1594043bfa 100644 --- a/ld/ld.texi +++ b/ld/ld.texi @@ -30,7 +30,6 @@ @set MMIX @set MSP430 @set NDS32 -@set NIOSII @set PDP11 @set POWERPC @set POWERPC64 @@ -2406,9 +2405,6 @@ This option is only supported on a few targets. @ifset M68HC11 @xref{M68HC11/68HC12,,@command{ld} and the 68HC11 and 68HC12}. @end ifset -@ifset NIOSII -@xref{Nios II,,@command{ld} and the Altera Nios II}. -@end ifset @ifset POWERPC @xref{PowerPC ELF32,,@command{ld} and PowerPC 32-bit ELF Support}. @end ifset @@ -7748,9 +7744,6 @@ functionality are not listed. @ifset NDS32 * NDS32:: @command{ld} and NDS32 @end ifset -@ifset NIOSII -* Nios II:: @command{ld} and the Altera Nios II -@end ifset @ifset POWERPC * PowerPC ELF32:: @command{ld} and PowerPC 32-bit ELF Support @end ifset @@ -8456,43 +8449,6 @@ Avoid generating the IFC instruction inside the loop. @end ifclear @end ifset -@ifset NIOSII -@ifclear GENERIC -@raisesections -@end ifclear - -@node Nios II -@section @command{ld} and the Altera Nios II -@cindex Nios II call relaxation -@kindex --relax on Nios II - -Call and immediate jump instructions on Nios II processors are limited to -transferring control to addresses in the same 256MB memory segment, -which may result in @command{ld} giving -@samp{relocation truncated to fit} errors with very large programs. -The command-line option @option{--relax} enables the generation of -trampolines that can access the entire 32-bit address space for calls -outside the normal @code{call} and @code{jmpi} address range. These -trampolines are inserted at section boundaries, so may not themselves -be reachable if an input section and its associated call trampolines are -larger than 256MB. - -The @option{--relax} option is enabled by default unless @option{-r} -is also specified. You can disable trampoline generation by using the -@option{--no-relax} linker option. You can also disable this optimization -locally by using the @samp{set .noat} directive in assembly-language -source files, as the linker-inserted trampolines use the @code{at} -register as a temporary. - -Note that the linker @option{--relax} option is independent of assembler -relaxation options, and that using the GNU assembler's @option{-relax-all} -option interferes with the linker's more selective call instruction relaxation. - -@ifclear GENERIC -@lowersections -@end ifclear -@end ifset - @ifset POWERPC @ifclear GENERIC @raisesections diff --git a/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp index 578276e595e..405b9cac6e4 100644 --- a/ld/testsuite/ld-elf/binutils.exp +++ b/ld/testsuite/ld-elf/binutils.exp @@ -93,7 +93,6 @@ proc binutils_test { prog_name ld_options test {test_name ""} {readelf_options " || [istarget "hppa*-*-openbsd*"] \ || [istarget "metag-*-*"] \ || [istarget "mips*-*-*"] \ - || [istarget "nios2*-*-*"] \ || [istarget "or1k-*-*"] \ || [istarget "sh*-*-*"] \ || [istarget "x86_64-*-rdos*"])] diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp index 831dfae153e..3be2be71ca8 100644 --- a/ld/testsuite/ld-elf/elf.exp +++ b/ld/testsuite/ld-elf/elf.exp @@ -216,7 +216,6 @@ proc target_defaults_to_execstack {} { || [istarget "ia64*-*-*"] || [istarget "kvx*-*-*"] || [istarget "loongarch*-*-*"] - || [istarget "nios2*-*-*"] || [istarget "powerpc64*-*-*"] || [istarget "pru*-*-*"] || [istarget "riscv*-*-*"] diff --git a/ld/testsuite/ld-elf/tls.exp b/ld/testsuite/ld-elf/tls.exp index 63796cccdfe..8bb870fa459 100644 --- a/ld/testsuite/ld-elf/tls.exp +++ b/ld/testsuite/ld-elf/tls.exp @@ -75,5 +75,5 @@ if [file exists tmpdir/pr22263-1] { "pr22263-1" \ "" \ ] \ - ] ia64-*-* m68*-*-* nios2-*-* s390-*-* sh*-*-* + ] ia64-*-* m68*-*-* s390-*-* sh*-*-* } diff --git a/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp index 582991feb3f..ced9a4b49b5 100644 --- a/ld/testsuite/ld-elfcomm/elfcomm.exp +++ b/ld/testsuite/ld-elfcomm/elfcomm.exp @@ -166,9 +166,6 @@ proc stt_common_test { options testname } { # Explicitly use "-fcommon" so that even if $CFLAGS includes # "-fno-common", these tests are compiled as expected. set options "-fcommon $NOSANITIZE_CFLAGS $NOLTO_CFLAGS" -if [istarget nios2*-*-*] { - append options " -G0" -} if { ![ld_compile "$CC_FOR_TARGET $options" $srcdir/$subdir/common1a.c tmpdir/common1a.o] || ![ld_compile "$CC_FOR_TARGET $options" $srcdir/$subdir/common1b.c tmpdir/common1b.o] || ![ld_compile "$CC_FOR_TARGET $options -Wa,--elf-stt-common=yes" $srcdir/$subdir/common1b.c tmpdir/common1c.o] } { diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index 14d0a8755e7..685b406e916 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -38,7 +38,6 @@ if { ![is_elf_format] || ![supports_gnu_osabi] || [istarget mips*-*-*] || [istarget mn10300-*-*] || [istarget nds32*-*-*] - || [istarget nios2-*-*] || [istarget or1k-*-*] || [istarget score*-*-*] || [istarget sh*-*-*] diff --git a/ld/testsuite/ld-nios2/emit-relocs-1.d b/ld/testsuite/ld-nios2/emit-relocs-1.d deleted file mode 100644 index 5fee1054b8c..00000000000 --- a/ld/testsuite/ld-nios2/emit-relocs-1.d +++ /dev/null @@ -1,37 +0,0 @@ -#name: Emit relocs 1 -#source: emit-relocs-1a.s -#source: emit-relocs-1b.s -#ld: -q -T emit-relocs-1.ld -#objdump: -sr - -.*: file format .* - -RELOCATION RECORDS FOR \[\.data\]: -OFFSET +TYPE +VALUE -00000000 R_NIOS2_BFD_RELOC32 \.data -00000004 R_NIOS2_BFD_RELOC32 \.data\+0x00001000 -00000008 R_NIOS2_BFD_RELOC32 \.merge1\+0x00000002 -0000000c R_NIOS2_BFD_RELOC32 \.merge2 -00000010 R_NIOS2_BFD_RELOC32 \.merge3 -00000014 R_NIOS2_BFD_RELOC32 \.merge3\+0x00000004 -00000020 R_NIOS2_BFD_RELOC32 \.data\+0x00000020 -00000024 R_NIOS2_BFD_RELOC32 \.data\+0x00001020 -00000028 R_NIOS2_BFD_RELOC32 \.merge1 -0000002c R_NIOS2_BFD_RELOC32 \.merge2\+0x00000002 -00000030 R_NIOS2_BFD_RELOC32 \.merge3\+0x00000008 -00000034 R_NIOS2_BFD_RELOC32 \.merge3\+0x00000004 - - -Contents of section \.text: - 80000 3a880100 00000000 00000000 00000000 .* -Contents of section \.merge1: - 80400 666c7574 74657200 flutter.* -Contents of section \.merge2: - 80800 74617374 696e6700 tasting.* -Contents of section \.merge3: - 80c00 00010000 00020000 00030000 .* -Contents of section \.data: - 81000 00100800 00200800 02040800 00080800 .* - 81010 000c0800 040c0800 00000000 00000000 .* - 81020 20100800 20200800 00040800 02080800 .* - 81030 080c0800 040c0800 .* diff --git a/ld/testsuite/ld-nios2/emit-relocs-1.ld b/ld/testsuite/ld-nios2/emit-relocs-1.ld deleted file mode 100644 index 1879ef4cbe7..00000000000 --- a/ld/testsuite/ld-nios2/emit-relocs-1.ld +++ /dev/null @@ -1,20 +0,0 @@ -ENTRY(_start) -SECTIONS -{ - . = 0x80000; - .text : { *(.text) } - - . = ALIGN (0x400); - .merge1 : { *(.merge1) } - - . = ALIGN (0x400); - .merge2 : { *(.merge2) } - - . = ALIGN (0x400); - .merge3 : { *(.merge3) } - - . = ALIGN (0x400); - .data : { *(.data) } - - /DISCARD/ : { *(*) } -} diff --git a/ld/testsuite/ld-nios2/emit-relocs-1a.s b/ld/testsuite/ld-nios2/emit-relocs-1a.s deleted file mode 100644 index bf0a8a1689e..00000000000 --- a/ld/testsuite/ld-nios2/emit-relocs-1a.s +++ /dev/null @@ -1,24 +0,0 @@ - .text - .align 4 - .globl _start -_start: - nop - - .section .merge1,"aMS",@progbits,1 -A: .string "utter" - - .section .merge2,"aMS",@progbits,1 -B: .string "tasting" - - .section .merge3,"aM",@progbits,4 -C: .4byte 0x100 -D: .4byte 0x200 - - .data - .align 4 -E: .4byte E - .4byte E + 0x1000 - .4byte A - .4byte B - .4byte C - .4byte D diff --git a/ld/testsuite/ld-nios2/emit-relocs-1b.s b/ld/testsuite/ld-nios2/emit-relocs-1b.s deleted file mode 100644 index 82229c1495b..00000000000 --- a/ld/testsuite/ld-nios2/emit-relocs-1b.s +++ /dev/null @@ -1,18 +0,0 @@ - .section .merge1,"aMS",@progbits,1 -A: .string "flutter" - - .section .merge2,"aMS",@progbits,1 -B: .string "sting" - - .section .merge3,"aM",@progbits,4 -C: .4byte 0x300 -D: .4byte 0x200 - - .data - .align 4 -E: .4byte E - .4byte E + 0x1000 - .4byte A - .4byte B - .4byte C - .4byte D diff --git a/ld/testsuite/ld-nios2/gprel.d b/ld/testsuite/ld-nios2/gprel.d deleted file mode 100644 index 202aece4dc6..00000000000 --- a/ld/testsuite/ld-nios2/gprel.d +++ /dev/null @@ -1,17 +0,0 @@ -#name: NIOS2 gp-relative relocations -#source: gprel.s -#ld: -#objdump: -dr --prefix-addresses - -# Test the %gprel macro. - -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -[0-9a-f]+ <[^>]*> movui gp,[0-9]+ -[0-9a-f]+ <[^>]*> ldw at,-[0-9]+\(gp\) -[0-9a-f]+ <[^>]*> ldw r2,-[0-9]+\(gp\) -[0-9a-f]+ <[^>]*> ldb r3,-[0-9]+\(gp\) -[0-9a-f]+ <[^>]*> ldw at,-[0-9]+\(gp\) -[0-9a-f]+ <[^>]*> ldw r2,-[0-9]+\(gp\) -[0-9a-f]+ <[^>]*> ldb r3,-[0-9]+\(gp\) diff --git a/ld/testsuite/ld-nios2/gprel.s b/ld/testsuite/ld-nios2/gprel.s deleted file mode 100644 index 24147229190..00000000000 --- a/ld/testsuite/ld-nios2/gprel.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat - -.sdata - -sym1: -.long 0xdead -sym2: -.long 0xbeef -sym3: -.byte 0x7f - -.section .sbss, "w" -sym4: -.long 0 -sym5: -.long 0 -sym6: -.byte 0 - -.text -.global _start -_start: - movui gp, _gp - ldw r1, %gprel(sym1)(gp) - ldw r2, %gprel(sym2)(gp) - ldb r3, %gprel(sym3)(gp) - ldw r1, %gprel(sym4)(gp) - ldw r2, %gprel(sym5)(gp) - ldb r3, %gprel(sym6)(gp) diff --git a/ld/testsuite/ld-nios2/hilo16.d b/ld/testsuite/ld-nios2/hilo16.d deleted file mode 100644 index c7034133922..00000000000 --- a/ld/testsuite/ld-nios2/hilo16.d +++ /dev/null @@ -1,13 +0,0 @@ -#name: NIOS2 R_NIOS2_HI16,LO16,HIADJ16 -#source: hilo16.s -#source: hilo16_symbol.s -#ld: -#objdump: -dr --prefix-addresses - -# Test the %hi, %lo and %hiadi relocations -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -[0-9a-f]+ <[^>]*> addi at,at,-8531 -[0-9a-f]+ <[^>]*> addi at,at,-16657 -[0-9a-f]+ <[^>]*> addi at,at,-8530 diff --git a/ld/testsuite/ld-nios2/hilo16.s b/ld/testsuite/ld-nios2/hilo16.s deleted file mode 100644 index 47b404f1776..00000000000 --- a/ld/testsuite/ld-nios2/hilo16.s +++ /dev/null @@ -1,10 +0,0 @@ -# Test the %hi, lo and %hiadj relocations - -.set noat - -.text -.global _start -_start: - addi r1, r1, %hi(long_symbol) - addi r1, r1, %lo(long_symbol) - addi r1, r1, %hiadj(long_symbol) diff --git a/ld/testsuite/ld-nios2/hilo16_symbol.s b/ld/testsuite/ld-nios2/hilo16_symbol.s deleted file mode 100644 index 88fdddccae3..00000000000 --- a/ld/testsuite/ld-nios2/hilo16_symbol.s +++ /dev/null @@ -1,3 +0,0 @@ -.global long_symbol -.set long_symbol, 0xDEADBEEF - diff --git a/ld/testsuite/ld-nios2/imm5.d b/ld/testsuite/ld-nios2/imm5.d deleted file mode 100644 index 2640c9c6230..00000000000 --- a/ld/testsuite/ld-nios2/imm5.d +++ /dev/null @@ -1,13 +0,0 @@ -#name: NIOS2 R_NIOS2_IMM5 -#source: imm5.s -#source: imm5_symbol.s -#ld: -#objdump: -dr --prefix-addresses - -# Test the branch instructions. -.*: +file format elf32-littlenios2 - -Disassembly of section .text: -[0-9a-f]+ <[^>]*> roli at,at,31 -[0-9a-f]+ <.[^>]*> Address 0x[0-9a-f]+ is out of bounds. - diff --git a/ld/testsuite/ld-nios2/imm5.s b/ld/testsuite/ld-nios2/imm5.s deleted file mode 100644 index 21bbfc3c45e..00000000000 --- a/ld/testsuite/ld-nios2/imm5.s +++ /dev/null @@ -1,9 +0,0 @@ -# Test the imm5 relocation - -.set noat -.text -.global _start -_start: - roli r1, r1, imm5 - - diff --git a/ld/testsuite/ld-nios2/imm5_symbol.s b/ld/testsuite/ld-nios2/imm5_symbol.s deleted file mode 100644 index d9889514013..00000000000 --- a/ld/testsuite/ld-nios2/imm5_symbol.s +++ /dev/null @@ -1,4 +0,0 @@ -.global imm5 -.text -.byte imm5 -.set imm5, 31 diff --git a/ld/testsuite/ld-nios2/mixed1a.d b/ld/testsuite/ld-nios2/mixed1a.d deleted file mode 100644 index 0c7d66689d1..00000000000 --- a/ld/testsuite/ld-nios2/mixed1a.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 mixed1a -#source: mixed1a.s -#as: -march=r2 -#readelf: -h - -ELF Header: -#... - Flags: 0x1 -#... diff --git a/ld/testsuite/ld-nios2/mixed1a.s b/ld/testsuite/ld-nios2/mixed1a.s deleted file mode 100644 index 8742f1cef1e..00000000000 --- a/ld/testsuite/ld-nios2/mixed1a.s +++ /dev/null @@ -1,9 +0,0 @@ -# Test linking incompatible object file types. - -.text -.global _start -_start: - movhi r2, %hiadj(foo) - addi r2, r2, %lo(foo) - ldw r2, 0(r2) - cmpeq r2, r2, zero diff --git a/ld/testsuite/ld-nios2/mixed1b.d b/ld/testsuite/ld-nios2/mixed1b.d deleted file mode 100644 index a702c5adb56..00000000000 --- a/ld/testsuite/ld-nios2/mixed1b.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 mixed1b -#source: mixed1b.s -#as: -march=r1 -#readelf: -h - -ELF Header: -#... - Flags: 0x0 -#... diff --git a/ld/testsuite/ld-nios2/mixed1b.s b/ld/testsuite/ld-nios2/mixed1b.s deleted file mode 100644 index 0d075905a3a..00000000000 --- a/ld/testsuite/ld-nios2/mixed1b.s +++ /dev/null @@ -1,3 +0,0 @@ -# Test linking incompatible object file types. - -.comm foo,4,4 diff --git a/ld/testsuite/ld-nios2/nios2.exp b/ld/testsuite/ld-nios2/nios2.exp deleted file mode 100644 index c7860a46800..00000000000 --- a/ld/testsuite/ld-nios2/nios2.exp +++ /dev/null @@ -1,28 +0,0 @@ -if { ! [istarget nios2-*-*] } { - return -} - -foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] { - run_dump_test [file rootname $test] -} - -set test_name "NIOS2 Mixed R1 and R2 objects" -set test mixed1 - -if ![ld_assemble $as "-march=r1 $srcdir/$subdir/${test}a.s" tmpdir/${test}a.o] { - fail "Build mixed1a.o" - return -} - -if ![ld_assemble $as "-march=r2 $srcdir/$subdir/${test}b.s" tmpdir/${test}b.o] { - fail "Build mixed1b.o" - return -} - -if { ![ld_link $ld tmpdir/$test "tmpdir/${test}a.o tmpdir/${test}b.o"] } { - if [string match "*architecture * is incompatible*" $link_output] { - pass "$test_name" - } { - fail "$test_name" - } -} diff --git a/ld/testsuite/ld-nios2/pcrel16.d b/ld/testsuite/ld-nios2/pcrel16.d deleted file mode 100644 index d4dda2e9e85..00000000000 --- a/ld/testsuite/ld-nios2/pcrel16.d +++ /dev/null @@ -1,15 +0,0 @@ -#name: NIOS2 R_NIOS2_PCREL16 -#source: pcrel16.s -#source: pcrel16_label.s -#ld: -#objdump: -dr --prefix-addresses - -# Test the relative branch relocations. -.*: +file format elf32-littlenios2 - -Disassembly of section .text: - -[0-9a-f]+ <[^>]*> br [0-9a-f]+ <ext_label> -[0-9a-f]+ <[^>]*> br [0-9a-f]+ <ext_label\+0x10> -[0-9a-f]+ <[^>]*> nop -[0-9a-f]+ <[^>]*> nop diff --git a/ld/testsuite/ld-nios2/pcrel16.s b/ld/testsuite/ld-nios2/pcrel16.s deleted file mode 100644 index 61c1c7e51d9..00000000000 --- a/ld/testsuite/ld-nios2/pcrel16.s +++ /dev/null @@ -1,8 +0,0 @@ -# Test for pc-relative relocations -.set norelax -.text -.global _start -_start: - br ext_label - br ext_label + 16 - diff --git a/ld/testsuite/ld-nios2/pcrel16_label.s b/ld/testsuite/ld-nios2/pcrel16_label.s deleted file mode 100644 index 3a766126925..00000000000 --- a/ld/testsuite/ld-nios2/pcrel16_label.s +++ /dev/null @@ -1,5 +0,0 @@ -.text -ext_label: - nop - nop -.global ext_label diff --git a/ld/testsuite/ld-nios2/relax_call26.s b/ld/testsuite/ld-nios2/relax_call26.s deleted file mode 100644 index b3b28dff6ca..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26.s +++ /dev/null @@ -1,27 +0,0 @@ -# test for call26 relaxation via linker stubs - -.globl text0 -.section text0, "ax", @progbits - call func0 # in same section - call func1 # in nearby section - call func2a # in distant section - jmpi func2b # also in distant section - -func0: - ret - -.section text1, "ax", @progbits -func1: - nop - nop - call func2a # in distant section - ret - -.section text2, "ax", @progbits -func2a: - nop - nop - nop - ret -func2b: - nop diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary.ld b/ld/testsuite/ld-nios2/relax_call26_boundary.ld deleted file mode 100644 index 313ef8cbfac..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary.ld +++ /dev/null @@ -1,14 +0,0 @@ -/* Simple script for testing call26 relaxation via linker stubs. - This script is used for a bunch of tests that vary the placement of - section text0 near a 256 memory segment boundary, by using - --section-start command-line options. */ - -OUTPUT_FORMAT("elf32-littlenios2", "elf32-littlenios2", "elf32-littlenios2") -OUTPUT_ARCH(nios2) -ENTRY(_start) -SECTIONS -{ - _start = .; - text0 : { *(text0) *(text1) } - text2 0x40000000 : { *(text2) } -} diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary.s b/ld/testsuite/ld-nios2/relax_call26_boundary.s deleted file mode 100644 index ce79ebdffd8..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary.s +++ /dev/null @@ -1,29 +0,0 @@ -# Test for call26 relaxation via linker stubs. -# This .s file is used with several different linker scripts that vary the -# placement of the sections in the output. -# Section text0 is 32 bytes long and requires at least 2 linker stubs -# (12 bytes each) to reach the call destinations in text2. Another stub -# may be required to reach func0 if the section is laid out so that it crosses -# a 256MB memory segment boundary. - -.globl text0 -.section text0, "ax", @progbits - call func0 # in same section - call func2a # in distant section - nop - nop - nop - nop - jmpi func2b # in distant section - -func0: - ret - -.section text2, "ax", @progbits -func2a: - nop - nop - nop - ret -func2b: - nop diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary_c8.d b/ld/testsuite/ld-nios2/relax_call26_boundary_c8.d deleted file mode 100644 index 61fd858cbb4..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary_c8.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_boundary_c8 -#ld: --relax -Trelax_call26_boundary.ld --section-start=text0=0x0fffffc8 -#source: relax_call26_boundary.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary_cc.d b/ld/testsuite/ld-nios2/relax_call26_boundary_cc.d deleted file mode 100644 index c3a571afbad..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary_cc.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_boundary_cc -#ld: --relax -Trelax_call26_boundary.ld --section-start=text0=0x0fffffcc -#source: relax_call26_boundary.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary_d0.d b/ld/testsuite/ld-nios2/relax_call26_boundary_d0.d deleted file mode 100644 index 67f28ce898f..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary_d0.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_boundary_d0 -#ld: --relax -Trelax_call26_boundary.ld --section-start=text0=0x0fffffd0 -#source: relax_call26_boundary.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary_d4.d b/ld/testsuite/ld-nios2/relax_call26_boundary_d4.d deleted file mode 100644 index 9ffdf0e257a..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary_d4.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_boundary_d4 -#ld: --relax -Trelax_call26_boundary.ld --section-start=text0=0x0fffffd4 -#source: relax_call26_boundary.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary_d8.d b/ld/testsuite/ld-nios2/relax_call26_boundary_d8.d deleted file mode 100644 index 168d5327b67..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary_d8.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_boundary_d8 -#ld: --relax -Trelax_call26_boundary.ld --section-start=text0=0x0fffffd8 -#source: relax_call26_boundary.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary_dc.d b/ld/testsuite/ld-nios2/relax_call26_boundary_dc.d deleted file mode 100644 index 539051ebc18..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary_dc.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_boundary_dc -#ld: --relax -Trelax_call26_boundary.ld --section-start=text0=0x0fffffdc -#source: relax_call26_boundary.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary_f0.d b/ld/testsuite/ld-nios2/relax_call26_boundary_f0.d deleted file mode 100644 index fe83151c718..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary_f0.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_boundary_f0 -#ld: --relax -Trelax_call26_boundary.ld --section-start=text0=0x0ffffff0 -#source: relax_call26_boundary.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary_f4.d b/ld/testsuite/ld-nios2/relax_call26_boundary_f4.d deleted file mode 100644 index 4006ff2199a..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary_f4.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_boundary_f4 -#ld: --relax -Trelax_call26_boundary.ld --section-start=text0=0x0ffffff4 -#source: relax_call26_boundary.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary_f8.d b/ld/testsuite/ld-nios2/relax_call26_boundary_f8.d deleted file mode 100644 index 10eb654af2b..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary_f8.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_boundary_f8 -#ld: --relax -Trelax_call26_boundary.ld --section-start=text0=0x0ffffff8 -#source: relax_call26_boundary.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_boundary_fc.d b/ld/testsuite/ld-nios2/relax_call26_boundary_fc.d deleted file mode 100644 index cf93b5a71f2..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_boundary_fc.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_boundary_fc -#ld: --relax -Trelax_call26_boundary.ld --section-start=text0=0x0ffffffc -#source: relax_call26_boundary.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_cache.d b/ld/testsuite/ld-nios2/relax_call26_cache.d deleted file mode 100644 index 43121c007a9..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_cache.d +++ /dev/null @@ -1,9 +0,0 @@ -#name: NIOS2 relax_call26_cache -#ld: --relax -Trelax_call26_cache.ld -#source: relax_call26_cache.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs. We don't need to -# check the exact layout of stubs for this test, only verify that it -# links without "relocation truncated to fit" errors. - -#pass diff --git a/ld/testsuite/ld-nios2/relax_call26_cache.ld b/ld/testsuite/ld-nios2/relax_call26_cache.ld deleted file mode 100644 index d3c43071f59..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_cache.ld +++ /dev/null @@ -1,13 +0,0 @@ -/* Simple script for testing call26 relaxation via linker stubs. - In this case, input sections text0 and text1 are placed in the - same output section in the same 256MB segment, so they can share stubs. */ - -OUTPUT_FORMAT("elf32-littlenios2", "elf32-littlenios2", "elf32-littlenios2") -OUTPUT_ARCH(nios2) -ENTRY(_start) -SECTIONS -{ - _start = .; - text0 0x0fffffe0 : { *(text0) *(text1) } - text2 0x40000000 : { *(text2) } -} diff --git a/ld/testsuite/ld-nios2/relax_call26_cache.s b/ld/testsuite/ld-nios2/relax_call26_cache.s deleted file mode 100644 index 37128530da8..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_cache.s +++ /dev/null @@ -1,28 +0,0 @@ -# test for call26 relaxation via linker stubs -# -# The purpose of this test is to ensure that, when section text0 straddles -# a 256MB memory segment boundary with calls to the same function on either -# side, the stub caching doesn't get confused and incorrectly use a stub -# on the wrong side. - -.globl text0 -.section text0, "ax", @progbits - call func2a # in distant section - call func2a # in distant section - nop - nop - nop - nop - nop - nop - nop - nop - nop - nop - call func2a # in distant section - call func2a # in distant section - -.section text2, "ax", @progbits -.globl func2a -func2a: - ret diff --git a/ld/testsuite/ld-nios2/relax_call26_multi.d b/ld/testsuite/ld-nios2/relax_call26_multi.d deleted file mode 100644 index 28279efc918..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_multi.d +++ /dev/null @@ -1,36 +0,0 @@ -#name: NIOS2 relax_call26_multi -#ld: --relax -Trelax_call26_multi.ld -#source: relax_call26.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs - -.*: +file format elf32-littlenios2 - -Disassembly of section text0: -00000000 <_start> call 00000010 <func0> -00000004 <[^>]*> call 0000002c <func1> -00000008 <[^>]*> call 00000020 <[^>]*> -0000000c <[^>]*> jmpi 00000014 <[^>]*> -00000010 <func0> ret -00000014 <[^>]*> movhi at,16384 -00000018 <[^>]*> addi at,at,16 -0000001c <[^>]*> jmp at -00000020 <[^>]*> movhi at,16384 -00000024 <[^>]*> addi at,at,0 -00000028 <[^>]*> jmp at - -Disassembly of section text1: -0000002c <func1> nop -00000030 <[^>]*> nop -00000034 <[^>]*> call 0000003c <[^>]*> -00000038 <[^>]*> ret -0000003c <[^>]*> movhi at,16384 -00000040 <[^>]*> addi at,at,0 -00000044 <[^>]*> jmp at - -Disassembly of section text2: -40000000 <func2a> nop -40000004 <[^>]*> nop -40000008 <[^>]*> nop -4000000c <[^>]*> ret -40000010 <func2b> nop diff --git a/ld/testsuite/ld-nios2/relax_call26_multi.ld b/ld/testsuite/ld-nios2/relax_call26_multi.ld deleted file mode 100644 index 750f7473480..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_multi.ld +++ /dev/null @@ -1,14 +0,0 @@ -/* Simple script for testing call26 relaxation via linker stubs. - In this case, input sections text0 and text1 cannot share stubs - because they are in different output sections. */ - -OUTPUT_FORMAT("elf32-littlenios2", "elf32-littlenios2", "elf32-littlenios2") -OUTPUT_ARCH(nios2) -ENTRY(_start) -SECTIONS -{ - _start = .; - text0 0 : { *(text0) } - text1 : { *(text1) } - text2 0x40000000 : { *(text2) } -} diff --git a/ld/testsuite/ld-nios2/relax_call26_norelax.d b/ld/testsuite/ld-nios2/relax_call26_norelax.d deleted file mode 100644 index 7c7371c3a10..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_norelax.d +++ /dev/null @@ -1,5 +0,0 @@ -#name: NIOS2 relax_call26_norelax -#ld: --no-relax -Trelax_call26_multi.ld -#source: relax_call26.s -#error: .*relocation truncated to fit: R_NIOS2_CALL26.* -# Test relaxation of call26 relocations via linker stubs diff --git a/ld/testsuite/ld-nios2/relax_call26_shared.d b/ld/testsuite/ld-nios2/relax_call26_shared.d deleted file mode 100644 index 75ccbca4193..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_shared.d +++ /dev/null @@ -1,31 +0,0 @@ -#name: NIOS2 relax_call26_shared -#ld: --relax -Trelax_call26_shared.ld -#source: relax_call26.s -#objdump: -dr --prefix-addresses -# Test relaxation of call26 relocations via linker stubs - -.*: +file format elf32-littlenios2 - -Disassembly of section text0: -00000000 <_start> call 00000010 <func0> -00000004 <[^>]*> call 00000014 <func1> -00000008 <[^>]*> call 00000030 <[^>]*> -0000000c <[^>]*> jmpi 00000024 <[^>]*> -00000010 <func0> ret -00000014 <func1> nop -00000018 <[^>]*> nop -0000001c <[^>]*> call 00000030 <[^>]*> -00000020 <[^>]*> ret -00000024 <[^>]*> movhi at,16384 -00000028 <[^>]*> addi at,at,16 -0000002c <[^>]*> jmp at -00000030 <[^>]*> movhi at,16384 -00000034 <[^>]*> addi at,at,0 -00000038 <[^>]*> jmp at - -Disassembly of section text2: -40000000 <func2a> nop -40000004 <[^>]*> nop -40000008 <[^>]*> nop -4000000c <[^>]*> ret -40000010 <func2b> nop diff --git a/ld/testsuite/ld-nios2/relax_call26_shared.ld b/ld/testsuite/ld-nios2/relax_call26_shared.ld deleted file mode 100644 index 6e6fd44d64a..00000000000 --- a/ld/testsuite/ld-nios2/relax_call26_shared.ld +++ /dev/null @@ -1,13 +0,0 @@ -/* Simple script for testing call26 relaxation via linker stubs. - In this case, input sections text0 and text1 are placed in the - same output section in the same 256MB segment, so they can share stubs. */ - -OUTPUT_FORMAT("elf32-littlenios2", "elf32-littlenios2", "elf32-littlenios2") -OUTPUT_ARCH(nios2) -ENTRY(_start) -SECTIONS -{ - _start = .; - text0 0 : { *(text0) *(text1) } - text2 0x40000000 : { *(text2) } -} diff --git a/ld/testsuite/ld-nios2/relax_callr.d b/ld/testsuite/ld-nios2/relax_callr.d deleted file mode 100644 index 7d40fe40053..00000000000 --- a/ld/testsuite/ld-nios2/relax_callr.d +++ /dev/null @@ -1,24 +0,0 @@ -#name: NIOS2 relax_callr -#as: -relax-all -#ld: --relax -Trelax_callr.ld -#source: relax_callr.s -#objdump: -dr --prefix-addresses -# Test relaxation of callr - -.*: +file format elf32-littlenios2 - -Disassembly of section text1: -00000000 <[^>]*> movhi at,2048 -00000004 <[^>]*> ori at,at,0 -00000008 <[^>]*> callr at -0000000c <[^>]*> movhi at,2048 -00000010 <[^>]*> ori at,at,20 -00000014 <[^>]*> callr at - -Disassembly of section text2: -08000000 <func> nop -08000004 <[^>]*> br 08000014 <func1> -08000008 <[^>]*> nop -0800000c <[^>]*> nop -08000010 <[^>]*> nop -08000014 <func1> nop diff --git a/ld/testsuite/ld-nios2/relax_callr.ld b/ld/testsuite/ld-nios2/relax_callr.ld deleted file mode 100644 index bc02d40aa8c..00000000000 --- a/ld/testsuite/ld-nios2/relax_callr.ld +++ /dev/null @@ -1,11 +0,0 @@ -/* Simple script for testing relaxation */ - -OUTPUT_FORMAT("elf32-littlenios2", "elf32-littlenios2", "elf32-littlenios2") -OUTPUT_ARCH(nios2) -ENTRY(_start) -SECTIONS -{ - _start = .; - text1 0 : { *(text1) } - text2 0x08000000 : { *(text2) } -} diff --git a/ld/testsuite/ld-nios2/relax_callr.s b/ld/testsuite/ld-nios2/relax_callr.s deleted file mode 100644 index b4cc2c473f5..00000000000 --- a/ld/testsuite/ld-nios2/relax_callr.s +++ /dev/null @@ -1,17 +0,0 @@ -# relaxation test for callr - -.globl text1 -.section text1, "ax", @progbits - - call func - call func1 - -.section text2, "ax", @progbits -func: - nop - br func1 - nop - nop - nop -func1: - nop diff --git a/ld/testsuite/ld-nios2/relax_cjmp.d b/ld/testsuite/ld-nios2/relax_cjmp.d deleted file mode 100644 index 535c59d5b20..00000000000 --- a/ld/testsuite/ld-nios2/relax_cjmp.d +++ /dev/null @@ -1,38 +0,0 @@ -#name: NIOS2 relax_cjmp -#as: -relax-all -#ld: --relax -Trelax_jmp.ld -#source: relax_cjmp.s -#objdump: -dr --prefix-addresses - -# Test relaxation of conditional jumps - -.*: +file format elf32-littlenios2 - -Disassembly of section text2: -00000000 <[^>]*> bge r2,r3,00008000 <[^>]*> -00000004 <[^>]*> bge r2,r3,00000014 <[^>]*> -00000008 <[^>]*> movhi at,1 -0000000c <[^>]*> ori at,at,24 -00000010 <[^>]*> jmp at -00000014 <[^>]*> bge r3,r2,00000020 <sym> -00000018 <[^>]*> nop -0000001c <[^>]*> nop -00000020 <sym> nop - -Disassembly of section text1: -00008000 <[^>]*> beq r2,r3,00010000 <on_border> -00008004 <[^>]*> bne r2,r3,00008014 <[^>]*> -00008008 <[^>]*> movhi at,1 -0000800c <[^>]*> ori at,at,24 -00008010 <[^>]*> jmp at -00008014 <[^>]*> nop -00008018 <[^>]*> nop -#... -00010000 <on_border> bne r2,r3,00010018 <in_range> -00010004 <[^>]*> nop -00010008 <[^>]*> nop -0001000c <[^>]*> nop -00010010 <[^>]*> nop -00010014 <[^>]*> nop -00010018 <in_range> nop -#pass diff --git a/ld/testsuite/ld-nios2/relax_cjmp.s b/ld/testsuite/ld-nios2/relax_cjmp.s deleted file mode 100644 index af00a1e381e..00000000000 --- a/ld/testsuite/ld-nios2/relax_cjmp.s +++ /dev/null @@ -1,32 +0,0 @@ -# relaxing conditional jumps -- absolute - -.globl text1 -.section text1, "ax", @progbits - beq r2, r3, on_border - beq r2, r3, out_of_range - nop - nop - -.align 15 -on_border: - bne r2, r3, in_range - nop - nop - nop - nop - nop -out_of_range: -in_range: - nop - -.globl text2 -.section text2, "ax", @progbits - - bge r2, r3, text1 - blt r2, r3, out_of_range - ble r2, r3, sym - nop - nop -sym: - nop - diff --git a/ld/testsuite/ld-nios2/relax_jmp.ld b/ld/testsuite/ld-nios2/relax_jmp.ld deleted file mode 100644 index df6c2208e82..00000000000 --- a/ld/testsuite/ld-nios2/relax_jmp.ld +++ /dev/null @@ -1,11 +0,0 @@ -/* Simple script for testing relaxation */ - -OUTPUT_FORMAT("elf32-littlenios2", "elf32-littlenios2", "elf32-littlenios2") -OUTPUT_ARCH(nios2) -ENTRY(_start) -SECTIONS -{ - _start = .; - text2 0 : { *(text2) } - text1 0x8000 : { *(text1) } -} diff --git a/ld/testsuite/ld-nios2/relax_section.d b/ld/testsuite/ld-nios2/relax_section.d deleted file mode 100644 index 93980cdcd0c..00000000000 --- a/ld/testsuite/ld-nios2/relax_section.d +++ /dev/null @@ -1,35 +0,0 @@ -#name: NIOS2 relax_section -#as: -relax-section -#ld: --relax -Trelax_jmp.ld -#source: relax_section.s -#objdump: -dr --prefix-addresses - -# Test relaxation of section - -.*: +file format elf32-littlenios2 - -Disassembly of section text1: -00008000 <[^>]*> bne r2,r3,00008010 <[^>]*> -00008004 <[^>]*> nextpc at -00008008 <[^>]*> addi at,at,32764 -0000800c <[^>]*> jmp at -00008010 <[^>]*> bge r2,r3,00008024 <[^>]*> -00008014 <[^>]*> nextpc at -00008018 <[^>]*> addi at,at,32767 -0000801c <[^>]*> addi at,at,9 -00008020 <[^>]*> jmp at -00008024 <[^>]*> bne r2,r3,00008030 <in_range> -00008028 <[^>]*> nop -0000802c <[^>]*> nop -00008030 <in_range> nop -#... -00010000 <[^>]*> br 00008030 <in_range> -00010004 <just_out_of_range> nop -00010008 <[^>]*> nop -0001000c <[^>]*> nop -00010010 <[^>]*> nop -00010014 <[^>]*> nop -00010018 <[^>]*> nop -0001001c <[^>]*> nop -00010020 <farther_out_of_range> nop -#pass diff --git a/ld/testsuite/ld-nios2/relax_section.s b/ld/testsuite/ld-nios2/relax_section.s deleted file mode 100644 index 0e803d115a6..00000000000 --- a/ld/testsuite/ld-nios2/relax_section.s +++ /dev/null @@ -1,23 +0,0 @@ -# relaxing conditional and unconditional jumps -- pc-relative - -.globl text1 -.section text1, "ax", @progbits - beq r2, r3, just_out_of_range - blt r2, r3, farther_out_of_range - bne r2, r3, in_range - nop - nop -in_range: - nop -.align 15 - br in_range -just_out_of_range: - nop - nop - nop - nop - nop - nop - nop -farther_out_of_range: - nop diff --git a/ld/testsuite/ld-nios2/relax_ujmp.d b/ld/testsuite/ld-nios2/relax_ujmp.d deleted file mode 100644 index 68313c123b1..00000000000 --- a/ld/testsuite/ld-nios2/relax_ujmp.d +++ /dev/null @@ -1,32 +0,0 @@ -#name: NIOS2 relax_ujmp -#as: -relax-all -#ld: --relax -Trelax_jmp.ld -#source: relax_ujmp.s -#objdump: -dr --prefix-addresses - -# Test relaxation of unconditional jumps - -.*: +file format elf32-littlenios2 - -Disassembly of section text2: -00000000 <[^>]*> br 00008000 <[^>]*> -00000004 <[^>]*> movhi at,1 -00000008 <[^>]*> ori at,at,16 -0000000c <[^>]*> jmp at -00000010 <[^>]*> br 0000001c <sym> -00000014 <[^>]*> nop -00000018 <[^>]*> nop -0000001c <sym> nop - -Disassembly of section text1: -00008000 <[^>]*> br 00010000 <on_border> -00008004 <[^>]*> movhi at,1 -00008008 <[^>]*> ori at,at,16 -0000800c <[^>]*> jmp at -#... -00010000 <on_border> br 00010010 <in_range> -00010004 <[^>]*> nop -00010008 <[^>]*> nop -0001000c <[^>]*> nop -00010010 <in_range> nop -#pass diff --git a/ld/testsuite/ld-nios2/relax_ujmp.s b/ld/testsuite/ld-nios2/relax_ujmp.s deleted file mode 100644 index 8982d739790..00000000000 --- a/ld/testsuite/ld-nios2/relax_ujmp.s +++ /dev/null @@ -1,37 +0,0 @@ -# relaxing unconditional jumps - -.globl text1 -.section text1, "ax", @progbits - - br on_border - br out_of_range - nop - nop - - -.align 15 -# nop -# nop -on_border: - br in_range - nop - nop - nop -out_of_range: -in_range: - nop - -.globl text2 -.section text2, "ax", @progbits - - br text1 - br out_of_range - br sym - nop - nop -sym: - nop - - - - diff --git a/ld/testsuite/ld-nios2/reloc.d b/ld/testsuite/ld-nios2/reloc.d deleted file mode 100644 index cb2959d23da..00000000000 --- a/ld/testsuite/ld-nios2/reloc.d +++ /dev/null @@ -1,10 +0,0 @@ -#name: NIOS2 R_NIOS2_BFD_RELOC_XX -#source: reloc.s -#source: reloc_symbol.s -#ld: -#objdump: -s - -.*: +file format elf32-littlenios2 - -Contents of section .text: - [0-9a-f]+ fa00cefa efbeadde facefaef beadde00 ................ diff --git a/ld/testsuite/ld-nios2/reloc.s b/ld/testsuite/ld-nios2/reloc.s deleted file mode 100644 index 2d555c35477..00000000000 --- a/ld/testsuite/ld-nios2/reloc.s +++ /dev/null @@ -1,9 +0,0 @@ -# Test for Nios II 32-bit, 16 and 8-bit relocations - -.global byte_sym -.global short_sym -.global long_sym - -.set byte_sym, 0xFA -.set short_sym, 0xFACE -.set long_sym, 0xDEADBEEF diff --git a/ld/testsuite/ld-nios2/reloc_symbol.s b/ld/testsuite/ld-nios2/reloc_symbol.s deleted file mode 100644 index fa7ac955458..00000000000 --- a/ld/testsuite/ld-nios2/reloc_symbol.s +++ /dev/null @@ -1,24 +0,0 @@ -.text -.global _start -_start: - -# byte aligned -.align 0 -.byte byte_sym - -# short aligned -.align 1 -.short short_sym - -# word aligned -.align 2 -.long long_sym - -# now lets try some unaligned words and halfwords -.byte byte_sym -.2byte short_sym -.4byte long_sym - -#.align 2 -#nop - diff --git a/ld/testsuite/ld-nios2/s16.d b/ld/testsuite/ld-nios2/s16.d deleted file mode 100644 index 6257e18078d..00000000000 --- a/ld/testsuite/ld-nios2/s16.d +++ /dev/null @@ -1,12 +0,0 @@ -#name: NIOS2 R_NIOS2_S16 -#source: s16.s -#source: s16_symbol.s -#ld: -#objdump: -s - -# Test the signed 16-bit relocations. -.*: +file format elf32-littlenios2 - -Contents of section .text: - [0-9a-f]+ 04004408 04006008 c4ff5f08 44004808 ..D...`..._.D.H. - [0-9a-f]+ 44004008 D.@. diff --git a/ld/testsuite/ld-nios2/s16.s b/ld/testsuite/ld-nios2/s16.s deleted file mode 100644 index df13efa006f..00000000000 --- a/ld/testsuite/ld-nios2/s16.s +++ /dev/null @@ -1,16 +0,0 @@ -# Test for Nios II 32-bit, 16 and 8-bit relocations - -.set noat -.set some_other_sym, 0x1000 -.text -.global _start -_start: -# signed 16-bit relocation - addi r1, r1, some_sym - addi r1, r1, min - addi r1, r1, max - addi r1, r1, some_sym + some_other_sym + 1 - addi r1, r1, some_sym - some_other_sym + 1 - - - diff --git a/ld/testsuite/ld-nios2/s16_symbol.s b/ld/testsuite/ld-nios2/s16_symbol.s deleted file mode 100644 index 3902177fd93..00000000000 --- a/ld/testsuite/ld-nios2/s16_symbol.s +++ /dev/null @@ -1,10 +0,0 @@ -.global some_sym -.global some_other_sym -.global min -.global max - -.set max, 0x7fff -.set min, -0x8000 -.set some_sym, 0x1000 - - diff --git a/ld/testsuite/ld-nios2/u16.d b/ld/testsuite/ld-nios2/u16.d deleted file mode 100644 index 7d1df05711e..00000000000 --- a/ld/testsuite/ld-nios2/u16.d +++ /dev/null @@ -1,12 +0,0 @@ -#name: NIOS2 R_NIOS2_U16 -#source: u16.s -#source: u16_symbol.s -#ld: -#objdump: -s - -# Test the unsigned 16-bit relocations. -.*: +file format elf32-littlenios2 - -Contents of section .text: - [0-9a-f]+ 0c004408 0c004008 ccff7f08 4c004808 ..D...@.....L.H. - [0-9a-f]+ 4c004008 L.@. diff --git a/ld/testsuite/ld-nios2/u16.s b/ld/testsuite/ld-nios2/u16.s deleted file mode 100644 index b8906823915..00000000000 --- a/ld/testsuite/ld-nios2/u16.s +++ /dev/null @@ -1,16 +0,0 @@ -# Test for Nios II 32-bit, 16 and 8-bit relocations - -.set noat -.set some_other_sym, 0x1000 -.text -.global _start -_start: -# unsigned 16-bit relocation - andi r1, r1, some_sym - andi r1, r1, min - andi r1, r1, max - andi r1, r1, some_sym + some_other_sym + 1 - andi r1, r1, some_sym - some_other_sym + 1 - - - diff --git a/ld/testsuite/ld-nios2/u16_symbol.s b/ld/testsuite/ld-nios2/u16_symbol.s deleted file mode 100644 index 518b4def8e2..00000000000 --- a/ld/testsuite/ld-nios2/u16_symbol.s +++ /dev/null @@ -1,9 +0,0 @@ -.global some_sym -.global min -.global max - -.set max, 0xffff -.set min, 0 -.set some_sym, 0x1000 - - diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index a173c8e6f36..bf5344bd569 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -214,8 +214,6 @@ TARGET32_LIBOPCODES_CFILES = \ mt-opc.c \ nds32-asm.c \ nds32-dis.c \ - nios2-dis.c \ - nios2-opc.c \ ns32k-dis.c \ or1k-asm.c \ or1k-desc.c \ diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 57aaed26da8..ed6366d648e 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -617,8 +617,6 @@ TARGET32_LIBOPCODES_CFILES = \ mt-opc.c \ nds32-asm.c \ nds32-dis.c \ - nios2-dis.c \ - nios2-opc.c \ ns32k-dis.c \ or1k-asm.c \ or1k-desc.c \ @@ -1000,8 +998,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nds32-asm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nds32-dis.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfp-dis.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nios2-dis.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nios2-opc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ns32k-dis.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/or1k-asm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/or1k-desc.Plo@am__quote@ diff --git a/opcodes/configure b/opcodes/configure index 0b9f2deff22..547e5afc766 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -14495,7 +14495,6 @@ if test x${all_targets} = xfalse ; then bfd_msp430_arch) ta="$ta msp430-dis.lo msp430-decode.lo" ;; bfd_nds32_arch) ta="$ta nds32-asm.lo nds32-dis.lo" ;; bfd_nfp_arch) ta="$ta nfp-dis.lo" ;; - bfd_nios2_arch) ta="$ta nios2-dis.lo nios2-opc.lo" ;; bfd_ns32k_arch) ta="$ta ns32k-dis.lo" ;; bfd_or1k_arch) ta="$ta or1k-asm.lo or1k-desc.lo or1k-dis.lo or1k-ibld.lo or1k-opc.lo" using_cgen=yes ;; bfd_pdp11_arch) ta="$ta pdp11-dis.lo pdp11-opc.lo" ;; diff --git a/opcodes/configure.ac b/opcodes/configure.ac index 4d918e3ef9b..51045b62178 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -311,7 +311,6 @@ if test x${all_targets} = xfalse ; then bfd_msp430_arch) ta="$ta msp430-dis.lo msp430-decode.lo" ;; bfd_nds32_arch) ta="$ta nds32-asm.lo nds32-dis.lo" ;; bfd_nfp_arch) ta="$ta nfp-dis.lo" ;; - bfd_nios2_arch) ta="$ta nios2-dis.lo nios2-opc.lo" ;; bfd_ns32k_arch) ta="$ta ns32k-dis.lo" ;; bfd_or1k_arch) ta="$ta or1k-asm.lo or1k-desc.lo or1k-dis.lo or1k-ibld.lo or1k-opc.lo" using_cgen=yes ;; bfd_pdp11_arch) ta="$ta pdp11-dis.lo pdp11-opc.lo" ;; diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c index 347f28e06a6..733a0c07aa6 100644 --- a/opcodes/disassemble.c +++ b/opcodes/disassemble.c @@ -74,7 +74,6 @@ #define ARCH_mt #define ARCH_msp430 #define ARCH_nds32 -#define ARCH_nios2 #define ARCH_ns32k #define ARCH_or1k #define ARCH_pdp11 @@ -348,14 +347,6 @@ disassembler (enum bfd_architecture a, disassemble = print_insn_mn10300; break; #endif -#ifdef ARCH_nios2 - case bfd_arch_nios2: - if (big) - disassemble = print_insn_big_nios2; - else - disassemble = print_insn_little_nios2; - break; -#endif #ifdef ARCH_or1k case bfd_arch_or1k: disassemble = print_insn_or1k; diff --git a/opcodes/disassemble.h b/opcodes/disassemble.h index b02e45268a2..24a2a65ce7d 100644 --- a/opcodes/disassemble.h +++ b/opcodes/disassemble.h @@ -27,7 +27,6 @@ extern int print_insn_avr (bfd_vma, disassemble_info *); extern int print_insn_bfin (bfd_vma, disassemble_info *); extern int print_insn_big_arm (bfd_vma, disassemble_info *); extern int print_insn_big_mips (bfd_vma, disassemble_info *); -extern int print_insn_big_nios2 (bfd_vma, disassemble_info *); extern int print_insn_big_powerpc (bfd_vma, disassemble_info *); extern int print_insn_big_score (bfd_vma, disassemble_info *); extern int print_insn_cr16 (bfd_vma, disassemble_info *); @@ -51,7 +50,6 @@ extern int print_insn_i386_intel (bfd_vma, disassemble_info *); extern int print_insn_ia64 (bfd_vma, disassemble_info *); extern int print_insn_ip2k (bfd_vma, disassemble_info *); extern int print_insn_iq2000 (bfd_vma, disassemble_info *); -extern int print_insn_little_nios2 (bfd_vma, disassemble_info *); extern int print_insn_riscv (bfd_vma, disassemble_info *); extern int print_insn_kvx (bfd_vma, disassemble_info *); extern int print_insn_little_arm (bfd_vma, disassemble_info *); diff --git a/opcodes/nios2-dis.c b/opcodes/nios2-dis.c deleted file mode 100644 index 344474633a3..00000000000 --- a/opcodes/nios2-dis.c +++ /dev/null @@ -1,1044 +0,0 @@ -/* Altera Nios II disassemble routines - Copyright (C) 2012-2024 Free Software Foundation, Inc. - Contributed by Nigel Gray (ngray@altera.com). - Contributed by Mentor Graphics, Inc. - - This file is part of the GNU opcodes library. - - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - It 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 General Public - License for more details. - - You should have received a copy of the GNU General Public License - along with this file; see the file COPYING. If not, write to the - Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, - MA 02110-1301, USA. */ - -#include "sysdep.h" -#include "disassemble.h" -#include "opintl.h" -#include "opcode/nios2.h" -#include "libiberty.h" -#include <string.h> -#include <assert.h> - -/* No symbol table is available when this code runs out in an embedded - system as when it is used for disassembler support in a monitor. */ -#if !defined(EMBEDDED_ENV) -#define SYMTAB_AVAILABLE 1 -#include "elf-bfd.h" -#include "elf/nios2.h" -#endif - -/* Default length of Nios II instruction in bytes. */ -#define INSNLEN 4 - -/* Data structures used by the opcode hash table. */ -typedef struct _nios2_opcode_hash -{ - const struct nios2_opcode *opcode; - struct _nios2_opcode_hash *next; -} nios2_opcode_hash; - -/* Hash table size. */ -#define OPCODE_HASH_SIZE (IW_R1_OP_UNSHIFTED_MASK + 1) - -/* Extract the opcode from an instruction word. */ -static unsigned int -nios2_r1_extract_opcode (unsigned int x) -{ - return GET_IW_R1_OP (x); -} - -static unsigned int -nios2_r2_extract_opcode (unsigned int x) -{ - return GET_IW_R2_OP (x); -} - -/* We maintain separate hash tables for R1 and R2 opcodes, and pseudo-ops - are stored in a different table than regular instructions. */ - -typedef struct _nios2_disassembler_state -{ - const struct nios2_opcode *opcodes; - const int *num_opcodes; - unsigned int (*extract_opcode) (unsigned int); - nios2_opcode_hash *hash[OPCODE_HASH_SIZE]; - nios2_opcode_hash *ps_hash[OPCODE_HASH_SIZE]; - const struct nios2_opcode *nop; - bool init; -} nios2_disassembler_state; - -static nios2_disassembler_state -nios2_r1_disassembler_state = { - nios2_r1_opcodes, - &nios2_num_r1_opcodes, - nios2_r1_extract_opcode, - {}, - {}, - NULL, - 0 -}; - -static nios2_disassembler_state -nios2_r2_disassembler_state = { - nios2_r2_opcodes, - &nios2_num_r2_opcodes, - nios2_r2_extract_opcode, - {}, - {}, - NULL, - 0 -}; - -/* Function to initialize the opcode hash table. */ -static void -nios2_init_opcode_hash (nios2_disassembler_state *state) -{ - unsigned int i; - register const struct nios2_opcode *op; - - for (i = 0; i < OPCODE_HASH_SIZE; i++) - for (op = state->opcodes; op < &state->opcodes[*(state->num_opcodes)]; op++) - { - nios2_opcode_hash *new_hash; - nios2_opcode_hash **bucket = NULL; - - if ((op->pinfo & NIOS2_INSN_MACRO) == NIOS2_INSN_MACRO) - { - if (i == state->extract_opcode (op->match) - && (op->pinfo & (NIOS2_INSN_MACRO_MOV | NIOS2_INSN_MACRO_MOVI) - & 0x7fffffff)) - { - bucket = &(state->ps_hash[i]); - if (strcmp (op->name, "nop") == 0) - state->nop = op; - } - } - else if (i == state->extract_opcode (op->match)) - bucket = &(state->hash[i]); - - if (bucket) - { - new_hash = - (nios2_opcode_hash *) malloc (sizeof (nios2_opcode_hash)); - if (new_hash == NULL) - { - /* xgettext:c-format */ - opcodes_error_handler (_("out of memory")); - exit (1); - } - new_hash->opcode = op; - new_hash->next = NULL; - while (*bucket) - bucket = &((*bucket)->next); - *bucket = new_hash; - } - } - state->init = 1; - -#ifdef DEBUG_HASHTABLE - for (i = 0; i < OPCODE_HASH_SIZE; ++i) - { - nios2_opcode_hash *tmp_hash = state->hash[i]; - printf ("index: 0x%02X ops: ", i); - while (tmp_hash != NULL) - { - printf ("%s ", tmp_hash->opcode->name); - tmp_hash = tmp_hash->next; - } - printf ("\n"); - } - - for (i = 0; i < OPCODE_HASH_SIZE; ++i) - { - nios2_opcode_hash *tmp_hash = state->ps_hash[i]; - printf ("index: 0x%02X ops: ", i); - while (tmp_hash != NULL) - { - printf ("%s ", tmp_hash->opcode->name); - tmp_hash = tmp_hash->next; - } - printf ("\n"); - } -#endif /* DEBUG_HASHTABLE */ -} - -/* Return a pointer to an nios2_opcode struct for a given instruction - word OPCODE for bfd machine MACH, or NULL if there is an error. */ -const struct nios2_opcode * -nios2_find_opcode_hash (unsigned long opcode, unsigned long mach) -{ - nios2_opcode_hash *entry; - nios2_disassembler_state *state; - - /* Select the right instruction set, hash tables, and opcode accessor - for the mach variant. */ - if (mach == bfd_mach_nios2r2) - state = &nios2_r2_disassembler_state; - else - state = &nios2_r1_disassembler_state; - - /* Build a hash table to shorten the search time. */ - if (!state->init) - nios2_init_opcode_hash (state); - - /* Check for NOP first. Both NOP and MOV are macros that expand into - an ADD instruction, and we always want to give priority to NOP. */ - if (state->nop->match == (opcode & state->nop->mask)) - return state->nop; - - /* First look in the pseudo-op hashtable. */ - for (entry = state->ps_hash[state->extract_opcode (opcode)]; - entry; entry = entry->next) - if (entry->opcode->match == (opcode & entry->opcode->mask)) - return entry->opcode; - - /* Otherwise look in the main hashtable. */ - for (entry = state->hash[state->extract_opcode (opcode)]; - entry; entry = entry->next) - if (entry->opcode->match == (opcode & entry->opcode->mask)) - return entry->opcode; - - return NULL; -} - -/* There are 32 regular registers, 32 coprocessor registers, - and 32 control registers. */ -#define NUMREGNAMES 32 - -/* Return a pointer to the base of the coprocessor register name array. */ -static struct nios2_reg * -nios2_coprocessor_regs (void) -{ - static struct nios2_reg *cached = NULL; - - if (!cached) - { - int i; - for (i = NUMREGNAMES; i < nios2_num_regs; i++) - if (!strcmp (nios2_regs[i].name, "c0")) - { - cached = nios2_regs + i; - break; - } - assert (cached); - } - return cached; -} - -/* Return a pointer to the base of the control register name array. */ -static struct nios2_reg * -nios2_control_regs (void) -{ - static struct nios2_reg *cached = NULL; - - if (!cached) - { - int i; - for (i = NUMREGNAMES; i < nios2_num_regs; i++) - if (!strcmp (nios2_regs[i].name, "status")) - { - cached = nios2_regs + i; - break; - } - assert (cached); - } - return cached; -} - -/* Helper routine to report internal errors. */ -static void -bad_opcode (const struct nios2_opcode *op) -{ - opcodes_error_handler - /* xgettext:c-format */ - (_("internal error: broken opcode descriptor for `%s %s'"), - op->name, op->args); - abort (); -} - -/* The function nios2_print_insn_arg uses the character pointed - to by ARGPTR to determine how it print the next token or separator - character in the arguments to an instruction. */ -static int -nios2_print_insn_arg (const char *argptr, - unsigned long opcode, bfd_vma address, - disassemble_info *info, - const struct nios2_opcode *op) -{ - unsigned long i = 0; - long s = 0; - int32_t o = 0; - struct nios2_reg *reg_base; - - switch (*argptr) - { - case ',': - case '(': - case ')': - (*info->fprintf_func) (info->stream, "%c", *argptr); - break; - - case 'c': - /* Control register index. */ - switch (op->format) - { - case iw_r_type: - i = GET_IW_R_IMM5 (opcode); - break; - case iw_F3X6L5_type: - i = GET_IW_F3X6L5_IMM5 (opcode); - break; - default: - bad_opcode (op); - } - reg_base = nios2_control_regs (); - (*info->fprintf_func) (info->stream, "%s", reg_base[i].name); - break; - - case 'd': - reg_base = nios2_regs; - switch (op->format) - { - case iw_r_type: - i = GET_IW_R_C (opcode); - break; - case iw_custom_type: - i = GET_IW_CUSTOM_C (opcode); - if (GET_IW_CUSTOM_READC (opcode) == 0) - reg_base = nios2_coprocessor_regs (); - break; - case iw_F3X6L5_type: - case iw_F3X6_type: - i = GET_IW_F3X6L5_C (opcode); - break; - case iw_F3X8_type: - i = GET_IW_F3X8_C (opcode); - if (GET_IW_F3X8_READC (opcode) == 0) - reg_base = nios2_coprocessor_regs (); - break; - case iw_F2_type: - i = GET_IW_F2_B (opcode); - break; - default: - bad_opcode (op); - } - if (i < NUMREGNAMES) - (*info->fprintf_func) (info->stream, "%s", reg_base[i].name); - else - (*info->fprintf_func) (info->stream, "unknown"); - break; - - case 's': - reg_base = nios2_regs; - switch (op->format) - { - case iw_r_type: - i = GET_IW_R_A (opcode); - break; - case iw_i_type: - i = GET_IW_I_A (opcode); - break; - case iw_custom_type: - i = GET_IW_CUSTOM_A (opcode); - if (GET_IW_CUSTOM_READA (opcode) == 0) - reg_base = nios2_coprocessor_regs (); - break; - case iw_F2I16_type: - i = GET_IW_F2I16_A (opcode); - break; - case iw_F2X4I12_type: - i = GET_IW_F2X4I12_A (opcode); - break; - case iw_F1X4I12_type: - i = GET_IW_F1X4I12_A (opcode); - break; - case iw_F1X4L17_type: - i = GET_IW_F1X4L17_A (opcode); - break; - case iw_F3X6L5_type: - case iw_F3X6_type: - i = GET_IW_F3X6L5_A (opcode); - break; - case iw_F2X6L10_type: - i = GET_IW_F2X6L10_A (opcode); - break; - case iw_F3X8_type: - i = GET_IW_F3X8_A (opcode); - if (GET_IW_F3X8_READA (opcode) == 0) - reg_base = nios2_coprocessor_regs (); - break; - case iw_F1X1_type: - i = GET_IW_F1X1_A (opcode); - break; - case iw_F1I5_type: - i = 27; /* Implicit stack pointer reference. */ - break; - case iw_F2_type: - i = GET_IW_F2_A (opcode); - break; - default: - bad_opcode (op); - } - if (i < NUMREGNAMES) - (*info->fprintf_func) (info->stream, "%s", reg_base[i].name); - else - (*info->fprintf_func) (info->stream, "unknown"); - break; - - case 't': - reg_base = nios2_regs; - switch (op->format) - { - case iw_r_type: - i = GET_IW_R_B (opcode); - break; - case iw_i_type: - i = GET_IW_I_B (opcode); - break; - case iw_custom_type: - i = GET_IW_CUSTOM_B (opcode); - if (GET_IW_CUSTOM_READB (opcode) == 0) - reg_base = nios2_coprocessor_regs (); - break; - case iw_F2I16_type: - i = GET_IW_F2I16_B (opcode); - break; - case iw_F2X4I12_type: - i = GET_IW_F2X4I12_B (opcode); - break; - case iw_F3X6L5_type: - case iw_F3X6_type: - i = GET_IW_F3X6L5_B (opcode); - break; - case iw_F2X6L10_type: - i = GET_IW_F2X6L10_B (opcode); - break; - case iw_F3X8_type: - i = GET_IW_F3X8_B (opcode); - if (GET_IW_F3X8_READB (opcode) == 0) - reg_base = nios2_coprocessor_regs (); - break; - case iw_F1I5_type: - i = GET_IW_F1I5_B (opcode); - break; - case iw_F2_type: - i = GET_IW_F2_B (opcode); - break; - case iw_T1X1I6_type: - i = 0; - break; - default: - bad_opcode (op); - } - if (i < NUMREGNAMES) - (*info->fprintf_func) (info->stream, "%s", reg_base[i].name); - else - (*info->fprintf_func) (info->stream, "unknown"); - break; - - case 'D': - switch (op->format) - { - case iw_T1I7_type: - i = GET_IW_T1I7_A3 (opcode); - break; - case iw_T2X1L3_type: - i = GET_IW_T2X1L3_B3 (opcode); - break; - case iw_T2X1I3_type: - i = GET_IW_T2X1I3_B3 (opcode); - break; - case iw_T3X1_type: - i = GET_IW_T3X1_C3 (opcode); - break; - case iw_T2X3_type: - if (op->num_args == 3) - i = GET_IW_T2X3_A3 (opcode); - else - i = GET_IW_T2X3_B3 (opcode); - break; - default: - bad_opcode (op); - } - i = nios2_r2_reg3_mappings[i]; - (*info->fprintf_func) (info->stream, "%s", nios2_regs[i].name); - break; - - case 'M': - /* 6-bit unsigned immediate with no shift. */ - switch (op->format) - { - case iw_T1X1I6_type: - i = GET_IW_T1X1I6_IMM6 (opcode); - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'N': - /* 6-bit unsigned immediate with 2-bit shift. */ - switch (op->format) - { - case iw_T1X1I6_type: - i = GET_IW_T1X1I6_IMM6 (opcode) << 2; - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'S': - switch (op->format) - { - case iw_T1I7_type: - i = GET_IW_T1I7_A3 (opcode); - break; - case iw_T2I4_type: - i = GET_IW_T2I4_A3 (opcode); - break; - case iw_T2X1L3_type: - i = GET_IW_T2X1L3_A3 (opcode); - break; - case iw_T2X1I3_type: - i = GET_IW_T2X1I3_A3 (opcode); - break; - case iw_T3X1_type: - i = GET_IW_T3X1_A3 (opcode); - break; - case iw_T2X3_type: - i = GET_IW_T2X3_A3 (opcode); - break; - case iw_T1X1I6_type: - i = GET_IW_T1X1I6_A3 (opcode); - break; - default: - bad_opcode (op); - } - i = nios2_r2_reg3_mappings[i]; - (*info->fprintf_func) (info->stream, "%s", nios2_regs[i].name); - break; - - case 'T': - switch (op->format) - { - case iw_T2I4_type: - i = GET_IW_T2I4_B3 (opcode); - break; - case iw_T3X1_type: - i = GET_IW_T3X1_B3 (opcode); - break; - case iw_T2X3_type: - i = GET_IW_T2X3_B3 (opcode); - break; - default: - bad_opcode (op); - } - i = nios2_r2_reg3_mappings[i]; - (*info->fprintf_func) (info->stream, "%s", nios2_regs[i].name); - break; - - case 'i': - /* 16-bit signed immediate. */ - switch (op->format) - { - case iw_i_type: - s = ((int32_t) ((GET_IW_I_IMM16 (opcode) & 0xffff) ^ 0x8000) - - 0x8000); - break; - case iw_F2I16_type: - s = ((int32_t) ((GET_IW_F2I16_IMM16 (opcode) & 0xffff) ^ 0x8000) - - 0x8000); - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", s); - break; - - case 'I': - /* 12-bit signed immediate. */ - switch (op->format) - { - case iw_F2X4I12_type: - s = ((int32_t) ((GET_IW_F2X4I12_IMM12 (opcode) & 0xfff) ^ 0x800) - - 0x800); - break; - case iw_F1X4I12_type: - s = ((int32_t) ((GET_IW_F1X4I12_IMM12 (opcode) & 0xfff) ^ 0x800) - - 0x800); - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", s); - break; - - case 'u': - /* 16-bit unsigned immediate. */ - switch (op->format) - { - case iw_i_type: - i = GET_IW_I_IMM16 (opcode); - break; - case iw_F2I16_type: - i = GET_IW_F2I16_IMM16 (opcode); - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'U': - /* 7-bit unsigned immediate with 2-bit shift. */ - switch (op->format) - { - case iw_T1I7_type: - i = GET_IW_T1I7_IMM7 (opcode) << 2; - break; - case iw_X1I7_type: - i = GET_IW_X1I7_IMM7 (opcode) << 2; - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'V': - /* 5-bit unsigned immediate with 2-bit shift. */ - switch (op->format) - { - case iw_F1I5_type: - i = GET_IW_F1I5_IMM5 (opcode) << 2; - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'W': - /* 4-bit unsigned immediate with 2-bit shift. */ - switch (op->format) - { - case iw_T2I4_type: - i = GET_IW_T2I4_IMM4 (opcode) << 2; - break; - case iw_L5I4X1_type: - i = GET_IW_L5I4X1_IMM4 (opcode) << 2; - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'X': - /* 4-bit unsigned immediate with 1-bit shift. */ - switch (op->format) - { - case iw_T2I4_type: - i = GET_IW_T2I4_IMM4 (opcode) << 1; - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'Y': - /* 4-bit unsigned immediate without shift. */ - switch (op->format) - { - case iw_T2I4_type: - i = GET_IW_T2I4_IMM4 (opcode); - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'o': - /* 16-bit signed immediate address offset. */ - switch (op->format) - { - case iw_i_type: - o = ((GET_IW_I_IMM16 (opcode) & 0xffff) ^ 0x8000) - 0x8000; - break; - case iw_F2I16_type: - o = ((GET_IW_F2I16_IMM16 (opcode) & 0xffff) ^ 0x8000) - 0x8000; - break; - default: - bad_opcode (op); - } - address = address + 4 + o; - (*info->print_address_func) (address, info); - break; - - case 'O': - /* 10-bit signed address offset with 1-bit shift. */ - switch (op->format) - { - case iw_I10_type: - o = (((GET_IW_I10_IMM10 (opcode) & 0x3ff) ^ 0x200) - 0x200) * 2; - break; - default: - bad_opcode (op); - } - address = address + 2 + o; - (*info->print_address_func) (address, info); - break; - - case 'P': - /* 7-bit signed address offset with 1-bit shift. */ - switch (op->format) - { - case iw_T1I7_type: - o = (((GET_IW_T1I7_IMM7 (opcode) & 0x7f) ^ 0x40) - 0x40) * 2; - break; - default: - bad_opcode (op); - } - address = address + 2 + o; - (*info->print_address_func) (address, info); - break; - - case 'j': - /* 5-bit unsigned immediate. */ - switch (op->format) - { - case iw_r_type: - i = GET_IW_R_IMM5 (opcode); - break; - case iw_F3X6L5_type: - i = GET_IW_F3X6L5_IMM5 (opcode); - break; - case iw_F2X6L10_type: - i = GET_IW_F2X6L10_MSB (opcode); - break; - case iw_X2L5_type: - i = GET_IW_X2L5_IMM5 (opcode); - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'k': - /* Second 5-bit unsigned immediate field. */ - switch (op->format) - { - case iw_F2X6L10_type: - i = GET_IW_F2X6L10_LSB (opcode); - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'l': - /* 8-bit unsigned immediate. */ - switch (op->format) - { - case iw_custom_type: - i = GET_IW_CUSTOM_N (opcode); - break; - case iw_F3X8_type: - i = GET_IW_F3X8_N (opcode); - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%lu", i); - break; - - case 'm': - /* 26-bit unsigned immediate. */ - switch (op->format) - { - case iw_j_type: - i = GET_IW_J_IMM26 (opcode); - break; - case iw_L26_type: - i = GET_IW_L26_IMM26 (opcode); - break; - default: - bad_opcode (op); - } - /* This translates to an address because it's only used in call - instructions. */ - address = (address & 0xf0000000) | (i << 2); - (*info->print_address_func) (address, info); - break; - - case 'e': - /* Encoded enumeration for addi.n/subi.n. */ - switch (op->format) - { - case iw_T2X1I3_type: - i = nios2_r2_asi_n_mappings[GET_IW_T2X1I3_IMM3 (opcode)]; - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%lu", i); - break; - - case 'f': - /* Encoded enumeration for slli.n/srli.n. */ - switch (op->format) - { - case iw_T2X1L3_type: - i = nios2_r2_shi_n_mappings[GET_IW_T2X1I3_IMM3 (opcode)]; - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%lu", i); - break; - - case 'g': - /* Encoded enumeration for andi.n. */ - switch (op->format) - { - case iw_T2I4_type: - i = nios2_r2_andi_n_mappings[GET_IW_T2I4_IMM4 (opcode)]; - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%lu", i); - break; - - case 'h': - /* Encoded enumeration for movi.n. */ - switch (op->format) - { - case iw_T1I7_type: - i = GET_IW_T1I7_IMM7 (opcode); - if (i == 125) - i = 0xff; - else if (i == 126) - i = -2; - else if (i == 127) - i = -1; - break; - default: - bad_opcode (op); - } - (*info->fprintf_func) (info->stream, "%ld", i); - break; - - case 'R': - { - unsigned long reglist = 0; - int dir = 1; - int k, t; - - switch (op->format) - { - case iw_F1X4L17_type: - /* Encoding for ldwm/stwm. */ - i = GET_IW_F1X4L17_REGMASK (opcode); - if (GET_IW_F1X4L17_RS (opcode)) - { - reglist = ((i << 14) & 0x00ffc000); - if (i & (1 << 10)) - reglist |= (1 << 28); - if (i & (1 << 11)) - reglist |= (1u << 31); - } - else - reglist = i << 2; - dir = GET_IW_F1X4L17_REGMASK (opcode) ? 1 : -1; - break; - - case iw_L5I4X1_type: - /* Encoding for push.n/pop.n. */ - reglist |= (1u << 31); - if (GET_IW_L5I4X1_FP (opcode)) - reglist |= (1 << 28); - if (GET_IW_L5I4X1_CS (opcode)) - { - int val = GET_IW_L5I4X1_REGRANGE (opcode); - reglist |= nios2_r2_reg_range_mappings[val]; - } - dir = (op->match == MATCH_R2_POP_N ? 1 : -1); - break; - - default: - bad_opcode (op); - } - - t = 0; - (*info->fprintf_func) (info->stream, "{"); - for (k = (dir == 1 ? 0 : 31); - (dir == 1 && k < 32) || (dir == -1 && k >= 0); - k += dir) - if (reglist & (1u << k)) - { - if (t) - (*info->fprintf_func) (info->stream, ","); - else - t++; - (*info->fprintf_func) (info->stream, "%s", nios2_regs[k].name); - } - (*info->fprintf_func) (info->stream, "}"); - break; - } - - case 'B': - /* Base register and options for ldwm/stwm. */ - switch (op->format) - { - case iw_F1X4L17_type: - if (GET_IW_F1X4L17_ID (opcode) == 0) - (*info->fprintf_func) (info->stream, "--"); - - i = GET_IW_F1X4I12_A (opcode); - (*info->fprintf_func) (info->stream, "(%s)", - nios2_builtin_regs[i].name); - - if (GET_IW_F1X4L17_ID (opcode)) - (*info->fprintf_func) (info->stream, "++"); - if (GET_IW_F1X4L17_WB (opcode)) - (*info->fprintf_func) (info->stream, ",writeback"); - if (GET_IW_F1X4L17_PC (opcode)) - (*info->fprintf_func) (info->stream, ",ret"); - break; - default: - bad_opcode (op); - } - break; - - default: - (*info->fprintf_func) (info->stream, "unknown"); - break; - } - return 0; -} - -/* nios2_disassemble does all the work of disassembling a Nios II - instruction opcode. */ -static int -nios2_disassemble (bfd_vma address, unsigned long opcode, - disassemble_info *info) -{ - const struct nios2_opcode *op; - - info->bytes_per_line = INSNLEN; - info->bytes_per_chunk = INSNLEN; - info->display_endian = info->endian; - info->insn_info_valid = 1; - info->branch_delay_insns = 0; - info->data_size = 0; - info->insn_type = dis_nonbranch; - info->target = 0; - info->target2 = 0; - - /* Find the major opcode and use this to disassemble - the instruction and its arguments. */ - op = nios2_find_opcode_hash (opcode, info->mach); - - if (op != NULL) - { - const char *argstr = op->args; - (*info->fprintf_func) (info->stream, "%s", op->name); - if (argstr != NULL && *argstr != '\0') - { - (*info->fprintf_func) (info->stream, "\t"); - while (*argstr != '\0') - { - nios2_print_insn_arg (argstr, opcode, address, info, op); - ++argstr; - } - } - /* Tell the caller how far to advance the program counter. */ - info->bytes_per_chunk = op->size; - return op->size; - } - else - { - /* Handle undefined instructions. */ - info->insn_type = dis_noninsn; - (*info->fprintf_func) (info->stream, "0x%lx", opcode); - return INSNLEN; - } -} - - -/* print_insn_nios2 is the main disassemble function for Nios II. - The function diassembler(abfd) (source in disassemble.c) returns a - pointer to this either print_insn_big_nios2 or - print_insn_little_nios2, which in turn call this function when the - bfd machine type is Nios II. print_insn_nios2 reads the - instruction word at the address given, and prints the disassembled - instruction on the stream info->stream using info->fprintf_func. */ - -static int -print_insn_nios2 (bfd_vma address, disassemble_info *info, - enum bfd_endian endianness) -{ - bfd_byte buffer[INSNLEN]; - int status; - - status = (*info->read_memory_func) (address, buffer, INSNLEN, info); - if (status == 0) - { - unsigned long insn; - if (endianness == BFD_ENDIAN_BIG) - insn = (unsigned long) bfd_getb32 (buffer); - else - insn = (unsigned long) bfd_getl32 (buffer); - return nios2_disassemble (address, insn, info); - } - - /* We might have a 16-bit R2 instruction at the end of memory. Try that. */ - if (info->mach == bfd_mach_nios2r2) - { - status = (*info->read_memory_func) (address, buffer, 2, info); - if (status == 0) - { - unsigned long insn; - if (endianness == BFD_ENDIAN_BIG) - insn = (unsigned long) bfd_getb16 (buffer); - else - insn = (unsigned long) bfd_getl16 (buffer); - return nios2_disassemble (address, insn, info); - } - } - - /* If we got here, we couldn't read anything. */ - (*info->memory_error_func) (status, address, info); - return -1; -} - -/* These two functions are the main entry points, accessed from - disassemble.c. */ -int -print_insn_big_nios2 (bfd_vma address, disassemble_info *info) -{ - return print_insn_nios2 (address, info, BFD_ENDIAN_BIG); -} - -int -print_insn_little_nios2 (bfd_vma address, disassemble_info *info) -{ - return print_insn_nios2 (address, info, BFD_ENDIAN_LITTLE); -} diff --git a/opcodes/nios2-opc.c b/opcodes/nios2-opc.c deleted file mode 100644 index f59d04a581e..00000000000 --- a/opcodes/nios2-opc.c +++ /dev/null @@ -1,783 +0,0 @@ -/* Altera Nios II opcode list. - Copyright (C) 2012-2024 Free Software Foundation, Inc. - Contributed by Nigel Gray (ngray@altera.com). - Contributed by Mentor Graphics, Inc. - - This file is part of the GNU opcodes library. - - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - It 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 General Public - License for more details. - - You should have received a copy of the GNU General Public License - along with this file; see the file COPYING. If not, write to the - Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, - MA 02110-1301, USA. */ - -#include "sysdep.h" -#include <stdio.h> -#include "opcode/nios2.h" - -/* Register string table */ - -const struct nios2_reg nios2_builtin_regs[] = { - /* Standard register names. */ - {"zero", 0, REG_NORMAL}, - {"at", 1, REG_NORMAL}, /* assembler temporary */ - {"r2", 2, REG_NORMAL | REG_3BIT | REG_LDWM}, - {"r3", 3, REG_NORMAL | REG_3BIT | REG_LDWM}, - {"r4", 4, REG_NORMAL | REG_3BIT | REG_LDWM}, - {"r5", 5, REG_NORMAL | REG_3BIT | REG_LDWM}, - {"r6", 6, REG_NORMAL | REG_3BIT | REG_LDWM}, - {"r7", 7, REG_NORMAL | REG_3BIT | REG_LDWM}, - {"r8", 8, REG_NORMAL | REG_LDWM}, - {"r9", 9, REG_NORMAL | REG_LDWM}, - {"r10", 10, REG_NORMAL | REG_LDWM}, - {"r11", 11, REG_NORMAL | REG_LDWM}, - {"r12", 12, REG_NORMAL | REG_LDWM}, - {"r13", 13, REG_NORMAL | REG_LDWM}, - {"r14", 14, REG_NORMAL | REG_LDWM}, - {"r15", 15, REG_NORMAL | REG_LDWM}, - {"r16", 16, REG_NORMAL | REG_3BIT | REG_LDWM | REG_POP}, - {"r17", 17, REG_NORMAL | REG_3BIT | REG_LDWM | REG_POP}, - {"r18", 18, REG_NORMAL | REG_LDWM | REG_POP}, - {"r19", 19, REG_NORMAL | REG_LDWM | REG_POP}, - {"r20", 20, REG_NORMAL | REG_LDWM | REG_POP}, - {"r21", 21, REG_NORMAL | REG_LDWM | REG_POP}, - {"r22", 22, REG_NORMAL | REG_LDWM | REG_POP}, - {"r23", 23, REG_NORMAL | REG_LDWM | REG_POP}, - {"et", 24, REG_NORMAL}, - {"bt", 25, REG_NORMAL}, - {"gp", 26, REG_NORMAL}, /* global pointer */ - {"sp", 27, REG_NORMAL}, /* stack pointer */ - {"fp", 28, REG_NORMAL | REG_LDWM | REG_POP}, /* frame pointer */ - {"ea", 29, REG_NORMAL}, /* exception return address */ - {"sstatus", 30, REG_NORMAL}, /* saved processor status */ - {"ra", 31, REG_NORMAL | REG_LDWM | REG_POP}, /* return address */ - - /* Alternative names for special registers. */ - {"r0", 0, REG_NORMAL}, - {"r1", 1, REG_NORMAL}, - {"r24", 24, REG_NORMAL}, - {"r25", 25, REG_NORMAL}, - {"r26", 26, REG_NORMAL}, - {"r27", 27, REG_NORMAL}, - {"r28", 28, REG_NORMAL | REG_LDWM | REG_POP}, - {"r29", 29, REG_NORMAL}, - {"r30", 30, REG_NORMAL}, - {"ba", 30, REG_NORMAL}, /* breakpoint return address */ - {"r31", 31, REG_NORMAL | REG_LDWM | REG_POP}, - - /* Control register names. */ - {"status", 0, REG_CONTROL}, - {"estatus", 1, REG_CONTROL}, - {"bstatus", 2, REG_CONTROL}, - {"ienable", 3, REG_CONTROL}, - {"ipending", 4, REG_CONTROL}, - {"cpuid", 5, REG_CONTROL}, - {"ctl6", 6, REG_CONTROL}, - {"exception", 7, REG_CONTROL}, - {"pteaddr", 8, REG_CONTROL}, - {"tlbacc", 9, REG_CONTROL}, - {"tlbmisc", 10, REG_CONTROL}, - {"eccinj", 11, REG_CONTROL}, - {"badaddr", 12, REG_CONTROL}, - {"config", 13, REG_CONTROL}, - {"mpubase", 14, REG_CONTROL}, - {"mpuacc", 15, REG_CONTROL}, - {"ctl16", 16, REG_CONTROL}, - {"ctl17", 17, REG_CONTROL}, - {"ctl18", 18, REG_CONTROL}, - {"ctl19", 19, REG_CONTROL}, - {"ctl20", 20, REG_CONTROL}, - {"ctl21", 21, REG_CONTROL}, - {"ctl22", 22, REG_CONTROL}, - {"ctl23", 23, REG_CONTROL}, - {"ctl24", 24, REG_CONTROL}, - {"ctl25", 25, REG_CONTROL}, - {"ctl26", 26, REG_CONTROL}, - {"ctl27", 27, REG_CONTROL}, - {"ctl28", 28, REG_CONTROL}, - {"ctl29", 29, REG_CONTROL}, - {"ctl30", 30, REG_CONTROL}, - {"ctl31", 31, REG_CONTROL}, - - /* Alternative names for special control registers. */ - {"ctl0", 0, REG_CONTROL}, - {"ctl1", 1, REG_CONTROL}, - {"ctl2", 2, REG_CONTROL}, - {"ctl3", 3, REG_CONTROL}, - {"ctl4", 4, REG_CONTROL}, - {"ctl5", 5, REG_CONTROL}, - {"ctl7", 7, REG_CONTROL}, - {"ctl8", 8, REG_CONTROL}, - {"ctl9", 9, REG_CONTROL}, - {"ctl10", 10, REG_CONTROL}, - {"ctl11", 11, REG_CONTROL}, - {"ctl12", 12, REG_CONTROL}, - {"ctl13", 13, REG_CONTROL}, - {"ctl14", 14, REG_CONTROL}, - {"ctl15", 15, REG_CONTROL}, - - /* Coprocessor register names. */ - {"c0", 0, REG_COPROCESSOR}, - {"c1", 1, REG_COPROCESSOR}, - {"c2", 2, REG_COPROCESSOR}, - {"c3", 3, REG_COPROCESSOR}, - {"c4", 4, REG_COPROCESSOR}, - {"c5", 5, REG_COPROCESSOR}, - {"c6", 6, REG_COPROCESSOR}, - {"c7", 7, REG_COPROCESSOR}, - {"c8", 8, REG_COPROCESSOR}, - {"c9", 9, REG_COPROCESSOR}, - {"c10", 10, REG_COPROCESSOR}, - {"c11", 11, REG_COPROCESSOR}, - {"c12", 12, REG_COPROCESSOR}, - {"c13", 13, REG_COPROCESSOR}, - {"c14", 14, REG_COPROCESSOR}, - {"c15", 15, REG_COPROCESSOR}, - {"c16", 16, REG_COPROCESSOR}, - {"c17", 17, REG_COPROCESSOR}, - {"c18", 18, REG_COPROCESSOR}, - {"c19", 19, REG_COPROCESSOR}, - {"c20", 20, REG_COPROCESSOR}, - {"c21", 21, REG_COPROCESSOR}, - {"c22", 22, REG_COPROCESSOR}, - {"c23", 23, REG_COPROCESSOR}, - {"c24", 24, REG_COPROCESSOR}, - {"c25", 25, REG_COPROCESSOR}, - {"c26", 26, REG_COPROCESSOR}, - {"c27", 27, REG_COPROCESSOR}, - {"c28", 28, REG_COPROCESSOR}, - {"c29", 29, REG_COPROCESSOR}, - {"c30", 30, REG_COPROCESSOR}, - {"c31", 31, REG_COPROCESSOR}, -}; - -#define NIOS2_NUM_REGS \ - ((sizeof nios2_builtin_regs) / (sizeof (nios2_builtin_regs[0]))) -const int nios2_num_builtin_regs = NIOS2_NUM_REGS; - -/* This is not const in order to allow for dynamic extensions to the - built-in instruction set. */ -struct nios2_reg *nios2_regs = (struct nios2_reg *) nios2_builtin_regs; -int nios2_num_regs = NIOS2_NUM_REGS; -#undef NIOS2_NUM_REGS - -/* This is the opcode table used by the Nios II GNU as, disassembler - and GDB. */ -const struct nios2_opcode nios2_r1_opcodes[] = -{ - /* { name, args, args_test, num_args, size, format, - match, mask, pinfo, overflow } */ - {"add", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_ADD, MASK_R1_ADD, 0, no_overflow}, - {"addi", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_ADDI, MASK_R1_ADDI, 0, signed_immed16_overflow}, - {"and", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_AND, MASK_R1_AND, 0, no_overflow}, - {"andhi", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_ANDHI, MASK_R1_ANDHI, 0, unsigned_immed16_overflow}, - {"andi", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_ANDI, MASK_R1_ANDI, 0, unsigned_immed16_overflow}, - {"beq", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, - MATCH_R1_BEQ, MASK_R1_BEQ, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bge", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, - MATCH_R1_BGE, MASK_R1_BGE, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bgeu", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, - MATCH_R1_BGEU, MASK_R1_BGEU, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bgt", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, - MATCH_R1_BGT, MASK_R1_BGT, - NIOS2_INSN_MACRO|NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bgtu", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, - MATCH_R1_BGTU, MASK_R1_BGTU, - NIOS2_INSN_MACRO|NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"ble", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, - MATCH_R1_BLE, MASK_R1_BLE, - NIOS2_INSN_MACRO|NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bleu", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, - MATCH_R1_BLEU, MASK_R1_BLEU, - NIOS2_INSN_MACRO|NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"blt", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, - MATCH_R1_BLT, MASK_R1_BLT, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bltu", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, - MATCH_R1_BLTU, MASK_R1_BLTU, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bne", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, - MATCH_R1_BNE, MASK_R1_BNE, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"br", "o", "o,E", 1, 4, iw_i_type, - MATCH_R1_BR, MASK_R1_BR, NIOS2_INSN_UBRANCH, branch_target_overflow}, - {"break", "j", "j,E", 1, 4, iw_r_type, - MATCH_R1_BREAK, MASK_R1_BREAK, NIOS2_INSN_OPTARG, no_overflow}, - {"bret", "", "E", 0, 4, iw_r_type, - MATCH_R1_BRET, MASK_R1_BRET, 0, no_overflow}, - {"call", "m", "m,E", 1, 4, iw_j_type, - MATCH_R1_CALL, MASK_R1_CALL, NIOS2_INSN_CALL, call_target_overflow}, - {"callr", "s", "s,E", 1, 4, iw_r_type, - MATCH_R1_CALLR, MASK_R1_CALLR, 0, no_overflow}, - {"cmpeq", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_CMPEQ, MASK_R1_CMPEQ, 0, no_overflow}, - {"cmpeqi", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_CMPEQI, MASK_R1_CMPEQI, 0, signed_immed16_overflow}, - {"cmpge", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_CMPGE, MASK_R1_CMPGE, 0, no_overflow}, - {"cmpgei", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_CMPGEI, MASK_R1_CMPGEI, 0, signed_immed16_overflow}, - {"cmpgeu", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_CMPGEU, MASK_R1_CMPGEU, 0, no_overflow}, - {"cmpgeui", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_CMPGEUI, MASK_R1_CMPGEUI, 0, unsigned_immed16_overflow}, - {"cmpgt", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_CMPGT, MASK_R1_CMPGT, NIOS2_INSN_MACRO, no_overflow}, - {"cmpgti", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_CMPGTI, MASK_R1_CMPGTI, NIOS2_INSN_MACRO, signed_immed16_overflow}, - {"cmpgtu", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_CMPGTU, MASK_R1_CMPGTU, NIOS2_INSN_MACRO, no_overflow}, - {"cmpgtui", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_CMPGTUI, MASK_R1_CMPGTUI, - NIOS2_INSN_MACRO, unsigned_immed16_overflow}, - {"cmple", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_CMPLE, MASK_R1_CMPLE, NIOS2_INSN_MACRO, no_overflow}, - {"cmplei", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_CMPLEI, MASK_R1_CMPLEI, NIOS2_INSN_MACRO, signed_immed16_overflow}, - {"cmpleu", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_CMPLEU, MASK_R1_CMPLEU, NIOS2_INSN_MACRO, no_overflow}, - {"cmpleui", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_CMPLEUI, MASK_R1_CMPLEUI, - NIOS2_INSN_MACRO, unsigned_immed16_overflow}, - {"cmplt", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_CMPLT, MASK_R1_CMPLT, 0, no_overflow}, - {"cmplti", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_CMPLTI, MASK_R1_CMPLTI, 0, signed_immed16_overflow}, - {"cmpltu", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_CMPLTU, MASK_R1_CMPLTU, 0, no_overflow}, - {"cmpltui", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_CMPLTUI, MASK_R1_CMPLTUI, 0, unsigned_immed16_overflow}, - {"cmpne", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_CMPNE, MASK_R1_CMPNE, 0, no_overflow}, - {"cmpnei", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_CMPNEI, MASK_R1_CMPNEI, 0, signed_immed16_overflow}, - {"custom", "l,d,s,t", "l,d,s,t,E", 4, 4, iw_custom_type, - MATCH_R1_CUSTOM, MASK_R1_CUSTOM, 0, custom_opcode_overflow}, - {"div", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_DIV, MASK_R1_DIV, 0, no_overflow}, - {"divu", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_DIVU, MASK_R1_DIVU, 0, no_overflow}, - {"eret", "", "E", 0, 4, iw_r_type, - MATCH_R1_ERET, MASK_R1_ERET, 0, no_overflow}, - {"flushd", "i(s)", "i(s),E", 2, 4, iw_i_type, - MATCH_R1_FLUSHD, MASK_R1_FLUSHD, 0, address_offset_overflow}, - {"flushda", "i(s)", "i(s),E", 2, 4, iw_i_type, - MATCH_R1_FLUSHDA, MASK_R1_FLUSHDA, 0, address_offset_overflow}, - {"flushi", "s", "s,E", 1, 4, iw_r_type, - MATCH_R1_FLUSHI, MASK_R1_FLUSHI, 0, no_overflow}, - {"flushp", "", "E", 0, 4, iw_r_type, - MATCH_R1_FLUSHP, MASK_R1_FLUSHP, 0, no_overflow}, - {"initd", "i(s)", "i(s),E", 2, 4, iw_i_type, - MATCH_R1_INITD, MASK_R1_INITD, 0, address_offset_overflow}, - {"initda", "i(s)", "i(s),E", 2, 4, iw_i_type, - MATCH_R1_INITDA, MASK_R1_INITDA, 0, address_offset_overflow}, - {"initi", "s", "s,E", 1, 4, iw_r_type, - MATCH_R1_INITI, MASK_R1_INITI, 0, no_overflow}, - {"jmp", "s", "s,E", 1, 4, iw_r_type, - MATCH_R1_JMP, MASK_R1_JMP, 0, no_overflow}, - {"jmpi", "m", "m,E", 1, 4, iw_j_type, - MATCH_R1_JMPI, MASK_R1_JMPI, 0, call_target_overflow}, - {"ldb", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_LDB, MASK_R1_LDB, 0, address_offset_overflow}, - {"ldbio", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_LDBIO, MASK_R1_LDBIO, 0, address_offset_overflow}, - {"ldbu", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_LDBU, MASK_R1_LDBU, 0, address_offset_overflow}, - {"ldbuio", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_LDBUIO, MASK_R1_LDBUIO, 0, address_offset_overflow}, - {"ldh", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_LDH, MASK_R1_LDH, 0, address_offset_overflow}, - {"ldhio", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_LDHIO, MASK_R1_LDHIO, 0, address_offset_overflow}, - {"ldhu", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_LDHU, MASK_R1_LDHU, 0, address_offset_overflow}, - {"ldhuio", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_LDHUIO, MASK_R1_LDHUIO, 0, address_offset_overflow}, - {"ldw", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_LDW, MASK_R1_LDW, 0, address_offset_overflow}, - {"ldwio", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_LDWIO, MASK_R1_LDWIO, 0, address_offset_overflow}, - {"mov", "d,s", "d,s,E", 2, 4, iw_r_type, - MATCH_R1_MOV, MASK_R1_MOV, NIOS2_INSN_MACRO_MOV, no_overflow}, - {"movhi", "t,u", "t,u,E", 2, 4, iw_i_type, - MATCH_R1_MOVHI, MASK_R1_MOVHI, - NIOS2_INSN_MACRO_MOVI, unsigned_immed16_overflow}, - {"movi", "t,i", "t,i,E", 2, 4, iw_i_type, - MATCH_R1_MOVI, MASK_R1_MOVI, NIOS2_INSN_MACRO_MOVI, signed_immed16_overflow}, - {"movia", "t,o", "t,o,E", 2, 4, iw_i_type, - MATCH_R1_ORHI, MASK_R1_ORHI, NIOS2_INSN_MACRO_MOVIA, no_overflow}, - {"movui", "t,u", "t,u,E", 2, 4, iw_i_type, - MATCH_R1_MOVUI, MASK_R1_MOVUI, - NIOS2_INSN_MACRO_MOVI, unsigned_immed16_overflow}, - {"mul", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_MUL, MASK_R1_MUL, 0, no_overflow}, - {"muli", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_MULI, MASK_R1_MULI, 0, signed_immed16_overflow}, - {"mulxss", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_MULXSS, MASK_R1_MULXSS, 0, no_overflow}, - {"mulxsu", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_MULXSU, MASK_R1_MULXSU, 0, no_overflow}, - {"mulxuu", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_MULXUU, MASK_R1_MULXUU, 0, no_overflow}, - {"nextpc", "d", "d,E", 1, 4, iw_r_type, - MATCH_R1_NEXTPC, MASK_R1_NEXTPC, 0, no_overflow}, - {"nop", "", "E", 0, 4, iw_r_type, - MATCH_R1_NOP, MASK_R1_NOP, NIOS2_INSN_MACRO_MOV, no_overflow}, - {"nor", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_NOR, MASK_R1_NOR, 0, no_overflow}, - {"or", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_OR, MASK_R1_OR, 0, no_overflow}, - {"orhi", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_ORHI, MASK_R1_ORHI, 0, unsigned_immed16_overflow}, - {"ori", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_ORI, MASK_R1_ORI, 0, unsigned_immed16_overflow}, - {"rdctl", "d,c", "d,c,E", 2, 4, iw_r_type, - MATCH_R1_RDCTL, MASK_R1_RDCTL, 0, no_overflow}, - {"rdprs", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_RDPRS, MASK_R1_RDPRS, 0, signed_immed16_overflow}, - {"ret", "", "E", 0, 4, iw_r_type, - MATCH_R1_RET, MASK_R1_RET, 0, no_overflow}, - {"rol", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_ROL, MASK_R1_ROL, 0, no_overflow}, - {"roli", "d,s,j", "d,s,j,E", 3, 4, iw_r_type, - MATCH_R1_ROLI, MASK_R1_ROLI, 0, unsigned_immed5_overflow}, - {"ror", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_ROR, MASK_R1_ROR, 0, no_overflow}, - {"sll", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_SLL, MASK_R1_SLL, 0, no_overflow}, - {"slli", "d,s,j", "d,s,j,E", 3, 4, iw_r_type, - MATCH_R1_SLLI, MASK_R1_SLLI, 0, unsigned_immed5_overflow}, - {"sra", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_SRA, MASK_R1_SRA, 0, no_overflow}, - {"srai", "d,s,j", "d,s,j,E", 3, 4, iw_r_type, - MATCH_R1_SRAI, MASK_R1_SRAI, 0, unsigned_immed5_overflow}, - {"srl", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_SRL, MASK_R1_SRL, 0, no_overflow}, - {"srli", "d,s,j", "d,s,j,E", 3, 4, iw_r_type, - MATCH_R1_SRLI, MASK_R1_SRLI, 0, unsigned_immed5_overflow}, - {"stb", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_STB, MASK_R1_STB, 0, address_offset_overflow}, - {"stbio", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_STBIO, MASK_R1_STBIO, 0, address_offset_overflow}, - {"sth", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_STH, MASK_R1_STH, 0, address_offset_overflow}, - {"sthio", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_STHIO, MASK_R1_STHIO, 0, address_offset_overflow}, - {"stw", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_STW, MASK_R1_STW, 0, address_offset_overflow}, - {"stwio", "t,i(s)", "t,i(s),E", 3, 4, iw_i_type, - MATCH_R1_STWIO, MASK_R1_STWIO, 0, address_offset_overflow}, - {"sub", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_SUB, MASK_R1_SUB, 0, no_overflow}, - {"subi", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_SUBI, MASK_R1_SUBI, NIOS2_INSN_MACRO, signed_immed16_overflow}, - {"sync", "", "E", 0, 4, iw_r_type, - MATCH_R1_SYNC, MASK_R1_SYNC, 0, no_overflow}, - {"trap", "j", "j,E", 1, 4, iw_r_type, - MATCH_R1_TRAP, MASK_R1_TRAP, NIOS2_INSN_OPTARG, no_overflow}, - {"wrctl", "c,s", "c,s,E", 2, 4, iw_r_type, - MATCH_R1_WRCTL, MASK_R1_WRCTL, 0, no_overflow}, - {"wrprs", "d,s", "d,s,E", 2, 4, iw_r_type, - MATCH_R1_WRPRS, MASK_R1_WRPRS, 0, no_overflow}, - {"xor", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, - MATCH_R1_XOR, MASK_R1_XOR, 0, no_overflow}, - {"xorhi", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_XORHI, MASK_R1_XORHI, 0, unsigned_immed16_overflow}, - {"xori", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_XORI, MASK_R1_XORI, 0, unsigned_immed16_overflow} -}; - -#define NIOS2_NUM_R1_OPCODES \ - ((sizeof nios2_r1_opcodes) / (sizeof (nios2_r1_opcodes[0]))) -const int nios2_num_r1_opcodes = NIOS2_NUM_R1_OPCODES; - - -const struct nios2_opcode nios2_r2_opcodes[] = -{ - /* { name, args, args_test, num_args, size, format, - match, mask, pinfo, overflow } */ - {"add", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_ADD, MASK_R2_ADD, 0, no_overflow}, - {"addi", "t,s,i", "t,s,i,E", 3, 4, iw_F2I16_type, - MATCH_R2_ADDI, MASK_R2_ADDI, 0, signed_immed16_overflow}, - {"add.n", "D,S,T", "D,S,T,E", 3, 2, iw_T3X1_type, - MATCH_R2_ADD_N, MASK_R2_ADD_N, 0, no_overflow}, - {"addi.n", "D,S,e", "D,S,e,E", 3, 2, iw_T2X1I3_type, - MATCH_R2_ADDI_N, MASK_R2_ADDI_N, 0, enumeration_overflow}, - {"and", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_AND, MASK_R2_AND, 0, no_overflow}, - {"andchi", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_ANDCHI, MASK_R2_ANDCHI, 0, unsigned_immed16_overflow}, - {"andci", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_ANDCI, MASK_R2_ANDCI, 0, unsigned_immed16_overflow}, - {"andhi", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_ANDHI, MASK_R2_ANDHI, 0, unsigned_immed16_overflow}, - {"andi", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_ANDI, MASK_R2_ANDI, 0, unsigned_immed16_overflow}, - {"andi.n", "T,S,g", "T,S,g,E", 3, 2, iw_T2I4_type, - MATCH_R2_ANDI_N, MASK_R2_ANDI_N, 0, enumeration_overflow}, - {"and.n", "D,S,T", "D,S,T,E", 3, 2, iw_T2X3_type, - MATCH_R2_AND_N, MASK_R2_AND_N, 0, no_overflow}, - {"beq", "s,t,o", "s,t,o,E", 3, 4, iw_F2I16_type, - MATCH_R2_BEQ, MASK_R2_BEQ, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"beqz.n", "S,P", "S,P,E", 2, 2, iw_T1I7_type, - MATCH_R2_BEQZ_N, MASK_R2_BEQZ_N, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bge", "s,t,o", "s,t,o,E", 3, 4, iw_F2I16_type, - MATCH_R2_BGE, MASK_R2_BGE, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bgeu", "s,t,o", "s,t,o,E", 3, 4, iw_F2I16_type, - MATCH_R2_BGEU, MASK_R2_BGEU, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bgt", "s,t,o", "s,t,o,E", 3, 4, iw_F2I16_type, - MATCH_R2_BGT, MASK_R2_BGT, - NIOS2_INSN_MACRO|NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bgtu", "s,t,o", "s,t,o,E", 3, 4, iw_F2I16_type, - MATCH_R2_BGTU, MASK_R2_BGTU, - NIOS2_INSN_MACRO|NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"ble", "s,t,o", "s,t,o,E", 3, 4, iw_F2I16_type, - MATCH_R2_BLE, MASK_R2_BLE, - NIOS2_INSN_MACRO|NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bleu", "s,t,o", "s,t,o,E", 3, 4, iw_F2I16_type, - MATCH_R2_BLEU, MASK_R2_BLEU, - NIOS2_INSN_MACRO|NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"blt", "s,t,o", "s,t,o,E", 3, 4, iw_F2I16_type, - MATCH_R2_BLT, MASK_R2_BLT, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bltu", "s,t,o", "s,t,o,E", 3, 4, iw_F2I16_type, - MATCH_R2_BLTU, MASK_R2_BLTU, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bne", "s,t,o", "s,t,o,E", 3, 4, iw_F2I16_type, - MATCH_R2_BNE, MASK_R2_BNE, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"bnez.n", "S,P", "S,P,E", 2, 2, iw_T1I7_type, - MATCH_R2_BNEZ_N, MASK_R2_BNEZ_N, NIOS2_INSN_CBRANCH, branch_target_overflow}, - {"br", "o", "o,E", 1, 4, iw_F2I16_type, - MATCH_R2_BR, MASK_R2_BR, NIOS2_INSN_UBRANCH, branch_target_overflow}, - {"break", "j", "j,E", 1, 4, iw_F3X6L5_type, - MATCH_R2_BREAK, MASK_R2_BREAK, NIOS2_INSN_OPTARG, no_overflow}, - {"break.n", "j", "j,E", 1, 2, iw_X2L5_type, - MATCH_R2_BREAK_N, MASK_R2_BREAK_N, NIOS2_INSN_OPTARG, no_overflow}, - {"bret", "", "E", 0, 4, iw_F3X6_type, - MATCH_R2_BRET, MASK_R2_BRET, 0, no_overflow}, - {"br.n", "O", "O,E", 1, 2, iw_I10_type, - MATCH_R2_BR_N, MASK_R2_BR_N, NIOS2_INSN_UBRANCH, branch_target_overflow}, - {"call", "m", "m,E", 1, 4, iw_L26_type, - MATCH_R2_CALL, MASK_R2_CALL, NIOS2_INSN_CALL, call_target_overflow}, - {"callr", "s", "s,E", 1, 4, iw_F3X6_type, - MATCH_R2_CALLR, MASK_R2_CALLR, 0, no_overflow}, - {"callr.n", "s", "s,E", 1, 2, iw_F1X1_type, - MATCH_R2_CALLR_N, MASK_R2_CALLR_N, 0, no_overflow}, - {"cmpeq", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_CMPEQ, MASK_R2_CMPEQ, 0, no_overflow}, - {"cmpeqi", "t,s,i", "t,s,i,E", 3, 4, iw_F2I16_type, - MATCH_R2_CMPEQI, MASK_R2_CMPEQI, 0, signed_immed16_overflow}, - {"cmpge", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_CMPGE, MASK_R2_CMPGE, 0, no_overflow}, - {"cmpgei", "t,s,i", "t,s,i,E", 3, 4, iw_F2I16_type, - MATCH_R2_CMPGEI, MASK_R2_CMPGEI, 0, signed_immed16_overflow}, - {"cmpgeu", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_CMPGEU, MASK_R2_CMPGEU, 0, no_overflow}, - {"cmpgeui", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_CMPGEUI, MASK_R2_CMPGEUI, 0, unsigned_immed16_overflow}, - {"cmpgt", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_CMPGT, MASK_R2_CMPGT, NIOS2_INSN_MACRO, no_overflow}, - {"cmpgti", "t,s,i", "t,s,i,E", 3, 4, iw_F2I16_type, - MATCH_R2_CMPGTI, MASK_R2_CMPGTI, NIOS2_INSN_MACRO, signed_immed16_overflow}, - {"cmpgtu", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_CMPGTU, MASK_R2_CMPGTU, NIOS2_INSN_MACRO, no_overflow}, - {"cmpgtui", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_CMPGTUI, MASK_R2_CMPGTUI, - NIOS2_INSN_MACRO, unsigned_immed16_overflow}, - {"cmple", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_CMPLE, MASK_R2_CMPLE, NIOS2_INSN_MACRO, no_overflow}, - {"cmplei", "t,s,i", "t,s,i,E", 3, 4, iw_F2I16_type, - MATCH_R2_CMPLEI, MASK_R2_CMPLEI, NIOS2_INSN_MACRO, signed_immed16_overflow}, - {"cmpleu", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_CMPLEU, MASK_R2_CMPLEU, NIOS2_INSN_MACRO, no_overflow}, - {"cmpleui", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_CMPLEUI, MASK_R2_CMPLEUI, - NIOS2_INSN_MACRO, unsigned_immed16_overflow}, - {"cmplt", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_CMPLT, MASK_R2_CMPLT, 0, no_overflow}, - {"cmplti", "t,s,i", "t,s,i,E", 3, 4, iw_F2I16_type, - MATCH_R2_CMPLTI, MASK_R2_CMPLTI, 0, signed_immed16_overflow}, - {"cmpltu", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_CMPLTU, MASK_R2_CMPLTU, 0, no_overflow}, - {"cmpltui", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_CMPLTUI, MASK_R2_CMPLTUI, 0, unsigned_immed16_overflow}, - {"cmpne", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_CMPNE, MASK_R2_CMPNE, 0, no_overflow}, - {"cmpnei", "t,s,i", "t,s,i,E", 3, 4, iw_F2I16_type, - MATCH_R2_CMPNEI, MASK_R2_CMPNEI, 0, signed_immed16_overflow}, - {"custom", "l,d,s,t", "l,d,s,t,E", 4, 4, iw_F3X8_type, - MATCH_R2_CUSTOM, MASK_R2_CUSTOM, 0, custom_opcode_overflow}, - {"div", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_DIV, MASK_R2_DIV, 0, no_overflow}, - {"divu", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_DIVU, MASK_R2_DIVU, 0, no_overflow}, - {"eni", "j", "j,E", 1, 4, iw_F3X6L5_type, - MATCH_R2_ENI, MASK_R2_ENI, NIOS2_INSN_OPTARG, no_overflow}, - {"eret", "", "E", 0, 4, iw_F3X6_type, - MATCH_R2_ERET, MASK_R2_ERET, 0, no_overflow}, - {"extract", "t,s,j,k", "t,s,j,k,E", 4, 4, iw_F2X6L10_type, - MATCH_R2_EXTRACT, MASK_R2_EXTRACT, 0, no_overflow}, - {"flushd", "I(s)", "I(s),E", 2, 4, iw_F1X4I12_type, - MATCH_R2_FLUSHD, MASK_R2_FLUSHD, 0, address_offset_overflow}, - {"flushda", "I(s)", "I(s),E", 2, 4, iw_F1X4I12_type, - MATCH_R2_FLUSHDA, MASK_R2_FLUSHDA, 0, address_offset_overflow}, - {"flushi", "s", "s,E", 1, 4, iw_F3X6_type, - MATCH_R2_FLUSHI, MASK_R2_FLUSHI, 0, no_overflow}, - {"flushp", "", "E", 0, 4, iw_F3X6_type, - MATCH_R2_FLUSHP, MASK_R2_FLUSHP, 0, no_overflow}, - {"initd", "I(s)", "I(s),E", 2, 4, iw_F1X4I12_type, - MATCH_R2_INITD, MASK_R2_INITD, 0, address_offset_overflow}, - {"initda", "I(s)", "I(s),E", 2, 4, iw_F1X4I12_type, - MATCH_R2_INITDA, MASK_R2_INITDA, 0, address_offset_overflow}, - {"initi", "s", "s,E", 1, 4, iw_F3X6_type, - MATCH_R2_INITI, MASK_R2_INITI, 0, no_overflow}, - {"insert", "t,s,j,k", "t,s,j,k,E", 4, 4, iw_F2X6L10_type, - MATCH_R2_INSERT, MASK_R2_INSERT, 0, no_overflow}, - {"jmp", "s", "s,E", 1, 4, iw_F3X6_type, - MATCH_R2_JMP, MASK_R2_JMP, 0, no_overflow}, - {"jmpi", "m", "m,E", 1, 4, iw_L26_type, - MATCH_R2_JMPI, MASK_R2_JMPI, 0, call_target_overflow}, - {"jmpr.n", "s", "s,E", 1, 2, iw_F1X1_type, - MATCH_R2_JMPR_N, MASK_R2_JMPR_N, 0, no_overflow}, - {"ldb", "t,i(s)", "t,i(s),E", 3, 4, iw_F2I16_type, - MATCH_R2_LDB, MASK_R2_LDB, 0, address_offset_overflow}, - {"ldbio", "t,I(s)", "t,I(s),E", 3, 4, iw_F2X4I12_type, - MATCH_R2_LDBIO, MASK_R2_LDBIO, 0, signed_immed12_overflow}, - {"ldbu", "t,i(s)", "t,i(s),E", 3, 4, iw_F2I16_type, - MATCH_R2_LDBU, MASK_R2_LDBU, 0, address_offset_overflow}, - {"ldbuio", "t,I(s)", "t,I(s),E", 3, 4, iw_F2X4I12_type, - MATCH_R2_LDBUIO, MASK_R2_LDBUIO, 0, signed_immed12_overflow}, - {"ldbu.n", "T,Y(S)", "T,Y(S),E", 3, 2, iw_T2I4_type, - MATCH_R2_LDBU_N, MASK_R2_LDBU_N, 0, address_offset_overflow}, - {"ldex", "d,(s)", "d,(s),E", 2, 4, iw_F3X6_type, - MATCH_R2_LDEX, MASK_R2_LDEX, 0, no_overflow}, - {"ldh", "t,i(s)", "t,i(s),E", 3, 4, iw_F2I16_type, - MATCH_R2_LDH, MASK_R2_LDH, 0, address_offset_overflow}, - {"ldhio", "t,I(s)", "t,I(s),E", 3, 4, iw_F2X4I12_type, - MATCH_R2_LDHIO, MASK_R2_LDHIO, 0, signed_immed12_overflow}, - {"ldhu", "t,i(s)", "t,i(s),E", 3, 4, iw_F2I16_type, - MATCH_R2_LDHU, MASK_R2_LDHU, 0, address_offset_overflow}, - {"ldhuio", "t,I(s)", "t,I(s),E", 3, 4, iw_F2X4I12_type, - MATCH_R2_LDHUIO, MASK_R2_LDHUIO, 0, signed_immed12_overflow}, - {"ldhu.n", "T,X(S)", "T,X(S),E", 3, 2, iw_T2I4_type, - MATCH_R2_LDHU_N, MASK_R2_LDHU_N, 0, address_offset_overflow}, - {"ldsex", "d,(s)", "d,(s),E", 2, 4, iw_F3X6_type, - MATCH_R2_LDSEX, MASK_R2_LDSEX, 0, no_overflow}, - {"ldw", "t,i(s)", "t,i(s),E", 3, 4, iw_F2I16_type, - MATCH_R2_LDW, MASK_R2_LDW, 0, address_offset_overflow}, - {"ldwio", "t,I(s)", "t,I(s),E", 3, 4, iw_F2X4I12_type, - MATCH_R2_LDWIO, MASK_R2_LDWIO, 0, signed_immed12_overflow}, - {"ldwm", "R,B", "R,B,E", 2, 4, iw_F1X4L17_type, - MATCH_R2_LDWM, MASK_R2_LDWM, 0, no_overflow}, - {"ldw.n", "T,W(S)", "T,W(S),E", 3, 2, iw_T2I4_type, - MATCH_R2_LDW_N, MASK_R2_LDW_N, 0, address_offset_overflow}, - {"ldwsp.n", "t,V(s)", "t,V(s),E", 3, 2, iw_F1I5_type, - MATCH_R2_LDWSP_N, MASK_R2_LDWSP_N, 0, address_offset_overflow}, - {"merge", "t,s,j,k", "t,s,j,k,E", 4, 4, iw_F2X6L10_type, - MATCH_R2_MERGE, MASK_R2_MERGE, 0, no_overflow}, - {"mov", "d,s", "d,s,E", 2, 4, iw_F3X6_type, - MATCH_R2_MOV, MASK_R2_MOV, NIOS2_INSN_MACRO_MOV, no_overflow}, - {"mov.n", "d,s", "d,s,E", 2, 2, iw_F2_type, - MATCH_R2_MOV_N, MASK_R2_MOV_N, 0, no_overflow}, - {"movi.n", "D,h", "D,h,E", 2, 2, iw_T1I7_type, - MATCH_R2_MOVI_N, MASK_R2_MOVI_N, 0, enumeration_overflow}, - {"movhi", "t,u", "t,u,E", 2, 4, iw_F2I16_type, - MATCH_R2_MOVHI, MASK_R2_MOVHI, - NIOS2_INSN_MACRO_MOVI, unsigned_immed16_overflow}, - {"movi", "t,i", "t,i,E", 2, 4, iw_F2I16_type, - MATCH_R2_MOVI, MASK_R2_MOVI, NIOS2_INSN_MACRO_MOVI, signed_immed16_overflow}, - {"movia", "t,o", "t,o,E", 2, 4, iw_F2I16_type, - MATCH_R2_ORHI, MASK_R2_ORHI, NIOS2_INSN_MACRO_MOVIA, no_overflow}, - {"movui", "t,u", "t,u,E", 2, 4, iw_F2I16_type, - MATCH_R2_MOVUI, MASK_R2_MOVUI, - NIOS2_INSN_MACRO_MOVI, unsigned_immed16_overflow}, - {"mul", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_MUL, MASK_R2_MUL, 0, no_overflow}, - {"muli", "t,s,i", "t,s,i,E", 3, 4, iw_F2I16_type, - MATCH_R2_MULI, MASK_R2_MULI, 0, signed_immed16_overflow}, - {"mulxss", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_MULXSS, MASK_R2_MULXSS, 0, no_overflow}, - {"mulxsu", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_MULXSU, MASK_R2_MULXSU, 0, no_overflow}, - {"mulxuu", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_MULXUU, MASK_R2_MULXUU, 0, no_overflow}, - /* The encoding of the neg.n operands is backwards, not - the interpretation -- the first operand is still the - destination and the second the source. */ - {"neg.n", "S,D", "S,D,E", 2, 2, iw_T2X3_type, - MATCH_R2_NEG_N, MASK_R2_NEG_N, 0, no_overflow}, - {"nextpc", "d", "d,E", 1, 4, iw_F3X6_type, - MATCH_R2_NEXTPC, MASK_R2_NEXTPC, 0, no_overflow}, - {"nop", "", "E", 0, 4, iw_F3X6_type, - MATCH_R2_NOP, MASK_R2_NOP, NIOS2_INSN_MACRO_MOV, no_overflow}, - {"nop.n", "", "E", 0, 2, iw_F2_type, - MATCH_R2_NOP_N, MASK_R2_NOP_N, NIOS2_INSN_MACRO_MOV, no_overflow}, - {"nor", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_NOR, MASK_R2_NOR, 0, no_overflow}, - {"not.n", "D,S", "D,S,E", 2, 2, iw_T2X3_type, - MATCH_R2_NOT_N, MASK_R2_NOT_N, 0, no_overflow}, - {"or", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_OR, MASK_R2_OR, 0, no_overflow}, - {"orhi", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_ORHI, MASK_R2_ORHI, 0, unsigned_immed16_overflow}, - {"ori", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_ORI, MASK_R2_ORI, 0, unsigned_immed16_overflow}, - {"or.n", "D,S,T", "D,S,T,E", 3, 2, iw_T2X3_type, - MATCH_R2_OR_N, MASK_R2_OR_N, 0, no_overflow}, - {"pop.n", "R,W", "R,W,E", 2, 2, iw_L5I4X1_type, - MATCH_R2_POP_N, MASK_R2_POP_N, NIOS2_INSN_OPTARG, no_overflow}, - {"push.n", "R,W", "R,W,E", 2, 2, iw_L5I4X1_type, - MATCH_R2_PUSH_N, MASK_R2_PUSH_N, NIOS2_INSN_OPTARG, no_overflow}, - {"rdctl", "d,c", "d,c,E", 2, 4, iw_F3X6L5_type, - MATCH_R2_RDCTL, MASK_R2_RDCTL, 0, no_overflow}, - {"rdprs", "t,s,I", "t,s,I,E", 3, 4, iw_F2X4I12_type, - MATCH_R2_RDPRS, MASK_R2_RDPRS, 0, signed_immed12_overflow}, - {"ret", "", "E", 0, 4, iw_F3X6_type, - MATCH_R2_RET, MASK_R2_RET, 0, no_overflow}, - {"ret.n", "", "E", 0, 2, iw_X2L5_type, - MATCH_R2_RET_N, MASK_R2_RET_N, 0, no_overflow}, - {"rol", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_ROL, MASK_R2_ROL, 0, no_overflow}, - {"roli", "d,s,j", "d,s,j,E", 3, 4, iw_F3X6L5_type, - MATCH_R2_ROLI, MASK_R2_ROLI, 0, unsigned_immed5_overflow}, - {"ror", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_ROR, MASK_R2_ROR, 0, no_overflow}, - {"sll", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_SLL, MASK_R2_SLL, 0, no_overflow}, - {"slli", "d,s,j", "d,s,j,E", 3, 4, iw_F3X6L5_type, - MATCH_R2_SLLI, MASK_R2_SLLI, 0, unsigned_immed5_overflow}, - {"sll.n", "D,S,T", "D,S,T,E", 3, 2, iw_T2X3_type, - MATCH_R2_SLL_N, MASK_R2_SLL_N, 0, no_overflow}, - {"slli.n", "D,S,f", "D,S,f,E", 3, 2, iw_T2X1L3_type, - MATCH_R2_SLLI_N, MASK_R2_SLLI_N, 0, enumeration_overflow}, - {"spaddi.n", "D,U", "D,U,E", 2, 2, iw_T1I7_type, - MATCH_R2_SPADDI_N, MASK_R2_SPADDI_N, 0, address_offset_overflow}, - {"spdeci.n", "U", "U,E", 1, 2, iw_X1I7_type, - MATCH_R2_SPDECI_N, MASK_R2_SPDECI_N, 0, address_offset_overflow}, - {"spinci.n", "U", "U,E", 1, 2, iw_X1I7_type, - MATCH_R2_SPINCI_N, MASK_R2_SPINCI_N, 0, address_offset_overflow}, - {"sra", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_SRA, MASK_R2_SRA, 0, no_overflow}, - {"srai", "d,s,j", "d,s,j,E", 3, 4, iw_F3X6L5_type, - MATCH_R2_SRAI, MASK_R2_SRAI, 0, unsigned_immed5_overflow}, - {"srl", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_SRL, MASK_R2_SRL, 0, no_overflow}, - {"srli", "d,s,j", "d,s,j,E", 3, 4, iw_F3X6L5_type, - MATCH_R2_SRLI, MASK_R2_SRLI, 0, unsigned_immed5_overflow}, - {"srl.n", "D,S,T", "D,S,T,E", 3, 2, iw_T2X3_type, - MATCH_R2_SRL_N, MASK_R2_SRL_N, 0, no_overflow}, - {"srli.n", "D,S,f", "D,S,f,E", 3, 2, iw_T2X1L3_type, - MATCH_R2_SRLI_N, MASK_R2_SRLI_N, 0, enumeration_overflow}, - {"stb", "t,i(s)", "t,i(s),E", 3, 4, iw_F2I16_type, - MATCH_R2_STB, MASK_R2_STB, 0, address_offset_overflow}, - {"stbio", "t,I(s)", "t,I(s),E", 3, 4, iw_F2X4I12_type, - MATCH_R2_STBIO, MASK_R2_STBIO, 0, signed_immed12_overflow}, - {"stb.n", "T,Y(S)", "T,Y(S),E", 3, 2, iw_T2I4_type, - MATCH_R2_STB_N, MASK_R2_STB_N, 0, address_offset_overflow}, - {"stbz.n", "t,M(S)", "t,M(S),E", 3, 2, iw_T1X1I6_type, - MATCH_R2_STBZ_N, MASK_R2_STBZ_N, 0, address_offset_overflow}, - {"stex", "d,t,(s)", "d,t,(s),E", 3, 4, iw_F3X6_type, - MATCH_R2_STEX, MASK_R2_STEX, 0, no_overflow}, - {"sth", "t,i(s)", "t,i(s),E", 3, 4, iw_F2I16_type, - MATCH_R2_STH, MASK_R2_STH, 0, address_offset_overflow}, - {"sthio", "t,I(s)", "t,I(s),E", 3, 4, iw_F2X4I12_type, - MATCH_R2_STHIO, MASK_R2_STHIO, 0, signed_immed12_overflow}, - {"sth.n", "T,X(S)", "T,X(S),E", 3, 2, iw_T2I4_type, - MATCH_R2_STH_N, MASK_R2_STH_N, 0, address_offset_overflow}, - {"stsex", "d,t,(s)", "d,t,(s),E", 3, 4, iw_F3X6_type, - MATCH_R2_STSEX, MASK_R2_STSEX, 0, no_overflow}, - {"stw", "t,i(s)", "t,i(s),E", 3, 4, iw_F2I16_type, - MATCH_R2_STW, MASK_R2_STW, 0, address_offset_overflow}, - {"stwio", "t,I(s)", "t,I(s),E", 3, 4, iw_F2X4I12_type, - MATCH_R2_STWIO, MASK_R2_STWIO, 0, signed_immed12_overflow}, - {"stwm", "R,B", "R,B,E", 2, 4, iw_F1X4L17_type, - MATCH_R2_STWM, MASK_R2_STWM, 0, no_overflow}, - {"stwsp.n", "t,V(s)", "t,V(s),E", 3, 2, iw_F1I5_type, - MATCH_R2_STWSP_N, MASK_R2_STWSP_N, 0, address_offset_overflow}, - {"stw.n", "T,W(S)", "T,W(S),E", 3, 2, iw_T2I4_type, - MATCH_R2_STW_N, MASK_R2_STW_N, 0, address_offset_overflow}, - {"stwz.n", "t,N(S)", "t,N(S),E", 3, 2, iw_T1X1I6_type, - MATCH_R2_STWZ_N, MASK_R2_STWZ_N, 0, address_offset_overflow}, - {"sub", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_SUB, MASK_R2_SUB, 0, no_overflow}, - {"subi", "t,s,i", "t,s,i,E", 3, 4, iw_F2I16_type, - MATCH_R2_SUBI, MASK_R2_SUBI, NIOS2_INSN_MACRO, signed_immed16_overflow}, - {"sub.n", "D,S,T", "D,S,T,E", 3, 2, iw_T3X1_type, - MATCH_R2_SUB_N, MASK_R2_SUB_N, 0, no_overflow}, - {"subi.n", "D,S,e", "D,S,e,E", 3, 2, iw_T2X1I3_type, - MATCH_R2_SUBI_N, MASK_R2_SUBI_N, 0, enumeration_overflow}, - {"sync", "", "E", 0, 4, iw_F3X6_type, - MATCH_R2_SYNC, MASK_R2_SYNC, 0, no_overflow}, - {"trap", "j", "j,E", 1, 4, iw_F3X6L5_type, - MATCH_R2_TRAP, MASK_R2_TRAP, NIOS2_INSN_OPTARG, no_overflow}, - {"trap.n", "j", "j,E", 1, 2, iw_X2L5_type, - MATCH_R2_TRAP_N, MASK_R2_TRAP_N, NIOS2_INSN_OPTARG, no_overflow}, - {"wrctl", "c,s", "c,s,E", 2, 4, iw_F3X6L5_type, - MATCH_R2_WRCTL, MASK_R2_WRCTL, 0, no_overflow}, - {"wrpie", "d,s", "d,s,E", 2, 4, iw_F3X6L5_type, - MATCH_R2_WRPIE, MASK_R2_WRPIE, 0, no_overflow}, - {"wrprs", "d,s", "d,s,E", 2, 4, iw_F3X6_type, - MATCH_R2_WRPRS, MASK_R2_WRPRS, 0, no_overflow}, - {"xor", "d,s,t", "d,s,t,E", 3, 4, iw_F3X6_type, - MATCH_R2_XOR, MASK_R2_XOR, 0, no_overflow}, - {"xorhi", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_XORHI, MASK_R2_XORHI, 0, unsigned_immed16_overflow}, - {"xori", "t,s,u", "t,s,u,E", 3, 4, iw_F2I16_type, - MATCH_R2_XORI, MASK_R2_XORI, 0, unsigned_immed16_overflow}, - {"xor.n", "D,S,T", "D,S,T,E", 3, 2, iw_T2X3_type, - MATCH_R2_XOR_N, MASK_R2_XOR_N, 0, no_overflow}, -}; - -#define NIOS2_NUM_R2_OPCODES \ - ((sizeof nios2_r2_opcodes) / (sizeof (nios2_r2_opcodes[0]))) -const int nios2_num_r2_opcodes = NIOS2_NUM_R2_OPCODES; - -/* Default to using the R1 instruction tables. */ -struct nios2_opcode *nios2_opcodes = (struct nios2_opcode *) nios2_r1_opcodes; -int nios2_num_opcodes = NIOS2_NUM_R1_OPCODES; -#undef NIOS2_NUM_R1_OPCODES -#undef NIOS2_NUM_R2_OPCODES - -/* Decodings for R2 asi.n (addi.n/subi.n) immediate values. */ -unsigned int nios2_r2_asi_n_mappings[] = - {1, 2, 4, 8, 16, 32, 64, 128}; -const int nios2_num_r2_asi_n_mappings = 8; - -/* Decodings for R2 shi.n (slli.n/srli.n) immediate values. */ -unsigned int nios2_r2_shi_n_mappings[] = - {1, 2, 3, 8, 12, 16, 24, 31}; -const int nios2_num_r2_shi_n_mappings = 8; - -/* Decodings for R2 andi.n immediate values. */ -unsigned int nios2_r2_andi_n_mappings[] = - {1, 2, 3, 4, 8, 0xf, 0x10, 0x1f, - 0x20, 0x3f, 0x7f, 0x80, 0xff, 0x7ff, 0xff00, 0xffff}; -const int nios2_num_r2_andi_n_mappings = 16; - -/* Decodings for R2 3-bit register fields. */ -int nios2_r2_reg3_mappings[] = - {16, 17, 2, 3, 4, 5, 6, 7}; -const int nios2_num_r2_reg3_mappings = 8; - -/* Decodings for R2 push.n/pop.n REG_RANGE value list. */ -unsigned long nios2_r2_reg_range_mappings[] = { - 0x00010000, - 0x00030000, - 0x00070000, - 0x000f0000, - 0x001f0000, - 0x003f0000, - 0x007f0000, - 0x00ff0000 -}; -const int nios2_num_r2_reg_range_mappings = 8; |