projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Port gas/config/* to str_htab.
[deliverable/binutils-gdb.git]
/
gas
/
config
/
tc-score7.c
diff --git
a/gas/config/tc-score7.c
b/gas/config/tc-score7.c
index c3b6e97d34ea8b79a1a95e086b3837c2ee558aff..2c77d30b7c8327bcfbba878c749bf100e2eeeaec 100644
(file)
--- a/
gas/config/tc-score7.c
+++ b/
gas/config/tc-score7.c
@@
-520,7
+520,7
@@
struct s7_reg_map
{
const struct s7_reg_entry *names;
int max_regno;
{
const struct s7_reg_entry *names;
int max_regno;
-
struct hash_control *
htab;
+
htab_t
htab;
const char *expected;
};
const char *expected;
};
@@
-531,8
+531,8
@@
static struct s7_reg_map s7_all_reg_maps[] =
{s7_score_crn_table, 31, NULL, N_("S+core co-processor register expected")},
};
{s7_score_crn_table, 31, NULL, N_("S+core co-processor register expected")},
};
-static
struct hash_control *
s7_score_ops_hsh = NULL;
-static
struct hash_control *
s7_dependency_insn_hsh = NULL;
+static
htab_t
s7_score_ops_hsh = NULL;
+static
htab_t
s7_dependency_insn_hsh = NULL;
\f
struct s7_datafield_range
\f
struct s7_datafield_range
@@
-1112,7
+1112,7
@@
s7_end_of_line (char *str)
}
static int
}
static int
-s7_score_reg_parse (char **ccp,
struct hash_control *
htab)
+s7_score_reg_parse (char **ccp,
htab_t
htab)
{
char *start = *ccp;
char c;
{
char *start = *ccp;
char c;
@@
-1129,7
+1129,7
@@
s7_score_reg_parse (char **ccp, struct hash_control *htab)
c = *p++;
*--p = 0;
c = *p++;
*--p = 0;
- reg = (struct s7_reg_entry *) hash_find (htab, start);
+ reg = (struct s7_reg_entry *)
str_
hash_find (htab, start);
*p = c;
if (reg)
*p = c;
if (reg)
@@
-2321,7
+2321,7
@@
s7_dependency_type_from_insn (char *insn_name)
const struct s7_insn_to_dependency *tmp;
strcpy (name, insn_name);
const struct s7_insn_to_dependency *tmp;
strcpy (name, insn_name);
- tmp = (const struct s7_insn_to_dependency *) hash_find (s7_dependency_insn_hsh, name);
+ tmp = (const struct s7_insn_to_dependency *)
str_
hash_find (s7_dependency_insn_hsh, name);
if (tmp)
return tmp->type;
if (tmp)
return tmp->type;
@@
-2789,7
+2789,7
@@
s7_parse_16_32_inst (char *insnstr, bfd_boolean gen_frag_p)
c = *p;
*p = '\0';
c = *p;
*p = '\0';
- opcode = (const struct s7_asm_opcode *) hash_find (s7_score_ops_hsh, operator);
+ opcode = (const struct s7_asm_opcode *)
str_
hash_find (s7_score_ops_hsh, operator);
*p = c;
memset (&s7_inst, '\0', sizeof (s7_inst));
*p = c;
memset (&s7_inst, '\0', sizeof (s7_inst));
@@
-5103,7
+5103,7
@@
s7_build_score_ops_hsh (void)
new_opcode->relax_value = insn->relax_value;
new_opcode->type = insn->type;
new_opcode->bitmask = insn->bitmask;
new_opcode->relax_value = insn->relax_value;
new_opcode->type = insn->type;
new_opcode->bitmask = insn->bitmask;
- hash_insert (s7_score_ops_hsh, new_opcode->template_name,
+
str_
hash_insert (s7_score_ops_hsh, new_opcode->template_name,
(void *) new_opcode);
}
}
(void *) new_opcode);
}
}
@@
-5130,7
+5130,7
@@
s7_build_dependency_insn_hsh (void)
strcpy (insn_name, tmp->insn_name);
new_i2d->insn_name = insn_name;
new_i2d->type = tmp->type;
strcpy (insn_name, tmp->insn_name);
new_i2d->insn_name = insn_name;
new_i2d->type = tmp->type;
- hash_insert (s7_dependency_insn_hsh, new_i2d->insn_name,
+
str_
hash_insert (s7_dependency_insn_hsh, new_i2d->insn_name,
(void *) new_i2d);
}
}
(void *) new_i2d);
}
}
@@
-5345,7
+5345,7
@@
s7_parse_pce_inst (char *insnstr)
\f
static void
\f
static void
-s7_insert_reg (const struct s7_reg_entry *r,
struct hash_control *
htab)
+s7_insert_reg (const struct s7_reg_entry *r,
htab_t
htab)
{
int i = 0;
int len = strlen (r->name) + 2;
{
int i = 0;
int len = strlen (r->name) + 2;
@@
-5359,8
+5359,8
@@
s7_insert_reg (const struct s7_reg_entry *r, struct hash_control *htab)
}
buf2[i] = '\0';
}
buf2[i] = '\0';
- hash_insert (htab, buf, (void *) r);
- hash_insert (htab, buf2, (void *) r);
+
str_
hash_insert (htab, buf, (void *) r);
+
str_
hash_insert (htab, buf2, (void *) r);
}
static void
}
static void
@@
-5368,7
+5368,7
@@
s7_build_reg_hsh (struct s7_reg_map *map)
{
const struct s7_reg_entry *r;
{
const struct s7_reg_entry *r;
- if ((map->htab =
hash_new
()) == NULL)
+ if ((map->htab =
str_htab_create
()) == NULL)
{
as_fatal (_("virtual memory exhausted"));
}
{
as_fatal (_("virtual memory exhausted"));
}
@@
-6115,12
+6115,12
@@
s7_begin (void)
segT seg;
subsegT subseg;
segT seg;
subsegT subseg;
- if ((s7_score_ops_hsh =
hash_new
()) == NULL)
+ if ((s7_score_ops_hsh =
str_htab_create
()) == NULL)
as_fatal (_("virtual memory exhausted"));
s7_build_score_ops_hsh ();
as_fatal (_("virtual memory exhausted"));
s7_build_score_ops_hsh ();
- if ((s7_dependency_insn_hsh =
hash_new
()) == NULL)
+ if ((s7_dependency_insn_hsh =
str_htab_create
()) == NULL)
as_fatal (_("virtual memory exhausted"));
s7_build_dependency_insn_hsh ();
as_fatal (_("virtual memory exhausted"));
s7_build_dependency_insn_hsh ();
This page took
0.028041 seconds
and
4
git commands to generate.