projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New Year - binutils ChangeLog rotation
[deliverable/binutils-gdb.git]
/
opcodes
/
crx-dis.c
diff --git
a/opcodes/crx-dis.c
b/opcodes/crx-dis.c
index 8f14e8ba92b2f77b3fd927929034357d8e65db57..710a96ec3d34534c8462ab4db682c2a3a3c1d756 100644
(file)
--- a/
opcodes/crx-dis.c
+++ b/
opcodes/crx-dis.c
@@
-1,26
+1,27
@@
/* Disassembler code for CRX.
/* Disassembler code for CRX.
- Copyright 2004, 2005 Free Software Foundation, Inc.
+ Copyright 2004, 2005
, 2006, 2007, 2012
Free Software Foundation, Inc.
Contributed by Tomer Levi, NSC, Israel.
Written by Tomer Levi.
Contributed by Tomer Levi, NSC, Israel.
Written by Tomer Levi.
- This file is part of the GNU
binutils and GDB, the GNU debugger
.
+ This file is part of the GNU
opcodes library
.
- 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 the Free
-
Software Foundation; either version 2
, or (at your option)
+ This
library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+
the Free Software Foundation; either version 3
, or (at your option)
any later version.
any later version.
-
This program
is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
+
It
is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+
License for
more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
-#include "dis-asm.h"
#include "sysdep.h"
#include "sysdep.h"
+#include "dis-asm.h"
#include "opcode/crx.h"
/* String to print when opcode was not matched. */
#include "opcode/crx.h"
/* String to print when opcode was not matched. */
@@
-30,7
+31,7
@@
/* Extract 'n_bits' from 'a' starting from offset 'offs'. */
#define EXTRACT(a, offs, n_bits) \
/* Extract 'n_bits' from 'a' starting from offset 'offs'. */
#define EXTRACT(a, offs, n_bits) \
- (n_bits == 32 ? (((a) >> (offs)) &
~0
L) \
+ (n_bits == 32 ? (((a) >> (offs)) &
0xffffffff
L) \
: (((a) >> (offs)) & ((1 << (n_bits)) -1)))
/* Set Bit Mask - a mask to set all bits starting from offset 'offs'. */
: (((a) >> (offs)) & ((1 << (n_bits)) -1)))
/* Set Bit Mask - a mask to set all bits starting from offset 'offs'. */
@@
-154,12
+155,12
@@
getargtype (operand_type op)
This routine is used when disassembling the 'excp' instruction. */
static char *
This routine is used when disassembling the 'excp' instruction. */
static char *
-gettrapstring (unsigned int index)
+gettrapstring (unsigned int
trap_
index)
{
const trap_entry *trap;
for (trap = crx_traps; trap < crx_traps + NUMTRAPS; trap++)
{
const trap_entry *trap;
for (trap = crx_traps; trap < crx_traps + NUMTRAPS; trap++)
- if (trap->entry == index)
+ if (trap->entry ==
trap_
index)
return trap->name;
return ILLEGAL;
return trap->name;
return ILLEGAL;
@@
-185,12
+186,12
@@
getcinvstring (unsigned int num)
char *
getregname (reg r)
{
char *
getregname (reg r)
{
- const reg_entry *
reg
= &crx_regtab[r];
+ const reg_entry *
regentry
= &crx_regtab[r];
- if (reg->type != CRX_R_REGTYPE)
+ if (reg
entry
->type != CRX_R_REGTYPE)
return ILLEGAL;
else
return ILLEGAL;
else
- return reg->name;
+ return reg
entry
->name;
}
/* Given a coprocessor register enum value, retrieve its name. */
}
/* Given a coprocessor register enum value, retrieve its name. */
@@
-198,28
+199,28
@@
getregname (reg r)
char *
getcopregname (copreg r, reg_type type)
{
char *
getcopregname (copreg r, reg_type type)
{
- const reg_entry *
reg
;
+ const reg_entry *
regentry
;
if (type == CRX_C_REGTYPE)
if (type == CRX_C_REGTYPE)
- reg = &crx_copregtab[r];
+ reg
entry
= &crx_copregtab[r];
else if (type == CRX_CS_REGTYPE)
else if (type == CRX_CS_REGTYPE)
- reg = &crx_copregtab[r+(cs0-c0)];
+ reg
entry
= &crx_copregtab[r+(cs0-c0)];
else
return ILLEGAL;
else
return ILLEGAL;
- return reg->name;
+ return reg
entry
->name;
}
/* Getting a processor register name. */
static char *
}
/* Getting a processor register name. */
static char *
-getprocregname (int index)
+getprocregname (int
reg_
index)
{
const reg_entry *r;
for (r = crx_regtab; r < crx_regtab + NUMREGS; r++)
{
const reg_entry *r;
for (r = crx_regtab; r < crx_regtab + NUMREGS; r++)
- if (r->image == index)
+ if (r->image ==
reg_
index)
return r->name;
return "ILLEGAL REGISTER";
return r->name;
return "ILLEGAL REGISTER";
@@
-354,7
+355,7
@@
match_opcode (void)
unsigned long mask;
/* The instruction 'constant' opcode doewsn't exceed 32 bits. */
unsigned long mask;
/* The instruction 'constant' opcode doewsn't exceed 32 bits. */
- unsigned long doubleWord =
words[1] + (words[0] << 16)
;
+ unsigned long doubleWord =
(words[1] + (words[0] << 16)) & 0xffffffff
;
/* Start searching from end of instruction table. */
instruction = &crx_instruction[NUMOPCODES - 2];
/* Start searching from end of instruction table. */
instruction = &crx_instruction[NUMOPCODES - 2];
@@
-547,7
+548,7
@@
print_arg (argument *a, bfd_vma memaddr, struct disassemble_info *info)
func (stream, "%s", string);
}
else
func (stream, "%s", string);
}
else
- func (stream, "$0x%lx", a->constant);
+ func (stream, "$0x%lx", a->constant
& 0xffffffff
);
}
else
{
}
else
{
@@
-556,12
+557,12
@@
print_arg (argument *a, bfd_vma memaddr, struct disassemble_info *info)
}
}
else
}
}
else
- func (stream, "$0x%lx", a->constant);
+ func (stream, "$0x%lx", a->constant
& 0xffffffff
);
break;
case arg_idxr:
break;
case arg_idxr:
- func (stream, "0x%lx(%s,%s,%d)", a->constant
, getregname (a->r)
,
- getregname (a->i_r), powerof2 (a->scale));
+ func (stream, "0x%lx(%s,%s,%d)", a->constant
& 0xffffffff
,
+ getregname (a->
r), getregname (a->
i_r), powerof2 (a->scale));
break;
case arg_rbase:
break;
case arg_rbase:
@@
-569,7
+570,7
@@
print_arg (argument *a, bfd_vma memaddr, struct disassemble_info *info)
break;
case arg_cr:
break;
case arg_cr:
- func (stream, "0x%lx(%s)", a->constant, getregname (a->r));
+ func (stream, "0x%lx(%s)", a->constant
& 0xffffffff
, getregname (a->r));
if (IS_INSN_TYPE (LD_STOR_INS_INC))
func (stream, "+");
if (IS_INSN_TYPE (LD_STOR_INS_INC))
func (stream, "+");
@@
-633,17
+634,17
@@
print_arg (argument *a, bfd_vma memaddr, struct disassemble_info *info)
/* Print all the arguments of CURRINSN instruction. */
static void
/* Print all the arguments of CURRINSN instruction. */
static void
-print_arguments (ins *currInsn, bfd_vma memaddr, struct disassemble_info *info)
+print_arguments (ins *curr
ent
Insn, bfd_vma memaddr, struct disassemble_info *info)
{
int i;
{
int i;
- for (i = 0; i < currInsn->nargs; i++)
+ for (i = 0; i < curr
ent
Insn->nargs; i++)
{
processing_argument_number = i;
{
processing_argument_number = i;
- print_arg (&currInsn->arg[i], memaddr, info);
+ print_arg (&curr
ent
Insn->arg[i], memaddr, info);
- if (i != currInsn->nargs - 1)
+ if (i != curr
ent
Insn->nargs - 1)
info->fprintf_func (info->stream, ", ");
}
}
info->fprintf_func (info->stream, ", ");
}
}
This page took
0.02636 seconds
and
4
git commands to generate.