Changeset c09ff7b in mainline


Ignore:
Timestamp:
2017-06-07T16:39:00Z (7 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
23c8acd9
Parents:
239e32b8
Message:

riscv64: fix compilation

Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed

  • abi/include/abi/proc/uarg.h

    r239e32b8 rc09ff7b  
    3636#define ABI_PROC_UARG_H_
    3737
     38#include <stddef.h>
     39
    3840/** Structure passed to uinit kernel thread as argument. */
    3941typedef struct uspace_arg {

  • boot/arch/riscv64/Makefile.inc

    r239e32b8 rc09ff7b  
    4040        arch/$(BARCH)/src/ucb.c \
    4141        arch/$(BARCH)/src/putchar.c \
    42         $(COMPS_C) \
     42        $(COMPS).s \
     43        $(COMPS)_desc.c \
    4344        generic/src/memstr.c \
    4445        generic/src/printf_core.c \
    … …  
    4849        generic/src/version.c \
    4950        generic/src/inflate.c
     51
     52PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c

  • boot/arch/riscv64/_link.ld.in

    r239e32b8 rc09ff7b  
    1717                *(.bss);        /* uninitialized static variables */
    1818                *(COMMON);      /* global variables */
     19                *(.components);
    1920        }
    2021       

  • boot/arch/riscv64/src/main.c

    r239e32b8 rc09ff7b  
    3939#include <halt.h>
    4040#include <inflate.h>
    41 #include <arch/_components.h>
     41#include "../../components.h"
    4242
    4343#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
    … …  
    6060       
    6161        for (size_t i = 0; i < COMPONENTS; i++) {
    62                 printf(" %p: %s image (%zu/%zu bytes)\n", components[i].start,
     62                printf(" %p: %s image (%zu/%zu bytes)\n", components[i].addr,
    6363                    components[i].name, components[i].inflated,
    6464                    components[i].size);
    6565               
    66                 uintptr_t tail = (uintptr_t) components[i].start +
     66                uintptr_t tail = (uintptr_t) components[i].addr +
    6767                    components[i].size;
    6868                if (tail > top)
    … …  
    112112                printf("%s ", components[i - 1].name);
    113113               
    114                 int err = inflate(components[i - 1].start, components[i - 1].size,
     114                int err = inflate(components[i - 1].addr, components[i - 1].size,
    115115                    dest[i - 1], components[i - 1].inflated);
    116116               

  • kernel/arch/riscv64/include/arch/istate_struct.ag

    r239e32b8 rc09ff7b  
    3636                },
    3737                {
    38                         negative-guard: KERNEL,
     38                        negative-guard : KERNEL,
     39                        include : <stddef.h>
     40                },
     41                {
     42                        negative-guard : KERNEL,
    3943                        include : <stdint.h>
    4044                }

  • kernel/arch/riscv64/include/arch/mm/km.h

    r239e32b8 rc09ff7b  
    3636#define KERN_riscv64_KM_H_
    3737
    38 #include <typedefs.h>
     38#include <stdbool.h>
     39#include <stddef.h>
    3940
    4041extern void km_identity_arch_init(void);

  • kernel/arch/riscv64/src/userspace.c

    r239e32b8 rc09ff7b  
    3434
    3535#include <abi/proc/uarg.h>
    36 #include <stdbool.h>
    3736#include <userspace.h>
    3837

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

    r239e32b8 rc09ff7b  
    3737#define LIBC_riscv64_SYSCALL_H_
    3838
     39#include <stdint.h>
    3940#include <abi/syscall.h>
     41#include <libarch/types.h>
    4042
    4143#define __syscall0  __syscall

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

    r239e32b8 rc09ff7b  
    5151static inline tcb_t *__tcb_get(void)
    5252{
    53         return NULL;
     53        return (void *) 0;
    5454}
    5555

  • uspace/lib/c/arch/riscv64/src/entry.c

    r239e32b8 rc09ff7b  
    3535void __entry(void)
    3636{
    37         __main(NULL);
     37        __main((void *) 0);
    3838}
    3939

  • uspace/lib/c/arch/riscv64/src/stacktrace.c

    r239e32b8 rc09ff7b  
    5555uintptr_t stacktrace_fp_get(void)
    5656{
    57         return (uintptr_t) NULL;
     57        return 0;
    5858}
    5959
    6060uintptr_t stacktrace_pc_get(void)
    6161{
    62         return (uintptr_t) NULL;
     62        return 0;
    6363}
    6464

  • uspace/lib/c/arch/riscv64/src/thread_entry.c

    r239e32b8 rc09ff7b  
    3030 */
    3131
     32#include <libarch/types.h>
    3233#include "../../../generic/private/thread.h"
    3334
    3435void __thread_entry(void)
    3536{
    36         __thread_main(NULL);
     37        __thread_main((void *) 0);
    3738}
    3839
Note: See TracChangeset for help on using the changeset viewer.