tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge from open-source master

Browse source
This commit is contained in:
Jean-Baptiste Queru 2009-09-16 16:21:35 -07:00
commit 895244b2ab
12 changed files with 476 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
MAINTAINERS Normal file
View file

@ -0,0 +1,6 @@
Bionic support for SuperH
-------------------------
Bionic support for SuperH architecture is written by
Shin-ichiro KAWASAKI <shinichiro.kawasaki.mg@hitachi.com>
and Contributed to Android by Hitachi, Ltd. and Renesas Solutions Corp.

12
libc/bionic/pthread.c
View file

@ -1241,22 +1241,12 @@ int pthread_cond_timeout_np(pthread_cond_t *cond,
pthread_mutex_t * mutex,
unsigned msecs)
{
int oldvalue;
struct timespec ts;
int status;
ts.tv_sec = msecs / 1000;
ts.tv_nsec = (msecs % 1000) * 1000000;
oldvalue = cond->value;
pthread_mutex_unlock(mutex);
status = __futex_wait(&cond->value, oldvalue, &ts);
pthread_mutex_lock(mutex);
if(status == (-ETIMEDOUT)) return ETIMEDOUT;
return 0;
return __pthread_cond_timedwait_relative(cond, mutex, &ts);
}

16
libc/include/stdint.h
View file

@ -46,13 +46,17 @@
# define __STDINT_MACROS
#endif
#if !defined __STRICT_ANSI__ || __STDC_VERSION__ >= 199901L
# define __STDC_INT64__
#endif
typedef __int8_t int8_t;
typedef __uint8_t uint8_t;
typedef __int16_t int16_t;
typedef __uint16_t uint16_t;
typedef __int32_t int32_t;
typedef __uint32_t uint32_t;
#if !defined(__STRICT_ANSI__)
#if defined(__STDC_INT64__)
typedef __int64_t int64_t;
typedef __uint64_t uint64_t;
#endif
@ -157,7 +161,7 @@ typedef uint32_t uint_fast32_t;
# define UINT_FAST32_C(c) UINT32_C(c)
#endif
#if !defined(__STRICT_ANSI__)
#if defined(__STDC_INT64__)
/*
* int64_t
*/
@ -198,7 +202,7 @@ typedef uint64_t uint_fast64_t;
# define __PRIFAST_RANK ""
# define __PRIPTR_RANK ""
#endif /* !__STRICT_ANSI__ */
#endif /* __STDC_INT64__ */
/*
* intptr_t & uintptr_t
@ -221,7 +225,7 @@ typedef unsigned int uintptr_t;
* intmax_t & uintmax_t
*/
#if !defined(__STRICT_ANSI__)
#if defined(__STDC_INT64__)
typedef uint64_t uintmax_t;
typedef int64_t intmax_t;
@ -233,7 +237,7 @@ typedef int64_t intmax_t;
#define INTMAX_C(c) INT64_C(c)
#define UINTMAX_C(c) UINT64_C(c)
#else /* __STRICT_ANSI__ */
#else /* !__STDC_INT64__ */
typedef uint32_t uintmax_t;
typedef int32_t intmax_t;
@ -245,7 +249,7 @@ typedef int32_t intmax_t;
#define INTMAX_C(c) INT32_C(c)
#define UINTMAX_C(c) UINT32_C(c)
#endif /* __STRICT_ANSI__ */
#endif /* !__STDC_INT64__ */
/* size_t is defined by the GCC-specific <stddef.h> */

4
libc/private/bionic_tls.h
View file

@ -87,8 +87,10 @@ extern void __init_tls(void** tls, void* thread_info);
extern int __set_tls(void *ptr);
/* get the TLS */
/* Linux kernel helpers for its TLS implementation */
#ifdef __arm__
# define __get_tls() ( *((volatile void **) 0xffff0ff0) )
typedef void* (__kernel_get_tls_t)(void);
#define __get_tls (*(__kernel_get_tls_t *)0xffff0fe0)
#else
extern void* __get_tls( void );
#endif

15
libdl/Android.mk
View file

@ -36,6 +36,21 @@ LOCAL_MODULE:= libdl
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
LOCAL_SYSTEM_SHARED_LIBRARIES :=
ifeq ($(TARGET_ARCH),sh)
# for SuperH, additional code is necessary to handle .ctors section.
GEN_SOBEGIN := $(TARGET_OUT_STATIC_LIBRARIES)/sobegin.o
$(GEN_SOBEGIN): $(LOCAL_PATH)/arch-sh/sobegin.S
@mkdir -p $(dir $@)
$(TARGET_CC) -o $@ -c $<
GEN_SOEND := $(TARGET_OUT_STATIC_LIBRARIES)/soend.o
$(GEN_SOEND): $(LOCAL_PATH)/arch-sh/soend.S
@mkdir -p $(dir $@)
$(TARGET_CC) -o $@ -c $<
LOCAL_ADDITIONAL_DEPENDENCIES := $(GEN_SOBEGIN) $(GEN_SOEND)
endif
include $(BUILD_SHARED_LIBRARY)
BUILD_DLTEST:=0

70
libdl/arch-sh/sobegin.S Normal file
View file

@ -0,0 +1,70 @@
/*
* Copyright (C) 2009 The Android Open Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
.text
.align 4
.type _init,#function
.globl _init
# The toolchain for SH-Linux does not produce INIT_ARRAY information which
# bionic linker relies on. Instead of it, The toolchain for SH-Linux produces
# INIT information when it find the function whose name is '_init'.
#
_init:
sts.l pr, @-r15
mov.l r8, @-r15
mov.l 0f, r8 /* first entry is invalid */
.L_loop:
add #4, r8
mov.l @r8, r0
cmp/eq #0, r0 /* Zero terimnated. See 'soend.so'. */
bt .L_end
jsr @r0 /* invoke a constructor */
nop
bra .L_loop
nop
.L_end:
mov.l @r15+, r8
lds.l @r15+, pr
rts
nop
.balign 4
0: .long __CTOR_LIST__
# the .ctors section contains a list of pointers to "constructor"
# functions that need to be called in order during C library initialization,
# just before the program is being run. This is a C++ requirement
#
# the last entry shall be 0, and is defined in crtend.S
#
.section .ctors, "aw"
.globl __CTOR_LIST__
__CTOR_LIST__:
.long -1

31
libdl/arch-sh/soend.S Normal file
View file

@ -0,0 +1,31 @@
/*
* Copyright (C) 2009 The Android Open Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
.section .ctors, "aw"
.long 0

2
libdl/libdl.c
View file

@ -24,7 +24,7 @@ int dlclose(void *handle) { return 0; }
#ifdef __arm__
void *dl_unwind_find_exidx(void *pc, int *pcount) { return 0; }
#elif defined(__i386__)
#elif defined(__i386__) || defined(__sh__)
/* we munge the cb definition so we don't have to include any headers here.
* It won't affect anything since these are just symbols anyway */
int dl_iterate_phdr(int (*cb)(void *info, void *size, void *data),

12
libm/Android.mk
View file

@ -170,7 +170,17 @@ else
libm_common_includes = $(LOCAL_PATH)/i386 $(LOCAL_PATH)/i387
else
$(error "Unknown architecture")
ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-sh)
libm_common_src_files += \
sh/fenv.c \
src/s_scalbln.c \
src/s_scalbn.c \
src/s_scalbnf.c
libm_common_includes = $(LOCAL_PATH)/sh
else
$(error "Unknown architecture")
endif
endif
endif

58
libm/sh/_fpmath.h Normal file
View file

@ -0,0 +1,58 @@
/*
* Copyright (C) 2009 Android Open Source Project, All rights reserved.
* Derived from "bionic/libm/arm/_fpmath.h"
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* Assumes that 'long double' on SH-linux is just an alias for 'double'.
*/
union IEEEl2bits {
long double e;
struct {
#if __BYTE_ORDER == __LITTLE_ENDIAN
unsigned int manl :32;
unsigned int manh :20;
unsigned int exp :11;
unsigned int sign :1;
#elif __BYTE_ORDER == __BIG_ENDIAN
unsigned int sign :1;
unsigned int exp :11;
unsigned int manh :20;
unsigned int manl :32;
#endif
} bits;
};
/*
* LDBL_NBIT is a mask indicating the position of the integer
* bit in a long double. But SH4 does not support it.
*/
#define LDBL_NBIT 0
#define mask_nbit_l(u) ((void)0)
#define LDBL_MANH_SIZE 20
#define LDBL_MANL_SIZE 32

30
libm/sh/fenv.c Normal file
View file

@ -0,0 +1,30 @@
/*
* Copyright (C) 2009 Android Open Source Project, All rights reserved.
* Derived from "bionic/libm/arm/fenv.c"
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
long __fpscr_values[2] = { 0L, 0x80000L };

240
libm/sh/fenv.h Normal file
View file

@ -0,0 +1,240 @@
/*
* Copyright (C) 2009 Android Open Source Project, All rights reserved.
* Derived from "bionic/libm/arm/fenv.h"
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _FENV_H_
#define _FENV_H_
#include <stdio.h>
#include <sys/types.h>
typedef uint32_t fenv_t;
typedef uint32_t fexcept_t;
/* Exception flags */
#define FE_INVALID 0x0010
#define FE_DIVBYZERO 0x0008
#define FE_OVERFLOW 0x0004
#define FE_UNDERFLOW 0x0002
#define FE_INEXACT 0x0001
#define FE_ALL_EXCEPT (FE_DIVBYZERO | FE_INEXACT | \
FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
/* Rounding modes */
#define FE_TONEAREST 0x0000
#define FE_TOWARDZERO 0x0001
#define FE_UPWARD 0x0002 /* not supporetd */
#define FE_DOWNWARD 0x0003 /* not supporetd */
#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \
FE_UPWARD | FE_TOWARDZERO)
/* bit shift for FPSCR mapping */
#define _FPUE_CAUSE_SHIFT 12
#define _FPUE_ENABLE_SHIFT 17
#define _FPUE_FLAG_SHIFT 2
/* bit shifters */
#define _FPUE_CAUSE(_EXCS) ((_EXCS) << _FPUE_CAUSE_SHIFT)
#define _FPUE_ENABLE(_EXCS) ((_EXCS) << _FPUE_ENABLE_SHIFT)
#define _FPUE_FLAG(_EXCS) ((_EXCS) << _FPUE_FLAG_SHIFT)
#define _GET_FPUE_CAUSE(_FPUE) (((_FPUE) >> _FPUE_CAUSE_SHIFT) & FE_ALL_EXCEPT)
#define _GET_FPUE_ENABLE(_FPUE) (((_FPUE) >> _FPUE_ENABLE_SHIFT)& FE_ALL_EXCEPT)
#define _GET_FPUE_FLAG(_FPUE) (((_FPUE) >> _FPUE_FLAG_SHIFT) & FE_ALL_EXCEPT)
/* FPSCR register accessors */
#ifdef __SH4_NOFPU__
#define __read_fpscr(_ptr)
#define __write_fpscr(_val)
#else
#define __read_fpscr(_ptr) __asm __volatile("sts fpscr, %0" : "=r" (*(_ptr)))
#define __write_fpscr(_val) __asm __volatile("lds %0, fpscr" : : "r" (_val))
#endif
/* functions for libm */
static __inline int
feclearexcept(int __excepts)
{
uint32_t __fpscr;
__read_fpscr(&__fpscr);
__fpscr &= ~_FPUE_FLAG(__excepts);
__write_fpscr(__fpscr);
return (0);
}
static __inline int
fegetexceptflag(fexcept_t *__flagp, int __excepts)
{
uint32_t __fpscr;
__read_fpscr(&__fpscr);
*__flagp = _GET_FPUE_FLAG(__fpscr) & __excepts;
return (0);
}
static __inline int
fesetexceptflag(const fexcept_t *__flagp, int __excepts)
{
uint32_t __fpscr;
__read_fpscr(&__fpscr);
__fpscr &= ~_FPUE_FLAG(__excepts);
__fpscr |= ~_FPUE_FLAG(*__flagp & __excepts);
__write_fpscr(__fpscr);
return (0);
}
static __inline int
feraiseexcept(int __excepts)
{
fexcept_t __ex = __excepts;
fesetexceptflag(&__ex, __excepts); /* XXX */
return (0);
}
static __inline int
fetestexcept(int __excepts)
{
fexcept_t __ex;
fegetexceptflag(&__ex, __excepts);
return (__ex);
}
static __inline int
fegetround(void)
{
uint32_t __fpscr = 0;
__read_fpscr(&__fpscr);
return (__fpscr & _ROUND_MASK);
}
static __inline int
fesetround(int __round)
{
uint32_t __fpscr = 0;
if (__round == FE_UPWARD || __round == FE_DOWNWARD) {
fprintf(stderr, "libm superh : "
"upward/downward rounding not supporetd.\n");
return -1;
}
__read_fpscr(&__fpscr);
__fpscr &= ~_ROUND_MASK;
__fpscr |= (__round & _ROUND_MASK);
__write_fpscr(__fpscr);
return (0);
}
static __inline int
fegetenv(fenv_t *__envp)
{
__read_fpscr(__envp);
return (0);
}
static __inline int
feholdexcept(fenv_t *__envp)
{
uint32_t __fpscr;
__read_fpscr(&__fpscr);
*__envp = __fpscr;
__fpscr &= ~_FPUE_FLAG(FE_ALL_EXCEPT);
__write_fpscr(__fpscr);
return (0);
}
static __inline int
fesetenv(const fenv_t *__envp)
{
__write_fpscr(*__envp);
return (0);
}
static __inline int
feupdateenv(const fenv_t *__envp)
{
uint32_t __fpscr;
__read_fpscr(&__fpscr);
__write_fpscr(*__envp);
feraiseexcept(_GET_FPUE_FLAG(__fpscr));
return (0);
}
#if __BSD_VISIBLE
static __inline int
feenableexcept(int __mask)
{
uint32_t __old_fpscr, __new_fpscr;
__read_fpscr(&__old_fpscr);
__new_fpscr = __old_fpscr | _FPUE_ENABLE(__mask & FE_ALL_EXCEPT);
__write_fpscr(__new_fpscr);
return (_GET_FPUE_ENABLE(__old_fpscr));
}
static __inline int
fedisableexcept(int __mask)
{
uint32_t __old_fpscr, __new_fpscr;
__read_fpscr(&__old_fpscr);
__new_fpscr = __old_fpscr & ~(_FPUE_ENABLE(__mask & FE_ALL_EXCEPT));
__write_fpscr(__new_fpscr);
return (_GET_FPUE_ENABLE(__old_fpscr));
}
static __inline int
fegetexcept(void)
{
uint32_t __fpscr;
__read_fpscr(&__fpscr);
return (_GET_FPUE_ENABLE(__fpscr));
}
#endif /* __BSD_VISIBLE */
#endif /* _FENV_H_ */