Changeset d5a89a3 in mainline for uspace/lib/c/arch/mips32/include


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/mips32/include/libarch
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_mips32_CONFIG_H_
    36 #define LIBC_mips32_CONFIG_H_
     35#ifndef _LIBC_mips32_CONFIG_H_
     36#define _LIBC_mips32_CONFIG_H_
    3737
    3838#define PAGE_WIDTH  14

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

    re3272101 rd5a89a3  
    3131 */
    3232
    33 #ifndef LIBC_mips32_DDI_H_
    34 #define LIBC_mips32_DDI_H_
     33#ifndef _LIBC_mips32_DDI_H_
     34#define _LIBC_mips32_DDI_H_
    3535
    3636#include <ddi.h>

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

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

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

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

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

    re3272101 rd5a89a3  
    3434 */
    3535
    36 #ifndef LIBC_mips32_FIBRIL_H_
    37 #define LIBC_mips32_FIBRIL_H_
     36#ifndef _LIBC_mips32_FIBRIL_H_
     37#define _LIBC_mips32_FIBRIL_H_
    3838
    3939#include <stdint.h>

  • uspace/lib/c/arch/mips32/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   0x04
    34 #define CONTEXT_OFFSET_S0   0x08
    35 #define CONTEXT_OFFSET_S1   0x0c
    36 #define CONTEXT_OFFSET_S2   0x10
    37 #define CONTEXT_OFFSET_S3   0x14
    38 #define CONTEXT_OFFSET_S4   0x18
    39 #define CONTEXT_OFFSET_S5   0x1c
    40 #define CONTEXT_OFFSET_S6   0x20
    41 #define CONTEXT_OFFSET_S7   0x24
    42 #define CONTEXT_OFFSET_S8   0x28
    43 #define CONTEXT_OFFSET_GP   0x2c
    44 #define CONTEXT_OFFSET_TLS  0x30
    45 #define CONTEXT_OFFSET_F20  0x34
    46 #define CONTEXT_OFFSET_F21  0x38
    47 #define CONTEXT_OFFSET_F22  0x3c
    48 #define CONTEXT_OFFSET_F23  0x40
    49 #define CONTEXT_OFFSET_F24  0x44
    50 #define CONTEXT_OFFSET_F25  0x48
    51 #define CONTEXT_OFFSET_F26  0x4c
    52 #define CONTEXT_OFFSET_F27  0x50
    53 #define CONTEXT_OFFSET_F28  0x54
    54 #define CONTEXT_OFFSET_F29  0x58
    55 #define CONTEXT_OFFSET_F30  0x5c
    56 #define CONTEXT_SIZE        0x60
     32#define __CONTEXT_OFFSET_SP   0x00
     33#define __CONTEXT_OFFSET_PC   0x04
     34#define __CONTEXT_OFFSET_S0   0x08
     35#define __CONTEXT_OFFSET_S1   0x0c
     36#define __CONTEXT_OFFSET_S2   0x10
     37#define __CONTEXT_OFFSET_S3   0x14
     38#define __CONTEXT_OFFSET_S4   0x18
     39#define __CONTEXT_OFFSET_S5   0x1c
     40#define __CONTEXT_OFFSET_S6   0x20
     41#define __CONTEXT_OFFSET_S7   0x24
     42#define __CONTEXT_OFFSET_S8   0x28
     43#define __CONTEXT_OFFSET_GP   0x2c
     44#define __CONTEXT_OFFSET_TLS  0x30
     45#define __CONTEXT_OFFSET_F20  0x34
     46#define __CONTEXT_OFFSET_F21  0x38
     47#define __CONTEXT_OFFSET_F22  0x3c
     48#define __CONTEXT_OFFSET_F23  0x40
     49#define __CONTEXT_OFFSET_F24  0x44
     50#define __CONTEXT_OFFSET_F25  0x48
     51#define __CONTEXT_OFFSET_F26  0x4c
     52#define __CONTEXT_OFFSET_F27  0x50
     53#define __CONTEXT_OFFSET_F28  0x54
     54#define __CONTEXT_OFFSET_F29  0x58
     55#define __CONTEXT_OFFSET_F30  0x5c
     56#define __CONTEXT_SIZE        0x60
    5757
    5858#ifndef __ASSEMBLER__
    … …  
    6161#include <stdint.h>
    6262
    63 typedef struct context {
     63typedef struct __context {
    6464        uint32_t sp;
    6565        uint32_t pc;
    … …  
    8787        uint32_t f29;
    8888        uint32_t f30;
    89 } context_t;
     89} __context_t;
    9090
    9191#endif

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

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_mips32_STACK_H_
    36 #define LIBC_mips32_STACK_H_
     35#ifndef _LIBC_mips32_STACK_H_
     36#define _LIBC_mips32_STACK_H_
    3737
    3838#define STACK_ITEM_SIZE  4

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

    re3272101 rd5a89a3  
    3434 */
    3535
    36 #ifndef LIBC_mips32_SYSCALL_H_
    37 #define LIBC_mips32_SYSCALL_H_
     36#ifndef _LIBC_mips32_SYSCALL_H_
     37#define _LIBC_mips32_SYSCALL_H_
    3838
    3939#define LIBARCH_SYSCALL_GENERIC

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

    re3272101 rd5a89a3  
    3434 */
    3535
    36 #ifndef LIBC_mips32_THREAD_H_
    37 #define LIBC_mips32_THREAD_H_
     36#ifndef _LIBC_mips32_THREAD_H_
     37#define _LIBC_mips32_THREAD_H_
    3838
    3939#endif

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

    re3272101 rd5a89a3  
    3636/* TLS for MIPS is described in http://www.linux-mips.org/wiki/NPTL */
    3737
    38 #ifndef LIBC_mips32_TLS_H_
    39 #define LIBC_mips32_TLS_H_
     38#ifndef _LIBC_mips32_TLS_H_
     39#define _LIBC_mips32_TLS_H_
    4040
    4141/*
Note: See TracChangeset for help on using the changeset viewer.