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 9005a9808d34476833131b13addca2dbb864853a..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,17 +200,15 @@ public class UsageInstance {
        @param isBuildUsedLibrary  whether the autogen is for library.\r
      */\r
     public void generateAutoGen(boolean isBuildUsedLibrary) \r
-    throws EntityException {\r
-        String guidStringArray[] = null;\r
-        String guidString        = null;\r
+        throws EntityException {\r
+        String  guidStringCName  = null;\r
         boolean isByteArray      = false;\r
+        String  printDatum       = null;\r
 \r
         hAutogenStr = "";\r
         cAutogenStr = "";\r
 \r
         if (this.modulePcdType == Token.PCD_TYPE.DYNAMIC_EX) {\r
-            hAutogenStr += String.format("#define _PCD_LOCAL_TOKEN_%s   0x%016x\r\n", \r
-                                         parentToken.cName, parentToken.tokenNumber);\r
             hAutogenStr += String.format("#define _PCD_TOKEN_%s   0x%016x\r\n", \r
                                          parentToken.cName, parentToken.dynamicExTokenNumber);\r
         } else {\r
@@ -224,6 +222,12 @@ public class UsageInstance {
             }\r
         }\r
 \r
+        if (parentToken.datumType == Token.DATUM_TYPE.UINT64) {\r
+            printDatum = this.datum + "ULL";\r
+        } else {\r
+            printDatum = this.datum;\r
+        }\r
+\r
         switch (modulePcdType) {\r
         case FEATURE_FLAG:\r
             if (isBuildUsedLibrary) {\r
@@ -236,7 +240,7 @@ public class UsageInstance {
             } else {\r
                 hAutogenStr += String.format("#define _PCD_VALUE_%s   %s\r\n", \r
                                              parentToken.cName, \r
-                                             datum.toString());\r
+                                             printDatum);\r
                 hAutogenStr += String.format("extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", \r
                                              parentToken.cName);\r
                 cAutogenStr += String.format("GLOBAL_REMOVE_IF_UNREFERENCED const BOOLEAN _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",\r
@@ -260,7 +264,7 @@ public class UsageInstance {
             } else {\r
                 hAutogenStr += String.format("#define _PCD_VALUE_%s   %s\r\n", \r
                                              parentToken.cName, \r
-                                             datum.toString());\r
+                                             printDatum);\r
                 if (isByteArray) {\r
                     cAutogenStr += String.format("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8 _gPcd_FixedAtBuild_%s[] = _PCD_VALUE_%s;\r\n",\r
                                                  parentToken.cName,\r
@@ -298,7 +302,7 @@ public class UsageInstance {
             } else {\r
                 hAutogenStr += String.format("#define _PCD_VALUE_%s   %s\r\n", \r
                                              parentToken.cName, \r
-                                             datum.toString());\r
+                                             printDatum);\r
                 if (isByteArray) {\r
                     cAutogenStr += String.format("GLOBAL_REMOVE_IF_UNREFERENCED UINT8 _gPcd_BinaryPatch_%s[] = _PCD_VALUE_%s;\r\n",\r
                                                  parentToken.cName,\r
@@ -333,34 +337,16 @@ public class UsageInstance {
                                          parentToken.cName);\r
             break;\r
         case DYNAMIC_EX:\r
-            guidStringArray = parentToken.tokenSpaceName.toString().split("-");\r
-            guidString      = String.format("{ 0x%s, 0x%s, 0x%s, {0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s}}",\r
-                                            guidStringArray[0],\r
-                                            guidStringArray[1],\r
-                                            guidStringArray[2],\r
-                                            (guidStringArray[3].substring(0, 2)),\r
-                                            (guidStringArray[3].substring(2, 4)),\r
-                                            (guidStringArray[4].substring(0, 2)),\r
-                                            (guidStringArray[4].substring(2, 4)),\r
-                                            (guidStringArray[4].substring(4, 6)),\r
-                                            (guidStringArray[4].substring(6, 8)),\r
-                                            (guidStringArray[4].substring(8, 10)),\r
-                                            (guidStringArray[4].substring(10, 12)));\r
+            guidStringCName = "_gPcd_TokenSpaceGuid_" +\r
+                              parentToken.tokenSpaceName.toString().replaceAll("-", "_");\r
                                             \r
-            hAutogenStr += String.format("extern EFI_GUID _gPcd_DynamicEx_TokenSpaceGuid_%s;\r\n",\r
-                                         parentToken.cName);\r
-            hAutogenStr += String.format("#define _PCD_MODE_%s_%s LibPcdGet%s(_PCD_LOCAL_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 EFI_GUID _gPcd_DynamicEx_TokenSpaceGuid_%s = %s;\r\n",\r
-                                             parentToken.cName,\r
-                                             guidString);\r
-            }\r
             break;\r
         }\r
     }\r