Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/aarch64/include Back out last change.



details:   https://anonhg.NetBSD.org/src/rev/325baf8fa5e2
branches:  trunk
changeset: 331534:325baf8fa5e2
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Aug 13 19:51:27 2014 +0000

description:
Back out last change.

diffstat:

 sys/arch/aarch64/include/int_fmtio.h |  218 +----------------------------------
 1 files changed, 1 insertions(+), 217 deletions(-)

diffs (224 lines):

diff -r 16f39d2e0e74 -r 325baf8fa5e2 sys/arch/aarch64/include/int_fmtio.h
--- a/sys/arch/aarch64/include/int_fmtio.h      Wed Aug 13 19:48:17 2014 +0000
+++ b/sys/arch/aarch64/include/int_fmtio.h      Wed Aug 13 19:51:27 2014 +0000
@@ -1,219 +1,3 @@
-/* $NetBSD: int_fmtio.h,v 1.2 2014/08/13 17:14:41 justin Exp $ */
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 _AARCH64_INT_FMTIO_H_
-#define _AARCH64_INT_FMTIO_H_
-
-#ifdef _LP64
-#ifdef __INTPTR_FMTd__
-#include <sys/common_int_fmtio.h>
-#else
-/*
- * 7.8.1 Macros for format specifiers
- */
-
-/* fprintf macros for signed integers */
-#define        PRId8           "d"     /* int8_t               */
-#define        PRId16          "d"     /* int16_t              */
-#define        PRId32          "d"     /* int32_t              */
-#define        PRId64          "ld"    /* int64_t              */
-#define        PRIdLEAST8      "d"     /* int_least8_t         */
-#define        PRIdLEAST16     "d"     /* int_least16_t        */
-#define        PRIdLEAST32     "d"     /* int_least32_t        */
-#define        PRIdLEAST64     "ld"    /* int_least64_t        */
-#define        PRIdFAST8       "d"     /* int_fast8_t          */
-#define        PRIdFAST16      "d"     /* int_fast16_t         */
-#define        PRIdFAST32      "d"     /* int_fast32_t         */
-#define        PRIdFAST64      "ld"    /* int_fast64_t         */
-#define        PRIdMAX         "ld"    /* intmax_t             */
-#define        PRIdPTR         "ld"    /* intptr_t             */
-
-#define        PRIi8           "i"     /* int8_t               */
-#define        PRIi16          "i"     /* int16_t              */
-#define        PRIi32          "i"     /* int32_t              */
-#define        PRIi64          "li"    /* int64_t              */
-#define        PRIiLEAST8      "i"     /* int_least8_t         */
-#define        PRIiLEAST16     "i"     /* int_least16_t        */
-#define        PRIiLEAST32     "i"     /* int_least32_t        */
-#define        PRIiLEAST64     "li"    /* int_least64_t        */
-#define        PRIiFAST8       "i"     /* int_fast8_t          */
-#define        PRIiFAST16      "i"     /* int_fast16_t         */
-#define        PRIiFAST32      "i"     /* int_fast32_t         */
-#define        PRIiFAST64      "li"    /* int_fast64_t         */
-#define        PRIiMAX         "li"    /* intmax_t             */
-#define        PRIiPTR         "li"    /* intptr_t             */
-
-/* fprintf macros for unsigned integers */
-
-#define        PRIo8           "o"     /* uint8_t              */
-#define        PRIo16          "o"     /* uint16_t             */
-#define        PRIo32          "o"     /* uint32_t             */
-#define        PRIo64          "lo"    /* uint64_t             */
-#define        PRIoLEAST8      "o"     /* uint_least8_t        */
-#define        PRIoLEAST16     "o"     /* uint_least16_t       */
-#define        PRIoLEAST32     "o"     /* uint_least32_t       */
-#define        PRIoLEAST64     "lo"    /* uint_least64_t       */
-#define        PRIoFAST8       "o"     /* uint_fast8_t         */
-#define        PRIoFAST16      "o"     /* uint_fast16_t        */
-#define        PRIoFAST32      "o"     /* uint_fast32_t        */
-#define        PRIoFAST64      "lo"    /* uint_fast64_t        */
-#define        PRIoMAX         "lo"    /* uintmax_t            */
-#define        PRIoPTR         "lo"    /* uintptr_t            */
-
-#define        PRIu8           "u"     /* uint8_t              */
-#define        PRIu16          "u"     /* uint16_t             */
-#define        PRIu32          "u"     /* uint32_t             */
-#define        PRIu64          "lu"    /* uint64_t             */
-#define        PRIuLEAST8      "u"     /* uint_least8_t        */
-#define        PRIuLEAST16     "u"     /* uint_least16_t       */
-#define        PRIuLEAST32     "u"     /* uint_least32_t       */
-#define        PRIuLEAST64     "lu"    /* uint_least64_t       */
-#define        PRIuFAST8       "u"     /* uint_fast8_t         */
-#define        PRIuFAST16      "u"     /* uint_fast16_t        */
-#define        PRIuFAST32      "u"     /* uint_fast32_t        */
-#define        PRIuFAST64      "lu"    /* uint_fast64_t        */
-#define        PRIuMAX         "lu"    /* uintmax_t            */
-#define        PRIuPTR         "lu"    /* uintptr_t            */
+/* $NetBSD: int_fmtio.h,v 1.3 2014/08/13 19:51:27 matt Exp $ */
 
-#define        PRIx8           "x"     /* uint8_t              */
-#define        PRIx16          "x"     /* uint16_t             */
-#define        PRIx32          "x"     /* uint32_t             */
-#define        PRIx64          "lx"    /* uint64_t             */
-#define        PRIxLEAST8      "x"     /* uint_least8_t        */
-#define        PRIxLEAST16     "x"     /* uint_least16_t       */
-#define        PRIxLEAST32     "x"     /* uint_least32_t       */
-#define        PRIxLEAST64     "lx"    /* uint_least64_t       */
-#define        PRIxFAST8       "x"     /* uint_fast8_t         */
-#define        PRIxFAST16      "x"     /* uint_fast16_t        */
-#define        PRIxFAST32      "x"     /* uint_fast32_t        */
-#define        PRIxFAST64      "lx"    /* uint_fast64_t        */
-#define        PRIxMAX         "lx"    /* uintmax_t            */
-#define        PRIxPTR         "lx"    /* uintptr_t            */
-
-#define        PRIX8           "X"     /* uint8_t              */
-#define        PRIX16          "X"     /* uint16_t             */
-#define        PRIX32          "X"     /* uint32_t             */
-#define        PRIX64          "lX"    /* uint64_t             */
-#define        PRIXLEAST8      "X"     /* uint_least8_t        */
-#define        PRIXLEAST16     "X"     /* uint_least16_t       */
-#define        PRIXLEAST32     "X"     /* uint_least32_t       */
-#define        PRIXLEAST64     "lX"    /* uint_least64_t       */
-#define        PRIXFAST8       "X"     /* uint_fast8_t         */
-#define        PRIXFAST16      "X"     /* uint_fast16_t        */
-#define        PRIXFAST32      "X"     /* uint_fast32_t        */
-#define        PRIXFAST64      "lX"    /* uint_fast64_t        */
-#define        PRIXMAX         "lX"    /* uintmax_t            */
-#define        PRIXPTR         "lX"    /* uintptr_t            */
-
-/* fscanf macros for signed integers */
-
-#define        SCNd8           "hhd"   /* int8_t               */
-#define        SCNd16          "hd"    /* int16_t              */
-#define        SCNd32          "d"     /* int32_t              */
-#define        SCNd64          "ld"    /* int64_t              */
-#define        SCNdLEAST8      "hhd"   /* int_least8_t         */
-#define        SCNdLEAST16     "hd"    /* int_least16_t        */
-#define        SCNdLEAST32     "d"     /* int_least32_t        */
-#define        SCNdLEAST64     "ld"    /* int_least64_t        */
-#define        SCNdFAST8       "d"     /* int_fast8_t          */
-#define        SCNdFAST16      "d"     /* int_fast16_t         */
-#define        SCNdFAST32      "d"     /* int_fast32_t         */
-#define        SCNdFAST64      "ld"    /* int_fast64_t         */
-#define        SCNdMAX         "ld"    /* intmax_t             */
-#define        SCNdPTR         "ld"    /* intptr_t             */
-
-#define        SCNi8           "hhi"   /* int8_t               */
-#define        SCNi16          "hi"    /* int16_t              */
-#define        SCNi32          "i"     /* int32_t              */
-#define        SCNi64          "li"    /* int64_t              */
-#define        SCNiLEAST8      "hhi"   /* int_least8_t         */
-#define        SCNiLEAST16     "hi"    /* int_least16_t        */
-#define        SCNiLEAST32     "i"     /* int_least32_t        */
-#define        SCNiLEAST64     "li"    /* int_least64_t        */
-#define        SCNiFAST8       "i"     /* int_fast8_t          */
-#define        SCNiFAST16      "i"     /* int_fast16_t         */
-#define        SCNiFAST32      "i"     /* int_fast32_t         */
-#define        SCNiFAST64      "li"    /* int_fast64_t         */
-#define        SCNiMAX         "li"    /* intmax_t             */
-#define        SCNiPTR         "li"    /* intptr_t             */
-
-/* fscanf macros for unsigned integers */
-
-#define        SCNo8           "hho"   /* uint8_t              */
-#define        SCNo16          "ho"    /* uint16_t             */
-#define        SCNo32          "o"     /* uint32_t             */
-#define        SCNo64          "lo"    /* uint64_t             */
-#define        SCNoLEAST8      "hho"   /* uint_least8_t        */
-#define        SCNoLEAST16     "ho"    /* uint_least16_t       */
-#define        SCNoLEAST32     "o"     /* uint_least32_t       */
-#define        SCNoLEAST64     "lo"    /* uint_least64_t       */
-#define        SCNoFAST8       "o"     /* uint_fast8_t         */
-#define        SCNoFAST16      "o"     /* uint_fast16_t        */
-#define        SCNoFAST32      "o"     /* uint_fast32_t        */
-#define        SCNoFAST64      "lo"    /* uint_fast64_t        */
-#define        SCNoMAX         "lo"    /* uintmax_t            */
-#define        SCNoPTR         "lo"    /* uintptr_t            */
-
-#define        SCNu8           "hhu"   /* uint8_t              */
-#define        SCNu16          "hu"    /* uint16_t             */
-#define        SCNu32          "u"     /* uint32_t             */
-#define        SCNu64          "lu"    /* uint64_t             */
-#define        SCNuLEAST8      "hhu"   /* uint_least8_t        */
-#define        SCNuLEAST16     "hu"    /* uint_least16_t       */
-#define        SCNuLEAST32     "u"     /* uint_least32_t       */
-#define        SCNuLEAST64     "lu"    /* uint_least64_t       */
-#define        SCNuFAST8       "u"     /* uint_fast8_t         */
-#define        SCNuFAST16      "u"     /* uint_fast16_t        */
-#define        SCNuFAST32      "u"     /* uint_fast32_t        */
-#define        SCNuFAST64      "lu"    /* uint_fast64_t        */
-#define        SCNuMAX         "lu"    /* uintmax_t            */
-#define        SCNuPTR         "lu"    /* uintptr_t            */
-
-#define        SCNx8           "hhx"   /* uint8_t              */
-#define        SCNx16          "hx"    /* uint16_t             */
-#define        SCNx32          "x"     /* uint32_t             */
-#define        SCNx64          "lx"    /* uint64_t             */
-#define        SCNxLEAST8      "hhx"   /* uint_least8_t        */
-#define        SCNxLEAST16     "hx"    /* uint_least16_t       */
-#define        SCNxLEAST32     "x"     /* uint_least32_t       */
-#define        SCNxLEAST64     "lx"    /* uint_least64_t       */
-#define        SCNxFAST8       "x"     /* uint_fast8_t         */
-#define        SCNxFAST16      "x"     /* uint_fast16_t        */
-#define        SCNxFAST32      "x"     /* uint_fast32_t        */
-#define        SCNxFAST64      "lx"    /* uint_fast64_t        */
-#define        SCNxMAX         "lx"    /* uintmax_t            */
-#define        SCNxPTR         "lx"    /* uintptr_t            */
-#endif
-#else /* _LP64 */
 #include <arm/int_fmtio.h>
-#endif
-
-#endif /* !_AARCH64_INT_FMTIO_H_ */



Home | Main Index | Thread Index | Old Index