diff mbox series

[v8,17/17] sh: Add string-fzb.h

Message ID 20230113182733.1268668-18-richard.henderson@linaro.org
State New
Headers show
Series Improve generic string routines | expand

Commit Message

Richard Henderson Jan. 13, 2023, 6:27 p.m. UTC 
From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>

Use the SH cmp/str on has_{zero,eq,zero_eq}.

Checked on sh4-linux-gnu.
Message-Id: <20230111204558.2402155-18-adhemerval.zanella@linaro.org>
---
 sysdeps/powerpc/{ => power6}/string-fza.h |  0
 sysdeps/sh/string-fzb.h                   | 59 +++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 rename sysdeps/powerpc/{ => power6}/string-fza.h (100%)
 create mode 100644 sysdeps/sh/string-fzb.h

Comments

Adhemerval Zanella Jan. 17, 2023, 2:35 p.m. UTC | #1 
On 13/01/23 15:27, Richard Henderson wrote:
> From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
> 
> Use the SH cmp/str on has_{zero,eq,zero_eq}.
> 
> Checked on sh4-linux-gnu.
> Message-Id: <20230111204558.2402155-18-adhemerval.zanella@linaro.org>
> ---
>  sysdeps/powerpc/{ => power6}/string-fza.h |  0
>  sysdeps/sh/string-fzb.h                   | 59 +++++++++++++++++++++++
>  2 files changed, 59 insertions(+)
>  rename sysdeps/powerpc/{ => power6}/string-fza.h (100%)
>  create mode 100644 sysdeps/sh/string-fzb.h
> 
> diff --git a/sysdeps/powerpc/string-fza.h b/sysdeps/powerpc/power6/string-fza.h
> similarity index 100%
> rename from sysdeps/powerpc/string-fza.h
> rename to sysdeps/powerpc/power6/string-fza.h

This belong the the powerpc bits.

> diff --git a/sysdeps/sh/string-fzb.h b/sysdeps/sh/string-fzb.h
> new file mode 100644
> index 0000000000..5a7868333b
> --- /dev/null
> +++ b/sysdeps/sh/string-fzb.h
> @@ -0,0 +1,59 @@
> +/* Zero byte detection; boolean.  SH4 version.
> +   Copyright (C) 2023 Free Software Foundation, Inc.
> +   This file is part of the GNU C Library.
> +
> +   The GNU C Library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   The GNU C Library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with the GNU C Library; if not, see
> +   <http://www.gnu.org/licenses/>.  */
> +
> +#ifndef STRING_FZB_H
> +#define STRING_FZB_H 1
> +
> +#include <sys/cdefs.h>
> +#include <string-optype.h>
> +
> +/* Determine if any bytes within X1 and X2 are equal.  */
> +
> +static __always_inline _Bool
> +has_eq (op_t x1, op_t x2)
> +{
> +  int ret;
> +
> +  /*
> +   * TODO: A compiler builtin for cmp/str would be much better.
> +   * It is difficult to use asm goto here, because the range of
> +   * bt/bf are quite small.
> +   */
> +  asm("cmp/str %1,%2\n\tmovt %0"
> +      : "=r" (ret) : "r" (x1), "r" (x2) : "t");
> +
> +  return ret;
> +}
> +
> +/* Determine if any byte within X is zero.  */
> +
> +static __always_inline _Bool
> +has_zero (op_t x)
> +{
> +  return has_eq (x, 0);
> +}
> +
> +/* Likewise, but for zeros in X1 and equal bytes between X1 and X2.  */
> +
> +static __always_inline _Bool
> +has_zero_eq (op_t x1, op_t x2)
> +{
> +  return has_zero (x1) | has_eq (x1, x2);
> +}
> +
> +#endif /* STRING_FZB_H */
diff mbox series

Patch

diff --git a/sysdeps/powerpc/string-fza.h b/sysdeps/powerpc/power6/string-fza.h
similarity index 100%
rename from sysdeps/powerpc/string-fza.h
rename to sysdeps/powerpc/power6/string-fza.h
diff --git a/sysdeps/sh/string-fzb.h b/sysdeps/sh/string-fzb.h
new file mode 100644
index 0000000000..5a7868333b
--- /dev/null
+++ b/sysdeps/sh/string-fzb.h
@@ -0,0 +1,59 @@ 
+/* Zero byte detection; boolean.  SH4 version.
+   Copyright (C) 2023 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef STRING_FZB_H
+#define STRING_FZB_H 1
+
+#include <sys/cdefs.h>
+#include <string-optype.h>
+
+/* Determine if any bytes within X1 and X2 are equal.  */
+
+static __always_inline _Bool
+has_eq (op_t x1, op_t x2)
+{
+  int ret;
+
+  /*
+   * TODO: A compiler builtin for cmp/str would be much better.
+   * It is difficult to use asm goto here, because the range of
+   * bt/bf are quite small.
+   */
+  asm("cmp/str %1,%2\n\tmovt %0"
+      : "=r" (ret) : "r" (x1), "r" (x2) : "t");
+
+  return ret;
+}
+
+/* Determine if any byte within X is zero.  */
+
+static __always_inline _Bool
+has_zero (op_t x)
+{
+  return has_eq (x, 0);
+}
+
+/* Likewise, but for zeros in X1 and equal bytes between X1 and X2.  */
+
+static __always_inline _Bool
+has_zero_eq (op_t x1, op_t x2)
+{
+  return has_zero (x1) | has_eq (x1, x2);
+}
+
+#endif /* STRING_FZB_H */