Ignore:
Timestamp:
2014-09-12T13:22:33Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b20126
Parents:
8db09e4 (diff), 105d8d6 (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

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r8db09e4 r15d0046  
    4040#include <align.h>
    4141#include <arch/stack.h>
     42#include <arch/context_struct.h>
    4243
    4344/*
    … …  
    5859        } while (0)
    5960
    60 /*
    61  * Only save registers that must be preserved across
    62  * function calls.
    63  */
    64 typedef struct {
    65 
    66         /*
    67          * Application registers
    68          */
    69         uint64_t ar_pfs;
    70         uint64_t ar_unat_caller;
    71         uint64_t ar_unat_callee;
    72         uint64_t ar_rsc;
    73         uintptr_t bsp;          /* ar_bsp */
    74         uint64_t ar_rnat;
    75         uint64_t ar_lc;
    76 
    77         /*
    78          * General registers
    79          */
    80         uint64_t r1;
    81         uint64_t r4;
    82         uint64_t r5;
    83         uint64_t r6;
    84         uint64_t r7;
    85         uintptr_t sp;           /* r12 */
    86         uint64_t r13;
    87        
    88         /*
    89          * Branch registers
    90          */
    91         uintptr_t pc;           /* b0 */
    92         uint64_t b1;
    93         uint64_t b2;
    94         uint64_t b3;
    95         uint64_t b4;
    96         uint64_t b5;
    97 
    98         /*
    99          * Predicate registers
    100          */
    101         uint64_t pr;
    102 
    103         uint128_t f2 __attribute__ ((aligned(16)));
    104         uint128_t f3;
    105         uint128_t f4;
    106         uint128_t f5;
    107 
    108         uint128_t f16;
    109         uint128_t f17;
    110         uint128_t f18;
    111         uint128_t f19;
    112         uint128_t f20;
    113         uint128_t f21;
    114         uint128_t f22;
    115         uint128_t f23;
    116         uint128_t f24;
    117         uint128_t f25;
    118         uint128_t f26;
    119         uint128_t f27;
    120         uint128_t f28;
    121         uint128_t f29;
    122         uint128_t f30;
    123         uint128_t f31;
    124        
    125         ipl_t ipl;
    126 } context_t;
    127 
    12861#endif
    12962
Note: See TracChangeset for help on using the changeset viewer.