Ignore:
Timestamp:
2019-02-11T22:31:04Z (7 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

Location:
uspace/lib/c/arch/ia64/include/libarch
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/arch/ia64/include/libarch/config.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia64_CONFIG_H_
    36 #define LIBC_ia64_CONFIG_H_
     35#ifndef _LIBC_ia64_CONFIG_H_
     36#define _LIBC_ia64_CONFIG_H_
    3737
    3838#define PAGE_WIDTH      14

  • uspace/lib/c/arch/ia64/include/libarch/ddi.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia64_DDI_H_
    36 #define LIBC_ia64_DDI_H_
     35#ifndef _LIBC_ia64_DDI_H_
     36#define _LIBC_ia64_DDI_H_
    3737
    3838#include <ddi.h>

  • uspace/lib/c/arch/ia64/include/libarch/elf_linux.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia64_ELF_LINUX_H_
    36 #define LIBC_ia64_ELF_LINUX_H_
     35#ifndef _LIBC_ia64_ELF_LINUX_H_
     36#define _LIBC_ia64_ELF_LINUX_H_
    3737
    3838#include <libarch/istate.h>

  • uspace/lib/c/arch/ia64/include/libarch/faddr.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia64_FADDR_H_
    36 #define LIBC_ia64_FADDR_H_
     35#ifndef _LIBC_ia64_FADDR_H_
     36#define _LIBC_ia64_FADDR_H_
    3737
    3838#include <types/common.h>

  • uspace/lib/c/arch/ia64/include/libarch/fibril.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia64_FIBRIL_H_
    36 #define LIBC_ia64_FIBRIL_H_
     35#ifndef _LIBC_ia64_FIBRIL_H_
     36#define _LIBC_ia64_FIBRIL_H_
    3737
    3838#include <stdint.h>
    … …  
    4343
    4444/*
    45  * __setjmp() and __longjmp() are both leaf procedures.
     45 * __context_save() and __context_restore() are both leaf procedures.
    4646 * No need to allocate scratch area.
    4747 */

  • uspace/lib/c/arch/ia64/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_AR_PFS          0x000
    33 #define CONTEXT_OFFSET_AR_UNAT_CALLER  0x008
    34 #define CONTEXT_OFFSET_AR_UNAT_CALLEE  0x010
    35 #define CONTEXT_OFFSET_AR_RSC          0x018
    36 #define CONTEXT_OFFSET_BSP             0x020
    37 #define CONTEXT_OFFSET_AR_RNAT         0x028
    38 #define CONTEXT_OFFSET_AR_LC           0x030
    39 #define CONTEXT_OFFSET_R1              0x038
    40 #define CONTEXT_OFFSET_R4              0x040
    41 #define CONTEXT_OFFSET_R5              0x048
    42 #define CONTEXT_OFFSET_R6              0x050
    43 #define CONTEXT_OFFSET_R7              0x058
    44 #define CONTEXT_OFFSET_SP              0x060
    45 #define CONTEXT_OFFSET_TP              0x068
    46 #define CONTEXT_OFFSET_PC              0x070
    47 #define CONTEXT_OFFSET_B1              0x078
    48 #define CONTEXT_OFFSET_B2              0x080
    49 #define CONTEXT_OFFSET_B3              0x088
    50 #define CONTEXT_OFFSET_B4              0x090
    51 #define CONTEXT_OFFSET_B5              0x098
    52 #define CONTEXT_OFFSET_PR              0x0a0
    53 #define CONTEXT_OFFSET_F2              0x0b0
    54 #define CONTEXT_OFFSET_F3              0x0c0
    55 #define CONTEXT_OFFSET_F4              0x0d0
    56 #define CONTEXT_OFFSET_F5              0x0e0
    57 #define CONTEXT_OFFSET_F16             0x0f0
    58 #define CONTEXT_OFFSET_F17             0x100
    59 #define CONTEXT_OFFSET_F18             0x110
    60 #define CONTEXT_OFFSET_F19             0x120
    61 #define CONTEXT_OFFSET_F20             0x130
    62 #define CONTEXT_OFFSET_F21             0x140
    63 #define CONTEXT_OFFSET_F22             0x150
    64 #define CONTEXT_OFFSET_F23             0x160
    65 #define CONTEXT_OFFSET_F24             0x170
    66 #define CONTEXT_OFFSET_F25             0x180
    67 #define CONTEXT_OFFSET_F26             0x190
    68 #define CONTEXT_OFFSET_F27             0x1a0
    69 #define CONTEXT_OFFSET_F28             0x1b0
    70 #define CONTEXT_OFFSET_F29             0x1c0
    71 #define CONTEXT_OFFSET_F30             0x1d0
    72 #define CONTEXT_OFFSET_F31             0x1e0
    73 #define CONTEXT_SIZE                   0x1f0
     32#define __CONTEXT_OFFSET_AR_PFS          0x000
     33#define __CONTEXT_OFFSET_AR_UNAT_CALLER  0x008
     34#define __CONTEXT_OFFSET_AR_UNAT_CALLEE  0x010
     35#define __CONTEXT_OFFSET_AR_RSC          0x018
     36#define __CONTEXT_OFFSET_BSP             0x020
     37#define __CONTEXT_OFFSET_AR_RNAT         0x028
     38#define __CONTEXT_OFFSET_AR_LC           0x030
     39#define __CONTEXT_OFFSET_R1              0x038
     40#define __CONTEXT_OFFSET_R4              0x040
     41#define __CONTEXT_OFFSET_R5              0x048
     42#define __CONTEXT_OFFSET_R6              0x050
     43#define __CONTEXT_OFFSET_R7              0x058
     44#define __CONTEXT_OFFSET_SP              0x060
     45#define __CONTEXT_OFFSET_TP              0x068
     46#define __CONTEXT_OFFSET_PC              0x070
     47#define __CONTEXT_OFFSET_B1              0x078
     48#define __CONTEXT_OFFSET_B2              0x080
     49#define __CONTEXT_OFFSET_B3              0x088
     50#define __CONTEXT_OFFSET_B4              0x090
     51#define __CONTEXT_OFFSET_B5              0x098
     52#define __CONTEXT_OFFSET_PR              0x0a0
     53#define __CONTEXT_OFFSET_F2              0x0b0
     54#define __CONTEXT_OFFSET_F3              0x0c0
     55#define __CONTEXT_OFFSET_F4              0x0d0
     56#define __CONTEXT_OFFSET_F5              0x0e0
     57#define __CONTEXT_OFFSET_F16             0x0f0
     58#define __CONTEXT_OFFSET_F17             0x100
     59#define __CONTEXT_OFFSET_F18             0x110
     60#define __CONTEXT_OFFSET_F19             0x120
     61#define __CONTEXT_OFFSET_F20             0x130
     62#define __CONTEXT_OFFSET_F21             0x140
     63#define __CONTEXT_OFFSET_F22             0x150
     64#define __CONTEXT_OFFSET_F23             0x160
     65#define __CONTEXT_OFFSET_F24             0x170
     66#define __CONTEXT_OFFSET_F25             0x180
     67#define __CONTEXT_OFFSET_F26             0x190
     68#define __CONTEXT_OFFSET_F27             0x1a0
     69#define __CONTEXT_OFFSET_F28             0x1b0
     70#define __CONTEXT_OFFSET_F29             0x1c0
     71#define __CONTEXT_OFFSET_F30             0x1d0
     72#define __CONTEXT_OFFSET_F31             0x1e0
     73#define __CONTEXT_SIZE                   0x1f0
    7474
    7575#ifndef __ASSEMBLER__
    … …  
    7979
    8080// Only save registers that must be preserved across function calls.
    81 typedef struct context {
     81typedef struct __context {
    8282        // Application registers.
    8383        uint64_t ar_pfs;
    … …  
    132132        uint128_t f30;
    133133        uint128_t f31;
    134 } context_t;
     134} __context_t;
    135135
    136136#endif  /* __ASSEMBLER__ */

  • uspace/lib/c/arch/ia64/include/libarch/stack.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia64_STACK_H_
    36 #define LIBC_ia64_STACK_H_
     35#ifndef _LIBC_ia64_STACK_H_
     36#define _LIBC_ia64_STACK_H_
    3737
    3838#define STACK_ITEM_SIZE                 8

  • uspace/lib/c/arch/ia64/include/libarch/stackarg.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_STACKARG_H_
    36 #define LIBC_STACKARG_H_
     35#ifndef _LIBC_STACKARG_H_
     36#define _LIBC_STACKARG_H_
    3737
    3838#endif

  • uspace/lib/c/arch/ia64/include/libarch/syscall.h

    re3272101 rd5a89a3  
    3434 */
    3535
    36 #ifndef LIBC_ia64_SYSCALL_H_
    37 #define LIBC_ia64_SYSCALL_H_
     36#ifndef _LIBC_ia64_SYSCALL_H_
     37#define _LIBC_ia64_SYSCALL_H_
    3838
    3939#define LIBARCH_SYSCALL_GENERIC

  • uspace/lib/c/arch/ia64/include/libarch/thread.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia64_THREAD_H_
    36 #define LIBC_ia64_THREAD_H_
     35#ifndef _LIBC_ia64_THREAD_H_
     36#define _LIBC_ia64_THREAD_H_
    3737
    3838#endif

  • uspace/lib/c/arch/ia64/include/libarch/tls.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia64_TLS_H_
    36 #define LIBC_ia64_TLS_H_
     35#ifndef _LIBC_ia64_TLS_H_
     36#define _LIBC_ia64_TLS_H_
    3737
    3838#define CONFIG_TLS_VARIANT_1
Note: See TracChangeset for help on using the changeset viewer.