From patchwork Fri Oct 20 23:20:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 116578 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2238310qgn; Fri, 20 Oct 2017 16:49:25 -0700 (PDT) X-Received: by 10.237.35.238 with SMTP id k43mr9891257qtc.214.1508543365711; Fri, 20 Oct 2017 16:49:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508543365; cv=none; d=google.com; s=arc-20160816; b=DoSx0aIA5P30UzLK5R+QKxKAwdB7V6IwOYgjuga9tkEnG2g3/ziVvXzQ54JblNJ6cQ 1ApLWmrRNVyXirAAR5aToX6K1/mffk+hFfCcMyg1SdzF4aCUoQsqB4Jl1ZVBrDEugg7Z eE10nkDvzFJlsBL8xQd8tOYDPGn0c/XL4ff0m0jrzx05Of/1IvmR2gVODC1voLj7p7B9 Dr01XPA+0hQTMX2x1nT52HtTym8kyl/xpvcllVDuPLitNrEWnZNkFYN7qJx6C/ys+zbF 4GVkuL7ryD6V7vUwCrg4LmH/+npJSG9Yvs1ZqWQnutCz8Z6U0cZ7Zt6oU21hX1bl39I+ Y1rw== 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=b2CHv8ZbWwK/h/iHEPhOUtRtKbpIkwlFvDhfeRmqI70=; b=yI0HN+EcX1BAtlJ/5pLBq7R7vCiWYQ2Hq50snThCcRp45/RxrXjzc8itB9ov/hUZ5N +jHX2hlNKYEHYd/6Zuzo6fxcyVeRD6YpGnYbAuwiae2l+FGeil5mfGVn5ZsPfAbm3IhH YYYqg4xGLwMhbl6O9w1u+P9qsn6Nu1U3jmakaCmYYc02AAjQd8JyHbqiKGo6hEzBP0I/ LtnEEQ7teXgoMz9sx4H8cuY+5OjGD2fH00XEQWXH58SSVq2e4XhwHWoB/SLSjaeEiUmW TtVBfhSvVM64Gi2kshNkQJ7oJ2GC6DZvTM6MbvVp0JM1w9zFELpro4qtdgwZIWMyJ5iN zFWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GymWqQJC; 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 g17si1760992qtc.88.2017.10.20.16.49.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 20 Oct 2017 16:49:25 -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=GymWqQJC; 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]:56095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5h2Z-00069u-G0 for patch@linaro.org; Fri, 20 Oct 2017 19:49:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5gbI-0006HB-GS for qemu-devel@nongnu.org; Fri, 20 Oct 2017 19:21:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5gbH-0007oG-8m for qemu-devel@nongnu.org; Fri, 20 Oct 2017 19:21:12 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:51597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e5gbH-0007no-1X for qemu-devel@nongnu.org; Fri, 20 Oct 2017 19:21:11 -0400 Received: by mail-pf0-x243.google.com with SMTP id n14so13059191pfh.8 for ; Fri, 20 Oct 2017 16:21:10 -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=b2CHv8ZbWwK/h/iHEPhOUtRtKbpIkwlFvDhfeRmqI70=; b=GymWqQJCUaePnWxylESmifGXQlfqiCu3pj/dP+6jgKmXRyE4hO2c2yGts0Ez9NyJfJ iXCoH4gRM5MqG0qhMwDUVUwzQz1e36h03B238OC9OU+nrR4qA8o29CepMlT0E31sGCTk 3mPup2TqXsKfU1/HpkQJKIU4wXp3Pz81MS1Bs= 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=b2CHv8ZbWwK/h/iHEPhOUtRtKbpIkwlFvDhfeRmqI70=; b=XmjZFqBjiCLeLj8tNh0KR3QfLoddJot0TZEGFAvUpVajY1+RFMpGSPecAeljvJN5pl Hr58eXH7Wv0XV19WpUEWeBa73dtXxEq/9Hn+zq21YZEx0dq651OkH0eM34gyGq2Uo53L R+LFIlU6CChcqBn4fbK78VG1kXRKBLdN9BqIwFU8Ey6oNde3EvrZuLsi58Y3C/OuUq2A CXtd4rXsN85juYuMJyKFdgdJS+Lc82EJfiUSpGFO8I/w9XbzHzrx+t91flYQNVz1tIar Uxyqsa1KSSXmuAz0gyPHoSdn1Zr/ZMSmy/ETOIg3sI+Iy348HUysHnTFZ/wzlt7EDNMk wgaw== X-Gm-Message-State: AMCzsaWfuLJKzkndP1xrMZl3wjdSG34NCep6f8mGcXdDWlFOvfLhg04H gge7z5jhhNqHwbOKKODAFPpg6dVEER0= X-Google-Smtp-Source: ABhQp+QbDZomc8SebKJuqSTjZj5bisc/9ROHBO2N6ip8KkFu0HQfBD1bShoUhUCxGiasyd9AazkyWQ== X-Received: by 10.159.242.137 with SMTP id u9mr5262955plr.243.1508541669484; Fri, 20 Oct 2017 16:21:09 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-165-104.tukw.qwest.net. [97.113.165.104]) by smtp.gmail.com with ESMTPSA id a17sm3532594pfk.173.2017.10.20.16.21.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2017 16:21:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 20 Oct 2017 16:20:01 -0700 Message-Id: <20171020232023.15010-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171020232023.15010-1-richard.henderson@linaro.org> References: <20171020232023.15010-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH v7 30/52] target/m68k: check CF_PARALLEL instead of parallel_cpus 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: pbonzini@redhat.com, cota@braap.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Thereby decoupling the resulting translated code from the current state of the system. Reviewed-by: Richard Henderson Signed-off-by: Emilio G. Cota Signed-off-by: Richard Henderson --- target/m68k/helper.h | 1 + target/m68k/op_helper.c | 33 ++++++++++++++++++++------------- target/m68k/translate.c | 12 ++++++++++-- 3 files changed, 31 insertions(+), 15 deletions(-) -- 2.13.6 diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 475a1f2186..eebe52dae5 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -11,6 +11,7 @@ DEF_HELPER_2(set_sr, void, env, i32) DEF_HELPER_3(movec, void, env, i32, i32) DEF_HELPER_4(cas2w, void, env, i32, i32, i32) DEF_HELPER_4(cas2l, void, env, i32, i32, i32) +DEF_HELPER_4(cas2l_parallel, void, env, i32, i32, i32) #define dh_alias_fp ptr #define dh_ctype_fp FPReg * diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 7b5126c88d..63089511cb 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -361,6 +361,7 @@ void HELPER(divsll)(CPUM68KState *env, int numr, int regr, int32_t den) env->dregs[numr] = quot; } +/* We're executing in a serial context -- no need to be atomic. */ void HELPER(cas2w)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2) { uint32_t Dc1 = extract32(regs, 9, 3); @@ -374,17 +375,11 @@ void HELPER(cas2w)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2) int16_t l1, l2; uintptr_t ra = GETPC(); - if (parallel_cpus) { - /* Tell the main loop we need to serialize this insn. */ - cpu_loop_exit_atomic(ENV_GET_CPU(env), ra); - } else { - /* We're executing in a serial context -- no need to be atomic. */ - l1 = cpu_lduw_data_ra(env, a1, ra); - l2 = cpu_lduw_data_ra(env, a2, ra); - if (l1 == c1 && l2 == c2) { - cpu_stw_data_ra(env, a1, u1, ra); - cpu_stw_data_ra(env, a2, u2, ra); - } + l1 = cpu_lduw_data_ra(env, a1, ra); + l2 = cpu_lduw_data_ra(env, a2, ra); + if (l1 == c1 && l2 == c2) { + cpu_stw_data_ra(env, a1, u1, ra); + cpu_stw_data_ra(env, a2, u2, ra); } if (c1 != l1) { @@ -399,7 +394,8 @@ void HELPER(cas2w)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2) env->dregs[Dc2] = deposit32(env->dregs[Dc2], 0, 16, l2); } -void HELPER(cas2l)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2) +static void do_cas2l(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2, + bool parallel) { uint32_t Dc1 = extract32(regs, 9, 3); uint32_t Dc2 = extract32(regs, 6, 3); @@ -416,7 +412,7 @@ void HELPER(cas2l)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2) TCGMemOpIdx oi; #endif - if (parallel_cpus) { + if (parallel) { /* We're executing in a parallel context -- must be atomic. */ #ifdef CONFIG_ATOMIC64 uint64_t c, u, l; @@ -470,6 +466,17 @@ void HELPER(cas2l)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2) env->dregs[Dc2] = l2; } +void HELPER(cas2l)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2) +{ + do_cas2l(env, regs, a1, a2, false); +} + +void HELPER(cas2l_parallel)(CPUM68KState *env, uint32_t regs, uint32_t a1, + uint32_t a2) +{ + do_cas2l(env, regs, a1, a2, true); +} + struct bf_data { uint32_t addr; uint32_t bofs; diff --git a/target/m68k/translate.c b/target/m68k/translate.c index fdc26268d0..d751faed7c 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -2312,7 +2312,11 @@ DISAS_INSN(cas2w) (REG(ext1, 6) << 3) | (REG(ext2, 0) << 6) | (REG(ext1, 0) << 9)); - gen_helper_cas2w(cpu_env, regs, addr1, addr2); + if (tb_cflags(s->tb) & CF_PARALLEL) { + gen_helper_exit_atomic(cpu_env); + } else { + gen_helper_cas2w(cpu_env, regs, addr1, addr2); + } tcg_temp_free(regs); /* Note that cas2w also assigned to env->cc_op. */ @@ -2358,7 +2362,11 @@ DISAS_INSN(cas2l) (REG(ext1, 6) << 3) | (REG(ext2, 0) << 6) | (REG(ext1, 0) << 9)); - gen_helper_cas2l(cpu_env, regs, addr1, addr2); + if (tb_cflags(s->tb) & CF_PARALLEL) { + gen_helper_cas2l_parallel(cpu_env, regs, addr1, addr2); + } else { + gen_helper_cas2l(cpu_env, regs, addr1, addr2); + } tcg_temp_free(regs); /* Note that cas2l also assigned to env->cc_op. */