projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s12z-opc.c formatting fixes
[deliverable/binutils-gdb.git]
/
opcodes
/
cgen-opc.c
diff --git
a/opcodes/cgen-opc.c
b/opcodes/cgen-opc.c
index 9c1e302cb5c0ff94c07ab77d16135235a3d9df1b..16d1d30875980ce6dd58ec875271f9445f67df07 100644
(file)
--- a/
opcodes/cgen-opc.c
+++ b/
opcodes/cgen-opc.c
@@
-1,7
+1,6
@@
/* CGEN generic opcode support.
/* CGEN generic opcode support.
- Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of libopcodes.
This file is part of libopcodes.
@@
-20,6
+19,7
@@
51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
#include "sysdep.h"
51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
#include "sysdep.h"
+#include "alloca-conf.h"
#include <stdio.h>
#include "ansidecl.h"
#include "libiberty.h"
#include <stdio.h>
#include "ansidecl.h"
#include "libiberty.h"
@@
-28,10
+28,6
@@
#include "symcat.h"
#include "opcode/cgen.h"
#include "symcat.h"
#include "opcode/cgen.h"
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
static unsigned int hash_keyword_name
(const CGEN_KEYWORD *, const char *, int);
static unsigned int hash_keyword_value
static unsigned int hash_keyword_name
(const CGEN_KEYWORD *, const char *, int);
static unsigned int hash_keyword_value
@@
-131,7
+127,7
@@
cgen_keyword_add (CGEN_KEYWORD *kt, CGEN_KEYWORD_ENTRY *ke)
&& ! strchr (kt->nonalpha_chars, ke->name[i]))
{
size_t idx = strlen (kt->nonalpha_chars);
&& ! strchr (kt->nonalpha_chars, ke->name[i]))
{
size_t idx = strlen (kt->nonalpha_chars);
-
+
/* If you hit this limit, please don't just
increase the size of the field, instead
look for a better algorithm. */
/* If you hit this limit, please don't just
increase the size of the field, instead
look for a better algorithm. */
@@
-373,16
+369,17
@@
cgen_get_insn_value (CGEN_CPU_DESC cd, unsigned char *buf, int length)
segments, and endian-convert them, one at a time. */
int i;
segments, and endian-convert them, one at a time. */
int i;
- /* Enforce divisibility. */
+ /* Enforce divisibility. */
if ((length % insn_chunk_bitsize) != 0)
abort ();
for (i = 0; i < length; i += insn_chunk_bitsize) /* NB: i == bits */
{
if ((length % insn_chunk_bitsize) != 0)
abort ();
for (i = 0; i < length; i += insn_chunk_bitsize) /* NB: i == bits */
{
- int index;
+ int
bit_
index;
bfd_vma this_value;
bfd_vma this_value;
- index = i; /* NB: not dependent on endianness; opposite of cgen_put_insn_value! */
- this_value = bfd_get_bits (& buf[index / 8], insn_chunk_bitsize, big_p);
+
+ bit_index = i; /* NB: not dependent on endianness; opposite of cgen_put_insn_value! */
+ this_value = bfd_get_bits (& buf[bit_index / 8], insn_chunk_bitsize, big_p);
value = (value << insn_chunk_bitsize) | this_value;
}
}
value = (value << insn_chunk_bitsize) | this_value;
}
}
@@
-411,15
+408,16
@@
cgen_put_insn_value (CGEN_CPU_DESC cd,
segments, and endian-convert them, one at a time. */
int i;
segments, and endian-convert them, one at a time. */
int i;
- /* Enforce divisibility. */
+ /* Enforce divisibility. */
if ((length % insn_chunk_bitsize) != 0)
abort ();
for (i = 0; i < length; i += insn_chunk_bitsize) /* NB: i == bits */
{
if ((length % insn_chunk_bitsize) != 0)
abort ();
for (i = 0; i < length; i += insn_chunk_bitsize) /* NB: i == bits */
{
- int index;
- index = (length - insn_chunk_bitsize - i); /* NB: not dependent on endianness! */
- bfd_put_bits ((bfd_vma) value, & buf[index / 8], insn_chunk_bitsize, big_p);
+ int bit_index;
+
+ bit_index = (length - insn_chunk_bitsize - i); /* NB: not dependent on endianness! */
+ bfd_put_bits ((bfd_vma) value, & buf[bit_index / 8], insn_chunk_bitsize, big_p);
value >>= insn_chunk_bitsize;
}
}
value >>= insn_chunk_bitsize;
}
}
@@
-454,17
+452,14
@@
cgen_lookup_insn (CGEN_CPU_DESC cd,
CGEN_FIELDS *fields,
int alias_p)
{
CGEN_FIELDS *fields,
int alias_p)
{
- unsigned char *buf;
- CGEN_INSN_INT base_insn;
CGEN_EXTRACT_INFO ex_info;
CGEN_EXTRACT_INFO *info;
if (cd->int_insn_p)
{
info = NULL;
CGEN_EXTRACT_INFO ex_info;
CGEN_EXTRACT_INFO *info;
if (cd->int_insn_p)
{
info = NULL;
- buf = (unsigned char *) alloca (cd->max_insn_bitsize / 8);
- cgen_put_insn_value (cd, buf, length, insn_int_value);
- base_insn = insn_int_value;
+ insn_bytes_value = (unsigned char *) xmalloc (cd->max_insn_bitsize / 8);
+ cgen_put_insn_value (cd, insn_bytes_value, length, insn_int_value);
}
else
{
}
else
{
@@
-472,8
+467,7
@@
cgen_lookup_insn (CGEN_CPU_DESC cd,
ex_info.dis_info = NULL;
ex_info.insn_bytes = insn_bytes_value;
ex_info.valid = -1;
ex_info.dis_info = NULL;
ex_info.insn_bytes = insn_bytes_value;
ex_info.valid = -1;
- buf = insn_bytes_value;
- base_insn = cgen_get_insn_value (cd, buf, length);
+ insn_int_value = cgen_get_insn_value (cd, insn_bytes_value, length);
}
if (!insn)
}
if (!insn)
@@
-483,7
+477,8
@@
cgen_lookup_insn (CGEN_CPU_DESC cd,
/* The instructions are stored in hash lists.
Pick the first one and keep trying until we find the right one. */
/* The instructions are stored in hash lists.
Pick the first one and keep trying until we find the right one. */
- insn_list = cgen_dis_lookup_insn (cd, (char *) buf, base_insn);
+ insn_list = cgen_dis_lookup_insn (cd, (char *) insn_bytes_value,
+ insn_int_value);
while (insn_list != NULL)
{
insn = insn_list->insn;
while (insn_list != NULL)
{
insn = insn_list->insn;
@@
-495,18
+490,18
@@
cgen_lookup_insn (CGEN_CPU_DESC cd,
/* Basic bit mask must be correct. */
/* ??? May wish to allow target to defer this check until the
extract handler. */
/* Basic bit mask must be correct. */
/* ??? May wish to allow target to defer this check until the
extract handler. */
- if ((
base_insn
& CGEN_INSN_BASE_MASK (insn))
+ if ((
insn_int_value
& CGEN_INSN_BASE_MASK (insn))
== CGEN_INSN_BASE_VALUE (insn))
{
/* ??? 0 is passed for `pc' */
int elength = CGEN_EXTRACT_FN (cd, insn)
== CGEN_INSN_BASE_VALUE (insn))
{
/* ??? 0 is passed for `pc' */
int elength = CGEN_EXTRACT_FN (cd, insn)
- (cd, insn, info,
base_insn
, fields, (bfd_vma) 0);
+ (cd, insn, info,
insn_int_value
, fields, (bfd_vma) 0);
if (elength > 0)
{
/* sanity check */
if (length != 0 && length != elength)
abort ();
if (elength > 0)
{
/* sanity check */
if (length != 0 && length != elength)
abort ();
-
return insn
;
+
break
;
}
}
}
}
}
}
@@
-526,15
+521,17
@@
cgen_lookup_insn (CGEN_CPU_DESC cd,
/* ??? 0 is passed for `pc' */
length = CGEN_EXTRACT_FN (cd, insn)
/* ??? 0 is passed for `pc' */
length = CGEN_EXTRACT_FN (cd, insn)
- (cd, insn, info,
base_insn
, fields, (bfd_vma) 0);
+ (cd, insn, info,
insn_int_value
, fields, (bfd_vma) 0);
/* Sanity check: must succeed.
Could relax this later if it ever proves useful. */
if (length == 0)
abort ();
/* Sanity check: must succeed.
Could relax this later if it ever proves useful. */
if (length == 0)
abort ();
- return insn;
}
}
- return NULL;
+ if (cd->int_insn_p)
+ free (insn_bytes_value);
+
+ return insn;
}
/* Fill in the operand instances used by INSN whose operands are FIELDS.
}
/* Fill in the operand instances used by INSN whose operands are FIELDS.
This page took
0.026206 seconds
and
4
git commands to generate.