Commit de2232ed authored by Hirokazu Takata's avatar Hirokazu Takata

m32r: Cosmetic updates of arch/m32r/kernel/entry.S

- Remove unused symbols *_MASK
- Change indentation of comments, etc.
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
parent abd0a782
...@@ -109,13 +109,6 @@ ...@@ -109,13 +109,6 @@
#define SP(reg) @(0x68,reg) #define SP(reg) @(0x68,reg)
#define ORIG_R0(reg) @(0x6C,reg) #define ORIG_R0(reg) @(0x6C,reg)
CF_MASK = 0x00000001
TF_MASK = 0x00000100
IF_MASK = 0x00000200
DF_MASK = 0x00000400
NT_MASK = 0x00004000
VM_MASK = 0x00020000
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
#define preempt_stop(x) CLI(x) #define preempt_stop(x) CLI(x)
#else #else
...@@ -295,7 +288,7 @@ ENTRY(ei_handler) ...@@ -295,7 +288,7 @@ ENTRY(ei_handler)
#endif #endif
SAVE_ALL SAVE_ALL
mv r1, sp ; arg1(regs) mv r1, sp ; arg1(regs)
; GET_ICU_STATUS; ; get ICU status
seth r0, #shigh(M32R_ICU_ISTS_ADDR) seth r0, #shigh(M32R_ICU_ISTS_ADDR)
ld r0, @(low(M32R_ICU_ISTS_ADDR),r0) ld r0, @(low(M32R_ICU_ISTS_ADDR),r0)
push r0 push r0
...@@ -377,6 +370,7 @@ ENTRY(ei_handler) ...@@ -377,6 +370,7 @@ ENTRY(ei_handler)
.fillinsn .fillinsn
5: 5:
#endif /* CONFIG_PLAT_HAS_INT2ICU */ #endif /* CONFIG_PLAT_HAS_INT2ICU */
check_end: check_end:
bl do_IRQ bl do_IRQ
pop r14 pop r14
...@@ -467,7 +461,7 @@ inst: ...@@ -467,7 +461,7 @@ inst:
ENTRY(alignment_check) ENTRY(alignment_check)
/* void alignment_check(int error_code) */ /* void alignment_check(int error_code) */
SWITCH_TO_KERNEL_STACK SWITCH_TO_KERNEL_STACK
SAVE_ALL SAVE_ALL
ldi r1, #0x30 ; error_code ldi r1, #0x30 ; error_code
...@@ -477,7 +471,7 @@ error_code: ...@@ -477,7 +471,7 @@ error_code:
bra ret_from_exception bra ret_from_exception
ENTRY(rie_handler) ENTRY(rie_handler)
/* void rie_handler(int error_code) */ /* void rie_handler(int error_code) */
SWITCH_TO_KERNEL_STACK SWITCH_TO_KERNEL_STACK
SAVE_ALL SAVE_ALL
ldi r1, #0x20 ; error_code ldi r1, #0x20 ; error_code
...@@ -486,7 +480,7 @@ ENTRY(rie_handler) ...@@ -486,7 +480,7 @@ ENTRY(rie_handler)
bra error_code bra error_code
ENTRY(pie_handler) ENTRY(pie_handler)
/* void pie_handler(int error_code) */ /* void pie_handler(int error_code) */
SWITCH_TO_KERNEL_STACK SWITCH_TO_KERNEL_STACK
SAVE_ALL SAVE_ALL
ldi r1, #0 ; error_code ; FIXME ldi r1, #0 ; error_code ; FIXME
...@@ -495,8 +489,8 @@ ENTRY(pie_handler) ...@@ -495,8 +489,8 @@ ENTRY(pie_handler)
bra error_code bra error_code
ENTRY(debug_trap) ENTRY(debug_trap)
.global withdraw_debug_trap
/* void debug_trap(void) */ /* void debug_trap(void) */
.global withdraw_debug_trap
SWITCH_TO_KERNEL_STACK SWITCH_TO_KERNEL_STACK
SAVE_ALL SAVE_ALL
mv r0, sp ; pt_regs mv r0, sp ; pt_regs
...@@ -515,11 +509,9 @@ ENTRY(ill_trap) ...@@ -515,11 +509,9 @@ ENTRY(ill_trap)
bl do_ill_trap bl do_ill_trap
bra error_code bra error_code
/* Cache flushing handler */
ENTRY(cache_flushing_handler) ENTRY(cache_flushing_handler)
.global _flush_cache_all
/* void _flush_cache_all(void); */ /* void _flush_cache_all(void); */
.global _flush_cache_all
SWITCH_TO_KERNEL_STACK SWITCH_TO_KERNEL_STACK
push r0 push r0
push r1 push r1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment