Fix a bug for token number set in FPD can not exceed 2^31. The fixing is using Long...

[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 baf87572f0ea8550cd890153127fc718d7edac76..d146e9db44053ec87e14b8018696914b076d7cf3 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
@@ -211,21 +211,23 @@ public class UsageInstance {
      */\r
     public void generateAutoGen(boolean isBuildUsedLibrary) \r
         throws EntityException {\r
-        String  guidStringCName  = null;\r
-        boolean isByteArray      = false;\r
-        String  printDatum       = null;\r
+        String  guidStringCName     = null;\r
+        boolean isByteArray         = false;\r
+        String  printDatum          = null;\r
+        String  tokenNumberString   = null;\r
 \r
         hAutogenStr = "";\r
         cAutogenStr = "";\r
 \r
         if (this.modulePcdType == Token.PCD_TYPE.DYNAMIC_EX) {\r
-            hAutogenStr += String.format("#define _PCD_TOKEN_%s   0x%016x\r\n", \r
-                                         parentToken.cName, parentToken.dynamicExTokenNumber);\r
+            tokenNumberString =  Long.toString(parentToken.dynamicExTokenNumber, 16);\r
         } else {\r
-            hAutogenStr += String.format("#define _PCD_TOKEN_%s   0x%016x\r\n", \r
-                                         parentToken.cName, parentToken.tokenNumber);\r
+            tokenNumberString = Long.toString(parentToken.tokenNumber, 16);\r
         }\r
 \r
+        hAutogenStr += String.format("#define _PCD_TOKEN_%s  0x%s\r\n", \r
+                                     parentToken.cName, tokenNumberString);\r
+        \r
         if (!isBuildUsedLibrary && !parentToken.isDynamicPCD) {\r
             if (datum.trim().charAt(0) == '{') {\r
                 isByteArray = true;\r