From patchwork Fri May 10 17:30:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163930 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2689178ilr; Fri, 10 May 2019 10:53:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqy4Kl3Fgcrozxf42irlPeFMS8id5v2zOCW7HF3Dld7qLNrn6Ybj9Kp7PlY6ktMwpft3+pjB X-Received: by 2002:a05:6402:1214:: with SMTP id c20mr12436858edw.38.1557510800116; Fri, 10 May 2019 10:53:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557510800; cv=none; d=google.com; s=arc-20160816; b=x9iR5fyi/mdhyinxH6pIyhJtKhsoPjqML6NPJVQHE7NzLmkDzBssHv7VwuUGeibU90 ZziccSPXitBMUPcZ6q2i5ggwBi2W4/5Ak/uZn1rV/ZFfe9tfiDyJiKvn8i6r++KzG2dq XsZXod2Mrz7WdIwlYq8jf6bVQG/BtcwL2LomEYrQvI/+0CN/IBkft7j+C9LxsGDEaG2b xiG8qReN6lyvLW1pQUo10k0x/KddmIz9nGgVQ1D338VegXtohK4EbowslZiNrRlSevzT 0z0LX6mFLZ2Gh0Rr9L7ul/fa1o29UGu98/2V/4mi8SZzc4mOtdzxCC7EcXh0g6YcI6u5 0QHQ== 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=3/XT/GNbTz9t3be4QG6qS3S59cCXuga8GczXPdJ1EMM=; b=yY0Qe0YKh+03L1j3U17698oevoxFs0eN8P0LBU7rRImdHqex2nEmxGo7qioS12IUfg Zva9sZkjvnymJBa4evNa2vIa908Zgo4rkwSgfrhBbqTanPaWr45Ujkrd1s7yVP0MdVmt Vq7Eugm2H/inAEBcQQEUn6K9R5RZgrpU2FR5pKBos+1++6xdldJ9WCs4U9LQe+EHfk45 BCqNLNurxUs0z7ExmH4FhPAhwHiRSoOAAOTSph6RB5sbmmG/LsrS4nE69TwzixznVtns HoNQ6dZSrcWAFIMS1s/MifSjZ8bqd+rfUu1wyc22w4n5ckQz1/0pLsmU1dpGngBHPc7w 2ixA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Fj0nTSks; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id k21si1308137ejj.200.2019.05.10.10.53.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 May 2019 10:53:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Fj0nTSks; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:47801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP9hv-0003Rn-1R for patch@linaro.org; Fri, 10 May 2019 13:53:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP9Mh-0007cc-1B for qemu-devel@nongnu.org; Fri, 10 May 2019 13:31:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP9Mg-0006Eu-51 for qemu-devel@nongnu.org; Fri, 10 May 2019 13:31:23 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:40823) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hP9Mf-0006Ed-VH for qemu-devel@nongnu.org; Fri, 10 May 2019 13:31:22 -0400 Received: by mail-pl1-x642.google.com with SMTP id b3so3138221plr.7 for ; Fri, 10 May 2019 10:31:21 -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=3/XT/GNbTz9t3be4QG6qS3S59cCXuga8GczXPdJ1EMM=; b=Fj0nTSksTM4fN1HQhx5uGxgNCq/HKYp0ojeEbcEI65djDLBJWYutwPjsmKSw8WB+uZ VoFRNfzbIvehNcc8KgAKWcm1EChcnteZxXjtTnkpkMsrnaHMNQcc91SX1nD/7oD/UdcL zCmMQctVdb5AmiC6HalqkhPbGjeCLIEEWba6C/JxkjDYwyO7CKWRXHNikicEjCy0pdas a/ERAkmLB2ouKdtheeWUj+HbV+V70yCAOo+ifobiFk1SchHM4u4NbGreB2LLvGqW5A5f ISauxo0DZwOvz5no/1BTgH7y1JamXDBezY7WgrBXuIKOq4zLSGuONPVujG7HBMbkXVCG 2JEA== 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=3/XT/GNbTz9t3be4QG6qS3S59cCXuga8GczXPdJ1EMM=; b=FrM/Gq5JmwhafrNM7O7MxMRNNXHZXfhuJfmXRkKWKaTyV5xaeVQsVmk29bhYK2qYzz Kp8HgcrsL48mEMIzQCaP38eRi3tGLuDNbXIbenpDEPd9HWKVYktvClbFLEskhe2JfsSH kRvR3C33g2zoPA5ehdoYktKukpe/ROB2UH7mknmphYZQgsVxZOJ7OAHmoW9X4gVZqFtk JBfEqN69SNSUcGI2VLCf6o0kmah2eUiyRodHnynBr0MUjLLyZL97CJhNiFWKSx22BhSC R+bpJ5tADgK7JOEzIdGm1E5e6R4Xm5eIaHVxBi4fXTVxLPgUrX1M2X7qz1wi4x+DaDWE mD/Q== X-Gm-Message-State: APjAAAWSx4260p4o58NFcW94nIRV1PdbvyatsUnyV3FgKh+XyCB+NewO Y+if1gV4gDZBnY97Jo+y4idaWRosRVE= X-Received: by 2002:a17:902:8b8a:: with SMTP id ay10mr6272032plb.74.1557509480814; Fri, 10 May 2019 10:31:20 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id v64sm7936792pfv.106.2019.05.10.10.31.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 May 2019 10:31:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 10 May 2019 10:30:48 -0700 Message-Id: <20190510173049.28171-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190510173049.28171-1-richard.henderson@linaro.org> References: <20190510173049.28171-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::642 Subject: [Qemu-devel] [PATCH v6 24/25] target/ppc: Use gen_io_start/end around DARN 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: David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Generating a random number counts as I/O, as it cannot be replayed and produce the same results. Cc: David Gibson Suggested-by: Peter Maydell Signed-off-by: Richard Henderson --- target/ppc/translate.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) -- 2.17.1 Acked-by: David Gibson Reviewed-by: Laurent Vivier Acked-by: David Gibson diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 8d08625c33..76628df6dd 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -1847,13 +1847,22 @@ static void gen_darn(DisasContext *ctx) { int l = L(ctx->opcode); - if (l == 0) { - gen_helper_darn32(cpu_gpr[rD(ctx->opcode)]); - } else if (l <= 2) { - /* Return 64-bit random for both CRN and RRN */ - gen_helper_darn64(cpu_gpr[rD(ctx->opcode)]); - } else { + if (l > 2) { tcg_gen_movi_i64(cpu_gpr[rD(ctx->opcode)], -1); + } else { + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { + gen_io_start(); + } + if (l == 0) { + gen_helper_darn32(cpu_gpr[rD(ctx->opcode)]); + } else { + /* Return 64-bit random for both CRN and RRN */ + gen_helper_darn64(cpu_gpr[rD(ctx->opcode)]); + } + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { + gen_io_end(); + gen_stop_exception(ctx); + } } } #endif