From patchwork Fri Dec 14 03:18:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153727 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1605216ljp; Thu, 13 Dec 2018 19:37:36 -0800 (PST) X-Google-Smtp-Source: AFSGD/XBnKqPTMLlgzu+BnD9eYFHcrclsLOkpdekJ1iZLBr+bQcUOze7woU6kayKsUwdNvuQkINj X-Received: by 2002:ac8:2c34:: with SMTP id d49mr1328258qta.152.1544758656395; Thu, 13 Dec 2018 19:37:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544758656; cv=none; d=google.com; s=arc-20160816; b=qv/zYKcIJvlHWJ+m2L4r+rzeoEbNK8hXKhUTe9zYly3b86LALK2Y4wZedGF4ERs0ns 0J9tAAcecThqZiBfjZSw6puOU37AEC+lQQYh5Fj857lXPU4pPhTAx3yBkfv801+T1TWi DNE7TDU+34KjaW7o0dsulQ2QnRlQ6DB/VtC/zIkTnQxSJbHUdNrhoTqZDPbJiay0p7Hg VNuEDLf0PIV0U6dVncWsx9EVyqbS3X2btrAUwOuSl7Fhs5V6fVvmyctFa9Uvqm2PGF9d D0E97Sbbw66oM0guM7ZZRLZkswv+O5c+LksR524nZc9p6onxqKUd7KIzIZIbBgx9ULmp n06w== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=yGI0DQBrYmbbF5yNTiceyVNuONNc8y56jnkN6aCaCvM=; b=KhUq9NHjSFXRB1FJ6ZbONQcVxsemJFRQRIlojz2VddWJs+3el+Ev6bbSVo9l//v3qr F14IRxIMMbk4Of2srjAzyYxhPTe9I4KbdWK9W1Nsq35EEMFLByVrS3hpAe6cP8qCD5hc AKCYV9okBV6mZcsiHMCE7bsVNF6iwafMaY0LrMxJCW0dmGg7GjygX6VvFp85QjaVNiMa 3ON3OfCW/miBvvRagrKV34lghYHPS+UiP1J10MdF4doBh+Nqlf9oke51a7P4gYcbFcDm 2gocOMr0r/ECxPhErGCkXkH+PztayXoiR7hcq5rQJ+R+4WuUaU1CX3xJiHvFLrZbo0MX J9og== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=J70V09da; 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 g34si220138qte.104.2018.12.13.19.37.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 19:37:36 -0800 (PST) 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=J70V09da; 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]:59143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXeIB-0004Fn-Fn for patch@linaro.org; Thu, 13 Dec 2018 22:37:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXe0n-0005uu-QU for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXe0m-0006cq-QA for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:37 -0500 Received: from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]:41316) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXe0m-0006ai-JE for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:36 -0500 Received: by mail-ot1-x334.google.com with SMTP id u16so4105186otk.8 for ; Thu, 13 Dec 2018 19:19:36 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=yGI0DQBrYmbbF5yNTiceyVNuONNc8y56jnkN6aCaCvM=; b=J70V09dauxm3M6NrRt/o1ZH80fRRIHkUupR5qtw4sSchM0Qwf4Ob7B3LVIfhMr8IXZ z1iAw1h78W9Y5ZMk69ARvu0awpUl04Q2x5Jl/LLs0txY8UExmpFwolbcRAf9bt97MCpl Bvk0GobIQ0gp8/Ib3ENvDdFhFLtdJviRUgkhs= 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:mime-version:content-transfer-encoding; bh=yGI0DQBrYmbbF5yNTiceyVNuONNc8y56jnkN6aCaCvM=; b=R9qSc3g+qkjueJWlTKiGrei/kOt9Ohw/cH4IYW5A5QRyLW1pR3XB4HqWCTIAwMZlaR 6VRFrmv4iKhMNXdIyYdWu3aMn91+54SMpY7yvicebeC4xnyBUoGXO46iyCojvHHN9PEy VMZOPNBfgfyQfHr9rsjxgJTnMjJ6WNLQiqnM4ZimO2JVPAAizISS9hu42lKxGaZXIo/P /oGBrQHIJD/6PTqtGDIfxijpjkKhEDwsfEHwpXvmy3RLV0V7qymCNRzbsapML7Unk2ww dM/2Bp16V6nOPOhAqIqGeLezVnKB7e7CkznY5nTsyJq7jlhR49yUUykjZfXDJsHA2lRX YxMA== X-Gm-Message-State: AA+aEWYZMBaizVYu124ATYlGaaY0FsuIZn9BCMjXkI5WYehWZaYiIhN8 RDrSqog6mv2f3/zKJNGgs47qXV/KdXJRIg== X-Received: by 2002:a9d:6287:: with SMTP id x7mr1011247otk.304.1544757575577; Thu, 13 Dec 2018 19:19:35 -0800 (PST) Received: from cloudburst.twiddle.net ([187.217.227.243]) by smtp.gmail.com with ESMTPSA id g138sm2367537oib.26.2018.12.13.19.19.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Dec 2018 19:19:34 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 21:18:59 -0600 Message-Id: <20181214031923.29527-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181214031923.29527-1-richard.henderson@linaro.org> References: <20181214031923.29527-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::334 Subject: [Qemu-devel] [PULL 08/32] tcg/s390: Remove retranslation code 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There is no longer a need for preserving branch offset operands, as we no longer re-translate. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.inc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) -- 2.17.2 diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c index 17c435ade5..96c344142e 100644 --- a/tcg/s390/tcg-target.inc.c +++ b/tcg/s390/tcg-target.inc.c @@ -1329,13 +1329,11 @@ static void tgen_branch(TCGContext *s, int cc, TCGLabel *l) static void tgen_compare_branch(TCGContext *s, S390Opcode opc, int cc, TCGReg r1, TCGReg r2, TCGLabel *l) { - intptr_t off; + intptr_t off = 0; if (l->has_value) { off = l->u.value_ptr - s->code_ptr; } else { - /* We need to keep the offset unchanged for retranslation. */ - off = s->code_ptr[1]; tcg_out_reloc(s, s->code_ptr + 1, R_390_PC16DBL, l, 2); } @@ -1347,13 +1345,11 @@ static void tgen_compare_branch(TCGContext *s, S390Opcode opc, int cc, static void tgen_compare_imm_branch(TCGContext *s, S390Opcode opc, int cc, TCGReg r1, int i2, TCGLabel *l) { - tcg_target_long off; + tcg_target_long off = 0; if (l->has_value) { off = l->u.value_ptr - s->code_ptr; } else { - /* We need to keep the offset unchanged for retranslation. */ - off = s->code_ptr[1]; tcg_out_reloc(s, s->code_ptr + 1, R_390_PC16DBL, l, 2); } @@ -1696,7 +1692,6 @@ static void tcg_out_qemu_ld(TCGContext* s, TCGReg data_reg, TCGReg addr_reg, base_reg = tcg_out_tlb_read(s, addr_reg, opc, mem_index, 1); - /* We need to keep the offset unchanged for retranslation. */ tcg_out16(s, RI_BRC | (S390_CC_NE << 4)); label_ptr = s->code_ptr; s->code_ptr += 1; @@ -1724,7 +1719,6 @@ static void tcg_out_qemu_st(TCGContext* s, TCGReg data_reg, TCGReg addr_reg, base_reg = tcg_out_tlb_read(s, addr_reg, opc, mem_index, 0); - /* We need to keep the offset unchanged for retranslation. */ tcg_out16(s, RI_BRC | (S390_CC_NE << 4)); label_ptr = s->code_ptr; s->code_ptr += 1;