tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: Enhance the check for numeric opcode with EFI_IFR_DISPLAY_INT_DEC attribute. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Aaron Pop <Aaron.Pop@congatec.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17344 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong 2015-05-06 12:29:33 +00:00 committed by ydong10
parent eff98cf9da
commit 1afac950f9
2 changed files with 294 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BaseTools/Source/C/VfrCompile/VfrFormPkg.h
View File

@ -310,6 +310,10 @@ public:
VOID UpdateHeader (IN EFI_IFR_OP_HEADER *Header) { VOID UpdateHeader (IN EFI_IFR_OP_HEADER *Header) {
mHeader = Header; mHeader = Header;
} }
UINT8 GetOpCode () {
return mHeader->OpCode;
}
}; };
extern UINT8 gScopeCount; extern UINT8 gScopeCount;
@ -1359,6 +1363,10 @@ public:
} }
return VFR_RETURN_SUCCESS; return VFR_RETURN_SUCCESS;
} }
UINT8 GetNumericFlags () {
return mNumeric->Flags;
}
}; };
class CIfrOneOf : public CIfrObj, public CIfrOpHeader, public CIfrQuestionHeader, public CIfrMinMaxStepData { class CIfrOneOf : public CIfrObj, public CIfrOpHeader, public CIfrQuestionHeader, public CIfrMinMaxStepData {

281
BaseTools/Source/C/VfrCompile/VfrSyntax.g
View File

@ -1396,6 +1396,13 @@ vfrQuestionDataFieldName [EFI_QUESTION_ID &QId, UINT32 &Mask, CHAR8 *&VarIdStr,
vfrConstantValueField[UINT8 Type, EFI_IFR_TYPE_VALUE &Value, BOOLEAN &ListType] : vfrConstantValueField[UINT8 Type, EFI_IFR_TYPE_VALUE &Value, BOOLEAN &ListType] :
<< <<
EFI_GUID Guid; EFI_GUID Guid;
BOOLEAN Negative = FALSE;
BOOLEAN IntDecStyle = FALSE;
CIfrNumeric *NumericQst = NULL;
if (gCurrentMinMaxData != NULL && gCurrentMinMaxData->IsNumericOpcode()) {
NumericQst = (CIfrNumeric *) gCurrentQuestion;
IntDecStyle = (NumericQst->GetNumericFlags() & EFI_IFR_DISPLAY) == 0 ? TRUE : FALSE;
}
UINT8 *Type8 = (UINT8 *) &Value; UINT8 *Type8 = (UINT8 *) &Value;
UINT16 *Type16 = (UINT16 *) &Value; UINT16 *Type16 = (UINT16 *) &Value;
UINT32 *Type32 = (UINT32 *) &Value; UINT32 *Type32 = (UINT32 *) &Value;
@ -1403,19 +1410,78 @@ vfrConstantValueField[UINT8 Type, EFI_IFR_TYPE_VALUE &Value, BOOLEAN &ListType]
UINT16 Index = 0; UINT16 Index = 0;
ListType = FALSE; ListType = FALSE;
>> >>
{
"\-" << Negative = TRUE; >>
}
N1:Number << N1:Number <<
switch ($Type) { switch ($Type) {
case EFI_IFR_TYPE_NUM_SIZE_8 : case EFI_IFR_TYPE_NUM_SIZE_8 :
$Value.u8 = _STOU8(N1->getText(), N1->getLine()); $Value.u8 = _STOU8(N1->getText(), N1->getLine());
if (IntDecStyle) {
if (Negative) {
if ($Value.u8 > 0x80) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, N1->getLine(), "INT8 type can't big than 0x7F, small than -0x80");
}
} else {
if ($Value.u8 > 0x7F) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, N1->getLine(), "INT8 type can't big than 0x7F, small than -0x80");
}
}
}
if (Negative) {
$Value.u8 = ~$Value.u8 + 1;
}
break; break;
case EFI_IFR_TYPE_NUM_SIZE_16 : case EFI_IFR_TYPE_NUM_SIZE_16 :
$Value.u16 = _STOU16(N1->getText(), N1->getLine()); $Value.u16 = _STOU16(N1->getText(), N1->getLine());
if (IntDecStyle) {
if (Negative) {
if ($Value.u16 > 0x8000) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, N1->getLine(), "INT16 type can't big than 0x7FFF, small than -0x8000");
}
} else {
if ($Value.u16 > 0x7FFF) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, N1->getLine(), "INT16 type can't big than 0x7FFF, small than -0x8000");
}
}
}
if (Negative) {
$Value.u16 = ~$Value.u16 + 1;
}
break; break;
case EFI_IFR_TYPE_NUM_SIZE_32 : case EFI_IFR_TYPE_NUM_SIZE_32 :
$Value.u32 = _STOU32(N1->getText(), N1->getLine()); $Value.u32 = _STOU32(N1->getText(), N1->getLine());
if (IntDecStyle) {
if (Negative) {
if ($Value.u32 > 0x80000000) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, N1->getLine(), "INT32 type can't big than 0x7FFFFFFF, small than -0x80000000");
}
} else {
if ($Value.u32 > 0X7FFFFFFF) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, N1->getLine(), "INT32 type can't big than 0x7FFFFFFF, small than -0x80000000");
}
}
}
if (Negative) {
$Value.u32 = ~$Value.u32 + 1;
}
break; break;
case EFI_IFR_TYPE_NUM_SIZE_64 : case EFI_IFR_TYPE_NUM_SIZE_64 :
$Value.u64 = _STOU64(N1->getText(), N1->getLine()); $Value.u64 = _STOU64(N1->getText(), N1->getLine());
if (IntDecStyle) {
if (Negative) {
if ($Value.u64 > 0x8000000000000000) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, N1->getLine(), "INT64 type can't big than 0x7FFFFFFFFFFFFFFF, small than -0x8000000000000000");
}
} else {
if ($Value.u64 > 0x7FFFFFFFFFFFFFFF) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, N1->getLine(), "INT64 type can't big than 0x7FFFFFFFFFFFFFFF, small than -0x8000000000000000");
}
}
}
if (Negative) {
$Value.u64 = ~$Value.u64 + 1;
}
break; break;
case EFI_IFR_TYPE_BOOLEAN : case EFI_IFR_TYPE_BOOLEAN :
$Value.b = _STOU8(N1->getText(), N1->getLine()); $Value.b = _STOU8(N1->getText(), N1->getLine());
@ -1590,6 +1656,7 @@ vfrStatementDefault :
UINT16 *Type16 = (UINT16 *) ValueList; UINT16 *Type16 = (UINT16 *) ValueList;
UINT32 *Type32 = (UINT32 *) ValueList; UINT32 *Type32 = (UINT32 *) ValueList;
UINT64 *Type64 = (UINT64 *) ValueList; UINT64 *Type64 = (UINT64 *) ValueList;
CIfrNumeric *NumericQst = NULL;
>> >>
D:Default D:Default
@ -1599,9 +1666,41 @@ vfrStatementDefault :
<< <<
if (gCurrentMinMaxData != NULL && gCurrentMinMaxData->IsNumericOpcode()) { if (gCurrentMinMaxData != NULL && gCurrentMinMaxData->IsNumericOpcode()) {
//check default value is valid for Numeric Opcode //check default value is valid for Numeric Opcode
if (Val->u64 < gCurrentMinMaxData->GetMinData(_GET_CURRQEST_DATATYPE()) || Val->u64 > gCurrentMinMaxData->GetMaxData(_GET_CURRQEST_DATATYPE())) { NumericQst = (CIfrNumeric *) gCurrentQuestion;
if ((NumericQst->GetNumericFlags() & EFI_IFR_DISPLAY) == 0) {
switch (_GET_CURRQEST_DATATYPE()) {
case EFI_IFR_TYPE_NUM_SIZE_8:
if (((INT8) Val.u8 < (INT8) gCurrentMinMaxData->GetMinData(_GET_CURRQEST_DATATYPE())) ||
((INT8) Val.u8 > (INT8) gCurrentMinMaxData->GetMaxData(_GET_CURRQEST_DATATYPE()))) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, D->getLine(), "Numeric default value must be between MinValue and MaxValue."); _PCATCH (VFR_RETURN_INVALID_PARAMETER, D->getLine(), "Numeric default value must be between MinValue and MaxValue.");
} }
break;
case EFI_IFR_TYPE_NUM_SIZE_16:
if (((INT16) Val.u16 < (INT16) gCurrentMinMaxData->GetMinData(_GET_CURRQEST_DATATYPE())) ||
((INT16) Val.u16 > (INT16) gCurrentMinMaxData->GetMaxData(_GET_CURRQEST_DATATYPE()))) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, D->getLine(), "Numeric default value must be between MinValue and MaxValue.");
}
break;
case EFI_IFR_TYPE_NUM_SIZE_32:
if (((INT32) Val.u32 < (INT32) gCurrentMinMaxData->GetMinData(_GET_CURRQEST_DATATYPE())) ||
((INT32) Val.u32 > (INT32) gCurrentMinMaxData->GetMaxData(_GET_CURRQEST_DATATYPE()))) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, D->getLine(), "Numeric default value must be between MinValue and MaxValue.");
}
break;
case EFI_IFR_TYPE_NUM_SIZE_64:
if (((INT64) Val.u64 < (INT64) gCurrentMinMaxData->GetMinData(_GET_CURRQEST_DATATYPE())) ||
((INT64) Val.u64 > (INT64) gCurrentMinMaxData->GetMaxData(_GET_CURRQEST_DATATYPE()))) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, D->getLine(), "Numeric default value must be between MinValue and MaxValue.");
}
break;
default:
break;
}
} else {
if (Val.u64 < gCurrentMinMaxData->GetMinData(_GET_CURRQEST_DATATYPE()) || Val.u64 > gCurrentMinMaxData->GetMaxData(_GET_CURRQEST_DATATYPE())) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, D->getLine(), "Numeric default value must be between MinValue and MaxValue.");
}
}
} }
if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) {
_PCATCH (VFR_RETURN_FATAL_ERROR, D->getLine(), "Default data type error."); _PCATCH (VFR_RETURN_FATAL_ERROR, D->getLine(), "Default data type error.");
@ -2313,42 +2412,206 @@ vfrSetMinMaxStep[CIfrMinMaxStepData & MMSDObj] :
UINT32 MaxU4 = 0, MinU4 = 0, StepU4 = 0; UINT32 MaxU4 = 0, MinU4 = 0, StepU4 = 0;
UINT16 MaxU2 = 0, MinU2 = 0, StepU2 = 0; UINT16 MaxU2 = 0, MinU2 = 0, StepU2 = 0;
UINT8 MaxU1 = 0, MinU1 = 0, StepU1 = 0; UINT8 MaxU1 = 0, MinU1 = 0, StepU1 = 0;
BOOLEAN IntDecStyle = FALSE;
CIfrNumeric *NObj = (CIfrNumeric *) (&MMSDObj);
if ((NObj->GetOpCode() == EFI_IFR_NUMERIC_OP) && ((NObj->GetNumericFlags() & EFI_IFR_DISPLAY) == 0)) {
IntDecStyle = TRUE;
}
BOOLEAN MinNegative = FALSE;
BOOLEAN MaxNegative = FALSE;
>> >>
Minimum "=" I:Number "," Minimum "="
<< {
"\-" << MinNegative = TRUE; >>
}
I:Number "," <<
if (!IntDecStyle && MinNegative) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, I->getLine(), "\"-\" can't be used when not in int decimal type. ");
}
switch (_GET_CURRQEST_DATATYPE()) { switch (_GET_CURRQEST_DATATYPE()) {
case EFI_IFR_TYPE_NUM_SIZE_64 : MinU8 = _STOU64(I->getText(), I->getLine()); break; case EFI_IFR_TYPE_NUM_SIZE_64 :
case EFI_IFR_TYPE_NUM_SIZE_32 : MinU4 = _STOU32(I->getText(), I->getLine()); break; MinU8 = _STOU64(I->getText(), I->getLine());
case EFI_IFR_TYPE_NUM_SIZE_16 : MinU2 = _STOU16(I->getText(), I->getLine()); break; if (IntDecStyle) {
case EFI_IFR_TYPE_NUM_SIZE_8 : MinU1 = _STOU8(I->getText(), I->getLine()); break; if (MinNegative) {
if (MinU8 > 0x8000000000000000) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, I->getLine(), "INT64 type minimum can't small than -0x8000000000000000, big than 0x7FFFFFFFFFFFFFFF");
}
} else {
if (MinU8 > 0x7FFFFFFFFFFFFFFF) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, I->getLine(), "INT64 type minimum can't small than -0x8000000000000000, big than 0x7FFFFFFFFFFFFFFF");
}
}
}
if (MinNegative) {
MinU8 = ~MinU8 + 1;
}
break;
case EFI_IFR_TYPE_NUM_SIZE_32 :
MinU4 = _STOU32(I->getText(), I->getLine());
if (IntDecStyle) {
if (MinNegative) {
if (MinU4 > 0x80000000) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, I->getLine(), "INT32 type minimum can't small than -0x80000000, big than 0x7FFFFFFF");
}
} else {
if (MinU4 > 0x7FFFFFFF) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, I->getLine(), "INT32 type minimum can't small than -0x80000000, big than 0x7FFFFFFF");
}
}
}
if (MinNegative) {
MinU4 = ~MinU4 + 1;
}
break;
case EFI_IFR_TYPE_NUM_SIZE_16 :
MinU2 = _STOU16(I->getText(), I->getLine());
if (IntDecStyle) {
if (MinNegative) {
if (MinU2 > 0x8000) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, I->getLine(), "INT16 type minimum can't small than -0x8000, big than 0x7FFF");
}
} else {
if (MinU2 > 0x7FFF) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, I->getLine(), "INT16 type minimum can't small than -0x8000, big than 0x7FFF");
}
}
}
if (MinNegative) {
MinU2 = ~MinU2 + 1;
}
break;
case EFI_IFR_TYPE_NUM_SIZE_8 :
MinU1 = _STOU8(I->getText(), I->getLine());
if (IntDecStyle) {
if (MinNegative) {
if (MinU1 > 0x80) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, I->getLine(), "INT8 type minimum can't small than -0x80, big than 0x7F");
}
} else {
if (MinU1 > 0x7F) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, I->getLine(), "INT8 type minimum can't small than -0x80, big than 0x7F");
}
}
}
if (MinNegative) {
MinU1 = ~MinU1 + 1;
}
break;
} }
>> >>
Maximum "=" A:Number "," Maximum "="
<< {
"\-" << MaxNegative = TRUE; >>
}
A:Number "," <<
if (!IntDecStyle && MaxNegative) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "\"-\" can't be used when not in int decimal type. ");
}
switch (_GET_CURRQEST_DATATYPE()) { switch (_GET_CURRQEST_DATATYPE()) {
case EFI_IFR_TYPE_NUM_SIZE_64 : case EFI_IFR_TYPE_NUM_SIZE_64 :
MaxU8 = _STOU64(A->getText(), A->getLine()); MaxU8 = _STOU64(A->getText(), A->getLine());
if (IntDecStyle) {
if (MaxNegative) {
if (MaxU8 > 0x8000000000000000) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "INT64 type maximum can't small than -0x8000000000000000, big than 0x7FFFFFFFFFFFFFFF");
}
} else {
if (MaxU8 > 0x7FFFFFFFFFFFFFFF) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "INT64 type maximum can't small than -0x8000000000000000, big than 0x7FFFFFFFFFFFFFFF");
}
}
}
if (MaxNegative) {
MaxU8 = ~MaxU8 + 1;
}
if (IntDecStyle) {
if ((INT64) MaxU8 < (INT64) MinU8) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum");
}
} else {
if (MaxU8 < MinU8) { if (MaxU8 < MinU8) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum"); _PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum");
} }
}
break; break;
case EFI_IFR_TYPE_NUM_SIZE_32 : case EFI_IFR_TYPE_NUM_SIZE_32 :
MaxU4 = _STOU32(A->getText(), A->getLine()); MaxU4 = _STOU32(A->getText(), A->getLine());
if (IntDecStyle) {
if (MaxNegative) {
if (MaxU4 > 0x80000000) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "INT32 type maximum can't small than -0x80000000, big than 0x7FFFFFFF");
}
} else {
if (MaxU4 > 0x7FFFFFFF) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "INT32 type maximum can't small than -0x80000000, big than 0x7FFFFFFF");
}
}
}
if (MaxNegative) {
MaxU4 = ~MaxU4 + 1;
}
if (IntDecStyle) {
if ((INT32) MaxU4 < (INT32) MinU4) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum");
}
} else {
if (MaxU4 < MinU4) { if (MaxU4 < MinU4) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum"); _PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum");
} }
}
break; break;
case EFI_IFR_TYPE_NUM_SIZE_16 : case EFI_IFR_TYPE_NUM_SIZE_16 :
MaxU2 = _STOU16(A->getText(), A->getLine()); MaxU2 = _STOU16(A->getText(), A->getLine());
if (IntDecStyle) {
if (MaxNegative) {
if (MaxU2 > 0x8000) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "INT16 type maximum can't small than -0x8000, big than 0x7FFF");
}
} else {
if (MaxU2 > 0x7FFF) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "INT16 type maximum can't small than -0x8000, big than 0x7FFF");
}
}
}
if (MaxNegative) {
MaxU2 = ~MaxU2 + 1;
}
if (IntDecStyle) {
if ((INT16) MaxU2 < (INT16) MinU2) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum");
}
} else {
if (MaxU2 < MinU2) { if (MaxU2 < MinU2) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum"); _PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum");
} }
}
break; break;
case EFI_IFR_TYPE_NUM_SIZE_8 : case EFI_IFR_TYPE_NUM_SIZE_8 :
MaxU1 = _STOU8(A->getText(), A->getLine()); MaxU1 = _STOU8(A->getText(), A->getLine());
if (IntDecStyle) {
if (MaxNegative) {
if (MaxU1 > 0x80) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "INT8 type maximum can't small than -0x80, big than 0x7F");
}
} else {
if (MaxU1 > 0x7F) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "INT8 type maximum can't small than -0x80, big than 0x7F");
}
}
}
if (MaxNegative) {
MaxU1 = ~MaxU1 + 1;
}
if (IntDecStyle) {
if ((INT8) MaxU1 < (INT8) MinU1) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum");
}
} else {
if (MaxU1 < MinU1) { if (MaxU1 < MinU1) {
_PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum"); _PCATCH (VFR_RETURN_INVALID_PARAMETER, A->getLine(), "Maximum can't be less than Minimum");
} }
}
break; break;
} }
>> >>