Changeset 5587cf7 in mainline


Ignore:
Timestamp:
2010-11-26T01:15:00Z (13 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3ebba9a
Parents:
855e0d8
Message:
  • use portable constant defines for integer range constants
  • add portable constant defines INTN_C and UINTN_C (for native_t and unative_t)
  • remove explicit wchar_t typedef (use the typedef set by autotool)
  • remove non-standard printf() formatting macros (PRIp, PRIs, PRIdPTR, etc.)
  • introduce PRIua formatting macro (for atomic_count_t)
  • unify kernel and uspace formatting macros
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • boot/generic/include/stdint.h

    r855e0d8 r5587cf7  
    3333#define BOOT_STDINT_H_
    3434
    35 #define INT8_MIN  (0x80)
    36 #define INT8_MAX  (0x7F)
     35#define INT8_MIN  INT8_C(0x80)
     36#define INT8_MAX  INT8_C(0x7F)
    3737
    38 #define UINT8_MIN  (0u)
    39 #define UINT8_MAX  (0xFFu)
     38#define UINT8_MIN  UINT8_C(0)
     39#define UINT8_MAX  UINT8_C(0xFF)
    4040
    41 #define INT16_MIN  (0x8000)
    42 #define INT16_MAX  (0x7FFF)
     41#define INT16_MIN  INT16_C(0x8000)
     42#define INT16_MAX  INT16_C(0x7FFF)
    4343
    44 #define UINT16_MIN  (0u)
    45 #define UINT16_MAX  (0xFFFFu)
     44#define UINT16_MIN  UINT16_C(0)
     45#define UINT16_MAX  UINT16_C(0xFFFF)
    4646
    47 #define INT32_MIN  (0x80000000l)
    48 #define INT32_MAX  (0x7FFFFFFFl)
     47#define INT32_MIN  INT32_C(0x80000000)
     48#define INT32_MAX  INT32_C(0x7FFFFFFF)
    4949
    50 #define UINT32_MIN  (0ul)
    51 #define UINT32_MAX  (0xFFFFFFFFul)
     50#define UINT32_MIN  UINT32_C(0)
     51#define UINT32_MAX  UINT32_C(0xFFFFFFFF)
    5252
    53 #define INT64_MIN  (0x8000000000000000ll)
    54 #define INT64_MAX  (0x7FFFFFFFFFFFFFFFll)
     53#define INT64_MIN  INT64_C(0x8000000000000000)
     54#define INT64_MAX  INT64_C(0x7FFFFFFFFFFFFFFF)
    5555
    56 #define UINT64_MIN  (0ull)
    57 #define UINT64_MAX  (0xFFFFFFFFFFFFFFFFull)
     56#define UINT64_MIN  UINT64_C(0)
     57#define UINT64_MAX  UINT64_C(0xFFFFFFFFFFFFFFFF)
    5858
    5959#endif

  • boot/generic/include/typedefs.h

    r855e0d8 r5587cf7  
    3737#include <arch/types.h>
    3838
    39 #define NULL    ((void *) 0)
     39#define NULL  ((void *) 0)
    4040
    4141#define false  0
    … …  
    4343
    4444typedef uint8_t bool;
    45 typedef int32_t wchar_t;
    4645
    4746#endif

  • kernel/arch/abs32le/include/types.h

    r855e0d8 r5587cf7  
    5353} fncptr_t;
    5454
    55 #define PRIp   PRIx32  /**< Format for uintptr_t. */
    56 #define PRIs   PRIu32  /**< Format for size_t. */
     55#define INTN_C(c)   INT32_C(c)
     56#define UINTN_C(c)  UINT32_C(c)
     57
    5758#define PRIdn  PRId32  /**< Format for native_t. */
    5859#define PRIun  PRIu32  /**< Format for unative_t. */
    5960#define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
     61#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    6062
    6163#endif

  • kernel/arch/amd64/include/types.h

    r855e0d8 r5587cf7  
    5050} fncptr_t;
    5151
    52 #define PRIp   PRIx64  /**< Format for uintptr_t. */
    53 #define PRIs   PRIu64  /**< Format for size_t. */
     52#define INTN_C(c)   INT64_C(c)
     53#define UINTN_C(c)  UINT64_C(c)
     54
    5455#define PRIdn  PRId64  /**< Format for native_t. */
    5556#define PRIun  PRIu64  /**< Format for unative_t. */
    5657#define PRIxn  PRIx64  /**< Format for hexadecimal unative_t. */
     58#define PRIua  PRIu64  /**< Format for atomic_count_t. */
    5759
    5860#endif

  • kernel/arch/arm32/include/types.h

    r855e0d8 r5587cf7  
    5757} fncptr_t;
    5858
    59 #define PRIp   PRIx32  /**< Format for uintptr_t. */
    60 #define PRIs   PRIu32  /**< Format for size_t. */
     59#define INTN_C(c)   INT32_C(c)
     60#define UINTN_C(c)  UINT32_C(c)
     61
    6162#define PRIdn  PRId32  /**< Format for native_t. */
    6263#define PRIun  PRIu32  /**< Format for unative_t. */
    6364#define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
     65#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    6466
    6567#endif

  • kernel/arch/ia32/include/types.h

    r855e0d8 r5587cf7  
    5050} fncptr_t;
    5151
    52 #define PRIp   PRIx32  /**< Format for uintptr_t. */
    53 #define PRIs   PRIu32  /**< Format for size_t. */
     52#define INTN_C(c)   INT32_C(c)
     53#define UINTN_C(c)  UINT32_C(c)
     54
    5455#define PRIdn  PRId32  /**< Format for native_t. */
    5556#define PRIun  PRIu32  /**< Format for unative_t. */
    5657#define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
     58#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    5759
    5860#endif

  • kernel/arch/ia64/include/types.h

    r855e0d8 r5587cf7  
    5252} __attribute__((may_alias)) fncptr_t;
    5353
    54 #define PRIp   PRIx64  /**< Format for uintptr_t. */
    55 #define PRIs   PRIu64  /**< Format for size_t. */
     54#define INTN_C(c)   INT64_C(c)
     55#define UINTN_C(c)  UINT64_C(c)
     56
    5657#define PRIdn  PRId64  /**< Format for native_t. */
    5758#define PRIun  PRIu64  /**< Format for unative_t. */
    5859#define PRIxn  PRIx64  /**< Format for hexadecimal unative_t. */
     60#define PRIua  PRIu64  /**< Format for atomic_count_t. */
    5961
    6062#endif

  • kernel/arch/mips32/include/types.h

    r855e0d8 r5587cf7  
    5050} fncptr_t;
    5151
    52 #define PRIp   PRIx32  /**< Format for uintptr_t. */
    53 #define PRIs   PRIu32  /**< Format for size_t. */
     52#define INTN_C(c)   INT32_C(c)
     53#define UINTN_C(c)  UINT32_C(c)
     54
    5455#define PRIdn  PRId32  /**< Format for native_t. */
    5556#define PRIun  PRIu32  /**< Format for unative_t. */
    5657#define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
     58#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    5759
    5860#endif

  • kernel/arch/ppc32/include/types.h

    r855e0d8 r5587cf7  
    5050} fncptr_t;
    5151
    52 #define PRIp   PRIx32  /**< Format for uintptr_t. */
    53 #define PRIs   PRIu32  /**< Format for size_t. */
     52#define INTN_C(c)   INT32_C(c)
     53#define UINTN_C(c)  UINT32_C(c)
     54
    5455#define PRIdn  PRId32  /**< Format for native_t. */
    5556#define PRIun  PRIu32  /**< Format for unative_t. */
    5657#define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
     58#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    5759
    5860#endif

  • kernel/arch/sparc64/include/types.h

    r855e0d8 r5587cf7  
    5252typedef uint8_t asi_t;
    5353
    54 #define PRIp   PRIx64  /**< Format for uintptr_t. */
    55 #define PRIs   PRIu64  /**< Format for size_t. */
     54#define INTN_C(c)   INT64_C(c)
     55#define UINTN_C(c)  UINT64_C(c)
     56
    5657#define PRIdn  PRId64  /**< Format for native_t. */
    5758#define PRIun  PRIu64  /**< Format for unative_t. */
    5859#define PRIxn  PRIx64  /**< Format for hexadecimal unative_t. */
     60#define PRIua  PRIu64  /**< Format for atomic_count_t. */
    5961
    6062#endif

  • kernel/generic/include/typedefs.h

    r855e0d8 r5587cf7  
    4040#include <arch/types.h>
    4141
    42 #define NULL    ((void *) 0)
     42#define NULL  ((void *) 0)
    4343
    4444#define false  0
    … …  
    6969typedef int32_t devno_t;
    7070
    71 typedef int32_t wchar_t;
    72 
    7371typedef volatile uint8_t ioport8_t;
    7472typedef volatile uint16_t ioport16_t;

  • uspace/lib/c/arch/abs32le/include/inttypes.h

    r855e0d8 r5587cf7  
    3434#define LIBC_abs32le_INTTYPES_H_
    3535
    36 #define PRIdPTR  PRId32
    37 #define PRIoPTR  PRIo32
    38 #define PRIuPTR  PRIu32
    39 #define PRIxPTR  PRIx32
    40 #define PRIXPTR  PRIX32
     36#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
     37#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
     38#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
     39#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    4140
    4241#endif

  • uspace/lib/c/arch/amd64/include/inttypes.h

    r855e0d8 r5587cf7  
    3030 * @{
    3131 */
    32 /** @file Macros for format specifiers.
    33  *
    34  * Macros for formatting stdint types as specified in section
    35  * 7.8.1 Macros for format specifiers of the C99 draft specification
    36  * (ISO/IEC 9899:201x). Only some macros from the specification are
    37  * implemented.
    38  */
    3932
    4033#ifndef LIBC_amd64_INTTYPES_H_
    4134#define LIBC_amd64_INTTYPES_H_
    4235
    43 #define PRIdPTR  PRId64
    44 #define PRIoPTR  PRIo64
    45 #define PRIuPTR  PRIu64
    46 #define PRIxPTR  PRIx64
    47 #define PRIXPTR  PRIX64
     36#define PRIdn  PRId64  /**< Format for sysarg_t, ipcarg_t, etc. */
     37#define PRIun  PRIu64  /**< Format for sysarg_t, ipcarg_t, etc. */
     38#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
     39#define PRIua  PRIu64  /**< Format for atomic_count_t. */
    4840
    4941#endif

  • uspace/lib/c/arch/arm32/include/inttypes.h

    r855e0d8 r5587cf7  
    3030 * @{
    3131 */
    32 /** @file Macros for format specifiers.
    33  *
    34  * Macros for formatting stdint types as specified in section
    35  * 7.8.1 Macros for format specifiers of the C99 draft specification
    36  * (ISO/IEC 9899:201x). Only some macros from the specification are
    37  * implemented.
    38  */
    3932
    4033#ifndef LIBC_arm32_INTTYPES_H_
    4134#define LIBC_arm32_INTTYPES_H_
    4235
    43 #define PRIdPTR  PRId32
    44 #define PRIoPTR  PRIo32
    45 #define PRIuPTR  PRIu32
    46 #define PRIxPTR  PRIx32
    47 #define PRIXPTR  PRIX32
     36#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
     37#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
     38#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
     39#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    4840
    4941#endif

  • uspace/lib/c/arch/ia32/include/inttypes.h

    r855e0d8 r5587cf7  
    3030 * @{
    3131 */
    32 /** @file Macros for format specifiers.
    33  *
    34  * Macros for formatting stdint types as specified in section
    35  * 7.8.1 Macros for format specifiers of the C99 draft specification
    36  * (ISO/IEC 9899:201x). Only some macros from the specification are
    37  * implemented.
    38  */
    3932
    4033#ifndef LIBC_ia32_INTTYPES_H_
    4134#define LIBC_ia32_INTTYPES_H_
    4235
    43 #define PRIdPTR  PRId32
    44 #define PRIoPTR  PRIo32
    45 #define PRIuPTR  PRIu32
    46 #define PRIxPTR  PRIx32
    47 #define PRIXPTR  PRIX32
     36#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
     37#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
     38#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
     39#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    4840
    4941#endif

  • uspace/lib/c/arch/ia64/include/inttypes.h

    r855e0d8 r5587cf7  
    3030 * @{
    3131 */
    32 /** @file Macros for format specifiers.
    33  *
    34  * Macros for formatting stdint types as specified in section
    35  * 7.8.1 Macros for format specifiers of the C99 draft specification
    36  * (ISO/IEC 9899:201x). Only some macros from the specification are
    37  * implemented.
    38  */
    3932
    4033#ifndef LIBC_ia64_INTTYPES_H_
    4134#define LIBC_ia64_INTTYPES_H_
    4235
    43 #define PRIdPTR  PRId64
    44 #define PRIoPTR  PRIo64
    45 #define PRIuPTR  PRIu64
    46 #define PRIxPTR  PRIx64
    47 #define PRIXPTR  PRIX64
     36#define PRIdn  PRId64  /**< Format for sysarg_t, ipcarg_t, etc. */
     37#define PRIun  PRIu64  /**< Format for sysarg_t, ipcarg_t, etc. */
     38#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
     39#define PRIua  PRIu64  /**< Format for atomic_count_t. */
    4840
    4941#endif

  • uspace/lib/c/arch/mips32/include/inttypes.h

    r855e0d8 r5587cf7  
    3030 * @{
    3131 */
    32 /** @file Macros for format specifiers.
    33  *
    34  * Macros for formatting stdint types as specified in section
    35  * 7.8.1 Macros for format specifiers of the C99 draft specification
    36  * (ISO/IEC 9899:201x). Only some macros from the specification are
    37  * implemented.
    38  */
    3932
    4033#ifndef LIBC_mips32_INTTYPES_H_
    4134#define LIBC_mips32_INTTYPES_H_
    4235
    43 #define PRIdPTR  PRId32
    44 #define PRIoPTR  PRIo32
    45 #define PRIuPTR  PRIu32
    46 #define PRIxPTR  PRIx32
    47 #define PRIXPTR  PRIX32
     36#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
     37#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
     38#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
     39#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    4840
    4941#endif

  • uspace/lib/c/arch/ppc32/include/inttypes.h

    r855e0d8 r5587cf7  
    3030 * @{
    3131 */
    32 /** @file Macros for format specifiers.
    33  *
    34  * Macros for formatting stdint types as specified in section
    35  * 7.8.1 Macros for format specifiers of the C99 draft specification
    36  * (ISO/IEC 9899:201x). Only some macros from the specification are
    37  * implemented.
    38  */
    3932
    4033#ifndef LIBC_ppc32_INTTYPES_H_
    4134#define LIBC_ppc32_INTTYPES_H_
    4235
    43 #define PRIdPTR  PRId32
    44 #define PRIoPTR  PRIo32
    45 #define PRIuPTR  PRIu32
    46 #define PRIxPTR  PRIx32
    47 #define PRIXPTR  PRIX32
     36#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
     37#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
     38#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
     39#define PRIua  PRIu32  /**< Format for atomic_count_t. */
    4840
    4941#endif

  • uspace/lib/c/arch/sparc64/include/inttypes.h

    r855e0d8 r5587cf7  
    3030 * @{
    3131 */
    32 /** @file Macros for format specifiers.
    33  *
    34  * Macros for formatting stdint types as specified in section
    35  * 7.8.1 Macros for format specifiers of the C99 draft specification
    36  * (ISO/IEC 9899:201x). Only some macros from the specification are
    37  * implemented.
    38  */
    3932
    4033#ifndef LIBC_sparc64_INTTYPES_H_
    4134#define LIBC_sparc64_INTTYPES_H_
    4235
    43 #define PRIdPTR  PRId64
    44 #define PRIoPTR  PRIo64
    45 #define PRIuPTR  PRIu64
    46 #define PRIxPTR  PRIx64
    47 #define PRIXPTR  PRIX64
     36#define PRIdn  PRId64  /**< Format for sysarg_t, ipcarg_t, etc. */
     37#define PRIun  PRIu64  /**< Format for sysarg_t, ipcarg_t, etc. */
     38#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
     39#define PRIua  PRIu64  /**< Format for atomic_count_t. */
    4840
    4941#endif

  • uspace/lib/c/include/sys/typefmt.h

    r855e0d8 r5587cf7  
    3939#include <inttypes.h>
    4040
    41 /* off64_t */
     41/* off64_t, aoff64_t */
    4242#define PRIdOFF64 PRId64
    4343#define PRIuOFF64 PRIu64
    … …  
    4545#define PRIXOFF64 PRIX64
    4646
    47 /* (s)size_t */
    48 #define PRIdSIZE PRIdPTR
    49 #define PRIuSIZE PRIuPTR
    50 #define PRIxSIZE PRIxPTR
    51 #define PRIXSIZE PRIXPTR
    52 
    53 /* sysarg_t */
    54 #define PRIdSYSARG PRIdPTR
    55 #define PRIuSYSARG PRIuPTR
    56 #define PRIxSYSARG PRIxPTR
    57 #define PRIXSYSARG PRIxPTR
    58 
    59 /* ipcarg_t */
    60 #define PRIdIPCARG PRIdPTR
    61 #define PRIuIPCARG PRIuPTR
    62 #define PRIxIPCARG PRIxPTR
    63 #define PRIXIPCARG PRIXPTR
    64 
    65 /* taskid_t */
    66 #define PRIdTASKID PRId64
    67 #define PRIuTASKID PRIu64
    68 #define PRIxTASKID PRIx64
    69 #define PRIXTASKID PRIx64
    70 
    7147#endif
    7248
Note: See TracChangeset for help on using the changeset viewer.