leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

microblaze: Put together addik instructions

Browse Source 
Saving instructions by adding 2/3 addik instructions to one.

Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Michal Simek 2010-06-22 18:16:07 +02:00
parent 9814cc11e5
commit 287503fabd
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/microblaze/kernel/entry.S
View File

@ -279,8 +279,10 @@
/* Kernel-mode state save. */ \ /* Kernel-mode state save. */ \
/* Reload kernel stack-ptr. */ \ /* Reload kernel stack-ptr. */ \
lwi r1, r0, TOPHYS(PER_CPU(ENTRY_SP)); \ lwi r1, r0, TOPHYS(PER_CPU(ENTRY_SP)); \
tophys(r1,r1); \ /* FIXME: I can add these two lines to one */ \
addik r1, r1, -STATE_SAVE_SIZE; /* Make room on the stack. */\ /* tophys(r1,r1); */ \
/* addik r1, r1, -STATE_SAVE_SIZE; */ \
addik r1, r1, CONFIG_KERNEL_BASE_ADDR - CONFIG_KERNEL_START - STATE_SAVE_SIZE; \
SAVE_REGS \ SAVE_REGS \
brid 2f; \ brid 2f; \
swi r1, r1, PTO+PT_MODE; \ swi r1, r1, PTO+PT_MODE; \
@ -288,9 +290,11 @@
lwi r1, r0, TOPHYS(PER_CPU(CURRENT_SAVE)); /* get saved current */\ lwi r1, r0, TOPHYS(PER_CPU(CURRENT_SAVE)); /* get saved current */\
tophys(r1,r1); \ tophys(r1,r1); \
lwi r1, r1, TS_THREAD_INFO; /* get the thread info */ \ lwi r1, r1, TS_THREAD_INFO; /* get the thread info */ \
addik r1, r1, THREAD_SIZE; /* calculate kernel stack pointer */\ /* MS these three instructions can be added to one */ \
tophys(r1,r1); \ /* addik r1, r1, THREAD_SIZE; */ \
addik r1, r1, -STATE_SAVE_SIZE; /* Make room on the stack. */\ /* tophys(r1,r1); */ \
/* addik r1, r1, -STATE_SAVE_SIZE; */ \
addik r1, r1, THREAD_SIZE + CONFIG_KERNEL_BASE_ADDR - CONFIG_KERNEL_START - STATE_SAVE_SIZE; \
SAVE_REGS \ SAVE_REGS \
lwi r11, r0, TOPHYS(PER_CPU(ENTRY_SP)); \ lwi r11, r0, TOPHYS(PER_CPU(ENTRY_SP)); \
swi r11, r1, PTO+PT_R1; /* Store user SP. */ \ swi r11, r1, PTO+PT_R1; /* Store user SP. */ \