search for: trapa

...ts 0-3 per the standard calling convention, * and arguments 4-5 are passed in r0 and r1. * - * The return value is in r3 rather than standard r0. + * The return value is in r0. */ .section ".text.syscall","ax" @@ -16,17 +16,17 @@ mov.l @(0,sp),r0 mov.l @(4,sp),r1 trapa #0x15 - mov.l 1f,r0 - cmp/hs r0,r3 + mov.l 1f,r1 + cmp/hs r0,r1 bt/s 3f - neg r3,r4 - mov.l 2f,r5 - mov.l r4, at r5 + neg r0,r1 + mov.l 2f,r2 + mov.l r1, at r2 rts mov #-1,r0 3: rts - mov r3,r0 + nop .align 2 1: .long -4096 /* Errno limit */ only in patch2: unchanged: --- a...

...@@ +/* + * arch/sh/pipe.S + * + * The pipe system call is special on sh: it returns + * the two file descriptors in r0 and r1. + */ + +#include <asm/unistd.h> + + .section ".text.syscall","ax" + .align 2 + .globl pipe + .type pipe, at function +pipe: + mov #__NR_pipe, r3 + trapa #0x10 + mov.l 1f,r2 + cmp/hs r0,r2 + bt/s 3f + neg r0,r2 + mov.l 2f,r3 + mov.l r2, at r3 + rts + mov #-1,r0 +3: + mov.l r0, @r4 + mov.l r1, @(4, r4) + rts + mov #0,r0 + + .align 2 +1: .long -4096 /* Errno limit */ +2: .long errno + + .size pipe,.-pipe diff --git a/usr/klibc/arch/sh/sysca...

...@@ +/* + * arch/sh/pipe.S + * + * The pipe system call is special on sh: it returns + * the two file descriptors in r0 and r1. + */ + +#include <asm/unistd.h> + + .section ".text.syscall","ax" + .align 2 + .globl pipe + .type pipe, at function +pipe: + mov #__NR_pipe, r3 + trapa #0x10 + mov.l 1f,r2 + cmp/hs r0,r2 + bt/s 3f + neg r0,r2 + mov.l 2f,r3 + mov.l r2, at r3 + rts + mov #-1,r0 +3: + mov.l r0, @r4 + mov.l r1, @(4, r4) + rts + mov #0,r0 + + .align 2 +1: .long -4096 /* Errno limit */ +2: .long errno + + .size pipe,.-pipe diff --git a/usr/klibc/arch/sh/sysca...

...+ * and arguments 4-5 are passed in r0 and r1. + * + * The return value is in r3 rather than standard r0. + */ + + .section ".text.syscall","ax" + .align 2 + .globl ___syscall_common + .type ___syscall_common, at function +___syscall_common: + mov.l @(sp),r0 + mov.l @(4,sp),r1 + trapa #0x15 + mov.l 1f,r0 + cmp/hs r0,r3 + bt/s 3f + neg r3,r4 + mov.l 2f,r5 + mov.l r4, at r5 + rts + mov #-1,r0 +3: + rts + mov r3,r0 + + .align 2 +1: .long -4096 /* Errno limit */ +2: .long errno + + .size ___syscall_common,.-___syscall_common diff --git a/usr/klibc/arch/sh/sysstub.ph b/usr/kli...

I have updated the klibc patchset based on feedback received. In particular, the patchset has been reorganized so as not to break git-bisect. Additionally, this updates the patch base to 2.6.17-git12 (d38b69689c349f35502b92e20dafb30c62d49d63) and klibc 1.4.8; the main difference on the klibc side is removal of obsolete code. This is also available as a git tree at: