/** @file\r
Parser for IFR binary encoding.\r
\r
-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
UINT16 mExpressionOpCodeIndex;\r
\r
BOOLEAN mInScopeSubtitle;\r
-BOOLEAN mInScopeSuppress;\r
-BOOLEAN mInScopeGrayOut;\r
-BOOLEAN mInScopeDisable;\r
-FORM_EXPRESSION *mSuppressExpression;\r
-FORM_EXPRESSION *mGrayOutExpression;\r
-FORM_EXPRESSION *mDisableExpression;\r
-\r
/**\r
Initialize Statement header members.\r
\r
{\r
FORM_BROWSER_STATEMENT *Statement;\r
EFI_IFR_STATEMENT_HEADER *StatementHdr;\r
+ INTN ConditionalExprCount; \r
\r
if (Form == NULL) {\r
//\r
CopyMem (&Statement->Prompt, &StatementHdr->Prompt, sizeof (EFI_STRING_ID));\r
CopyMem (&Statement->Help, &StatementHdr->Help, sizeof (EFI_STRING_ID));\r
\r
- if (mInScopeSuppress) {\r
- Statement->SuppressExpression = mSuppressExpression;\r
- }\r
-\r
- if (mInScopeGrayOut) {\r
- Statement->GrayOutExpression = mGrayOutExpression;\r
- }\r
-\r
-\r
- if (mInScopeDisable) {\r
- Statement->DisableExpression = mDisableExpression;\r
+ ConditionalExprCount = GetConditionalExpressionCount(ExpressStatement);\r
+ if (ConditionalExprCount > 0) {\r
+ //\r
+ // Form is inside of suppressif\r
+ //\r
+ \r
+ Statement->Expression = (FORM_EXPRESSION_LIST *) AllocatePool( \r
+ (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
+ ASSERT (Statement->Expression != NULL);\r
+ Statement->Expression->Count = (UINTN) ConditionalExprCount;\r
+ Statement->Expression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
+ CopyMem (Statement->Expression->Expression, GetConditionalExpressionList(ExpressStatement), (UINTN) (sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
}\r
\r
Statement->InSubtitle = mInScopeSubtitle;\r
while (!IsListEmpty (&Statement->OptionListHead)) {\r
Link = GetFirstNode (&Statement->OptionListHead);\r
Option = QUESTION_OPTION_FROM_LINK (Link);\r
+ if (Option->SuppressExpression != NULL) {\r
+ FreePool (Option->SuppressExpression);\r
+ }\r
RemoveEntryList (&Option->Link);\r
\r
FreePool (Option);\r
DestroyExpression (Expression);\r
}\r
\r
+ if (Statement->Expression != NULL) {\r
+ FreePool (Statement->Expression);\r
+ }\r
+\r
if (Statement->VariableName != NULL) {\r
FreePool (Statement->VariableName);\r
}\r
FreePool (ConfigInfo);\r
}\r
\r
+ if (Form->SuppressExpression != NULL) {\r
+ FreePool (Form->SuppressExpression);\r
+ }\r
+\r
//\r
// Free this Form\r
//\r
EFI_IMAGE_ID *ImageId;\r
BOOLEAN SuppressForQuestion;\r
BOOLEAN SuppressForOption;\r
- BOOLEAN InScopeOptionSuppress;\r
- FORM_EXPRESSION *OptionSuppressExpression;\r
- BOOLEAN InScopeFormSuppress;\r
- FORM_EXPRESSION *FormSuppressExpression;\r
UINT16 DepthOfDisable;\r
BOOLEAN OpCodeDisabled;\r
BOOLEAN SingleOpCodeExpression;\r
FORMSET_STORAGE *VarStorage;\r
LIST_ENTRY *MapExpressionList;\r
EFI_VARSTORE_ID TempVarstoreId;\r
+ BOOLEAN InScopeDisable;\r
+ INTN ConditionalExprCount;\r
\r
mInScopeSubtitle = FALSE;\r
SuppressForQuestion = FALSE;\r
SuppressForOption = FALSE;\r
- InScopeFormSuppress = FALSE;\r
- mInScopeSuppress = FALSE;\r
- InScopeOptionSuppress = FALSE;\r
- mInScopeGrayOut = FALSE;\r
- mInScopeDisable = FALSE;\r
+ InScopeDisable = FALSE;\r
DepthOfDisable = 0;\r
OpCodeDisabled = FALSE;\r
SingleOpCodeExpression = FALSE;\r
CurrentExpression = NULL;\r
CurrentDefault = NULL;\r
CurrentOption = NULL;\r
- OptionSuppressExpression = NULL;\r
- FormSuppressExpression = NULL;\r
ImageId = NULL;\r
MapMethod = NULL;\r
MapScopeDepth = 0;\r
VarStorage = NULL;\r
MapExpressionList = NULL;\r
TempVarstoreId = 0;\r
+ ConditionalExprCount = 0;\r
\r
//\r
// Get the number of Statements and Expressions\r
\r
if (ScopeOpCode == EFI_IFR_DISABLE_IF_OP) {\r
if (DepthOfDisable == 0) {\r
- mInScopeDisable = FALSE;\r
+ InScopeDisable = FALSE;\r
OpCodeDisabled = FALSE;\r
} else {\r
DepthOfDisable--;\r
CopyMem (&ExpressionOpCode->QuestionId2, &((EFI_IFR_EQ_ID_ID *) OpCodeData)->QuestionId2, sizeof (EFI_QUESTION_ID));\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
+ case EFI_IFR_EQ_ID_VAL_LIST_OP:\r
CopyMem (&ExpressionOpCode->QuestionId, &((EFI_IFR_EQ_ID_VAL_LIST *) OpCodeData)->QuestionId, sizeof (EFI_QUESTION_ID));\r
CopyMem (&ExpressionOpCode->ListLength, &((EFI_IFR_EQ_ID_VAL_LIST *) OpCodeData)->ListLength, sizeof (UINT16));\r
ExpressionOpCode->ValueList = AllocateCopyPool (ExpressionOpCode->ListLength * sizeof (UINT16), &((EFI_IFR_EQ_ID_VAL_LIST *) OpCodeData)->ValueList);\r
//\r
SingleOpCodeExpression = FALSE;\r
\r
- if (mInScopeDisable && CurrentForm == NULL) {\r
+ if (InScopeDisable && CurrentForm == NULL) {\r
//\r
// This is DisableIf expression for Form, it should be a constant expression\r
//\r
CopyMem (&CurrentForm->FormId, &((EFI_IFR_FORM *) OpCodeData)->FormId, sizeof (UINT16));\r
CopyMem (&CurrentForm->FormTitle, &((EFI_IFR_FORM *) OpCodeData)->FormTitle, sizeof (EFI_STRING_ID));\r
\r
- if (InScopeFormSuppress) {\r
+ ConditionalExprCount = GetConditionalExpressionCount(ExpressForm);\r
+ if ( ConditionalExprCount > 0) {\r
//\r
// Form is inside of suppressif\r
//\r
- CurrentForm->SuppressExpression = FormSuppressExpression;\r
+ CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool( \r
+ (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
+ ASSERT (CurrentForm->SuppressExpression != NULL);\r
+ CurrentForm->SuppressExpression->Count = (UINTN) ConditionalExprCount;\r
+ CurrentForm->SuppressExpression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
+ CopyMem (CurrentForm->SuppressExpression->Expression, GetConditionalExpressionList(ExpressForm), (UINTN) (sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
}\r
\r
if (Scope != 0) {\r
CopyMem (&CurrentForm->FormTitle, &MapMethod->MethodTitle, sizeof (EFI_STRING_ID));\r
}\r
\r
- if (InScopeFormSuppress) {\r
+ ConditionalExprCount = GetConditionalExpressionCount(ExpressForm);\r
+ if ( ConditionalExprCount > 0) {\r
//\r
// Form is inside of suppressif\r
//\r
- CurrentForm->SuppressExpression = FormSuppressExpression;\r
+ CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool( \r
+ (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
+ ASSERT (CurrentForm->SuppressExpression != NULL);\r
+ CurrentForm->SuppressExpression->Count = (UINTN) ConditionalExprCount;\r
+ CurrentForm->SuppressExpression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
+ CopyMem (CurrentForm->SuppressExpression->Expression, GetConditionalExpressionList(ExpressForm), (UINTN) (sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
}\r
\r
if (Scope != 0) {\r
CopyMem (&CurrentOption->Value.Value, &((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Value, sizeof (EFI_IFR_TYPE_VALUE));\r
ExtendValueToU64 (&CurrentOption->Value);\r
\r
- if (InScopeOptionSuppress) {\r
- CurrentOption->SuppressExpression = OptionSuppressExpression;\r
+ ConditionalExprCount = GetConditionalExpressionCount(ExpressOption);\r
+ if ( ConditionalExprCount > 0) {\r
+ //\r
+ // Form is inside of suppressif\r
+ //\r
+ CurrentOption->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool( \r
+ (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
+ ASSERT (CurrentOption->SuppressExpression != NULL);\r
+ CurrentOption->SuppressExpression->Count = (UINTN) ConditionalExprCount;\r
+ CurrentOption->SuppressExpression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
+ CopyMem (CurrentOption->SuppressExpression->Expression, GetConditionalExpressionList(ExpressOption), (UINTN) (sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
}\r
\r
//\r
CurrentStatement->StorageWidth = (UINT16) (CurrentStatement->MaxContainers * Width);\r
CurrentStatement->BufferValue = AllocateZeroPool (CurrentStatement->StorageWidth);\r
CurrentStatement->ValueType = CurrentOption->Value.Type;\r
+ if (CurrentStatement->HiiValue.Type == EFI_IFR_TYPE_BUFFER) {\r
+ CurrentStatement->HiiValue.Buffer = CurrentStatement->BufferValue;\r
+ CurrentStatement->HiiValue.BufferLen = CurrentStatement->StorageWidth;\r
+ }\r
\r
InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
}\r
}\r
\r
if (SuppressForOption) {\r
- InScopeOptionSuppress = TRUE;\r
- OptionSuppressExpression = CurrentExpression;\r
+ PushConditionalExpression(CurrentExpression, ExpressOption); \r
} else if (SuppressForQuestion) {\r
- mInScopeSuppress = TRUE;\r
- mSuppressExpression = CurrentExpression;\r
+ PushConditionalExpression(CurrentExpression, ExpressStatement); \r
} else {\r
- InScopeFormSuppress = TRUE;\r
- FormSuppressExpression = CurrentExpression;\r
+ PushConditionalExpression(CurrentExpression, ExpressForm); \r
}\r
\r
//\r
CurrentExpression = CreateExpression (CurrentForm);\r
CurrentExpression->Type = EFI_HII_EXPRESSION_GRAY_OUT_IF;\r
InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
-\r
- mInScopeGrayOut = TRUE;\r
- mGrayOutExpression = CurrentExpression;\r
+ PushConditionalExpression(CurrentExpression, ExpressStatement);\r
\r
//\r
// Take a look at next OpCode to see whether current expression consists\r
// This is DisableIf for Question, enqueue it to Form expression list\r
//\r
InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
+ PushConditionalExpression(CurrentExpression, ExpressStatement);\r
}\r
\r
- mDisableExpression = CurrentExpression;\r
- mInScopeDisable = TRUE;\r
- OpCodeDisabled = FALSE;\r
-\r
+ OpCodeDisabled = FALSE;\r
+ InScopeDisable = TRUE;\r
//\r
// Take a look at next OpCode to see whether current expression consists\r
// of single OpCode\r
\r
case EFI_IFR_SUPPRESS_IF_OP:\r
if (SuppressForOption) {\r
- InScopeOptionSuppress = FALSE;\r
+ PopConditionalExpression(ExpressOption); \r
} else if (SuppressForQuestion) {\r
- mInScopeSuppress = FALSE;\r
+ PopConditionalExpression(ExpressStatement);\r
} else {\r
- InScopeFormSuppress = FALSE;\r
+ PopConditionalExpression(ExpressForm);\r
}\r
break;\r
\r
case EFI_IFR_GRAY_OUT_IF_OP:\r
- mInScopeGrayOut = FALSE;\r
+ PopConditionalExpression(ExpressStatement);\r
break;\r
\r
case EFI_IFR_DISABLE_IF_OP:\r
- mInScopeDisable = FALSE;\r
+ if (CurrentForm != NULL) {\r
+ PopConditionalExpression(ExpressStatement);\r
+ }\r
+ InScopeDisable = FALSE;\r
OpCodeDisabled = FALSE;\r
break;\r
\r
\r
default:\r
if (IsExpressionOpCode (ScopeOpCode)) {\r
- if (mInScopeDisable && CurrentForm == NULL) {\r
+ if (InScopeDisable && CurrentForm == NULL) {\r
//\r
// This is DisableIf expression for Form, it should be a constant expression\r
//\r
projects / mirror_edk2.git / blobdiff