2017-07-11 11:43:08 +02:00
|
|
|
|
/* DO NOT EDIT! -*- buffer-read-only: t -*- vi:set ro: */
|
2014-04-22 16:57:47 +02:00
|
|
|
|
/* Instruction building/extraction support for or1k. -*- C -*-
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2005-07-01 13:16:33 +02:00
|
|
|
|
THIS FILE IS MACHINE GENERATED WITH CGEN: Cpu tools GENerator.
|
|
|
|
|
- the resultant file is machine generated, cgen-ibld.in isn't
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2019-01-01 11:31:27 +01:00
|
|
|
|
Copyright (C) 1996-2019 Free Software Foundation, Inc.
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2007-07-05 11:49:03 +02:00
|
|
|
|
This file is part of libopcodes.
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2007-07-05 11:49:03 +02:00
|
|
|
|
This library is free software; you can redistribute it and/or modify
|
2005-07-01 13:16:33 +02:00
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-07-05 11:49:03 +02:00
|
|
|
|
the Free Software Foundation; either version 3, or (at your option)
|
2005-07-01 13:16:33 +02:00
|
|
|
|
any later version.
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2007-07-05 11:49:03 +02:00
|
|
|
|
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.
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2005-07-01 13:16:33 +02:00
|
|
|
|
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. */
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
|
|
|
|
/* ??? Eventually more and more of this stuff can go to cpu-independent files.
|
|
|
|
|
Keep that in mind. */
|
|
|
|
|
|
|
|
|
|
#include "sysdep.h"
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include "ansidecl.h"
|
|
|
|
|
#include "dis-asm.h"
|
|
|
|
|
#include "bfd.h"
|
|
|
|
|
#include "symcat.h"
|
2014-04-22 16:57:47 +02:00
|
|
|
|
#include "or1k-desc.h"
|
|
|
|
|
#include "or1k-opc.h"
|
cpu/
* m32c.cpu (f-dsp-32-u24): Fix mode of extract handler.
(f-dsp-40-u20, f-dsp-40-u24): Ditto.
opcodes/
* cgen-ibld.in: #include "cgen/basic-modes.h".
* fr30-ibld.c, * frv-ibld.c, * ip2k-ibld.c, * iq2000-ibld.c,
* lm32-ibld.c, * m32c-ibld.c, * m32r-ibld.c, * mep-ibld.c,
* mt-ibld.c, * openrisc-ibld.c, * xc16x-ibld.c,
* xstormy16-ibld.c: Regenerate.
2010-01-06 06:30:19 +01:00
|
|
|
|
#include "cgen/basic-modes.h"
|
2001-04-27 15:34:20 +02:00
|
|
|
|
#include "opintl.h"
|
2001-10-13 11:38:04 +02:00
|
|
|
|
#include "safe-ctype.h"
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2005-07-01 13:16:33 +02:00
|
|
|
|
#undef min
|
2001-04-27 15:34:20 +02:00
|
|
|
|
#define min(a,b) ((a) < (b) ? (a) : (b))
|
2005-07-01 13:16:33 +02:00
|
|
|
|
#undef max
|
2001-04-27 15:34:20 +02:00
|
|
|
|
#define max(a,b) ((a) > (b) ? (a) : (b))
|
|
|
|
|
|
|
|
|
|
/* Used by the ifield rtx function. */
|
|
|
|
|
#define FLD(f) (fields->f)
|
|
|
|
|
|
|
|
|
|
static const char * insert_normal
|
2003-08-09 02:39:21 +02:00
|
|
|
|
(CGEN_CPU_DESC, long, unsigned int, unsigned int, unsigned int,
|
|
|
|
|
unsigned int, unsigned int, unsigned int, CGEN_INSN_BYTES_PTR);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
static const char * insert_insn_normal
|
2003-08-09 02:39:21 +02:00
|
|
|
|
(CGEN_CPU_DESC, const CGEN_INSN *,
|
|
|
|
|
CGEN_FIELDS *, CGEN_INSN_BYTES_PTR, bfd_vma);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
static int extract_normal
|
2003-08-09 02:39:21 +02:00
|
|
|
|
(CGEN_CPU_DESC, CGEN_EXTRACT_INFO *, CGEN_INSN_INT,
|
|
|
|
|
unsigned int, unsigned int, unsigned int, unsigned int,
|
|
|
|
|
unsigned int, unsigned int, bfd_vma, long *);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
static int extract_insn_normal
|
2003-08-09 02:39:21 +02:00
|
|
|
|
(CGEN_CPU_DESC, const CGEN_INSN *, CGEN_EXTRACT_INFO *,
|
|
|
|
|
CGEN_INSN_INT, CGEN_FIELDS *, bfd_vma);
|
2001-10-09 10:54:58 +02:00
|
|
|
|
#if CGEN_INT_INSN_P
|
2001-04-27 15:34:20 +02:00
|
|
|
|
static void put_insn_int_value
|
2003-08-09 02:39:21 +02:00
|
|
|
|
(CGEN_CPU_DESC, CGEN_INSN_BYTES_PTR, int, int, CGEN_INSN_INT);
|
2001-10-09 10:54:58 +02:00
|
|
|
|
#endif
|
|
|
|
|
#if ! CGEN_INT_INSN_P
|
|
|
|
|
static CGEN_INLINE void insert_1
|
2003-08-09 02:39:21 +02:00
|
|
|
|
(CGEN_CPU_DESC, unsigned long, int, int, int, unsigned char *);
|
2001-10-09 10:54:58 +02:00
|
|
|
|
static CGEN_INLINE int fill_cache
|
2003-08-09 02:39:21 +02:00
|
|
|
|
(CGEN_CPU_DESC, CGEN_EXTRACT_INFO *, int, int, bfd_vma);
|
2001-10-09 10:54:58 +02:00
|
|
|
|
static CGEN_INLINE long extract_1
|
2003-08-09 02:39:21 +02:00
|
|
|
|
(CGEN_CPU_DESC, CGEN_EXTRACT_INFO *, int, int, int, unsigned char *, bfd_vma);
|
2001-10-09 10:54:58 +02:00
|
|
|
|
#endif
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
|
|
|
|
/* Operand insertion. */
|
|
|
|
|
|
|
|
|
|
#if ! CGEN_INT_INSN_P
|
|
|
|
|
|
|
|
|
|
/* Subroutine of insert_normal. */
|
|
|
|
|
|
|
|
|
|
static CGEN_INLINE void
|
2003-08-09 02:39:21 +02:00
|
|
|
|
insert_1 (CGEN_CPU_DESC cd,
|
|
|
|
|
unsigned long value,
|
|
|
|
|
int start,
|
|
|
|
|
int length,
|
|
|
|
|
int word_length,
|
|
|
|
|
unsigned char *bufp)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned long x,mask;
|
|
|
|
|
int shift;
|
|
|
|
|
|
2001-10-09 10:54:58 +02:00
|
|
|
|
x = cgen_get_insn_value (cd, bufp, word_length);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
|
|
|
|
/* Written this way to avoid undefined behaviour. */
|
|
|
|
|
mask = (((1L << (length - 1)) - 1) << 1) | 1;
|
|
|
|
|
if (CGEN_INSN_LSB0_P)
|
|
|
|
|
shift = (start + 1) - length;
|
|
|
|
|
else
|
|
|
|
|
shift = (word_length - (start + length));
|
|
|
|
|
x = (x & ~(mask << shift)) | ((value & mask) << shift);
|
|
|
|
|
|
2001-10-09 10:54:58 +02:00
|
|
|
|
cgen_put_insn_value (cd, bufp, word_length, (bfd_vma) x);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* ! CGEN_INT_INSN_P */
|
|
|
|
|
|
|
|
|
|
/* Default insertion routine.
|
|
|
|
|
|
|
|
|
|
ATTRS is a mask of the boolean attributes.
|
|
|
|
|
WORD_OFFSET is the offset in bits from the start of the insn of the value.
|
|
|
|
|
WORD_LENGTH is the length of the word in bits in which the value resides.
|
|
|
|
|
START is the starting bit number in the word, architecture origin.
|
|
|
|
|
LENGTH is the length of VALUE in bits.
|
|
|
|
|
TOTAL_LENGTH is the total length of the insn in bits.
|
|
|
|
|
|
|
|
|
|
The result is an error message or NULL if success. */
|
|
|
|
|
|
|
|
|
|
/* ??? This duplicates functionality with bfd's howto table and
|
|
|
|
|
bfd_install_relocation. */
|
|
|
|
|
/* ??? This doesn't handle bfd_vma's. Create another function when
|
|
|
|
|
necessary. */
|
|
|
|
|
|
|
|
|
|
static const char *
|
2003-08-09 02:39:21 +02:00
|
|
|
|
insert_normal (CGEN_CPU_DESC cd,
|
|
|
|
|
long value,
|
|
|
|
|
unsigned int attrs,
|
|
|
|
|
unsigned int word_offset,
|
|
|
|
|
unsigned int start,
|
|
|
|
|
unsigned int length,
|
|
|
|
|
unsigned int word_length,
|
|
|
|
|
unsigned int total_length,
|
|
|
|
|
CGEN_INSN_BYTES_PTR buffer)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
static char errbuf[100];
|
|
|
|
|
/* Written this way to avoid undefined behaviour. */
|
|
|
|
|
unsigned long mask = (((1L << (length - 1)) - 1) << 1) | 1;
|
|
|
|
|
|
|
|
|
|
/* If LENGTH is zero, this operand doesn't contribute to the value. */
|
|
|
|
|
if (length == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
* cgen-ibld.in (insert_normal, extract_normal): Minor cleanup.
* fr30-ibld.c, * frv-ibld.c, * ip2k-ibld.c, * iq2000-ibld.c,
* lm32-ibld.c, * m32c-ibld.c, * m32r-ibld.c, * mep-ibld.c,
* mt-ibld.c, * openrisc-ibld.c, * xc16x-ibld.c,
* xstormy16-ibld.c: Regenerate.
2010-01-07 19:05:45 +01:00
|
|
|
|
if (word_length > 8 * sizeof (CGEN_INSN_INT))
|
2001-04-27 15:34:20 +02:00
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
/* For architectures with insns smaller than the base-insn-bitsize,
|
|
|
|
|
word_length may be too big. */
|
|
|
|
|
if (cd->min_insn_bitsize < cd->base_insn_bitsize)
|
|
|
|
|
{
|
|
|
|
|
if (word_offset == 0
|
|
|
|
|
&& word_length > total_length)
|
|
|
|
|
word_length = total_length;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Ensure VALUE will fit. */
|
2001-08-12 22:16:29 +02:00
|
|
|
|
if (CGEN_BOOL_ATTR (attrs, CGEN_IFLD_SIGN_OPT))
|
|
|
|
|
{
|
|
|
|
|
long minval = - (1L << (length - 1));
|
|
|
|
|
unsigned long maxval = mask;
|
2015-08-12 13:45:07 +02:00
|
|
|
|
|
2001-08-12 22:16:29 +02:00
|
|
|
|
if ((value > 0 && (unsigned long) value > maxval)
|
|
|
|
|
|| value < minval)
|
|
|
|
|
{
|
|
|
|
|
/* xgettext:c-format */
|
|
|
|
|
sprintf (errbuf,
|
|
|
|
|
_("operand out of range (%ld not between %ld and %lu)"),
|
|
|
|
|
value, minval, maxval);
|
|
|
|
|
return errbuf;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (! CGEN_BOOL_ATTR (attrs, CGEN_IFLD_SIGNED))
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned long maxval = mask;
|
2006-03-05 09:38:53 +01:00
|
|
|
|
unsigned long val = (unsigned long) value;
|
|
|
|
|
|
|
|
|
|
/* For hosts with a word size > 32 check to see if value has been sign
|
|
|
|
|
extended beyond 32 bits. If so then ignore these higher sign bits
|
|
|
|
|
as the user is attempting to store a 32-bit signed value into an
|
|
|
|
|
unsigned 32-bit field which is allowed. */
|
|
|
|
|
if (sizeof (unsigned long) > 4 && ((value >> 32) == -1))
|
|
|
|
|
val &= 0xFFFFFFFF;
|
|
|
|
|
|
|
|
|
|
if (val > maxval)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
/* xgettext:c-format */
|
|
|
|
|
sprintf (errbuf,
|
2006-03-05 09:38:53 +01:00
|
|
|
|
_("operand out of range (0x%lx not between 0 and 0x%lx)"),
|
|
|
|
|
val, maxval);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
return errbuf;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (! cgen_signed_overflow_ok_p (cd))
|
|
|
|
|
{
|
|
|
|
|
long minval = - (1L << (length - 1));
|
|
|
|
|
long maxval = (1L << (length - 1)) - 1;
|
2015-08-12 13:45:07 +02:00
|
|
|
|
|
2001-04-27 15:34:20 +02:00
|
|
|
|
if (value < minval || value > maxval)
|
|
|
|
|
{
|
|
|
|
|
sprintf
|
|
|
|
|
/* xgettext:c-format */
|
|
|
|
|
(errbuf, _("operand out of range (%ld not between %ld and %ld)"),
|
|
|
|
|
value, minval, maxval);
|
|
|
|
|
return errbuf;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if CGEN_INT_INSN_P
|
|
|
|
|
|
|
|
|
|
{
|
opcodes/cgen: Rework calculation of shift when inserting fields
The calculation of the shift amount, used to insert fields into the
instruction buffer, is not correct when the following conditions are all
true:
- CGEN_INT_INSN_P is defined, and true.
- CGEN_INSN_LSB0_P is true
- Total instruction length is greater than the length of a single
instruction word (the instruction is made of multiple words)
- The word offset is non-zero (the field is outside the first word)
When the above conditions are all true, the calculated shift fails to
take account of the total instruction length.
After this commit the calculation of the shift amount is split into two
parts, first we calculate the shift required to get to BIT0 of the word
in which the field lives, then we calculate the shift required to place
the field within the instruction word.
The change in this commit only effects the CGEN_INT_INSN_P defined true
case, but changes the code for both CGEN_INSN_LSB0_P true, and false.
In the case of CGEN_INSN_LSB0_P being false, the code used to say:
shift = total_length - (word_offset + start + length);
Now it says:
shift_to_word = total_length - (word_offset + word_length);
shift_within_word = word_length - start - length;
shift = shift_to_word + shift_within_word;
From which we can see that in all cases the computed shift value should
be unchanged.
In the case of CGEN_INSN_LSB0_P being true, the code used to say:
shift = (word_offset + start + 1) - length;
Now it says:
shift_to_word = total_length - (word_offset + word_length);
shift_within_word = start + 1 - length;
shift = shift_to_word + shift_within_word;
In the case where 'total_length == word_length' AND 'word_offset ==
0' (which indicates an instruction of a single word), we see that the
computed shift value will be unchanged. However, when the total_length
and word_length are different, and the word_offset is non-zero then the
computed shift value will be different (and correct).
opcodes/ChangeLog:
* cgen-ibld.in (insert_normal): Rework calculation of shift.
* epiphany-ibld.c: Regenerate.
* fr30-ibld.c: Regenerate.
* frv-ibld.c: Regenerate.
* ip2k-ibld.c: Regenerate.
* iq2000-ibld.c: Regenerate.
* lm32-ibld.c: Regenerate.
* m32c-ibld.c: Regenerate.
* m32r-ibld.c: Regenerate.
* mep-ibld.c: Regenerate.
* mt-ibld.c: Regenerate.
* or1k-ibld.c: Regenerate.
* xc16x-ibld.c: Regenerate.
* xstormy16-ibld.c: Regenerate.
2016-01-31 01:41:12 +01:00
|
|
|
|
int shift_within_word, shift_to_word, shift;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
opcodes/cgen: Rework calculation of shift when inserting fields
The calculation of the shift amount, used to insert fields into the
instruction buffer, is not correct when the following conditions are all
true:
- CGEN_INT_INSN_P is defined, and true.
- CGEN_INSN_LSB0_P is true
- Total instruction length is greater than the length of a single
instruction word (the instruction is made of multiple words)
- The word offset is non-zero (the field is outside the first word)
When the above conditions are all true, the calculated shift fails to
take account of the total instruction length.
After this commit the calculation of the shift amount is split into two
parts, first we calculate the shift required to get to BIT0 of the word
in which the field lives, then we calculate the shift required to place
the field within the instruction word.
The change in this commit only effects the CGEN_INT_INSN_P defined true
case, but changes the code for both CGEN_INSN_LSB0_P true, and false.
In the case of CGEN_INSN_LSB0_P being false, the code used to say:
shift = total_length - (word_offset + start + length);
Now it says:
shift_to_word = total_length - (word_offset + word_length);
shift_within_word = word_length - start - length;
shift = shift_to_word + shift_within_word;
From which we can see that in all cases the computed shift value should
be unchanged.
In the case of CGEN_INSN_LSB0_P being true, the code used to say:
shift = (word_offset + start + 1) - length;
Now it says:
shift_to_word = total_length - (word_offset + word_length);
shift_within_word = start + 1 - length;
shift = shift_to_word + shift_within_word;
In the case where 'total_length == word_length' AND 'word_offset ==
0' (which indicates an instruction of a single word), we see that the
computed shift value will be unchanged. However, when the total_length
and word_length are different, and the word_offset is non-zero then the
computed shift value will be different (and correct).
opcodes/ChangeLog:
* cgen-ibld.in (insert_normal): Rework calculation of shift.
* epiphany-ibld.c: Regenerate.
* fr30-ibld.c: Regenerate.
* frv-ibld.c: Regenerate.
* ip2k-ibld.c: Regenerate.
* iq2000-ibld.c: Regenerate.
* lm32-ibld.c: Regenerate.
* m32c-ibld.c: Regenerate.
* m32r-ibld.c: Regenerate.
* mep-ibld.c: Regenerate.
* mt-ibld.c: Regenerate.
* or1k-ibld.c: Regenerate.
* xc16x-ibld.c: Regenerate.
* xstormy16-ibld.c: Regenerate.
2016-01-31 01:41:12 +01:00
|
|
|
|
/* How to shift the value to BIT0 of the word. */
|
|
|
|
|
shift_to_word = total_length - (word_offset + word_length);
|
|
|
|
|
|
|
|
|
|
/* How to shift the value to the field within the word. */
|
2001-04-27 15:34:20 +02:00
|
|
|
|
if (CGEN_INSN_LSB0_P)
|
opcodes/cgen: Rework calculation of shift when inserting fields
The calculation of the shift amount, used to insert fields into the
instruction buffer, is not correct when the following conditions are all
true:
- CGEN_INT_INSN_P is defined, and true.
- CGEN_INSN_LSB0_P is true
- Total instruction length is greater than the length of a single
instruction word (the instruction is made of multiple words)
- The word offset is non-zero (the field is outside the first word)
When the above conditions are all true, the calculated shift fails to
take account of the total instruction length.
After this commit the calculation of the shift amount is split into two
parts, first we calculate the shift required to get to BIT0 of the word
in which the field lives, then we calculate the shift required to place
the field within the instruction word.
The change in this commit only effects the CGEN_INT_INSN_P defined true
case, but changes the code for both CGEN_INSN_LSB0_P true, and false.
In the case of CGEN_INSN_LSB0_P being false, the code used to say:
shift = total_length - (word_offset + start + length);
Now it says:
shift_to_word = total_length - (word_offset + word_length);
shift_within_word = word_length - start - length;
shift = shift_to_word + shift_within_word;
From which we can see that in all cases the computed shift value should
be unchanged.
In the case of CGEN_INSN_LSB0_P being true, the code used to say:
shift = (word_offset + start + 1) - length;
Now it says:
shift_to_word = total_length - (word_offset + word_length);
shift_within_word = start + 1 - length;
shift = shift_to_word + shift_within_word;
In the case where 'total_length == word_length' AND 'word_offset ==
0' (which indicates an instruction of a single word), we see that the
computed shift value will be unchanged. However, when the total_length
and word_length are different, and the word_offset is non-zero then the
computed shift value will be different (and correct).
opcodes/ChangeLog:
* cgen-ibld.in (insert_normal): Rework calculation of shift.
* epiphany-ibld.c: Regenerate.
* fr30-ibld.c: Regenerate.
* frv-ibld.c: Regenerate.
* ip2k-ibld.c: Regenerate.
* iq2000-ibld.c: Regenerate.
* lm32-ibld.c: Regenerate.
* m32c-ibld.c: Regenerate.
* m32r-ibld.c: Regenerate.
* mep-ibld.c: Regenerate.
* mt-ibld.c: Regenerate.
* or1k-ibld.c: Regenerate.
* xc16x-ibld.c: Regenerate.
* xstormy16-ibld.c: Regenerate.
2016-01-31 01:41:12 +01:00
|
|
|
|
shift_within_word = start + 1 - length;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
else
|
opcodes/cgen: Rework calculation of shift when inserting fields
The calculation of the shift amount, used to insert fields into the
instruction buffer, is not correct when the following conditions are all
true:
- CGEN_INT_INSN_P is defined, and true.
- CGEN_INSN_LSB0_P is true
- Total instruction length is greater than the length of a single
instruction word (the instruction is made of multiple words)
- The word offset is non-zero (the field is outside the first word)
When the above conditions are all true, the calculated shift fails to
take account of the total instruction length.
After this commit the calculation of the shift amount is split into two
parts, first we calculate the shift required to get to BIT0 of the word
in which the field lives, then we calculate the shift required to place
the field within the instruction word.
The change in this commit only effects the CGEN_INT_INSN_P defined true
case, but changes the code for both CGEN_INSN_LSB0_P true, and false.
In the case of CGEN_INSN_LSB0_P being false, the code used to say:
shift = total_length - (word_offset + start + length);
Now it says:
shift_to_word = total_length - (word_offset + word_length);
shift_within_word = word_length - start - length;
shift = shift_to_word + shift_within_word;
From which we can see that in all cases the computed shift value should
be unchanged.
In the case of CGEN_INSN_LSB0_P being true, the code used to say:
shift = (word_offset + start + 1) - length;
Now it says:
shift_to_word = total_length - (word_offset + word_length);
shift_within_word = start + 1 - length;
shift = shift_to_word + shift_within_word;
In the case where 'total_length == word_length' AND 'word_offset ==
0' (which indicates an instruction of a single word), we see that the
computed shift value will be unchanged. However, when the total_length
and word_length are different, and the word_offset is non-zero then the
computed shift value will be different (and correct).
opcodes/ChangeLog:
* cgen-ibld.in (insert_normal): Rework calculation of shift.
* epiphany-ibld.c: Regenerate.
* fr30-ibld.c: Regenerate.
* frv-ibld.c: Regenerate.
* ip2k-ibld.c: Regenerate.
* iq2000-ibld.c: Regenerate.
* lm32-ibld.c: Regenerate.
* m32c-ibld.c: Regenerate.
* m32r-ibld.c: Regenerate.
* mep-ibld.c: Regenerate.
* mt-ibld.c: Regenerate.
* or1k-ibld.c: Regenerate.
* xc16x-ibld.c: Regenerate.
* xstormy16-ibld.c: Regenerate.
2016-01-31 01:41:12 +01:00
|
|
|
|
shift_within_word = word_length - start - length;
|
|
|
|
|
|
|
|
|
|
/* The total SHIFT, then mask in the value. */
|
|
|
|
|
shift = shift_to_word + shift_within_word;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
*buffer = (*buffer & ~(mask << shift)) | ((value & mask) << shift);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else /* ! CGEN_INT_INSN_P */
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
unsigned char *bufp = (unsigned char *) buffer + word_offset / 8;
|
|
|
|
|
|
|
|
|
|
insert_1 (cd, value, start, length, word_length, bufp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* ! CGEN_INT_INSN_P */
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Default insn builder (insert handler).
|
|
|
|
|
The instruction is recorded in CGEN_INT_INSN_P byte order (meaning
|
|
|
|
|
that if CGEN_INSN_BYTES_PTR is an int * and thus, the value is
|
|
|
|
|
recorded in host byte order, otherwise BUFFER is an array of bytes
|
|
|
|
|
and the value is recorded in target byte order).
|
|
|
|
|
The result is an error message or NULL if success. */
|
|
|
|
|
|
|
|
|
|
static const char *
|
2003-08-09 02:39:21 +02:00
|
|
|
|
insert_insn_normal (CGEN_CPU_DESC cd,
|
|
|
|
|
const CGEN_INSN * insn,
|
|
|
|
|
CGEN_FIELDS * fields,
|
|
|
|
|
CGEN_INSN_BYTES_PTR buffer,
|
|
|
|
|
bfd_vma pc)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
|
|
|
|
|
unsigned long value;
|
|
|
|
|
const CGEN_SYNTAX_CHAR_TYPE * syn;
|
|
|
|
|
|
|
|
|
|
CGEN_INIT_INSERT (cd);
|
|
|
|
|
value = CGEN_INSN_BASE_VALUE (insn);
|
|
|
|
|
|
|
|
|
|
/* If we're recording insns as numbers (rather than a string of bytes),
|
|
|
|
|
target byte order handling is deferred until later. */
|
|
|
|
|
|
|
|
|
|
#if CGEN_INT_INSN_P
|
|
|
|
|
|
|
|
|
|
put_insn_int_value (cd, buffer, cd->base_insn_bitsize,
|
|
|
|
|
CGEN_FIELDS_BITSIZE (fields), value);
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
2001-10-09 10:54:58 +02:00
|
|
|
|
cgen_put_insn_value (cd, buffer, min ((unsigned) cd->base_insn_bitsize,
|
|
|
|
|
(unsigned) CGEN_FIELDS_BITSIZE (fields)),
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value);
|
|
|
|
|
|
|
|
|
|
#endif /* ! CGEN_INT_INSN_P */
|
|
|
|
|
|
|
|
|
|
/* ??? It would be better to scan the format's fields.
|
|
|
|
|
Still need to be able to insert a value based on the operand though;
|
|
|
|
|
e.g. storing a branch displacement that got resolved later.
|
|
|
|
|
Needs more thought first. */
|
|
|
|
|
|
|
|
|
|
for (syn = CGEN_SYNTAX_STRING (syntax); * syn; ++ syn)
|
|
|
|
|
{
|
|
|
|
|
const char *errmsg;
|
|
|
|
|
|
|
|
|
|
if (CGEN_SYNTAX_CHAR_P (* syn))
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
errmsg = (* cd->insert_operand) (cd, CGEN_SYNTAX_FIELD (*syn),
|
|
|
|
|
fields, buffer, pc);
|
|
|
|
|
if (errmsg)
|
|
|
|
|
return errmsg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2001-10-09 10:54:58 +02:00
|
|
|
|
#if CGEN_INT_INSN_P
|
2001-04-27 15:34:20 +02:00
|
|
|
|
/* Cover function to store an insn value into an integral insn. Must go here
|
2005-07-01 13:16:33 +02:00
|
|
|
|
because it needs <prefix>-desc.h for CGEN_INT_INSN_P. */
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
|
|
|
|
static void
|
2003-08-09 02:39:21 +02:00
|
|
|
|
put_insn_int_value (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
|
|
|
|
|
CGEN_INSN_BYTES_PTR buf,
|
|
|
|
|
int length,
|
|
|
|
|
int insn_length,
|
|
|
|
|
CGEN_INSN_INT value)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
/* For architectures with insns smaller than the base-insn-bitsize,
|
|
|
|
|
length may be too big. */
|
|
|
|
|
if (length > insn_length)
|
|
|
|
|
*buf = value;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int shift = insn_length - length;
|
|
|
|
|
/* Written this way to avoid undefined behaviour. */
|
|
|
|
|
CGEN_INSN_INT mask = (((1L << (length - 1)) - 1) << 1) | 1;
|
2005-07-01 13:16:33 +02:00
|
|
|
|
|
2001-04-27 15:34:20 +02:00
|
|
|
|
*buf = (*buf & ~(mask << shift)) | ((value & mask) << shift);
|
|
|
|
|
}
|
|
|
|
|
}
|
2001-10-09 10:54:58 +02:00
|
|
|
|
#endif
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
|
|
|
|
/* Operand extraction. */
|
|
|
|
|
|
|
|
|
|
#if ! CGEN_INT_INSN_P
|
|
|
|
|
|
|
|
|
|
/* Subroutine of extract_normal.
|
|
|
|
|
Ensure sufficient bytes are cached in EX_INFO.
|
|
|
|
|
OFFSET is the offset in bytes from the start of the insn of the value.
|
|
|
|
|
BYTES is the length of the needed value.
|
|
|
|
|
Returns 1 for success, 0 for failure. */
|
|
|
|
|
|
|
|
|
|
static CGEN_INLINE int
|
2003-08-09 02:39:21 +02:00
|
|
|
|
fill_cache (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
|
|
|
|
|
CGEN_EXTRACT_INFO *ex_info,
|
|
|
|
|
int offset,
|
|
|
|
|
int bytes,
|
|
|
|
|
bfd_vma pc)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
/* It's doubtful that the middle part has already been fetched so
|
|
|
|
|
we don't optimize that case. kiss. */
|
2001-10-09 10:54:58 +02:00
|
|
|
|
unsigned int mask;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
disassemble_info *info = (disassemble_info *) ex_info->dis_info;
|
|
|
|
|
|
|
|
|
|
/* First do a quick check. */
|
|
|
|
|
mask = (1 << bytes) - 1;
|
|
|
|
|
if (((ex_info->valid >> offset) & mask) == mask)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* Search for the first byte we need to read. */
|
|
|
|
|
for (mask = 1 << offset; bytes > 0; --bytes, ++offset, mask <<= 1)
|
|
|
|
|
if (! (mask & ex_info->valid))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (bytes)
|
|
|
|
|
{
|
|
|
|
|
int status;
|
|
|
|
|
|
|
|
|
|
pc += offset;
|
|
|
|
|
status = (*info->read_memory_func)
|
|
|
|
|
(pc, ex_info->insn_bytes + offset, bytes, info);
|
|
|
|
|
|
|
|
|
|
if (status != 0)
|
|
|
|
|
{
|
|
|
|
|
(*info->memory_error_func) (status, pc, info);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ex_info->valid |= ((1 << bytes) - 1) << offset;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Subroutine of extract_normal. */
|
|
|
|
|
|
|
|
|
|
static CGEN_INLINE long
|
2003-08-09 02:39:21 +02:00
|
|
|
|
extract_1 (CGEN_CPU_DESC cd,
|
|
|
|
|
CGEN_EXTRACT_INFO *ex_info ATTRIBUTE_UNUSED,
|
|
|
|
|
int start,
|
|
|
|
|
int length,
|
|
|
|
|
int word_length,
|
|
|
|
|
unsigned char *bufp,
|
|
|
|
|
bfd_vma pc ATTRIBUTE_UNUSED)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
unsigned long x;
|
|
|
|
|
int shift;
|
2005-07-01 13:16:33 +02:00
|
|
|
|
|
2001-11-09 11:21:22 +01:00
|
|
|
|
x = cgen_get_insn_value (cd, bufp, word_length);
|
|
|
|
|
|
2001-04-27 15:34:20 +02:00
|
|
|
|
if (CGEN_INSN_LSB0_P)
|
|
|
|
|
shift = (start + 1) - length;
|
|
|
|
|
else
|
|
|
|
|
shift = (word_length - (start + length));
|
|
|
|
|
return x >> shift;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* ! CGEN_INT_INSN_P */
|
|
|
|
|
|
|
|
|
|
/* Default extraction routine.
|
|
|
|
|
|
|
|
|
|
INSN_VALUE is the first base_insn_bitsize bits of the insn in host order,
|
|
|
|
|
or sometimes less for cases like the m32r where the base insn size is 32
|
|
|
|
|
but some insns are 16 bits.
|
|
|
|
|
ATTRS is a mask of the boolean attributes. We only need `SIGNED',
|
|
|
|
|
but for generality we take a bitmask of all of them.
|
|
|
|
|
WORD_OFFSET is the offset in bits from the start of the insn of the value.
|
|
|
|
|
WORD_LENGTH is the length of the word in bits in which the value resides.
|
|
|
|
|
START is the starting bit number in the word, architecture origin.
|
|
|
|
|
LENGTH is the length of VALUE in bits.
|
|
|
|
|
TOTAL_LENGTH is the total length of the insn in bits.
|
|
|
|
|
|
|
|
|
|
Returns 1 for success, 0 for failure. */
|
|
|
|
|
|
|
|
|
|
/* ??? The return code isn't properly used. wip. */
|
|
|
|
|
|
|
|
|
|
/* ??? This doesn't handle bfd_vma's. Create another function when
|
|
|
|
|
necessary. */
|
|
|
|
|
|
|
|
|
|
static int
|
2003-08-09 02:39:21 +02:00
|
|
|
|
extract_normal (CGEN_CPU_DESC cd,
|
2001-04-27 15:34:20 +02:00
|
|
|
|
#if ! CGEN_INT_INSN_P
|
2003-08-09 02:39:21 +02:00
|
|
|
|
CGEN_EXTRACT_INFO *ex_info,
|
2001-04-27 15:34:20 +02:00
|
|
|
|
#else
|
2003-08-09 02:39:21 +02:00
|
|
|
|
CGEN_EXTRACT_INFO *ex_info ATTRIBUTE_UNUSED,
|
2001-04-27 15:34:20 +02:00
|
|
|
|
#endif
|
2003-08-09 02:39:21 +02:00
|
|
|
|
CGEN_INSN_INT insn_value,
|
|
|
|
|
unsigned int attrs,
|
|
|
|
|
unsigned int word_offset,
|
|
|
|
|
unsigned int start,
|
|
|
|
|
unsigned int length,
|
|
|
|
|
unsigned int word_length,
|
|
|
|
|
unsigned int total_length,
|
2001-04-27 15:34:20 +02:00
|
|
|
|
#if ! CGEN_INT_INSN_P
|
2003-08-09 02:39:21 +02:00
|
|
|
|
bfd_vma pc,
|
2001-04-27 15:34:20 +02:00
|
|
|
|
#else
|
2003-08-09 02:39:21 +02:00
|
|
|
|
bfd_vma pc ATTRIBUTE_UNUSED,
|
2001-04-27 15:34:20 +02:00
|
|
|
|
#endif
|
2003-08-09 02:39:21 +02:00
|
|
|
|
long *valuep)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
2001-08-12 22:16:29 +02:00
|
|
|
|
long value, mask;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
|
|
|
|
/* If LENGTH is zero, this operand doesn't contribute to the value
|
|
|
|
|
so give it a standard value of zero. */
|
|
|
|
|
if (length == 0)
|
|
|
|
|
{
|
|
|
|
|
*valuep = 0;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
* cgen-ibld.in (insert_normal, extract_normal): Minor cleanup.
* fr30-ibld.c, * frv-ibld.c, * ip2k-ibld.c, * iq2000-ibld.c,
* lm32-ibld.c, * m32c-ibld.c, * m32r-ibld.c, * mep-ibld.c,
* mt-ibld.c, * openrisc-ibld.c, * xc16x-ibld.c,
* xstormy16-ibld.c: Regenerate.
2010-01-07 19:05:45 +01:00
|
|
|
|
if (word_length > 8 * sizeof (CGEN_INSN_INT))
|
2001-04-27 15:34:20 +02:00
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
/* For architectures with insns smaller than the insn-base-bitsize,
|
|
|
|
|
word_length may be too big. */
|
|
|
|
|
if (cd->min_insn_bitsize < cd->base_insn_bitsize)
|
|
|
|
|
{
|
2006-03-05 09:38:53 +01:00
|
|
|
|
if (word_offset + word_length > total_length)
|
|
|
|
|
word_length = total_length - word_offset;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
}
|
|
|
|
|
|
2001-08-12 22:16:29 +02:00
|
|
|
|
/* Does the value reside in INSN_VALUE, and at the right alignment? */
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2001-08-12 22:16:29 +02:00
|
|
|
|
if (CGEN_INT_INSN_P || (word_offset == 0 && word_length == total_length))
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
if (CGEN_INSN_LSB0_P)
|
|
|
|
|
value = insn_value >> ((word_offset + start + 1) - length);
|
|
|
|
|
else
|
|
|
|
|
value = insn_value >> (total_length - ( word_offset + start + length));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if ! CGEN_INT_INSN_P
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
unsigned char *bufp = ex_info->insn_bytes + word_offset / 8;
|
|
|
|
|
|
* cgen-ibld.in (insert_normal, extract_normal): Minor cleanup.
* fr30-ibld.c, * frv-ibld.c, * ip2k-ibld.c, * iq2000-ibld.c,
* lm32-ibld.c, * m32c-ibld.c, * m32r-ibld.c, * mep-ibld.c,
* mt-ibld.c, * openrisc-ibld.c, * xc16x-ibld.c,
* xstormy16-ibld.c: Regenerate.
2010-01-07 19:05:45 +01:00
|
|
|
|
if (word_length > 8 * sizeof (CGEN_INSN_INT))
|
2001-04-27 15:34:20 +02:00
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
if (fill_cache (cd, ex_info, word_offset / 8, word_length / 8, pc) == 0)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
value = extract_1 (cd, ex_info, start, length, word_length, bufp, pc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* ! CGEN_INT_INSN_P */
|
|
|
|
|
|
|
|
|
|
/* Written this way to avoid undefined behaviour. */
|
|
|
|
|
mask = (((1L << (length - 1)) - 1) << 1) | 1;
|
|
|
|
|
|
|
|
|
|
value &= mask;
|
|
|
|
|
/* sign extend? */
|
|
|
|
|
if (CGEN_BOOL_ATTR (attrs, CGEN_IFLD_SIGNED)
|
|
|
|
|
&& (value & (1L << (length - 1))))
|
|
|
|
|
value |= ~mask;
|
|
|
|
|
|
|
|
|
|
*valuep = value;
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Default insn extractor.
|
|
|
|
|
|
|
|
|
|
INSN_VALUE is the first base_insn_bitsize bits, translated to host order.
|
|
|
|
|
The extracted fields are stored in FIELDS.
|
|
|
|
|
EX_INFO is used to handle reading variable length insns.
|
|
|
|
|
Return the length of the insn in bits, or 0 if no match,
|
|
|
|
|
or -1 if an error occurs fetching data (memory_error_func will have
|
|
|
|
|
been called). */
|
|
|
|
|
|
|
|
|
|
static int
|
2003-08-09 02:39:21 +02:00
|
|
|
|
extract_insn_normal (CGEN_CPU_DESC cd,
|
|
|
|
|
const CGEN_INSN *insn,
|
|
|
|
|
CGEN_EXTRACT_INFO *ex_info,
|
|
|
|
|
CGEN_INSN_INT insn_value,
|
|
|
|
|
CGEN_FIELDS *fields,
|
|
|
|
|
bfd_vma pc)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
|
|
|
|
|
const CGEN_SYNTAX_CHAR_TYPE *syn;
|
|
|
|
|
|
|
|
|
|
CGEN_FIELDS_BITSIZE (fields) = CGEN_INSN_BITSIZE (insn);
|
|
|
|
|
|
|
|
|
|
CGEN_INIT_EXTRACT (cd);
|
|
|
|
|
|
|
|
|
|
for (syn = CGEN_SYNTAX_STRING (syntax); *syn; ++syn)
|
|
|
|
|
{
|
|
|
|
|
int length;
|
|
|
|
|
|
|
|
|
|
if (CGEN_SYNTAX_CHAR_P (*syn))
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
length = (* cd->extract_operand) (cd, CGEN_SYNTAX_FIELD (*syn),
|
|
|
|
|
ex_info, insn_value, fields, pc);
|
|
|
|
|
if (length <= 0)
|
|
|
|
|
return length;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We recognized and successfully extracted this insn. */
|
|
|
|
|
return CGEN_INSN_BITSIZE (insn);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-01 13:16:33 +02:00
|
|
|
|
/* Machine generated code added here. */
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2014-04-22 16:57:47 +02:00
|
|
|
|
const char * or1k_cgen_insert_operand
|
2005-07-01 13:16:33 +02:00
|
|
|
|
(CGEN_CPU_DESC, int, CGEN_FIELDS *, CGEN_INSN_BYTES_PTR, bfd_vma);
|
2001-10-09 10:54:58 +02:00
|
|
|
|
|
2001-04-27 15:34:20 +02:00
|
|
|
|
/* Main entry point for operand insertion.
|
|
|
|
|
|
|
|
|
|
This function is basically just a big switch statement. Earlier versions
|
|
|
|
|
used tables to look up the function to use, but
|
|
|
|
|
- if the table contains both assembler and disassembler functions then
|
|
|
|
|
the disassembler contains much of the assembler and vice-versa,
|
|
|
|
|
- there's a lot of inlining possibilities as things grow,
|
|
|
|
|
- using a switch statement avoids the function call overhead.
|
|
|
|
|
|
|
|
|
|
This function could be moved into `parse_insn_normal', but keeping it
|
|
|
|
|
separate makes clear the interface between `parse_insn_normal' and each of
|
|
|
|
|
the handlers. It's also needed by GAS to insert operands that couldn't be
|
2002-01-22 22:45:36 +01:00
|
|
|
|
resolved during parsing. */
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
|
|
|
|
const char *
|
2014-04-22 16:57:47 +02:00
|
|
|
|
or1k_cgen_insert_operand (CGEN_CPU_DESC cd,
|
2005-07-01 13:16:33 +02:00
|
|
|
|
int opindex,
|
|
|
|
|
CGEN_FIELDS * fields,
|
|
|
|
|
CGEN_INSN_BYTES_PTR buffer,
|
|
|
|
|
bfd_vma pc ATTRIBUTE_UNUSED)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
const char * errmsg = NULL;
|
|
|
|
|
unsigned int total_length = CGEN_FIELDS_BITSIZE (fields);
|
|
|
|
|
|
|
|
|
|
switch (opindex)
|
|
|
|
|
{
|
or1k: Add the l.adrp insn and supporting relocations
This patch adds the new instruction and relocation as per proposal:
https://openrisc.io/proposals/ladrp
This is to be added to the spec in an upcoming revision. The new instruction
l.adrp loads the page offset of the current instruction offset by
a 21-bit immediate shifted left 13-bits. This is meant to be used with
a 13-bit lower bit page offset. This allows us to free up the got
register r16.
l.adrp r3, foo
l.ori r4, r3, po(foo)
l.lbz r5, po(foo)(r3)
l.sb po(foo)(r3), r6
The relocations we add are:
- BFD_RELOC_OR1K_PLTA26 For PLT jump relocation with PLT entry
asm: plta() implemented using l.ardp, meaning
no need for r16 (the GOT reg)
- BFD_RELOC_OR1K_GOT_PG21 Upper 21-bit Page offset got address
asm: got()
- BFD_RELOC_OR1K_TLS_GD_PG21 Upper 21-bit Page offset with TLS General
asm: tlsgd() Dynamic calculation
- BFD_RELOC_OR1K_TLS_LDM_PG21 Upper 21-bit Page offset with TLS local
asm: tlsldm() dynamic calculation
- BFD_RELOC_OR1K_TLS_IE_PG21 Upper 21-bit Page offset with TLS Initial
asm: gottp() Executable calculation
- BFD_RELOC_OR1K_PCREL_PG21 Default relocation for disp21 (l.adrp
instructions)
- BFD_RELOC_OR1K_LO13 low 13-bit page offset relocation
asm: po() i.e. mem loads, addi etc
- BFD_RELOC_OR1K_SLO13 low 13-bit page offset relocation
asm: po() i.e. mem stores, with split immediate
- BFD_RELOC_OR1K_GOT_LO13, low 13-bit page offset with GOT calcs
asm: gotpo()
- BFD_RELOC_OR1K_TLS_GD_LO13 Lower 13-bit offset with TLS GD calcs
asm: tlsgdpo()
- BFD_RELOC_OR1K_TLS_LDM_LO13 Lower 13-bit offset with TLS LD calcs
asm: tlsldmpo()
- BFD_RELOC_OR1K_TLS_IE_LO13 Lower 13-bit offset with TLS IE calcs
asm: gottppo()
bfd/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* bfd-in2.h: Regenerated.
* elf32-or1k.c: (or1k_elf_howto_table): Fix formatting for
R_OR1K_PLT26, Add R_OR1K_PCREL_PG21, R_OR1K_GOT_PG21,
R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21, R_OR1K_TLS_IE_PG21,
R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13,
R_OR1K_TLS_IE_LO13, R_OR1K_SLO13, R_OR1K_PLTA26.
(or1k_reloc_map): Add BFD_RELOC_OR1K_PCREL_PG21,
BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_LDM_PG21, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_LO13, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_GD_LO13,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_PLTA26.
(elf_or1k_link_hash_table): Add field saw_plta.
(or1k_final_link_relocate): Add value calculations for new relocations.
(or1k_elf_relocate_section): Add section relocations for new
relocations.
(or1k_write_plt_entry): New function.
(or1k_elf_finish_dynamic_sections): Add support for PLTA relocations
using new l.adrp instruction. Cleanup PLT relocation code generation.
* libbfd.h: Regenerated.
* reloc.c: Add BFD_RELOC_OR1K_PCREL_PG21, BFD_RELOC_OR1K_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_PLTA26, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
cpu/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k.opc (parse_disp26): Add support for plta() relocations.
(parse_disp21): New function.
(or1k_rclass): New enum.
(or1k_rtype): New enum.
(or1k_imm16_relocs): Define new PO and SPO relocation mappings.
(parse_reloc): Add new po(), gotpo() and gottppo() for LO13 relocations.
(parse_imm16): Add support for the new 21bit and 13bit relocations.
* or1korbis.cpu (f-disp26): Don't assume SI.
(f-disp21): New pc-relative 21-bit 13 shifted to right.
(insn-opcode): Add ADRP.
(l-adrp): New instruction.
gas/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* config/tc-or1k.c (or1k_apply_fix): Add BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
* testsuite/gas/or1k/allinsn.s: Add test for l.adrp.
* testsuite/gas/or1k/allinsn.d: Add test results for new
instructions.
* testsuite/gas/or1k/reloc-1.s: Add tests to generate
R_OR1K_PLTA26, R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13,
R_OR1K_TLD_LDM_LO13, R_OR1K_TLS_IE_LO13, R_OR1K_LO13, R_OR1K_SLO13
relocations.
* testsuite/gas/or1k/reloc-1.d: Add relocation results for
tests.
* testsuite/gas/or1k/reloc-2.s: Add negative tests for store to
gotpo().
* testsuite/gas/or1k/reloc-2.l: Add expected error test results.
ld/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* testsuite/ld-or1k/or1k.exp: Add test cases for plt generation.
* testsuite/ld-or1k/plt1.dd: New file.
* testsuite/ld-or1k/plt1.s: New file.
* testsuite/ld-or1k/plt1.x.dd: New file.
* testsuite/ld-or1k/plta1.dd: New file.
* testsuite/ld-or1k/plta1.s: New file.
* testsuite/ld-or1k/pltlib.s: New file.
include/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* elf/or1k.h (elf_or1k_reloc_type): Add R_OR1K_PCREL_PG21,
R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13,
R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13, R_OR1K_TLS_IE_LO13,
R_OR1K_SLO13, R_OR1K_PLTA26.
opcodes/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k-asm.c: Regenerated.
* or1k-desc.c: Regenerated.
* or1k-desc.h: Regenerated.
* or1k-dis.c: Regenerated.
* or1k-ibld.c: Regenerated.
* or1k-opc.c: Regenerated.
* or1k-opc.h: Regenerated.
* or1k-opinst.c: Regenerated.
2018-10-05 04:41:41 +02:00
|
|
|
|
case OR1K_OPERAND_DISP21 :
|
|
|
|
|
{
|
|
|
|
|
long value = fields->f_disp21;
|
|
|
|
|
value = ((((DI) (value) >> (13))) - (((DI) (pc) >> (13))));
|
|
|
|
|
errmsg = insert_normal (cd, value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_ABS_ADDR), 0, 20, 21, 32, total_length, buffer);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_DISP26 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
long value = fields->f_disp26;
|
or1k: Add the l.adrp insn and supporting relocations
This patch adds the new instruction and relocation as per proposal:
https://openrisc.io/proposals/ladrp
This is to be added to the spec in an upcoming revision. The new instruction
l.adrp loads the page offset of the current instruction offset by
a 21-bit immediate shifted left 13-bits. This is meant to be used with
a 13-bit lower bit page offset. This allows us to free up the got
register r16.
l.adrp r3, foo
l.ori r4, r3, po(foo)
l.lbz r5, po(foo)(r3)
l.sb po(foo)(r3), r6
The relocations we add are:
- BFD_RELOC_OR1K_PLTA26 For PLT jump relocation with PLT entry
asm: plta() implemented using l.ardp, meaning
no need for r16 (the GOT reg)
- BFD_RELOC_OR1K_GOT_PG21 Upper 21-bit Page offset got address
asm: got()
- BFD_RELOC_OR1K_TLS_GD_PG21 Upper 21-bit Page offset with TLS General
asm: tlsgd() Dynamic calculation
- BFD_RELOC_OR1K_TLS_LDM_PG21 Upper 21-bit Page offset with TLS local
asm: tlsldm() dynamic calculation
- BFD_RELOC_OR1K_TLS_IE_PG21 Upper 21-bit Page offset with TLS Initial
asm: gottp() Executable calculation
- BFD_RELOC_OR1K_PCREL_PG21 Default relocation for disp21 (l.adrp
instructions)
- BFD_RELOC_OR1K_LO13 low 13-bit page offset relocation
asm: po() i.e. mem loads, addi etc
- BFD_RELOC_OR1K_SLO13 low 13-bit page offset relocation
asm: po() i.e. mem stores, with split immediate
- BFD_RELOC_OR1K_GOT_LO13, low 13-bit page offset with GOT calcs
asm: gotpo()
- BFD_RELOC_OR1K_TLS_GD_LO13 Lower 13-bit offset with TLS GD calcs
asm: tlsgdpo()
- BFD_RELOC_OR1K_TLS_LDM_LO13 Lower 13-bit offset with TLS LD calcs
asm: tlsldmpo()
- BFD_RELOC_OR1K_TLS_IE_LO13 Lower 13-bit offset with TLS IE calcs
asm: gottppo()
bfd/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* bfd-in2.h: Regenerated.
* elf32-or1k.c: (or1k_elf_howto_table): Fix formatting for
R_OR1K_PLT26, Add R_OR1K_PCREL_PG21, R_OR1K_GOT_PG21,
R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21, R_OR1K_TLS_IE_PG21,
R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13,
R_OR1K_TLS_IE_LO13, R_OR1K_SLO13, R_OR1K_PLTA26.
(or1k_reloc_map): Add BFD_RELOC_OR1K_PCREL_PG21,
BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_LDM_PG21, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_LO13, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_GD_LO13,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_PLTA26.
(elf_or1k_link_hash_table): Add field saw_plta.
(or1k_final_link_relocate): Add value calculations for new relocations.
(or1k_elf_relocate_section): Add section relocations for new
relocations.
(or1k_write_plt_entry): New function.
(or1k_elf_finish_dynamic_sections): Add support for PLTA relocations
using new l.adrp instruction. Cleanup PLT relocation code generation.
* libbfd.h: Regenerated.
* reloc.c: Add BFD_RELOC_OR1K_PCREL_PG21, BFD_RELOC_OR1K_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_PLTA26, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
cpu/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k.opc (parse_disp26): Add support for plta() relocations.
(parse_disp21): New function.
(or1k_rclass): New enum.
(or1k_rtype): New enum.
(or1k_imm16_relocs): Define new PO and SPO relocation mappings.
(parse_reloc): Add new po(), gotpo() and gottppo() for LO13 relocations.
(parse_imm16): Add support for the new 21bit and 13bit relocations.
* or1korbis.cpu (f-disp26): Don't assume SI.
(f-disp21): New pc-relative 21-bit 13 shifted to right.
(insn-opcode): Add ADRP.
(l-adrp): New instruction.
gas/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* config/tc-or1k.c (or1k_apply_fix): Add BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
* testsuite/gas/or1k/allinsn.s: Add test for l.adrp.
* testsuite/gas/or1k/allinsn.d: Add test results for new
instructions.
* testsuite/gas/or1k/reloc-1.s: Add tests to generate
R_OR1K_PLTA26, R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13,
R_OR1K_TLD_LDM_LO13, R_OR1K_TLS_IE_LO13, R_OR1K_LO13, R_OR1K_SLO13
relocations.
* testsuite/gas/or1k/reloc-1.d: Add relocation results for
tests.
* testsuite/gas/or1k/reloc-2.s: Add negative tests for store to
gotpo().
* testsuite/gas/or1k/reloc-2.l: Add expected error test results.
ld/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* testsuite/ld-or1k/or1k.exp: Add test cases for plt generation.
* testsuite/ld-or1k/plt1.dd: New file.
* testsuite/ld-or1k/plt1.s: New file.
* testsuite/ld-or1k/plt1.x.dd: New file.
* testsuite/ld-or1k/plta1.dd: New file.
* testsuite/ld-or1k/plta1.s: New file.
* testsuite/ld-or1k/pltlib.s: New file.
include/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* elf/or1k.h (elf_or1k_reloc_type): Add R_OR1K_PCREL_PG21,
R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13,
R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13, R_OR1K_TLS_IE_LO13,
R_OR1K_SLO13, R_OR1K_PLTA26.
opcodes/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k-asm.c: Regenerated.
* or1k-desc.c: Regenerated.
* or1k-desc.h: Regenerated.
* or1k-dis.c: Regenerated.
* or1k-ibld.c: Regenerated.
* or1k-opc.c: Regenerated.
* or1k-opc.h: Regenerated.
* or1k-opinst.c: Regenerated.
2018-10-05 04:41:41 +02:00
|
|
|
|
value = ((DI) (((value) - (pc))) >> (2));
|
2001-04-27 15:34:20 +02:00
|
|
|
|
errmsg = insert_normal (cd, value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 0, 25, 26, 32, total_length, buffer);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RA :
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_r2, 0, 0, 20, 5, 32, total_length, buffer);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RADF :
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_r1, 0, 0, 25, 5, 32, total_length, buffer);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RASF :
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_r2, 0, 0, 20, 5, 32, total_length, buffer);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RB :
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_r3, 0, 0, 15, 5, 32, total_length, buffer);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBDF :
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_r1, 0, 0, 25, 5, 32, total_length, buffer);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBSF :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
errmsg = insert_normal (cd, fields->f_r3, 0, 0, 15, 5, 32, total_length, buffer);
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RD :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
errmsg = insert_normal (cd, fields->f_r1, 0, 0, 25, 5, 32, total_length, buffer);
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RDDF :
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_r1, 0, 0, 25, 5, 32, total_length, buffer);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RDSF :
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_r1, 0, 0, 25, 5, 32, total_length, buffer);
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_SIMM16 :
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_simm16, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_SIGN_OPT), 0, 15, 16, 32, total_length, buffer);
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_SIMM16_SPLIT :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
{
|
2014-04-22 16:57:47 +02:00
|
|
|
|
FLD (f_imm16_25_5) = ((((INT) (FLD (f_simm16_split)) >> (11))) & (31));
|
|
|
|
|
FLD (f_imm16_10_11) = ((FLD (f_simm16_split)) & (2047));
|
2001-04-27 15:34:20 +02:00
|
|
|
|
}
|
2014-04-22 16:57:47 +02:00
|
|
|
|
errmsg = insert_normal (cd, fields->f_imm16_25_5, 0, 0, 25, 5, 32, total_length, buffer);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
if (errmsg)
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
errmsg = insert_normal (cd, fields->f_imm16_10_11, 0, 0, 10, 11, 32, total_length, buffer);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
if (errmsg)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
errmsg = insert_normal (cd, fields->f_uimm16, 0, 0, 15, 16, 32, total_length, buffer);
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16_SPLIT :
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
FLD (f_imm16_25_5) = ((((UINT) (FLD (f_uimm16_split)) >> (11))) & (31));
|
|
|
|
|
FLD (f_imm16_10_11) = ((FLD (f_uimm16_split)) & (2047));
|
|
|
|
|
}
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_imm16_25_5, 0, 0, 25, 5, 32, total_length, buffer);
|
|
|
|
|
if (errmsg)
|
|
|
|
|
break;
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_imm16_10_11, 0, 0, 10, 11, 32, total_length, buffer);
|
|
|
|
|
if (errmsg)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_UIMM6 :
|
|
|
|
|
errmsg = insert_normal (cd, fields->f_uimm6, 0, 0, 5, 6, 32, total_length, buffer);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default :
|
|
|
|
|
/* xgettext:c-format */
|
opcodes error messages
Another patch aimed at making binutils comply with the GNU coding
standard. The generated files require
https://sourceware.org/ml/cgen/2018-q1/msg00004.html
cpu/
* frv.opc: Include opintl.h.
(add_next_to_vliw): Use opcodes_error_handler to print error.
Standardize error message.
(fr500_check_insn_major_constraints, frv_vliw_add_insn): Likewise.
opcodes/
* sysdep.h (opcodes_error_handler): Define.
(_bfd_error_handler): Declare.
* Makefile.am: Remove stray #.
* opc2c.c (main): Remove bogus -l arg handling. Print "DO NOT
EDIT" comment.
* aarch64-dis.c, * arc-dis.c, * arm-dis.c, * avr-dis.c,
* d30v-dis.c, * h8300-dis.c, * mmix-dis.c, * ppc-dis.c,
* riscv-dis.c, * s390-dis.c, * sparc-dis.c, * v850-dis.c: Use
opcodes_error_handler to print errors. Standardize error messages.
* msp430-decode.opc, * nios2-dis.c, * rl78-decode.opc: Likewise,
and include opintl.h.
* nds32-asm.c: Likewise, and include sysdep.h and opintl.h.
* i386-gen.c: Standardize error messages.
* msp430-decode.c, * rl78-decode.c, rx-decode.c: Regenerate.
* Makefile.in: Regenerate.
* epiphany-asm.c, * epiphany-desc.c, * epiphany-dis.c,
* epiphany-ibld.c, * fr30-asm.c, * fr30-desc.c, * fr30-dis.c,
* fr30-ibld.c, * frv-asm.c, * frv-desc.c, * frv-dis.c, * frv-ibld.c,
* frv-opc.c, * ip2k-asm.c, * ip2k-desc.c, * ip2k-dis.c, * ip2k-ibld.c,
* iq2000-asm.c, * iq2000-desc.c, * iq2000-dis.c, * iq2000-ibld.c,
* lm32-asm.c, * lm32-desc.c, * lm32-dis.c, * lm32-ibld.c,
* m32c-asm.c, * m32c-desc.c, * m32c-dis.c, * m32c-ibld.c,
* m32r-asm.c, * m32r-desc.c, * m32r-dis.c, * m32r-ibld.c,
* mep-asm.c, * mep-desc.c, * mep-dis.c, * mep-ibld.c, * mt-asm.c,
* mt-desc.c, * mt-dis.c, * mt-ibld.c, * or1k-asm.c, * or1k-desc.c,
* or1k-dis.c, * or1k-ibld.c, * xc16x-asm.c, * xc16x-desc.c,
* xc16x-dis.c, * xc16x-ibld.c, * xstormy16-asm.c, * xstormy16-desc.c,
* xstormy16-dis.c, * xstormy16-ibld.c: Regenerate.
2018-03-01 22:53:50 +01:00
|
|
|
|
opcodes_error_handler
|
|
|
|
|
(_("internal error: unrecognized field %d while building insn"),
|
|
|
|
|
opindex);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return errmsg;
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-22 16:57:47 +02:00
|
|
|
|
int or1k_cgen_extract_operand
|
2005-07-01 13:16:33 +02:00
|
|
|
|
(CGEN_CPU_DESC, int, CGEN_EXTRACT_INFO *, CGEN_INSN_INT, CGEN_FIELDS *, bfd_vma);
|
2001-10-09 10:54:58 +02:00
|
|
|
|
|
2001-04-27 15:34:20 +02:00
|
|
|
|
/* Main entry point for operand extraction.
|
|
|
|
|
The result is <= 0 for error, >0 for success.
|
|
|
|
|
??? Actual values aren't well defined right now.
|
|
|
|
|
|
|
|
|
|
This function is basically just a big switch statement. Earlier versions
|
|
|
|
|
used tables to look up the function to use, but
|
|
|
|
|
- if the table contains both assembler and disassembler functions then
|
|
|
|
|
the disassembler contains much of the assembler and vice-versa,
|
|
|
|
|
- there's a lot of inlining possibilities as things grow,
|
|
|
|
|
- using a switch statement avoids the function call overhead.
|
|
|
|
|
|
|
|
|
|
This function could be moved into `print_insn_normal', but keeping it
|
|
|
|
|
separate makes clear the interface between `print_insn_normal' and each of
|
2002-01-22 22:45:36 +01:00
|
|
|
|
the handlers. */
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
|
|
|
|
int
|
2014-04-22 16:57:47 +02:00
|
|
|
|
or1k_cgen_extract_operand (CGEN_CPU_DESC cd,
|
2005-07-01 13:16:33 +02:00
|
|
|
|
int opindex,
|
|
|
|
|
CGEN_EXTRACT_INFO *ex_info,
|
|
|
|
|
CGEN_INSN_INT insn_value,
|
|
|
|
|
CGEN_FIELDS * fields,
|
|
|
|
|
bfd_vma pc)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
/* Assume success (for those operands that are nops). */
|
|
|
|
|
int length = 1;
|
|
|
|
|
unsigned int total_length = CGEN_FIELDS_BITSIZE (fields);
|
|
|
|
|
|
|
|
|
|
switch (opindex)
|
|
|
|
|
{
|
or1k: Add the l.adrp insn and supporting relocations
This patch adds the new instruction and relocation as per proposal:
https://openrisc.io/proposals/ladrp
This is to be added to the spec in an upcoming revision. The new instruction
l.adrp loads the page offset of the current instruction offset by
a 21-bit immediate shifted left 13-bits. This is meant to be used with
a 13-bit lower bit page offset. This allows us to free up the got
register r16.
l.adrp r3, foo
l.ori r4, r3, po(foo)
l.lbz r5, po(foo)(r3)
l.sb po(foo)(r3), r6
The relocations we add are:
- BFD_RELOC_OR1K_PLTA26 For PLT jump relocation with PLT entry
asm: plta() implemented using l.ardp, meaning
no need for r16 (the GOT reg)
- BFD_RELOC_OR1K_GOT_PG21 Upper 21-bit Page offset got address
asm: got()
- BFD_RELOC_OR1K_TLS_GD_PG21 Upper 21-bit Page offset with TLS General
asm: tlsgd() Dynamic calculation
- BFD_RELOC_OR1K_TLS_LDM_PG21 Upper 21-bit Page offset with TLS local
asm: tlsldm() dynamic calculation
- BFD_RELOC_OR1K_TLS_IE_PG21 Upper 21-bit Page offset with TLS Initial
asm: gottp() Executable calculation
- BFD_RELOC_OR1K_PCREL_PG21 Default relocation for disp21 (l.adrp
instructions)
- BFD_RELOC_OR1K_LO13 low 13-bit page offset relocation
asm: po() i.e. mem loads, addi etc
- BFD_RELOC_OR1K_SLO13 low 13-bit page offset relocation
asm: po() i.e. mem stores, with split immediate
- BFD_RELOC_OR1K_GOT_LO13, low 13-bit page offset with GOT calcs
asm: gotpo()
- BFD_RELOC_OR1K_TLS_GD_LO13 Lower 13-bit offset with TLS GD calcs
asm: tlsgdpo()
- BFD_RELOC_OR1K_TLS_LDM_LO13 Lower 13-bit offset with TLS LD calcs
asm: tlsldmpo()
- BFD_RELOC_OR1K_TLS_IE_LO13 Lower 13-bit offset with TLS IE calcs
asm: gottppo()
bfd/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* bfd-in2.h: Regenerated.
* elf32-or1k.c: (or1k_elf_howto_table): Fix formatting for
R_OR1K_PLT26, Add R_OR1K_PCREL_PG21, R_OR1K_GOT_PG21,
R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21, R_OR1K_TLS_IE_PG21,
R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13,
R_OR1K_TLS_IE_LO13, R_OR1K_SLO13, R_OR1K_PLTA26.
(or1k_reloc_map): Add BFD_RELOC_OR1K_PCREL_PG21,
BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_LDM_PG21, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_LO13, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_GD_LO13,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_PLTA26.
(elf_or1k_link_hash_table): Add field saw_plta.
(or1k_final_link_relocate): Add value calculations for new relocations.
(or1k_elf_relocate_section): Add section relocations for new
relocations.
(or1k_write_plt_entry): New function.
(or1k_elf_finish_dynamic_sections): Add support for PLTA relocations
using new l.adrp instruction. Cleanup PLT relocation code generation.
* libbfd.h: Regenerated.
* reloc.c: Add BFD_RELOC_OR1K_PCREL_PG21, BFD_RELOC_OR1K_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_PLTA26, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
cpu/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k.opc (parse_disp26): Add support for plta() relocations.
(parse_disp21): New function.
(or1k_rclass): New enum.
(or1k_rtype): New enum.
(or1k_imm16_relocs): Define new PO and SPO relocation mappings.
(parse_reloc): Add new po(), gotpo() and gottppo() for LO13 relocations.
(parse_imm16): Add support for the new 21bit and 13bit relocations.
* or1korbis.cpu (f-disp26): Don't assume SI.
(f-disp21): New pc-relative 21-bit 13 shifted to right.
(insn-opcode): Add ADRP.
(l-adrp): New instruction.
gas/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* config/tc-or1k.c (or1k_apply_fix): Add BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
* testsuite/gas/or1k/allinsn.s: Add test for l.adrp.
* testsuite/gas/or1k/allinsn.d: Add test results for new
instructions.
* testsuite/gas/or1k/reloc-1.s: Add tests to generate
R_OR1K_PLTA26, R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13,
R_OR1K_TLD_LDM_LO13, R_OR1K_TLS_IE_LO13, R_OR1K_LO13, R_OR1K_SLO13
relocations.
* testsuite/gas/or1k/reloc-1.d: Add relocation results for
tests.
* testsuite/gas/or1k/reloc-2.s: Add negative tests for store to
gotpo().
* testsuite/gas/or1k/reloc-2.l: Add expected error test results.
ld/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* testsuite/ld-or1k/or1k.exp: Add test cases for plt generation.
* testsuite/ld-or1k/plt1.dd: New file.
* testsuite/ld-or1k/plt1.s: New file.
* testsuite/ld-or1k/plt1.x.dd: New file.
* testsuite/ld-or1k/plta1.dd: New file.
* testsuite/ld-or1k/plta1.s: New file.
* testsuite/ld-or1k/pltlib.s: New file.
include/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* elf/or1k.h (elf_or1k_reloc_type): Add R_OR1K_PCREL_PG21,
R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13,
R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13, R_OR1K_TLS_IE_LO13,
R_OR1K_SLO13, R_OR1K_PLTA26.
opcodes/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k-asm.c: Regenerated.
* or1k-desc.c: Regenerated.
* or1k-desc.h: Regenerated.
* or1k-dis.c: Regenerated.
* or1k-ibld.c: Regenerated.
* or1k-opc.c: Regenerated.
* or1k-opc.h: Regenerated.
* or1k-opinst.c: Regenerated.
2018-10-05 04:41:41 +02:00
|
|
|
|
case OR1K_OPERAND_DISP21 :
|
|
|
|
|
{
|
|
|
|
|
long value;
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_ABS_ADDR), 0, 20, 21, 32, total_length, pc, & value);
|
|
|
|
|
value = ((((value) + (((DI) (pc) >> (13))))) << (13));
|
|
|
|
|
fields->f_disp21 = value;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_DISP26 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
long value;
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 0, 25, 26, 32, total_length, pc, & value);
|
|
|
|
|
value = ((((value) << (2))) + (pc));
|
|
|
|
|
fields->f_disp26 = value;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RA :
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 20, 5, 32, total_length, pc, & fields->f_r2);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RADF :
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 25, 5, 32, total_length, pc, & fields->f_r1);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RASF :
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 20, 5, 32, total_length, pc, & fields->f_r2);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RB :
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 15, 5, 32, total_length, pc, & fields->f_r3);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBDF :
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 25, 5, 32, total_length, pc, & fields->f_r1);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBSF :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 15, 5, 32, total_length, pc, & fields->f_r3);
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RD :
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 25, 5, 32, total_length, pc, & fields->f_r1);
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_RDDF :
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 25, 5, 32, total_length, pc, & fields->f_r1);
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_RDSF :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 25, 5, 32, total_length, pc, & fields->f_r1);
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_SIMM16 :
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_SIGN_OPT), 0, 15, 16, 32, total_length, pc, & fields->f_simm16);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_SIMM16_SPLIT :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
2014-04-22 16:57:47 +02:00
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 25, 5, 32, total_length, pc, & fields->f_imm16_25_5);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
if (length <= 0) break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 10, 11, 32, total_length, pc, & fields->f_imm16_10_11);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
if (length <= 0) break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
FLD (f_simm16_split) = ((HI) (UINT) (((((FLD (f_imm16_25_5)) << (11))) | (FLD (f_imm16_10_11)))));
|
2001-04-27 15:34:20 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 15, 16, 32, total_length, pc, & fields->f_uimm16);
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16_SPLIT :
|
|
|
|
|
{
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 25, 5, 32, total_length, pc, & fields->f_imm16_25_5);
|
|
|
|
|
if (length <= 0) break;
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 10, 11, 32, total_length, pc, & fields->f_imm16_10_11);
|
|
|
|
|
if (length <= 0) break;
|
|
|
|
|
FLD (f_uimm16_split) = ((UHI) (UINT) (((((FLD (f_imm16_25_5)) << (11))) | (FLD (f_imm16_10_11)))));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_UIMM6 :
|
|
|
|
|
length = extract_normal (cd, ex_info, insn_value, 0, 0, 5, 6, 32, total_length, pc, & fields->f_uimm6);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default :
|
|
|
|
|
/* xgettext:c-format */
|
opcodes error messages
Another patch aimed at making binutils comply with the GNU coding
standard. The generated files require
https://sourceware.org/ml/cgen/2018-q1/msg00004.html
cpu/
* frv.opc: Include opintl.h.
(add_next_to_vliw): Use opcodes_error_handler to print error.
Standardize error message.
(fr500_check_insn_major_constraints, frv_vliw_add_insn): Likewise.
opcodes/
* sysdep.h (opcodes_error_handler): Define.
(_bfd_error_handler): Declare.
* Makefile.am: Remove stray #.
* opc2c.c (main): Remove bogus -l arg handling. Print "DO NOT
EDIT" comment.
* aarch64-dis.c, * arc-dis.c, * arm-dis.c, * avr-dis.c,
* d30v-dis.c, * h8300-dis.c, * mmix-dis.c, * ppc-dis.c,
* riscv-dis.c, * s390-dis.c, * sparc-dis.c, * v850-dis.c: Use
opcodes_error_handler to print errors. Standardize error messages.
* msp430-decode.opc, * nios2-dis.c, * rl78-decode.opc: Likewise,
and include opintl.h.
* nds32-asm.c: Likewise, and include sysdep.h and opintl.h.
* i386-gen.c: Standardize error messages.
* msp430-decode.c, * rl78-decode.c, rx-decode.c: Regenerate.
* Makefile.in: Regenerate.
* epiphany-asm.c, * epiphany-desc.c, * epiphany-dis.c,
* epiphany-ibld.c, * fr30-asm.c, * fr30-desc.c, * fr30-dis.c,
* fr30-ibld.c, * frv-asm.c, * frv-desc.c, * frv-dis.c, * frv-ibld.c,
* frv-opc.c, * ip2k-asm.c, * ip2k-desc.c, * ip2k-dis.c, * ip2k-ibld.c,
* iq2000-asm.c, * iq2000-desc.c, * iq2000-dis.c, * iq2000-ibld.c,
* lm32-asm.c, * lm32-desc.c, * lm32-dis.c, * lm32-ibld.c,
* m32c-asm.c, * m32c-desc.c, * m32c-dis.c, * m32c-ibld.c,
* m32r-asm.c, * m32r-desc.c, * m32r-dis.c, * m32r-ibld.c,
* mep-asm.c, * mep-desc.c, * mep-dis.c, * mep-ibld.c, * mt-asm.c,
* mt-desc.c, * mt-dis.c, * mt-ibld.c, * or1k-asm.c, * or1k-desc.c,
* or1k-dis.c, * or1k-ibld.c, * xc16x-asm.c, * xc16x-desc.c,
* xc16x-dis.c, * xc16x-ibld.c, * xstormy16-asm.c, * xstormy16-desc.c,
* xstormy16-dis.c, * xstormy16-ibld.c: Regenerate.
2018-03-01 22:53:50 +01:00
|
|
|
|
opcodes_error_handler
|
|
|
|
|
(_("internal error: unrecognized field %d while decoding insn"),
|
|
|
|
|
opindex);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return length;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-12 13:45:07 +02:00
|
|
|
|
cgen_insert_fn * const or1k_cgen_insert_handlers[] =
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
insert_insn_normal,
|
|
|
|
|
};
|
|
|
|
|
|
2015-08-12 13:45:07 +02:00
|
|
|
|
cgen_extract_fn * const or1k_cgen_extract_handlers[] =
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
extract_insn_normal,
|
|
|
|
|
};
|
|
|
|
|
|
2014-04-22 16:57:47 +02:00
|
|
|
|
int or1k_cgen_get_int_operand (CGEN_CPU_DESC, int, const CGEN_FIELDS *);
|
|
|
|
|
bfd_vma or1k_cgen_get_vma_operand (CGEN_CPU_DESC, int, const CGEN_FIELDS *);
|
2001-10-09 10:54:58 +02:00
|
|
|
|
|
2001-04-27 15:34:20 +02:00
|
|
|
|
/* Getting values from cgen_fields is handled by a collection of functions.
|
|
|
|
|
They are distinguished by the type of the VALUE argument they return.
|
|
|
|
|
TODO: floating point, inlining support, remove cases where result type
|
|
|
|
|
not appropriate. */
|
|
|
|
|
|
|
|
|
|
int
|
2014-04-22 16:57:47 +02:00
|
|
|
|
or1k_cgen_get_int_operand (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
|
2005-07-01 13:16:33 +02:00
|
|
|
|
int opindex,
|
|
|
|
|
const CGEN_FIELDS * fields)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
int value;
|
|
|
|
|
|
|
|
|
|
switch (opindex)
|
|
|
|
|
{
|
or1k: Add the l.adrp insn and supporting relocations
This patch adds the new instruction and relocation as per proposal:
https://openrisc.io/proposals/ladrp
This is to be added to the spec in an upcoming revision. The new instruction
l.adrp loads the page offset of the current instruction offset by
a 21-bit immediate shifted left 13-bits. This is meant to be used with
a 13-bit lower bit page offset. This allows us to free up the got
register r16.
l.adrp r3, foo
l.ori r4, r3, po(foo)
l.lbz r5, po(foo)(r3)
l.sb po(foo)(r3), r6
The relocations we add are:
- BFD_RELOC_OR1K_PLTA26 For PLT jump relocation with PLT entry
asm: plta() implemented using l.ardp, meaning
no need for r16 (the GOT reg)
- BFD_RELOC_OR1K_GOT_PG21 Upper 21-bit Page offset got address
asm: got()
- BFD_RELOC_OR1K_TLS_GD_PG21 Upper 21-bit Page offset with TLS General
asm: tlsgd() Dynamic calculation
- BFD_RELOC_OR1K_TLS_LDM_PG21 Upper 21-bit Page offset with TLS local
asm: tlsldm() dynamic calculation
- BFD_RELOC_OR1K_TLS_IE_PG21 Upper 21-bit Page offset with TLS Initial
asm: gottp() Executable calculation
- BFD_RELOC_OR1K_PCREL_PG21 Default relocation for disp21 (l.adrp
instructions)
- BFD_RELOC_OR1K_LO13 low 13-bit page offset relocation
asm: po() i.e. mem loads, addi etc
- BFD_RELOC_OR1K_SLO13 low 13-bit page offset relocation
asm: po() i.e. mem stores, with split immediate
- BFD_RELOC_OR1K_GOT_LO13, low 13-bit page offset with GOT calcs
asm: gotpo()
- BFD_RELOC_OR1K_TLS_GD_LO13 Lower 13-bit offset with TLS GD calcs
asm: tlsgdpo()
- BFD_RELOC_OR1K_TLS_LDM_LO13 Lower 13-bit offset with TLS LD calcs
asm: tlsldmpo()
- BFD_RELOC_OR1K_TLS_IE_LO13 Lower 13-bit offset with TLS IE calcs
asm: gottppo()
bfd/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* bfd-in2.h: Regenerated.
* elf32-or1k.c: (or1k_elf_howto_table): Fix formatting for
R_OR1K_PLT26, Add R_OR1K_PCREL_PG21, R_OR1K_GOT_PG21,
R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21, R_OR1K_TLS_IE_PG21,
R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13,
R_OR1K_TLS_IE_LO13, R_OR1K_SLO13, R_OR1K_PLTA26.
(or1k_reloc_map): Add BFD_RELOC_OR1K_PCREL_PG21,
BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_LDM_PG21, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_LO13, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_GD_LO13,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_PLTA26.
(elf_or1k_link_hash_table): Add field saw_plta.
(or1k_final_link_relocate): Add value calculations for new relocations.
(or1k_elf_relocate_section): Add section relocations for new
relocations.
(or1k_write_plt_entry): New function.
(or1k_elf_finish_dynamic_sections): Add support for PLTA relocations
using new l.adrp instruction. Cleanup PLT relocation code generation.
* libbfd.h: Regenerated.
* reloc.c: Add BFD_RELOC_OR1K_PCREL_PG21, BFD_RELOC_OR1K_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_PLTA26, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
cpu/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k.opc (parse_disp26): Add support for plta() relocations.
(parse_disp21): New function.
(or1k_rclass): New enum.
(or1k_rtype): New enum.
(or1k_imm16_relocs): Define new PO and SPO relocation mappings.
(parse_reloc): Add new po(), gotpo() and gottppo() for LO13 relocations.
(parse_imm16): Add support for the new 21bit and 13bit relocations.
* or1korbis.cpu (f-disp26): Don't assume SI.
(f-disp21): New pc-relative 21-bit 13 shifted to right.
(insn-opcode): Add ADRP.
(l-adrp): New instruction.
gas/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* config/tc-or1k.c (or1k_apply_fix): Add BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
* testsuite/gas/or1k/allinsn.s: Add test for l.adrp.
* testsuite/gas/or1k/allinsn.d: Add test results for new
instructions.
* testsuite/gas/or1k/reloc-1.s: Add tests to generate
R_OR1K_PLTA26, R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13,
R_OR1K_TLD_LDM_LO13, R_OR1K_TLS_IE_LO13, R_OR1K_LO13, R_OR1K_SLO13
relocations.
* testsuite/gas/or1k/reloc-1.d: Add relocation results for
tests.
* testsuite/gas/or1k/reloc-2.s: Add negative tests for store to
gotpo().
* testsuite/gas/or1k/reloc-2.l: Add expected error test results.
ld/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* testsuite/ld-or1k/or1k.exp: Add test cases for plt generation.
* testsuite/ld-or1k/plt1.dd: New file.
* testsuite/ld-or1k/plt1.s: New file.
* testsuite/ld-or1k/plt1.x.dd: New file.
* testsuite/ld-or1k/plta1.dd: New file.
* testsuite/ld-or1k/plta1.s: New file.
* testsuite/ld-or1k/pltlib.s: New file.
include/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* elf/or1k.h (elf_or1k_reloc_type): Add R_OR1K_PCREL_PG21,
R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13,
R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13, R_OR1K_TLS_IE_LO13,
R_OR1K_SLO13, R_OR1K_PLTA26.
opcodes/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k-asm.c: Regenerated.
* or1k-desc.c: Regenerated.
* or1k-desc.h: Regenerated.
* or1k-dis.c: Regenerated.
* or1k-ibld.c: Regenerated.
* or1k-opc.c: Regenerated.
* or1k-opc.h: Regenerated.
* or1k-opinst.c: Regenerated.
2018-10-05 04:41:41 +02:00
|
|
|
|
case OR1K_OPERAND_DISP21 :
|
|
|
|
|
value = fields->f_disp21;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_DISP26 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value = fields->f_disp26;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RA :
|
|
|
|
|
value = fields->f_r2;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RADF :
|
|
|
|
|
value = fields->f_r1;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RASF :
|
|
|
|
|
value = fields->f_r2;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RB :
|
|
|
|
|
value = fields->f_r3;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBDF :
|
|
|
|
|
value = fields->f_r1;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBSF :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value = fields->f_r3;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RD :
|
|
|
|
|
value = fields->f_r1;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_RDDF :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value = fields->f_r1;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RDSF :
|
|
|
|
|
value = fields->f_r1;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_SIMM16 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value = fields->f_simm16;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_SIMM16_SPLIT :
|
|
|
|
|
value = fields->f_simm16_split;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value = fields->f_uimm16;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16_SPLIT :
|
|
|
|
|
value = fields->f_uimm16_split;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_UIMM6 :
|
|
|
|
|
value = fields->f_uimm6;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default :
|
|
|
|
|
/* xgettext:c-format */
|
opcodes error messages
Another patch aimed at making binutils comply with the GNU coding
standard. The generated files require
https://sourceware.org/ml/cgen/2018-q1/msg00004.html
cpu/
* frv.opc: Include opintl.h.
(add_next_to_vliw): Use opcodes_error_handler to print error.
Standardize error message.
(fr500_check_insn_major_constraints, frv_vliw_add_insn): Likewise.
opcodes/
* sysdep.h (opcodes_error_handler): Define.
(_bfd_error_handler): Declare.
* Makefile.am: Remove stray #.
* opc2c.c (main): Remove bogus -l arg handling. Print "DO NOT
EDIT" comment.
* aarch64-dis.c, * arc-dis.c, * arm-dis.c, * avr-dis.c,
* d30v-dis.c, * h8300-dis.c, * mmix-dis.c, * ppc-dis.c,
* riscv-dis.c, * s390-dis.c, * sparc-dis.c, * v850-dis.c: Use
opcodes_error_handler to print errors. Standardize error messages.
* msp430-decode.opc, * nios2-dis.c, * rl78-decode.opc: Likewise,
and include opintl.h.
* nds32-asm.c: Likewise, and include sysdep.h and opintl.h.
* i386-gen.c: Standardize error messages.
* msp430-decode.c, * rl78-decode.c, rx-decode.c: Regenerate.
* Makefile.in: Regenerate.
* epiphany-asm.c, * epiphany-desc.c, * epiphany-dis.c,
* epiphany-ibld.c, * fr30-asm.c, * fr30-desc.c, * fr30-dis.c,
* fr30-ibld.c, * frv-asm.c, * frv-desc.c, * frv-dis.c, * frv-ibld.c,
* frv-opc.c, * ip2k-asm.c, * ip2k-desc.c, * ip2k-dis.c, * ip2k-ibld.c,
* iq2000-asm.c, * iq2000-desc.c, * iq2000-dis.c, * iq2000-ibld.c,
* lm32-asm.c, * lm32-desc.c, * lm32-dis.c, * lm32-ibld.c,
* m32c-asm.c, * m32c-desc.c, * m32c-dis.c, * m32c-ibld.c,
* m32r-asm.c, * m32r-desc.c, * m32r-dis.c, * m32r-ibld.c,
* mep-asm.c, * mep-desc.c, * mep-dis.c, * mep-ibld.c, * mt-asm.c,
* mt-desc.c, * mt-dis.c, * mt-ibld.c, * or1k-asm.c, * or1k-desc.c,
* or1k-dis.c, * or1k-ibld.c, * xc16x-asm.c, * xc16x-desc.c,
* xc16x-dis.c, * xc16x-ibld.c, * xstormy16-asm.c, * xstormy16-desc.c,
* xstormy16-dis.c, * xstormy16-ibld.c: Regenerate.
2018-03-01 22:53:50 +01:00
|
|
|
|
opcodes_error_handler
|
|
|
|
|
(_("internal error: unrecognized field %d while getting int operand"),
|
|
|
|
|
opindex);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bfd_vma
|
2014-04-22 16:57:47 +02:00
|
|
|
|
or1k_cgen_get_vma_operand (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
|
2005-07-01 13:16:33 +02:00
|
|
|
|
int opindex,
|
|
|
|
|
const CGEN_FIELDS * fields)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
bfd_vma value;
|
|
|
|
|
|
|
|
|
|
switch (opindex)
|
|
|
|
|
{
|
or1k: Add the l.adrp insn and supporting relocations
This patch adds the new instruction and relocation as per proposal:
https://openrisc.io/proposals/ladrp
This is to be added to the spec in an upcoming revision. The new instruction
l.adrp loads the page offset of the current instruction offset by
a 21-bit immediate shifted left 13-bits. This is meant to be used with
a 13-bit lower bit page offset. This allows us to free up the got
register r16.
l.adrp r3, foo
l.ori r4, r3, po(foo)
l.lbz r5, po(foo)(r3)
l.sb po(foo)(r3), r6
The relocations we add are:
- BFD_RELOC_OR1K_PLTA26 For PLT jump relocation with PLT entry
asm: plta() implemented using l.ardp, meaning
no need for r16 (the GOT reg)
- BFD_RELOC_OR1K_GOT_PG21 Upper 21-bit Page offset got address
asm: got()
- BFD_RELOC_OR1K_TLS_GD_PG21 Upper 21-bit Page offset with TLS General
asm: tlsgd() Dynamic calculation
- BFD_RELOC_OR1K_TLS_LDM_PG21 Upper 21-bit Page offset with TLS local
asm: tlsldm() dynamic calculation
- BFD_RELOC_OR1K_TLS_IE_PG21 Upper 21-bit Page offset with TLS Initial
asm: gottp() Executable calculation
- BFD_RELOC_OR1K_PCREL_PG21 Default relocation for disp21 (l.adrp
instructions)
- BFD_RELOC_OR1K_LO13 low 13-bit page offset relocation
asm: po() i.e. mem loads, addi etc
- BFD_RELOC_OR1K_SLO13 low 13-bit page offset relocation
asm: po() i.e. mem stores, with split immediate
- BFD_RELOC_OR1K_GOT_LO13, low 13-bit page offset with GOT calcs
asm: gotpo()
- BFD_RELOC_OR1K_TLS_GD_LO13 Lower 13-bit offset with TLS GD calcs
asm: tlsgdpo()
- BFD_RELOC_OR1K_TLS_LDM_LO13 Lower 13-bit offset with TLS LD calcs
asm: tlsldmpo()
- BFD_RELOC_OR1K_TLS_IE_LO13 Lower 13-bit offset with TLS IE calcs
asm: gottppo()
bfd/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* bfd-in2.h: Regenerated.
* elf32-or1k.c: (or1k_elf_howto_table): Fix formatting for
R_OR1K_PLT26, Add R_OR1K_PCREL_PG21, R_OR1K_GOT_PG21,
R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21, R_OR1K_TLS_IE_PG21,
R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13,
R_OR1K_TLS_IE_LO13, R_OR1K_SLO13, R_OR1K_PLTA26.
(or1k_reloc_map): Add BFD_RELOC_OR1K_PCREL_PG21,
BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_LDM_PG21, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_LO13, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_GD_LO13,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_PLTA26.
(elf_or1k_link_hash_table): Add field saw_plta.
(or1k_final_link_relocate): Add value calculations for new relocations.
(or1k_elf_relocate_section): Add section relocations for new
relocations.
(or1k_write_plt_entry): New function.
(or1k_elf_finish_dynamic_sections): Add support for PLTA relocations
using new l.adrp instruction. Cleanup PLT relocation code generation.
* libbfd.h: Regenerated.
* reloc.c: Add BFD_RELOC_OR1K_PCREL_PG21, BFD_RELOC_OR1K_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_PLTA26, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
cpu/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k.opc (parse_disp26): Add support for plta() relocations.
(parse_disp21): New function.
(or1k_rclass): New enum.
(or1k_rtype): New enum.
(or1k_imm16_relocs): Define new PO and SPO relocation mappings.
(parse_reloc): Add new po(), gotpo() and gottppo() for LO13 relocations.
(parse_imm16): Add support for the new 21bit and 13bit relocations.
* or1korbis.cpu (f-disp26): Don't assume SI.
(f-disp21): New pc-relative 21-bit 13 shifted to right.
(insn-opcode): Add ADRP.
(l-adrp): New instruction.
gas/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* config/tc-or1k.c (or1k_apply_fix): Add BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
* testsuite/gas/or1k/allinsn.s: Add test for l.adrp.
* testsuite/gas/or1k/allinsn.d: Add test results for new
instructions.
* testsuite/gas/or1k/reloc-1.s: Add tests to generate
R_OR1K_PLTA26, R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13,
R_OR1K_TLD_LDM_LO13, R_OR1K_TLS_IE_LO13, R_OR1K_LO13, R_OR1K_SLO13
relocations.
* testsuite/gas/or1k/reloc-1.d: Add relocation results for
tests.
* testsuite/gas/or1k/reloc-2.s: Add negative tests for store to
gotpo().
* testsuite/gas/or1k/reloc-2.l: Add expected error test results.
ld/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* testsuite/ld-or1k/or1k.exp: Add test cases for plt generation.
* testsuite/ld-or1k/plt1.dd: New file.
* testsuite/ld-or1k/plt1.s: New file.
* testsuite/ld-or1k/plt1.x.dd: New file.
* testsuite/ld-or1k/plta1.dd: New file.
* testsuite/ld-or1k/plta1.s: New file.
* testsuite/ld-or1k/pltlib.s: New file.
include/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* elf/or1k.h (elf_or1k_reloc_type): Add R_OR1K_PCREL_PG21,
R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13,
R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13, R_OR1K_TLS_IE_LO13,
R_OR1K_SLO13, R_OR1K_PLTA26.
opcodes/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k-asm.c: Regenerated.
* or1k-desc.c: Regenerated.
* or1k-desc.h: Regenerated.
* or1k-dis.c: Regenerated.
* or1k-ibld.c: Regenerated.
* or1k-opc.c: Regenerated.
* or1k-opc.h: Regenerated.
* or1k-opinst.c: Regenerated.
2018-10-05 04:41:41 +02:00
|
|
|
|
case OR1K_OPERAND_DISP21 :
|
|
|
|
|
value = fields->f_disp21;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_DISP26 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value = fields->f_disp26;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RA :
|
|
|
|
|
value = fields->f_r2;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RADF :
|
|
|
|
|
value = fields->f_r1;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RASF :
|
|
|
|
|
value = fields->f_r2;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RB :
|
|
|
|
|
value = fields->f_r3;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBDF :
|
|
|
|
|
value = fields->f_r1;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBSF :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value = fields->f_r3;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RD :
|
|
|
|
|
value = fields->f_r1;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_RDDF :
|
|
|
|
|
value = fields->f_r1;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_RDSF :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value = fields->f_r1;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_SIMM16 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value = fields->f_simm16;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_SIMM16_SPLIT :
|
|
|
|
|
value = fields->f_simm16_split;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
value = fields->f_uimm16;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16_SPLIT :
|
|
|
|
|
value = fields->f_uimm16_split;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_UIMM6 :
|
|
|
|
|
value = fields->f_uimm6;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default :
|
|
|
|
|
/* xgettext:c-format */
|
opcodes error messages
Another patch aimed at making binutils comply with the GNU coding
standard. The generated files require
https://sourceware.org/ml/cgen/2018-q1/msg00004.html
cpu/
* frv.opc: Include opintl.h.
(add_next_to_vliw): Use opcodes_error_handler to print error.
Standardize error message.
(fr500_check_insn_major_constraints, frv_vliw_add_insn): Likewise.
opcodes/
* sysdep.h (opcodes_error_handler): Define.
(_bfd_error_handler): Declare.
* Makefile.am: Remove stray #.
* opc2c.c (main): Remove bogus -l arg handling. Print "DO NOT
EDIT" comment.
* aarch64-dis.c, * arc-dis.c, * arm-dis.c, * avr-dis.c,
* d30v-dis.c, * h8300-dis.c, * mmix-dis.c, * ppc-dis.c,
* riscv-dis.c, * s390-dis.c, * sparc-dis.c, * v850-dis.c: Use
opcodes_error_handler to print errors. Standardize error messages.
* msp430-decode.opc, * nios2-dis.c, * rl78-decode.opc: Likewise,
and include opintl.h.
* nds32-asm.c: Likewise, and include sysdep.h and opintl.h.
* i386-gen.c: Standardize error messages.
* msp430-decode.c, * rl78-decode.c, rx-decode.c: Regenerate.
* Makefile.in: Regenerate.
* epiphany-asm.c, * epiphany-desc.c, * epiphany-dis.c,
* epiphany-ibld.c, * fr30-asm.c, * fr30-desc.c, * fr30-dis.c,
* fr30-ibld.c, * frv-asm.c, * frv-desc.c, * frv-dis.c, * frv-ibld.c,
* frv-opc.c, * ip2k-asm.c, * ip2k-desc.c, * ip2k-dis.c, * ip2k-ibld.c,
* iq2000-asm.c, * iq2000-desc.c, * iq2000-dis.c, * iq2000-ibld.c,
* lm32-asm.c, * lm32-desc.c, * lm32-dis.c, * lm32-ibld.c,
* m32c-asm.c, * m32c-desc.c, * m32c-dis.c, * m32c-ibld.c,
* m32r-asm.c, * m32r-desc.c, * m32r-dis.c, * m32r-ibld.c,
* mep-asm.c, * mep-desc.c, * mep-dis.c, * mep-ibld.c, * mt-asm.c,
* mt-desc.c, * mt-dis.c, * mt-ibld.c, * or1k-asm.c, * or1k-desc.c,
* or1k-dis.c, * or1k-ibld.c, * xc16x-asm.c, * xc16x-desc.c,
* xc16x-dis.c, * xc16x-ibld.c, * xstormy16-asm.c, * xstormy16-desc.c,
* xstormy16-dis.c, * xstormy16-ibld.c: Regenerate.
2018-03-01 22:53:50 +01:00
|
|
|
|
opcodes_error_handler
|
|
|
|
|
(_("internal error: unrecognized field %d while getting vma operand"),
|
|
|
|
|
opindex);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-22 16:57:47 +02:00
|
|
|
|
void or1k_cgen_set_int_operand (CGEN_CPU_DESC, int, CGEN_FIELDS *, int);
|
|
|
|
|
void or1k_cgen_set_vma_operand (CGEN_CPU_DESC, int, CGEN_FIELDS *, bfd_vma);
|
2001-10-09 10:54:58 +02:00
|
|
|
|
|
2001-04-27 15:34:20 +02:00
|
|
|
|
/* Stuffing values in cgen_fields is handled by a collection of functions.
|
|
|
|
|
They are distinguished by the type of the VALUE argument they accept.
|
|
|
|
|
TODO: floating point, inlining support, remove cases where argument type
|
|
|
|
|
not appropriate. */
|
|
|
|
|
|
|
|
|
|
void
|
2014-04-22 16:57:47 +02:00
|
|
|
|
or1k_cgen_set_int_operand (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
|
2005-07-01 13:16:33 +02:00
|
|
|
|
int opindex,
|
|
|
|
|
CGEN_FIELDS * fields,
|
|
|
|
|
int value)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
switch (opindex)
|
|
|
|
|
{
|
or1k: Add the l.adrp insn and supporting relocations
This patch adds the new instruction and relocation as per proposal:
https://openrisc.io/proposals/ladrp
This is to be added to the spec in an upcoming revision. The new instruction
l.adrp loads the page offset of the current instruction offset by
a 21-bit immediate shifted left 13-bits. This is meant to be used with
a 13-bit lower bit page offset. This allows us to free up the got
register r16.
l.adrp r3, foo
l.ori r4, r3, po(foo)
l.lbz r5, po(foo)(r3)
l.sb po(foo)(r3), r6
The relocations we add are:
- BFD_RELOC_OR1K_PLTA26 For PLT jump relocation with PLT entry
asm: plta() implemented using l.ardp, meaning
no need for r16 (the GOT reg)
- BFD_RELOC_OR1K_GOT_PG21 Upper 21-bit Page offset got address
asm: got()
- BFD_RELOC_OR1K_TLS_GD_PG21 Upper 21-bit Page offset with TLS General
asm: tlsgd() Dynamic calculation
- BFD_RELOC_OR1K_TLS_LDM_PG21 Upper 21-bit Page offset with TLS local
asm: tlsldm() dynamic calculation
- BFD_RELOC_OR1K_TLS_IE_PG21 Upper 21-bit Page offset with TLS Initial
asm: gottp() Executable calculation
- BFD_RELOC_OR1K_PCREL_PG21 Default relocation for disp21 (l.adrp
instructions)
- BFD_RELOC_OR1K_LO13 low 13-bit page offset relocation
asm: po() i.e. mem loads, addi etc
- BFD_RELOC_OR1K_SLO13 low 13-bit page offset relocation
asm: po() i.e. mem stores, with split immediate
- BFD_RELOC_OR1K_GOT_LO13, low 13-bit page offset with GOT calcs
asm: gotpo()
- BFD_RELOC_OR1K_TLS_GD_LO13 Lower 13-bit offset with TLS GD calcs
asm: tlsgdpo()
- BFD_RELOC_OR1K_TLS_LDM_LO13 Lower 13-bit offset with TLS LD calcs
asm: tlsldmpo()
- BFD_RELOC_OR1K_TLS_IE_LO13 Lower 13-bit offset with TLS IE calcs
asm: gottppo()
bfd/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* bfd-in2.h: Regenerated.
* elf32-or1k.c: (or1k_elf_howto_table): Fix formatting for
R_OR1K_PLT26, Add R_OR1K_PCREL_PG21, R_OR1K_GOT_PG21,
R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21, R_OR1K_TLS_IE_PG21,
R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13,
R_OR1K_TLS_IE_LO13, R_OR1K_SLO13, R_OR1K_PLTA26.
(or1k_reloc_map): Add BFD_RELOC_OR1K_PCREL_PG21,
BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_LDM_PG21, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_LO13, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_GD_LO13,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_PLTA26.
(elf_or1k_link_hash_table): Add field saw_plta.
(or1k_final_link_relocate): Add value calculations for new relocations.
(or1k_elf_relocate_section): Add section relocations for new
relocations.
(or1k_write_plt_entry): New function.
(or1k_elf_finish_dynamic_sections): Add support for PLTA relocations
using new l.adrp instruction. Cleanup PLT relocation code generation.
* libbfd.h: Regenerated.
* reloc.c: Add BFD_RELOC_OR1K_PCREL_PG21, BFD_RELOC_OR1K_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_PLTA26, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
cpu/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k.opc (parse_disp26): Add support for plta() relocations.
(parse_disp21): New function.
(or1k_rclass): New enum.
(or1k_rtype): New enum.
(or1k_imm16_relocs): Define new PO and SPO relocation mappings.
(parse_reloc): Add new po(), gotpo() and gottppo() for LO13 relocations.
(parse_imm16): Add support for the new 21bit and 13bit relocations.
* or1korbis.cpu (f-disp26): Don't assume SI.
(f-disp21): New pc-relative 21-bit 13 shifted to right.
(insn-opcode): Add ADRP.
(l-adrp): New instruction.
gas/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* config/tc-or1k.c (or1k_apply_fix): Add BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
* testsuite/gas/or1k/allinsn.s: Add test for l.adrp.
* testsuite/gas/or1k/allinsn.d: Add test results for new
instructions.
* testsuite/gas/or1k/reloc-1.s: Add tests to generate
R_OR1K_PLTA26, R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13,
R_OR1K_TLD_LDM_LO13, R_OR1K_TLS_IE_LO13, R_OR1K_LO13, R_OR1K_SLO13
relocations.
* testsuite/gas/or1k/reloc-1.d: Add relocation results for
tests.
* testsuite/gas/or1k/reloc-2.s: Add negative tests for store to
gotpo().
* testsuite/gas/or1k/reloc-2.l: Add expected error test results.
ld/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* testsuite/ld-or1k/or1k.exp: Add test cases for plt generation.
* testsuite/ld-or1k/plt1.dd: New file.
* testsuite/ld-or1k/plt1.s: New file.
* testsuite/ld-or1k/plt1.x.dd: New file.
* testsuite/ld-or1k/plta1.dd: New file.
* testsuite/ld-or1k/plta1.s: New file.
* testsuite/ld-or1k/pltlib.s: New file.
include/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* elf/or1k.h (elf_or1k_reloc_type): Add R_OR1K_PCREL_PG21,
R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13,
R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13, R_OR1K_TLS_IE_LO13,
R_OR1K_SLO13, R_OR1K_PLTA26.
opcodes/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k-asm.c: Regenerated.
* or1k-desc.c: Regenerated.
* or1k-desc.h: Regenerated.
* or1k-dis.c: Regenerated.
* or1k-ibld.c: Regenerated.
* or1k-opc.c: Regenerated.
* or1k-opc.h: Regenerated.
* or1k-opinst.c: Regenerated.
2018-10-05 04:41:41 +02:00
|
|
|
|
case OR1K_OPERAND_DISP21 :
|
|
|
|
|
fields->f_disp21 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_DISP26 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
fields->f_disp26 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RA :
|
|
|
|
|
fields->f_r2 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RADF :
|
|
|
|
|
fields->f_r1 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RASF :
|
|
|
|
|
fields->f_r2 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RB :
|
|
|
|
|
fields->f_r3 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBDF :
|
|
|
|
|
fields->f_r1 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBSF :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
fields->f_r3 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RD :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
fields->f_r1 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RDDF :
|
|
|
|
|
fields->f_r1 = value;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_RDSF :
|
|
|
|
|
fields->f_r1 = value;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_SIMM16 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
fields->f_simm16 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_SIMM16_SPLIT :
|
|
|
|
|
fields->f_simm16_split = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
fields->f_uimm16 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16_SPLIT :
|
|
|
|
|
fields->f_uimm16_split = value;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_UIMM6 :
|
|
|
|
|
fields->f_uimm6 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default :
|
|
|
|
|
/* xgettext:c-format */
|
opcodes error messages
Another patch aimed at making binutils comply with the GNU coding
standard. The generated files require
https://sourceware.org/ml/cgen/2018-q1/msg00004.html
cpu/
* frv.opc: Include opintl.h.
(add_next_to_vliw): Use opcodes_error_handler to print error.
Standardize error message.
(fr500_check_insn_major_constraints, frv_vliw_add_insn): Likewise.
opcodes/
* sysdep.h (opcodes_error_handler): Define.
(_bfd_error_handler): Declare.
* Makefile.am: Remove stray #.
* opc2c.c (main): Remove bogus -l arg handling. Print "DO NOT
EDIT" comment.
* aarch64-dis.c, * arc-dis.c, * arm-dis.c, * avr-dis.c,
* d30v-dis.c, * h8300-dis.c, * mmix-dis.c, * ppc-dis.c,
* riscv-dis.c, * s390-dis.c, * sparc-dis.c, * v850-dis.c: Use
opcodes_error_handler to print errors. Standardize error messages.
* msp430-decode.opc, * nios2-dis.c, * rl78-decode.opc: Likewise,
and include opintl.h.
* nds32-asm.c: Likewise, and include sysdep.h and opintl.h.
* i386-gen.c: Standardize error messages.
* msp430-decode.c, * rl78-decode.c, rx-decode.c: Regenerate.
* Makefile.in: Regenerate.
* epiphany-asm.c, * epiphany-desc.c, * epiphany-dis.c,
* epiphany-ibld.c, * fr30-asm.c, * fr30-desc.c, * fr30-dis.c,
* fr30-ibld.c, * frv-asm.c, * frv-desc.c, * frv-dis.c, * frv-ibld.c,
* frv-opc.c, * ip2k-asm.c, * ip2k-desc.c, * ip2k-dis.c, * ip2k-ibld.c,
* iq2000-asm.c, * iq2000-desc.c, * iq2000-dis.c, * iq2000-ibld.c,
* lm32-asm.c, * lm32-desc.c, * lm32-dis.c, * lm32-ibld.c,
* m32c-asm.c, * m32c-desc.c, * m32c-dis.c, * m32c-ibld.c,
* m32r-asm.c, * m32r-desc.c, * m32r-dis.c, * m32r-ibld.c,
* mep-asm.c, * mep-desc.c, * mep-dis.c, * mep-ibld.c, * mt-asm.c,
* mt-desc.c, * mt-dis.c, * mt-ibld.c, * or1k-asm.c, * or1k-desc.c,
* or1k-dis.c, * or1k-ibld.c, * xc16x-asm.c, * xc16x-desc.c,
* xc16x-dis.c, * xc16x-ibld.c, * xstormy16-asm.c, * xstormy16-desc.c,
* xstormy16-dis.c, * xstormy16-ibld.c: Regenerate.
2018-03-01 22:53:50 +01:00
|
|
|
|
opcodes_error_handler
|
|
|
|
|
(_("internal error: unrecognized field %d while setting int operand"),
|
|
|
|
|
opindex);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2014-04-22 16:57:47 +02:00
|
|
|
|
or1k_cgen_set_vma_operand (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
|
2005-07-01 13:16:33 +02:00
|
|
|
|
int opindex,
|
|
|
|
|
CGEN_FIELDS * fields,
|
|
|
|
|
bfd_vma value)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
|
|
|
|
switch (opindex)
|
|
|
|
|
{
|
or1k: Add the l.adrp insn and supporting relocations
This patch adds the new instruction and relocation as per proposal:
https://openrisc.io/proposals/ladrp
This is to be added to the spec in an upcoming revision. The new instruction
l.adrp loads the page offset of the current instruction offset by
a 21-bit immediate shifted left 13-bits. This is meant to be used with
a 13-bit lower bit page offset. This allows us to free up the got
register r16.
l.adrp r3, foo
l.ori r4, r3, po(foo)
l.lbz r5, po(foo)(r3)
l.sb po(foo)(r3), r6
The relocations we add are:
- BFD_RELOC_OR1K_PLTA26 For PLT jump relocation with PLT entry
asm: plta() implemented using l.ardp, meaning
no need for r16 (the GOT reg)
- BFD_RELOC_OR1K_GOT_PG21 Upper 21-bit Page offset got address
asm: got()
- BFD_RELOC_OR1K_TLS_GD_PG21 Upper 21-bit Page offset with TLS General
asm: tlsgd() Dynamic calculation
- BFD_RELOC_OR1K_TLS_LDM_PG21 Upper 21-bit Page offset with TLS local
asm: tlsldm() dynamic calculation
- BFD_RELOC_OR1K_TLS_IE_PG21 Upper 21-bit Page offset with TLS Initial
asm: gottp() Executable calculation
- BFD_RELOC_OR1K_PCREL_PG21 Default relocation for disp21 (l.adrp
instructions)
- BFD_RELOC_OR1K_LO13 low 13-bit page offset relocation
asm: po() i.e. mem loads, addi etc
- BFD_RELOC_OR1K_SLO13 low 13-bit page offset relocation
asm: po() i.e. mem stores, with split immediate
- BFD_RELOC_OR1K_GOT_LO13, low 13-bit page offset with GOT calcs
asm: gotpo()
- BFD_RELOC_OR1K_TLS_GD_LO13 Lower 13-bit offset with TLS GD calcs
asm: tlsgdpo()
- BFD_RELOC_OR1K_TLS_LDM_LO13 Lower 13-bit offset with TLS LD calcs
asm: tlsldmpo()
- BFD_RELOC_OR1K_TLS_IE_LO13 Lower 13-bit offset with TLS IE calcs
asm: gottppo()
bfd/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* bfd-in2.h: Regenerated.
* elf32-or1k.c: (or1k_elf_howto_table): Fix formatting for
R_OR1K_PLT26, Add R_OR1K_PCREL_PG21, R_OR1K_GOT_PG21,
R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21, R_OR1K_TLS_IE_PG21,
R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13,
R_OR1K_TLS_IE_LO13, R_OR1K_SLO13, R_OR1K_PLTA26.
(or1k_reloc_map): Add BFD_RELOC_OR1K_PCREL_PG21,
BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_LDM_PG21, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_LO13, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_GD_LO13,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_PLTA26.
(elf_or1k_link_hash_table): Add field saw_plta.
(or1k_final_link_relocate): Add value calculations for new relocations.
(or1k_elf_relocate_section): Add section relocations for new
relocations.
(or1k_write_plt_entry): New function.
(or1k_elf_finish_dynamic_sections): Add support for PLTA relocations
using new l.adrp instruction. Cleanup PLT relocation code generation.
* libbfd.h: Regenerated.
* reloc.c: Add BFD_RELOC_OR1K_PCREL_PG21, BFD_RELOC_OR1K_LO13,
BFD_RELOC_OR1K_SLO13, BFD_RELOC_OR1K_GOT_PG21, BFD_RELOC_OR1K_GOT_LO13,
BFD_RELOC_OR1K_PLTA26, BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
cpu/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k.opc (parse_disp26): Add support for plta() relocations.
(parse_disp21): New function.
(or1k_rclass): New enum.
(or1k_rtype): New enum.
(or1k_imm16_relocs): Define new PO and SPO relocation mappings.
(parse_reloc): Add new po(), gotpo() and gottppo() for LO13 relocations.
(parse_imm16): Add support for the new 21bit and 13bit relocations.
* or1korbis.cpu (f-disp26): Don't assume SI.
(f-disp21): New pc-relative 21-bit 13 shifted to right.
(insn-opcode): Add ADRP.
(l-adrp): New instruction.
gas/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* config/tc-or1k.c (or1k_apply_fix): Add BFD_RELOC_OR1K_TLS_GD_PG21,
BFD_RELOC_OR1K_TLS_GD_LO13, BFD_RELOC_OR1K_TLS_LDM_PG21,
BFD_RELOC_OR1K_TLS_LDM_LO13, BFD_RELOC_OR1K_TLS_IE_PG21,
BFD_RELOC_OR1K_TLS_IE_LO13.
* testsuite/gas/or1k/allinsn.s: Add test for l.adrp.
* testsuite/gas/or1k/allinsn.d: Add test results for new
instructions.
* testsuite/gas/or1k/reloc-1.s: Add tests to generate
R_OR1K_PLTA26, R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13, R_OR1K_TLS_GD_LO13,
R_OR1K_TLD_LDM_LO13, R_OR1K_TLS_IE_LO13, R_OR1K_LO13, R_OR1K_SLO13
relocations.
* testsuite/gas/or1k/reloc-1.d: Add relocation results for
tests.
* testsuite/gas/or1k/reloc-2.s: Add negative tests for store to
gotpo().
* testsuite/gas/or1k/reloc-2.l: Add expected error test results.
ld/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* testsuite/ld-or1k/or1k.exp: Add test cases for plt generation.
* testsuite/ld-or1k/plt1.dd: New file.
* testsuite/ld-or1k/plt1.s: New file.
* testsuite/ld-or1k/plt1.x.dd: New file.
* testsuite/ld-or1k/plta1.dd: New file.
* testsuite/ld-or1k/plta1.s: New file.
* testsuite/ld-or1k/pltlib.s: New file.
include/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* elf/or1k.h (elf_or1k_reloc_type): Add R_OR1K_PCREL_PG21,
R_OR1K_GOT_PG21, R_OR1K_TLS_GD_PG21, R_OR1K_TLS_LDM_PG21,
R_OR1K_TLS_IE_PG21, R_OR1K_LO13, R_OR1K_GOT_LO13,
R_OR1K_TLS_GD_LO13, R_OR1K_TLS_LDM_LO13, R_OR1K_TLS_IE_LO13,
R_OR1K_SLO13, R_OR1K_PLTA26.
opcodes/ChangeLog:
yyyy-mm-dd Richard Henderson <rth@twiddle.net>
* or1k-asm.c: Regenerated.
* or1k-desc.c: Regenerated.
* or1k-desc.h: Regenerated.
* or1k-dis.c: Regenerated.
* or1k-ibld.c: Regenerated.
* or1k-opc.c: Regenerated.
* or1k-opc.h: Regenerated.
* or1k-opinst.c: Regenerated.
2018-10-05 04:41:41 +02:00
|
|
|
|
case OR1K_OPERAND_DISP21 :
|
|
|
|
|
fields->f_disp21 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_DISP26 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
fields->f_disp26 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RA :
|
|
|
|
|
fields->f_r2 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RADF :
|
|
|
|
|
fields->f_r1 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RASF :
|
|
|
|
|
fields->f_r2 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RB :
|
|
|
|
|
fields->f_r3 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBDF :
|
|
|
|
|
fields->f_r1 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RBSF :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
fields->f_r3 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RD :
|
|
|
|
|
fields->f_r1 = value;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_RDDF :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
fields->f_r1 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_RDSF :
|
|
|
|
|
fields->f_r1 = value;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_SIMM16 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
fields->f_simm16 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_SIMM16_SPLIT :
|
|
|
|
|
fields->f_simm16_split = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16 :
|
2001-04-27 15:34:20 +02:00
|
|
|
|
fields->f_uimm16 = value;
|
|
|
|
|
break;
|
2014-04-22 16:57:47 +02:00
|
|
|
|
case OR1K_OPERAND_UIMM16_SPLIT :
|
|
|
|
|
fields->f_uimm16_split = value;
|
|
|
|
|
break;
|
|
|
|
|
case OR1K_OPERAND_UIMM6 :
|
|
|
|
|
fields->f_uimm6 = value;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default :
|
|
|
|
|
/* xgettext:c-format */
|
opcodes error messages
Another patch aimed at making binutils comply with the GNU coding
standard. The generated files require
https://sourceware.org/ml/cgen/2018-q1/msg00004.html
cpu/
* frv.opc: Include opintl.h.
(add_next_to_vliw): Use opcodes_error_handler to print error.
Standardize error message.
(fr500_check_insn_major_constraints, frv_vliw_add_insn): Likewise.
opcodes/
* sysdep.h (opcodes_error_handler): Define.
(_bfd_error_handler): Declare.
* Makefile.am: Remove stray #.
* opc2c.c (main): Remove bogus -l arg handling. Print "DO NOT
EDIT" comment.
* aarch64-dis.c, * arc-dis.c, * arm-dis.c, * avr-dis.c,
* d30v-dis.c, * h8300-dis.c, * mmix-dis.c, * ppc-dis.c,
* riscv-dis.c, * s390-dis.c, * sparc-dis.c, * v850-dis.c: Use
opcodes_error_handler to print errors. Standardize error messages.
* msp430-decode.opc, * nios2-dis.c, * rl78-decode.opc: Likewise,
and include opintl.h.
* nds32-asm.c: Likewise, and include sysdep.h and opintl.h.
* i386-gen.c: Standardize error messages.
* msp430-decode.c, * rl78-decode.c, rx-decode.c: Regenerate.
* Makefile.in: Regenerate.
* epiphany-asm.c, * epiphany-desc.c, * epiphany-dis.c,
* epiphany-ibld.c, * fr30-asm.c, * fr30-desc.c, * fr30-dis.c,
* fr30-ibld.c, * frv-asm.c, * frv-desc.c, * frv-dis.c, * frv-ibld.c,
* frv-opc.c, * ip2k-asm.c, * ip2k-desc.c, * ip2k-dis.c, * ip2k-ibld.c,
* iq2000-asm.c, * iq2000-desc.c, * iq2000-dis.c, * iq2000-ibld.c,
* lm32-asm.c, * lm32-desc.c, * lm32-dis.c, * lm32-ibld.c,
* m32c-asm.c, * m32c-desc.c, * m32c-dis.c, * m32c-ibld.c,
* m32r-asm.c, * m32r-desc.c, * m32r-dis.c, * m32r-ibld.c,
* mep-asm.c, * mep-desc.c, * mep-dis.c, * mep-ibld.c, * mt-asm.c,
* mt-desc.c, * mt-dis.c, * mt-ibld.c, * or1k-asm.c, * or1k-desc.c,
* or1k-dis.c, * or1k-ibld.c, * xc16x-asm.c, * xc16x-desc.c,
* xc16x-dis.c, * xc16x-ibld.c, * xstormy16-asm.c, * xstormy16-desc.c,
* xstormy16-dis.c, * xstormy16-ibld.c: Regenerate.
2018-03-01 22:53:50 +01:00
|
|
|
|
opcodes_error_handler
|
|
|
|
|
(_("internal error: unrecognized field %d while setting vma operand"),
|
|
|
|
|
opindex);
|
2001-04-27 15:34:20 +02:00
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Function to call before using the instruction builder tables. */
|
|
|
|
|
|
|
|
|
|
void
|
2014-04-22 16:57:47 +02:00
|
|
|
|
or1k_cgen_init_ibld_table (CGEN_CPU_DESC cd)
|
2001-04-27 15:34:20 +02:00
|
|
|
|
{
|
2014-04-22 16:57:47 +02:00
|
|
|
|
cd->insert_handlers = & or1k_cgen_insert_handlers[0];
|
|
|
|
|
cd->extract_handlers = & or1k_cgen_extract_handlers[0];
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2014-04-22 16:57:47 +02:00
|
|
|
|
cd->insert_operand = or1k_cgen_insert_operand;
|
|
|
|
|
cd->extract_operand = or1k_cgen_extract_operand;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
|
2014-04-22 16:57:47 +02:00
|
|
|
|
cd->get_int_operand = or1k_cgen_get_int_operand;
|
|
|
|
|
cd->set_int_operand = or1k_cgen_set_int_operand;
|
|
|
|
|
cd->get_vma_operand = or1k_cgen_get_vma_operand;
|
|
|
|
|
cd->set_vma_operand = or1k_cgen_set_vma_operand;
|
2001-04-27 15:34:20 +02:00
|
|
|
|
}
|