1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
|
Index: b/usr/src/lib/libc/amd64/gen/rawmemchr.s
===================================================================
--- /dev/null
+++ b/usr/src/lib/libc/amd64/gen/rawmemchr.s
@@ -0,0 +1,96 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
+ .file "rawmemchr.s"
+
+/
+/ rawmemchr(sptr, c1)
+/
+/ Returns the pointer in sptr at which the character c1 appears;
+/ doesn't stop at all
+/
+/ Fast assembly language version of the following C-program memchr
+/ which represents the `standard' for the C-library.
+/
+/ void *
+/ rawmemchr(const void *sptr, int c1)
+/ {
+/ unsigned char c = (unsigned char)c1;
+/ const unsigned char *sp = sptr;
+/
+/ do {
+/ if (*sp++ == c)
+/ return ((void *)--sp);
+/ } while (1);
+/ return (NULL);
+/ }
+/
+
+#include "SYS.h"
+
+ .globl rawmemchr
+ .align 4
+
+ ENTRY(rawmemchr) /* (void *s, uchar_t c) */
+ movl %esi, %eax / move "c" to %eax
+ testq $3, %rdi / if %rdi not word aligned
+ jnz .L2 / goto .L2
+ .align 4
+.L3:
+ movl (%rdi), %ecx / move 1 word from (%rdi) to %ecx
+ cmpb %cl, %al / if the first byte is %al
+ je .L4 / goto .L4 (found)
+ cmpb %ch, %al / if the second byte is %al
+ je .L5 / goto .L5 (found)
+ shrl $16, %ecx / right shift 16-bit
+ cmpb %cl, %al / if the third byte is %al
+ je .L6 / goto .L6 (found)
+ cmpb %ch, %al / if the fourth is %al
+ je .L7 / goto .L7 (found)
+ addq $4, %rdi / next word
+ jmp .L3 / goto .L3
+ .align 4
+.L2:
+ cmpb (%rdi), %al / if a byte in (%rdi) is %al
+ je .L4 / goto .L4 (found)
+ incq %rdi / next byte
+ testq $3, %rdi / if %rdi not word aligned
+ jnz .L2 / goto .L2
+ jmp .L3 / goto .L3
+ .align 4
+.L7:
+ / found at the fourth byte
+ incq %rdi
+.L6:
+ / found at the third byte
+ incq %rdi
+.L5:
+ / found at the second byte
+ incq %rdi
+.L4:
+ / found at the first byte
+ movq %rdi,%rax
+ ret
+ SET_SIZE(rawmemchr)
Index: b/usr/src/lib/libc/amd64/Makefile
===================================================================
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -129,6 +129,7 @@ GENOBJS= \
new_list.o \
proc64_id.o \
proc64_support.o \
+ rawmemchr.o \
setjmp.o \
siginfolst.o \
siglongjmp.o \
Index: b/usr/src/lib/libc/port/mapfile-vers
===================================================================
--- a/usr/src/lib/libc/port/mapfile-vers
+++ b/usr/src/lib/libc/port/mapfile-vers
@@ -279,6 +279,7 @@ SYMBOL_VERSION DYSON_1 {
memrchr;
program_invocation_name;
program_invocation_short_name;
+ rawmemchr;
} ILLUMOS_0.3;
SYMBOL_VERSION ILLUMOS_0.3 { # Illumos additions
Index: b/usr/src/lib/libc/i386/gen/rawmemchr.s
===================================================================
--- /dev/null
+++ b/usr/src/lib/libc/i386/gen/rawmemchr.s
@@ -0,0 +1,100 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
+ .file "rawmemchr.s"
+
+/
+/ rawmemchr(sptr, c1)
+/
+/ Returns the pointer in sptr at which the character c1 appears;
+/ doesn't stop at all
+/
+/ Fast assembly language version of the following C-program memchr
+/ which represents the `standard' for the C-library.
+/
+/ void *
+/ rawmemchr(const void *sptr, int c1)
+/ {
+/ unsigned char c = (unsigned char)c1;
+/ const unsigned char *sp = sptr;
+/
+/ do {
+/ if (*sp++ == c)
+/ return ((void *)--sp);
+/ } while (1);
+/ return (NULL);
+/ }
+/
+
+#include "SYS.h"
+
+ .globl rawmemchr
+ .align 4
+
+ ENTRY(rawmemchr)
+ pushl %edi / save register variable
+ movl 8(%esp), %eax / %eax = string address
+ movl 12(%esp), %ecx / %cl = byte that is sought
+ testl $3, %eax / if %eax not word aligned
+ jnz .L2 / goto .L2
+ .align 4
+.L3:
+ movl (%eax), %edx / move 1 word from (%eax) to %edx
+ cmpb %dl, %cl / if the first byte is %cl
+ je .L4 / goto .L4 (found)
+ cmpb %dh, %cl / if the second byte is %cl
+ je .L5 / goto .L5 (found)
+ shrl $16, %edx / right shift 16-bit
+ cmpb %dl, %cl / if the third byte is %cl
+ je .L6 / goto .L6 (found)
+ cmpb %dh, %cl / if the fourth is %cl
+ je .L7 / goto .L7 (found)
+ subl $4, %edi / decrement number of bytes by 4
+ addl $4, %eax / next word
+ cmpl $4, %edi / if number of bytes >= 4
+ jae .L3 / goto .L3
+ .align 4
+.L2:
+ cmpb (%eax), %cl / if a byte in (%eax) is %cl
+ je .L4 / goto .L4 (found)
+ incl %eax / next byte
+ testl $3, %eax / if %eax not word aligned
+ jnz .L2 / goto .L2
+ jmp .L3 / goto .L3
+ .align 4
+.L7:
+ / found at the fourth byte
+ incl %eax
+.L6:
+ / found at the third byte
+ incl %eax
+.L5:
+ / found at the second byte
+ incl %eax
+.L4:
+ / found at the first byte
+ popl %edi / restore register variable
+ ret
+ SET_SIZE(rawmemchr)
Index: b/usr/src/lib/libc/i386/Makefile.com
===================================================================
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -139,6 +139,7 @@ GENOBJS= \
memcpy.o \
memset.o \
new_list.o \
+ rawmemchr.o \
setjmp.o \
siginfolst.o \
siglongjmp.o \
Index: b/usr/src/head/string.h
===================================================================
--- a/usr/src/head/string.h
+++ b/usr/src/head/string.h
@@ -141,6 +141,7 @@ extern char *strdup(const char *);
#define __mempcpy mempcpy
extern void *mempcpy(void *, const void *, size_t);
extern void *memrchr(const void *, int, size_t);
+extern void *rawmemchr(const void *, int);
#endif
#if defined(__EXTENSIONS__) || \
|
