From patchwork Fri Aug 3 22:40:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 175058 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 D8A242C00BE for ; Sat, 4 Aug 2012 08:42:22 +1000 (EST) Received: from localhost ([::1]:46498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxQZZ-0002An-00 for incoming@patchwork.ozlabs.org; Fri, 03 Aug 2012 18:42:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxQYW-00082B-Eb for qemu-devel@nongnu.org; Fri, 03 Aug 2012 18:41:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SxQYV-000422-69 for qemu-devel@nongnu.org; Fri, 03 Aug 2012 18:41:16 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:58948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxQYU-0003zU-85 for qemu-devel@nongnu.org; Fri, 03 Aug 2012 18:41:15 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so1909554pbb.4 for ; Fri, 03 Aug 2012 15:41:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=aXkCxw0FSDNuOIBhoSYkhmxEpUQ6eHh94BLJeNgW1vQ=; b=obRK2EyBummuNCnmvpqvgKZgi9P9tlzTv3FycPEk+x5m2vs4arnTaQ+URePI0/SuRl E0QHRGVttDAOGrEVvgX7sgKW+h/gyq/juutmQC5vSRYv3IINrYGYXdKe8nhFfHDZQD6R 3ESVNt8/rNwVR9GZs3rg1Q41MqOJ1C42cW6h9mr0x3lU8FfJCqhPVqmaA9eoif+yu92I zdyDWaawTQHw2+1IOwZzSy8g6gfdkyHvy4q5+1bXHe8VCWbZpL0+hu1zvvDPyCTZ3eh7 Ru25s/+GHytvP/mUI6i00crG30YaPlWUUZgKyUZQUofBJeKDXZJzizASef74k+bx+bKr fuvQ== Received: by 10.66.76.227 with SMTP id n3mr1740472paw.53.1344033673883; Fri, 03 Aug 2012 15:41:13 -0700 (PDT) Received: from anchor.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id qd2sm3721626pbb.29.2012.08.03.15.41.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Aug 2012 15:41:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 3 Aug 2012 15:40:55 -0700 Message-Id: <1344033657-9135-9-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1344033657-9135-1-git-send-email-rth@twiddle.net> References: <1344033657-9135-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 Subject: [Qemu-devel] [PATCH 08/10] 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 a21942c..53714de 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2846,13 +2846,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 */