Changeset 7bdcc45 in mainline for kernel/arch/ia64


Ignore:
Timestamp:
2010-12-16T16:38:49Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7837101
Parents:
8e58f94 (diff), eb221e5 (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 mainline changes.

Location:
kernel/arch/ia64
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r8e58f94 r7bdcc45  
    6262        unsigned int memmap_items;
    6363       
    64         unative_t *sapic;
     64        sysarg_t *sapic;
    6565        unsigned long sys_freq;
    6666        unsigned long freq_scale;

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

    r8e58f94 r7bdcc45  
    4343typedef uint64_t ipl_t;
    4444
    45 typedef uint64_t unative_t;
     45typedef uint64_t sysarg_t;
    4646typedef int64_t native_t;
    4747typedef uint64_t atomic_count_t;
    4848
    4949typedef struct {
    50         unative_t fnc;
    51         unative_t gp;
     50        sysarg_t fnc;
     51        sysarg_t gp;
    5252} __attribute__((may_alias)) fncptr_t;
    5353
    54 #define PRIp "lx"  /**< Format for uintptr_t. */
    55 #define PRIs "lu"  /**< Format for size_t. */
     54#define INTN_C(c)   INT64_C(c)
     55#define UINTN_C(c)  UINT64_C(c)
    5656
    57 #define PRId8 "d"    /**< Format for int8_t. */
    58 #define PRId16 "d"   /**< Format for int16_t. */
    59 #define PRId32 "d"   /**< Format for int32_t. */
    60 #define PRId64 "ld"  /**< Format for int64_t. */
    61 #define PRIdn "d"    /**< Format for native_t. */
    62 
    63 #define PRIu8 "u"    /**< Format for uint8_t. */
    64 #define PRIu16 "u"   /**< Format for uint16_t. */
    65 #define PRIu32 "u"   /**< Format for uint32_t. */
    66 #define PRIu64 "lu"  /**< Format for uint64_t. */
    67 #define PRIun "u"    /**< Format for unative_t. */
    68 
    69 #define PRIx8 "x"    /**< Format for hexadecimal (u)int8_t. */
    70 #define PRIx16 "x"   /**< Format for hexadecimal (u)int16_t. */
    71 #define PRIx32 "x"   /**< Format for hexadecimal (u)uint32_t. */
    72 #define PRIx64 "lx"  /**< Format for hexadecimal (u)int64_t. */
    73 #define PRIxn "x"    /**< Format for hexadecimal (u)native_t. */
     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. */
    7461
    7562#endif

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

    r8e58f94 r7bdcc45  
    104104static void iosapic_init(void)
    105105{
    106         uint64_t IOSAPIC = PA2KA((unative_t)(iosapic_base)) | FW_OFFSET;
     106        uint64_t IOSAPIC = PA2KA((sysarg_t)(iosapic_base)) | FW_OFFSET;
    107107        int i;
    108108       
    … …  
    251251 * We use r13 (a.k.a. tp) for this purpose.
    252252 */
    253 unative_t sys_tls_set(unative_t addr)
     253sysarg_t sys_tls_set(sysarg_t addr)
    254254{
    255255        return 0;
    … …  
    274274void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
    275275{
    276         fptr->fnc = (unative_t) addr;
    277         fptr->gp = ((unative_t *) caller)[1];
     276        fptr->fnc = (sysarg_t) addr;
     277        fptr->gp = ((sysarg_t *) caller)[1];
    278278       
    279279        return (void *) fptr;

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

    r8e58f94 r7bdcc45  
    135135void istate_decode(istate_t *istate)
    136136{
    137         printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp,
    138             istate->ar_bspstore);
    139         printf("ar.rnat=%#018llx\tar.rsc=%#018llx\n", istate->ar_rnat,
    140             istate->ar_rsc);
    141         printf("ar.ifs=%#018llx\tar.pfs=%#018llx\n", istate->ar_ifs,
    142             istate->ar_pfs);
    143         printf("cr.isr=%#018llx\tcr.ipsr=%#018llx\t\n", istate->cr_isr.value,
    144             istate->cr_ipsr);
    145        
    146         printf("cr.iip=%#018llx, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei,
     137        printf("ar.bsp=%p\tar.bspstore=%p\n",
     138            (void *) istate->ar_bsp, (void *) istate->ar_bspstore);
     139        printf("ar.rnat=%#0" PRIx64 "\tar.rsc=%#0" PRIx64 "\n",
     140            istate->ar_rnat, istate->ar_rsc);
     141        printf("ar.ifs=%#0" PRIx64 "\tar.pfs=%#0" PRIx64 "\n",
     142            istate->ar_ifs, istate->ar_pfs);
     143        printf("cr.isr=%#0" PRIx64 "\tcr.ipsr=%#0" PRIx64 "\n",
     144            istate->cr_isr.value, istate->cr_ipsr.value);
     145       
     146        printf("cr.iip=%#0" PRIx64 ", #%u\t(%s)\n",
     147            istate->cr_iip, istate->cr_isr.ei,
    147148            symtab_fmt_name_lookup(istate->cr_iip));
    148         printf("cr.iipa=%#018llx\t(%s)\n", istate->cr_iipa,
     149        printf("cr.iipa=%#0" PRIx64 "\t(%s)\n", istate->cr_iipa,
    149150            symtab_fmt_name_lookup(istate->cr_iipa));
    150         printf("cr.ifa=%#018llx\t(%s)\n", istate->cr_ifa,
     151        printf("cr.ifa=%#0" PRIx64 "\t(%s)\n", istate->cr_ifa,
    151152            symtab_fmt_name_lookup(istate->cr_ifa));
    152153}

  • kernel/arch/ia64/src/mm/tlb.c

    r8e58f94 r7bdcc45  
    499499                page_table_unlock(AS, true);
    500500                if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
    501                         fault_if_from_uspace(istate, "Page fault at %p.", va);
     501                        fault_if_from_uspace(istate, "Page fault at %p.",
     502                            (void *) va);
    502503                        panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
    503504                }
    … …  
    556557                        } else {
    557558                                fault_if_from_uspace(istate,
    558                                     "IO access fault at %p.", va);
     559                                    "IO access fault at %p.", (void *) va);
    559560                        }
    560561                }
    … …  
    620621                 */
    621622                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
    622                         fault_if_from_uspace(istate, "Page fault at %p.", va);
     623                        fault_if_from_uspace(istate, "Page fault at %p.",
     624                            (void *) va);
    623625                        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
    624626                }
    … …  
    668670        } else {
    669671                if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
    670                         fault_if_from_uspace(istate, "Page fault at %p.", va);
     672                        fault_if_from_uspace(istate, "Page fault at %p.",
     673                            (void *) va);
    671674                        panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
    672675                }
    … …  
    704707        } else {
    705708                if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
    706                         fault_if_from_uspace(istate, "Page fault at %p.", va);
     709                        fault_if_from_uspace(istate, "Page fault at %p.",
     710                            (void *) va);
    707711                        panic_memtrap(istate, PF_ACCESS_EXEC, va, NULL);
    708712                }
    … …  
    740744        } else {
    741745                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
    742                         fault_if_from_uspace(istate, "Page fault at %p.", va);
     746                        fault_if_from_uspace(istate, "Page fault at %p.",
     747                            (void *) va);
    743748                        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
    744749                }
    … …  
    772777        ASSERT(!t->w);
    773778        if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
    774                 fault_if_from_uspace(istate, "Page fault at %p.", va);
     779                fault_if_from_uspace(istate, "Page fault at %p.",
     780                    (void *) va);
    775781                panic_memtrap(istate, PF_ACCESS_WRITE, va, NULL);
    776782        }
    … …  
    812818                page_table_unlock(AS, true);
    813819                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
    814                         fault_if_from_uspace(istate, "Page fault at %p.", va);
     820                        fault_if_from_uspace(istate, "Page fault at %p.",
     821                            (void *) va);
    815822                        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, NULL);
    816823                }
Note: See TracChangeset for help on using the changeset viewer.