From a1e8986d97d8b3ce3ef2ff9d81f2d6ddf9d8dd1f Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Thu, 13 Nov 2014 18:25:10 +0000
Subject: [PATCH] UefiCpuPkg/CpuDxe: Move GDT structures into CpuGdt.h

We'll want to use the structures for AP startup.

Note: It seems previously we were not using '#pragma pack ()' in
      CpuGdt.c.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16348 6f19259b-4bc3-4df7-8a09-765794883524
---
 UefiCpuPkg/CpuDxe/CpuGdt.c | 52 +--------------------------
 UefiCpuPkg/CpuDxe/CpuGdt.h | 72 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 51 deletions(-)
 create mode 100644 UefiCpuPkg/CpuDxe/CpuGdt.h

diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.c b/UefiCpuPkg/CpuDxe/CpuGdt.c
index 32f45a535d..35a87a6e45 100644
--- a/UefiCpuPkg/CpuDxe/CpuGdt.c
+++ b/UefiCpuPkg/CpuDxe/CpuGdt.c
@@ -14,57 +14,7 @@
 **/
 
 #include "CpuDxe.h"
-
-
-//
-// Local structure definitions
-//
-
-#pragma pack (1)
-
-//
-// Global Descriptor Entry structures
-//
-
-typedef struct _GDT_ENTRY {
-  UINT16 Limit15_0;
-  UINT16 Base15_0;
-  UINT8  Base23_16;
-  UINT8  Type;
-  UINT8  Limit19_16_and_flags;
-  UINT8  Base31_24;
-} GDT_ENTRY;
-
-typedef
-struct _GDT_ENTRIES {
-  GDT_ENTRY Null;
-  GDT_ENTRY Linear;
-  GDT_ENTRY LinearCode;
-  GDT_ENTRY SysData;
-  GDT_ENTRY SysCode;
-  GDT_ENTRY LinearCode64;
-  GDT_ENTRY Spare4;
-  GDT_ENTRY Spare5;
-} GDT_ENTRIES;
-
-#define NULL_SEL          OFFSET_OF (GDT_ENTRIES, Null)
-#define LINEAR_SEL        OFFSET_OF (GDT_ENTRIES, Linear)
-#define LINEAR_CODE_SEL   OFFSET_OF (GDT_ENTRIES, LinearCode)
-#define SYS_DATA_SEL      OFFSET_OF (GDT_ENTRIES, SysData)
-#define SYS_CODE_SEL      OFFSET_OF (GDT_ENTRIES, SysCode)
-#define LINEAR_CODE64_SEL OFFSET_OF (GDT_ENTRIES, LinearCode64)
-#define SPARE4_SEL        OFFSET_OF (GDT_ENTRIES, Spare4)
-#define SPARE5_SEL        OFFSET_OF (GDT_ENTRIES, Spare5)
-
-#if defined (MDE_CPU_IA32)
-#define CPU_CODE_SEL LINEAR_CODE_SEL
-#define CPU_DATA_SEL LINEAR_SEL
-#elif defined (MDE_CPU_X64)
-#define CPU_CODE_SEL LINEAR_CODE64_SEL
-#define CPU_DATA_SEL LINEAR_SEL
-#else
-#error CPU type not supported for CPU GDT initialization!
-#endif
+#include "CpuGdt.h"
 
 //
 // Global descriptor table (GDT) Template
diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.h b/UefiCpuPkg/CpuDxe/CpuGdt.h
new file mode 100644
index 0000000000..7ecec5d5d9
--- /dev/null
+++ b/UefiCpuPkg/CpuDxe/CpuGdt.h
@@ -0,0 +1,72 @@
+/** @file
+  C based implemention of IA32 interrupt handling only
+  requiring a minimal assembly interrupt entry point.
+
+  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef _CPU_GDT_H_
+#define _CPU_GDT_H_
+
+//
+// Local structure definitions
+//
+
+#pragma pack (1)
+
+//
+// Global Descriptor Entry structures
+//
+
+typedef struct _GDT_ENTRY {
+  UINT16 Limit15_0;
+  UINT16 Base15_0;
+  UINT8  Base23_16;
+  UINT8  Type;
+  UINT8  Limit19_16_and_flags;
+  UINT8  Base31_24;
+} GDT_ENTRY;
+
+typedef
+struct _GDT_ENTRIES {
+  GDT_ENTRY Null;
+  GDT_ENTRY Linear;
+  GDT_ENTRY LinearCode;
+  GDT_ENTRY SysData;
+  GDT_ENTRY SysCode;
+  GDT_ENTRY LinearCode64;
+  GDT_ENTRY Spare4;
+  GDT_ENTRY Spare5;
+} GDT_ENTRIES;
+
+#pragma pack ()
+
+#define NULL_SEL          OFFSET_OF (GDT_ENTRIES, Null)
+#define LINEAR_SEL        OFFSET_OF (GDT_ENTRIES, Linear)
+#define LINEAR_CODE_SEL   OFFSET_OF (GDT_ENTRIES, LinearCode)
+#define SYS_DATA_SEL      OFFSET_OF (GDT_ENTRIES, SysData)
+#define SYS_CODE_SEL      OFFSET_OF (GDT_ENTRIES, SysCode)
+#define LINEAR_CODE64_SEL OFFSET_OF (GDT_ENTRIES, LinearCode64)
+#define SPARE4_SEL        OFFSET_OF (GDT_ENTRIES, Spare4)
+#define SPARE5_SEL        OFFSET_OF (GDT_ENTRIES, Spare5)
+
+#if defined (MDE_CPU_IA32)
+#define CPU_CODE_SEL LINEAR_CODE_SEL
+#define CPU_DATA_SEL LINEAR_SEL
+#elif defined (MDE_CPU_X64)
+#define CPU_CODE_SEL LINEAR_CODE64_SEL
+#define CPU_DATA_SEL LINEAR_SEL
+#else
+#error CPU type not supported for CPU GDT initialization!
+#endif
+
+#endif // _CPU_GDT_H_
+
-- 
2.39.2