opcodes/ChangeLog

* cr16-dis.c (match_opcode,make_instruction: Remove static declaration.
	(dwordU,wordU): Moved typedefs to opcode/cr16.h
	(cr16_words,cr16_allWords,cr16_currInsn): Added prefix 'cr16_'

bfd/Changelog
	* config.bfd (cr16*-*-uclinux*): New target support.

include/opcode/ChangeLog
	* cr16.h (dwordU,wordU): Moved typedefs from cr16-dis.c
	(make_instruction,match_opcode): Added function prototypes.
	(cr16_words,cr16_allWords,cr16_currInsn): Declare as extern.
This commit is contained in:
Nick Clifton 2013-01-02 13:13:36 +00:00
parent 3b1c1875dd
commit ff84dbd31f
2 changed files with 196 additions and 177 deletions

View File

@ -1,3 +1,9 @@
2013-01-02 Kaushik Phatak <kaushik.phatak@kpitcummins.com>
* cr16.h (dwordU,wordU): Moved typedefs from cr16-dis.c
(make_instruction,match_opcode): Added function prototypes.
(cr16_words,cr16_allWords,cr16_currInsn): Declare as extern.
2012-11-23 Alan Modra <amodra@gmail.com> 2012-11-23 Alan Modra <amodra@gmail.com>
* ppc.h (ppc_parse_cpu): Update prototype. * ppc.h (ppc_parse_cpu): Update prototype.

View File

@ -1,5 +1,5 @@
/* cr16.h -- Header file for CR16 opcode and register tables. /* cr16.h -- Header file for CR16 opcode and register tables.
Copyright 2007, 2008, 2010 Free Software Foundation, Inc. Copyright 2007, 2008, 2010, 2013 Free Software Foundation, Inc.
Contributed by M R Swami Reddy Contributed by M R Swami Reddy
This file is part of GAS, GDB and the GNU binutils. This file is part of GAS, GDB and the GNU binutils.
@ -26,21 +26,21 @@
Therefore, order MUST be preserved. */ Therefore, order MUST be preserved. */
typedef enum typedef enum
{ {
/* 16-bit general purpose registers. */ /* 16-bit general purpose registers. */
r0, r1, r2, r3, r0, r1, r2, r3,
r4, r5, r6, r7, r4, r5, r6, r7,
r8, r9, r10, r11, r8, r9, r10, r11,
r12_L = 12, r13_L = 13, ra = 14, sp_L = 15, r12_L = 12, r13_L = 13, ra = 14, sp_L = 15,
/* 32-bit general purpose registers. */ /* 32-bit general purpose registers. */
r12 = 12, r13 = 13, r14 = 14, r15 = 15, r12 = 12, r13 = 13, r14 = 14, r15 = 15,
era = 14, sp = 15, RA, era = 14, sp = 15, RA,
/* Not a register. */ /* Not a register. */
nullregister, nullregister,
MAX_REG MAX_REG
} }
reg; reg;
/* CR16 processor registers and special registers : /* CR16 processor registers and special registers :
@ -48,33 +48,33 @@ reg;
(cr16_pregtab). Therefore, order MUST be preserved. */ (cr16_pregtab). Therefore, order MUST be preserved. */
typedef enum typedef enum
{ {
/* processor registers. */ /* processor registers. */
dbs = MAX_REG, dbs = MAX_REG,
dsr, dcrl, dcrh, dsr, dcrl, dcrh,
car0l, car0h, car1l, car1h, car0l, car0h, car1l, car1h,
cfg, psr, intbasel, intbaseh, cfg, psr, intbasel, intbaseh,
ispl, isph, uspl, usph, ispl, isph, uspl, usph,
dcr = dcrl, dcr = dcrl,
car0 = car0l, car0 = car0l,
car1 = car1l, car1 = car1l,
intbase = intbasel, intbase = intbasel,
isp = ispl, isp = ispl,
usp = uspl, usp = uspl,
/* Not a processor register. */ /* Not a processor register. */
nullpregister = usph + 1, nullpregister = usph + 1,
MAX_PREG MAX_PREG
} }
preg; preg;
/* CR16 Register types. */ /* CR16 Register types. */
typedef enum typedef enum
{ {
CR16_R_REGTYPE, /* r<N> */ CR16_R_REGTYPE, /* r<N> */
CR16_RP_REGTYPE, /* reg pair */ CR16_RP_REGTYPE, /* reg pair */
CR16_P_REGTYPE /* Processor register */ CR16_P_REGTYPE /* Processor register */
} }
reg_type; reg_type;
/* CR16 argument types : /* CR16 argument types :
@ -89,69 +89,69 @@ reg_type;
idxrp - index with register pair idxrp - index with register pair
rbase - register base rbase - register base
rpbase - register pair base rpbase - register pair base
pr - processor register */ pr - processor register. */
typedef enum typedef enum
{ {
arg_r, arg_r,
arg_c, arg_c,
arg_cr, arg_cr,
arg_crp, arg_crp,
arg_ic, arg_ic,
arg_icr, arg_icr,
arg_idxr, arg_idxr,
arg_idxrp, arg_idxrp,
arg_rbase, arg_rbase,
arg_rpbase, arg_rpbase,
arg_rp, arg_rp,
arg_pr, arg_pr,
arg_prp, arg_prp,
arg_cc, arg_cc,
arg_ra, arg_ra,
/* Not an argument. */ /* Not an argument. */
nullargs nullargs
} }
argtype; argtype;
/* CR16 operand types:The operand types correspond to instructions operands.*/ /* CR16 operand types:The operand types correspond to instructions operands. */
typedef enum typedef enum
{ {
dummy, dummy,
/* N-bit signed immediate. */ /* N-bit signed immediate. */
imm3, imm4, imm5, imm6, imm16, imm20, imm32, imm3, imm4, imm5, imm6, imm16, imm20, imm32,
/* N-bit unsigned immediate. */ /* N-bit unsigned immediate. */
uimm3, uimm3_1, uimm4, uimm4_1, uimm5, uimm16, uimm20, uimm32, uimm3, uimm3_1, uimm4, uimm4_1, uimm5, uimm16, uimm20, uimm32,
/* N-bit signed displacement. */ /* N-bit signed displacement. */
disps5, disps17, disps25, disps5, disps17, disps25,
/* N-bit unsigned displacement. */ /* N-bit unsigned displacement. */
dispe9, dispe9,
/* N-bit absolute address. */ /* N-bit absolute address. */
abs20, abs24, abs20, abs24,
/* Register relative. */ /* Register relative. */
rra, rbase, rbase_disps20, rbase_dispe20, rra, rbase, rbase_disps20, rbase_dispe20,
/* Register pair relative. */ /* Register pair relative. */
rpbase_disps0, rpbase_dispe4, rpbase_disps4, rpbase_disps16, rpbase_disps0, rpbase_dispe4, rpbase_disps4, rpbase_disps16,
rpbase_disps20, rpbase_dispe20, rpbase_disps20, rpbase_dispe20,
/* Register index. */ /* Register index. */
rindex7_abs20, rindex8_abs20, rindex7_abs20, rindex8_abs20,
/* Register pair index. */ /* Register pair index. */
rpindex_disps0, rpindex_disps14, rpindex_disps20, rpindex_disps0, rpindex_disps14, rpindex_disps20,
/* register. */ /* register. */
regr, regr,
/* register pair. */ /* register pair. */
regp, regp,
/* processor register. */ /* processor register. */
pregr, pregr,
/* processor register 32 bit. */ /* processor register 32 bit. */
pregrp, pregrp,
/* condition code - 4 bit. */ /* condition code - 4 bit. */
cc, cc,
/* Not an operand. */ /* Not an operand. */
nulloperand, nulloperand,
/* Maximum supported operand. */ /* Maximum supported operand. */
MAX_OPRD MAX_OPRD
} }
operand_type; operand_type;
/* CR16 instruction types. */ /* CR16 instruction types. */
@ -239,126 +239,126 @@ operand_type;
/* Single operand description. */ /* Single operand description. */
typedef struct typedef struct
{ {
/* Operand type. */ /* Operand type. */
operand_type op_type; operand_type op_type;
/* Operand location within the opcode. */ /* Operand location within the opcode. */
unsigned int shift; unsigned int shift;
} }
operand_desc; operand_desc;
/* Instruction data structure used in instruction table. */ /* Instruction data structure used in instruction table. */
typedef struct typedef struct
{ {
/* Name. */ /* Name. */
const char *mnemonic; const char *mnemonic;
/* Size (in words). */ /* Size (in words). */
unsigned int size; unsigned int size;
/* Constant prefix (matched by the disassembler). */ /* Constant prefix (matched by the disassembler). */
unsigned long match; /* ie opcode */ unsigned long match; /* ie opcode */
/* Match size (in bits). */ /* Match size (in bits). */
/* MASK: if( (i & match_bits) == match ) then match */ /* MASK: if( (i & match_bits) == match ) then match */
int match_bits; int match_bits;
/* Attributes. */ /* Attributes. */
unsigned int flags; unsigned int flags;
/* Operands (always last, so unreferenced operands are initialized). */ /* Operands (always last, so unreferenced operands are initialized). */
operand_desc operands[MAX_OPERANDS]; operand_desc operands[MAX_OPERANDS];
} }
inst; inst;
/* Data structure for a single instruction's arguments (Operands). */ /* Data structure for a single instruction's arguments (Operands). */
typedef struct typedef struct
{ {
/* Register or base register. */ /* Register or base register. */
reg r; reg r;
/* Register pair register. */ /* Register pair register. */
reg rp; reg rp;
/* Index register. */ /* Index register. */
reg i_r; reg i_r;
/* Processor register. */ /* Processor register. */
preg pr; preg pr;
/* Processor register. 32 bit */ /* Processor register. 32 bit */
preg prp; preg prp;
/* Constant/immediate/absolute value. */ /* Constant/immediate/absolute value. */
long constant; long constant;
/* CC code. */ /* CC code. */
unsigned int cc; unsigned int cc;
/* Scaled index mode. */ /* Scaled index mode. */
unsigned int scale; unsigned int scale;
/* Argument type. */ /* Argument type. */
argtype type; argtype type;
/* Size of the argument (in bits) required to represent. */ /* Size of the argument (in bits) required to represent. */
int size; int size;
/* The type of the expression. */ /* The type of the expression. */
unsigned char X_op; unsigned char X_op;
} }
argument; argument;
/* Internal structure to hold the various entities /* Internal structure to hold the various entities
corresponding to the current assembling instruction. */ corresponding to the current assembling instruction. */
typedef struct typedef struct
{ {
/* Number of arguments. */ /* Number of arguments. */
int nargs; int nargs;
/* The argument data structure for storing args (operands). */ /* The argument data structure for storing args (operands). */
argument arg[MAX_OPERANDS]; argument arg[MAX_OPERANDS];
/* The following fields are required only by CR16-assembler. */ /* The following fields are required only by CR16-assembler. */
#ifdef TC_CR16 #ifdef TC_CR16
/* Expression used for setting the fixups (if any). */ /* Expression used for setting the fixups (if any). */
expressionS exp; expressionS exp;
bfd_reloc_code_real_type rtype; bfd_reloc_code_real_type rtype;
#endif /* TC_CR16 */ #endif /* TC_CR16 */
/* Instruction size (in bytes). */ /* Instruction size (in bytes). */
int size; int size;
} }
ins; ins;
/* Structure to hold information about predefined operands. */ /* Structure to hold information about predefined operands. */
typedef struct typedef struct
{ {
/* Size (in bits). */ /* Size (in bits). */
unsigned int bit_size; unsigned int bit_size;
/* Argument type. */ /* Argument type. */
argtype arg_type; argtype arg_type;
/* One bit syntax flags. */ /* One bit syntax flags. */
int flags; int flags;
} }
operand_entry; operand_entry;
/* Structure to hold trap handler information. */ /* Structure to hold trap handler information. */
typedef struct typedef struct
{ {
/* Trap name. */ /* Trap name. */
char *name; char *name;
/* Index in dispatch table. */ /* Index in dispatch table. */
unsigned int entry; unsigned int entry;
} }
trap_entry; trap_entry;
/* Structure to hold information about predefined registers. */ /* Structure to hold information about predefined registers. */
typedef struct typedef struct
{
/* Name (string representation). */
char *name;
/* Value (enum representation). */
union
{ {
/* Name (string representation). */ /* Register. */
char *name; reg reg_val;
/* Value (enum representation). */ /* processor register. */
union preg preg_val;
{ } value;
/* Register. */ /* Register image. */
reg reg_val; int image;
/* processor register. */ /* Register type. */
preg preg_val; reg_type type;
} value; }
/* Register image. */
int image;
/* Register type. */
reg_type type;
}
reg_entry; reg_entry;
/* CR16 opcode table. */ /* CR16 opcode table. */
@ -435,4 +435,17 @@ extern const inst *instruction;
typedef long long int LONGLONG; typedef long long int LONGLONG;
typedef unsigned long long ULONGLONG; typedef unsigned long long ULONGLONG;
/* Data types for opcode handling. */
typedef unsigned long dwordU;
typedef unsigned short wordU;
/* Globals to store opcode data and build the instruction. */
extern wordU cr16_words[3];
extern ULONGLONG cr16_allWords;
extern ins cr16_currInsn;
/* Prototypes for function in cr16-dis.c. */
extern void make_instruction (void);
extern int match_opcode (void);
#endif /* _CR16_H_ */ #endif /* _CR16_H_ */