diff options
author | cognet <cognet@FreeBSD.org> | 2006-10-21 00:46:56 +0000 |
---|---|---|
committer | cognet <cognet@FreeBSD.org> | 2006-10-21 00:46:56 +0000 |
commit | b4b85ee027c1dea172f462f1067f45b7ebc11961 (patch) | |
tree | 1ec2d4885194bbc00bbbc1fd2e745cb91cfeea53 /sys/arm | |
parent | 8f92fe04c3829512304e750aec70de2de57b0897 (diff) | |
download | FreeBSD-src-b4b85ee027c1dea172f462f1067f45b7ebc11961.zip FreeBSD-src-b4b85ee027c1dea172f462f1067f45b7ebc11961.tar.gz |
Ok I am an idiot. On 32 bits big-endian systems, it is needed to handle the
syscalls using __syscall but only actually returning 32bits, such as mmap(),
specially : they set the return value in td->td_retval[0], but the userland
functions will expect this in r1, and not in r0 as it is normally done, as it
is the LSB. So add a special case for all these syscalls (all except lseek,
which truly returns 64bits).
Many thanks to Peter Grehan for his patience while explaining me the issue.
Diffstat (limited to 'sys/arm')
-rw-r--r-- | sys/arm/arm/trap.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap.c index fd187f7..c4c4518 100644 --- a/sys/arm/arm/trap.c +++ b/sys/arm/arm/trap.c @@ -940,8 +940,23 @@ syscall(struct thread *td, trapframe_t *frame, u_int32_t insn) } switch (error) { case 0: - frame->tf_r0 = td->td_retval[0]; - frame->tf_r1 = td->td_retval[1]; +#ifdef __ARMEB__ + if ((insn & 0x000fffff) == SYS___syscall && + (code != SYS_lseek)) { + /* + * 64-bit return, 32-bit syscall. Fixup byte order + */ + frame->tf_r0 = 0; + frame->tf_r1 = td->td_retval[0]; + } else { + frame->tf_r0 = td->td_retval[0]; + frame->tf_r1 = td->td_retval[1]; + } +#else + frame->tf_r0 = td->td_retval[0]; + frame->tf_r1 = td->td_retval[1]; +#endif + frame->tf_spsr &= ~PSR_C_bit; /* carry bit */ break; |