Changeset 5b61171 in mainline

Timestamp:

2018-03-13T21:08:52Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

948222e4

Parents:

b127e4af

Message:

Fix riscv64 build, and add a build config for it to prevent future breakage.

Files:

• boot/arch/riscv64/src/main.c (modified) (1 diff)
• defaults/riscv64/Makefile.config (added)
• uspace/lib/c/arch/riscv64/include/libarch/fibril.h (modified) (2 diffs)
• uspace/lib/c/arch/riscv64/src/fibril.c (modified) (1 diff)

boot/arch/riscv64/src/main.c

@@ -64 +64 @@
         bootinfo.memmap.zones[0].size = PHYSMEM_SIZE;
 
-        printf("\nMemory statistics (total %lu MB, starting at %p)\n\n",
+        printf("\nMemory statistics (total %llu MB, starting at %p)\n\n",
             bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
         printf(" %p: boot info structure\n", &bootinfo);

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

@@ -37 +37 @@
 
 #include <stdint.h>
+#include <libarch/fibril_context.h>
 
 #define SP_DELTA  0
@@ -44 +45 @@
                 (ctx)->pc = (uintptr_t) (_pc); \
                 (ctx)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \
-                (ctx)->fp = 0; \
-                (ctx)->tls = ((uintptr_t) (ptls)) + sizeof(tcb_t); \
+                (ctx)->x4 = ((uintptr_t) (ptls)) + sizeof(tcb_t); \
         } while (0)
-
-/*
- * This stores the registers which need to be
- * preserved across function calls.
- */
-typedef struct {
-        uintptr_t sp;
-        uintptr_t fp;
-        uintptr_t pc;
-        uintptr_t tls;
-} context_t;
 
 static inline uintptr_t _context_get_fp(context_t *ctx)
 {
-        /* This function returns the frame pointer. */
-        return ctx->fp;
+        // FIXME: No frame pointer in the standard ABI.
+        return 0;
 }
 

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

@@ -30 +30 @@
  */
 
-#include <fibril.h>
+#include <setjmp.h>
 #include <stdbool.h>