header update; cleanup

date	2005.03.25.22.38.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 15:41:28 +00:00
parent 631cd8e78b
commit 80aa49baa2
4 changed files with 40 additions and 148 deletions

View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: aslanalyze.c - check for semantic errors
* $Revision: 1.90 $
* $Revision: 1.91 $
*
*****************************************************************************/
@ -485,12 +485,6 @@ AnGetBtype (
*
******************************************************************************/
#define ACPI_VALID_RESERVED_NAME_MAX 0x80000000
#define ACPI_NOT_RESERVED_NAME ACPI_UINT32_MAX
#define ACPI_PREDEFINED_NAME (ACPI_UINT32_MAX - 1)
#define ACPI_EVENT_RESERVED_NAME (ACPI_UINT32_MAX - 2)
#define ACPI_COMPILER_RESERVED_NAME (ACPI_UINT32_MAX - 3)
static UINT32
AnCheckForReservedName (
ACPI_PARSE_OBJECT *Op,
@ -786,9 +780,8 @@ AnMethodAnalysisWalkBegin (
TotalMethods++;
/*
* Create and init method info
*/
/* Create and init method info */
MethodInfo = UtLocalCalloc (sizeof (ASL_METHOD_INFO));
MethodInfo->Next = WalkInfo->MethodStack;
MethodInfo->Op = Op;
@ -1078,9 +1071,8 @@ AnMethodAnalysisWalkBegin (
"with arguments");
}
/*
* Typechecking for _HID
*/
/* Typechecking for _HID */
else if (!ACPI_STRCMP (METHOD_NAME__HID, ReservedMethods[i].Name))
{
/* Examine the second operand to typecheck it */
@ -1470,23 +1462,20 @@ AnCheckMethodReturnValue (
OwningOp = ACPI_CAST_PTR (ACPI_PARSE_OBJECT, Node->Object);
if (OwningOp->Asl.CompileFlags & NODE_METHOD_NO_RETVAL)
{
/*
* Method NEVER returns a value
*/
/* Method NEVER returns a value */
AslError (ASL_ERROR, ASL_MSG_NO_RETVAL, Op, Op->Asl.ExternalName);
}
else if (OwningOp->Asl.CompileFlags & NODE_METHOD_SOME_NO_RETVAL)
{
/*
* Method SOMETIMES returns a value, SOMETIMES not
*/
/* Method SOMETIMES returns a value, SOMETIMES not */
AslError (ASL_WARNING, ASL_MSG_SOME_NO_RETVAL, Op, Op->Asl.ExternalName);
}
else if (!(ThisNodeBtype & RequiredBtypes))
{
/*
* Method returns a value, but the type is wrong
*/
/* Method returns a value, but the type is wrong */
AnFormatBtype (StringBuffer, ThisNodeBtype);
AnFormatBtype (StringBuffer2, RequiredBtypes);

View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: aslcodegen - AML code generation
* $Revision: 1.53 $
* $Revision: 1.54 $
*
*****************************************************************************/
@ -175,9 +175,8 @@ CgAmlWriteWalk (
void *Context)
{
/*
* Debug output
*/
/* Debug output */
DbgPrint (ASL_TREE_OUTPUT,
"%5.5d [%2d]", Op->Asl.LogicalLineNumber, Level);
UtPrintFormattedName (Op->Asl.ParseOpcode, Level);
@ -212,9 +211,8 @@ CgAmlWriteWalk (
Op->Asl.Column,
Op->Asl.LineNumber);
/*
* Generate the AML for this node
*/
/* Generate the AML for this node */
CgWriteNode (Op);
return (AE_OK);
}
@ -224,7 +222,8 @@ CgAmlWriteWalk (
*
* FUNCTION: CgLocalWriteAmlData
*
* PARAMETERS: Buffer - Buffer to write
* PARAMETERS: Op - Current parse op
* Buffer - Buffer to write
* Length - Size of data in buffer
*
* RETURN: None
@ -240,7 +239,6 @@ CgLocalWriteAmlData (
UINT32 Length)
{
/* Write the raw data to the AML file */
FlWriteFile (ASL_FILE_AML_OUTPUT, Buffer, Length);
@ -422,7 +420,7 @@ CgWriteAmlOpcode (
*
* PARAMETERS: Op - The DEFINITIONBLOCK node
*
* RETURN: None.
* RETURN: None
*
* DESCRIPTION: Write a table header corresponding to the DEFINITIONBLOCK
*
@ -479,7 +477,7 @@ CgWriteTableHeader (
TableHeader.AslCompilerRevision = CompilerCreatorRevision;
/* Table length. Checksum zero for now, will rewrite later */
/* Table length. Checksum zero for now, will rewrite later */
TableHeader.Length = Gbl_TableLength;
TableHeader.Checksum = 0;

View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: aslcompile - top level compile module
* $Revision: 1.79 $
* $Revision: 1.80 $
*
*****************************************************************************/
@ -141,9 +141,8 @@ AslCompilerSignon (
char *Prefix = "";
/*
* Set line prefix depending on the destination file type
*/
/* Set line prefix depending on the destination file type */
switch (FileId)
{
case ASL_FILE_ASM_SOURCE_OUTPUT:
@ -210,9 +209,8 @@ AslCompilerFileHeader (
char *Prefix = "";
/*
* Set line prefix depending on the destination file type
*/
/* Set line prefix depending on the destination file type */
switch (FileId)
{
case ASL_FILE_ASM_SOURCE_OUTPUT:
@ -303,7 +301,7 @@ CmFlushSourceCode (
*
* PARAMETERS: FileInfo - Points to an open input file
*
* RETURN: Status (0 = OK)
* RETURN: Status
*
* DESCRIPTION: Verify that the input file is entirely ASCII.
*
@ -568,7 +566,6 @@ CmDoCompile (
LnPackageLengthWalk, NULL);
UtEndEvent (i++);
/* Code generation - emit the AML */
UtBeginEvent (i, "Generate AML code and write output files");
@ -679,10 +676,11 @@ CmCleanupAndExit (
if (Gbl_NsLookupCount)
{
DbgPrint (ASL_DEBUG_OUTPUT, "\n\nMiscellaneous compile statistics\n\n");
DbgPrint (ASL_DEBUG_OUTPUT, "%32s : %d\n", "Total Namespace searches", Gbl_NsLookupCount);
DbgPrint (ASL_DEBUG_OUTPUT, "%32s : %d\n", "Total Namespace searches",
Gbl_NsLookupCount);
DbgPrint (ASL_DEBUG_OUTPUT, "%32s : %d\n", "Time per search",
((UINT32) (AslGbl_Events[7].EndTime - AslGbl_Events[7].StartTime) * 1000) /
Gbl_NsLookupCount);
((UINT32) (AslGbl_Events[7].EndTime - AslGbl_Events[7].StartTime) *
1000) / Gbl_NsLookupCount);
}
/* Close all open files */

View File

@ -1,8 +1,8 @@
/******************************************************************************
*
* Module Name: aslcompiler.h - common include file
* $Revision: 1.135 $
* Module Name: aslcompiler.h - common include file for iASL
* $Revision: 1.136 $
*
*****************************************************************************/
@ -142,96 +142,23 @@
#include "acpi.h"
#include "amlresrc.h"
#include "acdebug.h"
/* Compiler headers */
#include "asldefine.h"
#include "asltypes.h"
#include "aslglobal.h"
/*
* Compiler versions and names
*/
#define CompilerCreatorRevision ACPI_CA_VERSION
#define IntelAcpiCA "Intel ACPI Component Architecture"
#define CompilerId "ASL Optimizing Compiler / AML Disassembler"
#define CompilerCopyright "Copyright (C) 2000 - 2005 Intel Corporation"
#define CompilerCompliance "ACPI 3.0"
#define CompilerName "iasl"
#define CompilerCreatorId "INTL"
/* Configuration constants */
#define ASL_MAX_ERROR_COUNT 200
#define ASL_NODE_CACHE_SIZE 1024
#define ASL_STRING_CACHE_SIZE 32768
#define ASL_FIRST_PARSE_OPCODE PARSEOP_ACCESSAS
#define ASL_YYTNAME_START 3
/*
* Macros
*/
#define ASL_RESDESC_OFFSET(m) ACPI_OFFSET (ASL_RESOURCE_DESC, m)
#define ASL_PTR_DIFF(a,b) ((UINT8 *)(b) - (UINT8 *)(a))
#define ASL_PTR_ADD(a,b) ((UINT8 *)(a) = ((UINT8 *)(a) + (b)))
#define ASL_GET_CHILD_NODE(a) (a)->Asl.Child
#define ASL_GET_PEER_NODE(a) (a)->Asl.Next
#define OP_TABLE_ENTRY(a,b,c,d) {b,d,a,c}
#define ASL_PARSE_OPCODE_BASE PARSEOP_ACCESSAS /* First Lex type */
/* Internal AML opcodes */
#define AML_RAW_DATA_BYTE (UINT16) 0xAA01 /* write one raw byte */
#define AML_RAW_DATA_WORD (UINT16) 0xAA02 /* write 2 raw bytes */
#define AML_RAW_DATA_DWORD (UINT16) 0xAA04 /* write 4 raw bytes */
#define AML_RAW_DATA_QWORD (UINT16) 0xAA08 /* write 8 raw bytes */
#define AML_RAW_DATA_BUFFER (UINT16) 0xAA0B /* raw buffer with length */
#define AML_RAW_DATA_CHAIN (UINT16) 0xAA0C /* chain of raw buffers */
#define AML_PACKAGE_LENGTH (UINT16) 0xAA10
#define AML_UNASSIGNED_OPCODE (UINT16) 0xEEEE
#define AML_DEFAULT_ARG_OP (UINT16) 0xDDDD
/* filename suffixes for output files */
#define FILE_SUFFIX_AML_CODE "aml"
#define FILE_SUFFIX_LISTING "lst"
#define FILE_SUFFIX_HEX_DUMP "hex"
#define FILE_SUFFIX_DEBUG "txt"
#define FILE_SUFFIX_SOURCE "src"
#define FILE_SUFFIX_NAMESPACE "nsp"
#define FILE_SUFFIX_ASM_SOURCE "asm"
#define FILE_SUFFIX_C_SOURCE "c"
#define FILE_SUFFIX_DISASSEMBLY "dsl"
#define FILE_SUFFIX_ASM_INCLUDE "inc"
#define FILE_SUFFIX_C_INCLUDE "h"
/* Misc */
#define ASL_EXTERNAL_METHOD 255
#define ASL_ABORT TRUE
#define ASL_NO_ABORT FALSE
/*******************************************************************************
*
* Compiler prototypes
*
******************************************************************************/
void
end_stmt (void);
/* parser */
/*
* parser - generated from flex/bison, lex/yacc, etc.
*/
int
AslCompilerparse(
void);
@ -265,7 +192,6 @@ AslPushInputFileStack (
/*
* aslmain - entry
*/
static void
Options (
void);
@ -291,7 +217,6 @@ AslCommandLine (
/*
* aslcompile - compile mainline
*/
void
AslCompilerSignon (
UINT32 FileId);
@ -324,7 +249,6 @@ FlCheckForAscii (
/*
* aslanalyze - semantic analysis
*/
ACPI_STATUS
AnOtherSemanticAnalysisWalkBegin (
ACPI_PARSE_OBJECT *Op,
@ -420,7 +344,6 @@ AnCheckMethodReturnValue (
/*
* aslerror - error handling/reporting
*/
void
AslError (
UINT8 Level,
@ -473,7 +396,6 @@ AeAddToErrorLog (
/*
* asllisting - generate all "listing" type files
*/
void
LsDoListings (
void);
@ -567,7 +489,6 @@ LsDoHexOutputAsm (
/*
* aslfold - constant folding
*/
ACPI_STATUS
OpcAmlConstantWalk (
ACPI_PARSE_OBJECT *Op,
@ -596,7 +517,6 @@ OpcAmlCheckForConstant (
/*
* aslopcodes - generate AML opcodes
*/
ACPI_STATUS
OpcAmlOpcodeWalk (
ACPI_PARSE_OBJECT *Op,
@ -635,7 +555,6 @@ OpcDoUuId (
/*
* asloperands - generate AML operands for the AML opcodes
*/
ACPI_PARSE_OBJECT *
UtGetArg (
ACPI_PARSE_OBJECT *Op,
@ -694,7 +613,6 @@ OpnAttachNameToNode (
/*
* aslopt - optmization
*/
void
OptOptimizeNamePath (
ACPI_PARSE_OBJECT *Op,
@ -737,7 +655,6 @@ OptOptimizeNameDeclaration (
/*
* aslcodegen - code generation
*/
void
CgGenerateAmlOutput (
void);
@ -774,7 +691,6 @@ CgWriteNode (
/*
* asllength - calculate/adjust AML package lengths
*/
ACPI_STATUS
LnPackageLengthWalk (
ACPI_PARSE_OBJECT *Op,
@ -832,7 +748,6 @@ MpDisplayReservedNames (
/*
* asltransform - parse tree transformations
*/
ACPI_STATUS
TrAmlTransformWalk (
ACPI_PARSE_OBJECT *Op,
@ -880,7 +795,6 @@ TrDoSwitch (
/*
* asltree - parse tree support
*/
ACPI_STATUS
TrWalkParseTree (
ACPI_PARSE_OBJECT *Op,
@ -973,7 +887,6 @@ TrGetNodeFlagName (
/*
* aslfiles - File I/O support
*/
void
AslAbort (
void);
@ -1050,7 +963,6 @@ FlParseInputPathname (
/*
* asload - load namespace in prep for cross reference
*/
ACPI_STATUS
LdLoadNamespace (
ACPI_PARSE_OBJECT *RootOp);
@ -1081,7 +993,6 @@ LdNamespace1End (
/*
* asllookup - namespace cross reference
*/
ACPI_STATUS
LkCrossReferenceNamespace (
void);
@ -1132,7 +1043,6 @@ LkNamespaceLocateEnd (
/*
* aslutils - common compiler utilites
*/
void
DbgPrint (
UINT32 Type,
@ -1237,7 +1147,6 @@ UtAttachNameseg (
/*
* aslresource - Resource template generation utilities
*/
ASL_RESOURCE_NODE *
RsAllocateResourceNode (
UINT32 Size);
@ -1272,7 +1181,7 @@ RsDoOneResourceDescriptor (
UINT32 CurrentByteOffset,
UINT8 *State);
/* values for State above */
/* Values for State above */
#define ACPI_RSTATE_NORMAL 0
#define ACPI_RSTATE_START_DEPENDENT 1
@ -1291,7 +1200,6 @@ RsDoResourceTemplate (
/*
* aslrestype1 - generate Small descriptors
*/
ASL_RESOURCE_NODE *
RsDoDmaDescriptor (
ACPI_PARSE_OBJECT *Op,
@ -1356,7 +1264,6 @@ RsDoVendorSmallDescriptor (
/*
* aslrestype2 - generate Large descriptors
*/
ASL_RESOURCE_NODE *
RsDoInterruptDescriptor (
ACPI_PARSE_OBJECT *Op,