From patchwork Mon Jan 7 16:31:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 154924 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3677806ljp; Mon, 7 Jan 2019 08:42:36 -0800 (PST) X-Google-Smtp-Source: ALg8bN4Ae6ah51SFFJampPOqFw/nNOswF/tgsvBicS6vH80uda1ILfMpCht9zzQ3oLAEEuc8d2q8 X-Received: by 2002:adf:ea81:: with SMTP id s1mr50529500wrm.309.1546879356564; Mon, 07 Jan 2019 08:42:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546879356; cv=none; d=google.com; s=arc-20160816; b=pe9S2PaoEG7IbRTiN75Ps5Mt00K/gyUhnKoemUxg3nAtnXsuh+pzGlaQ8P75xZ5r9u x2E2zwjo/IFQ6SDlt1XbEAHGqioJ/nKFGGrPQD/TRmec0gwqU1kACKuOHWg8xJm+0a39 3hYNXgSFe9NDCecLja3/b6xltH0ZpWWabLC8d8H0/CQ3V+h/qSnGInJ+oD9g2/os9Tuy 0Ejz1rS0GmUuOK0wRmJn5L8E8mMCMXnTapXXYx4RwEbG0+3HWNklhUD0NcUoE+q9YzgH NX7wW5/YagGulyWFb5t/IzWUfX/cw+jOA2LvVqHASlTmGY9J/C5wsqU2cya7MuzHale7 icRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=4t2j3JlI3wCS/gpNiHag2Gqqa/xd788Q4yu+HY0+oFg=; b=PX00dUhV6q0ve7fABUWdxirj49QAM/WYiyUqUYcR+va+nfjMMXYvy2D7nRPEnNW7Y4 vX8yJFEnG6gVoNTLeCS6xl1dPSm1tyE7UeVa7XFmtBEd3s389wJ7wPym5I5ZYM5NXUyg Csm6f3wDi2Lz5WrC1T+KGvYA2xa5Ycz5TqxdJIH7Mlzw3jeymHv1PgjCOW745ma+ETJI I9XH70wJDROYx3vQ77vp/WMRrDBVRDGVtII+p0lDgnms0uoJIgP9jtM6IvVG2HkSTpvH XqGFPlCrJG/lj5Vkj4KyJQ+51OX8h5dx5Z8ASop0uppw6E2epE4rlajpsctLRiPa02lW C0/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S2dKX0rG; 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 x14si34950346wrs.221.2019.01.07.08.42.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Jan 2019 08:42:36 -0800 (PST) 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=S2dKX0rG; 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]:44989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggXz1-000583-Ff for patch@linaro.org; Mon, 07 Jan 2019 11:42:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggXpR-0005jc-9X for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:32:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggXpP-0003Gq-7H for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:32:41 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:42854) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggXpN-0002X6-95 for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:32:38 -0500 Received: by mail-wr1-x434.google.com with SMTP id q18so1049192wrx.9 for ; Mon, 07 Jan 2019 08:32:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=4t2j3JlI3wCS/gpNiHag2Gqqa/xd788Q4yu+HY0+oFg=; b=S2dKX0rG9bBZGfYTRP5EPiT+G9Xa/k6L47Ny7ttoUunw9oJI+02JfQArwShtbFzjbG Mm3/gyRSoeccSUHc/+EhhjkziR6I7ZBgAB3Il1uP0xz50JIRlHdASPM93UZS8uQszHeE ux9U72mXhHWGru4ylstyaCK31eIQ6SFvBXIuA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4t2j3JlI3wCS/gpNiHag2Gqqa/xd788Q4yu+HY0+oFg=; b=c7Bx8XkHtcUz3vIIl95QAP/3ejzVXI+h+ihNBcG1ke9dyN010E7LaTEPhtPMlFedDi iArK+s9PP07p4hL+6wK47bzr63C5eU9Z9g29PX1L47eGg2PUylaEjzFnlR4fJu5r1fKi mOHuFu1gdz6p9FeXDx2jWjzuiHBUvAl5y2OPVgAngoSV1OltWHtVvayXHfFp/7+dYR0E QlaALKv7yAxMRklYRoSIRWmCu1RbEB/3jHmZEXbXSgJuWF1pFf8Yk7WZ3AYQRzI1jhXC OawsHq1IotjDu5P8qKgM4Da78uoNTlR7JneL6ZtDkx4xyV6YQdF92mAjtJ7Q0VZr0N0G zhtQ== X-Gm-Message-State: AJcUukeUOD4GdfEIC47V3krEkndqXXn/5+NIFHgNnV+TGYUsYUPU/fPC JLILe3cOuwnxAZL44vAcW5xJs1Y6j/RnJQ== X-Received: by 2002:a5d:6244:: with SMTP id m4mr41724613wrv.314.1546878723673; Mon, 07 Jan 2019 08:32:03 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j14sm46039759wrv.96.2019.01.07.08.32.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Jan 2019 08:32:03 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2019 16:31:15 +0000 Message-Id: <20190107163117.16269-36-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190107163117.16269-1-peter.maydell@linaro.org> References: <20190107163117.16269-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 35/37] target/arm: Emit barriers for A32/T32 load-acquire/store-release insns 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now that MTTCG is here, the comment in the 32-bit Arm decoder that "Since the emulation does not have barriers, the acquire/release semantics need no special handling" is no longer true. Emit the correct barriers for the load-acquire/store-release insns, as we already do in the A64 decoder. Signed-off-by: Peter Maydell Tested-by: Alex Bennée Reviewed-by: Alex Bennée --- target/arm/translate.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) -- 2.19.2 diff --git a/target/arm/translate.c b/target/arm/translate.c index ed3db0c3946..66cf28c8cbe 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9733,6 +9733,8 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) rd = (insn >> 12) & 0xf; if (insn & (1 << 23)) { /* load/store exclusive */ + bool is_ld = extract32(insn, 20, 1); + bool is_lasr = !extract32(insn, 8, 1); int op2 = (insn >> 8) & 3; op1 = (insn >> 21) & 0x3; @@ -9760,11 +9762,12 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) addr = tcg_temp_local_new_i32(); load_reg_var(s, addr, rn); - /* Since the emulation does not have barriers, - the acquire/release semantics need no special - handling */ + if (is_lasr && !is_ld) { + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_STRL); + } + if (op2 == 0) { - if (insn & (1 << 20)) { + if (is_ld) { tmp = tcg_temp_new_i32(); switch (op1) { case 0: /* lda */ @@ -9810,7 +9813,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) } tcg_temp_free_i32(tmp); } - } else if (insn & (1 << 20)) { + } else if (is_ld) { switch (op1) { case 0: /* ldrex */ gen_load_exclusive(s, rd, 15, addr, 2); @@ -9847,6 +9850,10 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) } } tcg_temp_free_i32(addr); + + if (is_lasr && is_ld) { + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_LDAQ); + } } else if ((insn & 0x00300f00) == 0) { /* 0bcccc_0001_0x00_xxxx_xxxx_0000_1001_xxxx * - SWP, SWPB @@ -10862,6 +10869,8 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) tcg_gen_addi_i32(tmp, tmp, s->pc); store_reg(s, 15, tmp); } else { + bool is_lasr = false; + bool is_ld = extract32(insn, 20, 1); int op2 = (insn >> 6) & 0x3; op = (insn >> 4) & 0x3; switch (op2) { @@ -10883,12 +10892,18 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) case 3: /* Load-acquire/store-release exclusive */ ARCH(8); + is_lasr = true; break; } + + if (is_lasr && !is_ld) { + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_STRL); + } + addr = tcg_temp_local_new_i32(); load_reg_var(s, addr, rn); if (!(op2 & 1)) { - if (insn & (1 << 20)) { + if (is_ld) { tmp = tcg_temp_new_i32(); switch (op) { case 0: /* ldab */ @@ -10927,12 +10942,16 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) } tcg_temp_free_i32(tmp); } - } else if (insn & (1 << 20)) { + } else if (is_ld) { gen_load_exclusive(s, rs, rd, addr, op); } else { gen_store_exclusive(s, rm, rs, rd, addr, op); } tcg_temp_free_i32(addr); + + if (is_lasr && is_ld) { + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_LDAQ); + } } } else { /* Load/store multiple, RFE, SRS. */