d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the decoding of the swi instruction to the syscall function. With the

Browse Source 
ARM EABI the syscall value will be moved to a register to ease adding thumb
support. When this happens decoding of the instruction will no longer be
required.
This commit is contained in:
Andrew Turner 2012-08-11 05:58:56 +00:00
parent 56c265f2f9
commit d2a3296d1a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arm/arm/trap.c
View File

@ -900,14 +900,13 @@ cpu_fetch_syscall_args(struct thread *td, struct syscall_args *sa)
#include "../../kern/subr_syscall.c"
static void
syscall(struct thread *td, trapframe_t *frame, u_int32_t insn)
syscall(struct thread *td, trapframe_t *frame)
{
struct syscall_args sa;
int error;
td->td_frame = frame;
sa.insn = insn;
switch (insn & SWI_OS_MASK) {
sa.insn = *(uint32_t *)(frame->tf_pc - INSN_SIZE);
switch (sa.insn & SWI_OS_MASK) {
case 0: /* XXX: we need our own one. */
sa.nap = 4;
break;
@ -927,7 +926,6 @@ void
swi_handler(trapframe_t *frame)
{
struct thread *td = curthread;
uint32_t insn;
td->td_frame = frame;
@ -941,7 +939,6 @@ swi_handler(trapframe_t *frame)
userret(td, frame);
return;
}
insn = *(u_int32_t *)(frame->tf_pc - INSN_SIZE);
/*
* Enable interrupts if they were enabled before the exception.
* Since all syscalls *should* come from user mode it will always
@ -954,6 +951,6 @@ swi_handler(trapframe_t *frame)
enable_interrupts(F32_bit);
}
syscall(td, frame, insn);
syscall(td, frame);
}