diff options
author | Ray Ni <ray.ni@intel.com> | 2024-06-11 15:00:41 +0800 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-06-12 07:18:12 +0000 |
commit | d3b32dca06b987d7214637f3952c2ce1ce69f308 (patch) | |
tree | e9ec5dffb4478cf8031b1e9a75b02840a4d29e1c | |
parent | 0982da4f50279bfb2be479f97821b86feb87c336 (diff) | |
download | edk2-d3b32dca06b987d7214637f3952c2ce1ce69f308.tar.gz |
MdePkg/BaseLib: Let CpuDeadLoop() be breakable in debugger
Starting from certain version of Visual Studio C compiler (I don’t
have the exact version. I am using VS2019), CpuDeadLoop is optimized
quite well by compiler.
The compiler does not generate instructions that jump out of the loop
when the "Index" is non-zero.
It becomes harder/impossible for developers to break out of the dead-loop
in debugger.
The new version of CpuDeadLoop() compares a volatile global to a volatile
local. This forces 2 reads and a comparison on every loop iteration.
The local variable can be set to 1 to exit the loop without modifying the
global variable.
Using VS2019 with max opt enabled, The dead-loop can be exit by setting
Index to 1 in a debugger.
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
-rw-r--r-- | MdePkg/Library/BaseLib/CpuDeadLoop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MdePkg/Library/BaseLib/CpuDeadLoop.c b/MdePkg/Library/BaseLib/CpuDeadLoop.c index b3b7548fa5..01e7b4def7 100644 --- a/MdePkg/Library/BaseLib/CpuDeadLoop.c +++ b/MdePkg/Library/BaseLib/CpuDeadLoop.c @@ -1,7 +1,7 @@ /** @file
Base Library CPU Functions for all architectures.
- Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2024, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -9,6 +9,8 @@ #include <Base.h>
#include <Library/BaseLib.h>
+static volatile UINTN mDeadLoopComparator = 0;
+
/**
Executes an infinite loop.
@@ -26,7 +28,7 @@ CpuDeadLoop ( {
volatile UINTN Index;
- for (Index = 0; Index == 0;) {
+ for (Index = mDeadLoopComparator; Index == mDeadLoopComparator;) {
CpuPause ();
}
}
|