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/ia32/include/libarch
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/ia32/include/libarch/config.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia32_CONFIG_H_
    36 #define LIBC_ia32_CONFIG_H_
     35#ifndef _LIBC_ia32_CONFIG_H_
     36#define _LIBC_ia32_CONFIG_H_
    3737
    3838#define PAGE_WIDTH  12
  • uspace/lib/c/arch/ia32/include/libarch/ddi.h

    re3272101 rd5a89a3  
    3131 */
    3232
    33 #ifndef LIBC_ia32_DDI_H_
    34 #define LIBC_ia32_DDI_H_
     33#ifndef _LIBC_ia32_DDI_H_
     34#define _LIBC_ia32_DDI_H_
    3535
    3636#include <ddi.h>
  • uspace/lib/c/arch/ia32/include/libarch/elf_linux.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia32_ELF_LINUX_H_
    36 #define LIBC_ia32_ELF_LINUX_H_
     35#ifndef _LIBC_ia32_ELF_LINUX_H_
     36#define _LIBC_ia32_ELF_LINUX_H_
    3737
    3838#include <libarch/istate.h>
  • uspace/lib/c/arch/ia32/include/libarch/faddr.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia32_FADDR_H_
    36 #define LIBC_ia32_FADDR_H_
     35#ifndef _LIBC_ia32_FADDR_H_
     36#define _LIBC_ia32_FADDR_H_
    3737
    3838#include <types/common.h>
  • uspace/lib/c/arch/ia32/include/libarch/fibril.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia32_FIBRIL_H_
    36 #define LIBC_ia32_FIBRIL_H_
     35#ifndef _LIBC_ia32_FIBRIL_H_
     36#define _LIBC_ia32_FIBRIL_H_
    3737
    3838#include <types/common.h>
  • uspace/lib/c/arch/ia32/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_EBX  0x08
    35 #define CONTEXT_OFFSET_ESI  0x0c
    36 #define CONTEXT_OFFSET_EDI  0x10
    37 #define CONTEXT_OFFSET_EBP  0x14
    38 #define CONTEXT_OFFSET_TLS  0x18
    39 #define CONTEXT_SIZE        0x1c
     32#define __CONTEXT_OFFSET_SP   0x00
     33#define __CONTEXT_OFFSET_PC   0x04
     34#define __CONTEXT_OFFSET_EBX  0x08
     35#define __CONTEXT_OFFSET_ESI  0x0c
     36#define __CONTEXT_OFFSET_EDI  0x10
     37#define __CONTEXT_OFFSET_EBP  0x14
     38#define __CONTEXT_OFFSET_TLS  0x18
     39#define __CONTEXT_SIZE        0x1c
    4040
    4141#ifndef __ASSEMBLER__
     
    4444
    4545/* We include only registers that must be preserved during function call. */
    46 typedef struct context {
     46typedef struct __context {
    4747        uint32_t sp;
    4848        uint32_t pc;
     
    5252        uint32_t ebp;
    5353        uint32_t tls;
    54 } context_t;
     54} __context_t;
    5555
    5656#endif
  • uspace/lib/c/arch/ia32/include/libarch/rtld/dynamic.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia32_RTLD_DYNAMIC_H_
    36 #define LIBC_ia32_RTLD_DYNAMIC_H_
     35#ifndef _LIBC_ia32_RTLD_DYNAMIC_H_
     36#define _LIBC_ia32_RTLD_DYNAMIC_H_
    3737
    3838typedef struct {
  • uspace/lib/c/arch/ia32/include/libarch/rtld/elf_dyn.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia32_RTLD_ELF_DYN_H_
    36 #define LIBC_ia32_RTLD_ELF_DYN_H_
     35#ifndef _LIBC_ia32_RTLD_ELF_DYN_H_
     36#define _LIBC_ia32_RTLD_ELF_DYN_H_
    3737
    3838/*
  • uspace/lib/c/arch/ia32/include/libarch/syscall.h

    re3272101 rd5a89a3  
    3434 */
    3535
    36 #ifndef LIBC_ia32_SYSCALL_H_
    37 #define LIBC_ia32_SYSCALL_H_
     36#ifndef _LIBC_ia32_SYSCALL_H_
     37#define _LIBC_ia32_SYSCALL_H_
    3838
    3939#include <abi/syscall.h>
  • uspace/lib/c/arch/ia32/include/libarch/thread.h

    re3272101 rd5a89a3  
    3333 */
    3434
    35 #ifndef LIBC_ia32_THREAD_H_
    36 #define LIBC_ia32_THREAD_H_
     35#ifndef _LIBC_ia32_THREAD_H_
     36#define _LIBC_ia32_THREAD_H_
    3737
    3838#endif
  • uspace/lib/c/arch/ia32/include/libarch/tls.h

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