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

Location:
uspace/lib/c/arch/sparc64/include/libarch
Files:
3 added
11 edited

Legend:

Unmodified
Added
Removed

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

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_sparc64_CONFIG_H_
    36 #define LIBC_sparc64_CONFIG_H_
     35#ifndef _LIBC_sparc64_CONFIG_H_
     36#define _LIBC_sparc64_CONFIG_H_
    3737
    3838#if defined (SUN4U)

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

    re3272101 rd5a89a3  
    3131 */
    3232
    33 #ifndef LIBC_sparc64_DDI_H_
    34 #define LIBC_sparc64_DDI_H_
     33#ifndef _LIBC_sparc64_DDI_H_
     34#define _LIBC_sparc64_DDI_H_
    3535
    3636#include <barrier.h>

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

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

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

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

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

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_sparc64_FIBRIL_H_
    36 #define LIBC_sparc64_FIBRIL_H_
     35#ifndef _LIBC_sparc64_FIBRIL_H_
     36#define _LIBC_sparc64_FIBRIL_H_
    3737
    3838#include <libarch/stack.h>

  • uspace/lib/c/arch/sparc64/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_I0  0x10
    35 #define CONTEXT_OFFSET_I1  0x18
    36 #define CONTEXT_OFFSET_I2  0x20
    37 #define CONTEXT_OFFSET_I3  0x28
    38 #define CONTEXT_OFFSET_I4  0x30
    39 #define CONTEXT_OFFSET_I5  0x38
    40 #define CONTEXT_OFFSET_FP  0x40
    41 #define CONTEXT_OFFSET_I7  0x48
    42 #define CONTEXT_OFFSET_L0  0x50
    43 #define CONTEXT_OFFSET_L1  0x58
    44 #define CONTEXT_OFFSET_L2  0x60
    45 #define CONTEXT_OFFSET_L3  0x68
    46 #define CONTEXT_OFFSET_L4  0x70
    47 #define CONTEXT_OFFSET_L5  0x78
    48 #define CONTEXT_OFFSET_L6  0x80
    49 #define CONTEXT_OFFSET_L7  0x88
    50 #define CONTEXT_OFFSET_TP  0x90
    51 #define CONTEXT_SIZE       0x98
     32#define __CONTEXT_OFFSET_SP  0x00
     33#define __CONTEXT_OFFSET_PC  0x08
     34#define __CONTEXT_OFFSET_I0  0x10
     35#define __CONTEXT_OFFSET_I1  0x18
     36#define __CONTEXT_OFFSET_I2  0x20
     37#define __CONTEXT_OFFSET_I3  0x28
     38#define __CONTEXT_OFFSET_I4  0x30
     39#define __CONTEXT_OFFSET_I5  0x38
     40#define __CONTEXT_OFFSET_FP  0x40
     41#define __CONTEXT_OFFSET_I7  0x48
     42#define __CONTEXT_OFFSET_L0  0x50
     43#define __CONTEXT_OFFSET_L1  0x58
     44#define __CONTEXT_OFFSET_L2  0x60
     45#define __CONTEXT_OFFSET_L3  0x68
     46#define __CONTEXT_OFFSET_L4  0x70
     47#define __CONTEXT_OFFSET_L5  0x78
     48#define __CONTEXT_OFFSET_L6  0x80
     49#define __CONTEXT_OFFSET_L7  0x88
     50#define __CONTEXT_OFFSET_TP  0x90
     51#define __CONTEXT_SIZE       0x98
    5252
    5353#ifndef __ASSEMBLER__
    … …  
    5656#include <stdint.h>
    5757
    58 typedef struct context {
     58typedef struct __context {
    5959        uintptr_t sp;  // %o6
    6060        uintptr_t pc;  // %o7
    … …  
    7676        uint64_t l7;
    7777        uint64_t tp;  // %g7
    78 } context_t;
     78} __context_t;
    7979
    8080#endif

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

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_sparc64_STACK_H_
    36 #define LIBC_sparc64_STACK_H_
     35#ifndef _LIBC_sparc64_STACK_H_
     36#define _LIBC_sparc64_STACK_H_
    3737
    3838#define STACK_ITEM_SIZE                 8

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

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_sparc64_STACKARG_H_
    36 #define LIBC_sparc64_STACKARG_H_
     35#ifndef _LIBC_sparc64_STACKARG_H_
     36#define _LIBC_sparc64_STACKARG_H_
    3737
    3838#endif

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

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_sparc64_SYSCALL_H_
    36 #define LIBC_sparc64_SYSCALL_H_
     35#ifndef _LIBC_sparc64_SYSCALL_H_
     36#define _LIBC_sparc64_SYSCALL_H_
    3737
    3838#include <stdint.h>

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

    re3272101 rd5a89a3  
    3232 */
    3333
    34 #ifndef LIBC_sparc64_THREAD_H_
    35 #define LIBC_sparc64_THREAD_H_
     34#ifndef _LIBC_sparc64_THREAD_H_
     35#define _LIBC_sparc64_THREAD_H_
    3636
    3737#endif

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

    re3272101 rd5a89a3  
    3636 */
    3737
    38 #ifndef LIBC_sparc64_TLS_H_
    39 #define LIBC_sparc64_TLS_H_
     38#ifndef _LIBC_sparc64_TLS_H_
     39#define _LIBC_sparc64_TLS_H_
    4040
    4141#define CONFIG_TLS_VARIANT_2
    … …  
    4646        void *self;
    4747        void *fibril_data;
     48        void **dtv;
     49        void *pad;
    4850} tcb_t;
    4951
Note: See TracChangeset for help on using the changeset viewer.