Ignore:
Timestamp:
2019-02-11T22:31:04Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
aaf9789c
Parents:
e3272101 (diff), 4805495 (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:

merging with upstream/master

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/arch/riscv64/include/libarch/fibril_context.h

    re3272101 rd5a89a3  
    2727 */
    2828
    29 #ifndef LIBC_ARCH_FIBRIL_CONTEXT_H_
    30 #define LIBC_ARCH_FIBRIL_CONTEXT_H_
     29#ifndef _LIBC_ARCH_FIBRIL_CONTEXT_H_
     30#define _LIBC_ARCH_FIBRIL_CONTEXT_H_
    3131
    32 #define CONTEXT_OFFSET_SP   0x00
    33 #define CONTEXT_OFFSET_PC   0x08
    34 #define CONTEXT_OFFSET_ZERO 0x10
    35 #define CONTEXT_OFFSET_RA   0x18
    36 #define CONTEXT_OFFSET_X3   0x20
    37 #define CONTEXT_OFFSET_X4   0x28
    38 #define CONTEXT_OFFSET_X5   0x30
    39 #define CONTEXT_OFFSET_X6   0x38
    40 #define CONTEXT_OFFSET_X7   0x40
    41 #define CONTEXT_OFFSET_X8   0x48
    42 #define CONTEXT_OFFSET_X9   0x50
    43 #define CONTEXT_OFFSET_X10  0x58
    44 #define CONTEXT_OFFSET_X11  0x60
    45 #define CONTEXT_OFFSET_X12  0x68
    46 #define CONTEXT_OFFSET_X13  0x70
    47 #define CONTEXT_OFFSET_X14  0x78
    48 #define CONTEXT_OFFSET_X15  0x80
    49 #define CONTEXT_OFFSET_X16  0x88
    50 #define CONTEXT_OFFSET_X17  0x90
    51 #define CONTEXT_OFFSET_X18  0x98
    52 #define CONTEXT_OFFSET_X19  0xa0
    53 #define CONTEXT_OFFSET_X20  0xa8
    54 #define CONTEXT_OFFSET_X21  0xb0
    55 #define CONTEXT_OFFSET_X22  0xb8
    56 #define CONTEXT_OFFSET_X23  0xc0
    57 #define CONTEXT_OFFSET_X24  0xc8
    58 #define CONTEXT_OFFSET_X25  0xd0
    59 #define CONTEXT_OFFSET_X26  0xd8
    60 #define CONTEXT_OFFSET_X27  0xe0
    61 #define CONTEXT_OFFSET_X28  0xe8
    62 #define CONTEXT_OFFSET_X29  0xf0
    63 #define CONTEXT_OFFSET_X30  0xf8
    64 #define CONTEXT_OFFSET_X31  0x100
    65 #define CONTEXT_SIZE        0x108
     32#define __CONTEXT_OFFSET_SP   0x00
     33#define __CONTEXT_OFFSET_PC   0x08
     34#define __CONTEXT_OFFSET_ZERO 0x10
     35#define __CONTEXT_OFFSET_RA   0x18
     36#define __CONTEXT_OFFSET_X3   0x20
     37#define __CONTEXT_OFFSET_X4   0x28
     38#define __CONTEXT_OFFSET_X5   0x30
     39#define __CONTEXT_OFFSET_X6   0x38
     40#define __CONTEXT_OFFSET_X7   0x40
     41#define __CONTEXT_OFFSET_X8   0x48
     42#define __CONTEXT_OFFSET_X9   0x50
     43#define __CONTEXT_OFFSET_X10  0x58
     44#define __CONTEXT_OFFSET_X11  0x60
     45#define __CONTEXT_OFFSET_X12  0x68
     46#define __CONTEXT_OFFSET_X13  0x70
     47#define __CONTEXT_OFFSET_X14  0x78
     48#define __CONTEXT_OFFSET_X15  0x80
     49#define __CONTEXT_OFFSET_X16  0x88
     50#define __CONTEXT_OFFSET_X17  0x90
     51#define __CONTEXT_OFFSET_X18  0x98
     52#define __CONTEXT_OFFSET_X19  0xa0
     53#define __CONTEXT_OFFSET_X20  0xa8
     54#define __CONTEXT_OFFSET_X21  0xb0
     55#define __CONTEXT_OFFSET_X22  0xb8
     56#define __CONTEXT_OFFSET_X23  0xc0
     57#define __CONTEXT_OFFSET_X24  0xc8
     58#define __CONTEXT_OFFSET_X25  0xd0
     59#define __CONTEXT_OFFSET_X26  0xd8
     60#define __CONTEXT_OFFSET_X27  0xe0
     61#define __CONTEXT_OFFSET_X28  0xe8
     62#define __CONTEXT_OFFSET_X29  0xf0
     63#define __CONTEXT_OFFSET_X30  0xf8
     64#define __CONTEXT_OFFSET_X31  0x100
     65#define __CONTEXT_SIZE        0x108
    6666
    6767#ifndef __ASSEMBLER__
    … …  
    7575 */
    7676
    77 typedef struct context {
     77typedef struct __context {
    7878        uint64_t sp;
    7979        uint64_t pc;
    … …  
    109109        uint64_t x30;
    110110        uint64_t x31;
    111 } context_t;
     111} __context_t;
    112112
    113113#endif
Note: See TracChangeset for help on using the changeset viewer.