From nobody Mon Feb 9 11:33:15 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.zohomail.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 1501825589707407.4476349163946; Thu, 3 Aug 2017 22:46:29 -0700 (PDT) Received: from localhost ([::1]:36664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVRJ-0005Ay-Ux for importer@patchew.org; Fri, 04 Aug 2017 01:46:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVPZ-0003rb-Bt for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddVPW-0003Az-UC for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:37 -0400 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:37013) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddVPW-00038r-MN for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:34 -0400 Received: by mail-pg0-x243.google.com with SMTP id 83so821932pgb.4 for ; Thu, 03 Aug 2017 22:44:34 -0700 (PDT) Received: from bigtime.twiddle.net (97-126-108-236.tukw.qwest.net. [97.126.108.236]) by smtp.gmail.com with ESMTPSA id o14sm1061063pfi.158.2017.08.03.22.44.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Aug 2017 22:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=X/0Co6YW9K1lstOeC237kzVIM42M5nyF0b897QyeSKE=; b=jqGLG4sAeFVdowsIuLoGgG2BFeacr4PsR1bYTpRYdMqxWMHVC3+0MpaYX8YOaJfrMb bJADp3Ch0ntkNRRuE+cQ0eAITrCyIis3jA3/K/Yb7E+TGZBya9jeNhcOOEiDbDlIJxnZ 0gQ6mZVza1RtwLHgs7dmJyyZaSd918JrNpnJqhhwt5i/4KJx0LipjzAGyDz2EsjHKRas lgQ1xsa2Mn+EljK9D1WHh7pw/uaSfG0eL+QVG8XTAxTl873AyYyrY3zKspjlFnEkdu4V q5oQ4LM+R7Rw7yvLeCBB7sFuoRGJSoCZzWtqxKiha2Zp7pannLTkfasrVfcRK8BzDYOL AYUw== 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:subject:date:message-id :in-reply-to:references; bh=X/0Co6YW9K1lstOeC237kzVIM42M5nyF0b897QyeSKE=; b=j0EqWH9Knvq1F5go12RSCBYEmFX4aKC4Xwg0zv2e7GG1tMwn9+d0Ic7TdCgCdDyeVG /FX/+/74u9fY0CsSwM1hkfps43IHvaMPyong8KjTwyVTP14vmY+PTsVe62qS+CIEtriW /VnJo6eIysRWSLJQ8CPtLdXtugY5HNagQ/g6h8vHxtZoesy3oYMZWptEduwdXsxWpojI IOYZfQSRvD6grgqnm7Z22K8gC7l2oJAJReJttG7oc6C8QZ6gg3nIIHSOuX/QWBcDWzbn bOkmNWLF0fR2YkTJnNy0KCt70cFZz8GiI9f3j+JZ3tQ/e6tAtqQRdTgLCsrNsw98H2QC rnkA== X-Gm-Message-State: AIVw110wXKtYOReENEh0IrNOKYMamzALQo6aQdtgoNeZikmsueo6M5d2 VjbH7qhY64qz8U3zytY= X-Received: by 10.84.171.195 with SMTP id l61mr1452096plb.464.1501825473469; Thu, 03 Aug 2017 22:44:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 3 Aug 2017 22:44:09 -0700 Message-Id: <20170804054426.10590-7-rth@twiddle.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170804054426.10590-1-rth@twiddle.net> References: <20170804054426.10590-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::243 Subject: [Qemu-devel] [PATCH for-2.11 06/23] tcg/s390: Fix sign of patch_reloc addend 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+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" We were passing in -2 instead of +2, but then ignoring the actual contents of addend in the calculation. Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.inc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c index e007586315..59c0da0922 100644 --- a/tcg/s390/tcg-target.inc.c +++ b/tcg/s390/tcg-target.inc.c @@ -360,21 +360,22 @@ uint64_t s390_facilities; static void patch_reloc(tcg_insn_unit *code_ptr, int type, intptr_t value, intptr_t addend) { - intptr_t pcrel2 =3D (tcg_insn_unit *)value - (code_ptr - 1); - tcg_debug_assert(addend =3D=3D -2); + intptr_t pcrel2; + + value +=3D addend; + pcrel2 =3D (tcg_insn_unit *)value - code_ptr; =20 switch (type) { case R_390_PC16DBL: - tcg_debug_assert(pcrel2 =3D=3D (int16_t)pcrel2); + assert(pcrel2 =3D=3D (int16_t)pcrel2); tcg_patch16(code_ptr, pcrel2); break; case R_390_PC32DBL: - tcg_debug_assert(pcrel2 =3D=3D (int32_t)pcrel2); + assert(pcrel2 =3D=3D (int32_t)pcrel2); tcg_patch32(code_ptr, pcrel2); break; default: - tcg_abort(); - break; + g_assert_not_reached(); } } =20 @@ -1270,11 +1271,11 @@ static void tgen_branch(TCGContext *s, int cc, TCGL= abel *l) tgen_gotoi(s, cc, l->u.value_ptr); } else if (USE_LONG_BRANCHES) { tcg_out16(s, RIL_BRCL | (cc << 4)); - tcg_out_reloc(s, s->code_ptr, R_390_PC32DBL, l, -2); + tcg_out_reloc(s, s->code_ptr, R_390_PC32DBL, l, 2); s->code_ptr +=3D 2; } else { tcg_out16(s, RI_BRC | (cc << 4)); - tcg_out_reloc(s, s->code_ptr, R_390_PC16DBL, l, -2); + tcg_out_reloc(s, s->code_ptr, R_390_PC16DBL, l, 2); s->code_ptr +=3D 1; } } @@ -1289,7 +1290,7 @@ static void tgen_compare_branch(TCGContext *s, S390Op= code opc, int cc, } else { /* We need to keep the offset unchanged for retranslation. */ off =3D s->code_ptr[1]; - tcg_out_reloc(s, s->code_ptr + 1, R_390_PC16DBL, l, -2); + tcg_out_reloc(s, s->code_ptr + 1, R_390_PC16DBL, l, 2); } =20 tcg_out16(s, (opc & 0xff00) | (r1 << 4) | r2); @@ -1307,7 +1308,7 @@ static void tgen_compare_imm_branch(TCGContext *s, S3= 90Opcode opc, int cc, } else { /* We need to keep the offset unchanged for retranslation. */ off =3D s->code_ptr[1]; - tcg_out_reloc(s, s->code_ptr + 1, R_390_PC16DBL, l, -2); + tcg_out_reloc(s, s->code_ptr + 1, R_390_PC16DBL, l, 2); } =20 tcg_out16(s, (opc & 0xff00) | (r1 << 4) | cc); @@ -1571,7 +1572,7 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s, = TCGLabelQemuLdst *lb) TCGMemOpIdx oi =3D lb->oi; TCGMemOp opc =3D get_memop(oi); =20 - patch_reloc(lb->label_ptr[0], R_390_PC16DBL, (intptr_t)s->code_ptr, -2= ); + patch_reloc(lb->label_ptr[0], R_390_PC16DBL, (intptr_t)s->code_ptr, 2); =20 tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_R2, TCG_AREG0); if (TARGET_LONG_BITS =3D=3D 64) { @@ -1592,7 +1593,7 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s, = TCGLabelQemuLdst *lb) TCGMemOpIdx oi =3D lb->oi; TCGMemOp opc =3D get_memop(oi); =20 - patch_reloc(lb->label_ptr[0], R_390_PC16DBL, (intptr_t)s->code_ptr, -2= ); + patch_reloc(lb->label_ptr[0], R_390_PC16DBL, (intptr_t)s->code_ptr, 2); =20 tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_R2, TCG_AREG0); if (TARGET_LONG_BITS =3D=3D 64) { --=20 2.13.3