Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit27aaf9d

Browse files
committed
Remove ; and add \n to ASM code.
1 parentb864793 commit27aaf9d

File tree

2 files changed

+93
-95
lines changed

2 files changed

+93
-95
lines changed

‎src/backend/storage/buffer/s_lock.c

Lines changed: 61 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.29 2001/01/14 05:08:15 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.30 2001/01/19 20:39:16 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -115,9 +115,6 @@ s_lock(volatile slock_t *lock, const char *file, const int line)
115115
}
116116
}
117117

118-
119-
120-
121118
/*
122119
* Various TAS implementations that cannot live in s_lock.h as no inline
123120
* definition exists (yet).
@@ -136,18 +133,18 @@ static void
136133
tas_dummy()/* really means: extern int tas(slock_t
137134
* **lock); */
138135
{
139-
__asm__("\n\
140-
.global_tas\n\
141-
_tas:\n\
142-
movel sp@(0x4),a0\n\
143-
tas a0@\n\
144-
beq _success\n\
145-
moveq #-128,d0\n\
146-
rts\n\
147-
_success:\n\
148-
moveq #0,d0\n\
149-
rts\n\
150-
");
136+
__asm__ __volatile__(
137+
"\
138+
.global_tas\n\
139+
_tas:\n\
140+
movelsp@(0x4),a0\n\
141+
tas a0@\n\
142+
beq _success\n\
143+
moveq #-128,d0\n\
144+
rts\n\
145+
_success:\n\
146+
moveq #0,d0\n\
147+
rts");
151148
}
152149

153150
#endif/* __m68k__ */
@@ -160,22 +157,23 @@ _success:\n\
160157
staticvoid
161158
tas_dummy()
162159
{
163-
__asm__(" \n\
164-
.globl tas \n\
165-
.globl _tas \n\
166-
_tas: \n\
167-
tas: \n\
168-
lwarx r5,0,r3 \n\
169-
cmpwi r5,0 \n\
170-
bne fail \n\
171-
addi r5,r5,1 \n\
172-
stwcx. r5,0,r3 \n\
173-
beq success \n\
174-
fail: li r3,1 \n\
175-
blr \n\
176-
success: \n\
177-
li r3,0 \n\
178-
blr \n\
160+
__asm__ __volatile__(
161+
"\
162+
.globl tas\n\
163+
.globl _tas\n\
164+
_tas:\n\
165+
tas:\n\
166+
lwarxr5,0,r3\n\
167+
cmpwi r5,0\n\
168+
bne fail\n\
169+
addi r5,r5,1\n\
170+
stwcx. r5,0,r3\n\
171+
beq success\n\
172+
fail:li r3,1\n\
173+
blr \n\
174+
success:\n\
175+
li r3,0\n\
176+
blr \n\
179177
");
180178
}
181179

@@ -186,21 +184,21 @@ success: \n\
186184
staticvoid
187185
tas_dummy()
188186
{
189-
__asm__("\n\
190-
.globaltas\n\
191-
tas:\n\
192-
lwarx5,0,3\n\
193-
cmpwi5,0\n\
194-
bnefail\n\
195-
addi5,5,1\n\
196-
stwcx. 5,0,3\n\
197-
beqsuccess\n\
198-
fail:li3,1\n\
199-
blr\n\
200-
success:\n\
201-
li 3,0\n\
202-
blr\n\
203-
");
187+
__asm__ __volatile__(
188+
"\
189+
.globaltas\n\
190+
tas:\n\
191+
lwarx5,0,3\n\
192+
cmpwi 5,0\n\
193+
bne fail\n\
194+
addi 5,5,1\n\
195+
stwcx.5,0,3\n\
196+
beq success\n\
197+
fail:li3,1\n\
198+
blr\n\
199+
success:\n\
200+
li 3,0\n\
201+
blr");
204202
}
205203

206204
#endif/* __powerpc__ */
@@ -209,22 +207,22 @@ success:\n\
209207
staticvoid
210208
tas_dummy()
211209
{
212-
__asm__("\n\
213-
.globaltas\n\
214-
tas:\n\
215-
.frame$sp, 0, $31\n\
216-
ll$14, 0($4)\n\
217-
or$15, $14,1\n\
218-
sc$15,0($4)\n\
219-
beq$15, 0, fail\n\
220-
bne$14, 0, fail\n\
221-
li$2, 0\n\
222-
.livereg 0x2000FF0E,0x00000FFF\n\
223-
j $31\n\
224-
fail:\n\
225-
li$2, 1\n\
226-
j $31\n\
227-
");
210+
__asm___volatile__(
211+
"\
212+
.globaltas\n\
213+
tas:\n\
214+
.frame$sp, 0, $31\n\
215+
ll$14,0($4)\n\
216+
or$15,$14, 1\n\
217+
sc$15, 0($4)\n\
218+
beq$15, 0, fail\n\
219+
bne$14, 0, fail\n\
220+
li$2, 0\n\
221+
.livereg 0x2000FF0E,0x00000FFF\n\
222+
j$31\n\
223+
fail:\n\
224+
li$2, 1\n\
225+
j $31");
228226
}
229227

230228
#endif/* __mips__ */

‎src/include/storage/s_lock.h

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.82 2001/01/1907:03:53 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.83 2001/01/1920:39:16 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -103,9 +103,9 @@ extern void s_lock_sleep(unsigned spins, int microsec,
103103
* Standard _asm format:
104104
*
105105
*__asm__ __volatile__(
106-
*"command;"
107-
*"command;"
108-
*"command;"
106+
*"command\n"
107+
*"command\n"
108+
*"command\n"
109109
*:"=r"(_res)return value, in register
110110
*:"r"(lock)argument, 'lock pointer', in register
111111
*:"r0");inline code uses this register
@@ -121,8 +121,8 @@ tas(volatile slock_t *lock)
121121
registerslock_t_res=1;
122122

123123
__asm__ __volatile__(
124-
"lock;"
125-
"xchgb%0,%1;"
124+
"lock\n"
125+
"xchgb%0,%1\n"
126126
:"=q"(_res),"=m"(*lock)
127127
:"0"(_res));
128128
return (int)_res;
@@ -140,7 +140,7 @@ tas(volatile slock_t *lock)
140140
longintret;
141141

142142
__asm__ __volatile__(
143-
"xchg4 %0=%1,%2;"
143+
"xchg4%0=%1,%2\n"
144144
:"=r"(ret),"=m"(*lock)
145145
:"r"(1),"1"(*lock)
146146
:"memory");
@@ -160,7 +160,7 @@ tas(volatile slock_t *lock)
160160
registerslock_t_res=1;
161161

162162
__asm__ __volatile__(
163-
"swpb %0, %0, [%3];"
163+
"swpb%0, %0, [%3]\n"
164164
:"=r"(_res),"=m"(*lock)
165165
:"0"(_res),"r"(lock));
166166
return (int)_res;
@@ -180,11 +180,11 @@ tas(volatile slock_t *lock)
180180
int_res;
181181

182182
__asm____volatile__(
183-
"la1,1;"
184-
"l 2,%2;"
185-
"slr 0,0;"
186-
"cs 0,1,0(2);"
187-
"lr %1,0;"
183+
"la1,1\n"
184+
"l2,%2\n"
185+
"slr 0,0\n"
186+
"cs 0,1,0(2)\n"
187+
"lr %1,0\n"
188188
:"=m"(lock),"=d"(_res)
189189
:"m"(lock)
190190
:"0","1","2");
@@ -204,7 +204,7 @@ tas(volatile slock_t *lock)
204204
registerslock_t_res=1;
205205

206206
__asm__ __volatile__(
207-
"ldstub[%2], %0;"
207+
"ldstub[%2], %0\n"
208208
:"=r"(_res),"=m"(*lock)
209209
:"r"(lock));
210210
return (int)_res;
@@ -222,8 +222,8 @@ tas(volatile slock_t *lock)
222222
registerintrv;
223223

224224
__asm____volatile__(
225-
"tas %1;"
226-
"sne %0;"
225+
"tas %1\n"
226+
"sne %0\n"
227227
:"=d"(rv),"=m"(*lock)
228228
:"1"(*lock)
229229
:"cc");
@@ -249,10 +249,10 @@ tas(volatile slock_t *lock)
249249
register_res;
250250

251251
__asm__ __volatile__(
252-
"movl $1, r0;"
253-
"bbssi $0, (%1), 1f;"
254-
"clrlr0;"
255-
"1: movl r0, %0;"
252+
"movl$1, r0\n"
253+
"bbssi$0, (%1), 1f\n"
254+
"clrlr0\n"
255+
"1: movl r0, %0\n"
256256
:"=r"(_res)
257257
:"r"(lock)
258258
:"r0");
@@ -271,8 +271,8 @@ tas(volatile slock_t *lock)
271271
register_res;
272272

273273
__asm__ __volatile__(
274-
"sbitb 0, %0;"
275-
"sfsd%1;"
274+
"sbitb0, %0\n"
275+
"sfsd%1\n"
276276
:"=m"(*lock),"=r"(_res));
277277
return (int)_res;
278278
}
@@ -339,16 +339,16 @@ tas(volatile slock_t *lock)
339339
registerslock_t_res;
340340

341341
__asm____volatile__(
342-
"ldq $0, %0;"
343-
"bne $0, 2f;"
344-
"ldq_l %1, %0;"
345-
"bne %1, 2f;"
346-
"mov 1,$0;"
347-
"stq_c $0, %0;"
348-
"beq $0, 2f;"
349-
"mb;"
350-
"br 3f;"
351-
"2: mov1, %1;"
342+
"ldq $0, %0\n"
343+
"bne $0, 2f\n"
344+
"ldq_l %1, %0\n"
345+
"bne %1, 2f\n"
346+
"mov 1, $0\n"
347+
"stq_c $0, %0\n"
348+
"beq $0, 2f\n"
349+
"mb\n"
350+
"br 3f\n"
351+
"2: mov 1, %1\n"
352352
"3:"
353353
:"=m"(*lock),"=r"(_res)
354354
:

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp