Changeset 810a36f in mainline for kernel


Ignore:
Timestamp:
2017-10-24T05:29:08Z (8 years ago)
Author:
jzr <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b1eb7ef
Parents:
c8fbbe7 (diff), 673ea28 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'types'.

Location:
kernel
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    rc8fbbe7 r810a36f  
    458458        done
    459459
    460 depend: $(COMMON_HEADER_ARCH) $(AUTOGENS_H)
    461 
    462 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)
    463         ln -sfn ../../../../$< $@
     460depend: $(AUTOGENS_H)
    464461
    465462autogen_clean:

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

    rc8fbbe7 r810a36f  
    3636#define KERN_abs32le_TYPES_H_
    3737
    38 #include <arch/common.h>
    39 
    40 #define ATOMIC_COUNT_MIN  UINT32_MIN
    41 #define ATOMIC_COUNT_MAX  UINT32_MAX
    42 
    43 typedef uint32_t size_t;
    44 typedef int32_t ssize_t;
    45 
    46 typedef uint32_t uintptr_t;
    47 typedef uint32_t pfn_t;
    48 
    49 typedef uint32_t ipl_t;
    50 
    51 typedef uint32_t sysarg_t;
    52 typedef int32_t native_t;
    53 typedef uint32_t atomic_count_t;
     38#include <_bits/all.h>
    5439
    5540typedef struct {
    5641} fncptr_t;
    57 
    58 #define PRIdn  PRId32  /**< Format for native_t. */
    59 #define PRIun  PRIu32  /**< Format for sysarg_t. */
    60 #define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
    61 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
    6242
    6343#endif

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

    rc8fbbe7 r810a36f  
    3636#define KERN_amd64_TYPES_H_
    3737
    38 #include <arch/common.h>
    39 
    40 typedef uint64_t size_t;
    41 typedef int64_t ssize_t;
    42 
    43 typedef uint64_t uintptr_t;
    44 typedef uint64_t pfn_t;
    45 
    46 typedef uint64_t ipl_t;
    47 
    48 typedef uint64_t sysarg_t;
    49 typedef int64_t native_t;
    50 typedef uint64_t atomic_count_t;
     38#include <_bits/all.h>
    5139
    5240typedef struct {
    5341} fncptr_t;
    54 
    55 #define PRIdn  PRId64  /**< Format for native_t. */
    56 #define PRIun  PRIu64  /**< Format for sysarg_t. */
    57 #define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
    58 #define PRIua  PRIu64  /**< Format for atomic_count_t. */
    5942
    6043#endif

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

    rc8fbbe7 r810a36f  
    3737#define KERN_arm32_TYPES_H_
    3838
    39 #include <arch/common.h>
    40 
    4139#ifndef DOXYGEN
    4240        #define ATTRIBUTE_PACKED __attribute__((packed))
    … …  
    4543#endif
    4644
    47 typedef uint32_t size_t;
    48 typedef int32_t ssize_t;
    49 
    50 typedef uint32_t uintptr_t;
    51 typedef uint32_t pfn_t;
    52 
    53 typedef uint32_t ipl_t;
    54 
    55 typedef uint32_t sysarg_t;
    56 typedef int32_t native_t;
    57 typedef uint32_t atomic_count_t;
     45#include <_bits/all.h>
    5846
    5947typedef struct {
    6048} fncptr_t;
    61 
    62 #define PRIdn  PRId32  /**< Format for native_t. */
    63 #define PRIun  PRIu32  /**< Format for sysarg_t. */
    64 #define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
    65 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
    6649
    6750#endif

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

    rc8fbbe7 r810a36f  
    3636#define KERN_ia32_TYPES_H_
    3737
    38 #include <arch/common.h>
    39 
    40 typedef uint32_t size_t;
    41 typedef int32_t ssize_t;
    42 
    43 typedef uint32_t uintptr_t;
    44 typedef uint32_t pfn_t;
    45 
    46 typedef uint32_t ipl_t;
    47 
    48 typedef uint32_t sysarg_t;
    49 typedef int32_t native_t;
    50 typedef uint32_t atomic_count_t;
     38#include <_bits/all.h>
    5139
    5240typedef struct {
    5341} fncptr_t;
    54 
    55 #define PRIdn  PRId32  /**< Format for native_t. */
    56 #define PRIun  PRIu32  /**< Format for sysarg_t. */
    57 #define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
    58 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
    5942
    6043#endif

  • kernel/arch/ia32/src/interrupt.c

    rc8fbbe7 r810a36f  
    8888            istate->esi, istate->edi, istate->ebp,
    8989            istate_from_uspace(istate) ? istate->esp :
    90             (uintptr_t) &istate->esp);
     90            (uint32_t) &istate->esp);
    9191}
    9292

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

    rc8fbbe7 r810a36f  
    3636#define KERN_ia64_TYPES_H_
    3737
    38 #include <arch/common.h>
    39 
    40 typedef uint64_t size_t;
    41 typedef int64_t ssize_t;
    42 
    43 typedef uint64_t uintptr_t;
    44 typedef uint64_t pfn_t;
    45 
    46 typedef uint64_t ipl_t;
    47 
    48 typedef uint64_t sysarg_t;
    49 typedef int64_t native_t;
    50 typedef uint64_t atomic_count_t;
     38#include <_bits/all.h>
    5139
    5240typedef struct {
    … …  
    5543} __attribute__((may_alias)) fncptr_t;
    5644
    57 #define PRIdn  PRId64  /**< Format for native_t. */
    58 #define PRIun  PRIu64  /**< Format for sysarg_t. */
    59 #define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
    60 #define PRIua  PRIu64  /**< Format for atomic_count_t. */
    61 
    6245#endif
    6346

  • kernel/arch/ia64/src/interrupt.c

    rc8fbbe7 r810a36f  
    142142            istate->cr_isr.value, istate->cr_ipsr.value);
    143143       
    144         printf("cr.iip=%#0" PRIx64 ", #%u\t(%s)\n",
     144        printf("cr.iip=%#0" PRIxPTR ", #%u\t(%s)\n",
    145145            istate->cr_iip, istate->cr_isr.ei,
    146146            symtab_fmt_name_lookup(istate->cr_iip));
    147         printf("cr.iipa=%#0" PRIx64 "\t(%s)\n", istate->cr_iipa,
     147        printf("cr.iipa=%#0" PRIxPTR "\t(%s)\n", istate->cr_iipa,
    148148            symtab_fmt_name_lookup(istate->cr_iipa));
    149         printf("cr.ifa=%#0" PRIx64 "\t(%s)\n", istate->cr_ifa,
     149        printf("cr.ifa=%#0" PRIxPTR "\t(%s)\n", istate->cr_ifa,
    150150            symtab_fmt_name_lookup(istate->cr_ifa));
    151151}

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

    rc8fbbe7 r810a36f  
    3636#define KERN_mips32_TYPES_H_
    3737
    38 #include <arch/common.h>
    39 
    40 typedef uint32_t size_t;
    41 typedef int32_t ssize_t;
    42 
    43 typedef uint32_t uintptr_t;
    44 typedef uint32_t pfn_t;
    45 
    46 typedef uint32_t ipl_t;
    47 
    48 typedef uint32_t sysarg_t;
    49 typedef int32_t native_t;
    50 typedef uint32_t atomic_count_t;
     38#include <_bits/all.h>
    5139
    5240typedef struct {
    5341} fncptr_t;
    54 
    55 #define PRIdn  PRId32  /**< Format for native_t. */
    56 #define PRIun  PRIu32  /**< Format for sysarg_t. */
    57 #define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
    58 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
    5942
    6043#endif

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

    rc8fbbe7 r810a36f  
    3636#define KERN_ppc32_TYPES_H_
    3737
    38 #include <arch/common.h>
    39 
    40 typedef uint32_t size_t;
    41 typedef int32_t ssize_t;
    42 
    43 typedef uint32_t uintptr_t;
    44 typedef uint32_t pfn_t;
    45 
    46 typedef uint32_t ipl_t;
    47 
    48 typedef uint32_t sysarg_t;
    49 typedef int32_t native_t;
    50 typedef uint32_t atomic_count_t;
     38#include <_bits/all.h>
    5139
    5240typedef struct {
    5341} fncptr_t;
    54 
    55 #define PRIdn  PRId32  /**< Format for native_t. */
    56 #define PRIun  PRIu32  /**< Format for sysarg_t. */
    57 #define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
    58 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
    5942
    6043#endif

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

    rc8fbbe7 r810a36f  
    3636#define KERN_riscv64_TYPES_H_
    3737
    38 #include <arch/common.h>
    39 
    40 typedef uint64_t size_t;
    41 typedef int64_t ssize_t;
    42 
    43 typedef uint64_t uintptr_t;
    44 typedef uint64_t pfn_t;
    45 
    46 typedef uint64_t ipl_t;
    47 
    48 typedef uint64_t sysarg_t;
    49 typedef int64_t native_t;
    50 typedef uint64_t atomic_count_t;
     38#include <_bits/all.h>
    5139
    5240typedef struct {
    5341} fncptr_t;
    54 
    55 #define PRIdn  PRId64  /**< Format for native_t. */
    56 #define PRIun  PRIu64  /**< Format for sysarg_t. */
    57 #define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
    58 #define PRIua  PRIu64  /**< Format for atomic_count_t. */
    5942
    6043#endif

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

    rc8fbbe7 r810a36f  
    350350       
    351351        pstate.value = pstate_read();
    352         pstate.ie = ((pstate_reg_t) ipl).ie;
     352        pstate.ie = ((pstate_reg_t)(uint64_t) ipl).ie;
    353353        pstate_write(pstate.value);
    354354}

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

    rc8fbbe7 r810a36f  
    3737
    3838#include <trace.h>
    39 
    40 #ifdef KERNEL
    41 #include <arch/common.h>
    42 #else
    43 #include <libarch/common.h>
    44 #endif
    4539
    4640/*
    … …  
    8882NO_TRACE static inline void flush_pipeline(void)
    8983{
    90         uint64_t pc;
     84        unsigned long pc;
    9185       
    9286        /*

  • kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h

    rc8fbbe7 r810a36f  
    7272struct pte;
    7373
    74 extern void tsb_invalidate(struct as *as, uintptr_t page, uint64_t pages);
     74extern void tsb_invalidate(struct as *as, uintptr_t page, size_t pages);
    7575extern void itsb_pte_copy(struct pte *t);
    7676extern void dtsb_pte_copy(struct pte *t, bool ro);

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

    rc8fbbe7 r810a36f  
    3636#define KERN_sparc64_TYPES_H_
    3737
    38 #include <arch/common.h>
    39 
    40 typedef uint64_t size_t;
    41 typedef int64_t ssize_t;
    42 
    43 typedef uint64_t uintptr_t;
    44 typedef uint64_t pfn_t;
    45 
    46 typedef uint64_t ipl_t;
    47 
    48 typedef uint64_t sysarg_t;
    49 typedef int64_t native_t;
    50 typedef uint64_t atomic_count_t;
     38#include <_bits/all.h>
    5139
    5240typedef struct {
    … …  
    5543typedef uint8_t asi_t;
    5644
    57 #define PRIdn  PRId64  /**< Format for native_t. */
    58 #define PRIun  PRIu64  /**< Format for sysarg_t. */
    59 #define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
    60 #define PRIua  PRIu64  /**< Format for atomic_count_t. */
    61 
    6245#endif
    6346

  • kernel/generic/include/stddef.h

    rc8fbbe7 r810a36f  
    3838#include <arch/types.h>
    3939
    40 typedef native_t ptrdiff_t;
    41 
    42 #ifndef NULL
    43         #define NULL  ((void *) 0)
    44 #endif
     40#include <_bits/NULL.h>
    4541
    4642#define offsetof(type,member) ((size_t) &(((type *) 0)->member))

  • kernel/generic/include/stdint.h

    rc8fbbe7 r810a36f  
    3636#define KERN_STDINT_H_
    3737
    38 #include <arch/common.h>
    39 
    40 #define INT8_MIN  INT8_C(0x80)
    41 #define INT8_MAX  INT8_C(0x7F)
    42 
    43 #define UINT8_MIN  UINT8_C(0)
    44 #define UINT8_MAX  UINT8_C(0xFF)
    45 
    46 #define INT16_MIN  INT16_C(0x8000)
    47 #define INT16_MAX  INT16_C(0x7FFF)
    48 
    49 #define UINT16_MIN  UINT16_C(0)
    50 #define UINT16_MAX  UINT16_C(0xFFFF)
    51 
    52 #define INT32_MIN  INT32_C(0x80000000)
    53 #define INT32_MAX  INT32_C(0x7FFFFFFF)
    54 
    55 #define UINT32_MIN  UINT32_C(0)
    56 #define UINT32_MAX  UINT32_C(0xFFFFFFFF)
    57 
    58 #define INT64_MIN  INT64_C(0x8000000000000000)
    59 #define INT64_MAX  INT64_C(0x7FFFFFFFFFFFFFFF)
    60 
    61 #define UINT64_MIN  UINT64_C(0)
    62 #define UINT64_MAX  UINT64_C(0xFFFFFFFFFFFFFFFF)
     38#include <_bits/stdint.h>
    6339
    6440#endif

  • kernel/generic/include/typedefs.h

    rc8fbbe7 r810a36f  
    3636#define KERN_TYPEDEFS_H_
    3737
    38 #include <stdint.h>
    39 #include <arch/common.h>
    4038#include <arch/types.h>
    4139

  • kernel/generic/src/debug/panic.c

    rc8fbbe7 r810a36f  
    6262                printf("\n");
    6363        } else if (cat == PANIC_BADTRAP) {
    64                 printf("bad trap %" PRIun ". %s\n", address,
     64                printf("bad trap %" PRIuPTR ". %s\n", address,
    6565                    BANNER_RIGHT);
    6666                if (fmt) {
    … …  
    9696        printf("THE=%p: ", THE);
    9797        if (THE != NULL) {
    98                 printf("pe=%" PRIun " thread=%p task=%p cpu=%p as=%p"
     98                printf("pe=%" PRIuPTR " thread=%p task=%p cpu=%p as=%p"
    9999                    " magic=%#" PRIx32 "\n", THE->preemption,
    100100                    THE->thread, THE->task, THE->cpu, THE->as, THE->magic);

  • kernel/generic/src/lib/ra.c

    rc8fbbe7 r810a36f  
    353353        link = hash_table_find(&span->used, &key);
    354354        if (!link) {
    355                 panic("Freeing segment which is not known to be used (base=%"
    356                     PRIxn ", size=%" PRIdn ").", base, size);
     355                panic("Freeing segment which is not known to be used (base=%zx"
     356                    ", size=%zd).", base, size);
    357357        }
    358358        seg = hash_table_get_inst(link, ra_segment_t, uh_link);
    … …  
    447447        irq_spinlock_unlock(&arena->lock, true);
    448448
    449         panic("Freeing to wrong arena (base=%" PRIxn ", size=%" PRIdn ").",
     449        panic("Freeing to wrong arena (base=%" PRIxPTR ", size=%zd).",
    450450            base, size);
    451451}

  • kernel/generic/src/lib/str.c

    rc8fbbe7 r810a36f  
    114114
    115115/** Check the condition if wchar_t is signed */
    116 #ifdef WCHAR_IS_UNSIGNED
     116#ifdef __WCHAR_UNSIGNED__
    117117        #define WCHAR_SIGNED_CHECK(cond)  (true)
    118118#else

  • kernel/generic/src/mm/backend_user.c

    rc8fbbe7 r810a36f  
    129129        if (rc != EOK) {
    130130                log(LF_USPACE, LVL_FATAL,
    131                     "Page-in request for page %#" PRIxn
     131                    "Page-in request for page %#" PRIxPTR
    132132                    " at pager %d failed with error %d.",
    133133                    upage, pager_info->pager, rc);

  • kernel/generic/src/printf/printf_core.c

    rc8fbbe7 r810a36f  
    104104        PrintfQualifierLongLong,
    105105        PrintfQualifierPointer,
    106         PrintfQualifierSize
     106        PrintfQualifierSize,
     107        PrintfQualifierMax
    107108} qualifier_t;
    108109
    … …  
    767768                        case 'z':
    768769                                qualifier = PrintfQualifierSize;
     770                                i = nxt;
     771                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
     772                                break;
     773                        case 'j':
     774                                qualifier = PrintfQualifierMax;
    769775                                i = nxt;
    770776                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
    … …  
    892898                                number = (uint64_t) va_arg(ap, size_t);
    893899                                break;
     900                        case PrintfQualifierMax:
     901                                size = sizeof(uintmax_t);
     902                                number = (uint64_t) va_arg(ap, uintmax_t);
     903                                break;
    894904                        default:
    895905                                /* Unknown qualifier */
Note: See TracChangeset for help on using the changeset viewer.