UefiCpuPkg/CpuDxe: make register access more readable

[mirror_edk2.git] / UefiCpuPkg / CpuDxe / CpuGdt.h

diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.h b/UefiCpuPkg/CpuDxe/CpuGdt.h
index 7ecec5d5d9f7ba9f0923a52c81052b2a90b91383..2a007516024b7e9e03d8f379f6e5399f49c87c52 100644 (file)
--- a/UefiCpuPkg/CpuDxe/CpuGdt.h
+++ b/UefiCpuPkg/CpuDxe/CpuGdt.h
@@ -2,7 +2,7 @@
   C based implemention of IA32 interrupt handling only\r
   requiring a minimal assembly interrupt entry point.\r
 \r
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -42,8 +42,9 @@ struct _GDT_ENTRIES {
   GDT_ENTRY LinearCode;\r
   GDT_ENTRY SysData;\r
   GDT_ENTRY SysCode;\r
-  GDT_ENTRY LinearCode64;\r
   GDT_ENTRY Spare4;\r
+  GDT_ENTRY LinearData64;\r
+  GDT_ENTRY LinearCode64;\r
   GDT_ENTRY Spare5;\r
 } GDT_ENTRIES;\r
 \r
@@ -54,8 +55,9 @@ struct _GDT_ENTRIES {
 #define LINEAR_CODE_SEL   OFFSET_OF (GDT_ENTRIES, LinearCode)\r
 #define SYS_DATA_SEL      OFFSET_OF (GDT_ENTRIES, SysData)\r
 #define SYS_CODE_SEL      OFFSET_OF (GDT_ENTRIES, SysCode)\r
-#define LINEAR_CODE64_SEL OFFSET_OF (GDT_ENTRIES, LinearCode64)\r
 #define SPARE4_SEL        OFFSET_OF (GDT_ENTRIES, Spare4)\r
+#define LINEAR_DATA64_SEL OFFSET_OF (GDT_ENTRIES, LinearData64)\r
+#define LINEAR_CODE64_SEL OFFSET_OF (GDT_ENTRIES, LinearCode64)\r
 #define SPARE5_SEL        OFFSET_OF (GDT_ENTRIES, Spare5)\r
 \r
 #if defined (MDE_CPU_IA32)\r
@@ -63,7 +65,7 @@ struct _GDT_ENTRIES {
 #define CPU_DATA_SEL LINEAR_SEL\r
 #elif defined (MDE_CPU_X64)\r
 #define CPU_CODE_SEL LINEAR_CODE64_SEL\r
-#define CPU_DATA_SEL LINEAR_SEL\r
+#define CPU_DATA_SEL LINEAR_DATA64_SEL\r
 #else\r
 #error CPU type not supported for CPU GDT initialization!\r
 #endif\r