edk2-buildtools-commits Mailing List for EDK II Build Tools (Page 6)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2553
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2553&view=rev
Author:   ydong10
Date:     2012-09-27 11:28:48 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
Refine the logic to auto generate opcode for not defined variable at the end of the form set instead of at the end of the form.

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

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

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
===================================================================

--- trunk/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp	2012-09-27 10:54:08 UTC (rev 2552)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp	2012-09-27 11:28:48 UTC (rev 2553)
@@ -2,7 +2,7 @@
   
   VfrCompiler main class and main function.
 
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2012, 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        
@@ -554,11 +554,50 @@
 }
 
 VOID
+CVfrCompiler::UpdateInfoForDynamicOpcode (
+  VOID
+  )
+{
+  SIfrRecord          *pRecord;
+
+  if (!gNeedAdjustOpcode) {
+    return;
+  }
+  
+  //
+  // Base on the original offset info to update the record list.
+  //
+  if (!gCIfrRecordInfoDB.IfrAdjustDynamicOpcodeInRecords()) {
+    DebugError (NULL, 0, 1001, "Error parsing vfr file", "Can find the offset in the record.");
+  }
+
+  //
+  // Base on the opcode binary length to recalculate the offset for each opcode.
+  //
+  gCIfrRecordInfoDB.IfrAdjustOffsetForRecord();
+
+  //
+  // Base on the offset to find the binary address.
+  //
+  pRecord = gCIfrRecordInfoDB.GetRecordInfoFromOffset(gAdjustOpcodeOffset);
+  while (pRecord != NULL) {
+    pRecord->mIfrBinBuf = gCFormPkg.GetBufAddrBaseOnOffset(pRecord->mOffset);
+    if (pRecord->mIfrBinBuf == NULL) {
+      DebugError (NULL, 0, 0001, "Error parsing vfr file", " 0x%X. offset not allocated.", pRecord->mOffset);
+    }
+    pRecord = pRecord->mNext;
+  }
+}
+
+VOID
 CVfrCompiler::AdjustBin (
   VOID
   )
 {
   EFI_VFR_RETURN_CODE Status;
+
+  UpdateInfoForDynamicOpcode ();
+
   //
   // Check Binary Code consistent between Form and IfrRecord
   //

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrCompiler.h
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrCompiler.h	2012-09-27 10:54:08 UTC (rev 2552)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrCompiler.h	2012-09-27 11:28:48 UTC (rev 2553)
@@ -87,6 +87,7 @@
 
   VOID    SET_RUN_STATUS (IN COMPILER_RUN_STATUS);
   BOOLEAN IS_RUN_STATUS (IN COMPILER_RUN_STATUS);
+  VOID    UpdateInfoForDynamicOpcode (VOID);
 
 public:
   COMPILER_RUN_STATUS RunStatus (VOID) {

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp	2012-09-27 10:54:08 UTC (rev 2552)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp	2012-09-27 11:28:48 UTC (rev 2553)
@@ -152,12 +152,39 @@
   PendingAssignList = NULL;
 }
 
+SBufferNode *
+CFormPkg::CreateNewNode (
+  VOID
+  )
+{
+  SBufferNode *Node;
+
+  Node = new SBufferNode;
+  if (Node == NULL) {
+    return NULL;
+  }
+
+  Node->mBufferStart = new CHAR8[mBufferSize];
+  if (Node->mBufferStart == NULL) {
+    delete Node;
+    return NULL;
+  } else {
+    memset (Node->mBufferStart, 0, mBufferSize);
+    Node->mBufferEnd  = Node->mBufferStart + mBufferSize;
+    Node->mBufferFree = Node->mBufferStart;
+    Node->mNext       = NULL;
+  }
+
+  return Node;
+}
+
 CHAR8 *
 CFormPkg::IfrBinBufferGet (
   IN UINT32 Len
   )
 {
-  CHAR8 *BinBuffer = NULL;
+  CHAR8       *BinBuffer = NULL;
+  SBufferNode *Node      = NULL;
 
   if ((Len == 0) || (Len > mBufferSize)) {
     return NULL;
@@ -167,24 +194,11 @@
     BinBuffer = mCurrBufferNode->mBufferFree;
     mCurrBufferNode->mBufferFree += Len;
   } else {
-    SBufferNode *Node;
-
-    Node = new SBufferNode;
+    Node = CreateNewNode ();
     if (Node == NULL) {
       return NULL;
     }
 
-    Node->mBufferStart = new CHAR8[mBufferSize];
-    if (Node->mBufferStart == NULL) {
-      delete Node;
-      return NULL;
-    } else {
-      memset (Node->mBufferStart, 0, mBufferSize);
-      Node->mBufferEnd  = Node->mBufferStart + mBufferSize;
-      Node->mBufferFree = Node->mBufferStart;
-      Node->mNext       = NULL;
-    }
-
     if (mBufferNodeQueueTail == NULL) {
       mBufferNodeQueueHead = mBufferNodeQueueTail = Node;
     } else {
@@ -245,7 +259,7 @@
   }
 
   if (mReadBufferNode == NULL) {
-  	return 0;
+    return 0;
   }
 
   for (Index = 0; Index < Size; Index++) {
@@ -256,7 +270,7 @@
         return Index;
       } else {
         mReadBufferOffset = 0;
-        Buffer[Index] = mReadBufferNode->mBufferStart[mReadBufferOffset++];
+        Index --;
       }
     }
   }
@@ -402,6 +416,9 @@
 }
 
 #define BYTES_PRE_LINE 0x10
+UINT32   gAdjustOpcodeOffset = 0;
+BOOLEAN  gNeedAdjustOpcode   = FALSE;
+UINT32   gAdjustOpcodeLen    = 0;
 
 EFI_VFR_RETURN_CODE 
 CFormPkg::GenCFile (
@@ -548,13 +565,236 @@
   }
 }
 
+SBufferNode *
+CFormPkg::GetBinBufferNodeForAddr (
+  IN CHAR8              *BinBuffAddr
+  )
+{
+  SBufferNode *TmpNode;
+
+  TmpNode = mBufferNodeQueueHead;
+
+  while (TmpNode != NULL) {
+    if (TmpNode->mBufferStart <= BinBuffAddr && TmpNode->mBufferFree >= BinBuffAddr) {
+      return TmpNode;
+    }
+
+    TmpNode = TmpNode->mNext;
+  }
+
+  return NULL;
+}
+
+SBufferNode *
+CFormPkg::GetNodeBefore(
+  IN SBufferNode *CurrentNode
+  )
+{
+  SBufferNode *FirstNode   = mBufferNodeQueueHead;
+  SBufferNode *LastNode    = mBufferNodeQueueHead;
+
+  while (FirstNode != NULL) {
+    if (FirstNode == CurrentNode) {
+      break;
+    }
+
+    LastNode    = FirstNode;
+    FirstNode   = FirstNode->mNext;
+  }
+
+  if (FirstNode == NULL) {
+    LastNode = NULL;
+  }
+
+  return LastNode;
+}
+
 EFI_VFR_RETURN_CODE
+CFormPkg::InsertNodeBefore(
+  IN SBufferNode *CurrentNode,
+  IN SBufferNode *NewNode
+  )
+{
+  SBufferNode *LastNode = GetNodeBefore (CurrentNode);
+
+  if (LastNode == NULL) {
+    return VFR_RETURN_MISMATCHED;
+  }
+
+  NewNode->mNext = LastNode->mNext;
+  LastNode->mNext = NewNode;
+
+  return VFR_RETURN_SUCCESS;
+}
+
+CHAR8 *
+CFormPkg::GetBufAddrBaseOnOffset (
+  IN UINT32      Offset
+  )
+{
+  SBufferNode *TmpNode;
+  UINT32      TotalBufLen;
+  UINT32      CurrentBufLen;
+
+  TotalBufLen = 0;
+
+  for (TmpNode = mBufferNodeQueueHead; TmpNode != NULL; TmpNode = TmpNode->mNext) {
+    CurrentBufLen = TmpNode->mBufferFree - TmpNode->mBufferStart;
+    if (Offset >= TotalBufLen && Offset < TotalBufLen + CurrentBufLen) {
+      return TmpNode->mBufferStart + (Offset - TotalBufLen);
+    }
+
+    TotalBufLen += CurrentBufLen;
+  }
+
+  return NULL;
+}
+
+EFI_VFR_RETURN_CODE
+CFormPkg::AdjustDynamicInsertOpcode (
+  IN CHAR8              *LastFormEndAddr,
+  IN CHAR8              *InsertOpcodeAddr
+  )
+{
+  SBufferNode *LastFormEndNode;
+  SBufferNode *InsertOpcodeNode;
+  SBufferNode *NewRestoreNodeBegin;
+  SBufferNode *NewRestoreNodeEnd;
+  SBufferNode *NewLastEndNode;
+  SBufferNode *TmpNode;
+  UINT32      NeedRestoreCodeLen;
+
+  NewRestoreNodeEnd = NULL;
+
+  LastFormEndNode  = GetBinBufferNodeForAddr(LastFormEndAddr);
+  InsertOpcodeNode = GetBinBufferNodeForAddr(InsertOpcodeAddr);
+
+  if (LastFormEndNode == InsertOpcodeNode) {
+    //
+    // Create New Node to save the restore opcode.
+    //
+    NeedRestoreCodeLen = InsertOpcodeAddr - LastFormEndAddr;
+    gAdjustOpcodeLen   = NeedRestoreCodeLen;
+    NewRestoreNodeBegin = CreateNewNode ();
+    if (NewRestoreNodeBegin == NULL) {
+      return VFR_RETURN_OUT_FOR_RESOURCES;
+    }
+    memcpy (NewRestoreNodeBegin->mBufferFree, LastFormEndAddr, NeedRestoreCodeLen);
+    NewRestoreNodeBegin->mBufferFree += NeedRestoreCodeLen;
+
+    //
+    // Override the restore buffer data.
+    //
+    memcpy (LastFormEndAddr, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);
+    InsertOpcodeNode->mBufferFree -= NeedRestoreCodeLen;
+    memset (InsertOpcodeNode->mBufferFree, 0, NeedRestoreCodeLen);
+  } else {
+    //
+    // Create New Node to save the restore opcode.
+    //
+    NeedRestoreCodeLen = LastFormEndNode->mBufferFree - LastFormEndAddr;
+    gAdjustOpcodeLen   = NeedRestoreCodeLen;
+    NewRestoreNodeBegin = CreateNewNode ();
+    if (NewRestoreNodeBegin == NULL) {
+      return VFR_RETURN_OUT_FOR_RESOURCES;
+    }
+    memcpy (NewRestoreNodeBegin->mBufferFree, LastFormEndAddr, NeedRestoreCodeLen);
+    NewRestoreNodeBegin->mBufferFree += NeedRestoreCodeLen;
+    //
+    // Override the restore buffer data.
+    //
+    LastFormEndNode->mBufferFree -= NeedRestoreCodeLen;
+    //
+    // Link the restore data to new node.
+    //
+    NewRestoreNodeBegin->mNext = LastFormEndNode->mNext;
+
+    //
+    // Count the Adjust opcode len.
+    //
+    TmpNode = LastFormEndNode->mNext;
+    while (TmpNode != InsertOpcodeNode) {
+      gAdjustOpcodeLen += TmpNode->mBufferFree - TmpNode->mBufferStart;
+      TmpNode = TmpNode->mNext;
+    }
+
+    //
+    // Create New Node to save the last node of restore opcode.
+    //
+    NeedRestoreCodeLen = InsertOpcodeAddr - InsertOpcodeNode->mBufferStart;
+    gAdjustOpcodeLen  += NeedRestoreCodeLen;
+    if (NeedRestoreCodeLen > 0) {
+      NewRestoreNodeEnd = CreateNewNode ();
+      if (NewRestoreNodeEnd == NULL) {
+        return VFR_RETURN_OUT_FOR_RESOURCES;
+      }
+      memcpy (NewRestoreNodeEnd->mBufferFree, InsertOpcodeNode->mBufferStart, NeedRestoreCodeLen);
+      NewRestoreNodeEnd->mBufferFree += NeedRestoreCodeLen;
+      //
+      // Override the restore buffer data.
+      //
+      memcpy (InsertOpcodeNode->mBufferStart, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);
+      InsertOpcodeNode->mBufferFree -= InsertOpcodeAddr - InsertOpcodeNode->mBufferStart;
+
+      //
+      // Insert the last restore data node.
+      //
+      TmpNode = GetNodeBefore (InsertOpcodeNode);
+      if (TmpNode == LastFormEndNode) {
+        NewRestoreNodeBegin->mNext = NewRestoreNodeEnd;
+      } else {
+        TmpNode->mNext = NewRestoreNodeEnd;
+      }
+      //
+      // Connect the dynamic opcode node to the node before last form end node.
+      //
+      LastFormEndNode->mNext = InsertOpcodeNode;
+    }
+  }
+
+  if (mBufferNodeQueueTail->mBufferFree - mBufferNodeQueueTail->mBufferStart > 2) {
+    //
+    // End form set opcode all in the mBufferNodeQueueTail node.
+    //
+    NewLastEndNode = CreateNewNode ();
+    if (NewLastEndNode == NULL) {
+      return VFR_RETURN_OUT_FOR_RESOURCES;
+    }
+    NewLastEndNode->mBufferStart[0] = 0x29;
+    NewLastEndNode->mBufferStart[1] = 0x02;
+    NewLastEndNode->mBufferFree += 2;
+
+    mBufferNodeQueueTail->mBufferFree -= 2;
+
+    mBufferNodeQueueTail->mNext = NewRestoreNodeBegin;
+    if (NewRestoreNodeEnd != NULL) {
+      NewRestoreNodeEnd->mNext = NewLastEndNode;
+    } else {
+      NewRestoreNodeBegin->mNext = NewLastEndNode;
+    }
+
+    mBufferNodeQueueTail = NewLastEndNode;
+  } else if (mBufferNodeQueueTail->mBufferFree - mBufferNodeQueueTail->mBufferStart == 2) {
+    TmpNode = GetNodeBefore(mBufferNodeQueueTail);
+    TmpNode->mNext = NewRestoreNodeBegin;
+    if (NewRestoreNodeEnd != NULL) {
+      NewRestoreNodeEnd->mNext = mBufferNodeQueueTail;
+    } else {
+      NewRestoreNodeBegin->mNext = mBufferNodeQueueTail;
+    }
+  }
+
+  return VFR_RETURN_SUCCESS;
+}
+
+EFI_VFR_RETURN_CODE
 CFormPkg::DeclarePendingQuestion (
   IN CVfrVarDataTypeDB   &lCVfrVarDataTypeDB,
   IN CVfrDataStorage     &lCVfrDataStorage,
   IN CVfrQuestionDB      &lCVfrQuestionDB,
   IN EFI_GUID            *LocalFormSetGuid,
-  IN UINT32 LineNo
+  IN UINT32              LineNo,
+  OUT CHAR8              **InsertOpcodeAddr
   )
 {
   SPendingAssign *pNode;
@@ -572,6 +812,7 @@
   // DisableIf
   CIfrDisableIf DIObj;
   DIObj.SetLineNo (LineNo);
+  *InsertOpcodeAddr = DIObj.GetObjBinAddr ();
   
   //TrueOpcode
   CIfrTrue TObj (LineNo);
@@ -983,6 +1224,82 @@
   return QuestionHead->QuestionId;
 }
 
+SIfrRecord *
+CIfrRecordInfoDB::GetRecordInfoFromOffset (
+  IN UINT32 Offset
+  )
+{
+  SIfrRecord *pNode = NULL;
+
+  for (pNode = mIfrRecordListHead; pNode != NULL; pNode = pNode->mNext) {
+    if (pNode->mOffset == Offset) {
+      return pNode;
+    }
+  }
+
+  return pNode;
+}
+
+BOOLEAN
+CIfrRecordInfoDB::IfrAdjustDynamicOpcodeInRecords (
+  VOID
+  )
+{
+  UINT32             OpcodeOffset;
+  SIfrRecord         *pNode, *pPreNode;
+  SIfrRecord         *pStartNode, *pNodeBeforeStart;
+  SIfrRecord         *pEndNode;
+  
+  pStartNode = NULL;
+  pEndNode   = NULL;
+  OpcodeOffset = 0;
+
+  //
+  // Base on the offset info to get the node.
+  //
+  for (pNode = mIfrRecordListHead; pNode->mNext != NULL; pPreNode = pNode,pNode = pNode->mNext) {
+    if (OpcodeOffset == gAdjustOpcodeOffset) {
+      pStartNode       = pNode;
+      pNodeBeforeStart = pPreNode;
+    } else if (OpcodeOffset == gAdjustOpcodeOffset + gAdjustOpcodeLen) {
+      pEndNode = pPreNode;
+    }
+
+    OpcodeOffset += pNode->mBinBufLen;
+  }
+
+  //
+  // Check the value.
+  //
+  if (pEndNode == NULL || pStartNode == NULL) {
+    return FALSE;
+  }
+
+  //
+  // Adjust the node. pPreNode save the Node before mIfrRecordListTail
+  //
+  pNodeBeforeStart->mNext = pEndNode->mNext;
+  pPreNode->mNext = pStartNode;
+  pEndNode->mNext = mIfrRecordListTail;
+
+  return TRUE;
+}
+
+VOID
+CIfrRecordInfoDB::IfrAdjustOffsetForRecord (
+  VOID
+  )
+{
+  UINT32             OpcodeOffset;
+  SIfrRecord         *pNode;
+
+  OpcodeOffset = 0;
+  for (pNode = mIfrRecordListHead; pNode != NULL; pNode = pNode->mNext) {
+    pNode->mOffset = OpcodeOffset;
+    OpcodeOffset += pNode->mBinBufLen;
+  }
+}
+
 EFI_VFR_RETURN_CODE
 CIfrRecordInfoDB::IfrRecordAdjust (
   VOID
@@ -1195,11 +1512,7 @@
   // Update Ifr Opcode Offset
   //
   if (Status == VFR_RETURN_SUCCESS) {
-    OpcodeOffset = 0;
-    for (pNode = mIfrRecordListHead; pNode != NULL; pNode = pNode->mNext) {
-      pNode->mOffset = OpcodeOffset;
-      OpcodeOffset += pNode->mBinBufLen;
-    }
+    IfrAdjustOffsetForRecord ();
   }
   return Status;
 }

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h	2012-09-27 10:54:08 UTC (rev 2552)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h	2012-09-27 11:28:48 UTC (rev 2553)
@@ -115,6 +115,10 @@
 
   VOID                _WRITE_PKG_LINE (IN FILE *, IN UINT32 , IN CONST CHAR8 *, IN CHAR8 *, IN UINT32);
   VOID                _WRITE_PKG_END (IN FILE *, IN UINT32 , IN CONST CHAR8 *, IN CHAR8 *, IN UINT32);
+  SBufferNode *       GetBinBufferNodeForAddr (IN CHAR8 *);
+  SBufferNode *       CreateNewNode ();
+  SBufferNode *       GetNodeBefore (IN SBufferNode *);
+  EFI_VFR_RETURN_CODE InsertNodeBefore (IN SBufferNode *, IN SBufferNode *);
 
 private:
   SPendingAssign      *PendingAssignList;
@@ -145,12 +149,22 @@
     IN CVfrDataStorage     &lCVfrDataStorage,
     IN CVfrQuestionDB      &lCVfrQuestionDB,
     IN EFI_GUID            *LocalFormSetGuid,
-    IN UINT32 LineNo
+    IN UINT32              LineNo,
+    OUT CHAR8              **InsertOpcodeAddr
     );
+  EFI_VFR_RETURN_CODE AdjustDynamicInsertOpcode (
+    IN CHAR8              *LastFormEndAddr,
+    IN CHAR8              *InsertOpcodeAddr
+    );
+  CHAR8 *             GetBufAddrBaseOnOffset (
+    IN UINT32             Offset
+    );
 };
 
 extern CFormPkg       gCFormPkg;
 extern CVfrStringDB   gCVfrStringDB;
+extern UINT32         gAdjustOpcodeOffset;
+extern BOOLEAN        gNeedAdjustOpcode;
 
 struct SIfrRecord {
   UINT32     mLineNo;
@@ -189,6 +203,10 @@
     mSwitch = FALSE;
   }
 
+  SIfrRecord * GetRecordInfoFromOffset (IN UINT32);
+  VOID        IfrAdjustOffsetForRecord (VOID);
+  BOOLEAN     IfrAdjustDynamicOpcodeInRecords (VOID);
+
   UINT32      IfrRecordRegister (IN UINT32, IN CHAR8 *, IN UINT8, IN UINT32);
   VOID        IfrRecordInfoUpdate (IN UINT32, IN UINT32, IN CHAR8*, IN UINT8, IN UINT32);
   VOID        IfrRecordOutput (IN FILE *, IN UINT32 LineNo);
@@ -227,6 +245,10 @@
     return mObjBinBuf;
   }
 
+  inline UINT32 GetObjBinOffset (VOID) {
+    return mPkgOffset;
+  }
+
   inline UINT8   GetObjBinLen (VOID) {
     return mObjBinLen;
   }

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2012-09-27 10:54:08 UTC (rev 2552)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2012-09-27 11:28:48 UTC (rev 2553)
@@ -494,6 +494,7 @@
      UINT8       ClassGuidNum = 0;
      CIfrFormSet *FSObj = NULL;
      UINT16      C, SC;
+     CHAR8*      InsertOpcodeAddr = NULL;
   >>
   L:FormSet
   Uuid "=" guidDefinition[Guid] ","
@@ -585,7 +586,34 @@
                                                         //
                                                         _DeclareDefaultFrameworkVarStore (GET_LINENO(E));
                                                       }
-                                                      CRT_END_OP (E); if (FSObj != NULL) delete FSObj;
+                                                      
+                                                      //
+                                                      // Declare undefined Question so that they can be used in expression.
+                                                      //
+                                                      if (gCFormPkg.HavePendingUnassigned()) {
+                                                        gCFormPkg.DeclarePendingQuestion (
+                                                                    gCVfrVarDataTypeDB,
+                                                                    mCVfrDataStorage,
+                                                                    mCVfrQuestionDB,
+                                                                    &mFormsetGuid,
+                                                                    E->getLine(),
+                                                                    &InsertOpcodeAddr
+                                                                  );
+                                                        gNeedAdjustOpcode = TRUE;
+                                                      }
+
+                                                      CRT_END_OP (E);
+
+                                                      if (gNeedAdjustOpcode) {
+                                                        gCFormPkg.AdjustDynamicInsertOpcode (
+                                                          mLastFormEndAddr,
+                                                          InsertOpcodeAddr
+                                                        );
+                                                      }
+
+                                                      if (FSObj != NULL) {
+                                                        delete FSObj;
+                                                      }
                                                     >>
   ";"
   ;
@@ -1389,23 +1417,7 @@
                                                         LObj3.SetNumber (0xffff);  //add end label for UEFI, label number hardcode 0xffff
                                                       }
 
-                                                      //
-                                                      // Declare undefined Question so that they can be used in expression.
-                                                      //
-                                                      if (gCFormPkg.HavePendingUnassigned()) {
-                                                        gCFormPkg.DeclarePendingQuestion (
-                                                                    gCVfrVarDataTypeDB,
-                                                                    mCVfrDataStorage,
-                                                                    mCVfrQuestionDB,
-                                                                    &mFormsetGuid,
-                                                                    E->getLine()
-                                                                  );
-                                                      }
-
-                                                      //
-                                                      // mCVfrQuestionDB.PrintAllQuestion();
-                                                      //
-                                                      CRT_END_OP (E);
+                                                      {CIfrEnd EObj; EObj.SetLineNo (E->getLine()); mLastFormEndAddr = EObj.GetObjBinAddr (); gAdjustOpcodeOffset = EObj.GetObjBinOffset ();}
                                                     >>
   ";"
   ;
@@ -3904,6 +3916,7 @@
 
   EFI_VARSTORE_INFO   mCurrQestVarInfo;
   EFI_GUID            *mOverrideClassGuid;
+  CHAR8*              mLastFormEndAddr;
 
 //
 // For framework vfr compatibility

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





2010	Jan (18)	Feb (75)	Mar (40)	Apr (18)	May (12)	Jun (13)	Jul (17)	Aug (25)	Sep (31)	Oct (16)	Nov (20)	Dec (13)
2011	Jan (5)	Feb (7)	Mar (6)	Apr (21)	May (12)	Jun (35)	Jul (29)	Aug (56)	Sep (64)	Oct (43)	Nov (60)	Dec (26)
2012	Jan (6)	Feb (12)	Mar (17)	Apr (10)	May (11)	Jun (13)	Jul (6)	Aug (2)	Sep (3)	Oct (9)	Nov (1)	Dec (2)
2013	Jan (5)	Feb (5)	Mar (1)	Apr (3)	May (3)	Jun (3)	Jul (8)	Aug (7)	Sep (2)	Oct (4)	Nov (14)	Dec (10)
2014	Jan (22)	Feb (7)	Mar (3)	Apr (4)	May (1)	Jun (6)	Jul (4)	Aug	Sep	Oct (1)	Nov	Dec

edk2-buildtools-commits Mailing List for EDK II Build Tools (Page 6)

edk2-buildtools-commits — EDK II Build Tools Source changes