Skip to content

Commit f19c3b4

Browse files
clementlegerpalmer-dabbelt
authored andcommitted
riscv: remove unused functions in traps_misaligned.c
Replace macros by the only two function calls that are done from this file, store_u8() and load_u8(). Signed-off-by: Clément Léger <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 0bb80ec commit f19c3b4

File tree

1 file changed

+7
-39
lines changed

1 file changed

+7
-39
lines changed

arch/riscv/kernel/traps_misaligned.c

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -151,51 +151,19 @@
151151
#define PRECISION_S 0
152152
#define PRECISION_D 1
153153

154-
#define DECLARE_UNPRIVILEGED_LOAD_FUNCTION(type, insn) \
155-
static inline type load_##type(const type *addr) \
156-
{ \
157-
type val; \
158-
asm (#insn " %0, %1" \
159-
: "=&r" (val) : "m" (*addr)); \
160-
return val; \
161-
}
154+
static inline u8 load_u8(const u8 *addr)
155+
{
156+
u8 val;
162157

163-
#define DECLARE_UNPRIVILEGED_STORE_FUNCTION(type, insn) \
164-
static inline void store_##type(type *addr, type val) \
165-
{ \
166-
asm volatile (#insn " %0, %1\n" \
167-
: : "r" (val), "m" (*addr)); \
168-
}
158+
asm volatile("lbu %0, %1" : "=&r" (val) : "m" (*addr));
169159

170-
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(u8, lbu)
171-
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(u16, lhu)
172-
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(s8, lb)
173-
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(s16, lh)
174-
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(s32, lw)
175-
DECLARE_UNPRIVILEGED_STORE_FUNCTION(u8, sb)
176-
DECLARE_UNPRIVILEGED_STORE_FUNCTION(u16, sh)
177-
DECLARE_UNPRIVILEGED_STORE_FUNCTION(u32, sw)
178-
#if defined(CONFIG_64BIT)
179-
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(u32, lwu)
180-
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(u64, ld)
181-
DECLARE_UNPRIVILEGED_STORE_FUNCTION(u64, sd)
182-
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(ulong, ld)
183-
#else
184-
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(u32, lw)
185-
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(ulong, lw)
186-
187-
static inline u64 load_u64(const u64 *addr)
188-
{
189-
return load_u32((u32 *)addr)
190-
+ ((u64)load_u32((u32 *)addr + 1) << 32);
160+
return val;
191161
}
192162

193-
static inline void store_u64(u64 *addr, u64 val)
163+
static inline void store_u8(u8 *addr, u8 val)
194164
{
195-
store_u32((u32 *)addr, val);
196-
store_u32((u32 *)addr + 1, val >> 32);
165+
asm volatile ("sb %0, %1\n" : : "r" (val), "m" (*addr));
197166
}
198-
#endif
199167

200168
static inline ulong get_insn(ulong mepc)
201169
{

0 commit comments

Comments
 (0)