Patch to add builtin index/rindex
Kaveh R. Ghazi
ghazi@caip.rutgers.edu
Sun Nov 12 10:04:00 GMT 2000
The following patch adds index/rindex builtins which use the same code
path as strchr/strrchr. They are registered as "nonansi" like
alloca/ffs/bcmp/bzero.
I also noticed that the strchr/strrchr builtins were still attempted
at -O0. (I think the testsuite doesn't happen to pick this up because
all the tests require string variable substitutions which only occur
with optimizations active, so they stop at -O0 but only by chance.)
Anyway, I added the appropriate checks.
Okay to install? (After the code slush of course...)
--Kaveh
2000-11-11 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* builtins.c (expand_builtin): Handle BUILT_IN_INDEX and
BUILT_IN_RINDEX. Add missing checks for BUILT_IN_STRCHR and
BUILT_IN_STRRCHR.
* builtins.def (BUILT_IN_INDEX, BUILT_IN_RINDEX): New entries.
* c-common.c (c_common_nodes_and_builtins): Declare index and
rindex when nonansi builtins are allowed.
* extend.texi (index, rindex): Document new builtins.
testsuite:
* gcc.c-torture/execute/string-opt-3.c: Also test builtin rindex.
* gcc.c-torture/execute/string-opt-4.c: Also test builtin index.
diff -rup orig/egcs-CVS20001110/gcc/builtins.c egcs-CVS20001110/gcc/builtins.c
--- orig/egcs-CVS20001110/gcc/builtins.c Thu Nov 9 10:17:34 2000
+++ egcs-CVS20001110/gcc/builtins.c Sat Nov 11 09:07:26 2000
@@ -2742,6 +2742,8 @@ expand_builtin (exp, target, subtarget,
|| fcode == BUILT_IN_FSQRT || fcode == BUILT_IN_MEMSET
|| fcode == BUILT_IN_MEMCPY || fcode == BUILT_IN_MEMCMP
|| fcode == BUILT_IN_BCMP || fcode == BUILT_IN_BZERO
+ || fcode == BUILT_IN_INDEX || fcode == BUILT_IN_RINDEX
+ || fcode == BUILT_IN_STRCHR || fcode == BUILT_IN_STRRCHR
|| fcode == BUILT_IN_STRLEN || fcode == BUILT_IN_STRCPY
|| fcode == BUILT_IN_STRSTR || fcode == BUILT_IN_STRPBRK
|| fcode == BUILT_IN_STRCMP || fcode == BUILT_IN_FFS
@@ -2884,12 +2886,14 @@ expand_builtin (exp, target, subtarget,
return target;
break;
+ case BUILT_IN_INDEX:
case BUILT_IN_STRCHR:
target = expand_builtin_strchr (arglist, target, mode);
if (target)
return target;
break;
+ case BUILT_IN_RINDEX:
case BUILT_IN_STRRCHR:
target = expand_builtin_strrchr (arglist, target, mode);
if (target)
diff -rup orig/egcs-CVS20001110/gcc/builtins.def egcs-CVS20001110/gcc/builtins.def
--- orig/egcs-CVS20001110/gcc/builtins.def Thu Nov 9 10:17:34 2000
+++ egcs-CVS20001110/gcc/builtins.def Sat Nov 11 08:08:05 2000
@@ -36,6 +36,8 @@ DEF_BUILTIN(BUILT_IN_MEMCMP)
DEF_BUILTIN(BUILT_IN_MEMSET)
DEF_BUILTIN(BUILT_IN_BZERO)
DEF_BUILTIN(BUILT_IN_BCMP)
+DEF_BUILTIN(BUILT_IN_INDEX)
+DEF_BUILTIN(BUILT_IN_RINDEX)
DEF_BUILTIN(BUILT_IN_STRCPY)
DEF_BUILTIN(BUILT_IN_STRCMP)
DEF_BUILTIN(BUILT_IN_STRLEN)
diff -rup orig/egcs-CVS20001110/gcc/c-common.c egcs-CVS20001110/gcc/c-common.c
--- orig/egcs-CVS20001110/gcc/c-common.c Fri Nov 10 10:08:39 2000
+++ egcs-CVS20001110/gcc/c-common.c Sat Nov 11 08:12:11 2000
@@ -5045,6 +5045,12 @@ c_common_nodes_and_builtins ()
/* Suppress error if redefined as a non-function. */
DECL_BUILT_IN_NONANSI (temp) = 1;
+ temp = builtin_function ("index", string_ftype_string_int,
+ BUILT_IN_INDEX, BUILT_IN_NORMAL, NULL_PTR);
+ DECL_BUILT_IN_NONANSI (temp) = 1;
+ temp = builtin_function ("rindex", string_ftype_string_int,
+ BUILT_IN_RINDEX, BUILT_IN_NORMAL, NULL_PTR);
+ DECL_BUILT_IN_NONANSI (temp) = 1;
/* The system prototypes for these functions have many
variations, so don't specify parameters to avoid conflicts.
The expand_* functions check the argument types anyway. */
@@ -5175,6 +5181,10 @@ c_common_nodes_and_builtins ()
BUILT_IN_BZERO, BUILT_IN_NORMAL, "bzero");
builtin_function ("__builtin_bcmp", bcmp_ftype,
BUILT_IN_BCMP, BUILT_IN_NORMAL, "bcmp");
+ builtin_function ("__builtin_index", string_ftype_string_int,
+ BUILT_IN_INDEX, BUILT_IN_NORMAL, "index");
+ builtin_function ("__builtin_rindex", string_ftype_string_int,
+ BUILT_IN_RINDEX, BUILT_IN_NORMAL, "rindex");
builtin_function ("__builtin_strcmp", int_ftype_string_string,
BUILT_IN_STRCMP, BUILT_IN_NORMAL, "strcmp");
builtin_function ("__builtin_strstr", string_ftype_string_string,
diff -rup orig/egcs-CVS20001110/gcc/extend.texi egcs-CVS20001110/gcc/extend.texi
--- orig/egcs-CVS20001110/gcc/extend.texi Fri Nov 10 10:08:44 2000
+++ egcs-CVS20001110/gcc/extend.texi Sat Nov 11 09:13:31 2000
@@ -3247,12 +3247,14 @@ function as well.
@findex fabsl
@findex ffs
@findex fputs
+@findex index
@findex labs
@findex llabs
@findex memcmp
@findex memcpy
@findex memset
@findex printf
+@findex rindex
@findex sin
@findex sinf
@findex sinl
@@ -3289,9 +3291,10 @@ and presumed not to return, but otherwis
@samp{-std=c89} or @samp{-std=c99}).
Outside strict ISO C mode, the functions @code{alloca}, @code{bcmp},
-@code{bzero}, and @code{ffs} may be handled as builtins. Corresponding
-versions @code{__builtin_alloca}, @code{__builtin_bcmp},
-@code{__builtin_bzero}, and @code{__builtin_ffs} are also recognized in
+@code{bzero}, @code{index}, @code{rindex} and @code{ffs} may be handled
+as builtins. Corresponding versions @code{__builtin_alloca},
+@code{__builtin_bcmp}, @code{__builtin_bzero}, @code{__builtin_index},
+@code{__builtin_rindex} and @code{__builtin_ffs} are also recognized in
strict ISO C mode.
The ISO C99 function @code{llabs} is handled as a builtin except in
diff -rup orig/egcs-CVS20001110/gcc/testsuite/gcc.c-torture/execute/string-opt-3.c egcs-CVS20001110/gcc/testsuite/gcc.c-torture/execute/string-opt-3.c
--- orig/egcs-CVS20001110/gcc/testsuite/gcc.c-torture/execute/string-opt-3.c Fri Nov 10 10:09:13 2000
+++ egcs-CVS20001110/gcc/testsuite/gcc.c-torture/execute/string-opt-3.c Sat Nov 11 09:06:37 2000
@@ -1,7 +1,7 @@
/* Copyright (C) 2000 Free Software Foundation.
- Ensure all expected transformations of builtin strlen, strcmp and strrchr
- occur and perform correctly.
+ Ensure all expected transformations of builtin strlen, strcmp,
+ strrchr and rindex occur and perform correctly.
Written by Jakub Jelinek, 11/7/2000. */
@@ -55,8 +55,20 @@ int main()
abort ();
if (x != 8)
abort ();
+ /* For systems which don't have rindex, we test the __builtin_
+ version to avoid spurious link failures at -O0. We only need to
+ test one case since everything is handled in the same code path
+ as builtin strrchr. */
+ if (__builtin_rindex ("hello", 'z') != 0)
+ abort ();
return 0;
+}
+
+static char *
+rindex (const char *s, int c)
+{
+ abort ();
}
#ifdef __OPTIMIZE__
diff -rup orig/egcs-CVS20001110/gcc/testsuite/gcc.c-torture/execute/string-opt-4.c egcs-CVS20001110/gcc/testsuite/gcc.c-torture/execute/string-opt-4.c
--- orig/egcs-CVS20001110/gcc/testsuite/gcc.c-torture/execute/string-opt-4.c Fri Nov 10 10:09:13 2000
+++ egcs-CVS20001110/gcc/testsuite/gcc.c-torture/execute/string-opt-4.c Sat Nov 11 09:04:43 2000
@@ -1,7 +1,7 @@
/* Copyright (C) 2000 Free Software Foundation.
- Ensure all expected transformations of builtin strchr occur and
- perform correctly.
+ Ensure all expected transformations of builtin strchr and index
+ occur and perform correctly.
Written by Jakub Jelinek, 11/7/2000. */
@@ -20,8 +20,20 @@ int main()
abort ();
if (strchr (foo, '\0') != foo + 11)
abort ();
+ /* For systems which don't have index, we test the __builtin_
+ version to avoid spurious link failures at -O0. We only need to
+ test one case since everything is handled in the same code path
+ as builtin strchr. */
+ if (__builtin_index ("hello", 'z') != 0)
+ abort ();
return 0;
+}
+
+static char *
+index (const char *s, int c)
+{
+ abort ();
}
#ifdef __OPTIMIZE__
More information about the Gcc-patches
mailing list