Make ASSERT statement more meaningful.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9276 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 8033b449d92f0eac5ac18a963d63171706367cc0..5b15a1edb7a6aa15dbe98489f0fd6bb5e1218cb2 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -1120,11 +1120,11 @@ CoreStartImage (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
+  //\r
+  // The image to be started must have the machine type supported by DxeCore.\r
+  //\r
+  ASSERT (EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->Machine));\r
   if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->Machine)) {\r
-    //\r
-    // The image to be started must have the machine type supported by DxeCore.\r
-    //\r
-    ASSERT (FALSE);\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index 84c9e4b5bf13750032e60763c8cd0bf42bfb48c1..1a6ba313c2c3d2dac0dc34e01a87006157c7c0f3 100644 (file)
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -434,11 +434,11 @@ PeiLoadImage (
                           AuthenticationState\r
                           );\r
       if (!EFI_ERROR (Status)) {\r
+        //\r
+        // The image to be started must have the machine type supported by PeiCore.\r
+        //\r
+        ASSERT (EFI_IMAGE_MACHINE_TYPE_SUPPORTED (PeCoffLoaderGetMachineType ((VOID *) (UINTN) ImageAddress)));\r
         if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (PeCoffLoaderGetMachineType ((VOID *) (UINTN) ImageAddress))) {\r
-          //\r
-          // The image to be started must have the machine type supported by PeiCore.\r
-          //\r
-          ASSERT (FALSE);\r
           return EFI_UNSUPPORTED;\r
         }\r
         return Status;\r