From patchwork Mon Feb 4 15:27:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 2093091 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 33ADADFE82 for ; Mon, 4 Feb 2013 15:51:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 174B3E6191 for ; Mon, 4 Feb 2013 07:51:38 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 63278E60D0 for ; Mon, 4 Feb 2013 07:29:40 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 04 Feb 2013 07:29:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,600,1355126400"; d="scan'208";a="257441976" Received: from unknown (HELO dyon.amr.corp.intel.com) ([10.255.12.132]) by orsmga001.jf.intel.com with ESMTP; 04 Feb 2013 07:29:39 -0800 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Mon, 4 Feb 2013 15:27:40 +0000 Message-Id: <1359991705-5254-46-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 1.7.7.5 In-Reply-To: <1359991705-5254-1-git-send-email-damien.lespiau@intel.com> References: <1359991705-5254-1-git-send-email-damien.lespiau@intel.com> Subject: [Intel-gfx] [PATCH 45/90] assembler: Unify the direct and indirect register type X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org They are all struct brw_reg registers now. Signed-off-by: Damien Lespiau --- assembler/gram.y | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/assembler/gram.y b/assembler/gram.y index 169026c..e015e0a 100644 --- a/assembler/gram.y +++ b/assembler/gram.y @@ -158,8 +158,7 @@ static void brw_program_add_label(struct brw_program *p, const char *label) struct brw_program program; struct region region; struct regtype regtype; - struct brw_reg direct_reg; - struct brw_reg indirect_reg; + struct brw_reg reg; struct condition condition; struct declared_register symbol_reg; imm32_t imm32; @@ -262,13 +261,13 @@ static void brw_program_add_label(struct brw_program *p, const char *label) %type predctrl predstate %type region region_wh indirectregion declare_srcregion; %type regtype -%type directgenreg directmsgreg addrreg accreg flagreg maskreg -%type maskstackreg notifyreg -/* %type maskstackdepthreg */ -%type statereg controlreg ipreg nullreg -%type dstoperandex_typed srcarchoperandex_typed -%type sendleadreg -%type indirectgenreg indirectmsgreg addrparam +%type directgenreg directmsgreg addrreg accreg flagreg maskreg +%type maskstackreg notifyreg +/* %type maskstackdepthreg */ +%type statereg controlreg ipreg nullreg +%type dstoperandex_typed srcarchoperandex_typed +%type sendleadreg +%type indirectgenreg indirectmsgreg addrparam %type mask_subreg maskstack_subreg %type declare_elementsize declare_dstregion declare_type /* %type maskstackdepth_subreg */ @@ -1955,7 +1954,7 @@ indirectsrcoperand: ; /* 1.4.4: Address Registers */ -/* Returns a partially-completed indirect_reg consisting of the address +/* Returns a partially-completed struct brw_reg consisting of the address * register fields for register-indirect access. */ addrparam: addrreg COMMA immaddroffset