WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/compiler/aslcompile.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
  * such license, approval or letter.
+ *
  *****************************************************************************/
+#include "aslcompiler.h"
 #include
 #include
-#include "aslcompiler.h"
+#include
 #define _COMPONENT          ACPI_COMPILER
         ACPI_MODULE_NAME    ("aslcompile")
 /* Local prototypes */
 static void
 CmFlushSourceCode (
     void);
-void
+static void
 FlConsumeAnsiComment (
     ASL_FILE_INFO           *FileInfo,
     ASL_FILE_STATUS         *Status);
 AslCompilerSignon (
     UINT32                  FileId)
+{
     char                    *Prefix = "";
     char                    *UtilityName;
     /* Set line prefix depending on the destination file type */
         /* No other output types supported */
         break;
+    }
-    /*
-     * Compiler signon with copyright
-     */
-    FlPrintFile (FileId,
-        "%s\n%s%s\n%s",
-        Prefix,
-        Prefix, IntelAcpiCA,
-        Prefix);
     /* Running compiler or disassembler? */
     if (Gbl_DisasmFlag)
-    {
-        FlPrintFile (FileId,
+    {
-            "%s", DisassemblerId);
+        UtilityName = AML_DISASSEMBLER_NAME;
+    }
     else
     {
-        FlPrintFile (FileId,
-            "%s", CompilerId);
+        UtilityName = ASL_COMPILER_NAME;
     }
-    /* Version, build date, copyright, compliance */
+    /* Compiler signon with copyright */
-    FlPrintFile (FileId,
-        " version %X [%s]\n%s%s\n%s%s\n%s\n",
-        (UINT32) ACPI_CA_VERSION, __DATE__,
         Prefix, CompilerCopyright,
-        Prefix, CompilerCompliance,
+    FlPrintFile (FileId, "%s\n", Prefix);
-        Prefix);
+    FlPrintFile (FileId, ACPI_COMMON_HEADER (UtilityName, Prefix));
  * DESCRIPTION: Step over both types of comment during check for ascii chars
+ *
  ******************************************************************************/
-void
+static void
 FlConsumeAnsiComment (
     ASL_FILE_INFO           *FileInfo,
     ASL_FILE_STATUS         *Status)
+{
     UINT8                   Byte;
+    }
+}
-void
+static void
 FlConsumeNewComment (
     ASL_FILE_INFO           *FileInfo,
     ASL_FILE_STATUS         *Status)
+{
     /* Semantic error checking part two - typing of method returns */
     Event = UtBeginEvent ("Determine object types returned by methods");
     DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - Method typing\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_TWICE,
-        AnMethodTypingWalkBegin,
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD,
-        AnMethodTypingWalkEnd, NULL);
+        NULL, AnMethodTypingWalkEnd, NULL);
     UtEndEvent (Event);
     /* Semantic error checking part three - operand type checking */
-    Event = UtBeginEvent ("Analyze AML operand types");
-    DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - Operand type checking\n\n");
+    Event = UtBeginEvent ("Analyze AML operand types");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_TWICE,
+    DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - Operand type checking\n\n");
-        AnOperandTypecheckWalkBegin,
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD,
-        AnOperandTypecheckWalkEnd, &AnalysisWalkInfo);
+        NULL, AnOperandTypecheckWalkEnd, &AnalysisWalkInfo);
     UtEndEvent (Event);
     /* Semantic error checking part four - other miscellaneous checks */
     Event = UtBeginEvent ("Miscellaneous analysis");
     DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - miscellaneous\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_TWICE,
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
+    }
     /*
      * Delete intermediate ("combined") source file (if -ls flag not set)
+     * This file is created during normal ASL/AML compiles. It is not
+     * created by the data table compiler.
+     *
+     * If the -ls flag is set, then the .SRC file should not be deleted.
+     * In this case, Gbl_SourceOutputFlag is set to TRUE.
+     *
+     * Note: Handles are cleared by FlCloseFile above, so we look at the
+     * filename instead, to determine if the .SRC file was actually
+     * created.
+     *
      * TBD: SourceOutput should be .TMP, then rename if we want to keep it?
      */
-    if (!Gbl_SourceOutputFlag)
+    if (!Gbl_SourceOutputFlag && Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename)
+    {
         if (remove (Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename))
+        {
             printf ("%s: ",
                 Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename);

Subversion Repositories Kolibri OS

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