<div>Fix various typos in EmulatorPkg.</div>
<div> </div>
<div>Contributed-under: TianoCore Contribution Agreement 1.1</div>
<div>Signed-off-by: Coeur <coeur@gmx.fr></div>
<div>---</div>
<div> EmulatorPkg/Sec/Ia32/SwitchRam.S | 18 +++++++++---------</div>
<div> EmulatorPkg/Sec/Ia32/SwitchRam.asm | 20 ++++++++++----------</div>
<div> EmulatorPkg/Sec/Sec.c | 5 ++---</div>
<div> EmulatorPkg/Sec/Sec.h | 4 ++--</div>
<div> EmulatorPkg/Sec/X64/SwitchRam.S | 2 +-</div>
<div> EmulatorPkg/Sec/X64/SwitchRam.asm | 2 +-</div>
<div> 6 files changed, 25 insertions(+), 26 deletions(-)</div>
<div> </div>
<div>diff --git a/EmulatorPkg/Sec/Ia32/SwitchRam.S b/EmulatorPkg/Sec/Ia32/SwitchRam.S</div>
<div>index f24529cc8e..d8298223a9 100644</div>
<div>--- a/EmulatorPkg/Sec/Ia32/SwitchRam.S</div>
<div>+++ b/EmulatorPkg/Sec/Ia32/SwitchRam.S</div>
<div>@@ -9,7 +9,7 @@</div>
<div> #</div>
<div> # Abstract:</div>
<div> #</div>
<div>-# Switch the stack from temporary memory to permenent memory.</div>
<div>+# Switch the stack from temporary memory to permanent memory.</div>
<div> #</div>
<div> #------------------------------------------------------------------------------</div>
<div> </div>
<div>@@ -36,7 +36,7 @@ ASM_PFX(SecSwitchStack):</div>
<div> </div>
<div> #</div>
<div> # !!CAUTION!! this function address's is pushed into stack after</div>
<div>-# migration of whole temporary memory, so need save it to permenent</div>
<div>+# migration of whole temporary memory, so need save it to permanent</div>
<div> # memory at first!</div>
<div> #</div>
<div> </div>
<div>@@ -44,14 +44,14 @@ ASM_PFX(SecSwitchStack):</div>
<div> movl 24(%esp), %ecx # Save the second parameter</div>
<div> </div>
<div> #</div>
<div>-# Save this function's return address into permenent memory at first.</div>
<div>-# Then, Fixup the esp point to permenent memory</div>
<div>+# Save this function's return address into permanent memory at first.</div>
<div>+# Then, Fixup the esp point to permanent memory</div>
<div> #</div>
<div> </div>
<div> movl %esp, %eax</div>
<div> subl %ebx, %eax</div>
<div> addl %ecx, %eax</div>
<div>- movl (%esp), %edx # copy pushed register's value to permenent memory</div>
<div>+ movl (%esp), %edx # copy pushed register's value to permanent memory</div>
<div> movl %edx, (%eax)</div>
<div> movl 4(%esp), %edx</div>
<div> movl %edx, 4(%eax)</div>
<div>@@ -61,16 +61,16 @@ ASM_PFX(SecSwitchStack):</div>
<div> movl %edx, 12(%eax)</div>
<div> movl 16(%esp), %edx</div>
<div> movl %edx, 16(%eax)</div>
<div>- movl %eax, %esp # From now, esp is pointed to permenent memory</div>
<div>+ movl %eax, %esp # From now, esp is pointed to permanent memory</div>
<div> </div>
<div> #</div>
<div>-# Fixup the ebp point to permenent memory</div>
<div>+# Fixup the ebp point to permanent memory</div>
<div> #</div>
<div> #ifndef __APPLE__</div>
<div> movl %ebp, %eax</div>
<div> subl %ebx, %eax</div>
<div> addl %ecx, %eax</div>
<div>- movl %eax, %ebp # From now, ebp is pointed to permenent memory</div>
<div>+ movl %eax, %ebp # From now, ebp is pointed to permanent memory</div>
<div> </div>
<div> #</div>
<div> # Fixup callee's ebp point for PeiDispatch</div>
<div>@@ -78,7 +78,7 @@ ASM_PFX(SecSwitchStack):</div>
<div> movl (%ebp), %eax</div>
<div> subl %ebx, %eax</div>
<div> addl %ecx, %eax</div>
<div>- movl %eax, (%ebp) # From now, Temporary's PPI caller's stack is in permenent memory</div>
<div>+ movl %eax, (%ebp) # From now, Temporary's PPI caller's stack is in permanent memory</div>
<div> #endif</div>
<div> </div>
<div> pop %edx</div>
<div>diff --git a/EmulatorPkg/Sec/Ia32/SwitchRam.asm b/EmulatorPkg/Sec/Ia32/SwitchRam.asm</div>
<div>index 9c7908f7a0..99ef002980 100644</div>
<div>--- a/EmulatorPkg/Sec/Ia32/SwitchRam.asm</div>
<div>+++ b/EmulatorPkg/Sec/Ia32/SwitchRam.asm</div>
<div>@@ -9,7 +9,7 @@</div>
<div> ;</div>
<div> ; Abstract:</div>
<div> ;</div>
<div>-; Switch the stack from temporary memory to permenent memory.</div>
<div>+; Switch the stack from temporary memory to permanent memory.</div>
<div> ;</div>
<div> ;------------------------------------------------------------------------------</div>
<div> </div>
<div>@@ -36,7 +36,7 @@ SecSwitchStack PROC</div>
<div> </div>
<div> ;</div>
<div> ; !!CAUTION!! this function address's is pushed into stack after</div>
<div>- ; migration of whole temporary memory, so need save it to permenent</div>
<div>+ ; migration of whole temporary memory, so need save it to permanent</div>
<div> ; memory at first!</div>
<div> ;</div>
<div> </div>
<div>@@ -44,13 +44,13 @@ SecSwitchStack PROC</div>
<div> mov ecx, [esp + 24] ; Save the second parameter</div>
<div> </div>
<div> ;</div>
<div>- ; Save this function's return address into permenent memory at first.</div>
<div>- ; Then, Fixup the esp point to permenent memory</div>
<div>+ ; Save this function's return address into permanent memory at first.</div>
<div>+ ; Then, Fixup the esp point to permanent memory</div>
<div> ;</div>
<div> mov eax, esp</div>
<div> sub eax, ebx</div>
<div> add eax, ecx</div>
<div>- mov edx, dword ptr [esp] ; copy pushed register's value to permenent memory</div>
<div>+ mov edx, dword ptr [esp] ; copy pushed register's value to permanent memory</div>
<div> mov dword ptr [eax], edx</div>
<div> mov edx, dword ptr [esp + 4]</div>
<div> mov dword ptr [eax + 4], edx</div>
<div>@@ -58,17 +58,17 @@ SecSwitchStack PROC</div>
<div> mov dword ptr [eax + 8], edx</div>
<div> mov edx, dword ptr [esp + 12]</div>
<div> mov dword ptr [eax + 12], edx</div>
<div>- mov edx, dword ptr [esp + 16] ; Update this function's return address into permenent memory</div>
<div>+ mov edx, dword ptr [esp + 16] ; Update this function's return address into permanent memory</div>
<div> mov dword ptr [eax + 16], edx</div>
<div>- mov esp, eax ; From now, esp is pointed to permenent memory</div>
<div>+ mov esp, eax ; From now, esp is pointed to permanent memory</div>
<div> </div>
<div> ;</div>
<div>- ; Fixup the ebp point to permenent memory</div>
<div>+ ; Fixup the ebp point to permanent memory</div>
<div> ;</div>
<div> mov eax, ebp</div>
<div> sub eax, ebx</div>
<div> add eax, ecx</div>
<div>- mov ebp, eax ; From now, ebp is pointed to permenent memory</div>
<div>+ mov ebp, eax ; From now, ebp is pointed to permanent memory</div>
<div> </div>
<div> ;</div>
<div> ; Fixup callee's ebp point for PeiDispatch</div>
<div>@@ -76,7 +76,7 @@ SecSwitchStack PROC</div>
<div> mov eax, dword ptr [ebp]</div>
<div> sub eax, ebx</div>
<div> add eax, ecx</div>
<div>- mov dword ptr [ebp], eax ; From now, Temporary's PPI caller's stack is in permenent memory</div>
<div>+ mov dword ptr [ebp], eax ; From now, Temporary's PPI caller's stack is in permanent memory</div>
<div> </div>
<div> pop edx</div>
<div> pop ecx</div>
<div>diff --git a/EmulatorPkg/Sec/Sec.c b/EmulatorPkg/Sec/Sec.c</div>
<div>index 701032233b..7ee8786c79 100644</div>
<div>--- a/EmulatorPkg/Sec/Sec.c</div>
<div>+++ b/EmulatorPkg/Sec/Sec.c</div>
<div>@@ -1,5 +1,5 @@</div>
<div> /*++ @file</div>
<div>- Stub SEC that is called from the OS appliation that is the root of the emulator.</div>
<div>+ Stub SEC that is called from the OS application that is the root of the emulator.</div>
<div> </div>
<div> The OS application will call the SEC with the PEI Entry Point API.</div>
<div> </div>
<div>@@ -89,7 +89,7 @@ _ModuleEntryPoint (</div>
<div> SecReseveredMemorySize += sizeof (EFI_PEI_PPI_DESCRIPTOR);</div>
<div> </div>
<div> if ((Ppi->Flags & EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST) == EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST) {</div>
<div>- // Since we are appending, need to clear out privious list terminator.</div>
<div>+ // Since we are appending, need to clear out previous list terminator.</div>
<div> Ppi->Flags &= ~EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;</div>
<div> break;</div>
<div> }</div>
<div>@@ -140,4 +140,3 @@ _ModuleEntryPoint (</div>
<div> }</div>
<div> </div>
<div> </div>
<div>-</div>
<div>diff --git a/EmulatorPkg/Sec/Sec.h b/EmulatorPkg/Sec/Sec.h</div>
<div>index dd301f7888..42554e05b5 100644</div>
<div>--- a/EmulatorPkg/Sec/Sec.h</div>
<div>+++ b/EmulatorPkg/Sec/Sec.h</div>
<div>@@ -1,5 +1,5 @@</div>
<div> /*++ @file</div>
<div>- Stub SEC that is called from the OS appliation that is the root of the emulator.</div>
<div>+ Stub SEC that is called from the OS application that is the root of the emulator.</div>
<div> </div>
<div> The OS application will call the SEC with the PEI Entry Point API.</div>
<div> </div>
<div>@@ -23,7 +23,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent</div>
<div> </div>
<div> </div>
<div> //</div>
<div>-// I think this shold be defined in a MdePkg include file?</div>
<div>+// I think this should be defined in a MdePkg include file?</div>
<div> //</div>
<div> VOID</div>
<div> EFIAPI</div>
<div>diff --git a/EmulatorPkg/Sec/X64/SwitchRam.S b/EmulatorPkg/Sec/X64/SwitchRam.S</div>
<div>index 7ddb6c854b..59d4e2edef 100644</div>
<div>--- a/EmulatorPkg/Sec/X64/SwitchRam.S</div>
<div>+++ b/EmulatorPkg/Sec/X64/SwitchRam.S</div>
<div>@@ -1,7 +1,7 @@</div>
<div> #------------------------------------------------------------------------------</div>
<div> #</div>
<div> # Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR></div>
<div>-# Portitions copyright (c) 2011, Apple Inc. All rights reserved.</div>
<div>+# Portions copyright (c) 2011, Apple Inc. All rights reserved.</div>
<div> # SPDX-License-Identifier: BSD-2-Clause-Patent</div>
<div> #</div>
<div> #------------------------------------------------------------------------------</div>
<div>diff --git a/EmulatorPkg/Sec/X64/SwitchRam.asm b/EmulatorPkg/Sec/X64/SwitchRam.asm</div>
<div>index 73530bff39..e66bda5bf4 100644</div>
<div>--- a/EmulatorPkg/Sec/X64/SwitchRam.asm</div>
<div>+++ b/EmulatorPkg/Sec/X64/SwitchRam.asm</div>
<div>@@ -1,7 +1,7 @@</div>
<div> ;------------------------------------------------------------------------------</div>
<div> ;</div>
<div> ; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR></div>
<div>-; Portitions copyright (c) 2011, Apple Inc. All rights reserved.</div>
<div>+; Portions copyright (c) 2011, Apple Inc. All rights reserved.</div>
<div> ; SPDX-License-Identifier: BSD-2-Clause-Patent</div>
<div> ;</div>
<div> ;------------------------------------------------------------------------------</div>
<div>-- </div>
<div>2.20.1 (Apple Git-117)</div>
<div> </div>
<div width="1" style="color:white;clear:both">_._,_._,_</div>
<hr>
Groups.io Links:<p>
You receive all messages sent to this group.
<p>
<a target="_blank" href="https://edk2.groups.io/g/devel/message/43179">View/Reply Online (#43179)</a> |
|
<a target="_blank" href="https://groups.io/mt/32288240/1813853">Mute This Topic</a>
| <a href="https://edk2.groups.io/g/devel/post">New Topic</a><br>
<br>
<a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> |
<a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> |
<a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a>
[edk2-devel-archive@redhat.com]<br>
<div width="1" style="color:white;clear:both">_._,_._,_</div>