diff options
| author | Kimplul <kimi.h.kuparinen@gmail.com> | 2022-05-23 20:40:53 +0300 |
|---|---|---|
| committer | Kimplul <kimi.h.kuparinen@gmail.com> | 2022-05-23 20:41:08 +0300 |
| commit | b096078c282af7233062ba242a213e6f5574cfb1 (patch) | |
| tree | 56f08b2898d4721255c8a91caa7b1978488959c6 /arch/riscv64/kernel | |
| parent | 20d9959b74fdfba26250579f8a75374042bfaaaf (diff) | |
| download | kmi-b096078c282af7233062ba242a213e6f5574cfb1.tar.gz kmi-b096078c282af7233062ba242a213e6f5574cfb1.zip | |
switch from clang-format to uncrustify
The output is close enough, and I like that uncrustify is a third-party
tool, so people can install a single tool for formatting instead of
having to lug around a whole toolchain. I fully expect to have to add
settings to uncrustify.conf, but let's see how this goes.
Diffstat (limited to 'arch/riscv64/kernel')
| -rw-r--r-- | arch/riscv64/kernel/proc.c | 4 | ||||
| -rw-r--r-- | arch/riscv64/kernel/sbi.c | 25 | ||||
| -rw-r--r-- | arch/riscv64/kernel/vmem.c | 4 |
3 files changed, 17 insertions, 16 deletions
diff --git a/arch/riscv64/kernel/proc.c b/arch/riscv64/kernel/proc.c index 51a4ab3..b378a72 100644 --- a/arch/riscv64/kernel/proc.c +++ b/arch/riscv64/kernel/proc.c @@ -12,8 +12,8 @@ stat_t jump_to_userspace(struct tcb *t, int argc, char **argv) { csr_write(CSR_SEPC, t->entry); csr_write(CSR_SSCRATCH, t); - __asm__ volatile("mv sp, %0\n" ::"r"(t->proc_stack_top) : "memory"); - __asm__ volatile("sret\n" ::: "memory"); + __asm__ volatile ("mv sp, %0\n" : : "r" (t->proc_stack_top) : "memory"); + __asm__ volatile ("sret\n" ::: "memory"); /* we should never reach this */ return ERR_ADDR; } diff --git a/arch/riscv64/kernel/sbi.c b/arch/riscv64/kernel/sbi.c index feadd8d..6a417d8 100644 --- a/arch/riscv64/kernel/sbi.c +++ b/arch/riscv64/kernel/sbi.c @@ -12,19 +12,20 @@ struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, { struct sbiret ret; - register uintptr_t a0 __asm__("a0") = (uintptr_t)(arg0); - register uintptr_t a1 __asm__("a1") = (uintptr_t)(arg1); - register uintptr_t a2 __asm__("a2") = (uintptr_t)(arg2); - register uintptr_t a3 __asm__("a3") = (uintptr_t)(arg3); - register uintptr_t a4 __asm__("a4") = (uintptr_t)(arg4); - register uintptr_t a5 __asm__("a5") = (uintptr_t)(arg5); - register uintptr_t a6 __asm__("a6") = (uintptr_t)(fid); - register uintptr_t a7 __asm__("a7") = (uintptr_t)(ext); + register uintptr_t a0 __asm__ ("a0") = (uintptr_t)(arg0); + register uintptr_t a1 __asm__ ("a1") = (uintptr_t)(arg1); + register uintptr_t a2 __asm__ ("a2") = (uintptr_t)(arg2); + register uintptr_t a3 __asm__ ("a3") = (uintptr_t)(arg3); + register uintptr_t a4 __asm__ ("a4") = (uintptr_t)(arg4); + register uintptr_t a5 __asm__ ("a5") = (uintptr_t)(arg5); + register uintptr_t a6 __asm__ ("a6") = (uintptr_t)(fid); + register uintptr_t a7 __asm__ ("a7") = (uintptr_t)(ext); - __asm__ volatile("ecall" - : "+r"(a0), "+r"(a1) - : "r"(a2), "r"(a3), "r"(a4), "r"(a5), "r"(a6), "r"(a7) - : "memory"); + __asm__ volatile ("ecall" + : "+r" (a0), "+r" (a1) + : "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6), + "r" (a7) + : "memory"); ret.error = a0; ret.value = a1; diff --git a/arch/riscv64/kernel/vmem.c b/arch/riscv64/kernel/vmem.c index 56b04f3..d7c823b 100644 --- a/arch/riscv64/kernel/vmem.c +++ b/arch/riscv64/kernel/vmem.c @@ -142,12 +142,12 @@ stat_t unmap_vpage(struct vmem *branch, vm_t vaddr) void flush_tlb() { - __asm__ volatile("sfence.vma %0\n" ::"r"(cpu_id()) : "memory"); + __asm__ volatile ("sfence.vma %0\n" : : "r" (cpu_id()) : "memory"); } void flush_tlb_all() { - __asm__ volatile("sfence.vma\n" ::: "memory"); + __asm__ volatile ("sfence.vma\n" ::: "memory"); } static void __start_vmem(struct vmem *branch, enum mm_mode m) |