Changeset d5a89a3 in mainline for uspace/lib/c/arch/amd64/include/libarch

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/amd64/include/libarch

Files:

• config.h (modified) (1 diff)
• elf_linux.h (modified) (1 diff)
• faddr.h (modified) (1 diff)
• fibril.h (modified) (1 diff)
• fibril_context.h (modified) (3 diffs)
• rtld/dynamic.h (modified) (1 diff)
• rtld/elf_dyn.h (modified) (1 diff)
• rtld/module.h (added)
• stackarg.h (modified) (1 diff)
• syscall.h (modified) (1 diff)
• thread.h (modified) (1 diff)
• tls.h (modified) (1 diff)

uspace/lib/c/arch/amd64/include/libarch/config.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_amd64_CONFIG_H_
-#define LIBC_amd64_CONFIG_H_
+#ifndef _LIBC_amd64_CONFIG_H_
+#define _LIBC_amd64_CONFIG_H_
 
 #define PAGE_WIDTH      12

uspace/lib/c/arch/amd64/include/libarch/elf_linux.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_amd64_ELF_LINUX_H_
-#define LIBC_amd64_ELF_LINUX_H_
+#ifndef _LIBC_amd64_ELF_LINUX_H_
+#define _LIBC_amd64_ELF_LINUX_H_
 
 #include <libarch/istate.h>

uspace/lib/c/arch/amd64/include/libarch/faddr.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_amd64_FADDR_H_
-#define LIBC_amd64_FADDR_H_
+#ifndef _LIBC_amd64_FADDR_H_
+#define _LIBC_amd64_FADDR_H_
 
 #include <types/common.h>

uspace/lib/c/arch/amd64/include/libarch/fibril.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_amd64_FIBRIL_H_
-#define LIBC_amd64_FIBRIL_H_
+#ifndef _LIBC_amd64_FIBRIL_H_
+#define _LIBC_amd64_FIBRIL_H_
 
 #include <libarch/fibril_context.h>

uspace/lib/c/arch/amd64/include/libarch/fibril_context.h

@@ -27 +27 @@
  */
 
-#ifndef LIBC_ARCH_FIBRIL_CONTEXT_H_
-#define LIBC_ARCH_FIBRIL_CONTEXT_H_
+#ifndef _LIBC_ARCH_FIBRIL_CONTEXT_H_
+#define _LIBC_ARCH_FIBRIL_CONTEXT_H_
 
-#define CONTEXT_OFFSET_SP   0x00
-#define CONTEXT_OFFSET_PC   0x08
-#define CONTEXT_OFFSET_RBX  0x10
-#define CONTEXT_OFFSET_RBP  0x18
-#define CONTEXT_OFFSET_R12  0x20
-#define CONTEXT_OFFSET_R13  0x28
-#define CONTEXT_OFFSET_R14  0x30
-#define CONTEXT_OFFSET_R15  0x38
-#define CONTEXT_OFFSET_TLS  0x40
-#define CONTEXT_SIZE        0x48
+#define __CONTEXT_OFFSET_SP   0x00
+#define __CONTEXT_OFFSET_PC   0x08
+#define __CONTEXT_OFFSET_RBX  0x10
+#define __CONTEXT_OFFSET_RBP  0x18
+#define __CONTEXT_OFFSET_R12  0x20
+#define __CONTEXT_OFFSET_R13  0x28
+#define __CONTEXT_OFFSET_R14  0x30
+#define __CONTEXT_OFFSET_R15  0x38
+#define __CONTEXT_OFFSET_TLS  0x40
+#define __CONTEXT_SIZE        0x48
 
 #ifndef __ASSEMBLER__
@@ -45 +45 @@
 #include <stdint.h>
 
-typedef struct context {
+typedef struct __context {
         /*
          * We include only registers that must be preserved
@@ -59 +59 @@
         uint64_t r15;
         uint64_t tls;
-} context_t;
+} __context_t;
 
 #endif

uspace/lib/c/arch/amd64/include/libarch/rtld/dynamic.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_amd64_RTLD_DYNAMIC_H_
-#define LIBC_amd64_RTLD_DYNAMIC_H_
+#ifndef _LIBC_amd64_RTLD_DYNAMIC_H_
+#define _LIBC_amd64_RTLD_DYNAMIC_H_
 
 typedef struct {

uspace/lib/c/arch/amd64/include/libarch/rtld/elf_dyn.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_amd64_RTLD_ELF_DYN_H_
-#define LIBC_amd64_RTLD_ELF_DYN_H_
+#ifndef _LIBC_amd64_RTLD_ELF_DYN_H_
+#define _LIBC_amd64_RTLD_ELF_DYN_H_
 
 #define R_X86_64_64             1

uspace/lib/c/arch/amd64/include/libarch/stackarg.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_STACKARG_H_
-#define LIBC_STACKARG_H_
+#ifndef _LIBC_STACKARG_H_
+#define _LIBC_STACKARG_H_
 
 #endif

uspace/lib/c/arch/amd64/include/libarch/syscall.h

@@ -34 +34 @@
  */
 
-#ifndef LIBC_amd64_SYSCALL_H_
-#define LIBC_amd64_SYSCALL_H_
+#ifndef _LIBC_amd64_SYSCALL_H_
+#define _LIBC_amd64_SYSCALL_H_
 
 #define LIBARCH_SYSCALL_GENERIC

uspace/lib/c/arch/amd64/include/libarch/thread.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_amd64_THREAD_H_
-#define LIBC_amd64_THREAD_H_
+#ifndef _LIBC_amd64_THREAD_H_
+#define _LIBC_amd64_THREAD_H_
 
 #endif

uspace/lib/c/arch/amd64/include/libarch/tls.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_amd64_TLS_H_
-#define LIBC_amd64_TLS_H_
+#ifndef _LIBC_amd64_TLS_H_
+#define _LIBC_amd64_TLS_H_
 
 #define CONFIG_TLS_VARIANT_2