* [patch] gas: factorize duplicate code in frags.c
@ 2011-07-25 22:50 Tristan Gingold
2011-07-28 16:39 ` Nick Clifton
0 siblings, 1 reply; 3+ messages in thread
From: Tristan Gingold @ 2011-07-25 22:50 UTC (permalink / raw)
To: binutils Development
Hi,
frag_var and frag_variant share most of their code. I think it would be better to factorize the initialization code into a new function (frag_var_init) and let the optimizer inlining the function if necessary.
No regression on i386-linux.
Ok for trunk ?
Tristan.
2011-07-25 Tristan Gingold <gingold@adacore.com>
* frags.c (frag_var_init): New function.
(frag_var): Call frag_var_init to initialize.
(frag_variant): Ditto.
diff --git a/gas/frags.c b/gas/frags.c
index 6e719bc..2faf58d 100644
--- a/gas/frags.c
+++ b/gas/frags.c
@@ -195,22 +195,14 @@ frag_more (int nchars)
return (retval);
}
-/* Start a new frag unless we have max_chars more chars of room in the
- current frag. Close off the old frag with a .fill 0.
+/* Close the current frag, setting its fields for a relaxable frag. Start a
+ new frag. */
- Set up a machine_dependent relaxable frag, then start a new frag.
- Return the address of the 1st char of the var part of the old frag
- to write into. */
-
-char *
-frag_var (relax_stateT type, int max_chars, int var, relax_substateT subtype,
- symbolS *symbol, offsetT offset, char *opcode)
+static void
+frag_var_init (relax_stateT type, int max_chars, int var,
+ relax_substateT subtype, symbolS *symbol, offsetT offset,
+ char *opcode)
{
- register char *retval;
-
- frag_grow (max_chars);
- retval = obstack_next_free (&frchain_now->frch_obstack);
- obstack_blank_fast (&frchain_now->frch_obstack, max_chars);
frag_now->fr_var = var;
frag_now->fr_type = type;
frag_now->fr_subtype = subtype;
@@ -226,8 +218,28 @@ frag_var (relax_stateT type, int max_chars, int var, relax_substateT subtype,
TC_FRAG_INIT (frag_now);
#endif
as_where (&frag_now->fr_file, &frag_now->fr_line);
+
frag_new (max_chars);
- return (retval);
+}
+
+/* Start a new frag unless we have max_chars more chars of room in the
+ current frag. Close off the old frag with a .fill 0.
+
+ Set up a machine_dependent relaxable frag, then start a new frag.
+ Return the address of the 1st char of the var part of the old frag
+ to write into. */
+
+char *
+frag_var (relax_stateT type, int max_chars, int var, relax_substateT subtype,
+ symbolS *symbol, offsetT offset, char *opcode)
+{
+ register char *retval;
+
+ frag_grow (max_chars);
+ retval = obstack_next_free (&frchain_now->frch_obstack);
+ obstack_blank_fast (&frchain_now->frch_obstack, max_chars);
+ frag_var_init (type, max_chars, var, subtype, symbol, offset, opcode);
+ return retval;
}
/* OVE: This variant of frag_var assumes that space for the tail has been
@@ -242,23 +254,9 @@ frag_variant (relax_stateT type, int max_chars, int var,
register char *retval;
retval = obstack_next_free (&frchain_now->frch_obstack);
- frag_now->fr_var = var;
- frag_now->fr_type = type;
- frag_now->fr_subtype = subtype;
- frag_now->fr_symbol = symbol;
- frag_now->fr_offset = offset;
- frag_now->fr_opcode = opcode;
-#ifdef USING_CGEN
- frag_now->fr_cgen.insn = 0;
- frag_now->fr_cgen.opindex = 0;
- frag_now->fr_cgen.opinfo = 0;
-#endif
-#ifdef TC_FRAG_INIT
- TC_FRAG_INIT (frag_now);
-#endif
- as_where (&frag_now->fr_file, &frag_now->fr_line);
- frag_new (max_chars);
- return (retval);
+ frag_var_init (type, max_chars, var, subtype, symbol, offset, opcode);
+
+ return retval;
}
/* Reduce the variable end of a frag to a harmless state. */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch] gas: factorize duplicate code in frags.c
2011-07-25 22:50 [patch] gas: factorize duplicate code in frags.c Tristan Gingold
@ 2011-07-28 16:39 ` Nick Clifton
2011-07-29 8:00 ` Tristan Gingold
0 siblings, 1 reply; 3+ messages in thread
From: Nick Clifton @ 2011-07-28 16:39 UTC (permalink / raw)
To: Tristan Gingold; +Cc: binutils Development
Hi Tristan,
> 2011-07-25 Tristan Gingold<gingold@adacore.com>
>
> * frags.c (frag_var_init): New function.
> (frag_var): Call frag_var_init to initialize.
> (frag_variant): Ditto.
>
Approved - please apply.
Cheers
Nick
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch] gas: factorize duplicate code in frags.c
2011-07-28 16:39 ` Nick Clifton
@ 2011-07-29 8:00 ` Tristan Gingold
0 siblings, 0 replies; 3+ messages in thread
From: Tristan Gingold @ 2011-07-29 8:00 UTC (permalink / raw)
To: Nick Clifton; +Cc: binutils Development
On Jul 28, 2011, at 1:43 PM, Nick Clifton wrote:
> Hi Tristan,
>
>> 2011-07-25 Tristan Gingold<gingold@adacore.com>
>>
>> * frags.c (frag_var_init): New function.
>> (frag_var): Call frag_var_init to initialize.
>> (frag_variant): Ditto.
>>
>
> Approved - please apply.
Thanks, committed.
Tristan.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-29 7:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-25 22:50 [patch] gas: factorize duplicate code in frags.c Tristan Gingold
2011-07-28 16:39 ` Nick Clifton
2011-07-29 8:00 ` Tristan Gingold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).