From patchwork Tue Mar 7 16:43:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9609413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1B07C6046A for ; Tue, 7 Mar 2017 16:45:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E080E1FF8F for ; Tue, 7 Mar 2017 16:45:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D582227D9B; Tue, 7 Mar 2017 16:45:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 674511FF8F for ; Tue, 7 Mar 2017 16:45:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clID2-0000y9-7E; Tue, 07 Mar 2017 16:43:36 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clID0-0000xQ-Rk for xen-devel@lists.xenproject.org; Tue, 07 Mar 2017 16:43:34 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id A7/CB-15112-633EEB85; Tue, 07 Mar 2017 16:43:34 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNIsWRWlGSWpSXmKPExsXS6fjDS9fo8b4 Igyfz5Sy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyf7/uZCpZrVsx7rdrAuFSpi5GTQ0ggT2LO xWtMIDavgJ3E+qZZLCC2hIChxNP319lAbBYBVYlvj7eyg9hsAuoSbc+2s3YxcnCICBhInDuaB GIyC+hLbFsH1iks4Cmxc94fJojpRRJbpvwB6+QUsJfY+usCWCevgKDE3x3CIGFmoKU3Vr5nnM DIMwshMwtJBsLWknj46xYLhK0tsWzha+ZZYHulJZb/44AIO0h0HJnIjqoExPaWePvhOesCRo5 VjBrFqUVlqUW6huZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiBgcoABDsYb28M OMQoycGkJMr748meCCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvM809kYICRalpqdWpGXmAGMGJ i3BwaMkwrsTJM1bXJCYW5yZDpE6xagoJc6roAmUEABJZJTmwbXB4vQSo6yUMC8j0CFCPAWpRb mZJajyrxjFORiVhHmlQKbwZOaVwE1/BbSYCWixn8xOkMUliQgpqQZGjS0xTUsCdgc6qqee7F+ 22ut9mF3etA0Bc1ZJF13bUMaqJvWcfanRnflST8snrnh4wmpuyrK47yk/f2n28evr/Llzkc1B jleJXX3JFo+rj+7kVJ3W5ef981ryQ9IlHt9av4T3bfPYnZgCN+9e/eWtRPP0OBu907XfDlqvl /Jtmj9Vg2MSh9kRJZbijERDLeai4kQA0Rg2qM4CAAA= X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1488905008!57624898!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 33513 invoked from network); 7 Mar 2017 16:43:30 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-3.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Mar 2017 16:43:30 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Tue, 07 Mar 2017 09:43:27 -0700 Message-Id: <58BEF13D0200007800140EDF@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Tue, 07 Mar 2017 09:43:25 -0700 From: "Jan Beulich" To: "xen-devel" References: <58BEF0470200007800140EB8@prv-mh.provo.novell.com> <58BEF0470200007800140EB8@prv-mh.provo.novell.com> In-Reply-To: <58BEF0470200007800140EB8@prv-mh.provo.novell.com> Mime-Version: 1.0 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH 3/3] x86: drop underscore prefixed 32-bit register names X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Now that all underscore prefixed instances have been replaced, this concludes the register renaming project. Signed-off-by: Jan Beulich x86: drop underscore prefixed 32-bit register names Now that all underscore prefixed instances have been replaced, this concludes the register renaming project. Signed-off-by: Jan Beulich --- a/xen/include/public/arch-x86/xen-x86_32.h +++ b/xen/include/public/arch-x86/xen-x86_32.h @@ -114,7 +114,7 @@ #elif defined(__XEN__) || defined(__XEN_TOOLS__) /* Anonymous unions include all permissible names (e.g., al/ah/ax/eax). */ #define __DECL_REG_LO8(which) union { \ - uint32_t e ## which ## x, _e ## which ## x; \ + uint32_t e ## which ## x; \ uint16_t which ## x; \ struct { \ uint8_t which ## l; \ --- a/xen/include/public/arch-x86/xen-x86_64.h +++ b/xen/include/public/arch-x86/xen-x86_64.h @@ -134,7 +134,7 @@ struct iret_context { /* Anonymous unions include all permissible names (e.g., al/ah/ax/eax/rax). */ #define __DECL_REG_LOHI(which) union { \ uint64_t r ## which ## x; \ - uint32_t e ## which ## x, _e ## which ## x; \ + uint32_t e ## which ## x; \ uint16_t which ## x; \ struct { \ uint8_t which ## l; \ @@ -143,13 +143,13 @@ struct iret_context { } #define __DECL_REG_LO8(name) union { \ uint64_t r ## name; \ - uint32_t e ## name, _e ## name; \ + uint32_t e ## name; \ uint16_t name; \ uint8_t name ## l; \ } #define __DECL_REG_LO16(name) union { \ uint64_t r ## name; \ - uint32_t e ## name, _e ## name; \ + uint32_t e ## name; \ uint16_t name; \ } #define __DECL_REG_HI(num) union { \ --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -58,15 +58,15 @@ #if defined(__i386__) # ifdef __XEN__ -__DeFiNe__ __DECL_REG_LO8(which) uint32_t _e ## which ## x -__DeFiNe__ __DECL_REG_LO16(name) union { uint32_t e ## name, _e ## name; } +__DeFiNe__ __DECL_REG_LO8(which) uint32_t e ## which ## x +__DeFiNe__ __DECL_REG_LO16(name) union { uint32_t e ## name; } # endif #include "xen-x86_32.h" # ifdef __XEN__ __UnDeF__ __DECL_REG_LO8 __UnDeF__ __DECL_REG_LO16 -__DeFiNe__ __DECL_REG_LO8(which) _e ## which ## x -__DeFiNe__ __DECL_REG_LO16(name) _e ## name +__DeFiNe__ __DECL_REG_LO8(which) e ## which ## x +__DeFiNe__ __DECL_REG_LO16(name) e ## name # endif #elif defined(__x86_64__) #include "xen-x86_64.h" Reviewed-by: Andrew Cooper --- a/xen/include/public/arch-x86/xen-x86_32.h +++ b/xen/include/public/arch-x86/xen-x86_32.h @@ -114,7 +114,7 @@ #elif defined(__XEN__) || defined(__XEN_TOOLS__) /* Anonymous unions include all permissible names (e.g., al/ah/ax/eax). */ #define __DECL_REG_LO8(which) union { \ - uint32_t e ## which ## x, _e ## which ## x; \ + uint32_t e ## which ## x; \ uint16_t which ## x; \ struct { \ uint8_t which ## l; \ --- a/xen/include/public/arch-x86/xen-x86_64.h +++ b/xen/include/public/arch-x86/xen-x86_64.h @@ -134,7 +134,7 @@ struct iret_context { /* Anonymous unions include all permissible names (e.g., al/ah/ax/eax/rax). */ #define __DECL_REG_LOHI(which) union { \ uint64_t r ## which ## x; \ - uint32_t e ## which ## x, _e ## which ## x; \ + uint32_t e ## which ## x; \ uint16_t which ## x; \ struct { \ uint8_t which ## l; \ @@ -143,13 +143,13 @@ struct iret_context { } #define __DECL_REG_LO8(name) union { \ uint64_t r ## name; \ - uint32_t e ## name, _e ## name; \ + uint32_t e ## name; \ uint16_t name; \ uint8_t name ## l; \ } #define __DECL_REG_LO16(name) union { \ uint64_t r ## name; \ - uint32_t e ## name, _e ## name; \ + uint32_t e ## name; \ uint16_t name; \ } #define __DECL_REG_HI(num) union { \ --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -58,15 +58,15 @@ #if defined(__i386__) # ifdef __XEN__ -__DeFiNe__ __DECL_REG_LO8(which) uint32_t _e ## which ## x -__DeFiNe__ __DECL_REG_LO16(name) union { uint32_t e ## name, _e ## name; } +__DeFiNe__ __DECL_REG_LO8(which) uint32_t e ## which ## x +__DeFiNe__ __DECL_REG_LO16(name) union { uint32_t e ## name; } # endif #include "xen-x86_32.h" # ifdef __XEN__ __UnDeF__ __DECL_REG_LO8 __UnDeF__ __DECL_REG_LO16 -__DeFiNe__ __DECL_REG_LO8(which) _e ## which ## x -__DeFiNe__ __DECL_REG_LO16(name) _e ## name +__DeFiNe__ __DECL_REG_LO8(which) e ## which ## x +__DeFiNe__ __DECL_REG_LO16(name) e ## name # endif #elif defined(__x86_64__) #include "xen-x86_64.h"