/* Disassemble MN10300 instructions.
- Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <stdio.h>
-#include "ansidecl.h"
+#include "sysdep.h"
#include "opcode/mn10300.h"
#include "dis-asm.h"
#include "opintl.h"
static void disassemble PARAMS ((bfd_vma, struct disassemble_info *,
unsigned long insn, unsigned int));
+#define HAVE_AM33 (info->mach == AM33)
+#define HAVE_AM30 (info->mach == AM30)
+
int
print_insn_mn10300 (memaddr, info)
bfd_vma memaddr;
|| (insn & 0xfc) == 0x38
|| (insn & 0xff) == 0xde
|| (insn & 0xff) == 0xdf
- /* start-sanitize-am33 */
|| (insn & 0xff) == 0xf9
- /* end-sanitize-am33 */
|| (insn & 0xff) == 0xcc)
{
status = (*info->read_memory_func) (memaddr, buffer, 2, info);
/* These are four byte insns. */
else if ((insn & 0xff) == 0xfa
- /* start-sanitize-am33 */
|| (insn & 0xff) == 0xf7
- /* end-sanitize-am33 */
|| (insn & 0xff) == 0xfb)
{
status = (*info->read_memory_func) (memaddr, buffer, 4, info);
mysize = 4;
else if (op->format == FMT_D4)
mysize = 6;
- /* start-sanitize-am33 */
else if (op->format == FMT_D6)
mysize = 3;
else if (op->format == FMT_D7 || op->format == FMT_D10)
mysize = 6;
else if (op->format == FMT_D9)
mysize = 7;
- /* end-sanitize-am33 */
else
mysize = 7;
if ((op->mask & insn) == op->opcode
- && size == (unsigned int) mysize)
+ && size == (unsigned int) mysize
+ && (op->machine == 0
+ || (op->machine == AM33 && HAVE_AM33)
+ || (op->machine == AM30 && HAVE_AM30)))
{
const unsigned char *opindex_ptr;
unsigned int nocomma;
|| op->format == FMT_S2 || op->format == FMT_S4
|| op->format == FMT_S6 || op->format == FMT_D5)
extra_shift = 16;
- /* start-sanitize-am33 */
else if (op->format == FMT_D7
|| op->format == FMT_D8
|| op->format == FMT_D9)
extra_shift = 8;
- /* end-sanitize-am33 */
else
extra_shift = 0;
{
extension = 0;
}
- /* start-sanitize-am33 */
else if (size == 3
&& op->format == FMT_D6)
{
extension = 0;
}
- /* end-sanitize-am33 */
else if (size == 3)
{
insn &= 0xff0000;
{
extension = 0;
}
- /* start-sanitize-am33 */
else if (size == 4
&& (op->format == FMT_D7
|| op->format == FMT_D10))
{
extension = 0;
}
- /* end-sanitize-am33 */
else if (size == 4)
{
insn &= 0xffff0000;
}
extension = *(unsigned char *)buffer;
}
- /* start-sanitize-am33 */
else if (size == 6 && op->format == FMT_D8)
{
insn &= 0xffffff00;
}
extension = bfd_getl16 (buffer);
}
- /* end-sanitize-am33 */
else if (size == 6)
{
unsigned long temp = 0;
insn |= (temp >> 16) & 0xffff;
extension = temp & 0xffff;
}
- /* start-sanitize-am33 */
else if (size == 7 && op->format == FMT_D9)
{
insn &= 0xffffff00;
insn |= (extension & 0xff000000) >> 24;
extension &= 0xffffff;
}
- /* end-sanitize-am33 */
else if (size == 7 && op->opcode == 0xdd000000)
{
unsigned long temp = 0;
operand = &mn10300_operands[*opindex_ptr];
+ /* If this operand is a PLUS (autoincrement), then do not emit
+ a comma before emitting the plus. */
+ if ((operand->flags & MN10300_OPERAND_PLUS) != 0)
+ nocomma = 1;
+
if ((operand->flags & MN10300_OPERAND_SPLIT) != 0)
{
unsigned long temp;
temp = extension >> operand->shift;
temp &= ((1 << (32 - operand->bits)) - 1);
value |= temp;
+ value = ((value ^ (((unsigned long)1) << 31))
+ - (((unsigned long)1) << 31));
}
- /* start-sanitize-am33 */
else if ((operand->flags & MN10300_OPERAND_24BIT) != 0)
{
unsigned long temp;
temp &= ((1 << (24 - operand->bits)) - 1);
value |= temp;
if ((operand->flags & MN10300_OPERAND_SIGNED) != 0)
- value = ((value & 0xffffff) ^ (~0x7fffff)) + 0x800000;
+ value = ((value & 0xffffff) ^ 0x800000) - 0x800000;
}
- /* end-sanitize-am33 */
else if ((operand->flags & MN10300_OPERAND_EXTENDED) != 0)
{
value = ((extension >> (operand->shift))
}
if ((operand->flags & MN10300_OPERAND_SIGNED) != 0
- /* start-sanitize-am33 */
- /* These are properly extended by the code above. */
- && ((operand->flags & MN10300_OPERAND_24BIT) == 0)
- /* end-sanitize-am33 */
- )
- value = ((long)(value << (32 - operand->bits))
- >> (32 - operand->bits));
+ /* These are properly extended by the code above. */
+ && ((operand->flags & MN10300_OPERAND_24BIT) == 0))
+ value = ((value ^ (((unsigned long)1) << (operand->bits - 1)))
+ - (((unsigned long)1) << (operand->bits - 1)));
if (!nocomma
&& (!paren
{
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
- (*info->fprintf_func) (info->stream, "d%d", value);
+ (*info->fprintf_func) (info->stream, "d%d", (int)value);
}
else if ((operand->flags & MN10300_OPERAND_AREG) != 0)
{
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
- (*info->fprintf_func) (info->stream, "a%d", value);
+ (*info->fprintf_func) (info->stream, "a%d", (int)value);
}
else if ((operand->flags & MN10300_OPERAND_SP) != 0)
else if ((operand->flags & MN10300_OPERAND_MDR) != 0)
(*info->fprintf_func) (info->stream, "mdr");
- /* start-sanitize-am33 */
else if ((operand->flags & MN10300_OPERAND_RREG) != 0)
{
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
- (*info->fprintf_func) (info->stream, "r%d", value);
+ if (value < 8)
+ (*info->fprintf_func) (info->stream, "r%d", (int)value);
+ else if (value < 12)
+ (*info->fprintf_func) (info->stream, "a%d", (int)value - 8);
+ else
+ (*info->fprintf_func) (info->stream, "d%d", (int)value - 12);
}
else if ((operand->flags & MN10300_OPERAND_XRREG) != 0)
{
value = ((insn >> (operand->shift + extra_shift))
& ((1 << operand->bits) - 1));
- (*info->fprintf_func) (info->stream, "xr%d", value);
+ if (value == 0)
+ (*info->fprintf_func) (info->stream, "sp", value);
+ else
+ (*info->fprintf_func) (info->stream, "xr%d", (int)value);
}
else if ((operand->flags & MN10300_OPERAND_USP) != 0)
else if ((operand->flags & MN10300_OPERAND_PLUS) != 0)
(*info->fprintf_func) (info->stream, "+");
- /* end-sanitize-am33 */
else if ((operand->flags & MN10300_OPERAND_PAREN) != 0)
{
comma = 1;
}
- /* start-sanitize-am33 */
if (value & 0x04)
{
if (comma)
(*info->fprintf_func) (info->stream, "exother");
comma = 1;
}
- /* end-sanitize-am33 */
(*info->fprintf_func) (info->stream, "]");
}
else
- (*info->fprintf_func) (info->stream, "%d", value);
+ (*info->fprintf_func) (info->stream, "%ld", (long)value);
}
/* All done. */
break;