summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/ChangeLog13
-rw-r--r--gcc/genattr.c26
-rw-r--r--gcc/genattrtab.c26
-rw-r--r--gcc/gencodes.c26
-rw-r--r--gcc/genconfig.c27
-rw-r--r--gcc/genemit.c27
-rw-r--r--gcc/genextract.c36
-rw-r--r--gcc/genflags.c27
-rw-r--r--gcc/genopinit.c177
-rw-r--r--gcc/genoutput.c26
-rw-r--r--gcc/genpeep.c26
-rw-r--r--gcc/genrecog.c36
-rw-r--r--gcc/gensupport.c37
13 files changed, 124 insertions, 386 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ab3dc549695..fca8db4ebb3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2000-05-18 Zack Weinberg <zack@wolery.cumb.org>
+
+ * genopinit.c: Use $ for escape sequences in optab patterns.
+ Remove backslashes from optab patterns. Change $A, $B, $C to
+ expand to (int) whatever instead of just whatever; remove
+ explicit (int) from all optab patterns.
+
+ * gensupport.c (xmalloc, xrealloc, xstrdup): Provide.
+ * genattr.c, genattrtab.c, gencodes.c, genconfig.c, genemit.c,
+ genextract.c, genflags.c, genopinit.c, genoutput.c, genpeep.c,
+ genrecog.c: Remove private copies of xmalloc, xrealloc, and
+ xstrdup.
+
2000-05-18 Richard Henderson <rth@cygnus.com>
* jump.c (jump_optimize_1): Base minimum insn count during
diff --git a/gcc/genattr.c b/gcc/genattr.c
index 9207876e817..6a593edeb21 100644
--- a/gcc/genattr.c
+++ b/gcc/genattr.c
@@ -183,32 +183,6 @@ write_units (num_units, multiplicity, simultaneity,
printf ("#define INSN_QUEUE_SIZE %d\n", q_size);
}
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
- return val;
-}
-
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
-
extern int main PARAMS ((int, char **));
int
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index 2c09e3d5fb2..db4634d9863 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -5856,32 +5856,6 @@ extend_range (range, min, max)
if (range->max < max) range->max = max;
}
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
-
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
- return val;
-}
-
static rtx
copy_rtx_unchanging (orig)
register rtx orig;
diff --git a/gcc/gencodes.c b/gcc/gencodes.c
index 0e36e9fd52d..eac688367c0 100644
--- a/gcc/gencodes.c
+++ b/gcc/gencodes.c
@@ -45,32 +45,6 @@ gen_insn (insn)
insn_code_number);
}
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
- return val;
-}
-
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
-
extern int main PARAMS ((int, char **));
int
diff --git a/gcc/genconfig.c b/gcc/genconfig.c
index a18f896a5b9..6508c39d906 100644
--- a/gcc/genconfig.c
+++ b/gcc/genconfig.c
@@ -238,33 +238,6 @@ gen_peephole (peep)
for (i = 0; i < XVECLEN (peep, 0); i++)
walk_insn_part (XVECEXP (peep, 0, i), 1, 0);
}
-
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
-
- return val;
-}
-
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
extern int main PARAMS ((int, char **));
diff --git a/gcc/genemit.c b/gcc/genemit.c
index f559eb97869..dab819bf6b1 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -738,33 +738,6 @@ output_peephole2_scratches (split)
insn_nr++;
}
}
-
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
-
- return val;
-}
-
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
extern int main PARAMS ((int, char **));
diff --git a/gcc/genextract.c b/gcc/genextract.c
index 1b653600c43..76cde0e3aec 100644
--- a/gcc/genextract.c
+++ b/gcc/genextract.c
@@ -340,42 +340,6 @@ print_path (path)
}
}
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
- return val;
-}
-
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
-
-char *
-xstrdup (input)
- const char *input;
-{
- register size_t len = strlen (input) + 1;
- register char *output = xmalloc (len);
- memcpy (output, input, len);
- return output;
-}
-
extern int main PARAMS ((int, char **));
int
diff --git a/gcc/genflags.c b/gcc/genflags.c
index e96ac618e4a..14cb8ad9ecd 100644
--- a/gcc/genflags.c
+++ b/gcc/genflags.c
@@ -186,33 +186,6 @@ gen_insn (insn)
obstack_grow (obstack_ptr, &insn, sizeof (rtx));
}
-
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
-
- return val;
-}
-
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
extern int main PARAMS ((int, char **));
diff --git a/gcc/genopinit.c b/gcc/genopinit.c
index 4bcabc61a5c..dcacc9fa392 100644
--- a/gcc/genopinit.c
+++ b/gcc/genopinit.c
@@ -38,84 +38,81 @@ Boston, MA 02111-1307, USA. */
This array contains a list of optabs that need to be initialized. Within
each string, the name of the pattern to be matched against is delimited
- with %( and %). In the string, %a and %b are used to match a short mode
+ with $( and $). In the string, $a and $b are used to match a short mode
name (the part of the mode name not including `mode' and converted to
lower-case). When writing out the initializer, the entire string is
- used. %A and %B are replaced with the full name of the mode; %a and %b
+ used. $A and $B are replaced with the full name of the mode; $a and $b
are replaced with the short form of the name, as above.
- If %N is present in the pattern, it means the two modes must be consecutive
- widths in the same mode class (e.g, QImode and HImode). %I means that
- only integer modes should be considered for the next mode, and %F means
+ If $N is present in the pattern, it means the two modes must be consecutive
+ widths in the same mode class (e.g, QImode and HImode). $I means that
+ only integer modes should be considered for the next mode, and $F means
that only float modes should be considered.
For some optabs, we store the operation by RTL codes. These are only
- used for comparisons. In that case, %c and %C are the lower-case and
+ used for comparisons. In that case, $c and $C are the lower-case and
upper-case forms of the comparison, respectively. */
-/* The reason we use \% is to avoid sequences of the form %-capletter-%
- which SCCS treats as magic. This gets warnings which you should ignore. */
-
const char * const optabs[] =
-{ "extendtab[(int) %B][(int) %A][0] = CODE_FOR_%(extend%a\%b2%)",
- "extendtab[(int) %B][(int) %A][1] = CODE_FOR_%(zero_extend%a\%b2%)",
- "fixtab[(int) %A][(int) %B][0] = CODE_FOR_%(fix%F\%a%I\%b2%)",
- "fixtab[(int) %A][(int) %B][1] = CODE_FOR_%(fixuns%F\%a%b2%)",
- "fixtrunctab[(int) %A][(int) %B][0] = CODE_FOR_%(fix_trunc%F\%a%I\%b2%)",
- "fixtrunctab[(int) %A][(int) %B][1] = CODE_FOR_%(fixuns_trunc%F\%a%I\%b2%)",
- "floattab[(int) %B][(int) %A][0] = CODE_FOR_%(float%I\%a%F\%b2%)",
- "floattab[(int) %B][(int) %A][1] = CODE_FOR_%(floatuns%I\%a%F\%b2%)",
- "add_optab->handlers[(int) %A].insn_code = CODE_FOR_%(add%a3%)",
- "sub_optab->handlers[(int) %A].insn_code = CODE_FOR_%(sub%a3%)",
- "smul_optab->handlers[(int) %A].insn_code = CODE_FOR_%(mul%a3%)",
- "umul_highpart_optab->handlers[(int) %A].insn_code = CODE_FOR_%(umul%a3_highpart%)",
- "smul_highpart_optab->handlers[(int) %A].insn_code = CODE_FOR_%(smul%a3_highpart%)",
- "smul_widen_optab->handlers[(int) %B].insn_code = CODE_FOR_%(mul%a%b3%)%N",
- "umul_widen_optab->handlers[(int) %B].insn_code = CODE_FOR_%(umul%a%b3%)%N",
- "sdiv_optab->handlers[(int) %A].insn_code = CODE_FOR_%(div%I\%a3%)",
- "udiv_optab->handlers[(int) %A].insn_code = CODE_FOR_%(udiv%I\%a3%)",
- "sdivmod_optab->handlers[(int) %A].insn_code = CODE_FOR_%(divmod%a4%)",
- "udivmod_optab->handlers[(int) %A].insn_code = CODE_FOR_%(udivmod%a4%)",
- "smod_optab->handlers[(int) %A].insn_code = CODE_FOR_%(mod%a3%)",
- "umod_optab->handlers[(int) %A].insn_code = CODE_FOR_%(umod%a3%)",
- "flodiv_optab->handlers[(int) %A].insn_code = CODE_FOR_%(div%F\%a3%)",
- "ftrunc_optab->handlers[(int) %A].insn_code = CODE_FOR_%(ftrunc%F\%a2%)",
- "and_optab->handlers[(int) %A].insn_code = CODE_FOR_%(and%a3%)",
- "ior_optab->handlers[(int) %A].insn_code = CODE_FOR_%(ior%a3%)",
- "xor_optab->handlers[(int) %A].insn_code = CODE_FOR_%(xor%a3%)",
- "ashl_optab->handlers[(int) %A].insn_code = CODE_FOR_%(ashl%a3%)",
- "ashr_optab->handlers[(int) %A].insn_code = CODE_FOR_%(ashr%a3%)",
- "lshr_optab->handlers[(int) %A].insn_code = CODE_FOR_%(lshr%a3%)",
- "rotl_optab->handlers[(int) %A].insn_code = CODE_FOR_%(rotl%a3%)",
- "rotr_optab->handlers[(int) %A].insn_code = CODE_FOR_%(rotr%a3%)",
- "smin_optab->handlers[(int) %A].insn_code = CODE_FOR_%(smin%I\%a3%)",
- "smin_optab->handlers[(int) %A].insn_code = CODE_FOR_%(min%F\%a3%)",
- "smax_optab->handlers[(int) %A].insn_code = CODE_FOR_%(smax%I\%a3%)",
- "smax_optab->handlers[(int) %A].insn_code = CODE_FOR_%(max%F\%a3%)",
- "umin_optab->handlers[(int) %A].insn_code = CODE_FOR_%(umin%I\%a3%)",
- "umax_optab->handlers[(int) %A].insn_code = CODE_FOR_%(umax%I\%a3%)",
- "neg_optab->handlers[(int) %A].insn_code = CODE_FOR_%(neg%a2%)",
- "abs_optab->handlers[(int) %A].insn_code = CODE_FOR_%(abs%a2%)",
- "sqrt_optab->handlers[(int) %A].insn_code = CODE_FOR_%(sqrt%a2%)",
- "sin_optab->handlers[(int) %A].insn_code = CODE_FOR_%(sin%a2%)",
- "cos_optab->handlers[(int) %A].insn_code = CODE_FOR_%(cos%a2%)",
- "strlen_optab->handlers[(int) %A].insn_code = CODE_FOR_%(strlen%a%)",
- "one_cmpl_optab->handlers[(int) %A].insn_code = CODE_FOR_%(one_cmpl%a2%)",
- "ffs_optab->handlers[(int) %A].insn_code = CODE_FOR_%(ffs%a2%)",
- "mov_optab->handlers[(int) %A].insn_code = CODE_FOR_%(mov%a%)",
- "movstrict_optab->handlers[(int) %A].insn_code = CODE_FOR_%(movstrict%a%)",
- "cmp_optab->handlers[(int) %A].insn_code = CODE_FOR_%(cmp%a%)",
- "tst_optab->handlers[(int) %A].insn_code = CODE_FOR_%(tst%a%)",
- "bcc_gen_fctn[(int) %C] = gen_%(b%c%)",
- "setcc_gen_code[(int) %C] = CODE_FOR_%(s%c%)",
- "movcc_gen_code[(int) %A] = CODE_FOR_%(mov%acc%)",
- "cbranch_optab->handlers[(int) %A].insn_code = CODE_FOR_%(cbranch%a4%)",
- "cmov_optab->handlers[(int) %A].insn_code = CODE_FOR_%(cmov%a6%)",
- "cstore_optab->handlers[(int) %A].insn_code = CODE_FOR_%(cstore%a4%)",
- "reload_in_optab[(int) %A] = CODE_FOR_%(reload_in%a%)",
- "reload_out_optab[(int) %A] = CODE_FOR_%(reload_out%a%)",
- "movstr_optab[(int) %A] = CODE_FOR_%(movstr%a%)",
- "clrstr_optab[(int) %A] = CODE_FOR_%(clrstr%a%)" };
+{ "extendtab[$B][$A][0] = CODE_FOR_$(extend$a$b2$)",
+ "extendtab[$B][$A][1] = CODE_FOR_$(zero_extend$a$b2$)",
+ "fixtab[$A][$B][0] = CODE_FOR_$(fix$F$a$I$b2$)",
+ "fixtab[$A][$B][1] = CODE_FOR_$(fixuns$F$a$b2$)",
+ "fixtrunctab[$A][$B][0] = CODE_FOR_$(fix_trunc$F$a$I$b2$)",
+ "fixtrunctab[$A][$B][1] = CODE_FOR_$(fixuns_trunc$F$a$I$b2$)",
+ "floattab[$B][$A][0] = CODE_FOR_$(float$I$a$F$b2$)",
+ "floattab[$B][$A][1] = CODE_FOR_$(floatuns$I$a$F$b2$)",
+ "add_optab->handlers[$A].insn_code = CODE_FOR_$(add$a3$)",
+ "sub_optab->handlers[$A].insn_code = CODE_FOR_$(sub$a3$)",
+ "smul_optab->handlers[$A].insn_code = CODE_FOR_$(mul$a3$)",
+ "umul_highpart_optab->handlers[$A].insn_code = CODE_FOR_$(umul$a3_highpart$)",
+ "smul_highpart_optab->handlers[$A].insn_code = CODE_FOR_$(smul$a3_highpart$)",
+ "smul_widen_optab->handlers[$B].insn_code = CODE_FOR_$(mul$a$b3$)$N",
+ "umul_widen_optab->handlers[$B].insn_code = CODE_FOR_$(umul$a$b3$)$N",
+ "sdiv_optab->handlers[$A].insn_code = CODE_FOR_$(div$I$a3$)",
+ "udiv_optab->handlers[$A].insn_code = CODE_FOR_$(udiv$I$a3$)",
+ "sdivmod_optab->handlers[$A].insn_code = CODE_FOR_$(divmod$a4$)",
+ "udivmod_optab->handlers[$A].insn_code = CODE_FOR_$(udivmod$a4$)",
+ "smod_optab->handlers[$A].insn_code = CODE_FOR_$(mod$a3$)",
+ "umod_optab->handlers[$A].insn_code = CODE_FOR_$(umod$a3$)",
+ "flodiv_optab->handlers[$A].insn_code = CODE_FOR_$(div$F$a3$)",
+ "ftrunc_optab->handlers[$A].insn_code = CODE_FOR_$(ftrunc$F$a2$)",
+ "and_optab->handlers[$A].insn_code = CODE_FOR_$(and$a3$)",
+ "ior_optab->handlers[$A].insn_code = CODE_FOR_$(ior$a3$)",
+ "xor_optab->handlers[$A].insn_code = CODE_FOR_$(xor$a3$)",
+ "ashl_optab->handlers[$A].insn_code = CODE_FOR_$(ashl$a3$)",
+ "ashr_optab->handlers[$A].insn_code = CODE_FOR_$(ashr$a3$)",
+ "lshr_optab->handlers[$A].insn_code = CODE_FOR_$(lshr$a3$)",
+ "rotl_optab->handlers[$A].insn_code = CODE_FOR_$(rotl$a3$)",
+ "rotr_optab->handlers[$A].insn_code = CODE_FOR_$(rotr$a3$)",
+ "smin_optab->handlers[$A].insn_code = CODE_FOR_$(smin$I$a3$)",
+ "smin_optab->handlers[$A].insn_code = CODE_FOR_$(min$F$a3$)",
+ "smax_optab->handlers[$A].insn_code = CODE_FOR_$(smax$I$a3$)",
+ "smax_optab->handlers[$A].insn_code = CODE_FOR_$(max$F$a3$)",
+ "umin_optab->handlers[$A].insn_code = CODE_FOR_$(umin$I$a3$)",
+ "umax_optab->handlers[$A].insn_code = CODE_FOR_$(umax$I$a3$)",
+ "neg_optab->handlers[$A].insn_code = CODE_FOR_$(neg$a2$)",
+ "abs_optab->handlers[$A].insn_code = CODE_FOR_$(abs$a2$)",
+ "sqrt_optab->handlers[$A].insn_code = CODE_FOR_$(sqrt$a2$)",
+ "sin_optab->handlers[$A].insn_code = CODE_FOR_$(sin$a2$)",
+ "cos_optab->handlers[$A].insn_code = CODE_FOR_$(cos$a2$)",
+ "strlen_optab->handlers[$A].insn_code = CODE_FOR_$(strlen$a$)",
+ "one_cmpl_optab->handlers[$A].insn_code = CODE_FOR_$(one_cmpl$a2$)",
+ "ffs_optab->handlers[$A].insn_code = CODE_FOR_$(ffs$a2$)",
+ "mov_optab->handlers[$A].insn_code = CODE_FOR_$(mov$a$)",
+ "movstrict_optab->handlers[$A].insn_code = CODE_FOR_$(movstrict$a$)",
+ "cmp_optab->handlers[$A].insn_code = CODE_FOR_$(cmp$a$)",
+ "tst_optab->handlers[$A].insn_code = CODE_FOR_$(tst$a$)",
+ "bcc_gen_fctn[$C] = gen_$(b$c$)",
+ "setcc_gen_code[$C] = CODE_FOR_$(s$c$)",
+ "movcc_gen_code[$A] = CODE_FOR_$(mov$acc$)",
+ "cbranch_optab->handlers[$A].insn_code = CODE_FOR_$(cbranch$a4$)",
+ "cmov_optab->handlers[$A].insn_code = CODE_FOR_$(cmov$a6$)",
+ "cstore_optab->handlers[$A].insn_code = CODE_FOR_$(cstore$a4$)",
+ "reload_in_optab[$A] = CODE_FOR_$(reload_in$a$)",
+ "reload_out_optab[$A] = CODE_FOR_$(reload_out$a$)",
+ "movstr_optab[$A] = CODE_FOR_$(movstr$a$)",
+ "clrstr_optab[$A] = CODE_FOR_$(clrstr$a$)" };
static void gen_insn PARAMS ((rtx));
@@ -143,13 +140,13 @@ gen_insn (insn)
int force_consec = 0;
int matches = 1;
- for (pp = optabs[pindex]; pp[0] != '%' || pp[1] != '('; pp++)
+ for (pp = optabs[pindex]; pp[0] != '$' || pp[1] != '('; pp++)
;
- for (pp += 2, np = name; matches && ! (pp[0] == '%' && pp[1] == ')');
+ for (pp += 2, np = name; matches && ! (pp[0] == '$' && pp[1] == ')');
pp++)
{
- if (*pp != '%')
+ if (*pp != '$')
{
if (*pp != *np++)
break;
@@ -218,7 +215,7 @@ gen_insn (insn)
}
}
- if (matches && pp[0] == '%' && pp[1] == ')'
+ if (matches && pp[0] == '$' && pp[1] == ')'
&& *np == 0
&& (! force_consec || (int) GET_MODE_WIDER_MODE(m1) == m2))
break;
@@ -238,8 +235,8 @@ gen_insn (insn)
/* Now write out the initialization, making all required substitutions. */
for (pp = optabs[pindex]; *pp; pp++)
{
- if (*pp != '%')
- printf ("%c", *pp);
+ if (*pp != '$')
+ putchar (*pp);
else
switch (*++pp)
{
@@ -255,15 +252,16 @@ gen_insn (insn)
putchar (TOLOWER (*np));
break;
case 'A':
- printf ("%smode", GET_MODE_NAME(m1));
+ printf ("(int) %smode", GET_MODE_NAME(m1));
break;
case 'B':
- printf ("%smode", GET_MODE_NAME(m2));
+ printf ("(int) %smode", GET_MODE_NAME(m2));
break;
case 'c':
printf ("%s", GET_RTX_NAME(op));
break;
case 'C':
+ printf ("(int) ");
for (np = GET_RTX_NAME(op); *np; np++)
putchar (TOUPPER (*np));
break;
@@ -272,33 +270,6 @@ gen_insn (insn)
printf (";\n");
}
-
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
-
- return val;
-}
-
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
extern int main PARAMS ((int, char **));
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index ce93da79836..0d0ae351a7a 100644
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -862,32 +862,6 @@ gen_split (split)
place_operands (d);
}
-
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
- return val;
-}
-
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
extern int main PARAMS ((int, char **));
diff --git a/gcc/genpeep.c b/gcc/genpeep.c
index dc90c73e2c8..fa8d08fdece 100644
--- a/gcc/genpeep.c
+++ b/gcc/genpeep.c
@@ -368,32 +368,6 @@ print_code (code)
for (p1 = GET_RTX_NAME (code); *p1; p1++)
putchar (TOUPPER(*p1));
}
-
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
- return val;
-}
-
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
extern int main PARAMS ((int, char **));
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index 5d8bb593589..7c435a071df 100644
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -2576,42 +2576,6 @@ record_insn_name (code, name)
insn_name_ptr[code] = new;
}
-char *
-xstrdup (input)
- const char *input;
-{
- register size_t len = strlen (input) + 1;
- register char *output = xmalloc (len);
- memcpy (output, input, len);
- return output;
-}
-
-PTR
-xrealloc (old, size)
- PTR old;
- size_t size;
-{
- register PTR ptr;
- if (old)
- ptr = (PTR) realloc (old, size);
- else
- ptr = (PTR) malloc (size);
- if (!ptr)
- fatal ("virtual memory exhausted");
- return ptr;
-}
-
-PTR
-xmalloc (size)
- size_t size;
-{
- register PTR val = (PTR) malloc (size);
-
- if (val == 0)
- fatal ("virtual memory exhausted");
- return val;
-}
-
static void
debug_decision_2 (test)
struct decision_test *test;
diff --git a/gcc/gensupport.c b/gcc/gensupport.c
index 534f5531df5..120614bcdfc 100644
--- a/gcc/gensupport.c
+++ b/gcc/gensupport.c
@@ -847,3 +847,40 @@ read_md_rtx (lineno, seqnr)
return desc;
}
+
+/* Until we can use the versions in libiberty. */
+char *
+xstrdup (input)
+ const char *input;
+{
+ register size_t len = strlen (input) + 1;
+ register char *output = xmalloc (len);
+ memcpy (output, input, len);
+ return output;
+}
+
+PTR
+xrealloc (old, size)
+ PTR old;
+ size_t size;
+{
+ register PTR ptr;
+ if (old)
+ ptr = (PTR) realloc (old, size);
+ else
+ ptr = (PTR) malloc (size);
+ if (!ptr)
+ fatal ("virtual memory exhausted");
+ return ptr;
+}
+
+PTR
+xmalloc (size)
+ size_t size;
+{
+ register PTR val = (PTR) malloc (size);
+
+ if (val == 0)
+ fatal ("virtual memory exhausted");
+ return val;
+}
View Lorry Controller Status