Fix autogen bug:[Edk67][Edk35].

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / autogen / AutoGen.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index 7de80e6c72ea4d1ed98727b6af70b2ebe7ccc73e..7f9b40e65cd7af1388bf997302e2365e471b542a 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -882,16 +882,11 @@ public class AutoGen {
                                .append("GLOBAL_REMOVE_IF_UNREFERENCED  const UINT8  _gDriverEntryPointCount = ");\r
                        fileBuffer.append(Integer.toString(entryPointCount));\r
                        fileBuffer.append(";\r\n");\r
-                       fileBuffer\r
-                               .append("static BASE_LIBRARY_JUMP_BUFFER  mJumpContext;\r\n");\r
-                               fileBuffer\r
-                                               .append("static EFI_STATUS  mDriverEntryPointStatus = EFI_LOAD_ERROR;\r\n\r\n");\r
-               \r
-                               fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFI_STATUS\r\n");\r
                                fileBuffer.append("EFIAPI\r\n");\r
                                fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
-                               fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");\r
-                               fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
+                               fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
+                               fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
                                fileBuffer.append("  )\r\n\r\n");\r
                                fileBuffer.append("{\r\n");\r
                                fileBuffer.append("  return EFI_SUCCESS;\r\n");\r
@@ -924,8 +919,8 @@ public class AutoGen {
                 fileBuffer.append("EFI_STATUS\r\n");\r
                 fileBuffer.append("EFIAPI\r\n");\r
                 fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
-                fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");\r
-                fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
+                fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
+                fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
                 fileBuffer.append("  )\r\n\r\n");\r
                 fileBuffer.append("{\r\n");\r
 \r
@@ -991,7 +986,7 @@ public class AutoGen {
                        fileBuffer.append("EFI_STATUS\r\n");\r
                        fileBuffer.append("EFIAPI\r\n");\r
                        fileBuffer.append("ProcessModuleUnloadList (\r\n");\r
-                       fileBuffer.append("  EFI_HANDLE  ImageHandle\r\n");\r
+                       fileBuffer.append("  IN EFI_HANDLE  ImageHandle\r\n");\r
                        fileBuffer.append("  )\r\n");\r
                        fileBuffer.append("{\r\n");\r
 \r
@@ -1042,8 +1037,8 @@ public class AutoGen {
                                fileBuffer.append("EFI_STATUS\r\n");\r
                                fileBuffer.append("EFIAPI\r\n");\r
                                fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
-                               fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");\r
-                               fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
+                               fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
+                               fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
                                fileBuffer.append("  )\r\n\r\n");\r
                                fileBuffer.append("{\r\n");\r
                                fileBuffer.append("  return EFI_SUCCESS;\r\n");\r
@@ -1077,8 +1072,8 @@ public class AutoGen {
                 fileBuffer.append("EFI_STATUS\r\n");\r
                 fileBuffer.append("EFIAPI\r\n");\r
                 fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
-                fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");\r
-                fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
+                fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
+                fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
                 fileBuffer.append("  )\r\n\r\n");\r
                 fileBuffer.append("{\r\n");\r
 \r
@@ -1179,7 +1174,7 @@ public class AutoGen {
                        fileBuffer.append("EFI_STATUS\n");\r
                        fileBuffer.append("EFIAPI\r\n");\r
                        fileBuffer.append("ProcessModuleUnloadList (\r\n");\r
-                       fileBuffer.append("  EFI_HANDLE  ImageHandle\r\n");\r
+                       fileBuffer.append("  IN EFI_HANDLE  ImageHandle\r\n");\r
                        fileBuffer.append("  )\r\n");\r
                        fileBuffer.append("{\r\n");\r
 \r
@@ -1193,8 +1188,12 @@ public class AutoGen {
                                fileBuffer.append("  EFI_STATUS  Status;\r\n\r\n");\r
                                fileBuffer.append("  Status = EFI_SUCCESS;\r\n\r\n");\r
                                for (int i = 0; i < entryPointList.length; i++) {\r
-                                       if (!entryPointList[i].equals("")) {\r
-                                               fileBuffer.append("  if (EFI_ERROR (Status)) {\r\n");\r
+                    if (i == 0) {\r
+                        fileBuffer.append("  Status = ");\r
+                        fileBuffer.append(entryPointList[i]);\r
+                        fileBuffer.append("(ImageHandle);\r\n");\r
+                    }else{\r
+                        fileBuffer.append("  if (EFI_ERROR (Status)) {\r\n");\r
                                                fileBuffer.append("    ");\r
                                                fileBuffer.append(entryPointList[i]);\r
                                                fileBuffer.append("(ImageHandle);\r\n");\r
@@ -1203,9 +1202,7 @@ public class AutoGen {
                                                fileBuffer.append(entryPointList[i]);\r
                                                fileBuffer.append("(ImageHandle);\r\n");\r
                                                fileBuffer.append("  }\r\n");\r
-                                       } else {\r
-                                               break;\r
-                                       }\r
+                    }\r
                                }\r
                                fileBuffer.append("  return Status;\r\n");\r
                        }\r