public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: devel@edk2.groups.io
Cc: Jordan Justen <jordan.l.justen@intel.com>,
	Ray Ni <ray.ni@intel.com>, Andrew Fish <afish@apple.com>
Subject: [Patch V4 09/10] EmulatorPkg/Sec: Change local variable scope for XCODE5
Date: Thu, 15 Aug 2019 19:14:36 -0700	[thread overview]
Message-ID: <20190816021437.7516-10-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20190816021437.7516-1-michael.d.kinney@intel.com>

The local variable PpiArray[10] is declared in middle
of the SEC module _ModuleEntryPoint().  When building
for XCODE5 with optimizations enabled, this results in
corruption and an exception.  The fix is to move the
declaration of PpiArray[10] to the standard location
at the beginning of the function so the storage for
this local variable is allocated for the entire
lifetime of the function.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Andrew Fish <afish@apple.com>
---
 EmulatorPkg/Sec/Sec.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/EmulatorPkg/Sec/Sec.c b/EmulatorPkg/Sec/Sec.c
index 701032233b..b734d2bb87 100644
--- a/EmulatorPkg/Sec/Sec.c
+++ b/EmulatorPkg/Sec/Sec.c
@@ -75,6 +75,7 @@ _ModuleEntryPoint (
   EFI_PEI_PPI_DESCRIPTOR    *SecPpiList;
   UINTN                     SecReseveredMemorySize;
   UINTN                     Index;
+  EFI_PEI_PPI_DESCRIPTOR    PpiArray[10];
 
   EMU_MAGIC_PAGE()->PpiList = PpiList;
   ProcessLibraryConstructorList ();
@@ -104,16 +105,13 @@ _ModuleEntryPoint (
   SecCoreData->PeiTemporaryRamBase = (VOID *)((UINTN)SecCoreData->PeiTemporaryRamBase + SecReseveredMemorySize);
   SecCoreData->PeiTemporaryRamSize -= SecReseveredMemorySize;
 #else
-  {
-    //
-    // When I subtrack from SecCoreData->PeiTemporaryRamBase PEI Core crashes? Either there is a bug
-    // or I don't understand temp RAM correctly?
-    //
-    EFI_PEI_PPI_DESCRIPTOR    PpiArray[10];
+  //
+  // When I subtrack from SecCoreData->PeiTemporaryRamBase PEI Core crashes? Either there is a bug
+  // or I don't understand temp RAM correctly?
+  //
 
-    SecPpiList = &PpiArray[0];
-    ASSERT (sizeof (PpiArray) >= SecReseveredMemorySize);
-  }
+  SecPpiList = &PpiArray[0];
+  ASSERT (sizeof (PpiArray) >= SecReseveredMemorySize);
 #endif
   // Copy existing list, and append our entries.
   CopyMem (SecPpiList, PpiList, sizeof (EFI_PEI_PPI_DESCRIPTOR) * Index);
-- 
2.21.0.windows.1


  parent reply	other threads:[~2019-08-16  2:14 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-16  2:14 [Patch V4 00/10] EmulatorPkg: Fix VS20xx IA32 boot and simplify build config Michael D Kinney
2019-08-16  2:14 ` [Patch V4 01/10] EmulatorPkg: Fix VS20xx IA32 boot failure Michael D Kinney
2019-08-16  2:14 ` [Patch V4 02/10] EmulatorPkg: Remove UNIX_SEC_BUILD/WIN_SEC_BUILD Michael D Kinney
2019-08-16  2:14 ` [Patch V4 03/10] EmulatorPkg: Add -D DISABLE_NEW_DEPRECATED_INTERFACES Michael D Kinney
2019-08-16  2:14 ` [Patch V4 04/10] EmulatorPkg: Add support for NOOPT target Michael D Kinney
2019-08-16  2:14 ` [Patch V4 05/10] EmulatorPkg/Unix/Host: Disable inline/optimizations Michael D Kinney
2019-08-16  2:14 ` [Patch V4 06/10] EmulatorPkg: Fix XCODE5 lldb issues Michael D Kinney
2019-08-16  7:40   ` Jordan Justen
2019-08-16 15:09     ` Michael D Kinney
2019-08-16 17:30       ` [edk2-devel] " Andrew Fish
2019-08-16 18:21       ` Jordan Justen
2019-08-16 21:14         ` Michael D Kinney
2019-08-16  2:14 ` [Patch V4 07/10] EmulatorPkg/Unix/Host: Fix BerkeleyPacketFilter.c issues Michael D Kinney
2019-08-16  7:47   ` Jordan Justen
2019-08-16  2:14 ` [Patch V4 08/10] EmulatorPkg: Disable TftpDynamicCommand and LogoDxe for XCODE5 Michael D Kinney
2019-08-16  2:14 ` Michael D Kinney [this message]
2019-08-16 18:29   ` [Patch V4 09/10] EmulatorPkg/Sec: Change local variable scope " Jordan Justen
2019-08-16  2:14 ` [Patch V4 10/10] BaseTools/tools_def.template: Add -gdwarf to XCODE5 X64 Michael D Kinney
2019-08-16  4:50   ` [edk2-devel] " Liming Gao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190816021437.7516-10-michael.d.kinney@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox