SF.net SVN: edk2-buildtools:[2603] trunk/BaseTools/Source/C/VfrCompile

[<yd...@us...>]

Revision: 2603
          http://sourceforge.net/p/edk2-buildtools/code/2603
Author:   ydong10
Date:     2013-10-12 02:12:44 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
Enable varid field for name/value varstore.

Signed-off-by: Eric Dong <eri...@in...>
Reviewed-by: Liming Gao <lim...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g
    trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
    trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2013-09-24 09:31:38 UTC (rev 2602)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2013-10-12 02:12:44 UTC (rev 2603)
@@ -1018,12 +1018,29 @@
   <<
      EFI_GUID              Guid;
      CIfrVarStoreNameValue VSNVObj;
-     EFI_VARSTORE_ID       VarStoreId;
+     EFI_VARSTORE_ID       VarStoreId = EFI_VARSTORE_ID_INVALID;
+     BOOLEAN               Created    = FALSE;
   >>
   L:NameValueVarStore                               << VSNVObj.SetLineNo(L->getLine()); >>
-  SN:StringIdentifier ","                           << _PCATCH(mCVfrDataStorage.DeclareNameVarStoreBegin (SN->getText()), SN); >>
+  SN:StringIdentifier ","
+  {
+    VarId "=" ID:Number ","                         <<
+                                                       _PCATCH(
+                                                         (INTN)(VarStoreId = _STOU16(ID->getText())) != 0,
+                                                         (INTN)TRUE,
+                                                         ID,
+                                                         "varid 0 is not allowed."
+                                                         );
+                                                    >>
+  }
   (
-    Name "=" "STRING_TOKEN" "\(" N:Number "\)" ","  << _PCATCH(mCVfrDataStorage.NameTableAddItem (_STOSID(N->getText())), SN); >>
+    Name "=" "STRING_TOKEN" "\(" N:Number "\)" ","  << 
+                                                       if (!Created) {
+                                                         _PCATCH(mCVfrDataStorage.DeclareNameVarStoreBegin (SN->getText(), VarStoreId), SN);
+                                                         Created = TRUE;
+                                                       }
+                                                       _PCATCH(mCVfrDataStorage.NameTableAddItem (_STOSID(N->getText())), SN); 
+                                                    >>
   )+
   Uuid "=" guidDefinition[Guid]                     << _PCATCH(mCVfrDataStorage.DeclareNameVarStoreEnd (&Guid), SN); >>
                                                     <<

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp	2013-09-24 09:31:38 UTC (rev 2602)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp	2013-10-12 02:12:44 UTC (rev 2603)
@@ -1512,21 +1512,30 @@
 
 EFI_VFR_RETURN_CODE
 CVfrDataStorage::DeclareNameVarStoreBegin (
-  IN CHAR8    *StoreName
+  IN CHAR8           *StoreName,
+  IN EFI_VARSTORE_ID VarStoreId
   )
 {
   SVfrVarStorageNode *pNode = NULL;
-  EFI_VARSTORE_ID    VarStoreId;
+  EFI_VARSTORE_ID    TmpVarStoreId;
 
   if (StoreName == NULL) {
     return VFR_RETURN_FATAL_ERROR;
   }
 
-  if (GetVarStoreId (StoreName, &VarStoreId) == VFR_RETURN_SUCCESS) {
+  if (GetVarStoreId (StoreName, &TmpVarStoreId) == VFR_RETURN_SUCCESS) {
     return VFR_RETURN_REDEFINED;
   }
+  
+  if (VarStoreId == EFI_VARSTORE_ID_INVALID) {
+    VarStoreId = GetFreeVarStoreId (EFI_VFR_VARSTORE_NAME);
+  } else {
+    if (ChekVarStoreIdFree (VarStoreId) == FALSE) {
+      return VFR_RETURN_VARSTOREID_REDEFINED;
+    }
+    MarkVarStoreIdUsed (VarStoreId);
+  }
 
-  VarStoreId = GetFreeVarStoreId (EFI_VFR_VARSTORE_NAME);
   if ((pNode = new SVfrVarStorageNode (StoreName, VarStoreId)) == NULL) {
     return VFR_RETURN_UNDEFINED;
   }

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h	2013-09-24 09:31:38 UTC (rev 2602)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h	2013-10-12 02:12:44 UTC (rev 2603)
@@ -300,7 +300,7 @@
   SVfrVarStorageNode * GetEfiVarStoreList () {
     return mEfiVarStoreList;
   }
-  EFI_VFR_RETURN_CODE DeclareNameVarStoreBegin (CHAR8 *);
+  EFI_VFR_RETURN_CODE DeclareNameVarStoreBegin (CHAR8 *, EFI_VARSTORE_ID);
   EFI_VFR_RETURN_CODE NameTableAddItem (EFI_STRING_ID);
   EFI_VFR_RETURN_CODE DeclareNameVarStoreEnd (EFI_GUID *);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.