From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: devel@edk2.groups.io
Cc: Andrew Fish <afish@apple.com>,
Jordan Justen <jordan.l.justen@intel.com>,
Ray Ni <ray.ni@intel.com>
Subject: [Patch V5 10/11] EmulatorPkg/Sec: Change scope of PpiArray[10]
Date: Fri, 16 Aug 2019 17:57:14 -0700 [thread overview]
Message-ID: <20190817005715.9856-11-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20190817005715.9856-1-michael.d.kinney@intel.com>
From: Andrew Fish <afish@apple.com>
The local variable PpiArray[10] is declared in the middle
of the SEC module _ModuleEntryPoint() with its own scope.
However, PpiArray has a dangling reference to its location
on the stack after the scope is closed. This causes issues
with some compilers (e.g. XCODE5).
The fix is to move the declaration of PpiArray[10] to
the beginning of the function, so it is scoped correctly
for all references to this local variable and references
to its location.
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>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Tested-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
next prev parent reply other threads:[~2019-08-17 0:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-17 0:57 [Patch V5 00/11] EmulatorPkg: Fix VS20xx IA32 boot and simplify build config Michael D Kinney
2019-08-17 0:57 ` [Patch V5 01/11] EmulatorPkg: Fix VS20xx IA32 boot failure Michael D Kinney
2019-08-17 0:57 ` [Patch V5 02/11] EmulatorPkg: Remove UNIX_SEC_BUILD/WIN_SEC_BUILD Michael D Kinney
2019-08-17 0:57 ` [Patch V5 03/11] EmulatorPkg: Add -D DISABLE_NEW_DEPRECATED_INTERFACES Michael D Kinney
2019-08-17 0:57 ` [Patch V5 04/11] EmulatorPkg: Add support for NOOPT target Michael D Kinney
2019-08-17 0:57 ` [Patch V5 05/11] EmulatorPkg/Unix/Host: Disable inline/optimizations Michael D Kinney
2019-08-17 0:57 ` [Patch V5 06/11] EmulatorPkg: Fix XCODE5 lldb issues Michael D Kinney
2019-08-17 0:57 ` [Patch V5 07/11] EmulatorPkg/Unix/Host: Initialize field in BerkeleyPacketFilter.c Michael D Kinney
2019-08-17 0:57 ` [Patch V5 08/11] EmulatorPkg/Unix/Host: Remove debug code from BerkeleyPacketFilter.c Michael D Kinney
2019-08-17 0:57 ` [Patch V5 09/11] EmulatorPkg: Disable TftpDynamicCommand and LogoDxe for XCODE5 Michael D Kinney
2019-08-17 0:57 ` Michael D Kinney [this message]
2019-08-17 0:57 ` [Patch V5 11/11] BaseTools/tools_def.template: Add -gdwarf to XCODE5 X64 Michael D Kinney
2019-08-19 2:42 ` [Patch V5 00/11] EmulatorPkg: Fix VS20xx IA32 boot and simplify build config Jordan Justen
2019-08-19 16:59 ` Michael D Kinney
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=20190817005715.9856-11-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