From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su9nF-0007wW-Iv for qemu-devel@nongnu.org; Wed, 25 Jul 2012 18:10:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Su9nD-00013o-47 for qemu-devel@nongnu.org; Wed, 25 Jul 2012 18:10:57 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:33038) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su9nC-00013d-W2 for qemu-devel@nongnu.org; Wed, 25 Jul 2012 18:10:55 -0400 Received: by yenl1 with SMTP id l1so1280761yen.4 for ; Wed, 25 Jul 2012 15:10:54 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Wed, 25 Jul 2012 15:10:36 -0700 Message-Id: <1343254238-4727-9-git-send-email-rth@twiddle.net> In-Reply-To: <1343254238-4727-1-git-send-email-rth@twiddle.net> References: <1343254238-4727-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 08/10] alpha-linux-user: Fix a3 error return with v0 error bypass. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: riku.voipio@iki.fi We were failing to initialize a3 for syscalls that bypass the negative return value error check. Signed-off-by: Richard Henderson --- linux-user/main.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 5787432..343b85c 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2759,13 +2759,11 @@ void cpu_loop(CPUAlphaState *env) break; } /* Syscall writes 0 to V0 to bypass error check, similar - to how this is handled internal to Linux kernel. */ - if (env->ir[IR_V0] == 0) { - env->ir[IR_V0] = sysret; - } else { - env->ir[IR_V0] = (sysret < 0 ? -sysret : sysret); - env->ir[IR_A3] = (sysret < 0); - } + to how this is handled internal to Linux kernel. + (Ab)use trapnr temporarily as boolean indicating error. */ + trapnr = (env->ir[IR_V0] != 0 && sysret < 0); + env->ir[IR_V0] = (trapnr ? -sysret : sysret); + env->ir[IR_A3] = trapnr; break; case 0x86: /* IMB */ -- 1.7.7.6