diff options
Diffstat (limited to 'libc/arch-arm/include')
| -rw-r--r-- | libc/arch-arm/include/machine/asm.h | 4 | ||||
| -rw-r--r-- | libc/arch-arm/include/machine/cdefs.h | 19 | ||||
| -rw-r--r-- | libc/arch-arm/include/machine/cpu-features.h | 128 | ||||
| -rw-r--r-- | libc/arch-arm/include/machine/endian.h | 14 | ||||
| -rw-r--r-- | libc/arch-arm/include/machine/internal_types.h | 10 | ||||
| -rw-r--r-- | libc/arch-arm/include/machine/kernel.h | 42 |
6 files changed, 9 insertions, 208 deletions
diff --git a/libc/arch-arm/include/machine/asm.h b/libc/arch-arm/include/machine/asm.h index 047e54d..f16baf8 100644 --- a/libc/arch-arm/include/machine/asm.h +++ b/libc/arch-arm/include/machine/asm.h @@ -70,12 +70,12 @@ #define _ASM_TYPE_FUNCTION #function #define _ASM_TYPE_OBJECT #object #define _ENTRY(x) \ - .text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; x: .fnstart + .text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; x: .fnstart; .cfi_startproc; #define _ASM_SIZE(x) .size x, .-x; #define _END(x) \ - .fnend; \ + .fnend; .cfi_endproc; \ _ASM_SIZE(x) #ifdef GPROF diff --git a/libc/arch-arm/include/machine/cdefs.h b/libc/arch-arm/include/machine/cdefs.h deleted file mode 100644 index 44f1542..0000000 --- a/libc/arch-arm/include/machine/cdefs.h +++ /dev/null @@ -1,19 +0,0 @@ -/* $OpenBSD: cdefs.h,v 1.2 2005/11/24 20:46:44 deraadt Exp $ */ - -#ifndef _MACHINE_CDEFS_H_ -#define _MACHINE_CDEFS_H_ - -#if defined(lint) -#define __indr_reference(sym,alias) __lint_equal__(sym,alias) -#define __warn_references(sym,msg) -#define __weak_alias(alias,sym) __lint_equal__(sym,alias) -#elif defined(__GNUC__) && defined(__STDC__) -#define __weak_alias(alias,sym) \ - __asm__(".weak " __STRING(alias) " ; " __STRING(alias) \ - " = " __STRING(sym)); -#define __warn_references(sym,msg) \ - __asm__(".section .gnu.warning." __STRING(sym) \ - " ; .ascii \"" msg "\" ; .text"); -#endif - -#endif /* !_MACHINE_CDEFS_H_ */ diff --git a/libc/arch-arm/include/machine/cpu-features.h b/libc/arch-arm/include/machine/cpu-features.h index 80d3fda..fc5a8fd 100644 --- a/libc/arch-arm/include/machine/cpu-features.h +++ b/libc/arch-arm/include/machine/cpu-features.h @@ -34,133 +34,29 @@ * * This is done to abstract us from the various ARM Architecture * quirks and alphabet soup. - * - * IMPORTANT: We have no intention to support anything below an ARMv4T ! */ /* __ARM_ARCH__ is a number corresponding to the ARM revision - * we're going to support - * - * it looks like our toolchain doesn't define __ARM_ARCH__ + * we're going to support. Our toolchain doesn't define __ARM_ARCH__ * so try to guess it. - * - * - * */ #ifndef __ARM_ARCH__ - # if defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ || \ - defined __ARM_ARCH_7R__ || defined __ARM_ARCH_7M__ - + defined __ARM_ARCH_7R__ || defined __ARM_ARCH_7M__ # define __ARM_ARCH__ 7 - # elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ || \ - defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6Z__ || \ - defined __ARM_ARCH_6KZ__ || defined __ARM_ARCH_6T2__ -# + defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6Z__ || \ + defined __ARM_ARCH_6KZ__ || defined __ARM_ARCH_6T2__ # define __ARM_ARCH__ 6 -# -# elif defined __ARM_ARCH_5__ || defined __ARM_ARCH_5T__ || \ - defined __ARM_ARCH_5TE__ || defined __ARM_ARCH_5TEJ__ -# -# define __ARM_ARCH__ 5 -# -# elif defined __ARM_ARCH_4T__ -# -# define __ARM_ARCH__ 4 -# -# elif defined __ARM_ARCH_4__ -# error ARMv4 is not supported, please use ARMv4T at a minimum # else # error Unknown or unsupported ARM architecture # endif #endif -/* experimental feature used to check that our ARMv4 workarounds - * work correctly without a real ARMv4 machine */ -#ifdef BIONIC_EXPERIMENTAL_FORCE_ARMV4 -# undef __ARM_ARCH__ -# define __ARM_ARCH__ 4 -#endif - -/* define __ARM_HAVE_5TE if we have the ARMv5TE instructions */ -#if __ARM_ARCH__ > 5 -# define __ARM_HAVE_5TE 1 -#elif __ARM_ARCH__ == 5 -# if defined __ARM_ARCH_5TE__ || defined __ARM_ARCH_5TEJ__ -# define __ARM_HAVE_5TE 1 -# endif -#endif - -/* instructions introduced in ARMv5 */ -#if __ARM_ARCH__ >= 5 -# define __ARM_HAVE_BLX 1 -# define __ARM_HAVE_CLZ 1 -# define __ARM_HAVE_LDC2 1 -# define __ARM_HAVE_MCR2 1 -# define __ARM_HAVE_MRC2 1 -# define __ARM_HAVE_STC2 1 -#endif - -/* ARMv5TE introduces a few instructions */ -#if __ARM_HAVE_5TE -# define __ARM_HAVE_PLD 1 -# define __ARM_HAVE_MCRR 1 -# define __ARM_HAVE_MRRC 1 -#endif - /* define __ARM_HAVE_HALFWORD_MULTIPLY when half-word multiply instructions * this means variants of: smul, smulw, smla, smlaw, smlal */ -#if __ARM_HAVE_5TE -# define __ARM_HAVE_HALFWORD_MULTIPLY 1 -#endif - -/* define __ARM_HAVE_PAIR_LOAD_STORE when 64-bit memory loads and stored - * into/from a pair of 32-bit registers is supported throuhg 'ldrd' and 'strd' - */ -#if __ARM_HAVE_5TE -# define __ARM_HAVE_PAIR_LOAD_STORE 1 -#endif - -/* define __ARM_HAVE_SATURATED_ARITHMETIC is you have the saturated integer - * arithmetic instructions: qdd, qdadd, qsub, qdsub - */ -#if __ARM_HAVE_5TE -# define __ARM_HAVE_SATURATED_ARITHMETIC 1 -#endif - -/* define __ARM_HAVE_PC_INTERWORK when a direct assignment to the - * pc register will switch into thumb/ARM mode depending on bit 0 - * of the new instruction address. Before ARMv5, this was not the - * case, and you have to write: - * - * mov r0, [<some address>] - * bx r0 - * - * instead of: - * - * ldr pc, [<some address>] - * - * note that this affects any instruction that explicitly changes the - * value of the pc register, including ldm { ...,pc } or 'add pc, #offset' - */ -#if __ARM_ARCH__ >= 5 -# define __ARM_HAVE_PC_INTERWORK -#endif - -/* define __ARM_HAVE_LDREX_STREX for ARMv6 and ARMv7 architecture to be - * used in replacement of deprecated swp instruction - */ -#if __ARM_ARCH__ >= 6 -# define __ARM_HAVE_LDREX_STREX -#endif - -/* define __ARM_HAVE_DMB for ARMv7 architecture - */ -#if __ARM_ARCH__ >= 7 -# define __ARM_HAVE_DMB -#endif +#define __ARM_HAVE_HALFWORD_MULTIPLY 1 /* define __ARM_HAVE_LDREXD for ARMv7 architecture * (also present in ARMv6K, but not implemented in ARMv7-M, neither of which @@ -184,18 +80,4 @@ # define __ARM_HAVE_NEON #endif -/* Assembly-only macros */ -#ifdef __ASSEMBLY__ - -/* define a handy PLD(address) macro since the cache preload - * is an optional opcode - */ -#if __ARM_HAVE_PLD -# define PLD(reg,offset) pld [reg, offset] -#else -# define PLD(reg,offset) /* nothing */ -#endif - -#endif /* ! __ASSEMBLY__ */ - #endif /* _ARM_MACHINE_CPU_FEATURES_H */ diff --git a/libc/arch-arm/include/machine/endian.h b/libc/arch-arm/include/machine/endian.h index 7cba3b9..8d9723d 100644 --- a/libc/arch-arm/include/machine/endian.h +++ b/libc/arch-arm/include/machine/endian.h @@ -33,15 +33,6 @@ #ifdef __GNUC__ -/* - * REV and REV16 weren't available on ARM5 or ARM4. - * We don't include <machine/cpu-features.h> because it pollutes the - * namespace with macros like PLD. - */ -#if !defined __ARM_ARCH_5__ && !defined __ARM_ARCH_5T__ && \ - !defined __ARM_ARCH_5TE__ && !defined __ARM_ARCH_5TEJ__ && \ - !defined __ARM_ARCH_4T__ && !defined __ARM_ARCH_4__ - /* According to RealView Assembler User's Guide, REV and REV16 are available * in Thumb code and 16-bit instructions when used in Thumb-2 code. * @@ -55,13 +46,13 @@ */ #define __swap16md(x) ({ \ register u_int16_t _x = (x); \ - __asm volatile ("rev16 %0, %0" : "+l" (_x)); \ + __asm__ __volatile__("rev16 %0, %0" : "+l" (_x)); \ _x; \ }) #define __swap32md(x) ({ \ register u_int32_t _x = (x); \ - __asm volatile ("rev %0, %0" : "+l" (_x)); \ + __asm__ __volatile__("rev %0, %0" : "+l" (_x)); \ _x; \ }) @@ -74,7 +65,6 @@ /* Tell sys/endian.h we have MD variants of the swap macros. */ #define MD_SWAP -#endif /* __ARM_ARCH__ */ #endif /* __GNUC__ */ #if defined(__ARMEB__) diff --git a/libc/arch-arm/include/machine/internal_types.h b/libc/arch-arm/include/machine/internal_types.h deleted file mode 100644 index 7e610b0..0000000 --- a/libc/arch-arm/include/machine/internal_types.h +++ /dev/null @@ -1,10 +0,0 @@ -/* $OpenBSD: internal_types.h,v 1.2 2004/05/06 15:53:39 drahn Exp $ */ -/* Public domain */ -#ifndef _ARM_INTERNAL_TYPES_H_ -#define _ARM_INTERNAL_TYPES_H_ - -#ifdef __CHAR_UNSIGNED__ -#define __machine_has_unsigned_chars -#endif - -#endif diff --git a/libc/arch-arm/include/machine/kernel.h b/libc/arch-arm/include/machine/kernel.h deleted file mode 100644 index 462b8e3..0000000 --- a/libc/arch-arm/include/machine/kernel.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source 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. - */ -#ifndef _ARCH_ARM_KERNEL_H -#define _ARCH_ARM_KERNEL_H - -/* this file contains kernel-specific definitions that were optimized out of - our processed kernel headers, but still useful nonetheless... */ - -typedef unsigned long __kernel_blkcnt_t; -typedef unsigned long __kernel_blksize_t; - -/* these aren't really defined by the kernel headers though... */ -typedef unsigned long __kernel_fsblkcnt_t; -typedef unsigned long __kernel_fsfilcnt_t; -typedef unsigned int __kernel_id_t; - -#endif /* _ARCH_ARM_KERNEL_H */ |