diff options
Diffstat (limited to 'arch/riscv64')
| -rw-r--r-- | arch/riscv64/gen/asm-offsets.c | 2 | ||||
| -rw-r--r-- | arch/riscv64/init/init.c | 12 | ||||
| -rw-r--r-- | arch/riscv64/kernel/csr.h | 8 | ||||
| -rw-r--r-- | arch/riscv64/kernel/regs.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/arch/riscv64/gen/asm-offsets.c b/arch/riscv64/gen/asm-offsets.c index 71a1c9a..dfebb5b 100644 --- a/arch/riscv64/gen/asm-offsets.c +++ b/arch/riscv64/gen/asm-offsets.c @@ -14,7 +14,7 @@ * @param sym Name of symbol. * @param val Value of symbol. */ -#define DEFINE(sym, val) \ +#define DEFINE(sym, val) \ __asm__ volatile ("\n#-> " #sym " %0 " #val "\n" : : "i" (val)) /** diff --git a/arch/riscv64/init/init.c b/arch/riscv64/init/init.c index db428dd..4b20614 100644 --- a/arch/riscv64/init/init.c +++ b/arch/riscv64/init/init.c @@ -69,12 +69,12 @@ static void move_kernel() * * @param reg Register to modify. */ -#define __va_reg(reg) \ - { \ - vm_t reg = 0; \ - __asm__ ("mv %0, " QUOTE(reg) : "=r" (reg)::); \ - reg = (vm_t)__va(reg); \ - __asm__ ("mv " QUOTE(reg) ", %0" ::"rK" (reg) :); \ +#define __va_reg(reg) \ + { \ + vm_t reg = 0; \ + __asm__ ("mv %0, " QUOTE(reg) : "=r" (reg)::); \ + reg = (vm_t)__va(reg); \ + __asm__ ("mv " QUOTE(reg) ", %0" ::"rK" (reg) :); \ } /** diff --git a/arch/riscv64/kernel/csr.h b/arch/riscv64/kernel/csr.h index ade397c..9cb5799 100644 --- a/arch/riscv64/kernel/csr.h +++ b/arch/riscv64/kernel/csr.h @@ -54,16 +54,16 @@ #define __ASM_STR(x) #x #endif -#define csr_read(csr, res) \ +#define csr_read(csr, res) \ __asm__ volatile ("csrr %0, " __ASM_STR(csr) : "=r" (res) : : "memory") -#define csr_write(csr, val) \ +#define csr_write(csr, val) \ __asm__ volatile ("csrw " __ASM_STR(csr) ", %0" : : "r" (val) : "memory") -#define csr_set(csr, val) \ +#define csr_set(csr, val) \ __asm__ volatile ("csrs " __ASM_STR(csr) ", %0" : : "r" (val) : "memory") -#define csr_clear(csr, val) \ +#define csr_clear(csr, val) \ __asm__ volatile ("csrc " __ASM_STR(csr) ", %0" : : "r" (val) : "memory") #endif /* APOS_CSR_H */ diff --git a/arch/riscv64/kernel/regs.h b/arch/riscv64/kernel/regs.h index 97bb17e..f2bf336 100644 --- a/arch/riscv64/kernel/regs.h +++ b/arch/riscv64/kernel/regs.h @@ -12,7 +12,7 @@ struct riscv_regs { long ra, sp, gp, tp, t0, t1, t2, s0, s1, a0, a1, a2, a3, a4, a5, a6, a7, - s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, t3, t4, t5, t6; + s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, t3, t4, t5, t6; }; #endif /* APOS_RISCV_REGS_H */ |