From patchwork Wed Sep 2 05:51:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 513300 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 CCC541401E7 for ; Wed, 2 Sep 2015 15:57:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=arHWEOqU; dkim-atps=neutral Received: from localhost ([::1]:33992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX13L-0003ZF-Qp for incoming@patchwork.ozlabs.org; Wed, 02 Sep 2015 01:57:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX0yU-0003WL-V3 for qemu-devel@nongnu.org; Wed, 02 Sep 2015 01:52:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZX0yU-0004Jy-7U for qemu-devel@nongnu.org; Wed, 02 Sep 2015 01:52:46 -0400 Received: from mail-qg0-x22d.google.com ([2607:f8b0:400d:c04::22d]:35509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX0yU-0004Jt-3a for qemu-devel@nongnu.org; Wed, 02 Sep 2015 01:52:46 -0400 Received: by qgt47 with SMTP id 47so11867772qgt.2 for ; Tue, 01 Sep 2015 22:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Tiokc7sPVhIwc/diFR8YtMtiWjIAdGXGnBgqCU4NVww=; b=arHWEOqU183+4fWwEQt40D4p8lOSS2ip/NmIY4ylWABrCxM+DHfS1jpNU6GZDM8K2f sRsdJq/kXI63VJdI8L8ZgeXnXA8SU/WZ5mPjRiIndAckhZA8buMmwxbeNtapgtuy0k6s 2Pe8qlU1zywNWEPrjK9xQ9ND4ohgtD+eKXXxigiyvR12JRuSqut8RBS5AF4cGZT6X1+p xQOrVD1D+KpYAHaxEW55lcA6L4Rpz2sAD9ibaQbYhIaIPqBdeAvkPuMRFY+5rFoa663h bA8j4G20lG7DapU8f39yHBBp2gvyfNO4AkzuRYqLbo05AB68q6rM1WRpOb/+ikLBBAfM MGsA== X-Received: by 10.140.146.196 with SMTP id 187mr30693850qhs.76.1441173165773; Tue, 01 Sep 2015 22:52:45 -0700 (PDT) Received: from bigtime.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by smtp.gmail.com with ESMTPSA id 67sm12191285qhs.8.2015.09.01.22.52.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Sep 2015 22:52:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 1 Sep 2015 22:51:49 -0700 Message-Id: <1441173123-25540-7-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1441173123-25540-1-git-send-email-rth@twiddle.net> References: <1441173123-25540-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::22d Cc: dl.soluz@gmx.net, atar4qemu@gmail.com, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 06/20] target-mips: Add delayed branch state to insn_start 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 Signed-off-by: Richard Henderson --- target-mips/cpu.h | 1 + target-mips/translate.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target-mips/cpu.h b/target-mips/cpu.h index c91883d..0a53568 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -132,6 +132,7 @@ struct CPUMIPSFPUContext { }; #define NB_MMU_MODES 3 +#define TARGET_INSN_START_EXTRA_WORDS 2 typedef struct CPUMIPSMVPContext CPUMIPSMVPContext; struct CPUMIPSMVPContext { diff --git a/target-mips/translate.c b/target-mips/translate.c index 9226420..320adef 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -20175,6 +20175,7 @@ gen_intermediate_code_internal(MIPSCPU *cpu, TranslationBlock *tb, ctx.CP0_Config1 = env->CP0_Config1; ctx.tb = tb; ctx.bstate = BS_NONE; + ctx.btarget = 0; ctx.kscrexist = (env->CP0_Config4 >> CP0C4_KScrExist) & 0xff; ctx.rxi = (env->CP0_Config3 >> CP0C3_RXI) & 1; ctx.ie = (env->CP0_Config4 >> CP0C4_IE) & 3; @@ -20230,7 +20231,7 @@ gen_intermediate_code_internal(MIPSCPU *cpu, TranslationBlock *tb, tcg_ctx.gen_opc_instr_start[lj] = 1; tcg_ctx.gen_opc_icount[lj] = num_insns; } - tcg_gen_insn_start(ctx.pc); + tcg_gen_insn_start(ctx.pc, ctx.hflags & MIPS_HFLAG_BMASK, ctx.btarget); if (num_insns + 1 == max_insns && (tb->cflags & CF_LAST_IO)) { gen_io_start();