Richard Henderson <r...@redhat.com> wrote:
> To get the ball rolling for other targets, and to let port maintainers see
> how easy it really is, here's a first cut at a port to ARM.
I've tried to port libitm to SH based on the ARM patch.
The attached patch is tested on sh4-unknown-linux-gnu:
=== libitm Summary ===
# of expected passes 23
# of expected failures 5
Regards,
kaz
--
* configure.tgt: Add sh* case.
* config/sh/target.h: New file.
* config/sh/futex_bits.h: New file.
* config/sh/sjlj.S: New file.
diff -uprN ORIG/trunk/libitm/config/sh/futex_bits.h
trunk/libitm/config/sh/futex_bits.h
--- ORIG/trunk/libitm/config/sh/futex_bits.h 1970-01-01 09:00:00.000000000
+0900
+++ trunk/libitm/config/sh/futex_bits.h 2011-11-24 19:06:36.000000000 +0900
@@ -0,0 +1,51 @@
+/* Copyright (C) 2011 Free Software Foundation, Inc.
+ Contributed by Kaz Kojima <kkoj...@gcc.gnu.org>.
+
+ 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/>. */
+
+/* Provide target-specific access to the futex system call. */
+
+#include <sys/syscall.h>
+
+/* 4 instruction cycles not accessing cache and TLB are needed after
+ trapa instruction to avoid an SH-4 silicon bug. */
+
+#define SYSCALL_WITH_INST_PAD "\
+ trapa #0x14; or r0,r0; or r0,r0; or r0,r0; or r0,r0; or r0,r0"
+
+static inline long
+sys_futex0 (int *addr, long op, long val)
+{
+ int __status;
+ register long __r3 asm ("r3") = SYS_futex;
+ register long __r4 asm ("r4") = (long) addr;
+ register long __r5 asm ("r5") = op;
+ register long __r6 asm ("r6") = val;
+ register long __r7 asm ("r7") = 0;
+
+ __asm __volatile (SYSCALL_WITH_INST_PAD
+ : "=z" (__status)
+ : "r" (__r3), "r" (__r4), "r" (__r5),
+ "r" (__r6), "r" (__r7)
+ : "memory", "t");
+ return __status;
+}
diff -uprN ORIG/trunk/libitm/config/sh/sjlj.S trunk/libitm/config/sh/sjlj.S
--- ORIG/trunk/libitm/config/sh/sjlj.S 1970-01-01 09:00:00.000000000 +0900
+++ trunk/libitm/config/sh/sjlj.S 2011-11-24 22:26:36.000000000 +0900
@@ -0,0 +1,123 @@
+/* Copyright (C) 2011 Free Software Foundation, Inc.
+ Contributed by Kaz Kojima <kkoj...@gcc.gnu.org>.
+
+ 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/>. */
+
+#include "asmcfi.h"
+
+ .text
+ .align 2
+ .global _ITM_beginTransaction
+ .type _ITM_beginTransaction, %function
+
+_ITM_beginTransaction:
+ cfi_startproc
+ mov r15, r1
+#ifdef __SH_FPU_ANY__
+ fmov.s fr15, @-r15
+ fmov.s fr14, @-r15
+ fmov.s fr13, @-r15
+ fmov.s fr12, @-r15
+ sts.l fpscr, @-r15
+#endif /* __SH_FPU_ANY__ */
+ stc.l gbr, @-r15
+ sts.l pr, @-r15
+ mov.l r1, @-r15
+ mov.l r14, @-r15
+ mov.l r13, @-r15
+ mov.l r12, @-r15
+ mov.l r11, @-r15
+ mov.l r10, @-r15
+ mov.l r9, @-r15
+ mov.l r8, @-r15
+#ifdef __SH_FPU_ANY__
+ cfi_def_cfa_offset (4*15)
+#else
+ cfi_def_cfa_offset (4*10)
+#endif
+#if defined HAVE_ATTRIBUTE_VISIBILITY || !defined __PIC__
+ mov.l .Lbegin, r1
+ jsr @r1
+ mov r15, r5
+#else
+ mova .Lgot, r0
+ mov.l .Lgot, r12
+ add r0, r12
+ mov.l .Lbegin, r1
+ bsrf r1
+ mov r15, r5
+.Lbegin0:
+ mov.l @(4*4,r15), r12
+#endif
+ mov.l @(8*4,r15), r1
+ lds r1, pr
+#ifdef __SH_FPU_ANY__
+ add #(15*4), r15
+#else
+ add #(10*5), r15
+#endif
+ cfi_def_cfa_offset (0)
+ rts
+ nop
+ cfi_endproc
+
+ .align 2
+.Lgot:
+ .long _GLOBAL_OFFSET_TABLE_
+.Lbegin:
+#if defined HAVE_ATTRIBUTE_VISIBILITY || !defined __PIC__
+ .long GTM_begin_transaction
+#else
+ .long GTM_begin_transaction@PLT-(.Lbegin0-.)
+#endif
+ .size _ITM_beginTransaction, . - _ITM_beginTransaction
+
+ .global GTM_longjmp
+ .hidden GTM_longjmp
+ .type GTM_longjmp, %function
+
+GTM_longjmp:
+ mov.l @r4+, r8
+ mov.l @r4+, r9
+ mov.l @r4+, r10
+ mov.l @r4+, r11
+ mov.l @r4+, r12
+ mov.l @r4+, r13
+ mov.l @r4+, r14
+ mov.l @r4+, r15
+ lds.l @r4+, pr
+ ldc.l @r4+, gbr
+#ifdef __SH_FPU_ANY__
+ lds.l @r4+, fpscr
+ fmov.s @r4+, fr12
+ fmov.s @r4+, fr13
+ fmov.s @r4+, fr14
+ fmov.s @r4+, fr15
+#endif
+ rts
+ mov r5, r0
+
+ .size GTM_longjmp, . - GTM_longjmp
+
+#ifdef __linux__
+.section .note.GNU-stack, "", %progbits
+#endif
diff -uprN ORIG/trunk/libitm/config/sh/target.h trunk/libitm/config/sh/target.h
--- ORIG/trunk/libitm/config/sh/target.h 1970-01-01 09:00:00.000000000
+0900
+++ trunk/libitm/config/sh/target.h 2011-11-24 09:39:31.000000000 +0900
@@ -0,0 +1,62 @@
+/* Copyright (C) 2011 Free Software Foundation, Inc.
+ Contributed by Kaz Kojima <kkoj...@gcc.gnu.org>.
+
+ 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/>. */
+
+namespace GTM HIDDEN {
+
+typedef struct gtm_jmpbuf
+{
+ unsigned long s[7]; /* r8-r14 */
+ void *cfa;
+ unsigned long pc;
+ unsigned long gbr;
+ unsigned long fpscr;
+ unsigned long f[4]; /* fr12-fr15 */
+} gtm_jmpbuf;
+
+/* SH generally uses a fixed page size of 4K. */
+#define PAGE_SIZE 4096
+#define FIXED_PAGE_SIZE 1
+
+/* ??? The size of one line in hardware caches (in bytes). */
+#define HW_CACHELINE_SIZE 32
+
+static inline void
+cpu_relax (void)
+{
+ __asm volatile ("" : : : "memory");
+}
+
+static inline void
+atomic_read_barrier (void)
+{
+ __sync_synchronize ();
+}
+
+static inline void
+atomic_write_barrier (void)
+{
+ __sync_synchronize ();
+}
+
+} // namespace GTM
diff -uprN ORIG/trunk/libitm/configure.tgt trunk/libitm/configure.tgt
--- ORIG/trunk/libitm/configure.tgt 2011-11-09 16:37:07.000000000 +0900
+++ trunk/libitm/configure.tgt 2011-11-24 09:42:38.000000000 +0900
@@ -61,6 +61,8 @@ case "${target_cpu}" in
ARCH=x86
;;
+ sh*) ARCH=sh ;;
+
x86_64)
case " ${CC} ${CFLAGS} " in
*" -m32 "*)
