From patchwork Tue May 20 21:22:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 350886 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 04F9F140086 for ; Wed, 21 May 2014 07:23:59 +1000 (EST) Received: from localhost ([::1]:55530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmrVs-0005qg-Oh for incoming@patchwork.ozlabs.org; Tue, 20 May 2014 17:23:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmrVL-00055T-MN for qemu-devel@nongnu.org; Tue, 20 May 2014 17:23:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmrVE-0001SY-0m for qemu-devel@nongnu.org; Tue, 20 May 2014 17:23:23 -0400 Received: from mail-la0-x22b.google.com ([2a00:1450:4010:c03::22b]:43602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmrVD-0001ST-QG; Tue, 20 May 2014 17:23:15 -0400 Received: by mail-la0-f43.google.com with SMTP id mc6so899213lab.16 for ; Tue, 20 May 2014 14:23:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=op95T6wq0pPi0fVUuu6Y8lyHOl4Ii01ymK0dSTiyIIo=; b=WvBDHz3Krt6i/U8UgBNb1Mc5k0V5jBi1yumIMGaWgnk93trljK0YxInOc/4zOfvkcH tl2ARhAORXXyR0nosBU/NrImAP4t8nr9l2XsyI65YXsT5B20uRi9fsTJ0qYu37o/ywg8 a23s0ecWy1MHkDReR74Um7RWUnZVrnTMXgyxSWbQtwPQkmU9M6RP58+gRhqfY7asschW 86h89iFNSrkjTOVPU+XUIOnF3cAjajvyhej/blcBPL3UXpm73SNjHsFDCkVQ5ZxIDylX 7qy5eXe29Ct4TnaP0kh+L/9oWJsSNDw6toc97Xjg4uzIJLLtluJyKbNqICVqwlVBt9GU SJRQ== X-Received: by 10.112.154.102 with SMTP id vn6mr9334265lbb.55.1400620994615; Tue, 20 May 2014 14:23:14 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPSA id g3sm2332609lam.18.2014.05.20.14.23.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 May 2014 14:23:13 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Wed, 21 May 2014 01:22:28 +0400 Message-Id: <1400620950-32297-2-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1400620950-32297-1-git-send-email-jcmvbkbc@gmail.com> References: <1400620950-32297-1-git-send-email-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22b Cc: Max Filippov , qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 1/3] target-xtensa: fix cross-page jumps/calls at the end of TB X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use tb->pc instead of dc->pc to check for cross-page jumps. When TB translation stops at the page boundary dc->pc points to the next page allowing chaining to TBs in it, which is wrong. Cc: qemu-stable@nongnu.org Signed-off-by: Max Filippov --- target-xtensa/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 764cee9..dda105d 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -419,7 +419,7 @@ static void gen_jump(DisasContext *dc, TCGv dest) static void gen_jumpi(DisasContext *dc, uint32_t dest, int slot) { TCGv_i32 tmp = tcg_const_i32(dest); - if (((dc->pc ^ dest) & TARGET_PAGE_MASK) != 0) { + if (((dc->tb->pc ^ dest) & TARGET_PAGE_MASK) != 0) { slot = -1; } gen_jump_slot(dc, tmp, slot); @@ -447,7 +447,7 @@ static void gen_callw(DisasContext *dc, int callinc, TCGv_i32 dest) static void gen_callwi(DisasContext *dc, int callinc, uint32_t dest, int slot) { TCGv_i32 tmp = tcg_const_i32(dest); - if (((dc->pc ^ dest) & TARGET_PAGE_MASK) != 0) { + if (((dc->tb->pc ^ dest) & TARGET_PAGE_MASK) != 0) { slot = -1; } gen_callw_slot(dc, callinc, tmp, slot);