diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 01c96fb0fc..0e4cfc5c77 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -187,6 +187,7 @@ switch $(HAIKU_DISTRO_COMPATIBILITY) { # analyze the gcc machine spec to determine HAIKU_CPU switch $(HAIKU_GCC_MACHINE) { case i?86-* : HAIKU_CPU = x86 ; + case x86_64-* : HAIKU_CPU = x86_64 ; case powerpc-* : HAIKU_CPU = ppc ; case m68k-* : HAIKU_CPU = m68k ; case mipsel-* : HAIKU_CPU = mipsel ; @@ -243,6 +244,19 @@ switch $(HAIKU_CPU) { Exit "HAIKU_YASM not set. Please re-run configure." ; } } + case x86_64 : + { + HAIKU_DEFINES += __x86_64__ ; + HAIKU_BOOT_PLATFORM = bios_ia32 ; + HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB + # offset in floppy image (>= sizeof(haiku_loader)) + HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB + + # yasm is required for target arch x86_64 + if ! $(HAIKU_YASM) { + Exit "HAIKU_YASM not set. Please re-run configure." ; + } + } case m68k : { HAIKU_DEFINES += __M68K__ ; @@ -341,6 +355,12 @@ switch $(HAIKU_ARCH) { # available with gcc 2, but the header will take care of that. HAIKU_DEFINES += B_USE_BUILTIN_ATOMIC_FUNCTIONS ; } + case x86_64 : + { + # Enable use of the gcc built-in atomic functions instead of atomic_*(). + # The former are inlined and have thus less overhead. + HAIKU_DEFINES += B_USE_BUILTIN_ATOMIC_FUNCTIONS ; + } } # If the environment variable HAIKU_INCLUDE_PATENTED_CODE is defined, we diff --git a/configure b/configure index b7f629823f..e60fb53811 100755 --- a/configure +++ b/configure @@ -38,7 +38,7 @@ options: resulting Haiku installation built with gcc 4 will not be binary compatible with BeOS R5. specifies the target architecture, either - "x86", "ppc", "m68k", "arm" or "mipsel". + "x86", "x86_64", "ppc", "m68k", "arm" or "mipsel". --cross-tools-prefix Assume cross compilation. should be a path to the directory where the cross @@ -381,6 +381,7 @@ while [ $# -gt 0 ] ; do buildCrossToolsScript="${buildCrossToolsScript}_gcc4" case "$2" in x86) HAIKU_GCC_MACHINE=i586-pc-haiku;; + x86_64) HAIKU_GCC_MACHINE=x86_64-pc-haiku; targetArch=x86_64;; ppc) HAIKU_GCC_MACHINE=powerpc-apple-haiku; targetArch=ppc;; m68k) HAIKU_GCC_MACHINE=m68k-unknown-haiku; targetArch=m86k;; arm) HAIKU_GCC_MACHINE=arm-unknown-haiku; targetArch=arm;; diff --git a/headers/build/config_build/HaikuConfig.h b/headers/build/config_build/HaikuConfig.h index cb62aeb2da..e8d7bee211 100644 --- a/headers/build/config_build/HaikuConfig.h +++ b/headers/build/config_build/HaikuConfig.h @@ -14,14 +14,12 @@ __HAIKU_BIG_ENDIAN - defined to 1 on big endian architectures */ #ifdef __INTEL__ -# ifdef HAIKU_HOST_PLATFORM_64_BIT -# define __HAIKU_ARCH x86_64 -# define __HAIKU_ARCH_X86_64 1 -# define __HAIKU_ARCH_64_BIT 1 -# else -# define __HAIKU_ARCH x86 -# define __HAIKU_ARCH_X86 1 -# endif +# define __HAIKU_ARCH x86 +# define __HAIKU_ARCH_X86 1 +#elif __x86_64__ +# define __HAIKU_ARCH x86_64 +# define __HAIKU_ARCH_X86_64 1 +# define __HAIKU_ARCH_64_BIT 1 #elif __POWERPC__ # define __HAIKU_ARCH ppc # define __HAIKU_ARCH_PPC 1 diff --git a/headers/config/HaikuConfig.h b/headers/config/HaikuConfig.h index 8b4def7a93..1ee10c27cb 100644 --- a/headers/config/HaikuConfig.h +++ b/headers/config/HaikuConfig.h @@ -14,14 +14,12 @@ __HAIKU_BIG_ENDIAN - defined to 1 on big endian architectures */ #ifdef __INTEL__ -# ifdef __x86_64__ -# define __HAIKU_ARCH x86_64 -# define __HAIKU_ARCH_X86_64 1 -# define __HAIKU_ARCH_64_BIT 1 -# else -# define __HAIKU_ARCH x86 -# define __HAIKU_ARCH_X86 1 -# endif +# define __HAIKU_ARCH x86 +# define __HAIKU_ARCH_X86 1 +#elif __x86_64__ +# define __HAIKU_ARCH x86_64 +# define __HAIKU_ARCH_X86_64 1 +# define __HAIKU_ARCH_64_BIT 1 #elif __POWERPC__ # define __HAIKU_ARCH ppc # define __HAIKU_ARCH_PPC 1 diff --git a/headers/posix/arch/x86_64/arch_setjmp.h b/headers/posix/arch/x86_64/arch_setjmp.h new file mode 100644 index 0000000000..009a6eee15 --- /dev/null +++ b/headers/posix/arch/x86_64/arch_setjmp.h @@ -0,0 +1,11 @@ +/* + * Copyright 2005, Haiku, Inc. + * Distributed under the terms of the MIT License. + */ +#ifndef _ARCH_SETJMP_H_ +#define _ARCH_SETJMP_H_ + +/* TODO: A jmp_buf size of 12 might not be large enough. Increase to a large size if needed. */ +typedef int __jmp_buf[12]; + +#endif /* _ARCH_SETJMP_H_ */ diff --git a/headers/posix/arch/x86_64/fenv.h b/headers/posix/arch/x86_64/fenv.h new file mode 100644 index 0000000000..b4d7379e8f --- /dev/null +++ b/headers/posix/arch/x86_64/fenv.h @@ -0,0 +1,214 @@ +/*- + * Copyright (c) 2004-2005 David Schultz + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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 AUTHOR 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 AUTHOR 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. + * + * $FreeBSD$ + */ + +#ifndef _FENV_H_ +#define _FENV_H_ + +#include +#include + +typedef struct { + struct { + __uint32_t __control; + __uint32_t __status; + __uint32_t __tag; + char __other[16]; + } __x87; + __uint32_t __mxcsr; +} fenv_t; + +typedef __uint16_t fexcept_t; + +/* Exception flags */ +#define FE_INVALID 0x01 +#define FE_DENORMAL 0x02 +#define FE_DIVBYZERO 0x04 +#define FE_OVERFLOW 0x08 +#define FE_UNDERFLOW 0x10 +#define FE_INEXACT 0x20 +#define FE_ALL_EXCEPT (FE_DIVBYZERO | FE_DENORMAL | FE_INEXACT | \ + FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW) + +/* Rounding modes */ +#define FE_TONEAREST 0x0000 +#define FE_DOWNWARD 0x0400 +#define FE_UPWARD 0x0800 +#define FE_TOWARDZERO 0x0c00 +#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \ + FE_UPWARD | FE_TOWARDZERO) + +/* + * As compared to the x87 control word, the SSE unit's control word + * has the rounding control bits offset by 3 and the exception mask + * bits offset by 7. + */ +#define _SSE_ROUND_SHIFT 3 +#define _SSE_EMASK_SHIFT 7 + +__BEGIN_DECLS + +/* Default floating-point environment */ +extern const fenv_t __fe_dfl_env; +#define FE_DFL_ENV (&__fe_dfl_env) + +#define __fldcw(__cw) __asm __volatile("fldcw %0" : : "m" (__cw)) +#define __fldenv(__env) __asm __volatile("fldenv %0" : : "m" (__env)) +#define __fldenvx(__env) __asm __volatile("fldenv %0" : : "m" (__env) \ + : "st", "st(1)", "st(2)", "st(3)", "st(4)", \ + "st(5)", "st(6)", "st(7)") +#define __fnclex() __asm __volatile("fnclex") +#define __fnstenv(__env) __asm __volatile("fnstenv %0" : "=m" (*(__env))) +#define __fnstcw(__cw) __asm __volatile("fnstcw %0" : "=m" (*(__cw))) +#define __fnstsw(__sw) __asm __volatile("fnstsw %0" : "=am" (*(__sw))) +#define __fwait() __asm __volatile("fwait") +#define __ldmxcsr(__csr) __asm __volatile("ldmxcsr %0" : : "m" (__csr)) +#define __stmxcsr(__csr) __asm __volatile("stmxcsr %0" : "=m" (*(__csr))) + +static __inline int +feclearexcept(int __excepts) +{ + fenv_t __env; + + if (__excepts == FE_ALL_EXCEPT) { + __fnclex(); + } else { + __fnstenv(&__env.__x87); + __env.__x87.__status &= ~__excepts; + __fldenv(__env.__x87); + } + __stmxcsr(&__env.__mxcsr); + __env.__mxcsr &= ~__excepts; + __ldmxcsr(__env.__mxcsr); + return (0); +} + +static __inline int +fegetexceptflag(fexcept_t *__flagp, int __excepts) +{ + int __mxcsr, __status; + + __stmxcsr(&__mxcsr); + __fnstsw(&__status); + *__flagp = (__mxcsr | __status) & __excepts; + return (0); +} + +int fesetexceptflag(const fexcept_t *__flagp, int __excepts); +int feraiseexcept(int __excepts); + +static __inline int +fetestexcept(int __excepts) +{ + int __mxcsr, __status; + + __stmxcsr(&__mxcsr); + __fnstsw(&__status); + return ((__status | __mxcsr) & __excepts); +} + +static __inline int +fegetround(void) +{ + int __control; + + /* + * We assume that the x87 and the SSE unit agree on the + * rounding mode. Reading the control word on the x87 turns + * out to be about 5 times faster than reading it on the SSE + * unit on an Opteron 244. + */ + __fnstcw(&__control); + return (__control & _ROUND_MASK); +} + +static __inline int +fesetround(int __round) +{ + int __mxcsr, __control; + + if (__round & ~_ROUND_MASK) + return (-1); + + __fnstcw(&__control); + __control &= ~_ROUND_MASK; + __control |= __round; + __fldcw(__control); + + __stmxcsr(&__mxcsr); + __mxcsr &= ~(_ROUND_MASK << _SSE_ROUND_SHIFT); + __mxcsr |= __round << _SSE_ROUND_SHIFT; + __ldmxcsr(__mxcsr); + + return (0); +} + +int fegetenv(fenv_t *__envp); +int feholdexcept(fenv_t *__envp); + +static __inline int +fesetenv(const fenv_t *__envp) +{ + + /* + * XXX Using fldenvx() instead of fldenv() tells the compiler that this + * instruction clobbers the i387 register stack. This happens because + * we restore the tag word from the saved environment. Normally, this + * would happen anyway and we wouldn't care, because the ABI allows + * function calls to clobber the i387 regs. However, fesetenv() is + * inlined, so we need to be more careful. + */ + __fldenvx(__envp->__x87); + __ldmxcsr(__envp->__mxcsr); + return (0); +} + +int feupdateenv(const fenv_t *__envp); + +#if __BSD_VISIBLE + +int feenableexcept(int __mask); +int fedisableexcept(int __mask); + +static __inline int +fegetexcept(void) +{ + int __control; + + /* + * We assume that the masks for the x87 and the SSE unit are + * the same. + */ + __fnstcw(&__control); + return (~__control & FE_ALL_EXCEPT); +} + +#endif /* __BSD_VISIBLE */ + +__END_DECLS + +#endif /* !_FENV_H_ */ diff --git a/headers/posix/arch/x86_64/signal.h b/headers/posix/arch/x86_64/signal.h new file mode 100644 index 0000000000..76f5c57558 --- /dev/null +++ b/headers/posix/arch/x86_64/signal.h @@ -0,0 +1,45 @@ +/* + * Copyright 2002-2007, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ +#ifndef _ARCH_SIGNAL_H_ +#define _ARCH_SIGNAL_H_ + +/* + * Architecture-specific structure passed to signal handlers + */ + +#if __x86_64__ + +struct vregs { + unsigned long rax; /* gp regs */ + unsigned long rdx; + unsigned long rcx; + unsigned long rbx; + unsigned long rsi; + unsigned long rdi; + unsigned long rbp; + unsigned long rsp; + + unsigned long r8; /* egp regs */ + unsigned long r9; + unsigned long r10; + unsigned long r11; + unsigned long r12; + unsigned long r13; + unsigned long r14; + unsigned long r15; + + unsigned long rip; + +/*TODO: add +* Floatpoint +* MMX +* SSE +*/ + +}; + +#endif /* __x86_64__ */ + +#endif /* _ARCH_SIGNAL_H_ */ diff --git a/headers/posix/fenv.h b/headers/posix/fenv.h index ef0f8dea17..4dcc8e68e7 100644 --- a/headers/posix/fenv.h +++ b/headers/posix/fenv.h @@ -3,6 +3,8 @@ #if defined(_X86_) # include +#elif defined(_x86_64_) +# include #elif defined(__ARM__) # include #elif defined(__POWERPC__)