2000-08-04 10:21:43 +08:00
|
|
|
|
/* Instruction building/extraction support for @arch@. -*- C -*-
|
|
|
|
|
|
2005-07-01 19:16:33 +08:00
|
|
|
|
THIS FILE IS MACHINE GENERATED WITH CGEN: Cpu tools GENerator.
|
|
|
|
|
- the resultant file is machine generated, cgen-ibld.in isn't
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
2021-01-01 06:58:58 +08:00
|
|
|
|
Copyright (C) 1996-2021 Free Software Foundation, Inc.
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
2007-07-05 17:49:03 +08:00
|
|
|
|
This file is part of libopcodes.
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
2007-07-05 17:49:03 +08:00
|
|
|
|
This library is free software; you can redistribute it and/or modify
|
2005-07-01 19:16:33 +08:00
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-07-05 17:49:03 +08:00
|
|
|
|
the Free Software Foundation; either version 3, or (at your option)
|
2005-07-01 19:16:33 +08:00
|
|
|
|
any later version.
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
2007-07-05 17:49:03 +08: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.
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
2005-07-01 19:16:33 +08: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. */
|
2000-08-04 10:21:43 +08: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"
|
|
|
|
|
#include "@prefix@-desc.h"
|
|
|
|
|
#include "@prefix@-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 13:30:19 +08:00
|
|
|
|
#include "cgen/basic-modes.h"
|
2000-08-04 10:21:43 +08:00
|
|
|
|
#include "opintl.h"
|
2001-10-13 17:38:04 +08:00
|
|
|
|
#include "safe-ctype.h"
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
2005-07-01 19:16:33 +08:00
|
|
|
|
#undef min
|
2000-08-04 10:21:43 +08:00
|
|
|
|
#define min(a,b) ((a) < (b) ? (a) : (b))
|
2005-07-01 19:16:33 +08:00
|
|
|
|
#undef max
|
2000-08-04 10:21:43 +08: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 05:21:24 +08:00
|
|
|
|
(CGEN_CPU_DESC, long, unsigned int, unsigned int, unsigned int,
|
|
|
|
|
unsigned int, unsigned int, unsigned int, CGEN_INSN_BYTES_PTR);
|
2000-08-04 10:21:43 +08:00
|
|
|
|
static const char * insert_insn_normal
|
2003-08-09 05:21:24 +08:00
|
|
|
|
(CGEN_CPU_DESC, const CGEN_INSN *,
|
|
|
|
|
CGEN_FIELDS *, CGEN_INSN_BYTES_PTR, bfd_vma);
|
2000-08-04 10:21:43 +08:00
|
|
|
|
static int extract_normal
|
2003-08-09 05:21:24 +08: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 *);
|
2000-08-04 10:21:43 +08:00
|
|
|
|
static int extract_insn_normal
|
2003-08-09 05:21:24 +08:00
|
|
|
|
(CGEN_CPU_DESC, const CGEN_INSN *, CGEN_EXTRACT_INFO *,
|
|
|
|
|
CGEN_INSN_INT, CGEN_FIELDS *, bfd_vma);
|
2001-10-09 16:54:58 +08:00
|
|
|
|
#if CGEN_INT_INSN_P
|
2000-08-29 02:17:54 +08:00
|
|
|
|
static void put_insn_int_value
|
2003-08-09 05:21:24 +08:00
|
|
|
|
(CGEN_CPU_DESC, CGEN_INSN_BYTES_PTR, int, int, CGEN_INSN_INT);
|
2001-10-09 16:54:58 +08:00
|
|
|
|
#endif
|
|
|
|
|
#if ! CGEN_INT_INSN_P
|
|
|
|
|
static CGEN_INLINE void insert_1
|
2003-08-09 05:21:24 +08:00
|
|
|
|
(CGEN_CPU_DESC, unsigned long, int, int, int, unsigned char *);
|
2001-10-09 16:54:58 +08:00
|
|
|
|
static CGEN_INLINE int fill_cache
|
2003-08-09 05:21:24 +08:00
|
|
|
|
(CGEN_CPU_DESC, CGEN_EXTRACT_INFO *, int, int, bfd_vma);
|
2001-10-09 16:54:58 +08:00
|
|
|
|
static CGEN_INLINE long extract_1
|
2003-08-09 05:21:24 +08:00
|
|
|
|
(CGEN_CPU_DESC, CGEN_EXTRACT_INFO *, int, int, int, unsigned char *, bfd_vma);
|
2001-10-09 16:54:58 +08:00
|
|
|
|
#endif
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
|
|
|
|
/* Operand insertion. */
|
|
|
|
|
|
|
|
|
|
#if ! CGEN_INT_INSN_P
|
|
|
|
|
|
|
|
|
|
/* Subroutine of insert_normal. */
|
|
|
|
|
|
|
|
|
|
static CGEN_INLINE void
|
2003-08-09 05:21:24 +08:00
|
|
|
|
insert_1 (CGEN_CPU_DESC cd,
|
|
|
|
|
unsigned long value,
|
2003-08-09 07:01:28 +08:00
|
|
|
|
int start,
|
|
|
|
|
int length,
|
|
|
|
|
int word_length,
|
2003-08-09 05:21:24 +08:00
|
|
|
|
unsigned char *bufp)
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
PR26449, PR26450 UBSAN: frv-ibld.c:135 left shift
Eh well, I guess the code didn't quite live up to the comment.
PR 26449
PR 26450
* cgen-ibld.in (insert_1): Use 1UL in forming mask.
(extract_normal): Likewise.
(insert_normal): Likewise, and move past zero length test.
(put_insn_int_value): Handle mask for zero length, use 1UL.
* bpf-ibld.c, * epiphany-ibld.c, * 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, * or1k-ibld.c,
* xc16x-ibld.c, * xstormy16-ibld.c: Regenerate.
2020-08-28 22:13:16 +08:00
|
|
|
|
unsigned long x, mask;
|
2000-08-04 10:21:43 +08:00
|
|
|
|
int shift;
|
|
|
|
|
|
opcodes: discriminate endianness and insn-endianness in CGEN ports
The CGEN support code in opcodes accesses instruction contents using a
couple of functions defined in cgen-opc.c: cgen_get_insn_value and
cgen_put_insn_value. These functions use the "instruction endianness"
in the CPU description to order the read/written bytes.
The process of writing an instruction to the object file is:
a) cgen_put_insn_value ;; Writes out the opcodes.
b) ARCH_cgen_insert_operand
insert_normal
insert_1
cgen_put_insn_value ;; Writes out the bytes of the
;; operand.
Likewise, the process of reading an instruction from the object file
is:
a) cgen_get_insn_value ;; Reads the opcodes.
b) ARCH_cgen_extract_operand
extract_normal
extract_1
cgen_get_insn_value ;; Reads in the bytes of the
;; operand.
As can be seen above, cgen_{get,put}_insn_value are used to both
process the instruction opcodes (the constant fields conforming the
base instruction) and also the values of the instruction operands,
such as immediates.
This is problematic for architectures in which the endianness of
instructions is different to the endianness of data. An example is
BPF, where instructions are always encoded big-endian but the data may
be either big or little.
This patch changes the cgen_{get,put}_insn_value functions in order to
get an extra argument with the endianness to use, and adapts the
existin callers to these functions in order to provide cd->endian or
cd->insn_endian, whatever appropriate. Callers like extract_1 and
insert_1 pass cd->endian (since they are reading/writing operand
values) while callers reading/writing the base instruction pass
cd->insn_endian instead.
A few little adjustments have been needed in some existing CGEN based
ports:
* The BPF assembler uses cgen_put_insn_value. It has been adapted to
pass the new endian argument.
* The mep port has code in mep.opc that uses cgen_{get,put}_insn_value.
It has been adapted to pass the new endianargument. Ditto for a
call in the assembler.
Tested with --enable-targets=all.
Regested in all supported targets.
No regressions.
include/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* opcode/cgen.h: Get an `endian' argument in both
cgen_get_insn_value and cgen_put_insn_value.
opcodes/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* cgen-opc.c (cgen_get_insn_value): Get an `endian' argument.
(cgen_put_insn_value): Likewise.
(cgen_lookup_insn): Pass endianness to cgen_{get,put}_insn_value.
* cgen-dis.in (print_insn): Likewise.
* cgen-ibld.in (insert_1): Likewise.
(insert_1): Likewise.
(insert_insn_normal): Likewise.
(extract_1): Likewise.
* bpf-dis.c: Regenerate.
* bpf-ibld.c: Likewise.
* bpf-ibld.c: Likewise.
* cgen-dis.in: Likewise.
* cgen-ibld.in: Likewise.
* cgen-opc.c: Likewise.
* epiphany-dis.c: Likewise.
* epiphany-ibld.c: Likewise.
* fr30-dis.c: Likewise.
* fr30-ibld.c: Likewise.
* frv-dis.c: Likewise.
* frv-ibld.c: Likewise.
* ip2k-dis.c: Likewise.
* ip2k-ibld.c: Likewise.
* iq2000-dis.c: Likewise.
* iq2000-ibld.c: Likewise.
* lm32-dis.c: Likewise.
* lm32-ibld.c: Likewise.
* m32c-dis.c: Likewise.
* m32c-ibld.c: Likewise.
* m32r-dis.c: Likewise.
* m32r-ibld.c: Likewise.
* mep-dis.c: Likewise.
* mep-ibld.c: Likewise.
* mt-dis.c: Likewise.
* mt-ibld.c: Likewise.
* or1k-dis.c: Likewise.
* or1k-ibld.c: Likewise.
* xc16x-dis.c: Likewise.
* xc16x-ibld.c: Likewise.
* xstormy16-dis.c: Likewise.
* xstormy16-ibld.c: Likewise.
gas/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* cgen.c (gas_cgen_finish_insn): Pass the endianness to
cgen_put_insn_value.
(gas_cgen_md_apply_fix): Likewise.
(gas_cgen_md_apply_fix): Likewise.
* config/tc-bpf.c (md_apply_fix): Pass data endianness to
cgen_put_insn_value.
* config/tc-mep.c (mep_check_ivc2_scheduling): Pass endianness to
cgen_put_insn_value.
cpu/ChangeLog:
2020-06-02 Jose E. Marchesi <jose.marchesi@oracle.com>
* mep.opc (print_slot_insn): Pass the insn endianness to
cgen_get_insn_value.
2020-06-04 22:15:53 +08:00
|
|
|
|
x = cgen_get_insn_value (cd, bufp, word_length, cd->endian);
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
|
|
|
|
/* Written this way to avoid undefined behaviour. */
|
PR26449, PR26450 UBSAN: frv-ibld.c:135 left shift
Eh well, I guess the code didn't quite live up to the comment.
PR 26449
PR 26450
* cgen-ibld.in (insert_1): Use 1UL in forming mask.
(extract_normal): Likewise.
(insert_normal): Likewise, and move past zero length test.
(put_insn_int_value): Handle mask for zero length, use 1UL.
* bpf-ibld.c, * epiphany-ibld.c, * 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, * or1k-ibld.c,
* xc16x-ibld.c, * xstormy16-ibld.c: Regenerate.
2020-08-28 22:13:16 +08:00
|
|
|
|
mask = (1UL << (length - 1) << 1) - 1;
|
2000-08-04 10:21:43 +08:00
|
|
|
|
if (CGEN_INSN_LSB0_P)
|
|
|
|
|
shift = (start + 1) - length;
|
|
|
|
|
else
|
|
|
|
|
shift = (word_length - (start + length));
|
|
|
|
|
x = (x & ~(mask << shift)) | ((value & mask) << shift);
|
|
|
|
|
|
opcodes: discriminate endianness and insn-endianness in CGEN ports
The CGEN support code in opcodes accesses instruction contents using a
couple of functions defined in cgen-opc.c: cgen_get_insn_value and
cgen_put_insn_value. These functions use the "instruction endianness"
in the CPU description to order the read/written bytes.
The process of writing an instruction to the object file is:
a) cgen_put_insn_value ;; Writes out the opcodes.
b) ARCH_cgen_insert_operand
insert_normal
insert_1
cgen_put_insn_value ;; Writes out the bytes of the
;; operand.
Likewise, the process of reading an instruction from the object file
is:
a) cgen_get_insn_value ;; Reads the opcodes.
b) ARCH_cgen_extract_operand
extract_normal
extract_1
cgen_get_insn_value ;; Reads in the bytes of the
;; operand.
As can be seen above, cgen_{get,put}_insn_value are used to both
process the instruction opcodes (the constant fields conforming the
base instruction) and also the values of the instruction operands,
such as immediates.
This is problematic for architectures in which the endianness of
instructions is different to the endianness of data. An example is
BPF, where instructions are always encoded big-endian but the data may
be either big or little.
This patch changes the cgen_{get,put}_insn_value functions in order to
get an extra argument with the endianness to use, and adapts the
existin callers to these functions in order to provide cd->endian or
cd->insn_endian, whatever appropriate. Callers like extract_1 and
insert_1 pass cd->endian (since they are reading/writing operand
values) while callers reading/writing the base instruction pass
cd->insn_endian instead.
A few little adjustments have been needed in some existing CGEN based
ports:
* The BPF assembler uses cgen_put_insn_value. It has been adapted to
pass the new endian argument.
* The mep port has code in mep.opc that uses cgen_{get,put}_insn_value.
It has been adapted to pass the new endianargument. Ditto for a
call in the assembler.
Tested with --enable-targets=all.
Regested in all supported targets.
No regressions.
include/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* opcode/cgen.h: Get an `endian' argument in both
cgen_get_insn_value and cgen_put_insn_value.
opcodes/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* cgen-opc.c (cgen_get_insn_value): Get an `endian' argument.
(cgen_put_insn_value): Likewise.
(cgen_lookup_insn): Pass endianness to cgen_{get,put}_insn_value.
* cgen-dis.in (print_insn): Likewise.
* cgen-ibld.in (insert_1): Likewise.
(insert_1): Likewise.
(insert_insn_normal): Likewise.
(extract_1): Likewise.
* bpf-dis.c: Regenerate.
* bpf-ibld.c: Likewise.
* bpf-ibld.c: Likewise.
* cgen-dis.in: Likewise.
* cgen-ibld.in: Likewise.
* cgen-opc.c: Likewise.
* epiphany-dis.c: Likewise.
* epiphany-ibld.c: Likewise.
* fr30-dis.c: Likewise.
* fr30-ibld.c: Likewise.
* frv-dis.c: Likewise.
* frv-ibld.c: Likewise.
* ip2k-dis.c: Likewise.
* ip2k-ibld.c: Likewise.
* iq2000-dis.c: Likewise.
* iq2000-ibld.c: Likewise.
* lm32-dis.c: Likewise.
* lm32-ibld.c: Likewise.
* m32c-dis.c: Likewise.
* m32c-ibld.c: Likewise.
* m32r-dis.c: Likewise.
* m32r-ibld.c: Likewise.
* mep-dis.c: Likewise.
* mep-ibld.c: Likewise.
* mt-dis.c: Likewise.
* mt-ibld.c: Likewise.
* or1k-dis.c: Likewise.
* or1k-ibld.c: Likewise.
* xc16x-dis.c: Likewise.
* xc16x-ibld.c: Likewise.
* xstormy16-dis.c: Likewise.
* xstormy16-ibld.c: Likewise.
gas/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* cgen.c (gas_cgen_finish_insn): Pass the endianness to
cgen_put_insn_value.
(gas_cgen_md_apply_fix): Likewise.
(gas_cgen_md_apply_fix): Likewise.
* config/tc-bpf.c (md_apply_fix): Pass data endianness to
cgen_put_insn_value.
* config/tc-mep.c (mep_check_ivc2_scheduling): Pass endianness to
cgen_put_insn_value.
cpu/ChangeLog:
2020-06-02 Jose E. Marchesi <jose.marchesi@oracle.com>
* mep.opc (print_slot_insn): Pass the insn endianness to
cgen_get_insn_value.
2020-06-04 22:15:53 +08:00
|
|
|
|
cgen_put_insn_value (cd, bufp, word_length, (bfd_vma) x, cd->endian);
|
2000-08-04 10:21:43 +08: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 05:21:24 +08: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)
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
|
|
|
|
static char errbuf[100];
|
PR26449, PR26450 UBSAN: frv-ibld.c:135 left shift
Eh well, I guess the code didn't quite live up to the comment.
PR 26449
PR 26450
* cgen-ibld.in (insert_1): Use 1UL in forming mask.
(extract_normal): Likewise.
(insert_normal): Likewise, and move past zero length test.
(put_insn_int_value): Handle mask for zero length, use 1UL.
* bpf-ibld.c, * epiphany-ibld.c, * 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, * or1k-ibld.c,
* xc16x-ibld.c, * xstormy16-ibld.c: Regenerate.
2020-08-28 22:13:16 +08:00
|
|
|
|
unsigned long mask;
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
|
|
|
|
/* If LENGTH is zero, this operand doesn't contribute to the value. */
|
|
|
|
|
if (length == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
PR26449, PR26450 UBSAN: frv-ibld.c:135 left shift
Eh well, I guess the code didn't quite live up to the comment.
PR 26449
PR 26450
* cgen-ibld.in (insert_1): Use 1UL in forming mask.
(extract_normal): Likewise.
(insert_normal): Likewise, and move past zero length test.
(put_insn_int_value): Handle mask for zero length, use 1UL.
* bpf-ibld.c, * epiphany-ibld.c, * 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, * or1k-ibld.c,
* xc16x-ibld.c, * xstormy16-ibld.c: Regenerate.
2020-08-28 22:13:16 +08:00
|
|
|
|
/* Written this way to avoid undefined behaviour. */
|
|
|
|
|
mask = (1UL << (length - 1) << 1) - 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-08 02:05:45 +08:00
|
|
|
|
if (word_length > 8 * sizeof (CGEN_INSN_INT))
|
2000-08-04 10:21:43 +08: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-07-01 10:48:46 +08:00
|
|
|
|
if (CGEN_BOOL_ATTR (attrs, CGEN_IFLD_SIGN_OPT))
|
|
|
|
|
{
|
2020-09-02 09:05:10 +08:00
|
|
|
|
long minval = - (1UL << (length - 1));
|
2001-07-01 10:48:46 +08:00
|
|
|
|
unsigned long maxval = mask;
|
2015-08-12 19:45:07 +08:00
|
|
|
|
|
2001-07-01 10:48:46 +08: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))
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
|
|
|
|
unsigned long maxval = mask;
|
2006-03-05 16:38:53 +08: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)
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
|
|
|
|
/* xgettext:c-format */
|
|
|
|
|
sprintf (errbuf,
|
2006-03-05 16:38:53 +08:00
|
|
|
|
_("operand out of range (0x%lx not between 0 and 0x%lx)"),
|
|
|
|
|
val, maxval);
|
2000-08-04 10:21:43 +08:00
|
|
|
|
return errbuf;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (! cgen_signed_overflow_ok_p (cd))
|
|
|
|
|
{
|
2020-09-02 09:05:10 +08:00
|
|
|
|
long minval = - (1UL << (length - 1));
|
|
|
|
|
long maxval = (1UL << (length - 1)) - 1;
|
2015-08-12 19:45:07 +08:00
|
|
|
|
|
2000-08-04 10:21:43 +08: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 08:41:12 +08:00
|
|
|
|
int shift_within_word, shift_to_word, shift;
|
2000-08-04 10:21:43 +08: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 08:41:12 +08: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. */
|
2000-08-04 10:21:43 +08: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 08:41:12 +08:00
|
|
|
|
shift_within_word = start + 1 - length;
|
2000-08-04 10:21:43 +08: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 08:41:12 +08:00
|
|
|
|
shift_within_word = word_length - start - length;
|
|
|
|
|
|
|
|
|
|
/* The total SHIFT, then mask in the value. */
|
|
|
|
|
shift = shift_to_word + shift_within_word;
|
2000-08-04 10:21:43 +08: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).
|
2001-03-28 05:37:47 +08:00
|
|
|
|
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).
|
2000-08-04 10:21:43 +08:00
|
|
|
|
The result is an error message or NULL if success. */
|
|
|
|
|
|
|
|
|
|
static const char *
|
2003-08-09 05:21:24 +08:00
|
|
|
|
insert_insn_normal (CGEN_CPU_DESC cd,
|
|
|
|
|
const CGEN_INSN * insn,
|
|
|
|
|
CGEN_FIELDS * fields,
|
|
|
|
|
CGEN_INSN_BYTES_PTR buffer,
|
|
|
|
|
bfd_vma pc)
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
|
|
|
|
const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
|
|
|
|
|
unsigned long value;
|
2001-01-10 01:00:21 +08:00
|
|
|
|
const CGEN_SYNTAX_CHAR_TYPE * syn;
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
2000-08-29 02:17:54 +08:00
|
|
|
|
put_insn_int_value (cd, buffer, cd->base_insn_bitsize,
|
|
|
|
|
CGEN_FIELDS_BITSIZE (fields), value);
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
2001-10-09 16:54:58 +08:00
|
|
|
|
cgen_put_insn_value (cd, buffer, min ((unsigned) cd->base_insn_bitsize,
|
opcodes: discriminate endianness and insn-endianness in CGEN ports
The CGEN support code in opcodes accesses instruction contents using a
couple of functions defined in cgen-opc.c: cgen_get_insn_value and
cgen_put_insn_value. These functions use the "instruction endianness"
in the CPU description to order the read/written bytes.
The process of writing an instruction to the object file is:
a) cgen_put_insn_value ;; Writes out the opcodes.
b) ARCH_cgen_insert_operand
insert_normal
insert_1
cgen_put_insn_value ;; Writes out the bytes of the
;; operand.
Likewise, the process of reading an instruction from the object file
is:
a) cgen_get_insn_value ;; Reads the opcodes.
b) ARCH_cgen_extract_operand
extract_normal
extract_1
cgen_get_insn_value ;; Reads in the bytes of the
;; operand.
As can be seen above, cgen_{get,put}_insn_value are used to both
process the instruction opcodes (the constant fields conforming the
base instruction) and also the values of the instruction operands,
such as immediates.
This is problematic for architectures in which the endianness of
instructions is different to the endianness of data. An example is
BPF, where instructions are always encoded big-endian but the data may
be either big or little.
This patch changes the cgen_{get,put}_insn_value functions in order to
get an extra argument with the endianness to use, and adapts the
existin callers to these functions in order to provide cd->endian or
cd->insn_endian, whatever appropriate. Callers like extract_1 and
insert_1 pass cd->endian (since they are reading/writing operand
values) while callers reading/writing the base instruction pass
cd->insn_endian instead.
A few little adjustments have been needed in some existing CGEN based
ports:
* The BPF assembler uses cgen_put_insn_value. It has been adapted to
pass the new endian argument.
* The mep port has code in mep.opc that uses cgen_{get,put}_insn_value.
It has been adapted to pass the new endianargument. Ditto for a
call in the assembler.
Tested with --enable-targets=all.
Regested in all supported targets.
No regressions.
include/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* opcode/cgen.h: Get an `endian' argument in both
cgen_get_insn_value and cgen_put_insn_value.
opcodes/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* cgen-opc.c (cgen_get_insn_value): Get an `endian' argument.
(cgen_put_insn_value): Likewise.
(cgen_lookup_insn): Pass endianness to cgen_{get,put}_insn_value.
* cgen-dis.in (print_insn): Likewise.
* cgen-ibld.in (insert_1): Likewise.
(insert_1): Likewise.
(insert_insn_normal): Likewise.
(extract_1): Likewise.
* bpf-dis.c: Regenerate.
* bpf-ibld.c: Likewise.
* bpf-ibld.c: Likewise.
* cgen-dis.in: Likewise.
* cgen-ibld.in: Likewise.
* cgen-opc.c: Likewise.
* epiphany-dis.c: Likewise.
* epiphany-ibld.c: Likewise.
* fr30-dis.c: Likewise.
* fr30-ibld.c: Likewise.
* frv-dis.c: Likewise.
* frv-ibld.c: Likewise.
* ip2k-dis.c: Likewise.
* ip2k-ibld.c: Likewise.
* iq2000-dis.c: Likewise.
* iq2000-ibld.c: Likewise.
* lm32-dis.c: Likewise.
* lm32-ibld.c: Likewise.
* m32c-dis.c: Likewise.
* m32c-ibld.c: Likewise.
* m32r-dis.c: Likewise.
* m32r-ibld.c: Likewise.
* mep-dis.c: Likewise.
* mep-ibld.c: Likewise.
* mt-dis.c: Likewise.
* mt-ibld.c: Likewise.
* or1k-dis.c: Likewise.
* or1k-ibld.c: Likewise.
* xc16x-dis.c: Likewise.
* xc16x-ibld.c: Likewise.
* xstormy16-dis.c: Likewise.
* xstormy16-ibld.c: Likewise.
gas/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* cgen.c (gas_cgen_finish_insn): Pass the endianness to
cgen_put_insn_value.
(gas_cgen_md_apply_fix): Likewise.
(gas_cgen_md_apply_fix): Likewise.
* config/tc-bpf.c (md_apply_fix): Pass data endianness to
cgen_put_insn_value.
* config/tc-mep.c (mep_check_ivc2_scheduling): Pass endianness to
cgen_put_insn_value.
cpu/ChangeLog:
2020-06-02 Jose E. Marchesi <jose.marchesi@oracle.com>
* mep.opc (print_slot_insn): Pass the insn endianness to
cgen_get_insn_value.
2020-06-04 22:15:53 +08:00
|
|
|
|
(unsigned) CGEN_FIELDS_BITSIZE (fields)),
|
|
|
|
|
value, cd->insn_endian);
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
|
|
|
|
#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. */
|
|
|
|
|
|
2001-01-10 01:00:21 +08:00
|
|
|
|
for (syn = CGEN_SYNTAX_STRING (syntax); * syn; ++ syn)
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
}
|
2000-08-29 02:17:54 +08:00
|
|
|
|
|
2001-10-09 16:54:58 +08:00
|
|
|
|
#if CGEN_INT_INSN_P
|
2000-08-29 02:17:54 +08:00
|
|
|
|
/* Cover function to store an insn value into an integral insn. Must go here
|
2005-07-01 19:16:33 +08:00
|
|
|
|
because it needs <prefix>-desc.h for CGEN_INT_INSN_P. */
|
2000-08-29 02:17:54 +08:00
|
|
|
|
|
|
|
|
|
static void
|
2003-08-09 05:21:24 +08: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)
|
2000-08-29 02:17:54 +08: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. */
|
PR26449, PR26450 UBSAN: frv-ibld.c:135 left shift
Eh well, I guess the code didn't quite live up to the comment.
PR 26449
PR 26450
* cgen-ibld.in (insert_1): Use 1UL in forming mask.
(extract_normal): Likewise.
(insert_normal): Likewise, and move past zero length test.
(put_insn_int_value): Handle mask for zero length, use 1UL.
* bpf-ibld.c, * epiphany-ibld.c, * 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, * or1k-ibld.c,
* xc16x-ibld.c, * xstormy16-ibld.c: Regenerate.
2020-08-28 22:13:16 +08:00
|
|
|
|
CGEN_INSN_INT mask = length == 0 ? 0 : (1UL << (length - 1) << 1) - 1;
|
2005-07-01 19:16:33 +08:00
|
|
|
|
|
2000-08-29 02:17:54 +08:00
|
|
|
|
*buf = (*buf & ~(mask << shift)) | ((value & mask) << shift);
|
|
|
|
|
}
|
|
|
|
|
}
|
2001-10-09 16:54:58 +08:00
|
|
|
|
#endif
|
2000-08-04 10:21:43 +08: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 05:21:24 +08:00
|
|
|
|
fill_cache (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
|
|
|
|
|
CGEN_EXTRACT_INFO *ex_info,
|
2003-08-09 07:01:28 +08:00
|
|
|
|
int offset,
|
|
|
|
|
int bytes,
|
2003-08-09 05:21:24 +08:00
|
|
|
|
bfd_vma pc)
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
|
|
|
|
/* It's doubtful that the middle part has already been fetched so
|
|
|
|
|
we don't optimize that case. kiss. */
|
2001-10-09 16:54:58 +08:00
|
|
|
|
unsigned int mask;
|
2000-08-04 10:21:43 +08: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 05:21:24 +08: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)
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
2001-01-03 00:34:07 +08:00
|
|
|
|
unsigned long x;
|
2000-08-04 10:21:43 +08:00
|
|
|
|
int shift;
|
2005-07-01 19:16:33 +08:00
|
|
|
|
|
opcodes: discriminate endianness and insn-endianness in CGEN ports
The CGEN support code in opcodes accesses instruction contents using a
couple of functions defined in cgen-opc.c: cgen_get_insn_value and
cgen_put_insn_value. These functions use the "instruction endianness"
in the CPU description to order the read/written bytes.
The process of writing an instruction to the object file is:
a) cgen_put_insn_value ;; Writes out the opcodes.
b) ARCH_cgen_insert_operand
insert_normal
insert_1
cgen_put_insn_value ;; Writes out the bytes of the
;; operand.
Likewise, the process of reading an instruction from the object file
is:
a) cgen_get_insn_value ;; Reads the opcodes.
b) ARCH_cgen_extract_operand
extract_normal
extract_1
cgen_get_insn_value ;; Reads in the bytes of the
;; operand.
As can be seen above, cgen_{get,put}_insn_value are used to both
process the instruction opcodes (the constant fields conforming the
base instruction) and also the values of the instruction operands,
such as immediates.
This is problematic for architectures in which the endianness of
instructions is different to the endianness of data. An example is
BPF, where instructions are always encoded big-endian but the data may
be either big or little.
This patch changes the cgen_{get,put}_insn_value functions in order to
get an extra argument with the endianness to use, and adapts the
existin callers to these functions in order to provide cd->endian or
cd->insn_endian, whatever appropriate. Callers like extract_1 and
insert_1 pass cd->endian (since they are reading/writing operand
values) while callers reading/writing the base instruction pass
cd->insn_endian instead.
A few little adjustments have been needed in some existing CGEN based
ports:
* The BPF assembler uses cgen_put_insn_value. It has been adapted to
pass the new endian argument.
* The mep port has code in mep.opc that uses cgen_{get,put}_insn_value.
It has been adapted to pass the new endianargument. Ditto for a
call in the assembler.
Tested with --enable-targets=all.
Regested in all supported targets.
No regressions.
include/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* opcode/cgen.h: Get an `endian' argument in both
cgen_get_insn_value and cgen_put_insn_value.
opcodes/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* cgen-opc.c (cgen_get_insn_value): Get an `endian' argument.
(cgen_put_insn_value): Likewise.
(cgen_lookup_insn): Pass endianness to cgen_{get,put}_insn_value.
* cgen-dis.in (print_insn): Likewise.
* cgen-ibld.in (insert_1): Likewise.
(insert_1): Likewise.
(insert_insn_normal): Likewise.
(extract_1): Likewise.
* bpf-dis.c: Regenerate.
* bpf-ibld.c: Likewise.
* bpf-ibld.c: Likewise.
* cgen-dis.in: Likewise.
* cgen-ibld.in: Likewise.
* cgen-opc.c: Likewise.
* epiphany-dis.c: Likewise.
* epiphany-ibld.c: Likewise.
* fr30-dis.c: Likewise.
* fr30-ibld.c: Likewise.
* frv-dis.c: Likewise.
* frv-ibld.c: Likewise.
* ip2k-dis.c: Likewise.
* ip2k-ibld.c: Likewise.
* iq2000-dis.c: Likewise.
* iq2000-ibld.c: Likewise.
* lm32-dis.c: Likewise.
* lm32-ibld.c: Likewise.
* m32c-dis.c: Likewise.
* m32c-ibld.c: Likewise.
* m32r-dis.c: Likewise.
* m32r-ibld.c: Likewise.
* mep-dis.c: Likewise.
* mep-ibld.c: Likewise.
* mt-dis.c: Likewise.
* mt-ibld.c: Likewise.
* or1k-dis.c: Likewise.
* or1k-ibld.c: Likewise.
* xc16x-dis.c: Likewise.
* xc16x-ibld.c: Likewise.
* xstormy16-dis.c: Likewise.
* xstormy16-ibld.c: Likewise.
gas/ChangeLog:
2020-06-04 Jose E. Marchesi <jose.marchesi@oracle.com>
* cgen.c (gas_cgen_finish_insn): Pass the endianness to
cgen_put_insn_value.
(gas_cgen_md_apply_fix): Likewise.
(gas_cgen_md_apply_fix): Likewise.
* config/tc-bpf.c (md_apply_fix): Pass data endianness to
cgen_put_insn_value.
* config/tc-mep.c (mep_check_ivc2_scheduling): Pass endianness to
cgen_put_insn_value.
cpu/ChangeLog:
2020-06-02 Jose E. Marchesi <jose.marchesi@oracle.com>
* mep.opc (print_slot_insn): Pass the insn endianness to
cgen_get_insn_value.
2020-06-04 22:15:53 +08:00
|
|
|
|
x = cgen_get_insn_value (cd, bufp, word_length, cd->endian);
|
2001-11-09 18:21:22 +08:00
|
|
|
|
|
2000-08-04 10:21:43 +08:00
|
|
|
|
if (CGEN_INSN_LSB0_P)
|
|
|
|
|
shift = (start + 1) - length;
|
|
|
|
|
else
|
|
|
|
|
shift = (word_length - (start + length));
|
2001-01-03 00:34:07 +08:00
|
|
|
|
return x >> shift;
|
2000-08-04 10:21:43 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#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 07:01:28 +08:00
|
|
|
|
extract_normal (CGEN_CPU_DESC cd,
|
2000-08-04 10:21:43 +08:00
|
|
|
|
#if ! CGEN_INT_INSN_P
|
2003-08-09 05:21:24 +08:00
|
|
|
|
CGEN_EXTRACT_INFO *ex_info,
|
2000-08-04 10:21:43 +08:00
|
|
|
|
#else
|
2003-08-09 05:21:24 +08:00
|
|
|
|
CGEN_EXTRACT_INFO *ex_info ATTRIBUTE_UNUSED,
|
2000-08-04 10:21:43 +08:00
|
|
|
|
#endif
|
2003-08-09 05:21:24 +08: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,
|
2000-08-04 10:21:43 +08:00
|
|
|
|
#if ! CGEN_INT_INSN_P
|
2003-08-09 05:21:24 +08:00
|
|
|
|
bfd_vma pc,
|
2000-08-04 10:21:43 +08:00
|
|
|
|
#else
|
2003-08-09 05:21:24 +08:00
|
|
|
|
bfd_vma pc ATTRIBUTE_UNUSED,
|
2000-08-04 10:21:43 +08:00
|
|
|
|
#endif
|
2003-08-09 05:21:24 +08:00
|
|
|
|
long *valuep)
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
2001-08-13 04:16:29 +08:00
|
|
|
|
long value, mask;
|
2000-08-04 10:21:43 +08: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-08 02:05:45 +08:00
|
|
|
|
if (word_length > 8 * sizeof (CGEN_INSN_INT))
|
2000-08-04 10:21:43 +08: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-01-04 06:06:18 +08:00
|
|
|
|
if (word_offset + word_length > total_length)
|
|
|
|
|
word_length = total_length - word_offset;
|
2000-08-04 10:21:43 +08:00
|
|
|
|
}
|
|
|
|
|
|
2001-05-08 01:55:21 +08:00
|
|
|
|
/* Does the value reside in INSN_VALUE, and at the right alignment? */
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
2001-05-08 01:55:21 +08:00
|
|
|
|
if (CGEN_INT_INSN_P || (word_offset == 0 && word_length == total_length))
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
|
|
|
|
if (CGEN_INSN_LSB0_P)
|
2000-08-29 02:17:54 +08:00
|
|
|
|
value = insn_value >> ((word_offset + start + 1) - length);
|
2000-08-04 10:21:43 +08:00
|
|
|
|
else
|
2000-08-29 02:17:54 +08:00
|
|
|
|
value = insn_value >> (total_length - ( word_offset + start + length));
|
2000-08-04 10:21:43 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#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-08 02:05:45 +08:00
|
|
|
|
if (word_length > 8 * sizeof (CGEN_INSN_INT))
|
2000-08-04 10:21:43 +08:00
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
if (fill_cache (cd, ex_info, word_offset / 8, word_length / 8, pc) == 0)
|
Ensure *valuep always written by extract_normal return
* cgen-ibld.in (extract_normal): Set *valuep on all return paths.
* bpf-ibld.c, * epiphany-ibld.c, * 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, * or1k-ibld.c,
* xc16x-ibld.c, * xstormy16-ibld.c: Regenerate.
2020-02-11 06:41:18 +08:00
|
|
|
|
{
|
|
|
|
|
*valuep = 0;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
|
|
|
|
value = extract_1 (cd, ex_info, start, length, word_length, bufp, pc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* ! CGEN_INT_INSN_P */
|
|
|
|
|
|
2001-01-03 00:34:07 +08:00
|
|
|
|
/* Written this way to avoid undefined behaviour. */
|
PR26449, PR26450 UBSAN: frv-ibld.c:135 left shift
Eh well, I guess the code didn't quite live up to the comment.
PR 26449
PR 26450
* cgen-ibld.in (insert_1): Use 1UL in forming mask.
(extract_normal): Likewise.
(insert_normal): Likewise, and move past zero length test.
(put_insn_int_value): Handle mask for zero length, use 1UL.
* bpf-ibld.c, * epiphany-ibld.c, * 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, * or1k-ibld.c,
* xc16x-ibld.c, * xstormy16-ibld.c: Regenerate.
2020-08-28 22:13:16 +08:00
|
|
|
|
mask = (1UL << (length - 1) << 1) - 1;
|
2001-01-03 00:34:07 +08:00
|
|
|
|
|
|
|
|
|
value &= mask;
|
|
|
|
|
/* sign extend? */
|
|
|
|
|
if (CGEN_BOOL_ATTR (attrs, CGEN_IFLD_SIGNED)
|
2020-09-02 09:05:10 +08:00
|
|
|
|
&& (value & (1UL << (length - 1))))
|
2001-01-03 00:34:07 +08:00
|
|
|
|
value |= ~mask;
|
|
|
|
|
|
2000-08-04 10:21:43 +08:00
|
|
|
|
*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 05:21:24 +08: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)
|
2000-08-04 10:21:43 +08:00
|
|
|
|
{
|
|
|
|
|
const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
|
2001-01-10 01:00:21 +08:00
|
|
|
|
const CGEN_SYNTAX_CHAR_TYPE *syn;
|
2000-08-04 10:21:43 +08:00
|
|
|
|
|
|
|
|
|
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 19:16:33 +08:00
|
|
|
|
/* Machine generated code added here. */
|