WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/compiler/aslmain.c

 /******************************************************************************
+ *
  * 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
+ *
  * 2.1. This is your license from Intel Corp. under its intellectual property
 #define _DECLARE_GLOBALS
 #include "aslcompiler.h"
+#include "acapps.h"
-#include "acapps.h"
+#include "acdisasm.h"
 #ifdef _DEBUG
     char                    *Filename);
 #define ASL_TOKEN_SEPARATORS    " \t\n"
-#define ASL_SUPPORTED_OPTIONS   "@:2b:c:d^e:fgh^i^I:l^no:p:r:s:t:v:w:x:yz"
+#define ASL_SUPPORTED_OPTIONS   "@:2b:c:d^e:fgh^i^I:l^no:p:r:s:t:T:v:w:x:z"
     printf ("  -on            Disable named reference string optimization\n");
     printf ("  -cr            Disable Resource Descriptor error checking\n");
     printf ("  -r   Override table header Revision (1-255)\n");
-    printf ("\nListings:\n");
+    printf ("\nASL Listing Files:\n");
     printf ("  -l             Create mixed listing file (ASL source and AML) (*.lst)\n");
     printf ("  -ln            Create namespace file (*.nsp)\n");
     printf ("  -ls            Create combined source file (expanded includes) (*.src)\n");
+    printf ("\nACPI Data Tables:\n");
+    printf ("  -T |ALL|* Create table template file(s) for \n");
+    printf ("  -vt            Create verbose templates (full disassembly)\n");
     printf ("\nAML Disassembler:\n");
+    printf ("  -d  [file]     Disassemble or decode binary ACPI table to file (*.dsl)\n");
-    printf ("  -d  [file]     Disassemble or decode binary ACPI table to file (*.dsl)\n");
+    printf ("  -da [f1,f2]    Disassemble multiple tables from single namespace\n");
     printf ("  -dc [file]     Disassemble AML and immediately compile it\n");
     printf ("                 (Obtain DSDT from current system if no input file)\n");
     printf ("  -e  [f1,f2]    Include ACPI table(s) for external symbol resolution\n");
     printf ("  -2             Emit ACPI 2.0 compatible ASL code\n");
     printf ("  -g             Get ACPI tables and write to files (*.dat)\n");
     printf ("\nHelp:\n");
     printf ("  -h             Additional help and compiler debug options\n");
+    printf ("  -hc            Display operators allowed in constant expressions\n");
-    printf ("  -hc            Display operators allowed in constant expressions\n");
+    printf ("  -hr            Display ACPI reserved method names\n");
-    printf ("  -hr            Display ACPI reserved method names\n");
+    printf ("  -ht            Display currently supported ACPI table names\n");
+}
     printf ("  -f             Ignore errors, force creation of AML output file(s)\n");
     printf ("  -n             Parse only, no output generation\n");
     printf ("  -ot            Display compile times\n");
     printf ("  -x      Set debug level for trace output\n");
-    printf ("  -y             Temporary: Enable data table compiler\n");
+    printf ("  -z             Do not insert new compiler ID for DataTables\n");
-    printf ("  -z             Do not insert new compiler ID for DataTables\n");
+}
 Usage (
     void)
+{
+    printf ("%s\n", ASL_COMPLIANCE);
-    printf ("Usage:    %s [Options] [Files]\n\n", CompilerName);
+    printf ("Usage:    %s [Options] [Files]\n\n", ASL_INVOCATION_NAME);
     Options ();
+}
     char                    **argv,
     BOOLEAN                 IsResponseFile)
+{
     int                     j;
     ACPI_STATUS             Status;
     /* Get the command line options */
         switch (AcpiGbl_Optarg[0])
+        {
         case 'b':
             AslCompilerdebug = 1; /* same as yydebug */
+            DtParserdebug = 1;
             break;
         case 'p':
+            AslCompilerdebug = 1; /* same as yydebug */
-            AslCompilerdebug = 1; /* same as yydebug */
+            DtParserdebug = 1;
             break;
         case '^':
             Gbl_DoCompile = FALSE;
             break;
+        case 'a':
+            Gbl_DoCompile = FALSE;
+            Gbl_DisassembleAll = TRUE;
+            break;
         case 'c':
             break;
         default:
         break;
     case 'e':
+        Status = AcpiDmAddToExternalFileList (AcpiGbl_Optarg);
+        if (ACPI_FAILURE (Status))
+        {
+            printf ("Could not add %s to external list\n", AcpiGbl_Optarg);
+            return (-1);
         Gbl_ExternalFilename = AcpiGbl_Optarg;
         break;
             ApDisplayReservedNames ();
             exit (0);
+        case 't':
+            UtDisplaySupportedTables ();
+            exit (0);
         default:
             printf ("Unknown option: -h%s\n", AcpiGbl_Optarg);
             return (-1);
-        }
         break;
+        }
         break;
+    case 'T':
+        Gbl_DoTemplates = TRUE;
+        Gbl_TemplateSignature = AcpiGbl_Optarg;
+        break;
     case 'v':
         switch (AcpiGbl_Optarg[0])
         case 's':
             Gbl_DoSignon = FALSE;
             break;
+        case 't':
+            Gbl_VerboseTemplates = TRUE;
+            break;
         default:
             printf ("Unknown option: -v%s\n", AcpiGbl_Optarg);
             return (-1);
+        }
         AcpiDbgLevel = strtoul (AcpiGbl_Optarg, NULL, 16);
         break;
-    case 'y':
-        Gbl_DataTableCompilerAvailable = TRUE;
-        break;
     case 'z':
     int                     argc,
     char                    **argv)
+{
     int                     BadCommandLine = 0;
     ACPI_STATUS             Status;
     /* Minimum command line contains at least the command and an input file */
     if (argc < 2)
+    {
-        AslCompilerSignon (ASL_FILE_STDOUT);
+        printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME));
         Usage ();
         exit (1);
+    }
+    /* Process all command line options */
+    BadCommandLine = AslDoOptions (argc, argv, FALSE);
+    if (Gbl_DoTemplates)
+    {
+        Status = DtCreateTemplates (Gbl_TemplateSignature);
+        if (ACPI_FAILURE (Status))
+        {
             exit (-1);
     /* Process all command line options */
         exit (1);
     BadCommandLine = AslDoOptions (argc, argv, FALSE);
+    }
     if (Gbl_DoSignon)
+    {
-        AslCompilerSignon (ASL_FILE_STDOUT);
+        printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME));
+    }
     /* Abort if anything went wrong on the command line */
     int                     argc,
     char                    **argv)
+{
     ACPI_STATUS             Status;
-    int                     Index;
+    int                     Index1;
+    int                     Index2;
+    AcpiGbl_ExternalFileList = NULL;
 #ifdef _DEBUG
     _CrtSetDbgFlag (_CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_LEAK_CHECK_DF |
                     _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG));
 #endif
     /* Init and command line */
     AslInitialize ();
-    Index = AslCommandLine (argc, argv);
+    Index1 = Index2 = AslCommandLine (argc, argv);
+        }
         return (0);
+    }
+    if (Gbl_DisassembleAll)
+    {
+        while (argv[Index1])
+        {
+            Status = AslDoOnePathname (argv[Index1], AcpiDmAddToExternalFileList);
+            if (ACPI_FAILURE (Status))
+            {
+                return (-1);
+            }
+            Index1++;
+        }
+    }
     /* Process each pathname/filename in the list, with possible wildcards */
-    while (argv[Index])
+    while (argv[Index2])
     {
-        Status = AslDoOnePathname (argv[Index]);
+        Status = AslDoOnePathname (argv[Index2], AslDoOneFile);
         if (ACPI_FAILURE (Status))
+        {
             return (-1);
         }
+        Index2++;
+    }
+    if (AcpiGbl_ExternalFileList)
+    {
-        Index++;
+        AcpiDmClearExternalFileList();
+    }

Subversion Repositories Kolibri OS

(root)/drivers/devman/acpica/compiler/aslmain.c – Rev 1498 → 2216