JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cris.h (enum cris_insn_version_usage): Tweak formatting and

Browse Source 
comments.  Remove member cris_ver_sim.  Add members
	cris_ver_sim_v0_10, cris_ver_v0_10, cris_ver_v3_10,
	cris_ver_v8_10, cris_ver_v10, cris_ver_v10p.
	(struct cris_support_reg, struct cris_cond15): New types.
	(cris_conds15): Declare.
	(JUMP_PC_INCR_OPCODE_V32, BA_DWORD_OPCODE, NOP_OPCODE_COMMON)
	(NOP_OPCODE_ZBITS_COMMON, LAPC_DWORD_OPCODE, LAPC_DWORD_Z_BITS)
	(NOP_OPCODE_V32, NOP_Z_BITS_V32): New macros.
	(NOP_Z_BITS): Define in terms of NOP_OPCODE.
	(cris_imm_oprnd_size_type): New members SIZE_FIELD_SIGNED and
	SIZE_FIELD_UNSIGNED.
This commit is contained in:
Hans-Peter Nilsson 2004-11-04 14:53:41 +00:00
parent 34b30773b1
commit 2f001ba2ef
2 changed files with 84 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/opcode/ChangeLog
View File

@ -1,3 +1,18 @@
2004-11-04 Hans-Peter Nilsson <hp@axis.com>
* cris.h (enum cris_insn_version_usage): Tweak formatting and
comments. Remove member cris_ver_sim. Add members
cris_ver_sim_v0_10, cris_ver_v0_10, cris_ver_v3_10,
cris_ver_v8_10, cris_ver_v10, cris_ver_v10p.
(struct cris_support_reg, struct cris_cond15): New types.
(cris_conds15): Declare.
(JUMP_PC_INCR_OPCODE_V32, BA_DWORD_OPCODE, NOP_OPCODE_COMMON)
(NOP_OPCODE_ZBITS_COMMON, LAPC_DWORD_OPCODE, LAPC_DWORD_Z_BITS)
(NOP_OPCODE_V32, NOP_Z_BITS_V32): New macros.
(NOP_Z_BITS): Define in terms of NOP_OPCODE.
(cris_imm_oprnd_size_type): New members SIZE_FIELD_SIGNED and
SIZE_FIELD_UNSIGNED.
2004-11-04 Jan Beulich <jbeulich@novell.com> 2004-11-04 Jan Beulich <jbeulich@novell.com>
* i386.h (sldx_Suf): Remove. * i386.h (sldx_Suf): Remove.

79
include/opcode/cris.h
View File

@ -1,5 +1,5 @@
/* cris.h -- Header file for CRIS opcode and register tables. /* cris.h -- Header file for CRIS opcode and register tables.
Copyright (C) 2000, 2001 Free Software Foundation, Inc. Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
Contributed by Axis Communications AB, Lund, Sweden. Contributed by Axis Communications AB, Lund, Sweden.
Originally written for GAS 1.38.1 by Mikael Asker. Originally written for GAS 1.38.1 by Mikael Asker.
Updated, BFDized and GNUified by Hans-Peter Nilsson. Updated, BFDized and GNUified by Hans-Peter Nilsson.
@ -38,15 +38,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
immediate operands. */ immediate operands. */
enum cris_insn_version_usage enum cris_insn_version_usage
{ {
/* Any version. */ /* Any version. */
cris_ver_version_all=0, cris_ver_version_all=0,
/* Indeterminate (intended for disassembly only, or obsolete). */ /* Indeterminate (intended for disassembly only, or obsolete). */
cris_ver_warning, cris_ver_warning,
/* Simulator only (reserved). */
cris_ver_sim,
/* Only for v0..3 (Etrax 1..4). */ /* Only for v0..3 (Etrax 1..4). */
cris_ver_v0_3, cris_ver_v0_3,
@ -59,10 +56,28 @@ enum cris_insn_version_usage
/* Only for v8 or higher (ETRAX 100, ETRAX 100 LX). */ /* Only for v8 or higher (ETRAX 100, ETRAX 100 LX). */
cris_ver_v8p, cris_ver_v8p,
/* Only for v10 or higher (ETRAX 100 LX). /* Only for v0..10. FIXME: Not sure what to do with this. */
Of course some or all these of may change to cris_ver_v10p if/when cris_ver_sim_v0_10,
/* Only for v0..10. */
cris_ver_v0_10,
/* Only for v3..10. (ETRAX 4, ETRAX 100 and ETRAX 100 LX). */
cris_ver_v3_10,
/* Only for v8..10 (ETRAX 100 and ETRAX 100 LX). */
cris_ver_v8_10,
/* Only for v10 (ETRAX 100 LX) and same series. */
cris_ver_v10,
/* Only for v10 (ETRAX 100 LX) and same series. */
cris_ver_v10p,
/* Only for v32 or higher (codename GUINNESS).
Of course some or all these of may change to cris_ver_v32p if/when
there's a new revision. */ there's a new revision. */
cris_ver_v10p cris_ver_v32p
}; };
@ -85,6 +100,25 @@ struct cris_spec_reg
}; };
extern const struct cris_spec_reg cris_spec_regs[]; extern const struct cris_spec_reg cris_spec_regs[];
/* Support registers (kind of special too, but not named as such). */
struct cris_support_reg
{
const char *const name;
unsigned int number;
};
extern const struct cris_support_reg cris_support_regs[];
struct cris_cond15
{
/* The name of the condition. */
const char *const name;
/* What CPU version this condition name applies to. */
enum cris_insn_version_usage applicable_version;
};
extern const struct cris_cond15 cris_conds15[];
/* Opcode-dependent constants. */ /* Opcode-dependent constants. */
#define AUTOINCR_BIT (0x04) #define AUTOINCR_BIT (0x04)
@ -163,9 +197,28 @@ extern const char *const cris_cc_strings[];
#define ADD_PC_INCR_OPCODE \ #define ADD_PC_INCR_OPCODE \
(0xfa00 + (2 << 4) + AUTOINCR_BIT * 0x0100 + REG_PC) (0xfa00 + (2 << 4) + AUTOINCR_BIT * 0x0100 + REG_PC)
#define JUMP_PC_INCR_OPCODE_V32 (0x0DBF)
/* BA DWORD (V32). */
#define BA_DWORD_OPCODE (0x0EBF)
/* Nop. */ /* Nop. */
#define NOP_OPCODE (0x050F) #define NOP_OPCODE (0x050F)
#define NOP_Z_BITS (0xFAF0) #define NOP_Z_BITS (0xFFFF ^ NOP_OPCODE)
#define NOP_OPCODE_V32 (0x05B0)
#define NOP_Z_BITS_V32 (0xFFFF ^ NOP_OPCODE_V32)
/* For the compatibility mode, let's use "MOVE R0,P0". Doesn't affect
registers or flags. Unfortunately shuts off interrupts for one cycle
for < v32, but there doesn't seem to be any alternative without that
effect. */
#define NOP_OPCODE_COMMON (0x630)
#define NOP_OPCODE_ZBITS_COMMON (0xffff & ~NOP_OPCODE_COMMON)
/* LAPC.D */
#define LAPC_DWORD_OPCODE (0x0D7F)
#define LAPC_DWORD_Z_BITS (0x0fff & ~LAPC_DWORD_OPCODE)
/* Structure of an opcode table entry. */ /* Structure of an opcode table entry. */
enum cris_imm_oprnd_size_type enum cris_imm_oprnd_size_type
@ -179,7 +232,13 @@ enum cris_imm_oprnd_size_type
/* Indicated by size of special register. */ /* Indicated by size of special register. */
SIZE_SPEC_REG, SIZE_SPEC_REG,
/* Indicated by size field. */ /* Indicated by size field, signed. */
SIZE_FIELD_SIGNED,
/* Indicated by size field, unsigned. */
SIZE_FIELD_UNSIGNED,
/* Indicated by size field, no sign implied. */
SIZE_FIELD SIZE_FIELD
}; };