espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-18 00:32:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile time warnings about comparisons always being false.

Browse Source 
PR 25224
gas	* config/tc-z80.c (emit_ld_m_rr): Use integer types when checking
	opcode byte values.
	(emit_ld_r_r): Likewise.
	(emit_ld_rr_m): Likewise.
	(emit_ld_rr_nn): Likewise.

opcodes	* z80-dis.c (ld_ii_ii): Use character constant when checking
	opcode byte value.
This commit is contained in:
Sergey Belyashov
2020-01-09 11:47:44 +00:00
committed by Nick Clifton
parent 72aea32839
commit 40c75bc8b0
4 changed files with 114 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gas/ChangeLog
View File

@ -1,3 +1,12 @@
2020-01-03 Sergey Belyashov <sergey.belyashov@gmail.com>
PR 25224
* config/tc-z80.c (emit_ld_m_rr): Use integer types when checking
opcode byte values.
(emit_ld_r_r): Likewise.
(emit_ld_rr_m): Likewise.
(emit_ld_rr_nn): Likewise.
2020-01-09 Jan Beulich <jbeulich@suse.com>
* config/tc-i386.c (optimize_encoding): Add

63
gas/config/tc-z80.c
View File

@ -786,11 +786,12 @@ contains_register(symbolS *sym)
if (sym)
{
expressionS * ex = symbol_get_value_expression(sym);
return (O_register == ex->X_op)
|| (ex->X_add_symbol && contains_register(ex->X_add_symbol))
|| (ex->X_op_symbol && contains_register(ex->X_op_symbol));
}
else
return 0;
}
@ -861,7 +862,7 @@ unify_indexed (expressionS *op)
return 0;
}
/* convert subtraction to addition of negative value */
/* Convert subtraction to addition of negative value. */
if (O_subtract == op->X_op)
{
expressionS minus;
@ -872,7 +873,8 @@ unify_indexed (expressionS *op)
op->X_op_symbol = make_expr_symbol (&minus);
op->X_op = O_add;
}
/* clear X_add_number of the expression */
/* Clear X_add_number of the expression. */
if (op->X_add_number != 0)
{
expressionS add;
@ -891,7 +893,7 @@ unify_indexed (expressionS *op)
return 1;
}
/* Parse expression, change operator to O_md1 for indexed addressing*/
/* Parse expression, change operator to O_md1 for indexed addressing. */
static const char *
parse_exp (const char *s, expressionS *op)
{
@ -1890,9 +1892,10 @@ emit_rst (char prefix ATTRIBUTE_UNUSED, char opcode, const char * args)
return p;
}
/* For 8-bit indirect load to memory instructions like: LD (HL),n or LD (ii+d),n. */
static void
emit_ld_m_n (expressionS *dst, expressionS *src)
{ /* for 8-bit indirect load to memory instructions like: LD (HL),n or LD (ii+d),n */
{
char *q;
char prefix;
expressionS dst_offset;
@ -1921,9 +1924,10 @@ emit_ld_m_n(expressionS *dst, expressionS *src)
emit_byte (src, BFD_RELOC_8);
}
/* For 8-bit load register to memory instructions: LD (<expression>),r. */
static void
emit_ld_m_r (expressionS *dst, expressionS *src)
{ /* for 8-bit load register to memory instructions: LD (<expression>),r */
{
char *q;
char prefix = 0;
expressionS dst_offset;
@ -1980,12 +1984,13 @@ emit_ld_m_r(expressionS *dst, expressionS *src)
ill_op ();
}
/* For 16-bit load register to memory instructions: LD (<expression>),rr. */
static void
emit_ld_m_rr (expressionS *dst, expressionS *src)
{ /* for 16-bit load register to memory instructions: LD (<expression>),rr */
{
char *q;
char prefix = 0;
char opcode = 0;
int prefix = 0;
int opcode = 0;
expressionS dst_offset;
switch (dst->X_op)
@ -2007,15 +2012,15 @@ emit_ld_m_rr(expressionS *dst, expressionS *src)
case REG_BC: opcode = 0x0F; break;
case REG_DE: opcode = 0x1F; break;
case REG_HL: opcode = 0x2F; break;
case REG_IX: opcode = (prefix != '\xfd') ? 0x3F : 0x3E; break;
case REG_IY: opcode = (prefix != '\xfd') ? 0x3E : 0x3F; break;
case REG_IX: opcode = (prefix != 0xFD) ? 0x3F : 0x3E; break;
case REG_IY: opcode = (prefix != 0xFD) ? 0x3E : 0x3F; break;
default:
ill_op ();
}
q = frag_more (prefix ? 2 : 1);
*q++ = prefix;
*q = opcode;
if (prefix == '\xfd' || prefix == '\xdd')
if (prefix == 0xFD || prefix == 0xDD)
{
dst_offset = *dst;
dst_offset.X_op = O_symbol;
@ -2165,8 +2170,8 @@ emit_ld_r_r (expressionS *dst, expressionS *src)
{ /* mostly 8-bit load register from register instructions: LD r,r */
/* there are some exceptions: LD SP,HL/IX/IY; LD I,HL and LD HL,I */
char *q;
char prefix = 0;
char opcode = 0;
int prefix = 0;
int opcode = 0;
int ii_halves = 0;
switch (dst->X_add_number)
@ -2296,14 +2301,14 @@ emit_ld_r_r (expressionS *dst, expressionS *src)
break;
case REG_H|R_IX:
case REG_L|R_IX:
if (prefix == '\xfd' || dst->X_add_number == REG_H || dst->X_add_number == REG_L)
if (prefix == 0xFD || dst->X_add_number == REG_H || dst->X_add_number == REG_L)
ill_op (); /* LD IYL,IXL and LD H,IXH are not permitted */
prefix = 0xDD;
ii_halves = 1;
break;
case REG_H|R_IY:
case REG_L|R_IY:
if (prefix == '\xdd' || dst->X_add_number == REG_H || dst->X_add_number == REG_L)
if (prefix == 0xDD || dst->X_add_number == REG_H || dst->X_add_number == REG_L)
ill_op (); /* LD IXH,IYH and LD L,IYL are not permitted */
prefix = 0xFD;
ii_halves = 1;
@ -2341,8 +2346,8 @@ static void
emit_ld_rr_m (expressionS *dst, expressionS *src)
{ /* for 16-bit indirect load from memory to register: LD rr,(xxx) */
char *q;
char prefix = 0;
char opcode = 0;
int prefix = 0;
int opcode = 0;
expressionS src_offset;
/* GBZ80 has no support for 16-bit load from memory instructions */
@ -2364,15 +2369,15 @@ emit_ld_rr_m (expressionS *dst, expressionS *src)
case REG_BC: opcode = 0x07; break;
case REG_DE: opcode = 0x17; break;
case REG_HL: opcode = 0x27; break;
case REG_IX: opcode = (!prefix || prefix == '\xdd') ? 0x37 : 0x31; break;
case REG_IY: opcode = prefix ? ((prefix == '\xdd') ? 0x31 : 0x37) : 0x36; break;
case REG_IX: opcode = (!prefix || prefix == 0xDD) ? 0x37 : 0x31; break;
case REG_IY: opcode = prefix ? ((prefix == 0xDD) ? 0x31 : 0x37) : 0x36; break;
default:
ill_op ();
}
q = frag_more (2);
*q++ = prefix;
*q = opcode;
if (prefix != '\xed')
if (prefix != 0xED)
{
src_offset = *src;
src_offset.X_op = O_symbol;
@ -2405,8 +2410,8 @@ static void
emit_ld_rr_nn (expressionS *dst, expressionS *src)
{ /* mostly load imediate value to multibyte register instructions: LD rr,nn */
char *q;
char prefix = 0x00;
char opcode = 0x21; /* LD HL,nn */
int prefix = 0x00;
int opcode = 0x21; /* LD HL,nn */
switch (dst->X_add_number)
{
case REG_IX:
@ -2643,10 +2648,10 @@ emit_lea (char prefix, char opcode, const char * args)
switch (rnum)
{
case REG_IX:
opcode = (opcode == 0x33) ? 0x55 : (opcode|0x00);
opcode = (opcode == (char)0x33) ? 0x55 : (opcode|0x00);
break;
case REG_IY:
opcode = (opcode == 0x32) ? 0x54 : (opcode|0x01);
opcode = (opcode == (char)0x32) ? 0x54 : (opcode|0x01);
}
q = frag_more (2);
@ -3497,7 +3502,7 @@ str_to_broken_float (bfd_boolean *signP, bfd_uint64_t *mantissaP, int *expP)
if (*p == '.')
{
p++;
if (!exponent) /* if no precission overflow */
if (!exponent) /* If no precission overflow. */
{
for (; ISDIGIT (*p); ++p, --exponent)
{
@ -3540,10 +3545,8 @@ str_to_broken_float (bfd_boolean *signP, bfd_uint64_t *mantissaP, int *expP)
/* normalization */
for (; mantissa <= ~0ull/10; --exponent)
mantissa *= 10;
/*
now we have sign, mantissa, and signed decimal exponent
need to recompute to binary exponent
*/
/* Now we have sign, mantissa, and signed decimal exponent
need to recompute to binary exponent. */
for (i = 64; exponent > 0; --exponent)
{
/* be sure that no integer overflow */

6
opcodes/ChangeLog
View File

@ -1,3 +1,9 @@
2020-01-03 Sergey Belyashov <sergey.belyashov@gmail.com>
PR 25224
* z80-dis.c (ld_ii_ii): Use character constant when checking
opcode byte value.
2020-01-09 Jan Beulich <jbeulich@suse.com>
* i386-dis.c (SEP_Fixup): New.

2
opcodes/z80-dis.c
View File

@ -603,7 +603,7 @@ ld_ii_ii(struct buffer *buf, disassemble_info * info, const char *txt)
int p;
static const char *ii[2] = { "ix", "iy" };
p = (buf->data[buf->n_fetch - 2] == '\xdd') ? 0 : 1;
p = (buf->data[buf->n_fetch - 2] == (char) 0xdd) ? 0 : 1;
c = buf->data[buf->n_fetch - 1];
if ((c & 0x07) != 0x07)
p = 1 - p; /* 0 -> 1, 1 -> 0 */