* config/tc-sparc.h (md_do_align): New macro.

* config/tc-sparc.c (sparc_handle_align): Handle rs_align_code.
        Patch from Jakub Jelinek <jj@sunsite.mff.cuni.cz>.
This commit is contained in:
Richard Henderson 1997-10-23 00:22:51 +00:00
parent 36e75fe3ec
commit 7532235c09
3 changed files with 115 additions and 24 deletions

View file

@ -1,3 +1,9 @@
Wed Oct 22 17:22:59 1997 Richard Henderson <rth@cygnus.com>
* config/tc-sparc.h (md_do_align): New macro.
* config/tc-sparc.c (sparc_handle_align): Handle rs_align_code.
Patch from Jakub Jelinek <jj@sunsite.mff.cuni.cz>.
Wed Oct 22 12:51:18 1997 Ian Lance Taylor <ian@cygnus.com>
* config/tc-sh.c (sh_small): New variable.

View file

@ -3224,7 +3224,24 @@ void
sparc_handle_align (fragp)
fragS *fragp;
{
if (fragp->fr_type == rs_align_code
if (fragp->fr_type == rs_align_code && !fragp->fr_subtype
&& fragp->fr_next->fr_address - fragp->fr_address - fragp->fr_fix != 0)
as_bad_where (fragp->fr_file, fragp->fr_line, "misaligned data");
if (fragp->fr_type == rs_align_code && fragp->fr_subtype == 1024)
{
int count = fragp->fr_next->fr_address - fragp->fr_address - fragp->fr_fix;
if (count >= 4 && !(count & 3) && count <= 1024 && !((long)(fragp->fr_literal + fragp->fr_fix) & 3))
{
unsigned *p = (unsigned *)(fragp->fr_literal + fragp->fr_fix);
int i;
for (i = 0; i < count; i += 4)
*p++ = 0x01000000; /* nop */
if (SPARC_OPCODE_ARCH_V9_P (max_architecture) && count > 8)
*(unsigned *)(fragp->fr_literal + fragp->fr_fix) =
0x30680000 | (count >> 2); /* ba,a,pt %xcc, 1f */
fragp->fr_var = count;
}
}
}

View file

@ -1,5 +1,5 @@
/* tc-sparc.h - Macros and type defines for the sparc.
Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
Copyright (C) 1989, 90-96, 1997 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
@ -15,32 +15,32 @@
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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
to the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#ifndef TC_SPARC
#define TC_SPARC 1
#ifdef ANSI_PROTOTYPES
struct frag;
#endif
/* This is used to set the default value for `target_big_endian'. */
#define TARGET_BYTES_BIG_ENDIAN 1
#define LOCAL_LABELS_FB 1
#define TARGET_ARCH bfd_arch_sparc
#ifdef OBJ_AOUT
#ifdef TE_NetBSD
#define TARGET_FORMAT "a.out-sparc-netbsd"
#else
#define TARGET_FORMAT "a.out-sunos-big"
#endif
#endif
#ifdef OBJ_BOUT
#define TARGET_FORMAT "b.out.big"
#endif
#ifdef OBJ_ELF
#ifndef sparcv9
#define TARGET_FORMAT "elf32-sparc"
#else /* sparcv9 */
#define TARGET_FORMAT "elf64-sparc" /* v9 */
#define ENV64 /* v9 */
#endif /* sparcv9 */
#define LOCAL_LABEL(name) (((name)[0] == '.' && (name)[1] == 'L') || !strncmp ((name), "_.L_", 4))
extern const char *sparc_target_format PARAMS ((void));
#define TARGET_FORMAT sparc_target_format ()
#ifdef TE_SPARCAOUT
/* Bi-endian support may eventually be unconditional, but until things are
working well it's only provided for targets that need it. */
#define SPARC_BIENDIAN
#endif
#define WORKING_DOT_WORD
#define md_convert_frag(b,s,f) {as_fatal ("sparc convert_frag\n");}
@ -48,10 +48,54 @@
#define md_create_short_jump(p,f,t,fr,s) as_fatal("sparc_create_short_jump")
#define md_estimate_size_before_relax(f,s) \
(as_fatal("estimate_size_before_relax called"),1)
void tc_aout_pre_write_hook ();
#define LISTING_HEADER "SPARC GAS "
extern int sparc_pic_code;
#define md_do_align(n, fill, len, max, around) \
if ((n) && (n) <= 10 && !need_pass_2 && !(fill) \
&& now_seg != data_section && now_seg != bss_section) \
{ \
char *p; \
p = frag_var (rs_align_code, 1024, 1, (relax_substateT) 1024, \
(symbolS *) 0, (offsetT) (n), (char *) 0); \
*p = 0x00; \
goto around; \
}
/* We require .word, et. al., to be aligned correctly. */
#define md_cons_align(nbytes) sparc_cons_align (nbytes)
extern void sparc_cons_align PARAMS ((int));
#define HANDLE_ALIGN(fragp) sparc_handle_align (fragp)
extern void sparc_handle_align PARAMS ((struct frag *));
#if defined (OBJ_ELF) || defined (OBJ_AOUT)
/* This expression evaluates to false if the relocation is for a local
object for which we still want to do the relocation at runtime.
True if we are willing to perform this relocation while building
the .o file.
If the reloc is against an externally visible symbol, then the
a.out assembler should not do the relocation if generating PIC, and
the ELF assembler should never do the relocation. */
#ifdef OBJ_ELF
#define obj_relocate_extern 0
#else
#define obj_relocate_extern (! sparc_pic_code)
#endif
#define TC_RELOC_RTSYM_LOC_FIXUP(FIX) \
(obj_relocate_extern \
|| (FIX)->fx_addsy == NULL \
|| (! S_IS_EXTERNAL ((FIX)->fx_addsy) \
&& ! S_IS_WEAK ((FIX)->fx_addsy) \
&& S_IS_DEFINED ((FIX)->fx_addsy) \
&& ! S_IS_COMMON ((FIX)->fx_addsy)))
#endif
/* I know that "call 0" fails in sparc-coff if this doesn't return 1. I
don't know about other relocation types, or other formats, yet. */
#ifdef OBJ_COFF
@ -62,15 +106,39 @@ void tc_aout_pre_write_hook ();
#define RELOC_REQUIRES_SYMBOL
#endif
#define MD_APPLY_FIX3
#define TC_HANDLES_FX_DONE
#ifdef OBJ_ELF
/* Keep relocations against global symbols. Don't turn them into
relocations against sections. This is required for the dynamic
linker to operate properly. */
#define tc_fix_adjustable(FIX) (! S_IS_EXTERN ((FIX)->fx_addsy))
linker to operate properly. When generating PIC, we need to keep
any non PC relative reloc. */
#define tc_fix_adjustable(FIX) \
(! S_IS_EXTERNAL ((FIX)->fx_addsy) \
&& ! S_IS_WEAK ((FIX)->fx_addsy) \
&& (! sparc_pic_code \
|| (FIX)->fx_pcrel \
|| ((FIX)->fx_subsy != NULL \
&& (S_GET_SEGMENT ((FIX)->fx_subsy) \
== S_GET_SEGMENT ((FIX)->fx_addsy)))))
#endif
#ifdef OBJ_AOUT
/* When generating PIC code, we must not adjust any reloc which will
turn into a reloc against the global offset table. */
#define tc_fix_adjustable(FIX) \
(! sparc_pic_code \
|| (FIX)->fx_pcrel \
|| (FIX)->fx_r_type == BFD_RELOC_16 \
|| (FIX)->fx_r_type == BFD_RELOC_32)
#endif
#define md_operand(x)
extern void sparc_md_end PARAMS ((void));
#define md_end() sparc_md_end ()
#endif
/* end of tc-sparc.h */