1) Change location of DEBUG() macro that prints the name of the FFS file being evalua...

[mirror_edk2.git] / MdeModulePkg / Core / PiSmmCore / Dependency.c

diff --git a/MdeModulePkg/Core/PiSmmCore/Dependency.c b/MdeModulePkg/Core/PiSmmCore/Dependency.c
index 4bf8502cf8be7aac6e9a3d15c1ab72fefc777bb7..44f693ac83ad25216b9a9baf2117ff986fec4f88 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Dependency.c
+++ b/MdeModulePkg/Core/PiSmmCore/Dependency.c
@@ -161,8 +161,7 @@ PopBool (
 /**\r
   This is the POSTFIX version of the dependency evaluator.  This code does\r
   not need to handle Before or After, as it is not valid to call this\r
-  routine in this case. The SOR is just ignored and is a nop in the grammer.\r
-  POSTFIX means all the math is done on top of the stack.\r
+  routine in this case. POSTFIX means all the math is done on top of the stack.\r
 \r
   @param  DriverEntry           DriverEntry element to update.\r
 \r
@@ -183,8 +182,6 @@ SmmIsSchedulable (
   EFI_GUID    DriverGuid;\r
   VOID        *Interface;\r
 \r
-  DEBUG ((DEBUG_DISPATCH, "Evaluate SMM DEPEX for FFS(%g)\n", &DriverEntry->FileName));\r
-  \r
   Operator = FALSE;\r
   Operator2 = FALSE;\r
 \r
@@ -196,6 +193,8 @@ SmmIsSchedulable (
     return FALSE;\r
   }\r
 \r
+  DEBUG ((DEBUG_DISPATCH, "Evaluate SMM DEPEX for FFS(%g)\n", &DriverEntry->FileName));\r
+  \r
   if (DriverEntry->Depex == NULL) {\r
     //\r
     // A NULL Depex means that the SMM driver is not built correctly.  \r
@@ -239,21 +238,6 @@ SmmIsSchedulable (
       //\r
       DEBUG ((DEBUG_DISPATCH, "  RESULT = FALSE (Unexpected BEFORE or AFTER opcode)\n"));\r
       ASSERT (FALSE);\r
-    case EFI_DEP_SOR:\r
-      //\r
-      // These opcodes can only appear once as the first opcode.  If it is found\r
-      // at any other location, then the dependency expression evaluates to FALSE\r
-      //\r
-      if (Iterator != DriverEntry->Depex) {\r
-        DEBUG ((DEBUG_DISPATCH, "  SOR\n"));\r
-        DEBUG ((DEBUG_DISPATCH, "  RESULT = FALSE (Unexpected SOR opcode)\n"));\r
-        return FALSE;\r
-      }\r
-      DEBUG ((DEBUG_DISPATCH, "  SOR                                             = Requested\n"));\r
-      //\r
-      // Otherwise, it is the first opcode and should be treated as a NOP.\r
-      //\r
-      break;\r
 \r
     case EFI_DEP_PUSH:\r
       //\r