From nobody Wed Nov 5 17:23:01 2025 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 1496795929699561.8928924447788; Tue, 6 Jun 2017 17:38:49 -0700 (PDT) Received: from localhost ([::1]:40585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOzo-0000eM-Di for importer@patchew.org; Tue, 06 Jun 2017 20:38:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOsp-0002Mr-Et for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOso-0001pa-88 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:35 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35982) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOso-0001pO-3I for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:34 -0400 Received: by mail-qt0-x243.google.com with SMTP id s33so19303424qtg.3 for ; Tue, 06 Jun 2017 17:31:34 -0700 (PDT) Received: from bigtime.twiddle.net.com (71-217-91-69.tukw.qwest.net. [71.217.91.69]) by smtp.gmail.com with ESMTPSA id m47sm29286qtc.36.2017.06.06.17.31.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:32 -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=Fe9UlZNXwq9rjT/4dYudugs+SGZkffVdyfwu1uqeZ74=; b=HOZFoeVM+gyV4kGLfGs6JOqQogjd7S7bamEMJWsnhUEAXCbnBmabOM/Qga09FrVg4J 2imv6Tt8gWU05b+jQAodV70C2l7/SzH7J/ophP+Z4YO8XY06PmfpXIRGlOpS1bbo4fab +/d7959yDl8K8sYsf2B1kazdPAnVEjKOm0fwYhzqBM0mgf9d6G6Uq2cJew22qT8E1CKS ejOqIhBMH3Ktb1ynm873JT3gA4trhdP3Iz6W4ESyDAUvsmwvdgHNzcUGND1XrnJXqAOT EtFKm7YyuH9JIhG6URO2J/bRg1y7kZBdtpuNz4E5bfPQCTcXHuabmsUnBydAmaCu9A9a /elA== 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=Fe9UlZNXwq9rjT/4dYudugs+SGZkffVdyfwu1uqeZ74=; b=S1o93A6Fi4oDtf2g9i7i9wkA3Upmts3ORTvOcgYcXrGN3lKaiKx8wk/3VjdiEfGIGB lc0jnb6F5xJN6mi1yAkr/W7saoSz9RNOHlcT0JFneKzQzsfzlJQY6f1KMClgdKb0i0/X MZsexbJ/A4RbaD9irmXx1X946ZocS92gFxOhqf5EsJUifbzPFyPlejVP/qzVThtv+++o bzmDj+jTmOHRodnSGmp7WFBwDK4XzmEXyiPaH0/4vcZNUrYifkaNVY0+3ARKfQetKPSM n2Wa7UDTRj9LCVHQ0ExUzlQyiFdb/6o8h7z8Fn533fnrimzUklGubDNN3qO2ueVH2jQx bhCw== X-Gm-Message-State: AODbwcCPsrWE9o3X4YWEhRWQDqq3jjsNbJzzydrQU5MUygye1BRixMxY XUr6ZAcLHOh5Pwsh0wE= X-Received: by 10.200.40.9 with SMTP id 9mr36341667qtq.22.1496795493269; Tue, 06 Jun 2017 17:31:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:15 -0700 Message-Id: <20170607003119.14778-7-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170607003119.14778-1-rth@twiddle.net> References: <20170607003119.14778-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PULL v2 06/70] 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 b1c1047..2c26308 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4165,7 +4165,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