OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

opcodes/

Browse Source 
2005-08-26  Jan Beulich  <jbeulich@novell.com>

	* i386-dis.c (intel_operand_size): New, broken out from OP_E for
	re-use.
	(OP_E): Call intel_operand_size, move call site out of mode
	dependent code.
	(OP_OFF): Call intel_operand_size if suffix_always. Remove
	ATTRIBUTE_UNUSED from parameters.
	(OP_OFF64): Likewise.
	(OP_ESreg): Call intel_operand_size.
	(OP_DSreg): Likewise.
	(OP_DIR): Use colon rather than semicolon as separator of far
	jump/call operands.

gas/testsuite/
2005-08-26  Jan Beulich  <jbeulich@novell.com>

	* gas/i386/intelok.d: Adjust.
This commit is contained in:
Jan Beulich 2005-08-26 15:33:43 +00:00
parent c0524131ea
commit 3f31e633c2
4 changed files with 94 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gas/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2005-08-26 Jan Beulich <jbeulich@novell.com>
* gas/i386/intelok.d: Adjust.
2005-08-25 Chao-ying Fu <fu@mips.com>
* gas/mips/mips.exp: Run DSP test.

2
gas/testsuite/gas/i386/intelok.d
View File

@ -126,7 +126,7 @@ Disassembly of section .text:
[ ]*[0-9a-f]+: 8b 00[ ]+mov[ ]+eax,(DWORD PTR )?\[eax\]
[ ]*[0-9a-f]+: 8b 04 08[ ]+mov[ ]+eax,(DWORD PTR )?\[eax\+ecx\]
[ ]*[0-9a-f]+: 8b 04 08[ ]+mov[ ]+eax,(DWORD PTR )?\[eax\+ecx\]
[ ]*[0-9a-f]+: 26 8b 00[ ]+mov[ ]+eax,es:(DWORD PTR )?\[eax\]
[ ]*[0-9a-f]+: 26 8b 00[ ]+mov[ ]+eax,(DWORD PTR )?es:\[eax\]
[ ]*[0-9a-f]+: 6a 01[ ]+push[ ]+0x1
[ ]*[0-9a-f]+: 6a ff[ ]+push[ ]+0xffffffff
[ ]*[0-9a-f]+: 6a fe[ ]+push[ ]+0xfffffffe

14
opcodes/ChangeLog
View File

@ -1,3 +1,17 @@
2005-08-26 Jan Beulich <jbeulich@novell.com>
* i386-dis.c (intel_operand_size): New, broken out from OP_E for
re-use.
(OP_E): Call intel_operand_size, move call site out of mode
dependent code.
(OP_OFF): Call intel_operand_size if suffix_always. Remove
ATTRIBUTE_UNUSED from parameters.
(OP_OFF64): Likewise.
(OP_ESreg): Call intel_operand_size.
(OP_DSreg): Likewise.
(OP_DIR): Use colon rather than semicolon as separator of far
jump/call operands.
2005-08-25 Chao-ying Fu <fu@mips.com>
* mips-opc.c (WR_a, RD_a, MOD_a, DSP_VOLA, D32): New define.

164
opcodes/i386-dis.c
View File

@ -3122,6 +3122,67 @@ print_operand_value (char *buf, int hex, bfd_vma disp)
}
}
static void
intel_operand_size (int bytemode, int sizeflag)
{
switch (bytemode)
{
case b_mode:
oappend ("BYTE PTR ");
break;
case w_mode:
case dqw_mode:
oappend ("WORD PTR ");
break;
case branch_v_mode:
if (mode_64bit && (sizeflag & DFLAG))
{
oappend ("QWORD PTR ");
used_prefixes |= (prefixes & PREFIX_DATA);
break;
}
/* FALLTHRU */
case v_mode:
case dq_mode:
USED_REX (REX_MODE64);
if (rex & REX_MODE64)
oappend ("QWORD PTR ");
else if ((sizeflag & DFLAG) || bytemode == dq_mode)
oappend ("DWORD PTR ");
else
oappend ("WORD PTR ");
used_prefixes |= (prefixes & PREFIX_DATA);
break;
case d_mode:
oappend ("DWORD PTR ");
break;
case q_mode:
oappend ("QWORD PTR ");
break;
case m_mode:
if (mode_64bit)
oappend ("QWORD PTR ");
else
oappend ("DWORD PTR ");
break;
case f_mode:
if (sizeflag & DFLAG)
oappend ("FWORD PTR ");
else
oappend ("DWORD PTR ");
used_prefixes |= (prefixes & PREFIX_DATA);
break;
case t_mode:
oappend ("TBYTE PTR ");
break;
case x_mode:
oappend ("XMMWORD PTR ");
break;
default:
break;
}
}
static void
OP_E (int bytemode, int sizeflag)
{
@ -3196,6 +3257,8 @@ OP_E (int bytemode, int sizeflag)
}
disp = 0;
if (intel_syntax)
intel_operand_size (bytemode, sizeflag);
append_seg ();
if ((sizeflag & AFLAG) || mode_64bit) /* 32 bit address mode */
@ -3262,60 +3325,6 @@ OP_E (int bytemode, int sizeflag)
if (havebase || (havesib && (index != 4 || scale != 0)))
{
if (intel_syntax)
{
switch (bytemode)
{
case b_mode:
oappend ("BYTE PTR ");
break;
case w_mode:
case dqw_mode:
oappend ("WORD PTR ");
break;
case branch_v_mode:
case v_mode:
case dq_mode:
USED_REX (REX_MODE64);
if (rex & REX_MODE64)
oappend ("QWORD PTR ");
else if ((sizeflag & DFLAG) || bytemode == dq_mode)
oappend ("DWORD PTR ");
else
oappend ("WORD PTR ");
used_prefixes |= (prefixes & PREFIX_DATA);
break;
case d_mode:
oappend ("DWORD PTR ");
break;
case q_mode:
oappend ("QWORD PTR ");
break;
case m_mode:
if (mode_64bit)
oappend ("QWORD PTR ");
else
oappend ("DWORD PTR ");
break;
case f_mode:
if (sizeflag & DFLAG)
{
used_prefixes |= (prefixes & PREFIX_DATA);
oappend ("FWORD PTR ");
}
else
oappend ("DWORD PTR ");
break;
case t_mode:
oappend ("TBYTE PTR ");
break;
case x_mode:
oappend ("XMMWORD PTR ");
break;
default:
break;
}
}
*obufp++ = open_char;
if (intel_syntax && riprel)
oappend ("rip + ");
@ -3908,17 +3917,19 @@ OP_DIR (int dummy ATTRIBUTE_UNUSED, int sizeflag)
}
used_prefixes |= (prefixes & PREFIX_DATA);
if (intel_syntax)
sprintf (scratchbuf, "0x%x,0x%x", seg, offset);
sprintf (scratchbuf, "0x%x:0x%x", seg, offset);
else
sprintf (scratchbuf, "$0x%x,$0x%x", seg, offset);
oappend (scratchbuf);
}
static void
OP_OFF (int bytemode ATTRIBUTE_UNUSED, int sizeflag)
OP_OFF (int bytemode, int sizeflag)
{
bfd_vma off;
if (intel_syntax && (sizeflag & SUFFIX_ALWAYS))
intel_operand_size (bytemode, sizeflag);
append_seg ();
if ((sizeflag & AFLAG) || mode_64bit)
@ -3940,7 +3951,7 @@ OP_OFF (int bytemode ATTRIBUTE_UNUSED, int sizeflag)
}
static void
OP_OFF64 (int bytemode ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
OP_OFF64 (int bytemode, int sizeflag)
{
bfd_vma off;
@ -3950,6 +3961,8 @@ OP_OFF64 (int bytemode ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
return;
}
if (intel_syntax && (sizeflag & SUFFIX_ALWAYS))
intel_operand_size (bytemode, sizeflag);
append_seg ();
off = get64 ();
@ -3994,22 +4007,7 @@ static void
OP_ESreg (int code, int sizeflag)
{
if (intel_syntax)
{
if (codep[-1] & 1)
{
USED_REX (REX_MODE64);
used_prefixes |= (prefixes & PREFIX_DATA);
if (rex & REX_MODE64)
oappend ("QWORD PTR ");
else if ((sizeflag & DFLAG))
oappend ("DWORD PTR ");
else
oappend ("WORD PTR ");
}
else
oappend ("BYTE PTR ");
}
intel_operand_size (codep[-1] & 1 ? v_mode : b_mode, sizeflag);
oappend ("%es:" + intel_syntax);
ptr_reg (code, sizeflag);
}
@ -4018,22 +4016,10 @@ static void
OP_DSreg (int code, int sizeflag)
{
if (intel_syntax)
{
if (codep[-1] != 0xd7 && (codep[-1] & 1))
{
USED_REX (REX_MODE64);
used_prefixes |= (prefixes & PREFIX_DATA);
if (rex & REX_MODE64)
oappend ("QWORD PTR ");
else if ((sizeflag & DFLAG))
oappend ("DWORD PTR ");
else
oappend ("WORD PTR ");
}
else
oappend ("BYTE PTR ");
}
intel_operand_size (codep[-1] != 0xd7 && (codep[-1] & 1)
? v_mode
: b_mode,
sizeflag);
if ((prefixes
& (PREFIX_CS
| PREFIX_DS