Changeset d5a89a3 in mainline for uspace/lib/c/arch/abs32le

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/abs32le

Files:

• include/libarch/config.h (modified) (1 diff)
• include/libarch/ddi.h (modified) (1 diff)
• include/libarch/elf_linux.h (modified) (1 diff)
• include/libarch/faddr.h (modified) (1 diff)
• include/libarch/fibril.h (modified) (1 diff)
• include/libarch/fibril_context.h (modified) (2 diffs)
• include/libarch/syscall.h (modified) (1 diff)
• include/libarch/thread.h (modified) (1 diff)
• include/libarch/tls.h (modified) (1 diff)
• src/fibril.c (modified) (1 diff)

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

@@ -33 +33 @@
  */
 
-#ifndef LIBC_abs32le_CONFIG_H_
-#define LIBC_abs32le_CONFIG_H_
+#ifndef _LIBC_abs32le_CONFIG_H_
+#define _LIBC_abs32le_CONFIG_H_
 
 #define PAGE_WIDTH  12

uspace/lib/c/arch/abs32le/include/libarch/ddi.h

@@ -30 +30 @@
  */
 
-#ifndef LIBC_abs32le_DDI_H_
-#define LIBC_abs32le_DDI_H_
+#ifndef _LIBC_abs32le_DDI_H_
+#define _LIBC_abs32le_DDI_H_
 
 #include <ddi.h>

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

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

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

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

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

@@ -33 +33 @@
  */
 
-#ifndef LIBC_abs32le_FIBRIL_H_
-#define LIBC_abs32le_FIBRIL_H_
+#ifndef _LIBC_abs32le_FIBRIL_H_
+#define _LIBC_abs32le_FIBRIL_H_
 
 #include <stdint.h>

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

@@ -27 +27 @@
  */
 
-#ifndef LIBC_abs32le_FIBRIL_CONTEXT_H_
-#define LIBC_abs32le_FIBRIL_CONTEXT_H_
+#ifndef _LIBC_abs32le_FIBRIL_CONTEXT_H_
+#define _LIBC_abs32le_FIBRIL_CONTEXT_H_
 
 #include <stdint.h>
@@ -36 +36 @@
  * need to be preserved across function calls.
  */
-typedef struct context {
+typedef struct __context {
         uintptr_t sp;
         uintptr_t fp;
         uintptr_t pc;
         uintptr_t tls;
-} context_t;
+} __context_t;
 
 #endif

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

@@ -34 +34 @@
  */
 
-#ifndef LIBC_abs32le_SYSCALL_H_
-#define LIBC_abs32le_SYSCALL_H_
+#ifndef _LIBC_abs32le_SYSCALL_H_
+#define _LIBC_abs32le_SYSCALL_H_
 
 #include <abi/syscall.h>

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

@@ -33 +33 @@
  */
 
-#ifndef LIBC_abs32le_THREAD_H_
-#define LIBC_abs32le_THREAD_H_
+#ifndef _LIBC_abs32le_THREAD_H_
+#define _LIBC_abs32le_THREAD_H_
 
 #endif

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

@@ -33 +33 @@
  */
 
-#ifndef LIBC_abs32le_TLS_H_
-#define LIBC_abs32le_TLS_H_
+#ifndef _LIBC_abs32le_TLS_H_
+#define _LIBC_abs32le_TLS_H_
 
 #define CONFIG_TLS_VARIANT_2

uspace/lib/c/arch/abs32le/src/fibril.c

@@ -33 +33 @@
 #include <stdbool.h>
 
-int __setjmp(context_t *ctx)
+int __context_save(__context_t *ctx)
 {
         return 0;
 }
 
-void __longjmp(context_t *ctx, int val)
+void __context_restore(__context_t *ctx, int val)
 {
         while (true)