PR target/54222

	* config/avr/stdfix.h: New file.
	* t-avr (stdfix-gcc.h): New rule to build it.
	(EXTRA_HEADERS): Set it to install stdfix.h, stdfix-gcc.h.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195407 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 383 insertions, 0 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8e5c18b90c2..51a75040814 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-23  Georg-Johann Lay  <avr@gjlay.de>
+
+	PR target/54222
+	* config/avr/stdfix.h: New file.
+	* t-avr (stdfix-gcc.h): New rule to build it.
+	(EXTRA_HEADERS): Set it to install stdfix.h, stdfix-gcc.h.
+
 2013-01-23  Kostya Serebryany  <kcc@google.com>
 
 	* config/darwin.h: remove dependency on CoreFoundation (asan on Mac OS).
diff --git a/gcc/config/avr/stdfix.h b/gcc/config/avr/stdfix.h
new file mode 100644
index 00000000000..95535a88180
--- /dev/null
+++ b/gcc/config/avr/stdfix.h
@@ -0,0 +1,367 @@
+/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
+
+   This file is part of GCC.
+
+   GCC 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, or (at your option)
+   any later version.
+
+   GCC 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/>.  */
+
+/* ISO/IEC JTC1 SC22 WG14 N1169
+ * Date: 2006-04-04
+ * ISO/IEC TR 18037
+ * Programming languages - C - Extensions to support embedded processors
+ */
+
+#ifndef _AVRGCC_STDFIX_H
+#define _AVRGCC_STDFIX_H
+
+/* 7.18a.1 Introduction.  */
+/* 7.18a.3 Precision macros.  */
+
+#include <stdfix-gcc.h>
+
+/* 2.1.7.4 The bitwise fixed-point to integer conversion functions.  */
+/* 2.1.7.5 The bitwise integer to fixed-point conversion functions.  */
+
+#define _GCC_TYPEPUN(A, B)                      \
+  __builtin_memcpy (&A, &B, sizeof (A))
+
+#if __SIZEOF_INT__ == 2
+
+typedef signed char int_hr_t;
+typedef unsigned char uint_uhr_t;
+
+typedef short int int_r_t;
+typedef short unsigned int uint_ur_t;
+
+typedef short int int_hk_t;
+typedef short unsigned int uint_uhk_t;
+
+typedef long int int_lr_t;
+typedef long unsigned int uint_ulr_t;
+
+typedef long int int_k_t;
+typedef long unsigned int uint_uk_t;
+
+typedef long long int int_llr_t;
+typedef long long unsigned int uint_ullr_t;
+
+typedef long long int int_lk_t;
+typedef long long unsigned int uint_ulk_t;
+
+typedef long long int int_llk_t;
+typedef long long unsigned int uint_ullk_t;
+
+#else /* __SIZEOF_INT__ = 1 (for -mint8) */
+
+
+typedef signed char int_hr_t;
+typedef unsigned char uint_uhr_t;
+
+typedef long int int_r_t;
+typedef long unsigned int uint_ur_t;
+
+typedef long int int_hk_t;
+typedef long unsigned int uint_uhk_t;
+
+typedef long long int int_lr_t;
+typedef long long unsigned int uint_ulr_t;
+
+typedef long long int int_k_t;
+typedef long long unsigned int uint_uk_t;
+
+#endif /* __SIZEOF_INT__ == 2 */
+
+
+
+/* short fract (hr): bitshr, bitsuhr, hrbits, uhrbits */
+
+static __inline__ __attribute__((__always_inline__))
+int_hr_t bitshr (const short fract __q)
+{
+  int_hr_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+uint_uhr_t bitsuhr (const unsigned short fract __q)
+{
+  uint_uhr_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+short fract hrbits (const int_hr_t __i)
+{
+  short fract __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+unsigned short fract uhrbits (const uint_uhr_t __i)
+{
+  unsigned short fract __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+/* fract (r): bitsr, bitsur, rbits, urbits */
+
+static __inline__ __attribute__((__always_inline__))
+int_r_t bitsr (const fract __q)
+{
+  int_r_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+uint_ur_t bitsur (const unsigned fract __q)
+{
+  uint_ur_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+fract rbits (const int_r_t __i)
+{
+  fract __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+unsigned fract urbits (const uint_ur_t __i)
+{
+  unsigned fract __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+/* long fract (lr): bitslr, bitsulr, lrbits, ulrbits */
+
+static __inline__ __attribute__((__always_inline__))
+int_lr_t bitslr (const long fract __q)
+{
+  int_lr_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+uint_ulr_t bitsulr (const unsigned long fract __q)
+{
+  uint_ulr_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+long fract lrbits (const int_lr_t __i)
+{
+  long fract __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+unsigned long fract ulrbits (const uint_ulr_t __i)
+{
+  unsigned long fract __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+/* short accum (hk): bitshk, bitsuhk, hkbits, uhkbits */
+
+static __inline__ __attribute__((__always_inline__))
+int_hk_t bitshk (const short accum __q)
+{
+  int_hk_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+uint_uhk_t bitsuhk (const unsigned short accum __q)
+{
+  uint_uhk_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+short accum hkbits (const int_hk_t __i)
+{
+  short accum __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+unsigned short accum uhkbits (const uint_uhk_t __i)
+{
+  unsigned short accum __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+/* accum (k): bitsk, bitsuk, kbits, ukbits */
+
+static __inline__ __attribute__((__always_inline__))
+int_k_t bitsk (const accum __q)
+{
+  int_k_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+uint_uk_t bitsuk (const unsigned accum __q)
+{
+  uint_uk_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+accum kbits (const int_k_t __i)
+{
+  accum __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+unsigned accum ukbits (const uint_uk_t __i)
+{
+  unsigned accum __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+#if __SIZEOF_INT__ == 2
+
+/* long long fract (llr): bitsllr, bitsullr, llrbits, ullrbits */
+
+static __inline__ __attribute__((__always_inline__))
+int_llr_t bitsllr (const long long fract __q)
+{
+  int_llr_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+uint_ullr_t bitsullr (const unsigned long long fract __q)
+{
+  uint_ullr_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+long long fract llrbits (const int_llr_t __i)
+{
+  long long fract __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+unsigned long long fract ullrbits (const uint_ullr_t __i)
+{
+  unsigned long long fract __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+/* long accum (lk): bitslk, bitsulk, lkbits, ulkbits */
+
+static __inline__ __attribute__((__always_inline__))
+int_lk_t bitslk (const long accum __q)
+{
+  int_lk_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+uint_ulk_t bitsulk (const unsigned long accum __q)
+{
+  uint_ulk_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+long accum lkbits (const int_lk_t __i)
+{
+  long accum __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+unsigned long accum ulkbits (const uint_ulk_t __i)
+{
+  unsigned long accum __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+/* long long accum (llk): bitsllk, bitsullk, llkbits, ullkbits */
+
+static __inline__ __attribute__((__always_inline__))
+int_llk_t bitsllk (const long long accum __q)
+{
+  int_llk_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+uint_ullk_t bitsullk (const unsigned long long accum __q)
+{
+  uint_ullk_t __result;
+  _GCC_TYPEPUN (__result, __q);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+long long accum llkbits (const int_llk_t __i)
+{
+  long long accum __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+static __inline__ __attribute__((__always_inline__))
+unsigned long long accum ullkbits (const uint_ullk_t __i)
+{
+  unsigned long long accum __result;
+  _GCC_TYPEPUN (__result, __i);
+  return __result;
+}
+
+#endif /* __SIZEOF_INT__ == 2 */
+#endif /* _AVRGCC_STDFIX_H */
diff --git a/gcc/config/avr/t-avr b/gcc/config/avr/t-avr
index a5411a392e4..e76a7606d9b 100644
--- a/gcc/config/avr/t-avr
+++ b/gcc/config/avr/t-avr
@@ -35,6 +35,15 @@ avr-log.o: $(srcdir)/config/avr/avr-log.c \
 
 avr.o avr-c.o: $(srcdir)/config/avr/builtins.def
 
+# This overrides stdfix.h from USER_H which we supply and include
+# in our own stdint.h as stdint-gcc.h.
+
+EXTRA_HEADERS = $(srcdir)/config/avr/stdfix.h \
+	      	stdfix-gcc.h
+
+stdfix-gcc.h: $(srcdir)/ginclude/stdfix.h
+	-cp $< $@
+
 # Files and Variables auto-generated from avr-mcus.def
 
 AVR_MCUS = $(srcdir)/config/avr/avr-mcus.def