From patchwork Wed Oct 3 19:39:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 148075 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp58361lji; Wed, 3 Oct 2018 12:41:52 -0700 (PDT) X-Google-Smtp-Source: ACcGV61NAGY9YQdQ1eq8yoWFmoH5YavP7i4VTBPdDJFzdT3KYIGxotDbhi3ATe5ohIAhzupntmKD X-Received: by 2002:aed:2337:: with SMTP id h52-v6mr2676044qtc.316.1538595712177; Wed, 03 Oct 2018 12:41:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538595712; cv=none; d=google.com; s=arc-20160816; b=pz7yQvyXjz6JZyP/hFKbvU/SbapdGR9luagoqgdSDkt+BjfszIH/rWGoL6TaNuUE4R hRdd6KM7FGhB9+60RexEv3hs30+v+4S6hnv08uZS0r2U4T1KkgQ3uRurT4d/BIBNTwBO FIRImsAIpyl2eWsormzNaka0tXlm3KZM1nOT2zU2I9YLe2ICH1imfuVXT3GOO4PDnbnB gBBtAypWAPZlT4excEaajgk8hoxwjX7QeCXWHztc0OmsWeyLGHuxna3AXp7gdHKxowvp c56xBjnH3JESovkF14J9PuDSv1NhMz9sHR8q7NvOIn9S689Yq9eljzduU7mtO1LVNU3u QZxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=JAldEmKZ57baz29qTLPDVIF0nqXzK08T0l7+NIorDqg=; b=yQ7h8vrWUvftIUQVQ5XSvy7VnCyGU4YIS02QNOVSD+4nLKWODQweATH/UHKfNDHlnG 5hz1Z4CHtMWoD0XYghifk8krRcquIZ/yhfB9KKXfOP7LA5Ts440+OdwoJGZlN6WvSC3m 38YfNZZKIwzmX2tYukx0SVxSW52CO/LHDnFl7i6PkkxrSDXXfEI0RzOj6K42MH24hfz8 2CsD4hwI25R+OpF9bd83XvEXZ6sYJIpgrUo6QywmtFOM7YEy2nqMGT9HeSCtzqsRwnq3 wuedcW8/8BAvzTEfkPJKo6mdQ5gW15IUguo1aO3Evw7lofS4P6GYyM3m4ubGFdslpnvC 6WQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S9UFJdeu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x69-v6si1553926qkx.12.2018.10.03.12.41.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 03 Oct 2018 12:41:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S9UFJdeu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7n1r-0002fm-GN for patch@linaro.org; Wed, 03 Oct 2018 15:41:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7n05-0001gD-00 for qemu-devel@nongnu.org; Wed, 03 Oct 2018 15:40:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7n03-00025y-A0 for qemu-devel@nongnu.org; Wed, 03 Oct 2018 15:40:00 -0400 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]:33366) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g7n02-00024f-Tk for qemu-devel@nongnu.org; Wed, 03 Oct 2018 15:39:59 -0400 Received: by mail-qt1-x831.google.com with SMTP id q40-v6so7323292qte.0 for ; Wed, 03 Oct 2018 12:39:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JAldEmKZ57baz29qTLPDVIF0nqXzK08T0l7+NIorDqg=; b=S9UFJdeuPrGGeDfeyqfgLFum6sPoaLYgW0dB+xcPxZCIGbixhXB6MU+MjEsIHFePlo yF4Hc+yZQtfnpNEQeRfKvu+iWcBMoMXhKECFyyryUfonzyiFNIkbSbt/PoL8Fzb1ukmu Saxnvy4J12DLdO+xI0t9aBvZQXsSjs5yKlBok= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JAldEmKZ57baz29qTLPDVIF0nqXzK08T0l7+NIorDqg=; b=AT5/SElCU22sDATikwxZzFHo0RuMyCKazwGS/9SQZQpFUpF4dD9U6ztTZzdQZhB6Vz iONiNK8H82LsCiuOZm0ltsXS4J5XTVBC0qtgPU0fME24ugNISqpV0Wd4lqHReuZreTop U1OQcL10AwaLipXQJ76VyxqaNatnHjNGK2FzI5FxNY/qG6elyaVnZjXpM/OoIxQRS8W2 tIci8+aHk0xHlqN6AkT/+m97vyUWAsVPuJ3RO9v23Q3/pT8g+ELMI478LXvGoEO0RMn0 Oa1gy8JgOzmaWgUTxAdZ0HyaI6EQe/tsBBLmdLY9aE0fjyZWtPJ8F4rl0QIWhLL7u6aO a7/g== X-Gm-Message-State: ABuFfojXe92a4qdbLhwXGHEU+jAHEP1D5SGVbypuXiU6pN7KdAgIjPzt rWMczU3Pg5VdyQhvrdKvlyACErctOS0Bng== X-Received: by 2002:ac8:5293:: with SMTP id s19-v6mr2617731qtn.336.1538595597826; Wed, 03 Oct 2018 12:39:57 -0700 (PDT) Received: from cloudburst.twiddle.net ([172.56.13.153]) by smtp.gmail.com with ESMTPSA id t16-v6sm1284946qth.68.2018.10.03.12.39.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Oct 2018 12:39:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 3 Oct 2018 14:39:30 -0500 Message-Id: <20181003193931.18096-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003193931.18096-1-richard.henderson@linaro.org> References: <20181003193931.18096-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::831 Subject: [Qemu-devel] [PATCH v3 8/9] target/s390x: Skip wout, cout helpers if op helper does not return X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When op raises an exception, it may not have initialized the output temps that would be written back by wout or cout. Cc: qemu-s390x@nongnu.org Signed-off-by: Richard Henderson --- target/s390x/translate.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.17.1 Reviewed-by: David Hildenbrand diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 7363aabf3a..7fad3ad8e9 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -6164,11 +6164,13 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s) if (insn->help_op) { ret = insn->help_op(s, &o); } - if (insn->help_wout) { - insn->help_wout(s, &f, &o); - } - if (insn->help_cout) { - insn->help_cout(s, &o); + if (ret != DISAS_NORETURN) { + if (insn->help_wout) { + insn->help_wout(s, &f, &o); + } + if (insn->help_cout) { + insn->help_cout(s, &o); + } } /* Free any temporaries created by the helpers. */