From patchwork Thu Jun 7 22:24:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163688 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6EBFAB6FA5 for ; Fri, 8 Jun 2012 09:05:43 +1000 (EST) Received: from localhost ([::1]:59807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Scl93-0003ee-5v for incoming@patchwork.ozlabs.org; Thu, 07 Jun 2012 18:25:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Scl8K-0001SD-5k for qemu-devel@nongnu.org; Thu, 07 Jun 2012 18:24:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Scl8I-0006Fo-8w for qemu-devel@nongnu.org; Thu, 07 Jun 2012 18:24:47 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:53303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Scl8I-0006F0-0O for qemu-devel@nongnu.org; Thu, 07 Jun 2012 18:24:46 -0400 Received: by pbbro12 with SMTP id ro12so1843718pbb.4 for ; Thu, 07 Jun 2012 15:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=hZAnaIWkYdRHd/6r2NZbdsWee/zkUSye5j6sFRCeOVs=; b=uaA+NVxQ3uaIbQ9DJIjwh8GP2KBPkhCAUstoKg6/kHnCyetNOLllVpPsEVSPUQ9GrE uiK7L+ntSDT1j8Vp2WXoWSTuZJA2GuThl0YPq2LTGToSg408+mXkq8XKNULP5oMCCqIN EIcxyqDAZ8JMIQhQfzHMyKLP4QDfMr7b050SdO3yFXliU7mD+s2ZmxQI0IcqVDIZWmBs 1AvtVS2WyHnNZ8N48vBfthKJoZFJjIKMbVV6D9aLnKa+EsUuLCpY8CmZORxVh48B5MhB EUqoR28PLp7E98DRTzUm9fI2/KfQVOEE7SscB5L0ojv6Rl131ooY0iXKF7eIfy4XLRPc L2Tw== Received: by 10.68.197.136 with SMTP id iu8mr12954002pbc.111.1339107884003; Thu, 07 Jun 2012 15:24:44 -0700 (PDT) Received: from anchor.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id u5sm5454817pbu.76.2012.06.07.15.24.43 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 07 Jun 2012 15:24:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Jun 2012 15:24:29 -0700 Message-Id: <1339107871-4487-8-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1339107871-4487-1-git-send-email-rth@twiddle.net> References: <1339107871-4487-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Riku Voipio Subject: [Qemu-devel] [PATCH 7/9] alpha-linux-user: Fix a3 error return with v0 error bypass. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 e81abb2..605018a 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2758,13 +2758,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 */