FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

include/opcode/

Browse source 
* ppc.h (struct powerpc_operand): Replace "bits" with "bitm".
	(num_powerpc_operands): Declare.
	(PPC_OPERAND_SIGNED et al): Redefine as hex.
	(PPC_OPERAND_PLUS1): Define.
opcodes/
	* ppc-dis.c (print_insn_powerpc): Adjust for struct powerpc_operand
	change.
	* ppc-opc.c (powerpc_operands): Replace bit count with bit mask
	in all entries.  Add PPC_OPERAND_SIGNED to DE entry.  Remove
	references to following deleted functions.
	(insert_bd, extract_bd, insert_dq, extract_dq): Delete.
	(insert_ds, extract_ds, insert_de, extract_de): Delete.
	(insert_des, extract_des, insert_li, extract_li): Delete.
	(insert_nb, insert_rsq, insert_rtq, insert_ev2, extract_ev2): Delete.
	(insert_ev4, extract_ev4, insert_ev8, extract_ev8): Delete.
	(num_powerpc_operands): New constant.
	(XSPRG_MASK): Remove entire SPRG field.
	(powerpc_opcodes <bcctre, bcctrel>): Use XLBB_MASK not XLYBB_MASK.
gas/
	* messages.c (as_internal_value_out_of_range): Extend to report
	errors for values with invalid low bits set.
	* config/tc-ppc.c (ppc_setup_opcodes): Check powerpc_operands bitm
	fields.  Check that operands and opcode fields are disjoint.
	(ppc_insert_operand): Check operands using mask rather than bit
	count.   Check low bits too.  Handle PPC_OPERAND_PLUS1.  Adjust
	insertion code.
	(md_apply_fix): Adjust for struct powerpc_operand change.
This commit is contained in:
Alan Modra 2007-04-20 12:25:15 +00:00
parent 1f90c7572b
commit b84bf58af1
8 changed files with 310 additions and 446 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gas/ChangeLog
View file

@ -1,3 +1,14 @@
2007-04-20 Alan Modra <amodra@bigpond.net.au>
* messages.c (as_internal_value_out_of_range): Extend to report
errors for values with invalid low bits set.
* config/tc-ppc.c (ppc_setup_opcodes): Check powerpc_operands bitm
fields. Check that operands and opcode fields are disjoint.
(ppc_insert_operand): Check operands using mask rather than bit
count. Check low bits too. Handle PPC_OPERAND_PLUS1. Adjust
insertion code.
(md_apply_fix): Adjust for struct powerpc_operand change.
2007-04-19 Paul Brook <paul@codesourcery.com> 2007-04-19 Paul Brook <paul@codesourcery.com>
* config/tc-arm.c (md_assemble): Only allow 16-bit instructions on * config/tc-arm.c (md_assemble): Only allow 16-bit instructions on

155
gas/config/tc-ppc.c
View file

@ -1,6 +1,6 @@
/* tc-ppc.c -- Assemble for the PowerPC or POWER (RS/6000) /* tc-ppc.c -- Assemble for the PowerPC or POWER (RS/6000)
Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
2004, 2005, 2006 Free Software Foundation, Inc. 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support. Written by Ian Lance Taylor, Cygnus Support.
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -1248,7 +1248,8 @@ ppc_setup_opcodes (void)
const struct powerpc_opcode *op_end; const struct powerpc_opcode *op_end;
const struct powerpc_macro *macro; const struct powerpc_macro *macro;
const struct powerpc_macro *macro_end; const struct powerpc_macro *macro_end;
bfd_boolean dup_insn = FALSE; unsigned int i;
bfd_boolean bad_insn = FALSE;
if (ppc_hash != NULL) if (ppc_hash != NULL)
hash_die (ppc_hash); hash_die (ppc_hash);
@ -1258,10 +1259,60 @@ ppc_setup_opcodes (void)
/* Insert the opcodes into a hash table. */ /* Insert the opcodes into a hash table. */
ppc_hash = hash_new (); ppc_hash = hash_new ();
/* Check operand masks. Code here and in the disassembler assumes
all the 1's in the mask are contiguous. */
for (i = 0; i < num_powerpc_operands; ++i)
{
unsigned long mask = powerpc_operands[i].bitm;
unsigned long right_bit;
right_bit = mask & -mask;
mask += right_bit;
right_bit = mask & -mask;
if (mask != right_bit)
{
as_bad (_("powerpc_operands[%d].bitm invalid"), i);
bad_insn = TRUE;
}
}
op_end = powerpc_opcodes + powerpc_num_opcodes; op_end = powerpc_opcodes + powerpc_num_opcodes;
for (op = powerpc_opcodes; op < op_end; op++) for (op = powerpc_opcodes; op < op_end; op++)
{ {
know ((op->opcode & op->mask) == op->opcode); const unsigned char *o;
unsigned long omask = op->mask;
/* The mask had better not trim off opcode bits. */
if ((op->opcode & omask) != op->opcode)
{
as_bad (_("mask trims opcode bits for %s"),
op->name);
bad_insn = TRUE;
}
/* The operands must not overlap the opcode or each other. */
for (o = op->operands; *o; ++o)
if (*o >= num_powerpc_operands)
{
as_bad (_("operand index error for %s"),
op->name);
bad_insn = TRUE;
}
else
{
const struct powerpc_operand *operand = &powerpc_operands[*o];
if (operand->shift >= 0)
{
unsigned long mask = operand->bitm << operand->shift;
if (omask & mask)
{
as_bad (_("operand %d overlap in %s"),
(int) (o - op->operands), op->name);
bad_insn = TRUE;
}
omask |= mask;
}
}
if ((op->flags & ppc_cpu & ~(PPC_OPCODE_32 | PPC_OPCODE_64)) != 0 if ((op->flags & ppc_cpu & ~(PPC_OPCODE_32 | PPC_OPCODE_64)) != 0
&& ((op->flags & (PPC_OPCODE_32 | PPC_OPCODE_64)) == 0 && ((op->flags & (PPC_OPCODE_32 | PPC_OPCODE_64)) == 0
@ -1296,9 +1347,9 @@ ppc_setup_opcodes (void)
&& (op->flags & PPC_OPCODE_POWER) != 0) && (op->flags & PPC_OPCODE_POWER) != 0)
continue; continue;
as_bad (_("Internal assembler error for instruction %s"), as_bad (_("duplicate instruction %s"),
op->name); op->name);
dup_insn = TRUE; bad_insn = TRUE;
} }
} }
} }
@ -1320,13 +1371,13 @@ ppc_setup_opcodes (void)
retval = hash_insert (ppc_macro_hash, macro->name, (PTR) macro); retval = hash_insert (ppc_macro_hash, macro->name, (PTR) macro);
if (retval != (const char *) NULL) if (retval != (const char *) NULL)
{ {
as_bad (_("Internal assembler error for macro %s"), macro->name); as_bad (_("duplicate macro %s"), macro->name);
dup_insn = TRUE; bad_insn = TRUE;
} }
} }
} }
if (dup_insn) if (bad_insn)
abort (); abort ();
} }
@ -1447,49 +1498,52 @@ ppc_insert_operand (insn, operand, val, file, line)
char *file; char *file;
unsigned int line; unsigned int line;
{ {
if (operand->bits != 32) long min, max, right;
offsetT test;
max = operand->bitm;
right = max & -max;
min = 0;
if ((operand->flags & PPC_OPERAND_SIGNED) != 0)
{ {
long min, max; if ((operand->flags & PPC_OPERAND_SIGNOPT) == 0)
offsetT test; max >>= 1;
min = ~(max | ((max & -max) - 1)) ;
if ((operand->flags & PPC_OPERAND_SIGNED) != 0) if (!ppc_obj64)
{ {
if ((operand->flags & PPC_OPERAND_SIGNOPT) != 0) /* Some people write 32 bit hex constants with the sign
max = (1 << operand->bits) - 1; extension done by hand. This shouldn't really be
else valid, but, to permit this code to assemble on a 64
max = (1 << (operand->bits - 1)) - 1; bit host, we sign extend the 32 bit value. */
min = - (1 << (operand->bits - 1)); if (val > 0
&& (val & (offsetT) 0x80000000) != 0
if (!ppc_obj64) && (val & (offsetT) 0xffffffff) == val)
{ {
/* Some people write 32 bit hex constants with the sign val -= 0x80000000;
extension done by hand. This shouldn't really be val -= 0x80000000;
valid, but, to permit this code to assemble on a 64
bit host, we sign extend the 32 bit value. */
if (val > 0
&& (val & (offsetT) 0x80000000) != 0
&& (val & (offsetT) 0xffffffff) == val)
{
val -= 0x80000000;
val -= 0x80000000;
}
} }
} }
else
{
max = (1 << operand->bits) - 1;
min = 0;
}
if ((operand->flags & PPC_OPERAND_NEGATIVE) != 0)
test = - val;
else
test = val;
if (test < (offsetT) min || test > (offsetT) max)
as_bad_value_out_of_range (_("operand"), test, (offsetT) min, (offsetT) max, file, line);
} }
if ((operand->flags & PPC_OPERAND_PLUS1) != 0)
{
max++;
min++;
}
if ((operand->flags & PPC_OPERAND_NEGATIVE) != 0)
test = - val;
else
test = val;
if (test < (offsetT) min
|| test > (offsetT) max
|| (test & (right - 1)) != 0)
as_bad_value_out_of_range (_("operand"),
test, (offsetT) min, (offsetT) max, file, line);
if (operand->insert) if (operand->insert)
{ {
const char *errmsg; const char *errmsg;
@ -1500,8 +1554,7 @@ ppc_insert_operand (insn, operand, val, file, line)
as_bad_where (file, line, errmsg); as_bad_where (file, line, errmsg);
} }
else else
insn |= (((long) val & ((1 << operand->bits) - 1)) insn |= ((long) val & operand->bitm) << operand->shift;
<< operand->shift);
return insn; return insn;
} }
@ -5637,7 +5690,7 @@ md_apply_fix (fixP, valP, seg)
csect. Other usages, such as `.long sym', generate relocs. This csect. Other usages, such as `.long sym', generate relocs. This
is the documented behaviour of non-TOC symbols. */ is the documented behaviour of non-TOC symbols. */
if ((operand->flags & PPC_OPERAND_PARENS) != 0 if ((operand->flags & PPC_OPERAND_PARENS) != 0
&& operand->bits == 16 && (operand->bitm & 0xfff0) == 0xfff0
&& operand->shift == 0 && operand->shift == 0
&& (operand->insert == NULL || ppc_obj64) && (operand->insert == NULL || ppc_obj64)
&& fixP->fx_addsy != NULL && fixP->fx_addsy != NULL
@ -5675,11 +5728,11 @@ md_apply_fix (fixP, valP, seg)
We are only prepared to turn a few of the operands into We are only prepared to turn a few of the operands into
relocs. */ relocs. */
if ((operand->flags & PPC_OPERAND_RELATIVE) != 0 if ((operand->flags & PPC_OPERAND_RELATIVE) != 0
&& operand->bits == 26 && operand->bitm == 0x3fffffc
&& operand->shift == 0) && operand->shift == 0)
fixP->fx_r_type = BFD_RELOC_PPC_B26; fixP->fx_r_type = BFD_RELOC_PPC_B26;
else if ((operand->flags & PPC_OPERAND_RELATIVE) != 0 else if ((operand->flags & PPC_OPERAND_RELATIVE) != 0
&& operand->bits == 16 && operand->bitm == 0xfffc
&& operand->shift == 0) && operand->shift == 0)
{ {
fixP->fx_r_type = BFD_RELOC_PPC_B16; fixP->fx_r_type = BFD_RELOC_PPC_B16;
@ -5690,11 +5743,11 @@ md_apply_fix (fixP, valP, seg)
#endif #endif
} }
else if ((operand->flags & PPC_OPERAND_ABSOLUTE) != 0 else if ((operand->flags & PPC_OPERAND_ABSOLUTE) != 0
&& operand->bits == 26 && operand->bitm == 0x3fffffc
&& operand->shift == 0) && operand->shift == 0)
fixP->fx_r_type = BFD_RELOC_PPC_BA26; fixP->fx_r_type = BFD_RELOC_PPC_BA26;
else if ((operand->flags & PPC_OPERAND_ABSOLUTE) != 0 else if ((operand->flags & PPC_OPERAND_ABSOLUTE) != 0
&& operand->bits == 16 && operand->bitm == 0xfffc
&& operand->shift == 0) && operand->shift == 0)
{ {
fixP->fx_r_type = BFD_RELOC_PPC_BA16; fixP->fx_r_type = BFD_RELOC_PPC_BA16;
@ -5706,7 +5759,7 @@ md_apply_fix (fixP, valP, seg)
} }
#if defined (OBJ_XCOFF) || defined (OBJ_ELF) #if defined (OBJ_XCOFF) || defined (OBJ_ELF)
else if ((operand->flags & PPC_OPERAND_PARENS) != 0 else if ((operand->flags & PPC_OPERAND_PARENS) != 0
&& operand->bits == 16 && (operand->bitm & 0xfff0) == 0xfff0
&& operand->shift == 0) && operand->shift == 0)
{ {
if (ppc_is_toc_sym (fixP->fx_addsy)) if (ppc_is_toc_sym (fixP->fx_addsy))

19
gas/messages.c
View file

@ -1,6 +1,6 @@
/* messages.c - error reporter - /* messages.c - error reporter -
Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
2003, 2004, 2005, 2006 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -456,6 +456,23 @@ as_internal_value_out_of_range (char * prefix,
if (prefix == NULL) if (prefix == NULL)
prefix = ""; prefix = "";
if (val >= min && val <= max)
{
addressT right = max & -max;
if (max <= 1)
abort ();
/* xgettext:c-format */
err = _("%s out of domain (%d is not a multiple of %d");
if (bad)
as_bad_where (file, line, err,
prefix, (int) val, (int) right);
else
as_warn_where (file, line, err,
prefix, (int) val, (int) right);
}
if ( val < HEX_MAX_THRESHOLD if ( val < HEX_MAX_THRESHOLD
&& min < HEX_MAX_THRESHOLD && min < HEX_MAX_THRESHOLD
&& max < HEX_MAX_THRESHOLD && max < HEX_MAX_THRESHOLD

7
include/opcode/ChangeLog
View file

@ -1,3 +1,10 @@
2007-04-20 Alan Modra <amodra@bigpond.net.au>
* ppc.h (struct powerpc_operand): Replace "bits" with "bitm".
(num_powerpc_operands): Declare.
(PPC_OPERAND_SIGNED et al): Redefine as hex.
(PPC_OPERAND_PLUS1): Define.
2007-03-21 H.J. Lu <hongjiu.lu@intel.com> 2007-03-21 H.J. Lu <hongjiu.lu@intel.com>
* i386.h (REX_MODE64): Renamed to ... * i386.h (REX_MODE64): Renamed to ...

62
include/opcode/ppc.h
View file

@ -1,6 +1,6 @@
/* ppc.h -- Header file for PowerPC opcode table /* ppc.h -- Header file for PowerPC opcode table
Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
Free Software Foundation, Inc. 2007 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support Written by Ian Lance Taylor, Cygnus Support
This file is part of GDB, GAS, and the GNU binutils. This file is part of GDB, GAS, and the GNU binutils.
@ -153,20 +153,21 @@ extern const int powerpc_num_opcodes;
struct powerpc_operand struct powerpc_operand
{ {
/* The number of bits in the operand. */ /* A bitmask of bits in the operand. */
int bits; unsigned int bitm;
/* How far the operand is left shifted in the instruction. */ /* How far the operand is left shifted in the instruction.
-1 to indicate that BITM and SHIFT cannot be used to determine
where the operand goes in the insn. */
int shift; int shift;
/* Insertion function. This is used by the assembler. To insert an /* Insertion function. This is used by the assembler. To insert an
operand value into an instruction, check this field. operand value into an instruction, check this field.
If it is NULL, execute If it is NULL, execute
i |= (op & ((1 << o->bits) - 1)) << o->shift; i |= (op & o->bitm) << o->shift;
(i is the instruction which we are filling in, o is a pointer to (i is the instruction which we are filling in, o is a pointer to
this structure, and op is the opcode value; this assumes twos this structure, and op is the operand value).
complement arithmetic).
If this field is not NULL, then simply call it with the If this field is not NULL, then simply call it with the
instruction and the operand value. It will return the new value instruction and the operand value. It will return the new value
@ -182,12 +183,11 @@ struct powerpc_operand
extract this operand type from an instruction, check this field. extract this operand type from an instruction, check this field.
If it is NULL, compute If it is NULL, compute
op = ((i) >> o->shift) & ((1 << o->bits) - 1); op = (i >> o->shift) & o->bitm;
if ((o->flags & PPC_OPERAND_SIGNED) != 0 if ((o->flags & PPC_OPERAND_SIGNED) != 0)
&& (op & (1 << (o->bits - 1))) != 0) sign_extend (op);
op -= 1 << o->bits;
(i is the instruction, o is a pointer to this structure, and op (i is the instruction, o is a pointer to this structure, and op
is the result; this assumes twos complement arithmetic). is the result).
If this field is not NULL, then simply call it with the If this field is not NULL, then simply call it with the
instruction value. It will return the value of the operand. If instruction value. It will return the value of the operand. If
@ -205,17 +205,18 @@ struct powerpc_operand
the operands field of the powerpc_opcodes table. */ the operands field of the powerpc_opcodes table. */
extern const struct powerpc_operand powerpc_operands[]; extern const struct powerpc_operand powerpc_operands[];
extern const unsigned int num_powerpc_operands;
/* Values defined for the flags field of a struct powerpc_operand. */ /* Values defined for the flags field of a struct powerpc_operand. */
/* This operand takes signed values. */ /* This operand takes signed values. */
#define PPC_OPERAND_SIGNED (01) #define PPC_OPERAND_SIGNED (0x1)
/* This operand takes signed values, but also accepts a full positive /* This operand takes signed values, but also accepts a full positive
range of values when running in 32 bit mode. That is, if bits is range of values when running in 32 bit mode. That is, if bits is
16, it takes any value from -0x8000 to 0xffff. In 64 bit mode, 16, it takes any value from -0x8000 to 0xffff. In 64 bit mode,
this flag is ignored. */ this flag is ignored. */
#define PPC_OPERAND_SIGNOPT (02) #define PPC_OPERAND_SIGNOPT (0x2)
/* This operand does not actually exist in the assembler input. This /* This operand does not actually exist in the assembler input. This
is used to support extended mnemonics such as mr, for which two is used to support extended mnemonics such as mr, for which two
@ -223,14 +224,14 @@ extern const struct powerpc_operand powerpc_operands[];
insert function with any op value. The disassembler should call insert function with any op value. The disassembler should call
the extract function, ignore the return value, and check the value the extract function, ignore the return value, and check the value
placed in the valid argument. */ placed in the valid argument. */
#define PPC_OPERAND_FAKE (04) #define PPC_OPERAND_FAKE (0x4)
/* The next operand should be wrapped in parentheses rather than /* The next operand should be wrapped in parentheses rather than
separated from this one by a comma. This is used for the load and separated from this one by a comma. This is used for the load and
store instructions which want their operands to look like store instructions which want their operands to look like
reg,displacement(reg) reg,displacement(reg)
*/ */
#define PPC_OPERAND_PARENS (010) #define PPC_OPERAND_PARENS (0x8)
/* This operand may use the symbolic names for the CR fields, which /* This operand may use the symbolic names for the CR fields, which
are are
@ -239,26 +240,26 @@ extern const struct powerpc_operand powerpc_operands[];
cr4 4 cr5 5 cr6 6 cr7 7 cr4 4 cr5 5 cr6 6 cr7 7
These may be combined arithmetically, as in cr2*4+gt. These are These may be combined arithmetically, as in cr2*4+gt. These are
only supported on the PowerPC, not the POWER. */ only supported on the PowerPC, not the POWER. */
#define PPC_OPERAND_CR (020) #define PPC_OPERAND_CR (0x10)
/* This operand names a register. The disassembler uses this to print /* This operand names a register. The disassembler uses this to print
register names with a leading 'r'. */ register names with a leading 'r'. */
#define PPC_OPERAND_GPR (040) #define PPC_OPERAND_GPR (0x20)
/* Like PPC_OPERAND_GPR, but don't print a leading 'r' for r0. */ /* Like PPC_OPERAND_GPR, but don't print a leading 'r' for r0. */
#define PPC_OPERAND_GPR_0 (0100) #define PPC_OPERAND_GPR_0 (0x40)
/* This operand names a floating point register. The disassembler /* This operand names a floating point register. The disassembler
prints these with a leading 'f'. */ prints these with a leading 'f'. */
#define PPC_OPERAND_FPR (0200) #define PPC_OPERAND_FPR (0x80)
/* This operand is a relative branch displacement. The disassembler /* This operand is a relative branch displacement. The disassembler
prints these symbolically if possible. */ prints these symbolically if possible. */
#define PPC_OPERAND_RELATIVE (0400) #define PPC_OPERAND_RELATIVE (0x100)
/* This operand is an absolute branch address. The disassembler /* This operand is an absolute branch address. The disassembler
prints these symbolically if possible. */ prints these symbolically if possible. */
#define PPC_OPERAND_ABSOLUTE (01000) #define PPC_OPERAND_ABSOLUTE (0x200)
/* This operand is optional, and is zero if omitted. This is used for /* This operand is optional, and is zero if omitted. This is used for
example, in the optional BF field in the comparison instructions. The example, in the optional BF field in the comparison instructions. The
@ -266,7 +267,7 @@ extern const struct powerpc_operand powerpc_operands[];
and the number of operands remaining for the opcode, and decide and the number of operands remaining for the opcode, and decide
whether this operand is present or not. The disassembler should whether this operand is present or not. The disassembler should
print this operand out only if it is not zero. */ print this operand out only if it is not zero. */
#define PPC_OPERAND_OPTIONAL (02000) #define PPC_OPERAND_OPTIONAL (0x400)
/* This flag is only used with PPC_OPERAND_OPTIONAL. If this operand /* This flag is only used with PPC_OPERAND_OPTIONAL. If this operand
is omitted, then for the next operand use this operand value plus is omitted, then for the next operand use this operand value plus
@ -274,24 +275,27 @@ extern const struct powerpc_operand powerpc_operands[];
hack is needed because the Power rotate instructions can take hack is needed because the Power rotate instructions can take
either 4 or 5 operands. The disassembler should print this operand either 4 or 5 operands. The disassembler should print this operand
out regardless of the PPC_OPERAND_OPTIONAL field. */ out regardless of the PPC_OPERAND_OPTIONAL field. */
#define PPC_OPERAND_NEXT (04000) #define PPC_OPERAND_NEXT (0x800)
/* This operand should be regarded as a negative number for the /* This operand should be regarded as a negative number for the
purposes of overflow checking (i.e., the normal most negative purposes of overflow checking (i.e., the normal most negative
number is disallowed and one more than the normal most positive number is disallowed and one more than the normal most positive
number is allowed). This flag will only be set for a signed number is allowed). This flag will only be set for a signed
operand. */ operand. */
#define PPC_OPERAND_NEGATIVE (010000) #define PPC_OPERAND_NEGATIVE (0x1000)
/* This operand names a vector unit register. The disassembler /* This operand names a vector unit register. The disassembler
prints these with a leading 'v'. */ prints these with a leading 'v'. */
#define PPC_OPERAND_VR (020000) #define PPC_OPERAND_VR (0x2000)
/* This operand is for the DS field in a DS form instruction. */ /* This operand is for the DS field in a DS form instruction. */
#define PPC_OPERAND_DS (040000) #define PPC_OPERAND_DS (0x4000)
/* This operand is for the DQ field in a DQ form instruction. */ /* This operand is for the DQ field in a DQ form instruction. */
#define PPC_OPERAND_DQ (0100000) #define PPC_OPERAND_DQ (0x8000)
/* Valid range of operand is 1..n rather than 0..n-1. */
#define PPC_OPERAND_PLUS1 (0x10000)
/* The POWER and PowerPC assemblers use a few macros. We keep them /* The POWER and PowerPC assemblers use a few macros. We keep them
with the operands table for simplicity. The macro table is an with the operands table for simplicity. The macro table is an

16
opcodes/ChangeLog
View file

@ -1,3 +1,19 @@
2007-04-20 Alan Modra <amodra@bigpond.net.au>
* ppc-dis.c (print_insn_powerpc): Adjust for struct powerpc_operand
change.
* ppc-opc.c (powerpc_operands): Replace bit count with bit mask
in all entries. Add PPC_OPERAND_SIGNED to DE entry. Remove
references to following deleted functions.
(insert_bd, extract_bd, insert_dq, extract_dq): Delete.
(insert_ds, extract_ds, insert_de, extract_de): Delete.
(insert_des, extract_des, insert_li, extract_li): Delete.
(insert_nb, insert_rsq, insert_rtq, insert_ev2, extract_ev2): Delete.
(insert_ev4, extract_ev4, insert_ev8, extract_ev8): Delete.
(num_powerpc_operands): New constant.
(XSPRG_MASK): Remove entire SPRG field.
(powerpc_opcodes <bcctre, bcctrel>): Use XLBB_MASK not XLYBB_MASK.
2007-04-20 Alan Modra <amodra@bigpond.net.au> 2007-04-20 Alan Modra <amodra@bigpond.net.au>
* ppc-opc.c (DCM, DGM, TE, RMC, R, SP, S): Correct shift. * ppc-opc.c (DCM, DGM, TE, RMC, R, SP, S): Correct shift.

18
opcodes/ppc-dis.c
View file

@ -222,10 +222,18 @@ print_insn_powerpc (bfd_vma memaddr,
value = (*operand->extract) (insn, dialect, &invalid); value = (*operand->extract) (insn, dialect, &invalid);
else else
{ {
value = (insn >> operand->shift) & ((1 << operand->bits) - 1); value = (insn >> operand->shift) & operand->bitm;
if ((operand->flags & PPC_OPERAND_SIGNED) != 0 if ((operand->flags & PPC_OPERAND_SIGNED) != 0)
&& (value & (1 << (operand->bits - 1))) != 0) {
value -= 1 << operand->bits; /* BITM is always some number of zeros followed by some
number of ones, followed by some numer of zeros. */
unsigned long top = operand->bitm;
/* top & -top gives the rightmost 1 bit, so this
fills in any trailing zeros. */
top |= (top & -top) - 1;
top &= ~(top >> 1);
value = (value ^ top) - top;
}
} }
/* If the operand is optional, and the value is zero, don't /* If the operand is optional, and the value is zero, don't
@ -258,7 +266,7 @@ print_insn_powerpc (bfd_vma memaddr,
(*info->fprintf_func) (info->stream, "%ld", value); (*info->fprintf_func) (info->stream, "%ld", value);
else else
{ {
if (operand->bits == 3) if (operand->bitm == 7)
(*info->fprintf_func) (info->stream, "cr%ld", value); (*info->fprintf_func) (info->stream, "cr%ld", value);
else else
{ {

468
opcodes/ppc-opc.c
View file

@ -42,8 +42,6 @@ static unsigned long insert_bat (unsigned long, long, int, const char **);
static long extract_bat (unsigned long, int, int *); static long extract_bat (unsigned long, int, int *);
static unsigned long insert_bba (unsigned long, long, int, const char **); static unsigned long insert_bba (unsigned long, long, int, const char **);
static long extract_bba (unsigned long, int, int *); static long extract_bba (unsigned long, int, int *);
static unsigned long insert_bd (unsigned long, long, int, const char **);
static long extract_bd (unsigned long, int, int *);
static unsigned long insert_bdm (unsigned long, long, int, const char **); static unsigned long insert_bdm (unsigned long, long, int, const char **);
static long extract_bdm (unsigned long, int, int *); static long extract_bdm (unsigned long, int, int *);
static unsigned long insert_bdp (unsigned long, long, int, const char **); static unsigned long insert_bdp (unsigned long, long, int, const char **);
@ -52,23 +50,12 @@ static unsigned long insert_bo (unsigned long, long, int, const char **);
static long extract_bo (unsigned long, int, int *); static long extract_bo (unsigned long, int, int *);
static unsigned long insert_boe (unsigned long, long, int, const char **); static unsigned long insert_boe (unsigned long, long, int, const char **);
static long extract_boe (unsigned long, int, int *); static long extract_boe (unsigned long, int, int *);
static unsigned long insert_dq (unsigned long, long, int, const char **);
static long extract_dq (unsigned long, int, int *);
static unsigned long insert_ds (unsigned long, long, int, const char **);
static long extract_ds (unsigned long, int, int *);
static unsigned long insert_de (unsigned long, long, int, const char **);
static long extract_de (unsigned long, int, int *);
static unsigned long insert_des (unsigned long, long, int, const char **);
static long extract_des (unsigned long, int, int *);
static unsigned long insert_fxm (unsigned long, long, int, const char **); static unsigned long insert_fxm (unsigned long, long, int, const char **);
static long extract_fxm (unsigned long, int, int *); static long extract_fxm (unsigned long, int, int *);
static unsigned long insert_li (unsigned long, long, int, const char **);
static long extract_li (unsigned long, int, int *);
static unsigned long insert_mbe (unsigned long, long, int, const char **); static unsigned long insert_mbe (unsigned long, long, int, const char **);
static long extract_mbe (unsigned long, int, int *); static long extract_mbe (unsigned long, int, int *);
static unsigned long insert_mb6 (unsigned long, long, int, const char **); static unsigned long insert_mb6 (unsigned long, long, int, const char **);
static long extract_mb6 (unsigned long, int, int *); static long extract_mb6 (unsigned long, int, int *);
static unsigned long insert_nb (unsigned long, long, int, const char **);
static long extract_nb (unsigned long, int, int *); static long extract_nb (unsigned long, int, int *);
static unsigned long insert_nsi (unsigned long, long, int, const char **); static unsigned long insert_nsi (unsigned long, long, int, const char **);
static long extract_nsi (unsigned long, int, int *); static long extract_nsi (unsigned long, int, int *);
@ -78,8 +65,6 @@ static unsigned long insert_raq (unsigned long, long, int, const char **);
static unsigned long insert_ras (unsigned long, long, int, const char **); static unsigned long insert_ras (unsigned long, long, int, const char **);
static unsigned long insert_rbs (unsigned long, long, int, const char **); static unsigned long insert_rbs (unsigned long, long, int, const char **);
static long extract_rbs (unsigned long, int, int *); static long extract_rbs (unsigned long, int, int *);
static unsigned long insert_rsq (unsigned long, long, int, const char **);
static unsigned long insert_rtq (unsigned long, long, int, const char **);
static unsigned long insert_sh6 (unsigned long, long, int, const char **); static unsigned long insert_sh6 (unsigned long, long, int, const char **);
static long extract_sh6 (unsigned long, int, int *); static long extract_sh6 (unsigned long, int, int *);
static unsigned long insert_spr (unsigned long, long, int, const char **); static unsigned long insert_spr (unsigned long, long, int, const char **);
@ -88,12 +73,6 @@ static unsigned long insert_sprg (unsigned long, long, int, const char **);
static long extract_sprg (unsigned long, int, int *); static long extract_sprg (unsigned long, int, int *);
static unsigned long insert_tbr (unsigned long, long, int, const char **); static unsigned long insert_tbr (unsigned long, long, int, const char **);
static long extract_tbr (unsigned long, int, int *); static long extract_tbr (unsigned long, int, int *);
static unsigned long insert_ev2 (unsigned long, long, int, const char **);
static long extract_ev2 (unsigned long, int, int *);
static unsigned long insert_ev4 (unsigned long, long, int, const char **);
static long extract_ev4 (unsigned long, int, int *);
static unsigned long insert_ev8 (unsigned long, long, int, const char **);
static long extract_ev8 (unsigned long, int, int *);
/* The operands table. /* The operands table.
@ -116,301 +95,301 @@ const struct powerpc_operand powerpc_operands[] =
/* The BA field in an XL form instruction. */ /* The BA field in an XL form instruction. */
#define BA UNUSED + 1 #define BA UNUSED + 1
#define BA_MASK (0x1f << 16) #define BA_MASK (0x1f << 16)
{ 5, 16, NULL, NULL, PPC_OPERAND_CR }, { 0x1f, 16, NULL, NULL, PPC_OPERAND_CR },
/* The BA field in an XL form instruction when it must be the same /* The BA field in an XL form instruction when it must be the same
as the BT field in the same instruction. */ as the BT field in the same instruction. */
#define BAT BA + 1 #define BAT BA + 1
{ 5, 16, insert_bat, extract_bat, PPC_OPERAND_FAKE }, { 0x1f, 16, insert_bat, extract_bat, PPC_OPERAND_FAKE },
/* The BB field in an XL form instruction. */ /* The BB field in an XL form instruction. */
#define BB BAT + 1 #define BB BAT + 1
#define BB_MASK (0x1f << 11) #define BB_MASK (0x1f << 11)
{ 5, 11, NULL, NULL, PPC_OPERAND_CR }, { 0x1f, 11, NULL, NULL, PPC_OPERAND_CR },
/* The BB field in an XL form instruction when it must be the same /* The BB field in an XL form instruction when it must be the same
as the BA field in the same instruction. */ as the BA field in the same instruction. */
#define BBA BB + 1 #define BBA BB + 1
{ 5, 11, insert_bba, extract_bba, PPC_OPERAND_FAKE }, { 0x1f, 11, insert_bba, extract_bba, PPC_OPERAND_FAKE },
/* The BD field in a B form instruction. The lower two bits are /* The BD field in a B form instruction. The lower two bits are
forced to zero. */ forced to zero. */
#define BD BBA + 1 #define BD BBA + 1
{ 16, 0, insert_bd, extract_bd, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED }, { 0xfffc, 0, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
/* The BD field in a B form instruction when absolute addressing is /* The BD field in a B form instruction when absolute addressing is
used. */ used. */
#define BDA BD + 1 #define BDA BD + 1
{ 16, 0, insert_bd, extract_bd, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED }, { 0xfffc, 0, NULL, NULL, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
/* The BD field in a B form instruction when the - modifier is used. /* The BD field in a B form instruction when the - modifier is used.
This sets the y bit of the BO field appropriately. */ This sets the y bit of the BO field appropriately. */
#define BDM BDA + 1 #define BDM BDA + 1
{ 16, 0, insert_bdm, extract_bdm, { 0xfffc, 0, insert_bdm, extract_bdm,
PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED }, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
/* The BD field in a B form instruction when the - modifier is used /* The BD field in a B form instruction when the - modifier is used
and absolute address is used. */ and absolute address is used. */
#define BDMA BDM + 1 #define BDMA BDM + 1
{ 16, 0, insert_bdm, extract_bdm, { 0xfffc, 0, insert_bdm, extract_bdm,
PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED }, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
/* The BD field in a B form instruction when the + modifier is used. /* The BD field in a B form instruction when the + modifier is used.
This sets the y bit of the BO field appropriately. */ This sets the y bit of the BO field appropriately. */
#define BDP BDMA + 1 #define BDP BDMA + 1
{ 16, 0, insert_bdp, extract_bdp, { 0xfffc, 0, insert_bdp, extract_bdp,
PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED }, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
/* The BD field in a B form instruction when the + modifier is used /* The BD field in a B form instruction when the + modifier is used
and absolute addressing is used. */ and absolute addressing is used. */
#define BDPA BDP + 1 #define BDPA BDP + 1
{ 16, 0, insert_bdp, extract_bdp, { 0xfffc, 0, insert_bdp, extract_bdp,
PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED }, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
/* The BF field in an X or XL form instruction. */ /* The BF field in an X or XL form instruction. */
#define BF BDPA + 1 #define BF BDPA + 1
{ 3, 23, NULL, NULL, PPC_OPERAND_CR }, { 0x7, 23, NULL, NULL, PPC_OPERAND_CR },
/* An optional BF field. This is used for comparison instructions, /* An optional BF field. This is used for comparison instructions,
in which an omitted BF field is taken as zero. */ in which an omitted BF field is taken as zero. */
#define OBF BF + 1 #define OBF BF + 1
{ 3, 23, NULL, NULL, PPC_OPERAND_CR | PPC_OPERAND_OPTIONAL }, { 0x7, 23, NULL, NULL, PPC_OPERAND_CR | PPC_OPERAND_OPTIONAL },
/* The BFA field in an X or XL form instruction. */ /* The BFA field in an X or XL form instruction. */
#define BFA OBF + 1 #define BFA OBF + 1
{ 3, 18, NULL, NULL, PPC_OPERAND_CR }, { 0x7, 18, NULL, NULL, PPC_OPERAND_CR },
/* The BI field in a B form or XL form instruction. */ /* The BI field in a B form or XL form instruction. */
#define BI BFA + 1 #define BI BFA + 1
#define BI_MASK (0x1f << 16) #define BI_MASK (0x1f << 16)
{ 5, 16, NULL, NULL, PPC_OPERAND_CR }, { 0x1f, 16, NULL, NULL, PPC_OPERAND_CR },
/* The BO field in a B form instruction. Certain values are /* The BO field in a B form instruction. Certain values are
illegal. */ illegal. */
#define BO BI + 1 #define BO BI + 1
#define BO_MASK (0x1f << 21) #define BO_MASK (0x1f << 21)
{ 5, 21, insert_bo, extract_bo, 0 }, { 0x1f, 21, insert_bo, extract_bo, 0 },
/* The BO field in a B form instruction when the + or - modifier is /* The BO field in a B form instruction when the + or - modifier is
used. This is like the BO field, but it must be even. */ used. This is like the BO field, but it must be even. */
#define BOE BO + 1 #define BOE BO + 1
{ 5, 21, insert_boe, extract_boe, 0 }, { 0x1e, 21, insert_boe, extract_boe, 0 },
#define BH BOE + 1 #define BH BOE + 1
{ 2, 11, NULL, NULL, PPC_OPERAND_OPTIONAL }, { 0x3, 11, NULL, NULL, PPC_OPERAND_OPTIONAL },
/* The BT field in an X or XL form instruction. */ /* The BT field in an X or XL form instruction. */
#define BT BH + 1 #define BT BH + 1
{ 5, 21, NULL, NULL, PPC_OPERAND_CR }, { 0x1f, 21, NULL, NULL, PPC_OPERAND_CR },
/* The condition register number portion of the BI field in a B form /* The condition register number portion of the BI field in a B form
or XL form instruction. This is used for the extended or XL form instruction. This is used for the extended
conditional branch mnemonics, which set the lower two bits of the conditional branch mnemonics, which set the lower two bits of the
BI field. This field is optional. */ BI field. This field is optional. */
#define CR BT + 1 #define CR BT + 1
{ 3, 18, NULL, NULL, PPC_OPERAND_CR | PPC_OPERAND_OPTIONAL }, { 0x7, 18, NULL, NULL, PPC_OPERAND_CR | PPC_OPERAND_OPTIONAL },
/* The CRB field in an X form instruction. */ /* The CRB field in an X form instruction. */
#define CRB CR + 1 #define CRB CR + 1
{ 5, 6, NULL, NULL, 0 }, { 0x1f, 6, NULL, NULL, 0 },
/* The CRFD field in an X form instruction. */ /* The CRFD field in an X form instruction. */
#define CRFD CRB + 1 #define CRFD CRB + 1
{ 3, 23, NULL, NULL, PPC_OPERAND_CR }, { 0x7, 23, NULL, NULL, PPC_OPERAND_CR },
/* The CRFS field in an X form instruction. */ /* The CRFS field in an X form instruction. */
#define CRFS CRFD + 1 #define CRFS CRFD + 1
{ 3, 0, NULL, NULL, PPC_OPERAND_CR }, { 0x7, 0, NULL, NULL, PPC_OPERAND_CR },
/* The CT field in an X form instruction. */ /* The CT field in an X form instruction. */
#define CT CRFS + 1 #define CT CRFS + 1
{ 5, 21, NULL, NULL, PPC_OPERAND_OPTIONAL }, { 0x1f, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
/* The D field in a D form instruction. This is a displacement off /* The D field in a D form instruction. This is a displacement off
a register, and implies that the next operand is a register in a register, and implies that the next operand is a register in
parentheses. */ parentheses. */
#define D CT + 1 #define D CT + 1
{ 16, 0, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED }, { 0xffff, 0, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },
/* The DE field in a DE form instruction. This is like D, but is 12 /* The DE field in a DE form instruction. This is like D, but is 12
bits only. */ bits only. */
#define DE D + 1 #define DE D + 1
{ 14, 0, insert_de, extract_de, PPC_OPERAND_PARENS }, { 0xfff, 4, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },
/* The DES field in a DES form instruction. This is like DS, but is 14 /* The DES field in a DES form instruction. This is like DS, but is 14
bits only (12 stored.) */ bits only (12 stored.) */
#define DES DE + 1 #define DES DE + 1
{ 14, 0, insert_des, extract_des, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED }, { 0x3ffc, 2, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },
/* The DQ field in a DQ form instruction. This is like D, but the /* The DQ field in a DQ form instruction. This is like D, but the
lower four bits are forced to zero. */ lower four bits are forced to zero. */
#define DQ DES + 1 #define DQ DES + 1
{ 16, 0, insert_dq, extract_dq, { 0xfff0, 0, NULL, NULL,
PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DQ }, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DQ },
/* The DS field in a DS form instruction. This is like D, but the /* The DS field in a DS form instruction. This is like D, but the
lower two bits are forced to zero. */ lower two bits are forced to zero. */
#define DS DQ + 1 #define DS DQ + 1
{ 16, 0, insert_ds, extract_ds, { 0xfffc, 0, NULL, NULL,
PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DS }, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DS },
/* The E field in a wrteei instruction. */ /* The E field in a wrteei instruction. */
#define E DS + 1 #define E DS + 1
{ 1, 15, NULL, NULL, 0 }, { 0x1, 15, NULL, NULL, 0 },
/* The FL1 field in a POWER SC form instruction. */ /* The FL1 field in a POWER SC form instruction. */
#define FL1 E + 1 #define FL1 E + 1
{ 4, 12, NULL, NULL, 0 }, { 0xf, 12, NULL, NULL, 0 },
/* The FL2 field in a POWER SC form instruction. */ /* The FL2 field in a POWER SC form instruction. */
#define FL2 FL1 + 1 #define FL2 FL1 + 1
{ 3, 2, NULL, NULL, 0 }, { 0x7, 2, NULL, NULL, 0 },
/* The FLM field in an XFL form instruction. */ /* The FLM field in an XFL form instruction. */
#define FLM FL2 + 1 #define FLM FL2 + 1
{ 8, 17, NULL, NULL, 0 }, { 0xff, 17, NULL, NULL, 0 },
/* The FRA field in an X or A form instruction. */ /* The FRA field in an X or A form instruction. */
#define FRA FLM + 1 #define FRA FLM + 1
#define FRA_MASK (0x1f << 16) #define FRA_MASK (0x1f << 16)
{ 5, 16, NULL, NULL, PPC_OPERAND_FPR }, { 0x1f, 16, NULL, NULL, PPC_OPERAND_FPR },
/* The FRB field in an X or A form instruction. */ /* The FRB field in an X or A form instruction. */
#define FRB FRA + 1 #define FRB FRA + 1
#define FRB_MASK (0x1f << 11) #define FRB_MASK (0x1f << 11)
{ 5, 11, NULL, NULL, PPC_OPERAND_FPR }, { 0x1f, 11, NULL, NULL, PPC_OPERAND_FPR },
/* The FRC field in an A form instruction. */ /* The FRC field in an A form instruction. */
#define FRC FRB + 1 #define FRC FRB + 1
#define FRC_MASK (0x1f << 6) #define FRC_MASK (0x1f << 6)
{ 5, 6, NULL, NULL, PPC_OPERAND_FPR }, { 0x1f, 6, NULL, NULL, PPC_OPERAND_FPR },
/* The FRS field in an X form instruction or the FRT field in a D, X /* The FRS field in an X form instruction or the FRT field in a D, X
or A form instruction. */ or A form instruction. */
#define FRS FRC + 1 #define FRS FRC + 1
#define FRT FRS #define FRT FRS
{ 5, 21, NULL, NULL, PPC_OPERAND_FPR }, { 0x1f, 21, NULL, NULL, PPC_OPERAND_FPR },
/* The FXM field in an XFX instruction. */ /* The FXM field in an XFX instruction. */
#define FXM FRS + 1 #define FXM FRS + 1
#define FXM_MASK (0xff << 12) #define FXM_MASK (0xff << 12)
{ 8, 12, insert_fxm, extract_fxm, 0 }, { 0xff, 12, insert_fxm, extract_fxm, 0 },
/* Power4 version for mfcr. */ /* Power4 version for mfcr. */
#define FXM4 FXM + 1 #define FXM4 FXM + 1
{ 8, 12, insert_fxm, extract_fxm, PPC_OPERAND_OPTIONAL }, { 0xff, 12, insert_fxm, extract_fxm, PPC_OPERAND_OPTIONAL },
/* The L field in a D or X form instruction. */ /* The L field in a D or X form instruction. */
#define L FXM4 + 1 #define L FXM4 + 1
{ 1, 21, NULL, NULL, PPC_OPERAND_OPTIONAL }, { 0x1, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
/* The LEV field in a POWER SVC form instruction. */ /* The LEV field in a POWER SVC form instruction. */
#define SVC_LEV L + 1 #define SVC_LEV L + 1
{ 7, 5, NULL, NULL, 0 }, { 0x7f, 5, NULL, NULL, 0 },
/* The LEV field in an SC form instruction. */ /* The LEV field in an SC form instruction. */
#define LEV SVC_LEV + 1 #define LEV SVC_LEV + 1
{ 7, 5, NULL, NULL, PPC_OPERAND_OPTIONAL }, { 0x7f, 5, NULL, NULL, PPC_OPERAND_OPTIONAL },
/* The LI field in an I form instruction. The lower two bits are /* The LI field in an I form instruction. The lower two bits are
forced to zero. */ forced to zero. */
#define LI LEV + 1 #define LI LEV + 1
{ 26, 0, insert_li, extract_li, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED }, { 0x3fffffc, 0, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
/* The LI field in an I form instruction when used as an absolute /* The LI field in an I form instruction when used as an absolute
address. */ address. */
#define LIA LI + 1 #define LIA LI + 1
{ 26, 0, insert_li, extract_li, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED }, { 0x3fffffc, 0, NULL, NULL, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
/* The LS field in an X (sync) form instruction. */ /* The LS field in an X (sync) form instruction. */
#define LS LIA + 1 #define LS LIA + 1
{ 2, 21, NULL, NULL, PPC_OPERAND_OPTIONAL }, { 0x3, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
/* The MB field in an M form instruction. */ /* The MB field in an M form instruction. */
#define MB LS + 1 #define MB LS + 1
#define MB_MASK (0x1f << 6) #define MB_MASK (0x1f << 6)
{ 5, 6, NULL, NULL, 0 }, { 0x1f, 6, NULL, NULL, 0 },
/* The ME field in an M form instruction. */ /* The ME field in an M form instruction. */
#define ME MB + 1 #define ME MB + 1
#define ME_MASK (0x1f << 1) #define ME_MASK (0x1f << 1)
{ 5, 1, NULL, NULL, 0 }, { 0x1f, 1, NULL, NULL, 0 },
/* The MB and ME fields in an M form instruction expressed a single /* The MB and ME fields in an M form instruction expressed a single
operand which is a bitmask indicating which bits to select. This operand which is a bitmask indicating which bits to select. This
is a two operand form using PPC_OPERAND_NEXT. See the is a two operand form using PPC_OPERAND_NEXT. See the
description in opcode/ppc.h for what this means. */ description in opcode/ppc.h for what this means. */
#define MBE ME + 1 #define MBE ME + 1
{ 5, 6, NULL, NULL, PPC_OPERAND_OPTIONAL | PPC_OPERAND_NEXT }, { 0x1f, 6, NULL, NULL, PPC_OPERAND_OPTIONAL | PPC_OPERAND_NEXT },
{ 32, 0, insert_mbe, extract_mbe, 0 }, { 0xff, 0, insert_mbe, extract_mbe, 0 },
/* The MB or ME field in an MD or MDS form instruction. The high /* The MB or ME field in an MD or MDS form instruction. The high
bit is wrapped to the low end. */ bit is wrapped to the low end. */
#define MB6 MBE + 2 #define MB6 MBE + 2
#define ME6 MB6 #define ME6 MB6
#define MB6_MASK (0x3f << 5) #define MB6_MASK (0x3f << 5)
{ 6, 5, insert_mb6, extract_mb6, 0 }, { 0x3f, 5, insert_mb6, extract_mb6, 0 },
/* The MO field in an mbar instruction. */ /* The MO field in an mbar instruction. */
#define MO MB6 + 1 #define MO MB6 + 1
{ 5, 21, NULL, NULL, PPC_OPERAND_OPTIONAL }, { 0x1f, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
/* The NB field in an X form instruction. The value 32 is stored as /* The NB field in an X form instruction. The value 32 is stored as
0. */ 0. */
#define NB MO + 1 #define NB MO + 1
{ 6, 11, insert_nb, extract_nb, 0 }, { 0x1f, 11, NULL, extract_nb, PPC_OPERAND_PLUS1 },
/* The NSI field in a D form instruction. This is the same as the /* The NSI field in a D form instruction. This is the same as the
SI field, only negated. */ SI field, only negated. */
#define NSI NB + 1 #define NSI NB + 1
{ 16, 0, insert_nsi, extract_nsi, { 0xffff, 0, insert_nsi, extract_nsi,
PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED }, PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED },
/* The RA field in an D, DS, DQ, X, XO, M, or MDS form instruction. */ /* The RA field in an D, DS, DQ, X, XO, M, or MDS form instruction. */
#define RA NSI + 1 #define RA NSI + 1
#define RA_MASK (0x1f << 16) #define RA_MASK (0x1f << 16)
{ 5, 16, NULL, NULL, PPC_OPERAND_GPR }, { 0x1f, 16, NULL, NULL, PPC_OPERAND_GPR },
/* As above, but 0 in the RA field means zero, not r0. */ /* As above, but 0 in the RA field means zero, not r0. */
#define RA0 RA + 1 #define RA0 RA + 1
{ 5, 16, NULL, NULL, PPC_OPERAND_GPR_0 }, { 0x1f, 16, NULL, NULL, PPC_OPERAND_GPR_0 },
/* The RA field in the DQ form lq instruction, which has special /* The RA field in the DQ form lq instruction, which has special
value restrictions. */ value restrictions. */
#define RAQ RA0 + 1 #define RAQ RA0 + 1
{ 5, 16, insert_raq, NULL, PPC_OPERAND_GPR_0 }, { 0x1f, 16, insert_raq, NULL, PPC_OPERAND_GPR_0 },
/* The RA field in a D or X form instruction which is an updating /* The RA field in a D or X form instruction which is an updating
load, which means that the RA field may not be zero and may not load, which means that the RA field may not be zero and may not
equal the RT field. */ equal the RT field. */
#define RAL RAQ + 1 #define RAL RAQ + 1
{ 5, 16, insert_ral, NULL, PPC_OPERAND_GPR_0 }, { 0x1f, 16, insert_ral, NULL, PPC_OPERAND_GPR_0 },
/* The RA field in an lmw instruction, which has special value /* The RA field in an lmw instruction, which has special value
restrictions. */ restrictions. */
#define RAM RAL + 1 #define RAM RAL + 1
{ 5, 16, insert_ram, NULL, PPC_OPERAND_GPR_0 }, { 0x1f, 16, insert_ram, NULL, PPC_OPERAND_GPR_0 },
/* The RA field in a D or X form instruction which is an updating /* The RA field in a D or X form instruction which is an updating
store or an updating floating point load, which means that the RA store or an updating floating point load, which means that the RA
field may not be zero. */ field may not be zero. */
#define RAS RAM + 1 #define RAS RAM + 1
{ 5, 16, insert_ras, NULL, PPC_OPERAND_GPR_0 }, { 0x1f, 16, insert_ras, NULL, PPC_OPERAND_GPR_0 },
/* The RA field of the tlbwe instruction, which is optional. */ /* The RA field of the tlbwe instruction, which is optional. */
#define RAOPT RAS + 1 #define RAOPT RAS + 1
{ 5, 16, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL }, { 0x1f, 16, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },
/* The RB field in an X, XO, M, or MDS form instruction. */ /* The RB field in an X, XO, M, or MDS form instruction. */
#define RB RAOPT + 1 #define RB RAOPT + 1
#define RB_MASK (0x1f << 11) #define RB_MASK (0x1f << 11)
{ 5, 11, NULL, NULL, PPC_OPERAND_GPR }, { 0x1f, 11, NULL, NULL, PPC_OPERAND_GPR },
/* The RB field in an X form instruction when it must be the same as /* The RB field in an X form instruction when it must be the same as
the RS field in the instruction. This is used for extended the RS field in the instruction. This is used for extended
mnemonics like mr. */ mnemonics like mr. */
#define RBS RB + 1 #define RBS RB + 1
{ 5, 1, insert_rbs, extract_rbs, PPC_OPERAND_FAKE }, { 0x1f, 11, insert_rbs, extract_rbs, PPC_OPERAND_FAKE },
/* The RS field in a D, DS, X, XFX, XS, M, MD or MDS form /* The RS field in a D, DS, X, XFX, XS, M, MD or MDS form
instruction or the RT field in a D, DS, X, XFX or XO form instruction or the RT field in a D, DS, X, XFX or XO form
@ -418,181 +397,184 @@ const struct powerpc_operand powerpc_operands[] =
#define RS RBS + 1 #define RS RBS + 1
#define RT RS #define RT RS
#define RT_MASK (0x1f << 21) #define RT_MASK (0x1f << 21)
{ 5, 21, NULL, NULL, PPC_OPERAND_GPR }, { 0x1f, 21, NULL, NULL, PPC_OPERAND_GPR },
/* The RS field of the DS form stq instruction, which has special /* The RS field of the DS form stq instruction, which has special
value restrictions. */ value restrictions. */
#define RSQ RS + 1 #define RSQ RS + 1
{ 5, 21, insert_rsq, NULL, PPC_OPERAND_GPR_0 }, { 0x1e, 21, NULL, NULL, PPC_OPERAND_GPR_0 },
/* The RT field of the DQ form lq instruction, which has special /* The RT field of the DQ form lq instruction, which has special
value restrictions. */ value restrictions. */
#define RTQ RSQ + 1 #define RTQ RSQ + 1
{ 5, 21, insert_rtq, NULL, PPC_OPERAND_GPR_0 }, { 0x1e, 21, NULL, NULL, PPC_OPERAND_GPR_0 },
/* The RS field of the tlbwe instruction, which is optional. */ /* The RS field of the tlbwe instruction, which is optional. */
#define RSO RTQ + 1 #define RSO RTQ + 1
#define RTO RSO #define RTO RSO
{ 5, 21, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL }, { 0x1f, 21, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },
/* The SH field in an X or M form instruction. */ /* The SH field in an X or M form instruction. */
#define SH RSO + 1 #define SH RSO + 1
#define SH_MASK (0x1f << 11) #define SH_MASK (0x1f << 11)
{ 5, 11, NULL, NULL, 0 }, { 0x1f, 11, NULL, NULL, 0 },
/* The SH field in an MD form instruction. This is split. */ /* The SH field in an MD form instruction. This is split. */
#define SH6 SH + 1 #define SH6 SH + 1
#define SH6_MASK ((0x1f << 11) | (1 << 1)) #define SH6_MASK ((0x1f << 11) | (1 << 1))
{ 6, 1, insert_sh6, extract_sh6, 0 }, { 0x3f, -1, insert_sh6, extract_sh6, 0 },
/* The SH field of the tlbwe instruction, which is optional. */ /* The SH field of the tlbwe instruction, which is optional. */
#define SHO SH6 + 1 #define SHO SH6 + 1
{ 5, 11,NULL, NULL, PPC_OPERAND_OPTIONAL }, { 0x1f, 11, NULL, NULL, PPC_OPERAND_OPTIONAL },
/* The SI field in a D form instruction. */ /* The SI field in a D form instruction. */
#define SI SHO + 1 #define SI SHO + 1
{ 16, 0, NULL, NULL, PPC_OPERAND_SIGNED }, { 0xffff, 0, NULL, NULL, PPC_OPERAND_SIGNED },
/* The SI field in a D form instruction when we accept a wide range /* The SI field in a D form instruction when we accept a wide range
of positive values. */ of positive values. */
#define SISIGNOPT SI + 1 #define SISIGNOPT SI + 1
{ 16, 0, NULL, NULL, PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT }, { 0xffff, 0, NULL, NULL, PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },
/* The SPR field in an XFX form instruction. This is flipped--the /* The SPR field in an XFX form instruction. This is flipped--the
lower 5 bits are stored in the upper 5 and vice- versa. */ lower 5 bits are stored in the upper 5 and vice- versa. */
#define SPR SISIGNOPT + 1 #define SPR SISIGNOPT + 1
#define PMR SPR #define PMR SPR
#define SPR_MASK (0x3ff << 11) #define SPR_MASK (0x3ff << 11)
{ 10, 11, insert_spr, extract_spr, 0 }, { 0x3ff, 11, insert_spr, extract_spr, 0 },
/* The BAT index number in an XFX form m[ft]ibat[lu] instruction. */ /* The BAT index number in an XFX form m[ft]ibat[lu] instruction. */
#define SPRBAT SPR + 1 #define SPRBAT SPR + 1
#define SPRBAT_MASK (0x3 << 17) #define SPRBAT_MASK (0x3 << 17)
{ 2, 17, NULL, NULL, 0 }, { 0x3, 17, NULL, NULL, 0 },
/* The SPRG register number in an XFX form m[ft]sprg instruction. */ /* The SPRG register number in an XFX form m[ft]sprg instruction. */
#define SPRG SPRBAT + 1 #define SPRG SPRBAT + 1
{ 5, 16, insert_sprg, extract_sprg, 0 }, { 0x1f, 16, insert_sprg, extract_sprg, 0 },
/* The SR field in an X form instruction. */ /* The SR field in an X form instruction. */
#define SR SPRG + 1 #define SR SPRG + 1
{ 4, 16, NULL, NULL, 0 }, { 0xf, 16, NULL, NULL, 0 },
/* The STRM field in an X AltiVec form instruction. */ /* The STRM field in an X AltiVec form instruction. */
#define STRM SR + 1 #define STRM SR + 1
#define STRM_MASK (0x3 << 21) #define STRM_MASK (0x3 << 21)
{ 2, 21, NULL, NULL, 0 }, { 0x3, 21, NULL, NULL, 0 },
/* The SV field in a POWER SC form instruction. */ /* The SV field in a POWER SC form instruction. */
#define SV STRM + 1 #define SV STRM + 1
{ 14, 2, NULL, NULL, 0 }, { 0x3fff, 2, NULL, NULL, 0 },
/* The TBR field in an XFX form instruction. This is like the SPR /* The TBR field in an XFX form instruction. This is like the SPR
field, but it is optional. */ field, but it is optional. */
#define TBR SV + 1 #define TBR SV + 1
{ 10, 11, insert_tbr, extract_tbr, PPC_OPERAND_OPTIONAL }, { 0x3ff, 11, insert_tbr, extract_tbr, PPC_OPERAND_OPTIONAL },
/* The TO field in a D or X form instruction. */ /* The TO field in a D or X form instruction. */
#define TO TBR + 1 #define TO TBR + 1
#define TO_MASK (0x1f << 21) #define TO_MASK (0x1f << 21)
{ 5, 21, NULL, NULL, 0 }, { 0x1f, 21, NULL, NULL, 0 },
/* The U field in an X form instruction. */ /* The U field in an X form instruction. */
#define U TO + 1 #define U TO + 1
{ 4, 12, NULL, NULL, 0 }, { 0xf, 12, NULL, NULL, 0 },
/* The UI field in a D form instruction. */ /* The UI field in a D form instruction. */
#define UI U + 1 #define UI U + 1
{ 16, 0, NULL, NULL, 0 }, { 0xffff, 0, NULL, NULL, 0 },
/* The VA field in a VA, VX or VXR form instruction. */ /* The VA field in a VA, VX or VXR form instruction. */
#define VA UI + 1 #define VA UI + 1
#define VA_MASK (0x1f << 16) #define VA_MASK (0x1f << 16)
{ 5, 16, NULL, NULL, PPC_OPERAND_VR }, { 0x1f, 16, NULL, NULL, PPC_OPERAND_VR },
/* The VB field in a VA, VX or VXR form instruction. */ /* The VB field in a VA, VX or VXR form instruction. */
#define VB VA + 1 #define VB VA + 1
#define VB_MASK (0x1f << 11) #define VB_MASK (0x1f << 11)
{ 5, 11, NULL, NULL, PPC_OPERAND_VR }, { 0x1f, 11, NULL, NULL, PPC_OPERAND_VR },
/* The VC field in a VA form instruction. */ /* The VC field in a VA form instruction. */
#define VC VB + 1 #define VC VB + 1
#define VC_MASK (0x1f << 6) #define VC_MASK (0x1f << 6)
{ 5, 6, NULL, NULL, PPC_OPERAND_VR }, { 0x1f, 6, NULL, NULL, PPC_OPERAND_VR },
/* The VD or VS field in a VA, VX, VXR or X form instruction. */ /* The VD or VS field in a VA, VX, VXR or X form instruction. */
#define VD VC + 1 #define VD VC + 1
#define VS VD #define VS VD
#define VD_MASK (0x1f << 21) #define VD_MASK (0x1f << 21)
{ 5, 21, NULL, NULL, PPC_OPERAND_VR }, { 0x1f, 21, NULL, NULL, PPC_OPERAND_VR },
/* The SIMM field in a VX form instruction. */ /* The SIMM field in a VX form instruction. */
#define SIMM VD + 1 #define SIMM VD + 1
{ 5, 16, NULL, NULL, PPC_OPERAND_SIGNED}, { 0x1f, 16, NULL, NULL, PPC_OPERAND_SIGNED},
/* The UIMM field in a VX form instruction, and TE in Z form. */ /* The UIMM field in a VX form instruction, and TE in Z form. */
#define UIMM SIMM + 1 #define UIMM SIMM + 1
#define TE UIMM #define TE UIMM
{ 5, 16, NULL, NULL, 0 }, { 0x1f, 16, NULL, NULL, 0 },
/* The SHB field in a VA form instruction. */ /* The SHB field in a VA form instruction. */
#define SHB UIMM + 1 #define SHB UIMM + 1
{ 4, 6, NULL, NULL, 0 }, { 0xf, 6, NULL, NULL, 0 },
/* The other UIMM field in a EVX form instruction. */ /* The other UIMM field in a EVX form instruction. */
#define EVUIMM SHB + 1 #define EVUIMM SHB + 1
{ 5, 11, NULL, NULL, 0 }, { 0x1f, 11, NULL, NULL, 0 },
/* The other UIMM field in a half word EVX form instruction. */ /* The other UIMM field in a half word EVX form instruction. */
#define EVUIMM_2 EVUIMM + 1 #define EVUIMM_2 EVUIMM + 1
{ 32, 11, insert_ev2, extract_ev2, PPC_OPERAND_PARENS }, { 0x3e, 10, NULL, NULL, PPC_OPERAND_PARENS },
/* The other UIMM field in a word EVX form instruction. */ /* The other UIMM field in a word EVX form instruction. */
#define EVUIMM_4 EVUIMM_2 + 1 #define EVUIMM_4 EVUIMM_2 + 1
{ 32, 11, insert_ev4, extract_ev4, PPC_OPERAND_PARENS }, { 0x7c, 9, NULL, NULL, PPC_OPERAND_PARENS },
/* The other UIMM field in a double EVX form instruction. */ /* The other UIMM field in a double EVX form instruction. */
#define EVUIMM_8 EVUIMM_4 + 1 #define EVUIMM_8 EVUIMM_4 + 1
{ 32, 11, insert_ev8, extract_ev8, PPC_OPERAND_PARENS }, { 0xf8, 8, NULL, NULL, PPC_OPERAND_PARENS },
/* The WS field. */ /* The WS field. */
#define WS EVUIMM_8 + 1 #define WS EVUIMM_8 + 1
#define WS_MASK (0x7 << 11) #define WS_MASK (0x7 << 11)
{ 3, 11, NULL, NULL, 0 }, { 0x7, 11, NULL, NULL, 0 },
/* The L field in an mtmsrd or A form instruction. */ /* The L field in an mtmsrd or A form instruction. */
#define MTMSRD_L WS + 1 #define MTMSRD_L WS + 1
#define A_L MTMSRD_L #define A_L MTMSRD_L
{ 1, 16, NULL, NULL, PPC_OPERAND_OPTIONAL }, { 0x1, 16, NULL, NULL, PPC_OPERAND_OPTIONAL },
#define RMC A_L + 1 #define RMC A_L + 1
{ 2, 9, NULL, NULL, 0 }, { 0x3, 9, NULL, NULL, 0 },
#define R RMC + 1 #define R RMC + 1
{ 1, 16, NULL, NULL, 0 }, { 0x1, 16, NULL, NULL, 0 },
#define SP R + 1 #define SP R + 1
{ 2, 19, NULL, NULL, 0 }, { 0x3, 19, NULL, NULL, 0 },
#define S SP + 1 #define S SP + 1
{ 1, 20, NULL, NULL, 0 }, { 0x1, 20, NULL, NULL, 0 },
/* SH field starting at bit position 16. */ /* SH field starting at bit position 16. */
#define SH16 S + 1 #define SH16 S + 1
/* The DCM and DGM fields in a Z form instruction. */ /* The DCM and DGM fields in a Z form instruction. */
#define DCM SH16 #define DCM SH16
#define DGM DCM #define DGM DCM
{ 6, 10, NULL, NULL, 0 }, { 0x3f, 10, NULL, NULL, 0 },
/* The L field in an X form with the RT field fixed instruction. */ /* The L field in an X form with the RT field fixed instruction. */
#define XRT_L SH16 + 1 #define XRT_L SH16 + 1
{ 2, 21, NULL, NULL, PPC_OPERAND_OPTIONAL }, { 0x1, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
/* The EH field in larx instruction. */ /* The EH field in larx instruction. */
#define EH XRT_L + 1 #define EH XRT_L + 1
{ 1, 0, NULL, NULL, PPC_OPERAND_OPTIONAL }, { 0x1, 0, NULL, NULL, PPC_OPERAND_OPTIONAL },
}; };
const unsigned int num_powerpc_operands = (sizeof (powerpc_operands)
/ sizeof (powerpc_operands[0]));
/* The functions used to insert and extract complicated operands. */ /* The functions used to insert and extract complicated operands. */
/* The BA field in an XL form instruction when it must be the same as /* The BA field in an XL form instruction when it must be the same as
@ -645,26 +627,6 @@ extract_bba (unsigned long insn,
return 0; return 0;
} }
/* The BD field in a B form instruction. The lower two bits are
forced to zero. */
static unsigned long
insert_bd (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg ATTRIBUTE_UNUSED)
{
return insn | (value & 0xfffc);
}
static long
extract_bd (unsigned long insn,
int dialect ATTRIBUTE_UNUSED,
int *invalid ATTRIBUTE_UNUSED)
{
return ((insn & 0xfffc) ^ 0x8000) - 0x8000;
}
/* The BD field in a B form instruction when the - modifier is used. /* The BD field in a B form instruction when the - modifier is used.
This modifier means that the branch is not expected to be taken. This modifier means that the branch is not expected to be taken.
For chips built to versions of the architecture prior to version 2 For chips built to versions of the architecture prior to version 2
@ -885,157 +847,6 @@ extract_boe (unsigned long insn,
return value & 0x1e; return value & 0x1e;
} }
/* The DQ field in a DQ form instruction. This is like D, but the
lower four bits are forced to zero. */
static unsigned long
insert_dq (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if ((value & 0xf) != 0)
*errmsg = _("offset not a multiple of 16");
return insn | (value & 0xfff0);
}
static long
extract_dq (unsigned long insn,
int dialect ATTRIBUTE_UNUSED,
int *invalid ATTRIBUTE_UNUSED)
{
return ((insn & 0xfff0) ^ 0x8000) - 0x8000;
}
static unsigned long
insert_ev2 (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if ((value & 1) != 0)
*errmsg = _("offset not a multiple of 2");
if ((value > 62) != 0)
*errmsg = _("offset greater than 62");
return insn | ((value & 0x3e) << 10);
}
static long
extract_ev2 (unsigned long insn,
int dialect ATTRIBUTE_UNUSED,
int *invalid ATTRIBUTE_UNUSED)
{
return (insn >> 10) & 0x3e;
}
static unsigned long
insert_ev4 (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if ((value & 3) != 0)
*errmsg = _("offset not a multiple of 4");
if ((value > 124) != 0)
*errmsg = _("offset greater than 124");
return insn | ((value & 0x7c) << 9);
}
static long
extract_ev4 (unsigned long insn,
int dialect ATTRIBUTE_UNUSED,
int *invalid ATTRIBUTE_UNUSED)
{
return (insn >> 9) & 0x7c;
}
static unsigned long
insert_ev8 (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if ((value & 7) != 0)
*errmsg = _("offset not a multiple of 8");
if ((value > 248) != 0)
*errmsg = _("offset greater than 248");
return insn | ((value & 0xf8) << 8);
}
static long
extract_ev8 (unsigned long insn,
int dialect ATTRIBUTE_UNUSED,
int *invalid ATTRIBUTE_UNUSED)
{
return (insn >> 8) & 0xf8;
}
/* The DS field in a DS form instruction. This is like D, but the
lower two bits are forced to zero. */
static unsigned long
insert_ds (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if ((value & 3) != 0)
*errmsg = _("offset not a multiple of 4");
return insn | (value & 0xfffc);
}
static long
extract_ds (unsigned long insn,
int dialect ATTRIBUTE_UNUSED,
int *invalid ATTRIBUTE_UNUSED)
{
return ((insn & 0xfffc) ^ 0x8000) - 0x8000;
}
/* The DE field in a DE form instruction. */
static unsigned long
insert_de (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if (value > 2047 || value < -2048)
*errmsg = _("offset not between -2048 and 2047");
return insn | ((value << 4) & 0xfff0);
}
static long
extract_de (unsigned long insn,
int dialect ATTRIBUTE_UNUSED,
int *invalid ATTRIBUTE_UNUSED)
{
return (insn & 0xfff0) >> 4;
}
/* The DES field in a DES form instruction. */
static unsigned long
insert_des (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if (value > 8191 || value < -8192)
*errmsg = _("offset not between -8192 and 8191");
else if ((value & 3) != 0)
*errmsg = _("offset not a multiple of 4");
return insn | ((value << 2) & 0xfff0);
}
static long
extract_des (unsigned long insn,
int dialect ATTRIBUTE_UNUSED,
int *invalid ATTRIBUTE_UNUSED)
{
return (((insn >> 2) & 0x3ffc) ^ 0x2000) - 0x2000;
}
/* FXM mask in mfcr and mtcrf instructions. */ /* FXM mask in mfcr and mtcrf instructions. */
static unsigned long static unsigned long
@ -1108,28 +919,6 @@ extract_fxm (unsigned long insn,
return mask; return mask;
} }
/* The LI field in an I form instruction. The lower two bits are
forced to zero. */
static unsigned long
insert_li (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if ((value & 3) != 0)
*errmsg = _("ignoring least significant bits in branch offset");
return insn | (value & 0x3fffffc);
}
static long
extract_li (unsigned long insn,
int dialect ATTRIBUTE_UNUSED,
int *invalid ATTRIBUTE_UNUSED)
{
return ((insn & 0x3fffffc) ^ 0x2000000) - 0x2000000;
}
/* The MB and ME fields in an M form instruction expressed as a single /* The MB and ME fields in an M form instruction expressed as a single
operand which is itself a bitmask. The extraction function always operand which is itself a bitmask. The extraction function always
marks it as invalid, since we never want to recognize an marks it as invalid, since we never want to recognize an
@ -1241,19 +1030,6 @@ extract_mb6 (unsigned long insn,
/* The NB field in an X form instruction. The value 32 is stored as /* The NB field in an X form instruction. The value 32 is stored as
0. */ 0. */
static unsigned long
insert_nb (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if (value < 0 || value > 32)
*errmsg = _("value out of range");
if (value == 32)
value = 0;
return insn | ((value & 0x1f) << 11);
}
static long static long
extract_nb (unsigned long insn, extract_nb (unsigned long insn,
int dialect ATTRIBUTE_UNUSED, int dialect ATTRIBUTE_UNUSED,
@ -1376,34 +1152,6 @@ extract_rbs (unsigned long insn,
return 0; return 0;
} }
/* The RT field of the DQ form lq instruction, which has special
value restrictions. */
static unsigned long
insert_rtq (unsigned long insn,
long value,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if ((value & 1) != 0)
*errmsg = _("target register operand must be even");
return insn | ((value & 0x1f) << 21);
}
/* The RS field of the DS form stq instruction, which has special
value restrictions. */
static unsigned long
insert_rsq (unsigned long insn,
long value ATTRIBUTE_UNUSED,
int dialect ATTRIBUTE_UNUSED,
const char **errmsg)
{
if ((value & 1) != 0)
*errmsg = _("source register operand must be even");
return insn | ((value & 0x1f) << 21);
}
/* The SH field in an MD form instruction. This is split. */ /* The SH field in an MD form instruction. This is split. */
static unsigned long static unsigned long
@ -1811,7 +1559,7 @@ extract_tbr (unsigned long insn,
/* An XFX form instruction with the SPR field filled in except for the /* An XFX form instruction with the SPR field filled in except for the
SPRG field. */ SPRG field. */
#define XSPRG_MASK (XSPR_MASK & ~(0x17 << 16)) #define XSPRG_MASK (XSPR_MASK & ~(0x1f << 16))
/* An X form instruction with everything filled in except the E field. */ /* An X form instruction with everything filled in except the E field. */
#define XE_MASK (0xffff7fff) #define XE_MASK (0xffff7fff)
@ -3242,8 +2990,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
{ "bcctrl", XLLK(19,528,1), XLBH_MASK, PPCCOM, { BO, BI, BH } }, { "bcctrl", XLLK(19,528,1), XLBH_MASK, PPCCOM, { BO, BI, BH } },
{ "bcc", XLLK(19,528,0), XLBB_MASK, PWRCOM, { BO, BI } }, { "bcc", XLLK(19,528,0), XLBB_MASK, PWRCOM, { BO, BI } },
{ "bccl", XLLK(19,528,1), XLBB_MASK, PWRCOM, { BO, BI } }, { "bccl", XLLK(19,528,1), XLBB_MASK, PWRCOM, { BO, BI } },
{ "bcctre", XLLK(19,529,0), XLYBB_MASK, BOOKE64, { BO, BI } }, { "bcctre", XLLK(19,529,0), XLBB_MASK, BOOKE64, { BO, BI } },
{ "bcctrel", XLLK(19,529,1), XLYBB_MASK, BOOKE64, { BO, BI } }, { "bcctrel", XLLK(19,529,1), XLBB_MASK, BOOKE64, { BO, BI } },
{ "rlwimi", M(20,0), M_MASK, PPCCOM, { RA,RS,SH,MBE,ME } }, { "rlwimi", M(20,0), M_MASK, PPCCOM, { RA,RS,SH,MBE,ME } },
{ "rlimi", M(20,0), M_MASK, PWRCOM, { RA,RS,SH,MBE,ME } }, { "rlimi", M(20,0), M_MASK, PWRCOM, { RA,RS,SH,MBE,ME } },