mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-03-12 01:03:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Generation for Win64

Browse Source 
date	2001.12.13.17.23.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 15:55:04 +00:00
parent f182cd0709
commit 1497d3ce8a
2 changed files with 18 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/compiler/aslerror.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: aslerror - Error handling and statistics
* $Revision: 1.54 $
* $Revision: 1.55 $
*
*****************************************************************************/
@ -301,7 +301,7 @@ AePrintException (
if (Enode->LineNumber)
{
fprintf (OutputFile, "%6d: ", Enode->LineNumber);
fprintf (OutputFile, "%6u: ", Enode->LineNumber);
/*
* Seek to the offset in the combined source file, read the source
@ -359,14 +359,14 @@ AePrintException (
if ((MsgLength + ErrorColumn) < (SourceColumn - 1))
{
fprintf (OutputFile, "%*s%s",
(SourceColumn - 1) - ErrorColumn,
(int) ((SourceColumn - 1) - ErrorColumn),
MainMessage, " ^ ");
}
else
{
fprintf (OutputFile, "%*s %s",
(SourceColumn - ErrorColumn) + 1, "^",
(int) ((SourceColumn - ErrorColumn) + 1), "^",
MainMessage);
}
}

74
source/compiler/aslfiles.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: aslfiles - file I/O suppoert
* $Revision: 1.18 $
* $Revision: 1.24 $
*
*****************************************************************************/
@ -115,7 +115,6 @@
*
*****************************************************************************/
#include "aslcompiler.h"
#define _COMPONENT ACPI_COMPILER
@ -218,7 +217,7 @@ FlFileError (
*
* RETURN: None
*
* DESCRIPTION: Open a file.
* DESCRIPTION: Open a file.
* NOTE: Aborts compiler on any error.
*
******************************************************************************/
@ -258,7 +257,7 @@ FlOpenFile (
*
* RETURN: Status. AE_ERROR indicated EOF.
*
* DESCRIPTION: Read data from an open file.
* DESCRIPTION: Read data from an open file.
* NOTE: Aborts compiler on any error.
*
******************************************************************************/
@ -310,7 +309,7 @@ FlReadFile (
ACPI_STATUS
FlWriteFile (
UINT32 FileId,
char *Buffer,
void *Buffer,
UINT32 Length)
{
UINT32 Actual;
@ -365,7 +364,6 @@ FlPrintFile (
}
/*******************************************************************************
*
* FUNCTION: FlSeekFile
@ -380,7 +378,7 @@ FlPrintFile (
*
******************************************************************************/
ACPI_STATUS
ACPI_STATUS
FlSeekFile (
UINT32 FileId,
UINT32 Offset)
@ -412,7 +410,7 @@ FlSeekFile (
*
******************************************************************************/
ACPI_STATUS
ACPI_STATUS
FlCloseFile (
UINT32 FileId)
{
@ -461,8 +459,9 @@ FlOpenIncludeFile (
if (!Node)
{
AslCommonError (ASL_ERROR, ASL_MSG_INCLUDE_FILE_OPEN,
Gbl_CurrentLineNumber, Gbl_LogicalLineNumber,
Gbl_InputByteCount, Gbl_CurrentColumn, Gbl_InputFilename, " - Null parse node");
Gbl_CurrentLineNumber, Gbl_LogicalLineNumber,
Gbl_InputByteCount, Gbl_CurrentColumn,
Gbl_Files[ASL_FILE_INPUT].Filename, " - Null parse node");
return;
}
@ -744,9 +743,12 @@ FlOpenMiscOutputFiles (
return (AE_ERROR);
}
/* Open the debug file, text mode */
/* Open the debug file as STDERR, text mode */
FlOpenFile (ASL_FILE_DEBUG_OUTPUT, Filename, "w+");
/* TBD: hide this behind a FlReopenFile function */
Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Filename = Filename;
Gbl_Files[ASL_FILE_DEBUG_OUTPUT].Handle = freopen (Filename, "w+", stderr);
AslCompilerSignon (ASL_FILE_DEBUG_OUTPUT);
AslCompilerFileHeader (ASL_FILE_DEBUG_OUTPUT);
@ -757,51 +759,3 @@ FlOpenMiscOutputFiles (
}
/*******************************************************************************
*
* FUNCTION: FlCloseListingFile
*
* PARAMETERS: None
*
* RETURN: None
*
* DESCRIPTION: Close the listing file if the option was specified
*
******************************************************************************/
void
FlCloseListingFile (void)
{
if (!Gbl_ListingFlag)
{
return;
}
/* Flush any final AML in the buffer */
LsFlushListingBuffer ();
/* Print a summary of the compile exceptions */
FlPrintFile (ASL_FILE_LISTING_OUTPUT, "\n\nSummary of errors and warnings\n\n");
AePrintErrorLog (ASL_FILE_LISTING_OUTPUT);
FlPrintFile (ASL_FILE_LISTING_OUTPUT, "\n\n");
UtDisplaySummary (ASL_FILE_LISTING_OUTPUT);
FlPrintFile (ASL_FILE_LISTING_OUTPUT, "\n\n");
/* Close the listing file */
FlCloseFile (ASL_FILE_LISTING_OUTPUT);
/*
* TBD: SourceOutput should be .TMP, then rename if we want to keep it?
*/
if (!Gbl_SourceOutputFlag)
{
FlCloseFile (ASL_FILE_SOURCE_OUTPUT);
unlink (Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename);
}
}