Patchwork [trans-mem] Move x86 TLS definition to linux/x86.

login
register
mail settings
Submitter Torvald Riegel
Date Aug. 22, 2011, 9:54 a.m.
Message ID <1314006893.3533.2590.camel@triegel.csb>
Download mbox | patch
Permalink /patch/110883/
State New
Headers show

Comments

Torvald Riegel - Aug. 22, 2011, 9:54 a.m.
A small change. OK for branch?
commit b9db8481779fc5a4069ac36505bd6cce8da971a1
Author: Torvald Riegel <triegel@redhat.com>
Date:   Mon Aug 22 11:52:00 2011 +0200

    Move x86 TLS definition to linux/x86.
    
    	* config/x86/tls.h: Moved to ...
    	* config/linux/x86/tls.h: ... here.
Richard Henderson - Aug. 22, 2011, 9:53 p.m.
On 08/22/2011 02:54 AM, Torvald Riegel wrote:
>     Move x86 TLS definition to linux/x86.
>     
>     	* config/x86/tls.h: Moved to ...
>     	* config/linux/x86/tls.h: ... here.

Ok.


r~

Patch

diff --git a/libitm/config/linux/x86/tls.h b/libitm/config/linux/x86/tls.h
new file mode 100644
index 0000000..ca644f4
--- /dev/null
+++ b/libitm/config/linux/x86/tls.h
@@ -0,0 +1,93 @@ 
+/* Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Transactional Memory Library (libitm).
+
+   Libitm is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   Libitm 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 General Public License for
+   more details.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef LIBITM_X86_TLS_H
+#define LIBITM_X86_TLS_H 1
+
+#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
+/* Use slots in the TCB head rather than __thread lookups.
+   GLIBC has reserved words 10 through 13 for TM.  */
+#define HAVE_ARCH_GTM_THREAD 1
+#define HAVE_ARCH_GTM_THREAD_DISP 1
+#endif
+
+#include "config/generic/tls.h"
+
+#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
+namespace GTM HIDDEN {
+
+#ifdef __x86_64__
+# define SEG_READ(OFS)		"movq\t%%fs:(" #OFS "*8),%0"
+# define SEG_WRITE(OFS)		"movq\t%0,%%fs:(" #OFS "*8)"
+# define SEG_DECODE_READ(OFS)	SEG_READ(OFS) "\n\t" \
+				"rorq\t$17,%0\n\t" \
+				"xorq\t%%fs:48,%0"
+# define SEG_ENCODE_WRITE(OFS)	"xorq\t%%fs:48,%0\n\t" \
+				"rolq\t$17,%0\n\t" \
+				SEG_WRITE(OFS)
+#else
+# define SEG_READ(OFS)  "movl\t%%gs:(" #OFS "*4),%0"
+# define SEG_WRITE(OFS) "movl\t%0,%%gs:(" #OFS "*4)"
+# define SEG_DECODE_READ(OFS)	SEG_READ(OFS) "\n\t" \
+				"rorl\t$9,%0\n\t" \
+				"xorl\t%%gs:24,%0"
+# define SEG_ENCODE_WRITE(OFS)	"xorl\t%%gs:24,%0\n\t" \
+				"roll\t$9,%0\n\t" \
+				SEG_WRITE(OFS)
+#endif
+
+static inline struct gtm_thread *gtm_thr(void)
+{
+  struct gtm_thread *r;
+  asm (SEG_READ(10) : "=r"(r));
+  return r;
+}
+
+static inline void set_gtm_thr(struct gtm_thread *x)
+{
+  asm volatile (SEG_WRITE(10) : : "r"(x));
+}
+
+static inline struct abi_dispatch *abi_disp(void)
+{
+  struct abi_dispatch *r;
+  asm (SEG_DECODE_READ(11) : "=r"(r));
+  return r;
+}
+
+static inline void set_abi_disp(struct abi_dispatch *x)
+{
+  void *scratch;
+  asm volatile (SEG_ENCODE_WRITE(11) : "=r"(scratch) : "0"(x));
+}
+
+#undef SEG_READ
+#undef SEG_WRITE
+#undef SEG_DECODE_READ
+#undef SEG_ENCODE_WRITE
+
+} // namespace GTM
+#endif /* >= GLIBC 2.10 */
+
+#endif // LIBITM_X86_TLS_H
diff --git a/libitm/config/x86/tls.h b/libitm/config/x86/tls.h
deleted file mode 100644
index ca644f4..0000000
--- a/libitm/config/x86/tls.h
+++ /dev/null
@@ -1,93 +0,0 @@ 
-/* Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
-   Contributed by Richard Henderson <rth@redhat.com>.
-
-   This file is part of the GNU Transactional Memory Library (libitm).
-
-   Libitm is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   Libitm 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 General Public License for
-   more details.
-
-   Under Section 7 of GPL version 3, you are granted additional
-   permissions described in the GCC Runtime Library Exception, version
-   3.1, as published by the Free Software Foundation.
-
-   You should have received a copy of the GNU General Public License and
-   a copy of the GCC Runtime Library Exception along with this program;
-   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef LIBITM_X86_TLS_H
-#define LIBITM_X86_TLS_H 1
-
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-/* Use slots in the TCB head rather than __thread lookups.
-   GLIBC has reserved words 10 through 13 for TM.  */
-#define HAVE_ARCH_GTM_THREAD 1
-#define HAVE_ARCH_GTM_THREAD_DISP 1
-#endif
-
-#include "config/generic/tls.h"
-
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-namespace GTM HIDDEN {
-
-#ifdef __x86_64__
-# define SEG_READ(OFS)		"movq\t%%fs:(" #OFS "*8),%0"
-# define SEG_WRITE(OFS)		"movq\t%0,%%fs:(" #OFS "*8)"
-# define SEG_DECODE_READ(OFS)	SEG_READ(OFS) "\n\t" \
-				"rorq\t$17,%0\n\t" \
-				"xorq\t%%fs:48,%0"
-# define SEG_ENCODE_WRITE(OFS)	"xorq\t%%fs:48,%0\n\t" \
-				"rolq\t$17,%0\n\t" \
-				SEG_WRITE(OFS)
-#else
-# define SEG_READ(OFS)  "movl\t%%gs:(" #OFS "*4),%0"
-# define SEG_WRITE(OFS) "movl\t%0,%%gs:(" #OFS "*4)"
-# define SEG_DECODE_READ(OFS)	SEG_READ(OFS) "\n\t" \
-				"rorl\t$9,%0\n\t" \
-				"xorl\t%%gs:24,%0"
-# define SEG_ENCODE_WRITE(OFS)	"xorl\t%%gs:24,%0\n\t" \
-				"roll\t$9,%0\n\t" \
-				SEG_WRITE(OFS)
-#endif
-
-static inline struct gtm_thread *gtm_thr(void)
-{
-  struct gtm_thread *r;
-  asm (SEG_READ(10) : "=r"(r));
-  return r;
-}
-
-static inline void set_gtm_thr(struct gtm_thread *x)
-{
-  asm volatile (SEG_WRITE(10) : : "r"(x));
-}
-
-static inline struct abi_dispatch *abi_disp(void)
-{
-  struct abi_dispatch *r;
-  asm (SEG_DECODE_READ(11) : "=r"(r));
-  return r;
-}
-
-static inline void set_abi_disp(struct abi_dispatch *x)
-{
-  void *scratch;
-  asm volatile (SEG_ENCODE_WRITE(11) : "=r"(scratch) : "0"(x));
-}
-
-#undef SEG_READ
-#undef SEG_WRITE
-#undef SEG_DECODE_READ
-#undef SEG_ENCODE_WRITE
-
-} // namespace GTM
-#endif /* >= GLIBC 2.10 */
-
-#endif // LIBITM_X86_TLS_H