This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [committed] Really fix PR gas/11395
- From: John David Anglin <dave at hiauly1 dot hia dot nrc dot ca>
- To: binutils at sourceware dot org
- Date: Fri, 31 Dec 2010 12:03:45 -0500
- Subject: Re: [committed] Really fix PR gas/11395
- References: <20101227021609.GA22760@hiauly1.hia.nrc.ca>
- Reply-to: John David Anglin <dave dot anglin at nrc-cnrc dot gc dot ca>
On Sun, 26 Dec 2010, John David Anglin wrote:
> The attached change fixes the handling of the doubleword carry bit (d)
> in add and sub instructions without a condition. By default, the d bit
> should be zero unless a doubleword completer is specified.
Sadly, the last change was seriously flawed. The cmpiclr instruction
has the "d" bit in a different location and playing with it broke this
instruction. It also broke disassembly. The attached change fixes
these problems.
I reviewed the handling of all conditions. There was a similar problem
for logical and unit instructions. We should prefer the 32-bit never
condition. This is minor as I don't think this changes the instruction
result. I also noticed that the 32 and 64-bit entries in pa_opcodes
for branch on bit were reversed. The 64-bit entry needs to come first
so that both 32 and 64-bit forms are recognized. Branch on bit also
requires a condition, so I added an error message.
Tested on hppa2.0w-hp-hpux11.11, hppa64-hp-hpux11.11 and hppa-unknown-linux-gnu
with full testsuite checks. It was also tested with GCC builds, and a
kernel build on hppa-unknown-linux-gnu.
Committed to trunk.
Dave
--
J. David Anglin dave.anglin@nrc-cnrc.gc.ca
National Research Council of Canada (613) 990-0752 (FAX: 952-6602)
2010-12-31 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
PR gas/11395
* config/tc-hppa.c (pa_ip): Revert last change. Add variable need_cond
to determine whether a 64-bit condition is needed for 'A' and 'S'
conditions. Default to 32-bit never condition for logical and unit
instructions. Add error message for missing branch on bit condition.
* hppa.h (pa_opcodes): Revert last change. Exchange 32 and 64-bit
"bb" entries.
* hppa-dis.c (compare_cond_64_names): Change never condition to ",*".
(add_cond_64_names): Likewise.
(logical_cond_64_names): Likewise.
(unit_cond_64_names): Likewise.
Index: gas/config/tc-hppa.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-hppa.c,v
retrieving revision 1.150
diff -u -3 -p -r1.150 tc-hppa.c
--- gas/config/tc-hppa.c 27 Dec 2010 02:05:13 -0000 1.150
+++ gas/config/tc-hppa.c 31 Dec 2010 15:53:20 -0000
@@ -3204,7 +3204,7 @@ pa_ip (char *str)
const char *args;
int match = FALSE;
int comma = 0;
- int cmpltr, nullif, flag, cond, num;
+ int cmpltr, nullif, flag, cond, need_cond, num;
int immediate_check = 0, pos = -1, len = -1;
unsigned long opcode;
struct pa_opcode *insn;
@@ -3264,6 +3264,7 @@ pa_ip (char *str)
opcode = insn->match;
strict = (insn->flags & FLAG_STRICT);
memset (&the_insn, 0, sizeof (the_insn));
+ need_cond = 1;
the_insn.reloc = R_HPPA_NONE;
@@ -3758,8 +3759,8 @@ pa_ip (char *str)
else
break;
- /* Set doubleword carry bit. */
- opcode |= 0x20;
+ /* Condition is not required with "dc". */
+ need_cond = 0;
INSERT_FIELD_AND_CONTINUE (opcode, flag, 11);
/* Handle 32 bit carry for ADD. */
@@ -3828,8 +3829,8 @@ pa_ip (char *str)
else
break;
- /* Set doubleword borrow bit. */
- opcode |= 0x20;
+ /* Condition is not required with "db". */
+ need_cond = 0;
INSERT_FIELD_AND_CONTINUE (opcode, flag, 11);
/* Handle 32 bit borrow for SUB. */
@@ -3973,14 +3974,6 @@ pa_ip (char *str)
/* Handle an add condition. */
case 'A':
- /* PR gas/11395
- If we don't have a ",*" condition or "dc" completer,
- then we have a doubleword carry match failure. */
- if (*s != ',' && !(opcode & 0x20))
- break;
- opcode |= 0x20;
- /* Fall through. */
-
case 'a':
cmpltr = 0;
flag = 0;
@@ -4063,6 +4056,11 @@ pa_ip (char *str)
as_bad (_("Invalid Add Condition: %s"), name);
*s = c;
}
+ /* Except with "dc", we have a match failure with
+ 'A' if we don't have a doubleword condition. */
+ else if (*args == 'A' && need_cond)
+ break;
+
opcode |= cmpltr << 13;
INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
@@ -4142,20 +4140,15 @@ pa_ip (char *str)
s += 2;
}
else
- as_bad (_("Invalid Bit Branch Condition: %c"), *s);
+ as_bad (_("Invalid Branch On Bit Condition: %c"), *s);
}
+ else
+ as_bad (_("Missing Branch On Bit Condition"));
+
INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 15);
/* Handle a compare/subtract condition. */
case 'S':
- /* PR gas/11395
- If we don't have a ",*" condition or "dc" completer,
- then we have a doubleword carry match failure. */
- if (*s != ',' && !(opcode & 0x20))
- break;
- opcode |= 0x20;
- /* Fall through. */
-
case 's':
cmpltr = 0;
flag = 0;
@@ -4239,6 +4232,11 @@ pa_ip (char *str)
name);
*s = c;
}
+ /* Except with "db", we have a match failure with
+ 'S' if we don't have a doubleword condition. */
+ else if (*args == 'S' && need_cond)
+ break;
+
opcode |= cmpltr << 13;
INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
@@ -4297,7 +4295,7 @@ pa_ip (char *str)
INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
- /* Handle a logical instruction condition. */
+ /* Handle a logical instruction condition. */
case 'L':
case 'l':
cmpltr = 0;
@@ -4361,6 +4359,10 @@ pa_ip (char *str)
as_bad (_("Invalid Logical Instruction Condition."));
*s = c;
}
+ /* 32-bit is default for no condition. */
+ else if (*args == 'L')
+ break;
+
opcode |= cmpltr << 13;
INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
@@ -4419,6 +4421,7 @@ pa_ip (char *str)
as_bad (_("Invalid Shift/Extract/Deposit Condition."));
*s = c;
}
+
INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
/* Handle a unit instruction condition. */
@@ -4530,6 +4533,10 @@ pa_ip (char *str)
else if (*args != 'U' || (*s != ' ' && *s != '\t'))
as_bad (_("Invalid Unit Instruction Condition."));
}
+ /* 32-bit is default for no condition. */
+ else if (*args == 'U')
+ break;
+
opcode |= cmpltr << 13;
INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
Index: include/opcode/hppa.h
===================================================================
RCS file: /cvs/src/src/include/opcode/hppa.h,v
retrieving revision 1.68
diff -u -3 -p -r1.68 hppa.h
--- include/opcode/hppa.h 27 Dec 2010 02:05:14 -0000 1.68
+++ include/opcode/hppa.h 31 Dec 2010 15:53:21 -0000
@@ -594,10 +594,10 @@ static const struct pa_opcode pa_opcodes
{ "addbf", 0xa8000000, 0xfc000000, "?dnx,b,w", pa10, 0},
{ "addibt", 0xa4000000, 0xfc000000, "?dn5,b,w", pa10, 0},
{ "addibf", 0xac000000, 0xfc000000, "?dn5,b,w", pa10, 0},
-{ "bb", 0xc0004000, 0xffe06000, "?bnx,!,w", pa10, FLAG_STRICT},
{ "bb", 0xc0006000, 0xffe06000, "?Bnx,!,w", pa20, FLAG_STRICT},
-{ "bb", 0xc4004000, 0xfc006000, "?bnx,Q,w", pa10, FLAG_STRICT},
+{ "bb", 0xc0004000, 0xffe06000, "?bnx,!,w", pa10, FLAG_STRICT},
{ "bb", 0xc4004000, 0xfc004000, "?Bnx,B,w", pa20, FLAG_STRICT},
+{ "bb", 0xc4004000, 0xfc006000, "?bnx,Q,w", pa10, FLAG_STRICT},
{ "bb", 0xc4004000, 0xfc006000, "?bnx,Q,w", pa10, 0},
{ "bvb", 0xc0004000, 0xffe04000, "?bnx,w", pa10, 0},
{ "clrbts", 0xe8004005, 0xffffffff, "", pa20, FLAG_STRICT},
@@ -634,20 +634,20 @@ static const struct pa_opcode pa_opcodes
{ "addio", 0xb4000800, 0xfc000800, "?ai,b,x", pa10, 0},
{ "addit", 0xb0000000, 0xfc000800, "?ai,b,x", pa10, 0},
{ "addito", 0xb0000800, 0xfc000800, "?ai,b,x", pa10, 0},
-{ "add", 0x08000700, 0xfc0007e0, "cY?Ax,b,t", pa20, FLAG_STRICT},
+{ "add", 0x08000720, 0xfc0007e0, "cY?Ax,b,t", pa20, FLAG_STRICT},
{ "add", 0x08000700, 0xfc0007e0, "cy?ax,b,t", pa10, FLAG_STRICT},
-{ "add", 0x08000200, 0xfc0003e0, "ca?Ax,b,t", pa20, FLAG_STRICT},
+{ "add", 0x08000220, 0xfc0003e0, "ca?Ax,b,t", pa20, FLAG_STRICT},
{ "add", 0x08000200, 0xfc0003e0, "ca?ax,b,t", pa10, FLAG_STRICT},
{ "add", 0x08000600, 0xfc000fe0, "?ax,b,t", pa10, 0},
{ "addl", 0x08000a00, 0xfc000fe0, "?ax,b,t", pa10, 0},
{ "addo", 0x08000e00, 0xfc000fe0, "?ax,b,t", pa10, 0},
{ "addc", 0x08000700, 0xfc000fe0, "?ax,b,t", pa10, 0},
{ "addco", 0x08000f00, 0xfc000fe0, "?ax,b,t", pa10, 0},
-{ "sub", 0x080004c0, 0xfc0007e0, "ct?Sx,b,t", pa20, FLAG_STRICT},
+{ "sub", 0x080004e0, 0xfc0007e0, "ct?Sx,b,t", pa20, FLAG_STRICT},
{ "sub", 0x080004c0, 0xfc0007e0, "ct?sx,b,t", pa10, FLAG_STRICT},
-{ "sub", 0x08000500, 0xfc0007e0, "cB?Sx,b,t", pa20, FLAG_STRICT},
+{ "sub", 0x08000520, 0xfc0007e0, "cB?Sx,b,t", pa20, FLAG_STRICT},
{ "sub", 0x08000500, 0xfc0007e0, "cb?sx,b,t", pa10, FLAG_STRICT},
-{ "sub", 0x08000400, 0xfc0007e0, "cv?Sx,b,t", pa20, FLAG_STRICT},
+{ "sub", 0x08000420, 0xfc0007e0, "cv?Sx,b,t", pa20, FLAG_STRICT},
{ "sub", 0x08000400, 0xfc0007e0, "cv?sx,b,t", pa10, FLAG_STRICT},
{ "sub", 0x08000400, 0xfc000fe0, "?sx,b,t", pa10, 0},
{ "subo", 0x08000c00, 0xfc000fe0, "?sx,b,t", pa10, 0},
Index: opcodes/hppa-dis.c
===================================================================
RCS file: /cvs/src/src/opcodes/hppa-dis.c,v
retrieving revision 1.49
diff -u -3 -p -r1.49 hppa-dis.c
--- opcodes/hppa-dis.c 5 Jul 2007 09:49:00 -0000 1.49
+++ opcodes/hppa-dis.c 31 Dec 2010 15:53:22 -0000
@@ -86,7 +86,7 @@ static const char *const compare_cond_na
};
static const char *const compare_cond_64_names[] =
{
- "", ",*=", ",*<", ",*<=", ",*<<", ",*<<=", ",*sv", ",*od",
+ ",*", ",*=", ",*<", ",*<=", ",*<<", ",*<<=", ",*sv", ",*od",
",*tr", ",*<>", ",*>=", ",*>", ",*>>=", ",*>>", ",*nsv", ",*ev"
};
static const char *const cmpib_cond_64_names[] =
@@ -100,7 +100,7 @@ static const char *const add_cond_names[
};
static const char *const add_cond_64_names[] =
{
- "", ",*=", ",*<", ",*<=", ",*nuv", ",*znv", ",*sv", ",*od",
+ ",*", ",*=", ",*<", ",*<=", ",*nuv", ",*znv", ",*sv", ",*od",
",*tr", ",*<>", ",*>=", ",*>", ",*uv", ",*vnz", ",*nsv", ",*ev"
};
static const char *const wide_add_cond_names[] =
@@ -114,7 +114,7 @@ static const char *const logical_cond_na
",tr", ",<>", ",>=", ",>", 0, 0, 0, ",ev"};
static const char *const logical_cond_64_names[] =
{
- "", ",*=", ",*<", ",*<=", 0, 0, 0, ",*od",
+ ",*", ",*=", ",*<", ",*<=", 0, 0, 0, ",*od",
",*tr", ",*<>", ",*>=", ",*>", 0, 0, 0, ",*ev"};
static const char *const unit_cond_names[] =
{
@@ -123,7 +123,7 @@ static const char *const unit_cond_names
};
static const char *const unit_cond_64_names[] =
{
- "", ",*swz", ",*sbz", ",*shz", ",*sdc", ",*swc", ",*sbc", ",*shc",
+ ",*", ",*swz", ",*sbz", ",*shz", ",*sdc", ",*swc", ",*sbc", ",*shc",
",*tr", ",*nwz", ",*nbz", ",*nhz", ",*ndc", ",*nwc", ",*nbc", ",*nhc"
};
static const char *const shift_cond_names[] =
@@ -132,7 +132,7 @@ static const char *const shift_cond_name
};
static const char *const shift_cond_64_names[] =
{
- "", ",*=", ",*<", ",*od", ",*tr", ",*<>", ",*>=", ",*ev"
+ ",*", ",*=", ",*<", ",*od", ",*tr", ",*<>", ",*>=", ",*ev"
};
static const char *const bb_cond_64_names[] =
{