From f4f88ebaccd843ce8123d0ba208bf0f544d1b590 Mon Sep 17 00:00:00 2001 From: kkojima Date: Sat, 17 Dec 2011 03:19:40 +0000 Subject: [PATCH] * configure.tgt: Add sh* case. * config/sh/target.h: New file. * config/sh/sjlj.S: New file. * config/linux/sh/futex_bits.h: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182429 138bc75d-0d04-0410-961f-82ee72b054a4 --- libitm/ChangeLog | 7 +++ libitm/config/linux/sh/futex_bits.h | 50 +++++++++++++++ libitm/config/sh/sjlj.S | 122 ++++++++++++++++++++++++++++++++++++ libitm/config/sh/target.h | 51 +++++++++++++++ libitm/configure.tgt | 2 + 5 files changed, 232 insertions(+) create mode 100644 libitm/config/linux/sh/futex_bits.h create mode 100644 libitm/config/sh/sjlj.S create mode 100644 libitm/config/sh/target.h diff --git a/libitm/ChangeLog b/libitm/ChangeLog index ea535fa..ff93a53 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,10 @@ +2011-12-17 Kaz Kojima + + * configure.tgt: Add sh* case. + * config/sh/target.h: New file. + * config/sh/sjlj.S: New file. + * config/linux/sh/futex_bits.h: New file. + 2011-12-14 Richard Henderson * config/arm/hwcap.h, config/arm/hwcap.cc: New files. diff --git a/libitm/config/linux/sh/futex_bits.h b/libitm/config/linux/sh/futex_bits.h new file mode 100644 index 0000000..f9381ed --- /dev/null +++ b/libitm/config/linux/sh/futex_bits.h @@ -0,0 +1,50 @@ +/* Copyright (C) 2011 Free Software Foundation, Inc. + + 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 + . */ + +/* Provide target-specific access to the futex system call. */ + +#include + +/* 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 --git a/libitm/config/sh/sjlj.S b/libitm/config/sh/sjlj.S new file mode 100644 index 0000000..dfd5cc0 --- /dev/null +++ b/libitm/config/sh/sjlj.S @@ -0,0 +1,122 @@ +/* Copyright (C) 2011 Free Software Foundation, Inc. + + 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 + . */ + +#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 @r5+, r8 + mov.l @r5+, r9 + mov.l @r5+, r10 + mov.l @r5+, r11 + mov.l @r5+, r12 + mov.l @r5+, r13 + mov.l @r5+, r14 + mov.l @r5+, r15 + lds.l @r5+, pr + ldc.l @r5+, gbr +#ifdef __SH_FPU_ANY__ + lds.l @r5+, fpscr + fmov.s @r5+, fr12 + fmov.s @r5+, fr13 + fmov.s @r5+, fr14 + fmov.s @r5+, fr15 +#endif + rts + mov r4, r0 + + .size GTM_longjmp, . - GTM_longjmp + +#ifdef __linux__ +.section .note.GNU-stack, "", %progbits +#endif diff --git a/libitm/config/sh/target.h b/libitm/config/sh/target.h new file mode 100644 index 0000000..2868ee3 --- /dev/null +++ b/libitm/config/sh/target.h @@ -0,0 +1,51 @@ +/* Copyright (C) 2011 Free Software Foundation, Inc. + + 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 + . */ + +namespace GTM HIDDEN { + +typedef struct gtm_jmpbuf +{ + unsigned long s[7]; /* r8-r14 */ + void *cfa; + unsigned long pc; + unsigned long gbr; +#ifdef __SH_FPU_ANY__ + unsigned long fpscr; + unsigned long f[4]; /* fr12-fr15 */ +#endif +} 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"); +} + +} // namespace GTM diff --git a/libitm/configure.tgt b/libitm/configure.tgt index a17f3fc..8d43cd4 100644 --- a/libitm/configure.tgt +++ b/libitm/configure.tgt @@ -63,6 +63,8 @@ case "${target_cpu}" in ARCH=x86 ;; + sh*) ARCH=sh ;; + x86_64) case " ${CC} ${CFLAGS} " in *" -m32 "*) -- 2.7.4