Merge branch 'tianocore-edk2-basetools'linaro-base-2013.01

3 files changed, 182 insertions, 42 deletions

diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
index d87653f0c4..55fdb05270 100644
--- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
@@ -596,6 +596,10 @@ CVfrCompiler::AdjustBin (
 {

   EFI_VFR_RETURN_CODE Status;

 

+  if (!IS_RUN_STATUS(STATUS_COMPILEED)) {

+    return;

+  }

+

   UpdateInfoForDynamicOpcode ();

 

   //

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
index 09f7cdf30a..614471060d 100644
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
@@ -2,7 +2,7 @@
   

   The definition of CFormPkg's member function

 

-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -433,6 +433,10 @@ public:
 

     return _FLAGS_ZERO (Flags) ? VFR_RETURN_SUCCESS : VFR_RETURN_FLAGS_UNSUPPORTED;

   }

+

+  VOID UpdateCIfrQuestionHeader (IN EFI_IFR_QUESTION_HEADER *Header) {

+    mHeader = Header;

+  }

 };

 

 /*

@@ -583,6 +587,10 @@ public:
   BOOLEAN IsNumericOpcode () {

     return IsNumeric;

   }

+

+  VOID UpdateCIfrMinMaxStepData (IN MINMAXSTEP_DATA *MinMaxStepData) {

+    mMinMaxStepData = MinMaxStepData;

+  }

 };

 

 static CIfrQuestionHeader *gCurrentQuestion  = NULL;

@@ -922,14 +930,15 @@ private:
 

 public:

   CIfrDefault (

+    IN UINT8              Size,

     IN UINT16             DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD,

     IN UINT8              Type      = EFI_IFR_TYPE_OTHER,

     IN EFI_IFR_TYPE_VALUE Value     = gZeroEfiIfrTypeValue

-    ) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault),

-        CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header) {

+    ) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault, Size),

+        CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header, Size) {

     mDefault->Type      = Type;

-    mDefault->Value     = Value;

     mDefault->DefaultId = DefaultId;

+    memcpy (&(mDefault->Value), &Value, Size - OFFSET_OF (EFI_IFR_DEFAULT, Value));

   }

 

   VOID SetDefaultId (IN UINT16 DefaultId) {

@@ -941,7 +950,7 @@ public:
   }

 

   VOID SetValue (IN EFI_IFR_TYPE_VALUE Value) {

-    mDefault->Value = Value;

+    memcpy (&mDefault->Value, &Value, mDefault->Header.Length - OFFSET_OF (EFI_IFR_DEFAULT, Value));

   }

 };

 

@@ -1299,7 +1308,7 @@ private:
   EFI_IFR_NUMERIC *mNumeric;

 

 public:

-  CIfrNumeric () : CIfrObj (EFI_IFR_NUMERIC_OP, (CHAR8 **)&mNumeric),

+  CIfrNumeric () : CIfrObj (EFI_IFR_NUMERIC_OP, (CHAR8 **)&mNumeric, sizeof (EFI_IFR_NUMERIC), TRUE),

                    CIfrOpHeader (EFI_IFR_NUMERIC_OP, &mNumeric->Header),

                    CIfrQuestionHeader (&mNumeric->Question),

                    CIfrMinMaxStepData (&mNumeric->data, TRUE) {

@@ -1313,6 +1322,27 @@ public:
     gCurrentMinMaxData = NULL;

   }

 

+  VOID ShrinkBinSize (IN UINT16 Size) {

+    //

+    // Update the buffer size which is truly be used later.

+    //

+    ShrinkObjBin(Size);

+    DecLength(Size);

+

+    //

+    // Allocate buffer in gCFormPkg.

+    //

+    _EMIT_PENDING_OBJ();

+

+    //

+    // Update the buffer pointer used by other class.

+    //

+    mNumeric = (EFI_IFR_NUMERIC *) GetObjBinAddr();

+    UpdateHeader (&mNumeric->Header);

+    UpdateCIfrQuestionHeader(&mNumeric->Question);

+    UpdateCIfrMinMaxStepData(&mNumeric->data);

+  }

+

   EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, IN UINT8 LFlags) {

     EFI_VFR_RETURN_CODE Ret;

 

@@ -1335,7 +1365,7 @@ private:
   EFI_IFR_ONE_OF *mOneOf;

 

 public:

-  CIfrOneOf () : CIfrObj (EFI_IFR_ONE_OF_OP, (CHAR8 **)&mOneOf),

+  CIfrOneOf () : CIfrObj (EFI_IFR_ONE_OF_OP, (CHAR8 **)&mOneOf, sizeof (EFI_IFR_ONE_OF), TRUE),

                  CIfrOpHeader (EFI_IFR_ONE_OF_OP, &mOneOf->Header),

                  CIfrQuestionHeader (&mOneOf->Question),

                  CIfrMinMaxStepData (&mOneOf->data) {

@@ -1364,6 +1394,27 @@ public:
     }

     return VFR_RETURN_SUCCESS;

   }

+

+  VOID ShrinkBinSize (IN UINT16 Size) {

+    //

+    // Update the buffer size which is truly be used later.

+    //

+    ShrinkObjBin(Size);

+    DecLength(Size);

+

+    //

+    // Allocate buffer in gCFormPkg.

+    //

+    _EMIT_PENDING_OBJ();

+

+    //

+    // Update the buffer pointer used by other class.

+    //

+    mOneOf = (EFI_IFR_ONE_OF *) GetObjBinAddr();

+    UpdateHeader (&mOneOf->Header);

+    UpdateCIfrQuestionHeader(&mOneOf->Question);

+    UpdateCIfrMinMaxStepData(&mOneOf->data);

+  }

 };

 

 class CIfrString : public CIfrObj, public CIfrOpHeader, public CIfrQuestionHeader {

@@ -1626,12 +1677,12 @@ private:
   EFI_IFR_ONE_OF_OPTION *mOneOfOption;

 

 public:

-  CIfrOneOfOption () : CIfrObj (EFI_IFR_ONE_OF_OPTION_OP, (CHAR8 **)&mOneOfOption),

-                       CIfrOpHeader (EFI_IFR_ONE_OF_OPTION_OP, &mOneOfOption->Header) {

+  CIfrOneOfOption (UINT8 Size) : CIfrObj (EFI_IFR_ONE_OF_OPTION_OP, (CHAR8 **)&mOneOfOption, Size),

+                       CIfrOpHeader (EFI_IFR_ONE_OF_OPTION_OP, &mOneOfOption->Header, Size) {

     mOneOfOption->Flags  = 0;

     mOneOfOption->Option = EFI_STRING_ID_INVALID;

     mOneOfOption->Type   = EFI_IFR_TYPE_OTHER;

-    memset (&mOneOfOption->Value, 0, sizeof (mOneOfOption->Value));

+    memset (&mOneOfOption->Value, 0, Size - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));

   }

 

   VOID SetOption (IN EFI_STRING_ID Option) {

@@ -1684,7 +1735,7 @@ public:
   }

 

   VOID SetValue (IN EFI_IFR_TYPE_VALUE Value) {

-    mOneOfOption->Value = Value;

+    memcpy (&mOneOfOption->Value, &Value, mOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));

   }

 

   UINT8 GetFlags (VOID) {

diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
index 3c7f0274d1..76d15790c3 100644
--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
@@ -1,5 +1,5 @@
 /*++

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -591,7 +591,7 @@ vfrFormSetDefinition :
                                                       // Declare undefined Question so that they can be used in expression.

                                                       //

                                                       if (gCFormPkg.HavePendingUnassigned()) {

-                                                        gCFormPkg.DeclarePendingQuestion (

+                                                        mParserStatus += gCFormPkg.DeclarePendingQuestion (

                                                                     gCVfrVarDataTypeDB,

                                                                     mCVfrDataStorage,

                                                                     mCVfrQuestionDB,

@@ -1472,6 +1472,8 @@ vfrStatementDefault :
      EFI_DEFAULT_ID        DefaultId     = EFI_HII_DEFAULT_CLASS_STANDARD;

      CHAR8                 *VarStoreName = NULL;

      EFI_VFR_VARSTORE_TYPE VarStoreType  = EFI_VFR_VARSTORE_INVALID;

+     UINT8                 Size          = 0;

+     BOOLEAN               TypeError     = FALSE;

   >>

   D:Default                                         

   (

@@ -1484,7 +1486,53 @@ vfrStatementDefault :
                                                             _PCATCH (VFR_RETURN_INVALID_PARAMETER, D->getLine(), "Numeric default value must be between MinValue and MaxValue.");

                                                           }

                                                         }

-                                                        DObj = new CIfrDefault;

+                                                        switch (_GET_CURRQEST_DATATYPE()) {

+                                                         case EFI_IFR_TYPE_NUM_SIZE_8:

+                                                           Size = 1;

+                                                           break;

+

+                                                         case EFI_IFR_TYPE_NUM_SIZE_16:

+                                                           Size = 2;

+                                                           break;

+

+                                                         case EFI_IFR_TYPE_NUM_SIZE_32:

+                                                           Size = 4;

+                                                           break;

+

+                                                         case EFI_IFR_TYPE_NUM_SIZE_64:

+                                                           Size = 8;

+                                                           break;

+

+                                                         case EFI_IFR_TYPE_DATE:

+                                                           Size = 4;

+                                                           break;

+

+                                                         case EFI_IFR_TYPE_TIME:

+                                                           Size = 3;

+                                                           break;

+

+                                                         case EFI_IFR_TYPE_REF:

+                                                           Size = 22;

+                                                           break;

+

+                                                         case EFI_IFR_TYPE_STRING:

+                                                           Size = 2;

+                                                           break;

+

+                                                         case EFI_IFR_TYPE_BOOLEAN:

+                                                           Size = 1;

+                                                           break;

+

+                                                         default:

+                                                           TypeError = TRUE;

+                                                           Size = sizeof (EFI_IFR_TYPE_VALUE);

+                                                           break;

+                                                         }

+                                                        if (TypeError) {

+                                                          _PCATCH (VFR_RETURN_FATAL_ERROR, D->getLine(), "Default data type error.");

+                                                        }

+                                                        Size += OFFSET_OF (EFI_IFR_DEFAULT, Value);

+                                                        DObj = new CIfrDefault (Size);

                                                         DObj->SetLineNo(D->getLine());

                                                         DObj->SetType (_GET_CURRQEST_DATATYPE()); 

                                                         DObj->SetValue(Val);

@@ -1991,6 +2039,7 @@ vfrStatementDate :
      CHAR8              *VarIdStr[3] = {NULL, };

      CIfrDate           DObj;

      EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue;

+     UINT8              Size = OFFSET_OF (EFI_IFR_DEFAULT, Value) + sizeof (EFI_HII_DATE);

   >>

   L:Date                                               << DObj.SetLineNo(L->getLine()); >>

   (

@@ -2027,7 +2076,7 @@ vfrStatementDate :
                                                           DObj.SetHelp (_STOSID(YH->getText()));

                                                           if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; }

                                                        >>

-                                                       << {CIfrDefault DefaultObj(EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_DATE, Val); DefaultObj.SetLineNo(L->getLine());} >>

+                                                       << {CIfrDefault DefaultObj(Size, EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_DATE, Val); DefaultObj.SetLineNo(L->getLine());} >>

     )

     ( vfrStatementInconsistentIf )*

   )

@@ -2155,8 +2204,9 @@ vfrSetMinMaxStep[CIfrMinMaxStepData & MMSDObj] :
 vfrStatementNumeric :

   <<

      CIfrNumeric NObj;

-     UINT32 DataTypeSize;

-     BOOLEAN IsSupported;

+     UINT32      DataTypeSize;

+     BOOLEAN     IsSupported = TRUE;

+     UINT8       ShrinkSize  = 0;

   >>

   L:Numeric                                            << NObj.SetLineNo(L->getLine()); >>

   vfrQuestionHeader[NObj] ","                          << // check data type

@@ -2170,23 +2220,27 @@ vfrStatementNumeric :
   {

     Key   "=" KN:Number ","                            << AssignQuestionKey (NObj, KN); >>

   }

-  vfrSetMinMaxStep[NObj]

-  vfrStatementQuestionOptionList

-  E:EndNumeric                                         << 

-                                                          IsSupported = FALSE;

+  vfrSetMinMaxStep[NObj]                               <<

                                                           switch (_GET_CURRQEST_DATATYPE()) {

-                                                            case EFI_IFR_TYPE_NUM_SIZE_8:

-                                                            case EFI_IFR_TYPE_NUM_SIZE_16:

-                                                            case EFI_IFR_TYPE_NUM_SIZE_32:

-                                                            case EFI_IFR_TYPE_NUM_SIZE_64:

-                                                              IsSupported = TRUE;

-                                                              break;

-                                                            default:

+                                                            //

+                                                            // Base on the type to know the actual used size,shrink the buffer 

+                                                            // size allocate before.

+                                                            //

+                                                            case EFI_IFR_TYPE_NUM_SIZE_8: ShrinkSize = 21;break;

+                                                            case EFI_IFR_TYPE_NUM_SIZE_16:ShrinkSize = 18;break;

+                                                            case EFI_IFR_TYPE_NUM_SIZE_32:ShrinkSize = 12;break;

+                                                            case EFI_IFR_TYPE_NUM_SIZE_64:break;

+                                                            default: 

+                                                              IsSupported = FALSE;

                                                               break;

                                                           }

+                                                          NObj.ShrinkBinSize (ShrinkSize);

                                                           if (!IsSupported) {

                                                             _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Numeric question only support UINT8, UINT16, UINT32 and UINT64 data type.");

                                                           }

+                                                       >>

+  vfrStatementQuestionOptionList

+  E:EndNumeric                                         << 

                                                           CRT_END_OP (E); 

                                                        >>

   ";"

@@ -2233,7 +2287,8 @@ vfrStatementOneOf :
   <<

      CIfrOneOf OObj;

      UINT32    DataTypeSize;

-     BOOLEAN   IsSupported;

+     BOOLEAN   IsSupported = TRUE;

+     UINT8     ShrinkSize  = 0;

   >>

   L:OneOf                                              << OObj.SetLineNo(L->getLine()); >>

   vfrQuestionHeader[OObj] ","                          << //check data type

@@ -2247,22 +2302,27 @@ vfrStatementOneOf :
   {

     vfrSetMinMaxStep[OObj]

   }

-  vfrStatementQuestionOptionList

-  E:EndOneOf                                           << 

-                                                          IsSupported = FALSE;

+                                                       <<

                                                           switch (_GET_CURRQEST_DATATYPE()) {

-                                                            case EFI_IFR_TYPE_NUM_SIZE_8:

-                                                            case EFI_IFR_TYPE_NUM_SIZE_16:

-                                                            case EFI_IFR_TYPE_NUM_SIZE_32:

-                                                            case EFI_IFR_TYPE_NUM_SIZE_64:

-                                                              IsSupported = TRUE;

-                                                              break;

+                                                            //

+                                                            // Base on the type to know the actual used size,shrink the buffer 

+                                                            // size allocate before.

+                                                            //

+                                                            case EFI_IFR_TYPE_NUM_SIZE_8: ShrinkSize = 21;break;

+                                                            case EFI_IFR_TYPE_NUM_SIZE_16:ShrinkSize = 18;break;

+                                                            case EFI_IFR_TYPE_NUM_SIZE_32:ShrinkSize = 12;break;

+                                                            case EFI_IFR_TYPE_NUM_SIZE_64:break;

                                                             default:

+                                                              IsSupported = FALSE;

                                                               break;

                                                           }

+                                                          OObj.ShrinkBinSize (ShrinkSize);

                                                           if (!IsSupported) {

                                                             _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "OneOf question only support UINT8, UINT16, UINT32 and UINT64 data type.");

                                                           }

+                                                       >>

+  vfrStatementQuestionOptionList

+  E:EndOneOf                                           <<

                                                           CRT_END_OP (E); 

                                                        >>

   ";"

@@ -2452,6 +2512,7 @@ vfrStatementTime :
      CHAR8              *VarIdStr[3] = {NULL, };

      CIfrTime           TObj;

      EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue;

+     UINT8              Size = OFFSET_OF (EFI_IFR_DEFAULT, Value) + sizeof (EFI_HII_TIME);

   >>

   L:Time                                               << TObj.SetLineNo(L->getLine()); >>

   (

@@ -2488,7 +2549,7 @@ vfrStatementTime :
                                                           TObj.SetHelp (_STOSID(HH->getText()));

                                                           if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; }

                                                        >>

-                                                       << {CIfrDefault DefaultObj(EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_TIME, Val); DefaultObj.SetLineNo(L->getLine());} >>

+                                                       << {CIfrDefault DefaultObj(Size, EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_TIME, Val); DefaultObj.SetLineNo(L->getLine());} >>

     )

     ( vfrStatementInconsistentIf )*

   )

@@ -2803,11 +2864,35 @@ vfrStatementOptions :
 

 vfrStatementOneOfOption :

   <<

-     EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue;

-     CIfrOneOfOption    OOOObj;

+     EFI_IFR_TYPE_VALUE Val           = gZeroEfiIfrTypeValue;

      CHAR8              *VarStoreName = NULL;

+     BOOLEAN            TypeError     = FALSE;

+     UINT8              Size          = 0;

+

+     switch (_GET_CURRQEST_DATATYPE()) {

+     case EFI_IFR_TYPE_NUM_SIZE_8:  Size = 1; break;

+     case EFI_IFR_TYPE_NUM_SIZE_16: Size = 2; break;

+     case EFI_IFR_TYPE_NUM_SIZE_32: Size = 4; break;

+     case EFI_IFR_TYPE_NUM_SIZE_64: Size = 8; break;

+     case EFI_IFR_TYPE_DATE:        Size = 4; break;

+     case EFI_IFR_TYPE_TIME:        Size = 3; break;

+     case EFI_IFR_TYPE_REF:         Size = 22;break;

+     case EFI_IFR_TYPE_STRING:      Size = 2; break;

+     case EFI_IFR_TYPE_BOOLEAN:     Size = 1; break;

+     default:

+       TypeError = TRUE;

+       Size = sizeof (EFI_IFR_TYPE_VALUE);

+       break;

+     }

+     Size += OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value);

+     CIfrOneOfOption    OOOObj (Size);

   >>

-  L:Option                                             << OOOObj.SetLineNo(L->getLine()); >>

+  L:Option                                             << 

+                                                          OOOObj.SetLineNo(L->getLine());

+                                                          if (TypeError) {

+                                                            _PCATCH (VFR_RETURN_FATAL_ERROR, L->getLine(), "Get data type error.");

+                                                          }

+                                                       >>

   Text  "=" "STRING_TOKEN" "\(" S:Number "\)" ","      << OOOObj.SetOption (_STOSID(S->getText())); >>

   Value "=" vfrConstantValueField[_GET_CURRQEST_DATATYPE()] >[Val] ","    

                                                        <<