From nobody Sun Feb 8 18:03:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496598287571866.7186969307446; Sun, 4 Jun 2017 10:44:47 -0700 (PDT) Received: from localhost ([::1]:57865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZa2-0007kG-3h for importer@patchew.org; Sun, 04 Jun 2017 13:44:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZQx-0007FO-4j for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZQv-0002jo-WC for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:23 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:33362) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZQv-0002jH-Oe for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:21 -0400 Received: by mail-pf0-x243.google.com with SMTP id f27so18145708pfe.0 for ; Sun, 04 Jun 2017 10:35:21 -0700 (PDT) Received: from bigtime.ASUS (cpe-98-155-27-246.hawaii.res.rr.com. [98.155.27.246]) by smtp.gmail.com with ESMTPSA id j191sm52854419pgc.53.2017.06.04.10.35.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zOEnny+FXc63rVcU1Jj6dtnyiLz13xyM9QYlW4x23uE=; b=Q26zcu+qUVWDilOzP3Wcs8RlsP5+/rjrs1yka5xGDExuV/9kLvGKu6l+3CLlW4wh6D xEeYUsp63AFEpekXghRK9RY6UIQs3jXTJ7las4Ewv0Fm7A7q1GkHEK3nyUE2zeiLhijb DjKag3tA6vXuvJqjiYWuO1ipCXpn9oxhUcBzMIhipC71Kb+e2RmguNGBXbYRt19Np275 su+rGgfJNYVfY+3902Fyim58sbwGooH3Qspsa2MKTM4Sm94zHno4k8j9Md5i5nwcc+5L 4ZmUUXLCZfUr6UdF7bRqdJ8sazXPbnlKWAIioB3ZXuBIHxgGo2zP3f2jjtNrT1Dj0nR6 OyPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=zOEnny+FXc63rVcU1Jj6dtnyiLz13xyM9QYlW4x23uE=; b=tWYi2RKczu/8Ez+/73w7eau6+r+R2btsaVXRSHAwPZM8OMkUkVVUPOL5wv7kG2ni5w JOKzRWkI7WMu56p6h6yR3308Tc0ipcNYnmYtByl7jXVcEeki0M+655XgPXpJMCn+gVGq WHMFn4pskO6RNo1lWp0jpni8PBQmJbuy794HYFUst2W0FH1mi37yjUbYF3cc3Jw5/Hk0 R1RIoGQohDcfme3m5Ou4Y+ij1wyRODCLW2fMTK3BKlUqk3hLOHO1x4AurjRWqAyPxsvC gkqQQzpp9SaNk1ESoFH5LoYZ8dxUC/LDwuMZ8iGRPXF3lehBFup9dEuzkx46tijL++3c GyPg== X-Gm-Message-State: AODbwcC7gVppwnovjgs2DPA5Rq+1/NrzLGrNweAnkggLwwjPdvGrb6ye aDd/Y+Mqlvq5ru5pwtc= X-Received: by 10.84.174.197 with SMTP id r63mr10680216plb.36.1496597720654; Sun, 04 Jun 2017 10:35:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:06 -0700 Message-Id: <20170604173509.29684-7-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170604173509.29684-1-rth@twiddle.net> References: <20170604173509.29684-1-rth@twiddle.net> 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] [PULL 06/69] target/s390x: Use unwind data for helper_xc 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: peter.maydell@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 44 ++++++++++++++++++++++++-------------------- target/s390x/translate.c | 1 - 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index b4b50d1..b71437a 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -57,7 +57,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessT= ype access_type, #endif =20 /* Reduce the length so that addr + len doesn't cross a page boundary. */ -static inline uint64_t adj_len_to_page(uint64_t len, uint64_t addr) +static inline uint32_t adj_len_to_page(uint32_t len, uint64_t addr) { #ifndef CONFIG_USER_ONLY if ((addr & ~TARGET_PAGE_MASK) + len - 1 >=3D TARGET_PAGE_SIZE) { @@ -68,7 +68,7 @@ static inline uint64_t adj_len_to_page(uint64_t len, uint= 64_t addr) } =20 static void fast_memset(CPUS390XState *env, uint64_t dest, uint8_t byte, - uint32_t l) + uint32_t l, uintptr_t ra) { int mmu_idx =3D cpu_mmu_index(env, false); =20 @@ -76,14 +76,14 @@ static void fast_memset(CPUS390XState *env, uint64_t de= st, uint8_t byte, void *p =3D tlb_vaddr_to_host(env, dest, MMU_DATA_STORE, mmu_idx); if (p) { /* Access to the whole page in write mode granted. */ - int l_adj =3D adj_len_to_page(l, dest); + uint32_t l_adj =3D adj_len_to_page(l, dest); memset(p, byte, l_adj); dest +=3D l_adj; l -=3D l_adj; } else { /* We failed to get access to the whole page. The next write access will likely fill the QEMU TLB for the next iteration= . */ - cpu_stb_data(env, dest, byte); + cpu_stb_data_ra(env, dest, byte, ra); dest++; l--; } @@ -100,7 +100,7 @@ static void fast_memmove(CPUS390XState *env, uint64_t d= est, uint64_t src, void *dest_p =3D tlb_vaddr_to_host(env, dest, MMU_DATA_STORE, mmu_= idx); if (src_p && dest_p) { /* Access to both whole pages granted. */ - int l_adj =3D adj_len_to_page(l, src); + uint32_t l_adj =3D adj_len_to_page(l, src); l_adj =3D adj_len_to_page(l_adj, dest); memmove(dest_p, src_p, l_adj); src +=3D l_adj; @@ -144,30 +144,34 @@ uint32_t HELPER(nc)(CPUS390XState *env, uint32_t l, u= int64_t dest, } =20 /* xor on array */ -uint32_t HELPER(xc)(CPUS390XState *env, uint32_t l, uint64_t dest, - uint64_t src) +static uint32_t do_helper_xc(CPUS390XState *env, uint32_t l, uint64_t dest, + uint64_t src, uintptr_t ra) { - int i; - unsigned char x; - uint32_t cc =3D 0; + uint32_t i; + uint8_t c =3D 0; =20 HELPER_LOG("%s l %d dest %" PRIx64 " src %" PRIx64 "\n", __func__, l, dest, src); =20 /* xor with itself is the same as memset(0) */ if (src =3D=3D dest) { - fast_memset(env, dest, 0, l + 1); + fast_memset(env, dest, 0, l + 1, ra); return 0; } =20 for (i =3D 0; i <=3D l; i++) { - x =3D cpu_ldub_data(env, dest + i) ^ cpu_ldub_data(env, src + i); - if (x) { - cc =3D 1; - } - cpu_stb_data(env, dest + i, x); + uint8_t x =3D cpu_ldub_data_ra(env, src + i, ra); + x ^=3D cpu_ldub_data_ra(env, dest + i, ra); + c |=3D x; + cpu_stb_data_ra(env, dest + i, x, ra); } - return cc; + return c !=3D 0; +} + +uint32_t HELPER(xc)(CPUS390XState *env, uint32_t l, uint64_t dest, + uint64_t src) +{ + return do_helper_xc(env, l, dest, src, GETPC()); } =20 /* or on array */ @@ -206,7 +210,7 @@ void HELPER(mvc)(CPUS390XState *env, uint32_t l, uint64= _t dest, uint64_t src) /* mvc with source pointing to the byte after the destination is the same as memset with the first source byte */ if (dest =3D=3D (src + 1)) { - fast_memset(env, dest, cpu_ldub_data(env, src), l + 1); + fast_memset(env, dest, cpu_ldub_data(env, src), l + 1, 0); return; } =20 @@ -1235,8 +1239,8 @@ uint32_t HELPER(ex)(CPUS390XState *env, uint32_t cc, = uint64_t v1, get_address(env, 0, b2, d2), 0); break; case 0x700: - cc =3D helper_xc(env, l, get_address(env, 0, b1, d1), - get_address(env, 0, b2, d2)); + cc =3D do_helper_xc(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); break; case 0xc00: helper_tr(env, l, get_address(env, 0, b1, d1), diff --git a/target/s390x/translate.c b/target/s390x/translate.c index db86b70..40a4099 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4160,7 +4160,6 @@ static ExitStatus op_xc(DisasContext *s, DisasOps *o) /* But in general we'll defer to a helper. */ o->in2 =3D get_address(s, 0, b2, d2); t32 =3D tcg_const_i32(l); - potential_page_fault(s); gen_helper_xc(cc_op, cpu_env, t32, o->addr1, o->in2); tcg_temp_free_i32(t32); set_cc_static(s); --=20 2.9.4