MdePkg: Redefined DEBUG_RAISE() to facilitate fuzzing.

MdePkg/Include/Base.h

@@ -885,8 +885,20 @@ STATIC_ASSERT (ALIGNOF (__VERIFY_UINT32_ENUM_SIZE) == sizeof (__VERIFY_UINT32_EN
 **/
 #define BASE_CR(Record, TYPE, Field)  ((TYPE *) ((CHAR8 *) (Record) - OFFSET_OF (TYPE, Field)))
 
-// FIXME: Upstream general variants of these macros.
+#define DEBUG_RAISE()                                                                                         \
-#define DEBUG_RAISE()     ASSERT (FALSE)
+    do {                                                                                                      \
+      if ((PcdGet8 (PcdDebugRaisePropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0) {                  \
+        DEBUG ((DEBUG_WARN, "DEBUG RAISE: Constraint violation in %a:%a:%u\n", __FILE__, __func__, __LINE__));\
+      }                                                                                                       \
+                                                                                                              \
+      if ((PcdGet8 (PcdDebugRaisePropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0) {                 \
+        ASSERT (FALSE);                                                                                       \
+      }                                                                                                       \
+                                                                                                              \
+      if ((PcdGet8 (PcdDebugRaisePropertyMask) & DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED) != 0) {            \
+        CpuBreakpoint ();                                                                                     \
+      }                                                                                                       \
+    } while (FALSE)
 
 /**
   Checks whether a value is a power of two.

MdePkg/Library/BasePeCoffLib2/BasePeCoffLib2.inf

@@ -47,3 +47,4 @@
   gEfiMdePkgTokenSpaceGuid.PcdImageLoaderProhibitTe
   gEfiMdePkgTokenSpaceGuid.PcdImageLoaderAllowMisalignedOffset
   gEfiMdePkgTokenSpaceGuid.PcdImageLoaderRemoveXForWX
+  gEfiMdePkgTokenSpaceGuid.PcdDebugRaisePropertyMask

MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c

@@ -16,6 +16,7 @@
 
 #include <IndustryStandard/PeImage2.h>
 
+#include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>

MdePkg/Library/BasePeCoffLib2/PeCoffHash.c

@@ -16,6 +16,7 @@
 
 #include <Guid/WinCertificate.h>
 
+#include <Library/BaseLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>

MdePkg/Library/BasePeCoffLib2/PeCoffHii.c

@@ -15,6 +15,7 @@
 
 #include <IndustryStandard/PeImage2.h>
 
+#include <Library/BaseLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PcdLib.h>

MdePkg/Library/BasePeCoffLib2/PeCoffInit.c

@@ -18,6 +18,7 @@
 
 #include <Guid/WinCertificate.h>
 
+#include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>

MdePkg/Library/BasePeCoffLib2/PeCoffLoad.c

@@ -16,6 +16,7 @@
 
 #include <IndustryStandard/PeImage2.h>
 
+#include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PcdLib.h>

MdePkg/Library/BaseUeImageLib/BaseUeImageLib.inf

@@ -29,3 +29,4 @@
 
 [FixedPcd]
   gEfiMdePkgTokenSpaceGuid.PcdImageLoaderRelocTypePolicy
+  gEfiMdePkgTokenSpaceGuid.PcdDebugRaisePropertyMask

MdePkg/Library/BaseUefiImageLib/BaseUefiImageLibPeCoff.inf

@@ -37,3 +37,4 @@
   gEfiMdePkgTokenSpaceGuid.PcdImageLoaderLoadHeader
   gEfiMdePkgTokenSpaceGuid.PcdImageLoaderProhibitTe
   gEfiMdePkgTokenSpaceGuid.PcdImageLoaderRemoveXForWX
+  gEfiMdePkgTokenSpaceGuid.PcdDebugRaisePropertyMask

MdePkg/Library/BaseUefiImageLib/BaseUefiImageLibUe.inf

@@ -31,3 +31,6 @@
   DebugLib
   MemoryAllocationLib
   UeImageLib
+
+[FixedPcd]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugRaisePropertyMask

MdePkg/Library/BaseUefiImageLib/CommonSupport.c

@@ -10,9 +10,11 @@
 #include <Uefi/UefiBaseType.h>
 #include <Uefi/UefiSpec.h>
 
+#include <Library/BaseLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/CacheMaintenanceLib.h>
 #include <Library/DebugLib.h>
+#include <Library/PcdLib.h>
 #include <Library/UefiImageLib.h>
 
 RETURN_STATUS

MdePkg/Library/BaseUefiImageLib/UeSupport.c

@@ -7,6 +7,7 @@
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
+#include <Library/PcdLib.h>
 #include <Library/UefiImageLib.h>
 #include <Library/UeImageLib.h>
 

MdePkg/MdePkg.dec

@@ -2322,6 +2322,13 @@
   # @Expression  0x80000002 | (gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask & 0xC0) == 0
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0|UINT8|0x00000005
 
+  ## The mask is used to control DEBUG_RAISE() behavior.<BR><BR>
+  #  BIT0 - Enable Debug Assert.<BR>
+  #  BIT1 - Enable Debug Print.<BR>
+  #  BIT4 - Enable BreakPoint as ASSERT.<BR>
+  # @Prompt DEBUG_RAISE() Property.
+  gEfiMdePkgTokenSpaceGuid.PcdDebugRaisePropertyMask|0x01|UINT8|0x0000001b
+
   ## This flag is used to control the print out Debug message.<BR><BR>
   #  BIT0  - Initialization message.<BR>
   #  BIT1  - Warning message.<BR>