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
|
Index: b/usr/src/lib/libc/i386/inc/SYS.h
===================================================================
--- a/usr/src/lib/libc/i386/inc/SYS.h 2012-09-30 22:01:57.162242716 +0400
+++ b/usr/src/lib/libc/i386/inc/SYS.h 2012-09-30 22:04:18.029233723 +0400
@@ -64,7 +64,7 @@
#define __SYSCALLINT(name) \
/* CSTYLED */ \
- movl $SYS_/**/name, %eax; \
+ movl $SYS_##name, %eax; \
int $T_SYSCALLINT
/*
@@ -75,7 +75,7 @@
call 8f; \
8: popl %edx; \
/* CSTYLED */ \
- movl $SYS_/**/name, %eax; \
+ movl $SYS_##name, %eax; \
movl %esp, %ecx; \
add $[9f - 8b], %edx; \
sysenter; \
@@ -87,7 +87,7 @@
*/
#define __SYSCALL(name) \
/* CSTYLED */ \
- movl $SYS_/**/name, %eax; \
+ movl $SYS_##name, %eax; \
.byte 0xf, 0x5 /* syscall */
#if defined(_SYSC_INSN)
@@ -112,7 +112,7 @@
*/
#define SYSFASTTRAP(name) \
/* CSTYLED */ \
- movl $T_/**/name, %eax; \
+ movl $T_##name, %eax; \
int $T_FASTTRAP
/*
@@ -149,7 +149,7 @@
*/
#define SYSREENTRY(name) \
/* CSTYLED */ \
-.restart_/**/name: \
+.restart_##name: \
ENTRY(name)
/*
@@ -207,13 +207,13 @@
SYSREENTRY(name); \
SYSTRAP_2RVALS(name); \
/* CSTYLED */ \
- SYSRESTART(.restart_/**/name)
+ SYSRESTART(.restart_##name)
#define SYSCALL_RESTART_RVAL1(name) \
SYSREENTRY(name); \
SYSTRAP_RVAL1(name); \
/* CSTYLED */ \
- SYSRESTART(.restart_/**/name)
+ SYSRESTART(.restart_##name)
/*
* SYSCALL2 provides a common system call sequence when the entry name
@@ -237,13 +237,13 @@
SYSREENTRY(entryname); \
SYSTRAP_2RVALS(trapname); \
/* CSTYLED */ \
- SYSRESTART(.restart_/**/entryname)
+ SYSRESTART(.restart_##entryname)
#define SYSCALL2_RESTART_RVAL1(entryname, trapname) \
SYSREENTRY(entryname); \
SYSTRAP_RVAL1(trapname); \
/* CSTYLED */ \
- SYSRESTART(.restart_/**/entryname)
+ SYSRESTART(.restart_##entryname)
/*
* SYSCALL_NOERROR provides the most common system call sequence for those
Index: b/usr/src/lib/libc/amd64/inc/SYS.h
===================================================================
--- a/usr/src/lib/libc/amd64/inc/SYS.h 2012-09-30 22:01:57.162112785 +0400
+++ b/usr/src/lib/libc/amd64/inc/SYS.h 2012-09-30 22:04:18.029722260 +0400
@@ -54,7 +54,7 @@
#define __SYSCALL(name) \
movq %rcx, %r10; \
/* CSTYLED */ \
- movl $SYS_/**/name, %eax; \
+ movl $SYS_##name, %eax; \
syscall
#define SYSTRAP_RVAL1(name) __SYSCALL(name)
@@ -68,7 +68,7 @@
*/
#define SYSFASTTRAP(name) \
/* CSTYLED */ \
- movl $T_/**/name, %eax; \
+ movl $T_##name, %eax; \
int $T_FASTTRAP
/*
Index: b/usr/src/lib/libc/amd64/gen/memcmp.s
===================================================================
--- a/usr/src/lib/libc/amd64/gen/memcmp.s 2012-09-30 22:01:57.162218724 +0400
+++ b/usr/src/lib/libc/amd64/gen/memcmp.s 2012-09-30 22:04:18.030203051 +0400
@@ -54,7 +54,7 @@
#include "SYS.h"
#include "cache.h"
-#define LABEL(s) .memcmp/**/s
+#define LABEL(s) .memcmp##s
ENTRY(memcmp) /* (const void *, const void*, size_t) */
Index: b/usr/src/lib/libc/amd64/gen/memcpy.s
===================================================================
--- a/usr/src/lib/libc/amd64/gen/memcpy.s 2012-09-30 22:01:57.162168084 +0400
+++ b/usr/src/lib/libc/amd64/gen/memcpy.s 2012-09-30 22:04:18.031273217 +0400
@@ -44,7 +44,7 @@
#include "cache.h"
#include "proc64_id.h"
-#define L(s) .memcpy/**/s
+#define L(s) .memcpy##s
/*
* memcpy algorithm overview:
Index: b/usr/src/lib/libc/amd64/gen/memset.s
===================================================================
--- a/usr/src/lib/libc/amd64/gen/memset.s 2012-09-30 22:01:57.162195235 +0400
+++ b/usr/src/lib/libc/amd64/gen/memset.s 2012-09-30 22:04:18.032628337 +0400
@@ -42,7 +42,7 @@
#include "cache.h"
#include "proc64_id.h"
-#define L(s) .memset/**/s
+#define L(s) .memset##s
/*
* memset algorithm overview:
Index: b/usr/src/lib/libc/amd64/gen/strcmp.s
===================================================================
--- a/usr/src/lib/libc/amd64/gen/strcmp.s 2012-09-30 22:01:57.162231700 +0400
+++ b/usr/src/lib/libc/amd64/gen/strcmp.s 2012-09-30 22:04:18.033273921 +0400
@@ -31,7 +31,7 @@
#include "SYS.h"
#include "proc64_id.h"
-#define LABEL(s) .strcmp/**/s
+#define LABEL(s) .strcmp##s
#ifdef USE_AS_STRNCMP
/*
Index: b/usr/src/lib/libc/amd64/gen/strcpy.s
===================================================================
--- a/usr/src/lib/libc/amd64/gen/strcpy.s 2012-09-30 22:01:57.162207265 +0400
+++ b/usr/src/lib/libc/amd64/gen/strcpy.s 2012-09-30 22:04:18.034113702 +0400
@@ -30,7 +30,7 @@
#include "SYS.h"
#include "proc64_id.h"
-#define LABEL(s) .strcpy/**/s
+#define LABEL(s) .strcpy##s
#ifdef USE_AS_STRNCPY
ENTRY(strncpy)
Index: b/usr/src/lib/libc/amd64/gen/strlen.s
===================================================================
--- a/usr/src/lib/libc/amd64/gen/strlen.s 2012-09-30 22:01:57.162183925 +0400
+++ b/usr/src/lib/libc/amd64/gen/strlen.s 2012-09-30 22:04:18.034426792 +0400
@@ -31,7 +31,7 @@
#include "SYS.h"
#include "proc64_id.h"
-#define LABEL(s) .strlen/**/s
+#define LABEL(s) .strlen##s
/*
* This implementation uses SSE instructions to compare up to 16 bytes
|
