diff options
Diffstat (limited to 'source/compiler')
| -rw-r--r-- | source/compiler/aslbtypes.c | 1 | ||||
| -rw-r--r-- | source/compiler/aslerror.c | 7 | ||||
| -rw-r--r-- | source/compiler/aslfold.c | 54 | ||||
| -rw-r--r-- | source/compiler/aslload.c | 12 | ||||
| -rw-r--r-- | source/compiler/aslmessages.c | 4 | ||||
| -rw-r--r-- | source/compiler/aslmessages.h | 2 | ||||
| -rw-r--r-- | source/compiler/dtcompile.c | 18 | ||||
| -rw-r--r-- | source/compiler/dtcompiler.h | 3 | ||||
| -rw-r--r-- | source/compiler/dtexpress.c | 42 | ||||
| -rw-r--r-- | source/compiler/dtparser.l | 58 | ||||
| -rw-r--r-- | source/compiler/dtparser.y | 102 | ||||
| -rw-r--r-- | source/compiler/dttable.c | 16 | ||||
| -rw-r--r-- | source/compiler/dttable1.c | 118 | ||||
| -rw-r--r-- | source/compiler/dttable2.c | 114 | 
14 files changed, 299 insertions, 252 deletions
diff --git a/source/compiler/aslbtypes.c b/source/compiler/aslbtypes.c index be3618eea8e8..f7c2eb0ccca4 100644 --- a/source/compiler/aslbtypes.c +++ b/source/compiler/aslbtypes.c @@ -259,6 +259,7 @@ AnMapArgTypeToBtype (          return (ACPI_BTYPE_DATA | ACPI_BTYPE_DEBUG_OBJECT |              ACPI_BTYPE_REFERENCE_OBJECT); +    case ARGI_FIXED_TARGET:      case ARGI_SIMPLE_TARGET:          return (ACPI_BTYPE_OBJECTS_AND_REFS); diff --git a/source/compiler/aslerror.c b/source/compiler/aslerror.c index ef6342b148a7..39297a4c5225 100644 --- a/source/compiler/aslerror.c +++ b/source/compiler/aslerror.c @@ -921,6 +921,13 @@ AslCommonError (      char                    *Filename,      char                    *ExtraMessage)  { +    /* Check if user wants to ignore this exception */ + +    if (AslIsExceptionIgnored (Level, MessageId)) +    { +        return; +    } +      AslLogNewError (Level, MessageId, CurrentLineNumber, LogicalLineNumber,          LogicalByteOffset, Column, Filename, ExtraMessage,          NULL, NULL); diff --git a/source/compiler/aslfold.c b/source/compiler/aslfold.c index 78ec8da23b63..7957c149e3a2 100644 --- a/source/compiler/aslfold.c +++ b/source/compiler/aslfold.c @@ -444,7 +444,7 @@ OpcAmlCheckForConstant (          if (Op->Asl.CompileFlags & OP_IS_TARGET)          {              DbgPrint (ASL_PARSE_OUTPUT, -                "**** Valid Target, transform to Store ****\n"); +                "**** Valid Target, transform to Store or CopyObject ****\n");              return (AE_CTRL_RETURN_VALUE);          } @@ -468,7 +468,7 @@ OpcAmlCheckForConstant (      if (WalkState->Opcode == AML_BUFFER_OP)      {          DbgPrint (ASL_PARSE_OUTPUT, -            "\nBuffer constant reduction is not supported yet\n"); +            "\nBuffer constant reduction is currently not supported\n");          if (NextOp) /* Found a Name() operator, error */          { @@ -623,6 +623,8 @@ TrTransformToStoreOp (      ACPI_PARSE_OBJECT       *NewParent;      ACPI_PARSE_OBJECT       *OriginalParent;      ACPI_STATUS             Status; +    UINT16                  NewParseOpcode; +    UINT16                  NewAmlOpcode;      /* Extract the operands */ @@ -646,9 +648,45 @@ TrTransformToStoreOp (          }      } -    DbgPrint (ASL_PARSE_OUTPUT, -        "Reduction/Transform to StoreOp: Store(%s, %s)\n", -        Child1->Asl.ParseOpName, Child2->Asl.ParseOpName); +    switch (Op->Asl.ParseOpcode) +    { +    /* +     * Folding of the explicit conversion opcodes must use CopyObject +     * instead of Store. This can change the object type of the target +     * operand, as per the ACPI specification: +     * +     * "If the ASL operator is one of the explicit conversion operators +     * (ToString, ToInteger, etc., and the CopyObject operator), no +     * [implicit] conversion is performed. (In other words, the result +     * object is stored directly to the target and completely overwrites +     * any existing object already stored at the target)" +     */ +    case PARSEOP_TOINTEGER: +    case PARSEOP_TOSTRING: +    case PARSEOP_TOBUFFER: +    case PARSEOP_TODECIMALSTRING: +    case PARSEOP_TOHEXSTRING: +    case PARSEOP_TOBCD: +    case PARSEOP_FROMBCD: + +        NewParseOpcode = PARSEOP_COPYOBJECT; +        NewAmlOpcode = AML_COPY_OBJECT_OP; + +        DbgPrint (ASL_PARSE_OUTPUT, +            "Reduction/Transform to CopyObjectOp: CopyObject(%s, %s)\n", +            Child1->Asl.ParseOpName, Child2->Asl.ParseOpName); +        break; + +    default: + +        NewParseOpcode = PARSEOP_STORE; +        NewAmlOpcode = AML_STORE_OP; + +        DbgPrint (ASL_PARSE_OUTPUT, +            "Reduction/Transform to StoreOp: Store(%s, %s)\n", +            Child1->Asl.ParseOpName, Child2->Asl.ParseOpName); +        break; +    }      /*       * Create a NULL (zero) target so that we can use the @@ -709,10 +747,10 @@ TrTransformToStoreOp (      TrInstallReducedConstant (Child1, ObjDesc); -    /* Convert operator to STORE */ +    /* Convert operator to STORE or COPYOBJECT */ -    Op->Asl.ParseOpcode = PARSEOP_STORE; -    Op->Asl.AmlOpcode = AML_STORE_OP; +    Op->Asl.ParseOpcode = NewParseOpcode; +    Op->Asl.AmlOpcode = NewAmlOpcode;      UtSetParseOpName (Op);      Op->Common.Parent = OriginalParent; diff --git a/source/compiler/aslload.c b/source/compiler/aslload.c index 534d4ca3acaa..f32a7461348c 100644 --- a/source/compiler/aslload.c +++ b/source/compiler/aslload.c @@ -327,8 +327,8 @@ LdLoadFieldElements (                       * The name already exists in this scope                       * But continue processing the elements                       */ -                    AslDualParseOpError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Child, -                        Child->Asl.Value.String, ASL_MSG_FOUND_HERE, Node->Op, +                    AslDualParseOpError (ASL_WARNING, ASL_MSG_EXTERN_COLLISION, Child, +                        Child->Asl.Value.String, ASL_MSG_EXTERN_FOUND_HERE, Node->Op,                          Node->Op->Asl.ExternalName);                  }              } @@ -830,8 +830,8 @@ LdNamespace1Begin (                  if (Node->OwnerId == WalkState->OwnerId &&                      !(Node->Flags & IMPLICIT_EXTERNAL))                  { -                    AslDualParseOpError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Op, -                        Op->Asl.ExternalName, ASL_MSG_FOUND_HERE, Node->Op, +                    AslDualParseOpError (ASL_WARNING, ASL_MSG_EXTERN_COLLISION, Op, +                        Op->Asl.ExternalName, ASL_MSG_EXTERN_FOUND_HERE, Node->Op,                          Node->Op->Asl.ExternalName);                  }                  if (Node->Flags & IMPLICIT_EXTERNAL) @@ -853,8 +853,8 @@ LdNamespace1Begin (                  if (Node->OwnerId == WalkState->OwnerId)                  { -                    AslDualParseOpError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Op, -                        Op->Asl.ExternalName, ASL_MSG_FOUND_HERE, Node->Op, +                    AslDualParseOpError (ASL_WARNING, ASL_MSG_EXTERN_COLLISION, Op, +                        Op->Asl.ExternalName, ASL_MSG_EXTERN_FOUND_HERE, Node->Op,                          Node->Op->Asl.ExternalName);                  }              } diff --git a/source/compiler/aslmessages.c b/source/compiler/aslmessages.c index 855008460b3a..e816b5385750 100644 --- a/source/compiler/aslmessages.c +++ b/source/compiler/aslmessages.c @@ -352,7 +352,9 @@ const char                      *AslCompilerMsgs [] =  /*    ASL_MSG_EXCEPTION_NOT_RECEIVED */     "Expected remark, warning, or error did not occur. Message ID:",  /*    ASL_MSG_NULL_RESOURCE_TEMPLATE */     "Empty Resource Template (END_TAG only)",  /*    ASL_MSG_FOUND_HERE */                 "Original name creation/declaration below: ", -/*    ASL_MSG_ILLEGAL_RECURSION */          "Illegal recursive call to method that creates named objects" +/*    ASL_MSG_ILLEGAL_RECURSION */          "Illegal recursive call to method that creates named objects", +/*    ASL_MSG_EXTERN_COLLISION */           "A name cannot be defined and declared external in the same table", +/*    ASL_MSG_FOUND_HERE_EXTERN*/           "Remove one of the declarations indicated above or below:"  };  /* Table compiler */ diff --git a/source/compiler/aslmessages.h b/source/compiler/aslmessages.h index 77c6759ef0fa..3105f0be8daa 100644 --- a/source/compiler/aslmessages.h +++ b/source/compiler/aslmessages.h @@ -355,6 +355,8 @@ typedef enum      ASL_MSG_NULL_RESOURCE_TEMPLATE,      ASL_MSG_FOUND_HERE,      ASL_MSG_ILLEGAL_RECURSION, +    ASL_MSG_EXTERN_COLLISION, +    ASL_MSG_EXTERN_FOUND_HERE,      /* These messages are used by the Data Table compiler only */ diff --git a/source/compiler/dtcompile.c b/source/compiler/dtcompile.c index a85099374453..93944146789d 100644 --- a/source/compiler/dtcompile.c +++ b/source/compiler/dtcompile.c @@ -453,7 +453,7 @@ DtCompileDataTable (      DtInsertCompilerIds (*FieldList);      Status = DtCompileTable (FieldList, AcpiDmTableInfoHeader, -        &Gbl_RootTable, TRUE); +        &Gbl_RootTable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -492,7 +492,7 @@ DtCompileDataTable (          {              Subtable = NULL;              Status = DtCompileTable (FieldList, TableData->TableInfo, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -531,7 +531,6 @@ FinishHeader:   * PARAMETERS:  Field               - Current field list pointer   *              Info                - Info table for this ACPI table   *              RetSubtable         - Compile result of table - *              Required            - If this subtable must exist   *   * RETURN:      Status   * @@ -543,8 +542,7 @@ ACPI_STATUS  DtCompileTable (      DT_FIELD                **Field,      ACPI_DMTABLE_INFO       *Info, -    DT_SUBTABLE             **RetSubtable, -    BOOLEAN                 Required) +    DT_SUBTABLE             **RetSubtable)  {      DT_FIELD                *LocalField;      UINT32                  Length; @@ -682,19 +680,19 @@ DtCompileTable (              case ACPI_DMT_GAS:                  Status = DtCompileTable (Field, AcpiDmTableInfoGas, -                    &InlineSubtable, TRUE); +                    &InlineSubtable);                  break;              case ACPI_DMT_HESTNTFY:                  Status = DtCompileTable (Field, AcpiDmTableInfoHestNotify, -                    &InlineSubtable, TRUE); +                    &InlineSubtable);                  break;              case ACPI_DMT_IORTMEM:                  Status = DtCompileTable (Field, AcpiDmTableInfoIortAcc, -                    &InlineSubtable, TRUE); +                    &InlineSubtable);                  break;              default: @@ -783,7 +781,7 @@ DtCompileTwoSubtables (      DT_FIELD                **PFieldList = (DT_FIELD **) List; -    Status = DtCompileTable (PFieldList, TableInfo1, &Subtable, TRUE); +    Status = DtCompileTable (PFieldList, TableInfo1, &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -794,7 +792,7 @@ DtCompileTwoSubtables (      while (*PFieldList)      { -        Status = DtCompileTable (PFieldList, TableInfo2, &Subtable, FALSE); +        Status = DtCompileTable (PFieldList, TableInfo2, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); diff --git a/source/compiler/dtcompiler.h b/source/compiler/dtcompiler.h index 7ecb14e1c82c..48d308b42be1 100644 --- a/source/compiler/dtcompiler.h +++ b/source/compiler/dtcompiler.h @@ -275,8 +275,7 @@ ACPI_STATUS  DtCompileTable (      DT_FIELD                **Field,      ACPI_DMTABLE_INFO       *Info, -    DT_SUBTABLE             **RetSubtable, -    BOOLEAN                 Required); +    DT_SUBTABLE             **RetSubtable);  ACPI_STATUS  DtCompileTwoSubtables ( diff --git a/source/compiler/dtexpress.c b/source/compiler/dtexpress.c index ef19122b3028..aa68cf1eeecd 100644 --- a/source/compiler/dtexpress.c +++ b/source/compiler/dtexpress.c @@ -209,7 +209,7 @@ DtResolveIntegerExpression (   * FUNCTION:    DtDoOperator   *   * PARAMETERS:  LeftValue           - First 64-bit operand - *              Operator            - Parse token for the operator (EXPOP_*) + *              Operator            - Parse token for the operator (OP_EXP_*)   *              RightValue          - Second 64-bit operand   *   * RETURN:      64-bit result of the requested operation @@ -231,22 +231,22 @@ DtDoOperator (      switch (Operator)      { -    case EXPOP_ONES_COMPLIMENT: +    case OP_EXP_ONES_COMPLIMENT:          Result = ~RightValue;          break; -    case EXPOP_LOGICAL_NOT: +    case OP_EXP_LOGICAL_NOT:          Result = !RightValue;          break; -    case EXPOP_MULTIPLY: +    case OP_EXP_MULTIPLY:          Result = LeftValue * RightValue;          break; -    case EXPOP_DIVIDE: +    case OP_EXP_DIVIDE:          if (!RightValue)          { @@ -258,7 +258,7 @@ DtDoOperator (          Result = LeftValue / RightValue;          break; -    case EXPOP_MODULO: +    case OP_EXP_MODULO:          if (!RightValue)          { @@ -270,76 +270,76 @@ DtDoOperator (          Result = LeftValue % RightValue;          break; -    case EXPOP_ADD: +    case OP_EXP_ADD:          Result = LeftValue + RightValue;          break; -    case EXPOP_SUBTRACT: +    case OP_EXP_SUBTRACT:          Result = LeftValue - RightValue;          break; -    case EXPOP_SHIFT_RIGHT: +    case OP_EXP_SHIFT_RIGHT:          Result = LeftValue >> RightValue;          break; -    case EXPOP_SHIFT_LEFT: +    case OP_EXP_SHIFT_LEFT:          Result = LeftValue << RightValue;          break; -    case EXPOP_LESS: +    case OP_EXP_LESS:          Result = LeftValue < RightValue;          break; -    case EXPOP_GREATER: +    case OP_EXP_GREATER:          Result = LeftValue > RightValue;          break; -    case EXPOP_LESS_EQUAL: +    case OP_EXP_LESS_EQUAL:          Result = LeftValue <= RightValue;          break; -    case EXPOP_GREATER_EQUAL: +    case OP_EXP_GREATER_EQUAL:          Result = LeftValue >= RightValue;          break; -    case EXPOP_EQUAL: +    case OP_EXP_EQUAL:          Result = LeftValue == RightValue;          break; -    case EXPOP_NOT_EQUAL: +    case OP_EXP_NOT_EQUAL:          Result = LeftValue != RightValue;          break; -    case EXPOP_AND: +    case OP_EXP_AND:          Result = LeftValue & RightValue;          break; -    case EXPOP_XOR: +    case OP_EXP_XOR:          Result = LeftValue ^ RightValue;          break; -    case EXPOP_OR: +    case OP_EXP_OR:          Result = LeftValue | RightValue;          break; -    case EXPOP_LOGICAL_AND: +    case OP_EXP_LOGICAL_AND:          Result = LeftValue && RightValue;          break; -    case EXPOP_LOGICAL_OR: +    case OP_EXP_LOGICAL_OR:          Result = LeftValue || RightValue;          break; diff --git a/source/compiler/dtparser.l b/source/compiler/dtparser.l index 3e5bc8c7f2a3..fae32dba8a15 100644 --- a/source/compiler/dtparser.l +++ b/source/compiler/dtparser.l @@ -171,37 +171,37 @@ NewLine         [\n]  %% -\(              return (EXPOP_PAREN_OPEN); -\)              return (EXPOP_PAREN_CLOSE); -\~              return (EXPOP_ONES_COMPLIMENT); -\!              return (EXPOP_LOGICAL_NOT); -\*              return (EXPOP_MULTIPLY); -\/              return (EXPOP_DIVIDE); -\%              return (EXPOP_MODULO); -\+              return (EXPOP_ADD); -\-              return (EXPOP_SUBTRACT); -">>"            return (EXPOP_SHIFT_RIGHT); -"<<"            return (EXPOP_SHIFT_LEFT); -\<              return (EXPOP_LESS); -\>              return (EXPOP_GREATER); -"<="            return (EXPOP_LESS_EQUAL); -">="            return (EXPOP_GREATER_EQUAL); -"=="            return (EXPOP_EQUAL); -"!="            return (EXPOP_NOT_EQUAL); -\&              return (EXPOP_AND); -\^              return (EXPOP_XOR); -\|              return (EXPOP_OR); -"&&"            return (EXPOP_LOGICAL_AND); -"||"            return (EXPOP_LOGICAL_OR); -<<EOF>>         return (EXPOP_EOF); /* null end-of-string */ - -{LabelRef}      return (EXPOP_LABEL); -{Number}        return (EXPOP_NUMBER); -{HexNumber}     return (EXPOP_HEX_NUMBER); -{NewLine}       return (EXPOP_NEW_LINE); +\(              return (OP_EXP_PAREN_OPEN); +\)              return (OP_EXP_PAREN_CLOSE); +\~              return (OP_EXP_ONES_COMPLIMENT); +\!              return (OP_EXP_LOGICAL_NOT); +\*              return (OP_EXP_MULTIPLY); +\/              return (OP_EXP_DIVIDE); +\%              return (OP_EXP_MODULO); +\+              return (OP_EXP_ADD); +\-              return (OP_EXP_SUBTRACT); +">>"            return (OP_EXP_SHIFT_RIGHT); +"<<"            return (OP_EXP_SHIFT_LEFT); +\<              return (OP_EXP_LESS); +\>              return (OP_EXP_GREATER); +"<="            return (OP_EXP_LESS_EQUAL); +">="            return (OP_EXP_GREATER_EQUAL); +"=="            return (OP_EXP_EQUAL); +"!="            return (OP_EXP_NOT_EQUAL); +\&              return (OP_EXP_AND); +\^              return (OP_EXP_XOR); +\|              return (OP_EXP_OR); +"&&"            return (OP_EXP_LOGICAL_AND); +"||"            return (OP_EXP_LOGICAL_OR); +<<EOF>>         return (OP_EXP_EOF); /* null end-of-string */ + +{LabelRef}      return (OP_EXP_LABEL); +{Number}        return (OP_EXP_NUMBER); +{HexNumber}     return (OP_EXP_HEX_NUMBER); +{NewLine}       return (OP_EXP_NEW_LINE);  {WhiteSpace}    /* Ignore */ -.               return (EXPOP_EOF); +.               return (OP_EXP_EOF);  %% diff --git a/source/compiler/dtparser.y b/source/compiler/dtparser.y index 43f7f04ebf85..1c44571238ae 100644 --- a/source/compiler/dtparser.y +++ b/source/compiler/dtparser.y @@ -193,26 +193,26 @@ UINT64                      DtParserResult; /* Expression return value */  %type  <value>  Expression -%token <op>     EXPOP_EOF -%token <op>     EXPOP_NEW_LINE -%token <op>     EXPOP_NUMBER -%token <op>     EXPOP_HEX_NUMBER -%token <op>     EXPOP_DECIMAL_NUMBER -%token <op>     EXPOP_LABEL -%token <op>     EXPOP_PAREN_OPEN -%token <op>     EXPOP_PAREN_CLOSE - -%left <op>      EXPOP_LOGICAL_OR -%left <op>      EXPOP_LOGICAL_AND -%left <op>      EXPOP_OR -%left <op>      EXPOP_XOR -%left <op>      EXPOP_AND -%left <op>      EXPOP_EQUAL EXPOP_NOT_EQUAL -%left <op>      EXPOP_GREATER EXPOP_LESS EXPOP_GREATER_EQUAL EXPOP_LESS_EQUAL -%left <op>      EXPOP_SHIFT_RIGHT EXPOP_SHIFT_LEFT -%left <op>      EXPOP_ADD EXPOP_SUBTRACT -%left <op>      EXPOP_MULTIPLY EXPOP_DIVIDE EXPOP_MODULO -%right <op>     EXPOP_ONES_COMPLIMENT EXPOP_LOGICAL_NOT +%token <op>     OP_EXP_EOF +%token <op>     OP_EXP_NEW_LINE +%token <op>     OP_EXP_NUMBER +%token <op>     OP_EXP_HEX_NUMBER +%token <op>     OP_EXP_DECIMAL_NUMBER +%token <op>     OP_EXP_LABEL +%token <op>     OP_EXP_PAREN_OPEN +%token <op>     OP_EXP_PAREN_CLOSE + +%left <op>      OP_EXP_LOGICAL_OR +%left <op>      OP_EXP_LOGICAL_AND +%left <op>      OP_EXP_OR +%left <op>      OP_EXP_XOR +%left <op>      OP_EXP_AND +%left <op>      OP_EXP_EQUAL OP_EXP_NOT_EQUAL +%left <op>      OP_EXP_GREATER OP_EXP_LESS OP_EXP_GREATER_EQUAL OP_EXP_LESS_EQUAL +%left <op>      OP_EXP_SHIFT_RIGHT OP_EXP_SHIFT_LEFT +%left <op>      OP_EXP_ADD OP_EXP_SUBTRACT +%left <op>      OP_EXP_MULTIPLY OP_EXP_DIVIDE OP_EXP_MODULO +%right <op>     OP_EXP_ONES_COMPLIMENT OP_EXP_LOGICAL_NOT  %% @@ -233,46 +233,46 @@ UINT64                      DtParserResult; /* Expression return value */   *  12)     ||   */  Value -    : Expression EXPOP_NEW_LINE                     { DtParserResult=$1; return 0; } /* End of line (newline) */ -    | Expression EXPOP_EOF                          { DtParserResult=$1; return 0; } /* End of string (0) */ +    : Expression OP_EXP_NEW_LINE                     { DtParserResult=$1; return 0; } /* End of line (newline) */ +    | Expression OP_EXP_EOF                          { DtParserResult=$1; return 0; } /* End of string (0) */      ;  Expression        /* Unary operators */ -    : EXPOP_LOGICAL_NOT         Expression          { $$ = DtDoOperator ($2, EXPOP_LOGICAL_NOT,     $2);} -    | EXPOP_ONES_COMPLIMENT     Expression          { $$ = DtDoOperator ($2, EXPOP_ONES_COMPLIMENT, $2);} +    : OP_EXP_LOGICAL_NOT         Expression          { $$ = DtDoOperator ($2, OP_EXP_LOGICAL_NOT,     $2);} +    | OP_EXP_ONES_COMPLIMENT     Expression          { $$ = DtDoOperator ($2, OP_EXP_ONES_COMPLIMENT, $2);}        /* Binary operators */ -    | Expression EXPOP_MULTIPLY         Expression  { $$ = DtDoOperator ($1, EXPOP_MULTIPLY,        $3);} -    | Expression EXPOP_DIVIDE           Expression  { $$ = DtDoOperator ($1, EXPOP_DIVIDE,          $3);} -    | Expression EXPOP_MODULO           Expression  { $$ = DtDoOperator ($1, EXPOP_MODULO,          $3);} -    | Expression EXPOP_ADD              Expression  { $$ = DtDoOperator ($1, EXPOP_ADD,             $3);} -    | Expression EXPOP_SUBTRACT         Expression  { $$ = DtDoOperator ($1, EXPOP_SUBTRACT,        $3);} -    | Expression EXPOP_SHIFT_RIGHT      Expression  { $$ = DtDoOperator ($1, EXPOP_SHIFT_RIGHT,     $3);} -    | Expression EXPOP_SHIFT_LEFT       Expression  { $$ = DtDoOperator ($1, EXPOP_SHIFT_LEFT,      $3);} -    | Expression EXPOP_GREATER          Expression  { $$ = DtDoOperator ($1, EXPOP_GREATER,         $3);} -    | Expression EXPOP_LESS             Expression  { $$ = DtDoOperator ($1, EXPOP_LESS,            $3);} -    | Expression EXPOP_GREATER_EQUAL    Expression  { $$ = DtDoOperator ($1, EXPOP_GREATER_EQUAL,   $3);} -    | Expression EXPOP_LESS_EQUAL       Expression  { $$ = DtDoOperator ($1, EXPOP_LESS_EQUAL,      $3);} -    | Expression EXPOP_EQUAL            Expression  { $$ = DtDoOperator ($1, EXPOP_EQUAL,           $3);} -    | Expression EXPOP_NOT_EQUAL        Expression  { $$ = DtDoOperator ($1, EXPOP_NOT_EQUAL,       $3);} -    | Expression EXPOP_AND              Expression  { $$ = DtDoOperator ($1, EXPOP_AND,             $3);} -    | Expression EXPOP_XOR              Expression  { $$ = DtDoOperator ($1, EXPOP_XOR,             $3);} -    | Expression EXPOP_OR               Expression  { $$ = DtDoOperator ($1, EXPOP_OR,              $3);} -    | Expression EXPOP_LOGICAL_AND      Expression  { $$ = DtDoOperator ($1, EXPOP_LOGICAL_AND,     $3);} -    | Expression EXPOP_LOGICAL_OR       Expression  { $$ = DtDoOperator ($1, EXPOP_LOGICAL_OR,      $3);} +    | Expression OP_EXP_MULTIPLY         Expression  { $$ = DtDoOperator ($1, OP_EXP_MULTIPLY,        $3);} +    | Expression OP_EXP_DIVIDE           Expression  { $$ = DtDoOperator ($1, OP_EXP_DIVIDE,          $3);} +    | Expression OP_EXP_MODULO           Expression  { $$ = DtDoOperator ($1, OP_EXP_MODULO,          $3);} +    | Expression OP_EXP_ADD              Expression  { $$ = DtDoOperator ($1, OP_EXP_ADD,             $3);} +    | Expression OP_EXP_SUBTRACT         Expression  { $$ = DtDoOperator ($1, OP_EXP_SUBTRACT,        $3);} +    | Expression OP_EXP_SHIFT_RIGHT      Expression  { $$ = DtDoOperator ($1, OP_EXP_SHIFT_RIGHT,     $3);} +    | Expression OP_EXP_SHIFT_LEFT       Expression  { $$ = DtDoOperator ($1, OP_EXP_SHIFT_LEFT,      $3);} +    | Expression OP_EXP_GREATER          Expression  { $$ = DtDoOperator ($1, OP_EXP_GREATER,         $3);} +    | Expression OP_EXP_LESS             Expression  { $$ = DtDoOperator ($1, OP_EXP_LESS,            $3);} +    | Expression OP_EXP_GREATER_EQUAL    Expression  { $$ = DtDoOperator ($1, OP_EXP_GREATER_EQUAL,   $3);} +    | Expression OP_EXP_LESS_EQUAL       Expression  { $$ = DtDoOperator ($1, OP_EXP_LESS_EQUAL,      $3);} +    | Expression OP_EXP_EQUAL            Expression  { $$ = DtDoOperator ($1, OP_EXP_EQUAL,           $3);} +    | Expression OP_EXP_NOT_EQUAL        Expression  { $$ = DtDoOperator ($1, OP_EXP_NOT_EQUAL,       $3);} +    | Expression OP_EXP_AND              Expression  { $$ = DtDoOperator ($1, OP_EXP_AND,             $3);} +    | Expression OP_EXP_XOR              Expression  { $$ = DtDoOperator ($1, OP_EXP_XOR,             $3);} +    | Expression OP_EXP_OR               Expression  { $$ = DtDoOperator ($1, OP_EXP_OR,              $3);} +    | Expression OP_EXP_LOGICAL_AND      Expression  { $$ = DtDoOperator ($1, OP_EXP_LOGICAL_AND,     $3);} +    | Expression OP_EXP_LOGICAL_OR       Expression  { $$ = DtDoOperator ($1, OP_EXP_LOGICAL_OR,      $3);}        /* Parentheses: '(' Expression ')' */ -    | EXPOP_PAREN_OPEN          Expression -        EXPOP_PAREN_CLOSE                           { $$ = $2;} +    | OP_EXP_PAREN_OPEN          Expression +        OP_EXP_PAREN_CLOSE                           { $$ = $2;}        /* Label references (prefixed with $) */ -    | EXPOP_LABEL                                   { $$ = DtResolveLabel (DtParsertext);} +    | OP_EXP_LABEL                                   { $$ = DtResolveLabel (DtParsertext);}        /*         * All constants for the data table compiler are in hex, whether a (optional) 0x @@ -283,15 +283,15 @@ Expression        /* Non-prefixed hex number */ -    | EXPOP_NUMBER                                  { $$ = DtDoConstant (DtParsertext);} +    | OP_EXP_NUMBER                                  { $$ = DtDoConstant (DtParsertext);}        /* Standard hex number (0x1234) */ -    | EXPOP_HEX_NUMBER                              { $$ = DtDoConstant (DtParsertext);} +    | OP_EXP_HEX_NUMBER                              { $$ = DtDoConstant (DtParsertext);}        /* Possible TBD: Decimal number with prefix (0d1234) - Not supported this time */ -    | EXPOP_DECIMAL_NUMBER                          { $$ = DtDoConstant (DtParsertext);} +    | OP_EXP_DECIMAL_NUMBER                          { $$ = DtDoConstant (DtParsertext);}      ;  %% @@ -300,7 +300,7 @@ Expression  /*   * Local support functions, including parser entry point   */ -#define PR_FIRST_PARSE_OPCODE   EXPOP_EOF +#define PR_FIRST_PARSE_OPCODE   OP_EXP_EOF  #define PR_YYTNAME_START        3 @@ -329,7 +329,7 @@ DtParsererror (   *   * FUNCTION:    DtGetOpName   * - * PARAMETERS:  ParseOpcode         - Parser token (EXPOP_*) + * PARAMETERS:  ParseOpcode         - Parser token (OP_EXP_*)   *   * RETURN:      Pointer to the opcode name   * @@ -344,7 +344,7 @@ DtGetOpName (  #ifdef ASL_YYTNAME_START      /*       * First entries (PR_YYTNAME_START) in yytname are special reserved names. -     * Ignore first 6 characters of name (EXPOP_) +     * Ignore first 6 characters of name (OP_EXP_)       */      return ((char *) yytname          [(ParseOpcode - PR_FIRST_PARSE_OPCODE) + PR_YYTNAME_START] + 6); diff --git a/source/compiler/dttable.c b/source/compiler/dttable.c index 75f34d5d7fe1..44efbee473fd 100644 --- a/source/compiler/dttable.c +++ b/source/compiler/dttable.c @@ -182,7 +182,7 @@ DtCompileRsdp (      /* Compile the "common" RSDP (ACPI 1.0) */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoRsdp1, -        &Gbl_RootTable, TRUE); +        &Gbl_RootTable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -196,7 +196,7 @@ DtCompileRsdp (          /* Compile the "extended" part of the RSDP as a subtable */          Status = DtCompileTable (PFieldList, AcpiDmTableInfoRsdp2, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -240,7 +240,7 @@ DtCompileFadt (      Status = DtCompileTable (PFieldList, AcpiDmTableInfoFadt1, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -255,7 +255,7 @@ DtCompileFadt (      if (Revision == 2)      {          Status = DtCompileTable (PFieldList, AcpiDmTableInfoFadt2, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -266,7 +266,7 @@ DtCompileFadt (      else if (Revision >= 2)      {          Status = DtCompileTable (PFieldList, AcpiDmTableInfoFadt3, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -277,7 +277,7 @@ DtCompileFadt (          if (Revision >= 5)          {              Status = DtCompileTable (PFieldList, AcpiDmTableInfoFadt5, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -289,7 +289,7 @@ DtCompileFadt (          if (Revision >= 6)          {              Status = DtCompileTable (PFieldList, AcpiDmTableInfoFadt6, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -326,7 +326,7 @@ DtCompileFacs (      Status = DtCompileTable (PFieldList, AcpiDmTableInfoFacs, -        &Gbl_RootTable, TRUE); +        &Gbl_RootTable);      if (ACPI_FAILURE (Status))      {          return (Status); diff --git a/source/compiler/dttable1.c b/source/compiler/dttable1.c index bc74799cb6ca..084adc3e4236 100644 --- a/source/compiler/dttable1.c +++ b/source/compiler/dttable1.c @@ -202,7 +202,7 @@ DtCompileAsf (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoAsfHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -247,7 +247,7 @@ DtCompileAsf (              return (AE_ERROR);          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -307,7 +307,7 @@ DtCompileAsf (                  while (DataCount > 0)                  {                      Status = DtCompileTable (PFieldList, DataInfoTable, -                        &Subtable, TRUE); +                        &Subtable);                      if (ACPI_FAILURE (Status))                      {                          return (Status); @@ -323,7 +323,7 @@ DtCompileAsf (                  for (i = 0; i < DataCount; i++)                  {                      Status = DtCompileTable (PFieldList, DataInfoTable, -                        &Subtable, TRUE); +                        &Subtable);                      if (ACPI_FAILURE (Status))                      {                          return (Status); @@ -399,7 +399,7 @@ DtCompileCsrt (          /* Resource group subtable */          Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt0, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -424,7 +424,7 @@ DtCompileCsrt (          /* Shared info subtable (One per resource group) */          Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt1, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -438,7 +438,7 @@ DtCompileCsrt (          {              Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -451,7 +451,7 @@ DtCompileCsrt (              if (*PFieldList)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2a, -                    &Subtable, TRUE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -504,7 +504,7 @@ DtCompileDbg2 (      /* Main table */ -    Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2, &Subtable, TRUE); +    Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2, &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -529,7 +529,7 @@ DtCompileDbg2 (          /* Subtable: Debug Device Information */          Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Device, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -550,7 +550,7 @@ DtCompileDbg2 (          for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)          {              Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -566,7 +566,7 @@ DtCompileDbg2 (          for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)          {              Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -580,7 +580,7 @@ DtCompileDbg2 (          DeviceInfo->NamepathOffset = CurrentOffset;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -595,7 +595,7 @@ DtCompileDbg2 (          /* OemData - Variable-length data (Optional, size = OemDataLength) */          Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2OemData, -            &Subtable, TRUE); +            &Subtable);          if (Status == AE_END_OF_TABLE)          {              /* optional field was not found and we're at the end of the file */ @@ -659,7 +659,7 @@ DtCompileDmar (      UINT32                  PciPathLength; -    Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable, TRUE); +    Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -675,7 +675,7 @@ DtCompileDmar (          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -722,7 +722,7 @@ DtCompileDmar (          /* DMAR Subtable */ -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -749,7 +749,7 @@ DtCompileDmar (          while (DeviceScopeLength)          {              Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope, -                &Subtable, FALSE); +                &Subtable);              if (Status == AE_NOT_FOUND)              {                  break; @@ -767,7 +767,7 @@ DtCompileDmar (              while (PciPathLength)              {                  Status = DtCompileTable (PFieldList, TableInfoDmarPciPath, -                    &Subtable, FALSE); +                    &Subtable);                  if (Status == AE_NOT_FOUND)                  {                      DtPopSubtable (); @@ -823,7 +823,7 @@ DtCompileDrtm (      /* Compile DRTM header */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoDrtm, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -841,7 +841,7 @@ DtCompileDrtm (      /* Compile VTL */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoDrtm0, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -857,7 +857,7 @@ DtCompileDrtm (      while (*PFieldList)      {          Status = DtCompileTable (PFieldList, AcpiDmTableInfoDrtm0a, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -877,7 +877,7 @@ DtCompileDrtm (      /* Compile RL */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoDrtm1, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -893,7 +893,7 @@ DtCompileDrtm (      while (*PFieldList)      {          Status = DtCompileTable (PFieldList, AcpiDmTableInfoDrtm1a, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -915,7 +915,7 @@ DtCompileDrtm (      /* Compile DPS */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoDrtm2, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1005,7 +1005,7 @@ DtCompileGtdt (      Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdt, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1018,7 +1018,7 @@ DtCompileGtdt (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdtHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1048,7 +1048,7 @@ DtCompileGtdt (              return (AE_ERROR);          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1074,7 +1074,7 @@ DtCompileGtdt (              while (GtCount)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdt0a, -                    &Subtable, TRUE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1128,7 +1128,7 @@ DtCompileFpdt (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoFpdtHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1159,7 +1159,7 @@ DtCompileFpdt (              break;          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1201,7 +1201,7 @@ DtCompileHest (      Status = DtCompileTable (PFieldList, AcpiDmTableInfoHest, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1272,7 +1272,7 @@ DtCompileHest (              return (AE_ERROR);          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1312,7 +1312,7 @@ DtCompileHest (          while (BankCount)          {              Status = DtCompileTable (PFieldList, AcpiDmTableInfoHestBank, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1362,7 +1362,7 @@ DtCompileHmat (      ParentTable = DtPeekSubtable ();      Status = DtCompileTable (PFieldList, AcpiDmTableInfoHmat, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1375,7 +1375,7 @@ DtCompileHmat (          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoHmatHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1410,7 +1410,7 @@ DtCompileHmat (              return (AE_ERROR);          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1433,7 +1433,7 @@ DtCompileHmat (              while (*PFieldList)              {                  Status = DtCompileTable (PFieldList, -                    AcpiDmTableInfoHmat1a, &Subtable, TRUE); +                    AcpiDmTableInfoHmat1a, &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1454,7 +1454,7 @@ DtCompileHmat (              while (*PFieldList)              {                  Status = DtCompileTable (PFieldList, -                    AcpiDmTableInfoHmat1b, &Subtable, TRUE); +                    AcpiDmTableInfoHmat1b, &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1479,7 +1479,7 @@ DtCompileHmat (              while (*PFieldList)              {                  Status = DtCompileTable (PFieldList, -                    AcpiDmTableInfoHmat1c, &Subtable, TRUE); +                    AcpiDmTableInfoHmat1c, &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1513,7 +1513,7 @@ DtCompileHmat (              while (*PFieldList)              {                  Status = DtCompileTable (PFieldList, -                    AcpiDmTableInfoHmat2a, &Subtable, TRUE); +                    AcpiDmTableInfoHmat2a, &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1576,7 +1576,7 @@ DtCompileIort (      ParentTable = DtPeekSubtable ();      Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1598,7 +1598,7 @@ DtCompileIort (       */      Iort->NodeOffset = sizeof (ACPI_TABLE_IORT);      Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1624,7 +1624,7 @@ DtCompileIort (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1642,7 +1642,7 @@ DtCompileIort (          case ACPI_IORT_NODE_ITS_GROUP:              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort0, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1656,7 +1656,7 @@ DtCompileIort (              while (*PFieldList)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort0a, -                    &Subtable, TRUE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1677,7 +1677,7 @@ DtCompileIort (          case ACPI_IORT_NODE_NAMED_COMPONENT:              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort1, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1692,7 +1692,7 @@ DtCompileIort (               * for filling this field.               */              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort1a, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1729,7 +1729,7 @@ DtCompileIort (          case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort2, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1742,7 +1742,7 @@ DtCompileIort (          case ACPI_IORT_NODE_SMMU:              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1756,7 +1756,7 @@ DtCompileIort (              IortSmmu->GlobalInterruptOffset = NodeLength;              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1772,7 +1772,7 @@ DtCompileIort (              while (*PFieldList)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b, -                    &Subtable, TRUE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1797,7 +1797,7 @@ DtCompileIort (              while (*PFieldList)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c, -                    &Subtable, TRUE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1819,7 +1819,7 @@ DtCompileIort (          case ACPI_IORT_NODE_SMMU_V3:              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort4, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1842,7 +1842,7 @@ DtCompileIort (          while (*PFieldList)          {              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortMap, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1905,7 +1905,7 @@ DtCompileIvrs (      Status = DtCompileTable (PFieldList, AcpiDmTableInfoIvrs, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1918,7 +1918,7 @@ DtCompileIvrs (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoIvrsHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1950,7 +1950,7 @@ DtCompileIvrs (              return (AE_ERROR);          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -2012,7 +2012,7 @@ DtCompileIvrs (                  }                  Status = DtCompileTable (PFieldList, InfoTable, -                    &Subtable, TRUE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); diff --git a/source/compiler/dttable2.c b/source/compiler/dttable2.c index a2960e9b40bd..785bc7a113cc 100644 --- a/source/compiler/dttable2.c +++ b/source/compiler/dttable2.c @@ -191,7 +191,7 @@ DtCompileLpit (          /* LPIT Subtable header */          Status = DtCompileTable (PFieldList, AcpiDmTableInfoLpitHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -218,7 +218,7 @@ DtCompileLpit (          /* LPIT Subtable */ -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -259,7 +259,7 @@ DtCompileMadt (      Status = DtCompileTable (PFieldList, AcpiDmTableInfoMadt, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -272,7 +272,7 @@ DtCompileMadt (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoMadtHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -372,7 +372,7 @@ DtCompileMadt (              return (AE_ERROR);          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -442,7 +442,7 @@ DtCompileMpst (      /* Main table */ -    Status = DtCompileTable (PFieldList, AcpiDmTableInfoMpst, &Subtable, TRUE); +    Status = DtCompileTable (PFieldList, AcpiDmTableInfoMpst, &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -460,7 +460,7 @@ DtCompileMpst (          /* Subtable: Memory Power Node(s) */          Status = DtCompileTable (PFieldList, AcpiDmTableInfoMpst0, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -481,7 +481,7 @@ DtCompileMpst (          while (*PFieldList && PowerStateCount)          {              Status = DtCompileTable (PFieldList, AcpiDmTableInfoMpst0A, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -496,7 +496,7 @@ DtCompileMpst (          while (*PFieldList && ComponentCount)          {              Status = DtCompileTable (PFieldList, AcpiDmTableInfoMpst0B, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -514,7 +514,7 @@ DtCompileMpst (      DtPopSubtable (); -    Status = DtCompileTable (PFieldList, AcpiDmTableInfoMpst1, &Subtable, TRUE); +    Status = DtCompileTable (PFieldList, AcpiDmTableInfoMpst1, &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -534,7 +534,7 @@ DtCompileMpst (      while (*PFieldList && SubtableCount)      {          Status = DtCompileTable (PFieldList, AcpiDmTableInfoMpst2, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -630,7 +630,7 @@ DtCompileNfit (      /* Main table */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoNfit, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -646,7 +646,7 @@ DtCompileNfit (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoNfitHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -708,7 +708,7 @@ DtCompileNfit (              return (AE_ERROR);          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -727,7 +727,7 @@ DtCompileNfit (              while (*PFieldList)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoNfit2a, -                    &Subtable, FALSE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -752,7 +752,7 @@ DtCompileNfit (              if (*PFieldList)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoNfit3a, -                    &Subtable, TRUE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -772,7 +772,7 @@ DtCompileNfit (              while (*PFieldList)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoNfit6a, -                    &Subtable, FALSE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -829,7 +829,7 @@ DtCompilePcct (      /* Main table */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoPcct, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -844,7 +844,7 @@ DtCompilePcct (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoPcctHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -889,7 +889,7 @@ DtCompilePcct (              return (AE_ERROR);          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -930,7 +930,7 @@ DtCompilePdtt (      /* Main table */ -    Status = DtCompileTable (PFieldList, AcpiDmTableInfoPdtt, &Subtable, TRUE); +    Status = DtCompileTable (PFieldList, AcpiDmTableInfoPdtt, &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -949,7 +949,7 @@ DtCompilePdtt (          /* List of subchannel IDs, each 2 bytes */          Status = DtCompileTable (PFieldList, AcpiDmTableInfoPdtt0, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -993,7 +993,7 @@ DtCompilePmtt (      /* Main table */ -    Status = DtCompileTable (PFieldList, AcpiDmTableInfoPmtt, &Subtable, TRUE); +    Status = DtCompileTable (PFieldList, AcpiDmTableInfoPmtt, &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1007,7 +1007,7 @@ DtCompilePmtt (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoPmttHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1039,7 +1039,7 @@ DtCompilePmtt (              /* Subtable: Socket Structure */              Status = DtCompileTable (PFieldList, AcpiDmTableInfoPmtt0, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1054,7 +1054,7 @@ DtCompilePmtt (              /* Subtable: Memory Controller Structure */              Status = DtCompileTable (PFieldList, AcpiDmTableInfoPmtt1, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1070,7 +1070,7 @@ DtCompilePmtt (              while (DomainCount)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoPmtt1a, -                    &Subtable, TRUE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1086,7 +1086,7 @@ DtCompilePmtt (              /* Subtable: Physical Component Structure */              Status = DtCompileTable (PFieldList, AcpiDmTableInfoPmtt2, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1141,7 +1141,7 @@ DtCompilePptt (          /* Compile PPTT subtable header */          Status = DtCompileTable (PFieldList, AcpiDmTableInfoPpttHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1175,7 +1175,7 @@ DtCompilePptt (          /* Compile PPTT subtable body */ -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1199,7 +1199,7 @@ DtCompilePptt (                  while (*PFieldList)                  {                      Status = DtCompileTable (PFieldList, -                        AcpiDmTableInfoPptt0a, &Subtable, TRUE); +                        AcpiDmTableInfoPptt0a, &Subtable);                      if (ACPI_FAILURE (Status))                      {                          return (Status); @@ -1288,7 +1288,7 @@ DtCompileS3pt (      Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt, -        &Gbl_RootTable, TRUE); +        &Gbl_RootTable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1300,7 +1300,7 @@ DtCompileS3pt (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3ptHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1330,7 +1330,7 @@ DtCompileS3pt (              return (AE_ERROR);          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1381,7 +1381,7 @@ DtCompileSdev (          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoSdevHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1416,7 +1416,7 @@ DtCompileSdev (          /* Compile SDEV subtable body */ -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1434,7 +1434,7 @@ DtCompileSdev (              /* Append DeviceId namespace string */              Status = DtCompileTable (PFieldList, AcpiDmTableInfoSdev0a, -                &Subtable, TRUE); +                &Subtable);              if (ACPI_FAILURE (Status))              {                  return (Status); @@ -1459,7 +1459,7 @@ DtCompileSdev (              if (*PFieldList)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoSdev1b, -                    &Subtable, TRUE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1491,7 +1491,7 @@ DtCompileSdev (              while (*PFieldList && !strcmp ((*PFieldList)->Name, "Device"))              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoSdev1a, -                    &Subtable, FALSE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1522,7 +1522,7 @@ DtCompileSdev (              if (*PFieldList)              {                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoSdev1b, -                    &Subtable, TRUE); +                    &Subtable);                  if (ACPI_FAILURE (Status))                  {                      return (Status); @@ -1583,7 +1583,7 @@ DtCompileSlic (      while (*PFieldList)      {          Status = DtCompileTable (PFieldList, AcpiDmTableInfoSlic, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1625,7 +1625,7 @@ DtCompileSlit (      Status = DtCompileTable (PFieldList, AcpiDmTableInfoSlit, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1681,7 +1681,7 @@ DtCompileSrat (      Status = DtCompileTable (PFieldList, AcpiDmTableInfoSrat, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1694,7 +1694,7 @@ DtCompileSrat (      {          SubtableStart = *PFieldList;          Status = DtCompileTable (PFieldList, AcpiDmTableInfoSratHdr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1739,7 +1739,7 @@ DtCompileSrat (              return (AE_ERROR);          } -        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE); +        Status = DtCompileTable (PFieldList, InfoTable, &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1779,7 +1779,7 @@ DtCompileStao (      /* Compile the main table */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoStao, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1793,7 +1793,7 @@ DtCompileStao (      while (*PFieldList)      {          Status = DtCompileTable (PFieldList, AcpiDmTableInfoStaoStr, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -1833,7 +1833,7 @@ DtCompileTcpa (      /* Compile the main table */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoTcpaHdr, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1853,13 +1853,13 @@ DtCompileTcpa (      case ACPI_TCPA_CLIENT_TABLE:          Status = DtCompileTable (PFieldList, AcpiDmTableInfoTcpaClient, -            &Subtable, TRUE); +            &Subtable);          break;      case ACPI_TCPA_SERVER_TABLE:          Status = DtCompileTable (PFieldList, AcpiDmTableInfoTcpaServer, -            &Subtable, TRUE); +            &Subtable);          break;      default: @@ -1902,7 +1902,7 @@ DtCompileTpm2 (      /* Compile the main table */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoTpm2, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1919,7 +1919,7 @@ DtCompileTpm2 (      /* TBD: Optional fields above not fully implemented (not optional at this time) */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoTpm2a, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -1938,7 +1938,7 @@ DtCompileTpm2 (          /* Subtable specific to to ARM_SMC */          Status = DtCompileTable (PFieldList, AcpiDmTableInfoTpm211, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_FAILURE (Status))          {              return (Status); @@ -2053,7 +2053,7 @@ DtCompileUefi (      /* Compile the predefined portion of the UEFI table */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoUefi, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -2152,7 +2152,7 @@ DtCompileWpbt (      /* Compile the main table */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -2164,7 +2164,7 @@ DtCompileWpbt (      /* Compile the argument list subtable */      Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt0, -        &Subtable, TRUE); +        &Subtable);      if (ACPI_FAILURE (Status))      {          return (Status); @@ -2284,7 +2284,7 @@ DtCompileGeneric (          }          Status = DtCompileTable (PFieldList, Info, -            &Subtable, TRUE); +            &Subtable);          if (ACPI_SUCCESS (Status))          {              DtInsertSubtable (ParentTable, Subtable);  | 
