diff options
author | Greg Ungerer <gerg@uclinux.org> | 2012-05-09 03:05:24 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2012-07-15 19:59:21 -0400 |
commit | 14be4252eae2ce40abec5872bf6011891d753433 (patch) | |
tree | c22f7ffd9797d539573d6280add823edcc09efa5 /arch/m68k | |
parent | 28d5445e94ab22198921b5c0c3e58c3b4a1a0116 (diff) |
m68k: merge the MMU and non-MMU versions of the entry.S code
Some of the entry.S code is common to both MMU and non-MMU builds.
So merge the entry_no.S and entry_mm.S files back into a single file.
With a little code movement we only need a single #ifdef.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/kernel/entry.S | 452 | ||||
-rw-r--r-- | arch/m68k/kernel/entry_mm.S | 419 | ||||
-rw-r--r-- | arch/m68k/kernel/entry_no.S | 130 |
3 files changed, 449 insertions, 552 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index b8daf64e347d..165ee9f9d5c9 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
@@ -1,5 +1,451 @@ | |||
1 | #if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE) | 1 | /* -*- mode: asm -*- |
2 | #include "entry_mm.S" | 2 | * |
3 | * linux/arch/m68k/kernel/entry.S | ||
4 | * | ||
5 | * Copyright (C) 1991, 1992 Linus Torvalds | ||
6 | * | ||
7 | * This file is subject to the terms and conditions of the GNU General Public | ||
8 | * License. See the file README.legal in the main directory of this archive | ||
9 | * for more details. | ||
10 | * | ||
11 | * Linux/m68k support by Hamish Macdonald | ||
12 | * | ||
13 | * 68060 fixes by Jesper Skov | ||
14 | * | ||
15 | */ | ||
16 | |||
17 | /* | ||
18 | * entry.S contains the system-call and fault low-level handling routines. | ||
19 | * This also contains the timer-interrupt handler, as well as all interrupts | ||
20 | * and faults that can result in a task-switch. | ||
21 | * | ||
22 | * NOTE: This code handles signal-recognition, which happens every time | ||
23 | * after a timer-interrupt and after each system call. | ||
24 | * | ||
25 | */ | ||
26 | |||
27 | /* | ||
28 | * 12/03/96 Jes: Currently we only support m68k single-cpu systems, so | ||
29 | * all pointers that used to be 'current' are now entry | ||
30 | * number 0 in the 'current_set' list. | ||
31 | * | ||
32 | * 6/05/00 RZ: addedd writeback completion after return from sighandler | ||
33 | * for 68040 | ||
34 | */ | ||
35 | |||
36 | #include <linux/linkage.h> | ||
37 | #include <asm/errno.h> | ||
38 | #include <asm/setup.h> | ||
39 | #include <asm/segment.h> | ||
40 | #include <asm/traps.h> | ||
41 | #include <asm/unistd.h> | ||
42 | #include <asm/asm-offsets.h> | ||
43 | #include <asm/entry.h> | ||
44 | |||
45 | .globl system_call, buserr, trap, resume | ||
46 | .globl sys_call_table | ||
47 | .globl sys_fork, sys_clone, sys_vfork | ||
48 | .globl ret_from_interrupt, bad_interrupt | ||
49 | .globl auto_irqhandler_fixup | ||
50 | .globl user_irqvec_fixup | ||
51 | |||
52 | .text | ||
53 | ENTRY(sys_fork) | ||
54 | SAVE_SWITCH_STACK | ||
55 | pea %sp@(SWITCH_STACK_SIZE) | ||
56 | jbsr m68k_fork | ||
57 | addql #4,%sp | ||
58 | RESTORE_SWITCH_STACK | ||
59 | rts | ||
60 | |||
61 | ENTRY(sys_clone) | ||
62 | SAVE_SWITCH_STACK | ||
63 | pea %sp@(SWITCH_STACK_SIZE) | ||
64 | jbsr m68k_clone | ||
65 | addql #4,%sp | ||
66 | RESTORE_SWITCH_STACK | ||
67 | rts | ||
68 | |||
69 | ENTRY(sys_vfork) | ||
70 | SAVE_SWITCH_STACK | ||
71 | pea %sp@(SWITCH_STACK_SIZE) | ||
72 | jbsr m68k_vfork | ||
73 | addql #4,%sp | ||
74 | RESTORE_SWITCH_STACK | ||
75 | rts | ||
76 | |||
77 | ENTRY(sys_sigreturn) | ||
78 | SAVE_SWITCH_STACK | ||
79 | jbsr do_sigreturn | ||
80 | RESTORE_SWITCH_STACK | ||
81 | rts | ||
82 | |||
83 | ENTRY(sys_rt_sigreturn) | ||
84 | SAVE_SWITCH_STACK | ||
85 | jbsr do_rt_sigreturn | ||
86 | RESTORE_SWITCH_STACK | ||
87 | rts | ||
88 | |||
89 | ENTRY(buserr) | ||
90 | SAVE_ALL_INT | ||
91 | GET_CURRENT(%d0) | ||
92 | movel %sp,%sp@- | stack frame pointer argument | ||
93 | jbsr buserr_c | ||
94 | addql #4,%sp | ||
95 | jra ret_from_exception | ||
96 | |||
97 | ENTRY(trap) | ||
98 | SAVE_ALL_INT | ||
99 | GET_CURRENT(%d0) | ||
100 | movel %sp,%sp@- | stack frame pointer argument | ||
101 | jbsr trap_c | ||
102 | addql #4,%sp | ||
103 | jra ret_from_exception | ||
104 | |||
105 | | After a fork we jump here directly from resume, | ||
106 | | so that %d1 contains the previous task | ||
107 | | schedule_tail now used regardless of CONFIG_SMP | ||
108 | ENTRY(ret_from_fork) | ||
109 | movel %d1,%sp@- | ||
110 | jsr schedule_tail | ||
111 | addql #4,%sp | ||
112 | jra ret_from_exception | ||
113 | |||
114 | #if defined(CONFIG_COLDFIRE) || !defined(CONFIG_MMU) | ||
115 | |||
116 | #ifdef TRAP_DBG_INTERRUPT | ||
117 | |||
118 | .globl dbginterrupt | ||
119 | ENTRY(dbginterrupt) | ||
120 | SAVE_ALL_INT | ||
121 | GET_CURRENT(%d0) | ||
122 | movel %sp,%sp@- /* stack frame pointer argument */ | ||
123 | jsr dbginterrupt_c | ||
124 | addql #4,%sp | ||
125 | jra ret_from_exception | ||
126 | #endif | ||
127 | |||
128 | ENTRY(reschedule) | ||
129 | /* save top of frame */ | ||
130 | pea %sp@ | ||
131 | jbsr set_esp0 | ||
132 | addql #4,%sp | ||
133 | pea ret_from_exception | ||
134 | jmp schedule | ||
135 | |||
136 | ENTRY(ret_from_user_signal) | ||
137 | moveq #__NR_sigreturn,%d0 | ||
138 | trap #0 | ||
139 | |||
140 | ENTRY(ret_from_user_rt_signal) | ||
141 | movel #__NR_rt_sigreturn,%d0 | ||
142 | trap #0 | ||
143 | |||
3 | #else | 144 | #else |
4 | #include "entry_no.S" | 145 | |
146 | do_trace_entry: | ||
147 | movel #-ENOSYS,%sp@(PT_OFF_D0)| needed for strace | ||
148 | subql #4,%sp | ||
149 | SAVE_SWITCH_STACK | ||
150 | jbsr syscall_trace | ||
151 | RESTORE_SWITCH_STACK | ||
152 | addql #4,%sp | ||
153 | movel %sp@(PT_OFF_ORIG_D0),%d0 | ||
154 | cmpl #NR_syscalls,%d0 | ||
155 | jcs syscall | ||
156 | badsys: | ||
157 | movel #-ENOSYS,%sp@(PT_OFF_D0) | ||
158 | jra ret_from_syscall | ||
159 | |||
160 | do_trace_exit: | ||
161 | subql #4,%sp | ||
162 | SAVE_SWITCH_STACK | ||
163 | jbsr syscall_trace | ||
164 | RESTORE_SWITCH_STACK | ||
165 | addql #4,%sp | ||
166 | jra .Lret_from_exception | ||
167 | |||
168 | ENTRY(ret_from_signal) | ||
169 | movel %curptr@(TASK_STACK),%a1 | ||
170 | tstb %a1@(TINFO_FLAGS+2) | ||
171 | jge 1f | ||
172 | jbsr syscall_trace | ||
173 | 1: RESTORE_SWITCH_STACK | ||
174 | addql #4,%sp | ||
175 | /* on 68040 complete pending writebacks if any */ | ||
176 | #ifdef CONFIG_M68040 | ||
177 | bfextu %sp@(PT_OFF_FORMATVEC){#0,#4},%d0 | ||
178 | subql #7,%d0 | bus error frame ? | ||
179 | jbne 1f | ||
180 | movel %sp,%sp@- | ||
181 | jbsr berr_040cleanup | ||
182 | addql #4,%sp | ||
183 | 1: | ||
184 | #endif | ||
185 | jra .Lret_from_exception | ||
186 | |||
187 | ENTRY(system_call) | ||
188 | SAVE_ALL_SYS | ||
189 | |||
190 | GET_CURRENT(%d1) | ||
191 | movel %d1,%a1 | ||
192 | |||
193 | | save top of frame | ||
194 | movel %sp,%curptr@(TASK_THREAD+THREAD_ESP0) | ||
195 | |||
196 | | syscall trace? | ||
197 | tstb %a1@(TINFO_FLAGS+2) | ||
198 | jmi do_trace_entry | ||
199 | cmpl #NR_syscalls,%d0 | ||
200 | jcc badsys | ||
201 | syscall: | ||
202 | jbsr @(sys_call_table,%d0:l:4)@(0) | ||
203 | movel %d0,%sp@(PT_OFF_D0) | save the return value | ||
204 | ret_from_syscall: | ||
205 | |oriw #0x0700,%sr | ||
206 | movel %curptr@(TASK_STACK),%a1 | ||
207 | movew %a1@(TINFO_FLAGS+2),%d0 | ||
208 | jne syscall_exit_work | ||
209 | 1: RESTORE_ALL | ||
210 | |||
211 | syscall_exit_work: | ||
212 | btst #5,%sp@(PT_OFF_SR) | check if returning to kernel | ||
213 | bnes 1b | if so, skip resched, signals | ||
214 | lslw #1,%d0 | ||
215 | jcs do_trace_exit | ||
216 | jmi do_delayed_trace | ||
217 | lslw #8,%d0 | ||
218 | jne do_signal_return | ||
219 | pea resume_userspace | ||
220 | jra schedule | ||
221 | |||
222 | |||
223 | ENTRY(ret_from_exception) | ||
224 | .Lret_from_exception: | ||
225 | btst #5,%sp@(PT_OFF_SR) | check if returning to kernel | ||
226 | bnes 1f | if so, skip resched, signals | ||
227 | | only allow interrupts when we are really the last one on the | ||
228 | | kernel stack, otherwise stack overflow can occur during | ||
229 | | heavy interrupt load | ||
230 | andw #ALLOWINT,%sr | ||
231 | |||
232 | resume_userspace: | ||
233 | movel %curptr@(TASK_STACK),%a1 | ||
234 | moveb %a1@(TINFO_FLAGS+3),%d0 | ||
235 | jne exit_work | ||
236 | 1: RESTORE_ALL | ||
237 | |||
238 | exit_work: | ||
239 | | save top of frame | ||
240 | movel %sp,%curptr@(TASK_THREAD+THREAD_ESP0) | ||
241 | lslb #1,%d0 | ||
242 | jne do_signal_return | ||
243 | pea resume_userspace | ||
244 | jra schedule | ||
245 | |||
246 | |||
247 | do_signal_return: | ||
248 | |andw #ALLOWINT,%sr | ||
249 | subql #4,%sp | dummy return address | ||
250 | SAVE_SWITCH_STACK | ||
251 | pea %sp@(SWITCH_STACK_SIZE) | ||
252 | bsrl do_notify_resume | ||
253 | addql #4,%sp | ||
254 | RESTORE_SWITCH_STACK | ||
255 | addql #4,%sp | ||
256 | jbra resume_userspace | ||
257 | |||
258 | do_delayed_trace: | ||
259 | bclr #7,%sp@(PT_OFF_SR) | clear trace bit in SR | ||
260 | pea 1 | send SIGTRAP | ||
261 | movel %curptr,%sp@- | ||
262 | pea LSIGTRAP | ||
263 | jbsr send_sig | ||
264 | addql #8,%sp | ||
265 | addql #4,%sp | ||
266 | jbra resume_userspace | ||
267 | |||
268 | |||
269 | /* This is the main interrupt handler for autovector interrupts */ | ||
270 | |||
271 | ENTRY(auto_inthandler) | ||
272 | SAVE_ALL_INT | ||
273 | GET_CURRENT(%d0) | ||
274 | movel %d0,%a1 | ||
275 | addqb #1,%a1@(TINFO_PREEMPT+1) | ||
276 | | put exception # in d0 | ||
277 | bfextu %sp@(PT_OFF_FORMATVEC){#4,#10},%d0 | ||
278 | subw #VEC_SPUR,%d0 | ||
279 | |||
280 | movel %sp,%sp@- | ||
281 | movel %d0,%sp@- | put vector # on stack | ||
282 | auto_irqhandler_fixup = . + 2 | ||
283 | jsr do_IRQ | process the IRQ | ||
284 | addql #8,%sp | pop parameters off stack | ||
285 | |||
286 | ret_from_interrupt: | ||
287 | movel %curptr@(TASK_STACK),%a1 | ||
288 | subqb #1,%a1@(TINFO_PREEMPT+1) | ||
289 | jeq ret_from_last_interrupt | ||
290 | 2: RESTORE_ALL | ||
291 | |||
292 | ALIGN | ||
293 | ret_from_last_interrupt: | ||
294 | moveq #(~ALLOWINT>>8)&0xff,%d0 | ||
295 | andb %sp@(PT_OFF_SR),%d0 | ||
296 | jne 2b | ||
297 | |||
298 | /* check if we need to do software interrupts */ | ||
299 | tstl irq_stat+CPUSTAT_SOFTIRQ_PENDING | ||
300 | jeq .Lret_from_exception | ||
301 | pea ret_from_exception | ||
302 | jra do_softirq | ||
303 | |||
304 | /* Handler for user defined interrupt vectors */ | ||
305 | |||
306 | ENTRY(user_inthandler) | ||
307 | SAVE_ALL_INT | ||
308 | GET_CURRENT(%d0) | ||
309 | movel %d0,%a1 | ||
310 | addqb #1,%a1@(TINFO_PREEMPT+1) | ||
311 | | put exception # in d0 | ||
312 | bfextu %sp@(PT_OFF_FORMATVEC){#4,#10},%d0 | ||
313 | user_irqvec_fixup = . + 2 | ||
314 | subw #VEC_USER,%d0 | ||
315 | |||
316 | movel %sp,%sp@- | ||
317 | movel %d0,%sp@- | put vector # on stack | ||
318 | jsr do_IRQ | process the IRQ | ||
319 | addql #8,%sp | pop parameters off stack | ||
320 | |||
321 | movel %curptr@(TASK_STACK),%a1 | ||
322 | subqb #1,%a1@(TINFO_PREEMPT+1) | ||
323 | jeq ret_from_last_interrupt | ||
324 | RESTORE_ALL | ||
325 | |||
326 | /* Handler for uninitialized and spurious interrupts */ | ||
327 | |||
328 | ENTRY(bad_inthandler) | ||
329 | SAVE_ALL_INT | ||
330 | GET_CURRENT(%d0) | ||
331 | movel %d0,%a1 | ||
332 | addqb #1,%a1@(TINFO_PREEMPT+1) | ||
333 | |||
334 | movel %sp,%sp@- | ||
335 | jsr handle_badint | ||
336 | addql #4,%sp | ||
337 | |||
338 | movel %curptr@(TASK_STACK),%a1 | ||
339 | subqb #1,%a1@(TINFO_PREEMPT+1) | ||
340 | jeq ret_from_last_interrupt | ||
341 | RESTORE_ALL | ||
342 | |||
343 | |||
344 | resume: | ||
345 | /* | ||
346 | * Beware - when entering resume, prev (the current task) is | ||
347 | * in a0, next (the new task) is in a1,so don't change these | ||
348 | * registers until their contents are no longer needed. | ||
349 | */ | ||
350 | |||
351 | /* save sr */ | ||
352 | movew %sr,%a0@(TASK_THREAD+THREAD_SR) | ||
353 | |||
354 | /* save fs (sfc,%dfc) (may be pointing to kernel memory) */ | ||
355 | movec %sfc,%d0 | ||
356 | movew %d0,%a0@(TASK_THREAD+THREAD_FS) | ||
357 | |||
358 | /* save usp */ | ||
359 | /* it is better to use a movel here instead of a movew 8*) */ | ||
360 | movec %usp,%d0 | ||
361 | movel %d0,%a0@(TASK_THREAD+THREAD_USP) | ||
362 | |||
363 | /* save non-scratch registers on stack */ | ||
364 | SAVE_SWITCH_STACK | ||
365 | |||
366 | /* save current kernel stack pointer */ | ||
367 | movel %sp,%a0@(TASK_THREAD+THREAD_KSP) | ||
368 | |||
369 | /* save floating point context */ | ||
370 | #ifndef CONFIG_M68KFPU_EMU_ONLY | ||
371 | #ifdef CONFIG_M68KFPU_EMU | ||
372 | tstl m68k_fputype | ||
373 | jeq 3f | ||
374 | #endif | ||
375 | fsave %a0@(TASK_THREAD+THREAD_FPSTATE) | ||
376 | |||
377 | #if defined(CONFIG_M68060) | ||
378 | #if !defined(CPU_M68060_ONLY) | ||
379 | btst #3,m68k_cputype+3 | ||
380 | beqs 1f | ||
381 | #endif | ||
382 | /* The 060 FPU keeps status in bits 15-8 of the first longword */ | ||
383 | tstb %a0@(TASK_THREAD+THREAD_FPSTATE+2) | ||
384 | jeq 3f | ||
385 | #if !defined(CPU_M68060_ONLY) | ||
386 | jra 2f | ||
387 | #endif | ||
388 | #endif /* CONFIG_M68060 */ | ||
389 | #if !defined(CPU_M68060_ONLY) | ||
390 | 1: tstb %a0@(TASK_THREAD+THREAD_FPSTATE) | ||
391 | jeq 3f | ||
392 | #endif | ||
393 | 2: fmovemx %fp0-%fp7,%a0@(TASK_THREAD+THREAD_FPREG) | ||
394 | fmoveml %fpcr/%fpsr/%fpiar,%a0@(TASK_THREAD+THREAD_FPCNTL) | ||
395 | 3: | ||
396 | #endif /* CONFIG_M68KFPU_EMU_ONLY */ | ||
397 | /* Return previous task in %d1 */ | ||
398 | movel %curptr,%d1 | ||
399 | |||
400 | /* switch to new task (a1 contains new task) */ | ||
401 | movel %a1,%curptr | ||
402 | |||
403 | /* restore floating point context */ | ||
404 | #ifndef CONFIG_M68KFPU_EMU_ONLY | ||
405 | #ifdef CONFIG_M68KFPU_EMU | ||
406 | tstl m68k_fputype | ||
407 | jeq 4f | ||
408 | #endif | ||
409 | #if defined(CONFIG_M68060) | ||
410 | #if !defined(CPU_M68060_ONLY) | ||
411 | btst #3,m68k_cputype+3 | ||
412 | beqs 1f | ||
413 | #endif | ||
414 | /* The 060 FPU keeps status in bits 15-8 of the first longword */ | ||
415 | tstb %a1@(TASK_THREAD+THREAD_FPSTATE+2) | ||
416 | jeq 3f | ||
417 | #if !defined(CPU_M68060_ONLY) | ||
418 | jra 2f | ||
419 | #endif | ||
420 | #endif /* CONFIG_M68060 */ | ||
421 | #if !defined(CPU_M68060_ONLY) | ||
422 | 1: tstb %a1@(TASK_THREAD+THREAD_FPSTATE) | ||
423 | jeq 3f | ||
5 | #endif | 424 | #endif |
425 | 2: fmovemx %a1@(TASK_THREAD+THREAD_FPREG),%fp0-%fp7 | ||
426 | fmoveml %a1@(TASK_THREAD+THREAD_FPCNTL),%fpcr/%fpsr/%fpiar | ||
427 | 3: frestore %a1@(TASK_THREAD+THREAD_FPSTATE) | ||
428 | 4: | ||
429 | #endif /* CONFIG_M68KFPU_EMU_ONLY */ | ||
430 | |||
431 | /* restore the kernel stack pointer */ | ||
432 | movel %a1@(TASK_THREAD+THREAD_KSP),%sp | ||
433 | |||
434 | /* restore non-scratch registers */ | ||
435 | RESTORE_SWITCH_STACK | ||
436 | |||
437 | /* restore user stack pointer */ | ||
438 | movel %a1@(TASK_THREAD+THREAD_USP),%a0 | ||
439 | movel %a0,%usp | ||
440 | |||
441 | /* restore fs (sfc,%dfc) */ | ||
442 | movew %a1@(TASK_THREAD+THREAD_FS),%a0 | ||
443 | movec %a0,%sfc | ||
444 | movec %a0,%dfc | ||
445 | |||
446 | /* restore status register */ | ||
447 | movew %a1@(TASK_THREAD+THREAD_SR),%sr | ||
448 | |||
449 | rts | ||
450 | |||
451 | #endif /* CONFIG_MMU && !CONFIG_COLDFIRE */ | ||
diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S deleted file mode 100644 index 1055a6e40e41..000000000000 --- a/arch/m68k/kernel/entry_mm.S +++ /dev/null | |||
@@ -1,419 +0,0 @@ | |||
1 | /* -*- mode: asm -*- | ||
2 | * | ||
3 | * linux/arch/m68k/kernel/entry.S | ||
4 | * | ||
5 | * Copyright (C) 1991, 1992 Linus Torvalds | ||
6 | * | ||
7 | * This file is subject to the terms and conditions of the GNU General Public | ||
8 | * License. See the file README.legal in the main directory of this archive | ||
9 | * for more details. | ||
10 | * | ||
11 | * Linux/m68k support by Hamish Macdonald | ||
12 | * | ||
13 | * 68060 fixes by Jesper Skov | ||
14 | * | ||
15 | */ | ||
16 | |||
17 | /* | ||
18 | * entry.S contains the system-call and fault low-level handling routines. | ||
19 | * This also contains the timer-interrupt handler, as well as all interrupts | ||
20 | * and faults that can result in a task-switch. | ||
21 | * | ||
22 | * NOTE: This code handles signal-recognition, which happens every time | ||
23 | * after a timer-interrupt and after each system call. | ||
24 | * | ||
25 | */ | ||
26 | |||
27 | /* | ||
28 | * 12/03/96 Jes: Currently we only support m68k single-cpu systems, so | ||
29 | * all pointers that used to be 'current' are now entry | ||
30 | * number 0 in the 'current_set' list. | ||
31 | * | ||
32 | * 6/05/00 RZ: addedd writeback completion after return from sighandler | ||
33 | * for 68040 | ||
34 | */ | ||
35 | |||
36 | #include <linux/linkage.h> | ||
37 | #include <asm/entry.h> | ||
38 | #include <asm/errno.h> | ||
39 | #include <asm/setup.h> | ||
40 | #include <asm/segment.h> | ||
41 | #include <asm/traps.h> | ||
42 | #include <asm/unistd.h> | ||
43 | |||
44 | #include <asm/asm-offsets.h> | ||
45 | |||
46 | .globl system_call, buserr, trap, resume | ||
47 | .globl sys_call_table | ||
48 | .globl sys_fork, sys_clone, sys_vfork | ||
49 | .globl ret_from_interrupt, bad_interrupt | ||
50 | .globl auto_irqhandler_fixup | ||
51 | .globl user_irqvec_fixup | ||
52 | |||
53 | .text | ||
54 | ENTRY(buserr) | ||
55 | SAVE_ALL_INT | ||
56 | GET_CURRENT(%d0) | ||
57 | movel %sp,%sp@- | stack frame pointer argument | ||
58 | jbsr buserr_c | ||
59 | addql #4,%sp | ||
60 | jra ret_from_exception | ||
61 | |||
62 | ENTRY(trap) | ||
63 | SAVE_ALL_INT | ||
64 | GET_CURRENT(%d0) | ||
65 | movel %sp,%sp@- | stack frame pointer argument | ||
66 | jbsr trap_c | ||
67 | addql #4,%sp | ||
68 | jra ret_from_exception | ||
69 | |||
70 | | After a fork we jump here directly from resume, | ||
71 | | so that %d1 contains the previous task | ||
72 | | schedule_tail now used regardless of CONFIG_SMP | ||
73 | ENTRY(ret_from_fork) | ||
74 | movel %d1,%sp@- | ||
75 | jsr schedule_tail | ||
76 | addql #4,%sp | ||
77 | jra ret_from_exception | ||
78 | |||
79 | do_trace_entry: | ||
80 | movel #-ENOSYS,%sp@(PT_OFF_D0)| needed for strace | ||
81 | subql #4,%sp | ||
82 | SAVE_SWITCH_STACK | ||
83 | jbsr syscall_trace | ||
84 | RESTORE_SWITCH_STACK | ||
85 | addql #4,%sp | ||
86 | movel %sp@(PT_OFF_ORIG_D0),%d0 | ||
87 | cmpl #NR_syscalls,%d0 | ||
88 | jcs syscall | ||
89 | badsys: | ||
90 | movel #-ENOSYS,%sp@(PT_OFF_D0) | ||
91 | jra ret_from_syscall | ||
92 | |||
93 | do_trace_exit: | ||
94 | subql #4,%sp | ||
95 | SAVE_SWITCH_STACK | ||
96 | jbsr syscall_trace | ||
97 | RESTORE_SWITCH_STACK | ||
98 | addql #4,%sp | ||
99 | jra .Lret_from_exception | ||
100 | |||
101 | ENTRY(ret_from_signal) | ||
102 | movel %curptr@(TASK_STACK),%a1 | ||
103 | tstb %a1@(TINFO_FLAGS+2) | ||
104 | jge 1f | ||
105 | jbsr syscall_trace | ||
106 | 1: RESTORE_SWITCH_STACK | ||
107 | addql #4,%sp | ||
108 | /* on 68040 complete pending writebacks if any */ | ||
109 | #ifdef CONFIG_M68040 | ||
110 | bfextu %sp@(PT_OFF_FORMATVEC){#0,#4},%d0 | ||
111 | subql #7,%d0 | bus error frame ? | ||
112 | jbne 1f | ||
113 | movel %sp,%sp@- | ||
114 | jbsr berr_040cleanup | ||
115 | addql #4,%sp | ||
116 | 1: | ||
117 | #endif | ||
118 | jra .Lret_from_exception | ||
119 | |||
120 | ENTRY(system_call) | ||
121 | SAVE_ALL_SYS | ||
122 | |||
123 | GET_CURRENT(%d1) | ||
124 | movel %d1,%a1 | ||
125 | |||
126 | | save top of frame | ||
127 | movel %sp,%curptr@(TASK_THREAD+THREAD_ESP0) | ||
128 | |||
129 | | syscall trace? | ||
130 | tstb %a1@(TINFO_FLAGS+2) | ||
131 | jmi do_trace_entry | ||
132 | cmpl #NR_syscalls,%d0 | ||
133 | jcc badsys | ||
134 | syscall: | ||
135 | jbsr @(sys_call_table,%d0:l:4)@(0) | ||
136 | movel %d0,%sp@(PT_OFF_D0) | save the return value | ||
137 | ret_from_syscall: | ||
138 | |oriw #0x0700,%sr | ||
139 | movel %curptr@(TASK_STACK),%a1 | ||
140 | movew %a1@(TINFO_FLAGS+2),%d0 | ||
141 | jne syscall_exit_work | ||
142 | 1: RESTORE_ALL | ||
143 | |||
144 | syscall_exit_work: | ||
145 | btst #5,%sp@(PT_OFF_SR) | check if returning to kernel | ||
146 | bnes 1b | if so, skip resched, signals | ||
147 | lslw #1,%d0 | ||
148 | jcs do_trace_exit | ||
149 | jmi do_delayed_trace | ||
150 | lslw #8,%d0 | ||
151 | jne do_signal_return | ||
152 | pea resume_userspace | ||
153 | jra schedule | ||
154 | |||
155 | |||
156 | ENTRY(ret_from_exception) | ||
157 | .Lret_from_exception: | ||
158 | btst #5,%sp@(PT_OFF_SR) | check if returning to kernel | ||
159 | bnes 1f | if so, skip resched, signals | ||
160 | | only allow interrupts when we are really the last one on the | ||
161 | | kernel stack, otherwise stack overflow can occur during | ||
162 | | heavy interrupt load | ||
163 | andw #ALLOWINT,%sr | ||
164 | |||
165 | resume_userspace: | ||
166 | movel %curptr@(TASK_STACK),%a1 | ||
167 | moveb %a1@(TINFO_FLAGS+3),%d0 | ||
168 | jne exit_work | ||
169 | 1: RESTORE_ALL | ||
170 | |||
171 | exit_work: | ||
172 | | save top of frame | ||
173 | movel %sp,%curptr@(TASK_THREAD+THREAD_ESP0) | ||
174 | lslb #1,%d0 | ||
175 | jne do_signal_return | ||
176 | pea resume_userspace | ||
177 | jra schedule | ||
178 | |||
179 | |||
180 | do_signal_return: | ||
181 | |andw #ALLOWINT,%sr | ||
182 | subql #4,%sp | dummy return address | ||
183 | SAVE_SWITCH_STACK | ||
184 | pea %sp@(SWITCH_STACK_SIZE) | ||
185 | bsrl do_notify_resume | ||
186 | addql #4,%sp | ||
187 | RESTORE_SWITCH_STACK | ||
188 | addql #4,%sp | ||
189 | jbra resume_userspace | ||
190 | |||
191 | do_delayed_trace: | ||
192 | bclr #7,%sp@(PT_OFF_SR) | clear trace bit in SR | ||
193 | pea 1 | send SIGTRAP | ||
194 | movel %curptr,%sp@- | ||
195 | pea LSIGTRAP | ||
196 | jbsr send_sig | ||
197 | addql #8,%sp | ||
198 | addql #4,%sp | ||
199 | jbra resume_userspace | ||
200 | |||
201 | |||
202 | /* This is the main interrupt handler for autovector interrupts */ | ||
203 | |||
204 | ENTRY(auto_inthandler) | ||
205 | SAVE_ALL_INT | ||
206 | GET_CURRENT(%d0) | ||
207 | movel %d0,%a1 | ||
208 | addqb #1,%a1@(TINFO_PREEMPT+1) | ||
209 | | put exception # in d0 | ||
210 | bfextu %sp@(PT_OFF_FORMATVEC){#4,#10},%d0 | ||
211 | subw #VEC_SPUR,%d0 | ||
212 | |||
213 | movel %sp,%sp@- | ||
214 | movel %d0,%sp@- | put vector # on stack | ||
215 | auto_irqhandler_fixup = . + 2 | ||
216 | jsr do_IRQ | process the IRQ | ||
217 | addql #8,%sp | pop parameters off stack | ||
218 | |||
219 | ret_from_interrupt: | ||
220 | movel %curptr@(TASK_STACK),%a1 | ||
221 | subqb #1,%a1@(TINFO_PREEMPT+1) | ||
222 | jeq ret_from_last_interrupt | ||
223 | 2: RESTORE_ALL | ||
224 | |||
225 | ALIGN | ||
226 | ret_from_last_interrupt: | ||
227 | moveq #(~ALLOWINT>>8)&0xff,%d0 | ||
228 | andb %sp@(PT_OFF_SR),%d0 | ||
229 | jne 2b | ||
230 | |||
231 | /* check if we need to do software interrupts */ | ||
232 | tstl irq_stat+CPUSTAT_SOFTIRQ_PENDING | ||
233 | jeq .Lret_from_exception | ||
234 | pea ret_from_exception | ||
235 | jra do_softirq | ||
236 | |||
237 | /* Handler for user defined interrupt vectors */ | ||
238 | |||
239 | ENTRY(user_inthandler) | ||
240 | SAVE_ALL_INT | ||
241 | GET_CURRENT(%d0) | ||
242 | movel %d0,%a1 | ||
243 | addqb #1,%a1@(TINFO_PREEMPT+1) | ||
244 | | put exception # in d0 | ||
245 | bfextu %sp@(PT_OFF_FORMATVEC){#4,#10},%d0 | ||
246 | user_irqvec_fixup = . + 2 | ||
247 | subw #VEC_USER,%d0 | ||
248 | |||
249 | movel %sp,%sp@- | ||
250 | movel %d0,%sp@- | put vector # on stack | ||
251 | jsr do_IRQ | process the IRQ | ||
252 | addql #8,%sp | pop parameters off stack | ||
253 | |||
254 | movel %curptr@(TASK_STACK),%a1 | ||
255 | subqb #1,%a1@(TINFO_PREEMPT+1) | ||
256 | jeq ret_from_last_interrupt | ||
257 | RESTORE_ALL | ||
258 | |||
259 | /* Handler for uninitialized and spurious interrupts */ | ||
260 | |||
261 | ENTRY(bad_inthandler) | ||
262 | SAVE_ALL_INT | ||
263 | GET_CURRENT(%d0) | ||
264 | movel %d0,%a1 | ||
265 | addqb #1,%a1@(TINFO_PREEMPT+1) | ||
266 | |||
267 | movel %sp,%sp@- | ||
268 | jsr handle_badint | ||
269 | addql #4,%sp | ||
270 | |||
271 | movel %curptr@(TASK_STACK),%a1 | ||
272 | subqb #1,%a1@(TINFO_PREEMPT+1) | ||
273 | jeq ret_from_last_interrupt | ||
274 | RESTORE_ALL | ||
275 | |||
276 | |||
277 | ENTRY(sys_fork) | ||
278 | SAVE_SWITCH_STACK | ||
279 | pea %sp@(SWITCH_STACK_SIZE) | ||
280 | jbsr m68k_fork | ||
281 | addql #4,%sp | ||
282 | RESTORE_SWITCH_STACK | ||
283 | rts | ||
284 | |||
285 | ENTRY(sys_clone) | ||
286 | SAVE_SWITCH_STACK | ||
287 | pea %sp@(SWITCH_STACK_SIZE) | ||
288 | jbsr m68k_clone | ||
289 | addql #4,%sp | ||
290 | RESTORE_SWITCH_STACK | ||
291 | rts | ||
292 | |||
293 | ENTRY(sys_vfork) | ||
294 | SAVE_SWITCH_STACK | ||
295 | pea %sp@(SWITCH_STACK_SIZE) | ||
296 | jbsr m68k_vfork | ||
297 | addql #4,%sp | ||
298 | RESTORE_SWITCH_STACK | ||
299 | rts | ||
300 | |||
301 | ENTRY(sys_sigreturn) | ||
302 | SAVE_SWITCH_STACK | ||
303 | jbsr do_sigreturn | ||
304 | RESTORE_SWITCH_STACK | ||
305 | rts | ||
306 | |||
307 | ENTRY(sys_rt_sigreturn) | ||
308 | SAVE_SWITCH_STACK | ||
309 | jbsr do_rt_sigreturn | ||
310 | RESTORE_SWITCH_STACK | ||
311 | rts | ||
312 | |||
313 | resume: | ||
314 | /* | ||
315 | * Beware - when entering resume, prev (the current task) is | ||
316 | * in a0, next (the new task) is in a1,so don't change these | ||
317 | * registers until their contents are no longer needed. | ||
318 | */ | ||
319 | |||
320 | /* save sr */ | ||
321 | movew %sr,%a0@(TASK_THREAD+THREAD_SR) | ||
322 | |||
323 | /* save fs (sfc,%dfc) (may be pointing to kernel memory) */ | ||
324 | movec %sfc,%d0 | ||
325 | movew %d0,%a0@(TASK_THREAD+THREAD_FS) | ||
326 | |||
327 | /* save usp */ | ||
328 | /* it is better to use a movel here instead of a movew 8*) */ | ||
329 | movec %usp,%d0 | ||
330 | movel %d0,%a0@(TASK_THREAD+THREAD_USP) | ||
331 | |||
332 | /* save non-scratch registers on stack */ | ||
333 | SAVE_SWITCH_STACK | ||
334 | |||
335 | /* save current kernel stack pointer */ | ||
336 | movel %sp,%a0@(TASK_THREAD+THREAD_KSP) | ||
337 | |||
338 | /* save floating point context */ | ||
339 | #ifndef CONFIG_M68KFPU_EMU_ONLY | ||
340 | #ifdef CONFIG_M68KFPU_EMU | ||
341 | tstl m68k_fputype | ||
342 | jeq 3f | ||
343 | #endif | ||
344 | fsave %a0@(TASK_THREAD+THREAD_FPSTATE) | ||
345 | |||
346 | #if defined(CONFIG_M68060) | ||
347 | #if !defined(CPU_M68060_ONLY) | ||
348 | btst #3,m68k_cputype+3 | ||
349 | beqs 1f | ||
350 | #endif | ||
351 | /* The 060 FPU keeps status in bits 15-8 of the first longword */ | ||
352 | tstb %a0@(TASK_THREAD+THREAD_FPSTATE+2) | ||
353 | jeq 3f | ||
354 | #if !defined(CPU_M68060_ONLY) | ||
355 | jra 2f | ||
356 | #endif | ||
357 | #endif /* CONFIG_M68060 */ | ||
358 | #if !defined(CPU_M68060_ONLY) | ||
359 | 1: tstb %a0@(TASK_THREAD+THREAD_FPSTATE) | ||
360 | jeq 3f | ||
361 | #endif | ||
362 | 2: fmovemx %fp0-%fp7,%a0@(TASK_THREAD+THREAD_FPREG) | ||
363 | fmoveml %fpcr/%fpsr/%fpiar,%a0@(TASK_THREAD+THREAD_FPCNTL) | ||
364 | 3: | ||
365 | #endif /* CONFIG_M68KFPU_EMU_ONLY */ | ||
366 | /* Return previous task in %d1 */ | ||
367 | movel %curptr,%d1 | ||
368 | |||
369 | /* switch to new task (a1 contains new task) */ | ||
370 | movel %a1,%curptr | ||
371 | |||
372 | /* restore floating point context */ | ||
373 | #ifndef CONFIG_M68KFPU_EMU_ONLY | ||
374 | #ifdef CONFIG_M68KFPU_EMU | ||
375 | tstl m68k_fputype | ||
376 | jeq 4f | ||
377 | #endif | ||
378 | #if defined(CONFIG_M68060) | ||
379 | #if !defined(CPU_M68060_ONLY) | ||
380 | btst #3,m68k_cputype+3 | ||
381 | beqs 1f | ||
382 | #endif | ||
383 | /* The 060 FPU keeps status in bits 15-8 of the first longword */ | ||
384 | tstb %a1@(TASK_THREAD+THREAD_FPSTATE+2) | ||
385 | jeq 3f | ||
386 | #if !defined(CPU_M68060_ONLY) | ||
387 | jra 2f | ||
388 | #endif | ||
389 | #endif /* CONFIG_M68060 */ | ||
390 | #if !defined(CPU_M68060_ONLY) | ||
391 | 1: tstb %a1@(TASK_THREAD+THREAD_FPSTATE) | ||
392 | jeq 3f | ||
393 | #endif | ||
394 | 2: fmovemx %a1@(TASK_THREAD+THREAD_FPREG),%fp0-%fp7 | ||
395 | fmoveml %a1@(TASK_THREAD+THREAD_FPCNTL),%fpcr/%fpsr/%fpiar | ||
396 | 3: frestore %a1@(TASK_THREAD+THREAD_FPSTATE) | ||
397 | 4: | ||
398 | #endif /* CONFIG_M68KFPU_EMU_ONLY */ | ||
399 | |||
400 | /* restore the kernel stack pointer */ | ||
401 | movel %a1@(TASK_THREAD+THREAD_KSP),%sp | ||
402 | |||
403 | /* restore non-scratch registers */ | ||
404 | RESTORE_SWITCH_STACK | ||
405 | |||
406 | /* restore user stack pointer */ | ||
407 | movel %a1@(TASK_THREAD+THREAD_USP),%a0 | ||
408 | movel %a0,%usp | ||
409 | |||
410 | /* restore fs (sfc,%dfc) */ | ||
411 | movew %a1@(TASK_THREAD+THREAD_FS),%a0 | ||
412 | movec %a0,%sfc | ||
413 | movec %a0,%dfc | ||
414 | |||
415 | /* restore status register */ | ||
416 | movew %a1@(TASK_THREAD+THREAD_SR),%sr | ||
417 | |||
418 | rts | ||
419 | |||
diff --git a/arch/m68k/kernel/entry_no.S b/arch/m68k/kernel/entry_no.S deleted file mode 100644 index d80cba45589f..000000000000 --- a/arch/m68k/kernel/entry_no.S +++ /dev/null | |||
@@ -1,130 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/m68knommu/kernel/entry.S | ||
3 | * | ||
4 | * Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com) | ||
5 | * Copyright (C) 1998 D. Jeff Dionne <jeff@lineo.ca>, | ||
6 | * Kenneth Albanowski <kjahds@kjahds.com>, | ||
7 | * Copyright (C) 2000 Lineo Inc. (www.lineo.com) | ||
8 | * | ||
9 | * Based on: | ||
10 | * | ||
11 | * linux/arch/m68k/kernel/entry.S | ||
12 | * | ||
13 | * Copyright (C) 1991, 1992 Linus Torvalds | ||
14 | * | ||
15 | * This file is subject to the terms and conditions of the GNU General Public | ||
16 | * License. See the file README.legal in the main directory of this archive | ||
17 | * for more details. | ||
18 | * | ||
19 | * Linux/m68k support by Hamish Macdonald | ||
20 | * | ||
21 | * 68060 fixes by Jesper Skov | ||
22 | * ColdFire support by Greg Ungerer (gerg@snapgear.com) | ||
23 | * 5307 fixes by David W. Miller | ||
24 | * linux 2.4 support David McCullough <davidm@snapgear.com> | ||
25 | */ | ||
26 | |||
27 | #include <linux/linkage.h> | ||
28 | #include <asm/errno.h> | ||
29 | #include <asm/setup.h> | ||
30 | #include <asm/segment.h> | ||
31 | #include <asm/asm-offsets.h> | ||
32 | #include <asm/entry.h> | ||
33 | #include <asm/unistd.h> | ||
34 | |||
35 | .text | ||
36 | |||
37 | .globl buserr | ||
38 | .globl trap | ||
39 | .globl ret_from_exception | ||
40 | .globl ret_from_signal | ||
41 | .globl sys_fork | ||
42 | .globl sys_clone | ||
43 | .globl sys_vfork | ||
44 | |||
45 | ENTRY(buserr) | ||
46 | SAVE_ALL_INT | ||
47 | GET_CURRENT(%d0) | ||
48 | movel %sp,%sp@- /* stack frame pointer argument */ | ||
49 | jsr buserr_c | ||
50 | addql #4,%sp | ||
51 | jra ret_from_exception | ||
52 | |||
53 | ENTRY(trap) | ||
54 | SAVE_ALL_INT | ||
55 | GET_CURRENT(%d0) | ||
56 | movel %sp,%sp@- /* stack frame pointer argument */ | ||
57 | jsr trap_c | ||
58 | addql #4,%sp | ||
59 | jra ret_from_exception | ||
60 | |||
61 | #ifdef TRAP_DBG_INTERRUPT | ||
62 | |||
63 | .globl dbginterrupt | ||
64 | ENTRY(dbginterrupt) | ||
65 | SAVE_ALL_INT | ||
66 | GET_CURRENT(%d0) | ||
67 | movel %sp,%sp@- /* stack frame pointer argument */ | ||
68 | jsr dbginterrupt_c | ||
69 | addql #4,%sp | ||
70 | jra ret_from_exception | ||
71 | #endif | ||
72 | |||
73 | ENTRY(reschedule) | ||
74 | /* save top of frame */ | ||
75 | pea %sp@ | ||
76 | jbsr set_esp0 | ||
77 | addql #4,%sp | ||
78 | pea ret_from_exception | ||
79 | jmp schedule | ||
80 | |||
81 | ENTRY(ret_from_fork) | ||
82 | movel %d1,%sp@- | ||
83 | jsr schedule_tail | ||
84 | addql #4,%sp | ||
85 | jra ret_from_exception | ||
86 | |||
87 | ENTRY(sys_fork) | ||
88 | SAVE_SWITCH_STACK | ||
89 | pea %sp@(SWITCH_STACK_SIZE) | ||
90 | jbsr m68k_fork | ||
91 | addql #4,%sp | ||
92 | RESTORE_SWITCH_STACK | ||
93 | rts | ||
94 | |||
95 | ENTRY(sys_vfork) | ||
96 | SAVE_SWITCH_STACK | ||
97 | pea %sp@(SWITCH_STACK_SIZE) | ||
98 | jbsr m68k_vfork | ||
99 | addql #4,%sp | ||
100 | RESTORE_SWITCH_STACK | ||
101 | rts | ||
102 | |||
103 | ENTRY(sys_clone) | ||
104 | SAVE_SWITCH_STACK | ||
105 | pea %sp@(SWITCH_STACK_SIZE) | ||
106 | jbsr m68k_clone | ||
107 | addql #4,%sp | ||
108 | RESTORE_SWITCH_STACK | ||
109 | rts | ||
110 | |||
111 | ENTRY(sys_sigreturn) | ||
112 | SAVE_SWITCH_STACK | ||
113 | jbsr do_sigreturn | ||
114 | RESTORE_SWITCH_STACK | ||
115 | rts | ||
116 | |||
117 | ENTRY(sys_rt_sigreturn) | ||
118 | SAVE_SWITCH_STACK | ||
119 | jbsr do_rt_sigreturn | ||
120 | RESTORE_SWITCH_STACK | ||
121 | rts | ||
122 | |||
123 | ENTRY(ret_from_user_signal) | ||
124 | moveq #__NR_sigreturn,%d0 | ||
125 | trap #0 | ||
126 | |||
127 | ENTRY(ret_from_user_rt_signal) | ||
128 | movel #__NR_rt_sigreturn,%d0 | ||
129 | trap #0 | ||
130 | |||