bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unified: added _MOVE_INSTR for RISCV32 architecture

Browse Source 
added _MOVE_INSTR for RISCV32 architecture

The store instruction has a different syntax in RISC-V,
compared to the other architectures. Hence, for each
architecture, specify the entire load instruction within
the _MOVE_INSTR variable.

Change-Id: Iedc421e73411876abd8b698f7d4b46081b473d79
Signed-off-by: Jean-Paul Etienne <fractalclone@gmail.com>
This commit is contained in:
Jean-Paul Etienne 2017-01-11 00:24:30 +01:00 committed by Andrew Boie
parent cd83e85edc
commit 4c6ab7cfcd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/init.c
View File

@ -346,11 +346,17 @@ static void switch_to_main_thread(void)
extern void *__stack_chk_guard;
#if defined(CONFIG_X86)
#define _MOVE_INSTR "movl "
#define _MOVE_INSTR "movl %1, %0"
#define _MOVE_MEM "=m"
#elif defined(CONFIG_ARM)
#define _MOVE_INSTR "str "
#define _MOVE_INSTR "str %1, %0"
#define _MOVE_MEM "=m"
#elif defined(CONFIG_ARC)
#define _MOVE_INSTR "st "
#define _MOVE_INSTR "st %1, %0"
#define _MOVE_MEM "=m"
#elif defined(CONFIG_RISCV32)
#define _MOVE_INSTR "sw %1, 0x00(%0)"
#define _MOVE_MEM "=r"
#else
#error "Unknown Architecture type"
#endif /* CONFIG_X86 */
@ -359,8 +365,8 @@ extern void *__stack_chk_guard;
do { \
register void *tmp; \
tmp = (void *)sys_rand32_get(); \
__asm__ volatile(_MOVE_INSTR "%1, %0;\n\t" \
: "=m"(__stack_chk_guard) \
__asm__ volatile(_MOVE_INSTR ";\n\t" \
: _MOVE_MEM(__stack_chk_guard) \
: "r"(tmp)); \
} while (0)