From patchwork Mon Jul 2 15:10:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 140801 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp72755ljj; Mon, 2 Jul 2018 08:16:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe5eW2ILiGnSUSZae5fGpfVVBe6tlva+4mGACKyD2KVydgkf9tzFBIsQNFkGZILtc5bE45Q X-Received: by 2002:a0c:e60e:: with SMTP id z14-v6mr11816897qvm.244.1530544594898; Mon, 02 Jul 2018 08:16:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530544594; cv=none; d=google.com; s=arc-20160816; b=GmcWx+TbCuj/pk2ZcBX45COAHggbOhzulX6/iN0ULk6cIYBWb8ZBk3LRIwVwjr61dv 6csD88QLgM8VgE3H1rZDhu6qVY/Khq9cfOsQscvV6eYCZ7YmPC7gkIbXO5Qr1b35OLjq 3CjGV4vQPYx/hjHm1+jnDdtHMv5Z02lhEU8j8aCVSyaYVA7AwKdFvFhVF8xaS35UFXVB UhCSO7ooEXPdBFvlC1FH7KIig5civ365dfQCXD8yG/YZ68D8wHYYvlfRJ/PKv2c/7pB0 YH669Mitw/b2u2c9BnHgubXLNb3w5DfK60yWpjwd2n00NS3Ef/rjn0rzt3AO0ajAlMFd 58BA== 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:arc-authentication-results; bh=/JZVefHUUHKkgVlCuUjnyf/d1zk468BKGk0xxZUY1uE=; b=WLL+XAV/HkWleOVCz3hOmkitn/hWwJIm3nlC1dtyS8wfuwvB6SDGx/lDpmyRG03r0g zdXpbbGCOnd/eGFK0D+hVouIG4Ve1Pt0gjeVdi7s48Qq/nbf0axq3vL1y1ScnZLQc6Vw H1ybdf4x4uYP87ltmV1FBe/M1/ZnS3xxB3lxWQy1J5FWLMMNLi0iTDUVvKrZUhmbGss5 iC3HeS8oa+BVimk4s8nSnx62Na6xKdvgCeG+1yMbqBuwwZbUAlS+tQVQV3p6rlPsr8qV NxIE7f46PKQSp9e6ZWRgS5IVLJ0ziJW3QthePLNtRMBTMw/C0ERn6wGBa7pZOvEZzu3i AHlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=XbaEK4q2; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m38-v6si4694476qtb.84.2018.07.02.08.16.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 08:16:34 -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=@gmail.com header.s=20161025 header.b=XbaEK4q2; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1]:33461 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0Z8-0007ZN-AE for patch@linaro.org; Mon, 02 Jul 2018 11:16:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0Tr-00047K-7P for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa0Tm-0007tH-AD for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:07 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:41670) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fa0Tm-0007sn-4E for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:02 -0400 Received: by mail-pl0-x242.google.com with SMTP id w8-v6so8106837ply.8 for ; Mon, 02 Jul 2018 08:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/JZVefHUUHKkgVlCuUjnyf/d1zk468BKGk0xxZUY1uE=; b=XbaEK4q2kgaq6Gz7+BgDFAZVMMcpSYUy9/kbsO3LcTrg4zn5jhhQjDSd5AuoCaHOGU E5ka4P14F6wfOYbkwsOY6p/yN1C8lMv0uAaYO0x5z1txFspCfkue0OGAfSh8xCDzNcqs 1gX+tlCINNVk2o0kGeYvxoLUKznwwVEoPakAdwX85fqt8C//C1VAR9r7OTQw1N2pUOp7 Dt1L4Z9MBlqxv/w5/kJvVnZ0rC3NLcWDFRBywB5Vu+0I/VrQ16HZYwaFvmsygswwoIQO jzs7oQfzMFEdpQ1conw4IXsxrVtOfugL4ZKsZIfTLjy+xEhUSaQzcBJzI0lJzksovp6C mvvQ== 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=/JZVefHUUHKkgVlCuUjnyf/d1zk468BKGk0xxZUY1uE=; b=icsTvLAJSQK7iT22RePq6WeCzpbjaqTDa/EgXg7qVeb+M6CkZwsVN+6P+dJFm1kaIr G2RtqhE59LAhHhzX0laqVomgQYG8jVvs0ooEAG92ZvFg9+Xm3CQZhq7lDcUQxEBGlnJO esJ4VPSPFMej1PzoRWqswWJcbzzbwEdKPwD0CxEbmpVQpT0CHu9qX/OyaKxAhrdxUA7l J9sMPvXPgFAdDeRwwKr6/n6yNCZbqlGFVoM+va1Kf6JC8o8UdEx67YBbDtSFUA3Mg27p WKO4Oms8vhpoPFnwCe1bumyp09JDppSmSx7iep7vEnKcKo2zV4Uiizjs1Z2t+dEjXc1B VjRw== X-Gm-Message-State: APt69E3QPecjUmvg4T8l4OLAfVdyDGrLgkYSq/QPTiUiNt5sCTlYFGuQ MEWb1naatUch8/HRACgKN3k= X-Received: by 2002:a17:902:9a06:: with SMTP id v6-v6mr26211447plp.21.1530544261296; Mon, 02 Jul 2018 08:11:01 -0700 (PDT) Received: from localhost (g90.124-44-6.ppp.wakwak.ne.jp. [124.44.6.90]) by smtp.gmail.com with ESMTPSA id w10-v6sm4658053pfg.187.2018.07.02.08.11.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 08:11:00 -0700 (PDT) From: Stafford Horne To: Peter Maydell Date: Tue, 3 Jul 2018 00:10:07 +0900 Message-Id: <20180702151023.24532-10-shorne@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180702151023.24532-1-shorne@gmail.com> References: <20180702151023.24532-1-shorne@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PULL v2 09/25] target/openrisc: Exit the TB after l.mtspr 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: Stafford Horne , Richard Henderson , QEMU Development Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson A store to SR changes interrupt state, which should return to the main loop to recognize that state. Signed-off-by: Richard Henderson Signed-off-by: Stafford Horne --- target/openrisc/translate.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -- 2.17.0 diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index db149986af..59605aacca 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -877,7 +877,22 @@ static bool trans_l_mtspr(DisasContext *dc, arg_l_mtspr *a, uint32_t insn) if (is_user(dc)) { gen_illegal_exception(dc); } else { - TCGv_i32 ti = tcg_const_i32(a->k); + TCGv_i32 ti; + + /* For SR, we will need to exit the TB to recognize the new + * exception state. For NPC, in theory this counts as a branch + * (although the SPR only exists for use by an ICE). Save all + * of the cpu state first, allowing it to be overwritten. + */ + if (dc->delayed_branch) { + tcg_gen_mov_tl(cpu_pc, jmp_pc); + tcg_gen_discard_tl(jmp_pc); + } else { + tcg_gen_movi_tl(cpu_pc, dc->base.pc_next + 4); + } + dc->base.is_jmp = DISAS_EXIT; + + ti = tcg_const_i32(a->k); gen_helper_mtspr(cpu_env, cpu_R[a->a], cpu_R[a->b], ti); tcg_temp_free_i32(ti); }