aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorSterling Augustine <saugustine@google.com>2009-08-21 19:35:35 +0000
committerSterling Augustine <saugustine@google.com>2009-08-21 19:35:35 +0000
commit62af60e2daf96e527c442d06661cbbde253c777b (patch)
treeb0cf58cb671a2f69350f16a917e99baedb6e0d6e /gas
parentdfdbc9b4c04150a7f77847ffea70e61f091b96f6 (diff)
downloadgdb-62af60e2daf96e527c442d06661cbbde253c777b.zip
gdb-62af60e2daf96e527c442d06661cbbde253c777b.tar.gz
gdb-62af60e2daf96e527c442d06661cbbde253c777b.tar.bz2
2009-08-21 Sterling Augustine <sterling@jaw.hq.tensilica.com>
* config/tc-xtensa.c (config_max_slots): New global variable. (md_begin): Set config_max_slots. (total_frag_text_expansion): Use config_max_slots instead of MAX_SLOTS. (xg_init_vinsn): Likewise. (xg_clear_vinsn): Likewise. (xg_free_vinsn): Likewise.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog10
-rw-r--r--gas/config/tc-xtensa.c24
2 files changed, 27 insertions, 7 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 624e7c9..005c9e5 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+2009-08-21 Sterling Augustine <sterling@jaw.hq.tensilica.com>
+
+ * config/tc-xtensa.c (config_max_slots): New global variable.
+ (md_begin): Set config_max_slots.
+ (total_frag_text_expansion): Use config_max_slots instead of
+ MAX_SLOTS.
+ (xg_init_vinsn): Likewise.
+ (xg_clear_vinsn): Likewise.
+ (xg_free_vinsn): Likewise.
+
2009-08-20 Sterling Augustine <sterling@jaw.hq.tensilica.com>
* config/tc-xtensa.c (xg_copy_vinsn): New function.
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index fdca232..539f178 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -587,6 +587,7 @@ static xtensa_opcode xtensa_retw_opcode;
static xtensa_opcode xtensa_retw_n_opcode;
static xtensa_opcode xtensa_rsr_lcount_opcode;
static xtensa_opcode xtensa_waiti_opcode;
+static int config_max_slots = 0;
/* Command-line Options. */
@@ -5104,6 +5105,7 @@ md_begin (void)
segT current_section = now_seg;
int current_subsec = now_subseg;
xtensa_isa isa;
+ int i;
xtensa_default_isa = xtensa_isa_init (0, 0);
isa = xtensa_default_isa;
@@ -5115,8 +5117,6 @@ md_begin (void)
subseg_set (current_section, current_subsec);
- xg_init_vinsn (&cur_vinsn);
-
xtensa_addi_opcode = xtensa_opcode_lookup (isa, "addi");
xtensa_addmi_opcode = xtensa_opcode_lookup (isa, "addmi");
xtensa_call0_opcode = xtensa_opcode_lookup (isa, "call0");
@@ -5149,6 +5149,15 @@ md_begin (void)
xtensa_rsr_lcount_opcode = xtensa_opcode_lookup (isa, "rsr.lcount");
xtensa_waiti_opcode = xtensa_opcode_lookup (isa, "waiti");
+ for (i = 0; i < xtensa_isa_num_formats (isa); i++)
+ {
+ int format_slots = xtensa_format_num_slots (isa, i);
+ if (format_slots > config_max_slots)
+ config_max_slots = format_slots;
+ }
+
+ xg_init_vinsn (&cur_vinsn);
+
xtensa_num_pipe_stages = xtensa_isa_num_pipe_stages (isa);
init_op_placement_info_table ();
@@ -6881,7 +6890,7 @@ total_frag_text_expansion (fragS *fragP)
int slot;
int total_expansion = 0;
- for (slot = 0; slot < MAX_SLOTS; slot++)
+ for (slot = 0; slot < config_max_slots; slot++)
total_expansion += fragP->tc_frag_data.text_expansion[slot];
return total_expansion;
@@ -11675,7 +11684,7 @@ xg_init_vinsn (vliw_insn *v)
if (v->insnbuf == NULL)
as_fatal (_("out of memory"));
- for (i = 0; i < MAX_SLOTS; i++)
+ for (i = 0; i < config_max_slots; i++)
{
v->slotbuf[i] = xtensa_insnbuf_alloc (isa);
if (v->slotbuf[i] == NULL)
@@ -11689,7 +11698,8 @@ xg_clear_vinsn (vliw_insn *v)
{
int i;
- memset (v, 0, offsetof (vliw_insn, insnbuf));
+ memset (v, 0, offsetof (vliw_insn, slots)
+ + sizeof(TInsn) * config_max_slots);
v->format = XTENSA_UNDEFINED;
v->num_slots = 0;
@@ -11698,7 +11708,7 @@ xg_clear_vinsn (vliw_insn *v)
if (xt_saved_debug_type != DEBUG_NONE)
debug_type = xt_saved_debug_type;
- for (i = 0; i < MAX_SLOTS; i++)
+ for (i = 0; i < config_max_slots; i++)
v->slots[i].opcode = XTENSA_UNDEFINED;
}
@@ -11732,7 +11742,7 @@ xg_free_vinsn (vliw_insn *v)
{
int i;
xtensa_insnbuf_free (xtensa_default_isa, v->insnbuf);
- for (i = 0; i < MAX_SLOTS; i++)
+ for (i = 0; i < config_max_slots; i++)
xtensa_insnbuf_free (xtensa_default_isa, v->slotbuf[i]);
}