From: Kaz Kojima <kkojima@rr.iij4u.or.jp>
To: libc-hacker@sources.redhat.com
Subject: Re: [PATCH] Fix SH build
Date: Sat, 16 Jun 2007 22:08:00 -0000 [thread overview]
Message-ID: <20070617.070718.77323891.kkojima@rr.iij4u.or.jp> (raw)
In-Reply-To: <20070610.133139.77259625.kkojima@rr.iij4u.or.jp>
The attached patch is a follow-up of
Fix SH build
http://sources.redhat.com/ml/libc-hacker/2007-06/msg00008.html
and fixes instructions which are non-existent on SH-3/4. I've
missed that mov.b insn has a very limited display on these CPUs.
I could fix my kernel problems and now these patches are tested
with "make check" on 2.6.22-rc4 kernel with no nptl failures.
Uli, could you please approve these patches? Should I send
the whole revised patch?
Regards,
kaz
--
2007-06-17 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S:
(__pthread_rwlock_rdlock): Don't use non SH-3/4 instruction.
* sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S:
(__pthread_rwlock_wrlock): Likewise.
* sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S:
(pthread_rwlock_timedrdlock): Likewise.
* sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S:
(pthread_rwlock_timedwrlock): Likewise.
* sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S:
(__pthread_rwlock_unlock): Likewise.
diff -uprN ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S 2007-06-17 00:00:04.000000000 +0900
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S 2007-06-17 06:34:50.000000000 +0900
@@ -57,7 +57,8 @@ __pthread_rwlock_rdlock:
mov.l @(WRITERS_QUEUED,r8), r0
tst r0, r0
bt 5f
- mov.b @(FLAGS,r8), r0
+ mov #FLAGS, r0
+ mov.b @(r0,r8), r0
tst r0, r0
bt 5f
3:
@@ -78,12 +79,14 @@ __pthread_rwlock_rdlock:
bf 10f
11:
#if __ASSUME_PRIVATE_FUTEX
- mov.b @(PSHARED,r8), r5
+ mov #PSHARED, r0
+ mov.b @(r0,r8), r5
mov #(FUTEX_PRIVATE_FLAG|FUTEX_WAIT), r0
xor r0, r5
extu.b r5, r5
#else
- mov.b @(PSHARED,r8), r5
+ mov #PSHARED, r0
+ mov.b @(r0,r8), r5
extu.b r5, r5
# if FUTEX_WAIT != 0
mov #FUTEX_WAIT, r0
diff -uprN ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S 2007-06-17 00:00:04.000000000 +0900
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S 2007-06-17 06:35:28.000000000 +0900
@@ -61,7 +61,8 @@ pthread_rwlock_timedrdlock:
mov.l @(WRITERS_QUEUED,r8), r0
tst r0, r0
bt 5f
- mov.b @(FLAGS,r8), r0
+ mov #FLAGS, r0
+ mov.b @(r0,r8), r0
tst r0, r0
bt 5f
3:
@@ -120,12 +121,14 @@ pthread_rwlock_timedrdlock:
/* Futex call. */
mov r15, r7
#if __ASSUME_PRIVATE_FUTEX
- mov.b @(PSHARED,r8), r5
+ mov #PSHARED, r0
+ mov.b @(r0,r8), r5
mov #(FUTEX_PRIVATE_FLAG|FUTEX_WAIT), r0
xor r0, r5
extu.b r5, r5
#else
- mov.b @(PSHARED,r8), r5
+ mov #PSHARED, r0
+ mov.b @(r0,r8), r5
extu.b r5, r5
# if FUTEX_WAIT != 0
mov #FUTEX_WAIT, r0
diff -uprN ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S 2007-06-17 00:00:04.000000000 +0900
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S 2007-06-16 23:39:19.000000000 +0900
@@ -117,12 +117,14 @@ pthread_rwlock_timedwrlock:
/* Futex call. */
mov r15, r7
#if __ASSUME_PRIVATE_FUTEX
- mov.b @(PSHARED,r8), r5
+ mov #PSHARED, r0
+ mov.b @(r0,r8), r5
mov #(FUTEX_PRIVATE_FLAG|FUTEX_WAIT), r0
xor r0, r5
extu.b r5, r5
#else
- mov.b @(PSHARED,r8), r5
+ mov #PSHARED, r0
+ mov.b @(r0,r8), r5
extu.b r5, r5
# if FUTEX_WAIT != 0
mov #FUTEX_WAIT, r0
diff -uprN ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S 2007-06-17 00:00:04.000000000 +0900
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S 2007-06-16 23:39:56.000000000 +0900
@@ -90,12 +90,14 @@ __pthread_rwlock_unlock:
8:
#if __ASSUME_PRIVATE_FUTEX
- mov.b @(PSHARED,r8), r5
+ mov #PSHARED, r0
+ mov.b @(r0,r8), r5
mov #(FUTEX_PRIVATE_FLAG|FUTEX_WAKE), r0
xor r0, r5
extu.b r5, r5
#else
- mov.b @(PSHARED,r8), r5
+ mov #PSHARED, r0
+ mov.b @(r0,r8), r5
extu.b r5, r5
mov #FUTEX_WAKE, r0
or r0, r5
diff -uprN ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S 2007-06-17 00:00:04.000000000 +0900
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S 2007-06-16 23:34:12.000000000 +0900
@@ -77,12 +77,14 @@ __pthread_rwlock_wrlock:
mov r8, r4
add #WRITERS_WAKEUP, r4
#if __ASSUME_PRIVATE_FUTEX
- mov.b @(PSHARED,r8), r5
+ mov #PSHARED, r0
+ mov.b @(r0,r8), r5
mov #(FUTEX_PRIVATE_FLAG|FUTEX_WAIT), r0
xor r0, r5
extu.b r5, r5
#else
- mov.b @(PSHARED,r8), r5
+ mov #PSHARED, r0
+ mov.b @(r0,r8), r5
extu.b r5, r5
# if FUTEX_WAIT != 0
mov #FUTEX_WAIT, r0
next prev parent reply other threads:[~2007-06-16 22:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-10 4:32 Kaz Kojima
2007-06-16 22:08 ` Kaz Kojima [this message]
2007-06-17 16:44 ` Ulrich Drepper
2007-06-17 21:49 ` Kaz Kojima
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070617.070718.77323891.kkojima@rr.iij4u.or.jp \
--to=kkojima@rr.iij4u.or.jp \
--cc=libc-hacker@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).