diff options
| -rw-r--r-- | bsd-user/main.c | 18 | ||||
| -rw-r--r-- | bsd-user/openbsd/syscall_nr.h | 30 |
2 files changed, 41 insertions, 7 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c index 49776b8733..61aa6e83cb 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -186,9 +186,6 @@ void cpu_loop(CPUSPARCState *env, enum BSDType bsd_type) case 0x100: #endif syscall_nr = env->gregs[1]; -#if defined(TARGET_SPARC) - syscall_nr &= ~(SYSCALL_G7RFLAG | SYSCALL_G2RFLAG); -#endif if (bsd_type == target_freebsd) ret = do_freebsd_syscall(env, syscall_nr, env->regwptr[0], env->regwptr[1], @@ -199,11 +196,16 @@ void cpu_loop(CPUSPARCState *env, enum BSDType bsd_type) env->regwptr[0], env->regwptr[1], env->regwptr[2], env->regwptr[3], env->regwptr[4], env->regwptr[5]); - else //if (bsd_type == target_openbsd) + else { //if (bsd_type == target_openbsd) +#if defined(TARGET_SPARC64) + syscall_nr &= ~(TARGET_OPENBSD_SYSCALL_G7RFLAG | + TARGET_OPENBSD_SYSCALL_G2RFLAG); +#endif ret = do_openbsd_syscall(env, syscall_nr, env->regwptr[0], env->regwptr[1], env->regwptr[2], env->regwptr[3], env->regwptr[4], env->regwptr[5]); + } if ((unsigned int)ret >= (unsigned int)(-515)) { #if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) env->xcc |= PSR_CARRY; @@ -219,11 +221,13 @@ void cpu_loop(CPUSPARCState *env, enum BSDType bsd_type) } env->regwptr[0] = ret; /* next instruction */ -#if defined(TARGET_SPARC) - if (env->gregs[1] & SYSCALL_G2RFLAG) { +#if defined(TARGET_SPARC64) + if (bsd_type == target_openbsd && + env->gregs[1] & TARGET_OPENBSD_SYSCALL_G2RFLAG) { env->pc = env->gregs[2]; env->npc = env->pc + 4; - } else if (env->gregs[1] & SYSCALL_G7RFLAG) { + } else if (bsd_type == target_openbsd && + env->gregs[1] & TARGET_OPENBSD_SYSCALL_G7RFLAG) { env->pc = env->gregs[7]; env->npc = env->pc + 4; } else { diff --git a/bsd-user/openbsd/syscall_nr.h b/bsd-user/openbsd/syscall_nr.h index 1f463cce14..dececfd9e8 100644 --- a/bsd-user/openbsd/syscall_nr.h +++ b/bsd-user/openbsd/syscall_nr.h @@ -193,3 +193,33 @@ #define TARGET_OPENBSD_NR_statfs 307 #define TARGET_OPENBSD_NR_fstatfs 308 #define TARGET_OPENBSD_NR_fhstatfs 309 + +/* syscall flags from machine/trap.h */ + +/* $OpenBSD: trap.h,v 1.4 2008/07/04 22:04:37 kettenis Exp $ */ +/* $NetBSD: trap.h,v 1.4 1999/06/07 05:28:04 eeh Exp $ */ + +/* + * Copyright (c) 1996-1999 Eduardo Horvath + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ +#define TARGET_OPENBSD_SYSCALL_G2RFLAG 0x400 /* on success, return to %g2 rather than npc */ +#define TARGET_OPENBSD_SYSCALL_G7RFLAG 0x800 /* use %g7 as above (deprecated) */ |