Maintainers.txt: Remove Nt32Pkg reference after Nt32Pkg is removed

[mirror_edk2.git] / OvmfPkg / Sec / SecMain.c

diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c
index e1993ec347b54d6d83254485718995baae9efff1..3914355cd17b4475748d925155881275f45c6680 100644 (file)
--- a/OvmfPkg/Sec/SecMain.c
+++ b/OvmfPkg/Sec/SecMain.c
@@ -4,13 +4,7 @@
   Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 \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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -280,7 +274,7 @@ FindFfsFileAndSection (
     }\r
 \r
     File = (EFI_FFS_FILE_HEADER*)(UINTN) CurrentAddress;\r
-    Size = *(UINT32*) File->Size & 0xffffff;\r
+    Size = FFS_FILE_SIZE (File);\r
     if (Size < (sizeof (*File) + sizeof (EFI_COMMON_SECTION_HEADER))) {\r
       return EFI_VOLUME_CORRUPTED;\r
     }\r
@@ -611,7 +605,7 @@ FindImageBase (
     }\r
 \r
     File = (EFI_FFS_FILE_HEADER*)(UINTN) CurrentAddress;\r
-    Size = *(UINT32*) File->Size & 0xffffff;\r
+    Size = FFS_FILE_SIZE (File);\r
     if (Size < sizeof (*File)) {\r
       return EFI_NOT_FOUND;\r
     }\r
@@ -636,7 +630,7 @@ FindImageBase (
       CurrentAddress = (EndOfSection + 3) & 0xfffffffffffffffcULL;\r
       Section = (EFI_COMMON_SECTION_HEADER*)(UINTN) CurrentAddress;\r
 \r
-      Size = *(UINT32*) Section->Size & 0xffffff;\r
+      Size = SECTION_SIZE (Section);\r
       if (Size < sizeof (*Section)) {\r
         return EFI_NOT_FOUND;\r
       }\r
@@ -931,9 +925,11 @@ TemporaryRamMigration (
   if (SetJump (&JumpBuffer) == 0) {\r
 #if defined (MDE_CPU_IA32)\r
     JumpBuffer.Esp = JumpBuffer.Esp + DebugAgentContext.StackMigrateOffset;\r
+    JumpBuffer.Ebp = JumpBuffer.Ebp + DebugAgentContext.StackMigrateOffset;\r
 #endif    \r
 #if defined (MDE_CPU_X64)\r
     JumpBuffer.Rsp = JumpBuffer.Rsp + DebugAgentContext.StackMigrateOffset;\r
+    JumpBuffer.Rbp = JumpBuffer.Rbp + DebugAgentContext.StackMigrateOffset;\r
 #endif    \r
     LongJump (&JumpBuffer, (UINTN)-1);\r
   }\r