Use the address of guid array as parameter directly for _PCD_MODE_xx macro for Dynami...

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / pcd / entity / UsageInstance.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
index cfbdb1e14960a27df4ca1ff17db7ac5d4fca79dc..2769d497f70d75e0e9831b64857fa38e3d571210 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
@@ -200,7 +200,7 @@ public class UsageInstance {
        @param isBuildUsedLibrary  whether the autogen is for library.\r
      */\r
     public void generateAutoGen(boolean isBuildUsedLibrary) \r
-    throws EntityException {\r
+        throws EntityException {\r
         String  guidStringCName  = null;\r
         boolean isByteArray      = false;\r
         String  printDatum       = null;\r
@@ -340,20 +340,13 @@ public class UsageInstance {
             guidStringCName = "_gPcd_TokenSpaceGuid_" +\r
                               parentToken.tokenSpaceName.toString().replaceAll("-", "_");\r
                                             \r
-            hAutogenStr += String.format("extern const EFI_GUID *_gPcd_DynamicEx_TokenSpaceGuid_%s;\r\n",\r
-                                         parentToken.cName);\r
-            hAutogenStr += String.format("#define _PCD_MODE_%s_%s LibPcdGetEx%s(_gPcd_DynamicEx_TokenSpaceGuid_%s, _PCD_TOKEN_%s)\r\n",\r
+            hAutogenStr += String.format("#define _PCD_MODE_%s_%s LibPcdGetEx%s(&%s, _PCD_TOKEN_%s)\r\n",\r
                                          Token.GetAutogenDefinedatumTypeString(parentToken.datumType),\r
                                          parentToken.cName,\r
                                          Token.getAutogenLibrarydatumTypeString(parentToken.datumType),\r
-                                         parentToken.cName,\r
+                                         guidStringCName,\r
                                          parentToken.cName);\r
 \r
-            if (!isBuildUsedLibrary) {\r
-                cAutogenStr += String.format("GLOBAL_REMOVE_IF_UNREFERENCED const EFI_GUID *_gPcd_DynamicEx_TokenSpaceGuid_%s = &%s;\r\n",\r
-                                             parentToken.cName,\r
-                                             guidStringCName);\r
-            }\r
             break;\r
         }\r
     }\r