| 8,7 → 8,7 |
|---|
| * |
| * 1. Copyright Notice |
| * |
| * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. |
| * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp. |
| * All rights reserved. |
| * |
| * 2. License |
| 134,7 → 134,6 |
|---|
| |
| |
| extern int AslCompilerdebug; |
| extern char *Gbl_ExternalFilename; |
| |
| |
| ACPI_STATUS |
| 148,22 → 147,18 |
|---|
| |
| /* Local prototypes */ |
| |
| void |
| static void |
| AdCreateTableHeader ( |
| char *Filename, |
| ACPI_TABLE_HEADER *Table); |
| |
| void |
| AdDisassemblerHeader ( |
| char *Filename); |
| |
| ACPI_STATUS |
| static ACPI_STATUS |
| AdDeferredParse ( |
| ACPI_PARSE_OBJECT *Op, |
| UINT8 *Aml, |
| UINT32 AmlLength); |
| |
| ACPI_STATUS |
| static ACPI_STATUS |
| AdParseDeferredOps ( |
| ACPI_PARSE_OBJECT *Root); |
| |
| 317,6 → 312,7 |
|---|
| ACPI_STATUS Status; |
| char *DisasmFilename = NULL; |
| char *ExternalFilename; |
| ACPI_EXTERNAL_FILE *ExternalFileList = AcpiGbl_ExternalFileList; |
| FILE *File = NULL; |
| ACPI_TABLE_HEADER *Table = NULL; |
| ACPI_TABLE_HEADER *ExternalTable; |
| 339,12 → 335,18 |
|---|
| * External filenames separated by commas |
| * Example: iasl -e file1,file2,file3 -d xxx.aml |
| */ |
| if (Gbl_ExternalFilename) |
| while (ExternalFileList) |
| { |
| ExternalFilename = strtok (Gbl_ExternalFilename, ","); |
| ExternalFilename = ExternalFileList->Path; |
| if (!ACPI_STRCMP (ExternalFilename, Filename)) |
| { |
| /* Next external file */ |
| |
| while (ExternalFilename) |
| { |
| ExternalFileList = ExternalFileList->Next; |
| |
| continue; |
| } |
| |
| Status = AcpiDbGetTableFromFile (ExternalFilename, &ExternalTable); |
| if (ACPI_FAILURE (Status)) |
| { |
| 372,13 → 374,15 |
|---|
| AcpiPsDeleteParseTree (AcpiGbl_ParseOpRoot); |
| } |
| |
| /* Next external file name */ |
| /* Next external file */ |
| |
| ExternalFilename = strtok (NULL, ","); |
| ExternalFileList = ExternalFileList->Next; |
| } |
| |
| /* Clear external list generated by Scope in external tables */ |
| |
| if (AcpiGbl_ExternalFileList) |
| { |
| AcpiDmClearExternalList (); |
| } |
| } |
| 608,10 → 612,10 |
|---|
| |
| /* Header and input table info */ |
| |
| AcpiOsPrintf ("/*\n * Intel ACPI Component Architecture\n"); |
| AcpiOsPrintf (" * AML Disassembler version %8.8X\n", ACPI_CA_VERSION); |
| AcpiOsPrintf ("/*\n"); |
| AcpiOsPrintf (ACPI_COMMON_HEADER ("AML Disassembler", " * ")); |
| |
| AcpiOsPrintf (" *\n * Disassembly of %s, %s", Filename, ctime (&Timer)); |
| AcpiOsPrintf (" * Disassembly of %s, %s", Filename, ctime (&Timer)); |
| AcpiOsPrintf (" *\n"); |
| } |
| |
| 630,7 → 634,7 |
|---|
| * |
| *****************************************************************************/ |
| |
| void |
| static void |
| AdCreateTableHeader ( |
| char *Filename, |
| ACPI_TABLE_HEADER *Table) |
| 644,7 → 648,7 |
|---|
| */ |
| AdDisassemblerHeader (Filename); |
| |
| AcpiOsPrintf (" *\n * Original Table Header:\n"); |
| AcpiOsPrintf (" * Original Table Header:\n"); |
| AcpiOsPrintf (" * Signature \"%4.4s\"\n", Table->Signature); |
| AcpiOsPrintf (" * Length 0x%8.8X (%u)\n", Table->Length, Table->Length); |
| |
| 663,7 → 667,7 |
|---|
| |
| if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT)) |
| { |
| AcpiOsPrintf (" **** ACPI 1.0, no 64-bit math support"); |
| AcpiOsPrintf (" **** 32-bit table (V1), no 64-bit math support"); |
| } |
| break; |
| |
| 689,7 → 693,7 |
|---|
| AcpiOsPrintf (" * OEM Revision 0x%8.8X (%u)\n", Table->OemRevision, Table->OemRevision); |
| AcpiOsPrintf (" * Compiler ID \"%.4s\"\n", Table->AslCompilerId); |
| AcpiOsPrintf (" * Compiler Version 0x%8.8X (%u)\n", Table->AslCompilerRevision, Table->AslCompilerRevision); |
| AcpiOsPrintf (" */\n"); |
| AcpiOsPrintf (" */\n\n"); |
| |
| /* Create AML output filename based on input filename */ |
| |
| 777,7 → 781,7 |
|---|
| * |
| *****************************************************************************/ |
| |
| ACPI_STATUS |
| static ACPI_STATUS |
| AdDeferredParse ( |
| ACPI_PARSE_OBJECT *Op, |
| UINT8 *Aml, |
| 900,7 → 904,7 |
|---|
| * |
| *****************************************************************************/ |
| |
| ACPI_STATUS |
| static ACPI_STATUS |
| AdParseDeferredOps ( |
| ACPI_PARSE_OBJECT *Root) |
| { |