public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Laszlo Ersek" <lersek@redhat.com>
To: devel@edk2.groups.io, dandan.bi@intel.com
Cc: Brian R Haug <brian.r.haug@intel.com>,
	Liming Gao <liming.gao@intel.com>,
	Eric Dong <eric.dong@intel.com>
Subject: Re: [edk2-devel] [patch] MdeModulePkg/Setup: Update opcode number variable type to UINTN
Date: Tue, 14 Jan 2020 14:09:38 +0100	[thread overview]
Message-ID: <7a53dfb7-c014-c105-9189-0aa68c97a117@redhat.com> (raw)
In-Reply-To: <15fdafea-a2d3-ea51-3d56-c41814cb01f2@redhat.com>

On 01/14/20 14:08, Laszlo Ersek wrote:
> Hi Dandan, Brian,
> 
> On 01/14/20 09:56, Dandan Bi wrote:
>> From: Brian R Haug <brian.r.haug@intel.com>
>>
>> Update data type of variables which save the opcode numbers
>> to UINTN, in case some configuration module has lots of
>> configuration items.
>>
>> Cc: Liming Gao <liming.gao@intel.com>
>> Cc: Eric Dong <eric.dong@intel.com>
>> Signed-off-by: Brian R Haug <brian.r.haug@intel.com>
>> Reviewed-by: Dandan Bi <dandan.bi@intel.com>
>> ---
>>  .../Universal/SetupBrowserDxe/IfrParse.c       | 18 +++++++++---------
>>  1 file changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
>> index 891b95cf9f..edb6a0fc4c 100644
>> --- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
>> +++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
>> @@ -1,17 +1,17 @@
>>  /** @file
>>  Parser for IFR binary encoding.
>>
>> -Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
>> +Copyright (c) 2007 - 2020, Intel Corporation. All rights reserved.<BR>
>>  SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>>  **/
>>
>>  #include "Setup.h"
>>
>> -UINT16           mStatementIndex;
>> -UINT16           mExpressionOpCodeIndex;
>> +UINTN            mStatementIndex;
>> +UINTN            mExpressionOpCodeIndex;
>>  EFI_QUESTION_ID  mUsedQuestionId;
>>  extern LIST_ENTRY      gBrowserStorageList;
>>  /**
>>    Initialize Statement header members.
>>
>> @@ -1104,16 +1104,16 @@ IsUnKnownOpCode (
>>
>>  **/
>>  VOID
>>  CountOpCodes (
>>    IN  FORM_BROWSER_FORMSET  *FormSet,
>> -  IN OUT  UINT16            *NumberOfStatement,
>> -  IN OUT  UINT16            *NumberOfExpression
>> +  OUT  UINTN             *NumberOfStatement,
>> +  OUT  UINTN             *NumberOfExpression
>>    )
>>  {
>> -  UINT16  StatementCount;
>> -  UINT16  ExpressionCount;
>> +  UINTN   StatementCount;
>> +  UINTN   ExpressionCount;
>>    UINT8   *OpCodeData;
>>    UINTN   Offset;
>>    UINTN   OpCodeLen;
>>
>>    Offset = 0;
>> @@ -1167,12 +1167,12 @@ ParseOpCodes (
>>    FORMSET_STORAGE         *Storage;
>>    FORMSET_DEFAULTSTORE    *DefaultStore;
>>    QUESTION_DEFAULT        *CurrentDefault;
>>    QUESTION_OPTION         *CurrentOption;
>>    UINT8                   Width;
>> -  UINT16                  NumberOfStatement;
>> -  UINT16                  NumberOfExpression;
>> +  UINTN                   NumberOfStatement;
>> +  UINTN                   NumberOfExpression;
>>    EFI_IMAGE_ID            *ImageId;
>>    BOOLEAN                 SuppressForQuestion;
>>    BOOLEAN                 SuppressForOption;
>>    UINT16                  DepthOfDisable;
>>    BOOLEAN                 OpCodeDisabled;
>>
> 
> I think this patch is incomplete. While the following statements will
> adapt automatically:
> 
>   FormSet->StatementBuffer = AllocateZeroPool (NumberOfStatement * sizeof (FORM_BROWSER_STATEMENT));
> 
>   FormSet->ExpressionBuffer = AllocateZeroPool (NumberOfExpression * sizeof (EXPRESSION_OPCODE));
> 
> I think we'll need to update the indexing into those arrays explicitly.
> Namely,
> 
>> diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
>> index 891b95cf9fb8..9b241ded8cdc 100644
>> --- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
>> +++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
>> @@ -8,8 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>>  #include "Setup.h"
>>
>> -UINT16           mStatementIndex;
>> -UINT16           mExpressionOpCodeIndex;
>> +UINTN            mStatementIndex;
>> +UINTN            mExpressionOpCodeIndex;
>>  EFI_QUESTION_ID  mUsedQuestionId;
>>  extern LIST_ENTRY      gBrowserStorageList;
>>  /**
> 
> Do you agree?

Aargh, I missed that that's exactly how the patch starts! Sorry about
the noise :)

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Thanks
Laszlo


  reply	other threads:[~2020-01-14 13:09 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-14  8:56 [patch] MdeModulePkg/Setup: Update opcode number variable type to UINTN Dandan Bi
2020-01-14 12:58 ` Liming Gao
2020-01-14 13:08 ` [edk2-devel] " Laszlo Ersek
2020-01-14 13:09   ` Laszlo Ersek [this message]
2020-01-15  0:24 ` Dong, Eric

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7a53dfb7-c014-c105-9189-0aa68c97a117@redhat.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox