From df57cf15787147d23aaefe37e61de5495711c768 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Aug 19 2017 00:49:28 +0000 Subject: New upstream version 20170728 --- diff --git a/changes.txt b/changes.txt index f7eee1d..d0fe928 100644 --- a/changes.txt +++ b/changes.txt @@ -1,4 +1,86 @@ ---------------------------------------- +28 July 2017. Summary of changes for version 20170728: + + +1) ACPICA kernel-resident subsystem: + +Fixed a regression seen with small resource descriptors that could cause +an inadvertent AE_AML_NO_RESOURCE_END_TAG exception. + +AML interpreter: Implemented a new feature that allows forward references +from individual named references within package objects that are +contained within blocks of "module-level code". This provides +compatibility with other ACPI implementations and supports existing +firmware that depends on this feature. Example: + + Name (ABCD, 1) + If (ABCD) /* An If() at module-level */ + { + Name (PKG1, Package() + { + INT1 /* Forward reference to object INT1 +*/ + }) + Name (INT1, 0x1234) + } + +AML Interpreter: Fixed a problem with the Alias() operator where aliases +to some ASL objects were not handled properly. Objects affected are: +Mutex, Event, and OperationRegion. + +AML Debugger: Enhanced to properly handle AML Alias objects. These +objects have one level of indirection which was not fully supported by +the debugger. + +Table Manager: Added support to detect and ignore duplicate SSDTs within +the XSDT/RSDT. This error in the XSDT has been seen in the field. + +EFI and EDK2 support: + Enabled /WX flag for MSVC builds + Added support for AcpiOsStall, AcpiOsSleep, and AcpiOsGetTimer + Added local support for 64-bit multiply and shift operations + Added support to compile acpidump.efi on Windows + Added OSL function stubs for interfaces not used under EFI + +Added additional support for the _DMA predefined name. _DMA returns a +buffer containing a resource template. This change add support within the +resource manager (AcpiWalkResourceBuffer) to walk and parse this list of +resource descriptors. Lorenzo Pieralisi + + +2) iASL Compiler/Disassembler and Tools: + +iASL: Fixed a problem where the internal input line buffer(s) could +overflow if there are very long lines in the input ASL source code file. +Implemented buffer management that automatically increases the size of +the buffers as necessary. + +iASL: Added an option (-vx) to "expect" particular remarks, warnings and +errors. If the specified exception is not raised during compilation, the +compiler emits an error. This is intended to support the ASL test suite, +but may be useful in other contexts. + +iASL: Implemented a new predefined macro, __METHOD__, which returns a +string containing the name of the current control method that is being +compiled. + +iASL: Implemented debugger and table compiler support for the SDEI ACPI +table (Software Delegated Exception Interface). James Morse + + +Unix/Linux makefiles: Added an option to disable compile optimizations. +The disable occurs when the NOOPT flag is set to TRUE. +theracermaster@gmail.com + +Acpidump: Added support for multiple DSDT and FACS tables. This can occur +when there are different tables for 32-bit versus 64-bit. + +Enhanced error reporting for the ASL test suite (ASLTS) by removing +unnecessary/verbose text, and emit the actual line number where an error +has occurred. These changes are intended to improve the usefulness of the +test suite. + +---------------------------------------- 29 June 2017. Summary of changes for version 20170629: diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config index 4d4f182..9707be3 100644 --- a/generate/unix/Makefile.config +++ b/generate/unix/Makefile.config @@ -43,7 +43,7 @@ CC = gcc OBJDIR = obj BINDIR = bin COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $< -LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) +LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) $(OPT_LDFLAGS) PREFIX ?= /usr INSTALLDIR = $(PREFIX)/bin UNAME_S := $(shell uname -s) @@ -162,6 +162,8 @@ endif # ifneq ($(NOOPT),TRUE) OPT_CFLAGS += -O2 +else +OPT_CFLAGS += -O0 endif # @@ -176,14 +178,14 @@ CFLAGS += \ -D$(HOST)\ -D_GNU_SOURCE\ -I$(ACPICA_INCLUDE) - + # # QNX requires __EXT to enable most functions in its C library, analogous # to _GNU_SOURCE. # ifeq ($(HOST), _QNX) CFLAGS+=-D__EXT -endif +endif # # Common compiler warning flags. The warning flags in addition diff --git a/generate/unix/acpiexamples/Makefile b/generate/unix/acpiexamples/Makefile index 691b65b..6aa2ba9 100644 --- a/generate/unix/acpiexamples/Makefile +++ b/generate/unix/acpiexamples/Makefile @@ -47,6 +47,7 @@ OBJECTS = \ $(OBJDIR)/dsmthdat.o\ $(OBJDIR)/dsobject.o\ $(OBJDIR)/dsopcode.o\ + $(OBJDIR)/dspkginit.o\ $(OBJDIR)/dsutils.o\ $(OBJDIR)/dswexec.o\ $(OBJDIR)/dswload.o\ diff --git a/generate/unix/acpiexec/Makefile b/generate/unix/acpiexec/Makefile index 9ed3f5f..fcb638b 100644 --- a/generate/unix/acpiexec/Makefile +++ b/generate/unix/acpiexec/Makefile @@ -85,6 +85,7 @@ OBJECTS = \ $(OBJDIR)/dsmthdat.o\ $(OBJDIR)/dsobject.o\ $(OBJDIR)/dsopcode.o\ + $(OBJDIR)/dspkginit.o\ $(OBJDIR)/dsutils.o\ $(OBJDIR)/dswexec.o\ $(OBJDIR)/dswload.o\ diff --git a/generate/unix/acpinames/Makefile b/generate/unix/acpinames/Makefile index fd263a0..7bc69e8 100644 --- a/generate/unix/acpinames/Makefile +++ b/generate/unix/acpinames/Makefile @@ -43,6 +43,7 @@ OBJECTS = \ $(OBJDIR)/dsinit.o\ $(OBJDIR)/dsmthdat.o\ $(OBJDIR)/dsobject.o\ + $(OBJDIR)/dspkginit.o\ $(OBJDIR)/dsutils.o\ $(OBJDIR)/dswload.o\ $(OBJDIR)/dswload2.o\ diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile index 1487b4e..b302572 100644 --- a/generate/unix/iasl/Makefile +++ b/generate/unix/iasl/Makefile @@ -134,6 +134,7 @@ OBJECTS = \ $(OBJDIR)/dsfield.o\ $(OBJDIR)/dsobject.o\ $(OBJDIR)/dsopcode.o\ + $(OBJDIR)/dspkginit.o\ $(OBJDIR)/dsutils.o\ $(OBJDIR)/dswexec.o\ $(OBJDIR)/dswload.o\ diff --git a/source/common/ahtable.c b/source/common/ahtable.c index 3c7a4ca..dc84c5f 100644 --- a/source/common/ahtable.c +++ b/source/common/ahtable.c @@ -131,6 +131,7 @@ const AH_TABLE Gbl_AcpiSupportedTables[] = {ACPI_SIG_RSDT, "Root System Description Table"}, {ACPI_SIG_S3PT, "S3 Performance Table"}, {ACPI_SIG_SBST, "Smart Battery Specification Table"}, + {ACPI_SIG_SDEI, "Software Delegated Exception Interface Table"}, {ACPI_SIG_SLIC, "Software Licensing Description Table"}, {ACPI_SIG_SLIT, "System Locality Information Table"}, {ACPI_SIG_SPCR, "Serial Port Console Redirection table"}, diff --git a/source/common/dmtable.c b/source/common/dmtable.c index 188657a..091947f 100644 --- a/source/common/dmtable.c +++ b/source/common/dmtable.c @@ -385,6 +385,7 @@ const ACPI_DMTABLE_DATA AcpiDmTableData[] = {ACPI_SIG_RSDT, NULL, AcpiDmDumpRsdt, DtCompileRsdt, TemplateRsdt}, {ACPI_SIG_S3PT, NULL, NULL, NULL, TemplateS3pt}, {ACPI_SIG_SBST, AcpiDmTableInfoSbst, NULL, NULL, TemplateSbst}, + {ACPI_SIG_SDEI, AcpiDmTableInfoSdei, NULL, NULL, TemplateSdei}, {ACPI_SIG_SLIC, NULL, AcpiDmDumpSlic, DtCompileSlic, TemplateSlic}, {ACPI_SIG_SLIT, NULL, AcpiDmDumpSlit, DtCompileSlit, TemplateSlit}, {ACPI_SIG_SPCR, AcpiDmTableInfoSpcr, NULL, NULL, TemplateSpcr}, diff --git a/source/common/dmtbinfo.c b/source/common/dmtbinfo.c index db44366..8d97c02 100644 --- a/source/common/dmtbinfo.c +++ b/source/common/dmtbinfo.c @@ -110,6 +110,7 @@ #define ACPI_RASF_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_RASF,f) #define ACPI_S3PT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_S3PT,f) #define ACPI_SBST_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SBST,f) +#define ACPI_SDEI_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SDEI,f) #define ACPI_SLIT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SLIT,f) #define ACPI_SPCR_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SPCR,f) #define ACPI_SPMI_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SPMI,f) @@ -2659,6 +2660,16 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoPmtt2[] = ACPI_DMT_TERMINATOR }; +/******************************************************************************* + * + * SDEI - Software Delegated Execption Interface Descriptor Table + * + ******************************************************************************/ + +ACPI_DMTABLE_INFO AcpiDmTableInfoSdei[] = +{ + ACPI_DMT_TERMINATOR +}; /******************************************************************************* * diff --git a/source/compiler/aslcompile.c b/source/compiler/aslcompile.c index 32ae24f..f99c7d1 100644 --- a/source/compiler/aslcompile.c +++ b/source/compiler/aslcompile.c @@ -707,6 +707,7 @@ CmCleanupAndExit ( BOOLEAN DeleteAmlFile = FALSE; + AslCheckExpectedExceptions (); AePrintErrorLog (ASL_FILE_STDERR); if (Gbl_DebugFlag) { diff --git a/source/compiler/aslcompiler.h b/source/compiler/aslcompiler.h index 20b1827..04b392d 100644 --- a/source/compiler/aslcompiler.h +++ b/source/compiler/aslcompiler.h @@ -305,12 +305,20 @@ AslError ( ACPI_PARSE_OBJECT *Op, char *ExtraMessage); +void +AslCheckExpectedExceptions ( + void); + +ACPI_STATUS +AslExpectException ( + char *MessageIdString); + ACPI_STATUS AslDisableException ( char *MessageIdString); BOOLEAN -AslIsExceptionDisabled ( +AslIsExceptionIgnored ( UINT8 Level, UINT16 MessageId); diff --git a/source/compiler/aslcompiler.l b/source/compiler/aslcompiler.l index 71a9002..091c28c 100644 --- a/source/compiler/aslcompiler.l +++ b/source/compiler/aslcompiler.l @@ -701,7 +701,7 @@ NamePathTail [.]{NameSeg} "__FILE__" { count (0); return (PARSEOP___FILE__); } "__LINE__" { count (0); return (PARSEOP___LINE__); } "__PATH__" { count (0); return (PARSEOP___PATH__); } - +"__METHOD__" { count (0); return (PARSEOP___METHOD__); } {NameSeg} { char *s; count (0); diff --git a/source/compiler/aslerror.c b/source/compiler/aslerror.c index 16abb32..174bf21 100644 --- a/source/compiler/aslerror.c +++ b/source/compiler/aslerror.c @@ -52,6 +52,16 @@ static void AeAddToErrorLog ( ASL_ERROR_MSG *Enode); +static BOOLEAN +AslIsExceptionExpected ( + UINT8 Level, + UINT16 MessageId); + +static BOOLEAN +AslIsExceptionDisabled ( + UINT8 Level, + UINT16 MessageId); + /******************************************************************************* * @@ -698,6 +708,115 @@ AslCommonError ( return; } +/******************************************************************************* + * + * FUNCTION: AslIsExceptionIgnored + * + * PARAMETERS: Level - Seriousness (Warning/error, etc.) + * MessageId - Index into global message buffer + * + * RETURN: BOOLEAN + * + * DESCRIPTION: Check if a particular exception is ignored. In this case it + * means that the exception is (expected or disabled. + * + ******************************************************************************/ + +BOOLEAN +AslIsExceptionIgnored ( + UINT8 Level, + UINT16 MessageId) +{ + BOOLEAN ExceptionIgnored; + + + /* Note: this allows exception to be disabled and expected */ + + ExceptionIgnored = AslIsExceptionDisabled (Level, MessageId); + ExceptionIgnored |= AslIsExceptionExpected (Level, MessageId); + + return (Gbl_AllExceptionsDisabled || ExceptionIgnored); +} + + +/******************************************************************************* + * + * FUNCTION: AslCheckExpectException + * + * PARAMETERS: none + * + * RETURN: none + * + * DESCRIPTION: Check the global expected messages table and raise an error + * for each message that has not been received. + * + ******************************************************************************/ + +void +AslCheckExpectedExceptions ( + void) +{ + UINT8 i; + + for (i = 0; i < Gbl_ExpectedMessagesIndex; ++i) + { + if (!Gbl_ExpectedMessages[i].MessageReceived) + { + AslError (ASL_ERROR, ASL_MSG_EXCEPTION_NOT_RECEIVED, NULL, + Gbl_ExpectedMessages[i].MessageIdStr); + } + } +} + + +/******************************************************************************* + * + * FUNCTION: AslExpectException + * + * PARAMETERS: MessageIdString - ID of excepted exception during compile + * + * RETURN: Status + * + * DESCRIPTION: Enter a message ID into the global expected messages table + * If these messages are not raised during the compilation, throw + * an error. + * + ******************************************************************************/ + +ACPI_STATUS +AslExpectException ( + char *MessageIdString) +{ + UINT32 MessageId; + + + /* Convert argument to an integer and validate it */ + + MessageId = (UINT32) strtoul (MessageIdString, NULL, 0); + + if (MessageId > 6999) + { + printf ("\"%s\" is not a valid warning/remark/erro ID\n", + MessageIdString); + return (AE_BAD_PARAMETER); + } + + /* Insert value into the global expected message array */ + + if (Gbl_ExpectedMessagesIndex >= ASL_MAX_EXPECTED_MESSAGES) + { + printf ("Too many messages have been registered as expected (max %u)\n", + ASL_MAX_DISABLED_MESSAGES); + return (AE_LIMIT); + } + + Gbl_ExpectedMessages[Gbl_ExpectedMessagesIndex].MessageId = MessageId; + Gbl_ExpectedMessages[Gbl_ExpectedMessagesIndex].MessageIdStr = MessageIdString; + Gbl_ExpectedMessages[Gbl_ExpectedMessagesIndex].MessageReceived = FALSE; + Gbl_ExpectedMessagesIndex++; + return (AE_OK); +} + /******************************************************************************* * @@ -758,7 +877,48 @@ AslDisableException ( * ******************************************************************************/ -BOOLEAN +static BOOLEAN +AslIsExceptionExpected ( + UINT8 Level, + UINT16 MessageId) +{ + UINT32 EncodedMessageId; + UINT32 i; + + + /* + * Mark this exception as received + */ + EncodedMessageId = AeBuildFullExceptionCode (Level, MessageId); + for (i = 0; i < Gbl_ExpectedMessagesIndex; i++) + { + /* Simple implementation via fixed array */ + + if (EncodedMessageId == Gbl_ExpectedMessages[i].MessageId) + { + return (Gbl_ExpectedMessages[i].MessageReceived = TRUE); + } + } + + return (FALSE); +} + + +/******************************************************************************* + * + * FUNCTION: AslIsExceptionDisabled + * + * PARAMETERS: Level - Seriousness (Warning/error, etc.) + * MessageId - Index into global message buffer + * + * RETURN: TRUE if exception/message should be ignored + * + * DESCRIPTION: Check if the user has specified options such that this + * exception should be ignored + * + ******************************************************************************/ + +static BOOLEAN AslIsExceptionDisabled ( UINT8 Level, UINT16 MessageId) @@ -832,8 +992,7 @@ AslError ( /* Check if user wants to ignore this exception */ - if (Gbl_AllExceptionsDisabled || - AslIsExceptionDisabled (Level, MessageId)) + if (AslIsExceptionIgnored (Level, MessageId)) { return; } diff --git a/source/compiler/aslglobal.h b/source/compiler/aslglobal.h index 12f1392..dc6c744 100644 --- a/source/compiler/aslglobal.h +++ b/source/compiler/aslglobal.h @@ -144,6 +144,7 @@ extern int AslCompilerdebug; #define ASL_DEFAULT_LINE_BUFFER_SIZE (1024 * 32) /* 32K */ #define ASL_MSG_BUFFER_SIZE (1024 * 32) /* 32k */ #define ASL_MAX_DISABLED_MESSAGES 32 +#define ASL_MAX_EXPECTED_MESSAGES 32 #define HEX_TABLE_LINE_SIZE 8 #define HEX_LISTING_LINE_SIZE 8 @@ -288,6 +289,7 @@ ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentHexColumn, 0); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentAmlOffset, 0); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_CurrentLine, 0); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_DisabledMessagesIndex, 0); +ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_ExpectedMessagesIndex, 0); ASL_EXTERN UINT8 ASL_INIT_GLOBAL (Gbl_HexBytesWereWritten, FALSE); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_NumNamespaceObjects, 0); ASL_EXTERN UINT32 ASL_INIT_GLOBAL (Gbl_ReservedMethods, 0); @@ -330,6 +332,7 @@ ASL_EXTERN char MsgBuffer[ASL_MSG_BUFFER_SIZE]; ASL_EXTERN char StringBuffer[ASL_MSG_BUFFER_SIZE]; ASL_EXTERN char StringBuffer2[ASL_MSG_BUFFER_SIZE]; ASL_EXTERN UINT32 Gbl_DisabledMessages[ASL_MAX_DISABLED_MESSAGES]; +ASL_EXTERN ASL_EXPECTED_MESSAGE Gbl_ExpectedMessages[ASL_MAX_EXPECTED_MESSAGES]; #endif /* __ASLGLOBAL_H */ diff --git a/source/compiler/aslhelp.c b/source/compiler/aslhelp.c index 6dd43bb..e3f9831 100644 --- a/source/compiler/aslhelp.c +++ b/source/compiler/aslhelp.c @@ -97,6 +97,7 @@ Usage ( ACPI_OPTION ("-vi", "Less verbose errors and warnings for use with IDEs"); ACPI_OPTION ("-vr", "Disable remarks"); ACPI_OPTION ("-vw ", "Disable specific warning or remark"); + ACPI_OPTION ("-vx ", "Expect a specific warning, remark, or error"); ACPI_OPTION ("-w <1|2|3>", "Set warning reporting level"); ACPI_OPTION ("-we", "Report warnings as errors"); diff --git a/source/compiler/aslmessages.c b/source/compiler/aslmessages.c index e15dcc0..a5e2b9b 100644 --- a/source/compiler/aslmessages.c +++ b/source/compiler/aslmessages.c @@ -240,7 +240,8 @@ const char *AslCompilerMsgs [] = /* ASL_MSG_ARG_AS_LOCAL_NOT_USED */ "Method Argument (as a local) is set but never used", /* ASL_MSG_ARG_NOT_USED */ "Method Argument is never used", /* ASL_MSG_CONSTANT_REQUIRED */ "Non-reducible expression", -/* ASL_MSG_CROSS_TABLE_SCOPE */ "Illegal open scope on external object from within DSDT" +/* ASL_MSG_CROSS_TABLE_SCOPE */ "Illegal open scope on external object from within DSDT", +/* ASL_MSG_EXCEPTION_NOT_RECEIVED */ "Expected remark, warning, or error did not occur. Message ID:" }; /* Table compiler */ diff --git a/source/compiler/aslmessages.h b/source/compiler/aslmessages.h index 8d39783..ee84fdc 100644 --- a/source/compiler/aslmessages.h +++ b/source/compiler/aslmessages.h @@ -243,6 +243,7 @@ typedef enum ASL_MSG_ARG_NOT_USED, ASL_MSG_CONSTANT_REQUIRED, ASL_MSG_CROSS_TABLE_SCOPE, + ASL_MSG_EXCEPTION_NOT_RECEIVED, /* These messages are used by the Data Table compiler only */ diff --git a/source/compiler/asloptions.c b/source/compiler/asloptions.c index 6b20377..e7d5044 100644 --- a/source/compiler/asloptions.c +++ b/source/compiler/asloptions.c @@ -846,6 +846,22 @@ AslDoOptions ( } break; + case 'x': + + /* Get the required argument */ + + if (AcpiGetoptArgument (argc, argv)) + { + return (-1); + } + + Status = AslExpectException (AcpiGbl_Optarg); + if (ACPI_FAILURE (Status)) + { + return (-1); + } + break; + default: printf ("Unknown option: -v%s\n", AcpiGbl_Optarg); diff --git a/source/compiler/aslparseop.c b/source/compiler/aslparseop.c index 9c45bbe..f1eb99c 100644 --- a/source/compiler/aslparseop.c +++ b/source/compiler/aslparseop.c @@ -577,10 +577,10 @@ TrCreateNullTargetOp ( * DESCRIPTION: Create a leaf op (no children or peers) for one of the * special constants - __LINE__, __FILE__, and __DATE__. * - * Note: An implemenation of __FUNC__ cannot happen here because we don't - * have a full parse tree at this time and cannot find the parent control - * method. If it is ever needed, __FUNC__ must be implemented later, after - * the parse tree has been fully constructed. + * Note: The fullimplemenation of __METHOD__ cannot happen here because we + * don't have a full parse tree at this time and cannot find the parent + * control method. __METHOD__ must be implemented later, after the parse + * tree has been fully constructed. * ******************************************************************************/ @@ -603,6 +603,14 @@ TrCreateConstantLeafOp ( Op->Asl.Value.Integer = Op->Asl.LineNumber; break; + case PARSEOP___METHOD__: + + /* Will become a string literal later */ + + Op = TrAllocateOp (PARSEOP___METHOD__); + Op->Asl.Value.String = NULL; + break; + case PARSEOP___PATH__: Op = TrAllocateOp (PARSEOP_STRING_LITERAL); diff --git a/source/compiler/aslrules.y b/source/compiler/aslrules.y index 59ec2b2..1862781 100644 --- a/source/compiler/aslrules.y +++ b/source/compiler/aslrules.y @@ -484,6 +484,7 @@ ConstExprTerm | PARSEOP___FILE__ {$$ = TrCreateConstantLeafOp (PARSEOP___FILE__);} | PARSEOP___LINE__ {$$ = TrCreateConstantLeafOp (PARSEOP___LINE__);} | PARSEOP___PATH__ {$$ = TrCreateConstantLeafOp (PARSEOP___PATH__);} + | PARSEOP___METHOD__ {$$ = TrCreateConstantLeafOp (PARSEOP___METHOD__);} ; Integer diff --git a/source/compiler/asltokens.y b/source/compiler/asltokens.y index 446089f..d8d408b 100644 --- a/source/compiler/asltokens.y +++ b/source/compiler/asltokens.y @@ -529,3 +529,4 @@ NoEcho(' %token PARSEOP___FILE__ %token PARSEOP___LINE__ %token PARSEOP___PATH__ +%token PARSEOP___METHOD__ diff --git a/source/compiler/asltransform.c b/source/compiler/asltransform.c index 88b628a..5652289 100644 --- a/source/compiler/asltransform.c +++ b/source/compiler/asltransform.c @@ -322,6 +322,8 @@ static void TrTransformSubtree ( ACPI_PARSE_OBJECT *Op) { + ACPI_PARSE_OBJECT *MethodOp; + if (Op->Asl.AmlOpcode == AML_RAW_DATA_BYTE) { @@ -357,6 +359,35 @@ TrTransformSubtree ( break; + case PARSEOP___METHOD__: + + /* Transform to a string op containing the parent method name */ + + Op->Asl.ParseOpcode = PARSEOP_STRING_LITERAL; + UtSetParseOpName (Op); + + /* Find the parent control method op */ + + MethodOp = Op; + while (MethodOp) + { + if (MethodOp->Asl.ParseOpcode == PARSEOP_METHOD) + { + /* First child contains the method name */ + + MethodOp = MethodOp->Asl.Child; + Op->Asl.Value.String = MethodOp->Asl.Value.String; + return; + } + + MethodOp = MethodOp->Asl.Parent; + } + + /* At the root, invocation not within a control method */ + + Op->Asl.Value.String = "\\"; + break; + default: /* Nothing to do here for other opcodes */ diff --git a/source/compiler/asltypes.h b/source/compiler/asltypes.h index ca356d6..aa6b26d 100644 --- a/source/compiler/asltypes.h +++ b/source/compiler/asltypes.h @@ -247,6 +247,15 @@ typedef struct asl_error_msg } ASL_ERROR_MSG; +/* An entry in the expected messages array */ +typedef struct asl_expected_message +{ + UINT32 MessageId; + char *MessageIdStr; + BOOLEAN MessageReceived; + +} ASL_EXPECTED_MESSAGE; + /* An entry in the listing file stack (for include files) */ diff --git a/source/compiler/aslutils.c b/source/compiler/aslutils.c index 9ad1347..066a604 100644 --- a/source/compiler/aslutils.c +++ b/source/compiler/aslutils.c @@ -66,6 +66,12 @@ UtAttachNameseg ( ACPI_PARSE_OBJECT *Op, char *Name); +static void +UtReallocLineBuffers ( + char **Buffer, + UINT32 OldSize, + UINT32 NewSize); + /******************************************************************************* * @@ -625,43 +631,48 @@ UtExpandLineBuffers ( Gbl_LineBufferSize, NewSize); } - Gbl_CurrentLineBuffer = realloc (Gbl_CurrentLineBuffer, NewSize); + UtReallocLineBuffers (&Gbl_CurrentLineBuffer, Gbl_LineBufferSize, NewSize); + UtReallocLineBuffers (&Gbl_MainTokenBuffer, Gbl_LineBufferSize, NewSize); + UtReallocLineBuffers (&Gbl_MacroTokenBuffer, Gbl_LineBufferSize, NewSize); + UtReallocLineBuffers (&Gbl_ExpressionTokenBuffer, Gbl_LineBufferSize, NewSize); + Gbl_LineBufPtr = Gbl_CurrentLineBuffer; - if (!Gbl_CurrentLineBuffer) - { - goto ErrorExit; - } + Gbl_LineBufferSize = NewSize; +} - Gbl_MainTokenBuffer = realloc (Gbl_MainTokenBuffer, NewSize); - if (!Gbl_MainTokenBuffer) - { - goto ErrorExit; - } - Gbl_MacroTokenBuffer = realloc (Gbl_MacroTokenBuffer, NewSize); - if (!Gbl_MacroTokenBuffer) - { - goto ErrorExit; - } +/****************************************************************************** + * + * FUNCTION: UtReallocLineBuffers + * + * PARAMETERS: Buffer - Buffer to realloc + * OldSize - Old size of Buffer + * NewSize - New size of Buffer + * + * RETURN: none + * + * DESCRIPTION: Reallocate and initialize Buffer + * + *****************************************************************************/ + +static void +UtReallocLineBuffers ( + char **Buffer, + UINT32 OldSize, + UINT32 NewSize) +{ - Gbl_ExpressionTokenBuffer = realloc (Gbl_ExpressionTokenBuffer, NewSize); - if (!Gbl_ExpressionTokenBuffer) + *Buffer = realloc (*Buffer, NewSize); + if (*Buffer) { - goto ErrorExit; + memset (*Buffer + OldSize, 0, NewSize - OldSize); + return; } - Gbl_LineBufferSize = NewSize; - return; - - - /* On error above, simply issue error messages and abort, cannot continue */ - -ErrorExit: printf ("Could not increase line buffer size from %u to %u\n", - Gbl_LineBufferSize, Gbl_LineBufferSize * 2); + OldSize, NewSize); - AslError (ASL_ERROR, ASL_MSG_BUFFER_ALLOCATION, - NULL, NULL); + AslError (ASL_ERROR, ASL_MSG_BUFFER_ALLOCATION, NULL, NULL); AslAbort (); } diff --git a/source/compiler/dtcompile.c b/source/compiler/dtcompile.c index 61c377d..567028b 100644 --- a/source/compiler/dtcompile.c +++ b/source/compiler/dtcompile.c @@ -378,18 +378,21 @@ DtCompileDataTable ( } else if (TableData->TableInfo) { - /* Simple table, just walk the info table */ + /* Simple table, just walk the info table, unless its empty */ - Subtable = NULL; - Status = DtCompileTable (FieldList, TableData->TableInfo, - &Subtable, TRUE); - if (ACPI_FAILURE (Status)) + if (FieldList && *FieldList) { - return (Status); - } + Subtable = NULL; + Status = DtCompileTable (FieldList, TableData->TableInfo, + &Subtable, TRUE); + if (ACPI_FAILURE (Status)) + { + return (Status); + } - DtInsertSubtable (Gbl_RootTable, Subtable); - DtPopSubtable (); + DtInsertSubtable (Gbl_RootTable, Subtable); + DtPopSubtable (); + } } else { diff --git a/source/compiler/dtcompiler.h b/source/compiler/dtcompiler.h index d38093e..ef3db7e 100644 --- a/source/compiler/dtcompiler.h +++ b/source/compiler/dtcompiler.h @@ -618,6 +618,7 @@ extern const unsigned char TemplateRasf[]; extern const unsigned char TemplateRsdt[]; extern const unsigned char TemplateS3pt[]; extern const unsigned char TemplateSbst[]; +extern const unsigned char TemplateSdei[]; extern const unsigned char TemplateSlic[]; extern const unsigned char TemplateSlit[]; extern const unsigned char TemplateSpcr[]; diff --git a/source/compiler/dttemplate.h b/source/compiler/dttemplate.h index 6164a42..6aa8213 100644 --- a/source/compiler/dttemplate.h +++ b/source/compiler/dttemplate.h @@ -1070,6 +1070,15 @@ const unsigned char TemplateSbst[] = 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 /* 00000028 "........" */ }; +const unsigned char TemplateSdei[] = +{ + 0x53,0x44,0x45,0x49,0x3e,0x00,0x00,0x00, /* 00000000 "SDEI>..." */ + 0x01,0x59,0x41,0x52,0x4d,0x20,0x20,0x20, /* 00000008 ".mARM " */ + 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ + 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ + 0x30,0x09,0x16,0x20 /* 00000028 "0.. " */ +}; + const unsigned char TemplateSlic[] = { 0x53,0x4C,0x49,0x43,0x76,0x01,0x00,0x00, /* 00000000 "SLICv..." */ diff --git a/source/compiler/dtutils.c b/source/compiler/dtutils.c index a57add4..81a2d45 100644 --- a/source/compiler/dtutils.c +++ b/source/compiler/dtutils.c @@ -82,7 +82,7 @@ DtError ( /* Check if user wants to ignore this exception */ - if (AslIsExceptionDisabled (Level, MessageId)) + if (AslIsExceptionIgnored (Level, MessageId)) { return; } diff --git a/source/compiler/prmacros.c b/source/compiler/prmacros.c index ec7b959..1d2a152 100644 --- a/source/compiler/prmacros.c +++ b/source/compiler/prmacros.c @@ -375,7 +375,7 @@ PrAddMacro ( { /* Search the macro arg list for matching arg */ - for (i = 0; Args[i].Name && (i < PR_MAX_MACRO_ARGS); i++) + for (i = 0; ((i < PR_MAX_MACRO_ARGS) && Args[i].Name); i++) { /* * Save argument offset within macro body. This is the mechanism diff --git a/source/components/debugger/dbdisply.c b/source/components/debugger/dbdisply.c index ffdcd66..34f0a13 100644 --- a/source/components/debugger/dbdisply.c +++ b/source/components/debugger/dbdisply.c @@ -343,7 +343,7 @@ DumpNode: else { - AcpiOsPrintf ("Object (%p) Pathname: %s\n", + AcpiOsPrintf ("Object %p: Namespace Node - Pathname: %s\n", Node, (char *) RetBuf.Pointer); } @@ -360,7 +360,7 @@ DumpNode: ObjDesc = AcpiNsGetAttachedObject (Node); if (ObjDesc) { - AcpiOsPrintf ("\nAttached Object (%p):\n", ObjDesc); + AcpiOsPrintf ("\nAttached Object %p:", ObjDesc); if (!AcpiOsReadable (ObjDesc, sizeof (ACPI_OPERAND_OBJECT))) { AcpiOsPrintf ("Invalid internal ACPI Object at address %p\n", @@ -368,8 +368,33 @@ DumpNode: return; } - AcpiUtDebugDumpBuffer ((void *) ObjDesc, - sizeof (ACPI_OPERAND_OBJECT), Display, ACPI_UINT32_MAX); + if (ACPI_GET_DESCRIPTOR_TYPE ( + ((ACPI_NAMESPACE_NODE *) ObjDesc)) == ACPI_DESC_TYPE_NAMED) + { + AcpiOsPrintf (" Namespace Node - "); + Status = AcpiGetName ((ACPI_NAMESPACE_NODE *) ObjDesc, + ACPI_FULL_PATHNAME_NO_TRAILING, &RetBuf); + if (ACPI_FAILURE (Status)) + { + AcpiOsPrintf ("Could not convert name to pathname\n"); + } + else + { + AcpiOsPrintf ("Pathname: %s", + (char *) RetBuf.Pointer); + } + + AcpiOsPrintf ("\n"); + AcpiUtDebugDumpBuffer ((void *) ObjDesc, + sizeof (ACPI_NAMESPACE_NODE), Display, ACPI_UINT32_MAX); + } + else + { + AcpiOsPrintf ("\n"); + AcpiUtDebugDumpBuffer ((void *) ObjDesc, + sizeof (ACPI_OPERAND_OBJECT), Display, ACPI_UINT32_MAX); + } + AcpiExDumpObjectDescriptor (ObjDesc, 1); } } diff --git a/source/components/dispatcher/dsfield.c b/source/components/dispatcher/dsfield.c index 2ecc99e..a755606 100644 --- a/source/components/dispatcher/dsfield.c +++ b/source/components/dispatcher/dsfield.c @@ -205,6 +205,8 @@ AcpiDsCreateBufferField ( if (!(WalkState->ParseFlags & ACPI_PARSE_EXECUTE)) { + ACPI_ERROR ((AE_INFO, + "Parse execute mode is not set")); return_ACPI_STATUS (AE_AML_INTERNAL); } @@ -593,6 +595,8 @@ AcpiDsInitFieldObjects ( return_ACPI_STATUS (AE_OK); } + ACPI_ERROR ((AE_INFO, + "Parse deferred mode is not set")); return_ACPI_STATUS (AE_AML_INTERNAL); } diff --git a/source/components/dispatcher/dsobject.c b/source/components/dispatcher/dsobject.c index cb432e3..ef0f2b7 100644 --- a/source/components/dispatcher/dsobject.c +++ b/source/components/dispatcher/dsobject.c @@ -52,14 +52,6 @@ #define _COMPONENT ACPI_DISPATCHER ACPI_MODULE_NAME ("dsobject") -/* Local prototypes */ - -static ACPI_STATUS -AcpiDsBuildInternalObject ( - ACPI_WALK_STATE *WalkState, - ACPI_PARSE_OBJECT *Op, - ACPI_OPERAND_OBJECT **ObjDescPtr); - #ifndef ACPI_NO_METHOD_EXECUTION /******************************************************************************* @@ -77,7 +69,7 @@ AcpiDsBuildInternalObject ( * ******************************************************************************/ -static ACPI_STATUS +ACPI_STATUS AcpiDsBuildInternalObject ( ACPI_WALK_STATE *WalkState, ACPI_PARSE_OBJECT *Op, @@ -85,7 +77,6 @@ AcpiDsBuildInternalObject ( { ACPI_OPERAND_OBJECT *ObjDesc; ACPI_STATUS Status; - ACPI_OBJECT_TYPE Type; ACPI_FUNCTION_TRACE (DsBuildInternalObject); @@ -96,129 +87,43 @@ AcpiDsBuildInternalObject ( { /* * This is a named object reference. If this name was - * previously looked up in the namespace, it was stored in this op. - * Otherwise, go ahead and look it up now + * previously looked up in the namespace, it was stored in + * this op. Otherwise, go ahead and look it up now */ if (!Op->Common.Node) { - Status = AcpiNsLookup (WalkState->ScopeInfo, - Op->Common.Value.String, - ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE, - ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL, - ACPI_CAST_INDIRECT_PTR (ACPI_NAMESPACE_NODE, &(Op->Common.Node))); - if (ACPI_FAILURE (Status)) - { - /* Check if we are resolving a named reference within a package */ - - if ((Status == AE_NOT_FOUND) && (AcpiGbl_EnableInterpreterSlack) && - - ((Op->Common.Parent->Common.AmlOpcode == AML_PACKAGE_OP) || - (Op->Common.Parent->Common.AmlOpcode == AML_VARIABLE_PACKAGE_OP))) - { - /* - * We didn't find the target and we are populating elements - * of a package - ignore if slack enabled. Some ASL code - * contains dangling invalid references in packages and - * expects that no exception will be issued. Leave the - * element as a null element. It cannot be used, but it - * can be overwritten by subsequent ASL code - this is - * typically the case. - */ - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, - "Ignoring unresolved reference in package [%4.4s]\n", - WalkState->ScopeInfo->Scope.Node->Name.Ascii)); - - return_ACPI_STATUS (AE_OK); - } - else - { - ACPI_ERROR_NAMESPACE (Op->Common.Value.String, Status); - } - - return_ACPI_STATUS (Status); - } - } - - /* Special object resolution for elements of a package */ - - if ((Op->Common.Parent->Common.AmlOpcode == AML_PACKAGE_OP) || - (Op->Common.Parent->Common.AmlOpcode == AML_VARIABLE_PACKAGE_OP)) - { - /* - * Attempt to resolve the node to a value before we insert it into - * the package. If this is a reference to a common data type, - * resolve it immediately. According to the ACPI spec, package - * elements can only be "data objects" or method references. - * Attempt to resolve to an Integer, Buffer, String or Package. - * If cannot, return the named reference (for things like Devices, - * Methods, etc.) Buffer Fields and Fields will resolve to simple - * objects (int/buf/str/pkg). - * - * NOTE: References to things like Devices, Methods, Mutexes, etc. - * will remain as named references. This behavior is not described - * in the ACPI spec, but it appears to be an oversight. - */ - ObjDesc = ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, Op->Common.Node); - - Status = AcpiExResolveNodeToValue ( - ACPI_CAST_INDIRECT_PTR (ACPI_NAMESPACE_NODE, &ObjDesc), - WalkState); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + /* Check if we are resolving a named reference within a package */ - /* - * Special handling for Alias objects. We need to setup the type - * and the Op->Common.Node to point to the Alias target. Note, - * Alias has at most one level of indirection internally. - */ - Type = Op->Common.Node->Type; - if (Type == ACPI_TYPE_LOCAL_ALIAS) + if ((Op->Common.Parent->Common.AmlOpcode == AML_PACKAGE_OP) || + (Op->Common.Parent->Common.AmlOpcode == AML_VARIABLE_PACKAGE_OP)) { - Type = ObjDesc->Common.Type; - Op->Common.Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, - Op->Common.Node->Object); - } - - switch (Type) - { - /* - * For these types, we need the actual node, not the subobject. - * However, the subobject did not get an extra reference count above. - * - * TBD: should ExResolveNodeToValue be changed to fix this? - */ - case ACPI_TYPE_DEVICE: - case ACPI_TYPE_THERMAL: - - AcpiUtAddReference (Op->Common.Node->Object); - - /*lint -fallthrough */ - /* - * For these types, we need the actual node, not the subobject. - * The subobject got an extra reference count in ExResolveNodeToValue. - */ - case ACPI_TYPE_MUTEX: - case ACPI_TYPE_METHOD: - case ACPI_TYPE_POWER: - case ACPI_TYPE_PROCESSOR: - case ACPI_TYPE_EVENT: - case ACPI_TYPE_REGION: - - /* We will create a reference object for these types below */ - break; - - default: /* - * All other types - the node was resolved to an actual - * object, we are done. + * We won't resolve package elements here, we will do this + * after all ACPI tables are loaded into the namespace. This + * behavior supports both forward references to named objects + * and external references to objects in other tables. */ - goto Exit; + goto CreateNewObject; + } + else + { + Status = AcpiNsLookup (WalkState->ScopeInfo, + Op->Common.Value.String, + ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE, + ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL, + ACPI_CAST_INDIRECT_PTR ( + ACPI_NAMESPACE_NODE, &(Op->Common.Node))); + if (ACPI_FAILURE (Status)) + { + ACPI_ERROR_NAMESPACE (Op->Common.Value.String, Status); + return_ACPI_STATUS (Status); + } } } } +CreateNewObject: + /* Create and init a new internal ACPI object */ ObjDesc = AcpiUtCreateInternalObject ( @@ -236,7 +141,28 @@ AcpiDsBuildInternalObject ( return_ACPI_STATUS (Status); } -Exit: + /* + * Handling for unresolved package reference elements. + * These are elements that are namepaths. + */ + if ((Op->Common.Parent->Common.AmlOpcode == AML_PACKAGE_OP) || + (Op->Common.Parent->Common.AmlOpcode == AML_VARIABLE_PACKAGE_OP)) + { + ObjDesc->Reference.Resolved = TRUE; + + if ((Op->Common.AmlOpcode == AML_INT_NAMEPATH_OP) && + !ObjDesc->Reference.Node) + { + /* + * Name was unresolved above. + * Get the prefix node for later lookup + */ + ObjDesc->Reference.Node = WalkState->ScopeInfo->Scope.Node; + ObjDesc->Reference.Aml = Op->Common.Aml; + ObjDesc->Reference.Resolved = FALSE; + } + } + *ObjDescPtr = ObjDesc; return_ACPI_STATUS (Status); } @@ -358,209 +284,6 @@ AcpiDsBuildInternalBufferObj ( return_ACPI_STATUS (AE_OK); } - -/******************************************************************************* - * - * FUNCTION: AcpiDsBuildInternalPackageObj - * - * PARAMETERS: WalkState - Current walk state - * Op - Parser object to be translated - * ElementCount - Number of elements in the package - this is - * the NumElements argument to Package() - * ObjDescPtr - Where the ACPI internal object is returned - * - * RETURN: Status - * - * DESCRIPTION: Translate a parser Op package object to the equivalent - * namespace object - * - * NOTE: The number of elements in the package will be always be the NumElements - * count, regardless of the number of elements in the package list. If - * NumElements is smaller, only that many package list elements are used. - * if NumElements is larger, the Package object is padded out with - * objects of type Uninitialized (as per ACPI spec.) - * - * Even though the ASL compilers do not allow NumElements to be smaller - * than the Package list length (for the fixed length package opcode), some - * BIOS code modifies the AML on the fly to adjust the NumElements, and - * this code compensates for that. This also provides compatibility with - * other AML interpreters. - * - ******************************************************************************/ - -ACPI_STATUS -AcpiDsBuildInternalPackageObj ( - ACPI_WALK_STATE *WalkState, - ACPI_PARSE_OBJECT *Op, - UINT32 ElementCount, - ACPI_OPERAND_OBJECT **ObjDescPtr) -{ - ACPI_PARSE_OBJECT *Arg; - ACPI_PARSE_OBJECT *Parent; - ACPI_OPERAND_OBJECT *ObjDesc = NULL; - ACPI_STATUS Status = AE_OK; - UINT32 i; - UINT16 Index; - UINT16 ReferenceCount; - - - ACPI_FUNCTION_TRACE (DsBuildInternalPackageObj); - - - /* Find the parent of a possibly nested package */ - - Parent = Op->Common.Parent; - while ((Parent->Common.AmlOpcode == AML_PACKAGE_OP) || - (Parent->Common.AmlOpcode == AML_VARIABLE_PACKAGE_OP)) - { - Parent = Parent->Common.Parent; - } - - /* - * If we are evaluating a Named package object "Name (xxxx, Package)", - * the package object already exists, otherwise it must be created. - */ - ObjDesc = *ObjDescPtr; - if (!ObjDesc) - { - ObjDesc = AcpiUtCreateInternalObject (ACPI_TYPE_PACKAGE); - *ObjDescPtr = ObjDesc; - if (!ObjDesc) - { - return_ACPI_STATUS (AE_NO_MEMORY); - } - - ObjDesc->Package.Node = Parent->Common.Node; - } - - /* - * Allocate the element array (array of pointers to the individual - * objects) based on the NumElements parameter. Add an extra pointer slot - * so that the list is always null terminated. - */ - ObjDesc->Package.Elements = ACPI_ALLOCATE_ZEROED ( - ((ACPI_SIZE) ElementCount + 1) * sizeof (void *)); - - if (!ObjDesc->Package.Elements) - { - AcpiUtDeleteObjectDesc (ObjDesc); - return_ACPI_STATUS (AE_NO_MEMORY); - } - - ObjDesc->Package.Count = ElementCount; - - /* - * Initialize the elements of the package, up to the NumElements count. - * Package is automatically padded with uninitialized (NULL) elements - * if NumElements is greater than the package list length. Likewise, - * Package is truncated if NumElements is less than the list length. - */ - Arg = Op->Common.Value.Arg; - Arg = Arg->Common.Next; - for (i = 0; Arg && (i < ElementCount); i++) - { - if (Arg->Common.AmlOpcode == AML_INT_RETURN_VALUE_OP) - { - if (Arg->Common.Node->Type == ACPI_TYPE_METHOD) - { - /* - * A method reference "looks" to the parser to be a method - * invocation, so we special case it here - */ - Arg->Common.AmlOpcode = AML_INT_NAMEPATH_OP; - Status = AcpiDsBuildInternalObject ( - WalkState, Arg, &ObjDesc->Package.Elements[i]); - } - else - { - /* This package element is already built, just get it */ - - ObjDesc->Package.Elements[i] = - ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, Arg->Common.Node); - } - } - else - { - Status = AcpiDsBuildInternalObject ( - WalkState, Arg, &ObjDesc->Package.Elements[i]); - } - - if (*ObjDescPtr) - { - /* Existing package, get existing reference count */ - - ReferenceCount = (*ObjDescPtr)->Common.ReferenceCount; - if (ReferenceCount > 1) - { - /* Make new element ref count match original ref count */ - - for (Index = 0; Index < (ReferenceCount - 1); Index++) - { - AcpiUtAddReference ((ObjDesc->Package.Elements[i])); - } - } - } - - Arg = Arg->Common.Next; - } - - /* Check for match between NumElements and actual length of PackageList */ - - if (Arg) - { - /* - * NumElements was exhausted, but there are remaining elements in the - * PackageList. Truncate the package to NumElements. - * - * Note: technically, this is an error, from ACPI spec: "It is an error - * for NumElements to be less than the number of elements in the - * PackageList". However, we just print a message and - * no exception is returned. This provides Windows compatibility. Some - * BIOSs will alter the NumElements on the fly, creating this type - * of ill-formed package object. - */ - while (Arg) - { - /* - * We must delete any package elements that were created earlier - * and are not going to be used because of the package truncation. - */ - if (Arg->Common.Node) - { - AcpiUtRemoveReference ( - ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, Arg->Common.Node)); - Arg->Common.Node = NULL; - } - - /* Find out how many elements there really are */ - - i++; - Arg = Arg->Common.Next; - } - - ACPI_INFO (( - "Actual Package length (%u) is larger than " - "NumElements field (%u), truncated", - i, ElementCount)); - } - else if (i < ElementCount) - { - /* - * Arg list (elements) was exhausted, but we did not reach NumElements count. - * Note: this is not an error, the package is padded out with NULLs. - */ - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, - "Package List length (%u) smaller than NumElements " - "count (%u), padded with null elements\n", - i, ElementCount)); - } - - ObjDesc->Package.Flags |= AOPOBJ_DATA_VALID; - Op->Common.Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjDesc); - return_ACPI_STATUS (Status); -} - - /******************************************************************************* * * FUNCTION: AcpiDsCreateNode @@ -688,10 +411,20 @@ AcpiDsInitObjectFromOp ( case ACPI_TYPE_PACKAGE: /* - * Defer evaluation of Package TermArg operand + * Defer evaluation of Package TermArg operand and all + * package elements. (01/2017): We defer the element + * resolution to allow forward references from the package + * in order to provide compatibility with other ACPI + * implementations. */ ObjDesc->Package.Node = ACPI_CAST_PTR ( ACPI_NAMESPACE_NODE, WalkState->Operands[0]); + + if (!Op->Named.Data) + { + return_ACPI_STATUS (AE_OK); + } + ObjDesc->Package.AmlStart = Op->Named.Data; ObjDesc->Package.AmlLength = Op->Named.Length; break; @@ -832,8 +565,11 @@ AcpiDsInitObjectFromOp ( /* Node was saved in Op */ ObjDesc->Reference.Node = Op->Common.Node; - ObjDesc->Reference.Object = Op->Common.Node->Object; ObjDesc->Reference.Class = ACPI_REFCLASS_NAME; + if (Op->Common.Node) + { + ObjDesc->Reference.Object = Op->Common.Node->Object; + } break; case AML_DEBUG_OP: diff --git a/source/components/dispatcher/dsopcode.c b/source/components/dispatcher/dsopcode.c index 83b5cce..da20a3e 100644 --- a/source/components/dispatcher/dsopcode.c +++ b/source/components/dispatcher/dsopcode.c @@ -639,6 +639,16 @@ AcpiDsEvalDataObjectOperands ( */ WalkState->OperandIndex = WalkState->NumOperands; + /* Ignore if child is not valid */ + + if (!Op->Common.Value.Arg) + { + ACPI_ERROR ((AE_INFO, + "Dispatch: Missing child while executing TermArg for %X", + Op->Common.AmlOpcode)); + return_ACPI_STATUS (AE_OK); + } + Status = AcpiDsCreateOperand (WalkState, Op->Common.Value.Arg, 1); if (ACPI_FAILURE (Status)) { diff --git a/source/components/dispatcher/dspkginit.c b/source/components/dispatcher/dspkginit.c new file mode 100644 index 0000000..65d3c69 --- /dev/null +++ b/source/components/dispatcher/dspkginit.c @@ -0,0 +1,527 @@ +/****************************************************************************** + * + * Module Name: dspkginit - Completion of deferred package initialization + * + *****************************************************************************/ + +/* + * Copyright (C) 2000 - 2017, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + */ + +#include "acpi.h" +#include "accommon.h" +#include "acnamesp.h" +#include "amlcode.h" +#include "acdispat.h" +#include "acinterp.h" + + +#define _COMPONENT ACPI_NAMESPACE + ACPI_MODULE_NAME ("dspkginit") + + +/* Local prototypes */ + +static void +AcpiDsResolvePackageElement ( + ACPI_OPERAND_OBJECT **Element); + + +/******************************************************************************* + * + * FUNCTION: AcpiDsBuildInternalPackageObj + * + * PARAMETERS: WalkState - Current walk state + * Op - Parser object to be translated + * ElementCount - Number of elements in the package - this is + * the NumElements argument to Package() + * ObjDescPtr - Where the ACPI internal object is returned + * + * RETURN: Status + * + * DESCRIPTION: Translate a parser Op package object to the equivalent + * namespace object + * + * NOTE: The number of elements in the package will be always be the NumElements + * count, regardless of the number of elements in the package list. If + * NumElements is smaller, only that many package list elements are used. + * if NumElements is larger, the Package object is padded out with + * objects of type Uninitialized (as per ACPI spec.) + * + * Even though the ASL compilers do not allow NumElements to be smaller + * than the Package list length (for the fixed length package opcode), some + * BIOS code modifies the AML on the fly to adjust the NumElements, and + * this code compensates for that. This also provides compatibility with + * other AML interpreters. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiDsBuildInternalPackageObj ( + ACPI_WALK_STATE *WalkState, + ACPI_PARSE_OBJECT *Op, + UINT32 ElementCount, + ACPI_OPERAND_OBJECT **ObjDescPtr) +{ + ACPI_PARSE_OBJECT *Arg; + ACPI_PARSE_OBJECT *Parent; + ACPI_OPERAND_OBJECT *ObjDesc = NULL; + ACPI_STATUS Status = AE_OK; + UINT16 ReferenceCount; + UINT32 Index; + UINT32 i; + + + ACPI_FUNCTION_TRACE (DsBuildInternalPackageObj); + + + /* Find the parent of a possibly nested package */ + + Parent = Op->Common.Parent; + while ((Parent->Common.AmlOpcode == AML_PACKAGE_OP) || + (Parent->Common.AmlOpcode == AML_VARIABLE_PACKAGE_OP)) + { + Parent = Parent->Common.Parent; + } + + /* + * If we are evaluating a Named package object of the form: + * Name (xxxx, Package) + * the package object already exists, otherwise it must be created. + */ + ObjDesc = *ObjDescPtr; + if (!ObjDesc) + { + ObjDesc = AcpiUtCreateInternalObject (ACPI_TYPE_PACKAGE); + *ObjDescPtr = ObjDesc; + if (!ObjDesc) + { + return_ACPI_STATUS (AE_NO_MEMORY); + } + + ObjDesc->Package.Node = Parent->Common.Node; + } + + if (ObjDesc->Package.Flags & AOPOBJ_DATA_VALID) /* Just in case */ + { + return_ACPI_STATUS (AE_OK); + } + + /* + * Allocate the element array (array of pointers to the individual + * objects) based on the NumElements parameter. Add an extra pointer slot + * so that the list is always null terminated. + */ + ObjDesc->Package.Elements = ACPI_ALLOCATE_ZEROED ( + ((ACPI_SIZE) ElementCount + 1) * sizeof (void *)); + + if (!ObjDesc->Package.Elements) + { + AcpiUtDeleteObjectDesc (ObjDesc); + return_ACPI_STATUS (AE_NO_MEMORY); + } + + ObjDesc->Package.Count = ElementCount; + Arg = Op->Common.Value.Arg; + Arg = Arg->Common.Next; + + if (Arg) + { + ObjDesc->Package.Flags |= AOPOBJ_DATA_VALID; + } + + /* + * Initialize the elements of the package, up to the NumElements count. + * Package is automatically padded with uninitialized (NULL) elements + * if NumElements is greater than the package list length. Likewise, + * Package is truncated if NumElements is less than the list length. + */ + for (i = 0; Arg && (i < ElementCount); i++) + { + if (Arg->Common.AmlOpcode == AML_INT_RETURN_VALUE_OP) + { + if (Arg->Common.Node->Type == ACPI_TYPE_METHOD) + { + /* + * A method reference "looks" to the parser to be a method + * invocation, so we special case it here + */ + Arg->Common.AmlOpcode = AML_INT_NAMEPATH_OP; + Status = AcpiDsBuildInternalObject ( + WalkState, Arg, &ObjDesc->Package.Elements[i]); + } + else + { + /* This package element is already built, just get it */ + + ObjDesc->Package.Elements[i] = + ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, Arg->Common.Node); + } + } + else + { + Status = AcpiDsBuildInternalObject ( + WalkState, Arg, &ObjDesc->Package.Elements[i]); + if (Status == AE_NOT_FOUND) + { + ACPI_ERROR ((AE_INFO, "%-48s", "****DS namepath not found")); + } + + /* + * Initialize this package element. This function handles the + * resolution of named references within the package. + */ + AcpiDsInitPackageElement (0, ObjDesc->Package.Elements[i], + NULL, &ObjDesc->Package.Elements[i]); + } + + if (*ObjDescPtr) + { + /* Existing package, get existing reference count */ + + ReferenceCount = (*ObjDescPtr)->Common.ReferenceCount; + if (ReferenceCount > 1) + { + /* Make new element ref count match original ref count */ + /* TBD: Probably need an AcpiUtAddReferences function */ + + for (Index = 0; Index < ((UINT32) ReferenceCount - 1); Index++) + { + AcpiUtAddReference ((ObjDesc->Package.Elements[i])); + } + } + } + + Arg = Arg->Common.Next; + } + + /* Check for match between NumElements and actual length of PackageList */ + + if (Arg) + { + /* + * NumElements was exhausted, but there are remaining elements in + * the PackageList. Truncate the package to NumElements. + * + * Note: technically, this is an error, from ACPI spec: "It is an + * error for NumElements to be less than the number of elements in + * the PackageList". However, we just print a message and no + * exception is returned. This provides compatibility with other + * ACPI implementations. Some firmware implementations will alter + * the NumElements on the fly, possibly creating this type of + * ill-formed package object. + */ + while (Arg) + { + /* + * We must delete any package elements that were created earlier + * and are not going to be used because of the package truncation. + */ + if (Arg->Common.Node) + { + AcpiUtRemoveReference ( + ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, Arg->Common.Node)); + Arg->Common.Node = NULL; + } + + /* Find out how many elements there really are */ + + i++; + Arg = Arg->Common.Next; + } + + ACPI_INFO (( + "Actual Package length (%u) is larger than " + "NumElements field (%u), truncated", + i, ElementCount)); + } + else if (i < ElementCount) + { + /* + * Arg list (elements) was exhausted, but we did not reach + * NumElements count. + * + * Note: this is not an error, the package is padded out + * with NULLs. + */ + ACPI_DEBUG_PRINT ((ACPI_DB_INFO, + "Package List length (%u) smaller than NumElements " + "count (%u), padded with null elements\n", + i, ElementCount)); + } + + ObjDesc->Package.Flags |= AOPOBJ_DATA_VALID; + Op->Common.Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjDesc); + return_ACPI_STATUS (Status); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiDsInitPackageElement + * + * PARAMETERS: ACPI_PKG_CALLBACK + * + * RETURN: Status + * + * DESCRIPTION: Resolve a named reference element within a package object + * + ******************************************************************************/ + +ACPI_STATUS +AcpiDsInitPackageElement ( + UINT8 ObjectType, + ACPI_OPERAND_OBJECT *SourceObject, + ACPI_GENERIC_STATE *State, + void *Context) +{ + ACPI_OPERAND_OBJECT **ElementPtr; + + + if (!SourceObject) + { + return (AE_OK); + } + + /* + * The following code is a bit of a hack to workaround a (current) + * limitation of the ACPI_PKG_CALLBACK interface. We need a pointer + * to the location within the element array because a new object + * may be created and stored there. + */ + if (Context) + { + /* A direct call was made to this function */ + + ElementPtr = (ACPI_OPERAND_OBJECT **) Context; + } + else + { + /* Call came from AcpiUtWalkPackageTree */ + + ElementPtr = State->Pkg.ThisTargetObj; + } + + /* We are only interested in reference objects/elements */ + + if (SourceObject->Common.Type == ACPI_TYPE_LOCAL_REFERENCE) + { + /* Attempt to resolve the (named) reference to a namespace node */ + + AcpiDsResolvePackageElement (ElementPtr); + } + else if (SourceObject->Common.Type == ACPI_TYPE_PACKAGE) + { + SourceObject->Package.Flags |= AOPOBJ_DATA_VALID; + } + + return (AE_OK); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiDsResolvePackageElement + * + * PARAMETERS: ElementPtr - Pointer to a reference object + * + * RETURN: Possible new element is stored to the indirect ElementPtr + * + * DESCRIPTION: Resolve a package element that is a reference to a named + * object. + * + ******************************************************************************/ + +static void +AcpiDsResolvePackageElement ( + ACPI_OPERAND_OBJECT **ElementPtr) +{ + ACPI_STATUS Status; + ACPI_GENERIC_STATE ScopeInfo; + ACPI_OPERAND_OBJECT *Element = *ElementPtr; + ACPI_NAMESPACE_NODE *ResolvedNode; + char *ExternalPath = NULL; + ACPI_OBJECT_TYPE Type; + + + ACPI_FUNCTION_TRACE (DsResolvePackageElement); + + + /* Check if reference element is already resolved */ + + if (Element->Reference.Resolved) + { + return_VOID; + } + + /* Element must be a reference object of correct type */ + + ScopeInfo.Scope.Node = Element->Reference.Node; /* Prefix node */ + + Status = AcpiNsLookup (&ScopeInfo, + (char *) Element->Reference.Aml, /* Pointer to AML path */ + ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE, + ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, + NULL, &ResolvedNode); + if (ACPI_FAILURE (Status)) + { + Status = AcpiNsExternalizeName (ACPI_UINT32_MAX, + (char *) Element->Reference.Aml, + NULL, &ExternalPath); + + ACPI_EXCEPTION ((AE_INFO, Status, + "Could not find/resolve named package element: %s", ExternalPath)); + + ACPI_FREE (ExternalPath); + *ElementPtr = NULL; + return_VOID; + } + else if (ResolvedNode->Type == ACPI_TYPE_ANY) + { + /* Named reference not resolved, return a NULL package element */ + + ACPI_ERROR ((AE_INFO, + "Could not resolve named package element [%4.4s] in [%4.4s]", + ResolvedNode->Name.Ascii, ScopeInfo.Scope.Node->Name.Ascii)); + *ElementPtr = NULL; + return_VOID; + } +#if 0 + else if (ResolvedNode->Flags & ANOBJ_TEMPORARY) + { + /* + * A temporary node found here indicates that the reference is + * to a node that was created within this method. We are not + * going to allow it (especially if the package is returned + * from the method) -- the temporary node will be deleted out + * from under the method. (05/2017). + */ + ACPI_ERROR ((AE_INFO, + "Package element refers to a temporary name [%4.4s], " + "inserting a NULL element", + ResolvedNode->Name.Ascii)); + *ElementPtr = NULL; + return_VOID; + } +#endif + + /* + * Special handling for Alias objects. We need ResolvedNode to point + * to the Alias target. This effectively "resolves" the alias. + */ + if (ResolvedNode->Type == ACPI_TYPE_LOCAL_ALIAS) + { + ResolvedNode = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, + ResolvedNode->Object); + } + + /* Update the reference object */ + + Element->Reference.Resolved = TRUE; + Element->Reference.Node = ResolvedNode; + Type = Element->Reference.Node->Type; + + /* + * Attempt to resolve the node to a value before we insert it into + * the package. If this is a reference to a common data type, + * resolve it immediately. According to the ACPI spec, package + * elements can only be "data objects" or method references. + * Attempt to resolve to an Integer, Buffer, String or Package. + * If cannot, return the named reference (for things like Devices, + * Methods, etc.) Buffer Fields and Fields will resolve to simple + * objects (int/buf/str/pkg). + * + * NOTE: References to things like Devices, Methods, Mutexes, etc. + * will remain as named references. This behavior is not described + * in the ACPI spec, but it appears to be an oversight. + */ + Status = AcpiExResolveNodeToValue (&ResolvedNode, NULL); + if (ACPI_FAILURE (Status)) + { + return_VOID; + } + +#if 0 +/* TBD - alias support */ + /* + * Special handling for Alias objects. We need to setup the type + * and the Op->Common.Node to point to the Alias target. Note, + * Alias has at most one level of indirection internally. + */ + Type = Op->Common.Node->Type; + if (Type == ACPI_TYPE_LOCAL_ALIAS) + { + Type = ObjDesc->Common.Type; + Op->Common.Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, + Op->Common.Node->Object); + } +#endif + + switch (Type) + { + /* + * These object types are a result of named references, so we will + * leave them as reference objects. In other words, these types + * have no intrinsic "value". + */ + case ACPI_TYPE_DEVICE: + case ACPI_TYPE_THERMAL: + + /* TBD: This may not be necesssary */ + + AcpiUtAddReference (ResolvedNode->Object); + break; + + case ACPI_TYPE_MUTEX: + case ACPI_TYPE_METHOD: + case ACPI_TYPE_POWER: + case ACPI_TYPE_PROCESSOR: + case ACPI_TYPE_EVENT: + case ACPI_TYPE_REGION: + + break; + + default: + /* + * For all other types - the node was resolved to an actual + * operand object with a value, return the object + */ + *ElementPtr = (ACPI_OPERAND_OBJECT *) ResolvedNode; + break; + } + + return_VOID; +} diff --git a/source/components/executer/excreate.c b/source/components/executer/excreate.c index 8fcf7bf..011e61b 100644 --- a/source/components/executer/excreate.c +++ b/source/components/executer/excreate.c @@ -95,70 +95,39 @@ AcpiExCreateAlias ( } /* Ensure that the target node is valid */ + if (!TargetNode) { return_ACPI_STATUS (AE_NULL_OBJECT); } - /* - * For objects that can never change (i.e., the NS node will - * permanently point to the same object), we can simply attach - * the object to the new NS node. For other objects (such as - * Integers, buffers, etc.), we have to point the Alias node - * to the original Node. - */ + /* Construct the alias object (a namespace node) */ + switch (TargetNode->Type) { - - /* For these types, the sub-object can change dynamically via a Store */ - - case ACPI_TYPE_INTEGER: - case ACPI_TYPE_STRING: - case ACPI_TYPE_BUFFER: - case ACPI_TYPE_PACKAGE: - case ACPI_TYPE_BUFFER_FIELD: - /* - * These types open a new scope, so we need the NS node in order to access - * any children. - */ - case ACPI_TYPE_DEVICE: - case ACPI_TYPE_POWER: - case ACPI_TYPE_PROCESSOR: - case ACPI_TYPE_THERMAL: - case ACPI_TYPE_LOCAL_SCOPE: - /* - * The new alias has the type ALIAS and points to the original - * NS node, not the object itself. - */ - AliasNode->Type = ACPI_TYPE_LOCAL_ALIAS; - AliasNode->Object = ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, TargetNode); - break; - case ACPI_TYPE_METHOD: /* - * Control method aliases need to be differentiated + * Control method aliases need to be differentiated with + * a special type */ AliasNode->Type = ACPI_TYPE_LOCAL_METHOD_ALIAS; - AliasNode->Object = ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, TargetNode); break; default: - - /* Attach the original source object to the new Alias Node */ - /* - * The new alias assumes the type of the target, and it points - * to the same object. The reference count of the object has an - * additional reference to prevent deletion out from under either the - * target node or the alias Node + * All other object types. + * + * The new alias has the type ALIAS and points to the original + * NS node, not the object itself. */ - Status = AcpiNsAttachObject (AliasNode, - AcpiNsGetAttachedObject (TargetNode), TargetNode->Type); + AliasNode->Type = ACPI_TYPE_LOCAL_ALIAS; + AliasNode->Object = ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, TargetNode); break; } /* Since both operands are Nodes, we don't need to delete them */ + AliasNode->Object = ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, TargetNode); return_ACPI_STATUS (Status); } diff --git a/source/components/executer/exdump.c b/source/components/executer/exdump.c index d869746..f4d81ee 100644 --- a/source/components/executer/exdump.c +++ b/source/components/executer/exdump.c @@ -121,7 +121,7 @@ static ACPI_EXDUMP_INFO AcpiExDumpPackage[6] = {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE (AcpiExDumpPackage), NULL}, {ACPI_EXD_NODE, ACPI_EXD_OFFSET (Package.Node), "Parent Node"}, {ACPI_EXD_UINT8, ACPI_EXD_OFFSET (Package.Flags), "Flags"}, - {ACPI_EXD_UINT32, ACPI_EXD_OFFSET (Package.Count), "Elements"}, + {ACPI_EXD_UINT32, ACPI_EXD_OFFSET (Package.Count), "Element Count"}, {ACPI_EXD_POINTER, ACPI_EXD_OFFSET (Package.Elements), "Element List"}, {ACPI_EXD_PACKAGE, 0, NULL} }; @@ -402,6 +402,11 @@ AcpiExDumpObject ( while (Count) { + if (!ObjDesc) + { + return; + } + Target = ACPI_ADD_PTR (UINT8, ObjDesc, Info->Offset); Name = Info->Name; @@ -414,7 +419,8 @@ AcpiExDumpObject ( case ACPI_EXD_TYPE: AcpiOsPrintf ("%20s : %2.2X [%s]\n", "Type", - ObjDesc->Common.Type, AcpiUtGetObjectTypeName (ObjDesc)); + ObjDesc->Common.Type, + AcpiUtGetObjectTypeName (ObjDesc)); break; case ACPI_EXD_UINT8: @@ -480,10 +486,10 @@ AcpiExDumpObject ( Start = *ACPI_CAST_PTR (void *, Target); Next = Start; - AcpiOsPrintf ("%20s : %p", Name, Next); + AcpiOsPrintf ("%20s : %p ", Name, Next); if (Next) { - AcpiOsPrintf ("(%s %2.2X)", + AcpiOsPrintf ("%s (Type %2.2X)", AcpiUtGetObjectTypeName (Next), Next->Common.Type); while (Next->Common.NextObject) @@ -506,6 +512,10 @@ AcpiExDumpObject ( } } } + else + { + AcpiOsPrintf ("- No attached objects"); + } AcpiOsPrintf ("\n"); break; @@ -1186,7 +1196,8 @@ AcpiExDumpPackageObj ( default: - AcpiOsPrintf ("[Unknown Type] %X\n", ObjDesc->Common.Type); + AcpiOsPrintf ("[%s] Type: %2.2X\n", + AcpiUtGetTypeName (ObjDesc->Common.Type), ObjDesc->Common.Type); break; } } @@ -1230,10 +1241,19 @@ AcpiExDumpObjectDescriptor ( { AcpiExDumpNamespaceNode ((ACPI_NAMESPACE_NODE *) ObjDesc, Flags); - AcpiOsPrintf ("\nAttached Object (%p):\n", - ((ACPI_NAMESPACE_NODE *) ObjDesc)->Object); - ObjDesc = ((ACPI_NAMESPACE_NODE *) ObjDesc)->Object; + if (!ObjDesc) + { + return_VOID; + } + + AcpiOsPrintf ("\nAttached Object %p", ObjDesc); + if (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc) == ACPI_DESC_TYPE_NAMED) + { + AcpiOsPrintf (" - Namespace Node"); + } + + AcpiOsPrintf (":\n"); goto DumpObject; } @@ -1257,6 +1277,11 @@ AcpiExDumpObjectDescriptor ( DumpObject: + if (!ObjDesc) + { + return_VOID; + } + /* Common Fields */ AcpiExDumpObject (ObjDesc, AcpiExDumpCommon); diff --git a/source/components/executer/exmisc.c b/source/components/executer/exmisc.c index 80d420c..67b8e11 100644 --- a/source/components/executer/exmisc.c +++ b/source/components/executer/exmisc.c @@ -292,6 +292,8 @@ AcpiExDoLogicalNumericOp ( default: + ACPI_ERROR ((AE_INFO, + "Invalid numeric logical opcode: %X", Opcode)); Status = AE_AML_INTERNAL; break; } @@ -377,6 +379,9 @@ AcpiExDoLogicalOp ( default: + ACPI_ERROR ((AE_INFO, + "Invalid object type for logical operator: %X", + Operand0->Common.Type)); Status = AE_AML_INTERNAL; break; } @@ -426,6 +431,8 @@ AcpiExDoLogicalOp ( default: + ACPI_ERROR ((AE_INFO, + "Invalid comparison opcode: %X", Opcode)); Status = AE_AML_INTERNAL; break; } @@ -504,6 +511,8 @@ AcpiExDoLogicalOp ( default: + ACPI_ERROR ((AE_INFO, + "Invalid comparison opcode: %X", Opcode)); Status = AE_AML_INTERNAL; break; } diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c index cbbb4b5..4c3113a 100644 --- a/source/components/executer/exoparg2.c +++ b/source/components/executer/exoparg2.c @@ -448,6 +448,8 @@ AcpiExOpcode_2A_1T_1R ( default: + ACPI_ERROR ((AE_INFO, + "Invalid object type: %X", (Operand[0])->Common.Type)); Status = AE_AML_INTERNAL; goto Cleanup; } diff --git a/source/components/hardware/hwregs.c b/source/components/hardware/hwregs.c index 0fe7ec2..e287932 100644 --- a/source/components/hardware/hwregs.c +++ b/source/components/hardware/hwregs.c @@ -120,7 +120,7 @@ AcpiHwGetAccessBitWidth ( } else if (Reg->AccessWidth) { - AccessBitWidth = (1 << (Reg->AccessWidth + 2)); + AccessBitWidth = ACPI_ACCESS_BIT_WIDTH (Reg->AccessWidth); } else { diff --git a/source/components/namespace/nsaccess.c b/source/components/namespace/nsaccess.c index f176c73..4c6307c 100644 --- a/source/components/namespace/nsaccess.c +++ b/source/components/namespace/nsaccess.c @@ -302,6 +302,7 @@ AcpiNsLookup ( { ACPI_STATUS Status; char *Path = Pathname; + char *ExternalPath; ACPI_NAMESPACE_NODE *PrefixNode; ACPI_NAMESPACE_NODE *CurrentNode = NULL; ACPI_NAMESPACE_NODE *ThisNode = NULL; @@ -448,11 +449,21 @@ AcpiNsLookup ( ThisNode = ThisNode->Parent; if (!ThisNode) { - /* Current scope has no parent scope */ + /* + * Current scope has no parent scope. Externalize + * the internal path for error message. + */ + Status = AcpiNsExternalizeName (ACPI_UINT32_MAX, Pathname, + NULL, &ExternalPath); + if (ACPI_SUCCESS (Status)) + { + ACPI_ERROR ((AE_INFO, + "%s: Path has too many parent prefixes (^)", + ExternalPath)); + + ACPI_FREE (ExternalPath); + } - ACPI_ERROR ((AE_INFO, - "%s: Path has too many parent prefixes (^) " - "- reached beyond root node", Pathname)); return_ACPI_STATUS (AE_NOT_FOUND); } } diff --git a/source/components/namespace/nsarguments.c b/source/components/namespace/nsarguments.c index c072188..ec17fc7 100644 --- a/source/components/namespace/nsarguments.c +++ b/source/components/namespace/nsarguments.c @@ -75,9 +75,14 @@ AcpiNsCheckArgumentTypes ( UINT32 i; - /* If not a predefined name, cannot typecheck args */ - - if (!Info->Predefined) + /* + * If not a predefined name, cannot typecheck args, because + * we have no idea what argument types are expected. + * Also, ignore typecheck if warnings/errors if this method + * has already been evaluated at least once -- in order + * to suppress repetitive messages. + */ + if (!Info->Predefined || (Info->Node->Flags & ANOBJ_EVALUATED)) { return; } @@ -99,6 +104,10 @@ AcpiNsCheckArgumentTypes ( "Found [%s], ACPI requires [%s]", (i + 1), AcpiUtGetTypeName (UserArgType), AcpiUtGetTypeName (ArgType))); + + /* Prevent any additional typechecking for this method */ + + Info->Node->Flags |= ANOBJ_EVALUATED; } } } @@ -130,7 +139,7 @@ AcpiNsCheckAcpiCompliance ( UINT32 RequiredParamCount; - if (!Predefined) + if (!Predefined || (Node->Flags & ANOBJ_EVALUATED)) { return; } @@ -224,6 +233,11 @@ AcpiNsCheckArgumentCount ( UINT32 RequiredParamCount; + if (Node->Flags & ANOBJ_EVALUATED) + { + return; + } + if (!Predefined) { /* diff --git a/source/components/namespace/nsinit.c b/source/components/namespace/nsinit.c index fcf7874..4a6134a 100644 --- a/source/components/namespace/nsinit.c +++ b/source/components/namespace/nsinit.c @@ -427,6 +427,20 @@ AcpiNsInitOneObject ( Info->PackageInit++; Status = AcpiDsGetPackageArguments (ObjDesc); + if (ACPI_FAILURE (Status)) + { + break; + } + + /* + * Resolve all named references in package objects (and all + * sub-packages). This action has been deferred until the entire + * namespace has been loaded, in order to support external and + * forward references from individual package elements (05/2017). + */ + Status = AcpiUtWalkPackageTree (ObjDesc, NULL, + AcpiDsInitPackageElement, NULL); + ObjDesc->Package.Flags |= AOPOBJ_DATA_VALID; break; default: diff --git a/source/components/namespace/nsnames.c b/source/components/namespace/nsnames.c index 0ca3514..0df136a 100644 --- a/source/components/namespace/nsnames.c +++ b/source/components/namespace/nsnames.c @@ -100,8 +100,15 @@ AcpiNsGetPathnameLength ( ACPI_SIZE Size; - ACPI_FUNCTION_ENTRY (); + /* Validate the Node */ + if (ACPI_GET_DESCRIPTOR_TYPE (Node) != ACPI_DESC_TYPE_NAMED) + { + ACPI_ERROR ((AE_INFO, + "Invalid/cached reference target node: %p, descriptor type %d", + Node, ACPI_GET_DESCRIPTOR_TYPE (Node))); + return (0); + } Size = AcpiNsBuildNormalizedPath (Node, NULL, 0, FALSE); return (Size); diff --git a/source/components/namespace/nsprepkg.c b/source/components/namespace/nsprepkg.c index 1e38021..36b29bf 100644 --- a/source/components/namespace/nsprepkg.c +++ b/source/components/namespace/nsprepkg.c @@ -614,6 +614,8 @@ AcpiNsCheckPackageList ( default: /* Should not get here, type was validated by caller */ + ACPI_ERROR ((AE_INFO, "Invalid Package type: %X", + Package->RetInfo.Type)); return (AE_AML_INTERNAL); } diff --git a/source/components/parser/psloop.c b/source/components/parser/psloop.c index 9ff8bcf..68fe72b 100644 --- a/source/components/parser/psloop.c +++ b/source/components/parser/psloop.c @@ -174,6 +174,9 @@ AcpiPsGetArguments ( INCREMENT_ARG_LIST (WalkState->ArgTypes); } + ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, + "Final argument count: %u pass %u\n", + WalkState->ArgCount, WalkState->PassNumber)); /* * Handle executable code at "module-level". This refers to @@ -272,6 +275,10 @@ AcpiPsGetArguments ( (Op->Common.Parent->Common.AmlOpcode == AML_NAME_OP) && (WalkState->PassNumber <= ACPI_IMODE_LOAD_PASS2)) { + ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, + "Setup Package/Buffer: Pass %u, AML Ptr: %p\n", + WalkState->PassNumber, AmlOpStart)); + /* * Skip parsing of Buffers and Packages because we don't have * enough info in the first pass to parse them correctly. @@ -581,6 +588,9 @@ AcpiPsParseLoop ( /* Check for arguments that need to be processed */ + ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, + "Parseloop: argument count: %u\n", WalkState->ArgCount)); + if (WalkState->ArgCount) { /* diff --git a/source/components/resources/rsxface.c b/source/components/resources/rsxface.c index 7ce8b61..5d8881b 100644 --- a/source/components/resources/rsxface.c +++ b/source/components/resources/rsxface.c @@ -688,7 +688,7 @@ ACPI_EXPORT_SYMBOL (AcpiWalkResourceBuffer) * device we are querying * Name - Method name of the resources we want. * (METHOD_NAME__CRS, METHOD_NAME__PRS, or - * METHOD_NAME__AEI) + * METHOD_NAME__AEI or METHOD_NAME__DMA) * UserFunction - Called for each resource * Context - Passed to UserFunction * @@ -719,12 +719,13 @@ AcpiWalkResources ( if (!DeviceHandle || !UserFunction || !Name || (!ACPI_COMPARE_NAME (Name, METHOD_NAME__CRS) && !ACPI_COMPARE_NAME (Name, METHOD_NAME__PRS) && - !ACPI_COMPARE_NAME (Name, METHOD_NAME__AEI))) + !ACPI_COMPARE_NAME (Name, METHOD_NAME__AEI) && + !ACPI_COMPARE_NAME (Name, METHOD_NAME__DMA))) { return_ACPI_STATUS (AE_BAD_PARAMETER); } - /* Get the _CRS/_PRS/_AEI resource list */ + /* Get the _CRS/_PRS/_AEI/_DMA resource list */ Buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER; Status = AcpiRsGetMethodData (DeviceHandle, Name, &Buffer); diff --git a/source/components/tables/tbdata.c b/source/components/tables/tbdata.c index 97c6890..0a18b8b 100644 --- a/source/components/tables/tbdata.c +++ b/source/components/tables/tbdata.c @@ -540,6 +540,8 @@ AcpiTbCheckDuplication ( * * DESCRIPTION: This function is called to validate and verify the table, the * returned table descriptor is in "VALIDATED" state. + * Note that 'TableIndex' is required to be set to !NULL to + * enable duplication check. * *****************************************************************************/ diff --git a/source/components/tables/tbxface.c b/source/components/tables/tbxface.c index 17e23ba..a34e445 100644 --- a/source/components/tables/tbxface.c +++ b/source/components/tables/tbxface.c @@ -185,7 +185,7 @@ AcpiReallocateRootTable ( { ACPI_STATUS Status; ACPI_TABLE_DESC *TableDesc; - UINT32 i; + UINT32 i, j; ACPI_FUNCTION_TRACE (AcpiReallocateRootTable); @@ -231,7 +231,7 @@ AcpiReallocateRootTable ( TableDesc = &AcpiGbl_RootTableList.Tables[i]; if (!(TableDesc->Flags & ACPI_TABLE_IS_VERIFIED)) { - Status = AcpiTbVerifyTempTable (TableDesc, NULL, NULL); + Status = AcpiTbVerifyTempTable (TableDesc, NULL, &j); if (ACPI_FAILURE (Status)) { AcpiTbUninstallTable (TableDesc); diff --git a/source/components/utilities/utclib.c b/source/components/utilities/utclib.c index 3d3bda7..17fc94c 100644 --- a/source/components/utilities/utclib.c +++ b/source/components/utilities/utclib.c @@ -654,7 +654,7 @@ strstr ( char *String1, char *String2) { - UINT32 Length; + ACPI_SIZE Length; Length = strlen (String2); diff --git a/source/components/utilities/uthex.c b/source/components/utilities/uthex.c index 5fe8151..667b996 100644 --- a/source/components/utilities/uthex.c +++ b/source/components/utilities/uthex.c @@ -75,8 +75,10 @@ AcpiUtHexToAsciiChar ( UINT64 Integer, UINT32 Position) { + UINT64 Index; - return (AcpiGbl_HexToAscii[(Integer >> Position) & 0xF]); + AcpiUtShortShiftRight (Integer, Position, &Index); + return (AcpiGbl_HexToAscii[Index & 0xF]); } diff --git a/source/components/utilities/utmath.c b/source/components/utilities/utmath.c index e803f75..758b8bf 100644 --- a/source/components/utilities/utmath.c +++ b/source/components/utilities/utmath.c @@ -48,16 +48,6 @@ #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("utmath") -/* - * Optional support for 64-bit double-precision integer divide. This code - * is configurable and is implemented in order to support 32-bit kernel - * environments where a 64-bit double-precision math library is not available. - * - * Support for a more normal 64-bit divide/modulo (with check for a divide- - * by-zero) appears after this optional section of code. - */ -#ifndef ACPI_USE_NATIVE_DIVIDE - /* Structures used only for 64-bit divide */ typedef struct uint64_struct @@ -74,6 +64,257 @@ typedef union uint64_overlay } UINT64_OVERLAY; +/* + * Optional support for 64-bit double-precision integer multiply and shift. + * This code is configurable and is implemented in order to support 32-bit + * kernel environments where a 64-bit double-precision math library is not + * available. + */ +#ifndef ACPI_USE_NATIVE_MATH64 + +/******************************************************************************* + * + * FUNCTION: AcpiUtShortMultiply + * + * PARAMETERS: Multiplicand - 64-bit multiplicand + * Multiplier - 32-bit multiplier + * OutProduct - Pointer to where the product is returned + * + * DESCRIPTION: Perform a short multiply. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiUtShortMultiply ( + UINT64 Multiplicand, + UINT32 Multiplier, + UINT64 *OutProduct) +{ + UINT64_OVERLAY MultiplicandOvl; + UINT64_OVERLAY Product; + UINT32 Carry32; + + + ACPI_FUNCTION_TRACE (UtShortMultiply); + + + MultiplicandOvl.Full = Multiplicand; + + /* + * The Product is 64 bits, the carry is always 32 bits, + * and is generated by the second multiply. + */ + ACPI_MUL_64_BY_32 (0, MultiplicandOvl.Part.Hi, Multiplier, + Product.Part.Hi, Carry32); + + ACPI_MUL_64_BY_32 (0, MultiplicandOvl.Part.Lo, Multiplier, + Product.Part.Lo, Carry32); + + Product.Part.Hi += Carry32; + + /* Return only what was requested */ + + if (OutProduct) + { + *OutProduct = Product.Full; + } + + return_ACPI_STATUS (AE_OK); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiUtShortShiftLeft + * + * PARAMETERS: Operand - 64-bit shift operand + * Count - 32-bit shift count + * OutResult - Pointer to where the result is returned + * + * DESCRIPTION: Perform a short left shift. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiUtShortShiftLeft ( + UINT64 Operand, + UINT32 Count, + UINT64 *OutResult) +{ + UINT64_OVERLAY OperandOvl; + + + ACPI_FUNCTION_TRACE (UtShortShiftLeft); + + + OperandOvl.Full = Operand; + + if ((Count & 63) >= 32) + { + OperandOvl.Part.Hi = OperandOvl.Part.Lo; + OperandOvl.Part.Lo ^= OperandOvl.Part.Lo; + Count = (Count & 63) - 32; + } + ACPI_SHIFT_LEFT_64_BY_32 (OperandOvl.Part.Hi, + OperandOvl.Part.Lo, Count); + + /* Return only what was requested */ + + if (OutResult) + { + *OutResult = OperandOvl.Full; + } + + return_ACPI_STATUS (AE_OK); +} + +/******************************************************************************* + * + * FUNCTION: AcpiUtShortShiftRight + * + * PARAMETERS: Operand - 64-bit shift operand + * Count - 32-bit shift count + * OutResult - Pointer to where the result is returned + * + * DESCRIPTION: Perform a short right shift. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiUtShortShiftRight ( + UINT64 Operand, + UINT32 Count, + UINT64 *OutResult) +{ + UINT64_OVERLAY OperandOvl; + + + ACPI_FUNCTION_TRACE (UtShortShiftRight); + + + OperandOvl.Full = Operand; + + if ((Count & 63) >= 32) + { + OperandOvl.Part.Lo = OperandOvl.Part.Hi; + OperandOvl.Part.Hi ^= OperandOvl.Part.Hi; + Count = (Count & 63) - 32; + } + ACPI_SHIFT_RIGHT_64_BY_32 (OperandOvl.Part.Hi, + OperandOvl.Part.Lo, Count); + + /* Return only what was requested */ + + if (OutResult) + { + *OutResult = OperandOvl.Full; + } + + return_ACPI_STATUS (AE_OK); +} +#else + +/******************************************************************************* + * + * FUNCTION: AcpiUtShortMultiply + * + * PARAMETERS: See function headers above + * + * DESCRIPTION: Native version of the UtShortMultiply function. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiUtShortMultiply ( + UINT64 Multiplicand, + UINT32 Multiplier, + UINT64 *OutProduct) +{ + + ACPI_FUNCTION_TRACE (UtShortMultiply); + + + /* Return only what was requested */ + + if (OutProduct) + { + *OutProduct = Multiplicand * Multiplier; + } + + return_ACPI_STATUS (AE_OK); +} + +/******************************************************************************* + * + * FUNCTION: AcpiUtShortShiftLeft + * + * PARAMETERS: See function headers above + * + * DESCRIPTION: Native version of the UtShortShiftLeft function. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiUtShortShiftLeft ( + UINT64 Operand, + UINT32 Count, + UINT64 *OutResult) +{ + + ACPI_FUNCTION_TRACE (UtShortShiftLeft); + + + /* Return only what was requested */ + + if (OutResult) + { + *OutResult = Operand << Count; + } + + return_ACPI_STATUS (AE_OK); +} + +/******************************************************************************* + * + * FUNCTION: AcpiUtShortShiftRight + * + * PARAMETERS: See function headers above + * + * DESCRIPTION: Native version of the UtShortShiftRight function. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiUtShortShiftRight ( + UINT64 Operand, + UINT32 Count, + UINT64 *OutResult) +{ + + ACPI_FUNCTION_TRACE (UtShortShiftRight); + + + /* Return only what was requested */ + + if (OutResult) + { + *OutResult = Operand >> Count; + } + + return_ACPI_STATUS (AE_OK); +} +#endif + +/* + * Optional support for 64-bit double-precision integer divide. This code + * is configurable and is implemented in order to support 32-bit kernel + * environments where a 64-bit double-precision math library is not available. + * + * Support for a more normal 64-bit divide/modulo (with check for a divide- + * by-zero) appears after this optional section of code. + */ +#ifndef ACPI_USE_NATIVE_DIVIDE + /******************************************************************************* * diff --git a/source/components/utilities/utmisc.c b/source/components/utilities/utmisc.c index ebad4d1..edf0b8b 100644 --- a/source/components/utilities/utmisc.c +++ b/source/components/utilities/utmisc.c @@ -255,7 +255,7 @@ AcpiUtCreateUpdateStateAndPush ( * * RETURN: Status * - * DESCRIPTION: Walk through a package + * DESCRIPTION: Walk through a package, including subpackages * ******************************************************************************/ @@ -269,8 +269,8 @@ AcpiUtWalkPackageTree ( ACPI_STATUS Status = AE_OK; ACPI_GENERIC_STATE *StateList = NULL; ACPI_GENERIC_STATE *State; - UINT32 ThisIndex; ACPI_OPERAND_OBJECT *ThisSourceObj; + UINT32 ThisIndex; ACPI_FUNCTION_TRACE (UtWalkPackageTree); @@ -287,8 +287,10 @@ AcpiUtWalkPackageTree ( /* Get one element of the package */ ThisIndex = State->Pkg.Index; - ThisSourceObj = (ACPI_OPERAND_OBJECT *) + ThisSourceObj = State->Pkg.SourceObject->Package.Elements[ThisIndex]; + State->Pkg.ThisTargetObj = + &State->Pkg.SourceObject->Package.Elements[ThisIndex]; /* * Check for: @@ -304,7 +306,7 @@ AcpiUtWalkPackageTree ( (ThisSourceObj->Common.Type != ACPI_TYPE_PACKAGE)) { Status = WalkCallback (ACPI_COPY_TYPE_SIMPLE, ThisSourceObj, - State, Context); + State, Context); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -377,6 +379,9 @@ AcpiUtWalkPackageTree ( /* We should never get here */ + ACPI_ERROR ((AE_INFO, + "State list did not terminate correctly")); + return_ACPI_STATUS (AE_AML_INTERNAL); } diff --git a/source/components/utilities/utobject.c b/source/components/utilities/utobject.c index 8767b89..11c95ed 100644 --- a/source/components/utilities/utobject.c +++ b/source/components/utilities/utobject.c @@ -543,6 +543,10 @@ AcpiUtGetSimpleObjectSize ( { /* A namespace node should never get here */ + ACPI_ERROR ((AE_INFO, + "Received a namespace node [%4.4s] " + "where an operand object is required", + ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, InternalObject)->Name.Ascii)); return_ACPI_STATUS (AE_AML_INTERNAL); } diff --git a/source/components/utilities/utprint.c b/source/components/utilities/utprint.c index 0044372..fa3332d 100644 --- a/source/components/utilities/utprint.c +++ b/source/components/utilities/utprint.c @@ -223,7 +223,7 @@ AcpiUtScanNumber ( while (isdigit ((int) *String)) { - Number *= 10; + AcpiUtShortMultiply (Number, 10, &Number); Number += *(String++) - '0'; } @@ -355,7 +355,7 @@ AcpiUtFormatNumber ( /* Generate full string in reverse order */ Pos = AcpiUtPutNumber (ReversedString, Number, Base, Upper); - i = ACPI_PTR_DIFF (Pos, ReversedString); + i = (INT32) ACPI_PTR_DIFF (Pos, ReversedString); /* Printing 100 using %2d gives "100", not "00" */ @@ -587,7 +587,7 @@ vsnprintf ( { s = ""; } - Length = AcpiUtBoundStringLength (s, Precision); + Length = (INT32) AcpiUtBoundStringLength (s, Precision); if (!(Type & ACPI_FORMAT_LEFT)) { while (Length < Width--) @@ -707,7 +707,7 @@ vsnprintf ( } } - return (ACPI_PTR_DIFF (Pos, String)); + return ((int) ACPI_PTR_DIFF (Pos, String)); } diff --git a/source/components/utilities/utresrc.c b/source/components/utilities/utresrc.c index bb1454b..0b23eeb 100644 --- a/source/components/utilities/utresrc.c +++ b/source/components/utilities/utresrc.c @@ -252,14 +252,11 @@ AcpiUtWalkAmlResources ( } /* - * The EndTag opcode must be followed by a zero byte. - * Although this byte is technically defined to be a checksum, - * in practice, all ASL compilers set this byte to zero. + * Don't attempt to perform any validation on the 2nd byte. + * Although all known ASL compilers insert a zero for the 2nd + * byte, it can also be a checksum (as per the ACPI spec), + * and this is occasionally seen in the field. July 2017. */ - if (*(Aml + 1) != 0) - { - return_ACPI_STATUS (AE_AML_NO_RESOURCE_END_TAG); - } /* Return the pointer to the EndTag if requested */ diff --git a/source/components/utilities/utstate.c b/source/components/utilities/utstate.c index deecb93..982f261 100644 --- a/source/components/utilities/utstate.c +++ b/source/components/utilities/utstate.c @@ -255,7 +255,7 @@ ACPI_GENERIC_STATE * AcpiUtCreatePkgState ( void *InternalObject, void *ExternalObject, - UINT16 Index) + UINT32 Index) { ACPI_GENERIC_STATE *State; diff --git a/source/components/utilities/utstrtoul64.c b/source/components/utilities/utstrtoul64.c index 8d1e9e7..7894a4c 100644 --- a/source/components/utilities/utstrtoul64.c +++ b/source/components/utilities/utstrtoul64.c @@ -311,8 +311,8 @@ AcpiUtStrtoulBase10 ( /* Convert and insert (add) the decimal digit */ - NextValue = - (ReturnValue * 10) + (AsciiDigit - ACPI_ASCII_ZERO); + AcpiUtShortMultiply (ReturnValue, 10, &NextValue); + NextValue += (AsciiDigit - ACPI_ASCII_ZERO); /* Check for overflow (32 or 64 bit) - return current converted value */ @@ -378,8 +378,8 @@ AcpiUtStrtoulBase16 ( /* Convert and insert the hex digit */ - ReturnValue = - (ReturnValue << 4) | AcpiUtAsciiCharToHex (AsciiDigit); + AcpiUtShortShiftLeft (ReturnValue, 4, &ReturnValue); + ReturnValue |= AcpiUtAsciiCharToHex (AsciiDigit); String++; ValidDigits++; diff --git a/source/components/utilities/uttrack.c b/source/components/utilities/uttrack.c index 2f720c2..2bb1801 100644 --- a/source/components/utilities/uttrack.c +++ b/source/components/utilities/uttrack.c @@ -668,6 +668,11 @@ AcpiUtDumpAllocations ( return_VOID; } + if (!AcpiGbl_GlobalList) + { + goto Exit; + } + Element = AcpiGbl_GlobalList->ListHead; while (Element) { @@ -679,7 +684,7 @@ AcpiUtDumpAllocations ( if (Element->Size < sizeof (ACPI_COMMON_DESCRIPTOR)) { - AcpiOsPrintf ("%p Length 0x%04X %9.9s-%u " + AcpiOsPrintf ("%p Length 0x%04X %9.9s-%4.4u " "[Not a Descriptor - too small]\n", Descriptor, Element->Size, Element->Module, Element->Line); @@ -691,7 +696,7 @@ AcpiUtDumpAllocations ( if (ACPI_GET_DESCRIPTOR_TYPE (Descriptor) != ACPI_DESC_TYPE_CACHED) { - AcpiOsPrintf ("%p Length 0x%04X %9.9s-%u [%s] ", + AcpiOsPrintf ("%p Length 0x%04X %9.9s-%4.4u [%s] ", Descriptor, Element->Size, Element->Module, Element->Line, AcpiUtGetDescriptorName (Descriptor)); @@ -767,6 +772,7 @@ AcpiUtDumpAllocations ( Element = Element->Next; } +Exit: (void) AcpiUtReleaseMutex (ACPI_MTX_MEMORY); /* Print summary */ diff --git a/source/include/acdisasm.h b/source/include/acdisasm.h index 8d997c7..73ad5c1 100644 --- a/source/include/acdisasm.h +++ b/source/include/acdisasm.h @@ -163,6 +163,7 @@ typedef enum ACPI_DMT_PCCT, ACPI_DMT_PMTT, ACPI_DMT_PPTT, + ACPI_DMT_SDEI, ACPI_DMT_SLIC, ACPI_DMT_SRAT, @@ -419,6 +420,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoS3ptHdr[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoS3pt0[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoS3pt1[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoSbst[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoSdei[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoSlic[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoSlit[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoSpcr[]; diff --git a/source/include/acdispat.h b/source/include/acdispat.h index f66003c..89694bc 100644 --- a/source/include/acdispat.h +++ b/source/include/acdispat.h @@ -301,6 +301,12 @@ AcpiDsInitializeObjects ( * dsobject - Parser/Interpreter interface - object initialization and conversion */ ACPI_STATUS +AcpiDsBuildInternalObject ( + ACPI_WALK_STATE *WalkState, + ACPI_PARSE_OBJECT *Op, + ACPI_OPERAND_OBJECT **ObjDescPtr); + +ACPI_STATUS AcpiDsBuildInternalBufferObj ( ACPI_WALK_STATE *WalkState, ACPI_PARSE_OBJECT *Op, @@ -329,6 +335,17 @@ AcpiDsCreateNode ( /* + * dspkginit - Package object initialization + */ +ACPI_STATUS +AcpiDsInitPackageElement ( + UINT8 ObjectType, + ACPI_OPERAND_OBJECT *SourceObject, + ACPI_GENERIC_STATE *State, + void *Context); + + +/* * dsutils - Parser/Interpreter interface utility routines */ void diff --git a/source/include/aclocal.h b/source/include/aclocal.h index faf5bcf..b2906a7 100644 --- a/source/include/aclocal.h +++ b/source/include/aclocal.h @@ -705,7 +705,7 @@ typedef struct acpi_update_state typedef struct acpi_pkg_state { ACPI_STATE_COMMON - UINT16 Index; + UINT32 Index; union acpi_operand_object *SourceObject; union acpi_operand_object *DestObject; struct acpi_walk_state *WalkState; diff --git a/source/include/acnames.h b/source/include/acnames.h index 9ef3973..3b7313a 100644 --- a/source/include/acnames.h +++ b/source/include/acnames.h @@ -54,6 +54,7 @@ #define METHOD_NAME__CLS "_CLS" #define METHOD_NAME__CRS "_CRS" #define METHOD_NAME__DDN "_DDN" +#define METHOD_NAME__DMA "_DMA" #define METHOD_NAME__HID "_HID" #define METHOD_NAME__INI "_INI" #define METHOD_NAME__PLD "_PLD" diff --git a/source/include/acobject.h b/source/include/acobject.h index 2a43055..105e2a1 100644 --- a/source/include/acobject.h +++ b/source/include/acobject.h @@ -438,11 +438,12 @@ typedef struct acpi_object_reference ACPI_OBJECT_COMMON_HEADER UINT8 Class; /* Reference Class */ UINT8 TargetType; /* Used for Index Op */ - UINT8 Reserved; + UINT8 Resolved; /* Reference has been resolved to a value */ void *Object; /* NameOp=>HANDLE to obj, IndexOp=>ACPI_OPERAND_OBJECT */ ACPI_NAMESPACE_NODE *Node; /* RefOf or Namepath */ union acpi_operand_object **Where; /* Target of Index */ UINT8 *IndexPointer; /* Used for Buffers and Strings */ + UINT8 *Aml; /* Used for deferred resolution of the ref */ UINT32 Value; /* Used for Local/Arg/Index/DdbHandle */ } ACPI_OBJECT_REFERENCE; @@ -463,7 +464,6 @@ typedef enum } ACPI_REFERENCE_CLASSES; - /* * Extra object is used as additional storage for types that * have AML code in their declarations (TermArgs) that must be diff --git a/source/include/acpi.h b/source/include/acpi.h index 25b4516..d7a7e20 100644 --- a/source/include/acpi.h +++ b/source/include/acpi.h @@ -54,14 +54,14 @@ * Note: The order of these include files is important. */ #include "platform/acenv.h" /* Environment-specific items */ -#include "acnames.h" /* Common ACPI names and strings */ #include "actypes.h" /* ACPICA data types and structures */ +#include "platform/acenvex.h" /* Extra environment-specific items */ +#include "acnames.h" /* Common ACPI names and strings */ #include "acexcep.h" /* ACPICA exceptions */ #include "actbl.h" /* ACPI table definitions */ #include "acoutput.h" /* Error output and Debug macros */ #include "acrestyp.h" /* Resource Descriptor structs */ #include "acpiosxf.h" /* OSL interfaces (ACPICA-to-OS) */ #include "acpixf.h" /* ACPI core subsystem external interfaces */ -#include "platform/acenvex.h" /* Extra environment-specific items */ #endif /* __ACPI_H__ */ diff --git a/source/include/acpixf.h b/source/include/acpixf.h index 94398aa..e063533 100644 --- a/source/include/acpixf.h +++ b/source/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20170629 +#define ACPI_CA_VERSION 0x20170728 #include "acconfig.h" #include "actypes.h" diff --git a/source/include/actbl2.h b/source/include/actbl2.h index cb1b638..a618a1f 100644 --- a/source/include/actbl2.h +++ b/source/include/actbl2.h @@ -78,6 +78,7 @@ #define ACPI_SIG_MCHI "MCHI" /* Management Controller Host Interface table */ #define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table */ #define ACPI_SIG_MTMR "MTMR" /* MID Timer table */ +#define ACPI_SIG_SDEI "SDEI" /* Software Delegated Exception Interface Table */ #define ACPI_SIG_SLIC "SLIC" /* Software Licensing Description Table */ #define ACPI_SIG_SPCR "SPCR" /* Serial Port Console Redirection table */ #define ACPI_SIG_SPMI "SPMI" /* Server Platform Management Interface table */ @@ -1314,6 +1315,21 @@ typedef struct acpi_mtmr_entry } ACPI_MTMR_ENTRY; +/******************************************************************************* + * + * SDEI - Software Delegated Exception Interface Descriptor Table + * + * Conforms to "Software Delegated Exception Interface (SDEI)" ARM DEN0054A, + * May 8th, 2017. Copyright 2017 ARM Ltd. + * + ******************************************************************************/ + +typedef struct acpi_table_sdei +{ + ACPI_TABLE_HEADER Header; /* Common ACPI table header */ + +} ACPI_TABLE_SDEI; + /******************************************************************************* * diff --git a/source/include/actypes.h b/source/include/actypes.h index b6d4080..4177ccb 100644 --- a/source/include/actypes.h +++ b/source/include/actypes.h @@ -168,6 +168,7 @@ typedef UINT64 ACPI_PHYSICAL_ADDRESS; #define ACPI_MAX_PTR ACPI_UINT64_MAX #define ACPI_SIZE_MAX ACPI_UINT64_MAX #define ACPI_USE_NATIVE_DIVIDE /* Has native 64-bit integer support */ +#define ACPI_USE_NATIVE_MATH64 /* Has native 64-bit integer support */ /* * In the case of the Itanium Processor Family (IPF), the hardware does not @@ -567,6 +568,13 @@ typedef UINT64 ACPI_INTEGER; #define ACPI_VALIDATE_RSDP_SIG(a) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8)) #define ACPI_MAKE_RSDP_SIG(dest) (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8)) +/* + * Algorithm to obtain access bit width. + * Can be used with AccessWidth of ACPI_GENERIC_ADDRESS and AccessSize of + * ACPI_RESOURCE_GENERIC_REGISTER. + */ +#define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + 2)) + /******************************************************************************* * diff --git a/source/include/acutils.h b/source/include/acutils.h index e560a6f..1450b85 100644 --- a/source/include/acutils.h +++ b/source/include/acutils.h @@ -737,7 +737,7 @@ ACPI_GENERIC_STATE * AcpiUtCreatePkgState ( void *InternalObject, void *ExternalObject, - UINT16 Index); + UINT32 Index); ACPI_STATUS AcpiUtCreateUpdateStateAndPush ( @@ -771,6 +771,24 @@ AcpiUtShortDivide ( UINT64 *OutQuotient, UINT32 *OutRemainder); +ACPI_STATUS +AcpiUtShortMultiply ( + UINT64 InMultiplicand, + UINT32 Multiplier, + UINT64 *Outproduct); + +ACPI_STATUS +AcpiUtShortShiftLeft ( + UINT64 Operand, + UINT32 Count, + UINT64 *OutResult); + +ACPI_STATUS +AcpiUtShortShiftRight ( + UINT64 Operand, + UINT32 Count, + UINT64 *OutResult); + /* * utmisc diff --git a/source/include/platform/accygwin.h b/source/include/platform/accygwin.h index c1ca160..667e2c7 100644 --- a/source/include/platform/accygwin.h +++ b/source/include/platform/accygwin.h @@ -72,6 +72,7 @@ #define COMPILER_DEPENDENT_INT64 long long #define COMPILER_DEPENDENT_UINT64 unsigned long long #define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 #endif #ifndef __cdecl diff --git a/source/include/platform/acdragonfly.h b/source/include/platform/acdragonfly.h index 30848af..a992b9d 100644 --- a/source/include/platform/acdragonfly.h +++ b/source/include/platform/acdragonfly.h @@ -51,6 +51,7 @@ #else #define ACPI_MACHINE_WIDTH 32 #define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 #endif #define ACPI_UINTPTR_T uintptr_t diff --git a/source/include/platform/acefi.h b/source/include/platform/acefi.h index c6f8c8b..8f80daf 100644 --- a/source/include/platform/acefi.h +++ b/source/include/platform/acefi.h @@ -44,11 +44,24 @@ #ifndef __ACEFI_H__ #define __ACEFI_H__ +/* + * Single threaded environment where Mutex/Event/Sleep are fake. This model is + * sufficient for pre-boot AcpiExec. + */ +#ifndef DEBUGGER_THREADING +#define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED +#endif /* !DEBUGGER_THREADING */ + /* EDK2 EFI environemnt */ #if defined(_EDK2_EFI) -#define _GNU_EFI +#ifdef USE_STDLIB +#define ACPI_USE_STANDARD_HEADERS +#define ACPI_USE_SYSTEM_CLIBRARY +#define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 +#endif #endif @@ -86,8 +99,10 @@ #endif +#ifndef USE_STDLIB #define UINTN uint64_t #define INTN int64_t +#endif #define ACPI_EFI_ERR(a) (0x8000000000000000 | a) @@ -95,8 +110,10 @@ #define ACPI_MACHINE_WIDTH 32 +#ifndef USE_STDLIB #define UINTN uint32_t #define INTN int32_t +#endif #define ACPI_EFI_ERR(a) (0x80000000 | a) @@ -218,26 +235,59 @@ UINT64 efi_call10(void *func, UINT64 arg1, UINT64 arg2, UINT64 arg3, #endif -/* GNU EFI definitions */ - -#if defined(_GNU_EFI) +/* EFI math64 definitions */ +#if defined(_GNU_EFI) || defined(_EDK2_EFI) /* - * Math helpers + * Math helpers, GNU EFI provided a platform independent 64-bit math + * support. */ -#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ +#ifndef ACPI_DIV_64_BY_32 +#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ + do { \ + UINT64 __n = ((UINT64) n_hi) << 32 | (n_lo); \ + (q32) = (UINT32) DivU64x32 ((__n), (d32), &(r32)); \ + } while (0) +#endif + +#ifndef ACPI_MUL_64_BY_32 +#define ACPI_MUL_64_BY_32(n_hi, n_lo, m32, p32, c32) \ + do { \ + UINT64 __n = ((UINT64) n_hi) << 32 | (n_lo); \ + UINT64 __p = MultU64x32 (__n, (m32)); \ + (p32) = (UINT32) __p; \ + (c32) = (UINT32) (__p >> 32); \ + } while (0) +#endif + +#ifndef ACPI_SHIFT_LEFT_64_by_32 +#define ACPI_SHIFT_LEFT_64_BY_32(n_hi, n_lo, s32) \ + do { \ + UINT64 __n = ((UINT64) n_hi) << 32 | (n_lo); \ + UINT64 __r = LShiftU64 (__n, (s32)); \ + (n_lo) = (UINT32) __r; \ + (n_hi) = (UINT32) (__r >> 32); \ + } while (0) +#endif + +#ifndef ACPI_SHIFT_RIGHT_64_BY_32 +#define ACPI_SHIFT_RIGHT_64_BY_32(n_hi, n_lo, s32) \ do { \ UINT64 __n = ((UINT64) n_hi) << 32 | (n_lo); \ - (q32) = DivU64x32 ((__n), (d32), &(r32)); \ + UINT64 __r = RShiftU64 (__n, (s32)); \ + (n_lo) = (UINT32) __r; \ + (n_hi) = (UINT32) (__r >> 32); \ } while (0) +#endif +#ifndef ACPI_SHIFT_RIGHT_64 #define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ do { \ (n_lo) >>= 1; \ (n_lo) |= (((n_hi) & 1) << 31); \ (n_hi) >>= 1; \ } while (0) - +#endif #endif struct _ACPI_SIMPLE_TEXT_OUTPUT_INTERFACE; @@ -245,17 +295,21 @@ struct _ACPI_SIMPLE_INPUT_INTERFACE; struct _ACPI_EFI_FILE_IO_INTERFACE; struct _ACPI_EFI_FILE_HANDLE; struct _ACPI_EFI_BOOT_SERVICES; +struct _ACPI_EFI_RUNTIME_SERVICES; struct _ACPI_EFI_SYSTEM_TABLE; struct _ACPI_EFI_PCI_IO; extern struct _ACPI_EFI_SYSTEM_TABLE *ST; extern struct _ACPI_EFI_BOOT_SERVICES *BS; +extern struct _ACPI_EFI_RUNTIME_SERVICES *RT; +#ifndef USE_STDLIB typedef union acpi_efi_file ACPI_EFI_FILE; #define FILE ACPI_EFI_FILE extern FILE *stdin; extern FILE *stdout; extern FILE *stderr; +#endif #endif /* __ACEFI_H__ */ diff --git a/source/include/platform/acefiex.h b/source/include/platform/acefiex.h index 859d77e..426cdf3 100644 --- a/source/include/platform/acefiex.h +++ b/source/include/platform/acefiex.h @@ -489,6 +489,11 @@ ACPI_EFI_STATUS typedef ACPI_EFI_STATUS +(ACPI_EFI_API *ACPI_EFI_STALL) ( + UINTN Microseconds); + +typedef +ACPI_EFI_STATUS (ACPI_EFI_API *ACPI_EFI_SET_WATCHDOG_TIMER) ( UINTN Timeout, UINT64 WatchdogCode, @@ -557,6 +562,27 @@ ACPI_EFI_STATUS /* + * EFI Time + */ +typedef struct { + UINT32 Resolution; + UINT32 Accuracy; + BOOLEAN SetsToZero; +} ACPI_EFI_TIME_CAPABILITIES; + +typedef +ACPI_EFI_STATUS +(ACPI_EFI_API *ACPI_EFI_GET_TIME) ( + ACPI_EFI_TIME *Time, + ACPI_EFI_TIME_CAPABILITIES *Capabilities); + +typedef +ACPI_EFI_STATUS +(ACPI_EFI_API *ACPI_EFI_SET_TIME) ( + ACPI_EFI_TIME *Time); + + +/* * Protocol handler functions */ typedef enum { @@ -782,12 +808,11 @@ typedef struct _ACPI_EFI_BOOT_SERVICES { #if 0 ACPI_EFI_EXIT_BOOT_SERVICES ExitBootServices; ACPI_EFI_GET_NEXT_MONOTONIC_COUNT GetNextMonotonicCount; - ACPI_EFI_STALL Stall; #else ACPI_EFI_UNKNOWN_INTERFACE ExitBootServices; ACPI_EFI_UNKNOWN_INTERFACE GetNextMonotonicCount; - ACPI_EFI_UNKNOWN_INTERFACE Stall; #endif + ACPI_EFI_STALL Stall; ACPI_EFI_SET_WATCHDOG_TIMER SetWatchdogTimer; #if 0 @@ -821,6 +846,54 @@ typedef struct _ACPI_EFI_BOOT_SERVICES { /* + * EFI Runtime Services Table + */ +#define ACPI_EFI_RUNTIME_SERVICES_SIGNATURE 0x56524553544e5552 +#define ACPI_EFI_RUNTIME_SERVICES_REVISION (EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION) + +typedef struct _ACPI_EFI_RUNTIME_SERVICES { + ACPI_EFI_TABLE_HEADER Hdr; + + ACPI_EFI_GET_TIME GetTime; + ACPI_EFI_SET_TIME SetTime; +#if 0 + ACPI_EFI_GET_WAKEUP_TIME GetWakeupTime; + ACPI_EFI_SET_WAKEUP_TIME SetWakeupTime; +#else + ACPI_EFI_UNKNOWN_INTERFACE GetWakeupTime; + ACPI_EFI_UNKNOWN_INTERFACE SetWakeupTime; +#endif + +#if 0 + ACPI_EFI_SET_VIRTUAL_ADDRESS_MAP SetVirtualAddressMap; + ACPI_EFI_CONVERT_POINTER ConvertPointer; +#else + ACPI_EFI_UNKNOWN_INTERFACE SetVirtualAddressMap; + ACPI_EFI_UNKNOWN_INTERFACE ConvertPointer; +#endif + +#if 0 + ACPI_EFI_GET_VARIABLE GetVariable; + ACPI_EFI_GET_NEXT_VARIABLE_NAME GetNextVariableName; + ACPI_EFI_SET_VARIABLE SetVariable; +#else + ACPI_EFI_UNKNOWN_INTERFACE GetVariable; + ACPI_EFI_UNKNOWN_INTERFACE GetNextVariableName; + ACPI_EFI_UNKNOWN_INTERFACE SetVariable; +#endif + +#if 0 + ACPI_EFI_GET_NEXT_HIGH_MONO_COUNT GetNextHighMonotonicCount; + ACPI_EFI_RESET_SYSTEM ResetSystem; +#else + ACPI_EFI_UNKNOWN_INTERFACE GetNextHighMonotonicCount; + ACPI_EFI_UNKNOWN_INTERFACE ResetSystem; +#endif + +} ACPI_EFI_RUNTIME_SERVICES; + + +/* * EFI System Table */ @@ -856,11 +929,7 @@ typedef struct _ACPI_EFI_SYSTEM_TABLE { ACPI_EFI_HANDLE StandardErrorHandle; ACPI_SIMPLE_TEXT_OUTPUT_INTERFACE *StdErr; -#if 0 ACPI_EFI_RUNTIME_SERVICES *RuntimeServices; -#else - ACPI_EFI_HANDLE *RuntimeServices; -#endif ACPI_EFI_BOOT_SERVICES *BootServices; UINTN NumberOfTableEntries; @@ -943,19 +1012,34 @@ union acpi_efi_file { }; -/* GNU EFI definitions */ +/* EFI definitions */ -#if defined(_GNU_EFI) +#if defined(_GNU_EFI) || defined(_EDK2_EFI) /* * This is needed to hide platform specific code from ACPICA */ -UINT64 +UINT64 ACPI_EFI_API DivU64x32 ( UINT64 Dividend, UINTN Divisor, UINTN *Remainder); +UINT64 ACPI_EFI_API +MultU64x32 ( + UINT64 Multiplicand, + UINTN Multiplier); + +UINT64 ACPI_EFI_API +LShiftU64 ( + UINT64 Operand, + UINTN Count); + +UINT64 ACPI_EFI_API +RShiftU64 ( + UINT64 Operand, + UINTN Count); + /* * EFI specific prototypes */ @@ -969,7 +1053,6 @@ acpi_main ( int argc, char *argv[]); - #endif extern ACPI_EFI_GUID AcpiGbl_LoadedImageProtocol; diff --git a/source/include/platform/acfreebsd.h b/source/include/platform/acfreebsd.h index 211b379..5341802 100644 --- a/source/include/platform/acfreebsd.h +++ b/source/include/platform/acfreebsd.h @@ -61,6 +61,7 @@ #define ACPI_USE_DO_WHILE_0 #define ACPI_USE_LOCAL_CACHE #define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 #define ACPI_USE_SYSTEM_CLIBRARY #ifdef _KERNEL diff --git a/source/include/platform/acgcc.h b/source/include/platform/acgcc.h index c8ec460..e088bec 100644 --- a/source/include/platform/acgcc.h +++ b/source/include/platform/acgcc.h @@ -84,4 +84,8 @@ typedef __builtin_va_list va_list; #define COMPILER_VA_MACRO 1 +/* GCC supports native multiply/shift on 32-bit platforms */ + +#define ACPI_USE_NATIVE_MATH64 + #endif /* __ACGCC_H__ */ diff --git a/source/include/platform/achaiku.h b/source/include/platform/achaiku.h index 6b7da88..a7fcd84 100644 --- a/source/include/platform/achaiku.h +++ b/source/include/platform/achaiku.h @@ -58,6 +58,7 @@ struct mutex; #define ACPI_MUTEX struct mutex * #define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 /* #define ACPI_THREAD_ID thread_id */ diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h index 2e92a85..92929fb 100644 --- a/source/include/platform/aclinux.h +++ b/source/include/platform/aclinux.h @@ -129,6 +129,7 @@ /* Host-dependent types and defines for in-kernel ACPICA */ #define ACPI_MACHINE_WIDTH BITS_PER_LONG +#define ACPI_USE_NATIVE_MATH64 #define ACPI_EXPORT_SYMBOL(symbol) EXPORT_SYMBOL(symbol); #define strtoul simple_strtoul @@ -217,6 +218,7 @@ #define COMPILER_DEPENDENT_INT64 long long #define COMPILER_DEPENDENT_UINT64 unsigned long long #define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 #endif #ifndef __cdecl diff --git a/source/include/platform/acmsvc.h b/source/include/platform/acmsvc.h index b8920ca..8ab255a 100644 --- a/source/include/platform/acmsvc.h +++ b/source/include/platform/acmsvc.h @@ -53,30 +53,6 @@ * out if these are actually defined. */ -/* - * Map low I/O functions for MS. This allows us to disable MS language - * extensions for maximum portability. - */ -#define open _open -#define read _read -#define write _write -#define close _close -#define stat _stat -#define fstat _fstat -#define mkdir _mkdir -#define snprintf _snprintf -#if _MSC_VER <= 1200 /* Versions below VC++ 6 */ -#define vsnprintf _vsnprintf -#endif -#define O_RDONLY _O_RDONLY -#define O_BINARY _O_BINARY -#define O_CREAT _O_CREAT -#define O_WRONLY _O_WRONLY -#define O_TRUNC _O_TRUNC -#define S_IREAD _S_IREAD -#define S_IWRITE _S_IWRITE -#define S_IFDIR _S_IFDIR - /* Eliminate warnings for "old" (non-secure) versions of clib functions */ #ifndef _CRT_SECURE_NO_WARNINGS @@ -109,11 +85,11 @@ /* Do not maintain the architecture specific stuffs for the EFI ports */ -#if !defined(_EDK2_EFI) && !defined(_GNU_EFI) -#ifndef _LINT +#if defined(__i386__) && !defined(_GNU_EFI) && !defined(_EDK2_EFI) /* * Math helper functions */ +#ifndef ACPI_DIV_64_BY_32 #define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ { \ __asm mov edx, n_hi \ @@ -122,26 +98,52 @@ __asm mov q32, eax \ __asm mov r32, edx \ } +#endif -#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ +#ifndef ACPI_MUL_64_BY_32 +#define ACPI_MUL_64_BY_32(n_hi, n_lo, m32, p32, c32) \ { \ - __asm shr n_hi, 1 \ - __asm rcr n_lo, 1 \ + __asm mov edx, n_hi \ + __asm mov eax, n_lo \ + __asm mul m32 \ + __asm mov p32, eax \ + __asm mov c32, edx \ } -#else +#endif -/* Fake versions to make lint happy */ +#ifndef ACPI_SHIFT_LEFT_64_BY_32 +#define ACPI_SHIFT_LEFT_64_BY_32(n_hi, n_lo, s32) \ +{ \ + __asm mov edx, n_hi \ + __asm mov eax, n_lo \ + __asm mov ecx, s32 \ + __asm and ecx, 31 \ + __asm shld edx, eax, cl \ + __asm shl eax, cl \ + __asm mov n_hi, edx \ + __asm mov n_lo, eax \ +} +#endif -#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ -{ \ - q32 = n_hi / d32; \ - r32 = n_lo / d32; \ +#ifndef ACPI_SHIFT_RIGHT_64_BY_32 +#define ACPI_SHIFT_RIGHT_64_BY_32(n_hi, n_lo, s32) \ +{ \ + __asm mov edx, n_hi \ + __asm mov eax, n_lo \ + __asm mov ecx, s32 \ + __asm and ecx, 31 \ + __asm shrd eax, edx, cl \ + __asm shr edx, cl \ + __asm mov n_hi, edx \ + __asm mov n_lo, eax \ } +#endif +#ifndef ACPI_SHIFT_RIGHT_64 #define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ { \ - n_hi >>= 1; \ - n_lo >>= 1; \ + __asm shr n_hi, 1 \ + __asm rcr n_lo, 1 \ } #endif #endif diff --git a/source/include/platform/acnetbsd.h b/source/include/platform/acnetbsd.h index 5bccbf5..dfa5ec0 100644 --- a/source/include/platform/acnetbsd.h +++ b/source/include/platform/acnetbsd.h @@ -70,6 +70,7 @@ #define asm __asm #define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 #define ACPI_SYSTEM_XFACE #define ACPI_EXTERNAL_XFACE @@ -107,5 +108,6 @@ /* Always use NetBSD code over our local versions */ #define ACPI_USE_SYSTEM_CLIBRARY #define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 #endif /* __ACNETBSD_H__ */ diff --git a/source/include/platform/acos2.h b/source/include/platform/acos2.h index 43776aa..9097ba2 100644 --- a/source/include/platform/acos2.h +++ b/source/include/platform/acos2.h @@ -56,6 +56,7 @@ #define COMPILER_DEPENDENT_INT64 long long #define COMPILER_DEPENDENT_UINT64 unsigned long long #define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 #define ACPI_SYSTEM_XFACE APIENTRY #define ACPI_EXTERNAL_XFACE APIENTRY diff --git a/source/include/platform/acqnx.h b/source/include/platform/acqnx.h index 0d91b52..9dcabc8 100644 --- a/source/include/platform/acqnx.h +++ b/source/include/platform/acqnx.h @@ -66,5 +66,6 @@ #define __cdecl #define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 #endif /* __ACQNX_H__ */ diff --git a/source/include/platform/acwin.h b/source/include/platform/acwin.h index 6abdb9b..15d4ab1 100644 --- a/source/include/platform/acwin.h +++ b/source/include/platform/acwin.h @@ -48,6 +48,8 @@ #define ACPI_USE_SYSTEM_CLIBRARY #define ACPI_MACHINE_WIDTH 32 +#define ACPI_USE_NATIVE_DIVIDE +#define ACPI_USE_NATIVE_MATH64 #ifdef ACPI_DEFINE_ALTERNATE_TYPES /* @@ -62,6 +64,30 @@ typedef unsigned int u32; typedef COMPILER_DEPENDENT_UINT64 u64; #endif +/* + * Map low I/O functions for MS. This allows us to disable MS language + * extensions for maximum portability. + */ +#define open _open +#define read _read +#define write _write +#define close _close +#define stat _stat +#define fstat _fstat +#define mkdir _mkdir +#define snprintf _snprintf +#if _MSC_VER <= 1200 /* Versions below VC++ 6 */ +#define vsnprintf _vsnprintf +#endif +#define O_RDONLY _O_RDONLY +#define O_BINARY _O_BINARY +#define O_CREAT _O_CREAT +#define O_WRONLY _O_WRONLY +#define O_TRUNC _O_TRUNC +#define S_IREAD _S_IREAD +#define S_IWRITE _S_IWRITE +#define S_IFDIR _S_IFDIR + /* * Handle platform- and compiler-specific assembly language differences. diff --git a/source/include/platform/acwin64.h b/source/include/platform/acwin64.h index 9585b24..1cb4cf0 100644 --- a/source/include/platform/acwin64.h +++ b/source/include/platform/acwin64.h @@ -50,6 +50,30 @@ #define ACPI_MACHINE_WIDTH 64 /* + * Map low I/O functions for MS. This allows us to disable MS language + * extensions for maximum portability. + */ +#define open _open +#define read _read +#define write _write +#define close _close +#define stat _stat +#define fstat _fstat +#define mkdir _mkdir +#define snprintf _snprintf +#if _MSC_VER <= 1200 /* Versions below VC++ 6 */ +#define vsnprintf _vsnprintf +#endif +#define O_RDONLY _O_RDONLY +#define O_BINARY _O_BINARY +#define O_CREAT _O_CREAT +#define O_WRONLY _O_WRONLY +#define O_TRUNC _O_TRUNC +#define S_IREAD _S_IREAD +#define S_IWRITE _S_IWRITE +#define S_IFDIR _S_IFDIR + +/* * Handle platform- and compiler-specific assembly language differences. * * Notes: diff --git a/source/os_specific/service_layers/oslinuxtbl.c b/source/os_specific/service_layers/oslinuxtbl.c index 72af73c..cb1cc7e 100644 --- a/source/os_specific/service_layers/oslinuxtbl.c +++ b/source/os_specific/service_layers/oslinuxtbl.c @@ -880,7 +880,7 @@ OslListBiosTables ( /* Skip NULL entries in RSDT/XSDT */ - if (!TableAddress) + if (TableAddress == 0) { continue; } @@ -933,7 +933,8 @@ OslGetBiosTable ( UINT8 NumberOfTables; UINT8 ItemSize; UINT32 CurrentInstance = 0; - ACPI_PHYSICAL_ADDRESS TableAddress = 0; + ACPI_PHYSICAL_ADDRESS TableAddress; + ACPI_PHYSICAL_ADDRESS FirstTableAddress = 0; UINT32 TableLength = 0; ACPI_STATUS Status = AE_OK; UINT32 i; @@ -947,10 +948,10 @@ OslGetBiosTable ( ACPI_COMPARE_NAME (Signature, ACPI_SIG_DSDT) || ACPI_COMPARE_NAME (Signature, ACPI_SIG_FACS)) { - if (Instance > 0) - { - return (AE_LIMIT); - } + +FindNextInstance: + + TableAddress = 0; /* * Get the appropriate address, either 32-bit or 64-bit. Be very @@ -959,28 +960,34 @@ OslGetBiosTable ( */ if (ACPI_COMPARE_NAME (Signature, ACPI_SIG_DSDT)) { - if ((Gbl_Fadt->Header.Length >= MIN_FADT_FOR_XDSDT) && - Gbl_Fadt->XDsdt) + if (CurrentInstance < 2) { - TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_Fadt->XDsdt; - } - else if ((Gbl_Fadt->Header.Length >= MIN_FADT_FOR_DSDT) && - Gbl_Fadt->Dsdt) - { - TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_Fadt->Dsdt; + if ((Gbl_Fadt->Header.Length >= MIN_FADT_FOR_XDSDT) && + Gbl_Fadt->XDsdt && CurrentInstance == 0) + { + TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_Fadt->XDsdt; + } + else if ((Gbl_Fadt->Header.Length >= MIN_FADT_FOR_DSDT) && + Gbl_Fadt->Dsdt != FirstTableAddress) + { + TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_Fadt->Dsdt; + } } } else if (ACPI_COMPARE_NAME (Signature, ACPI_SIG_FACS)) { - if ((Gbl_Fadt->Header.Length >= MIN_FADT_FOR_XFACS) && - Gbl_Fadt->XFacs) + if (CurrentInstance < 2) { - TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_Fadt->XFacs; - } - else if ((Gbl_Fadt->Header.Length >= MIN_FADT_FOR_FACS) && - Gbl_Fadt->Facs) - { - TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_Fadt->Facs; + if ((Gbl_Fadt->Header.Length >= MIN_FADT_FOR_XFACS) && + Gbl_Fadt->XFacs && CurrentInstance == 0) + { + TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_Fadt->XFacs; + } + else if ((Gbl_Fadt->Header.Length >= MIN_FADT_FOR_FACS) && + Gbl_Fadt->Facs != FirstTableAddress) + { + TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_Fadt->Facs; + } } } else if (ACPI_COMPARE_NAME (Signature, ACPI_SIG_XSDT)) @@ -989,16 +996,32 @@ OslGetBiosTable ( { return (AE_BAD_SIGNATURE); } - TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_Rsdp.XsdtPhysicalAddress; + if (CurrentInstance == 0) + { + TableAddress = + (ACPI_PHYSICAL_ADDRESS) Gbl_Rsdp.XsdtPhysicalAddress; + } } else if (ACPI_COMPARE_NAME (Signature, ACPI_SIG_RSDT)) { - TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_Rsdp.RsdtPhysicalAddress; + if (CurrentInstance == 0) + { + TableAddress = + (ACPI_PHYSICAL_ADDRESS) Gbl_Rsdp.RsdtPhysicalAddress; + } } else { - TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_RsdpAddress; - Signature = ACPI_SIG_RSDP; + if (CurrentInstance == 0) + { + TableAddress = (ACPI_PHYSICAL_ADDRESS) Gbl_RsdpAddress; + Signature = ACPI_SIG_RSDP; + } + } + + if (TableAddress == 0) + { + goto ExitFindTable; } /* Now we can get the requested special table */ @@ -1010,6 +1033,20 @@ OslGetBiosTable ( } TableLength = ApGetTableLength (MappedTable); + if (FirstTableAddress == 0) + { + FirstTableAddress = TableAddress; + } + + /* Match table instance */ + + if (CurrentInstance != Instance) + { + OslUnmapTable (MappedTable); + MappedTable = NULL; + CurrentInstance++; + goto FindNextInstance; + } } else /* Case for a normal ACPI table */ { @@ -1047,7 +1084,7 @@ OslGetBiosTable ( /* Skip NULL entries in RSDT/XSDT */ - if (!TableAddress) + if (TableAddress == 0) { continue; } @@ -1082,6 +1119,8 @@ OslGetBiosTable ( } } +ExitFindTable: + if (!MappedTable) { return (AE_LIMIT); diff --git a/source/tools/acpidump/apfiles.c b/source/tools/acpidump/apfiles.c index faaf6bc..5d4b00f 100644 --- a/source/tools/acpidump/apfiles.c +++ b/source/tools/acpidump/apfiles.c @@ -67,7 +67,7 @@ static int ApIsExistingFile ( char *Pathname) { -#ifndef _GNU_EFI +#if !defined(_GNU_EFI) && !defined(_EDK2_EFI) struct stat StatInfo; diff --git a/source/tools/acpidump/apmain.c b/source/tools/acpidump/apmain.c index db48f4f..4bc561a 100644 --- a/source/tools/acpidump/apmain.c +++ b/source/tools/acpidump/apmain.c @@ -332,7 +332,7 @@ ApDoOptions ( * ******************************************************************************/ -#ifndef _GNU_EFI +#if !defined(_GNU_EFI) && !defined(_EDK2_EFI) int ACPI_SYSTEM_XFACE main ( int argc, diff --git a/source/tools/acpihelp/ahaslkey.c b/source/tools/acpihelp/ahaslkey.c index 443d489..513a21d 100644 --- a/source/tools/acpihelp/ahaslkey.c +++ b/source/tools/acpihelp/ahaslkey.c @@ -187,6 +187,7 @@ const AH_DIRECTIVE_INFO Gbl_PreprocessorDirectives[] = {"__PATH__", "Return the full pathname of the current ASL file"}, {"__LINE__", "Return the current line number within the current ASL file"}, {"__DATE__", "Return the current date"}, + {"__METHOD__", "Return the declared name of the current control method"}, {"__IASL__", "Permanently defined for the iASL compiler"}, {NULL, NULL} }; diff --git a/source/tools/efihello/efihello.c b/source/tools/efihello/efihello.c index de0489b..1151902 100644 --- a/source/tools/efihello/efihello.c +++ b/source/tools/efihello/efihello.c @@ -61,7 +61,7 @@ static char LineBuffer[LINE_SIZE]; * ******************************************************************************/ -#ifndef _GNU_EFI +#if !defined(_GNU_EFI) && !defined(_EDK2_EFI) int ACPI_SYSTEM_XFACE main ( int argc, diff --git a/tests/aslts/src/runtime/cntl/common.asl b/tests/aslts/src/runtime/cntl/common.asl index 19cbd79..675c97b 100644 --- a/tests/aslts/src/runtime/cntl/common.asl +++ b/tests/aslts/src/runtime/cntl/common.asl @@ -273,7 +273,7 @@ Name(FNAM, 0) // Test filename */ Method(SET0, 3) { if (ERR0) { - err("SET0", z062, 0, 0, 0, ERR0, 0) + err("SET0", z062, __LINE__, 0, 0, ERR0, 0) } else { CopyObject(arg0, ERR0) CopyObject(arg1, ERR1) @@ -558,7 +558,7 @@ Method(STTT, 4) { // Current test finish Method(FTTT) { - CH03("FTTT", 0, 0, 0, 0) + CH03("FTTT", 0, 0, __LINE__, 0) // Report completion of previous root Method RPT0() @@ -734,10 +734,7 @@ Method(err, 7) // Add ID of test case being executed Or(ERRB, Local0, Local7) - Concatenate("---------- ERROR : 0x", Local7, Local1) - Concatenate(", 0x", Local6, Local2) - Concatenate(Local1, Local2, Local0) - Concatenate(Local0, ", ", Local1) + Store("---------- ERROR : ", Local1) Concatenate(Local1, arg0, Local0) Store(Local0, Debug) @@ -915,7 +912,7 @@ Method(prn0, 1, Serialized) { Method(CH00, 4) { if (LNotEqual(arg3, Zero)) { - err(arg0, z062, 1, 0, 0, arg1, arg2) + err(arg0, z062, __LINE__, 0, 0, arg1, arg2) } } @@ -929,7 +926,7 @@ Method(CH00, 4) Method(CH01, 4) { if (LNotEqual(arg3, Ones)) { - err(arg0, z062, 2, 0, 0, arg1, arg2) + err(arg0, z062, __LINE__, 0, 0, arg1, arg2) } } @@ -966,84 +963,84 @@ Name(ALL0, "`1234567890-=qwertyuiop[]\\asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+QWERTYU Method(CST0) { if (LNotEqual(c000, 10)) { - err("c000 corrupted", z062, 3, 0, 0, 0, 0) + err("c000 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c001, 5)) { - err("c001 corrupted", z062, 4, 0, 0, 0, 0) + err("c001 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c002, 13)) { - err("c002 corrupted", z062, 5, 0, 0, 0, 0) + err("c002 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c003, 12)) { - err("c003 corrupted", z062, 6, 0, 0, 0, 0) + err("c003 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c004, 6)) { - err("c004 corrupted", z062, 7, 0, 0, 0, 0) + err("c004 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c005, 4)) { - err("c005 corrupted", z062, 8, 0, 0, 0, 0) + err("c005 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c006, 31)) { - err("c006 corrupted", z062, 9, 0, 0, 0, 0) + err("c006 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c007, 51)) { - err("c007 corrupted", z062, 10, 0, 0, 0, 0) + err("c007 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c008, 0)) { - err("c008 corrupted", z062, 11, 0, 0, 0, 0) + err("c008 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c009, 1)) { - err("c009 corrupted", z062, 12, 0, 0, 0, 0) + err("c009 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00a, 2)) { - err("c00a corrupted", z062, 13, 0, 0, 0, 0) + err("c00a corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00b, 3)) { - err("c00b corrupted", z062, 14, 0, 0, 0, 0) + err("c00b corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00c, 4)) { - err("c00c corrupted", z062, 15, 0, 0, 0, 0) + err("c00c corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00d, 5)) { - err("c00d corrupted", z062, 16, 0, 0, 0, 0) + err("c00d corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00e, 6)) { - err("c00e corrupted", z062, 17, 0, 0, 0, 0) + err("c00e corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00f, 7)) { - err("c00f corrupted", z062, 18, 0, 0, 0, 0) + err("c00f corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c010, 8)) { - err("c010 corrupted", z062, 19, 0, 0, 0, 0) + err("c010 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c011, 9)) { - err("c011 corrupted", z062, 20, 0, 0, 0, 0) + err("c011 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c012, 10)) { - err("c012 corrupted", z062, 21, 0, 0, 0, 0) + err("c012 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c013, 11)) { - err("c013 corrupted", z062, 22, 0, 0, 0, 0) + err("c013 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c014, 12)) { - err("c014 corrupted", z062, 23, 0, 0, 0, 0) + err("c014 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c015, 13)) { - err("c015 corrupted", z062, 24, 0, 0, 0, 0) + err("c015 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c016, 14)) { - err("c016 corrupted", z062, 25, 0, 0, 0, 0) + err("c016 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c017, 15)) { - err("c017 corrupted", z062, 26, 0, 0, 0, 0) + err("c017 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c018, 16)) { - err("c018 corrupted", z062, 27, 0, 0, 0, 0) + err("c018 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c019, 17)) { - err("c019 corrupted", z062, 28, 0, 0, 0, 0) + err("c019 corrupted", z062, __LINE__, 0, 0, 0, 0) } } @@ -1149,12 +1146,12 @@ Method(sft1, 5, Serialized) Name(rest, 0) if (LLess(arg2, 1)) { - err("sft", z062, 29, 0, 0, arg2, 1) + err("sft", z062, __LINE__, 0, 0, arg2, 1) return (Ones) } if (LGreater(arg1, 7)) { - err("sft", z062, 30, 0, 0, arg1, 7) + err("sft", z062, __LINE__, 0, 0, arg1, 7) return (Ones) } @@ -1290,19 +1287,19 @@ Method(m4c0, 4, Serialized) if (F64) { Store(ObjectType(arg2), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z062, 31, 0, 0, tmp0, tmp1) + err(arg0, z062, __LINE__, 0, 0, tmp0, tmp1) Store(1, Local7) } elseif (LNotEqual(arg1, arg2)) { - err(arg0, z062, 32, 0, 0, arg1, arg2) + err(arg0, z062, __LINE__, 0, 0, arg1, arg2) Store(1, Local7) } } else { Store(ObjectType(arg3), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z062, 33, 0, 0, tmp0, tmp1) + err(arg0, z062, __LINE__, 0, 0, tmp0, tmp1) Store(1, Local7) } elseif (LNotEqual(arg1, arg3)) { - err(arg0, z062, 34, 0, 0, arg1, arg3) + err(arg0, z062, __LINE__, 0, 0, arg1, arg3) Store(1, Local7) } } @@ -1377,7 +1374,7 @@ Method(STRT, 1, Serialized) /* Reset internal information about exceptions */ - CH03("", 0, 0x888, 0, 0) + CH03("", 0, 0x888, __LINE__, 0) Store(0, EXC0) Store(0, EXC1) } @@ -1973,7 +1970,7 @@ Method(FNSH) { // Check, the current number of exceptions is zero - CH03("FNSH", 0, 0, 0, 0) + CH03("FNSH", 0, 0, __LINE__, 0) // Check all the constants are not corrupted diff --git a/tests/aslts/src/runtime/cntl/ehandle.asl b/tests/aslts/src/runtime/cntl/ehandle.asl index 4d34d06..4099144 100644 --- a/tests/aslts/src/runtime/cntl/ehandle.asl +++ b/tests/aslts/src/runtime/cntl/ehandle.asl @@ -194,7 +194,7 @@ Method(_ERR, 3) Store(arg0, Index(EX03, EXC0)) } else { Store("Maximal number of exceptions exceeded", Debug) - err("_ERR", z063, 0, 0, 0, EXC0, EXC2) + err("_ERR", z063, __LINE__, 0, 0, EXC0, EXC2) } } @@ -214,7 +214,7 @@ Method(CH02) { if (EXC1) { Concatenate("Some unexpected exceptions were handled, 0x", EXC1, Local0) - err("CH02", z063, 1, 0, 0, Local0, 0) + err("CH02", z063, __LINE__, 0, 0, Local0, 0) } Return(EXC1) } @@ -223,7 +223,7 @@ Method(CH02) * Check that the counter of current exceptions is zero. Set it to zero. * arg0 - diagnostic message * arg1 - absolute index of file initiating the checking - * arg2 - index of checking + * arg2 - line number of checking * arg3 - arg5 of err, "received value" * arg4 - arg6 of err, "expected value" */ @@ -237,7 +237,7 @@ Method(CH03, 5) Concatenate(Local1, EX01, Local0) Concatenate(Local0, ", ", Local1) Concatenate(Local1, EX00, Debug) - err(arg0, z063, 2, arg1, arg2, arg3, arg4) + err(arg0, z063, __LINE__, arg1, arg2, arg3, arg4) Store(EXC0, Local7) } Store(0, EXC0) @@ -281,7 +281,7 @@ Method(ST16, 1, Serialized) * * arg2 - index of exception info in pf00 Package * arg3 - absolute index of file initiating the checking - * arg4 - index of checking + * arg4 - line number of checking * arg5 - arg5 of err, "received value" * arg6 - arg6 of err, "expected value" */ @@ -355,7 +355,7 @@ Method(CH04, 7) Store(0, EX04) if (Local5) { - err(arg0, z063, 3, arg3, arg4, arg5, arg6) + err(arg0, z063, __LINE__, arg3, arg4, arg5, arg6) } return (Local5) @@ -363,16 +363,16 @@ Method(CH04, 7) Method(CH05) { - return (CH03("CH05", 0, 0, 0, 0)) + return (CH03("CH05", 0, 0, __LINE__, 0)) } Method(CH06, 3) { if (EXCV) { - return (CH04(arg0, 0, arg2, 0, arg1, 0, 0)) + return (CH04(arg0, 0, arg2, 0, __LINE__, 0, 0)) } else { // Just only presence of ANY exception(s) - return (CH04(arg0, 0, 0xff, 0, arg1, 0, 0)) + return (CH04(arg0, 0, 0xff, 0, __LINE__, 0, 0)) } } @@ -382,9 +382,9 @@ Method(CH06, 3) Method(CH07, 7) { if (SLCK) { - CH03(arg0, arg3, arg4, arg5, arg6) + CH03(arg0, arg3, arg4, __LINE__, arg6) } else { - CH04(arg0, arg1, arg2, arg3, arg4, arg5, arg6) + CH04(arg0, arg1, arg2, arg3, __LINE__, arg5, arg6) } } @@ -475,7 +475,7 @@ Method(CH08, 6) Concatenate(Local0, ", number of exceptions 0x", Local1) Concatenate(Local1, Local4, Local0) MSG0(arg1, Local0) - err(arg0, z063, 4, arg2, arg3, arg4, arg5) + err(arg0, z063, __LINE__, arg2, arg3, arg4, arg5) Store(1, Local7) } @@ -555,7 +555,7 @@ Method(CH09, 6) */ if (Local5) { - err("", z063, 5, arg3, arg4, 0, 0) + err("", z063, __LINE__, arg3, arg4, 0, 0) } Store(Local7, arg5) diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl index 34ea568..6e5ea01 100644 --- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl +++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl @@ -56,13 +56,13 @@ Method(m374,, Serialized) if (rn00) { - CH03(ts, z132, 0, 0, 0) + CH03(ts, z132, 0, __LINE__, 0) _TCI(c200, Local1) m000(0) _TCI(c201, pp0a) - CH04(ts, 0, 0xff, z132, 1, 0, 0) + CH04(ts, 0, 0xff, z132, __LINE__, 0, 0) m3a3(Local1, pp0a, Local3) m3a4(Local1, pp0a, Local3, 0, 0, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl index 95a094e..29e6098 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl @@ -87,7 +87,7 @@ Method(mf00,, Serialized) if (chk0) { if (LNotEqual(i001, 0xabcd0000)) { - err(ts, z161, 0x001, 0, 0, i001, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, i001, 0xabcd0000) } } @@ -113,7 +113,7 @@ Method(mf01,, Serialized) if (chk0) { /* This LNotEqual breaks */ if (LNotEqual(Local0, "qwertyuiop_sdfghjkl")) { - err(ts, z161, 0x004, 0, 0, Local0, "qwertyuiop_sdfghjkl") + err(ts, z161, __LINE__, 0, 0, Local0, "qwertyuiop_sdfghjkl") } } @@ -136,7 +136,7 @@ Method(mf02,, Serialized) if (chk0) { /* This LNotEqual breaks */ if (LEqual("qwerty", "sdfghj")) { - err(ts, z161, 0x004, 0, 0, "qwerty", "sdfghj") + err(ts, z161, __LINE__, 0, 0, "qwerty", "sdfghj") } } @@ -171,7 +171,7 @@ Method(mf03,, Serialized) if (chk1) { Store(m000(), Local0) if (LNotEqual(Local0, 0x24680003)) { - err(ts, z161, 0x007, 0, 0, Local0, 0x24680003) + err(ts, z161, __LINE__, 0, 0, Local0, 0x24680003) } } @@ -214,9 +214,9 @@ Method(mf04,, Serialized) if (chk0) { Store(m000(), Local0) if (LNotEqual(Local0, 0x1006)) { - err(ts, z161, 0x00a, 0, 0, Local0, 0x1006) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1006) } - CH03(ts, z161, 0x00b, 0, 0) + CH03(ts, z161, 0x00b, __LINE__, 0) } Return(POUT) @@ -245,7 +245,7 @@ Method(mf05,, Serialized) if (chk1) { Store(m000(0xabcd0000), Local0) if (LNotEqual(Local0, 0x1006)) { - err(ts, z161, 0x00a, 0, 0, Local0, 0x1006) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1006) } } @@ -275,10 +275,10 @@ Method(mf06,, Serialized) if (chk1) { if (LNotEqual(Local0, 0x1006)) { - err(ts, z161, 0x00a, 0, 0, Local0, 0x1006) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1006) } if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z161, 0x00a, 0, 0, i000, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, i000, 0xabcd0000) } } @@ -308,10 +308,10 @@ Method(mf07,, Serialized) if (chk1) { if (LNotEqual(Local0, 0x1006)) { - err(ts, z161, 0x00a, 0, 0, Local0, 0x1006) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1006) } if (LNotEqual(Local7, 0xabcd0000)) { - err(ts, z161, 0x00a, 0, 0, Local7, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, Local7, 0xabcd0000) } } @@ -365,7 +365,7 @@ Method(mf08,, Serialized) Store(0x80, bf00) if (LNotEqual(bf00, 0x80)) { - err(ts, z161, 0x00d, 0, 0, bf00, 0x80) + err(ts, z161, __LINE__, 0, 0, bf00, 0x80) } } /* if(chk0) */ @@ -388,7 +388,7 @@ Method(mf09,, Serialized) if (chk0) { Store(DerefOf(Index(s000, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x38) + err(ts, z161, __LINE__, 0, 0, Local0, 0x38) } } @@ -438,10 +438,10 @@ Method(mf0a,, Serialized) Store(m000(f000), Local0) if (chk1) { if (LNotEqual(Local0, 0x1234569e)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x1234569e) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1234569e) } if (LNotEqual(f000, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, f000, 0x12345678) + err(ts, z161, __LINE__, 0, 0, f000, 0x12345678) } } @@ -449,10 +449,10 @@ Method(mf0a,, Serialized) Store(m001(f000), Local0) if (chk1) { if (LNotEqual(Local0, 0x2468acef)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x2468acef) + err(ts, z161, __LINE__, 0, 0, Local0, 0x2468acef) } if (LNotEqual(f000, 0x12345675)) { - err(ts, z161, 0x010, 0, 0, f000, 0x12345675) + err(ts, z161, __LINE__, 0, 0, f000, 0x12345675) } } @@ -503,10 +503,10 @@ Method(mf0b,, Serialized) Store(m000(bnk0), Local0) if (chk1) { if (LNotEqual(Local0, 0x1234569e)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x1234569e) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1234569e) } if (LNotEqual(bnk0, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, bnk0, 0x12345678) + err(ts, z161, __LINE__, 0, 0, bnk0, 0x12345678) } } @@ -514,10 +514,10 @@ Method(mf0b,, Serialized) Store(m001(bnk0), Local0) if (chk1) { if (LNotEqual(Local0, 0x2468acef)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x2468acef) + err(ts, z161, __LINE__, 0, 0, Local0, 0x2468acef) } if (LNotEqual(bnk0, 0x12345675)) { - err(ts, z161, 0x010, 0, 0, bnk0, 0x12345675) + err(ts, z161, __LINE__, 0, 0, bnk0, 0x12345675) } } @@ -568,10 +568,10 @@ Method(mf0c,, Serialized) Store(m000(if00), Local0) if (chk1) { if (LNotEqual(Local0, 0x12121238)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x12121238) + err(ts, z161, __LINE__, 0, 0, Local0, 0x12121238) } if (LNotEqual(if00, 0x12121212)) { - err(ts, z161, 0x010, 0, 0, if00, 0x12121212) + err(ts, z161, __LINE__, 0, 0, if00, 0x12121212) } } @@ -579,10 +579,10 @@ Method(mf0c,, Serialized) Store(m001(if00), Local0) if (chk1) { if (LNotEqual(Local0, 0x24242429)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x24242429) + err(ts, z161, __LINE__, 0, 0, Local0, 0x24242429) } if (LNotEqual(if00, 0x12121212)) { - err(ts, z161, 0x010, 0, 0, if00, 0x12121212) + err(ts, z161, __LINE__, 0, 0, if00, 0x12121212) } } @@ -620,10 +620,10 @@ Method(mf0d,, Serialized) Store(m000(bf00), Local0) if (chk0) { if (LNotEqual(Local0, 0x1234569e)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x1234569e) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1234569e) } if (LNotEqual(bf00, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, bf00, 0x12345678) + err(ts, z161, __LINE__, 0, 0, bf00, 0x12345678) } } @@ -657,10 +657,10 @@ Method(mf0e,, Serialized) Store(m001(bf00), Local0) if (chk0) { if (LNotEqual(Local0, 0x2468acef)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x2468acef) + err(ts, z161, __LINE__, 0, 0, Local0, 0x2468acef) } if (LNotEqual(bf00, 0x12345675)) { - err(ts, z161, 0x010, 0, 0, bf00, 0x12345675) + err(ts, z161, __LINE__, 0, 0, bf00, 0x12345675) } } @@ -710,10 +710,10 @@ Method(mf0f,, Serialized) Store(m000(bf00), Local0) if (chk0) { if (LNotEqual(Local0, 0x1234569e)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x1234569e) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1234569e) } if (LNotEqual(bf00, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, bf00, 0x12345678) + err(ts, z161, __LINE__, 0, 0, bf00, 0x12345678) } } @@ -721,10 +721,10 @@ Method(mf0f,, Serialized) Store(m001(bf00), Local0) if (chk0) { if (LNotEqual(Local0, 0x2468acef)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x2468acef) + err(ts, z161, __LINE__, 0, 0, Local0, 0x2468acef) } if (LNotEqual(bf00, 0x12345675)) { - err(ts, z161, 0x010, 0, 0, bf00, 0x12345675) + err(ts, z161, __LINE__, 0, 0, bf00, 0x12345675) } } @@ -769,10 +769,10 @@ Method(mf10,, Serialized) OUTP(b000) if (LNotEqual(Local0, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x12345678) + err(ts, z161, __LINE__, 0, 0, Local0, 0x12345678) } if (LNotEqual(bf00, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, bf00, 0x12345678) + err(ts, z161, __LINE__, 0, 0, bf00, 0x12345678) } Return(POUT) @@ -890,43 +890,43 @@ Method(mf12,, Serialized) m000() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z161, 0x012, 0, 0, i000, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, i000, 0xabcd0000) } if (LNotEqual(i001, 0xabcd0001)) { - err(ts, z161, 0x013, 0, 0, i001, 0xabcd0001) + err(ts, z161, __LINE__, 0, 0, i001, 0xabcd0001) } if (LNotEqual(i002, 0xabcd0002)) { - err(ts, z161, 0x014, 0, 0, i002, 0xabcd0002) + err(ts, z161, __LINE__, 0, 0, i002, 0xabcd0002) } if (LNotEqual(i003, 0xabcd0003)) { - err(ts, z161, 0x015, 0, 0, i003, 0xabcd0003) + err(ts, z161, __LINE__, 0, 0, i003, 0xabcd0003) } if (LNotEqual(i004, 0xabcd0004)) { - err(ts, z161, 0x016, 0, 0, i004, 0xabcd0004) + err(ts, z161, __LINE__, 0, 0, i004, 0xabcd0004) } if (LNotEqual(i005, 0xabcd0005)) { - err(ts, z161, 0x017, 0, 0, i005, 0xabcd0005) + err(ts, z161, __LINE__, 0, 0, i005, 0xabcd0005) } if (LNotEqual(i006, 0xabcd0006)) { - err(ts, z161, 0x018, 0, 0, i006, 0xabcd0006) + err(ts, z161, __LINE__, 0, 0, i006, 0xabcd0006) } if (LNotEqual(i007, 0xabcd0007)) { - err(ts, z161, 0x019, 0, 0, i007, 0xabcd0007) + err(ts, z161, __LINE__, 0, 0, i007, 0xabcd0007) } if (LNotEqual(i008, 0xabcd0008)) { - err(ts, z161, 0x01a, 0, 0, i008, 0xabcd0008) + err(ts, z161, __LINE__, 0, 0, i008, 0xabcd0008) } if (LNotEqual(i009, 0xabcd0009)) { - err(ts, z161, 0x01b, 0, 0, i009, 0xabcd0009) + err(ts, z161, __LINE__, 0, 0, i009, 0xabcd0009) } if (LNotEqual(i00a, 0xabcd000a)) { - err(ts, z161, 0x01c, 0, 0, i00a, 0xabcd000a) + err(ts, z161, __LINE__, 0, 0, i00a, 0xabcd000a) } if (LNotEqual(i00b, 0xabcd000b)) { - err(ts, z161, 0x01d, 0, 0, i00b, 0xabcd000b) + err(ts, z161, __LINE__, 0, 0, i00b, 0xabcd000b) } if (LNotEqual(i00c, 0xabcd000c)) { - err(ts, z161, 0x01d, 0, 0, i00c, 0xabcd000c) + err(ts, z161, __LINE__, 0, 0, i00c, 0xabcd000c) } Return(POUT) @@ -1055,55 +1055,55 @@ Method(mf13,, Serialized) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z161, 0x012, 0, 0, i000, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, i000, 0xabcd0000) } if (LNotEqual(i001, 0xabcd0001)) { - err(ts, z161, 0x013, 0, 0, i001, 0xabcd0001) + err(ts, z161, __LINE__, 0, 0, i001, 0xabcd0001) } if (LNotEqual(i002, 0xabcd0002)) { - err(ts, z161, 0x014, 0, 0, i002, 0xabcd0002) + err(ts, z161, __LINE__, 0, 0, i002, 0xabcd0002) } if (LNotEqual(i003, 0xabcd0003)) { - err(ts, z161, 0x015, 0, 0, i003, 0xabcd0003) + err(ts, z161, __LINE__, 0, 0, i003, 0xabcd0003) } if (LNotEqual(i004, 0xabcd0004)) { - err(ts, z161, 0x016, 0, 0, i004, 0xabcd0004) + err(ts, z161, __LINE__, 0, 0, i004, 0xabcd0004) } if (LNotEqual(i005, 0xabcd0005)) { - err(ts, z161, 0x017, 0, 0, i005, 0xabcd0005) + err(ts, z161, __LINE__, 0, 0, i005, 0xabcd0005) } if (LNotEqual(i006, 0xabcd0006)) { - err(ts, z161, 0x018, 0, 0, i006, 0xabcd0006) + err(ts, z161, __LINE__, 0, 0, i006, 0xabcd0006) } if (LNotEqual(i007, 0xabcd0007)) { - err(ts, z161, 0x019, 0, 0, i007, 0xabcd0007) + err(ts, z161, __LINE__, 0, 0, i007, 0xabcd0007) } if (LNotEqual(i008, 0xabcd0008)) { - err(ts, z161, 0x01a, 0, 0, i008, 0xabcd0008) + err(ts, z161, __LINE__, 0, 0, i008, 0xabcd0008) } if (LNotEqual(i009, 0xabcd0009)) { - err(ts, z161, 0x01b, 0, 0, i009, 0xabcd0009) + err(ts, z161, __LINE__, 0, 0, i009, 0xabcd0009) } if (LNotEqual(i00a, 0xabcd000a)) { - err(ts, z161, 0x01c, 0, 0, i00a, 0xabcd000a) + err(ts, z161, __LINE__, 0, 0, i00a, 0xabcd000a) } if (LNotEqual(i00b, 0xabcd000b)) { - err(ts, z161, 0x01d, 0, 0, i00b, 0xabcd000b) + err(ts, z161, __LINE__, 0, 0, i00b, 0xabcd000b) } if (LNotEqual(i00c, 0xabcd000c)) { - err(ts, z161, 0x01d, 0, 0, i00c, 0xabcd000c) + err(ts, z161, __LINE__, 0, 0, i00c, 0xabcd000c) } if (LNotEqual(i00d, 0xabcd000d)) { - err(ts, z161, 0x01d, 0, 0, i00d, 0xabcd000d) + err(ts, z161, __LINE__, 0, 0, i00d, 0xabcd000d) } if (LNotEqual(i00e, 0xabcd000e)) { - err(ts, z161, 0x01d, 0, 0, i00e, 0xabcd000e) + err(ts, z161, __LINE__, 0, 0, i00e, 0xabcd000e) } if (LNotEqual(i00f, 0xabcd000f)) { - err(ts, z161, 0x01d, 0, 0, i00f, 0xabcd000f) + err(ts, z161, __LINE__, 0, 0, i00f, 0xabcd000f) } if (LNotEqual(i010, 0xabcd0010)) { - err(ts, z161, 0x01d, 0, 0, i010, 0xabcd0010) + err(ts, z161, __LINE__, 0, 0, i010, 0xabcd0010) } Return(POUT) @@ -1144,7 +1144,7 @@ Method(mf15,, Serialized) if (chk0) { if (LNotEqual(Local0, 5)) { - err(ts, z161, 0x004, 0, 0, Local0, 5) + err(ts, z161, __LINE__, 0, 0, Local0, 5) } } @@ -1170,7 +1170,7 @@ Method(mf16,, Serialized) Store(m000(p000), Local0) Store(DerefOf(Index(Local0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z161, 0x006, 0, 0, Local0, 0xabcd0001) + err(ts, z161, __LINE__, 0, 0, Local0, 0xabcd0001) } Return(POUT) @@ -1196,7 +1196,7 @@ Method(mf17,, Serialized) Store(m000(), Local0) Store(DerefOf(Index(Local0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z161, 0x006, 0, 0, Local0, 0xabcd0001) + err(ts, z161, __LINE__, 0, 0, Local0, 0xabcd0001) } Return(POUT) @@ -1218,7 +1218,7 @@ Method(mf18,, Serialized) if (chk0) { Store(LEqual(s000, s001), Local0) if (LNot(Local0)) { - err(ts, z161, 0x006, 0, 0, Local0, Ones) + err(ts, z161, __LINE__, 0, 0, Local0, Ones) } } @@ -1241,7 +1241,7 @@ Method(mf19,, Serialized) if (chk0) { Store(LEqual(b000, b001), Local0) if (LNot(Local0)) { - err(ts, z161, 0x006, 0, 0, Local0, Ones) + err(ts, z161, __LINE__, 0, 0, Local0, Ones) } } @@ -1265,7 +1265,7 @@ Method(mf1a,, Serialized) if (chk0) { Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z161, 0x006, 0, 0, Local0, 0xabcd0001) + err(ts, z161, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -1288,7 +1288,7 @@ Method(mf1b,, Serialized) if (chk0) { Store(Add(s000, s001), Local0) if (LNotEqual(Local0, 0x68ACE68A)) { - err(ts, z161, 0x006, 0, 0, Local0, 0x68ACE68A) + err(ts, z161, __LINE__, 0, 0, Local0, 0x68ACE68A) } } @@ -1311,7 +1311,7 @@ Method(mf1c,, Serialized) if (chk0) { Store(Add(b000, b001), Local0) if (LNotEqual(Local0, 0x6A584634)) { - err(ts, z161, 0x006, 0, 0, Local0, 0x6A584634) + err(ts, z161, __LINE__, 0, 0, Local0, 0x6A584634) } } @@ -1335,7 +1335,7 @@ Method(mf1d,, Serialized) Store(LEqual(f000, 0xabcd0000), Local0) if (LNot(Local0)) { - err(ts, z161, 0x006, 0, 0, Local0, Ones) + err(ts, z161, __LINE__, 0, 0, Local0, Ones) } Return(POUT) @@ -1364,7 +1364,7 @@ Method(mf1e,, Serialized) Store(m000(f000), Local0) if (LNot(Local0)) { - err(ts, z161, 0x006, 0, 0, Local0, Ones) + err(ts, z161, __LINE__, 0, 0, Local0, Ones) } Return(POUT) @@ -1386,7 +1386,7 @@ Method(mf1f,, Serialized) Method(m000, 1) { if (LNotEqual(arg0, 0xabcd0000)) { - err(ts, z161, 0x007, 0, 0, arg0, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, arg0, 0xabcd0000) } } @@ -1412,7 +1412,7 @@ Method(mf20,, Serialized) Store(Add(f000, 0x12), Local0) if (LNotEqual(Local0, 0xabcd0012)) { - err(ts, z161, 0x006, 0, 0, Local0, 0xabcd0012) + err(ts, z161, __LINE__, 0, 0, Local0, 0xabcd0012) } Return(POUT) @@ -1441,7 +1441,7 @@ Method(mf21,, Serialized) Store(m000(f000), Local0) if (LNotEqual(Local0, 0xabcd0012)) { - err(ts, z161, 0x006, 0, 0, Local0, 0xabcd0012) + err(ts, z161, __LINE__, 0, 0, Local0, 0xabcd0012) } Return(POUT) @@ -1464,7 +1464,7 @@ Method(mf22,, Serialized) Method(m000, 1) { if (LNotEqual(arg0, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg0, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg0, 0xabababab) } } @@ -1490,10 +1490,10 @@ Method(mf23,, Serialized) Method(m000, 2) { if (LNotEqual(arg0, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg0, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg0, 0xabababab) } if (LNotEqual(arg1, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg1, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg1, 0xabababab) } } @@ -1519,17 +1519,17 @@ Method(mf24,, Serialized) Method(m001, 1) { if (LNotEqual(arg0, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg0, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg0, 0xabababab) } Return (arg0) } Method(m002, 2) { if (LNotEqual(arg0, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg0, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg0, 0xabababab) } if (LNotEqual(arg1, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg1, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg1, 0xabababab) } Return (arg1) } @@ -1556,7 +1556,7 @@ Method(mf25,, Serialized) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c00e)) { - err(ts, z161, 0x000, 0, 0, Local0, c00e) + err(ts, z161, __LINE__, 0, 0, Local0, c00e) } */ Return(POUT) @@ -1578,7 +1578,7 @@ Method(mf27,, Serialized) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c00f)) { - err(ts, z161, 0x000, 0, 0, Local0, c00f) + err(ts, z161, __LINE__, 0, 0, Local0, c00f) } */ Return(POUT) @@ -1601,7 +1601,7 @@ Method(mf28,, Serialized) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c011)) { - err(ts, z161, 0x000, 0, 0, Local0, c011) + err(ts, z161, __LINE__, 0, 0, Local0, c011) } */ Return(POUT) @@ -1624,7 +1624,7 @@ Method(mf29, 1, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00f)) { - err(ts, z161, 0x000, 0, 0, Local0, c00f) + err(ts, z161, __LINE__, 0, 0, Local0, c00f) } */ Return(POUT) @@ -1647,7 +1647,7 @@ Method(mf2a, 1, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c011)) { - err(ts, z161, 0x000, 0, 0, Local0, c011) + err(ts, z161, __LINE__, 0, 0, Local0, c011) } */ Return(POUT) @@ -1674,7 +1674,7 @@ Method(mf2b,, Serialized) Store(d000, Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c00e)) { - err(ts, z161, 0x000, 0, 0, Local0, c00e) + err(ts, z161, __LINE__, 0, 0, Local0, c00e) } } */ @@ -1702,7 +1702,7 @@ Method(mf2c, 1, Serialized) Store(d000, arg0) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00e)) { - err(ts, z161, 0x000, 0, 0, Local0, c00e) + err(ts, z161, __LINE__, 0, 0, Local0, c00e) } } */ diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device.asl index 26d13d2..4d9b66b 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device.asl @@ -47,26 +47,26 @@ Method(md00,, Serialized) } if (LNotEqual(d000.i000, 0xabcd0000)) { - err(ts, z174, 0x000, 0, 0, d000.i000, 0xabcd0000) + err(ts, z174, __LINE__, 0, 0, d000.i000, 0xabcd0000) } CopyObject(d001, d000) if (LNotEqual(d000.i000, 0xabcd0001)) { - err(ts, z174, 0x001, 0, 0, d000.i000, 0xabcd0001) + err(ts, z174, __LINE__, 0, 0, d000.i000, 0xabcd0001) } CopyObject(tz00, d000) if (LNotEqual(d000.i000, 0xabcd0002)) { - err(ts, z174, 0x002, 0, 0, d000.i000, 0xabcd0002) + err(ts, z174, __LINE__, 0, 0, d000.i000, 0xabcd0002) } - CH03(ts, z174, 0x003, 0, 0) + CH03(ts, z174, 0x003, __LINE__, 0) Store(d000.i001, Local0) - CH04(ts, 0, 0xff, z174, 0x004, 0, 0) + CH04(ts, 0, 0xff, z174, __LINE__, 0, 0) // Rejected by ASL compiler // if (LNotEqual(d000.i002, 0x22222222)) { -// err(ts, z174, 0x005, 0, 0, d000.i002, 0x22222222) +// err(ts, z174, __LINE__, 0, 0, d000.i002, 0x22222222) // } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_abbu.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_abbu.asl index 8d33ea3..11d31b5 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_abbu.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_abbu.asl @@ -54,7 +54,7 @@ Method(dvf2,, Serialized) Store(Add(\_SB_.ABBU.dvf2.d000.i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z172, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z172, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -89,34 +89,34 @@ Method(mf26,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x001, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x002, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x003, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(DerefOf(Index(arg0, 4)), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0003) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0003) } Store(DerefOf(Index(arg0, 5)), Local0) if (LNotEqual(Local0, 0xabcd0004)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0004) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0004) } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x005, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -139,30 +139,30 @@ Method(mf26,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x006, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x007, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x008, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x009, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(DerefOf(Index(p000, 4)), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z164, 0x00a, 0, 0, Local0, 0xabcd0003) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0003) } Store(DerefOf(Index(p000, 5)), Local0) if (LNotEqual(Local0, 0xabcd0004)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0004) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0004) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_aslts.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_aslts.asl index c69f322..2c41236 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_aslts.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_aslts.asl @@ -54,7 +54,7 @@ Method(dvf2,, Serialized) Store(Add(\dvf2.d000.i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z173, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z173, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -87,34 +87,34 @@ Method(mf26,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x001, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x002, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x003, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(DerefOf(Index(arg0, 4)), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0003) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0003) } Store(DerefOf(Index(arg0, 5)), Local0) if (LNotEqual(Local0, 0xabcd0004)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0004) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0004) } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x005, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -122,31 +122,31 @@ Method(mf26,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x006, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x007, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x008, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x009, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(DerefOf(Index(p000, 4)), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z164, 0x00a, 0, 0, Local0, 0xabcd0003) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0003) } Store(DerefOf(Index(p000, 5)), Local0) if (LNotEqual(Local0, 0xabcd0004)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0004) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0004) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv00.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv00.asl index c10c81f..5ee2670 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv00.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv00.asl @@ -32,7 +32,7 @@ Method(dv00) } Store(Add(d000.i000, m001(d000.i000)), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z167, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -58,7 +58,7 @@ Method(dvf0) Store(Add(d000.i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z163, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -84,7 +84,7 @@ Method(dvf1) Store(Add(^dvf1.d000.i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z163, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -148,11 +148,11 @@ Method(dv01, 1) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z167, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z167, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z167, 0x004, 0, 0, i000, 0x80000000) + err(ts, z167, __LINE__, 0, 0, i000, 0x80000000) } } @@ -183,11 +183,11 @@ Method(dv02) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x00c00042)) { - err(ts, z167, 0x006, 0, 0, Local0, 0x00c00042) + err(ts, z167, __LINE__, 0, 0, Local0, 0x00c00042) } if (LNotEqual(i000, 0x0010000b)) { - err(ts, z167, 0x007, 0, 0, i000, 0x0010000b) + err(ts, z167, __LINE__, 0, 0, i000, 0x0010000b) } } @@ -250,11 +250,11 @@ Method(dv03, 1) Store(Add(Local7, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z167, 0x00c, 0, 0, Local0, 0x87654321) + err(ts, z167, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(Local7, 1)) { - err(ts, z167, 0x00d, 0, 0, Local7, 1) + err(ts, z167, __LINE__, 0, 0, Local7, 1) } } @@ -343,64 +343,64 @@ Method(dv04) Return (Add(i000, m005(i000, arg0))) } if (LNotEqual(arg0, 0x00000300)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x00000300) + err(ts, z167, __LINE__, 0, 0, arg0, 0x00000300) } if (LNotEqual(arg1, 0x10000001)) { - err(ts, z167, 0x004, 0, 0, arg1, 0x10000001) + err(ts, z167, __LINE__, 0, 0, arg1, 0x10000001) } Store(0x00004000, i000) Store(0x10000003, arg0) Return (Add(i000, m004(i000, arg0))) } if (LNotEqual(arg0, 0x00000020)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x00000020) + err(ts, z167, __LINE__, 0, 0, arg0, 0x00000020) } if (LNotEqual(i000, 0x00000020)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000020) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000020) } Store(0x10000002, arg0) if (LNotEqual(i000, 0x00000020)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000020) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000020) } if (LNotEqual(arg0, 0x10000002)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x10000002) + err(ts, z167, __LINE__, 0, 0, arg0, 0x10000002) } Store(0x00000300, i000) if (LNotEqual(i000, 0x00000300)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000300) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000300) } if (LNotEqual(arg0, 0x10000002)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x10000002) + err(ts, z167, __LINE__, 0, 0, arg0, 0x10000002) } if (LNotEqual(arg1, 0x10000001)) { - err(ts, z167, 0x004, 0, 0, arg1, 0x10000001) + err(ts, z167, __LINE__, 0, 0, arg1, 0x10000001) } Store(0x10000002, arg0) Store(0x00000300, i000) Return (Add(i000, m003(i000, arg1))) } if (LNotEqual(arg0, 0x00000001)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x00000001) + err(ts, z167, __LINE__, 0, 0, arg0, 0x00000001) } if (LNotEqual(i000, 0x00000001)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000001) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000001) } Store(0x10000001, arg0) if (LNotEqual(i000, 0x00000001)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000001) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000001) } if (LNotEqual(arg0, 0x10000001)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x10000001) + err(ts, z167, __LINE__, 0, 0, arg0, 0x10000001) } Store(0x00000020, i000) if (LNotEqual(i000, 0x00000020)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000020) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000020) } if (LNotEqual(arg0, 0x10000001)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x10000001) + err(ts, z167, __LINE__, 0, 0, arg0, 0x10000001) } if (LNotEqual(arg1, 0x10000000)) { - err(ts, z167, 0x004, 0, 0, arg1, 0x10000000) + err(ts, z167, __LINE__, 0, 0, arg1, 0x10000000) } Store(0x10000001, arg0) Store(0x00000020, i000) @@ -409,11 +409,11 @@ Method(dv04) Store(Add(i000, m001(i000, 0x10000000)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z167, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z167, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z167, 0x004, 0, 0, i000, 0x80000000) + err(ts, z167, __LINE__, 0, 0, i000, 0x80000000) } } @@ -459,83 +459,83 @@ Method(dv05) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z167, 0x003, 0, 0, Local0, arg1) + err(ts, z167, __LINE__, 0, 0, Local0, arg1) } Return (5) } - CH03(ts, z167, 0x000, 0, 0) + CH03(ts, z167, 0x000, __LINE__, 0) Store(Add(DerefOf(Index(p000, 0)), m001(i000, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(s000, c00a)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(b000, c00b)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(p000, c00c)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(e000, c00f)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mx00, c011)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mmm0, c008)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mmm1, c00a)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(d000, c00e)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(tz00, c015)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(pr00, c014)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(pw00, c013)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(r000, c012)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(bf00, c00b)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(f000, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(bnk0, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(if00, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } - CH03(ts, z167, 0x000, 0, 0) + CH03(ts, z167, 0x000, __LINE__, 0) } Method(dv06) @@ -545,7 +545,7 @@ Method(dv06) Store(ObjectType(i000), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z167, 0x003, 0, 0, Local0, c009) + err(ts, z167, __LINE__, 0, 0, Local0, c009) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl index cb78b5a..493a563 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl @@ -37,14 +37,14 @@ Method(in10) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(0x11112222, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -52,12 +52,12 @@ Method(in10) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -75,14 +75,14 @@ Method(in11) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -90,12 +90,12 @@ Method(in11) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -114,7 +114,7 @@ Method(in12) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(arg1), Local7) @@ -122,7 +122,7 @@ Method(in12) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -130,12 +130,12 @@ Method(in12) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -155,14 +155,14 @@ Method(in13) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -170,15 +170,15 @@ Method(in13) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } } @@ -211,26 +211,26 @@ Method(in14) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x000, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -238,22 +238,22 @@ Method(in14) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x000, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } } @@ -313,14 +313,14 @@ Method(in16) // arg0 - b000 Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x10)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x10) + err(ts, z164, __LINE__, 0, 0, Local0, 0x10) } Store(0x67, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x67) + err(ts, z164, __LINE__, 0, 0, Local0, 0x67) } // arg1 - RefOf(b000) @@ -330,7 +330,7 @@ Method(in16) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x55)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x55) + err(ts, z164, __LINE__, 0, 0, Local0, 0x55) } } @@ -338,17 +338,17 @@ Method(in16) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x67) + err(ts, z164, __LINE__, 0, 0, Local0, 0x67) } Store(DerefOf(Index(b000, 1)), Local0) if (LNotEqual(Local0, 0x11)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x11) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11) } Store(DerefOf(Index(b000, 2)), Local0) if (LNotEqual(Local0, 0x12)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x12) + err(ts, z164, __LINE__, 0, 0, Local0, 0x12) } } @@ -383,16 +383,16 @@ Method(in17) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x00c00042)) { - err(ts, z164, 0x00a, 0, 0, Local0, 0x00c00042) + err(ts, z164, __LINE__, 0, 0, Local0, 0x00c00042) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x0010000b)) { - err(ts, z164, 0x00b, 0, 0, Local0, 0x0010000b) + err(ts, z164, __LINE__, 0, 0, Local0, 0x0010000b) } - CH03(ts, z164, 0x00c, 0, 0) + CH03(ts, z164, 0x00c, __LINE__, 0) } /* @@ -414,7 +414,7 @@ Method(in18, 1) OperationRegion(r000, SystemMemory, 0x100, 0x100) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } - CH03(ts, z164, 0x011, 0, 0) + CH03(ts, z164, 0x011, __LINE__, 0) Store(arg0, i001) @@ -467,7 +467,7 @@ Method(in18, 1) Store(Add(f001, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z164, 0x012, 0, 0, Local0, 0x87654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -477,10 +477,10 @@ Method(in18, 1) } if (LNotEqual(f001, Local1)) { - err(ts, z164, 0x013, 0, 0, f001, Local1) + err(ts, z164, __LINE__, 0, 0, f001, Local1) } - CH03(ts, z164, 0x014, 0, 0) + CH03(ts, z164, 0x014, __LINE__, 0) } /* @@ -496,7 +496,7 @@ Method(in19, 1) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } BankField(r000, f001, 0, ByteAcc, NoLock, Preserve) { bnk0, 32 } - CH03(ts, z164, 0x015, 0, 0) + CH03(ts, z164, 0x015, __LINE__, 0) Store(arg0, i001) @@ -549,7 +549,7 @@ Method(in19, 1) Store(Add(bnk0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z164, 0x016, 0, 0, Local0, 0x87654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -559,10 +559,10 @@ Method(in19, 1) } if (LNotEqual(bnk0, Local1)) { - err(ts, z164, 0x017, 0, 0, bnk0, Local1) + err(ts, z164, __LINE__, 0, 0, bnk0, Local1) } - CH03(ts, z164, 0x018, 0, 0) + CH03(ts, z164, 0x018, __LINE__, 0) } /* @@ -578,7 +578,7 @@ Method(in1a, 1) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } IndexField(f000, f001, ByteAcc, NoLock, Preserve) { if00, 32 } - CH03(ts, z164, 0x019, 0, 0) + CH03(ts, z164, 0x019, __LINE__, 0) Store(arg0, i001) @@ -636,7 +636,7 @@ Method(in1a, 1) */ if (LNotEqual(Local0, 0x87878787)) { - err(ts, z164, 0x01a, 0, 0, Local0, 0x87878787) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87878787) } if (arg0) { @@ -646,10 +646,10 @@ Method(in1a, 1) } if (LNotEqual(if00, Local1)) { - err(ts, z164, 0x01b, 0, 0, if00, Local1) + err(ts, z164, __LINE__, 0, 0, if00, Local1) } - CH03(ts, z164, 0x01c, 0, 0) + CH03(ts, z164, 0x01c, __LINE__, 0) } /* @@ -661,7 +661,7 @@ Method(in1b, 1) Name(i001, 0) Name(b000, Buffer() {0x11, 0x01, 0x22}) - CH03(ts, z164, 0x01d, 0, 0) + CH03(ts, z164, 0x01d, __LINE__, 0) Store(arg0, i001) @@ -702,7 +702,7 @@ Method(in1b, 1) Store(Add(DerefOf(Index(b000, 1)), m001()), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z164, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z164, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -714,10 +714,10 @@ Method(in1b, 1) } if (LNotEqual(Local0, Local1)) { - err(ts, z164, 0x01f, 0, 0, Local0, Local1) + err(ts, z164, __LINE__, 0, 0, Local0, Local1) } - CH03(ts, z164, 0x020, 0, 0) + CH03(ts, z164, 0x020, __LINE__, 0) } /* @@ -733,7 +733,7 @@ Method(in1c, 1) Name(i001, 0) Name(b000, Buffer() {0x11, 0x01, 0x22}) - CH03(ts, z164, 0x01d, 0, 0) + CH03(ts, z164, 0x01d, __LINE__, 0) Store(arg0, i001) @@ -778,12 +778,12 @@ Method(in1c, 1) Return (Local0) } - CH03(ts, z164, 0x000, 0, 0) + CH03(ts, z164, 0x000, __LINE__, 0) Store(m000(b000), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z164, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z164, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -795,10 +795,10 @@ Method(in1c, 1) } if (LNotEqual(Local0, Local1)) { - err(ts, z164, 0x01f, 0, 0, Local0, Local1) + err(ts, z164, __LINE__, 0, 0, Local0, Local1) } - CH03(ts, z164, 0x020, 0, 0) + CH03(ts, z164, 0x020, __LINE__, 0) } @@ -812,7 +812,7 @@ Method(in1d) Name(p000, Package() {1,2,3,4}) Name(pp00, Package() {0x11111111, 0x00000001, 0x22223333}) - CH03(ts, z164, 0x006, 0, 0) + CH03(ts, z164, 0x006, __LINE__, 0) Method(m001) { @@ -851,16 +851,16 @@ Method(in1d) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z164, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z164, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07000000) } - CH03(ts, z164, 0x009, 0, 0) + CH03(ts, z164, 0x009, __LINE__, 0) } /* @@ -877,7 +877,7 @@ Method(in1e) Name(p000, Package() {1,2,3,4}) Name(pp00, Package() {0x11111111, 0x00000001, 0x22223333}) - CH03(ts, z164, 0x006, 0, 0) + CH03(ts, z164, 0x006, __LINE__, 0) Method(m000, 1) { @@ -920,21 +920,21 @@ Method(in1e) Return (Local0) } - CH03(ts, z164, 0x000, 0, 0) + CH03(ts, z164, 0x000, __LINE__, 0) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z164, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z164, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07000000) } - CH03(ts, z164, 0x009, 0, 0) + CH03(ts, z164, 0x009, __LINE__, 0) } Method(ini1) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv20.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv20.asl index 1b0c106..2956d80 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv20.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv20.asl @@ -22,7 +22,7 @@ Method(in20, 1) Name(i001, 0) - CH03(ts, z165, 0x000, 0, 0) + CH03(ts, z165, 0x000, __LINE__, 0) Store(arg0, i001) @@ -51,7 +51,7 @@ Method(in20, 1) Store(m000(i000), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z165, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z165, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -116,11 +116,11 @@ Method(in21, 1) Store(Add(i000, m001(i000)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z165, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z165, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x00000001)) { - err(ts, z165, 0x004, 0, 0, i000, 0x00000001) + err(ts, z165, __LINE__, 0, 0, i000, 0x00000001) } } @@ -157,11 +157,11 @@ Method(in22) Store(Add(i000, m000(i000)), Local0) if (LNotEqual(Local0, 0x00b0002d)) { - err(ts, z165, 0x006, 0, 0, Local0, 0x00b0002d) + err(ts, z165, __LINE__, 0, 0, Local0, 0x00b0002d) } if (LNotEqual(i000, 0x00100000)) { - err(ts, z165, 0x007, 0, 0, i000, 0x00100000) + err(ts, z165, __LINE__, 0, 0, i000, 0x00100000) } } @@ -224,14 +224,14 @@ Method(in23, 2) Store(Add(arg1, m001(1)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z165, 0x00f, 0, 0, Local0, 0x87654321) + err(ts, z165, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(arg1, 1)) { - err(ts, z165, 0x010, 0, 0, arg1, 1) + err(ts, z165, __LINE__, 0, 0, arg1, 1) } - CH03(ts, z165, 0x011, 0, 0) + CH03(ts, z165, 0x011, __LINE__, 0) } Method(ini2) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl index 0b2dd5b..e7707c6 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl @@ -34,14 +34,14 @@ Method(in30) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(0x11112222, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } } m001(arg0, arg1) @@ -51,12 +51,12 @@ Method(in30) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -77,14 +77,14 @@ Method(in31) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -94,12 +94,12 @@ Method(in31) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -121,7 +121,7 @@ Method(in32) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(arg1), Local7) @@ -129,7 +129,7 @@ Method(in32) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -139,12 +139,12 @@ Method(in32) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -167,14 +167,14 @@ Method(in33) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -184,15 +184,15 @@ Method(in33) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0002) } } @@ -226,26 +226,26 @@ Method(in34) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z162, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z162, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z162, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z162, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z162, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z162, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z162, 0x000, 0, 0, Local0, "i000") + err(ts, z162, __LINE__, 0, 0, Local0, "i000") } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z162, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z162, __LINE__, 0, 0, Local0, 0x11112222) } } m001(arg0, arg1) @@ -255,22 +255,22 @@ Method(in34) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z162, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z162, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z162, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z162, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z162, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z162, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z162, 0x000, 0, 0, Local0, "i000") + err(ts, z162, __LINE__, 0, 0, Local0, "i000") } } @@ -290,14 +290,14 @@ Method(in36) // arg0 - b000 Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x10)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x10) + err(ts, z166, __LINE__, 0, 0, Local0, 0x10) } Store(0x67, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x67) + err(ts, z166, __LINE__, 0, 0, Local0, 0x67) } // arg1 - RefOf(b000) @@ -307,7 +307,7 @@ Method(in36) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x55)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x55) + err(ts, z166, __LINE__, 0, 0, Local0, 0x55) } } m001(arg0, arg1) @@ -317,17 +317,17 @@ Method(in36) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x67) + err(ts, z166, __LINE__, 0, 0, Local0, 0x67) } Store(DerefOf(Index(b000, 1)), Local0) if (LNotEqual(Local0, 0x11)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x11) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11) } Store(DerefOf(Index(b000, 2)), Local0) if (LNotEqual(Local0, 0x12)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x12) + err(ts, z166, __LINE__, 0, 0, Local0, 0x12) } } @@ -368,16 +368,16 @@ Method(in37) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x00a0002d)) { - err(ts, z166, 0x00a, 0, 0, Local0, 0x00a0002d) + err(ts, z166, __LINE__, 0, 0, Local0, 0x00a0002d) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x00100009)) { - err(ts, z166, 0x00b, 0, 0, Local0, 0x00100009) + err(ts, z166, __LINE__, 0, 0, Local0, 0x00100009) } - CH03(ts, z166, 0x00c, 0, 0) + CH03(ts, z166, 0x00c, __LINE__, 0) } /* @@ -399,7 +399,7 @@ Method(in38, 1) OperationRegion(r000, SystemMemory, 0x100, 0x100) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } - CH03(ts, z166, 0x011, 0, 0) + CH03(ts, z166, 0x011, __LINE__, 0) Store(arg0, i001) @@ -466,7 +466,7 @@ Method(in38, 1) Store(m000(f001), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z166, 0x012, 0, 0, Local0, 0x07654321) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07654321) } if (arg0) { @@ -476,10 +476,10 @@ Method(in38, 1) } if (LNotEqual(f001, Local1)) { - err(ts, z166, 0x013, 0, 0, f001, Local1) + err(ts, z166, __LINE__, 0, 0, f001, Local1) } - CH03(ts, z166, 0x014, 0, 0) + CH03(ts, z166, 0x014, __LINE__, 0) } /* @@ -495,7 +495,7 @@ Method(in39, 1) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } BankField(r000, f001, 0, ByteAcc, NoLock, Preserve) { bnk0, 32 } - CH03(ts, z166, 0x015, 0, 0) + CH03(ts, z166, 0x015, __LINE__, 0) Store(arg0, i001) @@ -561,7 +561,7 @@ Method(in39, 1) Store(m000(bnk0), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z166, 0x016, 0, 0, Local0, 0x07654321) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07654321) } if (arg0) { @@ -571,10 +571,10 @@ Method(in39, 1) } if (LNotEqual(bnk0, Local1)) { - err(ts, z166, 0x017, 0, 0, bnk0, Local1) + err(ts, z166, __LINE__, 0, 0, bnk0, Local1) } - CH03(ts, z166, 0x018, 0, 0) + CH03(ts, z166, 0x018, __LINE__, 0) } /* @@ -590,7 +590,7 @@ Method(in3a, 1) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } IndexField(f000, f001, ByteAcc, NoLock, Preserve) { if00, 32 } - CH03(ts, z166, 0x019, 0, 0) + CH03(ts, z166, 0x019, __LINE__, 0) Store(arg0, i001) @@ -661,7 +661,7 @@ Method(in3a, 1) */ if (LNotEqual(Local0, 0x07070707)) { - err(ts, z166, 0x01a, 0, 0, Local0, 0x07070707) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07070707) } if (arg0) { @@ -671,10 +671,10 @@ Method(in3a, 1) } if (LNotEqual(if00, Local1)) { - err(ts, z166, 0x01b, 0, 0, if00, Local1) + err(ts, z166, __LINE__, 0, 0, if00, Local1) } - CH03(ts, z166, 0x01c, 0, 0) + CH03(ts, z166, 0x01c, __LINE__, 0) } /* @@ -700,7 +700,7 @@ Method(in3c, 1) Name(i001, 0) Name(b000, Buffer() {0x11, 0x01, 0x22}) - CH03(ts, z162, 0x01d, 0, 0) + CH03(ts, z162, 0x01d, __LINE__, 0) Store(arg0, i001) @@ -748,7 +748,7 @@ Method(in3c, 1) Store(m000(b000), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z162, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z162, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -760,10 +760,10 @@ Method(in3c, 1) } if (LNotEqual(Local0, Local1)) { - err(ts, z162, 0x01f, 0, 0, Local0, Local1) + err(ts, z162, __LINE__, 0, 0, Local0, Local1) } - CH03(ts, z162, 0x020, 0, 0) + CH03(ts, z162, 0x020, __LINE__, 0) } /* @@ -790,7 +790,7 @@ Method(in3e) Name(p000, Package() {1,2,3,4}) Name(pp00, Package() {0x11111111, 0x00000001, 0x22223333}) - CH03(ts, z162, 0x006, 0, 0) + CH03(ts, z162, 0x006, __LINE__, 0) Method(m000, 1) { @@ -836,16 +836,16 @@ Method(in3e) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z162, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z162, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z162, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z162, __LINE__, 0, 0, Local0, 0x07000000) } - CH03(ts, z162, 0x009, 0, 0) + CH03(ts, z162, 0x009, __LINE__, 0) } Method(ini3) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in00.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in00.asl index ab82f81..bf90dd4 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in00.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in00.asl @@ -82,7 +82,7 @@ Method(in00, 1, Serialized) } Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z163, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -146,11 +146,11 @@ Method(in01, 1, Serialized) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z163, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z163, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z163, 0x004, 0, 0, i000, 0x80000000) + err(ts, z163, __LINE__, 0, 0, i000, 0x80000000) } } @@ -181,11 +181,11 @@ Method(in02,, Serialized) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x00c00042)) { - err(ts, z163, 0x006, 0, 0, Local0, 0x00c00042) + err(ts, z163, __LINE__, 0, 0, Local0, 0x00c00042) } if (LNotEqual(i000, 0x0010000b)) { - err(ts, z163, 0x007, 0, 0, i000, 0x0010000b) + err(ts, z163, __LINE__, 0, 0, i000, 0x0010000b) } } @@ -248,11 +248,11 @@ Method(in03, 1, Serialized) Store(Add(Local7, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z163, 0x00c, 0, 0, Local0, 0x87654321) + err(ts, z163, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(Local7, 1)) { - err(ts, z163, 0x00d, 0, 0, Local7, 1) + err(ts, z163, __LINE__, 0, 0, Local7, 1) } } @@ -341,64 +341,64 @@ Method(in04,, Serialized) Return (Add(i000, m005(i000, arg0))) } if (LNotEqual(arg0, 0x00000300)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x00000300) + err(ts, z163, __LINE__, 0, 0, arg0, 0x00000300) } if (LNotEqual(arg1, 0x10000001)) { - err(ts, z163, 0x004, 0, 0, arg1, 0x10000001) + err(ts, z163, __LINE__, 0, 0, arg1, 0x10000001) } Store(0x00004000, i000) Store(0x10000003, arg0) Return (Add(i000, m004(i000, arg0))) } if (LNotEqual(arg0, 0x00000020)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x00000020) + err(ts, z163, __LINE__, 0, 0, arg0, 0x00000020) } if (LNotEqual(i000, 0x00000020)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000020) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000020) } Store(0x10000002, arg0) if (LNotEqual(i000, 0x00000020)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000020) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000020) } if (LNotEqual(arg0, 0x10000002)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x10000002) + err(ts, z163, __LINE__, 0, 0, arg0, 0x10000002) } Store(0x00000300, i000) if (LNotEqual(i000, 0x00000300)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000300) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000300) } if (LNotEqual(arg0, 0x10000002)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x10000002) + err(ts, z163, __LINE__, 0, 0, arg0, 0x10000002) } if (LNotEqual(arg1, 0x10000001)) { - err(ts, z163, 0x004, 0, 0, arg1, 0x10000001) + err(ts, z163, __LINE__, 0, 0, arg1, 0x10000001) } Store(0x10000002, arg0) Store(0x00000300, i000) Return (Add(i000, m003(i000, arg1))) } if (LNotEqual(arg0, 0x00000001)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x00000001) + err(ts, z163, __LINE__, 0, 0, arg0, 0x00000001) } if (LNotEqual(i000, 0x00000001)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000001) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000001) } Store(0x10000001, arg0) if (LNotEqual(i000, 0x00000001)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000001) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000001) } if (LNotEqual(arg0, 0x10000001)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x10000001) + err(ts, z163, __LINE__, 0, 0, arg0, 0x10000001) } Store(0x00000020, i000) if (LNotEqual(i000, 0x00000020)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000020) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000020) } if (LNotEqual(arg0, 0x10000001)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x10000001) + err(ts, z163, __LINE__, 0, 0, arg0, 0x10000001) } if (LNotEqual(arg1, 0x10000000)) { - err(ts, z163, 0x004, 0, 0, arg1, 0x10000000) + err(ts, z163, __LINE__, 0, 0, arg1, 0x10000000) } Store(0x10000001, arg0) Store(0x00000020, i000) @@ -407,11 +407,11 @@ Method(in04,, Serialized) Store(Add(i000, m001(i000, 0x10000000)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z163, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z163, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z163, 0x004, 0, 0, i000, 0x80000000) + err(ts, z163, __LINE__, 0, 0, i000, 0x80000000) } } @@ -457,101 +457,101 @@ Method(in05,, Serialized) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z163, 0x003, 0, 0, Local0, arg1) + err(ts, z163, __LINE__, 0, 0, Local0, arg1) } Return (5) } - CH03(ts, z163, 0x000, 0, 0) + CH03(ts, z163, 0x000, __LINE__, 0) Store(Add(DerefOf(Index(p000, 0)), m001(i000, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(s000, c00a)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(b000, c00b)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(p000, c00c)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(e000, c00f)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mx00, c011)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mmm0, c008)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mmm1, c00a)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(d000, c00e)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(tz00, c015)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(pr00, c014)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(pw00, c013)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(r000, c012)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(bf00, c00b)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(f000, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(bnk0, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(if00, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(ObjectType(f000), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z163, 0x003, 0, 0, Local0, c00d) + err(ts, z163, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(if00), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z163, 0x003, 0, 0, Local0, c00d) + err(ts, z163, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(bnk0), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z163, 0x003, 0, 0, Local0, c00d) + err(ts, z163, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, c016)) { - err(ts, z163, 0x003, 0, 0, Local0, c016) + err(ts, z163, __LINE__, 0, 0, Local0, c016) } - CH03(ts, z163, 0x000, 0, 0) + CH03(ts, z163, 0x000, __LINE__, 0) } Method(in06,, Serialized) @@ -561,7 +561,7 @@ Method(in06,, Serialized) Store(ObjectType(i000), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z163, 0x003, 0, 0, Local0, c009) + err(ts, z163, __LINE__, 0, 0, Local0, c009) } } @@ -591,6 +591,6 @@ Method(ini0) SRMT("in06") in06() - CH03("ini0", z163, 0x000, 0, 0) + CH03("ini0", z163, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl index 0cf6a83..9e835f9 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl @@ -65,14 +65,14 @@ Method(in10,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(0x11112222, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -80,12 +80,12 @@ Method(in10,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -103,14 +103,14 @@ Method(in11,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -118,12 +118,12 @@ Method(in11,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -142,7 +142,7 @@ Method(in12,, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(arg1), Local7) @@ -150,7 +150,7 @@ Method(in12,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -158,12 +158,12 @@ Method(in12,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -183,14 +183,14 @@ Method(in13,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -198,15 +198,15 @@ Method(in13,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } } @@ -239,26 +239,26 @@ Method(in14,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x000, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -266,22 +266,22 @@ Method(in14,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x000, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } } @@ -341,14 +341,14 @@ Method(in16,, Serialized) // arg0 - b000 Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x10)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x10) + err(ts, z164, __LINE__, 0, 0, Local0, 0x10) } Store(0x67, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x67) + err(ts, z164, __LINE__, 0, 0, Local0, 0x67) } // arg1 - RefOf(b000) @@ -358,7 +358,7 @@ Method(in16,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x55)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x55) + err(ts, z164, __LINE__, 0, 0, Local0, 0x55) } } @@ -366,17 +366,17 @@ Method(in16,, Serialized) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x67) + err(ts, z164, __LINE__, 0, 0, Local0, 0x67) } Store(DerefOf(Index(b000, 1)), Local0) if (LNotEqual(Local0, 0x11)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x11) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11) } Store(DerefOf(Index(b000, 2)), Local0) if (LNotEqual(Local0, 0x12)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x12) + err(ts, z164, __LINE__, 0, 0, Local0, 0x12) } } @@ -411,16 +411,16 @@ Method(in17,, Serialized) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x00c00042)) { - err(ts, z164, 0x00a, 0, 0, Local0, 0x00c00042) + err(ts, z164, __LINE__, 0, 0, Local0, 0x00c00042) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x0010000b)) { - err(ts, z164, 0x00b, 0, 0, Local0, 0x0010000b) + err(ts, z164, __LINE__, 0, 0, Local0, 0x0010000b) } - CH03(ts, z164, 0x00c, 0, 0) + CH03(ts, z164, 0x00c, __LINE__, 0) } /* @@ -442,7 +442,7 @@ Method(in18, 1, Serialized) OperationRegion(r000, SystemMemory, 0x100, 0x100) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } - CH03(ts, z164, 0x011, 0, 0) + CH03(ts, z164, 0x011, __LINE__, 0) Store(arg0, i001) @@ -495,7 +495,7 @@ Method(in18, 1, Serialized) Store(Add(f001, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z164, 0x012, 0, 0, Local0, 0x87654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -505,10 +505,10 @@ Method(in18, 1, Serialized) } if (LNotEqual(f001, Local1)) { - err(ts, z164, 0x013, 0, 0, f001, Local1) + err(ts, z164, __LINE__, 0, 0, f001, Local1) } - CH03(ts, z164, 0x014, 0, 0) + CH03(ts, z164, 0x014, __LINE__, 0) } /* @@ -524,7 +524,7 @@ Method(in19, 1, Serialized) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } BankField(r000, f001, 0, ByteAcc, NoLock, Preserve) { bnk0, 32 } - CH03(ts, z164, 0x015, 0, 0) + CH03(ts, z164, 0x015, __LINE__, 0) Store(arg0, i001) @@ -577,7 +577,7 @@ Method(in19, 1, Serialized) Store(Add(bnk0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z164, 0x016, 0, 0, Local0, 0x87654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -587,10 +587,10 @@ Method(in19, 1, Serialized) } if (LNotEqual(bnk0, Local1)) { - err(ts, z164, 0x017, 0, 0, bnk0, Local1) + err(ts, z164, __LINE__, 0, 0, bnk0, Local1) } - CH03(ts, z164, 0x018, 0, 0) + CH03(ts, z164, 0x018, __LINE__, 0) } /* @@ -606,7 +606,7 @@ Method(in1a, 1, Serialized) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } IndexField(f000, f001, ByteAcc, NoLock, Preserve) { if00, 32 } - CH03(ts, z164, 0x019, 0, 0) + CH03(ts, z164, 0x019, __LINE__, 0) Store(arg0, i001) @@ -664,7 +664,7 @@ Method(in1a, 1, Serialized) */ if (LNotEqual(Local0, 0x87878787)) { - err(ts, z164, 0x01a, 0, 0, Local0, 0x87878787) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87878787) } if (arg0) { @@ -674,10 +674,10 @@ Method(in1a, 1, Serialized) } if (LNotEqual(if00, Local1)) { - err(ts, z164, 0x01b, 0, 0, if00, Local1) + err(ts, z164, __LINE__, 0, 0, if00, Local1) } - CH03(ts, z164, 0x01c, 0, 0) + CH03(ts, z164, 0x01c, __LINE__, 0) } /* @@ -689,7 +689,7 @@ Method(in1b, 1, Serialized) Name(i001, 0) Name(b000, Buffer() {0x11, 0x01, 0x22}) - CH03(ts, z164, 0x01d, 0, 0) + CH03(ts, z164, 0x01d, __LINE__, 0) Store(arg0, i001) @@ -730,7 +730,7 @@ Method(in1b, 1, Serialized) Store(Add(DerefOf(Index(b000, 1)), m001()), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z164, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z164, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -742,10 +742,10 @@ Method(in1b, 1, Serialized) } if (LNotEqual(Local0, Local1)) { - err(ts, z164, 0x01f, 0, 0, Local0, Local1) + err(ts, z164, __LINE__, 0, 0, Local0, Local1) } - CH03(ts, z164, 0x020, 0, 0) + CH03(ts, z164, 0x020, __LINE__, 0) } /* @@ -761,7 +761,7 @@ Method(in1c, 1, Serialized) Name(i001, 0) Name(b000, Buffer() {0x11, 0x01, 0x22}) - CH03(ts, z164, 0x01d, 0, 0) + CH03(ts, z164, 0x01d, __LINE__, 0) Store(arg0, i001) @@ -806,12 +806,12 @@ Method(in1c, 1, Serialized) Return (Local0) } - CH03(ts, z164, 0x000, 0, 0) + CH03(ts, z164, 0x000, __LINE__, 0) Store(m000(b000), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z164, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z164, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -823,10 +823,10 @@ Method(in1c, 1, Serialized) } if (LNotEqual(Local0, Local1)) { - err(ts, z164, 0x01f, 0, 0, Local0, Local1) + err(ts, z164, __LINE__, 0, 0, Local0, Local1) } - CH03(ts, z164, 0x020, 0, 0) + CH03(ts, z164, 0x020, __LINE__, 0) } @@ -840,7 +840,7 @@ Method(in1d,, Serialized) Name(p000, Package() {1,2,3,4}) Name(pp00, Package() {0x11111111, 0x00000001, 0x22223333}) - CH03(ts, z164, 0x006, 0, 0) + CH03(ts, z164, 0x006, __LINE__, 0) Method(m001) { @@ -879,16 +879,16 @@ Method(in1d,, Serialized) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z164, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z164, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07000000) } - CH03(ts, z164, 0x009, 0, 0) + CH03(ts, z164, 0x009, __LINE__, 0) } /* @@ -905,7 +905,7 @@ Method(in1e,, Serialized) Name(p000, Package() {1,2,3,4}) Name(pp00, Package() {0x11111111, 0x00000001, 0x22223333}) - CH03(ts, z164, 0x006, 0, 0) + CH03(ts, z164, 0x006, __LINE__, 0) Method(m000, 1) { @@ -948,21 +948,21 @@ Method(in1e,, Serialized) Return (Local0) } - CH03(ts, z164, 0x000, 0, 0) + CH03(ts, z164, 0x000, __LINE__, 0) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z164, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z164, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07000000) } - CH03(ts, z164, 0x009, 0, 0) + CH03(ts, z164, 0x009, __LINE__, 0) } Method(ini1) @@ -1014,6 +1014,6 @@ Method(ini1) BLCK() } - CH03("ini1", z164, 0x000, 0, 0) + CH03("ini1", z164, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in20.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in20.asl index d0474e7..5d65712 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in20.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in20.asl @@ -50,7 +50,7 @@ Method(in20, 1, Serialized) Name(i001, 0) - CH03(ts, z165, 0x000, 0, 0) + CH03(ts, z165, 0x000, __LINE__, 0) Store(arg0, i001) @@ -79,7 +79,7 @@ Method(in20, 1, Serialized) Store(m000(i000), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z165, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z165, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -144,11 +144,11 @@ Method(in21, 1, Serialized) Store(Add(i000, m001(i000)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z165, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z165, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x00000001)) { - err(ts, z165, 0x004, 0, 0, i000, 0x00000001) + err(ts, z165, __LINE__, 0, 0, i000, 0x00000001) } } @@ -185,11 +185,11 @@ Method(in22,, Serialized) Store(Add(i000, m000(i000)), Local0) if (LNotEqual(Local0, 0x00b0002d)) { - err(ts, z165, 0x006, 0, 0, Local0, 0x00b0002d) + err(ts, z165, __LINE__, 0, 0, Local0, 0x00b0002d) } if (LNotEqual(i000, 0x00100000)) { - err(ts, z165, 0x007, 0, 0, i000, 0x00100000) + err(ts, z165, __LINE__, 0, 0, i000, 0x00100000) } } @@ -252,14 +252,14 @@ Method(in23, 2, Serialized) Store(Add(arg1, m001(1)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z165, 0x00f, 0, 0, Local0, 0x87654321) + err(ts, z165, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(arg1, 1)) { - err(ts, z165, 0x010, 0, 0, arg1, 1) + err(ts, z165, __LINE__, 0, 0, arg1, 1) } - CH03(ts, z165, 0x011, 0, 0) + CH03(ts, z165, 0x011, __LINE__, 0) } Method(ini2) @@ -273,6 +273,6 @@ Method(ini2) SRMT("in23-0") in23(0, 0) - CH03("ini2", z165, 0x000, 0, 0) + CH03("ini2", z165, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl index 43217d3..d351cd6 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl @@ -62,14 +62,14 @@ Method(in30,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(0x11112222, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } } m001(arg0, arg1) @@ -79,12 +79,12 @@ Method(in30,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -105,14 +105,14 @@ Method(in31,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -122,12 +122,12 @@ Method(in31,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -149,7 +149,7 @@ Method(in32,, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(arg1), Local7) @@ -157,7 +157,7 @@ Method(in32,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -167,12 +167,12 @@ Method(in32,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -195,14 +195,14 @@ Method(in33,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -212,15 +212,15 @@ Method(in33,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0002) } } @@ -254,26 +254,26 @@ Method(in34,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z166, 0x000, 0, 0, Local0, "i000") + err(ts, z166, __LINE__, 0, 0, Local0, "i000") } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } } m001(arg0, arg1) @@ -283,22 +283,22 @@ Method(in34,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z166, 0x000, 0, 0, Local0, "i000") + err(ts, z166, __LINE__, 0, 0, Local0, "i000") } } @@ -318,14 +318,14 @@ Method(in36,, Serialized) // arg0 - b000 Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x10)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x10) + err(ts, z166, __LINE__, 0, 0, Local0, 0x10) } Store(0x67, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x67) + err(ts, z166, __LINE__, 0, 0, Local0, 0x67) } // arg1 - RefOf(b000) @@ -335,7 +335,7 @@ Method(in36,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x55)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x55) + err(ts, z166, __LINE__, 0, 0, Local0, 0x55) } } m001(arg0, arg1) @@ -345,17 +345,17 @@ Method(in36,, Serialized) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x67) + err(ts, z166, __LINE__, 0, 0, Local0, 0x67) } Store(DerefOf(Index(b000, 1)), Local0) if (LNotEqual(Local0, 0x11)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x11) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11) } Store(DerefOf(Index(b000, 2)), Local0) if (LNotEqual(Local0, 0x12)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x12) + err(ts, z166, __LINE__, 0, 0, Local0, 0x12) } } @@ -396,16 +396,16 @@ Method(in37,, Serialized) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x00a0002d)) { - err(ts, z166, 0x00a, 0, 0, Local0, 0x00a0002d) + err(ts, z166, __LINE__, 0, 0, Local0, 0x00a0002d) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x00100009)) { - err(ts, z166, 0x00b, 0, 0, Local0, 0x00100009) + err(ts, z166, __LINE__, 0, 0, Local0, 0x00100009) } - CH03(ts, z166, 0x00c, 0, 0) + CH03(ts, z166, 0x00c, __LINE__, 0) } /* @@ -427,7 +427,7 @@ Method(in38, 1, Serialized) OperationRegion(r000, SystemMemory, 0x100, 0x100) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } - CH03(ts, z166, 0x011, 0, 0) + CH03(ts, z166, 0x011, __LINE__, 0) Store(arg0, i001) @@ -494,7 +494,7 @@ Method(in38, 1, Serialized) Store(m000(f001), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z166, 0x012, 0, 0, Local0, 0x07654321) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07654321) } if (arg0) { @@ -504,10 +504,10 @@ Method(in38, 1, Serialized) } if (LNotEqual(f001, Local1)) { - err(ts, z166, 0x013, 0, 0, f001, Local1) + err(ts, z166, __LINE__, 0, 0, f001, Local1) } - CH03(ts, z166, 0x014, 0, 0) + CH03(ts, z166, 0x014, __LINE__, 0) } /* @@ -523,7 +523,7 @@ Method(in39, 1, Serialized) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } BankField(r000, f001, 0, ByteAcc, NoLock, Preserve) { bnk0, 32 } - CH03(ts, z166, 0x015, 0, 0) + CH03(ts, z166, 0x015, __LINE__, 0) Store(arg0, i001) @@ -589,7 +589,7 @@ Method(in39, 1, Serialized) Store(m000(bnk0), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z166, 0x016, 0, 0, Local0, 0x07654321) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07654321) } if (arg0) { @@ -599,10 +599,10 @@ Method(in39, 1, Serialized) } if (LNotEqual(bnk0, Local1)) { - err(ts, z166, 0x017, 0, 0, bnk0, Local1) + err(ts, z166, __LINE__, 0, 0, bnk0, Local1) } - CH03(ts, z166, 0x018, 0, 0) + CH03(ts, z166, 0x018, __LINE__, 0) } /* @@ -618,7 +618,7 @@ Method(in3a, 1, Serialized) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } IndexField(f000, f001, ByteAcc, NoLock, Preserve) { if00, 32 } - CH03(ts, z166, 0x019, 0, 0) + CH03(ts, z166, 0x019, __LINE__, 0) Store(arg0, i001) @@ -689,7 +689,7 @@ Method(in3a, 1, Serialized) */ if (LNotEqual(Local0, 0x07070707)) { - err(ts, z166, 0x01a, 0, 0, Local0, 0x07070707) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07070707) } if (arg0) { @@ -699,10 +699,10 @@ Method(in3a, 1, Serialized) } if (LNotEqual(if00, Local1)) { - err(ts, z166, 0x01b, 0, 0, if00, Local1) + err(ts, z166, __LINE__, 0, 0, if00, Local1) } - CH03(ts, z166, 0x01c, 0, 0) + CH03(ts, z166, 0x01c, __LINE__, 0) } /* @@ -728,7 +728,7 @@ Method(in3c, 1, Serialized) Name(i001, 0) Name(b000, Buffer() {0x11, 0x01, 0x22}) - CH03(ts, z166, 0x01d, 0, 0) + CH03(ts, z166, 0x01d, __LINE__, 0) Store(arg0, i001) @@ -776,7 +776,7 @@ Method(in3c, 1, Serialized) Store(m000(b000), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z166, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z166, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -788,10 +788,10 @@ Method(in3c, 1, Serialized) } if (LNotEqual(Local0, Local1)) { - err(ts, z166, 0x01f, 0, 0, Local0, Local1) + err(ts, z166, __LINE__, 0, 0, Local0, Local1) } - CH03(ts, z166, 0x020, 0, 0) + CH03(ts, z166, 0x020, __LINE__, 0) } /* @@ -818,7 +818,7 @@ Method(in3e,, Serialized) Name(p000, Package() {1,2,3,4}) Name(pp00, Package() {0x11111111, 0x00000001, 0x22223333}) - CH03(ts, z166, 0x006, 0, 0) + CH03(ts, z166, 0x006, __LINE__, 0) Method(m000, 1) { @@ -864,16 +864,16 @@ Method(in3e,, Serialized) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z166, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z166, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07000000) } - CH03(ts, z166, 0x009, 0, 0) + CH03(ts, z166, 0x009, __LINE__, 0) } Method(ini3) @@ -907,6 +907,6 @@ Method(ini3) SRMT("in3e") in3e() - CH03("ini3", z166, 0x000, 0, 0) + CH03("ini3", z166, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl index 0090729..be12fc2 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl @@ -65,7 +65,7 @@ Method(obt0, 2) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err("obt0", z167, 0x000, 0, 0, Local0, arg1) + err("obt0", z167, __LINE__, 0, 0, Local0, arg1) } Return (5) } @@ -85,65 +85,65 @@ Method(act0, 4, Serialized) Case (0) { // ObjectType Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, arg2)) { - err(ts, z167, 0x000, 0, 0, Local0, arg2) + err(ts, z167, __LINE__, 0, 0, Local0, arg2) } } Case (1) { // Add Add(arg1, arg2, Local0) if (LNotEqual(Local0, arg3)) { - err(ts, z167, 0x001, 0, 0, Local0, arg3) + err(ts, z167, __LINE__, 0, 0, Local0, arg3) } } Case (2) { // LNotEqual if (LNotEqual(arg1, 0xabcd0000)) { - err(ts, z167, 0x002, 0, 0, arg1, 0xabcd0000) + err(ts, z167, __LINE__, 0, 0, arg1, 0xabcd0000) } } Case (3) { // LNotEqual // if (chk0) { if (LNotEqual(arg1, "qwrtyu0003")) { - err(ts, z167, 0x003, 0, 0, arg1, "qwrtyu0003") + err(ts, z167, __LINE__, 0, 0, arg1, "qwrtyu0003") } // } } Case (4) { // LNotEqual // if (chk0) { if (LNotEqual(arg1, "abcd0800")) { - err(ts, z167, 0x004, 0, 0, arg1, "abcd0800") + err(ts, z167, __LINE__, 0, 0, arg1, "abcd0800") } // } } Case (5) { // LNotEqual // if (chk0) { if (LNotEqual(arg1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4})) { - err(ts, z167, 0x005, 0, 0, arg1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) + err(ts, z167, __LINE__, 0, 0, arg1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) } // } } Case (6) { // LNotEqual Store(DerefOf(Index(arg1, 1)), Local0) if (LNotEqual(Local0, 0xabcd0902)) { - err(ts, z167, 0x006, 0, 0, Local0, 0xabcd0902) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0902) } } Case (7) { // LNotEqual if (LNotEqual(arg1, 0xabcd0a00)) { - err(ts, z167, 0x007, 0, 0, arg1, 0xabcd0a00) + err(ts, z167, __LINE__, 0, 0, arg1, 0xabcd0a00) } } Case (8) { // LNotEqual if (LNotEqual(arg1, 0xabababab)) { - err(ts, z167, 0x008, 0, 0, arg1, 0xabababab) + err(ts, z167, __LINE__, 0, 0, arg1, 0xabababab) } } Case (9) { // LNotEqual if (LNotEqual(arg1, 0)) { - err(ts, z167, 0x009, 0, 0, arg1, 0) + err(ts, z167, __LINE__, 0, 0, arg1, 0) } } Case (10) { // LNotEqual if (LNotEqual(arg1, 0xabcd0d08)) { - err(ts, z167, 0x00a, 0, 0, arg1, 0xabcd0d08) + err(ts, z167, __LINE__, 0, 0, arg1, 0xabcd0d08) } } } // Switch (arg0) @@ -170,14 +170,14 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 1)) { // Integer Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("mI01", z167, 0x000, 0, 0, Local0, c009) + err("mI01", z167, __LINE__, 0, 0, Local0, c009) } Add(arg0, 1, Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xabcd0001) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabcd0001) } if (LNotEqual(arg0, 0xabcd0000)) { - err("mI01", z167, 0x007, 0, 0, arg0, 0xabcd0000) + err("mI01", z167, __LINE__, 0, 0, arg0, 0xabcd0000) } Return (arg0) @@ -186,12 +186,12 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 2)) { // String Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00a)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00a) + err("mI01", z167, __LINE__, 0, 0, Local0, c00a) } if (LNot(run4)) { // Run on ACPICA only if (LNotEqual(arg0, "qwrtyu0003")) { - err("mI01", z167, 0x007, 0, 0, arg0, "qwrtyu0003") + err("mI01", z167, __LINE__, 0, 0, arg0, "qwrtyu0003") } } Return (arg0) @@ -200,16 +200,16 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 3)) { // String applicable to the Implicit Conversion Rules ("abcd0800") Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00a)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00a) + err("mI01", z167, __LINE__, 0, 0, Local0, c00a) } if (LNot(run4)) { // Run on ACPICA only Add(arg0, 5, Local0) if (LNotEqual(Local0, 0xabcd0805)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xabcd0805) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabcd0805) } if (LNotEqual(arg0, "abcd0800")) { - err("mI01", z167, 0x007, 0, 0, arg0, "abcd0800") + err("mI01", z167, __LINE__, 0, 0, arg0, "abcd0800") } } @@ -219,16 +219,16 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 4)) { // Buffer Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00b)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00b) + err("mI01", z167, __LINE__, 0, 0, Local0, c00b) } if (LNot(run4)) { // Run on ACPICA only Add(arg0, 7, Local0) if (LNotEqual(Local0, 0xb4b3b2b1b7)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xb4b3b2b1b7) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xb4b3b2b1b7) } if (LNotEqual(arg0, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4})) { - err("mI01", z167, 0x007, 0, 0, arg0, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) + err("mI01", z167, __LINE__, 0, 0, arg0, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) } } @@ -238,11 +238,11 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 5)) { // Package Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00c)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00c) + err("mI01", z167, __LINE__, 0, 0, Local0, c00c) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0902)) { - err("mI01", z167, 0x006, 0, 0, Local0, 0xabcd0902) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabcd0902) } Return (arg0) } @@ -250,14 +250,14 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 6)) { // Field Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("mI01", z167, 0x000, 0, 0, Local0, c009) + err("mI01", z167, __LINE__, 0, 0, Local0, c009) } Add(arg0, 9, Local0) if (LNotEqual(Local0, 0xabcd0a09)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xabcd0a09) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabcd0a09) } if (LNotEqual(arg0, 0xabcd0a00)) { - err("mI01", z167, 0x007, 0, 0, arg0, 0xabcd0a00) + err("mI01", z167, __LINE__, 0, 0, arg0, 0xabcd0a00) } Return (arg0) @@ -266,7 +266,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 7)) { // Device Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00e)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00e) + err("mI01", z167, __LINE__, 0, 0, Local0, c00e) } Return (arg0) } @@ -274,7 +274,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 8)) { // Event Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00f)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00f) + err("mI01", z167, __LINE__, 0, 0, Local0, c00f) } Return (arg0) } @@ -282,7 +282,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 9)) { // Mutex Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c011)) { - err("mI01", z167, 0x000, 0, 0, Local0, c011) + err("mI01", z167, __LINE__, 0, 0, Local0, c011) } Return (arg0) } @@ -290,7 +290,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 10)) { // Operation Region Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c012)) { - err("mI01", z167, 0x000, 0, 0, Local0, c012) + err("mI01", z167, __LINE__, 0, 0, Local0, c012) } Return (arg0) } @@ -298,7 +298,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 11)) { // Power Resource Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c013)) { - err("mI01", z167, 0x000, 0, 0, Local0, c013) + err("mI01", z167, __LINE__, 0, 0, Local0, c013) } Return (arg0) } @@ -306,7 +306,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 12)) { // Processor Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c014)) { - err("mI01", z167, 0x000, 0, 0, Local0, c014) + err("mI01", z167, __LINE__, 0, 0, Local0, c014) } Return (arg0) } @@ -314,7 +314,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 13)) { // Thermal Zone Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c015)) { - err("mI01", z167, 0x000, 0, 0, Local0, c015) + err("mI01", z167, __LINE__, 0, 0, Local0, c015) } Return (arg0) } @@ -322,14 +322,14 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 14)) { // Index Field Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("mI01", z167, 0x000, 0, 0, Local0, c009) + err("mI01", z167, __LINE__, 0, 0, Local0, c009) } Add(arg0, 9, Local0) if (LNotEqual(Local0, 0xabababb4)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xabababb4) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabababb4) } if (LNotEqual(arg0, 0xabababab)) { - err("mI01", z167, 0x008, 0, 0, arg0, 0xabababab) + err("mI01", z167, __LINE__, 0, 0, arg0, 0xabababab) } Return (arg0) } @@ -337,14 +337,14 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 15)) { // Bank Field Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("mI01", z167, 0x000, 0, 0, Local0, c009) + err("mI01", z167, __LINE__, 0, 0, Local0, c009) } Add(arg0, 9, Local0) if (LNotEqual(Local0, 9)) { - err("mI01", z167, 0x001, 0, 0, Local0, 9) + err("mI01", z167, __LINE__, 0, 0, Local0, 9) } if (LNotEqual(arg0, 0)) { - err("mI01", z167, 0x009, 0, 0, arg0, 0) + err("mI01", z167, __LINE__, 0, 0, arg0, 0) } Return (arg0) @@ -356,16 +356,16 @@ Method(mI01, 1, Serialized) Store(ObjectType(arg0), Local0) if (LAnd(LNotEqual(Local0, c009), LNotEqual(Local0, c00b))) { - err("mI01", z167, 0x000, 0, 0, Local0, c00b) + err("mI01", z167, __LINE__, 0, 0, Local0, c00b) } if (chk0) { Add(arg0, 2, Local0) if (LNotEqual(Local0, 0xabcd0d0a)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xabcd0d0a) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabcd0d0a) } if (LNotEqual(arg0, 0xabcd0d08)) { - err("mI01", z167, 0x00a, 0, 0, arg0, 0xabcd0d08) + err("mI01", z167, __LINE__, 0, 0, arg0, 0xabcd0d08) } } Return (arg0) @@ -4559,6 +4559,6 @@ Method(ini4) SRMT("in41") in41(0,0,0,0,0,0,0) - CH03("ini4", z167, 0x000, 0, 0) + CH03("ini4", z167, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in50.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in50.asl index 9346231..42cca7e 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in50.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in50.asl @@ -398,256 +398,256 @@ Method(in51, 7, Serialized) if (LNotEqual(Local0, 0x0006000C)) { - err(ts, z168, 0x000, 0, 0, Local0, 0x0006000C) + err(ts, z168, __LINE__, 0, 0, Local0, 0x0006000C) } if (LNotEqual(Local1, 0x0018002A)) { - err(ts, z168, 0x001, 0, 0, Local1, 0x0018002A) + err(ts, z168, __LINE__, 0, 0, Local1, 0x0018002A) } if (LNotEqual(Local2, 0x006000A6)) { - err(ts, z168, 0x002, 0, 0, Local2, 0x006000A6) + err(ts, z168, __LINE__, 0, 0, Local2, 0x006000A6) } if (LNotEqual(arg0, 0x001E0036)) { - err(ts, z168, 0x003, 0, 0, arg0, 0x001E0036) + err(ts, z168, __LINE__, 0, 0, arg0, 0x001E0036) } if (LNotEqual(arg1, 0x007E00DC)) { - err(ts, z168, 0x004, 0, 0, arg1, 0x007E00DC) + err(ts, z168, __LINE__, 0, 0, arg1, 0x007E00DC) } if (LNotEqual(ii00, 0x00000006)) { - err(ts, z168, 0x005, 0, 0, ii00, 0x00000006) + err(ts, z168, __LINE__, 0, 0, ii00, 0x00000006) } if (LNotEqual(Local3, 0x00076976)) { - err(ts, z168, 0x006, 0, 0, Local3, 0x00076976) + err(ts, z168, __LINE__, 0, 0, Local3, 0x00076976) } if (LNotEqual(ii01, 0x003B4BB0)) { - err(ts, z168, 0x007, 0, 0, ii01, 0x003B4BB0) + err(ts, z168, __LINE__, 0, 0, ii01, 0x003B4BB0) } if (LNotEqual(arg2, 0x00769760)) { - err(ts, z168, 0x008, 0, 0, arg2, 0x00769760) + err(ts, z168, __LINE__, 0, 0, arg2, 0x00769760) } if (LNotEqual(Local5, 0x1F710810)) { - err(ts, z168, 0x009, 0, 0, Local5, 0x1F710810) + err(ts, z168, __LINE__, 0, 0, Local5, 0x1F710810) } if (LNotEqual(ii02, 0x03EE2102)) { - err(ts, z168, 0x00a, 0, 0, ii02, 0x03EE2102) + err(ts, z168, __LINE__, 0, 0, ii02, 0x03EE2102) } if (LNotEqual(Local6, 0x034E2102)) { - err(ts, z168, 0x00b, 0, 0, Local6, 0x034E2102) + err(ts, z168, __LINE__, 0, 0, Local6, 0x034E2102) } if (LNotEqual(ii03, 0x00000007)) { - err(ts, z168, 0x00c, 0, 0, ii03, 0x00000007) + err(ts, z168, __LINE__, 0, 0, ii03, 0x00000007) } if (LNotEqual(ii04, 0x034E2109)) { - err(ts, z168, 0x00d, 0, 0, ii04, 0x034E2109) + err(ts, z168, __LINE__, 0, 0, ii04, 0x034E2109) } if (LNotEqual(ii05, 0x0000001F)) { - err(ts, z168, 0x00e, 0, 0, ii05, 0x0000001F) + err(ts, z168, __LINE__, 0, 0, ii05, 0x0000001F) } if (LNotEqual(arg3, 0x034E2128)) { - err(ts, z168, 0x00f, 0, 0, arg3, 0x034E2128) + err(ts, z168, __LINE__, 0, 0, arg3, 0x034E2128) } if (LNotEqual(ii06, 0x00000011)) { - err(ts, z168, 0x010, 0, 0, ii06, 0x00000011) + err(ts, z168, __LINE__, 0, 0, ii06, 0x00000011) } if (LNotEqual(arg4, 0x034E2139)) { - err(ts, z168, 0x011, 0, 0, arg4, 0x034E2139) + err(ts, z168, __LINE__, 0, 0, arg4, 0x034E2139) } if (LNotEqual(arg5, 0x12FAB246)) { - err(ts, z168, 0x012, 0, 0, arg5, 0x12FAB246) + err(ts, z168, __LINE__, 0, 0, arg5, 0x12FAB246) } if (LNotEqual(ii07, 0xFFFFFFFF01543726)) { - err(ts, z168, 0x013, 0, 0, ii07, 0xFFFFFFFF01543726) + err(ts, z168, __LINE__, 0, 0, ii07, 0xFFFFFFFF01543726) } if (LNotEqual(arg6, 0xFFFFFFFF144EE96C)) { - err(ts, z168, 0x014, 0, 0, arg6, 0xFFFFFFFF144EE96C) + err(ts, z168, __LINE__, 0, 0, arg6, 0xFFFFFFFF144EE96C) } if (LNotEqual(ii08, 0xFFFFFFFF050B0301)) { - err(ts, z168, 0x015, 0, 0, ii08, 0xFFFFFFFF050B0301) + err(ts, z168, __LINE__, 0, 0, ii08, 0xFFFFFFFF050B0301) } if (LNotEqual(Local7, 0xFFFFFFFE1959EC6D)) { - err(ts, z168, 0x016, 0, 0, Local7, 0xFFFFFFFE1959EC6D) + err(ts, z168, __LINE__, 0, 0, Local7, 0xFFFFFFFE1959EC6D) } if (LNotEqual(ii09, 0xFFFFFFFF01FB4321)) { - err(ts, z168, 0x017, 0, 0, ii09, 0xFFFFFFFF01FB4321) + err(ts, z168, __LINE__, 0, 0, ii09, 0xFFFFFFFF01FB4321) } if (LNotEqual(ii0a, 0xFFFFFFFD1B552F8E)) { - err(ts, z168, 0x018, 0, 0, ii0a, 0xFFFFFFFD1B552F8E) + err(ts, z168, __LINE__, 0, 0, ii0a, 0xFFFFFFFD1B552F8E) } if (LNotEqual(ii0b, 0x1B552F8E)) { - err(ts, z168, 0x019, 0, 0, ii0b, 0x1B552F8E) + err(ts, z168, __LINE__, 0, 0, ii0b, 0x1B552F8E) } if (LNotEqual(ii0c, 0x00769760)) { - err(ts, z168, 0x01a, 0, 0, ii0c, 0x00769760) + err(ts, z168, __LINE__, 0, 0, ii0c, 0x00769760) } if (LNotEqual(ii0d, 0x20769760)) { - err(ts, z168, 0x01b, 0, 0, ii0d, 0x20769760) + err(ts, z168, __LINE__, 0, 0, ii0d, 0x20769760) } if (LNotEqual(ii0e, 0)) { - err(ts, z168, 0x01c, 0, 0, ii0e, 0) + err(ts, z168, __LINE__, 0, 0, ii0e, 0) } if (LNotEqual(ii0f, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x01d, 0, 0, ii0f, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii0f, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(Local4, 0x052167D2)) { - err(ts, z168, 0x01e, 0, 0, Local4, 0x052167D2) + err(ts, z168, __LINE__, 0, 0, Local4, 0x052167D2) } if (LNotEqual(ii10, 0x052167D1)) { - err(ts, z168, 0x01f, 0, 0, ii10, 0x052167D1) + err(ts, z168, __LINE__, 0, 0, ii10, 0x052167D1) } if (LNotEqual(ii11, 0)) { - err(ts, z168, 0x020, 0, 0, ii11, 0) + err(ts, z168, __LINE__, 0, 0, ii11, 0) } if (LNotEqual(ii12, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x021, 0, 0, ii12, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii12, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii13, 0x00000000052167D1)) { - err(ts, z168, 0x022, 0, 0, ii13, 0x00000000052167D1) + err(ts, z168, __LINE__, 0, 0, ii13, 0x00000000052167D1) } if (LNotEqual(ii14, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x023, 0, 0, ii14, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii14, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii15, 0)) { - err(ts, z168, 0x024, 0, 0, ii15, 0) + err(ts, z168, __LINE__, 0, 0, ii15, 0) } if (LNotEqual(ii16, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x025, 0, 0, ii16, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii16, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii17, 0)) { - err(ts, z168, 0x026, 0, 0, ii17, 0) + err(ts, z168, __LINE__, 0, 0, ii17, 0) } if (LNotEqual(ii18, 0x052167D1)) { - err(ts, z168, 0x027, 0, 0, ii18, 0x052167D1) + err(ts, z168, __LINE__, 0, 0, ii18, 0x052167D1) } if (LNotEqual(ii19, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x028, 0, 0, ii19, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii19, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii1a, 0)) { - err(ts, z168, 0x029, 0, 0, ii1a, 0) + err(ts, z168, __LINE__, 0, 0, ii1a, 0) } if (LNotEqual(ii1b, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x02a, 0, 0, ii1c, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii1c, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii1c, 0x052167D0)) { - err(ts, z168, 0x02b, 0, 0, ii1d, 0x052167D0) + err(ts, z168, __LINE__, 0, 0, ii1d, 0x052167D0) } if (LNotEqual(ii1d, 0)) { - err(ts, z168, 0x02c, 0, 0, ii1d, 0) + err(ts, z168, __LINE__, 0, 0, ii1d, 0) } if (LNotEqual(ii1e, 0)) { - err(ts, z168, 0x02d, 0, 0, ii1e, 0) + err(ts, z168, __LINE__, 0, 0, ii1e, 0) } if (LNotEqual(ii1f, 0)) { - err(ts, z168, 0x02e, 0, 0, ii1f, 0) + err(ts, z168, __LINE__, 0, 0, ii1f, 0) } if (LNotEqual(ii20, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x02f, 0, 0, ii20, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii20, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii21, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x30, 0, 0, ii21, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii21, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii22, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x031, 0, 0, ii22, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii22, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii23, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x032, 0, 0, ii23, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii23, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii24, 0x052167CE)) { - err(ts, z168, 0x033, 0, 0, ii24, 0x052167CE) + err(ts, z168, __LINE__, 0, 0, ii24, 0x052167CE) } if (LNotEqual(ii25, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x034, 0, 0, ii25, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii25, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii26, 0)) { - err(ts, z168, 0x035, 0, 0, ii26, 0) + err(ts, z168, __LINE__, 0, 0, ii26, 0) } if (LNotEqual(ii27, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x036, 0, 0, ii27, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii27, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii28, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x037, 0, 0, ii28, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii28, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii29, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x038, 0, 0, ii29, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii29, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii2a, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x039, 0, 0, ii2a, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii2a, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii2b, 0xFFFFFFFFFFFFFFFD)) { - err(ts, z168, 0x03a, 0, 0, ii2b, 0xFFFFFFFFFFFFFFFD) + err(ts, z168, __LINE__, 0, 0, ii2b, 0xFFFFFFFFFFFFFFFD) } if (LNotEqual(ii2c, 0x052167CB)) { - err(ts, z168, 0x03b, 0, 0, ii2c, 0x052167CB) + err(ts, z168, __LINE__, 0, 0, ii2c, 0x052167CB) } if (LNotEqual(ii2d, 0)) { - err(ts, z168, 0x03c, 0, 0, ii2d, 0) + err(ts, z168, __LINE__, 0, 0, ii2d, 0) } if (LNotEqual(ii2e, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x03d, 0, 0, ii2e, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii2e, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii2f, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x03e, 0, 0, ii2f, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii2f, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii30, 0)) { - err(ts, z168, 0x03f, 0, 0, ii30, 0) + err(ts, z168, __LINE__, 0, 0, ii30, 0) } if (LNotEqual(ii31, 0)) { - err(ts, z168, 0x040, 0, 0, ii31, 0) + err(ts, z168, __LINE__, 0, 0, ii31, 0) } if (LNotEqual(ii32, 0)) { - err(ts, z168, 0x041, 0, 0, ii32, 0) + err(ts, z168, __LINE__, 0, 0, ii32, 0) } if (LNotEqual(ii33, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x042, 0, 0, ii33, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii33, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii34, 0x052167CA)) { - err(ts, z168, 0x043, 0, 0, ii34, 0x052167CA) + err(ts, z168, __LINE__, 0, 0, ii34, 0x052167CA) } if (LNotEqual(ii35, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x044, 0, 0, ii35, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii35, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii36, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x045, 0, 0, ii36, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii36, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii37, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x046, 0, 0, ii37, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii37, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii38, 0)) { - err(ts, z168, 0x047, 0, 0, ii38, 0) + err(ts, z168, __LINE__, 0, 0, ii38, 0) } if (LNotEqual(ii39, 0)) { - err(ts, z168, 0x048, 0, 0, ii39, 0) + err(ts, z168, __LINE__, 0, 0, ii39, 0) } if (LNotEqual(ii3a, 0)) { - err(ts, z168, 0x049, 0, 0, ii3a, 0) + err(ts, z168, __LINE__, 0, 0, ii3a, 0) } if (LNotEqual(ii3b, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x04a, 0, 0, ii3b, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii3b, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii3c, 0x052167C8)) { - err(ts, z168, 0x04b, 0, 0, ii3c, 0x052167C8) + err(ts, z168, __LINE__, 0, 0, ii3c, 0x052167C8) } if (LNotEqual(ii3d, 0)) { - err(ts, z168, 0x04c, 0, 0, ii3d, 0) + err(ts, z168, __LINE__, 0, 0, ii3d, 0) } if (LNotEqual(ii3e, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x04d, 0, 0, ii3e, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii3e, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii3f, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x04e, 0, 0, ii3f, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii3f, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii40, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x04f, 0, 0, ii40, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii40, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii41, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x050, 0, 0, ii41, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii41, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii42, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x051, 0, 0, ii42, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii42, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii43, 0xFFFFFFFFFFFFFFFD)) { - err(ts, z168, 0x052, 0, 0, ii43, 0xFFFFFFFFFFFFFFFD) + err(ts, z168, __LINE__, 0, 0, ii43, 0xFFFFFFFFFFFFFFFD) } if (LNotEqual(ii44, 0x052167C5)) { - err(ts, z168, 0x053, 0, 0, ii44, 0x052167C5) + err(ts, z168, __LINE__, 0, 0, ii44, 0x052167C5) } } @@ -659,6 +659,6 @@ Method(ini5) SRMT("in51") in51(0,0,0,0,0,0,0) - CH03("ini5", z168, 0x000, 0, 0) + CH03("ini5", z168, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_abbu.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_abbu.asl index 787ebf5..f6ffd0d 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_abbu.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_abbu.asl @@ -98,15 +98,15 @@ Method(mt00,, Serialized) mm01() } - CH03(ts, z169, 0x100, 0, 0) + CH03(ts, z169, 0x100, __LINE__, 0) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z169, 0x000, 0, 0, i000, 0xabcd0000) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd0000) } - CH03(ts, z169, 0x101, 0, 0) + CH03(ts, z169, 0x101, __LINE__, 0) } /* @@ -249,15 +249,15 @@ Method(mt01,, Serialized) mm01() } - CH03(ts, z169, 0x102, 0, 0) + CH03(ts, z169, 0x102, __LINE__, 0) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z169, 0x001, 0, 0, i000, 0xabcd0000) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd0000) } - CH03(ts, z169, 0x103, 0, 0) + CH03(ts, z169, 0x103, __LINE__, 0) } /* @@ -335,15 +335,15 @@ Method(mt02,, Serialized) Store(0xabcd0000, i000) } - CH03(ts, z169, 0x104, 0, 0) + CH03(ts, z169, 0x104, __LINE__, 0) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z169, 0x002, 0, 0, i000, 0xabcd0000) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd0000) } - CH03(ts, z169, 0x105, 0, 0) + CH03(ts, z169, 0x105, __LINE__, 0) } /* @@ -486,15 +486,15 @@ Method(mt03,, Serialized) Store(0xabcd0000, i000) } - CH03(ts, z169, 0x106, 0, 0) + CH03(ts, z169, 0x106, __LINE__, 0) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z169, 0x003, 0, 0, i000, 0xabcd0000) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd0000) } - CH03(ts, z169, 0x107, 0, 0) + CH03(ts, z169, 0x107, __LINE__, 0) } /* @@ -530,10 +530,10 @@ Method(mt04,, Serialized) OUTC("mt04, \\_SB_.ABBU.mt04.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0909)) { - err(ts, z169, 0x004, 0, 0, Local0, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0909) } if (LNotEqual(\_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x005, 0, 0, \_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909) } } Increment(\_SB_.ABBU.mt04.dz05.iy07) @@ -558,16 +558,16 @@ Method(mt04,, Serialized) mm01() } - CH03(ts, z169, 0x006, 0, 0) + CH03(ts, z169, 0x006, __LINE__, 0) Increment(\_SB_.ABBU.mt04.dz05.iy07) mm00() if (LNotEqual(\_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x007, 0, 0, \_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909) } - CH03(ts, z169, 0x008, 0, 0) + CH03(ts, z169, 0x008, __LINE__, 0) } /* @@ -651,10 +651,10 @@ Method(mt05,, Serialized) OUTC("mt05, \\_SB_.ABBU.mt05.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0921)) { - err(ts, z169, 0x009, 0, 0, Local0, 0xabcd0921) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0921) } if (LNotEqual(\_SB_.ABBU.mt05.dz05.iy07, 0xabcd0921)) { - err(ts, z169, 0x00a, 0, 0, \_SB_.ABBU.mt05.dz05.iy07, 0xabcd0921) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt05.dz05.iy07, 0xabcd0921) } } Increment(\_SB_.ABBU.mt05.dz05.iy07) @@ -751,16 +751,16 @@ Method(mt05,, Serialized) mm01() } - CH03(ts, z169, 0x108, 0, 0) + CH03(ts, z169, 0x108, __LINE__, 0) Increment(\_SB_.ABBU.mt05.dz05.iy07) mm00() if (LNotEqual(\_SB_.ABBU.mt05.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x00b, 0, 0, \_SB_.ABBU.mt05.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt05.dz05.iy07, 0xabcd0909) } - CH03(ts, z169, 0x109, 0, 0) + CH03(ts, z169, 0x109, __LINE__, 0) } /* @@ -816,10 +816,10 @@ Method(mt06,, Serialized) OUTC("mt06, \\_SB_.ABBU.mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z169, 0x00c, 0, 0, Local0, 0x11112222) + err(ts, z169, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\_SB_.ABBU.mt06.dz05.iy07, 0x11112222)) { - err(ts, z169, 0x00d, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) } } mm04() @@ -831,17 +831,17 @@ Method(mt06,, Serialized) mm01() } - CH03(ts, z169, 0x10a, 0, 0) + CH03(ts, z169, 0x10a, __LINE__, 0) mm00() mt07() // succeeds here if (LNotEqual(\_SB_.ABBU.mt06.dz05.iy07, 0x11112222)) { - err(ts, z169, 0x00e, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) } - CH03(ts, z169, 0x10b, 0, 0) + CH03(ts, z169, 0x10b, __LINE__, 0) } /* @@ -875,10 +875,10 @@ Method(mt07,, Serialized) OUTC("0 mt07, \\_SB_.ABBU.mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z169, 0x00f, 0, 0, Local0, 0x11112222) + err(ts, z169, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\_SB_.ABBU.mt06.dz05.iy07, 0x11112222)) { - err(ts, z169, 0x010, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) } } mm07() @@ -896,7 +896,7 @@ Method(mt07,, Serialized) mm01() } - CH03(ts, z169, 0x10c, 0, 0) + CH03(ts, z169, 0x10c, __LINE__, 0) mm00() @@ -904,13 +904,13 @@ Method(mt07,, Serialized) OUTC("1 mt07, \\_SB_.ABBU.mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z169, 0x011, 0, 0, Local0, 0x11112222) + err(ts, z169, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\_SB_.ABBU.mt06.dz05.iy07, 0x11112222)) { - err(ts, z169, 0x012, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) } - CH03(ts, z169, 0x10d, 0, 0) + CH03(ts, z169, 0x10d, __LINE__, 0) } /* @@ -979,10 +979,10 @@ Method(mt08,, Serialized) OUTC("mt08, \\_SB_.ABBU.mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z169, 0x013, 0, 0, Local0, 0x22223333) + err(ts, z169, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\_SB_.ABBU.mt08.dz05.iy07, 0x22223333)) { - err(ts, z169, 0x014, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) } } mm07() @@ -1000,17 +1000,17 @@ Method(mt08,, Serialized) mm01() } - CH03(ts, z169, 0x10e, 0, 0) + CH03(ts, z169, 0x10e, __LINE__, 0) mm00() mt09() // succeeds here if (LNotEqual(\_SB_.ABBU.mt08.dz05.iy07, 0x22223333)) { - err(ts, z169, 0x015, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) } - CH03(ts, z169, 0x10f, 0, 0) + CH03(ts, z169, 0x10f, __LINE__, 0) } /* @@ -1058,10 +1058,10 @@ Method(mt09,, Serialized) OUTC("0 mt09, \\_SB_.ABBU.mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z169, 0x016, 0, 0, Local0, 0x22223333) + err(ts, z169, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\_SB_.ABBU.mt08.dz05.iy07, 0x22223333)) { - err(ts, z169, 0x017, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) } } mm0f() @@ -1095,7 +1095,7 @@ Method(mt09,, Serialized) mm01() } - CH03(ts, z169, 0x110, 0, 0) + CH03(ts, z169, 0x110, __LINE__, 0) mm00() @@ -1103,13 +1103,13 @@ Method(mt09,, Serialized) OUTC("1 mt09, \\_SB_.ABBU.mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z169, 0x018, 0, 0, Local0, 0x22223333) + err(ts, z169, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\_SB_.ABBU.mt08.dz05.iy07, 0x22223333)) { - err(ts, z169, 0x019, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) } - CH03(ts, z169, 0x111, 0, 0) + CH03(ts, z169, 0x111, __LINE__, 0) } /* @@ -1120,16 +1120,16 @@ Method(mt0a,, Serialized) { Name(ts, "mt0a") - CH03(ts, z169, 0x112, 0, 0) + CH03(ts, z169, 0x112, __LINE__, 0) Store (\_SB_.ABBU.pr7d.iy07, Local0) OUTC("mt0a, \\_SB_.ABBU.pr7d.iy07:") OUTC(Local0) if (LNotEqual(\_SB_.ABBU.pr7d.iy07, 0xabcd0120)) { - err(ts, z169, 0x01a, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd0120) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd0120) } - CH03(ts, z169, 0x113, 0, 0) + CH03(ts, z169, 0x113, __LINE__, 0) } /* @@ -1139,7 +1139,7 @@ Method(mt0b,, Serialized) { Name(ts, "mt0b") - CH03(ts, z169, 0x114, 0, 0) + CH03(ts, z169, 0x114, __LINE__, 0) Increment(\_SB_.ABBU.pr7d.iy07) Store (\_SB_.ABBU.pr7d.iy07, Local0) @@ -1147,10 +1147,10 @@ Method(mt0b,, Serialized) OUTC(Local0) if (LNotEqual(\_SB_.ABBU.pr7d.iy07, 0xabcd0121)) { - err(ts, z169, 0x01b, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd0121) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd0121) } - CH03(ts, z169, 0x115, 0, 0) + CH03(ts, z169, 0x115, __LINE__, 0) } /* @@ -1166,7 +1166,7 @@ Method(mt0c,, Serialized) Name(iy07, 0xabcd0660) } - CH03(ts, z169, 0x01c, 0, 0) + CH03(ts, z169, 0x01c, __LINE__, 0) Increment(\_SB_.ABBU.mt0c.pr7d.iy07) Store (\_SB_.ABBU.mt0c.pr7d.iy07, Local0) @@ -1174,10 +1174,10 @@ Method(mt0c,, Serialized) OUTC(Local0) if (LNotEqual(\_SB_.ABBU.mt0c.pr7d.iy07, 0xabcd0661)) { - err(ts, z169, 0x01d, 0, 0, \_SB_.ABBU.mt0c.pr7d.iy07, 0xabcd0661) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt0c.pr7d.iy07, 0xabcd0661) } - CH03(ts, z169, 0x01e, 0, 0) + CH03(ts, z169, 0x01e, __LINE__, 0) } /* @@ -1189,7 +1189,7 @@ Method(mt0d,, Serialized) Name(i000, 0xabcd1234) - CH03(ts, z169, 0x116, 0, 0) + CH03(ts, z169, 0x116, __LINE__, 0) Store(0, Local0) While (1) { @@ -1202,13 +1202,13 @@ Method(mt0d,, Serialized) mt0e() - CH03(ts, z169, 0x117, 0, 0) + CH03(ts, z169, 0x117, __LINE__, 0) Return } } - CH03(ts, z169, 0x118, 0, 0) + CH03(ts, z169, 0x118, __LINE__, 0) } /* @@ -1218,17 +1218,17 @@ Method(mt0e,, Serialized) { Name(ts, "mt0e") - CH03(ts, z169, 0x119, 0, 0) + CH03(ts, z169, 0x119, __LINE__, 0) Store (\_SB_.ABBU.mt0d.i000, Local0) OUTC("mt0e, \\_SB_.ABBU.mt0d.i000:") OUTC(Local0) if (LNotEqual(\_SB_.ABBU.mt0d.i000, 0xabcd1234)) { - err(ts, z169, 0x01f, 0, 0, \_SB_.ABBU.mt0d.i000, 0xabcd1234) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt0d.i000, 0xabcd1234) } - CH03(ts, z169, 0x11a, 0, 0) + CH03(ts, z169, 0x11a, __LINE__, 0) } /* @@ -1265,10 +1265,10 @@ Method(mt0f,, Serialized) OUTC("mt0f, \\_SB_.ABBU.mt0f.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0909)) { - err(ts, z169, 0x020, 0, 0, Local0, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0909) } if (LNotEqual(\_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x021, 0, 0, \_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909) } } Add(\_SB_.ABBU.mt0f.dz05.iy07, 1, \_SB_.ABBU.mt0f.dz05.iy07) @@ -1293,16 +1293,16 @@ Method(mt0f,, Serialized) mm01() } - CH03(ts, z169, 0x022, 0, 0) + CH03(ts, z169, 0x022, __LINE__, 0) Add(\_SB_.ABBU.mt0f.dz05.iy07, 1, \_SB_.ABBU.mt0f.dz05.iy07) mm00() if (LNotEqual(\_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x023, 0, 0, \_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909) } - CH03(ts, z169, 0x024, 0, 0) + CH03(ts, z169, 0x024, __LINE__, 0) } /* @@ -1354,10 +1354,10 @@ Method(mt10,, Serialized) OUTC("mt10, \\_SB_.ABBU.mt10.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0909)) { - err(ts, z169, 0x025, 0, 0, Local0, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0909) } if (LNotEqual(\_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x026, 0, 0, \_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909) } } Add(\_SB_.ABBU.mt10.dz05.iy07, 1, \_SB_.ABBU.mt10.dz05.iy07) @@ -1406,16 +1406,16 @@ Method(mt10,, Serialized) mm01() } - CH03(ts, z169, 0x027, 0, 0) + CH03(ts, z169, 0x027, __LINE__, 0) Add(\_SB_.ABBU.mt10.dz05.iy07, 1, \_SB_.ABBU.mt10.dz05.iy07) mm00() if (LNotEqual(\_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x028, 0, 0, \_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909) } - CH03(ts, z169, 0x029, 0, 0) + CH03(ts, z169, 0x029, __LINE__, 0) } /* @@ -1451,10 +1451,10 @@ Method(mt11,, Serialized) OUTC("mt11, ^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0909)) { - err(ts, z169, 0x02a, 0, 0, Local0, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0909) } if (LNotEqual(^^^^^^^^dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x02b, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd0909) } } Increment(^^^^^^^dz05.iy07) @@ -1479,16 +1479,16 @@ Method(mt11,, Serialized) mm01() } - CH03(ts, z169, 0x02c, 0, 0) + CH03(ts, z169, 0x02c, __LINE__, 0) Increment(dz05.iy07) mm00() if (LNotEqual(dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x02d, 0, 0, dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, dz05.iy07, 0xabcd0909) } - CH03(ts, z169, 0x02e, 0, 0) + CH03(ts, z169, 0x02e, __LINE__, 0) } /* @@ -1572,10 +1572,10 @@ Method(mt12,, Serialized) OUTC("mt12, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0921)) { - err(ts, z169, 0x02f, 0, 0, Local0, 0xabcd0921) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0921) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0921)) { - err(ts, z169, 0x030, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0921) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0921) } } Increment(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07) @@ -1672,16 +1672,16 @@ Method(mt12,, Serialized) mm01() } - CH03(ts, z169, 0x11b, 0, 0) + CH03(ts, z169, 0x11b, __LINE__, 0) Increment(dz05.iy07) mm00() if (LNotEqual(dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x031, 0, 0, dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, dz05.iy07, 0xabcd0909) } - CH03(ts, z169, 0x11c, 0, 0) + CH03(ts, z169, 0x11c, __LINE__, 0) } /* @@ -1714,59 +1714,59 @@ Method(mt13,, Serialized) OUTC("mt13, \\_SB_.ABBU.mt13.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0500)) { - err(ts, z169, 0x032, 0, 0, Local0, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0500) } if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x033, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm06() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x034, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm05() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x035, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm04() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x036, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm03() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x037, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm02() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x038, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm01() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x039, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } - CH03(ts, z169, 0x03a, 0, 0) + CH03(ts, z169, 0x03a, __LINE__, 0) Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm00() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x03b, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } - CH03(ts, z169, 0x03c, 0, 0) + CH03(ts, z169, 0x03c, __LINE__, 0) } /* @@ -1849,304 +1849,304 @@ Method(mt14,, Serialized) OUTC("mt14, \\_SB_.ABBU.mt14.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x03d, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x03e, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1f() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x03f, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x040, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1e() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x041, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x042, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1d() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x043, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x044, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1c() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x045, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x046, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1b() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x047, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x048, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1a() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x049, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x04a, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm19() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x04b, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x04c, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm18() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x04d, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x04e, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm17() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x04f, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x050, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm16() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x051, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x052, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm15() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x053, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x054, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm14() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x055, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x056, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm13() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x057, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x058, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm12() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x059, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x05a, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm11() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x05b, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x05c, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm10() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x05d, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x05e, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0f() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x05f, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x060, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0e() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x061, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x062, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0d() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x063, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x064, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0c() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x065, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x066, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0b() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x067, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x068, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0a() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x069, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x06a, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm09() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x06b, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x06c, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm08() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x06d, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x06e, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm07() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x06f, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x070, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm06() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x071, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x072, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm05() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x073, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x074, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm04() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x075, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x076, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm03() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x077, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x078, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm02() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x079, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x07a, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm01() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x07b, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x07c, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } - CH03(ts, z169, 0x11d, 0, 0) + CH03(ts, z169, 0x11d, __LINE__, 0) Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm00() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x07d, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x07e, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } - CH03(ts, z169, 0x11e, 0, 0) + CH03(ts, z169, 0x11e, __LINE__, 0) } /* @@ -2229,304 +2229,304 @@ Method(mt15,, Serialized) OUTC("mt15, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x07f, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x080, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1f() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x081, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x082, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1e() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x083, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x084, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1d() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x085, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x086, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1c() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x087, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x088, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1b() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x089, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x08a, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1a() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x08b, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x08c, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm19() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x08d, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x08e, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm18() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x08f, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x090, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm17() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x091, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x092, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm16() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x093, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x094, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm15() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x095, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x096, 0, 0, ^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm14() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x097, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x098, 0, 0, ^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm13() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x099, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x09a, 0, 0, ^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm12() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x09b, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x09c, 0, 0, ^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm11() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x09d, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x09e, 0, 0, ^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm10() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x09f, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0a0, 0, 0, ^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^dz05.iy07, Local0) mm0f() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0a1, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0a2, 0, 0, ^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^dz05.iy07, Local0) mm0e() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0a3, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0a4, 0, 0, ^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^dz05.iy07, Local0) mm0d() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0a5, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0a6, 0, 0, ^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^dz05.iy07, Local0) mm0c() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0a7, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0a8, 0, 0, ^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^dz05.iy07, Local0) mm0b() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0a9, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0aa, 0, 0, ^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^dz05.iy07, Local0) mm0a() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0ab, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0ac, 0, 0, ^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^dz05.iy07, Local0) mm09() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0ad, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0ae, 0, 0, ^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^dz05.iy07, Local0) mm08() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0af, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0b0, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^dz05.iy07, Local0) mm07() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0b1, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0b2, 0, 0, ^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^dz05.iy07, Local0) mm06() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0b3, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0b4, 0, 0, ^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^dz05.iy07, Local0) mm05() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0b5, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0b6, 0, 0, ^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^dz05.iy07, Local0) mm04() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0b7, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0b8, 0, 0, ^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^dz05.iy07, 0xabcd3900) } } Store (^^^dz05.iy07, Local0) mm03() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0b9, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0ba, 0, 0, ^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^dz05.iy07, 0xabcd3900) } } Store (^^dz05.iy07, Local0) mm02() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0bb, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0bc, 0, 0, ^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^dz05.iy07, 0xabcd3900) } } Store (^dz05.iy07, Local0) mm01() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0bd, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0be, 0, 0, ^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^dz05.iy07, 0xabcd3900) } } - CH03(ts, z169, 0x11f, 0, 0) + CH03(ts, z169, 0x11f, __LINE__, 0) Store (dz05.iy07, Local0) mm00() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0bf, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0c0, 0, 0, dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, dz05.iy07, 0xabcd3900) } - CH03(ts, z169, 0x120, 0, 0) + CH03(ts, z169, 0x120, __LINE__, 0) } /* @@ -2600,12 +2600,12 @@ Method(mt16, 1, Serialized) mmF1(arg0) } - CH03(ts, z169, 0x0c1, 0, 0) + CH03(ts, z169, 0x0c1, __LINE__, 0) if (LEqual(arg0, 0)) { // Access to the internal data of method (mm00...) not being invoked m000() - CH04(ts, 0, 5, z169, 0x0c2, 0, 0) // AE_NOT_FOUND + CH04(ts, 0, 5, z169, __LINE__, 0, 0) // AE_NOT_FOUND } elseif (LEqual(arg0, 1)) { // Access to the internal data of method (mm00...) being invoked @@ -2614,7 +2614,7 @@ Method(mt16, 1, Serialized) Store(1, i001) mm00() if (LNotEqual(i000, 0xabcd4904)) { - err(ts, z169, 0x0c3, 0, 0, i000, 0xabcd4904) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd4904) } } elseif (LEqual(arg0, 2)) { @@ -2624,7 +2624,7 @@ Method(mt16, 1, Serialized) Store(2, i001) mm00() if (LNotEqual(i000, 0xabcd4905)) { - err(ts, z169, 0x0c4, 0, 0, i000, 0xabcd4905) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd4905) } } elseif (LEqual(arg0, 3)) { @@ -2635,11 +2635,11 @@ Method(mt16, 1, Serialized) Store(3, i001) mm00() if (LNotEqual(i000, 0xabcd6900)) { - err(ts, z169, 0x0c4, 0, 0, i000, 0xabcd6900) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd6900) } } - CH03(ts, z169, 0x0c5, 0, 0) + CH03(ts, z169, 0x0c5, __LINE__, 0) } /* @@ -2962,12 +2962,12 @@ if (LEqual(arg0, 1)) { mmF1(arg0) } - CH03(ts, z169, 0x0c6, 0, 0) + CH03(ts, z169, 0x0c6, __LINE__, 0) if (LEqual(arg0, 0)) { // Access to the internal data of method (mm00...) not being invoked m000() - CH04(ts, 0, 5, z169, 0x0c7, 0, 0) // AE_NOT_FOUND + CH04(ts, 0, 5, z169, __LINE__, 0, 0) // AE_NOT_FOUND } elseif (LEqual(arg0, 1)) { // Access to the internal data of method (mm00...) being invoked @@ -2976,7 +2976,7 @@ if (LEqual(arg0, 1)) { Store(1, i001) mm00() if (LNotEqual(i000, 0xabcd4906)) { - err(ts, z169, 0x0c8, 0, 0, i000, 0xabcd4906) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd4906) } } elseif (LEqual(arg0, 2)) { @@ -2986,7 +2986,7 @@ if (LEqual(arg0, 1)) { Store(2, i001) mm00() if (LNotEqual(i000, 0xabcd4907)) { - err(ts, z169, 0x0c9, 0, 0, i000, 0xabcd4907) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd4907) } } elseif (LEqual(arg0, 3)) { @@ -2997,11 +2997,11 @@ if (LEqual(arg0, 1)) { Store(3, i001) mm00() if (LNotEqual(i000, 0xabcd4908)) { - err(ts, z169, 0x0ca, 0, 0, i000, 0xabcd4908) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd4908) } } - CH03(ts, z169, 0x0cb, 0, 0) + CH03(ts, z169, 0x0cb, __LINE__, 0) } Method(mt18, 1, Serialized) @@ -3013,21 +3013,21 @@ Method(mt18, 1, Serialized) Name(iy07, 0xabcd4900) } - CH03(ts, z169, 0x0cc, 0, 0) + CH03(ts, z169, 0x0cc, __LINE__, 0) if (arg0) { Store(0xabcd9000, \_SB_.ABBU.mt18.dz05.iy07) if (LNotEqual(\_SB_.ABBU.mt18.dz05.iy07, 0xabcd9000)) { - err(ts, z169, 0x0ca, 0, 0, \_SB_.ABBU.mt18.dz05.iy07, 0xabcd9000) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt18.dz05.iy07, 0xabcd9000) } } else { Store(0xabcd9001, dz05.iy07) if (LNotEqual(dz05.iy07, 0xabcd9001)) { - err(ts, z169, 0x0ca, 0, 0, dz05.iy07, 0xabcd9001) + err(ts, z169, __LINE__, 0, 0, dz05.iy07, 0xabcd9001) } } - CH03(ts, z169, 0x0cd, 0, 0) + CH03(ts, z169, 0x0cd, __LINE__, 0) } Method(mt19, 1, Serialized) @@ -3039,40 +3039,40 @@ Method(mt19, 1, Serialized) Name(iy07, 0xabcd0660) } - CH03(ts, z169, 0x0ce, 0, 0) + CH03(ts, z169, 0x0ce, __LINE__, 0) if (arg0) { Store(0xabcd9002, \_SB_.ABBU.mt19.pr7d.iy07) if (LNotEqual(\_SB_.ABBU.mt19.pr7d.iy07, 0xabcd9002)) { - err(ts, z169, 0x0ca, 0, 0, \_SB_.ABBU.mt19.pr7d.iy07, 0xabcd9002) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt19.pr7d.iy07, 0xabcd9002) } } else { Store(0xabcd9003, pr7d.iy07) if (LNotEqual(pr7d.iy07, 0xabcd9003)) { - err(ts, z169, 0x0ca, 0, 0, pr7d.iy07, 0xabcd9003) + err(ts, z169, __LINE__, 0, 0, pr7d.iy07, 0xabcd9003) } } - CH03(ts, z169, 0x0cf, 0, 0) + CH03(ts, z169, 0x0cf, __LINE__, 0) } Method(mt1a, 1, Serialized) { Name(ts, "mt1a") - CH03(ts, z169, 0x0d0, 0, 0) + CH03(ts, z169, 0x0d0, __LINE__, 0) if (arg0) { Store(0xabcd9004, \_SB_.ABBU.pr7d.iy07) if (LNotEqual(\_SB_.ABBU.pr7d.iy07, 0xabcd9004)) { - err(ts, z169, 0x0ca, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd9004) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd9004) } } else { Store(0xabcd9005, ^pr7d.iy07) if (LNotEqual(^pr7d.iy07, 0xabcd9005)) { - err(ts, z169, 0x0ca, 0, 0, ^pr7d.iy07, 0xabcd9005) + err(ts, z169, __LINE__, 0, 0, ^pr7d.iy07, 0xabcd9005) } } - CH03(ts, z169, 0x0d1, 0, 0) + CH03(ts, z169, 0x0d1, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_aslts.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_aslts.asl index 27ad1fa..534384e 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_aslts.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_aslts.asl @@ -98,15 +98,15 @@ Method(mt00,, Serialized) mm01() } - CH03(ts, z170, 0x100, 0, 0) + CH03(ts, z170, 0x100, __LINE__, 0) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z170, 0x000, 0, 0, i000, 0xabcd0000) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd0000) } - CH03(ts, z170, 0x101, 0, 0) + CH03(ts, z170, 0x101, __LINE__, 0) } /* @@ -249,15 +249,15 @@ Method(mt01,, Serialized) mm01() } - CH03(ts, z170, 0x102, 0, 0) + CH03(ts, z170, 0x102, __LINE__, 0) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z170, 0x001, 0, 0, i000, 0xabcd0000) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd0000) } - CH03(ts, z170, 0x103, 0, 0) + CH03(ts, z170, 0x103, __LINE__, 0) } /* @@ -335,15 +335,15 @@ Method(mt02,, Serialized) Store(0xabcd0000, i000) } - CH03(ts, z170, 0x104, 0, 0) + CH03(ts, z170, 0x104, __LINE__, 0) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z170, 0x002, 0, 0, i000, 0xabcd0000) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd0000) } - CH03(ts, z170, 0x105, 0, 0) + CH03(ts, z170, 0x105, __LINE__, 0) } /* @@ -486,15 +486,15 @@ Method(mt03,, Serialized) Store(0xabcd0000, i000) } - CH03(ts, z170, 0x106, 0, 0) + CH03(ts, z170, 0x106, __LINE__, 0) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z170, 0x003, 0, 0, i000, 0xabcd0000) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd0000) } - CH03(ts, z170, 0x107, 0, 0) + CH03(ts, z170, 0x107, __LINE__, 0) } /* @@ -530,10 +530,10 @@ Method(mt04,, Serialized) OUTC("mt04, \\mt04.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0109)) { - err(ts, z170, 0x004, 0, 0, Local0, 0xabcd0109) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0109) } if (LNotEqual(\mt04.dz05.iy07, 0xabcd0109)) { - err(ts, z170, 0x005, 0, 0, \mt04.dz05.iy07, 0xabcd0109) + err(ts, z170, __LINE__, 0, 0, \mt04.dz05.iy07, 0xabcd0109) } } Increment(\mt04.dz05.iy07) @@ -558,17 +558,17 @@ Method(mt04,, Serialized) mm01() } - CH03(ts, z170, 0x006, 0, 0) + CH03(ts, z170, 0x006, __LINE__, 0) Increment(\mt04.dz05.iy07) mm00() if (LNotEqual(\mt04.dz05.iy07, 0xabcd0109)) { - err(ts, z170, 0x007, 0, 0, \mt04.dz05.iy07, 0xabcd0109) + err(ts, z170, __LINE__, 0, 0, \mt04.dz05.iy07, 0xabcd0109) } - CH03(ts, z170, 0x008, 0, 0) + CH03(ts, z170, 0x008, __LINE__, 0) } /* @@ -620,10 +620,10 @@ Method(mt05,, Serialized) OUTC("mt05, \\mt05.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0211)) { - err(ts, z170, 0x009, 0, 0, Local0, 0xabcd0211) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0211) } if (LNotEqual(\mt05.dz05.iy07, 0xabcd0211)) { - err(ts, z170, 0x00a, 0, 0, \mt05.dz05.iy07, 0xabcd0211) + err(ts, z170, __LINE__, 0, 0, \mt05.dz05.iy07, 0xabcd0211) } } Increment(\mt05.dz05.iy07) @@ -672,16 +672,16 @@ Method(mt05,, Serialized) mm01() } - CH03(ts, z170, 0x108, 0, 0) + CH03(ts, z170, 0x108, __LINE__, 0) Increment(\mt05.dz05.iy07) mm00() if (LNotEqual(\mt05.dz05.iy07, 0xabcd0211)) { - err(ts, z170, 0x00b, 0, 0, \mt05.dz05.iy07, 0xabcd0211) + err(ts, z170, __LINE__, 0, 0, \mt05.dz05.iy07, 0xabcd0211) } - CH03(ts, z170, 0x109, 0, 0) + CH03(ts, z170, 0x109, __LINE__, 0) } /* @@ -737,10 +737,10 @@ Method(mt06,, Serialized) OUTC("mt06, \\mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z170, 0x00c, 0, 0, Local0, 0x11112222) + err(ts, z170, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\mt06.dz05.iy07, 0x11112222)) { - err(ts, z170, 0x00d, 0, 0, \mt06.dz05.iy07, 0x11112222) + err(ts, z170, __LINE__, 0, 0, \mt06.dz05.iy07, 0x11112222) } } mm04() @@ -752,17 +752,17 @@ Method(mt06,, Serialized) mm01() } - CH03(ts, z170, 0x10a, 0, 0) + CH03(ts, z170, 0x10a, __LINE__, 0) mm00() mt07() if (LNotEqual(\mt06.dz05.iy07, 0x11112222)) { - err(ts, z170, 0x00e, 0, 0, \mt06.dz05.iy07, 0x11112222) + err(ts, z170, __LINE__, 0, 0, \mt06.dz05.iy07, 0x11112222) } - CH03(ts, z170, 0x10b, 0, 0) + CH03(ts, z170, 0x10b, __LINE__, 0) } /* @@ -796,10 +796,10 @@ Method(mt07,, Serialized) OUTC("0 mt07, \\mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z170, 0x00f, 0, 0, Local0, 0x11112222) + err(ts, z170, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\mt06.dz05.iy07, 0x11112222)) { - err(ts, z170, 0x010, 0, 0, \mt06.dz05.iy07, 0x11112222) + err(ts, z170, __LINE__, 0, 0, \mt06.dz05.iy07, 0x11112222) } } mm07() @@ -817,7 +817,7 @@ Method(mt07,, Serialized) mm01() } - CH03(ts, z170, 0x10c, 0, 0) + CH03(ts, z170, 0x10c, __LINE__, 0) mm00() @@ -825,13 +825,13 @@ Method(mt07,, Serialized) OUTC("1 mt07, \\mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z170, 0x011, 0, 0, Local0, 0x11112222) + err(ts, z170, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\mt06.dz05.iy07, 0x11112222)) { - err(ts, z170, 0x012, 0, 0, \mt06.dz05.iy07, 0x11112222) + err(ts, z170, __LINE__, 0, 0, \mt06.dz05.iy07, 0x11112222) } - CH03(ts, z170, 0x10d, 0, 0) + CH03(ts, z170, 0x10d, __LINE__, 0) } /* @@ -900,10 +900,10 @@ Method(mt08,, Serialized) OUTC("mt08, \\mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z170, 0x013, 0, 0, Local0, 0x22223333) + err(ts, z170, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\mt08.dz05.iy07, 0x22223333)) { - err(ts, z170, 0x014, 0, 0, \mt08.dz05.iy07, 0x22223333) + err(ts, z170, __LINE__, 0, 0, \mt08.dz05.iy07, 0x22223333) } } mm07() @@ -921,17 +921,17 @@ Method(mt08,, Serialized) mm01() } - CH03(ts, z170, 0x10e, 0, 0) + CH03(ts, z170, 0x10e, __LINE__, 0) mm00() mt09() if (LNotEqual(\mt08.dz05.iy07, 0x22223333)) { - err(ts, z170, 0x015, 0, 0, \mt08.dz05.iy07, 0x22223333) + err(ts, z170, __LINE__, 0, 0, \mt08.dz05.iy07, 0x22223333) } - CH03(ts, z170, 0x10f, 0, 0) + CH03(ts, z170, 0x10f, __LINE__, 0) } /* @@ -979,10 +979,10 @@ Method(mt09,, Serialized) OUTC("0 mt09, \\mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z170, 0x016, 0, 0, Local0, 0x22223333) + err(ts, z170, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\mt08.dz05.iy07, 0x22223333)) { - err(ts, z170, 0x017, 0, 0, \mt08.dz05.iy07, 0x22223333) + err(ts, z170, __LINE__, 0, 0, \mt08.dz05.iy07, 0x22223333) } } mm0f() @@ -1016,7 +1016,7 @@ Method(mt09,, Serialized) mm01() } - CH03(ts, z170, 0x110, 0, 0) + CH03(ts, z170, 0x110, __LINE__, 0) mm00() @@ -1024,13 +1024,13 @@ Method(mt09,, Serialized) OUTC("1 mt09, \\mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z170, 0x018, 0, 0, Local0, 0x22223333) + err(ts, z170, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\mt08.dz05.iy07, 0x22223333)) { - err(ts, z170, 0x019, 0, 0, \mt08.dz05.iy07, 0x22223333) + err(ts, z170, __LINE__, 0, 0, \mt08.dz05.iy07, 0x22223333) } - CH03(ts, z170, 0x111, 0, 0) + CH03(ts, z170, 0x111, __LINE__, 0) } /* @@ -1041,16 +1041,16 @@ Method(mt0a,, Serialized) { Name(ts, "mt0a") - CH03(ts, z170, 0x112, 0, 0) + CH03(ts, z170, 0x112, __LINE__, 0) Store (\pr7d.iy07, Local0) OUTC("mt0a, \\pr7d.iy07:") OUTC(Local0) if (LNotEqual(\pr7d.iy07, 0xabcd0120)) { - err(ts, z170, 0x01a, 0, 0, \pr7d.iy07, 0xabcd0120) + err(ts, z170, __LINE__, 0, 0, \pr7d.iy07, 0xabcd0120) } - CH03(ts, z170, 0x113, 0, 0) + CH03(ts, z170, 0x113, __LINE__, 0) } /* @@ -1060,7 +1060,7 @@ Method(mt0b,, Serialized) { Name(ts, "mt0b") - CH03(ts, z170, 0x114, 0, 0) + CH03(ts, z170, 0x114, __LINE__, 0) Increment(\pr7d.iy07) Store (\pr7d.iy07, Local0) @@ -1068,10 +1068,10 @@ Method(mt0b,, Serialized) OUTC(Local0) if (LNotEqual(\pr7d.iy07, 0xabcd0121)) { - err(ts, z170, 0x01b, 0, 0, \pr7d.iy07, 0xabcd0121) + err(ts, z170, __LINE__, 0, 0, \pr7d.iy07, 0xabcd0121) } - CH03(ts, z170, 0x115, 0, 0) + CH03(ts, z170, 0x115, __LINE__, 0) } /* @@ -1087,7 +1087,7 @@ Method(mt0c,, Serialized) Name(iy07, 0xabcd0660) } - CH03(ts, z170, 0x116, 0, 0) + CH03(ts, z170, 0x116, __LINE__, 0) Increment(\mt0c.pr7d.iy07) Store (\mt0c.pr7d.iy07, Local0) @@ -1095,10 +1095,10 @@ Method(mt0c,, Serialized) OUTC(Local0) if (LNotEqual(\mt0c.pr7d.iy07, 0xabcd0661)) { - err(ts, z170, 0x01d, 0, 0, \mt0c.pr7d.iy07, 0xabcd0661) + err(ts, z170, __LINE__, 0, 0, \mt0c.pr7d.iy07, 0xabcd0661) } - CH03(ts, z170, 0x117, 0, 0) + CH03(ts, z170, 0x117, __LINE__, 0) } /* @@ -1110,7 +1110,7 @@ Method(mt0d,, Serialized) Name(i000, 0xabcd1234) - CH03(ts, z170, 0x118, 0, 0) + CH03(ts, z170, 0x118, __LINE__, 0) Store(0, Local0) While (1) { @@ -1123,13 +1123,13 @@ Method(mt0d,, Serialized) mt0e() - CH03(ts, z170, 0x119, 0, 0) + CH03(ts, z170, 0x119, __LINE__, 0) Return } } - CH03(ts, z170, 0x11a, 0, 0) + CH03(ts, z170, 0x11a, __LINE__, 0) } /* @@ -1139,17 +1139,17 @@ Method(mt0e,, Serialized) { Name(ts, "mt0e") - CH03(ts, z170, 0x11b, 0, 0) + CH03(ts, z170, 0x11b, __LINE__, 0) Store (\mt0d.i000, Local0) OUTC("mt0e, \\mt0d.i000:") OUTC(Local0) if (LNotEqual(\mt0d.i000, 0xabcd1234)) { - err(ts, z170, 0x01f, 0, 0, \mt0d.i000, 0xabcd1234) + err(ts, z170, __LINE__, 0, 0, \mt0d.i000, 0xabcd1234) } - CH03(ts, z170, 0x11c, 0, 0) + CH03(ts, z170, 0x11c, __LINE__, 0) } /* @@ -1186,10 +1186,10 @@ Method(mt0f,, Serialized) OUTC("mt0f, \\mt0f.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0509)) { - err(ts, z170, 0x020, 0, 0, Local0, 0xabcd0509) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0509) } if (LNotEqual(\mt0f.dz05.iy07, 0xabcd0509)) { - err(ts, z170, 0x021, 0, 0, \mt0f.dz05.iy07, 0xabcd0509) + err(ts, z170, __LINE__, 0, 0, \mt0f.dz05.iy07, 0xabcd0509) } } Add(\mt0f.dz05.iy07, 1, \mt0f.dz05.iy07) @@ -1214,16 +1214,16 @@ Method(mt0f,, Serialized) mm01() } - CH03(ts, z170, 0x022, 0, 0) + CH03(ts, z170, 0x022, __LINE__, 0) Add(\mt0f.dz05.iy07, 1, \mt0f.dz05.iy07) mm00() if (LNotEqual(\mt0f.dz05.iy07, 0xabcd0509)) { - err(ts, z170, 0x023, 0, 0, \mt0f.dz05.iy07, 0xabcd0509) + err(ts, z170, __LINE__, 0, 0, \mt0f.dz05.iy07, 0xabcd0509) } - CH03(ts, z170, 0x024, 0, 0) + CH03(ts, z170, 0x024, __LINE__, 0) } /* @@ -1275,10 +1275,10 @@ Method(mt10,, Serialized) OUTC("mt10, \\mt10.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0611)) { - err(ts, z170, 0x025, 0, 0, Local0, 0xabcd0611) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0611) } if (LNotEqual(\mt10.dz05.iy07, 0xabcd0611)) { - err(ts, z170, 0x026, 0, 0, \mt10.dz05.iy07, 0xabcd0611) + err(ts, z170, __LINE__, 0, 0, \mt10.dz05.iy07, 0xabcd0611) } } Add(\mt10.dz05.iy07, 1, \mt10.dz05.iy07) @@ -1327,16 +1327,16 @@ Method(mt10,, Serialized) mm01() } - CH03(ts, z170, 0x027, 0, 0) + CH03(ts, z170, 0x027, __LINE__, 0) Add(\mt10.dz05.iy07, 1, \mt10.dz05.iy07) mm00() if (LNotEqual(\mt10.dz05.iy07, 0xabcd0611)) { - err(ts, z170, 0x028, 0, 0, \mt10.dz05.iy07, 0xabcd0611) + err(ts, z170, __LINE__, 0, 0, \mt10.dz05.iy07, 0xabcd0611) } - CH03(ts, z170, 0x029, 0, 0) + CH03(ts, z170, 0x029, __LINE__, 0) } /* @@ -1372,10 +1372,10 @@ Method(mt11,, Serialized) OUTC("mt11, ^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0709)) { - err(ts, z170, 0x02a, 0, 0, Local0, 0xabcd0709) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0709) } if (LNotEqual(^^^^^^^^dz05.iy07, 0xabcd0709)) { - err(ts, z170, 0x02b, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd0709) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd0709) } } Increment(^^^^^^^dz05.iy07) @@ -1400,16 +1400,16 @@ Method(mt11,, Serialized) mm01() } - CH03(ts, z170, 0x02c, 0, 0) + CH03(ts, z170, 0x02c, __LINE__, 0) Increment(dz05.iy07) mm00() if (LNotEqual(dz05.iy07, 0xabcd0709)) { - err(ts, z170, 0x02d, 0, 0, dz05.iy07, 0xabcd0709) + err(ts, z170, __LINE__, 0, 0, dz05.iy07, 0xabcd0709) } - CH03(ts, z170, 0x02e, 0, 0) + CH03(ts, z170, 0x02e, __LINE__, 0) } /* @@ -1493,10 +1493,10 @@ Method(mt12,, Serialized) OUTC("mt12, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0821)) { - err(ts, z170, 0x02f, 0, 0, Local0, 0xabcd0821) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0821) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0821)) { - err(ts, z170, 0x030, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0821) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0821) } } Increment(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07) @@ -1593,16 +1593,16 @@ Method(mt12,, Serialized) mm01() } - CH03(ts, z170, 0x11d, 0, 0) + CH03(ts, z170, 0x11d, __LINE__, 0) Increment(dz05.iy07) mm00() if (LNotEqual(dz05.iy07, 0xabcd0821)) { - err(ts, z170, 0x031, 0, 0, dz05.iy07, 0xabcd0821) + err(ts, z170, __LINE__, 0, 0, dz05.iy07, 0xabcd0821) } - CH03(ts, z170, 0x11e, 0, 0) + CH03(ts, z170, 0x11e, __LINE__, 0) } /* @@ -1635,59 +1635,59 @@ Method(mt13,, Serialized) OUTC("mt13, \\mt13.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0500)) { - err(ts, z170, 0x032, 0, 0, Local0, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0500) } if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x033, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm06() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x034, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm05() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x035, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm04() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x036, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm03() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x037, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm02() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x038, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm01() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x039, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } - CH03(ts, z170, 0x03a, 0, 0) + CH03(ts, z170, 0x03a, __LINE__, 0) Store (\mt13.dz05.iy07, Local0) mm00() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x03b, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } - CH03(ts, z170, 0x03c, 0, 0) + CH03(ts, z170, 0x03c, __LINE__, 0) } /* @@ -1770,304 +1770,304 @@ Method(mt14,, Serialized) OUTC("mt14, \\mt14.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x03d, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x03e, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1f() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x03f, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x040, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1e() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x041, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x042, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1d() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x043, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x044, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1c() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x045, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x046, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1b() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x047, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x048, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1a() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x049, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x04a, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm19() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x04b, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x04c, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm18() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x04d, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x04e, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm17() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x04f, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x050, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm16() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x051, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x052, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm15() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x053, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x054, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm14() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x055, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x056, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm13() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x057, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x058, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm12() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x059, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x05a, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm11() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x05b, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x05c, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm10() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x05d, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x05e, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0f() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x05f, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x060, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0e() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x061, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x062, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0d() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x063, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x064, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0c() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x065, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x066, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0b() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x067, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x068, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0a() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x069, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x06a, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm09() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x06b, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x06c, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm08() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x06d, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x06e, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm07() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x06f, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x070, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm06() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x071, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x072, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm05() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x073, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x074, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm04() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x075, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x076, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm03() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x077, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x078, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm02() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x079, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x07a, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm01() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x07b, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x07c, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } - CH03(ts, z170, 0x11f, 0, 0) + CH03(ts, z170, 0x11f, __LINE__, 0) Store (\mt14.dz05.iy07, Local0) mm00() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x07d, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x07e, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } - CH03(ts, z170, 0x120, 0, 0) + CH03(ts, z170, 0x120, __LINE__, 0) } /* @@ -2150,304 +2150,304 @@ Method(mt15,, Serialized) OUTC("mt15, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x07f, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x080, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1f() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x081, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x082, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1e() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x083, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x084, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1d() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x085, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x086, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1c() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x087, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x088, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1b() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x089, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x08a, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1a() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x08b, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x08c, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm19() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x08d, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x08e, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm18() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x08f, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x090, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm17() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x091, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x092, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm16() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x093, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x094, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm15() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x095, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x096, 0, 0, ^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm14() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x097, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x098, 0, 0, ^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm13() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x099, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x09a, 0, 0, ^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm12() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x09b, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x09c, 0, 0, ^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm11() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x09d, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x09e, 0, 0, ^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm10() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x09f, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0a0, 0, 0, ^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^dz05.iy07, Local0) mm0f() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0a1, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0a2, 0, 0, ^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^dz05.iy07, Local0) mm0e() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0a3, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0a4, 0, 0, ^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^dz05.iy07, Local0) mm0d() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0a5, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0a6, 0, 0, ^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^dz05.iy07, Local0) mm0c() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0a7, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0a8, 0, 0, ^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^dz05.iy07, Local0) mm0b() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0a9, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0aa, 0, 0, ^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^dz05.iy07, Local0) mm0a() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0ab, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0ac, 0, 0, ^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^dz05.iy07, Local0) mm09() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0ad, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0ae, 0, 0, ^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^dz05.iy07, Local0) mm08() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0af, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0b0, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^dz05.iy07, Local0) mm07() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0b1, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0b2, 0, 0, ^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^dz05.iy07, Local0) mm06() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0b3, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0b4, 0, 0, ^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^dz05.iy07, Local0) mm05() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0b5, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0b6, 0, 0, ^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^dz05.iy07, Local0) mm04() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0b7, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0b8, 0, 0, ^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^dz05.iy07, 0xabcd3900) } } Store (^^^dz05.iy07, Local0) mm03() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0b9, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0ba, 0, 0, ^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^dz05.iy07, 0xabcd3900) } } Store (^^dz05.iy07, Local0) mm02() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0bb, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0bc, 0, 0, ^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^dz05.iy07, 0xabcd3900) } } Store (^dz05.iy07, Local0) mm01() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0bd, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0be, 0, 0, ^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^dz05.iy07, 0xabcd3900) } } - CH03(ts, z170, 0x121, 0, 0) + CH03(ts, z170, 0x121, __LINE__, 0) Store (dz05.iy07, Local0) mm00() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0bf, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0c0, 0, 0, dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, dz05.iy07, 0xabcd3900) } - CH03(ts, z170, 0x122, 0, 0) + CH03(ts, z170, 0x122, __LINE__, 0) } /* @@ -2521,12 +2521,12 @@ Method(mt16, 1, Serialized) mmF1(arg0) } - CH03(ts, z170, 0x0c1, 0, 0) + CH03(ts, z170, 0x0c1, __LINE__, 0) if (LEqual(arg0, 0)) { // Access to the internal data of method (mm00...) not being invoked m000() - CH04(ts, 1, 5, z170, 0x0c2, 0, 0) // AE_NOT_FOUND + CH04(ts, 1, 5, z170, __LINE__, 0, 0) // AE_NOT_FOUND } elseif (LEqual(arg0, 1)) { // Access to the internal data of method (mm00...) being invoked @@ -2536,7 +2536,7 @@ Method(mt16, 1, Serialized) Store(1, i001) mm00() if (LNotEqual(i000, 0xabcd4904)) { - err(ts, z170, 0x0c3, 0, 0, i000, 0xabcd4904) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd4904) } } elseif (LEqual(arg0, 2)) { @@ -2546,7 +2546,7 @@ Method(mt16, 1, Serialized) Store(2, i001) mm00() if (LNotEqual(i000, 0xabcd4905)) { - err(ts, z170, 0x0c4, 0, 0, i000, 0xabcd4905) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd4905) } } elseif (LEqual(arg0, 3)) { @@ -2557,11 +2557,11 @@ Method(mt16, 1, Serialized) Store(3, i001) mm00() if (LNotEqual(i000, 0xabcd6900)) { - err(ts, z170, 0x1c4, 0, 0, i000, 0xabcd6900) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd6900) } } - CH03(ts, z170, 0x0c5, 0, 0) + CH03(ts, z170, 0x0c5, __LINE__, 0) } /* @@ -2884,12 +2884,12 @@ if (LEqual(arg0, 1)) { mmF1(arg0) } - CH03(ts, z170, 0x0c6, 0, 0) + CH03(ts, z170, 0x0c6, __LINE__, 0) if (LEqual(arg0, 0)) { // Access to the internal data of method (mm00...) not being invoked m000() - CH04(ts, 1, 5, z170, 0x0c7, 0, 0) // AE_NOT_FOUND + CH04(ts, 1, 5, z170, __LINE__, 0, 0) // AE_NOT_FOUND } elseif (LEqual(arg0, 1)) { // Access to the internal data of method (mm00...) being invoked @@ -2898,7 +2898,7 @@ if (LEqual(arg0, 1)) { Store(1, i001) mm00() if (LNotEqual(i000, 0xabcd4906)) { - err(ts, z170, 0x0c8, 0, 0, i000, 0xabcd4906) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd4906) } } elseif (LEqual(arg0, 2)) { @@ -2908,7 +2908,7 @@ if (LEqual(arg0, 1)) { Store(2, i001) mm00() if (LNotEqual(i000, 0xabcd4907)) { - err(ts, z170, 0x0c9, 0, 0, i000, 0xabcd4907) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd4907) } } elseif (LEqual(arg0, 3)) { @@ -2919,11 +2919,11 @@ if (LEqual(arg0, 1)) { Store(3, i001) mm00() if (LNotEqual(i000, 0xabcd4908)) { - err(ts, z170, 0x0ca, 0, 0, i000, 0xabcd4908) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd4908) } } - CH03(ts, z170, 0x0cb, 0, 0) + CH03(ts, z170, 0x0cb, __LINE__, 0) } Method(mt18, 1, Serialized) @@ -2935,21 +2935,21 @@ Method(mt18, 1, Serialized) Name(iy07, 0xabcd4900) } - CH03(ts, z170, 0x0cc, 0, 0) + CH03(ts, z170, 0x0cc, __LINE__, 0) if (arg0) { Store(0xabcd9000, \mt18.dz05.iy07) if (LNotEqual(\mt18.dz05.iy07, 0xabcd9000)) { - err(ts, z170, 0x0ca, 0, 0, \mt18.dz05.iy07, 0xabcd9000) + err(ts, z170, __LINE__, 0, 0, \mt18.dz05.iy07, 0xabcd9000) } } else { Store(0xabcd9001, dz05.iy07) if (LNotEqual(dz05.iy07, 0xabcd9001)) { - err(ts, z170, 0x0ca, 0, 0, dz05.iy07, 0xabcd9001) + err(ts, z170, __LINE__, 0, 0, dz05.iy07, 0xabcd9001) } } - CH03(ts, z170, 0x0cd, 0, 0) + CH03(ts, z170, 0x0cd, __LINE__, 0) } Method(mt19, 1, Serialized) @@ -2961,40 +2961,40 @@ Method(mt19, 1, Serialized) Name(iy07, 0xabcd0660) } - CH03(ts, z170, 0x0ce, 0, 0) + CH03(ts, z170, 0x0ce, __LINE__, 0) if (arg0) { Store(0xabcd9002, \mt19.pr7d.iy07) if (LNotEqual(\mt19.pr7d.iy07, 0xabcd9002)) { - err(ts, z170, 0x0ca, 0, 0, \mt19.pr7d.iy07, 0xabcd9002) + err(ts, z170, __LINE__, 0, 0, \mt19.pr7d.iy07, 0xabcd9002) } } else { Store(0xabcd9003, pr7d.iy07) if (LNotEqual(pr7d.iy07, 0xabcd9003)) { - err(ts, z170, 0x0ca, 0, 0, pr7d.iy07, 0xabcd9003) + err(ts, z170, __LINE__, 0, 0, pr7d.iy07, 0xabcd9003) } } - CH03(ts, z170, 0x0cf, 0, 0) + CH03(ts, z170, 0x0cf, __LINE__, 0) } Method(mt1a, 1, Serialized) { Name(ts, "mt1a") - CH03(ts, z170, 0x0d0, 0, 0) + CH03(ts, z170, 0x0d0, __LINE__, 0) if (arg0) { Store(0xabcd9004, \pr7d.iy07) if (LNotEqual(\pr7d.iy07, 0xabcd9004)) { - err(ts, z170, 0x0ca, 0, 0, \pr7d.iy07, 0xabcd9004) + err(ts, z170, __LINE__, 0, 0, \pr7d.iy07, 0xabcd9004) } } else { Store(0xabcd9005, ^pr7d.iy07) if (LNotEqual(^pr7d.iy07, 0xabcd9005)) { - err(ts, z170, 0x0ca, 0, 0, ^pr7d.iy07, 0xabcd9005) + err(ts, z170, __LINE__, 0, 0, ^pr7d.iy07, 0xabcd9005) } } - CH03(ts, z170, 0x0d1, 0, 0) + CH03(ts, z170, 0x0d1, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms0.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms0.asl index 473e9b0..f288d54 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms0.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms0.asl @@ -66,13 +66,13 @@ Method(ms00,, Serialized) Store (Local0, Debug) if (LNotEqual(Local0, 0x1777777)) { - err(ts, z162, 0x000, 0, 0, Local0, 0x1777777) + err(ts, z162, __LINE__, 0, 0, Local0, 0x1777777) } } - CH03(ts, z162, 0x001, 0, 0) + CH03(ts, z162, 0x001, __LINE__, 0) m000() - CH03(ts, z162, 0x002, 0, 0) + CH03(ts, z162, 0x002, __LINE__, 0) } /* @@ -91,7 +91,7 @@ Method(ms01, 1, Serialized) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x003, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } } @@ -104,7 +104,7 @@ Method(ms01, 1, Serialized) Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, c016)) { - err(ts, z162, 0x004, 0, 0, Local0, c016) + err(ts, z162, __LINE__, 0, 0, Local0, c016) } m000(bf00) @@ -112,19 +112,19 @@ Method(ms01, 1, Serialized) Store(bf00, i000) Store(ObjectType(i000), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z162, 0x005, 0, 0, Local0, c009) + err(ts, z162, __LINE__, 0, 0, Local0, c009) } Store(bf00, Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x006, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } Store(bf00, arg0) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x007, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } } @@ -144,7 +144,7 @@ Method(ms02, 1, Serialized) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x008, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } } @@ -152,7 +152,7 @@ Method(ms02, 1, Serialized) Store(ObjectType(f000), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z162, 0x009, 0, 0, Local0, c00d) + err(ts, z162, __LINE__, 0, 0, Local0, c00d) } m000(f000) @@ -160,19 +160,19 @@ Method(ms02, 1, Serialized) Store(f000, i000) Store(ObjectType(i000), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z162, 0x00a, 0, 0, Local0, c009) + err(ts, z162, __LINE__, 0, 0, Local0, c009) } Store(f000, Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x00b, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } Store(f000, arg0) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x00c, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } } @@ -203,7 +203,7 @@ Method(ms03,, Serialized) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0xabcd0001)) { - err("ms03", z162, 0x00d, 0, 0, Local0, c00d) + err("ms03", z162, __LINE__, 0, 0, Local0, c00d) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl index c173ddb..0836aa4 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl @@ -108,7 +108,7 @@ Method(ms10, 1, Serialized) OUTP(Local0) if (LNotEqual(arg1, Local0)) { - err(ts, z179, 0x000, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -129,11 +129,11 @@ Method(ms10, 1, Serialized) if (LAnd(ABUU, LNot(q004))) { // Implicit Operand conversion on MS contradicts ACPI Spec if (LNotEqual(arg2, INT0)) { - err(ts, z179, 0x001, 0, 0, INT0, arg2) + err(ts, z179, __LINE__, 0, 0, INT0, arg2) } } else { if (LNotEqual(arg1, INT0)) { - err(ts, z179, 0x001, 0, 0, INT0, arg1) + err(ts, z179, __LINE__, 0, 0, INT0, arg1) } } } @@ -154,7 +154,7 @@ Method(ms10, 1, Serialized) n063("0x111111111", 0, 0x31317830) } - CH03(ts, z179, 0x002, 0, 0) + CH03(ts, z179, 0x002, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } @@ -169,7 +169,7 @@ Method(ms10, 1, Serialized) case (8) { n063("0x111111111", 0, 0x31317830) } } - CH03(ts, z179, 0x003, 0, 0) + CH03(ts, z179, 0x003, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -201,10 +201,10 @@ Method(ms11, 1, Serialized) if (arg0) { Store(Derefof(i000), Local0) - CH04(ts, 0, 0xff, z179, 0x004, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } else { Store(Derefof(Refof(i000)), Local0) - CH03(ts, z179, 0x005, 0, 0) + CH03(ts, z179, 0x005, __LINE__, 0) } } @@ -223,9 +223,9 @@ Method(ms11, 1, Serialized) } Store(Derefof(Local0), Local1) if (arg0) { - CH04(ts, 0, 0xff, z179, 0x006, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } else { - CH03(ts, z179, 0x007, 0, 0) + CH03(ts, z179, 0x007, __LINE__, 0) } } @@ -243,7 +243,7 @@ Method(ms11, 1, Serialized) } } - CH03(ts, z179, 0x008, 0, 0) + CH03(ts, z179, 0x008, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } @@ -253,7 +253,7 @@ Method(ms11, 1, Serialized) case (4) { n083(1) } } - CH03(ts, z179, 0x009, 0, 0) + CH03(ts, z179, 0x009, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -293,9 +293,9 @@ Method(ms12,, Serialized) m001() } - CH03(ts, z179, 0x00a, 0, 0) + CH03(ts, z179, 0x00a, __LINE__, 0) m100() - CH03(ts, z179, 0x00b, 0, 0) + CH03(ts, z179, 0x00b, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -322,9 +322,9 @@ Method(ms13, 1, Serialized) Method(m000, 2) { Store(Derefof(arg0), Local0) - if (CH03(ts, z179, 0x00c, 0, 0)) { + if (CH03(ts, z179, 0x00c, __LINE__, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x00d, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -338,9 +338,9 @@ Method(ms13, 1, Serialized) Method(m000, 2) { Store(Derefof(arg0), Local0) - if (CH03(ts, z179, 0x00e, 0, 0)) { + if (CH03(ts, z179, 0x00e, __LINE__, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x00f, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -356,17 +356,17 @@ Method(ms13, 1, Serialized) Method(m000, 6) { OUTP(Derefof(arg0)) - CH03(ts, z179, 0x012, 0, 0) + CH03(ts, z179, 0x012, __LINE__, 0) OUTP(Derefof(arg1)) - CH03(ts, z179, 0x013, 0, 0) + CH03(ts, z179, 0x013, __LINE__, 0) OUTP(Derefof(arg2)) - CH03(ts, z179, 0x014, 0, 0) + CH03(ts, z179, 0x014, __LINE__, 0) OUTP(Derefof(arg3)) - CH03(ts, z179, 0x015, 0, 0) + CH03(ts, z179, 0x015, __LINE__, 0) OUTP(Derefof(arg4)) - CH03(ts, z179, 0x016, 0, 0) + CH03(ts, z179, 0x016, __LINE__, 0) OUTP(Derefof(arg5)) - CH03(ts, z179, 0x017, 0, 0) + CH03(ts, z179, 0x017, __LINE__, 0) } OUTP("Bug 113 MS: immediate Indexed Ref. as parameters of Methods can be dereferenced 3") @@ -382,14 +382,14 @@ Method(ms13, 1, Serialized) OUTP(Derefof(Local4)) } - CH03(ts, z179, 0x018, 0, 0) + CH03(ts, z179, 0x018, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { a113() b113() s113()} case (1) { a113() } case (2) { b113() } case (3) { s113() } } - CH03(ts, z179, 0x019, 0, 0) + CH03(ts, z179, 0x019, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -432,7 +432,7 @@ Method(ms14, 1, Serialized) Index(m001, 0, Local0) if (LAnd(ABUU, LNot(q005))) { } elseif (LNot(i001)) { - err(ts, z179, 0x01a, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } } elseif (LEqual(arg0, 1)) { OUTP("Start of test: Method returns (Package(){10,2,3,4,5})") @@ -440,7 +440,7 @@ Method(ms14, 1, Serialized) Index(m001, 0, Local0) if (LAnd(ABUU, LNot(q005))) { } elseif (LNot(i001)) { - err(ts, z179, 0x01c, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } } elseif (LEqual(arg0, 2)) { OUTP("Start of test: Name(b001, Buffer(){10,2,3,4,5})") @@ -465,14 +465,14 @@ Method(ms14, 1, Serialized) m114(2) } - CH03(ts, z179, 0x01e, 0, 0) + CH03(ts, z179, 0x01e, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000()} case (1) { m114(0) } case (2) { m114(1) } case (3) { m114(2) } } - CH03(ts, z179, 0x01f, 0, 0) + CH03(ts, z179, 0x01f, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -514,9 +514,9 @@ Method(ms15, 1, Serialized) Method(m000, 2) { Store(Derefof(arg0), Local0) - if (CH03(ts, z179, 0x020, 0, 0)) { + if (CH03(ts, z179, 0x020, __LINE__, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x021, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -531,9 +531,9 @@ Method(ms15, 1, Serialized) Method(m000, 2) { Store(Derefof(arg0), Local0) - if (CH03(ts, z179, 0x022, 0, 0)) { + if (CH03(ts, z179, 0x022, __LINE__, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x023, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -548,9 +548,9 @@ Method(ms15, 1, Serialized) Method(m000, 2) { Store(Derefof(arg0), Local0) - if (CH03(ts, z179, 0x024, 0, 0)) { + if (CH03(ts, z179, 0x024, __LINE__, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x025, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -565,9 +565,9 @@ Method(ms15, 1, Serialized) Method(m000, 2) { Store(Derefof(arg0), Local0) - if (CH03(ts, z179, 0x026, 0, 0)) { + if (CH03(ts, z179, 0x026, __LINE__, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x027, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -582,9 +582,9 @@ Method(ms15, 1, Serialized) Method(m000, 2) { Store(Derefof(arg0), Local0) - if (CH03(ts, z179, 0x028, 0, 0)) { + if (CH03(ts, z179, 0x028, __LINE__, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x029, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -599,9 +599,9 @@ Method(ms15, 1, Serialized) Method(m000, 2) { Store(Derefof(arg0), Local0) - if (CH03(ts, z179, 0x02a, 0, 0)) { + if (CH03(ts, z179, 0x02a, __LINE__, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x02b, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -610,7 +610,7 @@ Method(ms15, 1, Serialized) m000(m006(), 0x60) } - CH03(ts, z179, 0x02c, 0, 0) + CH03(ts, z179, 0x02c, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { a115() b115() c115() d115() e115() f115()} case (1) { a115() } @@ -620,7 +620,7 @@ Method(ms15, 1, Serialized) case (5) { e115() } case (6) { f115() } } - CH03(ts, z179, 0x02d, 0, 0) + CH03(ts, z179, 0x02d, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -654,7 +654,7 @@ Method(ms16, 1, Serialized) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 1)) { - err(ts, z179, 0x02e, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) if (LEqual(Local2, 2)) { OUTP(Local1) } else { @@ -663,7 +663,7 @@ Method(ms16, 1, Serialized) } else { OUTP(Local1) if (LNotEqual(Local1, 0xd650a284)) { - err(ts, z179, 0x02f, 0, 0, Local1, 0xd650a284) + err(ts, z179, __LINE__, 0, 0, Local1, 0xd650a284) } else { OUTP("Ok") } @@ -694,14 +694,14 @@ Method(ms16, 1, Serialized) if (LAnd(ABUU, LNot(q006))) { if (LNotEqual(Local2, 2)) { - err(ts, z179, 0x030, 0, 0, Local2, 2) + err(ts, z179, __LINE__, 0, 0, Local2, 2) } } elseif (LNotEqual(Local2, 1)) { - err(ts, z179, 0x030, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } else { OUTP(Local1) if (LNotEqual(Local1, 0xd650a284)) { - err(ts, z179, 0x031, 0, 0, Local1, 0xd650a284) + err(ts, z179, __LINE__, 0, 0, Local1, 0xd650a284) } else { OUTP("Ok") } @@ -734,14 +734,14 @@ Method(ms16, 1, Serialized) if (LAnd(ABUU, LNot(q006))) { if (LNotEqual(Local2, 2)) { - err(ts, z179, 0x032, 0, 0, Local2, 2) + err(ts, z179, __LINE__, 0, 0, Local2, 2) } } elseif (LNotEqual(Local2, 0xE)) { - err(ts, z179, 0x032, 0, 0, Local2, 0xE) + err(ts, z179, __LINE__, 0, 0, Local2, 0xE) } elseif (y118) { OUTP(Local1) if (LNotEqual(Local1, 10)) { - err(ts, z179, 0x033, 0, 0, Local1, 10) + err(ts, z179, __LINE__, 0, 0, Local1, 10) } else { OUTP("Ok") } @@ -771,14 +771,14 @@ Method(ms16, 1, Serialized) if (LAnd(ABUU, LNot(q007))) { if (LNotEqual(Local2, 3)) { - err(ts, z179, 0x034, 0, 0, Local2, 3) + err(ts, z179, __LINE__, 0, 0, Local2, 3) } } elseif (LNotEqual(Local2, 1)) { - err(ts, z179, 0x034, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } else { OUTP(Local1) if (LNotEqual(Local1, 10)) { - err(ts, z179, 0x035, 0, 0, Local1, 10) + err(ts, z179, __LINE__, 0, 0, Local1, 10) } else { OUTP("Ok") } @@ -809,14 +809,14 @@ Method(ms16, 1, Serialized) if (LAnd(ABUU, LNot(q007))) { if (LNotEqual(Local2, 3)) { - err(ts, z179, 0x036, 0, 0, Local2, 3) + err(ts, z179, __LINE__, 0, 0, Local2, 3) } } elseif (LNotEqual(Local2, 1)) { - err(ts, z179, 0x036, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } else { OUTP(Local1) if (LNotEqual(Local1, 10)) { - err(ts, z179, 0x037, 0, 0, Local1, 10) + err(ts, z179, __LINE__, 0, 0, Local1, 10) } else { OUTP("Ok") } @@ -850,11 +850,11 @@ Method(ms16, 1, Serialized) Store(ObjectType(p915), Local2) if (LNotEqual(Local2, 1)) { - err(ts, z179, 0x038, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } else { OUTP(p915) if (LNotEqual(m000(p915), 10)) { - err(ts, z179, 0x039, 0, 0, p915, 10) + err(ts, z179, __LINE__, 0, 0, p915, 10) } else { OUTP("Ok") } @@ -885,14 +885,14 @@ Method(ms16, 1, Serialized) if (LAnd(ABUU, LNot(q006))) { if (LNotEqual(Local2, 2)) { - err(ts, z179, 0x03a, 0, 0, Local2, 2) + err(ts, z179, __LINE__, 0, 0, Local2, 2) } } elseif (LNotEqual(Local2, 1)) { - err(ts, z179, 0x03a, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } else { OUTP(Local1) if (LNotEqual(Local1, 0xd650a284)) { - err(ts, z179, 0x03b, 0, 0, Local1, 0xd650a284) + err(ts, z179, __LINE__, 0, 0, Local1, 0xd650a284) } else { OUTP("Ok") } @@ -920,7 +920,7 @@ Method(ms16, 1, Serialized) g118() } - CH03(ts, z179, 0x03c, 0, 0) + CH03(ts, z179, 0x03c, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { a118() } @@ -931,7 +931,7 @@ Method(ms16, 1, Serialized) case (6) { f118() } case (7) { g118() } } - CH03(ts, z179, 0x03d, 0, 0) + CH03(ts, z179, 0x03d, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -962,17 +962,17 @@ Method(ms17, 1, Serialized) Store(DerefOf(arg0), Local0) Add(Local0, 1, Local6) - CH03(ts, z179, 0x03e, 0, 0) + CH03(ts, z179, 0x03e, __LINE__, 0) OUTP(Local6) Store(DerefOf(arg0), i001) OUTP(i001) Add(i001, 1, Local7) - CH03(ts, z179, 0x03f, 0, 0) + CH03(ts, z179, 0x03f, __LINE__, 0) OUTP(Local7) if (LNotEqual(Local6, Local7)) { - err(ts, z179, 0x040, 0, 0, Local6, Local7) + err(ts, z179, __LINE__, 0, 0, Local6, Local7) } OUTP("m000 finished") @@ -988,19 +988,19 @@ Method(ms17, 1, Serialized) Store(arg0, Local0) OUTP("Before Add") Add(Local0, 1, Local6) - CH03(ts, z179, 0x041, 0, 0) + CH03(ts, z179, 0x041, __LINE__, 0) OUTP("After Add") OUTP(Local6) OUTP("sit 1") Store(arg0, i001) - CH03(ts, z179, 0x042, 0, 0) + CH03(ts, z179, 0x042, __LINE__, 0) OUTP(i001) Add(i001, 1, Local7) - CH03(ts, z179, 0x043, 0, 0) + CH03(ts, z179, 0x043, __LINE__, 0) if (LNotEqual(Local6, Local7)) { - err(ts, z179, 0x044, 0, 0, Local6, Local7) + err(ts, z179, __LINE__, 0, 0, Local6, Local7) } OUTP("m001 finished") @@ -1012,10 +1012,10 @@ Method(ms17, 1, Serialized) OUTP("Before Add") Add(arg0, 1, Local7) - CH03(ts, z179, 0x045, 0, 0) + CH03(ts, z179, 0x045, __LINE__, 0) OUTP("After Add") if (LNotEqual(8, Local7)) { - err(ts, z179, 0x046, 0, 0, Local7, 8) + err(ts, z179, __LINE__, 0, 0, Local7, 8) } OUTP("m002 finished") @@ -1027,10 +1027,10 @@ Method(ms17, 1, Serialized) OUTP("Before Add") Add(DerefOf(arg0), 1, Local7) - CH03(ts, z179, 0x047, 0, 0) + CH03(ts, z179, 0x047, __LINE__, 0) OUTP("After Add") if (LNotEqual(8, Local7)) { - err(ts, z179, 0x048, 0, 0, Local7, 8) + err(ts, z179, __LINE__, 0, 0, Local7, 8) } OUTP("m003 finished") @@ -1065,7 +1065,7 @@ Method(ms17, 1, Serialized) m126(3) } - CH03(ts, z179, 0x049, 0, 0) + CH03(ts, z179, 0x049, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { m126(0) } @@ -1073,7 +1073,7 @@ Method(ms17, 1, Serialized) case (3) { m126(2) } case (4) { m126(3) } } - CH03(ts, z179, 0x04a, 0, 0) + CH03(ts, z179, 0x04a, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -1103,25 +1103,25 @@ Method(ms18,, Serialized) Store(Index(p000, 0, Local0), Local1) Store(Derefof(Local0), Local4) - CH03(ts, z179, 0x04b, 0, 0) + CH03(ts, z179, 0x04b, __LINE__, 0) Store(Derefof(Local1), Local4) - CH03(ts, z179, 0x04c, 0, 0) + CH03(ts, z179, 0x04c, __LINE__, 0) OUTP("CopyObject(Index(p000, 0, Local2), Local3):") CopyObject(Index(p000, 0, Local2), Local3) Store(Derefof(Local2), Local4) - CH03(ts, z179, 0x04d, 0, 0) + CH03(ts, z179, 0x04d, __LINE__, 0) Store(Derefof(Local3), Local4) - CH03(ts, z179, 0x04e, 0, 0) + CH03(ts, z179, 0x04e, __LINE__, 0) } - CH03(ts, z179, 0x04f, 0, 0) + CH03(ts, z179, 0x04f, __LINE__, 0) m127() - CH03(ts, z179, 0x050, 0, 0) + CH03(ts, z179, 0x050, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -1150,7 +1150,7 @@ Method(ms19, 1, Serialized) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x1234)) { - err(ts, z179, 0x051, 0, 0, Local1, 0x1234) + err(ts, z179, __LINE__, 0, 0, Local1, 0x1234) } OUTP("a128 finished") @@ -1167,7 +1167,7 @@ Method(ms19, 1, Serialized) OUTP("b128 started: Store Object_Reference to NamedX (Exception, Ok)") Store(RefOf(i000), ref0) - CH04(ts, 0, 0xff, z179, 0x052, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) OUTP("b128 finished") } @@ -1183,7 +1183,7 @@ Method(ms19, 1, Serialized) OUTP("c128 started: CopyObject Object_Reference to NamedX (Exception, Bug)") CopyObject(RefOf(i000), ref0) - if (CH04(ts, 0, 0xff, z179, 0x053, 0, 0)) { + if (CH04(ts, 0, 0xff, z179, __LINE__, 0, 0)) { return } @@ -1194,7 +1194,7 @@ Method(ms19, 1, Serialized) Store(DerefOf(ref0), Local1) if (LNotEqual(Local1, 0x1234)) { - err(ts, z179, 0x054, 0, 0, Local1, 0x1234) + err(ts, z179, __LINE__, 0, 0, Local1, 0x1234) } OUTP("c128 finished") @@ -1215,7 +1215,7 @@ Method(ms19, 1, Serialized) Store(DerefOf(DerefOf(Index(p000, 0))), Local1) if (LNotEqual(Local1, 0x1234)) { - err(ts, z179, 0x055, 0, 0, Local1, 0x1234) + err(ts, z179, __LINE__, 0, 0, Local1, 0x1234) } OUTP("d128 finished") @@ -1236,7 +1236,7 @@ Method(ms19, 1, Serialized) Store(DerefOf(DerefOf(Index(p000, 0))), Local1) if (LNotEqual(Local1, 0x1234)) { - err(ts, z179, 0x056, 0, 0, Local1, 0x1234) + err(ts, z179, __LINE__, 0, 0, Local1, 0x1234) } OUTP("d128 finished") @@ -1269,7 +1269,7 @@ Method(ms19, 1, Serialized) } } - CH03(ts, z179, 0x057, 0, 0) + CH03(ts, z179, 0x057, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { a128() } @@ -1278,7 +1278,7 @@ Method(ms19, 1, Serialized) case (4) { d128() } case (5) { e128() } } - CH03(ts, z179, 0x058, 0, 0) + CH03(ts, z179, 0x058, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -1323,9 +1323,9 @@ Method(ms1a, 1, Serialized) */ if (LEqual(i001, 0)) { - err(ts, z179, 0x059, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } elseif (LNotEqual(i000, 5)) { - err(ts, z179, 0x05a, 0, 0, i000, 5) + err(ts, z179, __LINE__, 0, 0, i000, 5) } else { OUTP("Ok a131") } @@ -1358,9 +1358,9 @@ Method(ms1a, 1, Serialized) */ if (LEqual(i001, 0)) { - err(ts, z179, 0x05b, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } elseif (LNotEqual(i000, 0x15)) { - err(ts, z179, 0x05c, 0, 0, i000, 0x15) + err(ts, z179, __LINE__, 0, 0, i000, 0x15) } else { OUTP("Ok b131") } @@ -1393,9 +1393,9 @@ Method(ms1a, 1, Serialized) Store(0x25, Derefof(Local1)) if (LEqual(i001, 0)) { - err(ts, z179, 0x05d, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } elseif (LNotEqual(i000, 0x25)) { - err(ts, z179, 0x05e, 0, 0, i000, 0x25) + err(ts, z179, __LINE__, 0, 0, i000, 0x25) } else { OUTP("Ok c131") } @@ -1424,9 +1424,9 @@ Method(ms1a, 1, Serialized) RSTO(0x35, m000()) if (LEqual(i001, 0)) { - err(ts, z179, 0x05f, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } elseif (LNotEqual(i000, 0x35)) { - err(ts, z179, 0x050, 0, 0, i000, 0x35) + err(ts, z179, __LINE__, 0, 0, i000, 0x35) } else { OUTP("Ok d131") } @@ -1448,7 +1448,7 @@ Method(ms1a, 1, Serialized) Store(m000(), Local0) if (LEqual(i001, 0)) { - err(ts, z179, 0x061, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } else { OUTP("Ok e131") } @@ -1477,7 +1477,7 @@ Method(ms1a, 1, Serialized) OUTP("Bug 131: Writing to the reference immediately returned by Method") - CH03(ts, z179, 0x062, 0, 0) + CH03(ts, z179, 0x062, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { a131() } @@ -1486,7 +1486,7 @@ Method(ms1a, 1, Serialized) case (4) { d131() } case (5) { e131() } } - CH03(ts, z179, 0x063, 0, 0) + CH03(ts, z179, 0x063, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -1519,12 +1519,12 @@ Method(ms1b, 1, Serialized) } else { Add(arg0, 1, Local7) } - CH03(ts, z179, 0x064, 0, 0) + CH03(ts, z179, 0x064, __LINE__, 0) OUTP("After Add") if (LNotEqual(Local7, 0x78)) { - err(ts, z179, 0x065, 0, 0, Local7, 0x78) + err(ts, z179, __LINE__, 0, 0, Local7, 0x78) } else { OUTP("Ok 0") } @@ -1565,7 +1565,7 @@ Method(ms1b, 1, Serialized) m132(1, 1) } - CH03(ts, z179, 0x066, 0, 0) + CH03(ts, z179, 0x066, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { m132(0, 0) } @@ -1573,7 +1573,7 @@ Method(ms1b, 1, Serialized) case (3) { m132(0, 1) } case (4) { m132(1, 1) } } - CH03(ts, z179, 0x067, 0, 0) + CH03(ts, z179, 0x067, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -1611,7 +1611,7 @@ Method(ms1c, 1, Serialized) Store(RefOf(i000), Local0) m000(Local0) if (LNotEqual(i000, 0x77)) { - err(ts, z179, 0x068, 0, 0, i000, 0x77) + err(ts, z179, __LINE__, 0, 0, i000, 0x77) } else { OUTP("Ok 0") } @@ -1624,7 +1624,7 @@ Method(ms1c, 1, Serialized) m000(Local0) Store(Derefof(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err(ts, z179, 0x069, 0, 0, Local1, 0x77) + err(ts, z179, __LINE__, 0, 0, Local1, 0x77) } else { OUTP("Ok 1") } @@ -1638,7 +1638,7 @@ Method(ms1c, 1, Serialized) Store(Derefof(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err(ts, z179, 0x06a, 0, 0, Local1, 0x77) + err(ts, z179, __LINE__, 0, 0, Local1, 0x77) } else { OUTP("Ok 2") } @@ -1651,7 +1651,7 @@ Method(ms1c, 1, Serialized) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0)) { - err(ts, z179, 0x06b, 0, 0, Local1, 0) + err(ts, z179, __LINE__, 0, 0, Local1, 0) } else { OUTP("Ok 3") } @@ -1666,7 +1666,7 @@ Method(ms1c, 1, Serialized) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err(ts, z179, 0x06c, 0, 0, Local1, 0x77) + err(ts, z179, __LINE__, 0, 0, Local1, 0x77) } else { OUTP("Ok 4") } @@ -1688,7 +1688,7 @@ Method(ms1c, 1, Serialized) m133(4) } - CH03(ts, z179, 0x06d, 0, 0) + CH03(ts, z179, 0x06d, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { m133(0) } @@ -1697,7 +1697,7 @@ Method(ms1c, 1, Serialized) case (4) { m133(3) } case (5) { m133(4) } } - CH03(ts, z179, 0x06e, 0, 0) + CH03(ts, z179, 0x06e, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -1742,13 +1742,13 @@ Method(ms1d, 1, Serialized) if (LAnd(ABUU, LNot(q008))) { if (LNotEqual(i000, 0x88)) { - err(ts, z179, 0x06f, 0, 0, i000, 0x88) + err(ts, z179, __LINE__, 0, 0, i000, 0x88) } } elseif (LNotEqual(i000, 0x11)) { - err(ts, z179, 0x06f, 0, 0, i000, 0x11) + err(ts, z179, __LINE__, 0, 0, i000, 0x11) } else { if (LNotEqual(Local6, 0x88)) { - err(ts, z179, 0x070, 0, 0, Local6, 0x88) + err(ts, z179, __LINE__, 0, 0, Local6, 0x88) } else { OUTP("Ok 0:") } @@ -1774,13 +1774,13 @@ Method(ms1d, 1, Serialized) if (LAnd(ABUU, LNot(q008))) { if (LNotEqual(i000, 0x88)) { - err(ts, z179, 0x071, 0, 0, i000, 0x88) + err(ts, z179, __LINE__, 0, 0, i000, 0x88) } } elseif (LNotEqual(i000, 0x11)) { - err(ts, z179, 0x071, 0, 0, i000, 0x11) + err(ts, z179, __LINE__, 0, 0, i000, 0x11) } else { if (LNotEqual(arg6, 0x88)) { - err(ts, z179, 0x072, 0, 0, arg6, 0x88) + err(ts, z179, __LINE__, 0, 0, arg6, 0x88) } else { OUTP("Ok 1:") } @@ -1806,15 +1806,15 @@ Method(ms1d, 1, Serialized) if (LAnd(ABUU, LNot(q008))) { if (LNotEqual(i000, 0x88)) { - err(ts, z179, 0x073, 0, 0, i000, 0x88) + err(ts, z179, __LINE__, 0, 0, i000, 0x88) } } elseif (LNotEqual(i000, 0x11)) { - err(ts, z179, 0x073, 0, 0, i000, 0x11) + err(ts, z179, __LINE__, 0, 0, i000, 0x11) OUTP(i000) } else { Store(DerefOf(arg6), Local1) if (LNotEqual(Local1, 0x88)) { - err(ts, z179, 0x074, 0, 0, Local1, 0x88) + err(ts, z179, __LINE__, 0, 0, Local1, 0x88) } else { OUTP("Ok 1:") } @@ -1843,14 +1843,14 @@ Method(ms1d, 1, Serialized) m134(2) } - CH03(ts, z179, 0x075, 0, 0) + CH03(ts, z179, 0x075, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { m134(0) } case (2) { m134(1) } case (3) { m134(2) } } - CH03(ts, z179, 0x076, 0, 0) + CH03(ts, z179, 0x076, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -1879,15 +1879,15 @@ Method(ms1e,, Serialized) if (LEqual(b000, b001)) { OUTP("Ok") } else { - err(ts, z179, 0x077, 0, 0, b000, b001) + err(ts, z179, __LINE__, 0, 0, b000, b001) } OUTP(b000) OUTP(b001) } - CH03(ts, z179, 0x078, 0, 0) + CH03(ts, z179, 0x078, __LINE__, 0) m136() - CH03(ts, z179, 0x079, 0, 0) + CH03(ts, z179, 0x079, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -1909,10 +1909,10 @@ Method(ms1f, 1, Serialized) { Store(ObjectType(Arg0), Local0) Store(Arg0, Index(PREF, Arg1)) - CH03(ts, z179, 0x07a, 0, 0) + CH03(ts, z179, 0x07a, __LINE__, 0) Store(ObjectType(Index(PREF, Arg1)), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x07b, 0, 0, Local1, Local0) + err(ts, z179, __LINE__, 0, 0, Local1, Local0) } } @@ -1960,7 +1960,7 @@ Method(ms1f, 1, Serialized) mlr3() } - CH03(ts, z179, 0x07c, 0, 0) + CH03(ts, z179, 0x07c, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { mlr0() } @@ -1968,7 +1968,7 @@ Method(ms1f, 1, Serialized) case (3) { mlr2() } case (4) { mlr3() } } - CH03(ts, z179, 0x07d, 0, 0) + CH03(ts, z179, 0x07d, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -1995,14 +1995,14 @@ Method(ms20, 1, Serialized) Store (Y, Local0) if (LNotEqual(Local0, 2)) { - err(ts, z179, 0x07e, 0, 0, Local0, 2) + err(ts, z179, __LINE__, 0, 0, Local0, 2) } Name (Y, 1) Store (Y, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z179, 0x07f, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } Method(mfr1,, Serialized) @@ -2014,12 +2014,12 @@ Method(ms20, 1, Serialized) Store (^Y, Local0) if (LNotEqual(Local0, 2)) { - err(ts, z179, 0x080, 0, 0, Local0, 2) + err(ts, z179, __LINE__, 0, 0, Local0, 2) } Store (Y, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z179, 0x081, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } @@ -2028,13 +2028,13 @@ Method(ms20, 1, Serialized) OUTP("Forward reference within a control method 2") Store (^mfr2.Y, Local0) - CH04(ts, 0, 0xff, z179, 0x082, "^mfr2.Y", Local0) + CH04(ts, 0, 0xff, z179, __LINE__, "^mfr2.Y", Local0) Name (Y, 1) Store (^mfr2.Y, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z179, 0x083, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } @@ -2046,7 +2046,7 @@ Method(ms20, 1, Serialized) Store (^mfr3.Y, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z179, 0x084, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } @@ -2063,7 +2063,7 @@ Method(ms20, 1, Serialized) mfr3() } - CH03(ts, z179, 0x085, 0, 0) + CH03(ts, z179, 0x085, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { mfr0() } @@ -2071,7 +2071,7 @@ Method(ms20, 1, Serialized) case (3) { mfr2() } case (4) { mfr3() } } - CH03(ts, z179, 0x086, 0, 0) + CH03(ts, z179, 0x086, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -2126,7 +2126,7 @@ Method(ms21, 1, Serialized) { OUTP("Recursive method execution aact(513)") OUTP(aact(513)) - CH04(ts, 0, 0xff, z179, 0x087, "recursion", 513) + CH04(ts, 0, 0xff, z179, __LINE__, "recursion", 513) } Method(m000) @@ -2142,7 +2142,7 @@ Method(ms21, 1, Serialized) } } - CH03(ts, z179, 0x088, 0, 0) + CH03(ts, z179, 0x088, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { mac0() } @@ -2151,7 +2151,7 @@ Method(ms21, 1, Serialized) case (4) { mac3() } case (5) { mac4() } } - CH03(ts, z179, 0x089, 0, 0) + CH03(ts, z179, 0x089, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -2188,7 +2188,7 @@ Method(ms22, 1, Serialized) Store(cact(0), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x08a, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -2200,17 +2200,17 @@ Method(ms22, 1, Serialized) Store(cact(1), Local0) if (LNotEqual(Local0, 0xffffffff)) { - err(ts, z179, 0x08b, 0, 0, Local0, 0xffffffff) + err(ts, z179, __LINE__, 0, 0, Local0, 0xffffffff) } } - CH03(ts, z179, 0x08c, 0, 0) + CH03(ts, z179, 0x08c, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() m001() } case (1) { m000() } case (2) { m001() } } - CH03(ts, z179, 0x08d, 0, 0) + CH03(ts, z179, 0x08d, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -2244,7 +2244,7 @@ Method(ms23, 1, Serialized) OUTP("An exception is expected: ...") Store(m001(), Local0) - CH04(ts, 0, 0xff, z179, 0x08e, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } Method(mir1,, Serialized) @@ -2266,12 +2266,12 @@ Method(ms23, 1, Serialized) Store(m001(), Local0) if (SLCK) { - if (CH03(ts, z179, 0x08f, 0, 0)) {return} + if (CH03(ts, z179, 0x08f, __LINE__, 0)) {return} if (LNotEqual(Local0, 0xabcd)) { - err(ts, z179, 0x090, 0, 0, Local0, 0xabcd) + err(ts, z179, __LINE__, 0, 0, Local0, 0xabcd) } } else { - CH04(ts, 0, 0xff, z179, 0x091, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } } @@ -2292,7 +2292,7 @@ Method(ms23, 1, Serialized) OUTP("An exception is expected: ...") Store(m001(), Local0) - CH04(ts, 0, 0xff, z179, 0x092, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } Method(mir3,, Serialized) @@ -2314,12 +2314,12 @@ Method(ms23, 1, Serialized) Store(m001(), Local0) if (SLCK) { - if (CH03(ts, z179, 0x093, 0, 0)) {return} + if (CH03(ts, z179, 0x093, __LINE__, 0)) {return} if (LNotEqual(Local0, 0xabce)) { - err(ts, z179, 0x094, 0, 0, Local0, 0xabce) + err(ts, z179, __LINE__, 0, 0, Local0, 0xabce) } } else { - CH04(ts, 0, 0xff, z179, 0x095, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } } @@ -2347,7 +2347,7 @@ Method(ms23, 1, Serialized) Store(m000, i000) if (SLCK) { - if (CH03(ts, z179, 0x096, 0, 0)) {return} + if (CH03(ts, z179, 0x096, __LINE__, 0)) {return} //y901: Predicate generates Implicit Return since ACPICA release 20080926 if (y901) { @@ -2356,10 +2356,10 @@ Method(ms23, 1, Serialized) Store(0xabcd000f, Local0) } if (LNotEqual(i000, Local0)) { - err(ts, z179, 0x097, 0, 0, i000, Local0) + err(ts, z179, __LINE__, 0, 0, i000, Local0) } } else { - CH04(ts, 0, 0xff, z179, 0x098, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } } @@ -2385,7 +2385,7 @@ Method(ms23, 1, Serialized) Store(m000, i000) if (SLCK) { - if (CH03(ts, z179, 0x099, 0, 0)) {return} + if (CH03(ts, z179, 0x099, __LINE__, 0)) {return} //y901: Predicate generates Implicit Return since ACPICA release 20080926 if (y901) { @@ -2394,10 +2394,10 @@ Method(ms23, 1, Serialized) Store(0xabcd000d, Local0) } if (LNotEqual(i000, Local0)) { - err(ts, z179, 0x09a, 0, 0, i000, Local0) + err(ts, z179, __LINE__, 0, 0, i000, Local0) } } else { - CH04(ts, 0, 0xff, z179, 0x09b, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } } @@ -2424,7 +2424,7 @@ Method(ms23, 1, Serialized) Store(m000, i000) if (SLCK) { - if (CH03(ts, z179, 0x09c, 0, 0)) {return} + if (CH03(ts, z179, 0x09c, __LINE__, 0)) {return} //y901: Predicate generates Implicit Return since ACPICA release 20080926 if (y901) { @@ -2433,10 +2433,10 @@ Method(ms23, 1, Serialized) Store(0xabcd000e, Local0) } if (LNotEqual(i000, Local0)) { - err(ts, z179, 0x09d, 0, 0, i000, Local0) + err(ts, z179, __LINE__, 0, 0, i000, Local0) } } else { - CH04(ts, 0, 0xff, z179, 0x09e, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } } @@ -2463,7 +2463,7 @@ Method(ms23, 1, Serialized) } } - CH03(ts, z179, 0x09f, 0, 0) + CH03(ts, z179, 0x09f, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { mir0() } @@ -2474,7 +2474,7 @@ Method(ms23, 1, Serialized) case (6) { mir5() } case (7) { mir6() } } - CH03(ts, z179, 0x0a0, 0, 0) + CH03(ts, z179, 0x0a0, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -2513,9 +2513,9 @@ Method(ms24,, Serialized) Store(ObjectType(s001), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0a1, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(s000, s001)) { - err(ts, z179, 0x0a2, 0, 0, s000, s001) + err(ts, z179, __LINE__, 0, 0, s000, s001) } else { OUTP("Ok Subtract/Decrement for String") } @@ -2531,17 +2531,17 @@ Method(ms24,, Serialized) Store(ObjectType(b001), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0a3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(b000, b001)) { - err(ts, z179, 0x0a4, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } else { OUTP("Ok Add/Increment for Buffer") } } - CH03(ts, z179, 0x0a5, 0, 0) + CH03(ts, z179, 0x0a5, __LINE__, 0) mmid() - CH03(ts, z179, 0x0a6, 0, 0) + CH03(ts, z179, 0x0a6, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -2565,9 +2565,9 @@ Method(ms25, 1, Serialized) OUTP("Check Store(..., DeRefof(...)) behavior: none DeRefof") Store(i001, Refof(i000)) - CH03(ts, z179, 0x0a7, 0, 0) + CH03(ts, z179, 0x0a7, __LINE__, 0) if (LNotEqual(i000, 0x12345678)) { - err(ts, z179, 0x0a8, 0, 0, i000, 0x12345678) + err(ts, z179, __LINE__, 0, 0, i000, 0x12345678) } } @@ -2579,9 +2579,9 @@ Method(ms25, 1, Serialized) OUTP("Check Store(..., DeRefof(...)) behavior: Refof(Named)") Store(i001, DeRefof(Refof(i000))) - CH03(ts, z179, 0x0a9, 0, 0) + CH03(ts, z179, 0x0a9, __LINE__, 0) if (LNotEqual(i000, 0x12345678)) { - err(ts, z179, 0x0aa, 0, 0, i000, 0x12345678) + err(ts, z179, __LINE__, 0, 0, i000, 0x12345678) } } @@ -2595,9 +2595,9 @@ Method(ms25, 1, Serialized) Store(Refof(i000), Local2) Store(i001, DeRefof(Local2)) - CH03(ts, z179, 0x0ab, 0, 0) + CH03(ts, z179, 0x0ab, __LINE__, 0) if (LNotEqual(i000, 0x12345678)) { - err(ts, z179, 0x0ac, 0, 0, i000, 0x12345678) + err(ts, z179, __LINE__, 0, 0, i000, 0x12345678) } } @@ -2612,20 +2612,20 @@ Method(ms25, 1, Serialized) Store(Refof(Local1), Local2) Store(i001, DeRefof(Local2)) - CH03(ts, z179, 0x0ad, 0, 0) + CH03(ts, z179, 0x0ad, __LINE__, 0) if (LNotEqual(i000, 0xffffffff)) { - err(ts, z179, 0x0ae, 0, 0, i000, 0xffffffff) + err(ts, z179, __LINE__, 0, 0, i000, 0xffffffff) } Store(Derefof(Local1), Local4) - if (CH04(ts, 0, 0xff, z179, 0x0af, 0, 0)) { + if (CH04(ts, 0, 0xff, z179, __LINE__, 0, 0)) { } elseif (LNotEqual(Local1, 0x12345678)) { - err(ts, z179, 0x0b0, 0, 0, Local1, 0x12345678) + err(ts, z179, __LINE__, 0, 0, Local1, 0x12345678) } } - CH03(ts, z179, 0x0b1, 0, 0) + CH03(ts, z179, 0x0b1, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { msd0() msd1() msd2() msd3() } case (1) { msd0() } @@ -2633,7 +2633,7 @@ Method(ms25, 1, Serialized) case (3) { msd2() } case (4) { msd3() } } - CH03(ts, z179, 0x0b2, 0, 0) + CH03(ts, z179, 0x0b2, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -2679,21 +2679,21 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b4, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x3c69, FU01) Store(FU01, Local0) Store(0x69, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b5, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2714,14 +2714,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b6, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b7, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(Buffer(){0x3c, 0x69}, FU01) @@ -2730,10 +2730,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x69, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b8, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b8, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2754,14 +2754,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b9, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0ba, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store("79", FU01) @@ -2770,10 +2770,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x39, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bb, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bb, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2794,14 +2794,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bc, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x1a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bd, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(Buffer(){0x7c, 0x69}, FU01) @@ -2810,10 +2810,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x29, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0be, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0be, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -2821,10 +2821,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x01, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bf, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bf, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2845,14 +2845,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c0, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x1a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c1, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store("79", FU01) @@ -2861,10 +2861,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x39, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c2, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c2, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -2872,10 +2872,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x01, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2896,21 +2896,21 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c4, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c5, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(Buffer(){0x3c, 0x69}, FU01) Store(FU01, Local0) Store(0x13c, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c6, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -2918,10 +2918,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x1a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c7, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c7, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2942,21 +2942,21 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c8, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c9, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store("79", FU01) Store(FU01, Local0) Store(0x137, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0ca, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -2964,10 +2964,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x0e, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cb, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cb, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2988,14 +2988,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cc, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cd, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(Buffer(){0x3c, 0x69, 0xa5}, FU01) @@ -3004,10 +3004,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0xa5, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0ce, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0ce, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -3015,10 +3015,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x1a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cf, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cf, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -3039,14 +3039,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d0, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d1, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store("795", FU01) @@ -3055,10 +3055,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x35, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d2, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d2, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -3066,10 +3066,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x0e, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -3086,7 +3086,7 @@ Method(ms26, 1, Serialized) rfu8() } - CH03(ts, z179, 0x0d4, 0, 0) + CH03(ts, z179, 0x0d4, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { rfu0() } @@ -3099,7 +3099,7 @@ Method(ms26, 1, Serialized) case (8) { rfu7() } case (9) { rfu8() } } - CH03(ts, z179, 0x0d5, 0, 0) + CH03(ts, z179, 0x0d5, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -3159,10 +3159,10 @@ Method(ms27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0d6, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0d7, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3209,10 +3209,10 @@ Method(ms27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0de, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0df, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3255,10 +3255,10 @@ Method(ms27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0e6, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0e7, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3314,10 +3314,10 @@ Method(ms27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0ee, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0ef, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3329,7 +3329,7 @@ Method(ms27, 1, Serialized) TRY0(3, 16, 0x78) } - CH03(ts, z179, 0x0e6, 0, 0) + CH03(ts, z179, 0x0e6, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { ifd0() @@ -3342,7 +3342,7 @@ Method(ms27, 1, Serialized) case (3) { ifd2() } case (4) { ifd3() } } - CH03(ts, z179, 0x0e7, 0, 0) + CH03(ts, z179, 0x0e7, __LINE__, 0) } Method(mt27, 1, Serialized) @@ -3385,10 +3385,10 @@ Method(mt27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0f0, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0f1, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3444,10 +3444,10 @@ Method(mt27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0f8, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0f9, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3489,10 +3489,10 @@ Method(mt27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x100, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x101, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3552,10 +3552,10 @@ Method(mt27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x108, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x109, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3586,7 +3586,7 @@ Method(mt27, 1, Serialized) TRY0(3, 4, Local0) } - CH03(ts, z179, 0x0e8, 0, 0) + CH03(ts, z179, 0x0e8, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { ifd4() @@ -3599,7 +3599,7 @@ Method(mt27, 1, Serialized) case (7) { ifd6() } case (8) { ifd7() } } - CH03(ts, z179, 0x0e9, 0, 0) + CH03(ts, z179, 0x0e9, __LINE__, 0) } Method(mu27, 1, Serialized) @@ -3647,10 +3647,10 @@ Method(mu27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x118, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x119, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3714,10 +3714,10 @@ Method(mu27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x120, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x121, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3773,10 +3773,10 @@ Method(mu27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x128, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x129, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3821,10 +3821,10 @@ Method(mu27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x130, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x131, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3836,7 +3836,7 @@ Method(mu27, 1, Serialized) TRY0(3, 12, 0x78) } - CH03(ts, z179, 0x0ea, 0, 0) + CH03(ts, z179, 0x0ea, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { ifd8() @@ -3849,7 +3849,7 @@ Method(mu27, 1, Serialized) case (11) { ifda() } case (12) { ifdb() } } - CH03(ts, z179, 0x0eb, 0, 0) + CH03(ts, z179, 0x0eb, __LINE__, 0) } Method(mv27, 1, Serialized) @@ -3886,10 +3886,10 @@ Method(mv27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x138, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x139, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3921,10 +3921,10 @@ Method(mv27, 1, Serialized) Add(0x140, Multiply(Local2, 2), Local2) if (LNotEqual(Local0, Local3)) { - err(ts, z179, Local2, 0, 0, Local0, Local3) + err(ts, z179, __LINE__, 0, 0, Local0, Local3) } if (LNotEqual(Local1, Local4)) { - err(ts, z179, Add(Local2, 1), 0, 0, Local1, Local4) + err(ts, z179, __LINE__, 0, 0, Local1, Local4) } } @@ -4051,7 +4051,7 @@ Method(mv27, 1, Serialized) TRY4(Local0, Refof(re10), Refof(re11), Refof(re12), Refof(re13)) } - CH03(ts, z179, 0x0ec, 0, 0) + CH03(ts, z179, 0x0ec, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { ifdc() @@ -4064,7 +4064,7 @@ Method(mv27, 1, Serialized) case (15) { ifde() } case (16) { ifdf() } } - CH03(ts, z179, 0x0ed, 0, 0) + CH03(ts, z179, 0x0ed, __LINE__, 0) } Method(mw27, 1, Serialized) @@ -4097,10 +4097,10 @@ Method(mw27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4135,10 +4135,10 @@ Method(mw27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4173,10 +4173,10 @@ Method(mw27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4211,10 +4211,10 @@ Method(mw27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4231,7 +4231,7 @@ Method(mw27, 1, Serialized) } - CH03(ts, z179, 0x0ee, 0, 0) + CH03(ts, z179, 0x0ee, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { ife0() @@ -4244,7 +4244,7 @@ Method(mw27, 1, Serialized) case (19) { ife2() } case (20) { ife3() } } - CH03(ts, z179, 0x0ef, 0, 0) + CH03(ts, z179, 0x0ef, __LINE__, 0) } Method(mx27, 1, Serialized) @@ -4277,10 +4277,10 @@ Method(mx27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4315,10 +4315,10 @@ Method(mx27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4355,13 +4355,13 @@ Method(mx27, 1, Serialized) Store(tot0, Local2) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } if (LNotEqual(Local2, arg5)) { - err(ts, z179, Add(arg2, 2), 0, 0, Local2, arg5) + err(ts, z179, __LINE__, 0, 0, Local2, arg5) } } @@ -4398,13 +4398,13 @@ Method(mx27, 1, Serialized) Store(tot0, Local2) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } if (LNotEqual(Local2, arg5)) { - err(ts, z179, Add(arg2, 2), 0, 0, Local2, arg5) + err(ts, z179, __LINE__, 0, 0, Local2, arg5) } } @@ -4420,7 +4420,7 @@ Method(mx27, 1, Serialized) m000(0x00008000, Refof(idf7), 0x215, 0x1, 0x00008000, 2) } - CH03(ts, z179, 0x1c8, 0, 0) + CH03(ts, z179, 0x1c8, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { ife4() @@ -4433,7 +4433,7 @@ Method(mx27, 1, Serialized) case (23) { ife6() } case (24) { ife7() } } - CH03(ts, z179, 0x1c9, 0, 0) + CH03(ts, z179, 0x1c9, __LINE__, 0) } Method(my27, 1, Serialized) @@ -4468,13 +4468,13 @@ Method(my27, 1, Serialized) Store(tot0, Local2) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } if (LNotEqual(Local2, arg5)) { - err(ts, z179, Add(arg2, 2), 0, 0, Local2, arg5) + err(ts, z179, __LINE__, 0, 0, Local2, arg5) } } @@ -4511,13 +4511,13 @@ Method(my27, 1, Serialized) Store(tot0, Local2) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } if (LNotEqual(Local2, arg5)) { - err(ts, z179, Add(arg2, 2), 0, 0, Local2, arg5) + err(ts, z179, __LINE__, 0, 0, Local2, arg5) } } @@ -4561,7 +4561,7 @@ Method(my27, 1, Serialized) Store(tot0, Local0) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } } @@ -4605,7 +4605,7 @@ Method(my27, 1, Serialized) Store(tot0, Local0) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } } @@ -4621,7 +4621,7 @@ Method(my27, 1, Serialized) m000(0xffffffff, 7, 0x24f, 0x80000002) } - CH03(ts, z179, 0x1ca, 0, 0) + CH03(ts, z179, 0x1ca, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { ife8() @@ -4646,7 +4646,7 @@ Method(my27, 1, Serialized) case (27) { ifea() } case (28) { ifeb() } } - CH03(ts, z179, 0x1cb, 0, 0) + CH03(ts, z179, 0x1cb, __LINE__, 0) } Method(mz27, 1, Serialized) @@ -4690,10 +4690,10 @@ Method(mz27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4726,7 +4726,7 @@ Method(mz27, 1, Serialized) Store(tot0, Local0) if (LNotEqual(Local0, 0x8001)) { - err(ts, z179, 0x260, 0, 0, Local0, 0x8001) + err(ts, z179, __LINE__, 0, 0, Local0, 0x8001) } } @@ -4747,7 +4747,7 @@ Method(mz27, 1, Serialized) Store(tot0, Local0) if (LNotEqual(Local0, 0x8000)) { - err(ts, z179, 0x261, 0, 0, Local0, 0x8000) + err(ts, z179, __LINE__, 0, 0, Local0, 0x8000) } } @@ -4784,10 +4784,10 @@ Method(mz27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x262, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x263, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -4799,7 +4799,7 @@ Method(mz27, 1, Serialized) TRY0(3, 3, 0xe0) } - CH03(ts, z179, 0x1cc, 0, 0) + CH03(ts, z179, 0x1cc, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { ifec() @@ -4812,7 +4812,7 @@ Method(mz27, 1, Serialized) case (31) { ifee() } case (32) { ifef() } } - CH03(ts, z179, 0x1cd, 0, 0) + CH03(ts, z179, 0x1cd, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -4898,39 +4898,39 @@ Method(ms28,, Serialized) Store(0, bnk0) if (LNotEqual(bnk0, 0)) { - err(ts, z179, 0x270, 0, 0, bnk0, 0) + err(ts, z179, __LINE__, 0, 0, bnk0, 0) } Store(0x87, bf00) if (LNotEqual(bnk0, 0)) { - err(ts, z179, 0x271, 0, 0, bnk0, 0) + err(ts, z179, __LINE__, 0, 0, bnk0, 0) } if (LNotEqual(bf00, 0x87)) { - err(ts, z179, 0x272, 0, 0, bf00, 0x87) + err(ts, z179, __LINE__, 0, 0, bf00, 0x87) } // Deal with 1-th bank layout: Store(1, bnk0) if (LNotEqual(bnk0, 1)) { - err(ts, z179, 0x273, 0, 0, bnk0, 1) + err(ts, z179, __LINE__, 0, 0, bnk0, 1) } Store(0x96, bf01) if (LNotEqual(bnk0, 1)) { - err(ts, z179, 0x274, 0, 0, bnk0, 1) + err(ts, z179, __LINE__, 0, 0, bnk0, 1) } if (LNotEqual(bf01, 0x96)) { - err(ts, z179, 0x275, 0, 0, bf01, 0x96) + err(ts, z179, __LINE__, 0, 0, bf01, 0x96) } } - CH03(ts, z179, 0x276, 0, 0) + CH03(ts, z179, 0x276, __LINE__, 0) bfd0() - CH03(ts, z179, 0x277, 0, 0) + CH03(ts, z179, 0x277, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -4976,7 +4976,7 @@ Method(ms29, 1, Serialized) { OUTP("Check Release by different ASL Methods") C160() - CH04(ts, 0, 0xff, z179, 0x278, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } Method(mut1) @@ -4987,7 +4987,7 @@ Method(ms29, 1, Serialized) Store(C157(1), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x279, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release") @@ -5002,14 +5002,14 @@ Method(ms29, 1, Serialized) Store(C157(1), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x27a, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") Store(C157(1), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x27b, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -5021,7 +5021,7 @@ Method(ms29, 1, Serialized) Store(Acquire (C155, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x27c, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") @@ -5029,7 +5029,7 @@ Method(ms29, 1, Serialized) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x27d, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -5041,7 +5041,7 @@ Method(ms29, 1, Serialized) Store(C157(1), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x27e, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release 1") @@ -5050,7 +5050,7 @@ Method(ms29, 1, Serialized) OUTP("Release 2") C158() - CH04(ts, 0, 0xff, z179, 0x27f, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } Method(mut5) @@ -5061,14 +5061,14 @@ Method(ms29, 1, Serialized) Store(Acquire (C156, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x280, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire( , 0) 2") Store(Acquire (C156, 0), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x281, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -5080,7 +5080,7 @@ Method(ms29, 1, Serialized) Store(Acquire (C153, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x282, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") @@ -5088,7 +5088,7 @@ Method(ms29, 1, Serialized) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x283, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release 1") @@ -5106,7 +5106,7 @@ Method(ms29, 1, Serialized) Store(Acquire (C159, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x284, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") @@ -5114,7 +5114,7 @@ Method(ms29, 1, Serialized) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x285, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release 1") @@ -5125,7 +5125,7 @@ Method(ms29, 1, Serialized) OUTP("Release 3") Release (C159) - CH04(ts, 0, 0xff, z179, 0x286, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } Method(mut8) @@ -5136,7 +5136,7 @@ Method(ms29, 1, Serialized) Store(Acquire (C153, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x287, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") @@ -5144,7 +5144,7 @@ Method(ms29, 1, Serialized) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x288, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release 1") @@ -5164,7 +5164,7 @@ Method(ms29, 1, Serialized) Store(Acquire (C159, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x289, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") @@ -5172,7 +5172,7 @@ Method(ms29, 1, Serialized) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x290, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release 1") @@ -5183,7 +5183,7 @@ Method(ms29, 1, Serialized) OUTP("Release 3") Release (C159) - CH04(ts, 0, 0xff, z179, 0x291, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } Method(m000) @@ -5221,7 +5221,7 @@ Method(ms29, 1, Serialized) } } - CH03(ts, z179, 0x292, 0, 0) + CH03(ts, z179, 0x292, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { mut0() } @@ -5235,7 +5235,7 @@ Method(ms29, 1, Serialized) case (9) { mut8() } case (10) { mut9() } } - CH03(ts, z179, 0x293, 0, 0) + CH03(ts, z179, 0x293, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -5304,7 +5304,7 @@ Method(ms2a, 1, Serialized) } if (LNot(BCMP(b000, b001))) { - err(ts, z179, Add(0x294, arg0), 0, 0, b000, b001) + err(ts, z179, __LINE__, 0, 0, b000, b001) } } @@ -5324,7 +5324,7 @@ Method(ms2a, 1, Serialized) Store(Buffer(4){0xab, 0x89, 0x67, 0x45}, Local1) } if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x296, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5334,7 +5334,7 @@ Method(ms2a, 1, Serialized) Store(ToBuffer("456789ab"), Local0) Store(Buffer(){"456789ab"}, Local1) if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x297, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5344,7 +5344,7 @@ Method(ms2a, 1, Serialized) Store(ToBuffer(Buffer(4){0x45, 0x67, 0x89, 0xab}), Local0) Store(Buffer(4){0x45, 0x67, 0x89, 0xab}, Local1) if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x298, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5358,7 +5358,7 @@ Method(ms2a, 1, Serialized) Store(Buffer(4){0xab, 0x89, 0x67, 0x45}, Local1) } if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x299, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5368,7 +5368,7 @@ Method(ms2a, 1, Serialized) ToBuffer("456789ab", Local0) Store(Buffer(){"456789ab"}, Local1) if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x29a, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5378,7 +5378,7 @@ Method(ms2a, 1, Serialized) ToBuffer(Buffer(4){0x45, 0x67, 0x89, 0xab}, Local0) Store(Buffer(4){0x45, 0x67, 0x89, 0xab}, Local1) if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x29b, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5395,9 +5395,9 @@ Method(ms2a, 1, Serialized) } Store(ObjectType(i000), Local2) if (LNotEqual(Local2, 3)) { - err(ts, z179, 0x29c, 0, 0, Local2, 3) + err(ts, z179, __LINE__, 0, 0, Local2, 3) } elseif (LNot(BCMP(Local1, i000))) { - err(ts, z179, 0x29d, 0, 0, i000, Local1) + err(ts, z179, __LINE__, 0, 0, i000, Local1) } } @@ -5410,9 +5410,9 @@ Method(ms2a, 1, Serialized) Store(Buffer(){"456789ab"}, Local1) Store(ObjectType(s000), Local2) if (LNotEqual(Local2, 3)) { - err(ts, z179, 0x29e, 0, 0, Local2, 3) + err(ts, z179, __LINE__, 0, 0, Local2, 3) } elseif (LNot(BCMP(Local1, s000))) { - err(ts, z179, 0x29f, 0, 0, s000, Local1) + err(ts, z179, __LINE__, 0, 0, s000, Local1) } } @@ -5425,9 +5425,9 @@ Method(ms2a, 1, Serialized) Store(Buffer(4){0x45, 0x67, 0x89, 0xab}, Local1) Store(ObjectType(b000), Local2) if (LNotEqual(Local2, 3)) { - err(ts, z179, 0x2a0, 0, 0, Local2, 3) + err(ts, z179, __LINE__, 0, 0, Local2, 3) } elseif (LNot(BCMP(Local1, b000))) { - err(ts, z179, 0x2a1, 0, 0, b000, Local1) + err(ts, z179, __LINE__, 0, 0, b000, Local1) } } @@ -5445,7 +5445,7 @@ Method(ms2a, 1, Serialized) Store(Buffer(1){0x01}, Local0) if (LNot(BCMP(b000, Local0))) { - err(ts, z179, Add(0x2a2, arg0), 0, 0, b000, Local0) + err(ts, z179, __LINE__, 0, 0, b000, Local0) } } else { OUTP("Store(b000, b001)") @@ -5453,7 +5453,7 @@ Method(ms2a, 1, Serialized) Store(Buffer(3){0x3c}, Local0) if (LNot(BCMP(b001, Local0))) { - err(ts, z179, Add(0x2a2, arg0), 0, 0, b001, Local0) + err(ts, z179, __LINE__, 0, 0, b001, Local0) } } } @@ -5488,7 +5488,7 @@ Method(ms2a, 1, Serialized) Store (1, F64) } - CH03(ts, z179, 0x2a4, 0, 0) + CH03(ts, z179, 0x2a4, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { tob0() } @@ -5503,7 +5503,7 @@ Method(ms2a, 1, Serialized) case (10) { tob9() } case (11) { toba() } } - CH03(ts, z179, 0x2a5, 0, 0) + CH03(ts, z179, 0x2a5, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -5536,7 +5536,7 @@ Method(ms2b, 1, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 5)) { - err(ts, z179, 0x2a6, 0, 0, Local0, 5) + err(ts, z179, __LINE__, 0, 0, Local0, 5) } } @@ -5549,12 +5549,12 @@ Method(ms2b, 1, Serialized) Store(ObjectType(Index(p000, 2)), Local0) if (Local0) { } else { - err(ts, z179, 0x2a7, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } Store(ObjectType(Index(p000, 3)), Local0) if (Local0) { - err(ts, z179, 0x2a8, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -5575,18 +5575,18 @@ Method(ms2b, 1, Serialized) Store(5, Local0) } if (LNotEqual(Local0, 5)) { - err(ts, z179, 0x2a9, 0, 0, Local0, 5) + err(ts, z179, __LINE__, 0, 0, Local0, 5) } } - CH03(ts, z179, 0x2ab, 0, 0) + CH03(ts, z179, 0x2ab, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { pac0() pac1() pac2() } case (1) { pac0() } case (2) { pac1() } case (3) { pac2() } } - CH03(ts, z179, 0x2ac, 0, 0) + CH03(ts, z179, 0x2ac, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -5630,13 +5630,13 @@ Method(ms2c, 1, Serialized) } if (LNotEqual(Local1, 2)) { - err(ts, z179, 0x2ad, 0, 0, Local1, 2) + err(ts, z179, __LINE__, 0, 0, Local1, 2) } Store(m000(1), Local1) if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2ae, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } } @@ -5656,7 +5656,7 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local1, 2)) { - err(ts, z179, 0x2af, 0, 0, Local1, 2) + err(ts, z179, __LINE__, 0, 0, Local1, 2) } } @@ -5676,10 +5676,10 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2b0, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } if (LNotEqual(Local2, 0)) { - err(ts, z179, 0x2b1, 0, 0, Local2, 0) + err(ts, z179, __LINE__, 0, 0, Local2, 0) } } @@ -5699,10 +5699,10 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2b2, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } if (LNotEqual(Local2, 1)) { - err(ts, z179, 0x2b3, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } } @@ -5728,13 +5728,13 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x2b4, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2b5, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } if (LNotEqual(Local2, 1)) { - err(ts, z179, 0x2b6, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } } @@ -5760,13 +5760,13 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x2b7, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2b8, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } if (LNotEqual(Local2, 0)) { - err(ts, z179, 0x2b9, 0, 0, Local2, 0) + err(ts, z179, __LINE__, 0, 0, Local2, 0) } } @@ -5792,13 +5792,13 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x2ba, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2bb, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } if (LNotEqual(Local2, 1)) { - err(ts, z179, 0x2bc, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } } @@ -5813,9 +5813,9 @@ Method(ms2c, 1, Serialized) while (Local0) { if (Local1) { - CH04(ts, 0, 0xff, z179, 0x2bd, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } else { - CH03(ts, z179, 0x2be, 0, 0) + CH03(ts, z179, 0x2be, __LINE__, 0) } Store(Local1, WHIN) Decrement(Local0) @@ -5834,9 +5834,9 @@ Method(ms2c, 1, Serialized) while (Local0) { if (LGreater(Local1, 2)) { - CH04(ts, 0, 0xff, z179, 0x2bf, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } else { - CH03(ts, z179, 0x2c0, 0, 0) + CH03(ts, z179, 0x2c0, __LINE__, 0) } Store(Local1, WHIN) Decrement(Local0) @@ -5866,7 +5866,7 @@ Method(ms2c, 1, Serialized) } } - CH03(ts, z179, 0x2c1, 0, 0) + CH03(ts, z179, 0x2c1, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { sw00() } @@ -5879,7 +5879,7 @@ Method(ms2c, 1, Serialized) case (8) { sw07() } case (9) { sw08() } } - CH03(ts, z179, 0x2c2, 0, 0) + CH03(ts, z179, 0x2c2, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -5911,12 +5911,12 @@ Method(ms2d, 1, Serialized) If (Y) { If (y300) { - CH03(ts, z179, 0x3c3, 0, 0) + CH03(ts, z179, 0x3c3, __LINE__, 0) } else { - CH04(ts, 0, 0xff, z179, 0x2c3, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } } else { - CH03(ts, z179, 0x2c4, 0, 0) + CH03(ts, z179, 0x2c4, __LINE__, 0) } Increment (Y) @@ -5967,14 +5967,14 @@ Method(ms2d, 1, Serialized) } } - CH03(ts, z179, 0x2c5, 0, 0) + CH03(ts, z179, 0x2c5, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m000() } case (1) { wac0() } case (2) { wac1() } case (3) { wac2() } } - CH03(ts, z179, 0x2c6, 0, 0) + CH03(ts, z179, 0x2c6, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -6064,17 +6064,17 @@ Method(ms2e,, Serialized) OUTP("Buffer is not shortened on storing short string") - CH03(ts, z179, 0x2c7, 0, 0) + CH03(ts, z179, 0x2c7, __LINE__, 0) Store ("ABCD", BUF0) Store(SizeOf (BUF0), Local0) if (LNotEqual(Local0, 12)) { - err(ts, z179, 0x2c8, 0, 0, Local0, 12) + err(ts, z179, __LINE__, 0, 0, Local0, 12) } - CH03(ts, z179, 0x2c9, 0, 0) + CH03(ts, z179, 0x2c9, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -6111,7 +6111,7 @@ Method(ms2f, 1, Serialized) } if (LNotEqual(Local1, 3)) { - err(ts, z179, 0x2ca, 0, 0, Local1, 3) + err(ts, z179, __LINE__, 0, 0, Local1, 3) } } @@ -6136,17 +6136,17 @@ Method(ms2f, 1, Serialized) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2cb, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } } - CH03(ts, z179, 0x2cc, 0, 0) + CH03(ts, z179, 0x2cc, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { b246() u246() } case (1) { b246() } case (2) { u246() } } - CH03(ts, z179, 0x2cd, 0, 0) + CH03(ts, z179, 0x2cd, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -6199,18 +6199,18 @@ Break } if (LEqual(Arg3, 1)) { if (LNotEqual(CH10, Arg1)) { - err(ts, z179, 0x2ce, 0, 0, CH10, Arg1) + err(ts, z179, __LINE__, 0, 0, CH10, Arg1) } if (LEqual(CH11, Arg1)) { - err(ts, z179, 0x2cf, 0, 0, CH11, Arg1) + err(ts, z179, __LINE__, 0, 0, CH11, Arg1) } } if (LEqual(Arg3, 2)) { if (LNotEqual(CH20, Arg2)) { - err(ts, z179, 0x2d0, 0, 0, CH20, Arg2) + err(ts, z179, __LINE__, 0, 0, CH20, Arg2) } if (LEqual(CH21, Arg2)) { - err(ts, z179, 0x2d1, 0, 0, CH21, Arg2) + err(ts, z179, __LINE__, 0, 0, CH21, Arg2) } } } @@ -6227,9 +6227,9 @@ Break } m000("Break 211", 1, 1, 2) } - CH03(ts, z179, 0x2d2, 0, 0) + CH03(ts, z179, 0x2d2, __LINE__, 0) b247() - CH03(ts, z179, 0x2d3, 0, 0) + CH03(ts, z179, 0x2d3, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -6272,11 +6272,11 @@ Method(ms31, 1, Serialized) Store(BUF0, RFU0) Load(RFU0, Local0) - CH03(ts, z179, 0x2d4, 0, 0) + CH03(ts, z179, 0x2d4, __LINE__, 0) OUTP("SSDT loaded") UnLoad(Local0) - CH03(ts, z179, 0x2d5, 0, 0) + CH03(ts, z179, 0x2d5, __LINE__, 0) OUTP("SSDT unloaded") } @@ -6288,7 +6288,7 @@ Method(ms31, 1, Serialized) Store(BUF0, RFU0) Load(IST0, Local0) - CH03(ts, z179, 0x2d6, 0, 0) + CH03(ts, z179, 0x2d6, __LINE__, 0) OUTP("SSDT loaded") } @@ -6299,11 +6299,11 @@ Method(ms31, 1, Serialized) Store(BUF0, RFU0) Load(IST0, DDBH) - CH03(ts, z179, 0x2d7, 0, 0) + CH03(ts, z179, 0x2d7, __LINE__, 0) OUTP("SSDT loaded") Unload(DDBH) - CH03(ts, z179, 0x2d8, 0, 0) + CH03(ts, z179, 0x2d8, __LINE__, 0) OUTP("SSDT unloaded") } @@ -6314,16 +6314,16 @@ Method(ms31, 1, Serialized) Store(BUF0, RFU0) Load(IST0, Local0) - CH03(ts, z179, 0x2d9, 0, 0) + CH03(ts, z179, 0x2d9, __LINE__, 0) OUTP("SSDT loaded") Store(ObjectType(Local0), Local1) if (LNotEqual(15, Local1)) { - err(ts, z179, 0x2da, 0, 0, Local1, 15) + err(ts, z179, __LINE__, 0, 0, Local1, 15) } Unload(DDBH) - CH03(ts, z179, 0x2db, 0, 0) + CH03(ts, z179, 0x2db, __LINE__, 0) OUTP("SSDT unloaded") } @@ -6335,12 +6335,12 @@ Method(ms31, 1, Serialized) Store(BUF0, RFU0) Load(IST0, Local0) - CH03(ts, z179, 0x2dc, 0, 0) + CH03(ts, z179, 0x2dc, __LINE__, 0) OUTP("SSDT loaded") Store(ObjectType(Local0), Local1) if (LNotEqual(15, Local1)) { - err(ts, z179, 0x2dd, 0, 0, Local1, 15) + err(ts, z179, __LINE__, 0, 0, Local1, 15) } } @@ -6353,16 +6353,16 @@ Method(ms31, 1, Serialized) Store(BUF0, RFU0) Load(IST0, DDBH) - CH03(ts, z179, 0x2de, 0, 0) + CH03(ts, z179, 0x2de, __LINE__, 0) OUTP("SSDT loaded") Store(ObjectType(DDBH), Local1) if (LNotEqual(15, Local1)) { - err(ts, z179, 0x2df, 0, 0, Local1, 15) + err(ts, z179, __LINE__, 0, 0, Local1, 15) } UnLoad(DDBH) - CH03(ts, z179, 0x2e0, 0, 0) + CH03(ts, z179, 0x2e0, __LINE__, 0) OUTP("SSDT unloaded") } @@ -6376,12 +6376,12 @@ Method(ms31, 1, Serialized) Store(BUF0, RFU0) Load(IST0, DDBH) - CH03(ts, z179, 0x2e1, 0, 0) + CH03(ts, z179, 0x2e1, __LINE__, 0) OUTP("SSDT loaded") Store(ObjectType(DDBH), Local1) if (LNotEqual(15, Local1)) { - err(ts, z179, 0x2e2, 0, 0, Local1, 15) + err(ts, z179, __LINE__, 0, 0, Local1, 15) } } @@ -6394,13 +6394,13 @@ Method(ms31, 1, Serialized) Store(BUF0, RFU0) Load(IST0, Index(PAC0, 0)) - CH03(ts, z179, 0x2e3, 0, 0) + CH03(ts, z179, 0x2e3, __LINE__, 0) OUTP("SSDT loaded") Store(Derefof(Index(PAC0, 0)), Local0) UnLoad(Local0) - CH03(ts, z179, 0x2e4, 0, 0) + CH03(ts, z179, 0x2e4, __LINE__, 0) OUTP("SSDT unloaded") } @@ -6414,7 +6414,7 @@ Method(ms31, 1, Serialized) Store(BUF0, RFU0) Load(IST0, Index(PAC0, 0)) - CH03(ts, z179, 0x2e5, 0, 0) + CH03(ts, z179, 0x2e5, __LINE__, 0) OUTP("SSDT loaded") } @@ -6427,26 +6427,26 @@ Method(ms31, 1, Serialized) Store(CondRefof(\SS00, Local1), Local2) OUTP("CondRefof before Load") if (Local2) { - err(ts, z179, 0x2e6, 0, 0, Local2, 0) + err(ts, z179, __LINE__, 0, 0, Local2, 0) } Load(IST0, Local0) - CH03(ts, z179, 0x2e7, 0, 0) + CH03(ts, z179, 0x2e7, __LINE__, 0) Store(CondRefof(\SS00, Local3), Local4) OUTP("CondRefof after Load") if (Local4) { } else { - err(ts, z179, 0x2e8, 0, 0, Local4, 1) + err(ts, z179, __LINE__, 0, 0, Local4, 1) } UnLoad(Local0) - CH03(ts, z179, 0x2e9, 0, 0) + CH03(ts, z179, 0x2e9, __LINE__, 0) Store(CondRefof(\SS00, Local5), Local6) OUTP("CondRefof after UnLoad") if (Local6) { - err(ts, z179, 0x2ea, 0, 0, Local6, 0) + err(ts, z179, __LINE__, 0, 0, Local6, 0) } } @@ -6460,17 +6460,17 @@ Method(ms31, 1, Serialized) Store(CondRefof(\SS00, Local1), Local2) OUTP("CondRefof before Load") if (Local2) { - err(ts, z179, 0x2eb, 0, 0, Local2, 0) + err(ts, z179, __LINE__, 0, 0, Local2, 0) } Load(IST0, Local0) - CH03(ts, z179, 0x2ec, 0, 0) + CH03(ts, z179, 0x2ec, __LINE__, 0) Store(CondRefof(\SS00, Local3), Local4) OUTP("CondRefof after Load") if (Local4) { } else { - err(ts, z179, 0x2ed, 0, 0, Local4, 1) + err(ts, z179, __LINE__, 0, 0, Local4, 1) } } @@ -6493,7 +6493,7 @@ Method(ms31, 1, Serialized) } } - CH03(ts, z179, 0x2ee, 0, 0) + CH03(ts, z179, 0x2ee, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m010() } case (1) { m000() } @@ -6508,7 +6508,7 @@ Method(ms31, 1, Serialized) case (10) { m015() } case (11) { m016() } } - CH03(ts, z179, 0x2ef, 0, 0) + CH03(ts, z179, 0x2ef, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -6538,7 +6538,7 @@ Method(ms32, 1, Serialized) OUTP("cnr0: Simple CondRefof() positive test") Store(CondRefof(\_SB.ABBU.IMAX), Local0) - CH03(ts, z179, 0x2f0, 0, 0) + CH03(ts, z179, 0x2f0, __LINE__, 0) } Method(m001) @@ -6546,11 +6546,11 @@ Method(ms32, 1, Serialized) OUTP("cnr1: Simple CondRefof( , ) positive test 2") Store(CondRefof(\_SB.ABBU._HID, Local1), Local0) - CH03(ts, z179, 0x2f1, 0, 0) + CH03(ts, z179, 0x2f1, __LINE__, 0) if (Local0) { } else { - err(ts, z179, 0x2f2, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } @@ -6564,10 +6564,10 @@ Method(ms32, 1, Serialized) if (Local0) { Store(Derefof(Local1), Local2) if (LNotEqual(0x76543210, Local2)) { - err(ts, z179, 0x2f3, 0, 0, Local2, 0x76543210) + err(ts, z179, __LINE__, 0, 0, Local2, 0x76543210) } } else { - err(ts, z179, 0x2f4, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } @@ -6577,7 +6577,7 @@ Method(ms32, 1, Serialized) Store(CondRefof(^M003.I000, Local1), Local0) if (Local0) { - err(ts, z179, 0x2f5, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } Name(I000, 1) @@ -6585,7 +6585,7 @@ Method(ms32, 1, Serialized) Store(CondRefof(^M003.I000, Local1), Local0) if (Local0) { } else { - err(ts, z179, 0x2f6, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -6607,7 +6607,7 @@ Method(ms32, 1, Serialized) } else { OUTP("False") } - CH03(ts, z179, 0x2f7, 0, 0) + CH03(ts, z179, 0x2f7, __LINE__, 0) } Method(m010) @@ -6619,7 +6619,7 @@ Method(ms32, 1, Serialized) m004() } - CH03(ts, z179, 0x2f8, 0, 0) + CH03(ts, z179, 0x2f8, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { m010() } case (1) { m000() } @@ -6628,7 +6628,7 @@ Method(ms32, 1, Serialized) case (4) { m003() } case (5) { m004() } } - CH03(ts, z179, 0x2f9, 0, 0) + CH03(ts, z179, 0x2f9, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ @@ -6658,9 +6658,9 @@ Method(ms33, 1, Serialized) */ if (LOr(ABUU, SLCK)) { - CH03(ts, z179, 0x2fa, 0, 0) + CH03(ts, z179, 0x2fa, __LINE__, 0) } else { - CH04(ts, 0, 0xff, z179, 0x2fb, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } } @@ -6676,10 +6676,10 @@ Method(ms33, 1, Serialized) if (LOr(ABUU, SLCK)) { Store(ObjectType(Local0), Local1) if (LNotEqual(6, Local1)) { - err(ts, z179, 0x2fc, 0, 0, Local1, 6) + err(ts, z179, __LINE__, 0, 0, Local1, 6) } } else { - CH04(ts, 0, 0xff, z179, 0x2fd, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } } @@ -6698,12 +6698,12 @@ Method(ms33, 1, Serialized) if (LOr(ABUU, SLCK)) { Store(ObjectType(Local0), Local1) if (LNotEqual(6, Local1)) { - err(ts, z179, 0x2fe, 0, 0, Local1, 6) + err(ts, z179, __LINE__, 0, 0, Local1, 6) } else { OUTP("Ok: ObjectType succeeded") } } else { - CH04(ts, 0, 0xff, z179, 0x2ff, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } } @@ -6724,14 +6724,14 @@ Method(ms33, 1, Serialized) if (LOr(ABUU, SLCK)) { Store(ObjectType(Local0), Local1) if (LNotEqual(6, Local1)) { - err(ts, z179, 0x2a0, 0, 0, Local1, 6) + err(ts, z179, __LINE__, 0, 0, Local1, 6) } } else { - CH04(ts, 0, 0xff, z179, 0x2a1, 0, 0) + CH04(ts, 0, 0xff, z179, __LINE__, 0, 0) } } - CH03(ts, z179, 0x2a2, 0, 0) + CH03(ts, z179, 0x2a2, __LINE__, 0) switch (ToInteger (Arg0)) { case (0) { asdl() @@ -6744,7 +6744,7 @@ Method(ms33, 1, Serialized) case (3) { csdl() } case (4) { dsdl() } } - CH03(ts, z179, 0x2a3, 0, 0) + CH03(ts, z179, 0x2a3, __LINE__, 0) } /* Methods to run manually (for ABBU only) */ diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns4.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns4.asl index ad98fe7..c8407c8 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns4.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns4.asl @@ -20,7 +20,7 @@ Method(m401, 1, Serialized) Name(i001, 0) Name(p000, Package() {1,2,3,4}) - CH03(ts, z100, 0x000, 0, 0) + CH03(ts, z100, 0x000, __LINE__, 0) Store(arg0, i001) @@ -71,14 +71,14 @@ Method(m401, 1, Serialized) Store(MAdd(i000, m001()), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z100, 0x001, 0, 0, Local0, 0x07654321) + err(ts, z100, __LINE__, 0, 0, Local0, 0x07654321) } if (LNotEqual(i000, 0x07000000)) { - err(ts, z100, 0x002, 0, 0, i000, 0x07000000) + err(ts, z100, __LINE__, 0, 0, i000, 0x07000000) } - CH03(ts, z100, 0x003, 0, 0) + CH03(ts, z100, 0x003, __LINE__, 0) } Method(n004) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns6.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns6.asl index 8b85e86..d1a20cd 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns6.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns6.asl @@ -26,14 +26,14 @@ Method(m600,, Serialized) { Store(0x11223344, i000) if (LNotEqual(arg0, 0xabcd0000)) { - err(ts, z101, 0x000, 0, 0, arg0, 0xabcd0000) + err(ts, z101, __LINE__, 0, 0, arg0, 0xabcd0000) } } m000(i000) if (LNotEqual(i000, 0x11223344)) { - err(ts, z101, 0x001, 0, 0, i000, 0x11223344) + err(ts, z101, __LINE__, 0, 0, i000, 0x11223344) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl index 6c87b37..b0cfe64 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl @@ -79,15 +79,15 @@ Method(mr00,, Serialized) Method(mr01) { /* - CH03(ts, z169, 0x100, 0, 0) + CH03(ts, z169, 0x100, __LINE__, 0) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z169, 0x000, 0, 0, i000, 0xabcd0000) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd0000) } - CH03(ts, z169, 0x101, 0, 0) + CH03(ts, z169, 0x101, __LINE__, 0) */ } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl index 6dc0f9f..7cdb7f8 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl @@ -85,13 +85,13 @@ Method(mr00) Decrement(IG00) if (LNotEqual(Local0, IG00)) { - err(ts, z172, 0x000, 0, 0, Local0, IG00) + err(ts, z172, __LINE__, 0, 0, Local0, IG00) } if (LNotEqual(IG02, RC00)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, RC00) + err(ts, z172, __LINE__, 0, 0, IG02, RC00) } } } @@ -117,10 +117,10 @@ Method(mr01, 1) Decrement(IG00) if (LNotEqual(Local1, IG00)) { - err(ts, z172, 0x000, 0, 0, Local1, IG00) + err(ts, z172, __LINE__, 0, 0, Local1, IG00) } if (LNotEqual(Local2, arg0)) { - err(ts, z172, 0x000, 0, 0, Local2, arg0) + err(ts, z172, __LINE__, 0, 0, Local2, arg0) } Multiply(RC00, 2, Local0) @@ -128,7 +128,7 @@ Method(mr01, 1) if (LNotEqual(IG02, Local0)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, Local0) + err(ts, z172, __LINE__, 0, 0, IG02, Local0) } } } @@ -149,10 +149,10 @@ Method(mr02, 1) Decrement(IG01) if (LNotEqual(Local1, IG01)) { - err(ts, z172, 0x000, 0, 0, Local1, IG01) + err(ts, z172, __LINE__, 0, 0, Local1, IG01) } if (LNotEqual(Local2, arg0)) { - err(ts, z172, 0x000, 0, 0, Local2, arg0) + err(ts, z172, __LINE__, 0, 0, Local2, arg0) } Multiply(RC00, 2, Local0) @@ -160,7 +160,7 @@ Method(mr02, 1) if (LNotEqual(IG02, Local0)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, Local0) + err(ts, z172, __LINE__, 0, 0, IG02, Local0) } } } @@ -195,7 +195,7 @@ Method(mr03,, Serialized) Decrement(IG00) if (LNotEqual(Local0, IG00)) { - err(ts, z172, 0x000, 0, 0, Local0, IG00) + err(ts, z172, __LINE__, 0, 0, Local0, IG00) } } @@ -212,7 +212,7 @@ Method(mr03,, Serialized) if (LNotEqual(IG02, RC00)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, RC00) + err(ts, z172, __LINE__, 0, 0, IG02, RC00) } } } @@ -252,7 +252,7 @@ Method(mr04,, Serialized) Decrement(IG00) if (LNotEqual(Local0, IG00)) { - err(ts, z172, 0x000, 0, 0, Local0, IG00) + err(ts, z172, __LINE__, 0, 0, Local0, IG00) } } @@ -271,7 +271,7 @@ Method(mr04,, Serialized) if (LNotEqual(IG02, Local0)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, Local0) + err(ts, z172, __LINE__, 0, 0, IG02, Local0) } } } @@ -292,10 +292,10 @@ Method(mr05, 1) Decrement(IG01) if (LNotEqual(Local1, IG01)) { - err(ts, z172, 0x000, 0, 0, Local1, IG01) + err(ts, z172, __LINE__, 0, 0, Local1, IG01) } if (LNotEqual(Local2, arg0)) { - err(ts, z172, 0x000, 0, 0, Local2, arg0) + err(ts, z172, __LINE__, 0, 0, Local2, arg0) } Multiply(RC00, 2, Local0) @@ -303,7 +303,7 @@ Method(mr05, 1) if (LNotEqual(IG02, Local0)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, Local0) + err(ts, z172, __LINE__, 0, 0, IG02, Local0) } } } @@ -314,7 +314,7 @@ Method(mrff,, Serialized) Name(ts, "mrff") Name(run0, 1) - CH03(ts, z172, 0x000, 0, 0) + CH03(ts, z172, 0x000, __LINE__, 0) SRMT("mr00") mrfd() @@ -341,5 +341,5 @@ test --- run mr05 and expect exception */ - CH03(ts, z172, 0x000, 0, 0) + CH03(ts, z172, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl index 0ae5560..62f0ef9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl @@ -42,50 +42,50 @@ Method(md9a,, Serialized) * Check that exceptions initiated by some bdemo tests on the * global level are all actually handled and reset at this point. */ - CH03("", 0, 0x999, 0, 0) + CH03("", 0, 0x999, __LINE__, 0) Store(LAnd(1, 1), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x000, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LEqual(0, 0), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x001, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LGreater(1, 0), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x002, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LGreaterEqual(1, 1), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x003, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LLess(0, 1), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x004, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LLessEqual(1, 1), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x005, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LNot(0), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x006, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LNotEqual(1, 0), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x007, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LOr(0, 1), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x008, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0001_ASL/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0001_ASL/DECL.asl index 2a9d692..db71d4f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0001_ASL/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0001_ASL/DECL.asl @@ -40,23 +40,23 @@ Method(md9b) Store(Acquire(mxd0, 0), Local0) if (Local0) { - err("", zFFF, 0x000, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } Store(Acquire(mxd0, 0x1000), Local0) if (Local0) { - err("", zFFF, 0x001, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } Store(0x1000, Local1) Store(Acquire(mxd0, Local1), Local0) if (Local0) { - err("", zFFF, 0x002, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } Store(Acquire(mxd0, TOUT), Local0) if (Local0) { - err("", zFFF, 0x003, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl index 5d85a8a..42573fc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl @@ -49,6 +49,6 @@ Method(md9c) } if (LNotEqual(Local0, 0x55555555)){ - err("", zFFF, 0x000, 0, 0, Local0, 0x55555555) + err("", zFFF, __LINE__, 0, 0, Local0, 0x55555555) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl index 13cf25a..5abff7a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl @@ -46,12 +46,12 @@ Method(mda0) Store(ObjectType(Local5), Local0) if (LNotEqual(Local0, c009)){ - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } Increment(Local5) if (LNotEqual(Local5, 1)){ - err("", zFFF, 0x001, 0, 0, Local5, 1) + err("", zFFF, __LINE__, 0, 0, Local5, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl index 72cf571..c02ad9a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl @@ -49,11 +49,11 @@ Method(mda1, 1, Serialized) if (LEqual(Arg0, 5)) { if (LNotEqual(Local7, 0x1234)) { - err("", zFFF, 0x000, 0, 0, Local7, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local7, 0x1234) } } else { if (LNotEqual(Local7, 0x5678)) { - err("", zFFF, 0x001, 0, 0, Local7, 0x5678) + err("", zFFF, __LINE__, 0, 0, Local7, 0x5678) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl index 696d038..f596e7d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl @@ -36,11 +36,11 @@ Method(mda3) { ToInteger("0x12345678", Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } ToInteger("12345678", Local0) if (LNotEqual(Local0, 12345678)) { - err("", zFFF, 0x001, 0, 0, Local0, 12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 12345678) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl index fdc713d..eaf1044 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl @@ -41,6 +41,6 @@ Method(mda4,, Serialized) ToString(B000, Local0, Local1) if (LNotequal(Local0, 0)) { - err("", zFFF, 0x000, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl index 856d3ed..78d79a2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl @@ -40,6 +40,6 @@ Method(mda5,, Serialized) Store(ObjectType(f000), Local0) if (LNotequal(Local0, c00d)) { - err("", zFFF, 0x000, 0, 0, Local0, c00d) + err("", zFFF, __LINE__, 0, 0, Local0, c00d) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl index a4e1625..e807e2f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl @@ -36,7 +36,7 @@ Method(mda6) { Store(ObjectType(Local0), Local7) if (LNotequal(Local7, c008)) { - err("", zFFF, 0x000, 0, 0, Local7, c008) + err("", zFFF, __LINE__, 0, 0, Local7, c008) } } @@ -47,7 +47,7 @@ Method(mda7, 1) } Store(ObjectType(Local0), Local7) if (LNotequal(Local7, c008)) { - err("", zFFF, 0x001, 0, 0, Local7, c008) + err("", zFFF, __LINE__, 0, 0, Local7, c008) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl index abdf9bc..c4ab6fc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl @@ -40,17 +40,17 @@ Method(mda9) Store(ObjectType(Local1), Local2) if (LNotequal(Local2, c00b)) { - err("", zFFF, 0x000, 0, 0, Local2, c00b) + err("", zFFF, __LINE__, 0, 0, Local2, c00b) } if (LNotequal(Local1, Buffer(4){10, 11, 12, 13})) { - err("", zFFF, 0x001, 0, 0, Local1, Buffer(4){10, 11, 12, 13}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer(4){10, 11, 12, 13}) } Store(ObjectType(Local0), Local2) if (LNotequal(Local2, c00b)) { - err("", zFFF, 0x002, 0, 0, Local2, c00b) + err("", zFFF, __LINE__, 0, 0, Local2, c00b) } if (LNotequal(Local0, Buffer(4){10, 11, 12, 13})) { - err("", zFFF, 0x003, 0, 0, Local0, Buffer(4){10, 11, 12, 13}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer(4){10, 11, 12, 13}) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel10.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel10.asl index 8fdc3ce..c610f96 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel10.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel10.asl @@ -75,7 +75,7 @@ Method(mdac,, Serialized) // Checkings - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf("b000"), Local1) mf88(Local1, c00b, bb00, 0x001, 0x002, 1) @@ -115,7 +115,7 @@ Method(mdac,, Serialized) Store(mm02("^b000"), Local1) mf88(Local1, c00b, bb00, 0x013, 0x014, 1) - CH03("", 0, 0x015, 0, 0) + CH03("", 0, 0x015, __LINE__, 0) } /* @@ -142,31 +142,31 @@ Method(mf89,, Serialized) if (FLG9) { mf88(Local1, c00b, bb01, 0x002, 0x003, 1) } else { - CH04("", 0, 0xff, 0, 0x004, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Store(DerefOf("^mf89.pr01.i000"), Local1) if (FLG9) { mf88(Local1, c009, 0xaabc0000, 0x005, 0x006, 1) } else { - CH04("", 0, 0xff, 0, 0x007, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Store(DerefOf("\\mf89.pr01.i000"), Local1) if (FLG9) { mf88(Local1, c009, 0xaabc0000, 0x008, 0x009, 1) } else { - CH04("", 0, 0xff, 0, 0x00a, 0, 0) // AE_NOT_FOUND + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_NOT_FOUND } Store(DerefOf("^mf89.i010"), Local1) if (FLG9) { mf88(Local1, c009, ii00, 0x00b, 0x00c, 1) } else { - CH04("", 0, 0xff, 0, 0x00d, 0, 0) // AE_NOT_FOUND + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_NOT_FOUND } - CH03("", 0, 0x00e, 0, 0) + CH03("", 0, 0x00e, __LINE__, 0) } /* @@ -182,7 +182,7 @@ Method(mf8a,, Serialized) Name(ii02, 0xabbc0000) Name(p002, Package() {1,2,3,4}) - CH03("", 0, 0x01f, 0, 0) + CH03("", 0, 0x01f, __LINE__, 0) // Checkings @@ -198,7 +198,7 @@ Method(mf8a,, Serialized) Store(DerefOf("p002"), Local1) mf88(Local1, c00c, 0, 0x026, 0x027, 0) - CH03("", 0, 0x028, 0, 0) + CH03("", 0, 0x028, __LINE__, 0) } /* @@ -216,33 +216,33 @@ Method(mf8b,, Serialized) // Checkings - CH03("", 0, 0x029, 0, 0) + CH03("", 0, 0x029, __LINE__, 0) CopyObject(DerefOf("e003"), Local1) mf88(Local1, c00f, 0, 0x02a, 0x02b, 0) - CH03("", 0, 0x02c, 0, 0) + CH03("", 0, 0x02c, __LINE__, 0) CopyObject(DerefOf("mx03"), Local1) mf88(Local1, c011, 0, 0x02d, 0x02e, 0) - CH03("", 0, 0x02f, 0, 0) + CH03("", 0, 0x02f, __LINE__, 0) CopyObject(DerefOf("d003"), Local1) mf88(Local1, c00e, 0, 0x030, 0x031, 0) - CH03("", 0, 0x032, 0, 0) + CH03("", 0, 0x032, __LINE__, 0) CopyObject(DerefOf("tz03"), Local1) mf88(Local1, c015, 0, 0x033, 0x034, 0) - CH03("", 0, 0x035, 0, 0) + CH03("", 0, 0x035, __LINE__, 0) CopyObject(DerefOf("pr03"), Local1) mf88(Local1, c014, 0, 0x036, 0x037, 0) if (y510) { - CH03("", 0, 0x038, 0, 0) + CH03("", 0, 0x038, __LINE__, 0) CopyObject(DerefOf("r003"), Local1) mf88(Local1, c012, 0, 0x039, 0x03a, 0) } - CH03("", 0, 0x03b, 0, 0) + CH03("", 0, 0x03b, __LINE__, 0) CopyObject(DerefOf("pw03"), Local1) mf88(Local1, c013, 0, 0x03c, 0x03d, 0) } @@ -258,17 +258,17 @@ Method(mf8c,, Serialized) // Checkings - CH03("", 0, 0x03e, 0, 0) + CH03("", 0, 0x03e, __LINE__, 0) Store(DerefOf(b004), Local1) - CH04("", 0, 0xff, 0, 0x03f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x040, 0, 0) + CH03("", 0, 0x040, __LINE__, 0) Store(DerefOf(i004), Local1) - CH04("", 0, 0xff, 0, 0x041, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x042, 0, 0) + CH03("", 0, 0x042, __LINE__, 0) Store(DerefOf(p004), Local1) - CH04("", 0, 0xff, 0, 0x043, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -276,17 +276,17 @@ Method(mf8c,, Serialized) */ Method(mf8d) { - CH03("", 0, 0x044, 0, 0) + CH03("", 0, 0x044, __LINE__, 0) Store(DerefOf("0123"), Local1) - CH04("", 0, 0xff, 0, 0x045, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x046, 0, 0) + CH03("", 0, 0x046, __LINE__, 0) Store(DerefOf("zxcvbnm,./;'\][0123"), Local1) - CH04("", 0, 0xff, 0, 0x047, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x048, 0, 0) + CH03("", 0, 0x048, __LINE__, 0) Store(DerefOf("b0qv"), Local1) - CH04("", 0, 0xff, 0, 0x049, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -318,7 +318,7 @@ Method(mf8e,, Serialized) // Checkings - CH03("", 0, 0x04a, 0, 0) + CH03("", 0, 0x04a, __LINE__, 0) Store(DerefOf("b006"), Local2) @@ -346,7 +346,7 @@ Method(mf8e,, Serialized) Store(DerefOf(i006), Local2) - CH03("", 0, 0x04b, 0, 0) + CH03("", 0, 0x04b, __LINE__, 0) } /* @@ -364,46 +364,46 @@ Method(mf8f,, Serialized) // Checkings - CH03("", 0, 0x04c, 0, 0) + CH03("", 0, 0x04c, __LINE__, 0) Store(DerefOf("e007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x04d, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x04e, 0, 0) + CH03("", 0, 0x04e, __LINE__, 0) Store(DerefOf("mx07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x04f, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x050, 0, 0) + CH03("", 0, 0x050, __LINE__, 0) Store(DerefOf("d007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x051, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x052, 0, 0) + CH03("", 0, 0x052, __LINE__, 0) Store(DerefOf("tz07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x053, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x054, 0, 0) + CH03("", 0, 0x054, __LINE__, 0) Store(DerefOf("pr07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x055, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x056, 0, 0) + CH03("", 0, 0x056, __LINE__, 0) Store(DerefOf("r007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x057, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x058, 0, 0) + CH03("", 0, 0x058, __LINE__, 0) Store(DerefOf("pw07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x059, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } } @@ -418,17 +418,17 @@ Method(mf90,, Serialized) // Checkings - CH03("", 0, 0x05a, 0, 0) + CH03("", 0, 0x05a, __LINE__, 0) Store(DerefOf(b008), Local2) - CH04("", 0, 0xff, 0, 0x05b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x05c, 0, 0) + CH03("", 0, 0x05c, __LINE__, 0) Store(DerefOf(i008), Local2) - CH04("", 0, 0xff, 0, 0x05d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x05e, 0, 0) + CH03("", 0, 0x05e, __LINE__, 0) Store(DerefOf(p008), Local2) - CH04("", 0, 0xff, 0, 0x05f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -436,21 +436,21 @@ Method(mf90,, Serialized) */ Method(mf91) { - CH03("", 0, 0x060, 0, 0) + CH03("", 0, 0x060, __LINE__, 0) Store(DerefOf("0123"), Local2) - CH04("", 0, 0xff, 0, 0x061, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x062, 0, 0) + CH03("", 0, 0x062, __LINE__, 0) Store(DerefOf("zxcvbnm,./;'\][0123"), Local2) - CH04("", 0, 0xff, 0, 0x063, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x064, 0, 0) + CH03("", 0, 0x064, __LINE__, 0) Store(DerefOf("mf_d"), Local2) - CH04("", 0, 0xff, 0, 0x065, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x066, 0, 0) + CH03("", 0, 0x066, __LINE__, 0) Store(DerefOf("b009"), Local2) - CH04("", 0, 0xff, 0, 0x067, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -466,7 +466,7 @@ Method(mfa0,, Serialized) BankField(r00a, f0a1, 0, ByteAcc, NoLock, Preserve) {bna0,4} IndexField(f0a2, f0a3, ByteAcc, NoLock, Preserve) {ifa0,8,ifa1,8} - CH03("", 0, 0x068, 0, 0) + CH03("", 0, 0x068, __LINE__, 0) Store(DerefOf("bfa0"), Local1) mf88(Local1, c009, 0xb1, 0x069, 0x06a, 1) @@ -492,7 +492,7 @@ Method(mfa0,, Serialized) Store(DerefOf("ifa1"), Local1) mf88(Local1, c009, 0, 0x077, 0x078, 0) - CH03("", 0, 0x079, 0, 0) + CH03("", 0, 0x079, __LINE__, 0) } // b @@ -506,37 +506,37 @@ Method(mfa1,, Serialized) BankField(r00b, f0b1, 0, ByteAcc, NoLock, Preserve) {bnb0,4} IndexField(f0b2, f0b3, ByteAcc, NoLock, Preserve) {ifb0,8,ifb1,8} - CH03("", 0, 0x07a, 0, 0) + CH03("", 0, 0x07a, __LINE__, 0) Store(DerefOf(bfb0), Local1) - CH04("", 0, 0xff, 0, 0x07b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x07c, 0, 0) + CH03("", 0, 0x07c, __LINE__, 0) Store(DerefOf(f0b0), Local1) - CH04("", 0, 0xff, 0, 0x07d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x07e, 0, 0) + CH03("", 0, 0x07e, __LINE__, 0) Store(DerefOf(f0b1), Local1) - CH04("", 0, 0xff, 0, 0x07f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x080, 0, 0) + CH03("", 0, 0x080, __LINE__, 0) Store(DerefOf(f0b2), Local1) - CH04("", 0, 0xff, 0, 0x081, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x082, 0, 0) + CH03("", 0, 0x082, __LINE__, 0) Store(DerefOf(f0b3), Local1) - CH04("", 0, 0xff, 0, 0x083, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x084, 0, 0) + CH03("", 0, 0x084, __LINE__, 0) Store(DerefOf(bnb0), Local1) - CH04("", 0, 0xff, 0, 0x085, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x086, 0, 0) + CH03("", 0, 0x086, __LINE__, 0) Store(DerefOf(ifb0), Local1) - CH04("", 0, 0xff, 0, 0x087, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x088, 0, 0) + CH03("", 0, 0x088, __LINE__, 0) Store(DerefOf(ifb1), Local1) - CH04("", 0, 0xff, 0, 0x089, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } // c @@ -552,33 +552,33 @@ Method(mfa2,, Serialized) // Checkings - CH03("", 0, 0x08a, 0, 0) + CH03("", 0, 0x08a, __LINE__, 0) Store(DerefOf(e00c), Local2) - CH04("", 0, 0xff, 0, 0x08b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x08c, 0, 0) + CH03("", 0, 0x08c, __LINE__, 0) Store(DerefOf(mx0c), Local2) - CH04("", 0, 0xff, 0, 0x08d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x08e, 0, 0) + CH03("", 0, 0x08e, __LINE__, 0) Store(DerefOf(d00c), Local2) - CH04("", 0, 0xff, 0, 0x08f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x090, 0, 0) + CH03("", 0, 0x090, __LINE__, 0) Store(DerefOf(tz0c), Local2) - CH04("", 0, 0xff, 0, 0x091, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x092, 0, 0) + CH03("", 0, 0x092, __LINE__, 0) Store(DerefOf(pr0c), Local2) - CH04("", 0, 0xff, 0, 0x093, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x094, 0, 0) + CH03("", 0, 0x094, __LINE__, 0) Store(DerefOf(r00c), Local2) - CH04("", 0, 0xff, 0, 0x095, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x096, 0, 0) + CH03("", 0, 0x096, __LINE__, 0) Store(DerefOf(pw0c), Local2) - CH04("", 0, 0xff, 0, 0x097, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Method(m12a) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel20.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel20.asl index 7e8cf85..f57ebe3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel20.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel20.asl @@ -76,7 +76,7 @@ Method(mdac,, Serialized) // Checkings - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf("b000"), Local1) mf88(Local1, c00b, bb00, 0x001, 0x002, 1) @@ -116,7 +116,7 @@ Method(mdac,, Serialized) Store(mm02("^b000"), Local1) mf88(Local1, c00b, bb00, 0x013, 0x014, 1) - CH03("", 0, 0x015, 0, 0) + CH03("", 0, 0x015, __LINE__, 0) } /* @@ -136,7 +136,7 @@ Method(mf89,, Serialized) // Checkings - CH03("", 0, 0x00f, 0, 0) + CH03("", 0, 0x00f, __LINE__, 0) Store(DerefOf("b001"), Local1) mf88(Local1, c00b, bb01, 0x000, 0x001, 1) @@ -145,31 +145,31 @@ Method(mf89,, Serialized) if (FLG9) { mf88(Local1, c00b, bb01, 0x002, 0x003, 1) } else { - CH04("", 0, 0xff, 0, 0x004, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Store(DerefOf("^mf89.pr01.i000"), Local1) if (FLG9) { mf88(Local1, c009, 0xaabc0000, 0x005, 0x006, 1) } else { - CH04("", 0, 0xff, 0, 0x007, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Store(DerefOf("\\m12b.mf89.pr01.i000"), Local1) if (FLG9) { mf88(Local1, c009, 0xaabc0000, 0x008, 0x009, 1) } else { - CH04("", 0, 0xff, 0, 0x00a, 0, 0) // AE_NOT_FOUND + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_NOT_FOUND } Store(DerefOf("^mf89.i010"), Local1) if (FLG9) { mf88(Local1, c009, ii00, 0x00b, 0x00c, 1) } else { - CH04("", 0, 0xff, 0, 0x00d, 0, 0) // AE_NOT_FOUND + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_NOT_FOUND } - CH03("", 0, 0x00e, 0, 0) + CH03("", 0, 0x00e, __LINE__, 0) } /* @@ -185,7 +185,7 @@ Method(mf8a,, Serialized) Name(ii02, 0xabbc0000) Name(p002, Package() {1,2,3,4}) - CH03("", 0, 0x01f, 0, 0) + CH03("", 0, 0x01f, __LINE__, 0) // Checkings @@ -201,7 +201,7 @@ Method(mf8a,, Serialized) Store(DerefOf("p002"), Local1) mf88(Local1, c00c, 0, 0x026, 0x027, 0) - CH03("", 0, 0x028, 0, 0) + CH03("", 0, 0x028, __LINE__, 0) } /* @@ -219,33 +219,33 @@ Method(mf8b,, Serialized) // Checkings - CH03("", 0, 0x029, 0, 0) + CH03("", 0, 0x029, __LINE__, 0) CopyObject(DerefOf("e003"), Local1) mf88(Local1, c00f, 0, 0x02a, 0x02b, 0) - CH03("", 0, 0x02c, 0, 0) + CH03("", 0, 0x02c, __LINE__, 0) CopyObject(DerefOf("mx03"), Local1) mf88(Local1, c011, 0, 0x02d, 0x02e, 0) - CH03("", 0, 0x02f, 0, 0) + CH03("", 0, 0x02f, __LINE__, 0) CopyObject(DerefOf("d003"), Local1) mf88(Local1, c00e, 0, 0x030, 0x031, 0) - CH03("", 0, 0x032, 0, 0) + CH03("", 0, 0x032, __LINE__, 0) CopyObject(DerefOf("tz03"), Local1) mf88(Local1, c015, 0, 0x033, 0x034, 0) - CH03("", 0, 0x035, 0, 0) + CH03("", 0, 0x035, __LINE__, 0) CopyObject(DerefOf("pr03"), Local1) mf88(Local1, c014, 0, 0x036, 0x037, 0) if (y510) { - CH03("", 0, 0x038, 0, 0) + CH03("", 0, 0x038, __LINE__, 0) CopyObject(DerefOf("r003"), Local1) mf88(Local1, c012, 0, 0x039, 0x03a, 0) } - CH03("", 0, 0x03b, 0, 0) + CH03("", 0, 0x03b, __LINE__, 0) CopyObject(DerefOf("pw03"), Local1) mf88(Local1, c013, 0, 0x03c, 0x03d, 0) } @@ -261,17 +261,17 @@ Method(mf8c,, Serialized) // Checkings - CH03("", 0, 0x03e, 0, 0) + CH03("", 0, 0x03e, __LINE__, 0) Store(DerefOf(b004), Local1) - CH04("", 0, 0xff, 0, 0x03f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x040, 0, 0) + CH03("", 0, 0x040, __LINE__, 0) Store(DerefOf(i004), Local1) - CH04("", 0, 0xff, 0, 0x041, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x042, 0, 0) + CH03("", 0, 0x042, __LINE__, 0) Store(DerefOf(p004), Local1) - CH04("", 0, 0xff, 0, 0x043, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -279,17 +279,17 @@ Method(mf8c,, Serialized) */ Method(mf8d) { - CH03("", 0, 0x044, 0, 0) + CH03("", 0, 0x044, __LINE__, 0) Store(DerefOf("0123"), Local1) - CH04("", 0, 0xff, 0, 0x045, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x046, 0, 0) + CH03("", 0, 0x046, __LINE__, 0) Store(DerefOf("zxcvbnm,./;'\][0123"), Local1) - CH04("", 0, 0xff, 0, 0x047, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x048, 0, 0) + CH03("", 0, 0x048, __LINE__, 0) Store(DerefOf("b0qv"), Local1) - CH04("", 0, 0xff, 0, 0x049, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -321,7 +321,7 @@ Method(mf8e,, Serialized) // Checkings - CH03("", 0, 0x04a, 0, 0) + CH03("", 0, 0x04a, __LINE__, 0) Store(DerefOf("b006"), Local2) @@ -349,7 +349,7 @@ Method(mf8e,, Serialized) Store(DerefOf(i006), Local2) - CH03("", 0, 0x04b, 0, 0) + CH03("", 0, 0x04b, __LINE__, 0) } /* @@ -367,46 +367,46 @@ Method(mf8f,, Serialized) // Checkings - CH03("", 0, 0x04c, 0, 0) + CH03("", 0, 0x04c, __LINE__, 0) Store(DerefOf("e007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x04d, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x04e, 0, 0) + CH03("", 0, 0x04e, __LINE__, 0) Store(DerefOf("mx07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x04f, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x050, 0, 0) + CH03("", 0, 0x050, __LINE__, 0) Store(DerefOf("d007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x051, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x052, 0, 0) + CH03("", 0, 0x052, __LINE__, 0) Store(DerefOf("tz07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x053, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x054, 0, 0) + CH03("", 0, 0x054, __LINE__, 0) Store(DerefOf("pr07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x055, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x056, 0, 0) + CH03("", 0, 0x056, __LINE__, 0) Store(DerefOf("r007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x057, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x058, 0, 0) + CH03("", 0, 0x058, __LINE__, 0) Store(DerefOf("pw07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x059, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } } @@ -421,17 +421,17 @@ Method(mf90,, Serialized) // Checkings - CH03("", 0, 0x05a, 0, 0) + CH03("", 0, 0x05a, __LINE__, 0) Store(DerefOf(b008), Local2) - CH04("", 0, 0xff, 0, 0x05b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x05c, 0, 0) + CH03("", 0, 0x05c, __LINE__, 0) Store(DerefOf(i008), Local2) - CH04("", 0, 0xff, 0, 0x05d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x05e, 0, 0) + CH03("", 0, 0x05e, __LINE__, 0) Store(DerefOf(p008), Local2) - CH04("", 0, 0xff, 0, 0x05f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -439,21 +439,21 @@ Method(mf90,, Serialized) */ Method(mf91) { - CH03("", 0, 0x060, 0, 0) + CH03("", 0, 0x060, __LINE__, 0) Store(DerefOf("0123"), Local2) - CH04("", 0, 0xff, 0, 0x061, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x062, 0, 0) + CH03("", 0, 0x062, __LINE__, 0) Store(DerefOf("zxcvbnm,./;'\][0123"), Local2) - CH04("", 0, 0xff, 0, 0x063, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x064, 0, 0) + CH03("", 0, 0x064, __LINE__, 0) Store(DerefOf("mf_d"), Local2) - CH04("", 0, 0xff, 0, 0x065, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x066, 0, 0) + CH03("", 0, 0x066, __LINE__, 0) Store(DerefOf("b009"), Local2) - CH04("", 0, 0xff, 0, 0x067, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -469,7 +469,7 @@ Method(mfa0,, Serialized) BankField(r00a, f0a1, 0, ByteAcc, NoLock, Preserve) {bna0,4} IndexField(f0a2, f0a3, ByteAcc, NoLock, Preserve) {ifa0,8,ifa1,8} - CH03("", 0, 0x068, 0, 0) + CH03("", 0, 0x068, __LINE__, 0) Store(DerefOf("bfa0"), Local1) mf88(Local1, c009, 0xb1, 0x069, 0x06a, 1) @@ -495,7 +495,7 @@ Method(mfa0,, Serialized) Store(DerefOf("ifa1"), Local1) mf88(Local1, c009, 0, 0x077, 0x078, 0) - CH03("", 0, 0x079, 0, 0) + CH03("", 0, 0x079, __LINE__, 0) } // b @@ -509,37 +509,37 @@ Method(mfa1,, Serialized) BankField(r00b, f0b1, 0, ByteAcc, NoLock, Preserve) {bnb0,4} IndexField(f0b2, f0b3, ByteAcc, NoLock, Preserve) {ifb0,8,ifb1,8} - CH03("", 0, 0x07a, 0, 0) + CH03("", 0, 0x07a, __LINE__, 0) Store(DerefOf(bfb0), Local1) - CH04("", 0, 0xff, 0, 0x07b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x07c, 0, 0) + CH03("", 0, 0x07c, __LINE__, 0) Store(DerefOf(f0b0), Local1) - CH04("", 0, 0xff, 0, 0x07d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x07e, 0, 0) + CH03("", 0, 0x07e, __LINE__, 0) Store(DerefOf(f0b1), Local1) - CH04("", 0, 0xff, 0, 0x07f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x080, 0, 0) + CH03("", 0, 0x080, __LINE__, 0) Store(DerefOf(f0b2), Local1) - CH04("", 0, 0xff, 0, 0x081, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x082, 0, 0) + CH03("", 0, 0x082, __LINE__, 0) Store(DerefOf(f0b3), Local1) - CH04("", 0, 0xff, 0, 0x083, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x084, 0, 0) + CH03("", 0, 0x084, __LINE__, 0) Store(DerefOf(bnb0), Local1) - CH04("", 0, 0xff, 0, 0x085, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x086, 0, 0) + CH03("", 0, 0x086, __LINE__, 0) Store(DerefOf(ifb0), Local1) - CH04("", 0, 0xff, 0, 0x087, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x088, 0, 0) + CH03("", 0, 0x088, __LINE__, 0) Store(DerefOf(ifb1), Local1) - CH04("", 0, 0xff, 0, 0x089, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } // c @@ -555,33 +555,33 @@ Method(mfa2,, Serialized) // Checkings - CH03("", 0, 0x08a, 0, 0) + CH03("", 0, 0x08a, __LINE__, 0) Store(DerefOf(e00c), Local2) - CH04("", 0, 0xff, 0, 0x08b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x08c, 0, 0) + CH03("", 0, 0x08c, __LINE__, 0) Store(DerefOf(mx0c), Local2) - CH04("", 0, 0xff, 0, 0x08d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x08e, 0, 0) + CH03("", 0, 0x08e, __LINE__, 0) Store(DerefOf(d00c), Local2) - CH04("", 0, 0xff, 0, 0x08f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x090, 0, 0) + CH03("", 0, 0x090, __LINE__, 0) Store(DerefOf(tz0c), Local2) - CH04("", 0, 0xff, 0, 0x091, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x092, 0, 0) + CH03("", 0, 0x092, __LINE__, 0) Store(DerefOf(pr0c), Local2) - CH04("", 0, 0xff, 0, 0x093, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x094, 0, 0) + CH03("", 0, 0x094, __LINE__, 0) Store(DerefOf(r00c), Local2) - CH04("", 0, 0xff, 0, 0x095, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x096, 0, 0) + CH03("", 0, 0x096, __LINE__, 0) Store(DerefOf(pw0c), Local2) - CH04("", 0, 0xff, 0, 0x097, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Method(m12a) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclDown.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclDown.asl index deb1608..17d844a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclDown.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclDown.asl @@ -48,7 +48,7 @@ Method(mdac) // Checkings - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf("b000"), Local1) mf88(Local1, c00b, bb00, 0x001, 0x002, 1) @@ -88,7 +88,7 @@ Method(mdac) Store(mm02("^b000"), Local1) mf88(Local1, c00b, bb00, 0x013, 0x014, 1) - CH03("", 0, 0x015, 0, 0) + CH03("", 0, 0x015, __LINE__, 0) } /* @@ -111,7 +111,7 @@ Method(mf89) if (FLG9) { mf88(Local1, c009, 0xaabc0000, 0x01c, 0x01d, 1) } else { - CH04("", 0, 0xff, 0, 0x01e, 0, 0) // AE_NOT_FOUND + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_NOT_FOUND } Store(DerefOf("^i010"), Local1) @@ -120,7 +120,7 @@ Method(mf89) Store(DerefOf("^i987"), Local1) mf88(Local1, c009, ii01, 0x021, 0x022, 1) - CH03("", 0, 0x023, 0, 0) + CH03("", 0, 0x023, __LINE__, 0) } /* @@ -128,7 +128,7 @@ Method(mf89) */ Method(mf8a) { - CH03("", 0, 0x01f, 0, 0) + CH03("", 0, 0x01f, __LINE__, 0) // Checkings @@ -144,7 +144,7 @@ Method(mf8a) Store(DerefOf("p002"), Local1) mf88(Local1, c00c, 0, 0x026, 0x027, 0) - CH03("", 0, 0x028, 0, 0) + CH03("", 0, 0x028, __LINE__, 0) } /* @@ -154,33 +154,33 @@ Method(mf8b) { // Checkings - CH03("", 0, 0x029, 0, 0) + CH03("", 0, 0x029, __LINE__, 0) CopyObject(DerefOf("e003"), Local1) mf88(Local1, c00f, 0, 0x02a, 0x02b, 0) - CH03("", 0, 0x02c, 0, 0) + CH03("", 0, 0x02c, __LINE__, 0) CopyObject(DerefOf("mx03"), Local1) mf88(Local1, c011, 0, 0x02d, 0x02e, 0) - CH03("", 0, 0x02f, 0, 0) + CH03("", 0, 0x02f, __LINE__, 0) CopyObject(DerefOf("d003"), Local1) mf88(Local1, c00e, 0, 0x030, 0x031, 0) - CH03("", 0, 0x032, 0, 0) + CH03("", 0, 0x032, __LINE__, 0) CopyObject(DerefOf("tz03"), Local1) mf88(Local1, c015, 0, 0x033, 0x034, 0) - CH03("", 0, 0x035, 0, 0) + CH03("", 0, 0x035, __LINE__, 0) CopyObject(DerefOf("pr03"), Local1) mf88(Local1, c014, 0, 0x036, 0x037, 0) if (y510) { - CH03("", 0, 0x038, 0, 0) + CH03("", 0, 0x038, __LINE__, 0) CopyObject(DerefOf("r003"), Local1) mf88(Local1, c012, 0, 0x039, 0x03a, 0) } - CH03("", 0, 0x03b, 0, 0) + CH03("", 0, 0x03b, __LINE__, 0) CopyObject(DerefOf("pw03"), Local1) mf88(Local1, c013, 0, 0x03c, 0x03d, 0) } @@ -192,17 +192,17 @@ Method(mf8c) { // Checkings - CH03("", 0, 0x03e, 0, 0) + CH03("", 0, 0x03e, __LINE__, 0) Store(DerefOf(b004), Local1) - CH04("", 0, 0xff, 0, 0x03f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x040, 0, 0) + CH03("", 0, 0x040, __LINE__, 0) Store(DerefOf(i004), Local1) - CH04("", 0, 0xff, 0, 0x041, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x042, 0, 0) + CH03("", 0, 0x042, __LINE__, 0) Store(DerefOf(p004), Local1) - CH04("", 0, 0xff, 0, 0x043, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -210,17 +210,17 @@ Method(mf8c) */ Method(mf8d) { - CH03("", 0, 0x044, 0, 0) + CH03("", 0, 0x044, __LINE__, 0) Store(DerefOf("0123"), Local1) - CH04("", 0, 0xff, 0, 0x045, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x046, 0, 0) + CH03("", 0, 0x046, __LINE__, 0) Store(DerefOf("zxcvbnm,./;'\][0123"), Local1) - CH04("", 0, 0xff, 0, 0x047, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x048, 0, 0) + CH03("", 0, 0x048, __LINE__, 0) Store(DerefOf("b0qv"), Local1) - CH04("", 0, 0xff, 0, 0x049, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -235,7 +235,7 @@ Method(mf8e) // Checkings - CH03("", 0, 0x04a, 0, 0) + CH03("", 0, 0x04a, __LINE__, 0) Store(DerefOf("b006"), Local2) @@ -263,7 +263,7 @@ Method(mf8e) Store(DerefOf(i006), Local2) - CH03("", 0, 0x04b, 0, 0) + CH03("", 0, 0x04b, __LINE__, 0) } /* @@ -273,46 +273,46 @@ Method(mf8f) { // Checkings - CH03("", 0, 0x04c, 0, 0) + CH03("", 0, 0x04c, __LINE__, 0) Store(DerefOf("e007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x04d, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x04e, 0, 0) + CH03("", 0, 0x04e, __LINE__, 0) Store(DerefOf("mx07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x04f, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x050, 0, 0) + CH03("", 0, 0x050, __LINE__, 0) Store(DerefOf("d007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x051, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x052, 0, 0) + CH03("", 0, 0x052, __LINE__, 0) Store(DerefOf("tz07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x053, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x054, 0, 0) + CH03("", 0, 0x054, __LINE__, 0) Store(DerefOf("pr07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x055, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x056, 0, 0) + CH03("", 0, 0x056, __LINE__, 0) Store(DerefOf("r007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x057, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x058, 0, 0) + CH03("", 0, 0x058, __LINE__, 0) Store(DerefOf("pw07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x059, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } } @@ -323,17 +323,17 @@ Method(mf90) { // Checkings - CH03("", 0, 0x05a, 0, 0) + CH03("", 0, 0x05a, __LINE__, 0) Store(DerefOf(b008), Local2) - CH04("", 0, 0xff, 0, 0x05b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x05c, 0, 0) + CH03("", 0, 0x05c, __LINE__, 0) Store(DerefOf(i008), Local2) - CH04("", 0, 0xff, 0, 0x05d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x05e, 0, 0) + CH03("", 0, 0x05e, __LINE__, 0) Store(DerefOf(p008), Local2) - CH04("", 0, 0xff, 0, 0x05f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -341,21 +341,21 @@ Method(mf90) */ Method(mf91) { - CH03("", 0, 0x060, 0, 0) + CH03("", 0, 0x060, __LINE__, 0) Store(DerefOf("0123"), Local2) - CH04("", 0, 0xff, 0, 0x061, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x062, 0, 0) + CH03("", 0, 0x062, __LINE__, 0) Store(DerefOf("zxcvbnm,./;'\][0123"), Local2) - CH04("", 0, 0xff, 0, 0x063, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x064, 0, 0) + CH03("", 0, 0x064, __LINE__, 0) Store(DerefOf("mf_d"), Local2) - CH04("", 0, 0xff, 0, 0x065, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x066, 0, 0) + CH03("", 0, 0x066, __LINE__, 0) Store(DerefOf("b009"), Local2) - CH04("", 0, 0xff, 0, 0x067, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -363,7 +363,7 @@ Method(mf91) */ Method(mfa0) { - CH03("", 0, 0x068, 0, 0) + CH03("", 0, 0x068, __LINE__, 0) Store(DerefOf("bfa0"), Local1) mf88(Local1, c009, 0xb1, 0x069, 0x06a, 1) @@ -389,43 +389,43 @@ Method(mfa0) Store(DerefOf("ifa1"), Local1) mf88(Local1, c009, 0, 0x077, 0x078, 0) - CH03("", 0, 0x079, 0, 0) + CH03("", 0, 0x079, __LINE__, 0) } // b Method(mfa1) { - CH03("", 0, 0x07a, 0, 0) + CH03("", 0, 0x07a, __LINE__, 0) Store(DerefOf(bfb0), Local1) - CH04("", 0, 0xff, 0, 0x07b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x07c, 0, 0) + CH03("", 0, 0x07c, __LINE__, 0) Store(DerefOf(f0b0), Local1) - CH04("", 0, 0xff, 0, 0x07d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x07e, 0, 0) + CH03("", 0, 0x07e, __LINE__, 0) Store(DerefOf(f0b1), Local1) - CH04("", 0, 0xff, 0, 0x07f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x080, 0, 0) + CH03("", 0, 0x080, __LINE__, 0) Store(DerefOf(f0b2), Local1) - CH04("", 0, 0xff, 0, 0x081, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x082, 0, 0) + CH03("", 0, 0x082, __LINE__, 0) Store(DerefOf(f0b3), Local1) - CH04("", 0, 0xff, 0, 0x083, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x084, 0, 0) + CH03("", 0, 0x084, __LINE__, 0) Store(DerefOf(bnb0), Local1) - CH04("", 0, 0xff, 0, 0x085, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x086, 0, 0) + CH03("", 0, 0x086, __LINE__, 0) Store(DerefOf(ifb0), Local1) - CH04("", 0, 0xff, 0, 0x087, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x088, 0, 0) + CH03("", 0, 0x088, __LINE__, 0) Store(DerefOf(ifb1), Local1) - CH04("", 0, 0xff, 0, 0x089, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } // c @@ -433,33 +433,33 @@ Method(mfa2) { // Checkings - CH03("", 0, 0x08a, 0, 0) + CH03("", 0, 0x08a, __LINE__, 0) Store(DerefOf(e00c), Local2) - CH04("", 0, 0xff, 0, 0x08b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x08c, 0, 0) + CH03("", 0, 0x08c, __LINE__, 0) Store(DerefOf(mx0c), Local2) - CH04("", 0, 0xff, 0, 0x08d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x08e, 0, 0) + CH03("", 0, 0x08e, __LINE__, 0) Store(DerefOf(d00c), Local2) - CH04("", 0, 0xff, 0, 0x08f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x090, 0, 0) + CH03("", 0, 0x090, __LINE__, 0) Store(DerefOf(tz0c), Local2) - CH04("", 0, 0xff, 0, 0x091, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x092, 0, 0) + CH03("", 0, 0x092, __LINE__, 0) Store(DerefOf(pr0c), Local2) - CH04("", 0, 0xff, 0, 0x093, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x094, 0, 0) + CH03("", 0, 0x094, __LINE__, 0) Store(DerefOf(r00c), Local2) - CH04("", 0, 0xff, 0, 0x095, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x096, 0, 0) + CH03("", 0, 0x096, __LINE__, 0) Store(DerefOf(pw0c), Local2) - CH04("", 0, 0xff, 0, 0x097, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Method(m12a) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclUp.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclUp.asl index 7eea1a0..0f79fc6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclUp.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclUp.asl @@ -176,7 +176,7 @@ Method(mdac) // Checkings - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf("b000"), Local1) mf88(Local1, c00b, bb00, 0x001, 0x002, 1) @@ -216,7 +216,7 @@ Method(mdac) Store(mm02("^b000"), Local1) mf88(Local1, c00b, bb00, 0x013, 0x014, 1) - CH03("", 0, 0x015, 0, 0) + CH03("", 0, 0x015, __LINE__, 0) } /* @@ -239,7 +239,7 @@ Method(mf89) if (FLG9) { mf88(Local1, c009, 0xaabc0000, 0x01c, 0x01d, 1) } else { - CH04("", 0, 0xff, 0, 0x01e, 0, 0) // AE_NOT_FOUND + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_NOT_FOUND } Store(DerefOf("^i010"), Local1) @@ -248,7 +248,7 @@ Method(mf89) Store(DerefOf("^i987"), Local1) mf88(Local1, c009, ii01, 0x021, 0x022, 1) - CH03("", 0, 0x023, 0, 0) + CH03("", 0, 0x023, __LINE__, 0) } /* @@ -256,7 +256,7 @@ Method(mf89) */ Method(mf8a) { - CH03("", 0, 0x01f, 0, 0) + CH03("", 0, 0x01f, __LINE__, 0) // Checkings @@ -272,7 +272,7 @@ Method(mf8a) Store(DerefOf("p002"), Local1) mf88(Local1, c00c, 0, 0x026, 0x027, 0) - CH03("", 0, 0x028, 0, 0) + CH03("", 0, 0x028, __LINE__, 0) } /* @@ -282,33 +282,33 @@ Method(mf8b) { // Checkings - CH03("", 0, 0x029, 0, 0) + CH03("", 0, 0x029, __LINE__, 0) CopyObject(DerefOf("e003"), Local1) mf88(Local1, c00f, 0, 0x02a, 0x02b, 0) - CH03("", 0, 0x02c, 0, 0) + CH03("", 0, 0x02c, __LINE__, 0) CopyObject(DerefOf("mx03"), Local1) mf88(Local1, c011, 0, 0x02d, 0x02e, 0) - CH03("", 0, 0x02f, 0, 0) + CH03("", 0, 0x02f, __LINE__, 0) CopyObject(DerefOf("d003"), Local1) mf88(Local1, c00e, 0, 0x030, 0x031, 0) - CH03("", 0, 0x032, 0, 0) + CH03("", 0, 0x032, __LINE__, 0) CopyObject(DerefOf("tz03"), Local1) mf88(Local1, c015, 0, 0x033, 0x034, 0) - CH03("", 0, 0x035, 0, 0) + CH03("", 0, 0x035, __LINE__, 0) CopyObject(DerefOf("pr03"), Local1) mf88(Local1, c014, 0, 0x036, 0x037, 0) if (y510) { - CH03("", 0, 0x038, 0, 0) + CH03("", 0, 0x038, __LINE__, 0) CopyObject(DerefOf("r003"), Local1) mf88(Local1, c012, 0, 0x039, 0x03a, 0) } - CH03("", 0, 0x03b, 0, 0) + CH03("", 0, 0x03b, __LINE__, 0) CopyObject(DerefOf("pw03"), Local1) mf88(Local1, c013, 0, 0x03c, 0x03d, 0) } @@ -320,17 +320,17 @@ Method(mf8c) { // Checkings - CH03("", 0, 0x03e, 0, 0) + CH03("", 0, 0x03e, __LINE__, 0) Store(DerefOf(b004), Local1) - CH04("", 0, 0xff, 0, 0x03f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x040, 0, 0) + CH03("", 0, 0x040, __LINE__, 0) Store(DerefOf(i004), Local1) - CH04("", 0, 0xff, 0, 0x041, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x042, 0, 0) + CH03("", 0, 0x042, __LINE__, 0) Store(DerefOf(p004), Local1) - CH04("", 0, 0xff, 0, 0x043, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -338,17 +338,17 @@ Method(mf8c) */ Method(mf8d) { - CH03("", 0, 0x044, 0, 0) + CH03("", 0, 0x044, __LINE__, 0) Store(DerefOf("0123"), Local1) - CH04("", 0, 0xff, 0, 0x045, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x046, 0, 0) + CH03("", 0, 0x046, __LINE__, 0) Store(DerefOf("zxcvbnm,./;'\][0123"), Local1) - CH04("", 0, 0xff, 0, 0x047, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x048, 0, 0) + CH03("", 0, 0x048, __LINE__, 0) Store(DerefOf("b0qv"), Local1) - CH04("", 0, 0xff, 0, 0x049, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -363,7 +363,7 @@ Method(mf8e) // Checkings - CH03("", 0, 0x04a, 0, 0) + CH03("", 0, 0x04a, __LINE__, 0) Store(DerefOf("b006"), Local2) @@ -391,7 +391,7 @@ Method(mf8e) Store(DerefOf(i006), Local2) - CH03("", 0, 0x04b, 0, 0) + CH03("", 0, 0x04b, __LINE__, 0) } /* @@ -401,46 +401,46 @@ Method(mf8f) { // Checkings - CH03("", 0, 0x04c, 0, 0) + CH03("", 0, 0x04c, __LINE__, 0) Store(DerefOf("e007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x04d, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x04e, 0, 0) + CH03("", 0, 0x04e, __LINE__, 0) Store(DerefOf("mx07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x04f, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x050, 0, 0) + CH03("", 0, 0x050, __LINE__, 0) Store(DerefOf("d007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x051, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x052, 0, 0) + CH03("", 0, 0x052, __LINE__, 0) Store(DerefOf("tz07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x053, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x054, 0, 0) + CH03("", 0, 0x054, __LINE__, 0) Store(DerefOf("pr07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x055, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x056, 0, 0) + CH03("", 0, 0x056, __LINE__, 0) Store(DerefOf("r007"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x057, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } - CH03("", 0, 0x058, 0, 0) + CH03("", 0, 0x058, __LINE__, 0) Store(DerefOf("pw07"), Local2) if(LNot(SLCK)){ - CH04("", 0, 47, 0, 0x059, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } } @@ -451,17 +451,17 @@ Method(mf90) { // Checkings - CH03("", 0, 0x05a, 0, 0) + CH03("", 0, 0x05a, __LINE__, 0) Store(DerefOf(b008), Local2) - CH04("", 0, 0xff, 0, 0x05b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x05c, 0, 0) + CH03("", 0, 0x05c, __LINE__, 0) Store(DerefOf(i008), Local2) - CH04("", 0, 0xff, 0, 0x05d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x05e, 0, 0) + CH03("", 0, 0x05e, __LINE__, 0) Store(DerefOf(p008), Local2) - CH04("", 0, 0xff, 0, 0x05f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -469,21 +469,21 @@ Method(mf90) */ Method(mf91) { - CH03("", 0, 0x060, 0, 0) + CH03("", 0, 0x060, __LINE__, 0) Store(DerefOf("0123"), Local2) - CH04("", 0, 0xff, 0, 0x061, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x062, 0, 0) + CH03("", 0, 0x062, __LINE__, 0) Store(DerefOf("zxcvbnm,./;'\][0123"), Local2) - CH04("", 0, 0xff, 0, 0x063, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x064, 0, 0) + CH03("", 0, 0x064, __LINE__, 0) Store(DerefOf("mf_d"), Local2) - CH04("", 0, 0xff, 0, 0x065, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x066, 0, 0) + CH03("", 0, 0x066, __LINE__, 0) Store(DerefOf("b009"), Local2) - CH04("", 0, 0xff, 0, 0x067, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } /* @@ -491,7 +491,7 @@ Method(mf91) */ Method(mfa0) { - CH03("", 0, 0x068, 0, 0) + CH03("", 0, 0x068, __LINE__, 0) Store(DerefOf("bfa0"), Local1) mf88(Local1, c009, 0xb1, 0x069, 0x06a, 1) @@ -517,43 +517,43 @@ Method(mfa0) Store(DerefOf("ifa1"), Local1) mf88(Local1, c009, 0, 0x077, 0x078, 0) - CH03("", 0, 0x079, 0, 0) + CH03("", 0, 0x079, __LINE__, 0) } // b Method(mfa1) { - CH03("", 0, 0x07a, 0, 0) + CH03("", 0, 0x07a, __LINE__, 0) Store(DerefOf(bfb0), Local1) - CH04("", 0, 0xff, 0, 0x07b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x07c, 0, 0) + CH03("", 0, 0x07c, __LINE__, 0) Store(DerefOf(f0b0), Local1) - CH04("", 0, 0xff, 0, 0x07d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x07e, 0, 0) + CH03("", 0, 0x07e, __LINE__, 0) Store(DerefOf(f0b1), Local1) - CH04("", 0, 0xff, 0, 0x07f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x080, 0, 0) + CH03("", 0, 0x080, __LINE__, 0) Store(DerefOf(f0b2), Local1) - CH04("", 0, 0xff, 0, 0x081, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x082, 0, 0) + CH03("", 0, 0x082, __LINE__, 0) Store(DerefOf(f0b3), Local1) - CH04("", 0, 0xff, 0, 0x083, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x084, 0, 0) + CH03("", 0, 0x084, __LINE__, 0) Store(DerefOf(bnb0), Local1) - CH04("", 0, 0xff, 0, 0x085, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x086, 0, 0) + CH03("", 0, 0x086, __LINE__, 0) Store(DerefOf(ifb0), Local1) - CH04("", 0, 0xff, 0, 0x087, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x088, 0, 0) + CH03("", 0, 0x088, __LINE__, 0) Store(DerefOf(ifb1), Local1) - CH04("", 0, 0xff, 0, 0x089, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } // c @@ -561,33 +561,33 @@ Method(mfa2) { // Checkings - CH03("", 0, 0x08a, 0, 0) + CH03("", 0, 0x08a, __LINE__, 0) Store(DerefOf(e00c), Local2) - CH04("", 0, 0xff, 0, 0x08b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x08c, 0, 0) + CH03("", 0, 0x08c, __LINE__, 0) Store(DerefOf(mx0c), Local2) - CH04("", 0, 0xff, 0, 0x08d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x08e, 0, 0) + CH03("", 0, 0x08e, __LINE__, 0) Store(DerefOf(d00c), Local2) - CH04("", 0, 0xff, 0, 0x08f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x090, 0, 0) + CH03("", 0, 0x090, __LINE__, 0) Store(DerefOf(tz0c), Local2) - CH04("", 0, 0xff, 0, 0x091, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x092, 0, 0) + CH03("", 0, 0x092, __LINE__, 0) Store(DerefOf(pr0c), Local2) - CH04("", 0, 0xff, 0, 0x093, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x094, 0, 0) + CH03("", 0, 0x094, __LINE__, 0) Store(DerefOf(r00c), Local2) - CH04("", 0, 0xff, 0, 0x095, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x096, 0, 0) + CH03("", 0, 0x096, __LINE__, 0) Store(DerefOf(pw0c), Local2) - CH04("", 0, 0xff, 0, 0x097, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Method(m12a) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/Method.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/Method.asl index 8e7226a..94dec77 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/Method.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/Method.asl @@ -47,16 +47,16 @@ Method(m13b) Method(m138) { - CH03("", 0, 0x098, 0, 0) + CH03("", 0, 0x098, __LINE__, 0) Store(DerefOf("m13b"), Local0) if (SLCK) { - CH03("", 0, 0x099, 0, 0) + CH03("", 0, 0x099, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x09a, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } } else { - CH04("", 0, 47, 0, 0x09b, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } } @@ -64,16 +64,16 @@ Method(m138) Method(m12c) { - CH03("", 0, 0x09c, 0, 0) + CH03("", 0, 0x09c, __LINE__, 0) Store(DerefOf("m12c"), Local0) if (SLCK) { - CH03("", 0, 0x09d, 0, 0) + CH03("", 0, 0x09d, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x09e, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } } else { - CH04("", 0, 47, 0, 0x09f, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } } @@ -86,16 +86,16 @@ Method(m139) return (0xabcd0003) } - CH03("", 0, 0x0a0, 0, 0) + CH03("", 0, 0x0a0, __LINE__, 0) Store(DerefOf("m13c"), Local0) if (SLCK) { - CH03("", 0, 0x0a1, 0, 0) + CH03("", 0, 0x0a1, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x0a2, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } } else { - CH04("", 0, 47, 0, 0x0a3, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } } @@ -109,16 +109,16 @@ Method(m13a) } Method(m138) { - CH03("", 0, 0x0a4, 0, 0) + CH03("", 0, 0x0a4, __LINE__, 0) Store(DerefOf("m13d"), Local0) if (SLCK) { - CH03("", 0, 0x0a5, 0, 0) + CH03("", 0, 0x0a5, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x0a6, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } } else { - CH04("", 0, 47, 0, 0x0a7, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } } m138() diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl index 8084d0b..58ded83 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl @@ -47,41 +47,41 @@ Method(mdad) Store(ObjectType(bf00), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x000, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf01), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x001, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf02), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x002, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf03), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x003, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf04), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x004, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf05), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x005, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf06), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x006, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf07), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x007, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl index 4717129..7f90a9f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl @@ -39,13 +39,13 @@ Method(mdae, 1) Method(mdaf) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) mdae(100) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) mdae(101) - CH04("", 0, 48, 0, 0x002, 0, 0) // AE_AML_OPERAND_VALUE + CH04("", 0, 48, 0, __LINE__, 0, 0) // AE_AML_OPERAND_VALUE mdae(255) - CH04("", 0, 48, 0, 0x003, 0, 0) // AE_AML_OPERAND_VALUE + CH04("", 0, 48, 0, __LINE__, 0, 0) // AE_AML_OPERAND_VALUE mdae(256) - CH04("", 0, 48, 0, 0x004, 0, 0) // AE_AML_OPERAND_VALUE + CH04("", 0, 48, 0, __LINE__, 0, 0) // AE_AML_OPERAND_VALUE } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl index 09a9e00..6c184ff 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl @@ -39,11 +39,11 @@ Method(mdb0,, Serialized) ToDecimalString(b000, Local0) if (LNotEqual(Local0, "1,1")) { - err("", zFFF, 0x000, 0, 0, Local0, "1,1") + err("", zFFF, __LINE__, 0, 0, Local0, "1,1") } Store(Sizeof(Local0), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x001, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0016/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0016/DECL.asl index c0edad6..e5e8dc5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0016/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0016/DECL.asl @@ -40,16 +40,16 @@ Method(mdb1) // 101 characters Store("01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890", Local1) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Concatenate(Local0, Local1, Local2) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) /* * The length of String is no more restricted. * - * CH04("", 0, 61, 0, 0x001, 0, 0) // AE_AML_STRING_LIMIT + * CH04("", 0, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl index 538c3e5..a3637ad 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl @@ -38,15 +38,15 @@ Method(mdb2) Store(Buffer(){ 0x20, 0x21, 0x22, 0, 0x26 }, Local1) if (LEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } if (LNotEqual(Local0, Buffer(){ 0x20, 0x21, 0x22, 0, 0x25 })) { - err("", zFFF, 0x001, 0, 0, Local0, Buffer(){ 0x20, 0x21, 0x22, 0, 0x25 }) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer(){ 0x20, 0x21, 0x22, 0, 0x25 }) } if (LNotEqual(Local1, Buffer(){ 0x20, 0x21, 0x22, 0, 0x26 })) { - err("", zFFF, 0x002, 0, 0, Local1, Buffer(){ 0x20, 0x21, 0x22, 0, 0x26 }) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer(){ 0x20, 0x21, 0x22, 0, 0x26 }) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl index 064ff4e..1cd703d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl @@ -42,7 +42,7 @@ Method(mdb3) if (LGreater(Local0, Local1)) { Store(1, Local7) } else { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } Return(Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl index fcd6837..c5e93d5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl @@ -38,7 +38,7 @@ Method(mdb4) Store(Buffer(){ 0x20, 0x21, 0x22, 0, 0x26 }, Local1) if (LGreaterEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl index 0084817..02d0a37 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl @@ -42,7 +42,7 @@ Method(mdb5) if (LLess(Local0, Local1)) { Store(1, Local7) } else { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } Return(Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl index 71f969e..5b3a32c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl @@ -38,7 +38,7 @@ Method(mdb6) Store(Buffer(){ 0x20, 0x21, 0x22, 0, 0x25 }, Local1) if (LLessEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl index 5f7cab4..d8f6374 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl @@ -42,7 +42,7 @@ Method(mdb7) if (LNotEqual(Local0, Local1)) { Store(1, Local7) } else { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } Return(Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl index 8d70d38..d9a9c09 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl @@ -39,10 +39,10 @@ Method(mdb8) Store(0x9999999999, Local0) Store(9999999999, Local1) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) FromBCD(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err("", zFFF, 0x001, 0, 0, Local2, Local1) + err("", zFFF, __LINE__, 0, 0, Local2, Local1) } // Bug, FromBCD(0x10000000000) @@ -50,10 +50,10 @@ Method(mdb8) Store(0x10000000000, Local0) Store(10000000000, Local1) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) FromBCD(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err("", zFFF, 0x004, 0, 0, Local2, Local1) + err("", zFFF, __LINE__, 0, 0, Local2, Local1) } // Ok, ToBCD(10000000000) @@ -61,12 +61,12 @@ Method(mdb8) Store(10000000000, Local0) Store(0x10000000000, Local1) - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) ToBCD(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err("", zFFF, 0x007, 0, 0, Local2, Local1) + err("", zFFF, __LINE__, 0, 0, Local2, Local1) } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl index b316040..75f41ef 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl @@ -49,41 +49,41 @@ Method(mdbd,, Serialized) { Name(b000, Buffer(16) {}) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) CreateBitField(b000, 128, f000) - CH04("", 0, 54, 0, 0x001, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 0, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) CreateByteField(b000, 16, f001) - CH04("", 0, 54, 0, 0x003, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 0, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) CreateWordField(b000, 15, f002) - CH04("", 0, 54, 0, 0x005, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 0, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) CreateDWordField(b000, 13, f003) - CH04("", 0, 54, 0, 0x007, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 0, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) CreateQWordField(b000, 9, f004) - CH04("", 0, 54, 0, 0x009, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 0, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) CreateField(b000, 127, 2, f005) - CH04("", 0, 54, 0, 0x00b, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 0, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03("", 0, 0x00c, 0, 0) + CH03("", 0, 0x00c, __LINE__, 0) CreateField(b000, 120, 9, f006) - CH04("", 0, 54, 0, 0x00d, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 0, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03("", 0, 0x00e, 0, 0) + CH03("", 0, 0x00e, __LINE__, 0) CreateField(b000, 128, 1, f007) - CH04("", 0, 54, 0, 0x00f, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 0, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03("", 0, 0x010, 0, 0) + CH03("", 0, 0x010, __LINE__, 0) CreateField(b000, 121, 8, f008) - CH04("", 0, 54, 0, 0x011, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 0, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT } Method(mdbe) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl index 5d33da7..9c1f24c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl @@ -42,7 +42,7 @@ Method(mdbf, 2, Serialized) Subtract(Local2, Local1, Local6) Multiply(arg1, 10000, Local4) if (LLess(Local6, Local4)) { - err("", zFFF, 0x000, 0, 0, Local6, Local4) + err("", zFFF, __LINE__, 0, 0, Local6, Local4) } } case (1) { @@ -52,7 +52,7 @@ Method(mdbf, 2, Serialized) Subtract(Local2, Local1, Local6) Multiply(arg1, 10, Local4) if (LLess(Local6, Local4)) { - err("", zFFF, 0x001, 0, 0, Local6, Local4) + err("", zFFF, __LINE__, 0, 0, Local6, Local4) } } case (2) { @@ -62,7 +62,7 @@ Method(mdbf, 2, Serialized) Subtract(Local2, Local1, Local6) Multiply(arg1, 10000, Local4) if (LLess(Local6, Local4)) { - err("", zFFF, 0x002, 0, 0, Local6, Local4) + err("", zFFF, __LINE__, 0, 0, Local6, Local4) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl index a213582..d4f8fcb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl @@ -52,10 +52,10 @@ Name(id28, 0) Method(mdc7,, Serialized) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(0x12345678, i000) Name(i000, 0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Method (m800,, Serialized) @@ -82,41 +82,41 @@ Method(m802,, Serialized) Name(i000, 0) Store(0xabcd0000, i000) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Name(i001, 0) Store(0xabcd0001, i001) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) Name(i002, 0xabcd0002) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) if (y084) { - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Method(m000,, Serialized) { Name(i000, 0xabcd0003) if (LNotEqual(i000, 0xabcd0003)) { - err("", zFFF, 0x006, 0, 0, i000, 0xabcd0003) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0003) } } - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) Method(m001,, Serialized) { Name(i000, 0xabcd0004) Store(0xabcd0005, i000) if (LNotEqual(i000, 0xabcd0005)) { - err("", zFFF, 0x006, 0, 0, i000, 0xabcd0005) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0005) } } - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) Method(m002,, Serialized) { @@ -124,11 +124,11 @@ Method(m802,, Serialized) Name(i000, 0xabcd0006) Store(0xabcd0007, i000) if (LNotEqual(i000, 0xabcd0007)) { - err("", zFFF, 0x006, 0, 0, i000, 0xabcd0007) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0007) } } - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) Method (m003,, Serialized) { @@ -136,52 +136,52 @@ Method(m802,, Serialized) Store(id28, Debug) Name(id28, 0xabcd0008) if (LNotEqual(id28, 0xabcd0008)) { - err("", zFFF, 0x006, 0, 0, id28, 0xabcd0008) + err("", zFFF, __LINE__, 0, 0, id28, 0xabcd0008) } } - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) } - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) if (LNotEqual(i000, 0xabcd0000)) { - err("", zFFF, 0x00a, 0, 0, i000, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0000) } if (LNotEqual(i001, 0xabcd0001)) { - err("", zFFF, 0x00b, 0, 0, i001, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, i001, 0xabcd0001) } if (LNotEqual(i002, 0xabcd0002)) { - err("", zFFF, 0x00c, 0, 0, i002, 0xabcd0002) + err("", zFFF, __LINE__, 0, 0, i002, 0xabcd0002) } if (y084) { - CH03("", 0, 0x00d, 0, 0) + CH03("", 0, 0x00d, __LINE__, 0) m000() - CH03("", 0, 0x00e, 0, 0) + CH03("", 0, 0x00e, __LINE__, 0) m001() - CH03("", 0, 0x00f, 0, 0) + CH03("", 0, 0x00f, __LINE__, 0) m002() - CH03("", 0, 0x010, 0, 0) + CH03("", 0, 0x010, __LINE__, 0) m003() - CH03("", 0, 0x011, 0, 0) + CH03("", 0, 0x011, __LINE__, 0) } else { SRMT("sub-tests-of-m802") BLCK() } - CH03("", 0, 0x012, 0, 0) + CH03("", 0, 0x012, __LINE__, 0) Store(0xabcd0009, ii99) Name(ii99, 0) - CH04("", 0, 0xff, 0, 0x013, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Method(m1dc) { /* Successful compilation itself of this test is error */ - err("", zFFF, 0x014, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Method(mdc6) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0037/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0037/DECL.asl index f2e5d2b..4b9eed2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0037/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0037/DECL.asl @@ -43,10 +43,10 @@ }) if (LNotEqual(M241, M242)) { - err("", zFFF, 0x000, 0, 0, M241, M242) + err("", zFFF, __LINE__, 0, 0, M241, M242) } if (LNotEqual(M240._RW, 0x18)) { - err("", zFFF, 0x000, 0, 0, M240._RW, 0x18) + err("", zFFF, __LINE__, 0, 0, M240._RW, 0x18) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl index a546ee1..1567236 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl @@ -44,7 +44,7 @@ Method(mdce,, Serialized) Store(n000, Debug) if (LNotEqual(n000, 0xfdeacb01)) { - err("", zFFF, 0x000, 0, 0, n000, 0xfdeacb01) + err("", zFFF, __LINE__, 0, 0, n000, 0xfdeacb01) } // Show that LGreater operator indicates correctly @@ -53,7 +53,7 @@ Method(mdce,, Serialized) if (LGreater(0x42345678, 0x32547698)) { Store(1, Local7) } else { - err("", zFFF, 0x001, 0, 0, 0x42345678, 0x32547698) + err("", zFFF, __LINE__, 0, 0, 0x42345678, 0x32547698) } // Show that (in 32-bit mode) "FdeAcb0132547698" passed to Name operator @@ -63,7 +63,7 @@ Method(mdce,, Serialized) if (LGreater(n000, 0x42345678)) { Store(1, Local7) } else { - err("", zFFF, 0x002, 0, 0, n000, 0x42345678) + err("", zFFF, __LINE__, 0, 0, n000, 0x42345678) } // Show that, nevertheless, (in 32-bit mode) "FdeAcb01Fdeacb03" passed @@ -73,7 +73,7 @@ Method(mdce,, Serialized) if (LGreater(0xfdeacb02, "FdeAcb01Fdeacb03")) { Store(1, Local7) } else { - err("", zFFF, 0x003, 0, 0, 0xfdeacb02, "FdeAcb01Fdeacb03") + err("", zFFF, __LINE__, 0, 0, 0xfdeacb02, "FdeAcb01Fdeacb03") } return (Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl index 9a19a54..4e5c230 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl @@ -41,7 +41,7 @@ Method(mdcf,, Serialized) Store(ObjectType(Debug), Local0) if (LNotEqual(Local0, c018)) { - err("", zFFF, 0x000, 0, 0, Local0, c018) + err("", zFFF, __LINE__, 0, 0, Local0, c018) } // Method @@ -49,6 +49,6 @@ Method(mdcf,, Serialized) Method(m0f2) { return (0x1234) } Store(ObjectType(m0f2), Local0) if (LNotEqual(Local0, c010)) { - err("", zFFF, 0x001, 0, 0, Local0, c010) + err("", zFFF, __LINE__, 0, 0, Local0, c010) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl index ffa98e1..8578f88 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl @@ -40,6 +40,6 @@ Method(mdd2) Store(Local0, Debug) Add(Local0, 1, Local7) if (LNotEqual(Local7, 1)){ - err("", zFFF, 0x000, 0, 0, Local7, 1) + err("", zFFF, __LINE__, 0, 0, Local7, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl index 871f1e7..190d209 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl @@ -40,6 +40,6 @@ Method(mdd3) Store(Local0, Debug) Add(Local0, 1, Local7) if (LNotEqual(Local7, 1)){ - err("", zFFF, 0x000, 0, 0, Local7, 1) + err("", zFFF, __LINE__, 0, 0, Local7, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl index 8ac0a07..3990c09 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl @@ -41,6 +41,6 @@ Method(mdd4) Add(Local0, 1, Local7) if (LNotEqual(Local7, 11)){ - err("", zFFF, 0x000, 0, 0, Local7, 11) + err("", zFFF, __LINE__, 0, 0, Local7, 11) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl index e43f446..0f08a59 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl @@ -40,6 +40,6 @@ Method(mdd5) Store(ToUUID("0a1b2c3d-4e5f-6071-8293-a4b5c6d7e8f9"), Local1) if (LNotEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl index 45851ea..15ab366 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl @@ -51,22 +51,22 @@ Method(mdd6,, Serialized) ToDecimalString(b001, Local0) if (LNotEqual(Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1")) { - err("", zFFF, 0x000, 0, 0, Local0, + err("", zFFF, __LINE__, 0, 0, Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1") } Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 99)) { - err("", zFFF, 0x001, 0, 0, Local1, 99) + err("", zFFF, __LINE__, 0, 0, Local1, 99) } ToDecimalString(b000, Local0) if (LNotEqual(Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1")) { - err("", zFFF, 0x002, 0, 0, Local0, + err("", zFFF, __LINE__, 0, 0, Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1") } Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 101)) { - err("", zFFF, 0x003, 0, 0, Local1, 101) + err("", zFFF, __LINE__, 0, 0, Local1, 101) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl index f43e8c2..c74b62b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl @@ -51,25 +51,25 @@ Method(mdd7,, Serialized) ToHexString(b001, Local0) if (LNotEqual(Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01")) { - err("", zFFF, 0x000, 0, 0, Local0, + err("", zFFF, __LINE__, 0, 0, Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01") } Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 197)) { - err("", zFFF, 0x001, 0, 0, Local1, 197) + err("", zFFF, __LINE__, 0, 0, Local1, 197) } ToHexString(b000, Local0) if (LNotEqual(Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01")) { - err("", zFFF, 0x002, 0, 0, Local0, + err("", zFFF, __LINE__, 0, 0, Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01") } Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 200)) { - err("", zFFF, 0x003, 0, 0, Local1, 200) + err("", zFFF, __LINE__, 0, 0, Local1, 200) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl index 3e9724f..f56092a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl @@ -83,7 +83,7 @@ Method(md77,, Serialized) if (LGreater(Local0, Local7)) { // if (Local5) { - err("", zFFF, 0x000, 0, 0, Local0, Local7) + err("", zFFF, __LINE__, 0, 0, Local0, Local7) Store(Concatenate("Cur timer : 0x", Local7), Debug) Store(Concatenate("Start timer : 0x", Local0), Debug) Store(Concatenate("Step of cycle : 0x", TSLP), Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl index a8052d7..b45ac7d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl @@ -43,17 +43,17 @@ Method(mdd8) // Concatenate 100-byte long string with 101-byte long // string and expect AE_AML_STRING_LIMIT exception. - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(Concatenate(Local0, Local1), Local2) /* * No restriction on the length of String objects now: * - * CH04("", 0, 61, 0, 0x001, 0, 0) // AE_AML_STRING_LIMIT + * CH04("", 0, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT */ - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0049/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0049/DECL.asl index 06e6200..2b35703 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0049/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0049/DECL.asl @@ -51,15 +51,15 @@ Method(mdd9,, Serialized) // to produce 201 byte long string and have to result // in AE_AML_STRING_LIMIT exception. - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) ToDecimalString(b000, Local0) /* * No restriction on the length of String objects now: * - * CH04("", 0, 61, 0, 0x001, 0, 0) // AE_AML_STRING_LIMIT + * CH04("", 0, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT */ - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl index 7675bf9..010993d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl @@ -48,9 +48,9 @@ Method(mdda,, Serialized) // to produce 203 byte long string and have to // result in AE_AML_STRING_LIMIT exception. - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) ToHexString(b000, Local0) - CH04("", 0, 61, 0, 0x001, 0, 0) // AE_AML_STRING_LIMIT + CH04("", 0, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl index 2d56b19..5e7b9fc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl @@ -38,10 +38,10 @@ Method(mddb, 5) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, 0x000, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } if (LNotEqual(arg2, arg3)) { - err("", zFFF, 0x001, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } @@ -73,6 +73,6 @@ Method(mddc,, Serialized) mddb(REG0._ADR, 7, REG1._ADR, 22, "_ADR") if (LNotEqual(RT00, BUF0)) { - err("", zFFF, 0x002, 0, 0, RT00, BUF0) + err("", zFFF, __LINE__, 0, 0, RT00, BUF0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl index c4ef09a..0cab99f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl @@ -42,16 +42,16 @@ Method(mddd,, Serialized) Store(DN00._HE, Local0) if (LNotEqual(Local0, 0x19)){ - err("", zFFF, 0x000, 0, 0, Local0, 0x19) + err("", zFFF, __LINE__, 0, 0, Local0, 0x19) } Store(DN00._LL, Local0) if (LNotEqual(Local0, 0x1a)){ - err("", zFFF, 0x000, 0, 0, Local0, 0x1a) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1a) } Store(DN00._SHR, Local0) if (LNotEqual(Local0, 0x1b)){ - err("", zFFF, 0x000, 0, 0, Local0, 0x1b) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1b) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl index 7a989cc..ae5ca20 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl @@ -44,7 +44,7 @@ Method(mddf,, Serialized) Store(ConcatenateResTemplate( b000, b001 ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x00})) { - err("", zFFF, 0x000, 0, 0, Local0, Buffer() {0x79, 0x00}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x00}) } } @@ -56,12 +56,12 @@ Method(mde0,, Serialized) Store(ConcatenateResTemplate( b000, Buffer() {0x79, 0x00} ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x00})) { - err("", zFFF, 0x001, 0, 0, Local0, Buffer() {0x79, 0x00}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x00}) } Store(ConcatenateResTemplate( Buffer() {0x79, 0x00}, b000 ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x00})) { - err("", zFFF, 0x002, 0, 0, Local0, Buffer() {0x79, 0x00}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x00}) } } @@ -69,7 +69,7 @@ Method(mde1) { Store(ConcatenateResTemplate( Buffer() {0x79, 0x00}, Buffer() {0x79, 0x00} ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x00})) { - err("", zFFF, 0x003, 0, 0, Local0, Buffer() {0x79, 0x00}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x00}) } } @@ -81,12 +81,12 @@ Method(mde2,, Serialized) Store(LEqual( b000, Buffer(1) {0x79} ), Local0) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x004, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } Store(LEqual( Buffer(1) {0x79}, b000 ), Local0) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x005, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } } @@ -94,7 +94,7 @@ Method(mde3) { Store(LEqual( Buffer(1) {0x79}, Buffer(1) {0x79} ), Local0) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x006, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } } @@ -106,12 +106,12 @@ Method(mde4,, Serialized) Store(LGreater( b000, Buffer(1) {0x79} ), Local0) if (LNotEqual(Local0, Zero)) { - err("", zFFF, 0x007, 0, 0, Local0, Zero) + err("", zFFF, __LINE__, 0, 0, Local0, Zero) } Store(LGreater( Buffer(1) {0x79}, b000 ), Local0) if (LNotEqual(Local0, Zero)) { - err("", zFFF, 0x008, 0, 0, Local0, Zero) + err("", zFFF, __LINE__, 0, 0, Local0, Zero) } } @@ -119,7 +119,7 @@ Method(mde5) { Store(LGreater( Buffer(1) {0x79}, Buffer(1) {0x79} ), Local0) if (LNotEqual(Local0, Zero)) { - err("", zFFF, 0x009, 0, 0, Local0, Zero) + err("", zFFF, __LINE__, 0, 0, Local0, Zero) } } @@ -133,12 +133,12 @@ Method(mde6,, Serialized) Store(Concatenate( b000, Buffer() {0x79} ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x79})) { - err("", zFFF, 0x00a, 0, 0, Local0, Buffer() {0x79, 0x79}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x79}) } Store(Concatenate( Buffer() {0x79}, b000 ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x79})) { - err("", zFFF, 0x00b, 0, 0, Local0, Buffer() {0x79, 0x79}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x79}) } } @@ -146,7 +146,7 @@ Method(mde7) { Store(Concatenate( Buffer() {0x79}, Buffer() {0x79} ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x79})) { - err("", zFFF, 0x00c, 0, 0, Local0, Buffer() {0x79, 0x79}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x79}) } } @@ -158,12 +158,12 @@ Method(mde8,, Serialized) Add( b000, Buffer() {0x79}, Local0) if (LNotEqual(Local0, 0xf2)) { - err("", zFFF, 0x00d, 0, 0, Local0, 0xf2) + err("", zFFF, __LINE__, 0, 0, Local0, 0xf2) } Add( Buffer() {0x79}, b000, Local0) if (LNotEqual(Local0, 0xf2)) { - err("", zFFF, 0x00e, 0, 0, Local0, 0xf2) + err("", zFFF, __LINE__, 0, 0, Local0, 0xf2) } } @@ -171,7 +171,7 @@ Method(mde9) { Add( Buffer() {0x79}, Buffer() {0x79}, Local0) if (LNotEqual(Local0, 0xf2)) { - err("", zFFF, 0x00f, 0, 0, Local0, 0xf2) + err("", zFFF, __LINE__, 0, 0, Local0, 0xf2) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl index cddc299..6fa89fe 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl @@ -57,7 +57,7 @@ Method(mdf2, 1) { // Store("ERROR 0: mdf2, after Return !!!", Debug) } - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) mdf0() mdf1() @@ -79,10 +79,10 @@ Method(mdf3, 1) { // ASL-compiler DOESN'T report Warning in this case!!! // And the Store operator below is actually processed!!! - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) mdf0() mdf1() diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl index 1511fdc..634c936 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl @@ -46,11 +46,11 @@ Method(mdf5, 1) Store(Concatenate(1, 2), Local0) if (F64) { if (LNotEqual(Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0})){ - err("", zFFF, 0x000, 0, 0, Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0}) } } else { if (LNotEqual(Local0, Buffer() {1,0,0,0,2,0,0,0})){ - err("", zFFF, 0x001, 0, 0, Local0, Buffer() {1,0,0,0,2,0,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {1,0,0,0,2,0,0,0}) } } } else { @@ -67,11 +67,11 @@ Method(mdf6, 1) Store(Concatenate(0x1234, 0x7890), Local0) if (F64) { if (LNotEqual(Local0, Buffer() {0x34,0x12,0,0,0,0,0,0,0x90,0x78,0,0,0,0,0,0})){ - err("", zFFF, 0x002, 0, 0, Local0, Buffer() {0x34,0x12,0,0,0,0,0,0,0x90,0x78,0,0,0,0,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x34,0x12,0,0,0,0,0,0,0x90,0x78,0,0,0,0,0,0}) } } else { if (LNotEqual(Local0, Buffer() {0x34,0x12,0,0,0x90,0x78,0,0})){ - err("", zFFF, 0x003, 0, 0, Local0, Buffer() {0x34,0x12,0,0,0x90,0x78,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x34,0x12,0,0,0x90,0x78,0,0}) } } } else { @@ -85,11 +85,11 @@ Method(mdf7) Store(Concatenate(1, 2), Local0) if (F64) { if (LNotEqual(Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0})){ - err("", zFFF, 0x004, 0, 0, Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0}) } } else { if (LNotEqual(Local0, Buffer() {1,0,0,0,2,0,0,0})){ - err("", zFFF, 0x005, 0, 0, Local0, Buffer() {1,0,0,0,2,0,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {1,0,0,0,2,0,0,0}) } } Store(Local0, Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl index 056024f..8beb756 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl @@ -67,11 +67,11 @@ Method(mdf9,, Serialized) Store(SizeOf(b000), Local1) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x000, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } elseif (LNotEqual(Local1, 202)) { - err("", zFFF, 0x001, 0, 0, Local0, 202) + err("", zFFF, __LINE__, 0, 0, Local0, 202) } elseif (LNotEqual(b000, b001)) { - err("", zFFF, 0x002, 0, 0, b000, b001) + err("", zFFF, __LINE__, 0, 0, b000, b001) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl index 9d279e4..e7d8478 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl @@ -38,9 +38,9 @@ Method(m206, 2) { if (SLCK) { - CH03("", 0, arg0, 0, 0) + CH03("", 0, arg0, __LINE__, 0) } else { - CH04("", 0, 47, 0, arg1, 0, 0) + CH04("", 0, 47, 0, __LINE__, 0, 0) } } @@ -53,7 +53,7 @@ Method(me02) /* // Removed 09/2015 - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(rd01, Local7) m206(0x001, 0x002) */ @@ -75,7 +75,7 @@ Method(me04) /* // Removed 09/2015 - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) Store(rd02, Local7) m206(0x004, 0x005) */ @@ -116,6 +116,6 @@ Method(me07) me03() me06() if (LNotEqual(id09, 1)) { - err("", zFFF, 0x002, 0, 0, id09, 1) + err("", zFFF, __LINE__, 0, 0, id09, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl index c05ae57..1e3bca1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl @@ -141,6 +141,6 @@ Method(mb62,, Serialized) // Check the original long String Literal if (LNotEqual(Local0, s000)) { - err("", zFFF, 0x000, 0, 0, s000, Local0) + err("", zFFF, __LINE__, 0, 0, s000, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl index 23b772c..6e89c1b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl @@ -34,44 +34,44 @@ Method(mf92) { // Hex: 0x - dec - CH03("", 0, 0x100, 0, 0) + CH03("", 0, 0x100, __LINE__, 0) ToInteger("0x0", Local0) if (LNotEqual(Local0, 0x0)) { - err("", zFFF, 0x101, 0, 0, Local0, 0x0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x0) } ToInteger("0x0000000", Local0) if (LNotEqual(Local0, 0x0)) { - err("", zFFF, 0x102, 0, 0, Local0, 0x0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x0) } ToInteger("0x1", Local0) if (LNotEqual(Local0, 0x1)) { - err("", zFFF, 0x103, 0, 0, Local0, 0x1) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1) } ToInteger("0x12345678", Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x104, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } ToInteger("0x12345", Local0) if (LNotEqual(Local0, 0x12345)) { - err("", zFFF, 0x105, 0, 0, Local0, 0x12345) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345) } if (F64) { Store("0x1234567890123456", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x106, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } Store("0x123456789012345", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x123456789012345)) { - err("", zFFF, 0x107, 0, 0, Local0, 0x123456789012345) + err("", zFFF, __LINE__, 0, 0, Local0, 0x123456789012345) } } @@ -79,25 +79,25 @@ Method(mf92) { ToInteger("0xabcdefef", Local0) if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x108, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } ToInteger("0xabcdef", Local0) if (LNotEqual(Local0, 0xabcdef)) { - err("", zFFF, 0x109, 0, 0, Local0, 0xabcdef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef) } if (F64) { Store("0xabcdefefadefbcdf", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0xabcdefefadefbcdf)) { - err("", zFFF, 0x10a, 0, 0, Local0, 0xabcdefefadefbcdf) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcdf) } Store("0xabcdefefadefbcd", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0xabcdefefadefbcd)) { - err("", zFFF, 0x10b, 0, 0, Local0, 0xabcdefefadefbcd) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcd) } } @@ -105,24 +105,24 @@ Method(mf92) { ToInteger("0x1ab2cd34", Local0) if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x10c, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } if (F64) { Store("0x1ab2cd340fe05678", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1ab2cd340fe05678)) { - err("", zFFF, 0x10d, 0, 0, Local0, 0x1ab2cd340fe05678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05678) } Store("0x1ab2cd340fe0", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1ab2cd340fe0)) { - err("", zFFF, 0x10e, 0, 0, Local0, 0x1ab2cd340fe0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe0) } } - CH03("", 0, 0x219, 0, 0) + CH03("", 0, 0x219, __LINE__, 0) } /* @@ -130,57 +130,57 @@ Method(mf92) { */ Method(mf93) { - CH03("", 0, 0x10f, 0, 0) + CH03("", 0, 0x10f, __LINE__, 0) ToInteger("0", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x110, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger("0000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x111, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger("000000000000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x112, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger("000000000000000000000000000000000000000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x113, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger("1", Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x114, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } ToInteger("1234567890", Local0) if (LNotEqual(Local0, 1234567890)) { - err("", zFFF, 0x115, 0, 0, Local0, 1234567890) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567890) } ToInteger("1234567", Local0) if (LNotEqual(Local0, 1234567)) { - err("", zFFF, 0x116, 0, 0, Local0, 1234567) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567) } ToInteger("4294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x117, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } if (F64) { Store("18446744073709551615", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 18446744073709551615)) { - err("", zFFF, 0x118, 0, 0, Local0, 18446744073709551615) + err("", zFFF, __LINE__, 0, 0, Local0, 18446744073709551615) } } - CH03("", 0, 0x119, 0, 0) + CH03("", 0, 0x119, __LINE__, 0) } /* @@ -189,154 +189,154 @@ Method(mf93) { */ Method(mf94) { - CH03("", 0, 0x11a, 0, 0) + CH03("", 0, 0x11a, __LINE__, 0) ToInteger(" 0x0", Local0) if (LNotEqual(Local0, 0x0)) { - err("", zFFF, 0x11b, 0, 0, Local0, 0x0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x0) } ToInteger(" 0x00000", Local0) if (LNotEqual(Local0, 0x0)) { - err("", zFFF, 0x11c, 0, 0, Local0, 0x0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x0) } ToInteger(" 0x1", Local0) if (LNotEqual(Local0, 0x1)) { - err("", zFFF, 0x11d, 0, 0, Local0, 0x1) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1) } ToInteger(" 0x12345678", Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x11e, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } ToInteger(" 0x12345", Local0) if (LNotEqual(Local0, 0x12345)) { - err("", zFFF, 0x11f, 0, 0, Local0, 0x12345) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345) } if (F64) { Store(" 0x1234567890123456", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x120, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } Store(" 0x123456789012345", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x123456789012345)) { - err("", zFFF, 0x121, 0, 0, Local0, 0x123456789012345) + err("", zFFF, __LINE__, 0, 0, Local0, 0x123456789012345) } } ToInteger(" 0xabcdefef", Local0) if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x122, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } ToInteger(" 0xabcdef", Local0) if (LNotEqual(Local0, 0xabcdef)) { - err("", zFFF, 0x123, 0, 0, Local0, 0xabcdef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef) } ToInteger(" 0xabcdef", Local0) if (LNotEqual(Local0, 0xabcdef)) { - err("", zFFF, 0x124, 0, 0, Local0, 0xabcdef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef) } if (F64) { Store(" 0xabcdefefadefbcdf", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0xabcdefefadefbcdf)) { - err("", zFFF, 0x125, 0, 0, Local0, 0xabcdefefadefbcdf) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcdf) } Store(" 0xabcdefefadefbcd", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0xabcdefefadefbcd)) { - err("", zFFF, 0x126, 0, 0, Local0, 0xabcdefefadefbcd) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcd) } } ToInteger(" 0x1ab2cd34", Local0) if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x127, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } if (F64) { Store(" 0x1ab2cd340fe05678", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1ab2cd340fe05678)) { - err("", zFFF, 0x128, 0, 0, Local0, 0x1ab2cd340fe05678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05678) } Store(" 0x1ab2cd340fe0", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1ab2cd340fe0)) { - err("", zFFF, 0x129, 0, 0, Local0, 0x1ab2cd340fe0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe0) } } ToInteger(" 0", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x12a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger(" 0000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x12b, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger(" 000000000000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x12c, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger(" 000000000000000000000000000000000000000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x12d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger(" 1", Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x12e, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } ToInteger(" 1234567890", Local0) if (LNotEqual(Local0, 1234567890)) { - err("", zFFF, 0x12f, 0, 0, Local0, 1234567890) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567890) } ToInteger(" 1234567890", Local0) if (LNotEqual(Local0, 1234567890)) { - err("", zFFF, 0x130, 0, 0, Local0, 1234567890) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567890) } ToInteger(" 1234567890", Local0) if (LNotEqual(Local0, 1234567890)) { - err("", zFFF, 0x131, 0, 0, Local0, 1234567890) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567890) } ToInteger(" 1234567", Local0) if (LNotEqual(Local0, 1234567)) { - err("", zFFF, 0x132, 0, 0, Local0, 1234567) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567) } ToInteger(" 4294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x133, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } if (F64) { Store(" 18446744073709551615", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 18446744073709551615)) { - err("", zFFF, 0x134, 0, 0, Local0, 18446744073709551615) + err("", zFFF, __LINE__, 0, 0, Local0, 18446744073709551615) } } - CH03("", 0, 0x135, 0, 0) + CH03("", 0, 0x135, __LINE__, 0) } /* @@ -344,94 +344,94 @@ Method(mf94) { */ Method(mf95) { - CH03("", 0, 0x136, 0, 0) + CH03("", 0, 0x136, __LINE__, 0) ToInteger(" 0", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x137, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger(" 2", Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x138, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } ToInteger(" 0xa", Local0) if (LNotEqual(Local0, 0xa)) { - err("", zFFF, 0x139, 0, 0, Local0, 0xa) + err("", zFFF, __LINE__, 0, 0, Local0, 0xa) } ToInteger(" 04294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13a, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger("04294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13b, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger("000000000000000000004294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13c, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger(" 000000000000000000004294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13d, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger(" 000000000000000000004294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13e, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger(" 000000000000000000004294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13f, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger(" 04294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x140, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger(" 0123456789", Local0) if (LNotEqual(Local0, 123456789)) { - err("", zFFF, 0x141, 0, 0, Local0, 123456789) + err("", zFFF, __LINE__, 0, 0, Local0, 123456789) } ToInteger("0123456789", Local0) if (LNotEqual(Local0, 123456789)) { - err("", zFFF, 0x142, 0, 0, Local0, 123456789) + err("", zFFF, __LINE__, 0, 0, Local0, 123456789) } ToInteger("00123456789", Local0) if (LNotEqual(Local0, 123456789)) { - err("", zFFF, 0x143, 0, 0, Local0, 123456789) + err("", zFFF, __LINE__, 0, 0, Local0, 123456789) } if (F64) { Store(" 018446744073709551615", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 18446744073709551615)) { - err("", zFFF, 0x144, 0, 0, Local0, 18446744073709551615) + err("", zFFF, __LINE__, 0, 0, Local0, 18446744073709551615) } Store("018446744073709551615", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 18446744073709551615)) { - err("", zFFF, 0x145, 0, 0, Local0, 18446744073709551615) + err("", zFFF, __LINE__, 0, 0, Local0, 18446744073709551615) } Store("000000000000000000000000000000000000000018446744073709551615", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 18446744073709551615)) { - err("", zFFF, 0x146, 0, 0, Local0, 18446744073709551615) + err("", zFFF, __LINE__, 0, 0, Local0, 18446744073709551615) } } - CH03("", 0, 0x219, 0, 0) + CH03("", 0, 0x219, __LINE__, 0) } /* @@ -440,182 +440,182 @@ Method(mf95) { Method(mf96) { // 5. "1234cd" (non-decimal character in dec-image) - CH03("", 0, 0x147, 0, 0) + CH03("", 0, 0x147, __LINE__, 0) Store("1234cd", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x148, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // 6. "000x1234" (non-decimal character in dec-image) - CH03("", 0, 0x149, 0, 0) + CH03("", 0, 0x149, __LINE__, 0) Store("000x1234", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x14a, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // 7. "0x1234cdQ" (non-hex character in '0x'-image) - CH03("", 0, 0x14b, 0, 0) + CH03("", 0, 0x14b, __LINE__, 0) Store("0x1234cdQ", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x14c, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x14d, 0, 0) + CH03("", 0, 0x14d, __LINE__, 0) Store("0x0x12345", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x14e, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // 8. "1234 " (white space in dec image) - CH03("", 0, 0x14f, 0, 0) + CH03("", 0, 0x14f, __LINE__, 0) Store("1234 ", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x150, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // 9. "0x1234cd " (white space in '0x'-image) - CH03("", 0, 0x151, 0, 0) + CH03("", 0, 0x151, __LINE__, 0) Store("0x1234cd ", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x152, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // 10. "0x 1234cdQ" (white space after '0x') - CH03("", 0, 0x153, 0, 0) + CH03("", 0, 0x153, __LINE__, 0) Store("0x 1234", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x154, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x155, 0, 0) + CH03("", 0, 0x155, __LINE__, 0) Store("0x0x 1234", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x156, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x157, 0, 0) + CH03("", 0, 0x157, __LINE__, 0) Store("0x0x 0x 1234", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x158, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x159, 0, 0) + CH03("", 0, 0x159, __LINE__, 0) Store("0x 0x 1234", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x15a, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // 11. (decimal image exceeding maximal) // 32-bit mode � the value exceeding "4294967295" if (LNot(F64)) { - CH03("", 0, 0x15b, 0, 0) + CH03("", 0, 0x15b, __LINE__, 0) Store("4294967296", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x15c, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x15d, 0, 0) + CH03("", 0, 0x15d, __LINE__, 0) Store("123456789012345678904294967296", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x15e, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x15f, 0, 0) + CH03("", 0, 0x15f, __LINE__, 0) Store(" 00004294967296", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x160, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x161, 0, 0) + CH03("", 0, 0x161, __LINE__, 0) Store(" 0123456789012345678904294967296", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x162, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x163, 0, 0) + CH03("", 0, 0x163, __LINE__, 0) Store("0123456789012345678904294967296", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x164, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x165, 0, 0) + CH03("", 0, 0x165, __LINE__, 0) Store(" 123456789012345678904294967296", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x166, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x167, 0, 0) + CH03("", 0, 0x167, __LINE__, 0) Store(" 123456789012345678904294967296", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x168, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } // 64-bit mode � the value exceeding "18446744073709551615" - CH03("", 0, 0x169, 0, 0) + CH03("", 0, 0x169, __LINE__, 0) Store("18446744073709551616", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x16a, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x16b, 0, 0) + CH03("", 0, 0x16b, __LINE__, 0) Store(" 18446744073709551616", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x16c, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x16d, 0, 0) + CH03("", 0, 0x16d, __LINE__, 0) Store(" 18446744073709551616", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x16e, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x16f, 0, 0) + CH03("", 0, 0x16f, __LINE__, 0) Store("018446744073709551616", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x170, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x171, 0, 0) + CH03("", 0, 0x171, __LINE__, 0) Store(" 000000000018446744073709551616", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x172, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // 12. "0x12345678901234567" (hex image exceeding maximal) - CH03("", 0, 0x173, 0, 0) + CH03("", 0, 0x173, __LINE__, 0) Store("0x12345678901234567", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x174, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) - CH03("", 0, 0x175, 0, 0) + CH03("", 0, 0x175, __LINE__, 0) Store("0x00000000000001234", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x176, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x178, 0, 0) + CH03("", 0, 0x178, __LINE__, 0) Store("0x0000000000000000000001234", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x179, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) if (LNot(F64)) { - CH03("", 0, 0x17a, 0, 0) + CH03("", 0, 0x17a, __LINE__, 0) Store("0x123456789", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x17b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } // 15. "0x" (incomplete '0x' image) - CH03("", 0, 0x17c, 0, 0) + CH03("", 0, 0x17c, __LINE__, 0) Store("0x", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x17d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x17e, 0, 0) + CH03("", 0, 0x17e, __LINE__, 0) Store("0x ", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x17f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x180, 0, 0) + CH03("", 0, 0x180, __LINE__, 0) Store("0x ", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x181, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x182, 0, 0) + CH03("", 0, 0x182, __LINE__, 0) Store("0x 1234", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x183, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x184, 0, 0) + CH03("", 0, 0x184, __LINE__, 0) Store("0x 1234", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x185, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // 16. Empty string - CH03("", 0, 0x186, 0, 0) + CH03("", 0, 0x186, __LINE__, 0) Store("", Local1) ToInteger(Local1, Local0) - CH04("", 0, 0xff, 0, 0x187, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl index dab4ef6..e051f25 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl @@ -34,61 +34,61 @@ Method(mf97) { // Hex: 0x - dec - CH03("", 0, 0x200, 0, 0) + CH03("", 0, 0x200, __LINE__, 0) Add("", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x201, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add("0x0", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x201, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add("0x1", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x202, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add("0x12345678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x203, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add("0x1234567890123456", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x204, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - hex Add("0xabcdefef", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x205, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add("0xabcdefefadefbcdf", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x206, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - dec/hex Add("0x1ab2cd340fe05678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x207, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x208, 0, 0) + CH03("", 0, 0x208, __LINE__, 0) Add("0x1ab2cd340fe0567823456789123456789987", 0, Local0) - CH03("", 0, 0x209, 0, 0) + CH03("", 0, 0x209, __LINE__, 0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x20a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x20b, 0, 0) + CH03("", 0, 0x20b, __LINE__, 0) } /* @@ -96,42 +96,42 @@ Method(mf97) { */ Method(mf98) { - CH03("", 0, 0x200, 0, 0) + CH03("", 0, 0x200, __LINE__, 0) Add("0", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x20d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x201, 0, 0) + CH03("", 0, 0x201, __LINE__, 0) Add("0000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x20e, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x202, 0, 0) + CH03("", 0, 0x202, __LINE__, 0) Add("000000000000000000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x20f, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x203, 0, 0) + CH03("", 0, 0x203, __LINE__, 0) Add("1", 0, Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x210, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } - CH03("", 0, 0x204, 0, 0) + CH03("", 0, 0x204, __LINE__, 0) Add("12345678", 0, Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x211, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } - CH03("", 0, 0x205, 0, 0) + CH03("", 0, 0x205, __LINE__, 0) } /* @@ -139,18 +139,18 @@ Method(mf98) { */ Method(mf99) { - CH03("", 0, 0x213, 0, 0) + CH03("", 0, 0x213, __LINE__, 0) // Hex: 0x - dec Add("1234567890123456", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x214, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x215, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -158,22 +158,22 @@ Method(mf99) { Add("abcdefef", 0, Local0) if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x216, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } Add("abcdefe", 0, Local0) if (LNotEqual(Local0, 0xabcdefe)) { - err("", zFFF, 0x217, 0, 0, Local0, 0xabcdefe) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefe) } Add("abcdefefadefbcdf", 0, Local0) if (F64) { if (LNotEqual(Local0, 0xabcdefefadefbcdf)) { - err("", zFFF, 0x218, 0, 0, Local0, 0xabcdefefadefbcdf) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcdf) } } else { if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x219, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } } @@ -182,31 +182,31 @@ Method(mf99) { Add("1ab2cd340fe05678", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05678)) { - err("", zFFF, 0x21a, 0, 0, Local0, 0x1ab2cd340fe05678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05678) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x21b, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add("1ab2cd340fe05", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05)) { - err("", zFFF, 0x21c, 0, 0, Local0, 0x1ab2cd340fe05) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x21d, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add("1a", 0, Local0) if (LNotEqual(Local0, 0x1a)) { - err("", zFFF, 0x21e, 0, 0, Local0, 0x1a) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1a) } - CH03("", 0, 0x219, 0, 0) + CH03("", 0, 0x219, __LINE__, 0) } /* @@ -215,261 +215,261 @@ Method(mf99) { Method(mf9a) { // 5. "1234cd" (non-decimal character in dec-image) - CH03("", 0, 0x220, 0, 0) + CH03("", 0, 0x220, __LINE__, 0) Add("1234cd", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x221, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 6. "000x1234" (non-decimal character in dec-image) - CH03("", 0, 0x223, 0, 0) + CH03("", 0, 0x223, __LINE__, 0) Add("000x1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x224, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 7. "0x1234cdQ" (non-hex character in '0x'-image) - CH03("", 0, 0x225, 0, 0) + CH03("", 0, 0x225, __LINE__, 0) Add("0x1234cdQ", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x226, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x227, 0, 0) + CH03("", 0, 0x227, __LINE__, 0) Add("1234cdQ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x228, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } - CH03("", 0, 0x229, 0, 0) + CH03("", 0, 0x229, __LINE__, 0) Add("0x0x12345", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x22a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 8. "1234 " (white space in dec image) - CH03("", 0, 0x22b, 0, 0) + CH03("", 0, 0x22b, __LINE__, 0) Add("1234 ", 0, Local0) if (LNotEqual(Local0, 0x1234)) { - err("", zFFF, 0x22c, 0, 0, Local0, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234) } // 9. "0x1234cd " (white space in '0x'-image) - CH03("", 0, 0x22d, 0, 0) + CH03("", 0, 0x22d, __LINE__, 0) Add("1234cd ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x22e, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 10. "0x 1234cdQ" (white space after '0x') - CH03("", 0, 0x22f, 0, 0) + CH03("", 0, 0x22f, __LINE__, 0) Add("0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x230, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x231, 0, 0) + CH03("", 0, 0x231, __LINE__, 0) Add("0x0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x232, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x233, 0, 0) + CH03("", 0, 0x233, __LINE__, 0) Add("0x0x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x234, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x235, 0, 0) + CH03("", 0, 0x235, __LINE__, 0) Add("0x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x236, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 11. (decimal image exceeding maximal) // 32-bit mode � the value exceeding "4294967295" if (1) { - CH03("", 0, 0x237, 0, 0) + CH03("", 0, 0x237, __LINE__, 0) Add("4294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x238, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x239, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } - CH03("", 0, 0x23a, 0, 0) + CH03("", 0, 0x23a, __LINE__, 0) Add("123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x23b, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x23c, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x23d, 0, 0) + CH03("", 0, 0x23d, __LINE__, 0) Add(" 00004294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x23e, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x23f, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } - CH03("", 0, 0x240, 0, 0) + CH03("", 0, 0x240, __LINE__, 0) Add(" 0123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x241, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x242, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x243, 0, 0) + CH03("", 0, 0x243, __LINE__, 0) Add("0123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x244, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x245, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x246, 0, 0) + CH03("", 0, 0x246, __LINE__, 0) Add(" 123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x247, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x248, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x249, 0, 0) + CH03("", 0, 0x249, __LINE__, 0) Add(" 123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x24a, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x24b, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } } // 64-bit mode � the value exceeding "18446744073709551615" - CH03("", 0, 0x24c, 0, 0) + CH03("", 0, 0x24c, __LINE__, 0) Add("18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x24d, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x24e, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x24f, 0, 0) + CH03("", 0, 0x24f, __LINE__, 0) Add(" 18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x250, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x251, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x252, 0, 0) + CH03("", 0, 0x252, __LINE__, 0) Add(" 18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x253, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x254, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x255, 0, 0) + CH03("", 0, 0x255, __LINE__, 0) Add("018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x256, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x257, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x258, 0, 0) + CH03("", 0, 0x258, __LINE__, 0) Add(" 000000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x259, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x25a, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } // 12. "0x12345678901234567" (hex image exceeding maximal) - CH03("", 0, 0x25b, 0, 0) + CH03("", 0, 0x25b, __LINE__, 0) Add("0x12345678901234567", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x25c, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) - CH03("", 0, 0x25e, 0, 0) + CH03("", 0, 0x25e, __LINE__, 0) Add("0x00000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x25f, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x260, 0, 0) + CH03("", 0, 0x260, __LINE__, 0) Add("0x0000000000000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x261, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) if (1) { - CH03("", 0, 0x262, 0, 0) + CH03("", 0, 0x262, __LINE__, 0) Add("0x123456789", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x263, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } // 15. "0x" (incomplete '0x' image) - CH03("", 0, 0x264, 0, 0) + CH03("", 0, 0x264, __LINE__, 0) Add("0x", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x265, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x266, 0, 0) + CH03("", 0, 0x266, __LINE__, 0) } /* @@ -481,56 +481,56 @@ Method(mf9b) { // Hex: 0x - dec - CH03("", 0, 0x267, 0, 0) + CH03("", 0, 0x267, __LINE__, 0) Add(" 0x0", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x268, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0x1", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x269, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0x12345678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x26a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0x1234567890123456", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x26b, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - hex Add(" 0xabcdefef", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x26c, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0xabcdefefadefbcdf", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x26d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - dec/hex Add(" 0x1ab2cd340fe05678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x26e, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x26f, 0, 0) + CH03("", 0, 0x26f, __LINE__, 0) Add(" 0x1ab2cd340fe0567823456789123456789987", 0, Local0) - CH03("", 0, 0x270, 0, 0) + CH03("", 0, 0x270, __LINE__, 0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x271, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x272, 0, 0) + CH03("", 0, 0x272, __LINE__, 0) /* * Implicit String to Integer () @@ -538,49 +538,49 @@ Method(mf9b) { * Method(mf98) */ - CH03("", 0, 0x273, 0, 0) + CH03("", 0, 0x273, __LINE__, 0) Add(" 0", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x274, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x275, 0, 0) + CH03("", 0, 0x275, __LINE__, 0) Add(" 0000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x276, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x277, 0, 0) + CH03("", 0, 0x277, __LINE__, 0) Add(" 000000000000000000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x278, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x279, 0, 0) + CH03("", 0, 0x279, __LINE__, 0) Add(" 000000000000000000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x27a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x27b, 0, 0) + CH03("", 0, 0x27b, __LINE__, 0) Add(" 1", 0, Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x27c, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } - CH03("", 0, 0x27d, 0, 0) + CH03("", 0, 0x27d, __LINE__, 0) Add(" 12345678", 0, Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x27e, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } - CH03("", 0, 0x27f, 0, 0) + CH03("", 0, 0x27f, __LINE__, 0) /* * Implicit String to Integer () @@ -588,18 +588,18 @@ Method(mf9b) { * Method(mf99) */ - CH03("", 0, 0x280, 0, 0) + CH03("", 0, 0x280, __LINE__, 0) // Hex: 0x - dec Add(" 1234567890123456", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x281, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x282, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -607,22 +607,22 @@ Method(mf9b) { Add(" abcdefef", 0, Local0) if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x283, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } Add(" abcdefe", 0, Local0) if (LNotEqual(Local0, 0xabcdefe)) { - err("", zFFF, 0x284, 0, 0, Local0, 0xabcdefe) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefe) } Add(" abcdefefadefbcdf", 0, Local0) if (F64) { if (LNotEqual(Local0, 0xabcdefefadefbcdf)) { - err("", zFFF, 0x285, 0, 0, Local0, 0xabcdefefadefbcdf) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcdf) } } else { if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x286, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } } @@ -631,31 +631,31 @@ Method(mf9b) { Add(" 1ab2cd340fe05678", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05678)) { - err("", zFFF, 0x287, 0, 0, Local0, 0x1ab2cd340fe05678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05678) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x288, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add(" 1ab2cd340fe05", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05)) { - err("", zFFF, 0x289, 0, 0, Local0, 0x1ab2cd340fe05) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x28a, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add(" 1a", 0, Local0) if (LNotEqual(Local0, 0x1a)) { - err("", zFFF, 0x28b, 0, 0, Local0, 0x1a) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1a) } - CH03("", 0, 0x28d, 0, 0) + CH03("", 0, 0x28d, __LINE__, 0) /* * No exceptions in special cases which force exceptions on ToInteger @@ -664,267 +664,267 @@ Method(mf9b) { */ // 5. "1234cd" (non-decimal character in dec-image) - CH03("", 0, 0x28e, 0, 0) + CH03("", 0, 0x28e, __LINE__, 0) Add(" 1234cd", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x28f, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 6. "000x1234" (non-decimal character in dec-image) - CH03("", 0, 0x290, 0, 0) + CH03("", 0, 0x290, __LINE__, 0) Add(" 000x1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x291, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 7. "0x1234cdQ" (non-hex character in '0x'-image) - CH03("", 0, 0x292, 0, 0) + CH03("", 0, 0x292, __LINE__, 0) Add(" 0x1234cdQ", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x293, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x294, 0, 0) + CH03("", 0, 0x294, __LINE__, 0) Add(" 1234cdQ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x295, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } - CH03("", 0, 0x296, 0, 0) + CH03("", 0, 0x296, __LINE__, 0) Add(" 0x0x12345", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x297, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 8. "1234 " (white space in dec image) - CH03("", 0, 0x298, 0, 0) + CH03("", 0, 0x298, __LINE__, 0) Add(" 1234 ", 0, Local0) if (LNotEqual(Local0, 0x1234)) { - err("", zFFF, 0x299, 0, 0, Local0, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234) } // 9. "0x1234cd " (white space in '0x'-image) - CH03("", 0, 0x29a, 0, 0) + CH03("", 0, 0x29a, __LINE__, 0) Add(" 1234cd ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x29b, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 10. "0x 1234cdQ" (white space after '0x') - CH03("", 0, 0x29c, 0, 0) + CH03("", 0, 0x29c, __LINE__, 0) Add(" 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x29d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x29e, 0, 0) + CH03("", 0, 0x29e, __LINE__, 0) Add(" 0x0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x29f, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x2a0, 0, 0) + CH03("", 0, 0x2a0, __LINE__, 0) Add(" 0x0x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2a1, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x2a2, 0, 0) + CH03("", 0, 0x2a2, __LINE__, 0) Add(" 0x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2a3, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 11. (decimal image exceeding maximal) // 32-bit mode � the value exceeding "4294967295" if (1) { - CH03("", 0, 0x2a4, 0, 0) + CH03("", 0, 0x2a4, __LINE__, 0) Add(" 4294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x2a5, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x2a6, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } - CH03("", 0, 0x2a7, 0, 0) + CH03("", 0, 0x2a7, __LINE__, 0) Add(" 123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x2a8, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x2a9, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x2aa, 0, 0) + CH03("", 0, 0x2aa, __LINE__, 0) Add(" 00004294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x2ab, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x2ac, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } - CH03("", 0, 0x2ad, 0, 0) + CH03("", 0, 0x2ad, __LINE__, 0) Add(" 0123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x2ae, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x2af, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x2b0, 0, 0) + CH03("", 0, 0x2b0, __LINE__, 0) Add(" 0123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x2b1, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x2b2, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x2b3, 0, 0) + CH03("", 0, 0x2b3, __LINE__, 0) Add(" 123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x2b4, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x2b5, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x2b6, 0, 0) + CH03("", 0, 0x2b6, __LINE__, 0) Add(" 123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x2b7, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x2b8, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } } // 64-bit mode � the value exceeding "18446744073709551615" - CH03("", 0, 0x2b8, 0, 0) + CH03("", 0, 0x2b8, __LINE__, 0) Add(" 18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x2b9, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x2ba, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x2bb, 0, 0) + CH03("", 0, 0x2bb, __LINE__, 0) Add(" 18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x2bc, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x2bd, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x2be, 0, 0) + CH03("", 0, 0x2be, __LINE__, 0) Add(" 18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x2bf, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x2c0, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x2c1, 0, 0) + CH03("", 0, 0x2c1, __LINE__, 0) Add(" 018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x2c2, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x2c3, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x2c4, 0, 0) + CH03("", 0, 0x2c4, __LINE__, 0) Add(" 000000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x2c5, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x2c6, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } // 12. "0x12345678901234567" (hex image exceeding maximal) - CH03("", 0, 0x2c7, 0, 0) + CH03("", 0, 0x2c7, __LINE__, 0) Add(" 0x12345678901234567", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2c8, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) - CH03("", 0, 0x2ca, 0, 0) + CH03("", 0, 0x2ca, __LINE__, 0) Add(" 0x00000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2cb, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x2cc, 0, 0) + CH03("", 0, 0x2cc, __LINE__, 0) Add(" 0x0000000000000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2cd, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) if (1) { - CH03("", 0, 0x2ce, 0, 0) + CH03("", 0, 0x2ce, __LINE__, 0) Add("0x123456789", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2cf, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } // 15. "0x" (incomplete '0x' image) - CH03("", 0, 0x2d0, 0, 0) + CH03("", 0, 0x2d0, __LINE__, 0) Add(" 0x", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2d1, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x2d2, 0, 0) + CH03("", 0, 0x2d2, __LINE__, 0) Add(" 0x", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2d3, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x2d4, 0, 0) + CH03("", 0, 0x2d4, __LINE__, 0) } /* @@ -942,56 +942,56 @@ Method(mf9c) { // Hex: 0x - dec - CH03("", 0, 0x367, 0, 0) + CH03("", 0, 0x367, __LINE__, 0) Add(" 0000000000x0", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x368, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0000000000x1", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x369, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0000000000x12345678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x36a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0000000000x1234567890123456", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x36b, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - hex Add(" 0000000000xabcdefef", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x36c, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0000000000xabcdefefadefbcdf", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x36d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - dec/hex Add(" 0000000000x1ab2cd340fe05678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x36e, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x36f, 0, 0) + CH03("", 0, 0x36f, __LINE__, 0) Add(" 0000000000x1ab2cd340fe0567823456789123456789987", 0, Local0) - CH03("", 0, 0x370, 0, 0) + CH03("", 0, 0x370, __LINE__, 0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x371, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x372, 0, 0) + CH03("", 0, 0x372, __LINE__, 0) /* * Implicit String to Integer () @@ -999,49 +999,49 @@ Method(mf9c) { * Method(mf98) */ - CH03("", 0, 0x373, 0, 0) + CH03("", 0, 0x373, __LINE__, 0) Add(" 0000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x374, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x375, 0, 0) + CH03("", 0, 0x375, __LINE__, 0) Add(" 0000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x376, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x377, 0, 0) + CH03("", 0, 0x377, __LINE__, 0) Add(" 000000000000000000000000000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x378, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x379, 0, 0) + CH03("", 0, 0x379, __LINE__, 0) Add(" 000000000000000000000000000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x37a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x37b, 0, 0) + CH03("", 0, 0x37b, __LINE__, 0) Add(" 0000000001", 0, Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x37c, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } - CH03("", 0, 0x37d, 0, 0) + CH03("", 0, 0x37d, __LINE__, 0) Add(" 00000000012345678", 0, Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x37e, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } - CH03("", 0, 0x37f, 0, 0) + CH03("", 0, 0x37f, __LINE__, 0) /* * Implicit String to Integer () @@ -1049,18 +1049,18 @@ Method(mf9c) { * Method(mf99) */ - CH03("", 0, 0x380, 0, 0) + CH03("", 0, 0x380, __LINE__, 0) // Hex: 0x - dec Add(" 0000000001234567890123456", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x381, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x382, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -1068,22 +1068,22 @@ Method(mf9c) { Add(" 000000000abcdefef", 0, Local0) if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x383, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } Add(" 000000000abcdefe", 0, Local0) if (LNotEqual(Local0, 0xabcdefe)) { - err("", zFFF, 0x384, 0, 0, Local0, 0xabcdefe) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefe) } Add(" 000000000abcdefefadefbcdf", 0, Local0) if (F64) { if (LNotEqual(Local0, 0xabcdefefadefbcdf)) { - err("", zFFF, 0x385, 0, 0, Local0, 0xabcdefefadefbcdf) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcdf) } } else { if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x386, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } } @@ -1092,31 +1092,31 @@ Method(mf9c) { Add(" 0000000001ab2cd340fe05678", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05678)) { - err("", zFFF, 0x387, 0, 0, Local0, 0x1ab2cd340fe05678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05678) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x388, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add(" 0000000001ab2cd340fe05", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05)) { - err("", zFFF, 0x389, 0, 0, Local0, 0x1ab2cd340fe05) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x38a, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add(" 0000000001a", 0, Local0) if (LNotEqual(Local0, 0x1a)) { - err("", zFFF, 0x38b, 0, 0, Local0, 0x1a) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1a) } - CH03("", 0, 0x38d, 0, 0) + CH03("", 0, 0x38d, __LINE__, 0) /* * No exceptions in special cases which force exceptions on ToInteger @@ -1125,265 +1125,265 @@ Method(mf9c) { */ // 5. "1234cd" (non-decimal character in dec-image) - CH03("", 0, 0x38e, 0, 0) + CH03("", 0, 0x38e, __LINE__, 0) Add(" 0000000001234cd", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x38f, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 6. "000x1234" (non-decimal character in dec-image) - CH03("", 0, 0x390, 0, 0) + CH03("", 0, 0x390, __LINE__, 0) Add(" 000000000000x1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x391, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 7. "0x1234cdQ" (non-hex character in '0x'-image) - CH03("", 0, 0x392, 0, 0) + CH03("", 0, 0x392, __LINE__, 0) Add(" 0000000000x1234cdQ", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x393, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x394, 0, 0) + CH03("", 0, 0x394, __LINE__, 0) Add(" 0000000001234cdQ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x395, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } - CH03("", 0, 0x396, 0, 0) + CH03("", 0, 0x396, __LINE__, 0) Add(" 0000000000x0x12345", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x397, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 8. "1234 " (white space in dec image) - CH03("", 0, 0x398, 0, 0) + CH03("", 0, 0x398, __LINE__, 0) Add(" 0000000001234 ", 0, Local0) if (LNotEqual(Local0, 0x1234)) { - err("", zFFF, 0x399, 0, 0, Local0, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234) } // 9. "0x1234cd " (white space in '0x'-image) - CH03("", 0, 0x39a, 0, 0) + CH03("", 0, 0x39a, __LINE__, 0) Add(" 0000000001234cd ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x39b, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 10. "0x 1234cdQ" (white space after '0x') - CH03("", 0, 0x39c, 0, 0) + CH03("", 0, 0x39c, __LINE__, 0) Add(" 0000000000x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x39d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x39e, 0, 0) + CH03("", 0, 0x39e, __LINE__, 0) Add(" 0000000000x0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x39f, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x3a0, 0, 0) + CH03("", 0, 0x3a0, __LINE__, 0) Add(" 0000000000x0x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3a1, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x3a2, 0, 0) + CH03("", 0, 0x3a2, __LINE__, 0) Add(" 0000000000x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3a3, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 11. (decimal image exceeding maximal) // 32-bit mode � the value exceeding "4294967295" if (1) { - CH03("", 0, 0x3a4, 0, 0) + CH03("", 0, 0x3a4, __LINE__, 0) Add(" 0000000004294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x3a5, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x3a6, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } - CH03("", 0, 0x3a7, 0, 0) + CH03("", 0, 0x3a7, __LINE__, 0) Add(" 000000000123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x3a8, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x3a9, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x3aa, 0, 0) + CH03("", 0, 0x3aa, __LINE__, 0) Add(" 00000000000004294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x3ab, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x3ac, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } - CH03("", 0, 0x3ad, 0, 0) + CH03("", 0, 0x3ad, __LINE__, 0) Add(" 0000000000123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x3ae, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x3af, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x3b0, 0, 0) + CH03("", 0, 0x3b0, __LINE__, 0) Add(" 0000000000123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x3b1, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x3b2, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x3b3, 0, 0) + CH03("", 0, 0x3b3, __LINE__, 0) Add(" 000000000123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x3b4, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x3b5, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03("", 0, 0x3b6, 0, 0) + CH03("", 0, 0x3b6, __LINE__, 0) Add(" 000000000123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x3b7, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x3b8, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } } // 64-bit mode � the value exceeding "18446744073709551615" - CH03("", 0, 0x3b8, 0, 0) + CH03("", 0, 0x3b8, __LINE__, 0) Add(" 00000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x3b9, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x3ba, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x3bb, 0, 0) + CH03("", 0, 0x3bb, __LINE__, 0) Add(" 00000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x3bc, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x3bd, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x3be, 0, 0) + CH03("", 0, 0x3be, __LINE__, 0) Add(" 00000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x3bf, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x3c0, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x3c1, 0, 0) + CH03("", 0, 0x3c1, __LINE__, 0) Add(" 000000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x3c2, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x3c3, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } - CH03("", 0, 0x3c4, 0, 0) + CH03("", 0, 0x3c4, __LINE__, 0) Add(" 000000000000000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x3c5, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x3c6, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } // 12. "0x12345678901234567" (hex image exceeding maximal) - CH03("", 0, 0x3c7, 0, 0) + CH03("", 0, 0x3c7, __LINE__, 0) Add(" 0000000000x12345678901234567", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3c8, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) - CH03("", 0, 0x3ca, 0, 0) + CH03("", 0, 0x3ca, __LINE__, 0) Add(" 0000000000x00000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3cb, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x3cc, 0, 0) + CH03("", 0, 0x3cc, __LINE__, 0) Add(" 0000000000x0000000000000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3cd, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) if (1) { - CH03("", 0, 0x3ce, 0, 0) + CH03("", 0, 0x3ce, __LINE__, 0) Add("0x123456789", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3cf, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } // 15. "0x" (incomplete '0x' image) - CH03("", 0, 0x3d0, 0, 0) + CH03("", 0, 0x3d0, __LINE__, 0) Add(" 0000000000x", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3d1, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x3d2, 0, 0) + CH03("", 0, 0x3d2, __LINE__, 0) Add(" 0000000000x", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3d3, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } - CH03("", 0, 0x3d4, 0, 0) + CH03("", 0, 0x3d4, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl index 68b9fae..2ffabed 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl @@ -91,297 +91,297 @@ Method(md74,, Serialized) { // 8 decimal Add("12345678", 0x11111111, Local0) if (LNotEqual(Local0, 0x23456789)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x23456789) + err("", zFFF, __LINE__, 0, 0, Local0, 0x23456789) } // 8 hex Add("abcdefab", 0x11111111, Local0) if (LNotEqual(Local0, 0xbcdf00bc)) { - err("", zFFF, 0x001, 0, 0, Local0, 0xbcdf00bc) + err("", zFFF, __LINE__, 0, 0, Local0, 0xbcdf00bc) } // 16 decimal Add("1234567890876543", 0x1111111111111111, Local0) if (LNotEqual(Local0, 0x23456789a1987654)) { - err("", zFFF, 0x002, 0, 0, Local0, 0x23456789a1987654) + err("", zFFF, __LINE__, 0, 0, Local0, 0x23456789a1987654) } // 16 hex Add("abcdefababcdfead", 0x1111111111111111, Local0) if (LNotEqual(Local0, 0xbcdf00bcbcdf0fbe)) { - err("", zFFF, 0x003, 0, 0, Local0, 0xbcdf00bcbcdf0fbe) + err("", zFFF, __LINE__, 0, 0, Local0, 0xbcdf00bcbcdf0fbe) } // 17 hex Add("1234567890123456z", 0x1111111111111111, Local0) if (LNotEqual(Local0, 0x23456789a1234567)) { - err("", zFFF, 0x004, 0, 0, Local0, 0x23456789a1234567) + err("", zFFF, __LINE__, 0, 0, Local0, 0x23456789a1234567) } // 17 hex (caused AE_BAD_HEX_CONSTANT, 28.09.2005) Add("12345678901234560", 0x1111111111111111, Local0) if (LNotEqual(Local0, 0x23456789a1234567)) { - err("", zFFF, 0x005, 0, 0, Local0, 0x23456789a1234567) + err("", zFFF, __LINE__, 0, 0, Local0, 0x23456789a1234567) } // Looks like octal, but should be treated as hex Add("01111", 0x2222, Local0) if (LNotEqual(Local0, 0x3333)) { - err("", zFFF, 0x006, 0, 0, Local0, 0x3333) + err("", zFFF, __LINE__, 0, 0, Local0, 0x3333) } // The first zeros each must be put into value Add("000010234", 0, Local0) if (LNotEqual(Local0, 0x10234)) { - err("", zFFF, 0x007, 0, 0, Local0, 0x10234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x10234) } Add("000000000000000010234", 0, Local0) if (LNotEqual(Local0, 0x10234)) { - err("", zFFF, 0x008, 0, 0, Local0, 0x10234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x10234) } Add("00000000000000010234", 0, Local0) if (LNotEqual(Local0, 0x10234)) { - err("", zFFF, 0x009, 0, 0, Local0, 0x10234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x10234) } Add("0000000010234", 0, Local0) if (LNotEqual(Local0, 0x10234)) { - err("", zFFF, 0x00a, 0, 0, Local0, 0x10234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x10234) } Add("000000010234", 0, Local0) if (LNotEqual(Local0, 0x10234)) { - err("", zFFF, 0x00b, 0, 0, Local0, 0x10234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x10234) } // Non-complete 4 hex, should be extended with zeros Add("abcd", 0x1111, Local0) if (LNotEqual(Local0, 0xbcde)) { - err("", zFFF, 0x00c, 0, 0, Local0, 0xbcde) + err("", zFFF, __LINE__, 0, 0, Local0, 0xbcde) } // Non-complete 5 decimal, should be extended with zeros Add("12345", 0x1111, Local0) if (LNotEqual(Local0, 0x13456)) { - err("", zFFF, 0x00d, 0, 0, Local0, 0x13456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x13456) } - CH03(ts, zFFF, 0x100, 0, 0) + CH03(ts, zFFF, 0x100, __LINE__, 0) // Too large, all hex, should be trancated Add("abcdef0123456789112233445566778890", 0, Local0) if (F64) { if (LNotEqual(Local0, 0xabcdef0123456789)) { - err("", zFFF, 0x00e, 0, 0, Local0, 0xabcdef0123456789) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef0123456789) } } else { if (LNotEqual(Local0, 0xabcdef01)) { - err("", zFFF, 0x00f, 0, 0, Local0, 0xabcdef01) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef01) } } - CH03(ts, zFFF, 0x101, 0, 0) + CH03(ts, zFFF, 0x101, __LINE__, 0) // Large, all hex, looks like octal, should be trancated Add("0abcdef0123456789112233445566778890", 0x1234, Local0) if (F64) { if (LNotEqual(Local0, 0xabcdef0123456789)) { - err("", zFFF, 0x010, 0, 0, Local0, 0xabcdef0123456789) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef0123456789) } } else { if (LNotEqual(Local0, 0xabcdef01)) { - err("", zFFF, 0x011, 0, 0, Local0, 0xabcdef01) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef01) } } - CH03(ts, zFFF, 0x102, 0, 0) + CH03(ts, zFFF, 0x102, __LINE__, 0) // Looks like usual hex, but 'x' terminates conversion Add("0x1111", 0x2222, Local0) if (LNotEqual(Local0, 0x2222)) { - err("", zFFF, 0x012, 0, 0, Local0, 0x2222) + err("", zFFF, __LINE__, 0, 0, Local0, 0x2222) } - CH03(ts, zFFF, 0x103, 0, 0) + CH03(ts, zFFF, 0x103, __LINE__, 0) // Empty string, no action - the relevant parameter of Add remains zero Add("", 222, Local0) if (LNotEqual(Local0, 222)) { - err("", zFFF, 0x013, 0, 0, Local0, 222) + err("", zFFF, __LINE__, 0, 0, Local0, 222) } - CH03(ts, zFFF, 0x104, 0, 0) + CH03(ts, zFFF, 0x104, __LINE__, 0) // Blank string, no action - the relevant parameter of Add remains zero Add(" ", 0x333, Local0) if (LNotEqual(Local0, 0x333)) { - err("", zFFF, 0x014, 0, 0, Local0, 0x333) + err("", zFFF, __LINE__, 0, 0, Local0, 0x333) } - CH03(ts, zFFF, 0x105, 0, 0) + CH03(ts, zFFF, 0x105, __LINE__, 0) // Blank string, no action - the relevant parameter of Add remains zero Add(" ", 0222, Local0) if (LNotEqual(Local0, 0222)) { - err("", zFFF, 0x015, 0, 0, Local0, 0222) + err("", zFFF, __LINE__, 0, 0, Local0, 0222) } - CH03(ts, zFFF, 0x106, 0, 0) + CH03(ts, zFFF, 0x106, __LINE__, 0) // Conversion is terminated just by the first symbol (non-hex) though followed by hex-es, remains zero Add("k1234567", 489, Local0) if (LNotEqual(Local0, 489)) { - err("", zFFF, 0x016, 0, 0, Local0, 489) + err("", zFFF, __LINE__, 0, 0, Local0, 489) } // Conversion is terminated just by the first symbol (non-hex), single Add("k", 0xabcdef0000, Local0) if (LNotEqual(Local0, 0xabcdef0000)) { - err("", zFFF, 0x017, 0, 0, Local0, 0xabcdef0000) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef0000) } - CH03(ts, zFFF, 0x107, 0, 0) + CH03(ts, zFFF, 0x107, __LINE__, 0) // Looks like designation of hex (terminated by x) Add("0x", 0x12345678, Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x018, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } - CH03(ts, zFFF, 0x108, 0, 0) + CH03(ts, zFFF, 0x108, __LINE__, 0) // Special symbol in the hex designation (terminated by x) Add("x", 12345678, Local0) if (LNotEqual(Local0, 12345678)) { - err("", zFFF, 0x019, 0, 0, Local0, 12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 12345678) } // Starts with the special symbol in the hex designation (terminated by x) Add("x12345", 111, Local0) if (LNotEqual(Local0, 111)) { - err("", zFFF, 0x01a, 0, 0, Local0, 111) + err("", zFFF, __LINE__, 0, 0, Local0, 111) } // No one hex, conversion is terminated just by the first symbol Z Add("ZZZZ", 123456, Local0) if (LNotEqual(Local0, 123456)) { - err("", zFFF, 0x01b, 0, 0, Local0, 123456) + err("", zFFF, __LINE__, 0, 0, Local0, 123456) } // Short <= 8, conversion is terminated by non-hex symbol Z Add("abcdZZZZ", 0x11, Local0) if (LNotEqual(Local0, 0xabde)) { - err("", zFFF, 0x01c, 0, 0, Local0, 0xabde) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabde) } // Short <= 8, hex in the middle (terminated by Z) Add("ZQ123MMM", 123456, Local0) if (LNotEqual(Local0, 123456)) { - err("", zFFF, 0x01d, 0, 0, Local0, 123456) + err("", zFFF, __LINE__, 0, 0, Local0, 123456) } // Short <= 8, hex at the end (terminated by Z) Add("ZQMMM123", 123456, Local0) if (LNotEqual(Local0, 123456)) { - err("", zFFF, 0x01e, 0, 0, Local0, 123456) + err("", zFFF, __LINE__, 0, 0, Local0, 123456) } // Long exceeding 16, no one hex Add("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu", 123, Local0) if (LNotEqual(Local0, 123)) { - err("", zFFF, 0x01f, 0, 0, Local0, 123) + err("", zFFF, __LINE__, 0, 0, Local0, 123) } // Long exceeding 16, hex at the beginning Add("1234zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu", 0123, Local0) if (LNotEqual(Local0, 0x1287)) { - err("", zFFF, 0x020, 0, 0, Local0, 0x1287) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1287) } // Long exceeding 16, hex everywhere Add("123z4s5qr6rr7rrrrrrrrr8ttttttt9ttttttattttbttttcyyyydyyeyyyyyyyyuuuuuuuuuuuuuuuuuuuuf", 0123, Local0) if (LNotEqual(Local0, 0x176)) { - err("", zFFF, 0x021, 0, 0, Local0, 0x176) + err("", zFFF, __LINE__, 0, 0, Local0, 0x176) } // Long exceeding 16, hex at the end Add("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu1234", 012321, Local0) if (LNotEqual(Local0, 012321)) { - err("", zFFF, 0x022, 0, 0, Local0, 012321) + err("", zFFF, __LINE__, 0, 0, Local0, 012321) } // Long exceeding 16, hex in the middle inside the possible Integer Add("zx1234swqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu", 0x12321, Local0) if (LNotEqual(Local0, 0x12321)) { - err("", zFFF, 0x023, 0, 0, Local0, 0x12321) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12321) } // Long exceeding 16, hex in the middle beyond the bounds of the possible Integer Add("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuu1234uu", 12321, Local0) if (LNotEqual(Local0, 12321)) { - err("", zFFF, 0x024, 0, 0, Local0, 12321) + err("", zFFF, __LINE__, 0, 0, Local0, 12321) } - CH03(ts, zFFF, 0x109, 0, 0) + CH03(ts, zFFF, 0x109, __LINE__, 0) // Only decimal, much more than 16 Store(Add("123456789012345601112223334446667788990087654", 0), Local1) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x025, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x026, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03(ts, zFFF, 0x10a, 0, 0) + CH03(ts, zFFF, 0x10a, __LINE__, 0) // Only hex, much more than 16 Store(Add("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabc", 0), Local1) if (F64) { if (LNotEqual(Local0, 0xabcdefabcdefabcd)) { - err("", zFFF, 0x027, 0, 0, Local0, 0xabcdefabcdefabcd) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefabcdefabcd) } } else { if (LNotEqual(Local0, 0xabcdefab)) { - err("", zFFF, 0x028, 0, 0, Local0, 0xabcdefab) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefab) } } - CH03(ts, zFFF, 0x10b, 0, 0) + CH03(ts, zFFF, 0x10b, __LINE__, 0) // Only decimal, much more than 16, non-hex at the end Store(Add("123456789012345601112223334446667788990087654ZZZZ", 0), Local1) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x029, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x02a, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } - CH03(ts, zFFF, 0x10c, 0, 0) + CH03(ts, zFFF, 0x10c, __LINE__, 0) // Only hex, much more than 16, non-hex at the end Store(Add("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcZZZZ", 0), Local1) if (F64) { if (LNotEqual(Local0, 0xabcdefabcdefabcd)) { - err("", zFFF, 0x02b, 0, 0, Local0, 0xabcdefabcdefabcd) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefabcdefabcd) } } else { if (LNotEqual(Local0, 0xabcdefab)) { - err("", zFFF, 0x02c, 0, 0, Local0, 0xabcdefab) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefab) } } - CH03(ts, zFFF, 0x10d, 0, 0) + CH03(ts, zFFF, 0x10d, __LINE__, 0) } Method(md75) { @@ -392,9 +392,9 @@ Method(md76,, Serialized) { Name(ts, "md76") - CH03(ts, zFFF, 0x10e, 0, 0) + CH03(ts, zFFF, 0x10e, __LINE__, 0) md74() - CH03(ts, zFFF, 0x10f, 0, 0) + CH03(ts, zFFF, 0x10f, __LINE__, 0) md75() - CH03(ts, zFFF, 0x110, 0, 0) + CH03(ts, zFFF, 0x110, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl index 4627288..2430041 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl @@ -35,51 +35,51 @@ Method(mf61, 1) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Add("", 0xabcd0000, Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err("", zFFF, 0x001, 0, 0, Local0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0000) } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) Add(" ", 0xabcd0001, Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err("", zFFF, 0x004, 0, 0, Local0, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0001) } - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) Store("", Local1) ToInteger(Local1, Local0) - CH04("", 0, 36, 0, 0x007, 0, 0) // AE_BAD_DECIMAL_CONSTANT + CH04("", 0, 36, 0, __LINE__, 0, 0) // AE_BAD_DECIMAL_CONSTANT - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) Store(" ", Local1) ToInteger(Local1, Local0) - CH04("", 0, 36, 0, 0x009, 0, 0) // AE_BAD_DECIMAL_CONSTANT + CH04("", 0, 36, 0, __LINE__, 0, 0) // AE_BAD_DECIMAL_CONSTANT - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) Add("q", 0xabcd0002, Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err("", zFFF, 0x00b, 0, 0, Local0, 0xabcd0002) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0002) } - CH03("", 0, 0x00c, 0, 0) + CH03("", 0, 0x00c, __LINE__, 0) - CH03("", 0, 0x00d, 0, 0) + CH03("", 0, 0x00d, __LINE__, 0) Add("q ", 0xabcd0003, Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err("", zFFF, 0x00e, 0, 0, Local0, 0xabcd0003) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0003) } - CH03("", 0, 0x00f, 0, 0) + CH03("", 0, 0x00f, __LINE__, 0) - CH03("", 0, 0x010, 0, 0) + CH03("", 0, 0x010, __LINE__, 0) Store("q", Local1) ToInteger(Local1, Local0) - CH04("", 0, 36, 0, 0x011, 0, 0) // AE_BAD_DECIMAL_CONSTANT + CH04("", 0, 36, 0, __LINE__, 0, 0) // AE_BAD_DECIMAL_CONSTANT - CH03("", 0, 0x012, 0, 0) + CH03("", 0, 0x012, __LINE__, 0) Store("q ", Local1) ToInteger(Local1, Local0) - CH04("", 0, 36, 0, 0x013, 0, 0) // AE_BAD_DECIMAL_CONSTANT + CH04("", 0, 36, 0, __LINE__, 0, 0) // AE_BAD_DECIMAL_CONSTANT } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl index 61d03de..fa2862b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl @@ -45,7 +45,7 @@ Method(md7e, 1) // (BufferField is converted to Integer). Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } } @@ -55,7 +55,7 @@ Method(md7f, 1) // (BufferField is converted to Buffer). Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00b)) { - err("", zFFF, 0x001, 0, 0, Local0, c00b) + err("", zFFF, __LINE__, 0, 0, Local0, c00b) } } @@ -65,12 +65,12 @@ Method(md80) Store(ObjectType(bf30), Local0) if (LNotEqual(Local0, c016)) { - err("", zFFF, 0x002, 0, 0, Local0, c016) + err("", zFFF, __LINE__, 0, 0, Local0, c016) } Store(ObjectType(bf31), Local0) if (LNotEqual(Local0, c016)) { - err("", zFFF, 0x003, 0, 0, Local0, c016) + err("", zFFF, __LINE__, 0, 0, Local0, c016) } md7e(bf30) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl index 308a6b8..f584902 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl @@ -45,7 +45,7 @@ Method(md81, 1) // (FieldUnit is converted to Integer). Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } } @@ -55,7 +55,7 @@ Method(md82, 1) // (FieldUnit is converted to Buffer). Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00b)) { - err("", zFFF, 0x001, 0, 0, Local0, c00b) + err("", zFFF, __LINE__, 0, 0, Local0, c00b) } } @@ -65,12 +65,12 @@ Method(md83) Store(ObjectType(fd00), Local0) if (LNotEqual(Local0, c00d)) { - err("", zFFF, 0x002, 0, 0, Local0, c00d) + err("", zFFF, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(fd01), Local0) if (LNotEqual(Local0, c00d)) { - err("", zFFF, 0x003, 0, 0, Local0, c00d) + err("", zFFF, __LINE__, 0, 0, Local0, c00d) } md81(fd00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl index 9df6a11..c28488f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl @@ -56,7 +56,7 @@ Method(md86) Store(md84(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } // BufferField converted to Buffer before return @@ -64,6 +64,6 @@ Method(md86) Store(md85(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, c00b)) { - err("", zFFF, 0x001, 0, 0, Local0, c00b) + err("", zFFF, __LINE__, 0, 0, Local0, c00b) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl index 6b1c297..239c1b0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl @@ -56,7 +56,7 @@ Method(md89) Store(md87(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } // FiledUnit converted to Buffer before return @@ -64,6 +64,6 @@ Method(md89) Store(md88(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, c00b)) { - err("", zFFF, 0x001, 0, 0, Local0, c00b) + err("", zFFF, __LINE__, 0, 0, Local0, c00b) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl index 8d5ba3c..556e978 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl @@ -41,7 +41,7 @@ Method(me08,, Serialized) Store(Mid(b000, 1, 1), Local0) if (LNotEqual(Local0, Buffer() {2})){ - err("", zFFF, 0x001, 0, 0, Local0, Buffer() {2}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {2}) } Store("Finish of test", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.asl index 30adad2..ea3efcc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.asl @@ -55,7 +55,7 @@ Method(mZ00, 1) } if (LNotEqual(Local0, 1)) { - err(arg0, z054, 0, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -70,13 +70,13 @@ Method(mZ02, 1) Store(0, Local0) mZ01(Local0) if (LNotequal(Local0, 0)) { - err(arg0, z054, 1, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } Store(0, Local0) Concatenate("qwertyuiop", Local0) if (LNotequal(Local0, 0)) { - err(arg0, z054, 2, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -92,7 +92,7 @@ Method(mZ05, 1) Store(ObjectType(RefOf(f000)), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 3, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -117,25 +117,25 @@ Method(mZ06, 1) Store(1, bnk0) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 4, 0, 0, bnk0, 0) + err(arg0, z054, __LINE__, 0, 0, bnk0, 0) } Store(0x96, bf01) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 5, 0, 0, bnk0, 0) + err(arg0, z054, __LINE__, 0, 0, bnk0, 0) } Store(0x87, bf00) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 6, 0, 0, bnk0, 0) + err(arg0, z054, __LINE__, 0, 0, bnk0, 0) } if (LNotEqual(bf00, 0x87)) { - err(arg0, z054, 7, 0, 0, bf00, 0) + err(arg0, z054, __LINE__, 0, 0, bf00, 0) } if (LNotEqual(bf01, 0x96)) { - err(arg0, z054, 8, 0, 0, bf01, 0) + err(arg0, z054, __LINE__, 0, 0, bf01, 0) } } @@ -146,7 +146,7 @@ Method(mZ07, 1) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00b)) { - err(arg0, z054, 9, 0, 0, Local1, 0) + err(arg0, z054, __LINE__, 0, 0, Local1, 0) } ToBuffer(Local0, Local2) @@ -156,7 +156,7 @@ Method(mZ07, 1) Store(ObjectType(Local0), Local3) if (LNotEqual(Local3, c00b)) { - err(arg0, z054, 10, 0, 0, Local3, 0) + err(arg0, z054, __LINE__, 0, 0, Local3, 0) } } @@ -178,15 +178,15 @@ Method(mZ09, 2) Store(0, Local0) } - CH03("", 0, 0, 0, 0) + CH03("", 0, 0, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, 0)) { - err(arg0, z054, 11, 0, 0, Local1, 0) + err(arg0, z054, __LINE__, 0, 0, Local1, 0) } - CH03("", 0, 0, 0, 0) + CH03("", 0, 0, __LINE__, 0) } Method(mZ0a, 1) @@ -212,7 +212,7 @@ Method(mZ0b, 1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 3)) { - err(arg0, z054, 12, 0, 0, Local2, 0) + err(arg0, z054, __LINE__, 0, 0, Local2, 0) } Store("================ 2:", Debug) @@ -253,7 +253,7 @@ Method(mZ0c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 3)) { - err(arg0, z054, 13, 0, 0, Local3, 3) + err(arg0, z054, __LINE__, 0, 0, Local3, 3) } // 1 @@ -263,7 +263,7 @@ Method(mZ0c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 9)) { - err(arg0, z054, 14, 0, 0, Local3, 9) + err(arg0, z054, __LINE__, 0, 0, Local3, 9) } // 2 @@ -273,7 +273,7 @@ Method(mZ0c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 6)) { - err(arg0, z054, 15, 0, 0, Local3, 6) + err(arg0, z054, __LINE__, 0, 0, Local3, 6) } Store(SizeOf(p000), Local0) @@ -281,7 +281,7 @@ Method(mZ0c, 1) Store(Local0, Debug) if (LNotEqual(Local0, 3)) { - err(arg0, z054, 16, 0, 0, Local0, 3) + err(arg0, z054, __LINE__, 0, 0, Local0, 3) } } */ @@ -298,11 +298,11 @@ Method(mZ0d, 1) Store(DeRefOf(Index(p000, 0)), Local7) if (LEqual(b000, Local7)) { - err(arg0, z054, 17, 0, 0, b000, Local7) + err(arg0, z054, __LINE__, 0, 0, b000, Local7) } if (LEqual(Local7, b000)) { - err(arg0, z054, 18, 0, 0, Local7, b000) + err(arg0, z054, __LINE__, 0, 0, Local7, b000) } return (0) @@ -315,11 +315,11 @@ Method(mZ0d, 1) // are passed immediately Method(mZ0e, 1) { - CH03("", 0, 0, 0, 0) + CH03("", 0, 0, __LINE__, 0) Add( Buffer() {0x79}, Buffer() {0x79} ) - CH03("", 0, 0, 0, 0) + CH03("", 0, 0, __LINE__, 0) } // Bug 57: The empty Return operator (without specifying the returning value) @@ -334,7 +334,7 @@ Method(mZ0f, 1) { // ASL-compiler report Warning in this case // Store("ERROR 0: mZ13, after Return !!!", Debug) } - err(arg0, z054, 19, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) return (0x5678) } @@ -348,10 +348,10 @@ Method(mZ0f, 1) { // ASL-compiler DOESN'T report Warning in this case!!! // And the Store operator below is actually processed!!! - err(arg0, z054, 20, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) } - err(arg0, z054, 21, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) return } @@ -374,7 +374,7 @@ Method(mZ10, 1) { if (LNotEqual(Sizeof(buf0), 2)) { // Error: length of the buffer not reduced to the stored string - err(arg0, z054, 22, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) } return (0) } @@ -392,7 +392,7 @@ Method(mZ11, 1) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 23, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } } @@ -400,7 +400,7 @@ Method(mZ11, 1) { { Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 24, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } else { m000(arg0, bf00) } @@ -422,7 +422,7 @@ Method(mZ12, 1) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 25, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } } @@ -430,7 +430,7 @@ Method(mZ12, 1) { { Store(ObjectType(f000), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 26, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } else { m000(arg0, f000) } @@ -457,12 +457,12 @@ Method(mZ13, 1) { { Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 27, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } else { Store(m000(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 28, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } } } @@ -488,12 +488,12 @@ Method(mZ14, 1) { { Store(ObjectType(f000), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 29, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } else { Store(m000(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 30, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } } } @@ -575,19 +575,19 @@ Method(mZ16, 1) Store(ObjectType(m000), Local0) if (LNotEqual(Local0, c010)) { - err(arg0, z054, 31, 0, 0, Local0, c010) + err(arg0, z054, __LINE__, 0, 0, Local0, c010) } /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ // // Store(ObjectType(m000()), Local0) // if (LNotEqual(Local0, c009)) { -// err(arg0, z054, 32, 0, 0, Local0, c009) +// err(arg0, z054, __LINE__, 0, 0, Local0, c009) // } // // Store(ObjectType(m001(123)), Local1) // if (LNotEqual(Local1, c009)) { -// err(arg0, z054, 33, 0, 0, Local1, c009) +// err(arg0, z054, __LINE__, 0, 0, Local1, c009) // } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.old.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.old.asl index c740115..2e736be 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.old.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.old.asl @@ -55,7 +55,7 @@ Method(m100, 1) } if (LNotEqual(Local0, 1)) { - err(arg0, z054, 0, Local0, 0) + err(arg0, z054, __LINE__, Local0, 0) } } @@ -70,13 +70,13 @@ Method(m102, 1) Store(0, Local0) m101(Local0) if (LNotequal(Local0, 0)) { - err(arg0, z054, 1, Local0, 0) + err(arg0, z054, __LINE__, Local0, 0) } Store(0, Local0) Concatenate("qwertyuiop", Local0) if (LNotequal(Local0, 0)) { - err(arg0, z054, 2, Local0, 0) + err(arg0, z054, __LINE__, Local0, 0) } } @@ -92,7 +92,7 @@ Method(m105, 1) Store(ObjectType(RefOf(f000)), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 3, Local0, 0) + err(arg0, z054, __LINE__, Local0, 0) } } @@ -117,25 +117,25 @@ Method(m106, 1) Store(1, bnk0) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 4, bnk0, 0) + err(arg0, z054, __LINE__, bnk0, 0) } Store(0x96, bf01) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 5, bnk0, 0) + err(arg0, z054, __LINE__, bnk0, 0) } Store(0x87, bf00) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 6, bnk0, 0) + err(arg0, z054, __LINE__, bnk0, 0) } if (LNotEqual(bf00, 0x87)) { - err(arg0, z054, 7, bf00, 0) + err(arg0, z054, __LINE__, bf00, 0) } if (LNotEqual(bf01, 0x96)) { - err(arg0, z054, 8, bf01, 0) + err(arg0, z054, __LINE__, bf01, 0) } } @@ -146,7 +146,7 @@ Method(m107, 1) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00b)) { - err(arg0, z054, 9, Local1, 0) + err(arg0, z054, __LINE__, Local1, 0) } ToBuffer(Local0, Local2) @@ -156,7 +156,7 @@ Method(m107, 1) Store(ObjectType(Local0), Local3) if (LNotEqual(Local3, c00b)) { - err(arg0, z054, 10, Local3, 0) + err(arg0, z054, __LINE__, Local3, 0) } } @@ -183,7 +183,7 @@ Method(m109, 2) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, 0)) { - err(arg0, z054, 11, Local1, 0) + err(arg0, z054, __LINE__, Local1, 0) } CH03() @@ -212,7 +212,7 @@ Method(m10b, 1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 3)) { - err(arg0, z054, 12, Local2, 0) + err(arg0, z054, __LINE__, Local2, 0) } Store("================ 2:", Debug) @@ -253,7 +253,7 @@ Method(m10c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 3)) { - err(arg0, z054, 13, Local3, 3) + err(arg0, z054, __LINE__, Local3, 3) } // 1 @@ -263,7 +263,7 @@ Method(m10c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 9)) { - err(arg0, z054, 14, Local3, 9) + err(arg0, z054, __LINE__, Local3, 9) } // 2 @@ -273,7 +273,7 @@ Method(m10c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 6)) { - err(arg0, z054, 15, Local3, 6) + err(arg0, z054, __LINE__, Local3, 6) } Store(SizeOf(p000), Local0) @@ -281,7 +281,7 @@ Method(m10c, 1) Store(Local0, Debug) if (LNotEqual(Local0, 3)) { - err(arg0, z054, 16, Local0, 3) + err(arg0, z054, __LINE__, Local0, 3) } } */ @@ -298,11 +298,11 @@ Method(m10d, 1) Store(DeRefOf(Index(p000, 0)), Local7) if (LEqual(b000, Local7)) { - err(arg0, z054, 17, b000, Local7) + err(arg0, z054, __LINE__, b000, Local7) } if (LEqual(Local7, b000)) { - err(arg0, z054, 18, Local7, b000) + err(arg0, z054, __LINE__, Local7, b000) } return (0) @@ -334,7 +334,7 @@ Method(m10f, 1) { // ASL-compiler report Warning in this case // Store("ERROR 0: m113, after Return !!!", Debug) } - err(arg0, z054, 19, 0, 0) + err(arg0, z054, __LINE__, 0, 0) return (0x5678) } @@ -348,10 +348,10 @@ Method(m10f, 1) { // ASL-compiler DOESN'T report Warning in this case!!! // And the Store operator below is actually processed!!! - err(arg0, z054, 20, 0, 0) + err(arg0, z054, __LINE__, 0, 0) } - err(arg0, z054, 21, 0, 0) + err(arg0, z054, __LINE__, 0, 0) return } @@ -374,7 +374,7 @@ Method(m110, 1) { if (LNotEqual(Sizeof(buf0), 2)) { // Error: length of the buffer not reduced to the stored string - err(arg0, z054, 22, 0, 0) + err(arg0, z054, __LINE__, 0, 0) } return (0) } @@ -392,7 +392,7 @@ Method(m111, 1) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 23, Local0, 14) + err(arg0, z054, __LINE__, Local0, 14) } } @@ -400,7 +400,7 @@ Method(m111, 1) { { Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 24, Local0, 14) + err(arg0, z054, __LINE__, Local0, 14) } else { m000(arg0, bf00) } @@ -422,7 +422,7 @@ Method(m112, 1) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 25, Local0, 5) + err(arg0, z054, __LINE__, Local0, 5) } } @@ -430,7 +430,7 @@ Method(m112, 1) { { Store(ObjectType(f000), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 26, Local0, 5) + err(arg0, z054, __LINE__, Local0, 5) } else { m000(arg0, f000) } @@ -457,12 +457,12 @@ Method(m113, 1) { { Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 27, Local0, 14) + err(arg0, z054, __LINE__, Local0, 14) } else { Store(m000(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 28, Local0, 14) + err(arg0, z054, __LINE__, Local0, 14) } } } @@ -488,12 +488,12 @@ Method(m114, 1) { { Store(ObjectType(f000), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 29, Local0, 5) + err(arg0, z054, __LINE__, Local0, 5) } else { Store(m000(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 30, Local0, 5) + err(arg0, z054, __LINE__, Local0, 5) } } } @@ -575,19 +575,19 @@ Method(m116, 1) Store(ObjectType(m000), Local0) if (LNotEqual(Local0, c010)) { - err(arg0, z054, 31, Local0, c010) + err(arg0, z054, __LINE__, Local0, c010) } /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ // // Store(ObjectType(m000()), Local0) // if (LNotEqual(Local0, c009)) { -// err(arg0, z054, 32, Local0, c009) +// err(arg0, z054, __LINE__, Local0, c009) // } // // Store(ObjectType(m001(123)), Local1) // if (LNotEqual(Local1, c009)) { -// err(arg0, z054, 33, Local1, c009) +// err(arg0, z054, __LINE__, Local1, c009) // } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl index 985427a..404359f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl @@ -45,7 +45,7 @@ Method(me0b) SKIP() } else { if (LNotEqual(Ones, 0xffffffff)){ - err("", zFFF, 0x000, 0, 0, Ones, 0xffffffff) + err("", zFFF, __LINE__, 0, 0, Ones, 0xffffffff) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl index 2519701..3b378ed 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl @@ -40,9 +40,9 @@ Store(Index(pd01, 0), Local1) Store(Local1, Debug) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Add(Local1, 0, Local7) - CH04("", 0, 47, 0, 0x001, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(Refof(id0a), Local2) Store(Local2, Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl index cd0bee3..93d15cb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl @@ -36,7 +36,7 @@ { Name (i000, 0x89abcdef) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(ToInteger("0"), Local0) // AE_BAD_DECIMAL_CONSTANT @@ -46,5 +46,5 @@ Store("0", i000) // AE_BAD_HEX_CONSTANT - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl index 920479d..60ba98a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl @@ -52,18 +52,18 @@ Store(ObjectType(me31), Local0) if (LNotEqual(Local0, c010)) { - err("", zFFF, 0x000, 0, 0, Local0, c010) + err("", zFFF, __LINE__, 0, 0, Local0, c010) } /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ // // Store(ObjectType(me31()), Local0) // if (LNotEqual(Local0, c009)) { -// err("", zFFF, 0x001, 0, 0, Local0, c009) +// err("", zFFF, __LINE__, 0, 0, Local0, c009) // } // // Store(ObjectType(me32("String")), Local0) // if (LNotEqual(Local0, c00a)) { -// err("", zFFF, 0x002, 0, 0, Local0, c00a) +// err("", zFFF, __LINE__, 0, 0, Local0, c00a) // } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0083/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0083/DECL.asl index 7440c84..1066e4b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0083/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0083/DECL.asl @@ -62,79 +62,79 @@ // Expected exception for each DerefOf below - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(i000), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(b000), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(p000), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(d000), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(e000), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(mx00), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(tz00), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(pr00), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(pw00), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(r000), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(bf90), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(f900), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(f901), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(f902), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(f903), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(bn90), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(if90), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(if91), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // And so on.. diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl index 7875081..39fb547 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl @@ -82,7 +82,7 @@ Method(m803,, Serialized) Method(m000) { if (LNotEqual(i000, 0xabcd0000)) { - err("", zFFF, 0x000, 0, 0, i000, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0000) } Store(0xabcd0001, i000) return (0xabcd0002) @@ -93,7 +93,7 @@ Method(m803,, Serialized) Method(m001) { if (LNotEqual(i000, 0xabcd0001)) { - err("", zFFF, 0x001, 0, 0, i000, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0001) } Store(0xabcd0003, i000) return (0xabcd0004) @@ -104,7 +104,7 @@ Method(m803,, Serialized) Method(m002) { if (LNotEqual(i000, 0xabcd0003)) { - err("", zFFF, 0x002, 0, 0, i000, 0xabcd0003) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0003) } Store(0xabcd0005, i000) return (0xabcd0006) @@ -115,7 +115,7 @@ Method(m803,, Serialized) Method(m003) { if (LNotEqual(i000, 0xabcd0005)) { - err("", zFFF, 0x003, 0, 0, i000, 0xabcd0005) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0005) } Store(0xabcd0007, i000) return (0xabcd0008) @@ -133,7 +133,7 @@ Method(m804,, Serialized) Method(m000) { if (LNotEqual(i000, 0xabcd0000)) { - err("", zFFF, 0x004, 0, 0, i000, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0000) } Store(0xabcd0001, i000) return (0xabcd0002) @@ -144,7 +144,7 @@ Method(m804,, Serialized) Method(m001) { if (LNotEqual(i000, 0xabcd0001)) { - err("", zFFF, 0x005, 0, 0, i000, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0001) } Store(0xabcd0003, i000) return (0xabcd0004) @@ -155,7 +155,7 @@ Method(m804,, Serialized) Method(m002) { if (LNotEqual(i000, 0xabcd0003)) { - err("", zFFF, 0x006, 0, 0, i000, 0xabcd0003) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0003) } Store(0xabcd0005, i000) return (0xabcd0006) @@ -166,7 +166,7 @@ Method(m804,, Serialized) Method(m003) { if (LNotEqual(i000, 0xabcd0005)) { - err("", zFFF, 0x007, 0, 0, i000, 0xabcd0005) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0005) } Store(0xabcd0007, i000) return (0xabcd0008) @@ -182,7 +182,7 @@ Method(m804,, Serialized) Method(m000) { if (LNotEqual(i000, 0xabcd0007)) { - err("", zFFF, 0x008, 0, 0, i000, 0xabcd0007) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0007) } Store(0xabcd0008, i000) return (0xabcd0009) @@ -193,7 +193,7 @@ Method(m804,, Serialized) Method(m001) { if (LNotEqual(i000, 0xabcd0008)) { - err("", zFFF, 0x009, 0, 0, i000, 0xabcd0008) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0008) } Store(0xabcd000a, i000) return (0xabcd000b) @@ -204,7 +204,7 @@ Method(m804,, Serialized) Method(m002) { if (LNotEqual(i000, 0xabcd000a)) { - err("", zFFF, 0x00a, 0, 0, i000, 0xabcd000a) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd000a) } Store(0xabcd000c, i000) return (0xabcd000d) @@ -215,7 +215,7 @@ Method(m804,, Serialized) Method(m003) { if (LNotEqual(i000, 0xabcd000c)) { - err("", zFFF, 0x00b, 0, 0, i000, 0xabcd000c) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd000c) } Store(0xabcd000e, i000) return (0xabcd000f) @@ -231,7 +231,7 @@ Method(m804,, Serialized) Method(m000) { if (LNotEqual(i000, 0xabcd000e)) { - err("", zFFF, 0x00c, 0, 0, i000, 0xabcd000e) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd000e) } Store(0xabcd0010, i000) return (0xabcd0011) @@ -242,7 +242,7 @@ Method(m804,, Serialized) Method(m001) { if (LNotEqual(i000, 0xabcd0010)) { - err("", zFFF, 0x00d, 0, 0, i000, 0xabcd0010) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0010) } Store(0xabcd0012, i000) return (0xabcd0013) @@ -253,7 +253,7 @@ Method(m804,, Serialized) Method(m002) { if (LNotEqual(i000, 0xabcd0012)) { - err("", zFFF, 0x00e, 0, 0, i000, 0xabcd0012) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0012) } Store(0xabcd0014, i000) return (0xabcd0015) @@ -264,7 +264,7 @@ Method(m804,, Serialized) Method(m003) { if (LNotEqual(i000, 0xabcd0014)) { - err("", zFFF, 0x00f, 0, 0, i000, 0xabcd0014) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0014) } Store(0xabcd0016, i000) return (0xabcd0017) @@ -276,7 +276,7 @@ Method(m804,, Serialized) m002() if (LNotEqual(i000, 0xabcd0016)) { - err("", zFFF, 0x010, 0, 0, i000, 0xabcd0016) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0016) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl index 766f584..187a668 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl @@ -46,7 +46,7 @@ } if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x000, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } } @@ -64,7 +64,7 @@ } if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x001, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl index 1f1c20d..b6bb964 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl @@ -40,38 +40,38 @@ Store("Package as a named object:", Debug) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(Index(p000, 5)), Local0) if (LNotEqual(Local0, 6)) { - err("", zFFF, 0x001, 0, 0, Local0, 6) + err("", zFFF, __LINE__, 0, 0, Local0, 6) } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) } elseif (LEqual(Arg0, 1)) { Store("The same Package but substituted immediately:", Debug) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) Store(Index(Package() {1,2,3,4,5,6,7,8}, 5), Local1) if (y900) { Store(DerefOf(Local1), Local0) if (LNotEqual(Local0, 6)) { - err("", zFFF, 0x004, 0, 0, Local0, 6) + err("", zFFF, __LINE__, 0, 0, Local0, 6) } - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) } else { - CH04("", 0, 0xff, 0, 0x006, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } else { - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) Store(DerefOf(Index(Package() {1,2,3,4,5,6,7,8}, 5)), Local0) if (y900) { if (LNotEqual(Local0, 6)) { - err("", zFFF, 0x008, 0, 0, Local0, 6) + err("", zFFF, __LINE__, 0, 0, Local0, 6) } - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) } else { - CH04("", 0, 0xff, 0, 0x00a, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl index 18a6e00..1a6689d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl @@ -40,40 +40,40 @@ Store("Buffer as a named object:", Debug) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(Index(b000, 5)), Local0) if (LNotEqual(Local0, 66)) { - err("", zFFF, 0x001, 0, 0, Local0, 66) + err("", zFFF, __LINE__, 0, 0, Local0, 66) } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) } elseif (LEqual(Arg0, 1)) { Store("The same Buffer but substituted immediately:", Debug) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) Store(Index(Buffer() {11,22,33,44,55,66,77,88}, 5), Local1) if (y900) { Store(DerefOf(Local1), Local0) if (LNotEqual(Local0, 66)) { - err("", zFFF, 0x004, 0, 0, Local0, 66) + err("", zFFF, __LINE__, 0, 0, Local0, 66) } - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) } else { - CH04("", 0, 0xff, 0, 0x006, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } else { - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) Store(DerefOf(Index(Buffer() {11,22,33,44,55,66,77,88}, 5)), Local0) if (y900) { if (LNotEqual(Local0, 66)) { - err("", zFFF, 0x008, 0, 0, Local0, 66) + err("", zFFF, __LINE__, 0, 0, Local0, 66) } - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) } else { - CH04("", 0, 0xff, 0, 0x00a, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl index 68d26d9..223a029 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl @@ -40,40 +40,40 @@ Store("String as a named object:", Debug) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(Index(s000, 5)), Local0) if (LNotEqual(Local0, 0x75)) { - err("", zFFF, 0x001, 0, 0, Local0, 0x75) + err("", zFFF, __LINE__, 0, 0, Local0, 0x75) } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) } elseif (LEqual(Arg0, 1)) { Store("The same String but substituted immediately:", Debug) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) Store(Index("qwrtyuiop", 5), Local1) if (y900) { Store(DerefOf(Local1), Local0) if (LNotEqual(Local0, 0x75)) { - err("", zFFF, 0x004, 0, 0, Local0, 0x75) + err("", zFFF, __LINE__, 0, 0, Local0, 0x75) } - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) } else { - CH04("", 0, 0xff, 0, 0x006, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } else { - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) Store(DerefOf(Index("qwrtyuiop", 5)), Local0) if (y900) { if (LNotEqual(Local0, 0x75)) { - err("", zFFF, 0x008, 0, 0, Local0, 0x75) + err("", zFFF, __LINE__, 0, 0, Local0, 0x75) } - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) } else { - CH04("", 0, 0xff, 0, 0x00a, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0096_ASL/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0096_ASL/DECL.asl index ad45de9..e19b501 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0096_ASL/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0096_ASL/DECL.asl @@ -70,17 +70,17 @@ Method(me4b) { if (SLCK) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) me49(0) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) me4a(0) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) } else { - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) me49(0) - CH04("", 0, 49, 0, 0x004, 0, 0) // AE_AML_UNINITIALIZED_LOCAL - CH03("", 0, 0x005, 0, 0) + CH04("", 0, 49, 0, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH03("", 0, 0x005, __LINE__, 0) me4a(0) - CH04("", 0, 49, 0, 0x006, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04("", 0, 49, 0, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl index 52715e4..81be501 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl @@ -44,7 +44,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x000, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } return (0) @@ -67,7 +67,7 @@ Store(Local1, Debug) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x001, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } Store("Finish of test", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl index 775c9e1..0b37adf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl @@ -62,10 +62,10 @@ me66() if (id0d) { - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } if (id0e) { - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl index 0830049..25c51f1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl @@ -48,7 +48,7 @@ Store(Local1, Debug) if (LNotEqual(Local1, c008)) { - err("", zFFF, 0x000, 0, 0, Local1, c008) + err("", zFFF, __LINE__, 0, 0, Local1, c008) } Store("Finish of test", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl index 0a199fc..f3b9475 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl @@ -46,7 +46,7 @@ Store(Local1, Debug) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x000, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } Store("Finish of test", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl index b413294..16bd965 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl @@ -45,6 +45,6 @@ Store(Local2, Debug) if (LNotEqual(Local2, c018)) { - err("", zFFF, 0x000, 0, 0, Local2, c018) + err("", zFFF, __LINE__, 0, 0, Local2, c018) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl index 6cb8939..26e0e0b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl @@ -38,7 +38,7 @@ Store(Local0, Debug) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x000, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } } @@ -48,7 +48,7 @@ Store(Local0, Debug) if (LNotEqual(Local0, 0x1235)) { - err("", zFFF, 0x001, 0, 0, Local0, 0x1235) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1235) } } Method(me6e) @@ -57,7 +57,7 @@ Store(Local0, Debug) if (LNotEqual(Local0, 0xffffffffffffedcb)) { - err("", zFFF, 0x002, 0, 0, Local0, 0xffffffffffffedcb) + err("", zFFF, __LINE__, 0, 0, Local0, 0xffffffffffffedcb) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0108_ASL/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0108_ASL/DECL.asl index 88ce99f..27573b5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0108_ASL/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0108_ASL/DECL.asl @@ -38,18 +38,18 @@ { Store(ToBCD(0x5F5E0FF), Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x000, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Store(ToBCD(0x5F5E100), Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x001, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Store(ToBCD(0x2386F26FC0FFFF), Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x002, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Store(ToBCD(0x2386F26FC10000), Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x003, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl index 98eebda..dad4c07 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl @@ -64,25 +64,25 @@ Store(0, id0f) me73("1") if (LNot(id0f)) { - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me73(Buffer(){1}) if (LNot(id0f)) { - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me73("0") if (id0f) { - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me73(Buffer(){0}) if (id0f) { - err("", zFFF, 0x003, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } // ////////// @@ -90,61 +90,61 @@ Store(0, id0f) me74("1", 0) if (LNotEqual(id0f, 2)) { - err("", zFFF, 0x004, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me74(Buffer(){0,0,1,0}, 0) if (LNotEqual(id0f, 2)) { - err("", zFFF, 0x005, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me74("0", 0) if (id0f) { - err("", zFFF, 0x006, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me74(Buffer(){0,0,0,0}, 0) if (id0f) { - err("", zFFF, 0x007, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me74("1", 1) if (LNotEqual(id0f, 1)) { - err("", zFFF, 0x008, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me74(Buffer(){0,0,1,0}, 1) if (LNotEqual(id0f, 1)) { - err("", zFFF, 0x009, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me75("0") if (id0f) { - err("", zFFF, 0x00a, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me75(Buffer(){0}) if (id0f) { - err("", zFFF, 0x00b, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me75("01") if (LNot(id0f)) { - err("", zFFF, 0x00c, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me75(Buffer(){0,0,1,0}) if (LNot(id0f)) { - err("", zFFF, 0x00d, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl index 71e2242..52b9e0d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl @@ -43,34 +43,34 @@ Store("Test 0", Debug) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(Add(arg0, 1), Local5) - CH04("", 1, 47, 0, 0x001, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store("Test 1", Debug) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store(Add(arg1, 1), Local5) - CH04("", 1, 47, 0, 0x003, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store("Test 2", Debug) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Store(Add(arg2, 1), Local5) - CH04("", 1, 47, 0, 0x005, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store("Test 3", Debug) - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) Store(Add(arg3, 1), Local5) - CH04("", 1, 47, 0, 0x007, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store("Test 4", Debug) - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) Store(Add(arg4, 1), Local5) - CH04("", 1, 47, 0, 0x009, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store("Test 5", Debug) - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) Store(Add(arg5, 1), Local5) - CH04("", 1, 47, 0, 0x00b, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(me7a,, Serialized) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl index 8131935..633abf8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl @@ -82,7 +82,7 @@ Store(0xabcd0000, Local0) me7e(me85(), Local0) if (LNotEqual(id10, Local0)) { - err("", zFFF, 0x000, 0, 0, id10, Local0) + err("", zFFF, __LINE__, 0, 0, id10, Local0) } // To show: all methods return Index references (Ok) @@ -103,42 +103,42 @@ me7e(me7f(), Local0) Store(DerefOf(Index(pd04, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } Store(0xabcd0002, Local0) me7e(me80(), Local0) Store(DerefOf(Index(pd05, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } Store(0xabcd0003, Local0) me7e(me81(), Local0) Store(DerefOf(Index(pd06, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } Store(0xabcd0004, Local0) me7e(me82(), Local0) Store(DerefOf(Index(pd07, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } Store(0xabcd0005, Local0) me7e(me83(), Local0) Store(DerefOf(Index(pd08, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } Store(0xabcd0006, Local0) me7e(me84(), Local0) Store(DerefOf(Index(pd09, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl index f9747e6..9e6de29 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl @@ -45,9 +45,9 @@ Store("Modification of the copied string", Debug) if (LNotEqual(Local0, "Strang")) { - err("", zFFF, 0x000, 0, 0, Local0, "Strang") + err("", zFFF, __LINE__, 0, 0, Local0, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x001, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.0000.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.0000.asl index 97b6a26..7ed329d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.0000.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.0000.asl @@ -46,10 +46,10 @@ Method(md79) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } else { if (LNotEqual(Local1, 0xfe7cb391d650a284)) { - err("", zFFF, 0x001, 0, 0, Local1, 0xfe7cb391d650a284) + err("", zFFF, __LINE__, 0, 0, Local1, 0xfe7cb391d650a284) } } } @@ -62,7 +62,7 @@ Method(md7a) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c016)) { - err("", zFFF, 0x002, 0, 0, Local0, c016) + err("", zFFF, __LINE__, 0, 0, Local0, c016) } else { Store("=======================================", Debug) Store(Local1, Debug) @@ -72,7 +72,7 @@ Store(Local0, Debug) Store("=======================================", Debug) if (1) { if (LNotEqual(Local1, 0x59)) { - err("", zFFF, 0x003, 0, 0, Local1, 0x59) + err("", zFFF, __LINE__, 0, 0, Local1, 0x59) } } } @@ -86,7 +86,7 @@ Method(md7b) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c00d)) { - err("", zFFF, 0x004, 0, 0, Local0, c00d) + err("", zFFF, __LINE__, 0, 0, Local0, c00d) } else { Store("=======================================", Debug) @@ -97,7 +97,7 @@ Store(Local0, Debug) Store("=======================================", Debug) if (1) { if (LNotEqual(Local1, 0)) { - err("", zFFF, 0x005, 0, 0, Local1, 0) + err("", zFFF, __LINE__, 0, 0, Local1, 0) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl index 033d1b5..c99ddba 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl @@ -62,26 +62,26 @@ Method(mf80,, Serialized) Add(Local1, 0x079, Local5) if (LNotEqual(Local4, c009)) { - err("", zFFF, 0x000, 0, 0, Local4, c009) + err("", zFFF, __LINE__, 0, 0, Local4, c009) } elseif (LNotEqual(Local5, 0xaaaa0279)) { - err("", zFFF, 0x001, 0, 0, Local5, 0xaaaa0279) + err("", zFFF, __LINE__, 0, 0, Local5, 0xaaaa0279) } if (LNotEqual(i000, 0xaaaa0300)) { - err("", zFFF, 0x002, 0, 0, i000, 0xaaaa0300) + err("", zFFF, __LINE__, 0, 0, i000, 0xaaaa0300) } if (LNotEqual(Local2, c009)) { - err("", zFFF, 0x003, 0, 0, Local2, c009) + err("", zFFF, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local3, c009)) { - err("", zFFF, 0x004, 0, 0, Local3, c009) + err("", zFFF, __LINE__, 0, 0, Local3, c009) } - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) Add(Local0, 0x079, Local5) - CH04("", 0, 47, 0, 0x006, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(mf81,, Serialized) @@ -115,26 +115,26 @@ Method(mf81,, Serialized) Add(ii01, 0x079, ii05) if (LNotEqual(ii04, c009)) { - err("", zFFF, 0x007, 0, 0, ii04, c009) + err("", zFFF, __LINE__, 0, 0, ii04, c009) } elseif (LNotEqual(ii05, 0xaaaa0279)) { - err("", zFFF, 0x008, 0, 0, ii05, 0xaaaa0279) + err("", zFFF, __LINE__, 0, 0, ii05, 0xaaaa0279) } if (LNotEqual(i000, 0xaaaa0300)) { - err("", zFFF, 0x009, 0, 0, i000, 0xaaaa0300) + err("", zFFF, __LINE__, 0, 0, i000, 0xaaaa0300) } if (LNotEqual(ii02, c009)) { - err("", zFFF, 0x00a, 0, 0, ii02, c009) + err("", zFFF, __LINE__, 0, 0, ii02, c009) } if (LNotEqual(ii03, c009)) { - err("", zFFF, 0x00b, 0, 0, ii03, c009) + err("", zFFF, __LINE__, 0, 0, ii03, c009) } - CH03("", 0, 0x00c, 0, 0) + CH03("", 0, 0x00c, __LINE__, 0) Add(Local0, 0x079, ii05) - CH04("", 0, 47, 0, 0x00d, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(mf82,, Serialized) @@ -166,26 +166,26 @@ Method(mf82,, Serialized) Add(ii01, 0x079, ii05) if (LNotEqual(ii04, c009)) { - err("", zFFF, 0x00e, 0, 0, ii04, c009) + err("", zFFF, __LINE__, 0, 0, ii04, c009) } elseif (LNotEqual(ii05, 0xaaaa0279)) { - err("", zFFF, 0x00f, 0, 0, ii05, 0xaaaa0279) + err("", zFFF, __LINE__, 0, 0, ii05, 0xaaaa0279) } if (LNotEqual(i000, 0xaaaa0300)) { - err("", zFFF, 0x010, 0, 0, i000, 0xaaaa0300) + err("", zFFF, __LINE__, 0, 0, i000, 0xaaaa0300) } if (LNotEqual(ii02, c009)) { - err("", zFFF, 0x011, 0, 0, ii02, c009) + err("", zFFF, __LINE__, 0, 0, ii02, c009) } if (LNotEqual(ii03, c009)) { - err("", zFFF, 0x012, 0, 0, ii03, c009) + err("", zFFF, __LINE__, 0, 0, ii03, c009) } - CH03("", 0, 0x013, 0, 0) + CH03("", 0, 0x013, __LINE__, 0) Add(ii00, 0x079, ii05) - CH04("", 0, 47, 0, 0x014, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(md79) @@ -195,10 +195,10 @@ Method(md79) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } else { if (LNotEqual(Local1, 0xfe7cb391d650a284)) { - err("", zFFF, 0x001, 0, 0, Local1, 0xfe7cb391d650a284) + err("", zFFF, __LINE__, 0, 0, Local1, 0xfe7cb391d650a284) } } } @@ -212,7 +212,7 @@ Method(md7a) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c016)) { - err("", zFFF, 0x002, 0, 0, Local0, c016) + err("", zFFF, __LINE__, 0, 0, Local0, c016) } else { Store("=======================================", Debug) Store(Local1, Debug) @@ -222,7 +222,7 @@ Store(Local0, Debug) Store("=======================================", Debug) if (1) { if (LNotEqual(Local1, 0x59)) { - err("", zFFF, 0x003, 0, 0, Local1, 0x59) + err("", zFFF, __LINE__, 0, 0, Local1, 0x59) } } } @@ -237,7 +237,7 @@ Method(md7b) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c00d)) { - err("", zFFF, 0x004, 0, 0, Local0, c00d) + err("", zFFF, __LINE__, 0, 0, Local0, c00d) } else { Store("=======================================", Debug) @@ -248,7 +248,7 @@ Store(Local0, Debug) Store("=======================================", Debug) if (1) { if (LNotEqual(Local1, 0)) { - err("", zFFF, 0x005, 0, 0, Local1, 0) + err("", zFFF, __LINE__, 0, 0, Local1, 0) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl index b89b51c..8a5aade 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl @@ -38,12 +38,12 @@ if (Local0) { Store ("Ok: LEqual", Debug) } else { - err("", zFFF, 0x000, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } Store (LLess(0xffffffff, 0x100000000), Local1) if (Local1) { - err("", zFFF, 0x001, 0, 0, Local1, Zero) + err("", zFFF, __LINE__, 0, 0, Local1, Zero) } else { Store ("Ok: LLess", Debug) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl index 15fc26e..e3f8007 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl @@ -41,7 +41,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c014)) { - err("", zFFF, 0x000, 0, 0, Local1, c014) + err("", zFFF, __LINE__, 0, 0, Local1, c014) } } @@ -54,7 +54,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c012)) { - err("", zFFF, 0x001, 0, 0, Local1, c012) + err("", zFFF, __LINE__, 0, 0, Local1, c012) } } @@ -67,7 +67,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c013)) { - err("", zFFF, 0x002, 0, 0, Local1, c013) + err("", zFFF, __LINE__, 0, 0, Local1, c013) } } @@ -80,7 +80,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00f)) { - err("", zFFF, 0x003, 0, 0, Local1, c00f) + err("", zFFF, __LINE__, 0, 0, Local1, c00f) } } @@ -93,7 +93,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c011)) { - err("", zFFF, 0x004, 0, 0, Local1, c011) + err("", zFFF, __LINE__, 0, 0, Local1, c011) } } @@ -103,15 +103,15 @@ Index(pp00, 0, Local0) - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) Store(ObjectType(Local0), Debug) - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) Store(Derefof(Local0), Debug) - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00e)) { - err("", zFFF, 0x008, 0, 0, Local1, c00e) + err("", zFFF, __LINE__, 0, 0, Local1, c00e) } } @@ -121,15 +121,15 @@ Index(pp00, 0, Local0) - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) Store(ObjectType(Local0), Debug) - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) Store(Derefof(Local0), Debug) - CH03("", 0, 0x00b, 0, 0) + CH03("", 0, 0x00b, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c015)) { - err("", zFFF, 0x00c, 0, 0, Local1, c015) + err("", zFFF, __LINE__, 0, 0, Local1, c015) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl index 8002104..3579583 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl @@ -39,35 +39,35 @@ Name(b000, Buffer(2){0xff, 0xff}) Name(i000, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) CreateField(b000, 0, 16, bf00) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) CreateField(b000, 0, i000, bf01) - CH04("", 0, 0xff, 0, 0x003, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) CreateField(b000, 1, i000, bf02) - CH04("", 0, 0xff, 0, 0x005, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) CreateField(b000, 7, i000, bf03) - CH04("", 0, 0xff, 0, 0x007, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) CreateField(b000, 8, i000, bf04) - CH04("", 0, 0xff, 0, 0x009, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) CreateField(b000, 15, i000, bf05) - CH04("", 0, 0xff, 0, 0x00b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x00c, 0, 0) + CH03("", 0, 0x00c, __LINE__, 0) CreateField(b000, 16, i000, bf06) - CH04("", 0, 0xff, 0, 0x00d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x00e, 0, 0) + CH03("", 0, 0x00e, __LINE__, 0) Store("All CreateField-s finished", Debug) @@ -79,7 +79,7 @@ Store(bf05, Debug) Store(bf06, Debug) - CH04("", 0, 0xff, 0, 0x00f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) Store("All Store-to-Debug-s finished", Debug) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.for_iASL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.for_iASL.asl index a593663..c176315 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.for_iASL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.for_iASL.asl @@ -38,35 +38,35 @@ { Name(b000, Buffer(2){0xff, 0xff}) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) CreateField(b000, 0,16, bf00) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) CreateField(b000, 0, 0, bf01) - CH04("", 0, 0xff, 0, 0x003, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) CreateField(b000, 1, 0, bf02) - CH04("", 0, 0xff, 0, 0x005, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) CreateField(b000, 7, 0, bf03) - CH04("", 0, 0xff, 0, 0x007, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) CreateField(b000, 8, 0, bf04) - CH04("", 0, 0xff, 0, 0x009, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) CreateField(b000,15, 0, bf05) - CH04("", 0, 0xff, 0, 0x00b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x00c, 0, 0) + CH03("", 0, 0x00c, __LINE__, 0) CreateField(b000,16, 0, bf06) - CH04("", 0, 0xff, 0, 0x00d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) - CH03("", 0, 0x00e, 0, 0) + CH03("", 0, 0x00e, __LINE__, 0) Store("All CreateField-s finished", Debug) @@ -78,7 +78,7 @@ Store(bf05, Debug) Store(bf06, Debug) - CH04("", 0, 0xff, 0, 0x00f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) Store("All Store-to-Debug-s finished", Debug) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0123/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0123/DECL.asl index 53ccfb1..43330a0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0123/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0123/DECL.asl @@ -39,7 +39,7 @@ // a) StartIndex > 0xffffffff // c) Modulo(StartIndex, 0x100000000) < Size. - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(Match(p000, MEQ, 1, MEQ, 1, 0x100000001), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl index 6d9eff7..e02dec0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl @@ -41,17 +41,17 @@ // a) Index > 0xffffffff // c) Modulo(Index, 0x100000000) < Size. - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(Index(p000, 0x100000001), Local0) - CH04("", 1, 55, 0, 0x001, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04("", 1, 55, 0, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store(Index(b000, 0x100000002), Local0) - CH04("", 1, 54, 0, 0x003, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 1, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Store(Index(s000, 0x100000003), Local0) - CH04("", 1, 61, 0, 0x005, 0, 0) // AE_AML_STRING_LIMIT + CH04("", 1, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl index 61dd812..053cc21 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl @@ -45,7 +45,7 @@ Mid(arg1, arg2, arg3, Local0) if (LNotEqual(arg4, Local0)) { - err("", zFFF, 0x000, 0, 0, arg4, Local0) + err("", zFFF, __LINE__, 0, 0, arg4, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl index 924cbe1..07b0a7c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl @@ -41,10 +41,10 @@ Add(Local0, 1, Local7) if (LNotEqual(Local0, 7)) { - err("", zFFF, 0x000, 0, 0, Local0, 7) + err("", zFFF, __LINE__, 0, 0, Local0, 7) } if (LNotEqual(Local7, 8)) { - err("", zFFF, 0x000, 0, 0, Local7, 8) + err("", zFFF, __LINE__, 0, 0, Local7, 8) } Store("m000 finished", Debug) @@ -59,10 +59,10 @@ Add(arg0, 1, Local7) if (LNotEqual(arg0, 7)) { - err("", zFFF, 0x000, 0, 0, arg0, 7) + err("", zFFF, __LINE__, 0, 0, arg0, 7) } if (LNotEqual(Local7, 8)) { - err("", zFFF, 0x000, 0, 0, arg0, 8) + err("", zFFF, __LINE__, 0, 0, arg0, 8) } Store("m001 finished", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl index 91be6fc..fddb7ac 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl @@ -39,23 +39,23 @@ { Store(Index(pd11, 0, Local0), Local1) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(Add(Local0, 0), Local2) - CH04("", 1, 47, 0, 0x001, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store(Add(Local1, 0), Local2) - CH04("", 1, 47, 0, 0x003, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(Index(pd11, 1, Local0), Local1) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Store(Add(Local0, 0), Local2) - CH04("", 1, 47, 0, 0x005, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) Store(Add(Local1, 0), Local2) - CH04("", 1, 47, 0, 0x007, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // CopyObject @@ -64,28 +64,28 @@ { CopyObject(Index(pd11, 0, Local0), Local1) - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) Store(Add(Local0, 0), Local2) - CH04("", 1, 47, 0, 0x009, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) Store(Add(Local1, 0), Local2) - CH04("", 1, 47, 0, 0x00b, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(mf15) { - CH03("", 0, 0x00c, 0, 0) + CH03("", 0, 0x00c, __LINE__, 0) CopyObject(Index(pd11, 1, Local0), Local1) - CH03("", 0, 0x00d, 0, 0) + CH03("", 0, 0x00d, __LINE__, 0) Store(Add(Local0, 0), Local2) - CH04("", 1, 47, 0, 0x00e, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x00f, 0, 0) + CH03("", 0, 0x00f, __LINE__, 0) Store(Add(Local1, 0), Local2) - CH04("", 1, 47, 0, 0x010, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(mf16) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl index fab4f49..c34257d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl @@ -41,7 +41,7 @@ Method(mf17,, Serialized) Store(DerefOf(Local0), Local1) Store(Local1, Debug) if (LNotEqual(Local1, 0x1234)) { - err("", zFFF, 0x000, 0, 0, Local1, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local1, 0x1234) } } @@ -50,7 +50,7 @@ Method(mf18,, Serialized) Name(ref0, 0) Name(i000, 0x1234) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) CopyObject(RefOf(i000), ref0) Store("Before printing ref0", Debug) @@ -62,10 +62,10 @@ Method(mf18,, Serialized) Store("Before LNotEqual", Debug) if (LNotEqual(Local1, 0x1234)) { - err("", zFFF, 0x001, 0, 0, Local1, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local1, 0x1234) } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) } Method(mf9e,, Serialized) @@ -81,7 +81,7 @@ Method(mf9e,, Serialized) Name(ref0, 0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) CopyObject(RefOf(i000), ref0) mf88(DerefOf(ref0), c009, ii00, 1, 2, 1) @@ -95,7 +95,7 @@ Method(mf9e,, Serialized) CopyObject(RefOf(p000), ref0) mf88(DerefOf(ref0), c00c, ss00, 5, 6, 0) - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) } Method(mf9f,, Serialized) @@ -112,35 +112,35 @@ Method(mf9f,, Serialized) // Checkings - CH03("", 0, 0x026, 0, 0) + CH03("", 0, 0x026, __LINE__, 0) CopyObject(RefOf(e000), ref0) mf88(DerefOf(ref0), c00f, 0, 0x027, 0x028, 0) - CH03("", 0, 0x029, 0, 0) + CH03("", 0, 0x029, __LINE__, 0) CopyObject(RefOf(mx00), ref0) mf88(DerefOf(ref0), c011, 0, 0x02a, 0x02b, 0) if (y511) { - CH03("", 0, 0x02c, 0, 0) + CH03("", 0, 0x02c, __LINE__, 0) CopyObject(RefOf(d000), ref0) mf88(DerefOf(ref0), c00e, 0, 0x02d, 0x02e, 0) } if (y508) { - CH03("", 0, 0x02f, 0, 0) + CH03("", 0, 0x02f, __LINE__, 0) CopyObject(RefOf(tz00), ref0) mf88(DerefOf(ref0), c015, 0, 0x030, 0x031, 0) } - CH03("", 0, 0x032, 0, 0) + CH03("", 0, 0x032, __LINE__, 0) CopyObject(RefOf(pr00), ref0) mf88(DerefOf(ref0), c014, 0, 0x033, 0x034, 0) - CH03("", 0, 0x035, 0, 0) + CH03("", 0, 0x035, __LINE__, 0) CopyObject(RefOf(r000), ref0) mf88(DerefOf(ref0), c012, 0, 0x036, 0x037, 0) - CH03("", 0, 0x038, 0, 0) + CH03("", 0, 0x038, __LINE__, 0) CopyObject(RefOf(pw00), ref0) mf88(DerefOf(ref0), c013, 0, 0x039, 0x03a, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl index 2585311..b7a6006 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl @@ -51,14 +51,14 @@ mf1a(sd04) if (LNotEqual(sd04, "qwer0000")) { - err("", zFFF, 0x000, 0, 0, sd04, "qwer0000") + err("", zFFF, __LINE__, 0, 0, sd04, "qwer0000") } // Index of Buffer mf1a(bd08) if (LNotEqual(bd08, Buffer(4) {1,0x77,3,4})) { - err("", zFFF, 0x001, 0, 0, bd08, Buffer(4) {1,0x77,3,4}) + err("", zFFF, __LINE__, 0, 0, bd08, Buffer(4) {1,0x77,3,4}) } // Index of Package @@ -69,6 +69,6 @@ Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err("", zFFF, 0x002, 0, 0, Local1, 0x77) + err("", zFFF, __LINE__, 0, 0, Local1, 0x77) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl index 2ecd8e4..20e1699 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl @@ -61,7 +61,7 @@ Method(m126,, Serialized) Store(0xabcd0001, Index(p000, 0)) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0001) } /* @@ -71,19 +71,19 @@ Store to method invocation is not supported Store(0xabcd0004, m002()) Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0004)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0004) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0004) } Store(0xabcd0005, m003()) Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0005)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0005) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0005) } Store(0xabcd0006, m004(1)) Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0006) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0006) } */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl index 96faf8e..f0f1cb0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl @@ -36,12 +36,12 @@ { Store(arg0, Debug) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Add(arg0, 1, Local7) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) if (LNotEqual(Local7, 0x78)) { - err("", zFFF, 0x000, 0, 0, id12, 5) + err("", zFFF, __LINE__, 0, 0, id12, 5) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl index 4c22a09..2071ed5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl @@ -44,7 +44,7 @@ Store(RefOf(id13), Local0) mf21(Local0) if (LNotEqual(id13, 0x77)) { - err("", zFFF, 0x000, 0, 0, id13, 0x77) + err("", zFFF, __LINE__, 0, 0, id13, 0x77) } // Writing by Index to String @@ -52,7 +52,7 @@ Index(sd05, 1, Local0) mf21(Local0) if (LNotEqual(sd05, "qwer0000")) { - err("", zFFF, 0x001, 0, 0, sd05, "qwer0000") + err("", zFFF, __LINE__, 0, 0, sd05, "qwer0000") } // Writing by Index to Buffer @@ -60,7 +60,7 @@ Index(bd09, 1, Local0) mf21(Local0) if (LNotEqual(bd09, Buffer(4) {1,0x77,3,4})) { - err("", zFFF, 0x002, 0, 0, bd09, Buffer(4) {1,0x77,3,4}) + err("", zFFF, __LINE__, 0, 0, bd09, Buffer(4) {1,0x77,3,4}) } // Writing by Index to Package @@ -72,6 +72,6 @@ Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err("", zFFF, 0x003, 0, 0, Local1, 0x77) + err("", zFFF, __LINE__, 0, 0, Local1, 0x77) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl index 527a33e..6b117a6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl @@ -49,7 +49,7 @@ Store(Local6, Debug) if (LNotEqual(Local6, 0x11)) { - err("", zFFF, 0x000, 0, 0, Local6, 0x11) + err("", zFFF, __LINE__, 0, 0, Local6, 0x11) } Store("LocalX case of Method finished", Debug) @@ -72,7 +72,7 @@ Store(arg6, Debug) if (LNotEqual(arg6, 0x11)) { - err("", zFFF, 0x000, 0, 0, arg6, 0x11) + err("", zFFF, __LINE__, 0, 0, arg6, 0x11) } Store("ArgX case (1) of Method finished", Debug) @@ -95,7 +95,7 @@ Store(arg6, Debug) if (LNotEqual(arg6, 0x11)) { - err("", zFFF, 0x000, 0, 0, arg6, 0x11) + err("", zFFF, __LINE__, 0, 0, arg6, 0x11) } Store("ArgX case (2) of Method finished", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl index 9d7620d..0c2e816 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl @@ -381,7 +381,7 @@ Method(mfc6, 7, Serialized) Name(p000, Package(Multiply(num, 2)) {}) Name(p001, Package(Multiply(num, 2)) {}) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) /* Unpack arg2 */ @@ -4046,7 +4046,7 @@ Method(mfc6, 7, Serialized) */ mfcc(Local7, num, num, i000, AR21, 0x001) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) } /* @@ -4088,7 +4088,7 @@ Method(mfcc, 6, Serialized) } if (LNotEqual(Local2, i000)) { - err("", zFFF, arg5, 0, 0, Local2, i000) + err("", zFFF, __LINE__, 0, 0, Local2, i000) } Increment(i000) @@ -4135,7 +4135,7 @@ Method(mfce, 6, Serialized) } if (LNotEqual(Local2, arg3)) { - err("", zFFF, arg5, 0, 0, Local2, arg3) + err("", zFFF, __LINE__, 0, 0, Local2, arg3) } Increment(targ) @@ -4157,6 +4157,6 @@ Method(mfd8, 3) Store(DerefOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err("", zFFF, arg2, 0, 0, Local0, arg1) + err("", zFFF, __LINE__, 0, 0, Local0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl index d7fea13..ab055fd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl @@ -115,7 +115,7 @@ Method(mfcf,, Serialized) Store(DerefOf(Local1), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err("", zFFF, 0x300, 0, 0, Local0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0000) } } @@ -1671,43 +1671,43 @@ Method(mfeb,, Serialized) Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x301, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DerefOf(Index(arg1, 3)), Local0) if (LNotEqual(Local0, 0x13)) { - err("", zFFF, 0x302, 0, 0, Local0, 0x13) + err("", zFFF, __LINE__, 0, 0, Local0, 0x13) } Store(DerefOf(Index(arg2, 3)), Local0) if (LNotEqual(Local0, 0x23)) { - err("", zFFF, 0x303, 0, 0, Local0, 0x23) + err("", zFFF, __LINE__, 0, 0, Local0, 0x23) } Store(DerefOf(Index(arg3, 3)), Local0) if (LNotEqual(Local0, 0x33)) { - err("", zFFF, 0x304, 0, 0, Local0, 0x33) + err("", zFFF, __LINE__, 0, 0, Local0, 0x33) } Store(DerefOf(Index(arg4, 3)), Local0) if (LNotEqual(Local0, 0x43)) { - err("", zFFF, 0x305, 0, 0, Local0, 0x43) + err("", zFFF, __LINE__, 0, 0, Local0, 0x43) } Store(DerefOf(Index(arg5, 3)), Local0) if (LNotEqual(Local0, 0x53)) { - err("", zFFF, 0x306, 0, 0, Local0, 0x53) + err("", zFFF, __LINE__, 0, 0, Local0, 0x53) } Store(DerefOf(Index(arg6, 3)), Local0) if (LNotEqual(Local0, 0x63)) { - err("", zFFF, 0x307, 0, 0, Local0, 0x63) + err("", zFFF, __LINE__, 0, 0, Local0, 0x63) } Store(DerefOf(Index(p000, 14)), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x66)) { - err("", zFFF, 0x308, 0, 0, Local1, 0x66) + err("", zFFF, __LINE__, 0, 0, Local1, 0x66) } if (LEqual(cmd0, 1)) { @@ -1794,37 +1794,37 @@ Method(mfeb,, Serialized) Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, 0xd3)) { - err("", zFFF, 0x309, 0, 0, Local0, 0xd3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xd3) } Store(DerefOf(Index(arg1, 3)), Local0) if (LNotEqual(Local0, 0x73)) { - err("", zFFF, 0x30a, 0, 0, Local0, 0x73) + err("", zFFF, __LINE__, 0, 0, Local0, 0x73) } Store(DerefOf(Index(arg2, 3)), Local0) if (LNotEqual(Local0, 0x83)) { - err("", zFFF, 0x30b, 0, 0, Local0, 0x83) + err("", zFFF, __LINE__, 0, 0, Local0, 0x83) } Store(DerefOf(Index(arg3, 3)), Local0) if (LNotEqual(Local0, 0x93)) { - err("", zFFF, 0x30c, 0, 0, Local0, 0x93) + err("", zFFF, __LINE__, 0, 0, Local0, 0x93) } Store(DerefOf(Index(arg4, 3)), Local0) if (LNotEqual(Local0, 0xa3)) { - err("", zFFF, 0x30d, 0, 0, Local0, 0xa3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xa3) } Store(DerefOf(Index(arg5, 3)), Local0) if (LNotEqual(Local0, 0xb3)) { - err("", zFFF, 0x30e, 0, 0, Local0, 0xb3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xb3) } Store(DerefOf(Index(arg6, 3)), Local0) if (LNotEqual(Local0, 0xc3)) { - err("", zFFF, 0x30f, 0, 0, Local0, 0xc3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xc3) } Store(DerefOf(Index(p000, 14)), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0xc6)) { - err("", zFFF, 0x310, 0, 0, Local1, 0xc6) + err("", zFFF, __LINE__, 0, 0, Local1, 0xc6) } } } @@ -1920,37 +1920,37 @@ Method(mfeb,, Serialized) Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, 0xd3)) { - err("", zFFF, 0x311, 0, 0, Local0, 0xd3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xd3) } Store(DerefOf(Index(arg1, 3)), Local0) if (LNotEqual(Local0, 0x73)) { - err("", zFFF, 0x312, 0, 0, Local0, 0x73) + err("", zFFF, __LINE__, 0, 0, Local0, 0x73) } Store(DerefOf(Index(arg2, 3)), Local0) if (LNotEqual(Local0, 0x83)) { - err("", zFFF, 0x313, 0, 0, Local0, 0x83) + err("", zFFF, __LINE__, 0, 0, Local0, 0x83) } Store(DerefOf(Index(arg3, 3)), Local0) if (LNotEqual(Local0, 0x93)) { - err("", zFFF, 0x314, 0, 0, Local0, 0x93) + err("", zFFF, __LINE__, 0, 0, Local0, 0x93) } Store(DerefOf(Index(arg4, 3)), Local0) if (LNotEqual(Local0, 0xa3)) { - err("", zFFF, 0x315, 0, 0, Local0, 0xa3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xa3) } Store(DerefOf(Index(arg5, 3)), Local0) if (LNotEqual(Local0, 0xb3)) { - err("", zFFF, 0x316, 0, 0, Local0, 0xb3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xb3) } Store(DerefOf(Index(arg6, 3)), Local0) if (LNotEqual(Local0, 0xc3)) { - err("", zFFF, 0x317, 0, 0, Local0, 0xc3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xc3) } Store(DerefOf(Index(p000, 14)), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0xc6)) { - err("", zFFF, 0x318, 0, 0, Local1, 0xc6) + err("", zFFF, __LINE__, 0, 0, Local1, 0xc6) } } } @@ -2124,7 +2124,7 @@ Method(mf01,, Serialized) { Store(DerefOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err("", zFFF, 0x319, 0, 0, Local0, arg1) + err("", zFFF, __LINE__, 0, 0, Local0, arg1) } } @@ -2235,7 +2235,7 @@ Method(mf01,, Serialized) { Store(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, arg1)), 4)), 0)), Local0) if (LNotEqual(Local0, arg2)) { - err("", zFFF, 0x31a, 0, 0, Local0, arg2) + err("", zFFF, __LINE__, 0, 0, Local0, arg2) } } @@ -2248,7 +2248,7 @@ Method(mf01,, Serialized) { Store(DerefOf(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, arg1)), 4)), 0))), Local0) if (LNotEqual(Local0, arg2)) { - err("", zFFF, 0x31b, 0, 0, Local0, arg2) + err("", zFFF, __LINE__, 0, 0, Local0, arg2) } } @@ -2256,7 +2256,7 @@ Method(mf01,, Serialized) { Store(DerefOf(DerefOf(Index(arg0, arg1))), Local0) if (LNotEqual(Local0, arg2)) { - err("", zFFF, 0x31c, 0, 0, Local0, arg2) + err("", zFFF, __LINE__, 0, 0, Local0, arg2) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc2.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc2.asl index 839c5e6..dd6ef7c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc2.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc2.asl @@ -65,7 +65,7 @@ Method(mf02, 6, Serialized) Store(Index(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, i001)), i002)), i003)), i004), Local7) } else { - err("", zFFF, 0x400, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } @@ -89,7 +89,7 @@ Method(mf02, 6, Serialized) Store(Local7, Index(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg3, ii01)), ii02)), ii03)), ii04)) } else { - err("", zFFF, 0x401, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } } @@ -123,12 +123,12 @@ Method(mfec, 4, Serialized) Store(DerefOf(DerefOf(Index(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, i001)), i002)), i003)), i004))), Local7) } else { - err("", zFFF, 0x402, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } if (LNotEqual(Local7, arg3)) { - err("", zFFF, 0x403, 0, 0, Local7, arg3) + err("", zFFF, __LINE__, 0, 0, Local7, arg3) } } @@ -161,14 +161,14 @@ Method(mfed, 5, Serialized) Store(DerefOf(DerefOf(Index(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, i001)), i002)), i003)), i004))), Local7) } else { - err("", zFFF, 0x404, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } Store(DerefOf(Index(Local7, arg3)), Local0) if (LNotEqual(Local0, arg4)) { - err("", zFFF, 0x405, 0, 0, Local0, arg4) + err("", zFFF, __LINE__, 0, 0, Local0, arg4) } } @@ -292,7 +292,7 @@ Method(mfee,, Serialized) Store(DerefOf(Index(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, arg1)), arg2)), arg3)), arg4)), Local0) if (LNotEqual(Local0, arg5)) { - err("", zFFF, 0x406, 0, 0, Local0, arg5) + err("", zFFF, __LINE__, 0, 0, Local0, arg5) } } @@ -301,7 +301,7 @@ Method(mfee,, Serialized) Store(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, arg1)), arg2)), arg3)), Local0) if (LNotEqual(Local0, arg4)) { - err("", zFFF, 0x407, 0, 0, Local0, arg4) + err("", zFFF, __LINE__, 0, 0, Local0, arg4) } } @@ -309,7 +309,7 @@ Method(mfee,, Serialized) { Store(DerefOf(Index(DerefOf(Index(arg0, arg1)), arg2)), Local0) if (LNotEqual(Local0, arg3)) { - err("", zFFF, 0x408, 0, 0, Local0, arg3) + err("", zFFF, __LINE__, 0, 0, Local0, arg3) } } @@ -317,7 +317,7 @@ Method(mfee,, Serialized) { Store(DerefOf(Index(arg0, arg1)), Local0) if (LNotEqual(Local0, arg2)) { - err("", zFFF, 0x409, 0, 0, Local0, arg2) + err("", zFFF, __LINE__, 0, 0, Local0, arg2) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Mix.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Mix.asl index 5b8b0ae..3b8fa2a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Mix.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Mix.asl @@ -37,7 +37,7 @@ Method(m80a, 4) { Store(DerefOf(DerefOf(Index(arg0, arg1))), Local0) if (LNotEqual(Local0, arg2)) { - err("", zFFF, arg3, 0, 0, Local0, arg2) + err("", zFFF, __LINE__, 0, 0, Local0, arg2) } } @@ -355,7 +355,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x10)) { - err("", zFFF, 0x534, 0, 0, Local1, 0x10) + err("", zFFF, __LINE__, 0, 0, Local1, 0x10) } /* @@ -366,7 +366,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x10)) { - err("", zFFF, 0x534, 0, 0, Local1, 0x10) + err("", zFFF, __LINE__, 0, 0, Local1, 0x10) } Store(5, rd00) @@ -377,7 +377,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x15)) { - err("", zFFF, 0x536, 0, 0, Local1, 0x15) + err("", zFFF, __LINE__, 0, 0, Local1, 0x15) } /* @@ -396,7 +396,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x10)) { - err("", zFFF, 0x538, 0, 0, Local1, 0x10) + err("", zFFF, __LINE__, 0, 0, Local1, 0x10) } /* @@ -407,7 +407,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x10)) { - err("", zFFF, 0x539, 0, 0, Local1, 0x10) + err("", zFFF, __LINE__, 0, 0, Local1, 0x10) } Store(5, rd00) @@ -418,7 +418,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x15)) { - err("", zFFF, 0x53b, 0, 0, Local1, 0x15) + err("", zFFF, __LINE__, 0, 0, Local1, 0x15) } /* @@ -436,7 +436,7 @@ Method(m80b,, Serialized) Store(Index(p002, wr00), Index(p003, wr00)) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x53d, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } /* @@ -447,7 +447,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x53e, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } Store(6, rd00) @@ -458,7 +458,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x16)) { - err("", zFFF, 0x540, 0, 0, Local1, 0x16) + err("", zFFF, __LINE__, 0, 0, Local1, 0x16) } /* @@ -476,7 +476,7 @@ Method(m80b,, Serialized) Store(Index(p001, wr00), Index(p003, wr00)) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x542, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } /* @@ -487,7 +487,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x543, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } Store(6, rd00) @@ -498,7 +498,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x16)) { - err("", zFFF, 0x545, 0, 0, Local1, 0x16) + err("", zFFF, __LINE__, 0, 0, Local1, 0x16) } /* @@ -517,7 +517,7 @@ Method(m80b,, Serialized) Store(Index(p001, wr00), Index(p001, wr01)) Store(DerefOf(DerefOf(DerefOf(Index(p001, wr01)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x547, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } /* @@ -528,7 +528,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p001, wr01)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x548, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } Store(6, rd00) @@ -539,7 +539,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p001, wr01)))), Local1) if (LNotEqual(Local1, 0x16)) { - err("", zFFF, 0x54a, 0, 0, Local1, 0x16) + err("", zFFF, __LINE__, 0, 0, Local1, 0x16) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl index 47984cc..45d8548 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl @@ -363,7 +363,7 @@ Method(mfe2, 6, Serialized) if (LNotEqual(arg4, Local1)) { Store(1, Local7) - err("", zFFF, 0x201, 0, 0, arg4, Local1) + err("", zFFF, __LINE__, 0, 0, arg4, Local1) Store("================= Params:", debug) Store(arg0, Debug) Store(arg1, Debug) @@ -1836,7 +1836,7 @@ SRMT("verify-4-of-pHR0-by-cross-refs-of-pHR2") Method(mfdb) { - CH03("", 0, 0x200, 0, 0) + CH03("", 0, 0x200, __LINE__, 0) mfdc() - CH03("", 0, 0x202, 0, 0) + CH03("", 0, 0x202, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl index c8fe35d..69a8e8f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl @@ -42,6 +42,6 @@ CopyObject(b000, b001) if (LNotEqual(b000, b001)) { - err("", zFFF, 0x000, 0, 0, b000, b001) + err("", zFFF, __LINE__, 0, 0, b000, b001) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl index bc99554..1ba674d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl @@ -42,12 +42,12 @@ ToBCD(12345678, STR0) Store(ObjectType(STR0), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } FromBCD(0x12345678, STR1) Store(ObjectType(STR1), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x001, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl index 6882cad..ca69ce9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl @@ -42,6 +42,6 @@ Store(0xfedcba9876543210, bf00) if (LNotEqual(bf00, Buffer(9){0x10, 0x32, 0x54, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00})) { - err("", zFFF, 0x000, 0, 0, bf00, Buffer(9){0x10, 0x32, 0x54, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00}) + err("", zFFF, __LINE__, 0, 0, bf00, Buffer(9){0x10, 0x32, 0x54, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00}) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl index f0ef7b8..ac327b4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl @@ -37,7 +37,7 @@ Method(mf2a) { if (LNotEqual(id1b, 0xfedcba9876543210)) { - err("", zFFF, 0x000, 0, 0, id1b, 0xfedcba9876543210) + err("", zFFF, __LINE__, 0, 0, id1b, 0xfedcba9876543210) } else { Store("Ok, initially id1b = 0xfedcba9876543210", Debug) @@ -46,7 +46,7 @@ Store(id1b, Local0) if (LNotEqual(id1b, 0xfedcba9876543210)) { - err("", zFFF, 0x001, 0, 0, id1b, 0xfedcba9876543210) + err("", zFFF, __LINE__, 0, 0, id1b, 0xfedcba9876543210) } } } @@ -57,7 +57,7 @@ Store(Refof(id1c), Local0) if (LNotEqual(id1c, 0xfedcba9876543211)) { - err("", zFFF, 0x002, 0, 0, id1c, 0xfedcba9876543211) + err("", zFFF, __LINE__, 0, 0, id1c, 0xfedcba9876543211) } else { Store("Ok, initially id1c = 0xfedcba9876543211", Debug) @@ -66,7 +66,7 @@ Store(DeRefof(Local0), Local1) if (LNotEqual(id1c, 0xfedcba9876543211)) { - err("", zFFF, 0x003, 0, 0, id1c, 0xfedcba9876543211) + err("", zFFF, __LINE__, 0, 0, id1c, 0xfedcba9876543211) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl index 9909b88..7fa2fe8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl @@ -51,16 +51,16 @@ Store(mf30(1, 2), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x000, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(mf31("FFFF"), Local0) if (LNotEqual(Local0, "FFFF")) { - err("", zFFF, 0x001, 0, 0, Local0, "FFFF") + err("", zFFF, __LINE__, 0, 0, Local0, "FFFF") } Store(mf32(3, "F", Buffer(1){0xff}), Local0) if (LNotEqual(Local0, 0x111)) { - err("", zFFF, 0x002, 0, 0, Local0, 0x111) + err("", zFFF, __LINE__, 0, 0, Local0, 0x111) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl index 9566e6b..1bdac18 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl @@ -55,21 +55,21 @@ Method(mf38) { Store(mf34(0), Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x000, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Store(mf35(1), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x000, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(mf36(2), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x000, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(mf37("3"), Local0) if (LNotEqual(Local0, "3")) { - err("", zFFF, 0x000, 0, 0, Local0, "3") + err("", zFFF, __LINE__, 0, 0, Local0, "3") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl index 6133de3..ecf6260 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl @@ -48,6 +48,6 @@ { Store(mf3a(Buffer(1) {10}), Local0) if (LNotEqual(Local0, 0x12389)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x12389) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12389) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl index 40ff10f..772aa46 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl @@ -47,6 +47,6 @@ Method(mf3d) { Store(mf3c(), Local0) if (LNotEqual(Local0, "mf3czxcvbnm")) { - err("", zFFF, 0x000, 0, 0, Local0, "mf3czxcvbnm") + err("", zFFF, __LINE__, 0, 0, Local0, "mf3czxcvbnm") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl index 96c1f2e..03123b1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl @@ -60,11 +60,11 @@ Method(md8a,, Serialized) Store(0, Local1) if (Acquire(mx00, 1)) { - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store(1, Local0) if (Acquire(mx01, 1)) { - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store(1, Local1) } @@ -93,12 +93,12 @@ Method(md8b,, Serialized) Store(0, Local1) if (Acquire(mx00, 1)) { - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store(1, Local0) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) Acquire(mx01, 1) - CH04("", 0, 64, 0, 0x004, 0, 0) // AE_AML_MUTEX_ORDER + CH04("", 0, 64, 0, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER } if (Local0) { Release(mx00) @@ -123,12 +123,12 @@ Method(md8c,, Serialized) Store(0, Local1) if (Acquire(mx00, 1)) { - err("", zFFF, 0x005, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store(1, Local0) - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) mx01() - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) } if (Local0) { @@ -154,12 +154,12 @@ Method(md8d,, Serialized) Store(0, Local1) if (Acquire(mx00, 1)) { - err("", zFFF, 0x008, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store(1, Local0) - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) mx01() - CH04("", 0, 64, 0, 0x00a, 0, 0) // AE_AML_MUTEX_ORDER + CH04("", 0, 64, 0, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER } if (Local0) { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl index c9596c5..0e135ce 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl @@ -52,7 +52,7 @@ Concatenate(b000, b001, Local0) if (LNotEqual(Local0, Buffer(7){1,2,3,4,5,6,7})) { - err("", zFFF, 0x000, 0, 0, Local0, Buffer(7){1,2,3,4,5,6,7}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer(7){1,2,3,4,5,6,7}) } // 2. @@ -67,7 +67,7 @@ Concatenate(Local0, b001, Local0) if (LNotEqual(Local0, Buffer(7){1,2,3,4,5,6,7})) { - err("", zFFF, 0x001, 0, 0, Local0, Buffer(7){1,2,3,4,5,6,7}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer(7){1,2,3,4,5,6,7}) } } @@ -89,7 +89,7 @@ Concatenate(s000, s001, Local0) if (LNotEqual(Local0, "String1")) { - err("", zFFF, 0x002, 0, 0, Local0, "String1") + err("", zFFF, __LINE__, 0, 0, Local0, "String1") } // 4. @@ -104,7 +104,7 @@ Concatenate(Local0, s001, Local0) if (LNotEqual(Local0, "String1")) { - err("", zFFF, 0x003, 0, 0, Local0, "String1") + err("", zFFF, __LINE__, 0, 0, Local0, "String1") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl index 9257874..61d14fa 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl @@ -39,9 +39,9 @@ Method(md01,, Serialized) Name(pppp, Package(1){Buffer() {1,2,3,4}}) Name(i000, 0x5678) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(pppp, i000) - CH04("", 0, 47, 0, 0x001, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // Package --> String @@ -51,9 +51,9 @@ Method(md02,, Serialized) Name(pppp, Package(1){Buffer() {1,2,3,4}}) Name(s000, "String") - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store(pppp, s000) - CH04("", 0, 47, 0, 0x003, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // Package --> Buffer @@ -63,16 +63,16 @@ Method(md03,, Serialized) Name(pppp, Package(1){Buffer() {1,2,3,4}}) Name(b000, Buffer() {1,2,3,4}) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Store(pppp, b000) - CH04("", 0, 47, 0, 0x005, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(md04) { - CH03("", 0, 0xf00, 0, 0) + CH03("", 0, 0xf00, __LINE__, 0) md01() md02() md03() - CH03("", 0, 0xf01, 0, 0) + CH03("", 0, 0xf01, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Mix.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Mix.asl index 7f21344..82dceb2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Mix.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Mix.asl @@ -48,69 +48,69 @@ Method(md05,, Serialized) Store(Store(Store(Store(Store(Store(Store(Store(0x1a2b3c4d, i000), i001), i002), i003), i004), i005), d000), r000) if (LNotEqual(i000, 0x1a2b3c4d)) { - err("", zFFF, 0x100, 0, 0, i000, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i000, 0x1a2b3c4d) } if (LNotEqual(i001, 0x1a2b3c4d)) { - err("", zFFF, 0x101, 0, 0, i001, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i001, 0x1a2b3c4d) } if (LNotEqual(i002, 0x1a2b3c4d)) { - err("", zFFF, 0x102, 0, 0, i002, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i002, 0x1a2b3c4d) } if (LNotEqual(i003, 0x1a2b3c4d)) { - err("", zFFF, 0x103, 0, 0, i003, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i003, 0x1a2b3c4d) } if (LNotEqual(i004, 0x1a2b3c4d)) { - err("", zFFF, 0x104, 0, 0, i004, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i004, 0x1a2b3c4d) } if (LNotEqual(i005, 0x1a2b3c4d)) { - err("", zFFF, 0x105, 0, 0, i005, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i005, 0x1a2b3c4d) } Store(Refof(d000), Local0) if (LNotEqual(DerefOf(Local0), 0x1a2b3c4d)) { - err("", zFFF, 0x106, 0, 0, d000, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, d000, 0x1a2b3c4d) } Store(Refof(r000), Local0) if (LNotEqual(DerefOf(Local0), 0x1a2b3c4d)) { - err("", zFFF, 0x107, 0, 0, r000, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, r000, 0x1a2b3c4d) } Store(Store(Store(Store(Store(Store(Store(Store(Store(0x91827364, e000), mx00), tz00), pr00), pw00), m000), i000), d000), r000) Store(Refof(e000), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x108, 0, 0, e000, 0x91827364) + err("", zFFF, __LINE__, 0, 0, e000, 0x91827364) } Store(Refof(mx00), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x109, 0, 0, mx00, 0x91827364) + err("", zFFF, __LINE__, 0, 0, mx00, 0x91827364) } Store(Refof(tz00), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10a, 0, 0, tz00, 0x91827364) + err("", zFFF, __LINE__, 0, 0, tz00, 0x91827364) } Store(Refof(pr00), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10b, 0, 0, pr00, 0x91827364) + err("", zFFF, __LINE__, 0, 0, pr00, 0x91827364) } Store(Refof(pw00), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10c, 0, 0, pw00, 0x91827364) + err("", zFFF, __LINE__, 0, 0, pw00, 0x91827364) } Store(Refof(m000), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10d, 0, 0, m000, 0x91827364) + err("", zFFF, __LINE__, 0, 0, m000, 0x91827364) } Store(Refof(i000), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10e, 0, 0, i000, 0x91827364) + err("", zFFF, __LINE__, 0, 0, i000, 0x91827364) } Store(Refof(d000), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10f, 0, 0, d000, 0x91827364) + err("", zFFF, __LINE__, 0, 0, d000, 0x91827364) } Store(Refof(r000), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x110, 0, 0, r000, 0x91827364) + err("", zFFF, __LINE__, 0, 0, r000, 0x91827364) } } @@ -136,55 +136,55 @@ Method(md06,, Serialized) Store(Store(Store(Store(Store(Store(i006, i000), i001), i002), i003), i004), i005) if (LNotEqual(i006, i000)) { - err("", zFFF, 0x111, 0, 0, i006, i000) + err("", zFFF, __LINE__, 0, 0, i006, i000) } if (LNotEqual(i006, i001)) { - err("", zFFF, 0x112, 0, 0, i006, i001) + err("", zFFF, __LINE__, 0, 0, i006, i001) } if (LNotEqual(i006, i002)) { - err("", zFFF, 0x113, 0, 0, i006, i002) + err("", zFFF, __LINE__, 0, 0, i006, i002) } if (LNotEqual(i006, i003)) { - err("", zFFF, 0x114, 0, 0, i006, i003) + err("", zFFF, __LINE__, 0, 0, i006, i003) } if (LNotEqual(i006, i004)) { - err("", zFFF, 0x115, 0, 0, i006, i004) + err("", zFFF, __LINE__, 0, 0, i006, i004) } if (LNotEqual(i006, i005)) { - err("", zFFF, 0x116, 0, 0, i006, i005) + err("", zFFF, __LINE__, 0, 0, i006, i005) } if (LNotEqual(i006, i006)) { - err("", zFFF, 0x117, 0, 0, i006, i006) + err("", zFFF, __LINE__, 0, 0, i006, i006) } Store(Store(Store(Store(Store(Store(Store(i006, e000), mx00), tz00), pr00), pw00), m000), i000) Store(Refof(e000), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x118, 0, 0, e000, i006) + err("", zFFF, __LINE__, 0, 0, e000, i006) } Store(Refof(mx00), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x119, 0, 0, mx00, i006) + err("", zFFF, __LINE__, 0, 0, mx00, i006) } Store(Refof(tz00), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x11a, 0, 0, tz00, i006) + err("", zFFF, __LINE__, 0, 0, tz00, i006) } Store(Refof(pr00), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x11b, 0, 0, pr00, i006) + err("", zFFF, __LINE__, 0, 0, pr00, i006) } Store(Refof(pw00), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x11c, 0, 0, pw00, i006) + err("", zFFF, __LINE__, 0, 0, pw00, i006) } Store(Refof(m000), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x11d, 0, 0, m000, i006) + err("", zFFF, __LINE__, 0, 0, m000, i006) } Store(Refof(i000), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x11e, 0, 0, i000, i006) + err("", zFFF, __LINE__, 0, 0, i000, i006) } } @@ -200,12 +200,12 @@ Method(md68,, Serialized) Store(ObjectType(DeRefof(Local7)), Local0) if (LNotEqual(Local0, c00f)) { - err("", zFFF, 0x11f, 0, 0, Local0, c00f) + err("", zFFF, __LINE__, 0, 0, Local0, c00f) } Store(Derefof(Index(p000, 0)), Local6) Store(ObjectType(DeRefof(Local6)), Local0) if (LNotEqual(Local0, c00f)) { - err("", zFFF, 0x120, 0, 0, Local0, c00f) + err("", zFFF, __LINE__, 0, 0, Local0, c00f) } Store(i000, OOO2) @@ -214,32 +214,32 @@ Method(md68,, Serialized) Store(DeRefof(Refof(OOO2)), Local0) if (LNotEqual(Local0, 0x61)) { - err("", zFFF, 0x121, 0, 0, Local0, 0x61) + err("", zFFF, __LINE__, 0, 0, Local0, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x122, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } Store(ObjectType(DeRefof(Local7)), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x123, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } Store(Refof(OOO2), Local7) Store(ObjectType(DeRefof(Local7)), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x124, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } Store(ObjectType(OOO2), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x125, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } Store(Derefof(Index(p000, 0)), Local7) Store(ObjectType(DeRefof(Local7)), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x126, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } } @@ -270,50 +270,50 @@ Method(md69,, Serialized) Store(DeRefof(Refof(OOO2)), Local0) if (LNotEqual(Local0, 0x61)) { - err("", zFFF, 0x127, 0, 0, Local0, 0x61) + err("", zFFF, __LINE__, 0, 0, Local0, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x128, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } // Are the locals save? Store(DerefOf(Local1), Local0) if (LNotEqual(Local0, 0xabcd0011)) { - err("", zFFF, 0x129, 0, 0, Local0, 0xabcd0011) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0011) } Store(DerefOf(Local2), Local0) if (LNotEqual(Local0, 0xabcd0012)) { - err("", zFFF, 0x12a, 0, 0, Local0, 0xabcd0012) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0012) } Store(DerefOf(Local3), Local0) if (LNotEqual(Local0, 0xabcd0013)) { - err("", zFFF, 0x12b, 0, 0, Local0, 0xabcd0013) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0013) } Store(DerefOf(Local4), Local0) if (LNotEqual(Local0, 0xabcd0014)) { - err("", zFFF, 0x12c, 0, 0, Local0, 0xabcd0014) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0014) } Store(DerefOf(Local5), Local0) if (LNotEqual(Local0, 0xabcd0015)) { - err("", zFFF, 0x12d, 0, 0, Local0, 0xabcd0015) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0015) } Store(DerefOf(Local6), Local0) if (LNotEqual(Local0, 0xabcd0016)) { - err("", zFFF, 0x12e, 0, 0, Local0, 0xabcd0016) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0016) } Store(DerefOf(Local7), Local0) if (LNotEqual(Local0, 0xabcd0017)) { - err("", zFFF, 0x12f, 0, 0, Local0, 0xabcd0017) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0017) } } Method(md07) { - CH03("", 0, 0xf02, 0, 0) + CH03("", 0, 0xf02, __LINE__, 0) md05() md06() md68() md69() - CH03("", 0, 0xf03, 0, 0) + CH03("", 0, 0xf03, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToBuffer.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToBuffer.asl index 40f6b35..13e40a3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToBuffer.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToBuffer.asl @@ -42,10 +42,10 @@ Method(md08,, Serialized) Store (0x61, b000) if (LNotEqual(b000, Buffer() {0x61,0,0,0})) { - err("", zFFF, 0x200, 0, 0, b000, Buffer() {0x61,0,0,0}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {0x61,0,0,0}) } if (LNotEqual(i000, 0xabcd)) { - err("", zFFF, 0x201, 0, 0, i000, 0xabcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd) } } @@ -60,10 +60,10 @@ Method(md09,, Serialized) Store("ADb", b000) if (LNotEqual(b000, Buffer() {0x41,0x44,0x62,0})) { - err("", zFFF, 0x202, 0, 0, b000, Buffer() {0x41,0x44,0x62,0}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {0x41,0x44,0x62,0}) } if (LNotEqual(s000, "zxcvbqwertynm")) { - err("", zFFF, 0x203, 0, 0, s000, "zxcvbqwertynm") + err("", zFFF, __LINE__, 0, 0, s000, "zxcvbqwertynm") } } @@ -78,10 +78,10 @@ Method(md0a,, Serialized) Store (Buffer() {5,6}, b001) if (LNotEqual(b001, Buffer() {5,6,0,0})) { - err("", zFFF, 0x204, 0, 0, b001, Buffer() {5,6,0,0}) + err("", zFFF, __LINE__, 0, 0, b001, Buffer() {5,6,0,0}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x205, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -97,7 +97,7 @@ Method(md0b,, Serialized) Store (0x61, b000) if (LNotEqual(b000, Buffer() {0x61,0,0,0})) { - err("", zFFF, 0x206, 0, 0, b000, Buffer() {0x61,0,0,0}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {0x61,0,0,0}) } } @@ -111,7 +111,7 @@ Method(md0c,, Serialized) Store("ADb", b000) if (LNotEqual(b000, Buffer() {0x41,0x44,0x62,0})) { - err("", zFFF, 0x207, 0, 0, b000, Buffer() {0x41,0x44,0x62,0}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {0x41,0x44,0x62,0}) } } @@ -125,18 +125,18 @@ Method(md0d,, Serialized) Store (Buffer() {5,6}, b001) if (LNotEqual(b001, Buffer() {5,6,0,0})) { - err("", zFFF, 0x208, 0, 0, b001, Buffer() {5,6,0,0}) + err("", zFFF, __LINE__, 0, 0, b001, Buffer() {5,6,0,0}) } } Method(m00e) { - CH03("", 0, 0xf04, 0, 0) + CH03("", 0, 0xf04, __LINE__, 0) md08() md09() md0a() md0b() md0c() md0d() - CH03("", 0, 0xf05, 0, 0) + CH03("", 0, 0xf05, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDevice.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDevice.asl index 7799e1f..b9ce0b1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDevice.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDevice.asl @@ -44,10 +44,10 @@ Method(md0f,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x300, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x301, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md10,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x302, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x303, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md11,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x304, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x305, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md12,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x306, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x307, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x308, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x309, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x30a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x30b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x30c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x30d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md13,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x30e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md14,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x30f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md15,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x310, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,25 +211,25 @@ Method(md16,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x311, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x312, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x313, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x314, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } Method(md17) { - CH03("", 0, 0xf06, 0, 0) + CH03("", 0, 0xf06, __LINE__, 0) md0f() md10() md11() @@ -238,5 +238,5 @@ Method(md17) md14() md15() md16() - CH03("", 0, 0xf07, 0, 0) + CH03("", 0, 0xf07, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDeviceGlob.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDeviceGlob.asl index b8ac971..cbdb6b0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDeviceGlob.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDeviceGlob.asl @@ -45,10 +45,10 @@ Method(md5b,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd00, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(id00, 0xe0385bcd)) { - err("", zFFF, 0xd01, 0, 0, id00, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, id00, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md5c,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xd02, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(sd00, "String")) { - err("", zFFF, 0xd03, 0, 0, sd00, "String") + err("", zFFF, __LINE__, 0, 0, sd00, "String") } } @@ -86,10 +86,10 @@ Method(md5d,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer(32) {1,2,3,0x61})) { - err("", zFFF, 0xd04, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(bd00, Buffer(32) {1,2,3,4})) { - err("", zFFF, 0xd05, 0, 0, bd00, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, bd00, Buffer() {1,2,3,4}) } } @@ -107,38 +107,38 @@ Method(md5e,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xd06, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xd07, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xd08, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd09, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pd00 Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0xd0a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0xd0b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0xd0c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0xd0d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -154,10 +154,10 @@ Method(md5f) Store(DeRefof(Refof(dd00)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd0e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(id00, 0xe0385bcd)) { - err("", zFFF, 0xd0f, 0, 0, id00, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, id00, 0xe0385bcd) } } @@ -175,10 +175,10 @@ Method(md60,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xd10, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(sd00, "String")) { - err("", zFFF, 0xd11, 0, 0, sd00, "String") + err("", zFFF, __LINE__, 0, 0, sd00, "String") } } @@ -195,10 +195,10 @@ Method(md61,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer(32) {1,2,3,0x61})) { - err("", zFFF, 0xd12, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(bd00, Buffer(32) {1,2,3,4})) { - err("", zFFF, 0xd13, 0, 0, bd00, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, bd00, Buffer() {1,2,3,4}) } } @@ -216,38 +216,38 @@ Method(md62,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xd14, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xd15, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xd16, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd17, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pd00 Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0xd18, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0xd19, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0xd1a, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0xd1b, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -265,10 +265,10 @@ Method(md63,, Serialized) Store(DeRefof(Refof(dd04)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd1c, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0xd1d, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -286,10 +286,10 @@ Method(md64,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xd1e, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0xd1f, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -306,10 +306,10 @@ Method(md65,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0xd20, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0xd21, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -327,44 +327,44 @@ Method(md66,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xd22, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xd23, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xd24, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd25, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0xd26, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0xd27, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0xd28, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0xd29, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } Method(md67) { - CH03("", 0, 0xf08, 0, 0) + CH03("", 0, 0xf08, __LINE__, 0) md5b() md5c() md5d() @@ -377,5 +377,5 @@ Method(md67) md64() md65() md66() - CH03("", 0, 0xf09, 0, 0) + CH03("", 0, 0xf09, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToEvent.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToEvent.asl index 7b09b41..7a85af4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToEvent.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToEvent.asl @@ -44,10 +44,10 @@ Method(md18,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x400, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x401, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md19,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x402, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x403, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md1a,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x404, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x405, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md1b,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x406, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x407, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x408, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x409, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x40a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x40b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x40c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x40d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md1c,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x40e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md1d,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x40f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md1e,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x410, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,25 +211,25 @@ Method(md1f,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x411, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x412, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x413, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x414, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } Method(md20) { - CH03("", 0, 0xf0a, 0, 0) + CH03("", 0, 0xf0a, __LINE__, 0) md18() md19() md1a() @@ -238,5 +238,5 @@ Method(md20) md1d() md1e() md1f() - CH03("", 0, 0xf0b, 0, 0) + CH03("", 0, 0xf0b, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToInteger.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToInteger.asl index 3a435cf..d4af3a0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToInteger.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToInteger.asl @@ -42,10 +42,10 @@ Method(md59,, Serialized) Store (0x61, i001) if (LNotEqual(i001, 0x61)) { - err("", zFFF, 0x500, 0, 0, i001, 0x61) + err("", zFFF, __LINE__, 0, 0, i001, 0x61) } if (LNotEqual(i000, 0)) { - err("", zFFF, 0x501, 0, 0, i000, 0) + err("", zFFF, __LINE__, 0, 0, i000, 0) } } @@ -60,10 +60,10 @@ Method(md21,, Serialized) Store(0x61, i000) if (LNotEqual(i000, 0x61)) { - err("", zFFF, 0x502, 0, 0, i000, 0x61) + err("", zFFF, __LINE__, 0, 0, i000, 0x61) } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x503, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -78,18 +78,18 @@ Method(md22,, Serialized) Store (0x61, i000) if (LNotEqual(i000, 0x61)) { - err("", zFFF, 0x504, 0, 0, i000, 0x61) + err("", zFFF, __LINE__, 0, 0, i000, 0x61) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x505, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } Method(md23) { - CH03("", 0, 0xf0c, 0, 0) + CH03("", 0, 0xf0c, __LINE__, 0) md59() md21() md22() - CH03("", 0, 0xf0d, 0, 0) + CH03("", 0, 0xf0d, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToMutex.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToMutex.asl index 1953e87..5905b4e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToMutex.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToMutex.asl @@ -44,10 +44,10 @@ Method(md24,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x600, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x601, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md25,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x602, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x603, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md26,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x604, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x605, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md27,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x606, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x607, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x608, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x609, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x60a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x60b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x60c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x60d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md28,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x60e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md29,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x60f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md2a,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x610, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,25 +211,25 @@ Method(md2b,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x611, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x612, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x613, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x614, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } Method(md2c) { - CH03("", 0, 0xf0e, 0, 0) + CH03("", 0, 0xf0e, __LINE__, 0) md24() md25() md26() @@ -238,5 +238,5 @@ Method(md2c) md29() md2a() md2b() - CH03("", 0, 0xf0f, 0, 0) + CH03("", 0, 0xf0f, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPackage.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPackage.asl index a1e61f1..46f5a32 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPackage.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPackage.asl @@ -44,10 +44,10 @@ Method(md2d,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x700, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x701, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -65,10 +65,10 @@ Method(md2e,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x702, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x703, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -86,10 +86,10 @@ Method(md2f,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x704, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x705, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -107,47 +107,47 @@ Method(md30,, Serialized) Store(DeRefof(Index(DerefOf(Index(OOO2, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x706, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(OOO2, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x707, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(OOO2, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x708, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(OOO2, 0)), 3)), Local0) if (LNotEqual(Local0, 0x61)) { - err("", zFFF, 0x709, 0, 0, Local0, 0x61) + err("", zFFF, __LINE__, 0, 0, Local0, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x70a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x70b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x70c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x70d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } Method(md31) { - CH03("", 0, 0xf10, 0, 0) + CH03("", 0, 0xf10, __LINE__, 0) md2d() md2e() md2f() md30() - CH03("", 0, 0xf11, 0, 0) + CH03("", 0, 0xf11, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPowerRes.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPowerRes.asl index 9b50e38..7f07e3c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPowerRes.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPowerRes.asl @@ -44,10 +44,10 @@ Method(md32,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x800, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x801, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md33,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x802, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x803, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md34,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x804, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x805, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md35,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x806, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x807, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x808, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x809, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x80a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x80b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x80c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x80d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md36,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x80e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md37,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x80f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md38,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x810, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,25 +211,25 @@ Method(md39,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x811, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x812, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x813, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x814, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } Method(md3a) { - CH03("", 0, 0xf12, 0, 0) + CH03("", 0, 0xf12, __LINE__, 0) md32() md33() md34() @@ -238,5 +238,5 @@ Method(md3a) md37() md38() md39() - CH03("", 0, 0xf13, 0, 0) + CH03("", 0, 0xf13, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToProcessor.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToProcessor.asl index c2cf68c..356dc13 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToProcessor.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToProcessor.asl @@ -44,10 +44,10 @@ Method(md3b,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x900, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x901, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md3c,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x902, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x903, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md3d,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x904, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x905, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md3e,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x906, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x907, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x908, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x909, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x90a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x90b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x90c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x90d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md3f,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x90e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md40,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x90f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md41,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x910, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,25 +211,25 @@ Method(md42,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x911, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x912, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x913, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x914, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } Method(md43) { - CH03("", 0, 0xf14, 0, 0) + CH03("", 0, 0xf14, __LINE__, 0) md3b() md3c() md3d() @@ -238,5 +238,5 @@ Method(md43) md40() md41() md42() - CH03("", 0, 0xf15, 0, 0) + CH03("", 0, 0xf15, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToRegion.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToRegion.asl index a801555..36acd5e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToRegion.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToRegion.asl @@ -44,10 +44,10 @@ Method(md44,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xa00, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0xa01, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md45,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xa02, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0xa03, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md46,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0xa04, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0xa05, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md47,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xa06, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xa07, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xa08, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xa09, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0xa0a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0xa0b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0xa0c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0xa0d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md48,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xa0e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md49,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xa0f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md4a,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0xa10, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,25 +211,25 @@ Method(md4b,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xa11, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xa12, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xa13, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xa14, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } Method(md4c) { - CH03("", 0, 0xf16, 0, 0) + CH03("", 0, 0xf16, __LINE__, 0) md44() md45() md46() @@ -238,5 +238,5 @@ Method(md4c) md49() md4a() md4b() - CH03("", 0, 0xf17, 0, 0) + CH03("", 0, 0xf17, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToString.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToString.asl index e1c4a0e..5c5adb5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToString.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToString.asl @@ -42,10 +42,10 @@ Method(md4d,, Serialized) Store (0x61, s000) if (LNotEqual(s000, 0x61)) { - err("", zFFF, 0xb00, 0, 0, s000, 0x61) + err("", zFFF, __LINE__, 0, 0, s000, 0x61) } if (LNotEqual(i000, 0xabcd)) { - err("", zFFF, 0xb01, 0, 0, i000, 0xabcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd) } } @@ -60,10 +60,10 @@ Method(md4e,, Serialized) Store("ADb", s001) if (LNotEqual(s001, "ADb")) { - err("", zFFF, 0xb02, 0, 0, s001, "ADb") + err("", zFFF, __LINE__, 0, 0, s001, "ADb") } if (LNotEqual(s000, "zxcvbqwertynm")) { - err("", zFFF, 0xb03, 0, 0, s000, "zxcvbqwertynm") + err("", zFFF, __LINE__, 0, 0, s000, "zxcvbqwertynm") } } @@ -78,18 +78,18 @@ Method(md4f,, Serialized) Store (Buffer() {5,6}, s000) if (LNotEqual(s000, Buffer() {5,6})) { - err("", zFFF, 0xb04, 0, 0, s000, Buffer() {5,6}) + err("", zFFF, __LINE__, 0, 0, s000, Buffer() {5,6}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0xb05, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } Method(md50) { - CH03("", 0, 0xf18, 0, 0) + CH03("", 0, 0xf18, __LINE__, 0) md4d() md4e() md4f() - CH03("", 0, 0xf19, 0, 0) + CH03("", 0, 0xf19, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToThermalZone.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToThermalZone.asl index 41681b0..1041ae7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToThermalZone.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToThermalZone.asl @@ -44,10 +44,10 @@ Method(md5a,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xc00, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0xc01, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md51,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xc02, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0xc03, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md52,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0xc04, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0xc05, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md53,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xc06, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xc07, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xc08, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xc09, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0xc0a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0xc0b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0xc0c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0xc0d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md54,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xc0e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md55,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xc0f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md56,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0xc10, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,25 +211,25 @@ Method(md57,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xc11, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xc12, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xc13, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xc14, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } Method(md58) { - CH03("", 0, 0xf1a, 0, 0) + CH03("", 0, 0xf1a, __LINE__, 0) md5a() md51() md52() @@ -238,5 +238,5 @@ Method(md58) md55() md56() md57() - CH03("", 0, 0xf1b, 0, 0) + CH03("", 0, 0xf1b, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl index 9ecd576..60dbbf7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl @@ -47,21 +47,21 @@ mf43(id1d) Store(ObjectType(id1d), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(id1d, 0xfedcba9876543210)) { - err("", zFFF, 0x001, 0, 0, id1d, 0xfedcba9876543210) + err("", zFFF, __LINE__, 0, 0, id1d, 0xfedcba9876543210) } mf43(ed02) Store(ObjectType(ed02), Local0) if (LNotEqual(Local0, c00f)) { - err("", zFFF, 0x002, 0, 0, Local0, c00f) + err("", zFFF, __LINE__, 0, 0, Local0, c00f) } mf43(dd0b) Store(ObjectType(dd0b), Local0) if (LNotEqual(Local0, c00e)) { - err("", zFFF, 0x003, 0, 0, Local0, c00e) + err("", zFFF, __LINE__, 0, 0, Local0, c00e) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl index 6e54518..334368b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl @@ -43,14 +43,14 @@ not only Operregion and Buffield Method(mf6b) { if (LNotEqual(id1f, 50)) { - err("", zFFF, 0x000, 0, 0, id1f, 50) + err("", zFFF, __LINE__, 0, 0, id1f, 50) } if (LNotEqual(id20, 8)) { - err("", zFFF, 0x001, 0, 0, id20, 8) + err("", zFFF, __LINE__, 0, 0, id20, 8) } if (LNotEqual(bfd3, 0x99)) { - err("", zFFF, 0x002, 0, 0, bfd3, 0x99) + err("", zFFF, __LINE__, 0, 0, bfd3, 0x99) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl index 7057f3c..3dbe2b7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl @@ -65,10 +65,10 @@ Method(md00) { mmm0() - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) if (LNotEqual("md00.m000", Local0)) { - err("", zFFF, 0x001, 0, 0, Local0, "md00.m000") + err("", zFFF, __LINE__, 0, 0, Local0, "md00.m000") } @@ -80,11 +80,11 @@ Method(md00) { mmm1() - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) if (LNotEqual("md00.mm00", Local0)) { - err("", zFFF, 0x003, 0, 0, Local0, "md00.mm00") + err("", zFFF, __LINE__, 0, 0, Local0, "md00.mm00") } - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0160/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0160/DECL.asl index a5d4c51..1a8a04c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0160/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0160/DECL.asl @@ -36,20 +36,20 @@ Method(mf48,, Serialized) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store("mf48 started", Debug) Field(rd05, ByteAcc, NoLock, Preserve) { f000, 8 } Store("mf48 finished", Debug) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } Method(mf49,, Serialized) { - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store("mf49 started", Debug) if (1) { Field(rd05, ByteAcc, NoLock, Preserve) { f000, 8 } } Store("mf49 finished", Debug) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl index 80972a5..b3ca995 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl @@ -39,30 +39,30 @@ Method(md8f) { if (LNotEqual(bf32, 0x14)) { - err("", zFFF, 0x000, 0, 0, bf32, 0x14) + err("", zFFF, __LINE__, 0, 0, bf32, 0x14) } if (LNotEqual(bf33, 0x1615)) { - err("", zFFF, 0x001, 0, 0, bf33, 0x1615) + err("", zFFF, __LINE__, 0, 0, bf33, 0x1615) } } Method(md90) { if (LNotEqual(bf34, 0x18)) { - err("", zFFF, 0x002, 0, 0, bf34, 0x18) + err("", zFFF, __LINE__, 0, 0, bf34, 0x18) } if (LNotEqual(bf35, 0x19)) { - err("", zFFF, 0x003, 0, 0, bf35, 0x19) + err("", zFFF, __LINE__, 0, 0, bf35, 0x19) } } Method(md91) { if (LNotEqual(bf36, 0x1a)) { - err("", zFFF, 0x004, 0, 0, bf36, 0x1a) + err("", zFFF, __LINE__, 0, 0, bf36, 0x1a) } if (LNotEqual(bf37, 0x1c1b)) { - err("", zFFF, 0x005, 0, 0, bf37, 0x1c1b) + err("", zFFF, __LINE__, 0, 0, bf37, 0x1c1b) } } @@ -74,10 +74,10 @@ Method(md92) CreateField(bd02, 40, Add(id03, 8), bf33) if (LNotEqual(bf32, 0x14)) { - err("", zFFF, 0x006, 0, 0, bf32, 0x14) + err("", zFFF, __LINE__, 0, 0, bf32, 0x14) } if (LNotEqual(bf33, 0x1615)) { - err("", zFFF, 0x007, 0, 0, bf33, 0x1615) + err("", zFFF, __LINE__, 0, 0, bf33, 0x1615) } } @@ -87,10 +87,10 @@ Method(md93) CreateField(bd02, Add(id04, 8), 8, bf35) if (LNotEqual(bf34, 0x18)) { - err("", zFFF, 0x008, 0, 0, bf34, 0x18) + err("", zFFF, __LINE__, 0, 0, bf34, 0x18) } if (LNotEqual(bf35, 0x19)) { - err("", zFFF, 0x009, 0, 0, bf35, 0x19) + err("", zFFF, __LINE__, 0, 0, bf35, 0x19) } } @@ -100,10 +100,10 @@ Method(md94) CreateField(bd02, Add(id07, 8), Add(id08, 8), bf37) if (LNotEqual(bf36, 0x1a)) { - err("", zFFF, 0x00a, 0, 0, bf36, 0x1a) + err("", zFFF, __LINE__, 0, 0, bf36, 0x1a) } if (LNotEqual(bf37, 0x1c1b)) { - err("", zFFF, 0x00b, 0, 0, bf37, 0x1c1b) + err("", zFFF, __LINE__, 0, 0, bf37, 0x1c1b) } } @@ -115,10 +115,10 @@ Method(md95) CreateField(bd03, 40, Add(id03, 8), bf33) if (LNotEqual(bf32, 0x14)) { - err("", zFFF, 0x00c, 0, 0, bf32, 0x14) + err("", zFFF, __LINE__, 0, 0, bf32, 0x14) } if (LNotEqual(bf33, 0x1615)) { - err("", zFFF, 0x00d, 0, 0, bf33, 0x1615) + err("", zFFF, __LINE__, 0, 0, bf33, 0x1615) } } @@ -128,10 +128,10 @@ Method(md96) CreateField(bd03, Add(id04, 8), 8, bf35) if (LNotEqual(bf34, 0x18)) { - err("", zFFF, 0x00e, 0, 0, bf34, 0x18) + err("", zFFF, __LINE__, 0, 0, bf34, 0x18) } if (LNotEqual(bf35, 0x19)) { - err("", zFFF, 0x00f, 0, 0, bf35, 0x19) + err("", zFFF, __LINE__, 0, 0, bf35, 0x19) } } @@ -141,10 +141,10 @@ Method(md97) CreateField(bd03, Add(id07, 8), Add(id08, 8), bf37) if (LNotEqual(bf36, 0x1a)) { - err("", zFFF, 0x010, 0, 0, bf36, 0x1a) + err("", zFFF, __LINE__, 0, 0, bf36, 0x1a) } if (LNotEqual(bf37, 0x1c1b)) { - err("", zFFF, 0x011, 0, 0, bf37, 0x1c1b) + err("", zFFF, __LINE__, 0, 0, bf37, 0x1c1b) } } @@ -153,40 +153,40 @@ Method(m075, 6, Serialized) Name(b000, Buffer() {0x5D, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}) if (LNotEqual(arg0, 1)) { - err("", zFFF, 0x012, 0, 0, arg0, 1) + err("", zFFF, __LINE__, 0, 0, arg0, 1) } if (LNotEqual(arg1, 0x5d)) { - err("", zFFF, 0x013, 0, 0, arg1, 0x5d) + err("", zFFF, __LINE__, 0, 0, arg1, 0x5d) } if (LNotEqual(arg2, 0x125D)) { - err("", zFFF, 0x014, 0, 0, arg2, 0x125D) + err("", zFFF, __LINE__, 0, 0, arg2, 0x125D) } if (LNotEqual(arg3, 0x1413125D)) { - err("", zFFF, 0x015, 0, 0, arg3, 0x1413125D) + err("", zFFF, __LINE__, 0, 0, arg3, 0x1413125D) } if (F64) { if (LNotEqual(arg4, 0x181716151413125D)) { - err("", zFFF, 0x016, 0, 0, arg4, 0x181716151413125D) + err("", zFFF, __LINE__, 0, 0, arg4, 0x181716151413125D) } } else { if (LNotEqual(arg4, b000)) { - err("", zFFF, 0x016, 0, 0, arg4, b000) + err("", zFFF, __LINE__, 0, 0, arg4, b000) } } if (LNotEqual(arg5, 0x5d)) { - err("", zFFF, 0x017, 0, 0, arg5, 0x5d) + err("", zFFF, __LINE__, 0, 0, arg5, 0x5d) } } Method(m076, 2) { if (LNotEqual(arg0, 0x5d)) { - err("", zFFF, 0x018, 0, 0, arg0, 0x5d) + err("", zFFF, __LINE__, 0, 0, arg0, 0x5d) } if (LNotEqual(arg1, 0x5d)) { - err("", zFFF, 0x019, 0, 0, arg1, 0x5d) + err("", zFFF, __LINE__, 0, 0, arg1, 0x5d) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl index 05b4640..2971079 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl @@ -68,6 +68,6 @@ Method(md78) * have to initiate err here, to log the error in a usual way. */ if (id01) { - err("", zFFF, 0x123, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl index 47fb3ec..e66431c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl @@ -74,14 +74,14 @@ Store(Sizeof (p000), Local0) if (LNotEqual(Local0, 256)) { - err("", zFFF, 0x000, 0, 0, Local0, 256) + err("", zFFF, __LINE__, 0, 0, Local0, 256) } else { Store(1, Local1) Store(0, Local2) while (Local0) { Store(DeRefOf(Index(p000, Local2)), Local3) if (LNotEqual(Local3, Local1)) { - err("", zFFF, 0x001, 0, 0, Local3, Local1) + err("", zFFF, __LINE__, 0, 0, Local3, Local1) Break } Decrement(Local0) @@ -132,12 +132,12 @@ Store(0, i000) mm00(0) if (LNotEqual(i000, 1)) { - err("", zFFF, 0x002, 0, 0, i000, 1) + err("", zFFF, __LINE__, 0, 0, i000, 1) } Store(0, i000) mm00(1) if (LNotEqual(i000, 2)) { - err("", zFFF, 0x003, 0, 0, i000, 2) + err("", zFFF, __LINE__, 0, 0, i000, 2) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0168_ACT_REQ_NOPT/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0168_ACT_REQ_NOPT/DECL.asl index 5fb7833..074f928 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0168_ACT_REQ_NOPT/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0168_ACT_REQ_NOPT/DECL.asl @@ -59,7 +59,7 @@ Store(mf59(0), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 2)){ - err("", zFFF, 0x000, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(mf59(1), Debug) @@ -67,6 +67,6 @@ Store(mf59(1), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 12)){ - err("", zFFF, 0x001, 0, 0, Local1, 12) + err("", zFFF, __LINE__, 0, 0, Local1, 12) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl index 4a94ba5..250286a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl @@ -36,18 +36,18 @@ { ShiftLeft(0xffffffffffffffff, 64, Local0) if (LNotEqual(Local0, 0)){ - err("", zFFF, 0x000, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ShiftLeft(0xffffffffffffffff, 65, Local0) if (LNotEqual(Local0, 0)){ - err("", zFFF, 0x001, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ShiftRight(0xffffffffffffffff, 64, Local0) if (LNotEqual(Local0, 0)){ - err("", zFFF, 0x002, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ShiftRight(0xffffffffffffffff, 65, Local0) if (LNotEqual(Local0, 0)){ - err("", zFFF, 0x003, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl index cb323cc..8e20ffc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl @@ -42,7 +42,7 @@ Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, 14)) { - err("", zFFF, 0x000, 0, 0, Local0, 14) + err("", zFFF, __LINE__, 0, 0, Local0, 14) } else { Store(0x9999992b, bf90) @@ -50,9 +50,9 @@ Store(ObjectType(bf90), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } elseif (LNotEqual(bf90, 0x2b)) { - err("", zFFF, 0x002, 0, 0, bf90, 0x2b) + err("", zFFF, __LINE__, 0, 0, bf90, 0x2b) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl index ff584f4..9906a69 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl @@ -47,11 +47,11 @@ { Store(LEqual("C179B3FE", 0xc179b3fe), Local0) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x000, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } Store(LEqual(0xc179b3fe, "C179B3FE"), Local0) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x001, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0172_OUTSTAND_ALLOC/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0172_OUTSTAND_ALLOC/DECL.asl index 6262f2f..b83a99a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0172_OUTSTAND_ALLOC/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0172_OUTSTAND_ALLOC/DECL.asl @@ -45,5 +45,5 @@ Store(id1e, pd10) // Store("Outstanding allocations to be investigated!", Debug) -// err("", zFFF, 0x000, 0, 0, 0, 0) +// err("", zFFF, __LINE__, 0, 0, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl index 2ea242b..d5ce788 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl @@ -35,6 +35,6 @@ Method(mf60) { if (LNotEqual(rtd1, bd0c)) { - err("", zFFF, 0x000, 0, 0, rtd1, bd0c) + err("", zFFF, __LINE__, 0, 0, rtd1, bd0c) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0175/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0175/DECL.asl index f12f745..97796f7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0175/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0175/DECL.asl @@ -34,7 +34,7 @@ Method(mf5d) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(prd1, Debug) Store(rd06, Debug) @@ -49,5 +49,5 @@ Method(mf5d) Store(tzd1, Debug) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl index 9b9fd83..445f58c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl @@ -50,51 +50,51 @@ // Named - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(Index(p000, 2), Local1) - CH04("", 1, 55, 0, 0x001, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04("", 1, 55, 0, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store(Index(b000, 3), Local1) - CH04("", 1, 54, 0, 0x003, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 1, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Store(Index(s000, 4), Local1) - CH04("", 1, 61, 0, 0x005, 0, 0) // AE_AML_STRING_LIMIT + CH04("", 1, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT // Immediate - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) Store(Index(Package(2){0, 1}, 2), Local1) if (y900) { - CH04("", 1, 55, 0, 0x007, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04("", 1, 55, 0, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT } else { - CH04("", 0, 85, 0, 0x008, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04("", 0, 85, 0, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) Store(Index(Buffer(3){2, 3, 4}, 3), Local1) if (y900) { - CH04("", 1, 54, 0, 0x00a, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 1, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT } else { - CH04("", 0, 85, 0, 0x00b, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04("", 0, 85, 0, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } - CH03("", 0, 0x00c, 0, 0) + CH03("", 0, 0x00c, __LINE__, 0) Store(Index("5678", 4), Local1) if (y900) { - CH04("", 1, 61, 0, 0x00d, 0, 0) // AE_AML_STRING_LIMIT + CH04("", 1, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT } else { - CH04("", 0, 85, 0, 0x00e, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04("", 0, 85, 0, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Fields - CH03("", 0, 0x00f, 0, 0) + CH03("", 0, 0x00f, __LINE__, 0) Store(f000, Local0) - CH03("", 0, 0x010, 0, 0) + CH03("", 0, 0x010, __LINE__, 0) - CH03("", 0, 0x011, 0, 0) + CH03("", 0, 0x011, __LINE__, 0) Store(f001, Local0) if (y263) { /* @@ -104,18 +104,18 @@ * - and on Store-to-debug stage * Check opcode of the last exception. */ - CH04("", 2, 53, 0, 0x013, 0, 0) // AE_AML_REGION_LIMIT + CH04("", 2, 53, 0, __LINE__, 0, 0) // AE_AML_REGION_LIMIT } else { - CH04("", 0, 53, 0, 0x013, 0, 0) // AE_AML_REGION_LIMIT + CH04("", 0, 53, 0, __LINE__, 0, 0) // AE_AML_REGION_LIMIT } - CH03("", 0, 0x014, 0, 0) + CH03("", 0, 0x014, __LINE__, 0) Store(bkf0, Local0) if (y263) { /* See comment to sub-test above */ - CH04("", 2, 68, 0, 0x016, 0, 0) // AE_AML_REGISTER_LIMIT + CH04("", 2, 68, 0, __LINE__, 0, 0) // AE_AML_REGISTER_LIMIT } else { - CH04("", 0, 68, 0, 0x016, 0, 0) // AE_AML_REGISTER_LIMIT + CH04("", 0, 68, 0, __LINE__, 0, 0) // AE_AML_REGISTER_LIMIT } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl index 9eefef8..8705f51 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl @@ -39,7 +39,7 @@ BankField(r000, bnk0, 4, ByteAcc, NoLock, Preserve) { bkf0, 9 } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(bkf0, Local0) if (y263) { @@ -50,9 +50,9 @@ * - and on Store-to-debug stage * Check opcode of the last exception. */ - CH04("", 2, 68, 0, 0x001, 0, 0) // AE_AML_REGISTER_LIMIT + CH04("", 2, 68, 0, __LINE__, 0, 0) // AE_AML_REGISTER_LIMIT } else { - CH04("", 0, 68, 0, 0x001, 0, 0) // AE_AML_REGISTER_LIMIT + CH04("", 0, 68, 0, __LINE__, 0, 0) // AE_AML_REGISTER_LIMIT } } @@ -64,9 +64,9 @@ BankField(r000, bnk0, i000, ByteAcc, NoLock, Preserve) { bkf0, 9 } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store(bkf0, Local0) - CH04("", 0, 68, 0, 0x003, 0, 0) // AE_AML_REGISTER_LIMIT + CH04("", 0, 68, 0, __LINE__, 0, 0) // AE_AML_REGISTER_LIMIT } Method(mf0c,, Serialized) @@ -76,9 +76,9 @@ BankField(r000, bnk0, 0, ByteAcc, NoLock, Preserve) { bkf0, 9 } - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Store(bkf0, Local0) - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) } Method(mf0d,, Serialized) @@ -89,9 +89,9 @@ BankField(r000, bnk0, Add(i000, 0), ByteAcc, NoLock, Preserve) { bkf0, 9 } - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) Store(bkf0, Local0) - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) } Method(mf0e,, Serialized) @@ -102,9 +102,9 @@ BankField(r000, bnk0, i000, ByteAcc, NoLock, Preserve) { bkf0, 9 } - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) Store(bkf0, Local0) - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl index c908251..fa2ea2e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl @@ -37,6 +37,6 @@ Store(ConcatenateResTemplate(rtd0, rtd0), Local0) if (LNotEqual(Local0, bd0b)) { - err("", zFFF, 0x000, 0, 0, Local0, 256) + err("", zFFF, __LINE__, 0, 0, Local0, 256) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl index 153b94c..201fc28 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl @@ -50,17 +50,17 @@ Method(me89, 1, Serialized) if (LEqual(arg0, 0)) { if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x000, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } if (LEqual(arg0, 1)) { if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x000, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } } if (LEqual(arg0, 2)) { if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x000, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl index 986b135..955c765 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl @@ -39,6 +39,6 @@ Method(me8b,, Serialized) mm20(1) if (LNotEqual(i000, 32)) { - err("", zFFF, 0x000, 0, 0, i000, 32) + err("", zFFF, __LINE__, 0, 0, i000, 32) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl index a31b2b6..f683efa 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl @@ -39,19 +39,19 @@ Name(id23, 0xabcd0000) Method (mf78,, Serialized) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) if (LNotEqual(id23, 0xabcd0000)) { - err("", zFFF, 0x001, 0, 0, id23, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, id23, 0xabcd0000) } Name (id23, 0xabcd0001) if (LNotEqual(id23, 0xabcd0001)) { - err("", zFFF, 0x002, 0, 0, id23, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, id23, 0xabcd0001) } - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } /* @@ -60,13 +60,13 @@ Method (mf78,, Serialized) */ Method (mf85,, Serialized) { - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) if (LNotEqual(i9z8, 0xabcd0001)) { - err("", zFFF, 0x005, 0, 0, i9z8, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, i9z8, 0xabcd0001) } Name (i9z8, 0xabcd0001) - CH04("", 0, 0xff, 0, 0x006, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl index 58e6d95..1d9eeec 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl @@ -43,20 +43,20 @@ Method(mf79, 1) Method(mf7a) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store("mf79(250):", Debug) Store(mf79(250), Debug) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } Method(m27e) { - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store("mf79(248):", Debug) Store(mf79(248), Debug) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0184/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0184/DECL.asl index f38a36b..f4fde3e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0184/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0184/DECL.asl @@ -41,8 +41,8 @@ Method(mf7b) Store ("mf7b", Debug) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m000() - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl index 4ebe377..a58d6e7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl @@ -64,14 +64,14 @@ Method(mfc2,, Serialized) Store(0xdddd9000, i000) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(m000, i000) if (SLCK) { - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", zFFF, 0x002, 0, 0, i000, 0) + err("", zFFF, __LINE__, 0, 0, i000, 0) } } else { CH07("", 0, 0xff, 0, 0x003, 0, 0) @@ -81,14 +81,14 @@ Method(mfc2,, Serialized) Store(0xdddd9000, i000) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Store(m009, i000) if (SLCK) { - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", zFFF, 0x006, 0, 0, i000, 0) + err("", zFFF, __LINE__, 0, 0, i000, 0) } } else { CH07("", 0, 0xff, 0, 0x007, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl index 6c9d269..e7def31 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl @@ -74,12 +74,12 @@ Method(mf6d, 0, Serialized) Store(0xdddd0000, i000) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(m000, i000) if (SLCK) { - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) //y901: Predicate generates Implicit Return since ACPICA release 20080926 if (y901) { @@ -88,7 +88,7 @@ Method(mf6d, 0, Serialized) Store(0xabcd0000, Local0) } if (LNotEqual(i000, Local0)) { - err("", zFFF, 0x002, 0, 0, i000, Local0) + err("", zFFF, __LINE__, 0, 0, i000, Local0) } } else { CH07("", 0, 0xff, 0, 0x003, 0, 0) @@ -98,12 +98,12 @@ Method(mf6d, 0, Serialized) Store(0xdddd0001, i000) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Store(m001, i000) if (SLCK) { - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) //y901: Predicate generates Implicit Return since ACPICA release 20080926 if (y901) { @@ -112,7 +112,7 @@ Method(mf6d, 0, Serialized) Store(0xabcd0001, Local0) } if (LNotEqual(i000, Local0)) { - err("", zFFF, 0x006, 0, 0, i000, Local0) + err("", zFFF, __LINE__, 0, 0, i000, Local0) } } else { CH07("", 0, 0xff, 0, 0x007, 0, 0) @@ -122,12 +122,12 @@ Method(mf6d, 0, Serialized) Store(0xdddd0002, i000) - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) Store(m001, i000) if (SLCK) { - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) //y901: Predicate generates Implicit Return since ACPICA release 20080926 if (y901) { @@ -136,7 +136,7 @@ Method(mf6d, 0, Serialized) Store(0xabcd0002, Local0) } if (LNotEqual(i000, Local0)) { - err("", zFFF, 0x00a, 0, 0, i000, Local0) + err("", zFFF, __LINE__, 0, 0, i000, Local0) } } else { CH07("", 0, 0xff, 0, 0x00b, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl index deca1f7..6451a6b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl @@ -45,14 +45,14 @@ Method(mf70,, Serialized) Store(0xdddd9000, i000) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(m000(), i000) if (SLCK) { - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", zFFF, 0x002, 0, 0, i000, 0) + err("", zFFF, __LINE__, 0, 0, i000, 0) } } else { CH07("", 0, 0xff, 0, 0x003, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl index 6ea85ed..b8a5d29 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl @@ -39,7 +39,7 @@ Method(mf7c,, Serialized) // Empty buffer - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(0, Local0) Store(Buffer(Local0){}, Local1) @@ -47,12 +47,12 @@ Method(mf7c,, Serialized) Store(ConcatenateResTemplate(RT00, Local1), Local2) if (LNotEqual(Local2, b000)) { - err("", zFFF, 0x001, 0, 0, Local2, b000) + err("", zFFF, __LINE__, 0, 0, Local2, b000) } if (LNotEqual(RT00, b000)) { - err("", zFFF, 0x002, 0, 0, RT00, b000) + err("", zFFF, __LINE__, 0, 0, RT00, b000) } - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl index c0c65cc..a9e6ebc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl @@ -38,16 +38,16 @@ Method(mf7d,, Serialized) Store(Buffer(){0x79}, Local0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(ConcatenateResTemplate(RT00, Local0), Local1) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) Store(Buffer(){0x78}, Local0) Store(ConcatenateResTemplate(RT00, Local0), Local1) - CH04("", 0, 0xff, 0, 0x002, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl index 945766d..8d2e490 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl @@ -40,9 +40,9 @@ Method(mf7e,, Serialized) Store(Buffer(){0x2a, 0x10, 0x05, 0x79}, Local0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(ConcatenateResTemplate(RT00, Local0), Local1) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl index 87f647c..16dd652 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl @@ -38,22 +38,22 @@ Method(mfa3) Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, 14)) { - err("", zFFF, 0x000, 0, 0, Local0, 14) + err("", zFFF, __LINE__, 0, 0, Local0, 14) } if (LNotEqual(bf90, 0x77)) { - err("", zFFF, 0x001, 0, 0, bf90, 0x77) + err("", zFFF, __LINE__, 0, 0, bf90, 0x77) } CopyObject(0x9999992b, bf90) Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, 14)) { - err("", zFFF, 0x002, 0, 0, Local0, 14) + err("", zFFF, __LINE__, 0, 0, Local0, 14) } if (LNotEqual(bf90, 0x2b)) { - err("", zFFF, 0x003, 0, 0, bf90, 0x2b) + err("", zFFF, __LINE__, 0, 0, bf90, 0x2b) Store(bf90, Debug) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl index b4cd048..d33dc3e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl @@ -38,7 +38,7 @@ Method(mfa4,, Serialized) Method(CHK0, 3) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, arg2, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl index a3a6869..fb1a14c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl @@ -57,7 +57,7 @@ Method(mfa5, 1, Serialized) if (LEqual(BFL1, bd10)) { Store("Ok 1", Debug) } else { - err("", zFFF, 0x000, 0, 0, BFL1, bd10) + err("", zFFF, __LINE__, 0, 0, BFL1, bd10) } // Optional storing @@ -72,7 +72,7 @@ Method(mfa5, 1, Serialized) if (LEqual(BFL1, bd10)) { Store("Ok 2", Debug) } else { - err("", zFFF, 0x001, 0, 0, BFL1, bd10) + err("", zFFF, __LINE__, 0, 0, BFL1, bd10) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl index 37f6f67..4a767bd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl @@ -65,13 +65,13 @@ Method(mfa7, 1, Serialized) Store("ToBuffer(b001, b000)", Debug) ToBuffer(b001, b000) if (LNot(bcmp(b000, bb01))) { - err("", zFFF, 0x000, 0, 0, b000, bb01) + err("", zFFF, __LINE__, 0, 0, b000, bb01) } } else { Store("ToBuffer(b000, b001)", Debug) ToBuffer(b000, b001) if (Lnot(bcmp(b001, bb00))) { - err("", zFFF, 0x000, 0, 0, b001, bb00) + err("", zFFF, __LINE__, 0, 0, b001, bb00) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl index b20fe2b..ff11d2f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl @@ -60,17 +60,17 @@ Method(mfaf,, Serialized) Store(ObjectType(s001), Local1) if (LNotEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(s000, s001)) { - err("", zFFF, 0x001, 0, 0, s000, s001) + err("", zFFF, __LINE__, 0, 0, s000, s001) } if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x002, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x003, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Increment(b000) @@ -85,16 +85,16 @@ Method(mfaf,, Serialized) Store(ObjectType(b001), Local1) if (LNotEqual(Local0, Local1)) { - err("", zFFF, 0x004, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(b000, b001)) { - err("", zFFF, 0x005, 0, 0, b000, b001) + err("", zFFF, __LINE__, 0, 0, b000, b001) } if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x006, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x007, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl index 77e7b12..3c8fe4c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl @@ -34,8 +34,8 @@ Method(mfb0) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store("0x0x12345678", Local1) ToInteger(Local1, Local0) - CH04("", 0, 34, 0, 0x001, 0, 0) // AE_BAD_HEX_CONSTANT + CH04("", 0, 34, 0, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl index 2876b4d..9f03fc4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl @@ -34,8 +34,8 @@ Method(mfb1) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store("0x 12345678", Local1) ToInteger(Local1, Local0) - CH04("", 0, 34, 0, 0x001, 0, 0) // AE_BAD_HEX_CONSTANT + CH04("", 0, 34, 0, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl index e2b5a35..ba93fac 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl @@ -71,11 +71,11 @@ Method(mfa9) { if (LNotEqual(Local0, s000)) { // Store("Error 0", Debug) - err("", zFFF, 0x000, 0, 0, Local0, s000) + err("", zFFF, __LINE__, 0, 0, Local0, s000) } if (LNotEqual(Local1, s000)) { // Store("Error 1", Debug) - err("", zFFF, 0x001, 0, 0, Local0, s000) + err("", zFFF, __LINE__, 0, 0, Local0, s000) } Store("========================================.", Debug) @@ -147,7 +147,7 @@ Method(m002) // Store(Index(RR55, 0), Debug) Store("---------------------------------- SSSSSSSS 0", Debug) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) m002() // Store("---------------------------------- SSSSSSSS 1", Debug) @@ -161,8 +161,8 @@ Method(m002) // m000() if (F64) { - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } else { - CH04("", 0, 0xff, 0, 0x004, 0, 0) // AE_AML_NUMERIC_OVERFLOW + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_AML_NUMERIC_OVERFLOW } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.asl index f4eae89..504fc7b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.asl @@ -73,11 +73,11 @@ Method(mfa9,, Serialized) { if (LNotEqual(Local0, s000)) { // Store("Error 0", Debug) - err("", zFFF, 0x000, 0, 0, Local0, s000) + err("", zFFF, __LINE__, 0, 0, Local0, s000) } if (LNotEqual(Local1, s000)) { // Store("Error 1", Debug) - err("", zFFF, 0x001, 0, 0, Local0, s000) + err("", zFFF, __LINE__, 0, 0, Local0, s000) } Store("========================================.", Debug) @@ -168,7 +168,7 @@ Method(mfa9,, Serialized) { // Store(Index(RR55, 0), Debug) Store("---------------------------------- SSSSSSSS 0", Debug) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) m002() // Store("---------------------------------- SSSSSSSS 1", Debug) @@ -183,12 +183,12 @@ Method(mfa9,, Serialized) { if (LEqual(id24, 0)) { if (F64) { - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } else { - CH04("", 0, 0xff, 0, 0x004, 0, 0) // AE_AML_NUMERIC_OVERFLOW + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_AML_NUMERIC_OVERFLOW } } else { - CH04("", 0, 0xff, 0, 0x004, 0, 0) // AE_AML_NUMERIC_OVERFLOW + CH04("", 0, 0xff, 0, __LINE__, 0, 0) // AE_AML_NUMERIC_OVERFLOW } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0199/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0199/DECL.asl index cc775de..e973a40 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0199/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0199/DECL.asl @@ -38,17 +38,17 @@ Method(mfb2,, Serialized) Name(i000, 0xabbc0000) Name(p000, Package() {1,2,3,4}) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(DerefOf(b000), Local0) - CH04("", 1, 47, 0, 0x001, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store(DerefOf(i000), Local0) - CH04("", 1, 47, 0, 0x003, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Store(DerefOf(p000), Local0) - CH04("", 1, 47, 0, 0x005, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(mfb3,, Serialized) @@ -61,31 +61,31 @@ Method(mfb3,, Serialized) OperationRegion(r000, SystemMemory, 0x100, 0x100) PowerResource(pw00, 1, 0) {Method(mmmm){return (0)}} - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) Store(DerefOf(e000), Local0) - CH04("", 1, 47, 0, 0x007, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) Store(DerefOf(mx00), Local0) - CH04("", 1, 47, 0, 0x009, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) Store(DerefOf(d000), Local0) - CH04("", 1, 47, 0, 0x00b, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x00c, 0, 0) + CH03("", 0, 0x00c, __LINE__, 0) Store(DerefOf(tz00), Local0) - CH04("", 1, 47, 0, 0x00d, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x00e, 0, 0) + CH03("", 0, 0x00e, __LINE__, 0) Store(DerefOf(pr00), Local0) - CH04("", 1, 47, 0, 0x00f, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x010, 0, 0) + CH03("", 0, 0x010, __LINE__, 0) Store(DerefOf(r000), Local0) - CH04("", 1, 47, 0, 0x011, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE - CH03("", 0, 0x012, 0, 0) + CH03("", 0, 0x012, __LINE__, 0) Store(DerefOf(pw00), Local0) - CH04("", 1, 47, 0, 0x013, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 1, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl index ec7e722..3b21901 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl @@ -153,27 +153,27 @@ Method(mfc0) SRMT("mfb5") if (y200) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) mfb5() - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } else { BLCK() } SRMT("mfbd") if (y200) { - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) mfbd() - CH04("", 0, 0xff, 0, 0x003, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } else { BLCK() } SRMT("mfbe") if (y200) { - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) mfbe() - CH04("", 0, 0xff, 0, 0x005, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } else { BLCK() } @@ -183,39 +183,39 @@ Method(mfc0) */ SRMT("mfb6") - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) mfb6() - CH04("", 0, 0xff, 0, 0x007, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) SRMT("mfb7") - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) mfb7() - CH04("", 0, 0xff, 0, 0x009, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) SRMT("mfb8") - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) mfb8() - CH04("", 0, 0xff, 0, 0x00b, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) SRMT("mfb9") - CH03("", 0, 0x00c, 0, 0) + CH03("", 0, 0x00c, __LINE__, 0) mfb9() - CH04("", 0, 0xff, 0, 0x00d, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) SRMT("mfba") - CH03("", 0, 0x00e, 0, 0) + CH03("", 0, 0x00e, __LINE__, 0) mfba() - CH04("", 0, 0xff, 0, 0x00f, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) SRMT("mfbb") - CH03("", 0, 0x010, 0, 0) + CH03("", 0, 0x010, __LINE__, 0) mfbb() - CH04("", 0, 0xff, 0, 0x011, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) SRMT("mfbf") - CH03("", 0, 0x012, 0, 0) + CH03("", 0, 0x012, __LINE__, 0) mfbf() - CH04("", 0, 0xff, 0, 0x013, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) Store("mfc0 ==== successfully returned to mfc0; finished !!!!!", Debug) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl index a349180..6df6845 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl @@ -41,7 +41,7 @@ Method(mfc1) Store("To be investigated:", Debug) Store("many Outstanding allocations on Reference ASLTS test run and other ASLTS tests.", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } /* diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl index 3bbb722..5602e9a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl @@ -46,7 +46,7 @@ Method(m813) /* ? */ if (LNotEqual(Local7, c008)) { - err("", zFFF, 0x100, 0, 0, Local7, c008) + err("", zFFF, __LINE__, 0, 0, Local7, c008) } /* or RING_OF_REFS_EXCEPTION? */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl index 6957488..37be6cb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl @@ -48,9 +48,9 @@ Method(m819) Method(m000, 1) { Store(2, Local0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Divide(1, arg0, Local0) - CH04("", 0, 56, 0, 0x001, 0, 0) // AE_AML_DIVIDE_BY_ZERO + CH04("", 0, 56, 0, __LINE__, 0, 0) // AE_AML_DIVIDE_BY_ZERO } Method(m001) @@ -62,5 +62,5 @@ Method(m819) m001() Store("Fight Outstanding allocations here", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0211/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0211/DECL.asl index e701727..2e1f266 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0211/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0211/DECL.asl @@ -56,6 +56,6 @@ Method(m81a) * ------- Additional Comment #8 From Len Brown 2006-06-25 21:49 ------- * ACPICA 20060608 shipped in 2.6.17-git9, closed. * - * err("", zFFF, 0x000, 0, 0, 0, 0) + * err("", zFFF, __LINE__, 0, 0, 0, 0) */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl index fc650da..f45915c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl @@ -375,7 +375,7 @@ Method(m80f,, Serialized) CopyObject(DerefOf(ir00), Local0) if (LNotEqual(Local0, arg0)) { - err("", zFFF, 0x534, 0, 0, Local0, arg0) + err("", zFFF, __LINE__, 0, 0, Local0, arg0) } } m000() diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl index 89f2e88..6c654de 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl @@ -49,9 +49,9 @@ Method(m81b) Return(Local0) } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(m000(), Local0) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) Store(Derefof(Local0), Debug) - CH04("", 0, 0xff, 0, 0x002, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl index a039638..d662de5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl @@ -57,28 +57,28 @@ Method(m81c,, Serialized) Store(0x01, rfu0) m000(OPR1) if (LNotEqual(rfu0, 0x01)) { - err("", zFFF, 0x000, 0, 0, rfu0, 0x01) + err("", zFFF, __LINE__, 0, 0, rfu0, 0x01) } Store(0x02, rfu0) m000(OPR1) if (LNotEqual(rfu0, 0x02)) { - err("", zFFF, 0x001, 0, 0, rfu0, 0x02) + err("", zFFF, __LINE__, 0, 0, rfu0, 0x02) } Store(0x03, rfu0) m000(OPR1) if (LNotEqual(rfu0, 0x03)) { - err("", zFFF, 0x002, 0, 0, rfu0, 0x03) + err("", zFFF, __LINE__, 0, 0, rfu0, 0x03) } Store(0x04, rfu0) if (LNotEqual(rfu0, 0x04)) { - err("", zFFF, 0x003, 0, 0, rfu0, 0x04) + err("", zFFF, __LINE__, 0, 0, rfu0, 0x04) } } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m001() - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl index f94cb93..3cb83cb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl @@ -72,21 +72,21 @@ Method(m81d) Store(1, idf0) if (LNotEqual(idf0, 1)) { - err("", zFFF, 0x000, 0, 0, idf0, 1) + err("", zFFF, __LINE__, 0, 0, idf0, 1) } Store(1, idf1) if (LNotEqual(idf1, 1)) { - err("", zFFF, 0x001, 0, 0, idf1, 1) + err("", zFFF, __LINE__, 0, 0, idf1, 1) } Store(1, idf2) if (LNotEqual(idf2, 1)) { - err("", zFFF, 0x002, 0, 0, idf2, 1) + err("", zFFF, __LINE__, 0, 0, idf2, 1) } } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m000() - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0216/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0216/DECL.asl index e430a10..5e1e175 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0216/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0216/DECL.asl @@ -716,7 +716,7 @@ Method(m836) Method(m831) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) SRMT("m831-0") if (1) { @@ -726,23 +726,23 @@ Method(m831) m821() } - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) SRMT("m831-1") if (1) { m822() - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) m823() - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) m824() - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) m825() - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) m826() - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) } - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) SRMT("m831-2") if (1) { @@ -753,7 +753,7 @@ Method(m831) m82b() } - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) SRMT("m831-3") if (1) { @@ -764,7 +764,7 @@ Method(m831) m830() } - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) SRMT("m831-4") if (1) { @@ -775,5 +775,5 @@ Method(m831) m836() } - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl index f79754c..1f89721 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl @@ -45,14 +45,14 @@ Method(m035,, Serialized) OperationRegion(OPR0, SystemMemory, 0x2000, 0x100) if (LNotEqual(id2a, 1)) { - err("", zFFF, 0x000, 0, 0, id2a, 1) + err("", zFFF, __LINE__, 0, 0, id2a, 1) } } Method(m036) { if (LNotEqual(id2a, 0)) { - err("", zFFF, 0x001, 0, 0, id2a, 0) + err("", zFFF, __LINE__, 0, 0, id2a, 0) } m035() } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl index a49e14c..2ece6bf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl @@ -79,16 +79,16 @@ Method(m037,, Serialized) Store(Local0, Debug) if (LNotEqual(i000, id29)) { - err("", zFFF, 0x000, 0, 0, i000, id29) + err("", zFFF, __LINE__, 0, 0, i000, id29) } if (LNotEqual(Local0, id29)) { - err("", zFFF, 0x001, 0, 0, Local0, id29) + err("", zFFF, __LINE__, 0, 0, Local0, id29) } } Method(m038) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m037() - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl index 8a1157a..2297dd0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl @@ -43,6 +43,6 @@ Method(m107,, Serialized) 0x0f, 0x79, 0x00}) if (LNotEqual(RT00, BUF0)) { - err("", zFFF, 0x000, 0, 0, RT00, BUF0) + err("", zFFF, __LINE__, 0, 0, RT00, BUF0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl index 9953dd5..e00eaf7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl @@ -60,12 +60,12 @@ Device(D220) { Method(m108) { if (\D220.NERR) { - err("", zFFF, 0x000, 0, 0, \D220.NERR, 0) + err("", zFFF, __LINE__, 0, 0, \D220.NERR, 0) } Subtract(\D220.ACTV, \D220.DACT, Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x001, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl index 99eafd5..6d41834 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl @@ -38,7 +38,7 @@ Method(m109,, Serialized) Method(CHCK, 3) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, arg2, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl index 289eae6..228748c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl @@ -37,7 +37,7 @@ Method(m10a,, Serialized) Method(CHCK, 3) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, arg2, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl index 60ed77a..0cde600 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl @@ -57,7 +57,7 @@ Method(m10b,, Serialized) Method(CHCK, 3) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, arg2, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl index 4c24d6f..eda03b5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl @@ -39,7 +39,7 @@ Method(m10c,, Serialized) Method(CHCK, 3) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, arg2, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl index f52f310..9389403 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl @@ -56,7 +56,7 @@ Method(m10e,, Serialized) Store(tot0, Local0) if (LNotEqual(Local0, 0x8001)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x8001) + err("", zFFF, __LINE__, 0, 0, Local0, 0x8001) } } @@ -70,11 +70,11 @@ Method(m17a,, Serialized) if (F64) { if (LNotEqual(bf00, 0x123456789abcdef0)) { - err("", zFFF, 0x001, 0, 0, bf00, 0x123456789abcdef0) + err("", zFFF, __LINE__, 0, 0, bf00, 0x123456789abcdef0) } } else { if (LNotEqual(bf00, b001)) { - err("", zFFF, 0x002, 0, 0, bf00, b001) + err("", zFFF, __LINE__, 0, 0, bf00, b001) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0228/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0228/DECL.asl index 9db0b1e..15ae764 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0228/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0228/DECL.asl @@ -54,7 +54,7 @@ Store to method invocation is not supported Store(5, mf1c()) if (LNotEqual(id12, 5)) { - err("", zFFF, 0x000, 0, 0, id12, 5) + err("", zFFF, __LINE__, 0, 0, id12, 5) } // Case mf1d @@ -62,7 +62,7 @@ Store to method invocation is not supported Store(6, mf1d()) if (LNotEqual(id12, 6)) { - err("", zFFF, 0x001, 0, 0, id12, 6) + err("", zFFF, __LINE__, 0, 0, id12, 6) } */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl index a56b8f5..1006cb6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl @@ -36,11 +36,11 @@ Method(m10f, 1, Serialized) { Name(b000, Buffer(Arg0) {}) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Add(b000, 0, Local0) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) ToInteger(b000, Local0) - CH04("", 0, 54, 0, 0x003, 0, 0) // AE_AML_BUFFER_LIMIT + CH04("", 0, 54, 0, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl index 31ab04e..b6d1720 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl @@ -109,10 +109,10 @@ Method(m127,, Serialized) Store("Finish of test", Debug) } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m100() /* Expect either ASL compiler error or any AML interpreter exception */ - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl index 7b25fd1..1836e04 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl @@ -92,10 +92,10 @@ Method(m128,, Serialized) Store("Finish of test", Debug) } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m100() /* Expect either ASL compiler error or any AML interpreter exception */ - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0232_F_OPTION/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0232_F_OPTION/DECL.asl index bbce721..190404f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0232_F_OPTION/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0232_F_OPTION/DECL.asl @@ -50,12 +50,12 @@ Method(m15c,, Serialized) Name (VV, 0x1234) Store (32, Local0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Name (VV, 0xBBBBAAAA) Store (12, Local2) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Method(m15f) @@ -63,12 +63,12 @@ Method(m15f) Method(m000) {} Store (32, Local0) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Method(m000) {} Store (12, Local2) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } Method(m160) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl index e62873c..6657361 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl @@ -44,17 +44,17 @@ Method(m039,, Serialized) Acquire(MX08, 0xffff) Acquire(MX09, 0xffff) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Release(MX08) /* * Release(MX08) above doesn't cause exception * but, seems, it should. */ - CH04("", 0, 64, 0, 0x001, 0, 0) // AE_AML_MUTEX_ORDER + CH04("", 0, 64, 0, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER /* Also this */ Release(MX07) - CH04("", 0, 64, 0, 0x002, 0, 0) // AE_AML_MUTEX_ORDER + CH04("", 0, 64, 0, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER /* * Now, the Release(MX09) below causes exception, @@ -68,7 +68,7 @@ Method(m039,, Serialized) Release(MX09) Release(MX08) Release(MX07) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } m000() } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0240_ACTION_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0240_ACTION_REQUIRED/DECL.asl index b76e24a..3ba204c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0240_ACTION_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0240_ACTION_REQUIRED/DECL.asl @@ -68,7 +68,7 @@ Method(m032, 1) Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { Store("Thread 0: failed to Acquire GL", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Thread 0: succeeded to Acquire GL", Debug) Store(1, i000) @@ -84,7 +84,7 @@ Method(m032, 1) if (LNot(i001)) { Store("Thread 1: before attempt to Release GL", Debug) Release(\_GL) - CH04("", 0, 63, 0, 0x001, 0, 0) // AE_AML_NOT_OWNER + CH04("", 0, 63, 0, __LINE__, 0, 0) // AE_AML_NOT_OWNER Store("Thread 1: after attempt to Release GL", Debug) Store(1, i001) } @@ -119,7 +119,7 @@ Method(m033, 1) Store(Acquire(MX00, 0xffff), Local0) if (Local0) { Store("Thread 0: failed to Acquire MX00", Debug) - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Thread 0: succeeded to Acquire MX00", Debug) Store(1, i000) @@ -135,7 +135,7 @@ Method(m033, 1) if (LNot(i001)) { Store("Thread 1: before attempt to Release MX00", Debug) Release(MX00) - CH04("", 0, 63, 0, 0x003, 0, 0) // AE_AML_NOT_OWNER + CH04("", 0, 63, 0, __LINE__, 0, 0) // AE_AML_NOT_OWNER Store("Thread 1: after attempt to Release MX00", Debug) Store(1, i001) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl index ac1f976..c47067e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl @@ -47,7 +47,7 @@ Method(m129) Store(Refof(FU01), Local2) - if (CH03("", 0, 0x000, 0, 0)) { + if (CH03("", 0, 0x000, __LINE__, 0)) { return } @@ -62,7 +62,7 @@ Method(m129) { Store (1, EXC0) } - CH04("", 0, 62, 0, 0x001, 0, 0) // AE_AML_NO_RETURN_VALUE + CH04("", 0, 62, 0, __LINE__, 0, 0) // AE_AML_NO_RETURN_VALUE } m000(0x100) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl index fcbee63..f9278ef 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl @@ -59,7 +59,7 @@ Method(m031,, Serialized) Store(Acquire(T000, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T000 (Level 0, index 0)", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T000 (Level 0, index 0)", Debug) } @@ -67,7 +67,7 @@ Method(m031,, Serialized) Store(Acquire(T001, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T001 (Level 0, index 1)", Debug) - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T001 (Level 0, index 1)", Debug) } @@ -75,7 +75,7 @@ Method(m031,, Serialized) Store(Acquire(T002, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T002 (Level 0, index 2)", Debug) - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T002 (Level 0, index 2)", Debug) } @@ -83,7 +83,7 @@ Method(m031,, Serialized) Store(Acquire(T003, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T003 (Level 0, index 3)", Debug) - err("", zFFF, 0x003, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T003 (Level 0, index 3)", Debug) } @@ -92,24 +92,24 @@ Method(m031,, Serialized) Store("Releasing mutexes of level 0:", Debug) Store("Release T000 (Level 0, index 0)", Debug) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Release(T000) - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) Store("Release T001 (Level 0, index 1)", Debug) - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) Release(T001) - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) Store("Release T002 (Level 0, index 2)", Debug) - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) Release(T002) - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) Store("Release T003 (Level 0, index 3)", Debug) - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) Release(T003) - CH03("", 0, 0x00b, 0, 0) + CH03("", 0, 0x00b, __LINE__, 0) } /* @@ -126,7 +126,7 @@ Method(m031,, Serialized) Store(Acquire(T100, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T100 (Level 1, index 0)", Debug) - err("", zFFF, 0x00c, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T100 (Level 1, index 0)", Debug) } @@ -134,7 +134,7 @@ Method(m031,, Serialized) Store(Acquire(T101, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T101 (Level 1, index 1)", Debug) - err("", zFFF, 0x00d, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T101 (Level 1, index 1)", Debug) } @@ -142,7 +142,7 @@ Method(m031,, Serialized) Store(Acquire(T102, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T102 (Level 1, index 2)", Debug) - err("", zFFF, 0x00e, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T102 (Level 1, index 2)", Debug) } @@ -150,7 +150,7 @@ Method(m031,, Serialized) Store(Acquire(T103, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T103 (Level 1, index 3)", Debug) - err("", zFFF, 0x00f, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T103 (Level 1, index 3)", Debug) } @@ -159,24 +159,24 @@ Method(m031,, Serialized) Store("Releasing mutexes of Level 1:", Debug) Store("Release T100 (Level 1, index 0)", Debug) - CH03("", 0, 0x010, 0, 0) + CH03("", 0, 0x010, __LINE__, 0) Release(T100) - CH03("", 0, 0x011, 0, 0) + CH03("", 0, 0x011, __LINE__, 0) Store("Release T101 (Level 1, index 1)", Debug) - CH03("", 0, 0x012, 0, 0) + CH03("", 0, 0x012, __LINE__, 0) Release(T101) - CH03("", 0, 0x013, 0, 0) + CH03("", 0, 0x013, __LINE__, 0) Store("Release T102 (Level 1, index 2)", Debug) - CH03("", 0, 0x014, 0, 0) + CH03("", 0, 0x014, __LINE__, 0) Release(T102) - CH03("", 0, 0x015, 0, 0) + CH03("", 0, 0x015, __LINE__, 0) Store("Release T103 (Level 1, index 3)", Debug) - CH03("", 0, 0x016, 0, 0) + CH03("", 0, 0x016, __LINE__, 0) Release(T103) - CH03("", 0, 0x017, 0, 0) + CH03("", 0, 0x017, __LINE__, 0) } /* @@ -194,7 +194,7 @@ Method(m031,, Serialized) Store(Acquire(T100, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T100 (Level 1, index 0)", Debug) - err("", zFFF, 0x018, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T100 (Level 1, index 0)", Debug) } @@ -202,7 +202,7 @@ Method(m031,, Serialized) Store(Acquire(T101, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T101 (Level 1, index 1)", Debug) - err("", zFFF, 0x019, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T101 (Level 1, index 1)", Debug) } @@ -210,7 +210,7 @@ Method(m031,, Serialized) Store(Acquire(T102, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T102 (Level 1, index 2)", Debug) - err("", zFFF, 0x01a, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T102 (Level 1, index 2)", Debug) } @@ -218,7 +218,7 @@ Method(m031,, Serialized) Store(Acquire(T103, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T103 (Level 1, index 3)", Debug) - err("", zFFF, 0x01b, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T103 (Level 1, index 3)", Debug) } @@ -227,24 +227,24 @@ Method(m031,, Serialized) Store("Releasing mutexes of Level 1:", Debug) Store("Release T101 (Level 1, index 1)", Debug) - CH03("", 0, 0x01c, 0, 0) + CH03("", 0, 0x01c, __LINE__, 0) Release(T101) - CH03("", 0, 0x01d, 0, 0) + CH03("", 0, 0x01d, __LINE__, 0) Store("Release T102 (Level 1, index 2)", Debug) - CH03("", 0, 0x01e, 0, 0) + CH03("", 0, 0x01e, __LINE__, 0) Release(T102) - CH03("", 0, 0x01f, 0, 0) + CH03("", 0, 0x01f, __LINE__, 0) Store("Release T103 (Level 1, index 3)", Debug) - CH03("", 0, 0x020, 0, 0) + CH03("", 0, 0x020, __LINE__, 0) Release(T103) - CH03("", 0, 0x021, 0, 0) + CH03("", 0, 0x021, __LINE__, 0) Store("Release T100 (Level 1, index 0)", Debug) - CH03("", 0, 0x022, 0, 0) + CH03("", 0, 0x022, __LINE__, 0) Release(T100) - CH03("", 0, 0x023, 0, 0) + CH03("", 0, 0x023, __LINE__, 0) } Method(mm00) @@ -254,8 +254,8 @@ Method(m031,, Serialized) m002() } - CH03("", 0, 0x024, 0, 0) + CH03("", 0, 0x024, __LINE__, 0) mm00() - CH03("", 0, 0x025, 0, 0) + CH03("", 0, 0x025, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl index 6dc14e1..24b0f89 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl @@ -47,7 +47,7 @@ Method(m02f,, Serialized) Store(Acquire(T500, 0xffff), Local0) if (Local0) { Store("!!!!!!!! ERROR 0: Acquire T500 (Level 5, index 0)", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquired T500 (Level 5, index 0)", Debug) } @@ -57,7 +57,7 @@ Method(m02f,, Serialized) Store(Acquire(T600, 0xffff), Local0) if (Local0) { Store("!!!!!!!! ERROR 1: Acquire T600 (Level 6, index 0)", Debug) - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquired T600 (Level 6, index 0)", Debug) } @@ -70,24 +70,24 @@ Method(m02f,, Serialized) * If no exception there: * ERROR: NO exception though expected! (it is the contents of bug 238) */ - CH04("", 0, 64, 0, 0x002, 0, 0) // AE_AML_MUTEX_ORDER + CH04("", 0, 64, 0, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER /* (4) */ Store("Acquiring mutex of level 7:", Debug) Store(Acquire(T700, 0xffff), Local0) if (Local0) { Store("!!!!!!!! ERROR 3: Acquire T700 (Level 7, index 0)", Debug) - err("", zFFF, 0x003, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquired T700 (Level 7, index 0)", Debug) Store("Current level is equal to 7!", Debug) } - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) /* (5) */ Store("Releasing the mutex of the current level: T700 (Level 7, index 0)", Debug) Release(T700) - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) /* * (6) @@ -97,12 +97,12 @@ Method(m02f,, Serialized) */ Store("Releasing mutex of level 6: T600 (Level 6, index 0)", Debug) Release(T600) - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) /* (7) */ Store("Releasing mutex of level 5: T500 (Level 5, index 0)", Debug) Release(T500) - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) } Method(mm00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl index 043f486..f3e6854 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl @@ -134,7 +134,7 @@ /* Method(m03c) { - if (CH03("", 0, 0x000, 0, 0)) + if (CH03("", 0, 0x000, __LINE__, 0)) { Store(1, i108) } @@ -146,39 +146,39 @@ Method(m02e) Method(m0b9) { if (i108) { - err("", zFFF, 0x126, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } if (LNot(i101)) { Store("******** Test was not run !!!!!!!!!!!!!", Debug) - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } Store("******** Test started", Debug) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) if (i104) { Store("!!!!!!!! ERROR 1: Acquire(T804, 0xffff) failed", Debug) - err("", zFFF, 0x004, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire(T804, 0xffff)", Debug) } if (i105) { Store("!!!!!!!! ERROR 2: Acquire(T805, 0xffff) failed", Debug) - err("", zFFF, 0x005, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire(T805, 0xffff)", Debug) } Release(T804) - CH04("", 0, 65, 0, 0x006, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04("", 0, 65, 0, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED Release(T805) - CH04("", 0, 65, 0, 0x007, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04("", 0, 65, 0, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED // Release T807 @@ -186,9 +186,9 @@ Method(m02e) Release(T807) } else { Store("!!!!!!!! ERROR 7: Acquire(T807, 0xffff) failed", Debug) - err("", zFFF, 0x008, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) // Release T806 @@ -196,9 +196,9 @@ Method(m02e) Release(T806) } else { Store("!!!!!!!! ERROR 5: Acquire(T806, 0xffff) failed", Debug) - err("", zFFF, 0x00a, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } - CH03("", 0, 0x00b, 0, 0) + CH03("", 0, 0x00b, __LINE__, 0) Store("******** Test finished", Debug) } @@ -310,34 +310,34 @@ Method(m030,, Serialized) { if (LNot(i101)) { Store("******** Test was not run !!!!!!!!!!!!!", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } Store("******** Test started", Debug) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) if (i104) { Store("!!!!!!!! ERROR 1: Acquire(T804, 0xffff) failed", Debug) - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire(T804, 0xffff)", Debug) } if (i105) { Store("!!!!!!!! ERROR 2: Acquire(T805, 0xffff) failed", Debug) - err("", zFFF, 0x003, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire(T805, 0xffff)", Debug) } Release(T804) - CH04("", 0, 65, 0, 0x004, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04("", 0, 65, 0, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED Release(T805) - CH04("", 0, 65, 0, 0x005, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04("", 0, 65, 0, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED /* Release T807 */ @@ -345,9 +345,9 @@ Method(m030,, Serialized) Release(T807) } else { Store("!!!!!!!! ERROR 7: Acquire(T807, 0xffff) failed", Debug) - err("", zFFF, 0x006, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) /* Release T806 */ @@ -355,9 +355,9 @@ Method(m030,, Serialized) Release(T806) } else { Store("!!!!!!!! ERROR 5: Acquire(T806, 0xffff) failed", Debug) - err("", zFFF, 0x008, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) Store("******** Test finished", Debug) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl index d479f1b..5f31f7e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl @@ -40,7 +40,7 @@ Method(m17b, 0, Serialized) Store(0x000, Local2) while (Local0) { - if (CH03("", 0, Local2, 0, 0)) { + if (CH03("", 0, Local2, __LINE__, 0)) { return } Increment(Local2) @@ -54,7 +54,7 @@ Method(m17b, 0, Serialized) Add(Local1, 2, Local1) } } - if (CH03("", 0, Local2, 0, 0)) { + if (CH03("", 0, Local2, __LINE__, 0)) { return } Increment(Local2) @@ -62,6 +62,6 @@ Method(m17b, 0, Serialized) } if (LNotEqual(Local1, 3)) { - err("", zFFF, Local2, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl index bb68635..ffe723c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl @@ -47,7 +47,7 @@ Method(m17c,, Serialized) Store(2, Local0) while (Local0) { - if (CH03("", 0, ERRN, 0, 0)) { + if (CH03("", 0, ERRN, __LINE__, 0)) { return } Increment(ERRN) @@ -67,7 +67,7 @@ Method(m17c,, Serialized) Store(1, CH21) } } - if (CH03("", 0, ERRN, 0, 0)) { + if (CH03("", 0, ERRN, __LINE__, 0)) { return } Increment(ERRN) @@ -75,19 +75,19 @@ Method(m17c,, Serialized) } if (LNotEqual(CH10, Arg1)) { - err("", zFFF, ERRN, 0, 0, CH10, Arg1) + err("", zFFF, __LINE__, 0, 0, CH10, Arg1) } Increment(ERRN) if (LEqual(CH11, Arg1)) { - err("", zFFF, ERRN, 0, 0, CH11, Arg1) + err("", zFFF, __LINE__, 0, 0, CH11, Arg1) } Increment(ERRN) if (LNotEqual(CH20, Arg2)) { - err("", zFFF, ERRN, 0, 0, CH20, Arg2) + err("", zFFF, __LINE__, 0, 0, CH20, Arg2) } Increment(ERRN) if (LEqual(CH21, Arg2)) { - err("", zFFF, ERRN, 0, 0, CH21, Arg2) + err("", zFFF, __LINE__, 0, 0, CH21, Arg2) } Increment(ERRN) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl index 7e3f807..62d164d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl @@ -87,7 +87,7 @@ Method(m02d) } if (LNotEqual(DerefOf(Local0), 0xabcd0000)) { - err("", zFFF, 0x000, 0, 0, DerefOf(Local0), 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, DerefOf(Local0), 0xabcd0000) } Store("============== sit 0 (Local0):", debug) @@ -125,7 +125,7 @@ Method(m02d) Store("============== before checking:", debug) if (LNotEqual(DerefOf(Local0), 0xabcd0000)) { - err("", zFFF, 0x001, 0, 0, DerefOf(Local0), 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, DerefOf(Local0), 0xabcd0000) } Store("============== end of test", debug) @@ -135,11 +135,11 @@ Method(m02d) m1a9() } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) mm00() /* Check opcode of the last exception */ - CH04("", 2, 47, 0, 0x003, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 2, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } /* @@ -156,18 +156,18 @@ Method(m03d,, Serialized) Name(hg01, 1) // if non-zero - the test hangs Name(hg02, 1) // if non-zero - the test hangs - CH03("", 0, 184, 0, 0) + CH03("", 0, 184, __LINE__, 0) CopyObject(Index(p000, 1, Local0), i001) - CH03("", 0, 185, 0, 0) + CH03("", 0, 185, __LINE__, 0) // Type of i001 should be already IRef here, // so, don't expect exception. Store(Index(p000, 0, Local0), i001) - CH03("", 0, 186, 0, 0) + CH03("", 0, 186, __LINE__, 0) Add(Local0, 1, Local7) @@ -200,11 +200,11 @@ Method(m03d,, Serialized) Store(Local7, debug) } - CH04("", 0, 0xff, 0, 187, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) Add(i001, 1, Local7) - CH04("", 0, 0xff, 0, 188, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) /* * Looks identical to b248: "Incorrect ReferenceCount on Switch operation" diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0251_ACTION_REQUIRED/MAIN.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0251_ACTION_REQUIRED/MAIN.asl index 30d6531..fe595f5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0251_ACTION_REQUIRED/MAIN.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0251_ACTION_REQUIRED/MAIN.asl @@ -96,7 +96,7 @@ DefinitionBlock( // Run verification methods - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) if (LEqual(arg1, "AML Debugger")) { Store("========== args of Execute command of AcpiExec:", Debug) @@ -117,7 +117,7 @@ DefinitionBlock( } } - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) // Final actions Store(FNSH(), Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl index c24e7cf..5bdf983 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl @@ -76,42 +76,42 @@ Method(m17d) Store(B257, F257) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x000, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) return } - if (CH03("", 0, 0x001, 0, 0)) { + if (CH03("", 0, 0x001, __LINE__, 0)) { return } Load(F257, H257) - if (CH03("", 0, 0x002, 0, 0)) { + if (CH03("", 0, 0x002, __LINE__, 0)) { return } if (CondRefof(\AUXD, Local0)) { } else { - err("", zFFF, 0x003, 0, 0, "\\AUXD", 0) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 0) return } Store (ObjectType(Local0), Local1) if (LNotEqual(Local1, 6)) { - err("", zFFF, 0x004, 0, 0, Local1, 6) + err("", zFFF, __LINE__, 0, 0, Local1, 6) return } Store(ObjectType(\AUXD.M000), Local0) if (LNotEqual(Local0, 8)) { - err("", zFFF, 0x005, 0, 0, Local0, 8) + err("", zFFF, __LINE__, 0, 0, Local0, 8) return } UnLoad(H257) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x006, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl index aff409a..3766764 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl @@ -75,42 +75,42 @@ Method(m17e) Store(B258, F258) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x000, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) return } - if (CH03("", 0, 0x001, 0, 0)) { + if (CH03("", 0, 0x001, __LINE__, 0)) { return } Load(R258, H258) - if (CH04("", 0, 8, 0, 0x002, 0, 0)) { // AE_TYPE + if (CH04("", 0, 8, 0, __LINE__, 0, 0)) { // AE_TYPE return } if (CondRefof(\AUXD, Local0)) { } else { - err("", zFFF, 0x003, 0, 0, "\\AUXD", 0) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 0) return } Store (ObjectType(Local0), Local1) if (LNotEqual(Local1, 6)) { - err("", zFFF, 0x004, 0, 0, Local1, 6) + err("", zFFF, __LINE__, 0, 0, Local1, 6) return } Store(ObjectType(\AUXD.M000), Local0) if (LNotEqual(Local0, 8)) { - err("", zFFF, 0x005, 0, 0, Local0, 8) + err("", zFFF, __LINE__, 0, 0, Local0, 8) return } UnLoad(H258) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x006, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl index 79f88a1..bbcadf8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl @@ -78,42 +78,42 @@ Method(m17f) Store(B259, F259) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x000, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) return } - if (CH03("", 0, 0x001, 0, 0)) { + if (CH03("", 0, 0x001, __LINE__, 0)) { return } Load(R259, H259) - if (CH03("", 0, 0x002, 0, 0)) { + if (CH03("", 0, 0x002, __LINE__, 0)) { return } if (CondRefof(\AUXD, Local0)) { } else { - err("", zFFF, 0x003, 0, 0, "\\AUXD", 0) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 0) return } Store (ObjectType(Local0), Local1) if (LNotEqual(Local1, 6)) { - err("", zFFF, 0x004, 0, 0, Local1, 6) + err("", zFFF, __LINE__, 0, 0, Local1, 6) return } Store(\AUXD.REGC, Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x005, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) return } UnLoad(H259) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x006, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl index d8feadb..6e3fbaa 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl @@ -56,12 +56,12 @@ Method(m029,, Serialized) Method(m000) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(BUF0, RFU0) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } @@ -71,14 +71,14 @@ Method(m029,, Serialized) if (CondRefof(\AUXD, Local0)) { } else { - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } Store(ObjectType(Local2), Local1) if (LNotEqual(Local1, 15)) { Store(Local1, Debug) - err("", zFFF, 0x003, 0, 0, Local1, 15) + err("", zFFF, __LINE__, 0, 0, Local1, 15) return } @@ -87,10 +87,10 @@ Method(m029,, Serialized) Store("SSDT unloaded", Debug) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x004, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) return } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl index 7fda258..f626691 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl @@ -60,12 +60,12 @@ Method(m028,, Serialized) { Name(PAC0, Package(1){}) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(BUF0, RFU0) if (CondRefof(\AUXZ, Local0)) { - err("", zFFF, 0x001, 0, 0, Local0, 0x1777777) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1777777) return } @@ -75,14 +75,14 @@ Method(m028,, Serialized) if (CondRefof(\AUXZ, Local0)) { } else { - err("", zFFF, 0x002, 0, 0, Local0, 0x1777777) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1777777) return } Store(ObjectType(Index(PAC0, 0)), Local1) if (LNotEqual(Local1, 15)) { Store(Local1, Debug) - err("", zFFF, 0x003, 0, 0, Local0, 0x1777777) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1777777) return } @@ -91,10 +91,10 @@ Method(m028,, Serialized) Store("SSDT unloaded", Debug) if (CondRefof(\AUXZ, Local0)) { - err("", zFFF, 0x004, 0, 0, Local0, 0x1777777) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1777777) } - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) return } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl index cfa07a9..29412ed 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl @@ -59,12 +59,12 @@ Method(m027,, Serialized) Store (Local0, Debug) if (LNotEqual(Local0, 0x1777777)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x1777777) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1777777) } } - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) m000() - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl index c87af5b..8182308 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl @@ -49,11 +49,11 @@ Method(m026) Store(i000, Debug) if (LNotEqual(Local0, 0x50000001)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x50000001) + err("", zFFF, __LINE__, 0, 0, Local0, 0x50000001) } if (LNotEqual(i000, 0x50000000)) { - err("", zFFF, 0x001, 0, 0, i000, 0x50000000) + err("", zFFF, __LINE__, 0, 0, i000, 0x50000000) } } @@ -111,11 +111,11 @@ Method(m026) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err("", zFFF, 0x002, 0, 0, Local0, 0x87654321) + err("", zFFF, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err("", zFFF, 0x003, 0, 0, i000, 0x80000000) + err("", zFFF, __LINE__, 0, 0, i000, 0x80000000) } } mm00() diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl index 1201e94..171f707 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl @@ -50,7 +50,7 @@ Method(m025) Name(i000, 0xabcd0000) Name(p000, Package() { i000 }) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(0xabcd0001, DerefOf(Index(p000, 0))) @@ -59,11 +59,11 @@ Specify then what should be there the result of Store operation above? Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0000) } */ - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } Method(m001,, Serialized) @@ -71,9 +71,9 @@ Specify then what should be there the result of Store operation above? Name(i000, 0xabcd0000) Name(p000, Package() { i000 }) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store(0xabcd0001, DerefOf(Index(p000, 0, Local0))) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } Method(m002,, Serialized) @@ -81,10 +81,10 @@ Specify then what should be there the result of Store operation above? Name(i000, 0xabcd0000) Name(p000, Package() { i000 }) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Index(p000, 0, Local0) Store(0xabcd0001, DerefOf(Local0)) - CH03("", 0, 0x005, 0, 0) + CH03("", 0, 0x005, __LINE__, 0) } Method(m003,, Serialized) @@ -92,10 +92,10 @@ Specify then what should be there the result of Store operation above? Name(i000, 0xabcd0000) Name(p000, Package() { i000 }) - CH03("", 0, 0x006, 0, 0) + CH03("", 0, 0x006, __LINE__, 0) Store(Index(p000, 0), Local0) Store(0xabcd0001, DerefOf(Local0)) - CH03("", 0, 0x007, 0, 0) + CH03("", 0, 0x007, __LINE__, 0) } Method(m004,, Serialized) @@ -103,10 +103,10 @@ Specify then what should be there the result of Store operation above? Name(i000, 0xabcd0000) Name(p000, Package() { i000 }) - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) Store(Index(p000, 0, Local0), Local1) Store(0xabcd0001, DerefOf(Local0)) - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) } Method(m005,, Serialized) @@ -114,10 +114,10 @@ Specify then what should be there the result of Store operation above? Name(i000, 0xabcd0000) Name(p000, Package() { i000 }) - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) Store(Index(p000, 0, Local0), Local1) Store(0xabcd0001, DerefOf(Local1)) - CH03("", 0, 0x00b, 0, 0) + CH03("", 0, 0x00b, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl index edbdba7..ff7d31d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl @@ -81,7 +81,7 @@ Method(m024) Store(Add(DerefOf(Index(s000, 1)), m001()), Local0) if (LNotEqual(Local0, 0x24)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x24) + err("", zFFF, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(s000, 1)), Local0) @@ -89,7 +89,7 @@ Method(m024) Store(0x08, Local1) if (LNotEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl index 331422c..747fa16 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl @@ -49,7 +49,7 @@ Method(m023,, Serialized) Store(i000, Debug) if (LNotEqual(arg0, 0xabcd0000)) { - err("", zFFF, 0x000, 0, 0, arg0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, arg0, 0xabcd0000) } } @@ -64,6 +64,6 @@ Method(m023,, Serialized) Store(i000, Debug) if (LNotEqual(i000, 0x11223344)) { - err("", zFFF, 0x001, 0, 0, i000, 0x11223344) + err("", zFFF, __LINE__, 0, 0, i000, 0x11223344) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl index 377b3e6..3480354 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl @@ -90,16 +90,16 @@ Method(m022,, Serialized) Return (MAdd(i000, m002())) } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(MAdd(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err("", zFFF, 0x001, 0, 0, Local0, c00e) + err("", zFFF, __LINE__, 0, 0, Local0, c00e) } if (LNotEqual(i000, 0x80000000)) { - err("", zFFF, 0x002, 0, 0, Local0, c00e) + err("", zFFF, __LINE__, 0, 0, Local0, c00e) } Store("Result:", Debug) @@ -108,5 +108,5 @@ Method(m022,, Serialized) Store("i000:", Debug) Store(i000, Debug) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl index a90997c..d5f4984 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl @@ -51,22 +51,22 @@ Method(m021,, Serialized) Store("-------------------------.", Debug) } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m123(i000) Store(ObjectType(i001), Local0) if (LNotEqual(Local0, c00e)) { - err("", zFFF, 0x001, 0, 0, Local0, c00e) + err("", zFFF, __LINE__, 0, 0, Local0, c00e) } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) CopyObject(i002, i001) Store(ObjectType(i001), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x003, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl index 2a36c94..ed06c93 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl @@ -51,22 +51,22 @@ Method(m020,, Serialized) Store("-------------------------.", Debug) } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m123(i000) Store(ObjectType(i001), Local0) if (LNotEqual(Local0, c015)) { - err("", zFFF, 0x001, 0, 0, Local0, c015) + err("", zFFF, __LINE__, 0, 0, Local0, c015) } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) CopyObject(i002, i001) Store(ObjectType(i001), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x003, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl index 622133a..ecb828c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl @@ -75,35 +75,35 @@ Method(mc73,, Serialized) } if (LNotEqual(F273, SSDT)) { - err("", zFFF, 0x001, 0, 0, F273, SSDT) + err("", zFFF, __LINE__, 0, 0, F273, SSDT) } if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x002, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } if (CondRefof(\D273._XT2, Local0)) { - err("", zFFF, 0x003, 0, 0, "\\D273._XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\D273._XT2", 1) } LD() if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x004, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } if (CondRefof(\D273._XT2, Local0)) { } else { - err("", zFFF, 0x005, 0, 0, "\\D273._XT2", 0) + err("", zFFF, __LINE__, 0, 0, "\\D273._XT2", 0) } UNLD() if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x006, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } if (CondRefof(\D273._XT2, Local0)) { - err("", zFFF, 0x007, 0, 0, "\\D273._XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\D273._XT2", 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl index 55abbbb..b8820d8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl @@ -54,7 +54,7 @@ Method(mc74,, Serialized) { Store(DerefOf(Index(Arg1, Arg2)), Local0) if (LNotEqual(Local0, Arg0)) { - err("", zFFF, Arg3, 0, 0, Arg0, Local0) + err("", zFFF, __LINE__, 0, 0, Arg0, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl index 7ef926a..5aeb5c1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl @@ -51,17 +51,17 @@ Method(mc75,, Serialized) Method(m002, 2) { Index(arg0, 1, Local0) - if (CH03("", 0, 0x001, arg0, 1)) { + if (CH03("", 0, 0x001, __LINE__, 1)) { return } Store(DerefOf(Local0), Local1) - if (CH03("", 0, 0x002, arg0, 1)) { + if (CH03("", 0, 0x002, __LINE__, 1)) { return } if (LNotEqual(Local1, 0xabcd0001)) { - err("", zFFF, 0x003, 0, 0, Local1, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, Local1, 0xabcd0001) } return } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl index 2036fe7..cb7c19d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl @@ -60,10 +60,10 @@ Device (D278) { { // Check absence if (CondRefof(NABS, Local0)) { - err("", zFFF, 0x001, 0, 0, "NABS", 1) + err("", zFFF, __LINE__, 0, 0, "NABS", 1) } if (CondRefof(NCRR, Local0)) { - err("", zFFF, 0x002, 0, 0, "NCRR", 1) + err("", zFFF, __LINE__, 0, 0, "NCRR", 1) } Store(SSDT, RFU0) @@ -73,33 +73,33 @@ Device (D278) { // Check existence if (CondRefof(NABS, Local0)) { if (LNotEqual("absolute location obj", Derefof(Local0))) { - err("", zFFF, 0x003, 0, 0, "absolute location NABS", 1) + err("", zFFF, __LINE__, 0, 0, "absolute location NABS", 1) } } else { - err("", zFFF, 0x004, 0, 0, "NABS", 0) + err("", zFFF, __LINE__, 0, 0, "NABS", 0) } if (CondRefof(NCRR, Local0)) { if (LNotEqual("current location obj", Derefof(Local0))) { - err("", zFFF, 0x005, 0, 0, "current location NCRR", 1) + err("", zFFF, __LINE__, 0, 0, "current location NCRR", 1) } } else { - err("", zFFF, 0x006, 0, 0, "NCRR", 0) + err("", zFFF, __LINE__, 0, 0, "NCRR", 0) } // Check location if (CondRefof(\NABS, Local0)) { } else { - err("", zFFF, 0x007, 0, 0, "\\NABS", 0) + err("", zFFF, __LINE__, 0, 0, "\\NABS", 0) } if (CondRefof(\NCRR, Local0)) { - err("", zFFF, 0x008, 0, 0, "\\NCRR", 1) + err("", zFFF, __LINE__, 0, 0, "\\NCRR", 1) } if (CondRefof(\D278.NCRR, Local0)) { - err("", zFFF, 0x009, 0, 0, "\\D278.NCRR", 1) + err("", zFFF, __LINE__, 0, 0, "\\D278.NCRR", 1) } if (CondRefof(\D278.TST0.NCRR, Local0)) { } else { - err("", zFFF, 0x00a, 0, 0, "\\D278.TST0.NCRR", 0) + err("", zFFF, __LINE__, 0, 0, "\\D278.TST0.NCRR", 0) } UnLoad(DDBH) @@ -107,10 +107,10 @@ Device (D278) { // Check absence if (CondRefof(NABS, Local0)) { - err("", zFFF, 0x00b, 0, 0, "NABS", 1) + err("", zFFF, __LINE__, 0, 0, "NABS", 1) } if (CondRefof(NCRR, Local0)) { - err("", zFFF, 0x00c, 0, 0, "NCRR", 1) + err("", zFFF, __LINE__, 0, 0, "NCRR", 1) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0279_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0279_ASL_RUNTIME/DECL.asl index 307f8b7..5c0cc06 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0279_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0279_ASL_RUNTIME/DECL.asl @@ -41,6 +41,6 @@ External(\SS00) Method(m279) { if (CondRefof(\SS00, Local0)) { - err("", zFFF, 0x001, 0, 0, "\\SS00", 1) + err("", zFFF, __LINE__, 0, 0, "\\SS00", 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0280_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0280_ASL_RUNTIME/DECL.asl index 1582891..3aaf2e3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0280_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0280_ASL_RUNTIME/DECL.asl @@ -36,7 +36,7 @@ Device (D280) { Method(T280) { if (CondRefof(NABS, Local0)) { - err("", zFFF, 0x001, 0, 0, "NABS", 1) + err("", zFFF, __LINE__, 0, 0, "NABS", 1) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl index 75228c0..56fef95 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl @@ -53,12 +53,12 @@ Device (D281) { if (LNotEqual(PLDT, 0)) { Store(PLDT, Debug) - err("", zFFF, 0x000, 0, 0, PLDT, 0) + err("", zFFF, __LINE__, 0, 0, PLDT, 0) return (1) } if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x001, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } // Successful case: spaces is replaced with zeroes @@ -76,21 +76,21 @@ Device (D281) { if (LNotEqual(PLDT, 1)) { Store(PLDT, Debug) - err("", zFFF, 0x003, 0, 0, PLDT, 1) + err("", zFFF, __LINE__, 0, 0, PLDT, 1) return (1) } Store("OEM1 loaded", Debug) if (CondRefof(\_XT2, Local0)) { } else { - err("", zFFF, 0x004, 0, 0, "\\_XT2", 0) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB0) Store("OEM1 unloaded", Debug) if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x005, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } // Unhappy case: normal strings @@ -101,21 +101,21 @@ Device (D281) { if (LNotEqual(PLDT, 1)) { Store(PLDT, Debug) - err("", zFFF, 0x007, 0, 0, PLDT, 1) + err("", zFFF, __LINE__, 0, 0, PLDT, 1) return (1) } Store("OEM1 loaded", Debug) if (CondRefof(\_XT2, Local0)) { } else { - err("", zFFF, 0x008, 0, 0, "\\_XT2", 0) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB1) Store("OEM1 unloaded", Debug) if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x009, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } return (0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0282/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0282/DECL.asl index 87232b7..b7bf7e3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0282/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0282/DECL.asl @@ -44,7 +44,7 @@ Device (D282) { Store(BUF0, Debug) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0283/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0283/DECL.asl index 889d0ee..e13d8db 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0283/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0283/DECL.asl @@ -70,11 +70,11 @@ Device (D283) { // "Incorrect checksum" ACPI warning is expected Load(RFU0, HI0) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) UnLoad(HI0) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl index 821f2de..75bd526 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl @@ -70,9 +70,9 @@ Device (D284) { // An exception is expected Load(RFU0, HI0) - if (CH04("", 0, 0xff, 0, 0x001, 0, 0)) { + if (CH04("", 0, 0xff, 0, __LINE__, 0, 0)) { UnLoad(HI0) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0285/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0285/DECL.asl index 8cdd926..14dfaf8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0285/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0285/DECL.asl @@ -63,9 +63,9 @@ Device (D285) { UnLoad(m000()) - if (CH03("", 0, 0x001, 0, 0)) { + if (CH03("", 0, 0x001, __LINE__, 0)) { UnLoad(HI0) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl index 51cf8fa..3c6ecee 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl @@ -71,13 +71,13 @@ Device (D286) { m000(Refof(\AUXD.PAC0)) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) Store(Derefof(Index(\AUXD.PAC0, 0)), Debug) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Unload(DDB0) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl index b4e56af..3bc0601 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl @@ -42,27 +42,27 @@ Device (D287) { // SignatureString is greater than four characters LoadTable("OEMXX", "", "", , "\\D287.PLDT", 1) - CH04("", 0, 0xff, 0, 0x001, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) if (LNotEqual(PLDT, 0)) { - err("", zFFF, 0x002, 0, 0, PLDT, 0) + err("", zFFF, __LINE__, 0, 0, PLDT, 0) Return (1) } // OEMIDString is greater than six characters LoadTable("OEM1", "IntelXX", "", , "\\D287.PLDT", 1) - CH04("", 0, 0xff, 0, 0x003, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) if (LNotEqual(PLDT, 0)) { - err("", zFFF, 0x004, 0, 0, PLDT, 0) + err("", zFFF, __LINE__, 0, 0, PLDT, 0) Return (1) } // OEMTableID is greater than eight characters LoadTable("OEM1", "", "ManyXXXXX", , "\\D287.PLDT", 1) - CH04("", 0, 0xff, 0, 0x005, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) if (LNotEqual(PLDT, 0)) { - err("", zFFF, 0x006, 0, 0, PLDT, 0) + err("", zFFF, __LINE__, 0, 0, PLDT, 0) Return (1) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0288_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0288_ASL_RUNTIME/DECL.asl index 770f4db..6ba8337 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0288_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0288_ASL_RUNTIME/DECL.asl @@ -44,7 +44,7 @@ Device (D288) { Store(LoadTable("OEM1", "", "", , "\\D288.PLDT", Local0), Local1) if (LNotEqual(PLDT, 1)) { - err("", zFFF, 0x001, 0, 0, PLDT, 1) + err("", zFFF, __LINE__, 0, 0, PLDT, 1) } UnLoad(Local1) @@ -52,7 +52,7 @@ Device (D288) { Store(LoadTable("OEM1", "", "", , "\\PLDT", m000(2)), Local1) if (LNotEqual(PLDT, 2)) { - err("", zFFF, 0x002, 0, 0, PLDT, 2) + err("", zFFF, __LINE__, 0, 0, PLDT, 2) } UnLoad(Local1) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl index f044013..9e50d2b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl @@ -67,7 +67,7 @@ Device (D289) { Store(LoadTable("SSDT", "iASLTS", "LTBL0001", "\\", "\\D289.PLDT", 1), DDBH) if (LEqual(PLDT, 1)) { - err("", zFFF, 0x001, 0, 0, "PLDT", 1) + err("", zFFF, __LINE__, 0, 0, "PLDT", 1) UnLoad(DDBH) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl index 7f8f486..6ac1e67 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl @@ -59,17 +59,17 @@ Device (D290) { Store(BUF0, RFU0) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x000, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) return } Load(IST0, Local1) - if (CH03("", 0, 0x001, 0, 0)) { + if (CH03("", 0, 0x001, __LINE__, 0)) { return } elseif (CondRefof(\AUXD, Local0)) { } else { - err("", zFFF, 0x002, 0, 0, "\\AUXD", 0) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 0) return } @@ -80,7 +80,7 @@ Device (D290) { Store("SSDT unloaded", Debug) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x003, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) } return diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0291_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0291_ASL_RUNTIME/DECL.asl index 3fe8f41..9fd360c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0291_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0291_ASL_RUNTIME/DECL.asl @@ -45,7 +45,7 @@ Device (D291) { Store(LoadTable("OEM1", "", "", "\\", "\\D291.PLDT", Subtract(M000(3), 1)), DDBH) if (LNotEqual(PLDT, 2)) { - err("", zFFF, 0x001, 0, 0, PLDT, 2) + err("", zFFF, __LINE__, 0, 0, PLDT, 2) return } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl index cf5a706..13e8c9b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl @@ -61,14 +61,14 @@ Device (D292) { Store("SSDT loaded", Debug) UnLoad(DDB0) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) Store("SSDT unloaded", Debug) UnLoad(DDB0) - CH04("", 0, 0xff, 0, 0x002, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) UnLoad(DDB0) - CH04("", 0, 0xff, 0, 0x003, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl index afa0719..7fa628b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl @@ -47,34 +47,34 @@ Method(m293) Store(Sizeof(Local3), Debug) If (LNotEqual(Sizeof(Local2), 0)) { - err("", zFFF, 0x001, 0, 0, Sizeof(Local2), 0) + err("", zFFF, __LINE__, 0, 0, Sizeof(Local2), 0) } If (LNotEqual(Sizeof(Local3), 0)) { - err("", zFFF, 0x001, 0, 0, Sizeof(Local3), 0) + err("", zFFF, __LINE__, 0, 0, Sizeof(Local3), 0) } If (LNotEqual("", Local1)) { - err("", zFFF, 0x001, 0, 0, "", Local1) + err("", zFFF, __LINE__, 0, 0, "", Local1) } If (LNotEqual("", Local2)) { - err("", zFFF, 0x001, 0, 0, "", Local2) + err("", zFFF, __LINE__, 0, 0, "", Local2) } If (LNotEqual("", Local3)) { - err("", zFFF, 0x001, 0, 0, "", Local3) + err("", zFFF, __LINE__, 0, 0, "", Local3) } If (LNotEqual(Local2, Local3)) { - err("", zFFF, 0x001, 0, 0, Local2, Local3) + err("", zFFF, __LINE__, 0, 0, Local2, Local3) } If (LNotEqual(Local2, Local1)) { - err("", zFFF, 0x001, 0, 0, Local2, Local1) + err("", zFFF, __LINE__, 0, 0, Local2, Local1) } If (LNotEqual(Local3, Local1)) { - err("", zFFF, 0x001, 0, 0, Local3, Local1) + err("", zFFF, __LINE__, 0, 0, Local3, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl index 347755a..4f8e3a4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl @@ -238,7 +238,7 @@ Device (D294) { Name(DDB3, 0) if (INIT()) { - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return (1) } @@ -249,7 +249,7 @@ Device (D294) { while (Local0) { // Store(HI0N, Debug) if (LD()) { - err("", zFFF, 0x002, 0, 0, Local0, HI0N) + err("", zFFF, __LINE__, 0, 0, Local0, HI0N) return (1) } Decrement(Local0) @@ -263,7 +263,7 @@ Device (D294) { // The following Load should cause AE_OWNER_ID_LIMIT Load(RFU3, DDB3) - CH04("", 0, 0xff, 0, 0x003, 0, 0) + CH04("", 0, 0xff, 0, __LINE__, 0, 0) return (0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl index 9845e60..df0cec3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl @@ -41,20 +41,20 @@ Device (D296) { { Store(LoadTable("OEM1", "", "", , "\\PLDT", "1"), Local0) - if (CH03("", 0, 0x001, 0, 0)) { + if (CH03("", 0, 0x001, __LINE__, 0)) { return } Store(ObjectType(PLDT), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x002, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } elseif (LNotEqual(1, PLDT)) { - err("", zFFF, 0x003, 0, 0, 1, PLDT) + err("", zFFF, __LINE__, 0, 0, 1, PLDT) } UnLoad(Local0) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0297_ACTIONS_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0297_ACTIONS_REQUIRED/DECL.asl index fc9bce8..3c2c32d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0297_ACTIONS_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0297_ACTIONS_REQUIRED/DECL.asl @@ -37,7 +37,7 @@ */ Method(m1e4, 1, Serialized) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Mutex(MT00, 0) Mutex(MT10, 1) @@ -199,131 +199,131 @@ Method(m1e4, 1, Serialized) Store(Acquire(MT00, 0xffff), Local0) if (Local0) { - err("", zFFF, 1, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT01, 0xffff), Local0) /* the same level */ if (Local0) { - err("", zFFF, 2, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(\_GL, 0xffff), Local0) /* GL */ if (Local0) { - err("", zFFF, 3, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT10, 0xffff), Local0) if (Local0) { - err("", zFFF, 4, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT11, 0xffff), Local0) if (Local0) { - err("", zFFF, 5, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT20, 0xffff), Local0) if (Local0) { - err("", zFFF, 6, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT21, 0xffff), Local0) if (Local0) { - err("", zFFF, 7, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT30, 0xffff), Local0) if (Local0) { - err("", zFFF, 8, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT31, 0xffff), Local0) if (Local0) { - err("", zFFF, 9, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT40, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00a, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT41, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00b, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT50, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00c, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT51, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00d, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT60, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00e, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT61, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00f, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT70, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x010, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT71, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x011, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT80, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x012, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT81, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x013, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT90, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x014, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT91, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x015, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x016, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa1, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x017, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x018, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb1, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x019, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01a, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc1, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01b, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01c, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd1, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01d, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01e, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe1, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01f, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTf0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x020, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { if (arg0) { Store(Acquire(MTf1, 0xffff), Local0) @@ -331,7 +331,7 @@ Method(m1e4, 1, Serialized) Store(0, Local0) } if (Local0) { - err("", zFFF, 0x021, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { if (arg0) { Release(MTF1) @@ -403,9 +403,9 @@ Method(m1e4, 1, Serialized) } if (arg0) { - CH04("", 1, 18, 0, 0x022, 0, 0) // AE_LIMIT + CH04("", 1, 18, 0, __LINE__, 0, 0) // AE_LIMIT } else { - CH03("", 0, 0x023, 0, 0) + CH03("", 0, 0x023, __LINE__, 0) } } @@ -417,7 +417,7 @@ Method(m1e5) * Event(E000) */ - CH03("", 0, 0x024, 0, 0) + CH03("", 0, 0x024, __LINE__, 0) /* * This causes messages (but no exceptions): @@ -429,7 +429,7 @@ Method(m1e5) */ Sleep(100) - CH03("", 0, 0x025, 0, 0) + CH03("", 0, 0x025, __LINE__, 0) } Method(m1e6) @@ -440,7 +440,7 @@ Method(m1e6) m1e4(0) SRMT("m1e5") m1e5() - CH03("", 0, 0x026, 0, 0) + CH03("", 0, 0x026, __LINE__, 0) /* * m1e5 shows appearance of bug but doesn't cause exceptions @@ -450,5 +450,5 @@ Method(m1e6) * report below (or try to find how to detect this situation * automatically now (for not fixed yet)): */ - err("", zFFF, 0x027, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0298_ACTIONS_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0298_ACTIONS_REQUIRED/DECL.asl index 3d4edbd..1ca369a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0298_ACTIONS_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0298_ACTIONS_REQUIRED/DECL.asl @@ -49,10 +49,10 @@ Method(m1e7) Store(0x123, Local0) Acquire(MX03, 0x100) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Acquire(MX02, 0x100) - CH04("", 0, 64, 0, 0x003, 0, 0) // AE_AML_MUTEX_ORDER + CH04("", 0, 64, 0, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER Store(RefOf(p000), Local2) // L0(0x004d5ec8, 0x123), L2 (0x004d5dc8, res of RefOf) Store(DerefOf(Local2), Local3) @@ -67,16 +67,16 @@ Method(m1e7) Add(Local0, 0x11111111, Local4) Store(Local4, Debug) if (LNotEqual(Local4, 0x11111233)) { - err("", zFFF, 0x001, 0, 0, Local4, 0x11111233) + err("", zFFF, __LINE__, 0, 0, Local4, 0x11111233) } Store("============================== 3", Debug) - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) /* * The problem is not automatically detected, * so remove this error report after the problem has been resolved. */ - err("", zFFF, 0x123, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0299_ACTIONS_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0299_ACTIONS_REQUIRED/DECL.asl index 69a5d1a..1fb90e5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0299_ACTIONS_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0299_ACTIONS_REQUIRED/DECL.asl @@ -99,7 +99,7 @@ Method(m1e8) mm00(0, i000, i001) } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m306(9, 0) m306(9, 0) m306(9, 0) @@ -116,13 +116,13 @@ Method(m1e8) m306(9, 0) m306(9, 0) m306(9, 0) - CH04("", 1, 64, 0, 0x001, 0, 0) // AE_AML_MUTEX_ORDER + CH04("", 1, 64, 0, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER /* * The problem is not automatically detected, * so remove this error report after the problem has been resolved. */ - err("", zFFF, 0x123, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl index 8873abc..bb9c7ab 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl @@ -73,18 +73,18 @@ Method(m1e9) } if (LNotEqual(arg0, ii00)) { - err("", zFFF, 0x000, 0, 0, arg0, ii00) + err("", zFFF, __LINE__, 0, 0, arg0, ii00) } if (LNotEqual(arg0, Local5)) { - err("", zFFF, 0x001, 0, 0, arg0, Local5) + err("", zFFF, __LINE__, 0, 0, arg0, Local5) } } m100(0) } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) m000() - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0301/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0301/DECL.asl index 859a416..c098f35 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0301/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0301/DECL.asl @@ -133,9 +133,9 @@ Method(m19c,, Serialized) m100() } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m19c() - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl index 4105793..e912d38 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl @@ -48,7 +48,7 @@ Method(m1eb) Method(m201) { if (LNotEqual(\_SB.i2z7, 0xabcd0007)) { - err("", zFFF, 0x000, 0, 0, \_SB.i2z7, 0xabcd0007) + err("", zFFF, __LINE__, 0, 0, \_SB.i2z7, 0xabcd0007) } } @@ -69,7 +69,7 @@ Method(m1eb) Method(m203) { if (LNotEqual(\i2z4, 0xabcd0004)) { - err("", zFFF, 0x001, 0, 0, \i2z4, 0xabcd0004) + err("", zFFF, __LINE__, 0, 0, \i2z4, 0xabcd0004) } } @@ -77,7 +77,7 @@ Method(m1eb) } - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) SRMT("m1eb-m100") m100() @@ -89,7 +89,7 @@ Method(m1eb) BLCK() } - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl index 2cc1dde..a90c8ac 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl @@ -42,10 +42,10 @@ Method(m1ec) Name(\i4z0, 0xabcd0000) if (LNotEqual(i4z0, 0xabcd0000)) { - err("", zFFF, 0x000, 0, 0, i4z0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i4z0, 0xabcd0000) } if (LNotEqual(\i4z0, 0xabcd0000)) { - err("", zFFF, 0x001, 0, 0, \i4z0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, \i4z0, 0xabcd0000) } m101() } @@ -53,10 +53,10 @@ Method(m1ec) Method(m101) { if (LNotEqual(i4z0, 0xabcd0000)) { - err("", zFFF, 0x002, 0, 0, i4z0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i4z0, 0xabcd0000) } if (LNotEqual(\i4z0, 0xabcd0000)) { - err("", zFFF, 0x003, 0, 0, \i4z0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, \i4z0, 0xabcd0000) } } @@ -75,10 +75,10 @@ Method(m1ec) } if (LNotEqual(i4z1, 0xabcd0000)) { - err("", zFFF, 0x004, 0, 0, i4z1, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i4z1, 0xabcd0000) } if (LNotEqual(\i4z1, 0xabcd0000)) { - err("", zFFF, 0x005, 0, 0, \i4z1, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, \i4z1, 0xabcd0000) } m101() } @@ -86,10 +86,10 @@ Method(m1ec) Method(m101) { if (LNotEqual(i4z1, 0xabcd0000)) { - err("", zFFF, 0x006, 0, 0, i4z1, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i4z1, 0xabcd0000) } if (LNotEqual(\i4z1, 0xabcd0000)) { - err("", zFFF, 0x007, 0, 0, \i4z1, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, \i4z1, 0xabcd0000) } } @@ -98,13 +98,13 @@ Method(m1ec) Store("---------------- Completed",debug) } - CH03("", 0, 0x008, 0, 0) + CH03("", 0, 0x008, __LINE__, 0) SRMT("m1ec-m000") m000() - CH03("", 0, 0x009, 0, 0) + CH03("", 0, 0x009, __LINE__, 0) SRMT("m1ec-m001") m001() - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl index f6a51c7..8ee1cbc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl @@ -139,7 +139,7 @@ Method(m18a, 1, Serialized, 3) Store(DeRefOf(Index(arg2, lpC0)), Local0) Store(DeRefOf(Index(arg3, lpC0)), Local1) if (LNotEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) Store(arg0, Debug) Store(lpC0, Debug) } @@ -150,22 +150,22 @@ Method(m18a, 1, Serialized, 3) Switch (ToInteger (arg0)) { Case (1) { if (LNotEqual(ind1, n100)) { - err("", zFFF, 0x001, 0, 0, ind1, n100) + err("", zFFF, __LINE__, 0, 0, ind1, n100) } } Case (2) { if (LNotEqual(ind2, n200)) { - err("", zFFF, 0x002, 0, 0, ind2, n200) + err("", zFFF, __LINE__, 0, 0, ind2, n200) } } Case (3) { if (LNotEqual(ind3, n300)) { - err("", zFFF, 0x003, 0, 0, ind3, n300) + err("", zFFF, __LINE__, 0, 0, ind3, n300) } } Case (4) { if (LNotEqual(ind4, n400)) { - err("", zFFF, 0x004, 0, 0, ind4, n400) + err("", zFFF, __LINE__, 0, 0, ind4, n400) } } } @@ -203,7 +203,7 @@ Method(m18a, 1, Serialized, 3) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p100, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x005, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } Method(m200, 0, Serialized, 0) @@ -222,7 +222,7 @@ Method(m18a, 1, Serialized, 3) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p200, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x006, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } Method(m300, 0, Serialized, 0) @@ -247,7 +247,7 @@ Method(m18a, 1, Serialized, 3) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p300, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x007, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } Method(m400, 0, Serialized, 0) @@ -265,7 +265,7 @@ Method(m18a, 1, Serialized, 3) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p400, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x008, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } @@ -278,17 +278,17 @@ Method(m18a, 1, Serialized, 3) // Check if exception takes place (AE_AML_METHOD_LIMIT) if (arg0) { - CH04("", 0, 84, 0, 0x009, 0, 0) // AE_AML_METHOD_LIMIT + CH04("", 0, 84, 0, __LINE__, 0, 0) // AE_AML_METHOD_LIMIT } else { - CH03("", 0, 0x00a, 0, 0) + CH03("", 0, 0x00a, __LINE__, 0) } } - CH03("", 0, 0x00b, 0, 0) + CH03("", 0, 0x00b, __LINE__, 0) SRMT("m18a-0") m18a(0) - CH03("", 0, 0x00c, 0, 0) + CH03("", 0, 0x00c, __LINE__, 0) SRMT("m18a-1") m18a(1) - CH03("", 0, 0x00d, 0, 0) + CH03("", 0, 0x00d, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl index d574735..fb1652c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl @@ -50,12 +50,12 @@ Method(mff2) Store("==================== 1", Debug) if (LNotEqual(Local0, 0xabcd0003)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0003) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0003) } } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) m000(0) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl index dbb42a0..abab8bb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl @@ -41,19 +41,19 @@ Method(mff3) Store("87654321", arg0) } - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(0x12345678, Local0) Store("87654321", Local0) if (LNotEqual(ObjectType(Local0), 2)) { - err("", zFFF, 0x001, 0, 0, ObjectType(Local0), 2) + err("", zFFF, __LINE__, 0, 0, ObjectType(Local0), 2) } m000(Refof(Local1)) if (LNotEqual(ObjectType(Local1), 2)) { - err("", zFFF, 0x002, 0, 0, ObjectType(Local1), 2) + err("", zFFF, __LINE__, 0, 0, ObjectType(Local1), 2) } Store(Refof(Local2), Local3) @@ -63,8 +63,8 @@ Method(mff3) Store("87654321", DeRefof(Local4)) if (LNotEqual(ObjectType(Local2), 2)) { - err("", zFFF, 0x003, 0, 0, ObjectType(Local2), 2) + err("", zFFF, __LINE__, 0, 0, ObjectType(Local2), 2) } - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl index 0dbc488..b8e3e39 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl @@ -74,7 +74,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, lpC0)), Local0) TRC1(arg0, lpC0, Local0) if (LNotEqual(Local0, lpC0)) { - err("", zFFF, 0x000, 0, 0, Local0, lpC0) + err("", zFFF, __LINE__, 0, 0, Local0, lpC0) } Decrement(lpN0) Increment(lpC0) @@ -86,7 +86,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) TRC1(arg0, 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x001, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Last pre-initialized element @@ -94,7 +94,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, Local0)), Local1) TRC1(arg0, Local0, Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x002, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } // Middle pre-initialized element @@ -102,7 +102,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, Local0)), Local1) TRC1(arg0, Local0, Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x003, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } @@ -119,7 +119,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, lpC0)), Local0) TRC1(arg0, lpC0, Local0) if (LNotEqual(Local0, lpC0)) { - err("", zFFF, 0x004, 0, 0, Local0, lpC0) + err("", zFFF, __LINE__, 0, 0, Local0, lpC0) } Decrement(lpN0) Increment(lpC0) @@ -131,7 +131,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, arg3)), Local0) TRC1(arg0, arg3, Local0) if (LNotEqual(Local0, arg3)) { - err("", zFFF, 0x005, 0, 0, Local0, arg3) + err("", zFFF, __LINE__, 0, 0, Local0, arg3) } // Last written element @@ -140,7 +140,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, Local0)), Local1) TRC1(arg0, Local0, Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x006, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } // Middle written element @@ -149,7 +149,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, Local0)), Local1) TRC1(arg0, Local0, Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x007, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } @@ -163,18 +163,18 @@ Method(md6a, 7, Serialized) TRC1(arg0, arg2, 0xf0f0f0f0) Store(Index(arg0, arg2), Local0) - CH03("", 0, 0x100, 0, 0) + CH03("", 0, 0x100, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04("", 1, 51, 0, 0x101, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT + CH04("", 1, 51, 0, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT // Just before written area Subtract(arg3, 1, Local1) TRC1(arg0, Local1, 0xf0f0f0f0) Store(Index(arg0, Local1), Local0) - CH03("", 0, 0x102, 0, 0) + CH03("", 0, 0x102, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04("", 1, 51, 0, 0x103, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT + CH04("", 1, 51, 0, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT } // Just after pre-initialized and written areas @@ -187,59 +187,59 @@ Method(md6a, 7, Serialized) if (LLess(Local7, arg1)) { TRC1(arg0, Local7, 0xf0f0f0f0) Store(Index(arg0, Local7), Local0) - CH03("", 0, 0x104, 0, 0) + CH03("", 0, 0x104, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04("", 1, 51, 0, 0x105, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT + CH04("", 1, 51, 0, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT // Last element of Package Subtract(arg1, 1, Local1) TRC1(arg0, Local1, 0xf0f0f0f0) Store(Index(arg0, Local1), Local0) - CH03("", 0, 0x106, 0, 0) + CH03("", 0, 0x106, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04("", 1, 51, 0, 0x107, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT + CH04("", 1, 51, 0, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT } } else { // Just after pre-initialized area TRC1(arg0, arg2, 0xf0f0f0f0) Store(Index(arg0, arg2), Local0) - CH03("", 0, 0x108, 0, 0) + CH03("", 0, 0x108, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04("", 1, 51, 0, 0x109, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT + CH04("", 1, 51, 0, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT // Last element of Package Subtract(arg1, 1, Local1) TRC1(arg0, Local1, 0xf0f0f0f0) Store(Index(arg0, Local1), Local0) - CH03("", 0, 0x10a, 0, 0) + CH03("", 0, 0x10a, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04("", 1, 51, 0, 0x10b, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT + CH04("", 1, 51, 0, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT } } // Check exception on out of Package access TRC1(arg0, arg1, 0xf0f0f0f0) - CH03("", 0, 0x10c, 0, 0) + CH03("", 0, 0x10c, __LINE__, 0) Index(arg0, arg1, Local0) - CH04("", 0, 55, 0, 0x10d, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04("", 0, 55, 0, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT Add(arg1, 1, Local7) if (LGreaterEqual(Local7, arg1)) { TRC1(arg0, Local7, 0xf0f0f0f0) - CH03("", 0, 0x10e, 0, 0) + CH03("", 0, 0x10e, __LINE__, 0) Index(arg0, Local7, Local0) - CH04("", 0, 55, 0, 0x10f, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04("", 0, 55, 0, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT } if (LGreaterEqual(0xffffffffffffffff, arg1)) { TRC1(arg0, 0xffffffffffffffff, 0xf0f0f0f0) - CH03("", 0, 0x110, 0, 0) + CH03("", 0, 0x110, __LINE__, 0) Index(arg0, 0xffffffffffffffff, Local0) - CH04("", 0, 55, 0, 0x111, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04("", 0, 55, 0, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT } // Check near the maximal bound of a simple Package @@ -280,13 +280,13 @@ Method(md6b, 6) // Was initialized - CH03("", 0, 0x112, 0, 0) + CH03("", 0, 0x112, __LINE__, 0) Store(DerefOf(Index(arg0, arg5)), Local0) TRC1(arg0, arg5, Local0) if (LNotEqual(Local0, arg5)) { - err("", zFFF, 0x008, 0, 0, Local0, arg5) + err("", zFFF, __LINE__, 0, 0, Local0, arg5) } - CH03("", 0, 0x113, 0, 0) + CH03("", 0, 0x113, __LINE__, 0) } elseif (LLess(arg5, arg1)) { @@ -294,18 +294,18 @@ Method(md6b, 6) TRC1(arg0, arg5, 0xf0f0f0f0) Store(Index(arg0, arg5), Local0) - CH03("", 0, 0x114, 0, 0) + CH03("", 0, 0x114, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04("", 1, 51, 0, 0x115, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT + CH04("", 1, 51, 0, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT } else { // Check exception on out of Package access TRC1(arg0, arg5, 0xf0f0f0f0) - CH03("", 0, 0x116, 0, 0) + CH03("", 0, 0x116, __LINE__, 0) Index(arg0, arg5, Local0) - CH04("", 0, 55, 0, 0x117, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04("", 0, 55, 0, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT } } @@ -328,7 +328,7 @@ Method(md7d) */ /* Check opcode of the first exception */ - CH04("", 1, 56, 0, 0x118, 0, 0) // AE_AML_DIVIDE_BY_ZERO + CH04("", 1, 56, 0, __LINE__, 0, 0) // AE_AML_DIVIDE_BY_ZERO /* Number of exceptions not greater than two */ if (LGreater(EXC1, 2)) { @@ -342,7 +342,7 @@ Method(md7d) Store(1, id01) } - CH03("", 0, 0x119, 0, 0) + CH03("", 0, 0x119, __LINE__, 0) return (1) } @@ -360,11 +360,11 @@ Method(mf88, 6) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err("", zFFF, arg3, 0, 0, Local0, arg1) + err("", zFFF, __LINE__, 0, 0, Local0, arg1) } if (arg5) { if (LNotEqual(arg0, arg2)) { - err("", zFFF, arg4, 0, 0, arg0, arg2) + err("", zFFF, __LINE__, 0, 0, arg0, arg2) } } } @@ -373,5 +373,5 @@ Method(m02a) { Store("Check the error manually and remove call to m02a() when the bug is fixed.", Debug) - err("", zFFF, 0x800, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/complex/badasl/badasl.asl b/tests/aslts/src/runtime/collections/complex/badasl/badasl.asl index 7aa584e..46df147 100644 --- a/tests/aslts/src/runtime/collections/complex/badasl/badasl.asl +++ b/tests/aslts/src/runtime/collections/complex/badasl/badasl.asl @@ -51,12 +51,12 @@ Method(m101,, Serialized) Name (VV, 0x1234) Store (32, Local0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Name (VV, 0xBBBBAAAA) Store (12, Local2) - CH04(ts, 0, 0xff, z146, 1, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) } /* @@ -81,9 +81,9 @@ Method(m102,, Serialized) Name (p000, Package(3) {0xabcd0000, 0xabcd0001, 0xabcd0002, 0xabcd0003}) - CH03(ts, z146, 2, 0, 0) + CH03(ts, z146, 2, __LINE__, 0) Store(DerefOf(Index(p000, 3)), Local0) - CH03(ts, z146, 2, 0, 0) + CH03(ts, z146, 2, __LINE__, 0) } /* @@ -115,120 +115,120 @@ Method(m103,, Serialized) /* Acquire */ - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(i900, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(s900, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(b900, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(p900, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(e900, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(d900, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(tz90, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(pr90, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(pw90, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(r900, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(bf90, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(f900, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(bn90, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Acquire(if90, 0xffff) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) /* Release */ - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(i900) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(s900) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(b900) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(p900) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(e900) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(d900) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(tz90) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(pr90) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(pw90) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(r900) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(bf90) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(f900) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(bn90) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) - CH03(ts, z146, 0, 0, 0) + CH03(ts, z146, 0, __LINE__, 0) Release(if90) - CH04(ts, 0, 0xff, z146, 0x025, 0, 0) + CH04(ts, 0, 0xff, z146, __LINE__, 0, 0) } // Run-method diff --git a/tests/aslts/src/runtime/collections/complex/misc/misc.asl b/tests/aslts/src/runtime/collections/complex/misc/misc.asl index 8b92c1b..411bda9 100644 --- a/tests/aslts/src/runtime/collections/complex/misc/misc.asl +++ b/tests/aslts/src/runtime/collections/complex/misc/misc.asl @@ -56,7 +56,7 @@ Method(m110, 1, Serialized) } if (LNotEqual(Local0, 1)) { - err(arg0, z054, 0, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -71,13 +71,13 @@ Method(m112, 1) Store(0, Local0) m111(Local0) if (LNotequal(Local0, 0)) { - err(arg0, z054, 1, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } Store(0, Local0) Store(Concatenate("qwertyuiop", Local0), Local5) if (LNotequal(Local0, 0)) { - err(arg0, z054, 2, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -93,7 +93,7 @@ Method(m113, 1, Serialized) Store(ObjectType(RefOf(f000)), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 3, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -120,35 +120,35 @@ Method(m114, 1, Serialized) Store(0, bnk0) if (LNotEqual(bnk0, 0)) { - err(arg0, z054, 4, 0, 0, bnk0, 0) + err(arg0, z054, __LINE__, 0, 0, bnk0, 0) } Store(0x87, bf00) if (LNotEqual(bnk0, 0)) { - err(arg0, z054, 5, 0, 0, bnk0, 0) + err(arg0, z054, __LINE__, 0, 0, bnk0, 0) } if (LNotEqual(bf00, 0x87)) { - err(arg0, z054, 6, 0, 0, bf00, 0x87) + err(arg0, z054, __LINE__, 0, 0, bf00, 0x87) } // Deal with 1-th bank layout: Store(1, bnk0) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 7, 0, 0, bnk0, 1) + err(arg0, z054, __LINE__, 0, 0, bnk0, 1) } Store(0x96, bf01) if (X192) { if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 8, 0, 0, bnk0, 1) + err(arg0, z054, __LINE__, 0, 0, bnk0, 1) } } if (LNotEqual(bf01, 0x96)) { - err(arg0, z054, 9, 0, 0, bf01, 0x96) + err(arg0, z054, __LINE__, 0, 0, bf01, 0x96) } } @@ -159,7 +159,7 @@ Method(m115, 1) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00b)) { - err(arg0, z054, 9, 0, 0, Local1, 0) + err(arg0, z054, __LINE__, 0, 0, Local1, 0) } ToBuffer(Local0, Local2) @@ -169,7 +169,7 @@ Method(m115, 1) Store(ObjectType(Local0), Local3) if (LNotEqual(Local3, c00b)) { - err(arg0, z054, 10, 0, 0, Local3, 0) + err(arg0, z054, __LINE__, 0, 0, Local3, 0) } } @@ -193,15 +193,15 @@ Method(m117, 2, Serialized) Store(0, Local0) } - CH03(ts, z054, 0x100, 0, 0) + CH03(ts, z054, 0x100, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, 0)) { - err(arg0, z054, 11, 0, 0, Local1, 0) + err(arg0, z054, __LINE__, 0, 0, Local1, 0) } - CH03(ts, z054, 0x101, 0, 0) + CH03(ts, z054, 0x101, __LINE__, 0) } Method(m118, 1) @@ -230,7 +230,7 @@ Method(m119, 1, Serialized) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 3)) { - err(arg0, z054, 12, 0, 0, Local2, 0) + err(arg0, z054, __LINE__, 0, 0, Local2, 0) } Store("================ 2:", Debug) @@ -238,7 +238,7 @@ Method(m119, 1, Serialized) Store(Local1, Debug) Store(Local2, Debug) - CH03(arg0, z054, 0x102, 0, 0) + CH03(arg0, z054, 0x102, __LINE__, 0) return (0) } @@ -273,7 +273,7 @@ Method(m11a, 1) Store(Local3, Debug) if (LNotEqual(Local3, 3)) { - err(arg0, z054, 13, 0, 0, Local3, 3) + err(arg0, z054, __LINE__, 0, 0, Local3, 3) } // 1 @@ -283,7 +283,7 @@ Method(m11a, 1) Store(Local3, Debug) if (LNotEqual(Local3, 9)) { - err(arg0, z054, 14, 0, 0, Local3, 9) + err(arg0, z054, __LINE__, 0, 0, Local3, 9) } // 2 @@ -293,7 +293,7 @@ Method(m11a, 1) Store(Local3, Debug) if (LNotEqual(Local3, 6)) { - err(arg0, z054, 15, 0, 0, Local3, 6) + err(arg0, z054, __LINE__, 0, 0, Local3, 6) } Store(SizeOf(p000), Local0) @@ -301,7 +301,7 @@ Method(m11a, 1) Store(Local0, Debug) if (LNotEqual(Local0, 3)) { - err(arg0, z054, 16, 0, 0, Local0, 3) + err(arg0, z054, __LINE__, 0, 0, Local0, 3) } } */ @@ -318,11 +318,11 @@ Method(m11b, 1) Store(DeRefOf(Index(p000, 0)), Local7) if (LEqual(b000, Local7)) { - err(arg0, z054, 17, 0, 0, b000, Local7) + err(arg0, z054, __LINE__, 0, 0, b000, Local7) } if (LEqual(Local7, b000)) { - err(arg0, z054, 18, 0, 0, Local7, b000) + err(arg0, z054, __LINE__, 0, 0, Local7, b000) } return (0) @@ -337,11 +337,11 @@ Method(m11c, 1, Serialized) { Name(ts, "m11c") - CH03(ts, z054, 0x103, 0, 0) + CH03(ts, z054, 0x103, __LINE__, 0) Store(Add( Buffer() {0x79}, Buffer() {0x79} ), Local5) - CH03(ts, z054, 0x104, 0, 0) + CH03(ts, z054, 0x104, __LINE__, 0) } // Bug 57: The empty Return operator (without specifying the returning value) @@ -356,7 +356,7 @@ Method(m11d, 1) { // ASL-compiler report Warning in this case // Store("ERROR 0: m121, after Return !!!", Debug) } - err(arg0, z054, 19, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) return (0x5678) } @@ -370,10 +370,10 @@ Method(m11d, 1) { // ASL-compiler DOESN'T report Warning in this case!!! // And the Store operator below is actually processed!!! - err(arg0, z054, 20, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) } - err(arg0, z054, 21, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) return } @@ -405,13 +405,13 @@ Method(m11e, 1, Serialized) { * * if (LNotEqual(Sizeof(buf0), 3)) { * // Error: length of the buffer not reduced to the stored string - * err(arg0, z054, 22, 0, 0, 0, 0) + * err(arg0, z054, __LINE__, 0, 0, 0, 0) * } * * New: */ if (LNotEqual(buf0, Buffer(){0x01, 0x02, 0, 0})) { - err(arg0, z054, 22, 0, 0, buf0, Buffer(){0x01, 0x02, 0, 0}) + err(arg0, z054, __LINE__, 0, 0, buf0, Buffer(){0x01, 0x02, 0, 0}) } return (0) } @@ -438,12 +438,12 @@ Method(m11f, 1, Serialized) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z054, 23, 0, 0, Local0, arg2) + err(arg0, z054, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(arg1), Local0) if (LNotEqual(Local0, arg3)) { - err(arg0, z054, 24, 0, 0, Local0, arg3) + err(arg0, z054, __LINE__, 0, 0, Local0, arg3) } } @@ -451,27 +451,27 @@ Method(m11f, 1, Serialized) { { Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 25, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } Store(ObjectType(bf01), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 26, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } Store(ObjectType(bf02), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 27, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } Store(ObjectType(bf03), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 28, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } Store(ObjectType(bf04), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 29, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } Store(ObjectType(bf05), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 30, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } if (F64) { @@ -517,12 +517,12 @@ Method(m120, 1, Serialized) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z054, 31, 0, 0, Local0, arg2) + err(arg0, z054, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(arg1), Local0) if (LNotEqual(Local0, arg3)) { - err(arg0, z054, 32, 0, 0, Local0, arg3) + err(arg0, z054, __LINE__, 0, 0, Local0, arg3) } } @@ -530,27 +530,27 @@ Method(m120, 1, Serialized) { { Store(ObjectType(f000), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 33, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 34, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } Store(ObjectType(f002), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 35, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } Store(ObjectType(f003), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 36, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } Store(ObjectType(f004), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 37, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } Store(ObjectType(f005), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 38, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } if (F64) { @@ -614,12 +614,12 @@ Method(m121, 1, Serialized) { Store(m000(arg1), Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z054, 39, 0, 0, Local0, arg2) + err(arg0, z054, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(Local1), Local0) if (LNotEqual(Local0, arg3)) { - err(arg0, z054, 40, 0, 0, Local0, arg3) + err(arg0, z054, __LINE__, 0, 0, Local0, arg3) } } @@ -687,12 +687,12 @@ Method(m122, 1, Serialized) { Store(m000(arg1), Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z054, 41, 0, 0, Local0, arg2) + err(arg0, z054, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(Local1), Local0) if (LNotEqual(Local0, arg3)) { - err(arg0, z054, 42, 0, 0, Local0, arg3) + err(arg0, z054, __LINE__, 0, 0, Local0, arg3) } } @@ -791,11 +791,11 @@ Method(m124, 1) return (0x12345678) } - CH03(arg0, z054, 0x105, 0, 0) + CH03(arg0, z054, 0x105, __LINE__, 0) Store(ObjectType(m000), Local0) if (LNotEqual(Local0, c010)) { - err(arg0, z054, 43, 0, 0, Local0, c010) + err(arg0, z054, __LINE__, 0, 0, Local0, c010) } // Bug 81. @@ -807,15 +807,15 @@ Method(m124, 1) //Store(ObjectType(m000()), Local0) //if (LNotEqual(Local0, c009)) { - // err(arg0, z054, 44, 0, 0, Local0, c009) + // err(arg0, z054, __LINE__, 0, 0, Local0, c009) //} // //Store(ObjectType(m001(123)), Local1) //if (LNotEqual(Local1, c009)) { - // err(arg0, z054, 45, 0, 0, Local1, c009) + // err(arg0, z054, __LINE__, 0, 0, Local1, c009) //} // - //CH03(arg0, z054, 0x106, 0, 0) + //CH03(arg0, z054, 0x106, __LINE__, 0) } /* @@ -838,10 +838,10 @@ Method(m125, 1) Store(0x61, Index(Local0, 3)) if (LNotEqual(Local0, "Strang")) { - err(arg0, z054, 46, 0, 0, Local0, "Strang") + err(arg0, z054, __LINE__, 0, 0, Local0, "Strang") } if (LNotEqual(s000, "String")) { - err(arg0, z054, 47, 0, 0, s000, "String") + err(arg0, z054, __LINE__, 0, 0, s000, "String") } } @@ -854,10 +854,10 @@ Method(m125, 1) Store(0x61, Index(Local0, 3)) if (LNotEqual(Local0, Buffer(){0xa0, 0xa1, 0xa2, 0x61, 0xa4, 0xa5})) { - err(arg0, z054, 48, 0, 0, Local0, Buffer(){0xa0, 0xa1, 0xa2, 0x61, 0xa4, 0xa5}) + err(arg0, z054, __LINE__, 0, 0, Local0, Buffer(){0xa0, 0xa1, 0xa2, 0x61, 0xa4, 0xa5}) } if (LNotEqual(b000, Buffer(){0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5})) { - err(arg0, z054, 49, 0, 0, b000, Buffer(){0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5}) + err(arg0, z054, __LINE__, 0, 0, b000, Buffer(){0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5}) } } @@ -870,41 +870,41 @@ Method(m125, 1) Store(0x61, Index(Local0, 3)) if (LNotEqual(Derefof(Index(Local0, 0)), 0xfff0)) { - err(arg0, z054, 50, 0, 0, Derefof(Index(Local0, 0)), 0xfff0) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 0)), 0xfff0) } if (LNotEqual(Derefof(Index(Local0, 1)), 0xfff1)) { - err(arg0, z054, 51, 0, 0, Derefof(Index(Local0, 1)), 0xfff1) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 1)), 0xfff1) } if (LNotEqual(Derefof(Index(Local0, 2)), 0xfff2)) { - err(arg0, z054, 52, 0, 0, Derefof(Index(Local0, 2)), 0xfff2) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 2)), 0xfff2) } if (LNotEqual(Derefof(Index(Local0, 3)), 0x61)) { - err(arg0, z054, 53, 0, 0, Derefof(Index(Local0, 3)), 0x61) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 3)), 0x61) } if (LNotEqual(Derefof(Index(Local0, 4)), 0xfff4)) { - err(arg0, z054, 54, 0, 0, Derefof(Index(Local0, 4)), 0xfff4) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 4)), 0xfff4) } if (LNotEqual(Derefof(Index(Local0, 5)), 0xfff5)) { - err(arg0, z054, 55, 0, 0, Derefof(Index(Local0, 5)), 0xfff5) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 5)), 0xfff5) } if (LNotEqual(Derefof(Index(p000, 0)), 0xfff0)) { - err(arg0, z054, 56, 0, 0, Derefof(Index(p000, 0)), 0xfff0) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 0)), 0xfff0) } if (LNotEqual(Derefof(Index(p000, 1)), 0xfff1)) { - err(arg0, z054, 57, 0, 0, Derefof(Index(p000, 1)), 0xfff1) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 1)), 0xfff1) } if (LNotEqual(Derefof(Index(p000, 2)), 0xfff2)) { - err(arg0, z054, 58, 0, 0, Derefof(Index(p000, 2)), 0xfff2) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 2)), 0xfff2) } if (LNotEqual(Derefof(Index(p000, 3)), 0xfff3)) { - err(arg0, z054, 59, 0, 0, Derefof(Index(p000, 3)), 0xfff3) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 3)), 0xfff3) } if (LNotEqual(Derefof(Index(p000, 4)), 0xfff4)) { - err(arg0, z054, 60, 0, 0, Derefof(Index(p000, 4)), 0xfff4) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 4)), 0xfff4) } if (LNotEqual(Derefof(Index(p000, 5)), 0xfff5)) { - err(arg0, z054, 61, 0, 0, Derefof(Index(p000, 5)), 0xfff5) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 5)), 0xfff5) } } @@ -971,25 +971,25 @@ Method(mf75, 1) } } - CH03(arg0, z054, 0x107, 0, 0) + CH03(arg0, z054, 0x107, __LINE__, 0) mf74() - CH03(arg0, z054, 0x108, 0, 0) + CH03(arg0, z054, 0x108, __LINE__, 0) - CH03(arg0, z054, 0x109, 0, 0) + CH03(arg0, z054, 0x109, __LINE__, 0) mm00() - CH03(arg0, z054, 0x10a, 0, 0) + CH03(arg0, z054, 0x10a, __LINE__, 0) - CH03(arg0, z054, 0x10b, 0, 0) + CH03(arg0, z054, 0x10b, __LINE__, 0) mm01() - CH03(arg0, z054, 0x10c, 0, 0) + CH03(arg0, z054, 0x10c, __LINE__, 0) - CH03(arg0, z054, 0x10d, 0, 0) + CH03(arg0, z054, 0x10d, __LINE__, 0) mm02() - CH03(arg0, z054, 0x10e, 0, 0) + CH03(arg0, z054, 0x10e, __LINE__, 0) - CH03(arg0, z054, 0x10f, 0, 0) + CH03(arg0, z054, 0x10f, __LINE__, 0) mm03() - CH03(arg0, z054, 0x110, 0, 0) + CH03(arg0, z054, 0x110, __LINE__, 0) } @@ -1002,7 +1002,7 @@ Method(mf75, 1) * Method(mf76, 1) * { * if (LNotEqual(arg0, "Strang")) { - * err(arg0, z054, 72, 0, 0, arg0, "Strang") + * err(arg0, z054, __LINE__, 0, 0, arg0, "Strang") * } * } * @@ -1020,7 +1020,7 @@ Method(mf75, 1) * * mf76(p000) * if (LNotEqual(s000, "String")) { - * err(arg0, z054, 73, 0, 0, s000, "String") + * err(arg0, z054, __LINE__, 0, 0, s000, "String") * } * } */ @@ -1028,34 +1028,34 @@ Method(mf75, 1) /* Bug 196 */ Method(mf86, 1) { - CH03("mf86", z054, 74, 0, 0) + CH03("mf86", z054, 74, __LINE__, 0) Store("0x0x12345678", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z054, 75, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } - CH04("mf86", 0, 0xff, z054, 2, 0, 0) + CH04("mf86", 0, 0xff, z054, __LINE__, 0, 0) } Method(mf87, 1) { - CH03("mf87", z054, 0, 0, 0) + CH03("mf87", z054, 0, __LINE__, 0) Add("0x0xabcdef", 0x10234, Local0) if (LNotEqual(Local0, 0x10234)) { - err(arg0, z054, 77, 0, 0, Local0, 0x10234) + err(arg0, z054, __LINE__, 0, 0, Local0, 0x10234) } - CH03("mf87", z054, 1, 0, 0) + CH03("mf87", z054, 1, __LINE__, 0) Add(0x10234, "0x0xabcdef", Local0) if (LNotEqual(Local0, 0x10234)) { - err(arg0, z054, 78, 0, 0, Local0, 0x10234) + err(arg0, z054, __LINE__, 0, 0, Local0, 0x10234) } - CH03("mf87", z054, 2, 0, 0) + CH03("mf87", z054, 2, __LINE__, 0) } Method(m15b,, Serialized) @@ -1079,53 +1079,53 @@ Method(m15b,, Serialized) { Store(mm00, Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z054, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z054, __LINE__, 0, 0, Local0, 0xabcd0000) } } Method(m001) { - CH03(ts, z054, 0x001, 0, 0) + CH03(ts, z054, 0x001, __LINE__, 0) Store(DerefOf(RefOf(mm00)), Local0) if (SLCK) { - CH03(ts, z054, 0x002, 0, 0) + CH03(ts, z054, 0x002, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err(ts, z054, 0x003, 0, 0, Local1, c010) + err(ts, z054, __LINE__, 0, 0, Local1, c010) } } else { - CH04(ts, 0, 47, z054, 0x004, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 0, 47, z054, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } } Method(m002) { - CH03(ts, z054, 0x005, 0, 0) + CH03(ts, z054, 0x005, __LINE__, 0) Store(DerefOf(Index(p000, 1)), Local0) if (SLCK) { - CH03(ts, z054, 0x006, 0, 0) + CH03(ts, z054, 0x006, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err(ts, z054, 0x007, 0, 0, Local1, c010) + err(ts, z054, __LINE__, 0, 0, Local1, c010) } } else { - CH04(ts, 0, 47, z054, 0x008, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 0, 47, z054, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } } Method(m003) { // 10/2016: Compiler now catches illegal DerefOf(StringConstant) -// CH03(ts, z054, 0x009, 0, 0) +// CH03(ts, z054, 0x009, __LINE__, 0) // Store(DerefOf("mm00"), Local0) // if (SLCK) { -// CH03(ts, z054, 0x00a, 0, 0) +// CH03(ts, z054, 0x00a, __LINE__, 0) // Store(ObjectType(Local0), Local1) // if (LNotEqual(Local1, c010)) { -// err(ts, z054, 0x00b, 0, 0, Local1, c010) +// err(ts, z054, __LINE__, 0, 0, Local1, c010) // } // } else { -// CH04(ts, 0, 47, z054, 0x00c, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 0, 47, z054, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE // } } @@ -1135,31 +1135,31 @@ Method(m15b,, Serialized) { CopyObject(mm00, Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z054, 0x00d, 0, 0, Local0, 0xabcd0000) + err(ts, z054, __LINE__, 0, 0, Local0, 0xabcd0000) } } Method(m005) { - CH03(ts, z054, 0x00e, 0, 0) + CH03(ts, z054, 0x00e, __LINE__, 0) CopyObject(DerefOf(RefOf(mm00)), Local0) - CH03(ts, z054, 0x00f, 0, 0) + CH03(ts, z054, 0x00f, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err(ts, z054, 0x010, 0, 0, Local1, c010) + err(ts, z054, __LINE__, 0, 0, Local1, c010) } } Method(m006) { - CH03(ts, z054, 0x011, 0, 0) + CH03(ts, z054, 0x011, __LINE__, 0) CopyObject(DerefOf(Index(p000, 1)), Local0) - CH03(ts, z054, 0x012, 0, 0) + CH03(ts, z054, 0x012, __LINE__, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err(ts, z054, 0x013, 0, 0, Local1, c010) + err(ts, z054, __LINE__, 0, 0, Local1, c010) } } @@ -1167,13 +1167,13 @@ Method(m15b,, Serialized) { // 10/2016: Compiler now catches illegal DerefOf(StringConstant) -// CH03(ts, z054, 0x014, 0, 0) +// CH03(ts, z054, 0x014, __LINE__, 0) // CopyObject(DerefOf("mm00"), Local0) -// CH03(ts, z054, 0x015, 0, 0) +// CH03(ts, z054, 0x015, __LINE__, 0) // // Store(ObjectType(Local0), Local1) // if (LNotEqual(Local1, c010)) { -// err(ts, z054, 0x016, 0, 0, Local1, c010) +// err(ts, z054, __LINE__, 0, 0, Local1, c010) // } } @@ -1183,31 +1183,31 @@ Method(m15b,, Serialized) { Add(mm00, 1, Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z054, 0x017, 0, 0, Local0, 0xabcd0001) + err(ts, z054, __LINE__, 0, 0, Local0, 0xabcd0001) } } Method(m009) { - CH03(ts, z054, 0x018, 0, 0) + CH03(ts, z054, 0x018, __LINE__, 0) Add(DerefOf(RefOf(mm00)), 2, Local0) - CH04(ts, 0, 47, z054, 0x019, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 0, 47, z054, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(m00a) { - CH03(ts, z054, 0x01a, 0, 0) + CH03(ts, z054, 0x01a, __LINE__, 0) Add(DerefOf(Index(p000, 1)), 3, Local0) - CH04(ts, 0, 47, z054, 0x01b, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 0, 47, z054, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(m00b) { // 10/2016: Compiler now catches illegal DerefOf(StringConstant) -// CH03(ts, z054, 0x01c, 0, 0) +// CH03(ts, z054, 0x01c, __LINE__, 0) // Add(DerefOf("mm00"), 4, Local0) -// CH04(ts, 0, 47, z054, 0x01d, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 0, 47, z054, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } /* ObjectType */ @@ -1216,7 +1216,7 @@ Method(m15b,, Serialized) { Store(ObjectType(mm00), Local0) if (LNotEqual(Local0, c010)) { - err(ts, z054, 0x01e, 0, 0, Local0, c010) + err(ts, z054, __LINE__, 0, 0, Local0, c010) } } @@ -1224,7 +1224,7 @@ Method(m15b,, Serialized) { Store(ObjectType(DerefOf(RefOf(mm00))), Local0) if (LNotEqual(Local0, c010)) { - err(ts, z054, 0x01f, 0, 0, Local0, c010) + err(ts, z054, __LINE__, 0, 0, Local0, c010) } } @@ -1232,7 +1232,7 @@ Method(m15b,, Serialized) { Store(ObjectType(DerefOf(Index(p000, 1))), Local0) if (LNotEqual(Local0, c010)) { - err(ts, z054, 0x020, 0, 0, Local0, c010) + err(ts, z054, __LINE__, 0, 0, Local0, c010) } } @@ -1242,7 +1242,7 @@ Method(m15b,, Serialized) // Store(ObjectType(DerefOf("mm00")), Local0) // if (LNotEqual(Local0, c010)) { -// err(ts, z054, 0x021, 0, 0, Local0, c010) +// err(ts, z054, __LINE__, 0, 0, Local0, c010) // } } diff --git a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl index ef67756..fc8b2b2 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl @@ -45,10 +45,10 @@ Method(fp00,, Serialized) Name(\i4z0, 0xabcd0000) if (LNotEqual(i4z0, 0xabcd0000)) { - err(ts, z179, 0x000, 0, 0, i4z0, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, i4z0, 0xabcd0000) } if (LNotEqual(\i4z0, 0xabcd0000)) { - err(ts, z179, 0x001, 0, 0, \i4z0, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, \i4z0, 0xabcd0000) } m001() } @@ -56,16 +56,16 @@ Method(fp00,, Serialized) Method(m001) { if (LNotEqual(i4z0, 0xabcd0000)) { - err(ts, z179, 0x002, 0, 0, i4z0, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, i4z0, 0xabcd0000) } if (LNotEqual(\i4z0, 0xabcd0000)) { - err(ts, z179, 0x003, 0, 0, \i4z0, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, \i4z0, 0xabcd0000) } } - CH03(ts, z179, 0x044, 0, 0) + CH03(ts, z179, 0x044, __LINE__, 0) m000() - CH03(ts, z179, 0x045, 0, 0) + CH03(ts, z179, 0x045, __LINE__, 0) } Method(fp01,, Serialized) @@ -79,10 +79,10 @@ Method(fp01,, Serialized) } if (LNotEqual(i4z1, 0xabcd0000)) { - err(ts, z179, 0x000, 0, 0, i4z1, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, i4z1, 0xabcd0000) } if (LNotEqual(\i4z1, 0xabcd0000)) { - err(ts, z179, 0x001, 0, 0, \i4z1, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, \i4z1, 0xabcd0000) } m001() } @@ -90,16 +90,16 @@ Method(fp01,, Serialized) Method(m001) { if (LNotEqual(i4z1, 0xabcd0000)) { - err(ts, z179, 0x002, 0, 0, i4z1, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, i4z1, 0xabcd0000) } if (LNotEqual(\i4z1, 0xabcd0000)) { - err(ts, z179, 0x003, 0, 0, \i4z1, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, \i4z1, 0xabcd0000) } } - CH03(ts, z179, 0x044, 0, 0) + CH03(ts, z179, 0x044, __LINE__, 0) m000(0) - CH03(ts, z179, 0x045, 0, 0) + CH03(ts, z179, 0x045, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl index 7a0f289..0ce51ba 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl @@ -53,7 +53,7 @@ Method(m000, 1, Serialized) Name(i001, 0) - CH03(ts, z154, 0x000, 0, 0) + CH03(ts, z154, 0x000, __LINE__, 0) Store(arg0, i001) @@ -74,11 +74,11 @@ Method(m000, 1, Serialized) } Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z154, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z154, __LINE__, 0, 0, Local0, 0xabcd0003) } Store(Local0, Debug) - CH03(ts, z154, 0x002, 0, 0) + CH03(ts, z154, 0x002, __LINE__, 0) } Method(m001, 1, Serialized) @@ -136,14 +136,14 @@ Method(m001, 1, Serialized) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z154, 0x004, 0, 0, i000, 0x80000000) + err(ts, z154, __LINE__, 0, 0, i000, 0x80000000) } - CH03(ts, z154, 0x005, 0, 0) + CH03(ts, z154, 0x005, __LINE__, 0) } Method(m002,, Serialized) @@ -165,14 +165,14 @@ Method(m002,, Serialized) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z154, 0x006, 0, 0, Local0, 0x065013BA) + err(ts, z154, __LINE__, 0, 0, Local0, 0x065013BA) } if (LNotEqual(i000, 0x00100064)) { - err(ts, z154, 0x007, 0, 0, i000, 0x00100064) + err(ts, z154, __LINE__, 0, 0, i000, 0x00100064) } - CH03(ts, z154, 0x008, 0, 0) + CH03(ts, z154, 0x008, __LINE__, 0) } Method(m003,, Serialized) @@ -193,14 +193,14 @@ Method(m003,, Serialized) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z154, 0x009, 0, 0, Local0, 0x065013BA) + err(ts, z154, __LINE__, 0, 0, Local0, 0x065013BA) } if (LNotEqual(i000, 0x00100064)) { - err(ts, z154, 0x00a, 0, 0, i000, 0x00100064) + err(ts, z154, __LINE__, 0, 0, i000, 0x00100064) } - CH03(ts, z154, 0x00b, 0, 0) + CH03(ts, z154, 0x00b, __LINE__, 0) } /* @@ -262,14 +262,14 @@ Method(m004, 1, Serialized) Store(Add(Local7, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x00c, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(Local7, 1)) { - err(ts, z154, 0x00d, 0, 0, Local7, 1) + err(ts, z154, __LINE__, 0, 0, Local7, 1) } - CH03(ts, z154, 0x00e, 0, 0) + CH03(ts, z154, 0x00e, __LINE__, 0) } /* @@ -331,14 +331,14 @@ Method(m005, 2, Serialized) Store(Add(arg1, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x00f, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(arg1, 1)) { - err(ts, z154, 0x010, 0, 0, arg1, 1) + err(ts, z154, __LINE__, 0, 0, arg1, 1) } - CH03(ts, z154, 0x011, 0, 0) + CH03(ts, z154, 0x011, __LINE__, 0) } Method(n000) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl index b4c0f05..fee399f 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl @@ -45,7 +45,7 @@ Method(m006, 1, Serialized) Store(arg0, i001) - CH03(ts, z154, 0x014, 0, 0) + CH03(ts, z154, 0x014, __LINE__, 0) Method(m001) { @@ -94,15 +94,15 @@ Method(m006, 1, Serialized) Store(Add(d000.i000, m001()), Local0) if (FLG9) { - CH03(ts, z154, 0x014, 0, 0) + CH03(ts, z154, 0x014, __LINE__, 0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x012, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(d000.i000, 0x80000000)) { - err(ts, z154, 0x013, 0, 0, d000.i000, 0x80000000) + err(ts, z154, __LINE__, 0, 0, d000.i000, 0x80000000) } } else { - CH04(ts, 1, 5, z154, 0x014, 0, 0) // AE_NOT_FOUND + CH04(ts, 1, 5, z154, __LINE__, 0, 0) // AE_NOT_FOUND } } @@ -121,7 +121,7 @@ Method(m007, 1, Serialized) Store(arg0, i001) - CH03(ts, z154, 0x014, 0, 0) + CH03(ts, z154, 0x014, __LINE__, 0) Method(m001) { @@ -169,15 +169,15 @@ Method(m007, 1, Serialized) Store(Add(tz00.i000, m001()), Local0) if (FLG9) { - CH03(ts, z154, 0x014, 0, 0) + CH03(ts, z154, 0x014, __LINE__, 0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x015, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(tz00.i000, 0x80000000)) { - err(ts, z154, 0x016, 0, 0, tz00.i000, 0x80000000) + err(ts, z154, __LINE__, 0, 0, tz00.i000, 0x80000000) } } else { - CH04(ts, 1, 5, z154, 0x014, 0, 0) // AE_NOT_FOUND + CH04(ts, 1, 5, z154, __LINE__, 0, 0) // AE_NOT_FOUND } } @@ -196,7 +196,7 @@ Method(m008, 1, Serialized) Store(arg0, i001) - CH03(ts, z154, 0x014, 0, 0) + CH03(ts, z154, 0x014, __LINE__, 0) Method(m001) { @@ -245,15 +245,15 @@ Method(m008, 1, Serialized) Store(Add(pr00.i000, m001()), Local0) if (FLG9) { - CH03(ts, z154, 0x014, 0, 0) + CH03(ts, z154, 0x014, __LINE__, 0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x018, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(pr00.i000, 0x80000000)) { - err(ts, z154, 0x019, 0, 0, pr00.i000, 0x80000000) + err(ts, z154, __LINE__, 0, 0, pr00.i000, 0x80000000) } } else { - CH04(ts, 1, 5, z154, 0x014, 0, 0) // AE_NOT_FOUND + CH04(ts, 1, 5, z154, __LINE__, 0, 0) // AE_NOT_FOUND } } @@ -272,7 +272,7 @@ Method(m009, 1, Serialized) Store(arg0, i001) - CH03(ts, z154, 0x01d, 0, 0) + CH03(ts, z154, 0x01d, __LINE__, 0) Method(m001) { @@ -321,15 +321,15 @@ Method(m009, 1, Serialized) Store(Add(pw00.i000, m001()), Local0) if (FLG9) { - CH03(ts, z154, 0x014, 0, 0) + CH03(ts, z154, 0x014, __LINE__, 0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x01b, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(pw00.i000, 0x80000000)) { - err(ts, z154, 0x01c, 0, 0, pw00.i000, 0x80000000) + err(ts, z154, __LINE__, 0, 0, pw00.i000, 0x80000000) } } else { - CH04(ts, 1, 5, z154, 0x014, 0, 0) // AE_NOT_FOUND + CH04(ts, 1, 5, z154, __LINE__, 0, 0) // AE_NOT_FOUND } } diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl index dd31c5f..380a668 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl @@ -49,10 +49,10 @@ Method(m100,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z155, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z155, __LINE__, 0, 0, Local0, 0x11112222) } - CH03(ts, z155, 0x001, 0, 0) + CH03(ts, z155, 0x001, __LINE__, 0) } Method(m101,, Serialized) @@ -69,10 +69,10 @@ Method(m101,, Serialized) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z155, 0x002, 0, 0, Local0, 0x67) + err(ts, z155, __LINE__, 0, 0, Local0, 0x67) } - CH03(ts, z155, 0x003, 0, 0) + CH03(ts, z155, 0x003, __LINE__, 0) } Method(m102,, Serialized) @@ -89,10 +89,10 @@ Method(m102,, Serialized) Store(DerefOf(Index(s000, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z155, 0x004, 0, 0, Local0, 0x38) + err(ts, z155, __LINE__, 0, 0, Local0, 0x38) } - CH03(ts, z155, 0x005, 0, 0) + CH03(ts, z155, 0x005, __LINE__, 0) } /* @@ -105,7 +105,7 @@ Method(m103, 1, Serialized) Name(p000, Package() {1,2,3,4}) Name(pp00, Package() {0x11111111, 0x00000001, 0x22223333}) - CH03(ts, z155, 0x006, 0, 0) + CH03(ts, z155, 0x006, __LINE__, 0) Store(arg0, i001) @@ -155,16 +155,16 @@ Method(m103, 1, Serialized) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z155, 0x007, 0, 0, Local0, 0x87654321) + err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z155, 0x008, 0, 0, Local0, 0x80000000) + err(ts, z155, __LINE__, 0, 0, Local0, 0x80000000) } - CH03(ts, z155, 0x009, 0, 0) + CH03(ts, z155, 0x009, __LINE__, 0) } /* @@ -192,16 +192,16 @@ Method(m104,, Serialized) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z155, 0x00a, 0, 0, Local0, 0x065013BA) + err(ts, z155, __LINE__, 0, 0, Local0, 0x065013BA) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x00100064)) { - err(ts, z155, 0x00b, 0, 0, Local0, 0x00100064) + err(ts, z155, __LINE__, 0, 0, Local0, 0x00100064) } - CH03(ts, z155, 0x00c, 0, 0) + CH03(ts, z155, 0x00c, __LINE__, 0) } /* @@ -214,7 +214,7 @@ Method(m105, 1, Serialized) Name(b000, Buffer(16) {}) CreateField(b000, 5, 32, bf00) - CH03(ts, z155, 0x00d, 0, 0) + CH03(ts, z155, 0x00d, __LINE__, 0) Store(arg0, i001) @@ -267,7 +267,7 @@ Method(m105, 1, Serialized) Store(Add(bf00, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z155, 0x00e, 0, 0, Local0, 0x87654321) + err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -277,10 +277,10 @@ Method(m105, 1, Serialized) } if (LNotEqual(bf00, Local1)) { - err(ts, z155, 0x00f, 0, 0, bf00, Local1) + err(ts, z155, __LINE__, 0, 0, bf00, Local1) } - CH03(ts, z155, 0x010, 0, 0) + CH03(ts, z155, 0x010, __LINE__, 0) } /* @@ -293,7 +293,7 @@ Method(m106, 1, Serialized) OperationRegion(r000, SystemMemory, 0x100, 0x100) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } - CH03(ts, z155, 0x011, 0, 0) + CH03(ts, z155, 0x011, __LINE__, 0) Store(arg0, i001) @@ -346,7 +346,7 @@ Method(m106, 1, Serialized) Store(Add(f001, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z155, 0x012, 0, 0, Local0, 0x87654321) + err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -356,10 +356,10 @@ Method(m106, 1, Serialized) } if (LNotEqual(f001, Local1)) { - err(ts, z155, 0x013, 0, 0, f001, Local1) + err(ts, z155, __LINE__, 0, 0, f001, Local1) } - CH03(ts, z155, 0x014, 0, 0) + CH03(ts, z155, 0x014, __LINE__, 0) } /* @@ -375,7 +375,7 @@ Method(m107, 1, Serialized) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } BankField(r000, f001, 0, ByteAcc, NoLock, Preserve) { bnk0, 32 } - CH03(ts, z155, 0x015, 0, 0) + CH03(ts, z155, 0x015, __LINE__, 0) Store(arg0, i001) @@ -428,7 +428,7 @@ Method(m107, 1, Serialized) Store(Add(bnk0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z155, 0x016, 0, 0, Local0, 0x87654321) + err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -438,10 +438,10 @@ Method(m107, 1, Serialized) } if (LNotEqual(bnk0, Local1)) { - err(ts, z155, 0x017, 0, 0, bnk0, Local1) + err(ts, z155, __LINE__, 0, 0, bnk0, Local1) } - CH03(ts, z155, 0x018, 0, 0) + CH03(ts, z155, 0x018, __LINE__, 0) } /* @@ -457,7 +457,7 @@ Method(m108, 1, Serialized) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } IndexField(f000, f001, ByteAcc, NoLock, Preserve) { if00, 32 } - CH03(ts, z155, 0x019, 0, 0) + CH03(ts, z155, 0x019, __LINE__, 0) Store(arg0, i001) @@ -510,7 +510,7 @@ Method(m108, 1, Serialized) Store(Add(if00, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z155, 0x01a, 0, 0, Local0, 0x87654321) + err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -520,10 +520,10 @@ Method(m108, 1, Serialized) } if (LNotEqual(if00, Local1)) { - err(ts, z155, 0x01b, 0, 0, if00, Local1) + err(ts, z155, __LINE__, 0, 0, if00, Local1) } - CH03(ts, z155, 0x01c, 0, 0) + CH03(ts, z155, 0x01c, __LINE__, 0) } /* @@ -535,7 +535,7 @@ Method(m109, 1, Serialized) Name(i001, 0) Name(b000, Buffer() {0x11, 0x01, 0x22}) - CH03(ts, z155, 0x01d, 0, 0) + CH03(ts, z155, 0x01d, __LINE__, 0) Store(arg0, i001) @@ -585,7 +585,7 @@ Method(m109, 1, Serialized) Store(Add(DerefOf(Index(b000, 1)), m001()), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z155, 0x01e, 0, 0, Local0, 0x24) + err(ts, z155, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(b000, 1)), Local0) @@ -597,10 +597,10 @@ Method(m109, 1, Serialized) } if (LNotEqual(Local0, Local1)) { - err(ts, z155, 0x01f, 0, 0, Local0, Local1) + err(ts, z155, __LINE__, 0, 0, Local0, Local1) } - CH03(ts, z155, 0x020, 0, 0) + CH03(ts, z155, 0x020, __LINE__, 0) } /* @@ -612,7 +612,7 @@ Method(m10a, 1, Serialized) Name(i001, 0) Name(s000, "q\001ertyuiop") - CH03(ts, z155, 0x021, 0, 0) + CH03(ts, z155, 0x021, __LINE__, 0) Store(arg0, i001) @@ -662,7 +662,7 @@ Method(m10a, 1, Serialized) Store(Add(DerefOf(Index(s000, 1)), m001()), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z155, 0x022, 0, 0, Local0, 0x24) + err(ts, z155, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(s000, 1)), Local0) @@ -674,10 +674,10 @@ Method(m10a, 1, Serialized) } if (LNotEqual(Local0, Local1)) { - err(ts, z155, 0x023, 0, 0, Local0, Local1) + err(ts, z155, __LINE__, 0, 0, Local0, Local1) } - CH03(ts, z155, 0x024, 0, 0) + CH03(ts, z155, 0x024, __LINE__, 0) } Method(n001) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl index e58bf1c..ba12335 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl @@ -51,10 +51,10 @@ Method(m200,, Serialized) Store(DerefOf(Index(d000.p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z156, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z156, __LINE__, 0, 0, Local0, 0x11112222) } - CH03(ts, z156, 0x001, 0, 0) + CH03(ts, z156, 0x001, __LINE__, 0) } Method(m201,, Serialized) @@ -74,10 +74,10 @@ Method(m201,, Serialized) Store(DerefOf(Index(d000.b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z156, 0x002, 0, 0, Local0, 0x67) + err(ts, z156, __LINE__, 0, 0, Local0, 0x67) } - CH03(ts, z156, 0x003, 0, 0) + CH03(ts, z156, 0x003, __LINE__, 0) } Method(m202,, Serialized) @@ -97,10 +97,10 @@ Method(m202,, Serialized) Store(DerefOf(Index(d000.s000, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z156, 0x004, 0, 0, Local0, 0x38) + err(ts, z156, __LINE__, 0, 0, Local0, 0x38) } - CH03(ts, z156, 0x005, 0, 0) + CH03(ts, z156, 0x005, __LINE__, 0) } /* @@ -131,16 +131,16 @@ Method(m204,, Serialized) Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z156, 0x00a, 0, 0, Local0, 0x065013BA) + err(ts, z156, __LINE__, 0, 0, Local0, 0x065013BA) } Store(DerefOf(Index(d000.pp00, 1)), Local0) if (LNotEqual(Local0, 0x00100064)) { - err(ts, z156, 0x00b, 0, 0, Local0, 0x00100064) + err(ts, z156, __LINE__, 0, 0, Local0, 0x00100064) } - CH03(ts, z156, 0x00c, 0, 0) + CH03(ts, z156, 0x00c, __LINE__, 0) } Method(n002) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl index 95f5737..17b3134 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl @@ -43,7 +43,7 @@ Method(m203, 1, Serialized) Name(pp00, Package() {0x11111111, 0x00000001, 0x22223333}) } - CH03(ts, z156, 0x006, 0, 0) + CH03(ts, z156, 0x006, __LINE__, 0) Store(arg0, i001) @@ -93,16 +93,16 @@ Method(m203, 1, Serialized) Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z156, 0x007, 0, 0, Local0, 0x87654321) + err(ts, z156, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(d000.pp00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z156, 0x008, 0, 0, Local0, 0x80000000) + err(ts, z156, __LINE__, 0, 0, Local0, 0x80000000) } - CH03(ts, z156, 0x009, 0, 0) + CH03(ts, z156, 0x009, __LINE__, 0) } /* @@ -114,7 +114,7 @@ Method(m205, 1, Serialized) Name(i001, 0) Name(p000, Package() {1,2,3,4}) - CH03(ts, z156, 0x00d, 0, 0) + CH03(ts, z156, 0x00d, __LINE__, 0) Device(d000) { @@ -122,7 +122,7 @@ Method(m205, 1, Serialized) CreateField(b000, 5, 32, bf00) } - CH03(ts, z156, 0x00e, 0, 0) + CH03(ts, z156, 0x00e, __LINE__, 0) if (0) { CreateField(d000.b000, 5, 32, bf00) @@ -176,16 +176,16 @@ Method(m205, 1, Serialized) Store(Add(DerefOf(Index(d000.bf00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z156, 0x00f, 0, 0, Local0, 0x87654321) + err(ts, z156, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(d000.bf00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z156, 0x010, 0, 0, Local0, 0x80000000) + err(ts, z156, __LINE__, 0, 0, Local0, 0x80000000) } - CH03(ts, z156, 0x011, 0, 0) + CH03(ts, z156, 0x011, __LINE__, 0) } Method(n102) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl index a918859..410bc2f 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl @@ -48,7 +48,7 @@ Method(m300,, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z157, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z157, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -57,10 +57,10 @@ Method(m300,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z157, 0x001, 0, 0, Local0, 0x11112222) + err(ts, z157, __LINE__, 0, 0, Local0, 0x11112222) } - CH03(ts, z157, 0x002, 0, 0) + CH03(ts, z157, 0x002, __LINE__, 0) } Method(m301,, Serialized) @@ -80,7 +80,7 @@ Method(m301,, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z157, 0x003, 0, 0, Local0, 0x67) + err(ts, z157, __LINE__, 0, 0, Local0, 0x67) } } @@ -89,10 +89,10 @@ Method(m301,, Serialized) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z157, 0x004, 0, 0, Local0, 0x67) + err(ts, z157, __LINE__, 0, 0, Local0, 0x67) } - CH03(ts, z157, 0x005, 0, 0) + CH03(ts, z157, 0x005, __LINE__, 0) } Method(m302,, Serialized) @@ -111,7 +111,7 @@ Method(m302,, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z157, 0x006, 0, 0, Local0, 0x38) + err(ts, z157, __LINE__, 0, 0, Local0, 0x38) } } @@ -120,10 +120,10 @@ Method(m302,, Serialized) Store(DerefOf(Index(s000, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z157, 0x007, 0, 0, Local0, 0x38) + err(ts, z157, __LINE__, 0, 0, Local0, 0x38) } - CH03(ts, z157, 0x008, 0, 0) + CH03(ts, z157, 0x008, __LINE__, 0) } /* @@ -139,7 +139,7 @@ Method(m303, 1, Serialized) Name(i001, 0) Name(p000, Package() {1,2,3,4}) - CH03(ts, z157, 0x009, 0, 0) + CH03(ts, z157, 0x009, __LINE__, 0) Store(arg1, i001) @@ -189,16 +189,16 @@ Method(m303, 1, Serialized) Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x00a, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(arg0, 1)), Local1) if (LNotEqual(Local1, 0x80000000)) { - err(ts, z157, 0x00b, 0, 0, Local1, 0x80000000) + err(ts, z157, __LINE__, 0, 0, Local1, 0x80000000) } - CH03(ts, z157, 0x00c, 0, 0) + CH03(ts, z157, 0x00c, __LINE__, 0) Return (Local0) } @@ -206,16 +206,16 @@ Method(m303, 1, Serialized) Store(m000(pp00, arg0), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x00d, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z157, 0x00e, 0, 0, Local0, 0x80000000) + err(ts, z157, __LINE__, 0, 0, Local0, 0x80000000) } - CH03(ts, z157, 0x00f, 0, 0) + CH03(ts, z157, 0x00f, __LINE__, 0) } /* @@ -244,13 +244,13 @@ Method(m304,, Serialized) Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z157, 0x010, 0, 0, Local0, 0x065013BA) + err(ts, z157, __LINE__, 0, 0, Local0, 0x065013BA) } Store(DerefOf(Index(arg0, 1)), Local1) if (LNotEqual(Local1, 0x00100064)) { - err(ts, z157, 0x011, 0, 0, Local1, 0x00100064) + err(ts, z157, __LINE__, 0, 0, Local1, 0x00100064) } Return (Local0) } @@ -258,16 +258,16 @@ Method(m304,, Serialized) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z157, 0x012, 0, 0, Local0, 0x065013BA) + err(ts, z157, __LINE__, 0, 0, Local0, 0x065013BA) } Store(DerefOf(Index(pp00, 1)), Local1) if (LNotEqual(Local1, 0x00100064)) { - err(ts, z157, 0x013, 0, 0, Local1, 0x00100064) + err(ts, z157, __LINE__, 0, 0, Local1, 0x00100064) } - CH03(ts, z157, 0x014, 0, 0) + CH03(ts, z157, 0x014, __LINE__, 0) } /* @@ -278,7 +278,7 @@ Method(m305,, Serialized) Name(ts, "m305") Name(b000, Buffer(16) {}) - CH03(ts, z157, 0x015, 0, 0) + CH03(ts, z157, 0x015, __LINE__, 0) CreateField(b000, 5, 32, bf00) Store(0xabcdef70, bf00) @@ -330,16 +330,16 @@ Method(m305,, Serialized) Store(Add(arg0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x016, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0x0000001, Local1) if (LNotEqual(arg0, Local1)) { - err(ts, z157, 0x017, 0, 0, arg0, Local1) + err(ts, z157, __LINE__, 0, 0, arg0, Local1) } - CH03(ts, z157, 0x018, 0, 0) + CH03(ts, z157, 0x018, __LINE__, 0) Return (Local0) } @@ -347,16 +347,16 @@ Method(m305,, Serialized) Store(m000(bf00), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x019, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0xabcdef70, Local1) if (LNotEqual(bf00, Local1)) { - err(ts, z157, 0x01a, 0, 0, bf00, Local1) + err(ts, z157, __LINE__, 0, 0, bf00, Local1) } - CH03(ts, z157, 0x01b, 0, 0) + CH03(ts, z157, 0x01b, __LINE__, 0) } /* @@ -369,7 +369,7 @@ Method(m306,, Serialized) OperationRegion(r000, SystemMemory, 0x100, 0x100) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } - CH03(ts, z157, 0x01c, 0, 0) + CH03(ts, z157, 0x01c, __LINE__, 0) Store(0xabcdef70, f000) @@ -420,16 +420,16 @@ Method(m306,, Serialized) Store(Add(arg0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x01d, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0x0000001, Local1) if (LNotEqual(arg0, Local1)) { - err(ts, z157, 0x01e, 0, 0, arg0, Local1) + err(ts, z157, __LINE__, 0, 0, arg0, Local1) } - CH03(ts, z157, 0x01f, 0, 0) + CH03(ts, z157, 0x01f, __LINE__, 0) Return (Local0) } @@ -437,16 +437,16 @@ Method(m306,, Serialized) Store(m000(f000), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x020, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0xabcdef70, Local1) if (LNotEqual(f000, Local1)) { - err(ts, z157, 0x021, 0, 0, f000, Local1) + err(ts, z157, __LINE__, 0, 0, f000, Local1) } - CH03(ts, z157, 0x022, 0, 0) + CH03(ts, z157, 0x022, __LINE__, 0) } /* @@ -460,7 +460,7 @@ Method(m307,, Serialized) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } BankField(r000, f001, 0, ByteAcc, NoLock, Preserve) { bnk0, 32 } - CH03(ts, z157, 0x023, 0, 0) + CH03(ts, z157, 0x023, __LINE__, 0) Store(0xabcdef70, bnk0) @@ -511,16 +511,16 @@ Method(m307,, Serialized) Store(Add(arg0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x024, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0x0000001, Local1) if (LNotEqual(arg0, Local1)) { - err(ts, z157, 0x025, 0, 0, arg0, Local1) + err(ts, z157, __LINE__, 0, 0, arg0, Local1) } - CH03(ts, z157, 0x026, 0, 0) + CH03(ts, z157, 0x026, __LINE__, 0) Return (Local0) } @@ -528,16 +528,16 @@ Method(m307,, Serialized) Store(m000(bnk0), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x027, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0xabcdef70, Local1) if (LNotEqual(bnk0, Local1)) { - err(ts, z157, 0x028, 0, 0, bnk0, Local1) + err(ts, z157, __LINE__, 0, 0, bnk0, Local1) } - CH03(ts, z157, 0x029, 0, 0) + CH03(ts, z157, 0x029, __LINE__, 0) } /* @@ -551,7 +551,7 @@ Method(m308,, Serialized) Field(r000, ByteAcc, NoLock, Preserve) { f000,32, f001,32 } IndexField(f000, f001, ByteAcc, NoLock, Preserve) { if00, 32 } - CH03(ts, z157, 0x02a, 0, 0) + CH03(ts, z157, 0x02a, __LINE__, 0) Store(0xabcdef70, if00) @@ -602,16 +602,16 @@ Method(m308,, Serialized) Store(Add(arg0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x02b, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0x0000001, Local1) if (LNotEqual(arg0, Local1)) { - err(ts, z157, 0x02c, 0, 0, arg0, Local1) + err(ts, z157, __LINE__, 0, 0, arg0, Local1) } - CH03(ts, z157, 0x02d, 0, 0) + CH03(ts, z157, 0x02d, __LINE__, 0) Return (Local0) } @@ -619,16 +619,16 @@ Method(m308,, Serialized) Store(m000(if00), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x02e, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0xabcdef70, Local1) if (LNotEqual(if00, Local1)) { - err(ts, z157, 0x02f, 0, 0, if00, Local1) + err(ts, z157, __LINE__, 0, 0, if00, Local1) } - CH03(ts, z157, 0x030, 0, 0) + CH03(ts, z157, 0x030, __LINE__, 0) } /* @@ -640,7 +640,7 @@ Method(m309, 1, Serialized) Name(i001, 0) Name(b000, Buffer() {0x11, 0x01, 0x22}) - CH03(ts, z157, 0x031, 0, 0) + CH03(ts, z157, 0x031, __LINE__, 0) Store(arg0, i001) @@ -692,7 +692,7 @@ Method(m309, 1, Serialized) Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z157, 0x032, 0, 0, Local0, 0x24) + err(ts, z157, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(arg0, 1)), Local1) @@ -704,10 +704,10 @@ Method(m309, 1, Serialized) } if (LNotEqual(Local1, Local2)) { - err(ts, z157, 0x033, 0, 0, Local1, Local2) + err(ts, z157, __LINE__, 0, 0, Local1, Local2) } - CH03(ts, z157, 0x034, 0, 0) + CH03(ts, z157, 0x034, __LINE__, 0) Return (Local0) } @@ -715,7 +715,7 @@ Method(m309, 1, Serialized) Store(m000(b000, arg0), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z157, 0x035, 0, 0, Local0, 0x24) + err(ts, z157, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(b000, 1)), Local1) @@ -727,10 +727,10 @@ Method(m309, 1, Serialized) } if (LNotEqual(Local1, Local2)) { - err(ts, z157, 0x036, 0, 0, Local1, Local2) + err(ts, z157, __LINE__, 0, 0, Local1, Local2) } - CH03(ts, z157, 0x037, 0, 0) + CH03(ts, z157, 0x037, __LINE__, 0) } /* @@ -742,7 +742,7 @@ Method(m30a, 1, Serialized) Name(i001, 0) Name(s000, "q\001ertyuiop") - CH03(ts, z157, 0x038, 0, 0) + CH03(ts, z157, 0x038, __LINE__, 0) Store(arg0, i001) @@ -794,7 +794,7 @@ Method(m30a, 1, Serialized) Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z157, 0x039, 0, 0, Local0, 0x24) + err(ts, z157, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(arg0, 1)), Local1) @@ -806,10 +806,10 @@ Method(m30a, 1, Serialized) } if (LNotEqual(Local1, Local2)) { - err(ts, z157, 0x03a, 0, 0, Local1, Local2) + err(ts, z157, __LINE__, 0, 0, Local1, Local2) } - CH03(ts, z157, 0x03b, 0, 0) + CH03(ts, z157, 0x03b, __LINE__, 0) Return (Local0) } @@ -817,7 +817,7 @@ Method(m30a, 1, Serialized) Store(m000(s000, arg0), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z157, 0x03c, 0, 0, Local0, 0x24) + err(ts, z157, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(s000, 1)), Local1) @@ -829,10 +829,10 @@ Method(m30a, 1, Serialized) } if (LNotEqual(Local1, Local2)) { - err(ts, z157, 0x03d, 0, 0, Local1, Local2) + err(ts, z157, __LINE__, 0, 0, Local1, Local2) } - CH03(ts, z157, 0x03e, 0, 0) + CH03(ts, z157, 0x03e, __LINE__, 0) } /* @@ -848,7 +848,7 @@ Method(m30b, 1, Serialized) Store(arg0, i001) - CH03(ts, z157, 0x03f, 0, 0) + CH03(ts, z157, 0x03f, __LINE__, 0) Method(m000, 2) { @@ -903,7 +903,7 @@ Method(m30b, 1, Serialized) Store(Add(bf00, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x040, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } if (arg1) { @@ -913,10 +913,10 @@ Method(m30b, 1, Serialized) } if (LNotEqual(bf00, Local1)) { - err(ts, z157, 0x041, 0, 0, bf00, Local1) + err(ts, z157, __LINE__, 0, 0, bf00, Local1) } - CH03(ts, z157, 0x042, 0, 0) + CH03(ts, z157, 0x042, __LINE__, 0) Return (Local0) } @@ -924,10 +924,10 @@ Method(m30b, 1, Serialized) Store(m000(0, arg0), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x043, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } - CH03(ts, z157, 0x044, 0, 0) + CH03(ts, z157, 0x044, __LINE__, 0) } Method(n003) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl index e245d1a..be9c01a 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl @@ -44,7 +44,7 @@ Method(m401, 1, Serialized) Name(i001, 0) Name(p000, Package() {1,2,3,4}) - CH03(ts, z158, 0x000, 0, 0) + CH03(ts, z158, 0x000, __LINE__, 0) Store(arg0, i001) @@ -100,14 +100,14 @@ Method(m401, 1, Serialized) Store(MAdd(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z158, 0x001, 0, 0, Local0, 0x87654321) + err(ts, z158, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z158, 0x002, 0, 0, i000, 0x80000000) + err(ts, z158, __LINE__, 0, 0, i000, 0x80000000) } - CH03(ts, z158, 0x003, 0, 0) + CH03(ts, z158, 0x003, __LINE__, 0) } Method(n004) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl index 6704e14..e9a0196 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl @@ -37,10 +37,10 @@ Method(m500) Store(DerefOf(Index(d000.p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z159, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z159, __LINE__, 0, 0, Local0, 0x11112222) } - CH03(ts, z159, 0x100, 0, 0) + CH03(ts, z159, 0x100, __LINE__, 0) } Method(m501) @@ -60,10 +60,10 @@ Method(m501) Store(DerefOf(Index(d000.b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z159, 0x001, 0, 0, Local0, 0x67) + err(ts, z159, __LINE__, 0, 0, Local0, 0x67) } - CH03(ts, z159, 0x101, 0, 0) + CH03(ts, z159, 0x101, __LINE__, 0) } Method(m502) @@ -83,10 +83,10 @@ Method(m502) Store(DerefOf(Index(d000.s000, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z159, 0x002, 0, 0, Local0, 0x38) + err(ts, z159, __LINE__, 0, 0, Local0, 0x38) } - CH03(ts, z159, 0x102, 0, 0) + CH03(ts, z159, 0x102, __LINE__, 0) } /* @@ -102,7 +102,7 @@ Method(m503, 1) Name(pp00, Package() {0x11111111, 0x00000001, 0x22223333}) } - CH03(ts, z159, 0x103, 0, 0) + CH03(ts, z159, 0x103, __LINE__, 0) Store(arg0, i001) @@ -152,16 +152,16 @@ Method(m503, 1) Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z159, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z159, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(d000.pp00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z159, 0x004, 0, 0, Local0, 0x80000000) + err(ts, z159, __LINE__, 0, 0, Local0, 0x80000000) } - CH03(ts, z159, 0x104, 0, 0) + CH03(ts, z159, 0x104, __LINE__, 0) } /* @@ -192,16 +192,16 @@ Method(m504) Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z159, 0x005, 0, 0, Local0, 0x065013BA) + err(ts, z159, __LINE__, 0, 0, Local0, 0x065013BA) } Store(DerefOf(Index(d000.pp00, 1)), Local0) if (LNotEqual(Local0, 0x00100064)) { - err(ts, z159, 0x006, 0, 0, Local0, 0x00100064) + err(ts, z159, __LINE__, 0, 0, Local0, 0x00100064) } - CH03(ts, z159, 0x105, 0, 0) + CH03(ts, z159, 0x105, __LINE__, 0) } /* @@ -213,7 +213,7 @@ Method(m505, 1) Name(i001, 0) Name(p000, Package() {1,2,3,4}) - CH03(ts, z159, 0x200, 0, 0) + CH03(ts, z159, 0x200, __LINE__, 0) Device(d000) { @@ -221,7 +221,7 @@ Method(m505, 1) CreateField(b000, 5, 32, bf00) } - CH03(ts, z159, 0x106, 0, 0) + CH03(ts, z159, 0x106, __LINE__, 0) if (0) { CreateField(d000.b000, 5, 32, bf00) @@ -275,16 +275,16 @@ Method(m505, 1) Store(Add(DerefOf(Index(d000.bf00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z159, 0x007, 0, 0, Local0, 0x87654321) + err(ts, z159, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(d000.bf00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z159, 0x008, 0, 0, Local0, 0x80000000) + err(ts, z159, __LINE__, 0, 0, Local0, 0x80000000) } - CH03(ts, z159, 0x107, 0, 0) + CH03(ts, z159, 0x107, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl index 6d60f77..d80b777 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl @@ -10,14 +10,14 @@ Method(m600,, Serialized) { Store(0x11223344, i000) if (LNotEqual(arg0, 0xabcd0000)) { - err(ts, z160, 0x000, 0, 0, arg0, 0xabcd0000) + err(ts, z160, __LINE__, 0, 0, arg0, 0xabcd0000) } } m000(i000) if (LNotEqual(i000, 0x11223344)) { - err(ts, z160, 0x001, 0, 0, i000, 0x11223344) + err(ts, z160, __LINE__, 0, 0, i000, 0x11223344) } } diff --git a/tests/aslts/src/runtime/collections/complex/namespace/scope.asl b/tests/aslts/src/runtime/collections/complex/namespace/scope.asl index 5860200..cdf95d8 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/scope.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/scope.asl @@ -41,9 +41,9 @@ Method(sc00,, Serialized) Scope(\) { Name(i2z4, 0xabcd0007) } } - CH03(ts, z178, 0x044, 0, 0) + CH03(ts, z178, 0x044, __LINE__, 0) m000(0) - CH03(ts, z178, 0x045, 0, 0) + CH03(ts, z178, 0x045, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl b/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl index 9da3a4d..e21a8ae 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl @@ -784,9 +784,9 @@ Method(m600, 4) Store(ObjectType(arg2), Local0) Store(ObjectType(arg3), Local1) if (LNotEqual(Local0, Local1)) { - err(Concatenate(arg0, "-OType"), z084, arg1, 0, 0, Local0, Local1) + err(Concatenate(arg0, "-OType"), z084, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(arg2, arg3)) { - err(arg0, z084, arg1, 0, 0, arg2, arg3) + err(arg0, z084, __LINE__, 0, 0, arg2, arg3) } } @@ -870,7 +870,7 @@ Method(m601, 2, Serialized) Return (0xd650a283) } Default { - err(terr, z084, 11, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -910,7 +910,7 @@ Method(m601, 2, Serialized) Return ("21 03 01") } Default { - err(terr, z084, 12, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -944,7 +944,7 @@ Method(m601, 2, Serialized) Return (Buffer() {0x30, 0x33, 0x32, 0x31, 0x01}) } Default { - err(terr, z084, 13, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -956,12 +956,12 @@ Method(m601, 2, Serialized) 0xa58, 0xa59, 0xa5a, 0xa5b, 0xa5c, 0xa5d, 0xa5e,}) } Default { - err(terr, z084, 14, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } Default { - err(terr, z084, 15, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Return(Local0) @@ -1210,7 +1210,7 @@ Method(m602, 3, Serialized) } } Default { - err(terr, z084, 16, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -1327,7 +1327,7 @@ Method(m602, 3, Serialized) } } Default { - err(terr, z084, 17, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -1424,7 +1424,7 @@ Method(m602, 3, Serialized) } } Default { - err(terr, z084, 18, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -1441,16 +1441,16 @@ Method(m602, 3, Serialized) } } Default { - err(terr, z084, 19, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } Default { - err(terr, z084, 20, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } else { - err(terr, z084, 21, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } Return(Local0) } @@ -1478,11 +1478,11 @@ Method(m603, 3, Serialized) Return (Local0) } Default { - err(terr, z084, 22, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } else { - err(terr, z084, 23, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Case(2) { // String @@ -1499,11 +1499,11 @@ Method(m603, 3, Serialized) Return (Local0) } Default { - err(terr, z084, 24, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } else { - err(terr, z084, 25, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Case(3) { // Buffer @@ -1520,11 +1520,11 @@ Method(m603, 3, Serialized) Return (Local0) } Default { - err(terr, z084, 26, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } else { - err(terr, z084, 27, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Case(4) { // Package @@ -1541,15 +1541,15 @@ Method(m603, 3, Serialized) Return (Local0) } Default { - err(terr, z084, 28, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } else { - err(terr, z084, 29, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Default { - err(terr, z084, 30, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Return(Local0) @@ -1565,7 +1565,7 @@ Method(m604, 4, Serialized) Switch(ToInteger (arg0)) { Case(0) { // Constant if (arg3) { - err(terr, z084, 0, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } Switch(ToInteger (arg1)) { Case(1) { // Integer @@ -1589,7 +1589,7 @@ Method(m604, 4, Serialized) Return (0x6e7c534136002214) } Default { - err(terr, z084, 1, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } @@ -1632,7 +1632,7 @@ Method(m604, 4, Serialized) Return ("63") } Default { - err(terr, z084, 1, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } @@ -1674,12 +1674,12 @@ Method(m604, 4, Serialized) Return (Buffer(1){0x3f}) } Default { - err(terr, z084, 1, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } Default { - err(terr, z084, 2, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } @@ -1700,7 +1700,7 @@ Method(m604, 4, Serialized) Return (Local0) } Default { - err(terr, z084, 3, 0, 0, arg2, arg3) + err(terr, z084, __LINE__, 0, 0, arg2, arg3) } } } @@ -1717,17 +1717,17 @@ Method(m604, 4, Serialized) Return (Local0) } Default { - err(terr, z084, 4, 0, 0, arg2, arg3) + err(terr, z084, __LINE__, 0, 0, arg2, arg3) } } } Default { - err(terr, z084, 5, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } Default { - err(terr, z084, 6, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } @@ -1747,11 +1747,11 @@ Method(m604, 4, Serialized) Return (Local0) } Default { - err(terr, z084, 7, 0, 0, arg2, arg3) + err(terr, z084, __LINE__, 0, 0, arg2, arg3) } } } else { - err(terr, z084, 8, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } Case(2) { // String @@ -1768,11 +1768,11 @@ Method(m604, 4, Serialized) Return (Local0) } Default { - err(terr, z084, 7, 0, 0, arg2, arg3) + err(terr, z084, __LINE__, 0, 0, arg2, arg3) } } } else { - err(terr, z084, 8, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } Case(3) { // Buffer @@ -1789,20 +1789,20 @@ Method(m604, 4, Serialized) Return (Local0) } Default { - err(terr, z084, 7, 0, 0, arg2, arg3) + err(terr, z084, __LINE__, 0, 0, arg2, arg3) } } } else { - err(terr, z084, 8, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } Default { - err(terr, z084, 9, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } Default { - err(terr, z084, 10, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Return(Local0) diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl index bc01d62..0f1b839 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl @@ -11815,16 +11815,16 @@ Method(m617,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z121, 0, 0, 0) + CH03(arg0, z121, 0, __LINE__, 0) Store(Index(m601(2, 6), arg1), Local3) - CH04(arg0, 0, 85, z121, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z121, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), arg1), Local3) - CH04(arg0, 0, 85, z121, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z121, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), arg1), Local3) - CH04(arg0, 0, 85, z121, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z121, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } @@ -11883,16 +11883,16 @@ Method(m617,, Serialized) Index(m601(4, 0), arg1, Local0) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z121, 0, 0, 0) + CH03(arg0, z121, 0, __LINE__, 0) Index(m601(2, 6), arg1, Local0) - CH04(arg0, 0, 85, z121, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z121, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), arg1, Local0) - CH04(arg0, 0, 85, z121, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z121, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), arg1, Local0) - CH04(arg0, 0, 85, z121, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z121, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11973,14 +11973,14 @@ Method(m617,, Serialized) // (it can only be checked an exception does not occur) Method(m02e, 4) { - CH03(arg0, z121, 0, 0, 0) + CH03(arg0, z121, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, arg1) if (F64) { Fatal(0xff, 0xffffffff, arg2) } else { Fatal(0xff, 0xffffffff, arg3) } - CH03(arg0, z121, 1, 0, 0) + CH03(arg0, z121, 1, __LINE__, 0) } // String to Integer conversion of the String Index and Length @@ -12608,19 +12608,19 @@ Method(m617,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m031, 3) { - CH03(arg0, z121, 2, 0, 0) + CH03(arg0, z121, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(arg1) - CH03(arg0, z121, 3, 0, 0) + CH03(arg0, z121, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12628,12 +12628,12 @@ Method(m617,, Serialized) Store(Timer, Local0) Stall(arg2) - CH03(arg0, z121, 4, 0, 0) + CH03(arg0, z121, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z121, 1, 0, 0, Local2, 990) + err(arg0, z121, __LINE__, 0, 0, Local2, 990) } } @@ -12644,19 +12644,19 @@ Method(m617,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z121, 5, 0, 0) + CH03(arg0, z121, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, arg1) */ - CH03(arg0, z121, 6, 0, 0) + CH03(arg0, z121, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } } @@ -12666,17 +12666,17 @@ Method(m617,, Serialized) { Event(EVT0) - CH03(arg0, z121, 7, 0, 0) + CH03(arg0, z121, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, arg1) - CH03(arg0, z121, 8, 0, 0) + CH03(arg0, z121, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } } @@ -23405,14 +23405,14 @@ Method(m617,, Serialized) // (it can only be checked an exception does not occur) Method(m068, 3) { - CH03(arg0, z121, 9, 0, 0) + CH03(arg0, z121, 9, __LINE__, 0) Fatal(0xff, 0xffffffff, arg1) if (F64) { Fatal(0xff, 0xffffffff, arg2) } else { Fatal(0xff, 0xffffffff, arg2) } - CH03(arg0, z121, 10, 0, 0) + CH03(arg0, z121, 10, __LINE__, 0) } // Buffer to Integer conversion of the Buffer Index and Length @@ -24040,19 +24040,19 @@ Method(m617,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m06b, 3) { - CH03(arg0, z121, 11, 0, 0) + CH03(arg0, z121, 11, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(arg1) - CH03(arg0, z121, 12, 0, 0) + CH03(arg0, z121, 12, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24060,12 +24060,12 @@ Method(m617,, Serialized) Store(Timer, Local0) Stall(arg2) - CH03(arg0, z121, 13, 0, 0) + CH03(arg0, z121, 13, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z121, 1, 0, 0, Local2, 990) + err(arg0, z121, __LINE__, 0, 0, Local2, 990) } } @@ -24077,19 +24077,19 @@ Method(m617,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z121, 14, 0, 0) + CH03(arg0, z121, 14, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, arg1) */ - CH03(arg0, z121, 15, 0, 0) + CH03(arg0, z121, 15, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } } @@ -24099,17 +24099,17 @@ Method(m617,, Serialized) { Event(EVT0) - CH03(arg0, z121, 16, 0, 0) + CH03(arg0, z121, 16, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, arg1) - CH03(arg0, z121, 17, 0, 0) + CH03(arg0, z121, 17, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl index 16f9456..726ce3c 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl @@ -12261,16 +12261,16 @@ Method(m610,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z085, 0, 0, 0) + CH03(arg0, z085, 0, __LINE__, 0) Store(Index(m601(2, 6), "B"), Local3) - CH04(arg0, 0, 85, z085, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), "B"), Local3) - CH04(arg0, 0, 85, z085, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), "B"), Local3) - CH04(arg0, 0, 85, z085, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } @@ -12330,16 +12330,16 @@ Method(m610,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z085, 0, 0, 0) + CH03(arg0, z085, 0, __LINE__, 0) Index(m601(2, 6), "B", Local0) - CH04(arg0, 0, 85, z085, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), "B", Local0) - CH04(arg0, 0, 85, z085, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), "B", Local0) - CH04(arg0, 0, 85, z085, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } @@ -12421,14 +12421,14 @@ Method(m610,, Serialized) // (it can only be checked an exception does not occur) Method(m02e, 1) { - CH03(arg0, z085, 0, 0, 0) + CH03(arg0, z085, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, "0321") if (F64) { Fatal(0xff, 0xffffffff, "FE7CB391D650A284") } else { Fatal(0xff, 0xffffffff, "C179B3FE") } - CH03(arg0, z085, 1, 0, 0) + CH03(arg0, z085, 1, __LINE__, 0) } // String to Integer conversion of the String Index and Length @@ -13126,19 +13126,19 @@ Method(m610,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m031, 1) { - CH03(arg0, z085, 2, 0, 0) + CH03(arg0, z085, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep("0321") - CH03(arg0, z085, 3, 0, 0) + CH03(arg0, z085, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -13146,12 +13146,12 @@ Method(m610,, Serialized) Store(Timer, Local0) Stall("63") - CH03(arg0, z085, 4, 0, 0) + CH03(arg0, z085, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z085, 1, 0, 0, Local2, 990) + err(arg0, z085, __LINE__, 0, 0, Local2, 990) } } @@ -13162,19 +13162,19 @@ Method(m610,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z085, 5, 0, 0) + CH03(arg0, z085, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, "0321") */ - CH03(arg0, z085, 6, 0, 0) + CH03(arg0, z085, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } } @@ -13184,17 +13184,17 @@ Method(m610,, Serialized) { Event(EVT0) - CH03(arg0, z085, 7, 0, 0) + CH03(arg0, z085, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, "0321") - CH03(arg0, z085, 8, 0, 0) + CH03(arg0, z085, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } } @@ -24199,16 +24199,16 @@ Method(m610,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z085, 0, 0, 0) + CH03(arg0, z085, 0, __LINE__, 0) Store(Index(m601(2, 6), Buffer(1){0xb}), Local3) - CH04(arg0, 0, 85, z085, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), Buffer(1){0xb}), Local3) - CH04(arg0, 0, 85, z085, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), Buffer(1){0xb}), Local3) - CH04(arg0, 0, 85, z085, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -24267,16 +24267,16 @@ Method(m610,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z085, 0, 0, 0) + CH03(arg0, z085, 0, __LINE__, 0) Index(m601(2, 6), Buffer(1){0xb}, Local0) - CH04(arg0, 0, 85, z085, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), Buffer(1){0xb}, Local0) - CH04(arg0, 0, 85, z085, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), Buffer(1){0xb}, Local0) - CH04(arg0, 0, 85, z085, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z085, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -24357,14 +24357,14 @@ Method(m610,, Serialized) // (it can only be checked an exception does not occur) Method(m068, 1) { - CH03(arg0, z085, 9, 0, 0) + CH03(arg0, z085, 9, __LINE__, 0) Fatal(0xff, 0xffffffff, Buffer(3){0x21, 0x03, 0x00}) if (F64) { Fatal(0xff, 0xffffffff, Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}) } else { Fatal(0xff, 0xffffffff, Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}) } - CH03(arg0, z085, 10, 0, 0) + CH03(arg0, z085, 10, __LINE__, 0) } // Buffer to Integer conversion of the Buffer Index and Length @@ -25030,19 +25030,19 @@ Method(m610,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m06b, 1) { - CH03(arg0, z085, 11, 0, 0) + CH03(arg0, z085, 11, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(Buffer(3){0x21, 0x03, 0x00}) - CH03(arg0, z085, 12, 0, 0) + CH03(arg0, z085, 12, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -25050,12 +25050,12 @@ Method(m610,, Serialized) Store(Timer, Local0) Stall(Buffer(1){0x3f}) - CH03(arg0, z085, 13, 0, 0) + CH03(arg0, z085, 13, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z085, 1, 0, 0, Local2, 990) + err(arg0, z085, __LINE__, 0, 0, Local2, 990) } } @@ -25067,19 +25067,19 @@ Method(m610,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z085, 14, 0, 0) + CH03(arg0, z085, 14, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Buffer(3){0x21, 0x03, 0x00}) */ - CH03(arg0, z085, 15, 0, 0) + CH03(arg0, z085, 15, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } } @@ -25089,17 +25089,17 @@ Method(m610,, Serialized) { Event(EVT0) - CH03(arg0, z085, 16, 0, 0) + CH03(arg0, z085, 16, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, Buffer(3){0x21, 0x03, 0x00}) - CH03(arg0, z085, 17, 0, 0) + CH03(arg0, z085, 17, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl index 4835f70..c377921 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl @@ -12010,16 +12010,16 @@ Method(m618,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z117, 0, 0, 0) + CH03(arg0, z117, 0, __LINE__, 0) Store(Index(m601(2, 6), Local1), Local5) - CH04(arg0, 0, 85, z117, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z117, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), Local1), Local5) - CH04(arg0, 0, 85, z117, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z117, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), Local1), Local5) - CH04(arg0, 0, 85, z117, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z117, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -12078,16 +12078,16 @@ Method(m618,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z117, 0, 0, 0) + CH03(arg0, z117, 0, __LINE__, 0) Index(m601(2, 6), Local1, Local0) - CH04(arg0, 0, 85, z117, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z117, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), Local1, Local0) - CH04(arg0, 0, 85, z117, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z117, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), Local1, Local0) - CH04(arg0, 0, 85, z117, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z117, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -12172,14 +12172,14 @@ Method(m618,, Serialized) Store("FE7CB391D650A284", Local2) Store("C179B3FE", Local3) - CH03(arg0, z117, 0, 0, 0) + CH03(arg0, z117, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, Local1) if (F64) { Fatal(0xff, 0xffffffff, Local2) } else { Fatal(0xff, 0xffffffff, Local3) } - CH03(arg0, z117, 1, 0, 0) + CH03(arg0, z117, 1, __LINE__, 0) } // String to Integer conversion of the String Index and Length @@ -12820,19 +12820,19 @@ Method(m618,, Serialized) Store("0321", Local3) Store("63", Local4) - CH03(arg0, z117, 2, 0, 0) + CH03(arg0, z117, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(Local3) - CH03(arg0, z117, 3, 0, 0) + CH03(arg0, z117, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12840,12 +12840,12 @@ Method(m618,, Serialized) Store(Timer, Local0) Stall(Local4) - CH03(arg0, z117, 4, 0, 0) + CH03(arg0, z117, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z117, 1, 0, 0, Local2, 990) + err(arg0, z117, __LINE__, 0, 0, Local2, 990) } } @@ -12858,19 +12858,19 @@ Method(m618,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z117, 5, 0, 0) + CH03(arg0, z117, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Local3) */ - CH03(arg0, z117, 6, 0, 0) + CH03(arg0, z117, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } } @@ -12882,17 +12882,17 @@ Method(m618,, Serialized) Event(EVT0) - CH03(arg0, z117, 7, 0, 0) + CH03(arg0, z117, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, Local1) - CH03(arg0, z117, 8, 0, 0) + CH03(arg0, z117, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } } @@ -23766,14 +23766,14 @@ Method(m618,, Serialized) Store(Buffer(3){0x21, 0x03, 0x00}, Local1) Store(Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Local2) - CH03(arg0, z117, 9, 0, 0) + CH03(arg0, z117, 9, __LINE__, 0) Fatal(0xff, 0xffffffff, Local1) if (F64) { Fatal(0xff, 0xffffffff, Local2) } else { Fatal(0xff, 0xffffffff, Local2) } - CH03(arg0, z117, 10, 0, 0) + CH03(arg0, z117, 10, __LINE__, 0) } // Buffer to Integer conversion of the Buffer Index and Length @@ -24414,19 +24414,19 @@ Method(m618,, Serialized) Store(Buffer(3){0x21, 0x03, 0x00}, Local3) Store(Buffer(1){0x3f}, Local4) - CH03(arg0, z117, 11, 0, 0) + CH03(arg0, z117, 11, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(Local3) - CH03(arg0, z117, 12, 0, 0) + CH03(arg0, z117, 12, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24434,12 +24434,12 @@ Method(m618,, Serialized) Store(Timer, Local0) Stall(Local4) - CH03(arg0, z117, 13, 0, 0) + CH03(arg0, z117, 13, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z117, 1, 0, 0, Local2, 990) + err(arg0, z117, __LINE__, 0, 0, Local2, 990) } } @@ -24453,19 +24453,19 @@ Method(m618,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z117, 14, 0, 0) + CH03(arg0, z117, 14, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Local3) */ - CH03(arg0, z117, 15, 0, 0) + CH03(arg0, z117, 15, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } } @@ -24477,17 +24477,17 @@ Method(m618,, Serialized) Event(EVT0) - CH03(arg0, z117, 16, 0, 0) + CH03(arg0, z117, 16, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, Local1) - CH03(arg0, z117, 17, 0, 0) + CH03(arg0, z117, 17, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl index 5614930..139b517 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl @@ -11817,16 +11817,16 @@ Method(m611,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z086, 0, 0, 0) + CH03(arg0, z086, 0, __LINE__, 0) Store(Index(m601(2, 6), s614), Local3) - CH04(arg0, 0, 85, z086, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), s614), Local3) - CH04(arg0, 0, 85, z086, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), s614), Local3) - CH04(arg0, 0, 85, z086, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11885,16 +11885,16 @@ Method(m611,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z086, 0, 0, 0) + CH03(arg0, z086, 0, __LINE__, 0) Index(m601(2, 6), s614, Local0) - CH04(arg0, 0, 85, z086, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), s614, Local0) - CH04(arg0, 0, 85, z086, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), s614, Local0) - CH04(arg0, 0, 85, z086, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11975,14 +11975,14 @@ Method(m611,, Serialized) // (it can only be checked an exception does not occur) Method(m02e, 1) { - CH03(arg0, z086, 0, 0, 0) + CH03(arg0, z086, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, s601) if (F64) { Fatal(0xff, 0xffffffff, s605) } else { Fatal(0xff, 0xffffffff, s604) } - CH03(arg0, z086, 1, 0, 0) + CH03(arg0, z086, 1, __LINE__, 0) } // String to Integer conversion of the String Index and Length @@ -12610,19 +12610,19 @@ Method(m611,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m031, 1) { - CH03(arg0, z086, 2, 0, 0) + CH03(arg0, z086, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(s601) - CH03(arg0, z086, 3, 0, 0) + CH03(arg0, z086, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12630,12 +12630,12 @@ Method(m611,, Serialized) Store(Timer, Local0) Stall(s61b) - CH03(arg0, z086, 4, 0, 0) + CH03(arg0, z086, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z086, 1, 0, 0, Local2, 990) + err(arg0, z086, __LINE__, 0, 0, Local2, 990) } } @@ -12646,19 +12646,19 @@ Method(m611,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z086, 5, 0, 0) + CH03(arg0, z086, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, s601) */ - CH03(arg0, z086, 6, 0, 0) + CH03(arg0, z086, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } } @@ -12668,17 +12668,17 @@ Method(m611,, Serialized) { Event(EVT0) - CH03(arg0, z086, 7, 0, 0) + CH03(arg0, z086, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, s601) - CH03(arg0, z086, 8, 0, 0) + CH03(arg0, z086, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } } @@ -23238,16 +23238,16 @@ Method(m611,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z086, 0, 0, 0) + CH03(arg0, z086, 0, __LINE__, 0) Store(Index(m601(2, 6), b60e), Local3) - CH04(arg0, 0, 85, z086, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), b60e), Local3) - CH04(arg0, 0, 85, z086, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), b60e), Local3) - CH04(arg0, 0, 85, z086, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23306,16 +23306,16 @@ Method(m611,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z086, 0, 0, 0) + CH03(arg0, z086, 0, __LINE__, 0) Index(m601(2, 6), b60e, Local0) - CH04(arg0, 0, 85, z086, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), b60e, Local0) - CH04(arg0, 0, 85, z086, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), b60e, Local0) - CH04(arg0, 0, 85, z086, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z086, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23396,14 +23396,14 @@ Method(m611,, Serialized) // (it can only be checked an exception does not occur) Method(m068, 1) { - CH03(arg0, z086, 9, 0, 0) + CH03(arg0, z086, 9, __LINE__, 0) Fatal(0xff, 0xffffffff, b606) if (F64) { Fatal(0xff, 0xffffffff, b60a) } else { Fatal(0xff, 0xffffffff, b60a) } - CH03(arg0, z086, 10, 0, 0) + CH03(arg0, z086, 10, __LINE__, 0) } // Buffer to Integer conversion of the Buffer Index and Length @@ -24031,19 +24031,19 @@ Method(m611,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m06b, 1) { - CH03(arg0, z086, 11, 0, 0) + CH03(arg0, z086, 11, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(b606) - CH03(arg0, z086, 12, 0, 0) + CH03(arg0, z086, 12, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24051,12 +24051,12 @@ Method(m611,, Serialized) Store(Timer, Local0) Stall(b613) - CH03(arg0, z086, 13, 0, 0) + CH03(arg0, z086, 13, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z086, 1, 0, 0, Local2, 990) + err(arg0, z086, __LINE__, 0, 0, Local2, 990) } } @@ -24068,19 +24068,19 @@ Method(m611,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z086, 14, 0, 0) + CH03(arg0, z086, 14, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, b606) */ - CH03(arg0, z086, 15, 0, 0) + CH03(arg0, z086, 15, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } } @@ -24090,17 +24090,17 @@ Method(m611,, Serialized) { Event(EVT0) - CH03(arg0, z086, 16, 0, 0) + CH03(arg0, z086, 16, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, b606) - CH03(arg0, z086, 17, 0, 0) + CH03(arg0, z086, 17, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl index 5292734..87c4c7d 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl @@ -11070,16 +11070,16 @@ Method(m612,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z087, 0, 0, 0) + CH03(arg0, z087, 0, __LINE__, 0) Store(Index(m601(2, 6), bf74), Local3) - CH04(arg0, 0, 85, z087, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z087, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), bf74), Local3) - CH04(arg0, 0, 85, z087, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z087, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), bf74), Local3) - CH04(arg0, 0, 85, z087, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z087, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11138,16 +11138,16 @@ Method(m612,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z087, 0, 0, 0) + CH03(arg0, z087, 0, __LINE__, 0) Index(m601(2, 6), bf74, Local0) - CH04(arg0, 0, 85, z087, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z087, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), bf74, Local0) - CH04(arg0, 0, 85, z087, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z087, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), bf74, Local0) - CH04(arg0, 0, 85, z087, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z087, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11228,14 +11228,14 @@ Method(m612,, Serialized) // (it can only be checked an exception does not occur) Method(m068, 1) { - CH03(arg0, z087, 0, 0, 0) + CH03(arg0, z087, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, bf61) if (F64) { Fatal(0xff, 0xffffffff, bf65) } else { Fatal(0xff, 0xffffffff, bf65) } - CH03(arg0, z087, 1, 0, 0) + CH03(arg0, z087, 1, __LINE__, 0) } // Buffer Field to Integer conversion of the Buffer Field Index @@ -11859,19 +11859,19 @@ Method(m612,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m06b, 1) { - CH03(arg0, z087, 2, 0, 0) + CH03(arg0, z087, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(bf61) - CH03(arg0, z087, 3, 0, 0) + CH03(arg0, z087, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z087, 0, 0, 0, Local2, c08c) + err(arg0, z087, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -11879,12 +11879,12 @@ Method(m612,, Serialized) Store(Timer, Local0) Stall(bf75) - CH03(arg0, z087, 4, 0, 0) + CH03(arg0, z087, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z087, 1, 0, 0, Local2, 990) + err(arg0, z087, __LINE__, 0, 0, Local2, 990) } } @@ -11896,19 +11896,19 @@ Method(m612,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z087, 5, 0, 0) + CH03(arg0, z087, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, bf61) */ - CH03(arg0, z087, 6, 0, 0) + CH03(arg0, z087, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z087, 0, 0, 0, Local2, c08c) + err(arg0, z087, __LINE__, 0, 0, Local2, c08c) } } @@ -11918,17 +11918,17 @@ Method(m612,, Serialized) { Event(EVT0) - CH03(arg0, z087, 7, 0, 0) + CH03(arg0, z087, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, bf61) - CH03(arg0, z087, 8, 0, 0) + CH03(arg0, z087, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z087, 0, 0, 0, Local2, c08c) + err(arg0, z087, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl index a6d0124..437654a 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl @@ -12012,16 +12012,16 @@ Method(m613,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z088, 0, 0, 0) + CH03(arg0, z088, 0, __LINE__, 0) Store(Index(m601(2, 6), s614), Local3) - CH04(arg0, 0, 85, z088, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), s614), Local3) - CH04(arg0, 0, 85, z088, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), s614), Local3) - CH04(arg0, 0, 85, z088, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -12080,16 +12080,16 @@ Method(m613,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z088, 0, 0, 0) + CH03(arg0, z088, 0, __LINE__, 0) Index(m601(2, 6), s614, Local0) - CH04(arg0, 0, 85, z088, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), s614, Local0) - CH04(arg0, 0, 85, z088, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), s614, Local0) - CH04(arg0, 0, 85, z088, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -12174,14 +12174,14 @@ Method(m613,, Serialized) Name(s604, "C179B3FE") Name(s605, "FE7CB391D650A284") - CH03(arg0, z088, 0, 0, 0) + CH03(arg0, z088, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, s601) if (F64) { Fatal(0xff, 0xffffffff, s605) } else { Fatal(0xff, 0xffffffff, s604) } - CH03(arg0, z088, 1, 0, 0) + CH03(arg0, z088, 1, __LINE__, 0) } // String to Integer conversion of the String Index and Length @@ -12822,19 +12822,19 @@ Method(m613,, Serialized) Name(s601, "0321") Name(s61b, "63") - CH03(arg0, z088, 2, 0, 0) + CH03(arg0, z088, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(s601) - CH03(arg0, z088, 3, 0, 0) + CH03(arg0, z088, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12842,12 +12842,12 @@ Method(m613,, Serialized) Store(Timer, Local0) Stall(s61b) - CH03(arg0, z088, 4, 0, 0) + CH03(arg0, z088, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z088, 1, 0, 0, Local2, 990) + err(arg0, z088, __LINE__, 0, 0, Local2, 990) } } @@ -12860,19 +12860,19 @@ Method(m613,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z088, 5, 0, 0) + CH03(arg0, z088, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, s601) */ - CH03(arg0, z088, 6, 0, 0) + CH03(arg0, z088, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } } @@ -12884,17 +12884,17 @@ Method(m613,, Serialized) Event(EVT0) - CH03(arg0, z088, 7, 0, 0) + CH03(arg0, z088, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, s601) - CH03(arg0, z088, 8, 0, 0) + CH03(arg0, z088, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } } @@ -23628,16 +23628,16 @@ Method(m613,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z088, 0, 0, 0) + CH03(arg0, z088, 0, __LINE__, 0) Store(Index(m601(2, 6), b60e), Local3) - CH04(arg0, 0, 85, z088, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), b60e), Local3) - CH04(arg0, 0, 85, z088, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), b60e), Local3) - CH04(arg0, 0, 85, z088, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23696,16 +23696,16 @@ Method(m613,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z088, 0, 0, 0) + CH03(arg0, z088, 0, __LINE__, 0) Index(m601(2, 6), b60e, Local0) - CH04(arg0, 0, 85, z088, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), b60e, Local0) - CH04(arg0, 0, 85, z088, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), b60e, Local0) - CH04(arg0, 0, 85, z088, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23789,14 +23789,14 @@ Method(m613,, Serialized) Name(b606, Buffer(3){0x21, 0x03, 0x00}) Name(b60a, Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}) - CH03(arg0, z088, 9, 0, 0) + CH03(arg0, z088, 9, __LINE__, 0) Fatal(0xff, 0xffffffff, b606) if (F64) { Fatal(0xff, 0xffffffff, b60a) } else { Fatal(0xff, 0xffffffff, b60a) } - CH03(arg0, z088, 10, 0, 0) + CH03(arg0, z088, 10, __LINE__, 0) } // Buffer to Integer conversion of the Buffer Index and Length @@ -24437,19 +24437,19 @@ Method(m613,, Serialized) Name(b606, Buffer(3){0x21, 0x03, 0x00}) Name(b613, Buffer(1){0x3f}) - CH03(arg0, z088, 11, 0, 0) + CH03(arg0, z088, 11, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(b606) - CH03(arg0, z088, 12, 0, 0) + CH03(arg0, z088, 12, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24457,12 +24457,12 @@ Method(m613,, Serialized) Store(Timer, Local0) Stall(b613) - CH03(arg0, z088, 13, 0, 0) + CH03(arg0, z088, 13, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z088, 1, 0, 0, Local2, 990) + err(arg0, z088, __LINE__, 0, 0, Local2, 990) } } @@ -24476,19 +24476,19 @@ Method(m613,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z088, 14, 0, 0) + CH03(arg0, z088, 14, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, b606) */ - CH03(arg0, z088, 15, 0, 0) + CH03(arg0, z088, 15, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } } @@ -24500,17 +24500,17 @@ Method(m613,, Serialized) Event(EVT0) - CH03(arg0, z088, 16, 0, 0) + CH03(arg0, z088, 16, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, b606) - CH03(arg0, z088, 17, 0, 0) + CH03(arg0, z088, 17, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl index fe4e3c6..6708f38 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl @@ -11451,16 +11451,16 @@ Method(m614,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z089, 0, 0, 0) + CH03(arg0, z089, 0, __LINE__, 0) Store(Index(m601(2, 6), bf74), Local3) - CH04(arg0, 0, 85, z089, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z089, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), bf74), Local3) - CH04(arg0, 0, 85, z089, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z089, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), bf74), Local3) - CH04(arg0, 0, 85, z089, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z089, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11519,16 +11519,16 @@ Method(m614,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z088, 0, 0, 0) + CH03(arg0, z088, 0, __LINE__, 0) Index(m601(2, 6), bf74, Local0) - CH04(arg0, 0, 85, z088, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), bf74, Local0) - CH04(arg0, 0, 85, z088, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), bf74, Local0) - CH04(arg0, 0, 85, z088, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z088, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11615,14 +11615,14 @@ Method(m614,, Serialized) Store(Buffer(3){0x21, 0x03, 0x00}, bf61) Store(Buffer(8){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE}, bf65) - CH03(arg0, z089, 0, 0, 0) + CH03(arg0, z089, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, bf61) if (F64) { Fatal(0xff, 0xffffffff, bf65) } else { Fatal(0xff, 0xffffffff, bf65) } - CH03(arg0, z089, 1, 0, 0) + CH03(arg0, z089, 1, __LINE__, 0) } // Buffer Field to Integer conversion of the Buffer Field Index @@ -12272,19 +12272,19 @@ Method(m614,, Serialized) Store(Buffer(3){0x21, 0x03, 0x00}, bf61) Store(0x3f, bf75) - CH03(arg0, z089, 2, 0, 0) + CH03(arg0, z089, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(bf61) - CH03(arg0, z089, 3, 0, 0) + CH03(arg0, z089, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z089, 0, 0, 0, Local2, c08c) + err(arg0, z089, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12292,12 +12292,12 @@ Method(m614,, Serialized) Store(Timer, Local0) Stall(bf75) - CH03(arg0, z089, 4, 0, 0) + CH03(arg0, z089, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z089, 1, 0, 0, Local2, 990) + err(arg0, z089, __LINE__, 0, 0, Local2, 990) } } @@ -12313,19 +12313,19 @@ Method(m614,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z089, 5, 0, 0) + CH03(arg0, z089, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, bf61) */ - CH03(arg0, z089, 6, 0, 0) + CH03(arg0, z089, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z089, 0, 0, 0, Local2, c08c) + err(arg0, z089, __LINE__, 0, 0, Local2, c08c) } } @@ -12339,17 +12339,17 @@ Method(m614,, Serialized) Event(EVT0) - CH03(arg0, z089, 7, 0, 0) + CH03(arg0, z089, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, bf61) - CH03(arg0, z089, 8, 0, 0) + CH03(arg0, z089, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z089, 0, 0, 0, Local2, c08c) + err(arg0, z089, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl index faac109..aa3b043 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl @@ -11817,16 +11817,16 @@ Method(m615,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z090, 0, 0, 0) + CH03(arg0, z090, 0, __LINE__, 0) Store(Index(m601(2, 6), Derefof(Index(ps60, 20))), Local3) - CH04(arg0, 0, 85, z090, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), Derefof(Index(ps60, 20))), Local3) - CH04(arg0, 0, 85, z090, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), Derefof(Index(ps60, 20))), Local3) - CH04(arg0, 0, 85, z090, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11885,16 +11885,16 @@ Method(m615,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z090, 0, 0, 0) + CH03(arg0, z090, 0, __LINE__, 0) Index(m601(2, 6), Derefof(Index(ps60, 20)), Local0) - CH04(arg0, 0, 85, z090, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), Derefof(Index(ps60, 20)), Local0) - CH04(arg0, 0, 85, z090, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), Derefof(Index(ps60, 20)), Local0) - CH04(arg0, 0, 85, z090, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11975,14 +11975,14 @@ Method(m615,, Serialized) // (it can only be checked an exception does not occur) Method(m02e, 1) { - CH03(arg0, z090, 0, 0, 0) + CH03(arg0, z090, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, Derefof(Index(ps60, 1))) if (F64) { Fatal(0xff, 0xffffffff, Derefof(Index(ps60, 5))) } else { Fatal(0xff, 0xffffffff, Derefof(Index(ps60, 4))) } - CH03(arg0, z090, 1, 0, 0) + CH03(arg0, z090, 1, __LINE__, 0) } // String to Integer conversion of the String Index and Length @@ -12610,19 +12610,19 @@ Method(m615,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m031, 1) { - CH03(arg0, z090, 2, 0, 0) + CH03(arg0, z090, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(Derefof(Index(ps60, 1))) - CH03(arg0, z090, 3, 0, 0) + CH03(arg0, z090, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12630,12 +12630,12 @@ Method(m615,, Serialized) Store(Timer, Local0) Stall(Derefof(Index(ps60, 27))) - CH03(arg0, z090, 4, 0, 0) + CH03(arg0, z090, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z090, 1, 0, 0, Local2, 990) + err(arg0, z090, __LINE__, 0, 0, Local2, 990) } } @@ -12646,19 +12646,19 @@ Method(m615,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z090, 5, 0, 0) + CH03(arg0, z090, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Index(ps60, 1))) */ - CH03(arg0, z090, 6, 0, 0) + CH03(arg0, z090, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } } @@ -12668,17 +12668,17 @@ Method(m615,, Serialized) { Event(EVT0) - CH03(arg0, z090, 7, 0, 0) + CH03(arg0, z090, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, Derefof(Index(ps60, 1))) - CH03(arg0, z090, 8, 0, 0) + CH03(arg0, z090, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } } @@ -23238,16 +23238,16 @@ Method(m615,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z090, 0, 0, 0) + CH03(arg0, z090, 0, __LINE__, 0) Store(Index(m601(2, 6), Derefof(Index(pb60, 14))), Local3) - CH04(arg0, 0, 85, z090, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), Derefof(Index(pb60, 14))), Local3) - CH04(arg0, 0, 85, z090, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), Derefof(Index(pb60, 14))), Local3) - CH04(arg0, 0, 85, z090, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23306,16 +23306,16 @@ Method(m615,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z090, 0, 0, 0) + CH03(arg0, z090, 0, __LINE__, 0) Index(m601(2, 6), Derefof(Index(pb60, 14)), Local0) - CH04(arg0, 0, 85, z090, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), Derefof(Index(pb60, 14)), Local0) - CH04(arg0, 0, 85, z090, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), Derefof(Index(pb60, 14)), Local0) - CH04(arg0, 0, 85, z090, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z090, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23396,14 +23396,14 @@ Method(m615,, Serialized) // (it can only be checked an exception does not occur) Method(m068, 1) { - CH03(arg0, z090, 9, 0, 0) + CH03(arg0, z090, 9, __LINE__, 0) Fatal(0xff, 0xffffffff, Derefof(Index(pb60, 6))) if (F64) { Fatal(0xff, 0xffffffff, Derefof(Index(pb60, 10))) } else { Fatal(0xff, 0xffffffff, Derefof(Index(pb60, 10))) } - CH03(arg0, z090, 10, 0, 0) + CH03(arg0, z090, 10, __LINE__, 0) } // Buffer to Integer conversion of the Buffer Index and Length @@ -24031,19 +24031,19 @@ Method(m615,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m06b, 1) { - CH03(arg0, z090, 11, 0, 0) + CH03(arg0, z090, 11, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(Derefof(Index(pb60, 6))) - CH03(arg0, z090, 12, 0, 0) + CH03(arg0, z090, 12, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24051,12 +24051,12 @@ Method(m615,, Serialized) Store(Timer, Local0) Stall(Derefof(Index(pb60, 19))) - CH03(arg0, z090, 13, 0, 0) + CH03(arg0, z090, 13, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z090, 1, 0, 0, Local2, 990) + err(arg0, z090, __LINE__, 0, 0, Local2, 990) } } @@ -24068,19 +24068,19 @@ Method(m615,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z090, 14, 0, 0) + CH03(arg0, z090, 14, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Index(pb60, 6))) */ - CH03(arg0, z090, 15, 0, 0) + CH03(arg0, z090, 15, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } } @@ -24090,17 +24090,17 @@ Method(m615,, Serialized) { Event(EVT0) - CH03(arg0, z090, 16, 0, 0) + CH03(arg0, z090, 16, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, Derefof(Index(pb60, 6))) - CH03(arg0, z090, 17, 0, 0) + CH03(arg0, z090, 17, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl index 5804274..f68859c 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl @@ -11817,16 +11817,16 @@ Method(m616,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z091, 0, 0, 0) + CH03(arg0, z091, 0, __LINE__, 0) Store(Index(m601(2, 6), Derefof(Refof(s614))), Local3) - CH04(arg0, 0, 85, z091, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), Derefof(Refof(s614))), Local3) - CH04(arg0, 0, 85, z091, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), Derefof(Refof(s614))), Local3) - CH04(arg0, 0, 85, z091, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11885,16 +11885,16 @@ Method(m616,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z091, 0, 0, 0) + CH03(arg0, z091, 0, __LINE__, 0) Index(m601(2, 6), Derefof(Refof(s614)), Local0) - CH04(arg0, 0, 85, z091, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), Derefof(Refof(s614)), Local0) - CH04(arg0, 0, 85, z091, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), Derefof(Refof(s614)), Local0) - CH04(arg0, 0, 85, z091, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11975,14 +11975,14 @@ Method(m616,, Serialized) // (it can only be checked an exception does not occur) Method(m02e, 1) { - CH03(arg0, z091, 0, 0, 0) + CH03(arg0, z091, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, Derefof(Refof(s601))) if (F64) { Fatal(0xff, 0xffffffff, Derefof(Refof(s605))) } else { Fatal(0xff, 0xffffffff, Derefof(Refof(s604))) } - CH03(arg0, z091, 1, 0, 0) + CH03(arg0, z091, 1, __LINE__, 0) } // String to Integer conversion of the String Index and Length @@ -12610,19 +12610,19 @@ Method(m616,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m031, 1) { - CH03(arg0, z091, 2, 0, 0) + CH03(arg0, z091, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(Derefof(Refof(s601))) - CH03(arg0, z091, 3, 0, 0) + CH03(arg0, z091, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12630,12 +12630,12 @@ Method(m616,, Serialized) Store(Timer, Local0) Stall(Derefof(Refof(s61b))) - CH03(arg0, z091, 4, 0, 0) + CH03(arg0, z091, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z091, 1, 0, 0, Local2, 990) + err(arg0, z091, __LINE__, 0, 0, Local2, 990) } } @@ -12646,19 +12646,19 @@ Method(m616,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z091, 5, 0, 0) + CH03(arg0, z091, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Refof(s601))) */ - CH03(arg0, z091, 6, 0, 0) + CH03(arg0, z091, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } } @@ -12668,17 +12668,17 @@ Method(m616,, Serialized) { Event(EVT0) - CH03(arg0, z091, 7, 0, 0) + CH03(arg0, z091, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, Derefof(Refof(s601))) - CH03(arg0, z091, 8, 0, 0) + CH03(arg0, z091, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } } @@ -23238,16 +23238,16 @@ Method(m616,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z091, 0, 0, 0) + CH03(arg0, z091, 0, __LINE__, 0) Store(Index(m601(2, 6), Derefof(Refof(b60e))), Local3) - CH04(arg0, 0, 85, z091, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), Derefof(Refof(b60e))), Local3) - CH04(arg0, 0, 85, z091, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), Derefof(Refof(b60e))), Local3) - CH04(arg0, 0, 85, z091, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23306,16 +23306,16 @@ Method(m616,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z091, 0, 0, 0) + CH03(arg0, z091, 0, __LINE__, 0) Index(m601(2, 6), Derefof(Refof(b60e)), Local0) - CH04(arg0, 0, 85, z091, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), Derefof(Refof(b60e)), Local0) - CH04(arg0, 0, 85, z091, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), Derefof(Refof(b60e)), Local0) - CH04(arg0, 0, 85, z091, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z091, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23396,14 +23396,14 @@ Method(m616,, Serialized) // (it can only be checked an exception does not occur) Method(m068, 1) { - CH03(arg0, z091, 9, 0, 0) + CH03(arg0, z091, 9, __LINE__, 0) Fatal(0xff, 0xffffffff, Derefof(Refof(b606))) if (F64) { Fatal(0xff, 0xffffffff, Derefof(Refof(b60a))) } else { Fatal(0xff, 0xffffffff, Derefof(Refof(b60a))) } - CH03(arg0, z091, 10, 0, 0) + CH03(arg0, z091, 10, __LINE__, 0) } // Buffer to Integer conversion of the Buffer Index and Length @@ -24031,19 +24031,19 @@ Method(m616,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m06b, 1) { - CH03(arg0, z091, 11, 0, 0) + CH03(arg0, z091, 11, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(Derefof(Refof(b606))) - CH03(arg0, z091, 12, 0, 0) + CH03(arg0, z091, 12, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24051,12 +24051,12 @@ Method(m616,, Serialized) Store(Timer, Local0) Stall(Derefof(Refof(b613))) - CH03(arg0, z091, 13, 0, 0) + CH03(arg0, z091, 13, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z091, 1, 0, 0, Local2, 990) + err(arg0, z091, __LINE__, 0, 0, Local2, 990) } } @@ -24068,19 +24068,19 @@ Method(m616,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z091, 14, 0, 0) + CH03(arg0, z091, 14, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Refof(b606))) */ - CH03(arg0, z091, 15, 0, 0) + CH03(arg0, z091, 15, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } } @@ -24090,17 +24090,17 @@ Method(m616,, Serialized) { Event(EVT0) - CH03(arg0, z091, 16, 0, 0) + CH03(arg0, z091, 16, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, Derefof(Refof(b606))) - CH03(arg0, z091, 17, 0, 0) + CH03(arg0, z091, 17, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl index fb37b34..0dd4fd9 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl @@ -11056,16 +11056,16 @@ Method(m61b,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z120, 0, 0, 0) + CH03(arg0, z120, 0, __LINE__, 0) Store(Index(m601(2, 6), Derefof(Refof(bf74))), Local3) - CH04(arg0, 0, 85, z120, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z120, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), Derefof(Refof(bf74))), Local3) - CH04(arg0, 0, 85, z120, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z120, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), Derefof(Refof(bf74))), local3) - CH04(arg0, 0, 85, z120, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z120, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11124,16 +11124,16 @@ Method(m61b,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z120, 0, 0, 0) + CH03(arg0, z120, 0, __LINE__, 0) Index(m601(2, 6), Derefof(Refof(bf74)), Local0) - CH04(arg0, 0, 85, z120, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z120, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), Derefof(Refof(bf74)), Local0) - CH04(arg0, 0, 85, z120, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z120, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), Derefof(Refof(bf74)), Local0) - CH04(arg0, 0, 85, z120, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z120, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11214,14 +11214,14 @@ Method(m61b,, Serialized) // (it can only be checked an exception does not occur) Method(m068, 1) { - CH03(arg0, z120, 0, 0, 0) + CH03(arg0, z120, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, Derefof(Refof(bf61))) if (F64) { Fatal(0xff, 0xffffffff, Derefof(Refof(bf65))) } else { Fatal(0xff, 0xffffffff, Derefof(Refof(bf65))) } - CH03(arg0, z120, 1, 0, 0) + CH03(arg0, z120, 1, __LINE__, 0) } // Buffer Field to Integer conversion of the Buffer Field Index @@ -11845,19 +11845,19 @@ Method(m61b,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m06b, 1) { - CH03(arg0, z120, 2, 0, 0) + CH03(arg0, z120, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(Derefof(Refof(bf61))) - CH03(arg0, z120, 3, 0, 0) + CH03(arg0, z120, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z120, 0, 0, 0, Local2, c08c) + err(arg0, z120, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -11865,12 +11865,12 @@ Method(m61b,, Serialized) Store(Timer, Local0) Stall(Derefof(Refof(bf75))) - CH03(arg0, z120, 4, 0, 0) + CH03(arg0, z120, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z120, 1, 0, 0, Local2, 990) + err(arg0, z120, __LINE__, 0, 0, Local2, 990) } } @@ -11882,19 +11882,19 @@ Method(m61b,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z120, 5, 0, 0) + CH03(arg0, z120, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Refof(bf61))) */ - CH03(arg0, z120, 6, 0, 0) + CH03(arg0, z120, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z120, 0, 0, 0, Local2, c08c) + err(arg0, z120, __LINE__, 0, 0, Local2, c08c) } } @@ -11904,17 +11904,17 @@ Method(m61b,, Serialized) { Event(EVT0) - CH03(arg0, z120, 7, 0, 0) + CH03(arg0, z120, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, Derefof(Refof(bf61))) - CH03(arg0, z120, 8, 0, 0) + CH03(arg0, z120, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z120, 0, 0, 0, Local2, c08c) + err(arg0, z120, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl index 7ec4727..dbd6998 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl @@ -11818,16 +11818,16 @@ Method(m61a,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z119, 0, 0, 0) + CH03(arg0, z119, 0, __LINE__, 0) Store(Index(m601(2, 6), Derefof(m604(2, 2, 20, 1))), Local3) - CH04(arg0, 0, 85, z119, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), Derefof(m604(2, 2, 20, 1))), Local3) - CH04(arg0, 0, 85, z119, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), Derefof(m604(2, 2, 20, 1))), Local3) - CH04(arg0, 0, 85, z119, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11886,16 +11886,16 @@ Method(m61a,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z119, 0, 0, 0) + CH03(arg0, z119, 0, __LINE__, 0) Index(m601(2, 6), Derefof(m604(2, 2, 20, 1)), Local0) - CH04(arg0, 0, 85, z119, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), Derefof(m604(2, 2, 20, 1)), Local0) - CH04(arg0, 0, 85, z119, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), Derefof(m604(2, 2, 20, 1)), Local0) - CH04(arg0, 0, 85, z119, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11976,14 +11976,14 @@ Method(m61a,, Serialized) // (it can only be checked an exception does not occur) Method(m02e, 1) { - CH03(arg0, z119, 0, 0, 0) + CH03(arg0, z119, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, Derefof(m604(2, 2, 1, 1))) if (F64) { Fatal(0xff, 0xffffffff, Derefof(m604(2, 2, 5, 1))) } else { Fatal(0xff, 0xffffffff, Derefof(m604(2, 2, 4, 1))) } - CH03(arg0, z119, 1, 0, 0) + CH03(arg0, z119, 1, __LINE__, 0) } // String to Integer conversion of the String Index and Length @@ -12611,19 +12611,19 @@ Method(m61a,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m031, 1) { - CH03(arg0, z119, 2, 0, 0) + CH03(arg0, z119, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(Derefof(m604(2, 2, 1, 1))) - CH03(arg0, z119, 3, 0, 0) + CH03(arg0, z119, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12631,12 +12631,12 @@ Method(m61a,, Serialized) Store(Timer, Local0) Stall(Derefof(m604(2, 2, 27, 1))) - CH03(arg0, z119, 4, 0, 0) + CH03(arg0, z119, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z119, 1, 0, 0, Local2, 990) + err(arg0, z119, __LINE__, 0, 0, Local2, 990) } } @@ -12647,19 +12647,19 @@ Method(m61a,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z119, 5, 0, 0) + CH03(arg0, z119, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(m604(2, 2, 1, 1))) */ - CH03(arg0, z119, 6, 0, 0) + CH03(arg0, z119, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } } @@ -12669,17 +12669,17 @@ Method(m61a,, Serialized) { Event(EVT0) - CH03(arg0, z119, 7, 0, 0) + CH03(arg0, z119, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, Derefof(m604(2, 2, 1, 1))) - CH03(arg0, z119, 8, 0, 0) + CH03(arg0, z119, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } } @@ -23240,16 +23240,16 @@ Method(m61a,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z119, 0, 0, 0) + CH03(arg0, z119, 0, __LINE__, 0) Store(Index(m601(2, 6), Derefof(m604(2, 3, 14, 1))), Local3) - CH04(arg0, 0, 85, z119, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), Derefof(m604(2, 3, 14, 1))), Local3) - CH04(arg0, 0, 85, z119, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), Derefof(m604(2, 3, 14, 1))), Local3) - CH04(arg0, 0, 85, z119, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23308,16 +23308,16 @@ Method(m61a,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z119, 0, 0, 0) + CH03(arg0, z119, 0, __LINE__, 0) Index(m601(2, 6), Derefof(m604(2, 3, 14, 1)), Local0) - CH04(arg0, 0, 85, z119, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), Derefof(m604(2, 3, 14, 1)), Local0) - CH04(arg0, 0, 85, z119, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), Derefof(m604(2, 3, 14, 1)), Local0) - CH04(arg0, 0, 85, z119, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z119, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23398,14 +23398,14 @@ Method(m61a,, Serialized) // (it can only be checked an exception does not occur) Method(m068, 1) { - CH03(arg0, z119, 9, 0, 0) + CH03(arg0, z119, 9, __LINE__, 0) Fatal(0xff, 0xffffffff, Derefof(m604(2, 3, 6, 1))) if (F64) { Fatal(0xff, 0xffffffff, Derefof(m604(2, 3, 10, 1))) } else { Fatal(0xff, 0xffffffff, Derefof(m604(2, 3, 10, 1))) } - CH03(arg0, z119, 10, 0, 0) + CH03(arg0, z119, 10, __LINE__, 0) } // Buffer to Integer conversion of the Buffer Index and Length @@ -24033,19 +24033,19 @@ Method(m61a,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m06b, 1) { - CH03(arg0, z119, 11, 0, 0) + CH03(arg0, z119, 11, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(Derefof(m604(2, 3, 6, 1))) - CH03(arg0, z119, 12, 0, 0) + CH03(arg0, z119, 12, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24053,12 +24053,12 @@ Method(m61a,, Serialized) Store(Timer, Local0) Stall(Derefof(m604(2, 3, 19, 1))) - CH03(arg0, z119, 13, 0, 0) + CH03(arg0, z119, 13, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z119, 1, 0, 0, Local2, 990) + err(arg0, z119, __LINE__, 0, 0, Local2, 990) } } @@ -24070,19 +24070,19 @@ Method(m61a,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z119, 14, 0, 0) + CH03(arg0, z119, 14, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(m604(2, 3, 6, 1))) */ - CH03(arg0, z119, 15, 0, 0) + CH03(arg0, z119, 15, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } } @@ -24092,17 +24092,17 @@ Method(m61a,, Serialized) { Event(EVT0) - CH03(arg0, z119, 16, 0, 0) + CH03(arg0, z119, 16, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, Derefof(m604(2, 3, 6, 1))) - CH03(arg0, z119, 17, 0, 0) + CH03(arg0, z119, 17, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl index 7eacf1d..6a4cad5 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl @@ -11817,16 +11817,16 @@ Method(m619,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z118, 0, 0, 0) + CH03(arg0, z118, 0, __LINE__, 0) Store(Index(m601(2, 6), m604(0, 2, 20, 0)), Local3) - CH04(arg0, 0, 85, z118, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), m604(0, 2, 20, 0)), Local3) - CH04(arg0, 0, 85, z118, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), m604(0, 2, 20, 0)), Local3) - CH04(arg0, 0, 85, z118, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11885,16 +11885,16 @@ Method(m619,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z118, 0, 0, 0) + CH03(arg0, z118, 0, __LINE__, 0) Index(m601(2, 6), m604(0, 2, 20, 0), Local0) - CH04(arg0, 0, 85, z118, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), m604(0, 2, 20, 0), Local0) - CH04(arg0, 0, 85, z118, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), m604(0, 2, 20, 0), Local0) - CH04(arg0, 0, 85, z118, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -11975,14 +11975,14 @@ Method(m619,, Serialized) // (it can only be checked an exception does not occur) Method(m02e, 1) { - CH03(arg0, z118, 0, 0, 0) + CH03(arg0, z118, 0, __LINE__, 0) Fatal(0xff, 0xffffffff, m604(0, 2, 1, 0)) if (F64) { Fatal(0xff, 0xffffffff, m604(0, 2, 5, 0)) } else { Fatal(0xff, 0xffffffff, m604(0, 2, 4, 0)) } - CH03(arg0, z118, 1, 0, 0) + CH03(arg0, z118, 1, __LINE__, 0) } // String to Integer conversion of the String Index and Length @@ -12610,19 +12610,19 @@ Method(m619,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m031, 1) { - CH03(arg0, z118, 2, 0, 0) + CH03(arg0, z118, 2, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(m604(0, 2, 1, 0)) - CH03(arg0, z118, 3, 0, 0) + CH03(arg0, z118, 3, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12630,12 +12630,12 @@ Method(m619,, Serialized) Store(Timer, Local0) Stall(m604(0, 2, 27, 0)) - CH03(arg0, z118, 4, 0, 0) + CH03(arg0, z118, 4, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z118, 1, 0, 0, Local2, 990) + err(arg0, z118, __LINE__, 0, 0, Local2, 990) } } @@ -12646,19 +12646,19 @@ Method(m619,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z118, 5, 0, 0) + CH03(arg0, z118, 5, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, m604(0, 2, 1, 0)) */ - CH03(arg0, z118, 6, 0, 0) + CH03(arg0, z118, 6, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } } @@ -12668,17 +12668,17 @@ Method(m619,, Serialized) { Event(EVT0) - CH03(arg0, z118, 7, 0, 0) + CH03(arg0, z118, 7, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, m604(0, 2, 1, 0)) - CH03(arg0, z118, 8, 0, 0) + CH03(arg0, z118, 8, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } } @@ -23238,16 +23238,16 @@ Method(m619,, Serialized) m600(arg0, 11, Derefof(Local0), bi11) } else { - CH03(arg0, z118, 0, 0, 0) + CH03(arg0, z118, 0, __LINE__, 0) Store(Index(m601(2, 6), m604(0, 3, 14, 0)), Local3) - CH04(arg0, 0, 85, z118, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(3, 6), m604(0, 3, 14, 0)), Local3) - CH04(arg0, 0, 85, z118, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Store(Index(m601(4, 0), m604(0, 3, 14, 0)), Local3) - CH04(arg0, 0, 85, z118, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23306,16 +23306,16 @@ Method(m619,, Serialized) m600(arg0, 26, Derefof(Local0), bi11) } else { - CH03(arg0, z118, 0, 0, 0) + CH03(arg0, z118, 0, __LINE__, 0) Index(m601(2, 6), m604(0, 3, 14, 0), Local0) - CH04(arg0, 0, 85, z118, 24, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(3, 6), m604(0, 3, 14, 0), Local0) - CH04(arg0, 0, 85, z118, 25, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED Index(m601(4, 0), m604(0, 3, 14, 0), Local0) - CH04(arg0, 0, 85, z118, 26, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(arg0, 0, 85, z118, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Method returns Reference @@ -23396,14 +23396,14 @@ Method(m619,, Serialized) // (it can only be checked an exception does not occur) Method(m068, 1) { - CH03(arg0, z118, 9, 0, 0) + CH03(arg0, z118, 9, __LINE__, 0) Fatal(0xff, 0xffffffff, m604(0, 3, 6, 0)) if (F64) { Fatal(0xff, 0xffffffff, m604(0, 3, 10, 0)) } else { Fatal(0xff, 0xffffffff, m604(0, 3, 10, 0)) } - CH03(arg0, z118, 10, 0, 0) + CH03(arg0, z118, 10, __LINE__, 0) } // Buffer to Integer conversion of the Buffer Index and Length @@ -24031,19 +24031,19 @@ Method(m619,, Serialized) // of the Method execution control operators (Sleep, Stall) Method(m06b, 1) { - CH03(arg0, z118, 11, 0, 0) + CH03(arg0, z118, 11, __LINE__, 0) // Sleep Store(Timer, Local0) Sleep(m604(0, 3, 6, 0)) - CH03(arg0, z118, 12, 0, 0) + CH03(arg0, z118, 12, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24051,12 +24051,12 @@ Method(m619,, Serialized) Store(Timer, Local0) Stall(m604(0, 3, 19, 0)) - CH03(arg0, z118, 13, 0, 0) + CH03(arg0, z118, 13, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z118, 1, 0, 0, Local2, 990) + err(arg0, z118, __LINE__, 0, 0, Local2, 990) } } @@ -24068,19 +24068,19 @@ Method(m619,, Serialized) Mutex(MTX0, 0) Acquire(MTX0, 0) - CH03(arg0, z118, 14, 0, 0) + CH03(arg0, z118, 14, __LINE__, 0) Store(Timer, Local0) /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, m604(0, 3, 6, 0)) */ - CH03(arg0, z118, 15, 0, 0) + CH03(arg0, z118, 15, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } } @@ -24090,17 +24090,17 @@ Method(m619,, Serialized) { Event(EVT0) - CH03(arg0, z118, 16, 0, 0) + CH03(arg0, z118, 16, __LINE__, 0) Store(Timer, Local0) Wait(EVT0, m604(0, 3, 6, 0)) - CH03(arg0, z118, 17, 0, 0) + CH03(arg0, z118, 17, __LINE__, 0) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl index c863ab7..10647c9 100644 --- a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl +++ b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl @@ -48,10 +48,10 @@ Method(m130, 1, Serialized) Store(ToString(B000, Local0), Local2) if (LNotequal(Local0, 0)) { - err(arg0, z055, 0, 0, 0, Local0, 0) + err(arg0, z055, __LINE__, 0, 0, Local0, 0) } - CH03(arg0, z055, 1, 0, 0) + CH03(arg0, z055, 1, __LINE__, 0) } // Store-like actions affect the source objects passed as parameter @@ -69,10 +69,10 @@ Method(m132, 1) Store(10, Local0) m131(Local0) if (LNotEqual(Local0, 10)){ - err(arg0, z055, 2, 0, 0, Local0, 10) + err(arg0, z055, __LINE__, 0, 0, Local0, 10) } - CH03(arg0, z055, 3, 0, 0) + CH03(arg0, z055, 3, __LINE__, 0) } // Operator doesn't update the source object passed to method as a REFERENCE @@ -83,10 +83,10 @@ Method(m133, 1) Store(RefOf(Local0), Local1) m131(Local1) if (LNotEqual(Local0, 9)){ - err(arg0, z055, 4, 0, 0, Local0, 9) + err(arg0, z055, __LINE__, 0, 0, Local0, 9) } - CH03(arg0, z055, 5, 0, 0) + CH03(arg0, z055, 5, __LINE__, 0) } Method(m134, 1) @@ -94,10 +94,10 @@ Method(m134, 1) Store(10, Local0) m131(RefOf(Local0)) if (LNotEqual(Local0, 9)){ - err(arg0, z055, 6, 0, 0, Local0, 9) + err(arg0, z055, __LINE__, 0, 0, Local0, 9) } - CH03(arg0, z055, 7, 0, 0) + CH03(arg0, z055, 7, __LINE__, 0) } Method(m135, 1) @@ -110,10 +110,10 @@ Method(m136, 1) Store(10, Local0) m135(RefOf(Local0)) if (LNotEqual(Local0, 5)){ - err(arg0, z055, 8, 0, 0, Local0, 5) + err(arg0, z055, __LINE__, 0, 0, Local0, 5) } - CH03(arg0, z055, 9, 0, 0) + CH03(arg0, z055, 9, __LINE__, 0) } // Run-method diff --git a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl index ef8d2cd..62c3f54 100644 --- a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl +++ b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl @@ -325,11 +325,11 @@ Method(m680, 5) Store(ObjectType(arg3), Local0) Store(ObjectType(arg4), Local1) if (LNotEqual(Local0, Local1)) { - err(Concatenate(arg0, "-OType"), z122, arg1, arg2, 0, Local0, Local1) + err(Concatenate(arg0, "-OType"), z122, __LINE__, arg2, 0, Local0, Local1) Return (1) } elseif (Derefof(Index(b679, Local0))) { if (LNotEqual(arg3, arg4)) { - err(arg0, z122, arg1, arg2, 0, arg3, arg4) + err(arg0, z122, __LINE__, arg2, 0, arg3, arg4) Return (1) } } @@ -620,7 +620,7 @@ if (y361) { // Check exceptions Method(m003, 1) { - if (CH03(arg0, z122, 1, arg0, 0)) { + if (CH03(arg0, z122, 1, __LINE__, 0)) { if (STCS) { if (LLess(IND2, INDM)) { Store(arg0, Index(PAC2, IND2)) @@ -634,7 +634,7 @@ if (y361) { Method(m004, 3) { if (LNotEqual(arg0, arg1)) { - err(arg0, z122, 2, 0, 0, arg0, arg1) + err(arg0, z122, __LINE__, 0, 0, arg0, arg1) if (STCS) {m000(3, 0x100, arg2, arg1)} } } @@ -1103,11 +1103,11 @@ if (y361) { } Default { // Unexpected Target Type - err(Concatenate(arg0, terr), z122, 4, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg1, 0) Return (1) } } - if (CH03(arg0, z122, 5, arg1, 0)) { + if (CH03(arg0, z122, 5, __LINE__, 0)) { //Exception during preparing of Target Object Return (1) } @@ -1120,7 +1120,7 @@ if (y361) { Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Target can not be set up - err(arg0, z122, 6, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -1209,11 +1209,11 @@ if (y361) { } Default { // Unexpected Source Type - err(Concatenate(arg0, terr), z122, 7, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg1, 0) Return (1) } } - if (CH03(arg0, z122, 8, arg1, 0)) { + if (CH03(arg0, z122, 8, __LINE__, 0)) { // Exception during preparing of Source Object Return (1) } @@ -1226,7 +1226,7 @@ if (y361) { Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source can not be set up - err(arg0, z122, 9, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -1245,7 +1245,7 @@ if (y361) { // Check that it can be used as reference Store(Derefof(arg2), Local0) Store(Derefof(Local0) ,Local3) - if (CH03(arg0, z122, 10, arg1, Local0)) { + if (CH03(arg0, z122, 10, __LINE__, Local0)) { // Derefof caused unexpected exception Return (1) } @@ -1255,7 +1255,7 @@ if (y361) { Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source object is corrupted - err(arg0, z122, 11, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -1321,14 +1321,14 @@ if (y361) { } Default { // Unexpected Result Type - err(arg0, z122, 12, 0, 0, arg1, 0) + err(arg0, z122, __LINE__, 0, 0, arg1, 0) Return (1) } } if (LNotEqual(Local0, arg1)) { // Mismatch of Source Type against specified Result Type - err(arg0, z122, 13, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) if (STCS) {m000(3, 0x1000000, Local0, arg1)} @@ -1338,31 +1338,31 @@ if (y361) { Switch(ToInteger(arg1)) { Case(1) { if (LNotEqual(INT0, Derefof(arg3))) { - err(arg0, z122, 14, 0, 0, INT0, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, INT0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), INT0)) { - err(arg0, z122, 15, 0, 0, Derefof(arg2), INT0) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), INT0) Return (1) } } Case(2) { if (LNotEqual(STR0, Derefof(arg3))) { - err(arg0, z122, 16, 0, 0, STR0, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, STR0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), STR0)) { - err(arg0, z122, 17, 0, 0, Derefof(arg2), STR0) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), STR0) Return (1) } } Case(3) { if (LNotEqual(BUF0, Derefof(arg3))) { - err(arg0, z122, 18, 0, 0, BUF0, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, BUF0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), BUF0)) { - err(arg0, z122, 19, 0, 0, Derefof(arg2), BUF0) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), BUF0) Return (1) } } @@ -1370,7 +1370,7 @@ if (y361) { Store(Sizeof(PAC0), Local0) if (LNotEqual(Sizeof(arg3), Local0)) { - err(arg0, z122, 20, 0, 0, Sizeof(arg3), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg3), Local0) Return (1) } While (Local0) { @@ -1379,7 +1379,7 @@ if (y361) { Store(ObjectType(Derefof(Index(PAC0, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 21, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -1387,7 +1387,7 @@ if (y361) { Derefof(Index(Derefof(arg3), Local0)), Derefof(Index(PAC0, Local0)))) { // The value is corrupted - err(arg0, z122, 22, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) Return (1) } } @@ -1395,7 +1395,7 @@ if (y361) { Store(Sizeof(PAC0), Local0) if (LNotEqual(Sizeof(arg2), Local0)) { - err(arg0, z122, 23, 0, 0, Sizeof(arg2), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg2), Local0) Return (1) } While (Local0) { @@ -1404,7 +1404,7 @@ if (y361) { Store(ObjectType(Derefof(Index(PAC0, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 24, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -1412,7 +1412,7 @@ if (y361) { Derefof(Index(Derefof(arg2), Local0)), Derefof(Index(PAC0, Local0)))) { // The value is corrupted - err(arg0, z122, 25, 0, 0, Derefof(Index(Derefof(arg2), Local0)), Local0) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg2), Local0)), Local0) Return (1) } } @@ -1422,29 +1422,29 @@ if (y361) { Store(Derefof(Index(Derefof(arg3), 0)), Local0) if (LEqual(Local0, 0)) { if (LNotEqual(FLU0, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 26, 0, 0, FLU0, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, FLU0, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), FLU0)) { - err(arg0, z122, 27, 0, 0, Derefof(arg2), FLU0) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), FLU0) Return (1) } } elseif (LEqual(Local0, 1)) { if (LNotEqual(FLU2, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 28, 0, 0, FLU2, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, FLU2, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), FLU2)) { - err(arg0, z122, 29, 0, 0, Derefof(arg2), FLU2) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), FLU2) Return (1) } } else { if (LNotEqual(FLU4, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 30, 0, 0, FLU4, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, FLU4, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), FLU4)) { - err(arg0, z122, 31, 0, 0, Derefof(arg2), FLU4) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), FLU4) Return (1) } } @@ -1452,7 +1452,7 @@ if (y361) { Case(8) { CopyObject(Derefof(arg2), MMM2) if (LNotEqual(MMM2, MMM0)) { - err(arg0, z122, 32, 0, 0, MMM2, MMM0) + err(arg0, z122, __LINE__, 0, 0, MMM2, MMM0) Return (1) } } @@ -1460,29 +1460,29 @@ if (y361) { Store(Derefof(Index(Derefof(arg3), 0)), Local0) if (LEqual(Local0, 0)) { if (LNotEqual(BFL0, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 33, 0, 0, BFL0, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, BFL0, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), BFL0)) { - err(arg0, z122, 34, 0, 0, Derefof(arg2), BFL0) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), BFL0) Return (1) } } elseif (LEqual(Local0, 1)) { if (LNotEqual(BFL2, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 35, 0, 0, BFL2, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, BFL2, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), BFL2)) { - err(arg0, z122, 36, 0, 0, Derefof(arg2), BFL2) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), BFL2) Return (1) } } else { if (LNotEqual(BFL4, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 37, 0, 0, BFL4, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, BFL4, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), BFL4)) { - err(arg0, z122, 38, 0, 0, Derefof(arg2), BFL4) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), BFL4) Return (1) } } @@ -1512,10 +1512,10 @@ if (y361) { if (LEqual(arg2, c016)) { if (X170) { //this sentence is for m00d and invalid, removed. - //err(arg0, z122, 39, 0, 0, Local2, arg2) + //err(arg0, z122, __LINE__, 0, 0, Local2, arg2) } } else { - err(arg0, z122, 39, 0, 0, Local2, arg2) + err(arg0, z122, __LINE__, 0, 0, Local2, arg2) } if (STCS) {m000(3, 0x100, arg2, Local2)} @@ -1532,18 +1532,18 @@ if (y361) { // Check that Target can be used as reference Store(Derefof(arg1), Local0) Store(Derefof(Local0), Local3) - if (CH03(arg0, z122, 40, Local2, arg3)) { + if (CH03(arg0, z122, 40, __LINE__, arg3)) { // Derefof caused unexpected exception Return (1) } } elseif (LNotEqual(m684(arg3), 1)) { // Types mismatch Result/Target on storing - err(arg0, z122, 41, 0, 0, Local2, arg3) + err(arg0, z122, __LINE__, 0, 0, Local2, arg3) Return (1) } elseif (LNotEqual(Local2, 3)) { // Types mismatch Result/Target on storing // Test fixed type Objects are converted to Buffer - err(arg0, z122, 42, 0, 0, Local2, 3) + err(arg0, z122, __LINE__, 0, 0, Local2, 3) Return (1) } if (STCS) {m000(3, 0x100, arg3, Local2)} @@ -1576,18 +1576,18 @@ if (y361) { if (LEqual(arg3, 8)) { // Method CopyObject(Derefof(arg1), MMM2) if (LNotEqual(MMM2, Local7)) { - err(arg0, z122, 43, 0, 0, MMM2, Local7) + err(arg0, z122, __LINE__, 0, 0, MMM2, Local7) Return (1) } } elseif (LNotEqual(arg3, 4)) { // Not Package if (LNotEqual(Derefof(arg1), Local7)) { - err(arg0, z122, 44, 0, 0, Derefof(arg1), Local7) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg1), Local7) Return (1) } } else { // Package Store(Sizeof(Local7), Local0) if (LNotEqual(Sizeof(arg1), Local0)) { - err(arg0, z122, 45, 0, 0, Sizeof(arg1), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg1), Local0) Return (1) } While (Local0) { @@ -1596,7 +1596,7 @@ if (y361) { Store(ObjectType(Derefof(Index(Local7, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 46, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -1604,7 +1604,7 @@ if (y361) { Derefof(Index(Derefof(arg1), Local0)), Derefof(Index(Local7, Local0)))) { // The value is corrupted - err(arg0, z122, 47, 0, 0, Derefof(Index(Derefof(arg1), Local0)), Derefof(Index(Local7, Local0))) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg1), Local0)), Derefof(Index(Local7, Local0))) Return (1) } } @@ -1634,7 +1634,7 @@ if (y361) { Store(Not(Local4), Derefof(Local3)) } else { Store(Ones, Derefof(Local3)) - if (CH03(arg0, z122, 48, Local1, arg1)) { + if (CH03(arg0, z122, 48, __LINE__, arg1)) { // Store caused unexpected exception Return (1) } @@ -1648,7 +1648,7 @@ if (y361) { Store(Not(Local4), Derefof(Local3)) } else { Store(Ones, Derefof(Local3)) - if (CH03(arg0, z122, 49, Local1, arg1)) { + if (CH03(arg0, z122, 49, __LINE__, arg1)) { // Store caused unexpected exception Return (1) } @@ -1668,7 +1668,7 @@ if (y361) { Store(Not(ToInteger(Derefof(arg1))), arg1) } - if (CH03(arg0, z122, 50, Local0, arg1)) { + if (CH03(arg0, z122, 50, __LINE__, arg1)) { // Update caused unexpected exception Return (1) } @@ -1742,7 +1742,7 @@ if (y361) { } if (m004(Concatenate(arg0, "-m004"), arg3, Local6, Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 51, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -1759,11 +1759,11 @@ if (y361) { } if (m003(Concatenate(arg0, "-m003"), arg2, Local1, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 52, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } - if (CH03(arg0, z122, 53, arg3, arg2)) { + if (CH03(arg0, z122, 53, __LINE__, arg2)) { // Unexpected exception during preparation Return (1) } @@ -1817,7 +1817,7 @@ if (y361) { } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 54, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg2, 14)) { // Buffer Field Target @@ -1867,7 +1867,7 @@ if (y361) { } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 55, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -1919,7 +1919,7 @@ if (y361) { } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 56, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -1931,7 +1931,7 @@ if (y361) { if (STCS) {m000(2, 0x100, arg2, arg3)} } } else { - CH03(arg0, z122, 57, arg3, arg2) + CH03(arg0, z122, 57, __LINE__, arg2) } } else { if (LNot(CH06(arg0, 57, 0xff))) { @@ -1940,7 +1940,7 @@ if (y361) { } // No further test if exception is expected Return (0) - } elseif (CH03(arg0, z122, 58, arg3, arg2)) { + } elseif (CH03(arg0, z122, 58, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -2102,7 +2102,7 @@ if (y361) { } if (m004(Concatenate(arg0, "-m004"), arg3, Local6, Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 59, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -2110,11 +2110,11 @@ if (y361) { Store(Index(Derefof(Index(arg6, 3)), arg2), Local7) if (m003(Concatenate(arg0, "-m003"), arg2, Refof(Local4), Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 60, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } - if (CH03(arg0, z122, 61, arg3, arg2)) { + if (CH03(arg0, z122, 61, __LINE__, arg2)) { // Unexpected exception during preparation Return (1) } @@ -2167,7 +2167,7 @@ if (y361) { } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 62, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2176,7 +2176,7 @@ if (y361) { if (LNot(CH06(arg0, 15, 0xff))) { if (STCS) {m000(2, 0x100, arg2, arg3)} } - } elseif (CH03(arg0, z122, 63, arg3, arg2)) { + } elseif (CH03(arg0, z122, 63, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -2254,7 +2254,7 @@ if (y361) { Store(Index(arg6, 2), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(Local1), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 64, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -2271,11 +2271,11 @@ if (y361) { } if (m003(Concatenate(arg0, "-m003"), arg2, Local4, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 65, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } - if (CH03(arg0, z122, 66, arg3, arg2)) { + if (CH03(arg0, z122, 66, __LINE__, arg2)) { // Unexpected exception during preparation Return (1) } @@ -2288,7 +2288,7 @@ if (y361) { CopyObject(Local1, FLU1) } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 67, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg2, 14)) { // Buffer Field Target @@ -2298,7 +2298,7 @@ if (y361) { CopyObject(Local1, BFL1) } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 68, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2310,7 +2310,7 @@ if (y361) { } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 69, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2322,7 +2322,7 @@ if (y361) { if (STCS) {m000(2, 0x100, arg2, arg3)} } } else { - CH03(arg0, z122, 70, arg3, arg2) + CH03(arg0, z122, 70, __LINE__, arg2) } } else { if (LNot(CH06(arg0, 70, 0xff))) { @@ -2331,7 +2331,7 @@ if (y361) { } // No further test if exception is expected Return (0) - } elseif (CH03(arg0, z122, 71, arg3, arg2)) { + } elseif (CH03(arg0, z122, 71, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -2450,7 +2450,7 @@ if (y361) { Store(Index(arg6, 2), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(Local1), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 72, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -2458,11 +2458,11 @@ if (y361) { Store(Index(Derefof(Index(arg6, 3)), arg2), Local7) if (m003(Concatenate(arg0, "-m003"), arg2, Refof(Local4), Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 73, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } - if (CH03(arg0, z122, 74, arg3, arg2)) { + if (CH03(arg0, z122, 74, __LINE__, arg2)) { // Unexpected exception during preparation Return (1) } @@ -2474,7 +2474,7 @@ if (y361) { CopyObject(Local1, Local4) } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 75, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2483,7 +2483,7 @@ if (y361) { if (LNot(CH06(arg0, 15, 0xff))) { if (STCS) {m000(2, 0x100, arg2, arg3)} } - } elseif (CH03(arg0, z122, 76, arg3, arg2)) { + } elseif (CH03(arg0, z122, 76, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -2601,13 +2601,13 @@ if (y361) { } if (m004(Concatenate(arg0, "-m004"), arg3, Local6, Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 77, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } Store(Refof(ARG1), Local1) - if (CH03(arg0, z122, 78, arg3, arg2)) { + if (CH03(arg0, z122, 78, __LINE__, arg2)) { // Unexpected exception during preparation Return (1) } @@ -2662,7 +2662,7 @@ if (y361) { } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 79, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2676,14 +2676,14 @@ if (y361) { if (STCS) {m000(2, 0x100, arg2, arg3)} } } else { - CH03(arg0, z122, 80, arg3, arg2) + CH03(arg0, z122, 80, __LINE__, arg2) } } else { if (LNot(CH06(arg0, 80, 0xff))) { if (STCS) {m000(2, 0x100, arg2, arg3)} } } - } elseif (CH03(arg0, z122, 81, arg3, arg2)) { + } elseif (CH03(arg0, z122, 81, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -2763,11 +2763,11 @@ if (y361) { } if (m003(Concatenate(arg0, "-m003"), arg2, Local1, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 82, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } - if (CH03(arg0, z122, 83, arg3, arg2)) { + if (CH03(arg0, z122, 83, __LINE__, arg2)) { // Unexpected exception during preparation Return (1) } @@ -2858,11 +2858,11 @@ if (y361) { } if (m004(Concatenate(arg0, "-m004"), arg3, Local6, Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 84, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } - if (CH03(arg0, z122, 85, arg3, arg2)) { + if (CH03(arg0, z122, 85, __LINE__, arg2)) { // Unexpected exception during preparation Return (1) } @@ -2917,7 +2917,7 @@ if (y361) { } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 86, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2929,14 +2929,14 @@ if (y361) { if (STCS) {m000(2, 0x100, arg2, arg3)} } } else { - CH03(arg0, z122, 87, arg3, arg2) + CH03(arg0, z122, 87, __LINE__, arg2) } } else { if (LNot(CH06(arg0, 87, 0xff))) { if (STCS) {m000(2, 0x100, arg2, arg3)} } } - } elseif (CH03(arg0, z122, 88, arg3, arg2)) { + } elseif (CH03(arg0, z122, 88, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -3021,11 +3021,11 @@ if (y361) { } if (m003(Concatenate(arg0, "-m003"), arg2, Local1, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 89, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } - if (CH03(arg0, z122, 90, arg3, arg2)) { + if (CH03(arg0, z122, 90, __LINE__, arg2)) { // Unexpected exception during preparation Return (1) } @@ -3059,7 +3059,7 @@ if (y361) { Store(Index(arg6, 2), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(Local1), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 91, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -3068,11 +3068,11 @@ if (y361) { Store(Index(Derefof(Index(arg6, 3)), arg2), Local7) if (m013(Concatenate(arg0, "-m003"), arg2, DST0, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 92, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } - if (CH03(arg0, z122, 93, arg3, arg2)) { + if (CH03(arg0, z122, 93, __LINE__, arg2)) { // Unexpected exception during preparation Return (1) } @@ -3080,7 +3080,7 @@ if (y361) { // Check Target Object to have the initial type and value if (m015(Concatenate(arg0, "-m015"), arg2, Local4, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 94, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -3091,7 +3091,7 @@ if (y361) { // CopyObject(Local1, Index(DST0, 0)) } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 95, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -3100,7 +3100,7 @@ if (y361) { if (LNot(CH06(arg0, 96, 0xff))) { if (STCS) {m000(2, 0x100, arg2, arg3)} } - } elseif (CH03(arg0, z122, 97, arg3, arg2)) { + } elseif (CH03(arg0, z122, 97, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -3193,11 +3193,11 @@ if (y361) { } Default { // Unexpected Target Type - err(Concatenate(arg0, terr), z122, 98, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg1, 0) Return (1) } } - if (CH03(arg0, z122, 99, arg1, 0)) { + if (CH03(arg0, z122, 99, __LINE__, 0)) { //Exception during preparing of Target Object Return (1) } @@ -3210,7 +3210,7 @@ if (y361) { Store(ObjectType(Index(arg2, 0)), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Target can not be set up - err(arg0, z122, 100, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -3229,7 +3229,7 @@ if (y361) { // Check that it can be used as reference Store(Derefof(arg2), Local0) Store(Derefof(Local0), Local3) - if (CH03(arg0, z122, 101, arg1, Local0)) { + if (CH03(arg0, z122, 101, __LINE__, Local0)) { // Derefof caused unexpected exception Return (1) } @@ -3237,7 +3237,7 @@ if (y361) { Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Target object is corrupted - err(arg0, z122, 102, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) Return (1) } } @@ -3291,7 +3291,7 @@ if (y361) { Case(17) { //Store(Derefof(REF1), Local3) Store (REF1, Local3) - if (CH03(arg0, z122, 103, arg1, Local0)) { + if (CH03(arg0, z122, 103, __LINE__, Local0)) { // Derefof caused unexpected exception Return (1) } @@ -3299,14 +3299,14 @@ if (y361) { } Default { // Unexpected Result Type - err(arg0, z122, 104, 0, 0, arg1, 0) + err(arg0, z122, __LINE__, 0, 0, arg1, 0) Return (1) } } if (LNotEqual(Local0, arg1)) { // Mismatch of Target Type against the specified one - err(arg0, z122, 105, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) if (STCS) {m000(3, 0x1000000, Local0, arg1)} @@ -3316,31 +3316,31 @@ if (y361) { Switch(ToInteger(arg1)) { Case(1) { if (LNotEqual(INT1, Derefof(arg3))) { - err(arg0, z122, 106, 0, 0, INT1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, INT1, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), INT1)) { - err(arg0, z122, 107, 0, 0, Derefof(arg2), INT1) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), INT1) Return (1) } } Case(2) { if (LNotEqual(STR1, Derefof(arg3))) { - err(arg0, z122, 108, 0, 0, STR1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, STR1, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), STR1)) { - err(arg0, z122, 109, 0, 0, Derefof(arg2), STR1) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), STR1) Return (1) } } Case(3) { if (LNotEqual(BUF1, Derefof(arg3))) { - err(arg0, z122, 110, 0, 0, BUF1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, BUF1, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), BUF1)) { - err(arg0, z122, 111, 0, 0, Derefof(arg2), BUF1) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), BUF1) Return (1) } } @@ -3348,7 +3348,7 @@ if (y361) { Store(Sizeof(PAC1), Local0) if (LNotEqual(Sizeof(arg3), Local0)) { - err(arg0, z122, 112, 0, 0, Sizeof(arg3), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg3), Local0) Return (1) } While (Local0) { @@ -3357,7 +3357,7 @@ if (y361) { Store(ObjectType(Derefof(Index(PAC1, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 113, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -3365,7 +3365,7 @@ if (y361) { Derefof(Index(Derefof(arg3), Local0)), Derefof(Index(PAC1, Local0)))) { // The value is corrupted - err(arg0, z122, 114, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) Return (1) } } @@ -3373,7 +3373,7 @@ if (y361) { Store(Sizeof(PAC1), Local0) if (LNotEqual(Sizeof(arg2), Local0)) { - err(arg0, z122, 115, 0, 0, Sizeof(arg2), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg2), Local0) Return (1) } While (Local0) { @@ -3382,7 +3382,7 @@ if (y361) { Store(ObjectType(Derefof(Index(PAC1, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 116, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -3390,7 +3390,7 @@ if (y361) { Derefof(Index(Derefof(arg2), Local0)), Derefof(Index(PAC1, Local0)))) { // The value is corrupted - err(arg0, z122, 117, 0, 0, Derefof(Index(Derefof(arg2), Local0)), Local0) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg2), Local0)), Local0) Return (1) } } @@ -3398,20 +3398,20 @@ if (y361) { } Case(5) { if (LNotEqual(Derefof(arg2), Derefof(arg3))) { - err(arg0, z122, 118, 0, 0, Derefof(arg2), Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), Derefof(arg3)) Return (1) } } Case(8) { CopyObject(Derefof(arg2), MMM2) if (LNotEqual(MMM2, MMM1)) { - err(arg0, z122, 119, 0, 0, MMM2, MMM1) + err(arg0, z122, __LINE__, 0, 0, MMM2, MMM1) Return (1) } } Case(14) { if (LNotEqual(Derefof(arg2), Derefof(arg3))) { - err(arg0, z122, 120, 0, 0, Derefof(arg2), Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), Derefof(arg3)) Return (1) } } @@ -3474,7 +3474,7 @@ if (y361) { Case(17) { //Store(Derefof(REF1), Local3) Store(REF1, Local3) - if (CH03(arg0, z122, 121, arg1, 0)) { + if (CH03(arg0, z122, 121, __LINE__, 0)) { // Derefof caused unexpected exception Return (1) } @@ -3482,14 +3482,14 @@ if (y361) { } Default { // Unexpected Result Type - err(arg0, z122, 122, 0, 0, arg1, 0) + err(arg0, z122, __LINE__, 0, 0, arg1, 0) Return (1) } } if (LNotEqual(Local0, arg1)) { // Mismatch of Target Type against the specified one - err(arg0, z122, 123, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) if (STCS) {m000(3, 0x1000000, Local0, arg1)} @@ -3499,19 +3499,19 @@ if (y361) { Switch(ToInteger(arg1)) { Case(1) { if (LNotEqual(INT1, Derefof(arg3))) { - err(arg0, z122, 124, 0, 0, INT1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, INT1, Derefof(arg3)) Return (1) } } Case(2) { if (LNotEqual(STR1, Derefof(arg3))) { - err(arg0, z122, 125, 0, 0, STR1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, STR1, Derefof(arg3)) Return (1) } } Case(3) { if (LNotEqual(BUF1, Derefof(arg3))) { - err(arg0, z122, 126, 0, 0, BUF1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, BUF1, Derefof(arg3)) Return (1) } } @@ -3519,7 +3519,7 @@ if (y361) { Store(Sizeof(PAC1), Local0) if (LNotEqual(Sizeof(arg3), Local0)) { - err(arg0, z122, 127, 0, 0, Sizeof(arg3), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg3), Local0) Return (1) } While (Local0) { @@ -3528,7 +3528,7 @@ if (y361) { Store(ObjectType(Derefof(Index(PAC1, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 128, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -3536,7 +3536,7 @@ if (y361) { Derefof(Index(Derefof(arg3), Local0)), Derefof(Index(PAC1, Local0)))) { // The value is corrupted - err(arg0, z122, 129, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) Return (1) } } @@ -3567,7 +3567,7 @@ if (y361) { Store(Not(Local4), Derefof(Local3)) } else { Store(Ones, Derefof(Local3)) - if (CH03(arg0, z122, 130, Local1, Index(arg1, 0))) { + if (CH03(arg0, z122, 130, __LINE__, Index(arg1, 0))) { // Store caused unexpected exception Return (1) } @@ -3581,7 +3581,7 @@ if (y361) { Store(Not(Local4), Derefof(Local3)) } else { Store(Ones, Derefof(Local3)) - if (CH03(arg0, z122, 131, Local1, Index(arg1, 0))) { + if (CH03(arg0, z122, 131, __LINE__, Index(arg1, 0))) { // Store caused unexpected exception Return (1) } @@ -3601,7 +3601,7 @@ if (y361) { Store(Not(ToInteger(Derefof(Index(arg1, 0)))), Index(arg1, 0)) } - if (CH03(arg0, z122, 132, Local0, Index(arg1, 0))) { + if (CH03(arg0, z122, 132, __LINE__, Index(arg1, 0))) { // Update caused unexpected exception Return (1) } @@ -4340,13 +4340,13 @@ if (y361) { if (LGreater(arg1, 1)) { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 133, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg1, 0) Return (1) } if (LGreater(arg5, 6)) { // Unexpected Kind of Source-Target pair - err(Concatenate(arg0, terr), z122, 134, 0, 0, arg5, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg5, 0) Return (1) } @@ -4397,7 +4397,7 @@ if (y361) { Store(Derefof(Index(Local2, 0)), Local3) if (LNotEqual(Local3, lpC1)) { // Unexpected data package - err(Concatenate(arg0, terr), z122, 135, 0, 0, arg1, lpC1) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg1, lpC1) Return (1) } Store(Derefof(Index(Local2, 1)), Local3) diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl index 57847c2..8272684 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl @@ -256,7 +256,7 @@ Method(m693, 5, Serialized) CopyObject(Derefof(arg3), BUF1) Store(Sizeof(BUF1), Local0) if (LNotEqual(Local0, 17)) { - err(Concatenate(arg0, terr), z126, 1, 0, 0, Local0, 17) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, Local0, 17) Return (1) } CopyObject(BUF1, arg2) @@ -304,11 +304,11 @@ Method(m693, 5, Serialized) } Default { // Unexpected Target Type - err(Concatenate(arg0, terr), z126, 2, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg1, 0) Return (1) } } - if (CH03(arg0, z126, 3, arg1, 0)) { + if (CH03(arg0, z126, 3, __LINE__, 0)) { //Exception during preparing of Target Object Return (1) } @@ -316,7 +316,7 @@ Method(m693, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Target can not be set up - err(arg0, z126, 4, 0, 0, Local0, arg1) + err(arg0, z126, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -345,11 +345,11 @@ Method(m693, 5, Serialized) } Default { // Unexpected Source Type - err(Concatenate(arg0, terr), z126, 5, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg1, 0) Return (1) } } - if (CH03(arg0, z126, 6, arg1, 0)) { + if (CH03(arg0, z126, 6, __LINE__, 0)) { // Exception during preparing of Source Object Return (1) } @@ -357,7 +357,7 @@ Method(m693, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source can not be set up - err(arg0, z126, 7, 0, 0, Local0, arg1) + err(arg0, z126, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -372,7 +372,7 @@ Method(m693, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source object is corrupted - err(arg0, z126, 8, 0, 0, Local0, arg1) + err(arg0, z126, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -388,14 +388,14 @@ Method(m693, 5, Serialized) } Default { // Unexpected Result Type - err(arg0, z126, 9, 0, 0, arg1, 0) + err(arg0, z126, __LINE__, 0, 0, arg1, 0) Return (1) } } if (LNotEqual(Local0, arg1)) { // Mismatch of Source Type against specified one - err(arg0, z126, 10, 0, 0, Local0, arg1) + err(arg0, z126, __LINE__, 0, 0, Local0, arg1) if (STCS) {m000(3, 0x1000000, Local0, arg0)} Return (1) } else { @@ -403,31 +403,31 @@ Method(m693, 5, Serialized) Switch(ToInteger(arg1)) { Case(1) { if (LNotEqual(INT0, Derefof(arg3))) { - err(arg0, z126, 11, 0, 0, INT0, Derefof(arg3)) + err(arg0, z126, __LINE__, 0, 0, INT0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), INT0)) { - err(arg0, z126, 12, 0, 0, Derefof(arg2), INT0) + err(arg0, z126, __LINE__, 0, 0, Derefof(arg2), INT0) Return (1) } } Case(2) { if (LNotEqual(STR0, Derefof(arg3))) { - err(arg0, z126, 13, 0, 0, STR0, Derefof(arg3)) + err(arg0, z126, __LINE__, 0, 0, STR0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), STR0)) { - err(arg0, z126, 14, 0, 0, Derefof(arg2), STR0) + err(arg0, z126, __LINE__, 0, 0, Derefof(arg2), STR0) Return (1) } } Case(3) { if (LNotEqual(BUF0, Derefof(arg3))) { - err(arg0, z126, 15, 0, 0, BUF0, Derefof(arg3)) + err(arg0, z126, __LINE__, 0, 0, BUF0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), BUF0)) { - err(arg0, z126, 16, 0, 0, Derefof(arg2), BUF0) + err(arg0, z126, __LINE__, 0, 0, Derefof(arg2), BUF0) Return (1) } } @@ -455,10 +455,10 @@ Method(m693, 5, Serialized) // Types mismatch Target/Target on storing if (LEqual(arg2, c016)) { if (X170) { - err(arg0, z126, 17, 0, 0, Local2, arg2) + err(arg0, z126, __LINE__, 0, 0, Local2, arg2) } } else { - err(arg0, z126, 17, 0, 0, Local2, arg2) + err(arg0, z126, __LINE__, 0, 0, Local2, arg2) } if (STCS) {m000(3, 0x100, arg2, Local2)} Return (1) @@ -469,12 +469,12 @@ Method(m693, 5, Serialized) if (LNotEqual(Local2, arg3)) { if (LNotEqual(m684(arg3), 1)) { // Types mismatch Result/Target on storing - err(arg0, z126, 18, 0, 0, Local2, arg3) + err(arg0, z126, __LINE__, 0, 0, Local2, arg3) Return (1) } elseif (LNotEqual(Local2, 3)) { // Types mismatch Result/Target on storing // Test fixed type Objects are converted to Buffer - err(arg0, z126, 19, 0, 0, Local2, 3) + err(arg0, z126, __LINE__, 0, 0, Local2, 3) Return (1) } if (STCS) {m000(3, 0x100, arg3, Local2)} @@ -494,10 +494,10 @@ Method(m693, 5, Serialized) if (LNotEqual(Derefof(arg1), Local7)) { if (LAnd(LEqual(arg2, c00b), LEqual(arg3, c00b))) { if (X194) { - err(arg0, z126, 20, 0, 0, Derefof(arg1), Local7) + err(arg0, z126, __LINE__, 0, 0, Derefof(arg1), Local7) } } else { - err(arg0, z126, 20, 0, 0, Derefof(arg1), Local7) + err(arg0, z126, __LINE__, 0, 0, Derefof(arg1), Local7) } Return (1) } @@ -527,7 +527,7 @@ Method(m693, 5, Serialized) Store(Index(arg6, 1), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(SRC0), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z126, 21, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -544,7 +544,7 @@ Method(m693, 5, Serialized) } if (m003(Concatenate(arg0, "-m003"), arg2, Local1, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z126, 22, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -582,7 +582,7 @@ Method(m693, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z126, 23, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg2, 14)) { // Buffer Field Target @@ -618,7 +618,7 @@ Method(m693, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z126, 24, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -654,7 +654,7 @@ Method(m693, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z126, 25, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -663,7 +663,7 @@ Method(m693, 5, Serialized) if (LNot(CH06(arg0, 26, 0xff))) { if (STCS) {m000(2, 0x100, arg2, arg3)} } - } elseif (CH03(arg0, z126, 27, arg3, arg2)) { + } elseif (CH03(arg0, z126, 27, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -711,7 +711,7 @@ Method(m693, 5, Serialized) Store(Index(arg6, 1), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(SRC0), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z126, 28, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -719,7 +719,7 @@ Method(m693, 5, Serialized) Store(Index(Derefof(Index(arg6, 2)), arg2), Local7) if (m003(Concatenate(arg0, "-m003"), arg2, Refof(Local4), Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z126, 29, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -756,7 +756,7 @@ Method(m693, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z126, 30, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -765,7 +765,7 @@ Method(m693, 5, Serialized) if (LNot(CH06(arg0, 31, 0xff))) { if (STCS) {m000(2, 0x100, arg2, arg3)} } - } elseif (CH03(arg0, z126, 32, arg3, arg2)) { + } elseif (CH03(arg0, z126, 32, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -1288,13 +1288,13 @@ Method(m693, 5, Serialized) if (LGreater(arg0, 2)) { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(ts, terr), z126, 33, 0, 0, arg0, 0) + err(Concatenate(ts, terr), z126, __LINE__, 0, 0, arg0, 0) Return (1) } if (LGreater(arg4, 1)) { // Unexpected Kind of Source-Target pair - err(Concatenate(ts, terr), z126, 34, 0, 0, arg4, 0) + err(Concatenate(ts, terr), z126, __LINE__, 0, 0, arg4, 0) Return (1) } diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl index e0c7e77..9019035 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl @@ -271,11 +271,11 @@ Method(m692, 2, Serialized) } Default { // Unexpected Source Type - err(Concatenate(arg0, terr), z125, 1, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, 0) Return (1) } } - if (CH03(arg0, z125, 2, arg1, 0)) { + if (CH03(arg0, z125, 2, __LINE__, 0)) { // Exception during preparing of Source Object Return (1) } @@ -283,7 +283,7 @@ Method(m692, 2, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source can not be set up - err(arg0, z125, 3, 0, 0, Local0, arg1) + err(arg0, z125, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -305,10 +305,10 @@ Method(m692, 2, Serialized) // Target (Result) type should keep the original type if (LOr(LEqual(arg3, c00a), LEqual(arg3, c00b))) { if (X195) { - err(arg0, z125, 4, 0, 0, Local2, arg2) + err(arg0, z125, __LINE__, 0, 0, Local2, arg2) } } else { - err(arg0, z125, 4, 0, 0, Local2, arg2) + err(arg0, z125, __LINE__, 0, 0, Local2, arg2) } if (STCS) {m000(3, 0x100, arg2, Local2)} Return (1) @@ -327,7 +327,7 @@ Method(m692, 2, Serialized) Store(INT0, Local0) } if (LNotEqual(Derefof(arg1), Local0)) { - err(arg0, z125, 5, 0, 0, Derefof(arg1), Local0) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), Local0) Return (1) } } @@ -341,7 +341,7 @@ Method(m692, 2, Serialized) Store(STR0, Local0) } if (LNotEqual(Derefof(arg1), Local0)) { - err(arg0, z125, 6, 0, 0, Derefof(arg1), Local0) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), Local0) Return (1) } } @@ -355,12 +355,12 @@ Method(m692, 2, Serialized) Store(BUF0, Local0) } if (LNotEqual(Derefof(arg1), Local0)) { - err(arg0, z125, 7, 0, 0, Derefof(arg1), Local0) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), Local0) Return (1) } } Default{ - err(Concatenate(arg0, terr), z125, 8, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } @@ -377,12 +377,12 @@ Method(m692, 2, Serialized) Store(STR0, STR1) } if (LNotEqual(Derefof(arg1), STR1)) { - err(arg0, z125, 9, 0, 0, Derefof(arg1), STR1) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), STR1) Return (1) } } Default{ - err(Concatenate(arg0, terr), z125, 10, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } @@ -399,12 +399,12 @@ Method(m692, 2, Serialized) Store(BUF0, BUF1) } if (LNotEqual(Derefof(arg1), BUF1)) { - err(arg0, z125, 11, 0, 0, Derefof(arg1), BUF1) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), BUF1) Return (1) } } Default{ - err(Concatenate(arg0, terr), z125, 12, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } @@ -421,12 +421,12 @@ Method(m692, 2, Serialized) Store(FLU0, FLU1) } if (LNotEqual(Derefof(arg1), FLU1)) { - err(arg0, z125, 13, 0, 0, Derefof(arg1), FLU1) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), FLU1) Return (1) } } Default{ - err(Concatenate(arg0, terr), z125, 14, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } @@ -443,18 +443,18 @@ Method(m692, 2, Serialized) Store(BFL0, BFL1) } if (LNotEqual(Derefof(arg1), BFL1)) { - err(arg0, z125, 15, 0, 0, Derefof(arg1), BFL1) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), BFL1) Return (1) } } Default{ - err(Concatenate(arg0, terr), z125, 16, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } } Default{ - err(Concatenate(arg0, terr), z125, 17, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } @@ -489,7 +489,7 @@ Method(m692, 2, Serialized) // Prepare Source of specified type if (m004(Concatenate(arg0, "-m004"), arg3, Local3)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z125, 18, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -501,7 +501,7 @@ Method(m692, 2, Serialized) Decrement(FLU0) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 19, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg3, 14)) { // Buffer Source/Field Target @@ -511,7 +511,7 @@ Method(m692, 2, Serialized) Decrement(BFL0) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 20, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg4, 0)) { // Increment @@ -520,7 +520,7 @@ Method(m692, 2, Serialized) Decrement(SRC0) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 21, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -529,7 +529,7 @@ Method(m692, 2, Serialized) if (LNot(CH06(arg0, 22, 0xff))) { if (STCS) {m000(2, 0x100, arg2, arg3)} } - } elseif (CH03(arg0, z125, 23, arg3, arg2)) { + } elseif (CH03(arg0, z125, 23, __LINE__, arg2)) { // Processing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -557,7 +557,7 @@ Method(m692, 2, Serialized) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(Local1))) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z125, 24, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -567,7 +567,7 @@ Method(m692, 2, Serialized) Decrement(Local1) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 25, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -578,7 +578,7 @@ Method(m692, 2, Serialized) // will be converted to Integer 0, thus no // exception caused by implicit source // conversion. - if (CH03(arg0, z125, 26, arg3, arg2)) { + if (CH03(arg0, z125, 26, __LINE__, arg2)) { if (STCS) {m000(2, 0x100, arg2, arg3)} } } else { @@ -587,7 +587,7 @@ Method(m692, 2, Serialized) if (STCS) {m000(2, 0x100, arg2, arg3)} } } - } elseif (CH03(arg0, z125, 27, arg3, arg2)) { + } elseif (CH03(arg0, z125, 27, __LINE__, arg2)) { // Processing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -628,7 +628,7 @@ Method(m692, 2, Serialized) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(Local1))) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z125, 28, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -638,7 +638,7 @@ Method(m692, 2, Serialized) Store(m101(Local1), Local2) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 29, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -649,7 +649,7 @@ Method(m692, 2, Serialized) // will be converted to Integer 0, thus no // exception caused by implicit source // conversion. - if (CH03(arg0, z125, 30, arg3, arg2)) { + if (CH03(arg0, z125, 30, __LINE__, arg2)) { if (STCS) {m000(2, 0x100, arg2, arg3)} } } else { @@ -658,7 +658,7 @@ Method(m692, 2, Serialized) if (STCS) {m000(2, 0x100, arg2, arg3)} } } - } elseif (CH03(arg0, z125, 31, arg3, arg2)) { + } elseif (CH03(arg0, z125, 31, __LINE__, arg2)) { // Processing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -708,7 +708,7 @@ Method(m692, 2, Serialized) // Prepare Source of specified type if (m004(Concatenate(arg0, "-m004"), arg3, Local3)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z125, 32, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -719,7 +719,7 @@ Method(m692, 2, Serialized) m101(Local3) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 33, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -728,7 +728,7 @@ Method(m692, 2, Serialized) if (LNot(CH06(arg0, 34, 0xff))) { if (STCS) {m000(2, 0x100, arg2, arg3)} } - } elseif (CH03(arg0, z125, 35, arg3, arg2)) { + } elseif (CH03(arg0, z125, 35, __LINE__, arg2)) { // Processing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, arg3)} } else { @@ -760,7 +760,7 @@ Method(m692, 2, Serialized) if (LGreater(arg0, 1)) { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(ts, terr), z125, 36, 0, 0, arg0, 0) + err(Concatenate(ts, terr), z125, __LINE__, 0, 0, arg0, 0) Return (1) } diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl b/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl index af5060b..132bf71 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl @@ -285,7 +285,7 @@ Method(m694, 5, Serialized) CopyObject(Derefof(arg3), BUF1) Store(Sizeof(BUF1), Local0) if (LNotEqual(Local0, 17)) { - err(Concatenate(arg0, terr), z127, 1, 0, 0, Local0, 17) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, Local0, 17) Return (1) } CopyObject(BUF1, arg2) @@ -333,11 +333,11 @@ Method(m694, 5, Serialized) } Default { // Unexpected Target Type - err(Concatenate(arg0, terr), z127, 2, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg1, 0) Return (1) } } - if (CH03(arg0, z127, 3, arg1, 0)) { + if (CH03(arg0, z127, 3, __LINE__, 0)) { //Exception during preparing of Target Object Return (1) } @@ -350,7 +350,7 @@ Method(m694, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Target can not be set up - err(arg0, z127, 4, 0, 0, Local0, arg1) + err(arg0, z127, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -383,11 +383,11 @@ Method(m694, 5, Serialized) } Default { // Unexpected Source Type - err(Concatenate(arg0, terr), z127, 5, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg1, 0) Return (1) } } - if (CH03(arg0, z127, 6, arg1, 0)) { + if (CH03(arg0, z127, 6, __LINE__, 0)) { // Exception during preparing of Source Object Return (1) } @@ -395,7 +395,7 @@ Method(m694, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source can not be set up - err(arg0, z127, 7, 0, 0, Local0, arg1) + err(arg0, z127, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -410,7 +410,7 @@ Method(m694, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source object is corrupted - err(arg0, z127, 8, 0, 0, Local0, arg1) + err(arg0, z127, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -429,14 +429,14 @@ Method(m694, 5, Serialized) } Default { // Unexpected Source Type - err(arg0, z127, 9, 0, 0, arg1, 0) + err(arg0, z127, __LINE__, 0, 0, arg1, 0) Return (1) } } if (LNotEqual(Local0, arg1)) { // Mismatch of Source Type against specified one - err(arg0, z127, 10, 0, 0, Local0, arg1) + err(arg0, z127, __LINE__, 0, 0, Local0, arg1) if (STCS) {m000(3, 0x1000000, Local0, arg0)} Return (1) } else { @@ -444,31 +444,31 @@ Method(m694, 5, Serialized) Switch(ToInteger(arg1)) { Case(1) { if (LNotEqual(INT0, Derefof(arg3))) { - err(arg0, z127, 11, 0, 0, INT0, Derefof(arg3)) + err(arg0, z127, __LINE__, 0, 0, INT0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), INT0)) { - err(arg0, z127, 12, 0, 0, Derefof(arg2), INT0) + err(arg0, z127, __LINE__, 0, 0, Derefof(arg2), INT0) Return (1) } } Case(2) { if (LNotEqual(STR0, Derefof(arg3))) { - err(arg0, z127, 13, 0, 0, STR0, Derefof(arg3)) + err(arg0, z127, __LINE__, 0, 0, STR0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), STR0)) { - err(arg0, z127, 14, 0, 0, Derefof(arg2), STR0) + err(arg0, z127, __LINE__, 0, 0, Derefof(arg2), STR0) Return (1) } } Case(3) { if (LNotEqual(BUF0, Derefof(arg3))) { - err(arg0, z127, 15, 0, 0, BUF0, Derefof(arg3)) + err(arg0, z127, __LINE__, 0, 0, BUF0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), BUF0)) { - err(arg0, z127, 16, 0, 0, Derefof(arg2), BUF0) + err(arg0, z127, __LINE__, 0, 0, Derefof(arg2), BUF0) Return (1) } } @@ -495,10 +495,10 @@ Method(m694, 5, Serialized) if (LEqual(arg2, c016)) { if (X170) { //this error report is unnecessary, should be removed. - //err(arg0, z127, 17, 0, 0, Local2, arg2) + //err(arg0, z127, __LINE__, 0, 0, Local2, arg2) } } else { - err(arg0, z127, 17, 0, 0, Local2, arg2) + err(arg0, z127, __LINE__, 0, 0, Local2, arg2) } if (STCS) {m000(3, 0x100, arg2, Local2)} @@ -513,18 +513,18 @@ Method(m694, 5, Serialized) // Check that Target can be used as reference Store(Derefof(arg1), Local0) Store(Derefof(Local0), Local3) - if (CH03(arg0, z127, 18, Local2, arg3)) { + if (CH03(arg0, z127, 18, __LINE__, arg3)) { // Derefof caused unexpected exception Return (1) } } elseif (LNotEqual(m684(arg3), 1)) { // Types mismatch Result/Target on storing - err(arg0, z127, 19, 0, 0, Local2, arg3) + err(arg0, z127, __LINE__, 0, 0, Local2, arg3) Return (1) } elseif (LNotEqual(Local2, 3)) { // Types mismatch Result/Target on storing // Test fixed type Objects are converted to Buffer - err(arg0, z127, 20, 0, 0, Local2, 3) + err(arg0, z127, __LINE__, 0, 0, Local2, 3) Return (1) } if (STCS) {m000(3, 0x100, arg3, Local2)} @@ -544,10 +544,10 @@ Method(m694, 5, Serialized) if (LNotEqual(Derefof(arg1), Local7)) { if (LEqual(arg2, c016)) { if (X193) { - err(arg0, z127, 21, 0, 0, Derefof(arg1), Local7) + err(arg0, z127, __LINE__, 0, 0, Derefof(arg1), Local7) } } else { - err(arg0, z127, 21, 0, 0, Derefof(arg1), Local7) + err(arg0, z127, __LINE__, 0, 0, Derefof(arg1), Local7) } Return (1) } @@ -583,7 +583,7 @@ Method(m694, 5, Serialized) Store(Index(arg6, 1), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(SRC0), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z127, 22, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -600,7 +600,7 @@ Method(m694, 5, Serialized) } if (m003(Concatenate(arg0, "-m003"), arg2, Local1, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z127, 23, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -674,7 +674,7 @@ Method(m694, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z127, 24, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg2, 14)) { // Buffer Field Target @@ -746,7 +746,7 @@ Method(m694, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z127, 25, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -818,7 +818,7 @@ Method(m694, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z127, 26, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -830,7 +830,7 @@ Method(m694, 5, Serialized) if (LNot(CH06(arg0, 27, 0xff))) { if (STCS) {m000(2, 0x100, arg2, Local5)} } - } elseif (CH03(arg0, z127, 28, Local5, arg2)) { + } elseif (CH03(arg0, z127, 28, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, Local5)} } else { @@ -872,7 +872,7 @@ Method(m694, 5, Serialized) Store(Index(arg6, 1), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(SRC0), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z127, 29, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -880,7 +880,7 @@ Method(m694, 5, Serialized) Store(Index(Derefof(Index(arg6, 2)), arg2), Local7) if (m003(Concatenate(arg0, "-m003"), arg2, Refof(Local4), Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z127, 30, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -953,7 +953,7 @@ Method(m694, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z127, 31, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -965,7 +965,7 @@ Method(m694, 5, Serialized) if (LNot(CH06(arg0, 32, 0xff))) { if (STCS) {m000(2, 0x100, arg2, Local5)} } - } elseif (CH03(arg0, z127, 33, Local5, arg2)) { + } elseif (CH03(arg0, z127, 33, __LINE__, arg2)) { // Storing caused unexpected exception if (STCS) {m000(2, 0x100, arg2, Local5)} } else { @@ -2253,13 +2253,13 @@ Method(m694, 5, Serialized) if (LGreater(arg0, 2)) { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(ts, terr), z127, 34, 0, 0, arg0, 0) + err(Concatenate(ts, terr), z127, __LINE__, 0, 0, arg0, 0) Return (1) } if (LGreater(arg4, 1)) { // Unexpected Kind of Source-Target pair - err(Concatenate(ts, terr), z127, 35, 0, 0, arg4, 0) + err(Concatenate(ts, terr), z127, __LINE__, 0, 0, arg4, 0) Return (1) } diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl index 11a94b9..fd786a0 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl @@ -80,7 +80,7 @@ Method(m690,, Serialized) // ArgX Object // Store(Src0, arg3) Store("Not implemented", Debug) - err(terr, z123, 1, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 3)) { // LocalX Object @@ -89,17 +89,17 @@ Method(m690,, Serialized) // Reference in ArgX Object // Store(Src0, arg4) Store("Not implemented", Debug) - err(terr, z123, 2, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 5)) { // Elemenf of a Package // Store(Src0, Index(p680, 0)) Store("Not implemented", Debug) - err(terr, z123, 3, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } else { Store("Unexpected Kind of the Object to store into", Debug) - err(terr, z123, 4, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -109,7 +109,7 @@ Method(m690,, Serialized) // Constant // Store(Src0, "") Store("Not implemented", Debug) - err(terr, z123, 5, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 1)) { // Named Object @@ -118,7 +118,7 @@ Method(m690,, Serialized) // ArgX Object // Store(Src0, arg3) Store("Not implemented", Debug) - err(terr, z123, 6, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 3)) { // LocalX Object @@ -127,17 +127,17 @@ Method(m690,, Serialized) // Reference in ArgX Object // Store(Src0, arg4) Store("Not implemented", Debug) - err(terr, z123, 7, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 5)) { // Elemenf of a Package // Store(Src0, Index(p680, 0)) Store("Not implemented", Debug) - err(terr, z123, 8, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } else { Store("Unexpected Kind of the Object to store into", Debug) - err(terr, z123, 9, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -147,7 +147,7 @@ Method(m690,, Serialized) // Constant // Store(Src0, Buffer(1){}) Store("Not implemented", Debug) - err(terr, z123, 10, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 1)) { // Named Object @@ -156,36 +156,36 @@ Method(m690,, Serialized) // ArgX Object // Store(Src0, arg3) Store("Not implemented", Debug) - err(terr, z123, 11, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 3)) { // LocalX Object // Store(Src0, Local2) Store("Not implemented", Debug) - err(terr, z123, 12, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 4)) { // Reference in ArgX Object // Store(Src0, arg4) Store("Not implemented", Debug) - err(terr, z123, 13, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 5)) { // Elemenf of a Package // Store(Src0, Index(p680, 0)) Store("Not implemented", Debug) - err(terr, z123, 14, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } else { Store("Unexpected Kind of the Object to store into", Debug) - err(terr, z123, 15, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } Case(4) { // Package // Store(Src0, p680) Store("Not implemented", Debug) - err(terr, z123, 16, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer field @@ -193,7 +193,7 @@ Method(m690,, Serialized) if (LEqual(arg2, 0)) { // Constant (like Store(Src0, Zero)) Store("Not implemented", Debug) - err(terr, z123, 17, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 1)) { // Named Object @@ -204,35 +204,35 @@ Method(m690,, Serialized) // ArgX Object // Store(Src0, arg3) Store("Not implemented", Debug) - err(terr, z123, 18, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 3)) { // LocalX Object // Store(Src0, Local2) Store("Not implemented", Debug) - err(terr, z123, 19, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 4)) { // Reference in ArgX Object // Store(Src0, arg4) Store("Not implemented", Debug) - err(terr, z123, 20, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 5)) { // Elemenf of a Package // Store(Src0, Index(p680, 0)) Store("Not implemented", Debug) - err(terr, z123, 21, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } else { Store("Unexpected Kind of the Object to store into", Debug) - err(terr, z123, 22, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } Default { Store("Unexpected type of the Object to store into", Debug) - err(terr, z123, 23, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -282,12 +282,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 30, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 31, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -314,12 +314,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 38, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 39, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -351,12 +351,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 44, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 45, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -380,12 +380,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 52, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 53, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -407,12 +407,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 54, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 55, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -434,12 +434,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 62, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 63, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -466,12 +466,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 70, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 71, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -495,12 +495,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 78, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 79, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -524,12 +524,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 86, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 87, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -553,12 +553,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 94, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 95, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -569,7 +569,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 96, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -621,12 +621,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 109, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 110, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -675,12 +675,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 123, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 124, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -725,12 +725,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 131, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 132, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -782,12 +782,12 @@ Method(m690,, Serialized) */ Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 145, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 146, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -809,12 +809,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 147, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 148, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -900,12 +900,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 173, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 174, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -950,12 +950,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 187, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 188, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1000,12 +1000,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 201, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 202, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1050,12 +1050,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 215, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 216, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1066,7 +1066,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 217, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1112,12 +1112,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 231, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 232, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1160,12 +1160,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 246, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 247, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1204,12 +1204,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 255, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 256, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1246,7 +1246,7 @@ Method(m690,, Serialized) } Default { Store("Unexpected type of the result Object to be stored", Debug) - err(terr, z123, 270, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1271,12 +1271,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 271, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 272, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1346,12 +1346,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 299, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 300, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1420,12 +1420,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 327, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 328, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1463,12 +1463,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 342, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 343, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1479,7 +1479,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 344, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1527,12 +1527,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 359, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 360, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1577,12 +1577,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 375, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 376, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1619,12 +1619,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 384, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 385, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1665,12 +1665,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 400, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 401, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1692,12 +1692,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 402, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 403, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1775,12 +1775,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 432, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 433, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1821,12 +1821,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 448, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 449, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1867,12 +1867,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 464, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 465, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1914,12 +1914,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 480, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 481, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1930,7 +1930,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 482, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1978,12 +1978,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 497, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 498, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2028,12 +2028,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 513, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 514, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2072,12 +2072,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 522, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 523, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2118,12 +2118,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 538, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 539, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2145,12 +2145,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 540, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 541, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2228,12 +2228,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 570, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 571, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2274,12 +2274,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 586, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 587, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2320,12 +2320,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 602, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 603, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2367,12 +2367,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 618, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 619, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2383,7 +2383,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 620, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2415,12 +2415,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 624, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 625, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2448,12 +2448,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 629, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 630, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2522,12 +2522,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 631, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 632, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2551,12 +2551,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 636, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 637, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2578,12 +2578,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 638, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 639, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2627,12 +2627,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 646, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 647, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2656,12 +2656,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 651, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 652, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2685,12 +2685,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 656, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 657, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2723,12 +2723,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 669, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 670, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2739,7 +2739,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 671, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2771,12 +2771,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 675, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 676, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2804,12 +2804,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 680, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 681, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2908,12 +2908,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 682, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 683, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2937,12 +2937,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 687, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 688, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2964,12 +2964,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 689, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 690, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3013,12 +3013,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 697, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 698, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3042,12 +3042,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 702, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 703, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3071,12 +3071,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 707, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 708, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3125,12 +3125,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 724, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 725, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3141,7 +3141,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 726, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3173,12 +3173,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 730, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 731, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3206,12 +3206,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 735, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 736, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3290,12 +3290,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 737, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 738, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3319,12 +3319,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 742, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 743, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3346,12 +3346,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 744, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 745, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3395,12 +3395,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 752, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 753, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3424,12 +3424,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 757, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 758, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3453,12 +3453,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 762, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 763, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3491,12 +3491,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 775, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 776, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3507,7 +3507,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 777, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3553,12 +3553,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 791, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 792, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3601,12 +3601,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 806, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 807, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3645,12 +3645,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 815, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 816, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3687,7 +3687,7 @@ Method(m690,, Serialized) } Default { Store("Unexpected type of the result Object to be stored", Debug) - err(terr, z123, 830, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3712,12 +3712,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 831, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 832, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3787,12 +3787,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 859, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 860, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3861,12 +3861,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 887, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 888, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3904,12 +3904,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 902, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 903, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3920,7 +3920,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 904, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl index edaecd1..93bf8fc 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl @@ -40,23 +40,23 @@ Method(m140,, Serialized) { Name(ts, "m140") - CH03(ts, z058, 0, 0, 0) + CH03(ts, z058, 0, __LINE__, 0) Store(1, Local1) Store(2, Local0) Divide(Local1, Local0, Local2) - CH03(ts, z058, 1, 0, 0) + CH03(ts, z058, 1, __LINE__, 0) Store(0, Local0) Divide(Local1, Local0, Local2) - CH04(ts, 0, 56, z058, 2, 0, 0) // AE_AML_DIVIDE_BY_ZERO + CH04(ts, 0, 56, z058, __LINE__, 0, 0) // AE_AML_DIVIDE_BY_ZERO Store(2, Local0) Divide(Local1, Local0, Local2) - CH03(ts, z058, 3, 0, 0) + CH03(ts, z058, 3, __LINE__, 0) } // Modulo divide by zero @@ -64,23 +64,23 @@ Method(m141,, Serialized) { Name(ts, "m141") - CH03(ts, z058, 4, 0, 0) + CH03(ts, z058, 4, __LINE__, 0) Store(1, Local1) Store(2, Local0) Mod(Local1, Local0, Local2) - CH03(ts, z058, 5, 0, 0) + CH03(ts, z058, 5, __LINE__, 0) Store(0, Local0) Mod(Local1, Local0, Local2) - CH04(ts, 0, 56, z058, 6, 0, 0) // AE_AML_DIVIDE_BY_ZERO + CH04(ts, 0, 56, z058, __LINE__, 0, 0) // AE_AML_DIVIDE_BY_ZERO Store(2, Local0) Mod(Local1, Local0, Local2) - CH03(ts, z058, 7, 0, 0) + CH03(ts, z058, 7, __LINE__, 0) } // Release ownership on a Mutex that is not currently owned @@ -90,11 +90,11 @@ Method(m142,, Serialized) Mutex(MTX0, 0) - CH03(ts, z058, 8, 0, 0) + CH03(ts, z058, 8, __LINE__, 0) Release(MTX0) - CH04(ts, 0, 65, z058, 9, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04(ts, 0, 65, z058, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED } // SizeOf for data types not an Integer, Buffer, String or Package object @@ -144,42 +144,42 @@ Method(m143,, Serialized) // Buffer Field Index(BUF0, 0, Local0) - CH03(ts, z058, 10, 0, 0) + CH03(ts, z058, 10, __LINE__, 0) Store(SizeOf(STR0), Local5) Store(SizeOf(BUF0), Local5) Store(SizeOf(PAC0), Local5) Store(SizeOf(INT0), Local5) - CH03(ts, z058, 11, 0, 0) + CH03(ts, z058, 11, __LINE__, 0) if (INT0) { Store(0, Local1) } Store(SizeOf(Local1), Local5) - CH04(ts, 1, 49, z058, 12, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04(ts, 1, 49, z058, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL /* These are now caught by the compiler - Aug 2015 */ // Store(SizeOf(DEV0), Local5) -// CH04(ts, 1, 47, z058, 13, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE // // Store(SizeOf(EVE0), Local5) -// CH04(ts, 1, 47, z058, 14, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE // // Store(SizeOf(MTX0), Local5) -// CH04(ts, 1, 47, z058, 15, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE // // Store(SizeOf(OPR0), Local5) -// CH04(ts, 1, 47, z058, 16, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE // // Store(SizeOf(PWR0), Local5) -// CH04(ts, 1, 47, z058, 17, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE // // Store(SizeOf(CPU0), Local5) -// CH04(ts, 1, 47, z058, 18, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE // // Store(SizeOf(TZN0), Local5) -// CH04(ts, 1, 47, z058, 19, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // ToString() when the number of characters copied from buffer exceeds 200 @@ -195,11 +195,11 @@ Method(m144,, Serialized) Increment(Local0) } - CH03(ts, z058, 20, 0, 0) + CH03(ts, z058, 20, __LINE__, 0) ToString(b000, Ones, Local5) - CH03(ts, z058, 21, 0, 0) + CH03(ts, z058, 21, __LINE__, 0) Name(b001, Buffer(201){}) @@ -212,12 +212,12 @@ Method(m144,, Serialized) ToString(b001, Ones, Local5) /* - * CH04(ts, 0, 61, z058, 22, 0, 0) // AE_AML_STRING_LIMIT + * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT * * 20.12.2005. * No more limit of string size. */ - CH03(ts, z058, 22, 0, 0) + CH03(ts, z058, 22, __LINE__, 0) } // Access out of Package @@ -228,43 +228,43 @@ Method(m145,, Serialized) Name(p000, Package() {0,1,2}) Name(p001, Package(3) {0,1,2}) - CH03(ts, z058, 23, 0, 0) + CH03(ts, z058, 23, __LINE__, 0) // Package() Store(Index(p000, 2), Local5) - CH03(ts, z058, 24, 0, 0) + CH03(ts, z058, 24, __LINE__, 0) Store(Index(p000, 3), Local5) - CH04(ts, 1, 55, z058, 25, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04(ts, 1, 55, z058, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT Index(p000, 2, Local0) - CH03(ts, z058, 26, 0, 0) + CH03(ts, z058, 26, __LINE__, 0) Index(p000, 3, Local0) - CH04(ts, 0, 55, z058, 27, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04(ts, 0, 55, z058, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT // Package(3) Store(Index(p001, 2), Local5) - CH03(ts, z058, 28, 0, 0) + CH03(ts, z058, 28, __LINE__, 0) Index(p001, 3, Local5) - CH04(ts, 0, 55, z058, 29, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04(ts, 0, 55, z058, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT Index(p001, 2, Local0) - CH03(ts, z058, 30, 0, 0) + CH03(ts, z058, 30, __LINE__, 0) Index(p001, 3, Local0) - CH04(ts, 0, 55, z058, 31, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04(ts, 0, 55, z058, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT } // Access out of String @@ -274,24 +274,24 @@ Method(m085,, Serialized) Name(s000, "123") - CH03(ts, z058, 32, 0, 0) + CH03(ts, z058, 32, __LINE__, 0) Index(s000, 2, Local5) - CH03(ts, z058, 33, 0, 0) + CH03(ts, z058, 33, __LINE__, 0) Index(s000, 3, Local5) // Bug 177, Bugzilla 5480. - CH04(ts, 0, 61, z058, 34, 0, 0) // AE_AML_STRING_LIMIT + CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT Index(s000, 2, Local0) - CH03(ts, z058, 35, 0, 0) + CH03(ts, z058, 35, __LINE__, 0) Index(s000, 3, Local0) - CH04(ts, 0, 61, z058, 36, 0, 0) // AE_AML_STRING_LIMIT + CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT } // Access out of Buffer @@ -302,43 +302,43 @@ Method(m086,, Serialized) Name(b000, Buffer() {0,1,2}) Name(b001, Buffer(3) {0,1,2}) - CH03(ts, z058, 37, 0, 0) + CH03(ts, z058, 37, __LINE__, 0) // Buffer() Index(b000, 2, Local5) - CH03(ts, z058, 38, 0, 0) + CH03(ts, z058, 38, __LINE__, 0) Index(b000, 3, Local5) - CH04(ts, 0, 54, z058, 39, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT Index(b000, 2, Local0) - CH03(ts, z058, 40, 0, 0) + CH03(ts, z058, 40, __LINE__, 0) Index(b000, 3, Local0) - CH04(ts, 0, 54, z058, 41, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT // Buffer(3) Index(b001, 2, Local5) - CH03(ts, z058, 42, 0, 0) + CH03(ts, z058, 42, __LINE__, 0) Index(b001, 3, Local5) - CH04(ts, 0, 54, z058, 43, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT Index(b001, 2, Local0) - CH03(ts, z058, 44, 0, 0) + CH03(ts, z058, 44, __LINE__, 0) Index(b001, 3, Local0) - CH04(ts, 0, 54, z058, 45, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT } // ToInteger() passed with an image of a number which value @@ -347,7 +347,7 @@ Method(m146,, Serialized) { Name(ts, "m146") - CH03(ts, z058, 46, 0, 0) + CH03(ts, z058, 46, __LINE__, 0) if (LEqual(F64, 1)) { Store("0xffffffffffffffff", Local0) @@ -356,7 +356,7 @@ Method(m146,, Serialized) } ToInteger(Local0, Local5) - CH03(ts, z058, 47, 0, 0) + CH03(ts, z058, 47, __LINE__, 0) if (LEqual(F64, 1)) { Store("0x11111111111111111", Local0) @@ -365,7 +365,7 @@ Method(m146,, Serialized) } ToInteger(Local0, Local5) - CH04(ts, 0, 46, z058, 48, 0, 0) // AE_AML_NO_OPERAND + CH04(ts, 0, 46, z058, __LINE__, 0, 0) // AE_AML_NO_OPERAND } // [Uninitialized] None. @@ -379,11 +379,11 @@ Method(m147, 1, Serialized) Store(0, Local0) } - CH03(ts, z058, 49, 0, 0) + CH03(ts, z058, 49, __LINE__, 0) Increment(Local0) - CH04(ts, 0, 49, z058, 50, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04(ts, 0, 49, z058, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } Method(m148) @@ -397,23 +397,23 @@ Method(m149, 1, Serialized) { Name(ts, "m149") - CH03(ts, z058, 51, 0, 0) + CH03(ts, z058, 51, __LINE__, 0) Stall(Arg0) - CH03(ts, z058, 52, 0, 0) + CH03(ts, z058, 52, __LINE__, 0) } Method(m14a, 1, Serialized) { Name(ts, "m14a") - CH03(ts, z058, 53, 0, 0) + CH03(ts, z058, 53, __LINE__, 0) Stall(Arg0) // It is now bug 14. - CH04(ts, 0, 48, z058, 54, 0, 0) // AE_AML_OPERAND_VALUE + CH04(ts, 0, 48, z058, __LINE__, 0, 0) // AE_AML_OPERAND_VALUE } // Bug 14. @@ -445,22 +445,22 @@ Method(m14c,, Serialized) // 101 characters Store("01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890", Local1) - CH03(ts, z058, 55, 0, 0) + CH03(ts, z058, 55, __LINE__, 0) Concatenate(Local0, Local0, Local5) - CH03(ts, z058, 56, 0, 0) + CH03(ts, z058, 56, __LINE__, 0) Concatenate(Local0, Local1, Local5) /* - * CH04(ts, 0, 61, z058, 57, 0, 0) // AE_AML_STRING_LIMIT + * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT * * 20.12.2005. * No more limit of string size. */ - CH03(ts, z058, 57, 0, 0) + CH03(ts, z058, 57, __LINE__, 0) } // ToDecimalString() when the number of result characters in string exceeds 200 @@ -488,22 +488,22 @@ Method(m14d,, Serialized) 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) - CH03(ts, z058, 58, 0, 0) + CH03(ts, z058, 58, __LINE__, 0) ToDecimalString(b000, Local5) - CH03(ts, z058, 59, 0, 0) + CH03(ts, z058, 59, __LINE__, 0) ToDecimalString(b001, Local5) /* - * CH04(ts, 0, 61, z058, 60, 0, 0) // AE_AML_STRING_LIMIT + * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT * * 20.12.2005. * No more limit of string size. */ - CH03(ts, z058, 60, 0, 0) + CH03(ts, z058, 60, __LINE__, 0) } // ToBCD() when a specified integer overflows a number of the BCD format @@ -511,7 +511,7 @@ Method(m14e,, Serialized) { Name(ts, "m14e") - CH03(ts, z058, 61, 0, 0) + CH03(ts, z058, 61, __LINE__, 0) if (LEqual(F64, 1)) { Store(9999999999999999, Local4) @@ -520,7 +520,7 @@ Method(m14e,, Serialized) ToBCD(99999999, Local5) } - CH03(ts, z058, 62, 0, 0) + CH03(ts, z058, 62, __LINE__, 0) if (LEqual(F64, 1)) { Store(10000000000000000, Local4) @@ -530,7 +530,7 @@ Method(m14e,, Serialized) ToBCD(Local4, Local5) } - CH04(ts, 0, 52, z058, 63, 0, 0) // AE_AML_NUMERIC_OVERFLOW + CH04(ts, 0, 52, z058, __LINE__, 0, 0) // AE_AML_NUMERIC_OVERFLOW } // Create field out of buffer @@ -540,47 +540,47 @@ Method(m14f,, Serialized) Name(b001, Buffer(16) {}) - CH03(ts, z058, 64, 0, 0) + CH03(ts, z058, 64, __LINE__, 0) CreateBitField(b001, 127, f000) - CH03(ts, z058, 65, 0, 0) + CH03(ts, z058, 65, __LINE__, 0) CreateBitField(b001, 128, f001) - CH04(ts, 0, 54, z058, 66, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03(ts, z058, 67, 0, 0) + CH03(ts, z058, 67, __LINE__, 0) CreateByteField(b001, 15, f002) - CH03(ts, z058, 68, 0, 0) + CH03(ts, z058, 68, __LINE__, 0) CreateByteField(b001, 16, f003) - CH04(ts, 0, 54, z058, 69, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03(ts, z058, 70, 0, 0) + CH03(ts, z058, 70, __LINE__, 0) CreateWordField(b001, 14, f004) - CH03(ts, z058, 71, 0, 0) + CH03(ts, z058, 71, __LINE__, 0) CreateWordField(b001, 15, f005) - CH04(ts, 0, 54, z058, 72, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03(ts, z058, 73, 0, 0) + CH03(ts, z058, 73, __LINE__, 0) CreateDWordField(b001, 12, f006) - CH03(ts, z058, 74, 0, 0) + CH03(ts, z058, 74, __LINE__, 0) CreateDWordField(b001, 13, f007) - CH04(ts, 0, 54, z058, 75, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03(ts, z058, 76, 0, 0) + CH03(ts, z058, 76, __LINE__, 0) CreateQWordField(b001, 8, f008) - CH03(ts, z058, 77, 0, 0) + CH03(ts, z058, 77, __LINE__, 0) CreateQWordField(b001, 9, f009) - CH04(ts, 0, 54, z058, 78, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03(ts, z058, 79, 0, 0) + CH03(ts, z058, 79, __LINE__, 0) CreateField(b001, 127, 1, f00a) - CH03(ts, z058, 80, 0, 0) + CH03(ts, z058, 80, __LINE__, 0) CreateField(b001, 128, 1, f00b) - CH04(ts, 0, 54, z058, 81, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT - CH03(ts, z058, 82, 0, 0) + CH03(ts, z058, 82, __LINE__, 0) CreateField(b001, 120, 8, f00c) - CH03(ts, z058, 83, 0, 0) + CH03(ts, z058, 83, __LINE__, 0) CreateField(b001, 120, 9, f00d) - CH04(ts, 0, 54, z058, 84, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT } // Access to uninitialized local @@ -592,11 +592,11 @@ Method(m150, 1, Serialized) Store(0, Local0) } - CH03(ts, z058, 85, 0, 0) + CH03(ts, z058, 85, __LINE__, 0) Index(Local0, 0, Local5) - CH04(ts, 0, 49, z058, 86, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04(ts, 0, 49, z058, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } // Access to an uninitialized element of package @@ -606,33 +606,33 @@ Method(m151,, Serialized) Name(p000, Package(4) {0,1,2}) - CH03(ts, z058, 87, 0, 0) + CH03(ts, z058, 87, __LINE__, 0) Store(DeRefOf(Index(p000, 2)), Local5) - CH03(ts, z058, 88, 0, 0) + CH03(ts, z058, 88, __LINE__, 0) Store(DeRefOf(Index(p000, 3)), Local5) /* * Obsolete: - * CH04(ts, 0, 51, z058, 89, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT + * CH04(ts, 0, 51, z058, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT * * Updated according to Bug 85 fix: no exception is expected * since the value is not processed. */ /* * OBSOLETE July 2013. DerefOf on an empty package element now causes error - * CH04(ts, 0, 62, z058, 89, 0, 0) + * CH04(ts, 0, 62, z058, __LINE__, 0, 0) */ - CH04(ts, 1, 51, z058, 89, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT + CH04(ts, 1, 51, z058, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT Add(DeRefOf(Index(p000, 3)), 1, Local5) if (EXCV) { - CH04(ts, 0, 51, z058, 169, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT + CH04(ts, 0, 51, z058, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT } else { - CH04(ts, 0, 0xff, z058, 169, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } return (0) @@ -659,22 +659,22 @@ Method(m152,, Serialized) 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) - CH03(ts, z058, 90, 0, 0) + CH03(ts, z058, 90, __LINE__, 0) ToHexString(b000, Local5) - CH03(ts, z058, 91, 0, 0) + CH03(ts, z058, 91, __LINE__, 0) ToHexString(b001, Local5) /* - * CH04(ts, 0, 61, z058, 92, 0, 0) // AE_AML_STRING_LIMIT + * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT * * 20.12.2005. * No more limit of string size. */ - CH03(ts, z058, 92, 0, 0) + CH03(ts, z058, 92, __LINE__, 0) } // StartIndex in Match greater than the package size @@ -684,15 +684,15 @@ Method(m153,, Serialized) Name(PAC0, Package(1) {0}) - CH03(ts, z058, 93, 0, 0) + CH03(ts, z058, 93, __LINE__, 0) Store(Match(PAC0, MTR, 0, MTR, 0, 0), Local5) - CH03(ts, z058, 94, 0, 0) + CH03(ts, z058, 94, __LINE__, 0) Store(Match(PAC0, MTR, 0, MTR, 0, 1), Local5) - CH04(ts, 1, 55, z058, 95, 0, 0) // AE_AML_PACKAGE_LIMIT + CH04(ts, 1, 55, z058, __LINE__, 0, 0) // AE_AML_PACKAGE_LIMIT } // Exeptional conditions of ConcatenateResTemplate @@ -708,17 +708,17 @@ Method(m154,, Serialized) Store(0, Local0) Store(Buffer(Local0){}, Local2) - CH03(ts, z058, 96, 0, 0) + CH03(ts, z058, 96, __LINE__, 0) ConcatenateResTemplate(RT00, RT00, Local5) - CH03(ts, z058, 97, 0, 0) + CH03(ts, z058, 97, __LINE__, 0) ConcatenateResTemplate(RT00, Local2, Local5) // Bug 188. - CH03(ts, z058, 98, 0, 0) - // CH04(ts, 0, 71, z058, 98, 0, 0) // AE_AML_NO_RESOURCE_END_TAG + CH03(ts, z058, 98, __LINE__, 0) + // CH04(ts, 0, 71, z058, __LINE__, 0, 0) // AE_AML_NO_RESOURCE_END_TAG // One-element buffer @@ -733,9 +733,9 @@ Method(m154,, Serialized) * we get AE_AML_NO_RESOURCE_END_TAG instead of AE_AML_OPERAND_TYPE. */ if (EXCV) { - CH04(ts, 0, 71, z058, 100, 0, 0) // AE_AML_NO_RESOURCE_END_TAG + CH04(ts, 0, 71, z058, __LINE__, 0, 0) // AE_AML_NO_RESOURCE_END_TAG } else { - CH04(ts, 0, 0xff, z058, 100, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } // One-element 0x79 buffer @@ -745,7 +745,7 @@ Method(m154,, Serialized) ConcatenateResTemplate(RT00, Local2, Local5) // Bug 189. - CH04(ts, 0, 71, z058, 101, 0, 0) // AE_AML_NO_RESOURCE_END_TAG + CH04(ts, 0, 71, z058, __LINE__, 0, 0) // AE_AML_NO_RESOURCE_END_TAG // Not resource template buffer @@ -754,9 +754,9 @@ Method(m154,, Serialized) ConcatenateResTemplate(RT00, Local2, Local5) if (EXCV) { - CH04(ts, 0, 71, z058, 102, 0, 0) // AE_AML_NO_RESOURCE_END_TAG + CH04(ts, 0, 71, z058, __LINE__, 0, 0) // AE_AML_NO_RESOURCE_END_TAG } else { - CH04(ts, 0, 0xff, z058, 102, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } // Nearly resource template buffer @@ -766,7 +766,7 @@ Method(m154,, Serialized) ConcatenateResTemplate(RT00, Local2, Local5) // Bug 190. - CH04(ts, 0, 71, z058, 103, 0, 0) // AE_AML_NO_RESOURCE_END_TAG + CH04(ts, 0, 71, z058, __LINE__, 0, 0) // AE_AML_NO_RESOURCE_END_TAG // Like resource template buffer @@ -775,12 +775,12 @@ Method(m154,, Serialized) ConcatenateResTemplate(RT00, Local2, Local5) if (EXCV) { - CH04(ts, 0, 71, z058, 104, 0, 0) // AE_AML_NO_RESOURCE_END_TAG + CH04(ts, 0, 71, z058, __LINE__, 0, 0) // AE_AML_NO_RESOURCE_END_TAG } else { - CH04(ts, 0, 0xff, z058, 104, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } - CH03(ts, z058, 171, 0, 0) + CH03(ts, z058, 171, __LINE__, 0) } /* @@ -799,20 +799,20 @@ Method(m155,, Serialized) { Name(ts, "m155") - CH03(ts, z058, 105, 0, 0) + CH03(ts, z058, 105, __LINE__, 0) Add("0x1111", 0, Local0) /* * Obsolete: - * CH04(ts, 0, 34, z058, 106, 0, 0) // AE_BAD_HEX_CONSTANT + * CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT * * New: */ - CH03(ts, z058, 106, 0, 0) + CH03(ts, z058, 106, __LINE__, 0) if (LNotEqual(Local0, 0)) { // Bug 63, Bugzilla 5329. - err(ts, z058, 170, 0, 0, Local0, 0) + err(ts, z058, __LINE__, 0, 0, Local0, 0) } } @@ -830,44 +830,44 @@ Method(m156,, Serialized) Store(0, Local0) Name(b000, Buffer(Local0) {}) - CH03(ts, z058, 107, 0, 0) + CH03(ts, z058, 107, __LINE__, 0) // Add, empty String Add("", 0, Local5) -// CH04(ts, 0, 34, z058, 108, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z058, 108, 0, 0) +// CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT + CH03(ts, z058, 108, __LINE__, 0) // Add, String filled with blanks Add(" ", 0, Local5) -// CH04(ts, 0, 34, z058, 109, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z058, 109, 0, 0) +// CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT + CH03(ts, z058, 109, __LINE__, 0) // ToInteger, empty String Store("", Local4) ToInteger(Local4, Local5) - CH04(ts, 0, 36, z058, 110, 0, 0) // AE_BAD_DECIMAL_CONSTANT + CH04(ts, 0, 36, z058, __LINE__, 0, 0) // AE_BAD_DECIMAL_CONSTANT // ToInteger, String filled with blanks Store(" ", Local4) ToInteger(Local4, Local5) -// CH04(ts, 0, 34, z058, 111, 0, 0) // AE_BAD_HEX_CONSTANT - CH04(ts, 0, 36, z058, 111, 0, 0) // AE_BAD_DECIMAL_CONSTANT +// CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 36, z058, __LINE__, 0, 0) // AE_BAD_DECIMAL_CONSTANT // Add, zero-length Buffer Add(b000, 0, Local5) -// CH04(ts, 0, 34, z058, 112, 0, 0) // AE_BAD_HEX_CONSTANT - CH04(ts, 0, 54, z058, 112, 0, 0) // AE_AML_BUFFER_LIMIT +// CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT // ToInteger, zero-length Buffer ToInteger(b000, Local5) -// CH04(ts, 0, 34, z058, 113, 0, 0) // AE_BAD_HEX_CONSTANT - CH04(ts, 0, 54, z058, 113, 0, 0) // AE_AML_BUFFER_LIMIT +// CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT } // ////////////////////////////////////////////////////////// @@ -883,23 +883,23 @@ Method(m157,, Serialized) Name(i000, 0xaaaaaaaa) - CH03(ts, z058, 114, 0, 0) + CH03(ts, z058, 114, __LINE__, 0) Store(Index(i000, 0), Local5) - CH04(ts, 1, 47, z058, 115, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Index(i000, 0, Local0) - CH04(ts, 0, 47, z058, 116, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(Index(i000, 0), Local0) - CH04(ts, 0, 0xff, z058, 117, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(Index(i000, 0, Local0), Local1) - CH04(ts, 0, 0xff, z058, 118, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } // Bug 83 @@ -910,17 +910,17 @@ Method(m158,, Serialized) Name(i000, 0xaaaaaaaa) - CH03(ts, z058, 119, 0, 0) + CH03(ts, z058, 119, __LINE__, 0) // Bug 83, Bugzilla 5387. Store(DerefOf(i000), Local5) - CH04(ts, 0, 0xff, z058, 120, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(DerefOf(i000), Local0) // Bug 83, Bugzilla 5387. - CH04(ts, 0, 0xff, z058, 121, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } // Index(Local7-Integer) @@ -933,35 +933,35 @@ Method(m087,, Serialized) Store(i000, Local7) - CH03(ts, z058, 122, 0, 0) + CH03(ts, z058, 122, __LINE__, 0) // Index(Integer) Store(Index(Local7, 0), Local5) - CH04(ts, 1, 47, z058, 123, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Index(Local7, 0, Local0) - CH04(ts, 0, 47, z058, 124, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(Index(Local7, 0), Local0) - CH04(ts, 0, 0xff, z058, 125, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(Index(Local7, 0, Local0), Local1) - CH04(ts, 0, 0xff, z058, 126, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) // DerefOf(Integer) Store(DerefOf(Local7), Local5) - CH04(ts, 0, 0xff, z058, 127, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(DerefOf(Local7), Local0) - CH04(ts, 0, 0xff, z058, 128, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } // Index(Buffer Field) @@ -972,27 +972,27 @@ Method(m159,, Serialized) Name(b000, Buffer() {1,2,3,4,5,6,7,8,9}) CreateField(b000, 0, 8, bf00) - CH03(ts, z058, 129, 0, 0) + CH03(ts, z058, 129, __LINE__, 0) Store(Index(bf00, 0), Local5) - CH04(ts, 1, 47, z058, 130, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Index(bf00, 0, Local0) - CH04(ts, 0, 47, z058, 131, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(Index(bf00, 0), Local0) - CH04(ts, 0, 0xff, z058, 132, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(Index(bf00, 0), Local0) - CH04(ts, 0, 0xff, z058, 133, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(Index(bf00, 0, Local0), Local1) - CH04(ts, 0, 0xff, z058, 134, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } // Bug 83 @@ -1004,17 +1004,17 @@ Method(m15a,, Serialized) Name(b000, Buffer() {1,2,3,4,5,6,7,8,9}) CreateField(b000, 0, 8, bf00) - CH03(ts, z058, 135, 0, 0) + CH03(ts, z058, 135, __LINE__, 0) Store(DerefOf(bf00), Local5) // Bug 83, Bugzilla 5387. - CH04(ts, 0, 0xff, z058, 136, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(DerefOf(bf00), Local0) // Bug 83, Bugzilla 5387. - CH04(ts, 0, 0xff, z058, 137, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } // Index(Field Unit) @@ -1028,73 +1028,73 @@ Method(m15d,, Serialized) BankField(r000, bnk0, 0, ByteAcc, NoLock, Preserve) {bkf0,4} IndexField(f00a, f00b, ByteAcc, NoLock, Preserve) {if00,1,if01,1} - CH03(ts, z058, 138, 0, 0) + CH03(ts, z058, 138, __LINE__, 0) // Field Store(Index(f000, 0), Local5) - CH04(ts, 1, 47, z058, 139, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Index(f000, 0, Local0) - CH04(ts, 0, 47, z058, 140, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(Index(f000, 0), Local0) - CH04(ts, 0, 0xff, z058, 141, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(Index(f000, 0), Local0) - CH04(ts, 0, 0xff, z058, 142, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(Index(f000, 0, Local0), Local1) - CH04(ts, 0, 0xff, z058, 143, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) // BankField Store(Index(bkf0, 0), Local5) - CH04(ts, 1, 47, z058, 144, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Index(bkf0, 0, Local0) - CH04(ts, 0, 47, z058, 145, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(Index(bkf0, 0), Local0) - CH04(ts, 0, 0xff, z058, 146, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(Index(bkf0, 0), Local0) - CH04(ts, 0, 0xff, z058, 147, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(Index(bkf0, 0, Local0), Local1) - CH04(ts, 0, 0xff, z058, 148, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) // IndexField Store(Index(if00, 0), Local5) - CH04(ts, 1, 47, z058, 149, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Index(if00, 0, Local0) - CH04(ts, 0, 47, z058, 150, 0, 0) // AE_AML_OPERAND_TYPE + CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(Index(if00, 0), Local0) - CH04(ts, 0, 0xff, z058, 151, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(Index(if00, 0), Local0) - CH04(ts, 0, 0xff, z058, 152, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(Index(if00, 0, Local0), Local1) - CH04(ts, 0, 0xff, z058, 153, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } // Bug 83 @@ -1109,43 +1109,43 @@ Method(m15e,, Serialized) BankField(r000, bnk0, 0, ByteAcc, NoLock, Preserve) {bkf0,4} IndexField(f00a, f00b, ByteAcc, NoLock, Preserve) {if00,1,if01,1} - CH03(ts, z058, 154, 0, 0) + CH03(ts, z058, 154, __LINE__, 0) // Field Store(DerefOf(f000), Local5) // Bug 83, Bugzilla 5387. - CH04(ts, 0, 0xff, z058, 155, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(DerefOf(f000), Local0) // Bug 83, Bugzilla 5387. - CH04(ts, 0, 0xff, z058, 156, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) // BankField Store(DerefOf(bkf0), Local5) // Bug 83, Bugzilla 5387. - CH04(ts, 0, 0xff, z058, 157, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(DerefOf(bkf0), Local0) // Bug 83, Bugzilla 5387. - CH04(ts, 0, 0xff, z058, 158, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) // IndexField Store(DerefOf(if00), Local5) // Bug 83, Bugzilla 5387. - CH04(ts, 0, 0xff, z058, 159, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) Store(DerefOf(if00), Local0) // Bug 83, Bugzilla 5387. - CH04(ts, 0, 0xff, z058, 160, 0, 0) + CH04(ts, 0, 0xff, z058, __LINE__, 0, 0) } // UPDATE exc.m084: Implement this test for all the types of objects @@ -1162,33 +1162,33 @@ Method(m084, 1, Serialized) Name(p000, Package() {0x12345678}) } - CH03(ts, z058, 161, 0, 0) + CH03(ts, z058, 161, __LINE__, 0) /* Discuss: now the ObjectType doesnt cause exception! Is it correct? Understand and discuss it. Store(ObjectType(i000), Local0) - CH04(ts, 0, 46, z058, 162, 0, 0) // AE_AML_NO_OPERAND + CH04(ts, 0, 46, z058, __LINE__, 0, 0) // AE_AML_NO_OPERAND Store(ObjectType(s000), Local0) - CH04(ts, 0, 46, z058, 163, 0, 0) // AE_AML_NO_OPERAND + CH04(ts, 0, 46, z058, __LINE__, 0, 0) // AE_AML_NO_OPERAND Store(ObjectType(b000), Local0) - CH04(ts, 0, 46, z058, 164, 0, 0) // AE_AML_NO_OPERAND + CH04(ts, 0, 46, z058, __LINE__, 0, 0) // AE_AML_NO_OPERAND Store(ObjectType(p000), Local0) - CH04(ts, 0, 46, z058, 165, 0, 0) // AE_AML_NO_OPERAND + CH04(ts, 0, 46, z058, __LINE__, 0, 0) // AE_AML_NO_OPERAND */ Store(Index(p000, 0), Local0) if (LNot(Arg0)) { - CH04(ts, 0, 0xFF, z058, 166, 0, 0) + CH04(ts, 0, 0xFF, z058, __LINE__, 0, 0) } else { - CH03(ts, z058, 167, 0, 0) + CH03(ts, z058, 167, __LINE__, 0) } - CH03(ts, z058, 168, 0, 0) + CH03(ts, z058, 168, __LINE__, 0) } Method(mf9d) @@ -1214,17 +1214,17 @@ Method(mf9d) { } - CH03("mf9d", z058, 171, 0, 0) + CH03("mf9d", z058, 171, __LINE__, 0) m000() - CH04("mf9d", 0, 0xff, z058, 172, 0, 0) + CH04("mf9d", 0, 0xff, z058, __LINE__, 0, 0) - CH03("mf9d", z058, 173, 0, 0) + CH03("mf9d", z058, 173, __LINE__, 0) m001() - CH04("mf9d", 0, 0xff, z058, 174, 0, 0) + CH04("mf9d", 0, 0xff, z058, __LINE__, 0, 0) } // Access out of OpRegion and DataTableRegion @@ -1264,12 +1264,12 @@ Method(m708,, Serialized) Store(Refof(Local2), Local3) - CH03(ts, z058, Add(175, Local1), 0, 0) + CH03(ts, z058, __LINE__, 0, 0) // Write: except DataTableRegion if (LLess(Local1, 3)) { Store(0x12345678, DeRefof(Local3)) - CH04(ts, 0, 53, z058, Add(179, Local1), 0, 0)// AE_AML_REGION_LIMIT + CH04(ts, 0, 53, z058, __LINE__, 0, 0)// AE_AML_REGION_LIMIT } // Read @@ -1284,7 +1284,7 @@ Method(m708,, Serialized) * Indicate we only care about the first by placing a 1 * in the second argument */ - CH04(ts, 1, 53, z058, Add(183, Local1), 0, 0) // AE_AML_REGION_LIMIT + CH04(ts, 1, 53, z058, __LINE__, 0, 0) // AE_AML_REGION_LIMIT Decrement(Local0) Increment(Local1) @@ -1309,15 +1309,15 @@ Method(m709,, Serialized) // OperationRegion(OPR0, SystemMemory, offp, 1) // } // -// CH03(ts, z058, 188, 0, 0) +// CH03(ts, z058, 188, __LINE__, 0) // // m000() // -// CH04(ts, 0, 47, z058, 189, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE // // OperationRegion(OPR1, SystemMemory, 1, lenp) // -// CH04(ts, 0, 47, z058, 190, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // Try OpRegion arguments when Offset + Length > MaxInteger @@ -1337,15 +1337,15 @@ Method(m70a,, Serialized) Field(OPR0, WordAcc, NoLock, Preserve) { Offset(0x10), FU01, 8} - CH03(ts, z058, 191, 0, 0) + CH03(ts, z058, 191, __LINE__, 0) Store(0x12, FU00) - CH04(ts, 0, 53, z058, 192, 0, 0) // AE_AML_REGION_LIMIT + CH04(ts, 0, 53, z058, __LINE__, 0, 0) // AE_AML_REGION_LIMIT Store(0x12, FU01) - CH04(ts, 0, 53, z058, 193, 0, 0) // AE_AML_REGION_LIMIT + CH04(ts, 0, 53, z058, __LINE__, 0, 0) // AE_AML_REGION_LIMIT } // Attempt to write into DataTableRegion @@ -1360,11 +1360,11 @@ Method(m70b,, Serialized) Store(FU00, Local0) - CH03(ts, z058, 194, 0, 0) + CH03(ts, z058, 194, __LINE__, 0) Store(0, FU00) - CH04(ts, 0, 16, z058, 195, 0, 0) // AE_SUPPORT + CH04(ts, 0, 16, z058, __LINE__, 0, 0) // AE_SUPPORT } // Check non-String DataTableRegion *String arguments @@ -1376,36 +1376,36 @@ Method(m7f5,, Serialized) Name(i000, 0x12) Name(p000, Package(1){0x12}) - CH03(ts, z058, 193, 0, 0) + CH03(ts, z058, 193, __LINE__, 0) DataTableRegion (DR00, b000, "", "") - CH04(ts, 0, 5, z058, 196, 0, 0) // AE_NOT_FOUND + CH04(ts, 0, 5, z058, __LINE__, 0, 0) // AE_NOT_FOUND DataTableRegion (DR01, "SSDT", b000, "") - CH04(ts, 0, 5, z058, 197, 0, 0) // AE_NOT_FOUND + CH04(ts, 0, 5, z058, __LINE__, 0, 0) // AE_NOT_FOUND DataTableRegion (DR02, "SSDT", "", b000) - CH04(ts, 0, 5, z058, 198, 0, 0) // AE_NOT_FOUND + CH04(ts, 0, 5, z058, __LINE__, 0, 0) // AE_NOT_FOUND DataTableRegion (DR03, i000, "", "") - CH04(ts, 0, 5, z058, 199, 0, 0) // AE_NOT_FOUND + CH04(ts, 0, 5, z058, __LINE__, 0, 0) // AE_NOT_FOUND DataTableRegion (DR04, "SSDT", i000, "") - CH04(ts, 0, 5, z058, 200, 0, 0) // AE_NOT_FOUND + CH04(ts, 0, 5, z058, __LINE__, 0, 0) // AE_NOT_FOUND DataTableRegion (DR05, "SSDT", "", i000) - CH04(ts, 0, 5, z058, 201, 0, 0) // AE_NOT_FOUND + CH04(ts, 0, 5, z058, __LINE__, 0, 0) // AE_NOT_FOUND /* These are now caught by the compiler - Aug 2015 */ // // DataTableRegion (DR06, p000, "", i000) -// CH04(ts, 0, 47, z058, 202, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE // // DataTableRegion (DR07, "SSDT", p000, "") -// CH04(ts, 0, 47, z058, 203, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE // // DataTableRegion (DR08, "SSDT", "", p000) -// CH04(ts, 0, 47, z058, 204, 0, 0) // AE_AML_OPERAND_TYPE +// CH04(ts, 0, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // Check SMBus OpRegion restictions @@ -1423,12 +1423,12 @@ Method(m7f6,, Serialized) // Create improper SMBus data buffer Name(BUFF, Buffer(33){}) - CH03(ts, z058, 205, 0, 0) + CH03(ts, z058, 205, __LINE__, 0) // Invoke Write Quick transaction Store(BUFF, FLD0) - CH04(ts, 0, 54, z058, 206, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(ts, 0, 54, z058, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT } /* Name space issues */ @@ -1453,11 +1453,11 @@ Method(m0bc,, Serialized) Store(m000(), Local1) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z058, 0x0ce, 0, 0, Local0, 0xabcd0000) + err(ts, z058, __LINE__, 0, 0, Local0, 0xabcd0000) } if (LNotEqual(Local1, 0xabcd0001)) { - err(ts, z058, 0x0cf, 0, 0, Local1, 0xabcd0001) + err(ts, z058, __LINE__, 0, 0, Local1, 0xabcd0001) } } @@ -1468,17 +1468,17 @@ Method(m0bc,, Serialized) return (0xabcd0002) } - CH03(ts, z058, 0x0d0, 0, 0) + CH03(ts, z058, 0x0d0, __LINE__, 0) m004() - CH04(ts, 0, 5, z058, 0x0d1, 0, 0) // AE_NOT_FOUND + CH04(ts, 0, 5, z058, __LINE__, 0, 0) // AE_NOT_FOUND } Method(m003) { /* Recursion */ - CH03(ts, z058, 0x0d0, 0, 0) + CH03(ts, z058, 0x0d0, __LINE__, 0) m003() - CH04(ts, 0, 84, z058, 0x0d1, 0, 0) // AE_AML_METHOD_LIMIT + CH04(ts, 0, 84, z058, __LINE__, 0, 0) // AE_AML_METHOD_LIMIT Method(m003) { diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl index 18c301a..f386d47 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl @@ -56,7 +56,7 @@ Method(m4b0, 1, Serialized) // CondRefOf CondRefOf(Local0, Local1) - CH03(ts, z092, 1, 0, 0) + CH03(ts, z092, 1, __LINE__, 0) // CopyObject @@ -106,12 +106,12 @@ Method(m4b0, 1, Serialized) // ObjectType Store (ObjectType(Local0), Local1) - CH03(ts, z092, 2, 0, 0) + CH03(ts, z092, 2, __LINE__, 0) // RefOf Store (RefOf(Local0), Local1) - CH03(ts, z092, 3, 0, 0) + CH03(ts, z092, 3, __LINE__, 0) // Release @@ -415,7 +415,7 @@ Method(m4b0, 1, Serialized) // DeRefOf(Index(Package, Ind)) Store (DeRefOf(Index(p000, 0)), Local1) - CH04(ts, 1, 51, z092, 4, 0, 0) + CH04(ts, 1, 51, z092, __LINE__, 0, 0) // CondRefOf @@ -471,7 +471,7 @@ Method(m4b0, 1, Serialized) if (X104) { Store (ObjectType(DeRefOf(Index(p000, 0))), Local1) - CH03(ts, z092, 5, 0, 0) + CH03(ts, z092, 5, __LINE__, 0) } // RefOf @@ -773,10 +773,10 @@ Method(m4b0, 1, Serialized) // CondRefOf CondRefOf(arg2) - CH03(ts, z092, 6, 0, 0) + CH03(ts, z092, 6, __LINE__, 0) CondRefOf(arg2, Local1) - CH03(ts, z092, 7, 0, 0) + CH03(ts, z092, 7, __LINE__, 0) // CopyObject @@ -838,12 +838,12 @@ Method(m4b0, 1, Serialized) // ObjectType ObjectType(arg2) - CH03(ts, z092, 8, 0, 0) + CH03(ts, z092, 8, __LINE__, 0) // RefOf RefOf(arg2) - CH03(ts, z092, 9, 0, 0) + CH03(ts, z092, 9, __LINE__, 0) // Release @@ -1265,12 +1265,12 @@ Method(m4b0, 1, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z092, 8, 0, 0, Local0, 0) + err(arg0, z092, __LINE__, 0, 0, Local0, 0) return (1) } Store (DeRefOf(arg1), Local1) - CH04(ts, 0, 62, z092, 10, 0, 0) + CH04(ts, 0, 62, z092, __LINE__, 0, 0) // CondRefOf @@ -1326,7 +1326,7 @@ Method(m4b0, 1, Serialized) if (X104) { Store (ObjectType(DeRefOf(arg1)), Local1) - CH03(ts, z092, 11, 0, 0) + CH03(ts, z092, 11, __LINE__, 0) } // RefOf @@ -1776,7 +1776,7 @@ Method(m4b0, 1, Serialized) m00d(Derefof(Index(p000, 0))) CH06(arg0, 0, 51) if (LNotEqual(i001, 0)) { - err(arg0, z092, 1, 0, 0, i001, 0) + err(arg0, z092, __LINE__, 0, 0, i001, 0) } Store(0, i001) @@ -1784,14 +1784,14 @@ Method(m4b0, 1, Serialized) m00d(Derefof(Local1)) CH06(arg0, 2, 51) if (LNotEqual(i001, 0)) { - err(arg0, z092, 3, 0, 0, i001, 0) + err(arg0, z092, __LINE__, 0, 0, i001, 0) } Store(0, i001) m00d(Derefof(Index(p000, 0, Local2))) CH06(arg0, 4, 51) if (LNotEqual(i001, 0)) { - err(arg0, z092, 5, 0, 0, i001, 0) + err(arg0, z092, __LINE__, 0, 0, i001, 0) } Store(0, i001) @@ -1799,7 +1799,7 @@ Method(m4b0, 1, Serialized) m00d(Derefof(Local3)) CH06(arg0, 6, 51) if (LNotEqual(i001, 0)) { - err(arg0, z092, 7, 0, 0, i001, 0) + err(arg0, z092, __LINE__, 0, 0, i001, 0) } Store(0, i001) @@ -1807,11 +1807,11 @@ Method(m4b0, 1, Serialized) m00d(Derefof(Local5)) CH06(arg0, 8, 51) if (LNotEqual(i001, 0)) { - err(arg0, z092, 9, 0, 0, i001, 0) + err(arg0, z092, __LINE__, 0, 0, i001, 0) } } - CH03(ts, z092, 12, 0, 0) + CH03(ts, z092, 12, __LINE__, 0) // Uninitialized Local m000(Concatenate(ts, "-m000"), 0) @@ -1912,7 +1912,7 @@ Method(m4b0, 1, Serialized) m00d(Local0) CH06(ts, 9, 49) if (LNotEqual(i001, 0)) { - err(ts, z092, 10, 0, 0, i001, 0) + err(ts, z092, __LINE__, 0, 0, i001, 0) } // Uninitialized element of Package as parameter of a method @@ -1927,7 +1927,7 @@ Method(m4b0, 1, Serialized) m00d(Arg1) CH06(ts, 11, 50) if (LNotEqual(i001, 0)) { - err(ts, z092, 12, i001, 0) + err(ts, z092, __LINE__, i001, 0) } */ } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl index 3d083a2..3c2c0db 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl @@ -244,12 +244,12 @@ Method(m4b1, 1, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 1)) { - err(arg0, z093, 46, 0, 0, Local0, 1) + err(arg0, z093, __LINE__, 0, 0, Local0, 1) return (1) } Store (DerefOf(arg1), Local1) - CH03(ts, z093, 0, 0, 0) + CH03(ts, z093, 0, __LINE__, 0) Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 47, 47) @@ -278,7 +278,7 @@ Method(m4b1, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z093, 50, 0, 0, i000, arg1) + err(arg0, z093, __LINE__, 0, 0, i000, arg1) } } @@ -346,7 +346,7 @@ Method(m4b1, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i001, arg1)) { - err(arg0, z093, 59, 0, 0, i000, arg1) + err(arg0, z093, __LINE__, 0, 0, i000, arg1) } } @@ -359,7 +359,7 @@ Method(m4b1, 1, Serialized) Store(0, i001) Store (DerefOf(m000(1, lpC0)), Local1) - CH03(ts, z093, Add(1, lpC0), 0, 0) + CH03(ts, z093, __LINE__, 0, 0) CH00(arg0, 1) Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) @@ -379,7 +379,7 @@ Method(m4b1, 1, Serialized) } } - CH03(ts, z093, 3, 0, 0) + CH03(ts, z093, 3, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl index cca2436..43080de 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl @@ -63,7 +63,7 @@ Method(m4b2, 1, Serialized) // Index Index(s000, 0, Local1) - CH03(ts, z094, 1, 0, 0) + CH03(ts, z094, 1, __LINE__, 0) // ConcatenateResTemplate @@ -86,7 +86,7 @@ Method(m4b2, 1, Serialized) // Index Index(s100, 0, Local1) - CH03(ts, z094, 3, 0, 0) + CH03(ts, z094, 3, __LINE__, 0) // ConcatenateResTemplate @@ -137,7 +137,7 @@ Method(m4b2, 1, Serialized) // Index Index(arg1, 0, Local1) - CH03(ts, z094, 5, 0, 0) + CH03(ts, z094, 5, __LINE__, 0) // Wait @@ -191,7 +191,7 @@ Method(m4b2, 1, Serialized) // Index Index(Local0, 0, Local1) - CH03(ts, z094, 7, 0, 0) + CH03(ts, z094, 7, __LINE__, 0) // Wait @@ -215,7 +215,7 @@ Method(m4b2, 1, Serialized) CH06(arg0, 32, 5) Store (Index(DeRefOf(Index(p000, 0)), 0), Local1) - CH03(ts, z094, 8, 0, 0) + CH03(ts, z094, 8, __LINE__, 0) Store (Match(DeRefOf(Index(p000, 0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 33, 47) @@ -226,7 +226,7 @@ Method(m4b2, 1, Serialized) CH06(arg0, 34, 5) Store (Index(DeRefOf(Index(p000, 0, Local0)), 0), Local1) - CH03(ts, z094, 9, 0, 0) + CH03(ts, z094, 9, __LINE__, 0) Store (Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 35, 47) @@ -240,18 +240,18 @@ Method(m4b2, 1, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 2)) { - err(arg0, z094, 36, 0, 0, Local0, 2) + err(arg0, z094, __LINE__, 0, 0, Local0, 2) return (1) } Store (DerefOf(arg1), Local1) - CH03(ts, z094, 10, 0, 0) + CH03(ts, z094, 10, __LINE__, 0) Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 37, 5) Store (Index(DerefOf(arg1), 0), Local1) - CH03(ts, z094, 11, 0, 0) + CH03(ts, z094, 11, __LINE__, 0) Store (Match(DerefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 38, 47) @@ -274,7 +274,7 @@ Method(m4b2, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z094, 39, 0, 0, i000, arg1) + err(arg0, z094, __LINE__, 0, 0, i000, arg1) } } @@ -306,13 +306,13 @@ Method(m4b2, 1, Serialized) CH00(arg0, 5) } - CH03(ts, z094, 12, 0, 0) + CH03(ts, z094, 12, __LINE__, 0) Store (Index(m000(6), 0), Local1) if (y900) { - CH03(ts, z094, 12, 0, 0) + CH03(ts, z094, 12, __LINE__, 0) CH00(arg0, 6) } else { - CH04(ts, 0, 85, z094, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z094, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } Store(Wait(m000(7), 0), Local1) @@ -347,7 +347,7 @@ Method(m4b2, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z094, 47, 0, 0, i000, arg1) + err(arg0, z094, __LINE__, 0, 0, i000, arg1) } } @@ -360,7 +360,7 @@ Method(m4b2, 1, Serialized) Store(0, i000) Store (DerefOf(m000(1, lpC0)), Local1) - CH03(ts, z094, Add(13, lpC0), 0, 0) + CH03(ts, z094, __LINE__, 0, 0) CH00(arg0, 1) Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) @@ -380,7 +380,7 @@ Method(m4b2, 1, Serialized) } } - CH03(ts, z094, 15, 0, 0) + CH03(ts, z094, 15, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl index f541a65..2209c94 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl @@ -57,7 +57,7 @@ Method(m4b3, 1, Serialized) } Store (Index(b000, 0), Local1) - CH03(ts, z095, 0, 0, 0) + CH03(ts, z095, 0, __LINE__, 0) } // Global Named Object @@ -69,7 +69,7 @@ Method(m4b3, 1, Serialized) } Store (Index(b100, 0), Local1) - CH03(ts, z095, 1, 0, 0) + CH03(ts, z095, 1, __LINE__, 0) } // Argument @@ -91,7 +91,7 @@ Method(m4b3, 1, Serialized) CH06(arg0, 6, 47) Store (Index(arg1, 0), Local1) - CH03(ts, z095, 2, 0, 0) + CH03(ts, z095, 2, __LINE__, 0) Store(Wait(arg1, 0), Local1) CH06(arg0, 7, 47) @@ -121,7 +121,7 @@ Method(m4b3, 1, Serialized) CH06(arg0, 13, 47) Store (Index(Local0, 0), Local1) - CH03(ts, z095, 3, 0, 0) + CH03(ts, z095, 3, __LINE__, 0) Store(Wait(Local0, 0), Local1) CH06(arg0, 14, 47) @@ -141,7 +141,7 @@ Method(m4b3, 1, Serialized) CH06(arg0, 18, 47) Store (Index(DeRefOf(Index(p000, 0, Local0)), 0), Local1) - CH03(ts, z095, 5, 0, 0) + CH03(ts, z095, 5, __LINE__, 0) Store (Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 19, 47) @@ -155,18 +155,18 @@ Method(m4b3, 1, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 3)) { - err(arg0, z095, 20, 0, 0, Local0, 3) + err(arg0, z095, __LINE__, 0, 0, Local0, 3) return (1) } Store (DerefOf(arg1), Local1) - CH03(ts, z095, 6, 0, 0) + CH03(ts, z095, 6, __LINE__, 0) Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 21, 47) Store (Index(DerefOf(arg1), 0), Local1) - CH03(ts, z095, 7, 0, 0) + CH03(ts, z095, 7, __LINE__, 0) Store (Match(DerefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 22, 47) @@ -189,7 +189,7 @@ Method(m4b3, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z095, 23, 0, 0, i000, arg1) + err(arg0, z095, __LINE__, 0, 0, i000, arg1) } } @@ -221,13 +221,13 @@ Method(m4b3, 1, Serialized) CH00(arg0, 5) } - CH03(ts, z095, 12, 0, 0) + CH03(ts, z095, 12, __LINE__, 0) Store (Index(m000(6), 0), Local1) if (y900) { - CH03(ts, z095, 8, 0, 0) + CH03(ts, z095, 8, __LINE__, 0) CH00(arg0, 6) } else { - CH04(ts, 0, 85, z095, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z095, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } Store(Wait(m000(7), 0), Local1) @@ -262,7 +262,7 @@ Method(m4b3, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z095, 31, 0, 0, i000, arg1) + err(arg0, z095, __LINE__, 0, 0, i000, arg1) } } @@ -275,7 +275,7 @@ Method(m4b3, 1, Serialized) Store(0, i000) Store (DerefOf(m000(1, lpC0)), Local1) - CH03(ts, z095, Add(9, lpC0), 0, 0) + CH03(ts, z095, __LINE__, 0, 0) CH00(arg0, 1) Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) @@ -295,7 +295,7 @@ Method(m4b3, 1, Serialized) } } - CH03(ts, z095, 11, 0, 0) + CH03(ts, z095, 11, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl index 7538b23..e57372e 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl @@ -60,15 +60,15 @@ Method(m4b4, 1, Serialized) // CondRefOf Store (CondRefOf(p000), Local1) - CH03(ts, z096, 0, 0, 0) + CH03(ts, z096, 0, __LINE__, 0) CondRefOf(p000, Local1) - CH03(ts, z096, 1, 0, 0) + CH03(ts, z096, 1, __LINE__, 0) // CopyObject CopyObject(p000, Local1) - CH03(ts, z096, 2, 0, 0) + CH03(ts, z096, 2, __LINE__, 0) // Decrement @@ -96,12 +96,12 @@ Method(m4b4, 1, Serialized) // ObjectType Store (ObjectType(p000), Local1) - CH03(ts, z096, 3, 0, 0) + CH03(ts, z096, 3, __LINE__, 0) // RefOf Store (RefOf(p000), Local1) - CH03(ts, z096, 4, 0, 0) + CH03(ts, z096, 4, __LINE__, 0) // Release @@ -112,7 +112,7 @@ Method(m4b4, 1, Serialized) // SizeOf Store (SizeOf(p000), Local1) - CH03(ts, z096, 5, 0, 0) + CH03(ts, z096, 5, __LINE__, 0) // Sleep @@ -121,7 +121,7 @@ Method(m4b4, 1, Serialized) // Store Store(p000, Local1) - CH03(ts, z096, 6, 0, 0) + CH03(ts, z096, 6, __LINE__, 0) // ToBCD @@ -150,10 +150,10 @@ Method(m4b4, 1, Serialized) // Index Index(p000, 0, Local1) - CH03(ts, z096, 7, 0, 0) + CH03(ts, z096, 7, __LINE__, 0) Store (Index(p000, 0), Local1) - CH03(ts, z096, 8, 0, 0) + CH03(ts, z096, 8, __LINE__, 0) // LEqual @@ -196,7 +196,7 @@ Method(m4b4, 1, Serialized) // Match Store (Match(p000, MTR, 0, MTR, 0, 0), Local1) - CH03(ts, z096, 9, 0, 0) + CH03(ts, z096, 9, __LINE__, 0) } // Global Named Object @@ -205,12 +205,12 @@ Method(m4b4, 1, Serialized) // CondRefOf CondRefOf(p100, Local1) - CH03(ts, z096, 11, 0, 0) + CH03(ts, z096, 11, __LINE__, 0) // CopyObject CopyObject(p100, Local1) - CH03(ts, z096, 12, 0, 0) + CH03(ts, z096, 12, __LINE__, 0) // Decrement @@ -237,12 +237,12 @@ Method(m4b4, 1, Serialized) // ObjectType Store (ObjectType(p100), Local1) - CH03(ts, z096, 13, 0, 0) + CH03(ts, z096, 13, __LINE__, 0) // RefOf Store (RefOf(p100), Local1) - CH03(ts, z096, 14, 0, 0) + CH03(ts, z096, 14, __LINE__, 0) // Release @@ -253,7 +253,7 @@ Method(m4b4, 1, Serialized) // SizeOf Store (SizeOf(p100), Local1) - CH03(ts, z096, 15, 0, 0) + CH03(ts, z096, 15, __LINE__, 0) // Sleep @@ -262,7 +262,7 @@ Method(m4b4, 1, Serialized) // Store Store(p100, Local1) - CH03(ts, z096, 16, 0, 0) + CH03(ts, z096, 16, __LINE__, 0) // ToBCD @@ -291,7 +291,7 @@ Method(m4b4, 1, Serialized) // Index Store (Index(p100, 0), Local1) - CH03(ts, z096, 18, 0, 0) + CH03(ts, z096, 18, __LINE__, 0) // LEqual @@ -334,7 +334,7 @@ Method(m4b4, 1, Serialized) // Match Store (Match(p100, MTR, 0, MTR, 0, 0), Local1) - CH03(ts, z096, 19, 0, 0) + CH03(ts, z096, 19, __LINE__, 0) } // Argument @@ -345,12 +345,12 @@ Method(m4b4, 1, Serialized) // CondRefOf CondRefOf(arg1, Local1) - CH03(ts, z096, 21, 0, 0) + CH03(ts, z096, 21, __LINE__, 0) // CopyObject CopyObject(arg1, Local1) - CH03(ts, z096, 22, 0, 0) + CH03(ts, z096, 22, __LINE__, 0) // Decrement @@ -395,12 +395,12 @@ Method(m4b4, 1, Serialized) // ObjectType Store (ObjectType(arg1), Local1) - CH03(ts, z096, 23, 0, 0) + CH03(ts, z096, 23, __LINE__, 0) // RefOf Store (RefOf(arg1), Local1) - CH03(ts, z096, 24, 0, 0) + CH03(ts, z096, 24, __LINE__, 0) // Release @@ -420,7 +420,7 @@ Method(m4b4, 1, Serialized) // SizeOf Store (SizeOf(arg1), Local1) - CH03(ts, z096, 25, 0, 0) + CH03(ts, z096, 25, __LINE__, 0) // Sleep @@ -435,7 +435,7 @@ Method(m4b4, 1, Serialized) // Store Store(arg1, Local1) - CH03(ts, z096, 26, 0, 0) + CH03(ts, z096, 26, __LINE__, 0) // ToBCD @@ -521,7 +521,7 @@ Method(m4b4, 1, Serialized) // Index Index(arg1, 0, Local1) - CH03(ts, z096, 28, 0, 0) + CH03(ts, z096, 28, __LINE__, 0) Index("0", arg1, Local1) CH06(arg0, 57, 47) @@ -684,7 +684,7 @@ Method(m4b4, 1, Serialized) // Match Store (Match(arg1, MTR, 0, MTR, 0, 0), Local1) - CH03(ts, z096, 29, 0, 0) + CH03(ts, z096, 29, __LINE__, 0) Store (Match(Package(){1}, MTR, arg1, MTR, 0, 0), Local1) CH06(arg0, 121, 47) @@ -704,12 +704,12 @@ Method(m4b4, 1, Serialized) // CondRefOf CondRefOf(Local0, Local1) - CH03(ts, z096, 31, 0, 0) + CH03(ts, z096, 31, __LINE__, 0) // CopyObject CopyObject(Local0, Local1) - CH03(ts, z096, 32, 0, 0) + CH03(ts, z096, 32, __LINE__, 0) // Decrement @@ -754,12 +754,12 @@ Method(m4b4, 1, Serialized) // ObjectType Store (ObjectType(Local0), Local1) - CH03(ts, z096, 33, 0, 0) + CH03(ts, z096, 33, __LINE__, 0) // RefOf Store (RefOf(Local0), Local1) - CH03(ts, z096, 34, 0, 0) + CH03(ts, z096, 34, __LINE__, 0) // Release @@ -779,7 +779,7 @@ Method(m4b4, 1, Serialized) // SizeOf Store (SizeOf(Local0), Local1) - CH03(ts, z096, 35, 0, 0) + CH03(ts, z096, 35, __LINE__, 0) // Sleep @@ -794,7 +794,7 @@ Method(m4b4, 1, Serialized) // Store Store(Local0, Local1) - CH03(ts, z096, 36, 0, 0) + CH03(ts, z096, 36, __LINE__, 0) // ToBCD @@ -877,7 +877,7 @@ Method(m4b4, 1, Serialized) // Index Index(Local0, 0, Local1) - CH03(ts, z096, 38, 0, 0) + CH03(ts, z096, 38, __LINE__, 0) Index("0", Local0, Local1) CH06(arg0, 57, 47) @@ -1040,7 +1040,7 @@ Method(m4b4, 1, Serialized) // Match Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) - CH03(ts, z096, 39, 0, 0) + CH03(ts, z096, 39, __LINE__, 0) Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 47) @@ -1067,7 +1067,7 @@ Method(m4b4, 1, Serialized) // CopyObject CopyObject(DeRefOf(Index(p000, 0)), Local1) - CH03(ts, z096, 40, 0, 0) + CH03(ts, z096, 40, __LINE__, 0) // Decrement @@ -1112,7 +1112,7 @@ Method(m4b4, 1, Serialized) // ObjectType Store (ObjectType(DeRefOf(Index(p000, 0))), Local1) - CH03(ts, z096, 41, 0, 0) + CH03(ts, z096, 41, __LINE__, 0) // RefOf @@ -1128,7 +1128,7 @@ Method(m4b4, 1, Serialized) // SizeOf Store (SizeOf(DeRefOf(Index(p000, 0))), Local1) - CH03(ts, z096, 42, 0, 0) + CH03(ts, z096, 42, __LINE__, 0) // Sleep @@ -1143,7 +1143,7 @@ Method(m4b4, 1, Serialized) // Store Store(DeRefOf(Index(p000, 0)), Local1) - CH03(ts, z096, 43, 0, 0) + CH03(ts, z096, 43, __LINE__, 0) // ToBCD @@ -1226,7 +1226,7 @@ Method(m4b4, 1, Serialized) // Index Index(DeRefOf(Index(p000, 0)), 0, Local1) - CH03(ts, z096, 45, 0, 0) + CH03(ts, z096, 45, __LINE__, 0) Index("0", DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 57, 47) @@ -1386,7 +1386,7 @@ Method(m4b4, 1, Serialized) // Match Store (Match(DeRefOf(Index(p000, 0)), MTR, 0, MTR, 0, 0), Local1) - CH03(ts, z096, 46, 0, 0) + CH03(ts, z096, 46, __LINE__, 0) Store (Match(Package(){1}, MTR, DeRefOf(Index(p000, 0)), MTR, 0, 0), Local1) CH06(arg0, 121, 47) @@ -1408,7 +1408,7 @@ Method(m4b4, 1, Serialized) // CopyObject CopyObject(DeRefOf(Index(p000, 0, Local0)), Local1) - CH03(ts, z096, 47, 0, 0) + CH03(ts, z096, 47, __LINE__, 0) // Decrement @@ -1453,7 +1453,7 @@ Method(m4b4, 1, Serialized) // ObjectType Store (ObjectType(DeRefOf(Index(p000, 0, Local0))), Local1) - CH03(ts, z096, 48, 0, 0) + CH03(ts, z096, 48, __LINE__, 0) // RefOf @@ -1469,7 +1469,7 @@ Method(m4b4, 1, Serialized) // SizeOf Store (SizeOf(DeRefOf(Index(p000, 0, Local0))), Local1) - CH03(ts, z096, 49, 0, 0) + CH03(ts, z096, 49, __LINE__, 0) // Sleep @@ -1484,7 +1484,7 @@ Method(m4b4, 1, Serialized) // Store Store(DeRefOf(Index(p000, 0, Local0)), Local1) - CH03(ts, z096, 50, 0, 0) + CH03(ts, z096, 50, __LINE__, 0) // ToBCD @@ -1567,7 +1567,7 @@ Method(m4b4, 1, Serialized) // Index Index(DeRefOf(Index(p000, 0, Local0)), 0, Local1) - CH03(ts, z096, 52, 0, 0) + CH03(ts, z096, 52, __LINE__, 0) Index("0", DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 57, 47) @@ -1727,7 +1727,7 @@ Method(m4b4, 1, Serialized) // Match Store (Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0), Local1) - CH03(ts, z096, 53, 0, 0) + CH03(ts, z096, 53, __LINE__, 0) Store (Match(Package(){1}, MTR, DeRefOf(Index(p000, 0, Local0)), MTR, 0, 0), Local1) CH06(arg0, 121, 47) @@ -1747,12 +1747,12 @@ Method(m4b4, 1, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 4)) { - err(arg0, z096, 0, 0, 0, Local0, 4) + err(arg0, z096, __LINE__, 0, 0, Local0, 4) return (1) } Store (DerefOf(arg1), Local1) - CH03(ts, z096, 54, 0, 0) + CH03(ts, z096, 54, __LINE__, 0) // CondRefOf @@ -1765,7 +1765,7 @@ Method(m4b4, 1, Serialized) // CopyObject CopyObject(DerefOf(arg1), Local1) - CH03(ts, z096, 55, 0, 0) + CH03(ts, z096, 55, __LINE__, 0) // Decrement @@ -1810,7 +1810,7 @@ Method(m4b4, 1, Serialized) // ObjectType Store (ObjectType(DerefOf(arg1)), Local1) - CH03(ts, z096, 56, 0, 0) + CH03(ts, z096, 56, __LINE__, 0) // RefOf @@ -1826,7 +1826,7 @@ Method(m4b4, 1, Serialized) // SizeOf Store (SizeOf(DerefOf(arg1)), Local1) - CH03(ts, z096, 57, 0, 0) + CH03(ts, z096, 57, __LINE__, 0) // Sleep @@ -1841,7 +1841,7 @@ Method(m4b4, 1, Serialized) // Store Store(DerefOf(arg1), Local1) - CH03(ts, z096, 58, 0, 0) + CH03(ts, z096, 58, __LINE__, 0) // ToBCD @@ -1924,7 +1924,7 @@ Method(m4b4, 1, Serialized) // Index Index(DerefOf(arg1), 0, Local1) - CH03(ts, z096, 60, 0, 0) + CH03(ts, z096, 60, __LINE__, 0) Index("0", DerefOf(arg1), Local1) CH06(arg0, 57, 47) @@ -2084,7 +2084,7 @@ Method(m4b4, 1, Serialized) // Match Store (Match(DerefOf(arg1), MTR, 0, MTR, 0, 0), Local1) - CH03(ts, z096, 61, 0, 0) + CH03(ts, z096, 61, __LINE__, 0) Store (Match(Package(){1}, MTR, DerefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, 47) @@ -2127,7 +2127,7 @@ Method(m4b4, 1, Serialized) // CopyObject CopyObject(m000(), Local1) - CH03(ts, z096, 62, 0, 0) + CH03(ts, z096, 62, __LINE__, 0) // Decrement @@ -2173,7 +2173,7 @@ Method(m4b4, 1, Serialized) /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ Store (ObjectType(m000), Local0) - CH03(ts, z096, 63, 0, 0) + CH03(ts, z096, 63, __LINE__, 0) // RefOf /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ @@ -2300,23 +2300,23 @@ Method(m4b4, 1, Serialized) if (y900) { Index(m000(), 0, Local1) - CH03(ts, z096, 65, 0, 0) + CH03(ts, z096, 65, __LINE__, 0) Index("0", m000(), Local1) CH06(arg0, 57, 47) } else { - CH03(ts, z096, 0x123, 0, 0) - CH03(ts, z096, 0x127, 0, 0) + CH03(ts, z096, 0x123, __LINE__, 0) + CH03(ts, z096, 0x127, __LINE__, 0) Index(m000(), 0, Local1) - CH04(ts, 0, 85, z094, 0x128, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z094, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - CH03(ts, z096, 0x129, 0, 0) + CH03(ts, z096, 0x129, __LINE__, 0) Index("0", m000(), Local1) - CH04(ts, 0, 0xff, z094, 0x12a, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 0xff, z094, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - CH03(ts, z096, 0x129, 0, 0) + CH03(ts, z096, 0x129, __LINE__, 0) Index(ss00, m000(), Local1) - CH04(ts, 0, 47, z094, 0x12a, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 47, z094, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // LEqual @@ -2477,7 +2477,7 @@ Method(m4b4, 1, Serialized) // Match Store (Match(m000(), MTR, 0, MTR, 0, 0), Local1) - CH03(ts, z096, 66, 0, 0) + CH03(ts, z096, 66, __LINE__, 0) Store (Match(Package(){1}, MTR, m000(), MTR, 0, 0), Local1) CH06(arg0, 121, 47) @@ -2510,7 +2510,7 @@ Method(m4b4, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z096, 0, 0, 0, i000, arg1) + err(arg0, z096, __LINE__, 0, 0, i000, arg1) } } @@ -2523,7 +2523,7 @@ Method(m4b4, 1, Serialized) Store(0, i000) Store (DerefOf(m000(1, lpC0)), Local1) - CH03(ts, z096, Add(67, lpC0), 0, 0) + CH03(ts, z096, __LINE__, 0, 0) CH00(arg0, 1) Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) @@ -2558,7 +2558,7 @@ Method(m4b4, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z096, 0, 0, 0, i000, arg1) + err(arg0, z096, __LINE__, 0, 0, i000, arg1) } } @@ -2629,13 +2629,13 @@ Method(m4b4, 1, Serialized) // Index - CH03(ts, z094, 0x123, 0, 0) + CH03(ts, z094, 0x123, __LINE__, 0) Store (Index(m000(9), 0), Local1) if (y900) { - CH03(ts, z096, 69, 0, 0) + CH03(ts, z096, 69, __LINE__, 0) CH00(arg0, 9) } else { - CH04(ts, 0, 85, z094, 0x124, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z094, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } // Wait @@ -2649,13 +2649,13 @@ Method(m4b4, 1, Serialized) // Match Store (Match(m000(11), MTR, 0, MTR, 0, 0), Local1) - CH03(ts, z096, 70, 0, 0) + CH03(ts, z096, 70, __LINE__, 0) CH00(arg0, 11) } SET0(z096, ts, 0) - CH03(ts, z096, 70, 0, 0) + CH03(ts, z096, 70, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl index b733ee2..a9ccd68 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl @@ -87,9 +87,9 @@ Method(m4b5,, Serialized) Store (Index(fu03, 0), Local1) if (y900) { - CH03(ts, z097, 0, 0, 0) + CH03(ts, z097, 0, __LINE__, 0) } else { - CH04(ts, 0, 85, z094, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z094, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } @@ -118,9 +118,9 @@ Method(m4b5,, Serialized) Store (Index(fu01, 0), Local1) if (y900) { - CH03(ts, z097, 1, 0, 0) + CH03(ts, z097, 1, __LINE__, 0) } else { - CH04(ts, 0, 85, z094, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z094, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } @@ -132,12 +132,12 @@ Method(m4b5,, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z097, 6, 0, 0, Local0, 5) + err(arg0, z097, __LINE__, 0, 0, Local0, 5) return (1) } Store (DerefOf(arg1), Local1) - CH03(ts, z097, 2, 0, 0) + CH03(ts, z097, 2, __LINE__, 0) Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 7, 47) @@ -147,9 +147,9 @@ Method(m4b5,, Serialized) if (arg2) { // Like Buffer behaviour if (y900) { - CH03(ts, z097, 3, 0, 0) + CH03(ts, z097, 3, __LINE__, 0) } else { - CH04(ts, 0, 85, z097, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z097, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } else { // Like Integer behaviour @@ -190,7 +190,7 @@ Method(m4b5,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z097, 10, 0, 0, i000, arg1) + err(arg0, z097, __LINE__, 0, 0, i000, arg1) } } @@ -208,7 +208,7 @@ Method(m4b5,, Serialized) Store(0, i000) Store (DerefOf(m000(1, lpC0)), Local1) - CH03(ts, z097, Add(4, lpC0), 0, 0) + CH03(ts, z097, __LINE__, 0, 0) CH00(arg0, 1) @@ -220,9 +220,9 @@ Method(m4b5,, Serialized) if (Mod(lpC0, 2)) { // Like Buffer behaviour if (y900) { - CH03(ts, z097, Add(8, lpC0), 0, 0) + CH03(ts, z097, __LINE__, 0, 0) } else { - CH04(ts, 0, 85, z097, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z097, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } else { // Like Integer behaviour @@ -239,7 +239,7 @@ Method(m4b5,, Serialized) } } - CH03(ts, z097, 12, 0, 0) + CH03(ts, z097, 12, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl index 3389ede..e16015d 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl @@ -83,12 +83,12 @@ Method(m4b6,, Serialized) // CondRefOf CondRefOf(Local0, Local1) - CH03(ts, z098, 1, 0, 0) + CH03(ts, z098, 1, __LINE__, 0) // CopyObject CopyObject(Local0, Local1) - CH03(ts, z098, 2, 0, 0) + CH03(ts, z098, 2, __LINE__, 0) // Decrement @@ -133,12 +133,12 @@ Method(m4b6,, Serialized) // ObjectType Store (ObjectType(Local0), Local1) - CH03(ts, z098, 3, 0, 0) + CH03(ts, z098, 3, __LINE__, 0) // RefOf Store (RefOf(Local0), Local1) - CH03(ts, z098, 4, 0, 0) + CH03(ts, z098, 4, __LINE__, 0) // Release @@ -441,7 +441,7 @@ Method(m4b6,, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 6)) { - err(arg0, z098, 200, 0, 0, Local0, 6) + err(arg0, z098, __LINE__, 0, 0, Local0, 6) return (1) } @@ -452,7 +452,7 @@ Method(m4b6,, Serialized) } Store (DeRefOf(arg1), Local1) - CH03(ts, z098, 5, 0, 0) + CH03(ts, z098, 5, __LINE__, 0) // CondRefOf @@ -507,7 +507,7 @@ Method(m4b6,, Serialized) // ObjectType Store (ObjectType(DeRefOf(arg1)), Local1) - CH03(ts, z098, 6, 0, 0) + CH03(ts, z098, 6, __LINE__, 0) // RefOf @@ -817,7 +817,7 @@ Method(m4b6,, Serialized) // CopyObject CopyObject(m000, Local1) - CH03(ts, z098, 7, 0, 0) + CH03(ts, z098, 7, __LINE__, 0) // Decrement @@ -863,7 +863,7 @@ Method(m4b6,, Serialized) /* Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Store (ObjectType(m000), Local0) - CH03(ts, z098, 8, 0, 0) + CH03(ts, z098, 8, __LINE__, 0) // RefOf /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ @@ -1186,7 +1186,7 @@ Method(m4b6,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z098, 0, 0, 0, i000, arg1) + err(arg0, z098, __LINE__, 0, 0, i000, arg1) } } @@ -1199,7 +1199,7 @@ Method(m4b6,, Serialized) Store(0, i000) Store (DerefOf(m000(1, lpC0)), Local1) - CH03(ts, z098, Add(9, lpC0), 0, 0) + CH03(ts, z098, __LINE__, 0, 0) CH00(arg0, 1) Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) @@ -1219,7 +1219,7 @@ Method(m4b6,, Serialized) } } - CH03(ts, z098, 11, 0, 0) + CH03(ts, z098, 11, __LINE__, 0) // Local Named Object // m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl index d32aa56..dcb192f 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl @@ -84,12 +84,12 @@ Method(m4b7,, Serialized) // CondRefOf CondRefOf(Local0, Local1) - CH03(ts, z099, 1, 0, 0) + CH03(ts, z099, 1, __LINE__, 0) // CopyObject CopyObject(Local0, Local1) - CH03(ts, z099, 2, 0, 0) + CH03(ts, z099, 2, __LINE__, 0) // Decrement @@ -134,12 +134,12 @@ Method(m4b7,, Serialized) // ObjectType Store (ObjectType(Local0), Local1) - CH03(ts, z099, 3, 0, 0) + CH03(ts, z099, 3, __LINE__, 0) // RefOf Store (RefOf(Local0), Local1) - CH03(ts, z099, 4, 0, 0) + CH03(ts, z099, 4, __LINE__, 0) // Release @@ -149,12 +149,12 @@ Method(m4b7,, Serialized) // Reset Reset(Local0) - CH03(ts, z099, 14, 0, 0) + CH03(ts, z099, 14, __LINE__, 0) // Signal Signal(Local0) - CH03(ts, z099, 15, 0, 0) + CH03(ts, z099, 15, __LINE__, 0) // SizeOf @@ -396,7 +396,7 @@ Method(m4b7,, Serialized) // Wait Store(Wait(Local0, i000), Local1) - CH03(ts, z099, 108, 0, 0) + CH03(ts, z099, 108, __LINE__, 0) Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 47) @@ -440,13 +440,13 @@ Method(m4b7,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 7)) { - err(arg0, z099, 200, 0, 0, Local0, 7) + err(arg0, z099, __LINE__, 0, 0, Local0, 7) return (1) } Store (DeRefOf(arg1), Local1) if(LNot(SLCK)){ - CH04(ts, 0, 47, z099, 5, 0, 0) + CH04(ts, 0, 47, z099, __LINE__, 0, 0) } // CondRefOf @@ -457,7 +457,7 @@ Method(m4b7,, Serialized) // CopyObject CopyObject(DeRefOf(arg1), Local1) - CH03(ts, z099, 2, 0, 0) + CH03(ts, z099, 2, __LINE__, 0) // Decrement @@ -502,7 +502,7 @@ Method(m4b7,, Serialized) // ObjectType Store (ObjectType(DeRefOf(arg1)), Local1) - CH03(ts, z099, 6, 0, 0) + CH03(ts, z099, 6, __LINE__, 0) // RefOf @@ -817,7 +817,7 @@ Method(m4b7,, Serialized) // CopyObject CopyObject(m000(), Local1) - CH03(ts, z099, 7, 0, 0) + CH03(ts, z099, 7, __LINE__, 0) // Decrement @@ -863,7 +863,7 @@ Method(m4b7,, Serialized) /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Store (ObjectType(m000), Local0) - CH03(ts, z099, 8, 0, 0) + CH03(ts, z099, 8, __LINE__, 0) // RefOf /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ @@ -1188,7 +1188,7 @@ Method(m4b7,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z099, 0, 0, 0, i000, arg1) + err(arg0, z099, __LINE__, 0, 0, i000, arg1) } } @@ -1202,7 +1202,7 @@ Method(m4b7,, Serialized) Store (DerefOf(m000(1, lpC0)), Local1) if(LNot(SLCK)){ - CH04(ts, 0, 47, z099, Add(9, lpC0), 0, 0) + CH04(ts, 0, 47, z099, __LINE__, 0, 0) } CH00(arg0, 1) @@ -1227,7 +1227,7 @@ Method(m4b7,, Serialized) SET0(z099, ts, 0) - CH03(ts, z099, 11, 0, 0) + CH03(ts, z099, 11, __LINE__, 0) // Local Named Object // m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl index 003baf9..f634639 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl @@ -82,12 +82,12 @@ Method(m4b8,, Serialized) // CondRefOf CondRefOf(Local0, Local1) - CH03(ts, z100, 1, 0, 0) + CH03(ts, z100, 1, __LINE__, 0) // CopyObject CopyObject(Local0, Local1) - CH03(ts, z100, 2, 0, 0) + CH03(ts, z100, 2, __LINE__, 0) // Decrement @@ -132,12 +132,12 @@ Method(m4b8,, Serialized) // ObjectType Store (ObjectType(Local0), Local1) - CH03(ts, z100, 3, 0, 0) + CH03(ts, z100, 3, __LINE__, 0) // RefOf Store (RefOf(Local0), Local1) - CH03(ts, z100, 4, 0, 0) + CH03(ts, z100, 4, __LINE__, 0) // Release @@ -438,13 +438,13 @@ Method(m4b8,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 8)) { - err(arg0, z100, 200, 0, 0, Local0, 8) + err(arg0, z100, __LINE__, 0, 0, Local0, 8) return (1) } Store (DeRefOf(arg1), Local1) if(LNot(SLCK)){ - CH04(ts, 0, 47, z100, 5, 0, 0) + CH04(ts, 0, 47, z100, __LINE__, 0, 0) } // CondRefOf @@ -455,7 +455,7 @@ Method(m4b8,, Serialized) // CopyObject CopyObject(DeRefOf(arg1), Local1) - CH03(ts, z100, 2, 0, 0) + CH03(ts, z100, 2, __LINE__, 0) // Decrement @@ -500,7 +500,7 @@ Method(m4b8,, Serialized) // ObjectType Store (ObjectType(DeRefOf(arg1)), Local1) - CH03(ts, z100, 6, 0, 0) + CH03(ts, z100, 6, __LINE__, 0) // RefOf @@ -814,7 +814,7 @@ Method(m4b8,, Serialized) // CopyObject CopyObject(m000(), Local1) - CH03(ts, z100, 7, 0, 0) + CH03(ts, z100, 7, __LINE__, 0) // Decrement @@ -860,7 +860,7 @@ Method(m4b8,, Serialized) /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Store (ObjectType(m000), Local0) - CH03(ts, z100, 8, 0, 0) + CH03(ts, z100, 8, __LINE__, 0) // RefOf /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ @@ -1185,7 +1185,7 @@ Method(m4b8,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z100, 0, 0, 0, i000, arg1) + err(arg0, z100, __LINE__, 0, 0, i000, arg1) } } @@ -1199,7 +1199,7 @@ Method(m4b8,, Serialized) Store (DerefOf(m000(1, lpC0)), Local1) if(LNot(SLCK)){ - CH04(ts, 0, 47, z100, Add(9, lpC0), 0, 0) + CH04(ts, 0, 47, z100, __LINE__, 0, 0) } CH00(arg0, 1) @@ -1224,7 +1224,7 @@ Method(m4b8,, Serialized) SET0(z100, ts, 0) - CH03(ts, z100, 11, 0, 0) + CH03(ts, z100, 11, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl index 2adf74b..87258d1 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl @@ -87,12 +87,12 @@ Method(m4b9,, Serialized) // CondRefOf CondRefOf(Local0, Local1) - CH03(ts, z101, 1, 0, 0) + CH03(ts, z101, 1, __LINE__, 0) // CopyObject CopyObject(Local0, Local1) - CH03(ts, z101, 2, 0, 0) + CH03(ts, z101, 2, __LINE__, 0) // Decrement @@ -137,12 +137,12 @@ Method(m4b9,, Serialized) // ObjectType Store (ObjectType(Local0), Local1) - CH03(ts, z101, 3, 0, 0) + CH03(ts, z101, 3, __LINE__, 0) // RefOf Store (RefOf(Local0), Local1) - CH03(ts, z101, 4, 0, 0) + CH03(ts, z101, 4, __LINE__, 0) // Release @@ -207,7 +207,7 @@ Method(m4b9,, Serialized) // Acquire Store(Acquire(Local0, 100), Local1) - CH03(ts, z101, 30, 0, 0) + CH03(ts, z101, 30, __LINE__, 0) // Add @@ -443,13 +443,13 @@ Method(m4b9,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 9)) { - err(arg0, z101, 200, 0, 0, Local0, 9) + err(arg0, z101, __LINE__, 0, 0, Local0, 9) return (1) } Store (DeRefOf(arg1), Local1) if(LNot(SLCK)){ - CH04(ts, 0, 47, z101, 5, 0, 0) + CH04(ts, 0, 47, z101, __LINE__, 0, 0) } // CondRefOf @@ -459,7 +459,7 @@ Method(m4b9,, Serialized) // CopyObject CopyObject(DeRefOf(arg1), Local1) - CH03(ts, z101, 2, 0, 0) + CH03(ts, z101, 2, __LINE__, 0) // Decrement @@ -504,7 +504,7 @@ Method(m4b9,, Serialized) // ObjectType Store (ObjectType(DeRefOf(arg1)), Local1) - CH03(ts, z101, 6, 0, 0) + CH03(ts, z101, 6, __LINE__, 0) // RefOf @@ -818,7 +818,7 @@ Method(m4b9,, Serialized) // CopyObject CopyObject(m000(), Local1) - CH03(ts, z101, 7, 0, 0) + CH03(ts, z101, 7, __LINE__, 0) // Decrement @@ -864,7 +864,7 @@ Method(m4b9,, Serialized) /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Store (ObjectType(m000), Local0) - CH03(ts, z101, 8, 0, 0) + CH03(ts, z101, 8, __LINE__, 0) // RefOf /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ @@ -1189,7 +1189,7 @@ Method(m4b9,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z101, 0, 0, 0, i000, arg1) + err(arg0, z101, __LINE__, 0, 0, i000, arg1) } } @@ -1203,7 +1203,7 @@ Method(m4b9,, Serialized) Store (DerefOf(m000(1, lpC0)), Local1) if(Lnot(SLCK)){ - CH04(ts, 0, 47, z101, Add(9, lpC0), 0, 0) + CH04(ts, 0, 47, z101, __LINE__, 0, 0) } CH00(arg0, 1) @@ -1228,7 +1228,7 @@ Method(m4b9,, Serialized) SET0(z101, ts, 0) - CH03(ts, z101, 11, 0, 0) + CH03(ts, z101, 11, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl index d11f25b..1437d14 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl @@ -85,15 +85,15 @@ Method(m4ba,, Serialized) // CondRefOf Store (CondRefOf(Local0), Local1) - CH03(ts, z102, 0, 0, 0) + CH03(ts, z102, 0, __LINE__, 0) CondRefOf(Local0, Local1) - CH03(ts, z102, 1, 0, 0) + CH03(ts, z102, 1, __LINE__, 0) // CopyObject CopyObject(Local0, Local1) - CH03(ts, z102, 2, 0, 0) + CH03(ts, z102, 2, __LINE__, 0) // Decrement @@ -138,12 +138,12 @@ Method(m4ba,, Serialized) // ObjectType Store (ObjectType(Local0), Local1) - CH03(ts, z102, 3, 0, 0) + CH03(ts, z102, 3, __LINE__, 0) // RefOf Store (RefOf(Local0), Local1) - CH03(ts, z102, 4, 0, 0) + CH03(ts, z102, 4, __LINE__, 0) // Release @@ -444,12 +444,12 @@ Method(m4ba,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 10)) { - err(arg0, z102, 200, 0, 0, Local0, 10) + err(arg0, z102, __LINE__, 0, 0, Local0, 10) return (1) } Store (DeRefOf(arg1), Local1) - CH03(ts, z102, 5, 0, 0) + CH03(ts, z102, 5, __LINE__, 0) // CondRefOf @@ -504,7 +504,7 @@ Method(m4ba,, Serialized) // ObjectType Store (ObjectType(DeRefOf(arg1)), Local1) - CH03(ts, z102, 6, 0, 0) + CH03(ts, z102, 6, __LINE__, 0) // RefOf @@ -813,7 +813,7 @@ Method(m4ba,, Serialized) // CopyObject CopyObject(m000(), Local1) - CH03(ts, z102, 7, 0, 0) + CH03(ts, z102, 7, __LINE__, 0) // Decrement @@ -859,7 +859,7 @@ Method(m4ba,, Serialized) /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Store (ObjectType(m000), Local0) - CH03(ts, z102, 8, 0, 0) + CH03(ts, z102, 8, __LINE__, 0) // RefOf /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ @@ -1182,7 +1182,7 @@ Method(m4ba,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z102, 0, 0, 0, i000, arg1) + err(arg0, z102, __LINE__, 0, 0, i000, arg1) } } @@ -1215,7 +1215,7 @@ Method(m4ba,, Serialized) } } - CH03(ts, z102, 11, 0, 0) + CH03(ts, z102, 11, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl index 5e31a4d..3fca809 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl @@ -86,12 +86,12 @@ Method(m4bb,, Serialized) // CondRefOf CondRefOf(Local0, Local1) - CH03(ts, z103, 1, 0, 0) + CH03(ts, z103, 1, __LINE__, 0) // CopyObject CopyObject(Local0, Local1) - CH03(ts, z103, 2, 0, 0) + CH03(ts, z103, 2, __LINE__, 0) // Decrement @@ -136,12 +136,12 @@ Method(m4bb,, Serialized) // ObjectType Store (ObjectType(Local0), Local1) - CH03(ts, z103, 3, 0, 0) + CH03(ts, z103, 3, __LINE__, 0) // RefOf Store (RefOf(Local0), Local1) - CH03(ts, z103, 4, 0, 0) + CH03(ts, z103, 4, __LINE__, 0) // Release @@ -442,13 +442,13 @@ Method(m4bb,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 11)) { - err(arg0, z103, 200, 0, 0, Local0, 11) + err(arg0, z103, __LINE__, 0, 0, Local0, 11) return (1) } Store (DeRefOf(arg1), Local1) if(LNot(SLCK)){ - CH04(ts, 0, 47, z103, 5, 0, 0) + CH04(ts, 0, 47, z103, __LINE__, 0, 0) } // CondRefOf @@ -459,7 +459,7 @@ Method(m4bb,, Serialized) // CopyObject CopyObject(DeRefOf(arg1), Local1) - CH03(ts, z103, 2, 0, 0) + CH03(ts, z103, 2, __LINE__, 0) // Decrement @@ -504,7 +504,7 @@ Method(m4bb,, Serialized) // ObjectType Store (ObjectType(DeRefOf(arg1)), Local1) - CH03(ts, z103, 6, 0, 0) + CH03(ts, z103, 6, __LINE__, 0) // RefOf @@ -818,7 +818,7 @@ Method(m4bb,, Serialized) // CopyObject CopyObject(m000(), Local1) - CH03(ts, z103, 7, 0, 0) + CH03(ts, z103, 7, __LINE__, 0) // Decrement @@ -864,7 +864,7 @@ Method(m4bb,, Serialized) /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Store (ObjectType(m000), Local0) - CH03(ts, z103, 8, 0, 0) + CH03(ts, z103, 8, __LINE__, 0) // RefOf /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ @@ -1189,7 +1189,7 @@ Method(m4bb,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z103, 0, 0, 0, i000, arg1) + err(arg0, z103, __LINE__, 0, 0, i000, arg1) } } @@ -1203,7 +1203,7 @@ Method(m4bb,, Serialized) Store (DerefOf(m000(1, lpC0)), Local1) if(LNot(SLCK)){ - CH04(ts, 0, 47, z103, Add(9, lpC0), 0, 0) + CH04(ts, 0, 47, z103, __LINE__, 0, 0) } CH00(arg0, 1) @@ -1228,7 +1228,7 @@ Method(m4bb,, Serialized) SET0(z103, ts, 0) - CH03(ts, z103, 11, 0, 0) + CH03(ts, z103, 11, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl index b50d318..fac7e64 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl @@ -88,12 +88,12 @@ Method(m4bc,, Serialized) // CondRefOf CondRefOf(Local0, Local1) - CH03(ts, z104, 1, 0, 0) + CH03(ts, z104, 1, __LINE__, 0) // CopyObject CopyObject(Local0, Local1) - CH03(ts, z104, 2, 0, 0) + CH03(ts, z104, 2, __LINE__, 0) // Decrement @@ -138,12 +138,12 @@ Method(m4bc,, Serialized) // ObjectType Store (ObjectType(Local0), Local1) - CH03(ts, z104, 3, 0, 0) + CH03(ts, z104, 3, __LINE__, 0) // RefOf Store (RefOf(Local0), Local1) - CH03(ts, z104, 4, 0, 0) + CH03(ts, z104, 4, __LINE__, 0) // Release @@ -444,13 +444,13 @@ Method(m4bc,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 12)) { - err(arg0, z104, 200, 0, 0, Local0, 12) + err(arg0, z104, __LINE__, 0, 0, Local0, 12) return (1) } Store (DeRefOf(arg1), Local1) if(LNot(SLCK)){ - CH04(ts, 0, 47, z104, 5, 0, 0) + CH04(ts, 0, 47, z104, __LINE__, 0, 0) } // CondRefOf @@ -461,7 +461,7 @@ Method(m4bc,, Serialized) // CopyObject CopyObject(DeRefOf(arg1), Local1) - CH03(ts, z104, 2, 0, 0) + CH03(ts, z104, 2, __LINE__, 0) // Decrement @@ -506,7 +506,7 @@ Method(m4bc,, Serialized) // ObjectType Store (ObjectType(DeRefOf(arg1)), Local1) - CH03(ts, z104, 6, 0, 0) + CH03(ts, z104, 6, __LINE__, 0) // RefOf @@ -820,7 +820,7 @@ Method(m4bc,, Serialized) // CopyObject CopyObject(m000(), Local1) - CH03(ts, z104, 7, 0, 0) + CH03(ts, z104, 7, __LINE__, 0) // Decrement @@ -866,7 +866,7 @@ Method(m4bc,, Serialized) /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Store (ObjectType(m000), Local0) - CH03(ts, z104, 8, 0, 0) + CH03(ts, z104, 8, __LINE__, 0) // RefOf /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ @@ -1191,7 +1191,7 @@ Method(m4bc,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z104, 0, 0, 0, i000, arg1) + err(arg0, z104, __LINE__, 0, 0, i000, arg1) } } @@ -1205,7 +1205,7 @@ Method(m4bc,, Serialized) Store (DerefOf(m000(1, lpC0)), Local1) if(LNot(SLCK)){ - CH04(ts, 0, 47, z104, Add(9, lpC0), 0, 0) + CH04(ts, 0, 47, z104, __LINE__, 0, 0) } CH00(arg0, 1) @@ -1230,7 +1230,7 @@ Method(m4bc,, Serialized) SET0(z104, ts, 0) - CH03(ts, z104, 11, 0, 0) + CH03(ts, z104, 11, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl index 37b0132..b9ae44c 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl @@ -86,12 +86,12 @@ Method(m4bd,, Serialized) // CondRefOf CondRefOf(Local0, Local1) - CH03(ts, z105, 1, 0, 0) + CH03(ts, z105, 1, __LINE__, 0) // CopyObject CopyObject(Local0, Local1) - CH03(ts, z105, 2, 0, 0) + CH03(ts, z105, 2, __LINE__, 0) // Decrement @@ -136,12 +136,12 @@ Method(m4bd,, Serialized) // ObjectType Store (ObjectType(Local0), Local1) - CH03(ts, z105, 3, 0, 0) + CH03(ts, z105, 3, __LINE__, 0) // RefOf Store (RefOf(Local0), Local1) - CH03(ts, z105, 4, 0, 0) + CH03(ts, z105, 4, __LINE__, 0) // Release @@ -444,7 +444,7 @@ Method(m4bd,, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 13)) { - err(arg0, z105, 200, 0, 0, Local0, 13) + err(arg0, z105, __LINE__, 0, 0, Local0, 13) return (1) } @@ -455,7 +455,7 @@ Method(m4bd,, Serialized) } Store (DeRefOf(arg1), Local1) - CH03(ts, z105, 5, 0, 0) + CH03(ts, z105, 5, __LINE__, 0) // CondRefOf @@ -510,7 +510,7 @@ Method(m4bd,, Serialized) // ObjectType Store (ObjectType(DeRefOf(arg1)), Local1) - CH03(ts, z105, 6, 0, 0) + CH03(ts, z105, 6, __LINE__, 0) // RefOf @@ -819,7 +819,7 @@ Method(m4bd,, Serialized) // CopyObject CopyObject(m000(), Local1) - CH03(ts, z105, 7, 0, 0) + CH03(ts, z105, 7, __LINE__, 0) // Decrement @@ -865,7 +865,7 @@ Method(m4bd,, Serialized) /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Store (ObjectType(m000), Local0) - CH03(ts, z105, 8, 0, 0) + CH03(ts, z105, 8, __LINE__, 0) // RefOf /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ @@ -1188,7 +1188,7 @@ Method(m4bd,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z105, 0, 0, 0, i000, arg1) + err(arg0, z105, __LINE__, 0, 0, i000, arg1) } } @@ -1201,7 +1201,7 @@ Method(m4bd,, Serialized) Store(0, i000) Store (DerefOf(m000(1, lpC0)), Local1) - CH03(ts, z105, Add(9, lpC0), 0, 0) + CH03(ts, z105, __LINE__, 0, 0) CH00(arg0, 1) Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) @@ -1221,7 +1221,7 @@ Method(m4bd,, Serialized) } } - CH03(ts, z105, 11, 0, 0) + CH03(ts, z105, 11, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl index 0c6b492..0420eee 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl @@ -83,9 +83,9 @@ Method(m4be,, Serialized) Store (Index(bf03, 0), Local1) if (y900) { - CH03(ts, z106, 0, 0, 0) + CH03(ts, z106, 0, __LINE__, 0) } else { - CH04(ts, 0, 85, z106, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z106, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } @@ -114,9 +114,9 @@ Method(m4be,, Serialized) Store (Index(bf21, 0), Local1) if (y900) { - CH03(ts, z106, 1, 0, 0) + CH03(ts, z106, 1, __LINE__, 0) } else { - CH04(ts, 0, 85, z106, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z106, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } @@ -129,12 +129,12 @@ Method(m4be,, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z106, 6, 0, 0, Local0, 14) + err(arg0, z106, __LINE__, 0, 0, Local0, 14) return (1) } Store (DerefOf(arg1), Local1) - CH03(ts, z106, 2, 0, 0) + CH03(ts, z106, 2, __LINE__, 0) Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 7, 47) @@ -144,9 +144,9 @@ Method(m4be,, Serialized) if (arg2) { // Like Buffer behaviour if (y900) { - CH03(ts, z106, 3, 0, 0) + CH03(ts, z106, 3, __LINE__, 0) } else { - CH04(ts, 0, 85, z106, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z106, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } else { // Like Integer behaviour @@ -186,7 +186,7 @@ Method(m4be,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z106, 10, 0, 0, i000, arg1) + err(arg0, z106, __LINE__, 0, 0, i000, arg1) } } @@ -218,7 +218,7 @@ Method(m4be,, Serialized) if (y900) { CH03(ts, z106, Add(8, lpC0), 0, 0) } else { - CH04(ts, 0, 85, z106, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED + CH04(ts, 0, 85, z106, __LINE__, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } } else { // Like Integer behaviour @@ -235,7 +235,7 @@ Method(m4be,, Serialized) } } - CH03(ts, z106, 12, 0, 0) + CH03(ts, z106, 12, __LINE__, 0) // Local Named Object m000(ts) diff --git a/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl b/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl index b352086..44a6242 100644 --- a/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl +++ b/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl @@ -55,95 +55,95 @@ Method(m000, 6, Serialized) case (0) { Add(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 0, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Add(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 1, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (1) { Subtract(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 2, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (2) { Multiply(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 3, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Multiply(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 4, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (3) { And(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 5, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } And(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 6, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (4) { Nand(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 7, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Nand(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 8, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (5) { Nor(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 9, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Nor(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 10, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (6) { Or(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 11, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Or(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 12, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (7) { Xor(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 13, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Xor(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 14, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (8) { Mod(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 15, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (9) { ShiftLeft(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 16, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (10) { ShiftRight(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 17, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } } @@ -178,10 +178,10 @@ Method(m001, 6, Serialized) case (0) { Divide(Local0, Local1, Local6, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 18, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } if (LNotEqual(Local6, Local3)) { - err(arg0, z083, 19, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } } @@ -210,31 +210,31 @@ Method(m002, 6, Serialized) case (0) { Increment(Local0) if (LNotEqual(Local0, Local1)) { - err(arg0, z083, 20, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (1) { Decrement(Local0) if (LNotEqual(Local0, Local1)) { - err(arg0, z083, 21, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (2) { Not(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z083, 22, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (3) { FindSetLeftBit(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z083, 23, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (4) { FindSetRightBit(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z083, 24, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } } @@ -1441,7 +1441,7 @@ Method(FSL0,, Serialized) FindSetLeftBit(Local2, Local3) Add(Local1, 1, Local4) if (LNotEqual(Local3, Local4)) { - err(ts, z083, 25, 0, 0, Local0, 0) + err(ts, z083, __LINE__, 0, 0, Local0, 0) } Increment(Local1) Decrement(Local0) @@ -1502,7 +1502,7 @@ Method(FSR0,, Serialized) } FindSetRightBit(Local2, Local3) if (LNotEqual(Local3, Local4)) { - err(ts, z083, 26, 0, 0, Local0, 0) + err(ts, z083, __LINE__, 0, 0, Local0, 0) } Increment(Local1) Decrement(Local0) diff --git a/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl b/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl index bed20f8..9866996 100644 --- a/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl +++ b/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl @@ -172,13 +172,13 @@ Method(m210, 7, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 0, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(arg2, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 1, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -198,13 +198,13 @@ Method(m210, 7, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 2, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(arg5, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 3, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -223,13 +223,13 @@ Method(m210, 7, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x0000000000000001)) { - err(arg0, z001, 4, 0, 0, Local0, 0x0000000000000001) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000000001) } Store(arg3, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 5, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -248,13 +248,13 @@ Method(m210, 7, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x0000000000000001)) { - err(arg0, z001, 6, 0, 0, Local0, 0x0000000000000001) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000000001) } Store(arg4, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 7, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -265,17 +265,17 @@ Method(m210, 7, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg6)) { - err(arg0, z001, 8, 0, 0, Local0, arg6) + err(arg0, z001, __LINE__, 0, 0, Local0, arg6) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg6)) { - err(arg0, z001, 9, 0, 0, Local0, arg6) + err(arg0, z001, __LINE__, 0, 0, Local0, arg6) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 10, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } if (pr00) { @@ -307,7 +307,7 @@ Method(m211,, Serialized) While (n000) { if (LGreaterEqual(ncur, bsz1)) { - err(ts, z001, 11, 0, 0, ncur, bsz1) + err(ts, z001, __LINE__, 0, 0, ncur, bsz1) Break } @@ -359,13 +359,13 @@ Method(m212, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 12, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b000, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 13, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -385,13 +385,13 @@ Method(m212, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 14, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b101, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 15, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -410,13 +410,13 @@ Method(m212, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x00000000000000ff)) { - err(arg0, z001, 16, 0, 0, Local0, 0x00000000000000ff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x00000000000000ff) } Store(b0ff, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 17, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -435,13 +435,13 @@ Method(m212, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x00000000000000ff)) { - err(arg0, z001, 18, 0, 0, Local0, 0x00000000000000ff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x00000000000000ff) } Store(b010, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 19, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -460,13 +460,13 @@ Method(m212, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x0000000000000096)) { - err(arg0, z001, 20, 0, 0, Local0, 0x0000000000000096) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000000096) } Store(b0B0, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 21, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -477,17 +477,17 @@ Method(m212, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 22, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 23, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 24, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } if (pr00) { @@ -519,7 +519,7 @@ Method(m213,, Serialized) While (n000) { if (LGreaterEqual(ncur, bsz1)) { - err(ts, z001, 25, 0, 0, ncur, bsz1) + err(ts, z001, __LINE__, 0, 0, ncur, bsz1) Break } @@ -571,13 +571,13 @@ Method(m214, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 26, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b000, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 27, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -597,13 +597,13 @@ Method(m214, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 28, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b101, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 29, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -622,13 +622,13 @@ Method(m214, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x000000000000ffff)) { - err(arg0, z001, 30, 0, 0, Local0, 0x000000000000ffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x000000000000ffff) } Store(b0ff, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 31, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -647,13 +647,13 @@ Method(m214, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x000000000000ffff)) { - err(arg0, z001, 32, 0, 0, Local0, 0x000000000000ffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x000000000000ffff) } Store(b010, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 33, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -662,12 +662,12 @@ Method(m214, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 34, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 35, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } //////////////// E. 0->1 (000->010) @@ -682,13 +682,13 @@ Method(m214, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x0000000000007698)) { - err(arg0, z001, 36, 0, 0, Local0, 0x0000000000007698) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000007698) } Store(b0B0, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 37, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -699,17 +699,17 @@ Method(m214, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 38, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 39, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 40, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } if (pr00) { @@ -741,7 +741,7 @@ Method(m215,, Serialized) While (n000) { if (LGreaterEqual(ncur, bsz1)) { - err(ts, z001, 41, 0, 0, ncur, bsz1) + err(ts, z001, __LINE__, 0, 0, ncur, bsz1) Break } @@ -801,13 +801,13 @@ Method(m216, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 42, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b000, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 43, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -827,13 +827,13 @@ Method(m216, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 44, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b101, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 45, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -852,13 +852,13 @@ Method(m216, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x00000000ffffffff)) { - err(arg0, z001, 46, 0, 0, Local0, 0x00000000ffffffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x00000000ffffffff) } Store(b0ff, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 47, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -877,13 +877,13 @@ Method(m216, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x00000000ffffffff)) { - err(arg0, z001, 48, 0, 0, Local0, 0x00000000ffffffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x00000000ffffffff) } Store(b010, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 49, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -892,12 +892,12 @@ Method(m216, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 50, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 51, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } //////////////// E. 0->1 (000->010) @@ -912,13 +912,13 @@ Method(m216, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x0000000032547698)) { - err(arg0, z001, 52, 0, 0, Local0, 0x0000000032547698) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000032547698) } Store(b0B0, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 53, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -929,17 +929,17 @@ Method(m216, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 54, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 55, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 56, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } if (pr00) { @@ -971,7 +971,7 @@ Method(m217,, Serialized) While (n000) { if (LGreaterEqual(ncur, bsz1)) { - err(ts, z001, 57, 0, 0, ncur, bsz1) + err(ts, z001, __LINE__, 0, 0, ncur, bsz1) Break } @@ -1059,18 +1059,18 @@ Method(m218, 3, Serialized) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 0x0000000000000000)) { - err(arg0, z001, 58, 0, 0, Local0, 0x0000000000000000) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000000000) } } else { if (LNotEqual(Local0, bb00)) { - err(arg0, z001, 59, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } Store(b000, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 60, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -1093,18 +1093,18 @@ Method(m218, 3, Serialized) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 0x0000000000000000)) { - err(arg0, z001, 61, 0, 0, Local0, 0x0000000000000000) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000000000) } } else { if (LNotEqual(Local0, bb00)) { - err(arg0, z001, 62, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } Store(b101, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 63, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -1128,7 +1128,7 @@ Method(m218, 3, Serialized) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 0xffffffffffffffff)) { - err(arg0, z001, 64, 0, 0, Local0, 0xffffffffffffffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0xffffffffffffffff) } } else { if (LNotEqual(Local0, bb01)) { @@ -1140,7 +1140,7 @@ Method(m218, 3, Serialized) Store("=========================.", Debug) } - err(arg0, z001, 65, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } @@ -1160,7 +1160,7 @@ Method(m218, 3, Serialized) Store("=========================.", Debug) } - err(arg0, z001, 66, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -1200,7 +1200,7 @@ Method(m218, 3, Serialized) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 0xffffffffffffffff)) { - err(arg0, z001, 67, 0, 0, Local0, 0xffffffffffffffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0xffffffffffffffff) } } else { if (LNotEqual(Local0, bb01)) { @@ -1212,7 +1212,7 @@ Method(m218, 3, Serialized) Store("=========================.", Debug) } - err(arg0, z001, 68, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } @@ -1232,7 +1232,7 @@ Method(m218, 3, Serialized) Store("=========================.", Debug) } - err(arg0, z001, 69, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -1242,12 +1242,12 @@ Method(m218, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 70, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 71, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } //////////////// E. 0->1 (000->010) @@ -1276,11 +1276,11 @@ Method(m218, 3, Serialized) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 0xefcdab1032547698)) { - err(arg0, z001, 72, 0, 0, Local0, 0xefcdab1032547698) + err(arg0, z001, __LINE__, 0, 0, Local0, 0xefcdab1032547698) } } else { if (LNotEqual(Local0, bb02)) { - err(arg0, z001, 73, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } @@ -1292,7 +1292,7 @@ Method(m218, 3, Serialized) } if (LNotEqual(b001, b002)) { - err(arg0, z001, 74, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -1305,17 +1305,17 @@ Method(m218, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 75, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 76, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 77, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } if (pr00) { @@ -1356,7 +1356,7 @@ Method(m219,, Serialized) While (n000) { if (LGreaterEqual(ncur, bsz1)) { - err(ts, z001, 78, 0, 0, ncur, bsz1) + err(ts, z001, __LINE__, 0, 0, ncur, bsz1) Break } @@ -1467,7 +1467,7 @@ Method(m21a, 6, Serialized) Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 79, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } // Fill the entire buffer (ground) @@ -1503,11 +1503,11 @@ Method(m21a, 6, Serialized) if (INT0) { Store(arg5, INT1) if (LNotEqual(Local0, INT1)) { - err(arg0, z001, 80, 0, 0, Local0, INT1) + err(arg0, z001, __LINE__, 0, 0, Local0, INT1) } } else { if (LNotEqual(Local0, arg5)) { - err(arg0, z001, 81, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } @@ -1516,7 +1516,7 @@ Method(m21a, 6, Serialized) Store(b0B0, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 82, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) if (pr00) { Store("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE:", Debug) @@ -1574,7 +1574,7 @@ Method(m21b, 6, Serialized) // Num of bits have to be non-zero if (LEqual(arg3, 0)) { - err(arg0, z001, 83, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) return (Ones) } diff --git a/tests/aslts/src/runtime/collections/functional/constant/constants.asl b/tests/aslts/src/runtime/collections/functional/constant/constants.asl index 4d2089b..ca666b7 100644 --- a/tests/aslts/src/runtime/collections/functional/constant/constants.asl +++ b/tests/aslts/src/runtime/collections/functional/constant/constants.asl @@ -38,29 +38,29 @@ Method(CST1,, Serialized) Name(ts, "CST1") if (LNotEqual(Zero, 0)){ - err(ts, z002, 0, 0, 0, Zero, 0) + err(ts, z002, __LINE__, 0, 0, Zero, 0) } if (LNotEqual(One, 1)){ - err(ts, z002, 1, 0, 0, One, 1) + err(ts, z002, __LINE__, 0, 0, One, 1) } if (LEqual(F64, 1)) { if (LNotEqual(Ones, 0xffffffffffffffff)){ - err(ts, z002, 2, 0, 0, Ones, 0xffffffffffffffff) + err(ts, z002, __LINE__, 0, 0, Ones, 0xffffffffffffffff) } } else { if (LNotEqual(Ones, 0xffffffff)){ - err(ts, z002, 3, 0, 0, Ones, 0xffffffff) + err(ts, z002, __LINE__, 0, 0, Ones, 0xffffffff) } } if (LLess(Revision, 0x20140114)){ - err(ts, z002, 4, 0, 0, Revision, 0x20050114) + err(ts, z002, __LINE__, 0, 0, Revision, 0x20050114) } if (LGreater(Revision, 0x20500000)){ - err(ts, z002, 5, 0, 0, Revision, 0x20500000) + err(ts, z002, __LINE__, 0, 0, Revision, 0x20500000) } /* @@ -71,6 +71,6 @@ Method(CST1,, Serialized) * other ACPI implementations. */ if (LNotEqual(\_REV, 2)){ - err(ts, z002, 6, 0, 0, \_REV, 2) + err(ts, z002, __LINE__, 0, 0, \_REV, 2) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl index 13c7131..3434ed5 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl @@ -178,202 +178,202 @@ Method(mf71,, Serialized) Store(0xabcd9000, i000) - CH03("", z136, 0x100, 0, 0) + CH03("", z136, 0x100, __LINE__, 0) Store(m000(), i000) if (SLCK) { - CH03("", z136, 0x101, 0, 0) + CH03("", z136, 0x101, __LINE__, 0) if (y901) { Store(0, Local0) } else { Store(0xabcd0002, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x102, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z136, 0x103, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m001 Store(0xabcd9001, i000) - CH03("", z136, 0x104, 0, 0) + CH03("", z136, 0x104, __LINE__, 0) Store(m001(), i000) if (SLCK) { - CH03("", z136, 0x105, 0, 0) + CH03("", z136, 0x105, __LINE__, 0) if (LNotEqual(i000, 0xabcd0003)) { - err("", z136, 0x106, 0, 0, i000, 0xabcd0003) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0003) } } else { - CH04("", 0, 0xff, z136, 0x107, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m002 Store(0xabcd9002, i000) - CH03("", z136, 0x108, 0, 0) + CH03("", z136, 0x108, __LINE__, 0) Store(m002(1), i000) if (SLCK) { - CH03("", z136, 0x109, 0, 0) + CH03("", z136, 0x109, __LINE__, 0) if (LNotEqual(i000, 0xabcd0004)) { - err("", z136, 0x10a, 0, 0, i000, 0xabcd0004) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0004) } } else { - CH04("", 0, 0xff, z136, 0x10b, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m003 Store(0xabcd9003, i000) - CH03("", z136, 0x10c, 0, 0) + CH03("", z136, 0x10c, __LINE__, 0) Store(m003(0), i000) if (SLCK) { - CH03("", z136, 0x10d, 0, 0) + CH03("", z136, 0x10d, __LINE__, 0) if (LNotEqual(i000, 0xabcd0006)) { - err("", z136, 0x10e, 0, 0, i000, 0xabcd0006) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0006) } } else { - CH04("", 0, 0xff, z136, 0x10f, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m004(0) Store(0xabcd9004, i000) - CH03("", z136, 0x110, 0, 0) + CH03("", z136, 0x110, __LINE__, 0) Store(m004(0), i000) if (SLCK) { - CH03("", z136, 0x111, 0, 0) + CH03("", z136, 0x111, __LINE__, 0) if (LNotEqual(i000, 0xabcd0007)) { - err("", z136, 0x112, 0, 0, i000, 0xabcd0007) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0007) } } else { - CH04("", 0, 0xff, z136, 0x113, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m004(0x12345678) Store(0xabcd9005, i000) - CH03("", z136, 0x114, 0, 0) + CH03("", z136, 0x114, __LINE__, 0) Store(m004(0x12345678), i000) if (SLCK) { - CH03("", z136, 0x115, 0, 0) + CH03("", z136, 0x115, __LINE__, 0) if (LNotEqual(i000, 0xabcd0008)) { - err("", z136, 0x116, 0, 0, i000, 0xabcd0008) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0008) } } else { - CH04("", 0, 0xff, z136, 0x117, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m004(Default) Store(0xabcd9006, i000) - CH03("", z136, 0x118, 0, 0) + CH03("", z136, 0x118, __LINE__, 0) Store(m004(1111), i000) if (SLCK) { - CH03("", z136, 0x119, 0, 0) + CH03("", z136, 0x119, __LINE__, 0) if (LNotEqual(i000, 0xabcd0009)) { - err("", z136, 0x11a, 0, 0, i000, 0xabcd0009) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0009) } } else { - CH04("", 0, 0xff, z136, 0x11b, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m005 Store(0xabcd9007, i000) - CH03("", z136, 0x11c, 0, 0) + CH03("", z136, 0x11c, __LINE__, 0) Store(m005(), i000) if (SLCK) { - CH03("", z136, 0x11d, 0, 0) + CH03("", z136, 0x11d, __LINE__, 0) if (LNotEqual(i000, 0xabcd000a)) { - err("", z136, 0x11e, 0, 0, i000, 0xabcd000a) + err("", z136, __LINE__, 0, 0, i000, 0xabcd000a) } } else { - CH04("", 0, 0xff, z136, 0x11f, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m006 Store(0xabcd9008, i000) - CH03("", z136, 0x120, 0, 0) + CH03("", z136, 0x120, __LINE__, 0) Store(m006(), i000) if (SLCK) { - CH03("", z136, 0x121, 0, 0) + CH03("", z136, 0x121, __LINE__, 0) if (y901) { Store(0xabcd0003, Local0) } else { Store(0xabcd000b, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x122, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z136, 0x123, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m007 Store(0xabcd9009, i000) - CH03("", z136, 0x124, 0, 0) + CH03("", z136, 0x124, __LINE__, 0) Store(m007(), i000) if (SLCK) { - CH03("", z136, 0x125, 0, 0) + CH03("", z136, 0x125, __LINE__, 0) if (y901) { Store(0xabcd0001, Local0) } else { Store(0xabcd000c, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x126, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z136, 0x127, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m008 Store(0xabcd900a, i000) - CH03("", z136, 0x128, 0, 0) + CH03("", z136, 0x128, __LINE__, 0) Store(m008(), i000) if (SLCK) { - CH03("", z136, 0x129, 0, 0) + CH03("", z136, 0x129, __LINE__, 0) if (LNotEqual(i000, 0xabcd000d)) { - err("", z136, 0x12a, 0, 0, i000, 0xabcd000d) + err("", z136, __LINE__, 0, 0, i000, 0xabcd000d) } } else { - CH04("", 0, 0xff, z136, 0x12b, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } } @@ -561,219 +561,219 @@ Method(mff0,, Serialized) Store(0xabcd9000, i000) - CH03("", z136, 0x12c, 0, 0) + CH03("", z136, 0x12c, __LINE__, 0) Store(m000(), i000) if (SLCK) { - CH03("", z136, 0x12d, 0, 0) + CH03("", z136, 0x12d, __LINE__, 0) if (y901) { Store(0, Local0) } else { Store(0xabcd0002, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x12e, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z136, 0x12f, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m001 Store(0xabcd9001, i000) - CH03("", z136, 0x130, 0, 0) + CH03("", z136, 0x130, __LINE__, 0) Store(m001(), i000) if (SLCK) { - CH03("", z136, 0x131, 0, 0) + CH03("", z136, 0x131, __LINE__, 0) if (LNotEqual(i000, 0xabcd0003)) { - err("", z136, 0x132, 0, 0, i000, 0xabcd0003) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0003) } } else { - CH04("", 0, 0xff, z136, 0x133, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m002 Store(0xabcd9002, i000) - CH03("", z136, 0x134, 0, 0) + CH03("", z136, 0x134, __LINE__, 0) Store(m002(1), i000) if (SLCK) { - CH03("", z136, 0x135, 0, 0) + CH03("", z136, 0x135, __LINE__, 0) if (LNotEqual(i000, 0xabcd0004)) { - err("", z136, 0x136, 0, 0, i000, 0xabcd0004) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0004) } } else { - CH04("", 0, 0xff, z136, 0x137, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m003 Store(0xabcd9003, i000) - CH03("", z136, 0x138, 0, 0) + CH03("", z136, 0x138, __LINE__, 0) Store(m003(0), i000) if (SLCK) { - CH03("", z136, 0x139, 0, 0) + CH03("", z136, 0x139, __LINE__, 0) if (LNotEqual(i000, 0xabcd0006)) { - err("", z136, 0x10e, 0, 0, i000, 0xabcd0006) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0006) } } else { - CH04("", 0, 0xff, z136, 0x13a, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m004(0) Store(0xabcd9004, i000) - CH03("", z136, 0x13b, 0, 0) + CH03("", z136, 0x13b, __LINE__, 0) Store(m004(0), i000) if (SLCK) { - CH03("", z136, 0x13c, 0, 0) + CH03("", z136, 0x13c, __LINE__, 0) if (LNotEqual(i000, 0xabcd0007)) { - err("", z136, 0x13d, 0, 0, i000, 0xabcd0007) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0007) } } else { - CH04("", 0, 0xff, z136, 0x13e, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m004(0x12345678) Store(0xabcd9005, i000) - CH03("", z136, 0x13f, 0, 0) + CH03("", z136, 0x13f, __LINE__, 0) Store(m004(0x12345678), i000) if (SLCK) { - CH03("", z136, 0x140, 0, 0) + CH03("", z136, 0x140, __LINE__, 0) if (LNotEqual(i000, 0xabcd0008)) { - err("", z136, 0x141, 0, 0, i000, 0xabcd0008) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0008) } } else { - CH04("", 0, 0xff, z136, 0x142, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m004(Default) Store(0xabcd9006, i000) - CH03("", z136, 0x143, 0, 0) + CH03("", z136, 0x143, __LINE__, 0) Store(m004(1111), i000) if (SLCK) { - CH03("", z136, 0x144, 0, 0) + CH03("", z136, 0x144, __LINE__, 0) if (LNotEqual(i000, 0xabcd0009)) { - err("", z136, 0x145, 0, 0, i000, 0xabcd0009) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0009) } } else { - CH04("", 0, 0xff, z136, 0x146, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m005 Store(0xabcd9007, i000) - CH03("", z136, 0x147, 0, 0) + CH03("", z136, 0x147, __LINE__, 0) Store(m005(), i000) if (SLCK) { - CH03("", z136, 0x148, 0, 0) + CH03("", z136, 0x148, __LINE__, 0) if (LNotEqual(i000, 0xabcd000a)) { - err("", z136, 0x149, 0, 0, i000, 0xabcd000a) + err("", z136, __LINE__, 0, 0, i000, 0xabcd000a) } } else { - CH04("", 0, 0xff, z136, 0x14a, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m006 Store(0xabcd9008, i000) - CH03("", z136, 0x14b, 0, 0) + CH03("", z136, 0x14b, __LINE__, 0) Store(m006(), i000) if (SLCK) { - CH03("", z136, 0x14c, 0, 0) + CH03("", z136, 0x14c, __LINE__, 0) if (y901) { Store(0xabcd0002, Local0) } else { Store(0xabcd000b, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x14d, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z136, 0x14e, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m007 Store(0xabcd9009, i000) - CH03("", z136, 0x14f, 0, 0) + CH03("", z136, 0x14f, __LINE__, 0) Store(m007(), i000) if (SLCK) { - CH03("", z136, 0x150, 0, 0) + CH03("", z136, 0x150, __LINE__, 0) if (y901) { Store(0xabcd0005, Local0) } else { Store(0xabcd000c, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x151, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z136, 0x152, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m008 Store(0xabcd900a, i000) - CH03("", z136, 0x153, 0, 0) + CH03("", z136, 0x153, __LINE__, 0) Store(m008(), i000) if (SLCK) { - CH03("", z136, 0x154, 0, 0) + CH03("", z136, 0x154, __LINE__, 0) if (LNotEqual(i000, 0xabcd000d)) { - err("", z136, 0x155, 0, 0, i000, 0xabcd000d) + err("", z136, __LINE__, 0, 0, i000, 0xabcd000d) } } else { - CH04("", 0, 0xff, z136, 0x156, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } // m009 Store(0xabcd900b, i000) - CH03("", z136, 0x157, 0, 0) + CH03("", z136, 0x157, __LINE__, 0) Store(m009(), i000) if (SLCK) { - CH03("", z136, 0x158, 0, 0) + CH03("", z136, 0x158, __LINE__, 0) if (LNotEqual(i000, 0xabcd000e)) { - err("", z136, 0x159, 0, 0, i000, 0xabcd000e) + err("", z136, __LINE__, 0, 0, i000, 0xabcd000e) } } else { - CH04("", 0, 0xff, z136, 0x15a, 0, 0) + CH04("", 0, 0xff, z136, __LINE__, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/standaloneret.asl b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/standaloneret.asl index 5e4646c..efcb87f 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/standaloneret.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/standaloneret.asl @@ -188,186 +188,186 @@ Method(mf6f,, Serialized) Store(0xabcd9000, i000) - CH03("", z137, 0x200, 0, 0) + CH03("", z137, 0x200, __LINE__, 0) Store(m000(), i000) if (SLCK) { - CH03("", z137, 0x201, 0, 0) + CH03("", z137, 0x201, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x202, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x203, 0, 0) + CH03("", z137, 0x203, __LINE__, 0) } // m001 Store(0xabcd9001, i000) - CH03("", z137, 0x204, 0, 0) + CH03("", z137, 0x204, __LINE__, 0) Store(m001(), i000) if (SLCK) { - CH03("", z137, 0x205, 0, 0) + CH03("", z137, 0x205, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x206, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x207, 0, 0) + CH03("", z137, 0x207, __LINE__, 0) } // m002 Store(0xabcd9002, i000) - CH03("", z137, 0x208, 0, 0) + CH03("", z137, 0x208, __LINE__, 0) Store(m002(1), i000) if (SLCK) { - CH03("", z137, 0x209, 0, 0) + CH03("", z137, 0x209, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x20a, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x20b, 0, 0) + CH03("", z137, 0x20b, __LINE__, 0) } // m003 Store(0xabcd9003, i000) - CH03("", z137, 0x20c, 0, 0) + CH03("", z137, 0x20c, __LINE__, 0) Store(m003(0), i000) if (SLCK) { - CH03("", z137, 0x20d, 0, 0) + CH03("", z137, 0x20d, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x20e, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x20f, 0, 0) + CH03("", z137, 0x20f, __LINE__, 0) } // m004(0) Store(0xabcd9004, i000) - CH03("", z137, 0x210, 0, 0) + CH03("", z137, 0x210, __LINE__, 0) Store(m004(0), i000) if (SLCK) { - CH03("", z137, 0x211, 0, 0) + CH03("", z137, 0x211, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x212, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x213, 0, 0) + CH03("", z137, 0x213, __LINE__, 0) } // m004(0x12345678) Store(0xabcd9005, i000) - CH03("", z137, 0x214, 0, 0) + CH03("", z137, 0x214, __LINE__, 0) Store(m004(0x12345678), i000) if (SLCK) { - CH03("", z137, 0x215, 0, 0) + CH03("", z137, 0x215, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x216, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x217, 0, 0) + CH03("", z137, 0x217, __LINE__, 0) } // m004(Default) Store(0xabcd9006, i000) - CH03("", z137, 0x218, 0, 0) + CH03("", z137, 0x218, __LINE__, 0) Store(m004(1111), i000) if (SLCK) { - CH03("", z137, 0x219, 0, 0) + CH03("", z137, 0x219, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x21a, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x21b, 0, 0) + CH03("", z137, 0x21b, __LINE__, 0) } // m005 Store(0xabcd9007, i000) - CH03("", z137, 0x21c, 0, 0) + CH03("", z137, 0x21c, __LINE__, 0) Store(m005(), i000) if (SLCK) { - CH03("", z137, 0x21d, 0, 0) + CH03("", z137, 0x21d, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x21e, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x21f, 0, 0) + CH03("", z137, 0x21f, __LINE__, 0) } // m006 Store(0xabcd9008, i000) - CH03("", z137, 0x220, 0, 0) + CH03("", z137, 0x220, __LINE__, 0) Store(m006(), i000) if (SLCK) { - CH03("", z137, 0x221, 0, 0) + CH03("", z137, 0x221, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x222, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x223, 0, 0) + CH03("", z137, 0x223, __LINE__, 0) } // m007 Store(0xabcd9009, i000) - CH03("", z137, 0x224, 0, 0) + CH03("", z137, 0x224, __LINE__, 0) Store(m007(), i000) if (SLCK) { - CH03("", z137, 0x225, 0, 0) + CH03("", z137, 0x225, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x226, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x227, 0, 0) + CH03("", z137, 0x227, __LINE__, 0) } // m008 Store(0xabcd900a, i000) - CH03("", z137, 0x228, 0, 0) + CH03("", z137, 0x228, __LINE__, 0) Store(m008(), i000) if (SLCK) { - CH03("", z137, 0x229, 0, 0) + CH03("", z137, 0x229, __LINE__, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x22a, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { - CH03("", z137, 0x22b, 0, 0) + CH03("", z137, 0x22b, __LINE__, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/store.asl b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/store.asl index c8f8b9e..b3e9b18 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/store.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/store.asl @@ -178,202 +178,202 @@ Method(mf6c,, Serialized) Store(0xabcd9000, i000) - CH03("", z138, 0x000, 0, 0) + CH03("", z138, 0x000, __LINE__, 0) Store(m000(), i000) if (SLCK) { - CH03("", z138, 0x001, 0, 0) + CH03("", z138, 0x001, __LINE__, 0) if (y901) { Store(0, Local0) } else { Store(0xabcd0002, Local0) } if (LNotEqual(i000, Local0)) { - err("", z138, 0x002, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x003, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m001 Store(0xabcd9001, i000) - CH03("", z138, 0x004, 0, 0) + CH03("", z138, 0x004, __LINE__, 0) Store(m001(), i000) if (SLCK) { - CH03("", z138, 0x005, 0, 0) + CH03("", z138, 0x005, __LINE__, 0) if (LNotEqual(i000, 0xabcd0003)) { - err("", z138, 0x006, 0, 0, i000, 0xabcd0003) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0003) } } else { - CH04("", 0, 0xff, z138, 0x007, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m002 Store(0xabcd9002, i000) - CH03("", z138, 0x008, 0, 0) + CH03("", z138, 0x008, __LINE__, 0) Store(m002(1), i000) if (SLCK) { - CH03("", z138, 0x009, 0, 0) + CH03("", z138, 0x009, __LINE__, 0) if (LNotEqual(i000, 0xabcd0004)) { - err("", z138, 0x00a, 0, 0, i000, 0xabcd0004) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0004) } } else { - CH04("", 0, 0xff, z138, 0x00b, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m003 Store(0xabcd9003, i000) - CH03("", z138, 0x00c, 0, 0) + CH03("", z138, 0x00c, __LINE__, 0) Store(m003(0), i000) if (SLCK) { - CH03("", z138, 0x00d, 0, 0) + CH03("", z138, 0x00d, __LINE__, 0) if (LNotEqual(i000, 0xabcd0006)) { - err("", z138, 0x00e, 0, 0, i000, 0xabcd0006) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0006) } } else { - CH04("", 0, 0xff, z138, 0x00f, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m004(0) Store(0xabcd9004, i000) - CH03("", z138, 0x010, 0, 0) + CH03("", z138, 0x010, __LINE__, 0) Store(m004(0), i000) if (SLCK) { - CH03("", z138, 0x011, 0, 0) + CH03("", z138, 0x011, __LINE__, 0) if (LNotEqual(i000, 0xabcd0007)) { - err("", z138, 0x012, 0, 0, i000, 0xabcd0007) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0007) } } else { - CH04("", 0, 0xff, z138, 0x013, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m004(0x12345678) Store(0xabcd9005, i000) - CH03("", z138, 0x014, 0, 0) + CH03("", z138, 0x014, __LINE__, 0) Store(m004(0x12345678), i000) if (SLCK) { - CH03("", z138, 0x015, 0, 0) + CH03("", z138, 0x015, __LINE__, 0) if (LNotEqual(i000, 0xabcd0008)) { - err("", z138, 0x016, 0, 0, i000, 0xabcd0008) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0008) } } else { - CH04("", 0, 0xff, z138, 0x017, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m004(Default) Store(0xabcd9006, i000) - CH03("", z138, 0x018, 0, 0) + CH03("", z138, 0x018, __LINE__, 0) Store(m004(1111), i000) if (SLCK) { - CH03("", z138, 0x019, 0, 0) + CH03("", z138, 0x019, __LINE__, 0) if (LNotEqual(i000, 0xabcd0009)) { - err("", z138, 0x01a, 0, 0, i000, 0xabcd0009) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0009) } } else { - CH04("", 0, 0xff, z138, 0x01b, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m005 Store(0xabcd9007, i000) - CH03("", z138, 0x01c, 0, 0) + CH03("", z138, 0x01c, __LINE__, 0) Store(m005(), i000) if (SLCK) { - CH03("", z138, 0x01d, 0, 0) + CH03("", z138, 0x01d, __LINE__, 0) if (LNotEqual(i000, 0xabcd000a)) { - err("", z138, 0x01e, 0, 0, i000, 0xabcd000a) + err("", z138, __LINE__, 0, 0, i000, 0xabcd000a) } } else { - CH04("", 0, 0xff, z138, 0x01f, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m006 Store(0xabcd9008, i000) - CH03("", z138, 0x020, 0, 0) + CH03("", z138, 0x020, __LINE__, 0) Store(m006(), i000) if (SLCK) { - CH03("", z138, 0x021, 0, 0) + CH03("", z138, 0x021, __LINE__, 0) if (y901) { Store(1, Local0) } else { Store(0xabcd000b, Local0) } if (LNotEqual(i000, Local0)) { - err("", z138, 0x022, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x023, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m007 Store(0xabcd9009, i000) - CH03("", z138, 0x024, 0, 0) + CH03("", z138, 0x024, __LINE__, 0) Store(m007(), i000) if (SLCK) { - CH03("", z138, 0x025, 0, 0) + CH03("", z138, 0x025, __LINE__, 0) if (y901) { Store(1, Local0) } else { Store(0xabcd000c, Local0) } if (LNotEqual(i000, Local0)) { - err("", z138, 0x026, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x027, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m008 Store(0xabcd900a, i000) - CH03("", z138, 0x028, 0, 0) + CH03("", z138, 0x028, __LINE__, 0) Store(m008(), i000) if (SLCK) { - CH03("", z138, 0x029, 0, 0) + CH03("", z138, 0x029, __LINE__, 0) if (LNotEqual(i000, 0xabcd000d)) { - err("", z138, 0x02a, 0, 0, i000, 0xabcd000d) + err("", z138, __LINE__, 0, 0, i000, 0xabcd000d) } } else { - CH04("", 0, 0xff, z138, 0x02b, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } } @@ -624,55 +624,55 @@ Method(mf6e,, Serialized) } Store(0xdddd0000, i000) - CH03("", z138, 0x02c, 0, 0) + CH03("", z138, 0x02c, __LINE__, 0) Store(m000(), i000) if (SLCK) { - CH03("", z138, 0x02d, 0, 0) + CH03("", z138, 0x02d, __LINE__, 0) Store(0xaaaa0006, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x02e, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x02f, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x030, 0, 0) + CH03("", z138, 0x030, __LINE__, 0) Store(m001(), i000) if (SLCK) { - CH03("", z138, 0x031, 0, 0) + CH03("", z138, 0x031, __LINE__, 0) Store(0xaaaa000c, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x032, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x033, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x034, 0, 0) + CH03("", z138, 0x034, __LINE__, 0) Store(m002(), i000) if (SLCK) { - CH03("", z138, 0x035, 0, 0) + CH03("", z138, 0x035, __LINE__, 0) Store(0xaaaa0013, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x036, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x037, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x038, 0, 0) + CH03("", z138, 0x038, __LINE__, 0) Store(m003(), i000) if (SLCK) { - CH03("", z138, 0x039, 0, 0) + CH03("", z138, 0x039, __LINE__, 0) Store(0xaaaa0019, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x03a, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x03b, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } @@ -680,68 +680,68 @@ Method(mf6e,, Serialized) Store(0xdddd0000, i000) - CH03("", z138, 0x03c, 0, 0) + CH03("", z138, 0x03c, __LINE__, 0) Store(m006(), i000) if (LAnd(SLCK, y901)) { - CH03("", z138, 0x03d, 0, 0) + CH03("", z138, 0x03d, __LINE__, 0) Store(0, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x03e, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x03f, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x040, 0, 0) + CH03("", z138, 0x040, __LINE__, 0) Store(m007(), i000) if (LAnd(SLCK, y901)) { - CH03("", z138, 0x041, 0, 0) + CH03("", z138, 0x041, __LINE__, 0) Store(0, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x042, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x043, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x044, 0, 0) + CH03("", z138, 0x044, __LINE__, 0) Store(m008(), i000) if (LAnd(SLCK, y901)) { - CH03("", z138, 0x045, 0, 0) + CH03("", z138, 0x045, __LINE__, 0) Store(0xabcd0000, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x046, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x047, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x048, 0, 0) + CH03("", z138, 0x048, __LINE__, 0) Store(m009(), i000) if (LAnd(SLCK, y901)) { - CH03("", z138, 0x049, 0, 0) + CH03("", z138, 0x049, __LINE__, 0) Store(0xabcd0000, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x04a, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x04b, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x04c, 0, 0) + CH03("", z138, 0x04c, __LINE__, 0) Store(m00a(), i000) if (LAnd(SLCK, y901)) { - CH03("", z138, 0x04d, 0, 0) + CH03("", z138, 0x04d, __LINE__, 0) Store(0xabcd0008, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x04e, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x04f, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0, tmp0) @@ -749,19 +749,19 @@ Method(mf6e,, Serialized) Store(1, tmp0) } Store(0xdddd0000, i000) - CH03("", z138, 0x050, 0, 0) + CH03("", z138, 0x050, __LINE__, 0) Store(m00b(), i000) if (tmp0) { - CH03("", z138, 0x051, 0, 0) + CH03("", z138, 0x051, __LINE__, 0) // Oct 2013, David Box // Implicit return for logical opertions (LNot, LEqual, ...) // returns logical value of the operation Store(Ones, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x052, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x053, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0, tmp0) @@ -769,32 +769,32 @@ Method(mf6e,, Serialized) Store(1, tmp0) } Store(0xdddd0000, i000) - CH03("", z138, 0x054, 0, 0) + CH03("", z138, 0x054, __LINE__, 0) Store(m00c(), i000) if (tmp0) { - CH03("", z138, 0x055, 0, 0) + CH03("", z138, 0x055, __LINE__, 0) // Oct 2013, David Box // Implicit return for logical opertions (LNot, LEqual, ...) // returns logical value of the operation Store(Zero, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x056, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x057, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x058, 0, 0) + CH03("", z138, 0x058, __LINE__, 0) Store(m00d(), i000) if (LAnd(SLCK, y901)) { - CH03("", z138, 0x059, 0, 0) + CH03("", z138, 0x059, __LINE__, 0) Store(0xabcd0009, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x05a, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x05b, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0, tmp0) @@ -802,19 +802,19 @@ Method(mf6e,, Serialized) Store(1, tmp0) } Store(0xdddd0000, i000) - CH03("", z138, 0x05c, 0, 0) + CH03("", z138, 0x05c, __LINE__, 0) Store(m00e(), i000) if (tmp0) { - CH03("", z138, 0x05d, 0, 0) + CH03("", z138, 0x05d, __LINE__, 0) // Oct 2013, David Box // Implicit return for logical opertions (LNot, LEqual, ...) // returns logical value of the operation Store(Ones, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x05e, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x55f, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0, tmp0) @@ -822,76 +822,76 @@ Method(mf6e,, Serialized) Store(1, tmp0) } Store(0xdddd0000, i000) - CH03("", z138, 0x060, 0, 0) + CH03("", z138, 0x060, __LINE__, 0) Store(m00f(), i000) if (tmp0) { - CH03("", z138, 0x061, 0, 0) + CH03("", z138, 0x061, __LINE__, 0) // Oct 2013, David Box // Implicit return for logical opertions (LNot, LEqual, ...) // returns logical value of the operation Store(Zero, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x062, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x063, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x064, 0, 0) + CH03("", z138, 0x064, __LINE__, 0) Store(m010(), i000) if (LAnd(SLCK, y901)) { - CH03("", z138, 0x065, 0, 0) + CH03("", z138, 0x065, __LINE__, 0) Store(0xabcd0008, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x066, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x067, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } if (y901) { Store(0xdddd0000, i000) - CH03("", z138, 0x068, 0, 0) + CH03("", z138, 0x068, __LINE__, 0) Store(m011(), i000) if (LAnd(SLCK, y901)) { - CH03("", z138, 0x069, 0, 0) + CH03("", z138, 0x069, __LINE__, 0) Store(Zero, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x06a, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x06b, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x06c, 0, 0) + CH03("", z138, 0x06c, __LINE__, 0) Store(m012(), i000) if (LAnd(SLCK, y901)) { - CH03("", z138, 0x06d, 0, 0) + CH03("", z138, 0x06d, __LINE__, 0) Store(Ones, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x06e, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x06f, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } } /* if (y901) */ // Should be the last Store(0xdddd0000, i000) - CH03("", z138, 0x070, 0, 0) + CH03("", z138, 0x070, __LINE__, 0) Store(m004(), i000) if (SLCK) { - CH03("", z138, 0x071, 0, 0) + CH03("", z138, 0x071, __LINE__, 0) Store(0xaaaa001c, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x072, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { - CH04("", 0, 0xff, z138, 0x073, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } @@ -912,69 +912,69 @@ Method(mf6e,, Serialized) if (0xabcd0007) { Store(0xdddd0000, i000) - CH03("", z138, 0x040, 0, 0) + CH03("", z138, 0x040, __LINE__, 0) Store(m000(), i000) if (r002) { if (SLCK) { - CH03("", z138, 0x041, 0, 0) + CH03("", z138, 0x041, __LINE__, 0) if (LNotEqual(i000, 0xaaaa0006)) { - err("", z138, 0x042, 0, 0, i000, 0xaaaa0006) + err("", z138, __LINE__, 0, 0, i000, 0xaaaa0006) } } else { - CH04("", 0, 0xff, z138, 0x043, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x044, 0, 0) + CH03("", z138, 0x044, __LINE__, 0) Store(m001(), i000) if (SLCK) { - CH03("", z138, 0x045, 0, 0) + CH03("", z138, 0x045, __LINE__, 0) if (LNotEqual(i000, 0xaaaa000c)) { - err("", z138, 0x046, 0, 0, i000, 0xaaaa000c) + err("", z138, __LINE__, 0, 0, i000, 0xaaaa000c) } } else { - CH04("", 0, 0xff, z138, 0x047, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0123, i000) if (r003) { - CH03("", z138, 0x048, 0, 0) + CH03("", z138, 0x048, __LINE__, 0) Store(m002(), i000) if (SLCK) { - CH03("", z138, 0x049, 0, 0) + CH03("", z138, 0x049, __LINE__, 0) if (LNotEqual(i000, 0xaaaa0013)) { - err("", z138, 0x04a, 0, 0, i000, 0xaaaa0013) + err("", z138, __LINE__, 0, 0, i000, 0xaaaa0013) } } else { - CH04("", 0, 0xff, z138, 0x04b, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x04c, 0, 0) + CH03("", z138, 0x04c, __LINE__, 0) Store(m003(), i000) if (SLCK) { - CH03("", z138, 0x04d, 0, 0) + CH03("", z138, 0x04d, __LINE__, 0) if (LNotEqual(i000, 0xaaaa0019)) { - err("", z138, 0x04e, 0, 0, i000, 0xaaaa0019) + err("", z138, __LINE__, 0, 0, i000, 0xaaaa0019) } } else { - CH04("", 0, 0xff, z138, 0x04f, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } Store(0xdddd0000, i000) - CH03("", z138, 0x050, 0, 0) + CH03("", z138, 0x050, __LINE__, 0) Store(m004(), i000) if (SLCK) { - CH03("", z138, 0x051, 0, 0) + CH03("", z138, 0x051, __LINE__, 0) if (LNotEqual(i000, 0xaaaa001c)) { - err("", z138, 0x052, 0, 0, i000, 0xaaaa001c) + err("", z138, __LINE__, 0, 0, i000, 0xaaaa001c) } } else { - CH04("", 0, 0xff, z138, 0x053, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } while (0xabcd0008) { @@ -1034,72 +1034,72 @@ Method(mf6e,, Serialized) // 0000 Store(0xdddd0000, i003) - CH03("", z138, 0x054, 0, 0) + CH03("", z138, 0x054, __LINE__, 0) Store(m005(0), i003) if (SLCK) { - CH03("", z138, 0x055, 0, 0) + CH03("", z138, 0x055, __LINE__, 0) if (LNotEqual(i003, 0xabcd0030)) { - err("", z138, 0x056, 0, 0, i003, 0xabcd0030) + err("", z138, __LINE__, 0, 0, i003, 0xabcd0030) } } else { - CH03("", z138, 0x057, 0, 0) + CH03("", z138, 0x057, __LINE__, 0) } // r001 Store(0xdddd0000, i003) - CH03("", z138, 0x058, 0, 0) + CH03("", z138, 0x058, __LINE__, 0) Store(m005(1), i003) if (SLCK) { - CH03("", z138, 0x059, 0, 0) + CH03("", z138, 0x059, __LINE__, 0) if (y901) { Store(0, Local0) } else { Store(Ones, Local0) } if (LNotEqual(i003, Local0)) { - err("", z138, 0x05a, 0, 0, i003, Local0) + err("", z138, __LINE__, 0, 0, i003, Local0) } } else { - CH04("", 0, 0xff, z138, 0x05b, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // r002 Store(0xdddd0000, i003) - CH03("", z138, 0x05c, 0, 0) + CH03("", z138, 0x05c, __LINE__, 0) Store(m005(2), i003) if (SLCK) { - CH03("", z138, 0x05d, 0, 0) + CH03("", z138, 0x05d, __LINE__, 0) if (y901) { Store(i006, Local0) } else { Store(0xaaaa0006, Local0) } if (LNotEqual(i003, Local0)) { - err("", z138, 0x05e, 0, 0, i003, Local0) + err("", z138, __LINE__, 0, 0, i003, Local0) } } else { - CH04("", 0, 0xff, z138, 0x05f, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // r003 Store(0xdddd0000, i003) - CH03("", z138, 0x060, 0, 0) + CH03("", z138, 0x060, __LINE__, 0) Store(m005(3), i003) if (SLCK) { - CH03("", z138, 0x061, 0, 0) + CH03("", z138, 0x061, __LINE__, 0) if (y901) { Store(i007, Local0) } else { Store(0xdddd0123, Local0) } if (LNotEqual(i003, Local0)) { - err("", z138, 0x062, 0, 0, i003, Local0) + err("", z138, __LINE__, 0, 0, i003, Local0) } } else { - CH04("", 0, 0xff, z138, 0x063, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } } @@ -1228,112 +1228,112 @@ Method(mff1,, Serialized) // m002 Store(0, Local0) - CH03("", z138, 0x064, 0, 0) + CH03("", z138, 0x064, __LINE__, 0) Store(m002(), Local0) if (SLCK) { - CH03("", z138, 0x065, 0, 0) + CH03("", z138, 0x065, __LINE__, 0) if (LNotEqual(Local0, 0xf3)) { - err("", z138, 0x066, 0, 0, Local0, 0xf3) + err("", z138, __LINE__, 0, 0, Local0, 0xf3) } } else { - CH04("", 0, 0xff, z138, 0x067, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m004 Store(0, Local0) - CH03("", z138, 0x068, 0, 0) + CH03("", z138, 0x068, __LINE__, 0) Store(m004(), Local0) if (SLCK) { - CH03("", z138, 0x069, 0, 0) + CH03("", z138, 0x069, __LINE__, 0) if (LNotEqual(Local0, 0xfabec)) { - err("", z138, 0x06a, 0, 0, Local0, 0xfabec) + err("", z138, __LINE__, 0, 0, Local0, 0xfabec) } } else { - CH04("", 0, 0xff, z138, 0x06b, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m006 Store(0, Local0) - CH03("", z138, 0x06e, 0, 0) + CH03("", z138, 0x06e, __LINE__, 0) Store(m006(), Local0) if (SLCK) { - CH03("", z138, 0x06f, 0, 0) + CH03("", z138, 0x06f, __LINE__, 0) if (LNotEqual(Local0, 0xcedab)) { - err("", z138, 0x070, 0, 0, Local0, 0xcedab) + err("", z138, __LINE__, 0, 0, Local0, 0xcedab) } } else { - CH04("", 0, 0xff, z138, 0x071, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m008 Store(0, Local0) - CH03("", z138, 0x072, 0, 0) + CH03("", z138, 0x072, __LINE__, 0) Store(m008(), Local0) if (SLCK) { - CH03("", z138, 0x073, 0, 0) + CH03("", z138, 0x073, __LINE__, 0) if (LNotEqual(Local0, 0xabcd)) { - err("", z138, 0x074, 0, 0, Local0, 0xabcd) + err("", z138, __LINE__, 0, 0, Local0, 0xabcd) } } else { - CH04("", 0, 0xff, z138, 0x075, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m00a Store(0, Local0) - CH03("", z138, 0x076, 0, 0) + CH03("", z138, 0x076, __LINE__, 0) Store(m00a(), Local0) if (SLCK) { - CH03("", z138, 0x077, 0, 0) + CH03("", z138, 0x077, __LINE__, 0) if (LNotEqual(Local0, 0x1234)) { - err("", z138, 0x078, 0, 0, Local0, 0x1234) + err("", z138, __LINE__, 0, 0, Local0, 0x1234) } } else { - CH04("", 0, 0xff, z138, 0x079, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } // m00b Store(0, Local0) - CH03("", z138, 0x080, 0, 0) + CH03("", z138, 0x080, __LINE__, 0) Store(m00b(), Local0) if (SLCK) { - CH03("", z138, 0x081, 0, 0) + CH03("", z138, 0x081, __LINE__, 0) if (LNotEqual(Local0, 0x5678)) { - err("", z138, 0x082, 0, 0, Local0, 0x5678) + err("", z138, __LINE__, 0, 0, Local0, 0x5678) } } else { - CH04("", 0, 0xff, z138, 0x083, 0, 0) + CH04("", 0, 0xff, z138, __LINE__, 0, 0) } if (LNotEqual(i000, 0xf3)) { - err("", z138, 0x084, 0, 0, i000, 0xf3) + err("", z138, __LINE__, 0, 0, i000, 0xf3) } if (LNotEqual(i001, 0xf3)) { - err("", z138, 0x085, 0, 0, i001, 0xf3) + err("", z138, __LINE__, 0, 0, i001, 0xf3) } if (LNotEqual(i002, 0xabcd)) { - err("", z138, 0x086, 0, 0, i002, 0xabcd) + err("", z138, __LINE__, 0, 0, i002, 0xabcd) } if (LNotEqual(i003, 0xabcd)) { - err("", z138, 0x087, 0, 0, i003, 0xabcd) + err("", z138, __LINE__, 0, 0, i003, 0xabcd) } if (LNotEqual(i004, 0xabcd)) { - err("", z138, 0x088, 0, 0, i004, 0xabcd) + err("", z138, __LINE__, 0, 0, i004, 0xabcd) } if (LNotEqual(i005, 0x1234)) { - err("", z138, 0x089, 0, 0, i005, 0x1234) + err("", z138, __LINE__, 0, 0, i005, 0x1234) } if (LNotEqual(i006, 0x1234)) { - err("", z138, 0x08a, 0, 0, i006, 0x1234) + err("", z138, __LINE__, 0, 0, i006, 0x1234) } if (LNotEqual(i007, 0x5678)) { - err("", z138, 0x08b, 0, 0, i007, 0x5678) + err("", z138, __LINE__, 0, 0, i007, 0x5678) } if (LNotEqual(i008, 0x5678)) { - err("", z138, 0x08c, 0, 0, i008, 0x5678) + err("", z138, __LINE__, 0, 0, i008, 0x5678) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/Recursion/recursion.asl b/tests/aslts/src/runtime/collections/functional/control/Recursion/recursion.asl index 4b704ec..2a98d64 100644 --- a/tests/aslts/src/runtime/collections/functional/control/Recursion/recursion.asl +++ b/tests/aslts/src/runtime/collections/functional/control/Recursion/recursion.asl @@ -152,7 +152,7 @@ Method(m0ef,, Serialized) m801(1) } - CH03(ts, z177, 0x000, 0, 0) + CH03(ts, z177, 0x000, __LINE__, 0) m100() @@ -160,15 +160,15 @@ Method(m0ef,, Serialized) /* Check Maximal number of methods being in progress simultaneously */ if (LNotEqual(max0, 45)) { - err(ts, z177, 0x001, 0, 0, max0, 45) + err(ts, z177, __LINE__, 0, 0, max0, 45) } /* Overall got out of methods the same number as got into methods */ if (LNotEqual(cnt0, 0)) { - err(ts, z177, 0x002, 0, 0, cnt0, 0) + err(ts, z177, __LINE__, 0, 0, cnt0, 0) } - CH03(ts, z177, 0x003, 0, 0) + CH03(ts, z177, 0x003, __LINE__, 0) } /* @@ -281,7 +281,7 @@ Method(m0fb,, Serialized) Store(DeRefOf(Index(arg2, lpC0)), Local0) Store(DeRefOf(Index(arg3, lpC0)), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z177, 0x004, 0, 0, Local0, Local1) + err(ts, z177, __LINE__, 0, 0, Local0, Local1) Store(arg0, Debug) Store(lpC0, Debug) } @@ -292,22 +292,22 @@ Method(m0fb,, Serialized) Switch (arg0) { Case (1) { if (LNotEqual(ind1, n100)) { - err(ts, z177, 0x005, 0, 0, ind1, n100) + err(ts, z177, __LINE__, 0, 0, ind1, n100) } } Case (2) { if (LNotEqual(ind2, n200)) { - err(ts, z177, 0x006, 0, 0, ind2, n200) + err(ts, z177, __LINE__, 0, 0, ind2, n200) } } Case (3) { if (LNotEqual(ind3, n300)) { - err(ts, z177, 0x007, 0, 0, ind3, n300) + err(ts, z177, __LINE__, 0, 0, ind3, n300) } } Case (4) { if (LNotEqual(ind4, n400)) { - err(ts, z177, 0x008, 0, 0, ind4, n400) + err(ts, z177, __LINE__, 0, 0, ind4, n400) } } } @@ -355,7 +355,7 @@ Method(m0fb,, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p400, ii00)), ii00) if (LNotEqual(ii00, Local0)) { - err(ts, z177, 0x009, 0, 0, ii00, Local0) + err(ts, z177, __LINE__, 0, 0, ii00, Local0) } } Store(ind3, ii00) @@ -374,7 +374,7 @@ Method(m0fb,, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p300, ii00)), ii00) if (LNotEqual(ii00, Local0)) { - err(ts, z177, 0x00a, 0, 0, ii00, Local0) + err(ts, z177, __LINE__, 0, 0, ii00, Local0) } } Store(ind2, ii00) @@ -393,7 +393,7 @@ Method(m0fb,, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p200, ii00)), ii00) if (LNotEqual(ii00, Local0)) { - err(ts, z177, 0x00b, 0, 0, ii00, Local0) + err(ts, z177, __LINE__, 0, 0, ii00, Local0) } } Store(ind1, ii00) @@ -412,11 +412,11 @@ Method(m0fb,, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p100, ii00)), ii00) if (LNotEqual(ii00, Local0)) { - err(ts, z177, 0x00c, 0, 0, ii00, Local0) + err(ts, z177, __LINE__, 0, 0, ii00, Local0) } } - CH03(ts, z177, 0x00d, 0, 0) + CH03(ts, z177, 0x00d, __LINE__, 0) m100() @@ -424,12 +424,12 @@ Method(m0fb,, Serialized) /* Check Maximal number of methods being in progress simultaneously */ if (LNotEqual(max0, 45)) { - err(ts, z177, 0x00e, 0, 0, max0, 45) + err(ts, z177, __LINE__, 0, 0, max0, 45) } /* Overall got out of methods the same number as got into methods */ if (LNotEqual(cnt0, 0)) { - err(ts, z177, 0x00f, 0, 0, cnt0, 0) + err(ts, z177, __LINE__, 0, 0, cnt0, 0) } /* Check indexes */ @@ -441,10 +441,10 @@ Method(m0fb,, Serialized) /* Check the overall sum of total indexes */ if (LNotEqual(cnt1, 0x3DE)) { - err(ts, z177, 0x010, 0, 0, cnt1, 0x3DE) + err(ts, z177, __LINE__, 0, 0, cnt1, 0x3DE) } - CH03(ts, z177, 0x011, 0, 0) + CH03(ts, z177, 0x011, __LINE__, 0) } /* @@ -578,29 +578,29 @@ Method(m0ff, 1, Serialized) m801(1) } - CH03(ts, z177, 0x012, 0, 0) + CH03(ts, z177, 0x012, __LINE__, 0) Store(arg0, i000) m100() if (arg0) { - CH04(ts, 0, 84, z177, 0x013, 0, 0) // AE_AML_METHOD_LIMIT + CH04(ts, 0, 84, z177, __LINE__, 0, 0) // AE_AML_METHOD_LIMIT } else { Concatenate("Maximal number of methods being in progress simultaneously ", max0, Debug) /* Check Maximal number of methods being in progress simultaneously */ if (LNotEqual(max0, 221)) { - err(ts, z177, 0x014, 0, 0, max0, 221) + err(ts, z177, __LINE__, 0, 0, max0, 221) } /* Overall got out of methods the same number as got into methods */ if (LNotEqual(cnt0, 0)) { - err(ts, z177, 0x015, 0, 0, cnt0, 0) + err(ts, z177, __LINE__, 0, 0, cnt0, 0) } } - CH03(ts, z177, 0x016, 0, 0) + CH03(ts, z177, 0x016, __LINE__, 0) } /* @@ -719,7 +719,7 @@ Method(m18a, 1, Serialized) Store(DeRefOf(Index(arg2, lpC0)), Local0) Store(DeRefOf(Index(arg3, lpC0)), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z177, 0x017, 0, 0, Local0, Local1) + err(ts, z177, __LINE__, 0, 0, Local0, Local1) Store(arg0, Debug) Store(lpC0, Debug) } @@ -730,22 +730,22 @@ Method(m18a, 1, Serialized) Switch (arg0) { Case (1) { if (LNotEqual(ind1, n100)) { - err(ts, z177, 0x018, 0, 0, ind1, n100) + err(ts, z177, __LINE__, 0, 0, ind1, n100) } } Case (2) { if (LNotEqual(ind2, n200)) { - err(ts, z177, 0x019, 0, 0, ind2, n200) + err(ts, z177, __LINE__, 0, 0, ind2, n200) } } Case (3) { if (LNotEqual(ind3, n300)) { - err(ts, z177, 0x01a, 0, 0, ind3, n300) + err(ts, z177, __LINE__, 0, 0, ind3, n300) } } Case (4) { if (LNotEqual(ind4, n400)) { - err(ts, z177, 0x01b, 0, 0, ind4, n400) + err(ts, z177, __LINE__, 0, 0, ind4, n400) } } } @@ -783,7 +783,7 @@ Method(m18a, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p100, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x01c, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m200, 0, Serialized, 0) @@ -802,7 +802,7 @@ Method(m18a, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p200, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x01d, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m300, 0, Serialized, 0) @@ -826,7 +826,7 @@ Method(m18a, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p300, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x01e, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m400, 0, Serialized, 0) @@ -844,11 +844,11 @@ Method(m18a, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p400, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x01f, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } - CH03(ts, z177, 0x020, 0, 0) + CH03(ts, z177, 0x020, __LINE__, 0) Store(arg0, i000) @@ -857,17 +857,17 @@ Method(m18a, 1, Serialized) Concatenate("Maximal number of methods being in progress simultaneously ", max0, Debug) if (arg0) { - CH04(ts, 0, 84, z177, 0x113, 0, 0) // AE_AML_METHOD_LIMIT + CH04(ts, 0, 84, z177, __LINE__, 0, 0) // AE_AML_METHOD_LIMIT } else { /* Check Maximal number of methods being in progress simultaneously */ if (LNotEqual(max0, 45)) { - err(ts, z177, 0x021, 0, 0, max0, 45) + err(ts, z177, __LINE__, 0, 0, max0, 45) } /* Overall got out of methods the same number as got into methods */ if (LNotEqual(cnt0, 0)) { - err(ts, z177, 0x022, 0, 0, cnt0, 0) + err(ts, z177, __LINE__, 0, 0, cnt0, 0) } /* Check indexes */ @@ -879,10 +879,10 @@ Method(m18a, 1, Serialized) /* Check the overall sum of total indexes */ if (LNotEqual(cnt1, 0x3DE)) { - err(ts, z177, 0x023, 0, 0, cnt1, 0x3DE) + err(ts, z177, __LINE__, 0, 0, cnt1, 0x3DE) } } - CH03(ts, z177, 0x024, 0, 0) + CH03(ts, z177, 0x024, __LINE__, 0) } /* @@ -1000,7 +1000,7 @@ Method(m18b, 1, Serialized) Store(DeRefOf(Index(arg2, lpC0)), Local0) Store(DeRefOf(Index(arg3, lpC0)), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z177, 0x025, 0, 0, Local0, Local1) + err(ts, z177, __LINE__, 0, 0, Local0, Local1) Store(arg0, Debug) Store(lpC0, Debug) } @@ -1011,22 +1011,22 @@ Method(m18b, 1, Serialized) Switch (arg0) { Case (1) { if (LNotEqual(ind1, n100)) { - err(ts, z177, 0x026, 0, 0, ind1, n100) + err(ts, z177, __LINE__, 0, 0, ind1, n100) } } Case (2) { if (LNotEqual(ind2, n200)) { - err(ts, z177, 0x027, 0, 0, ind2, n200) + err(ts, z177, __LINE__, 0, 0, ind2, n200) } } Case (3) { if (LNotEqual(ind3, n300)) { - err(ts, z177, 0x028, 0, 0, ind3, n300) + err(ts, z177, __LINE__, 0, 0, ind3, n300) } } Case (4) { if (LNotEqual(ind4, n400)) { - err(ts, z177, 0x029, 0, 0, ind4, n400) + err(ts, z177, __LINE__, 0, 0, ind4, n400) } } } @@ -1064,7 +1064,7 @@ Method(m18b, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p100, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x02a, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m200, 0, Serialized, 7) @@ -1083,7 +1083,7 @@ Method(m18b, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p200, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x02b, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m300, 0, Serialized, 7) @@ -1107,7 +1107,7 @@ Method(m18b, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p300, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x02c, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m400, 0, Serialized, 7) @@ -1125,11 +1125,11 @@ Method(m18b, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p400, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x02d, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } - CH03(ts, z177, 0x02e, 0, 0) + CH03(ts, z177, 0x02e, __LINE__, 0) Store(arg0, i000) @@ -1138,17 +1138,17 @@ Method(m18b, 1, Serialized) Concatenate("Maximal number of methods being in progress simultaneously ", max0, Debug) if (arg0) { - CH04(ts, 0, 84, z177, 0x213, 0, 0) // AE_AML_METHOD_LIMIT + CH04(ts, 0, 84, z177, __LINE__, 0, 0) // AE_AML_METHOD_LIMIT } else { /* Check Maximal number of methods being in progress simultaneously */ if (LNotEqual(max0, 45)) { - err(ts, z177, 0x02f, 0, 0, max0, 45) + err(ts, z177, __LINE__, 0, 0, max0, 45) } /* Overall got out of methods the same number as got into methods */ if (LNotEqual(cnt0, 0)) { - err(ts, z177, 0x030, 0, 0, cnt0, 0) + err(ts, z177, __LINE__, 0, 0, cnt0, 0) } /* Check indexes */ @@ -1160,11 +1160,11 @@ Method(m18b, 1, Serialized) /* Check the overall sum of total indexes */ if (LNotEqual(cnt1, 0x3DE)) { - err(ts, z177, 0x031, 0, 0, cnt1, 0x3DE) + err(ts, z177, __LINE__, 0, 0, cnt1, 0x3DE) } } - CH03(ts, z177, 0x032, 0, 0) + CH03(ts, z177, 0x032, __LINE__, 0) } @@ -1190,9 +1190,9 @@ Method(m18d,, Serialized) } } - CH03(ts, z177, 0x033, 0, 0) + CH03(ts, z177, 0x033, __LINE__, 0) m000(0) - CH03(ts, z177, 0x034, 0, 0) + CH03(ts, z177, 0x034, __LINE__, 0) } /* @@ -1212,12 +1212,12 @@ Method(m18e,, Serialized) } } - CH03(ts, z177, 0x035, 0, 0) + CH03(ts, z177, 0x035, __LINE__, 0) m000(0) if (y902) { - CH04(ts, 0, 7, z177, 0x036, 0, 0) // AE_ALREADY_EXISTS + CH04(ts, 0, 7, z177, __LINE__, 0, 0) // AE_ALREADY_EXISTS } else { - CH03(ts, z177, 0x037, 0, 0) + CH03(ts, z177, 0x037, __LINE__, 0) } } @@ -1242,12 +1242,12 @@ Method(m18f,, Serialized) } } - CH03(ts, z177, 0x038, 0, 0) + CH03(ts, z177, 0x038, __LINE__, 0) m000(0) if (y902) { - CH04(ts, 0, 7, z177, 0x039, 0, 0) // AE_ALREADY_EXISTS + CH04(ts, 0, 7, z177, __LINE__, 0, 0) // AE_ALREADY_EXISTS } else { - CH03(ts, z177, 0x03a, 0, 0) + CH03(ts, z177, 0x03a, __LINE__, 0) } } @@ -1268,12 +1268,12 @@ Method(m19a,, Serialized) } } - CH03(ts, z177, 0x03b, 0, 0) + CH03(ts, z177, 0x03b, __LINE__, 0) m000(0) if (y902) { - CH04(ts, 0, 7, z177, 0x03c, 0, 0) // AE_ALREADY_EXISTS + CH04(ts, 0, 7, z177, __LINE__, 0, 0) // AE_ALREADY_EXISTS } else { - CH03(ts, z177, 0x03d, 0, 0) + CH03(ts, z177, 0x03d, __LINE__, 0) } } @@ -1294,12 +1294,12 @@ Method(m19b,, Serialized) } } - CH03(ts, z177, 0x03e, 0, 0) + CH03(ts, z177, 0x03e, __LINE__, 0) m000(0) if (y902) { - CH04(ts, 0, 7, z177, 0x03f, 0, 0) // AE_ALREADY_EXISTS + CH04(ts, 0, 7, z177, __LINE__, 0, 0) // AE_ALREADY_EXISTS } else { - CH03(ts, z177, 0x040, 0, 0) + CH03(ts, z177, 0x040, __LINE__, 0) } } @@ -1406,12 +1406,12 @@ Method(m19c,, Serialized) m801(1) } - CH03(ts, z177, 0x041, 0, 0) + CH03(ts, z177, 0x041, __LINE__, 0) m100() if (y902) { - CH04(ts, 0, 7, z177, 0x042, 0, 0) // AE_ALREADY_EXISTS + CH04(ts, 0, 7, z177, __LINE__, 0, 0) // AE_ALREADY_EXISTS } else { - CH03(ts, z177, 0x043, 0, 0) + CH03(ts, z177, 0x043, __LINE__, 0) } } @@ -1433,39 +1433,39 @@ Method(m19d,, Serialized) Name(\i2z0, 0xabcd0000) if (LNotEqual(i2z0, 0xabcd0000)) { - err(ts, z177, 0x044, 0, 0, i2z0, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, i2z0, 0xabcd0000) } if (LNotEqual(\i2z0, 0xabcd0000)) { - err(ts, z177, 0x045, 0, 0, \i2z0, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, \i2z0, 0xabcd0000) } Store(0x12345678, i2z0) if (LNotEqual(i2z0, 0x12345678)) { - err(ts, z177, 0x046, 0, 0, i2z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i2z0, 0x12345678) } if (LNotEqual(\i2z0, 0x12345678)) { - err(ts, z177, 0x047, 0, 0, \i2z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i2z0, 0x12345678) } Store(0x11112222, \i2z0) if (LNotEqual(i2z0, 0x11112222)) { - err(ts, z177, 0x048, 0, 0, i2z0, 0x11112222) + err(ts, z177, __LINE__, 0, 0, i2z0, 0x11112222) } if (LNotEqual(\i2z0, 0x11112222)) { - err(ts, z177, 0x049, 0, 0, \i2z0, 0x11112222) + err(ts, z177, __LINE__, 0, 0, \i2z0, 0x11112222) } } - CH03(ts, z177, 0x04a, 0, 0) + CH03(ts, z177, 0x04a, __LINE__, 0) m000(0) - CH03(ts, z177, 0x04b, 0, 0) + CH03(ts, z177, 0x04b, __LINE__, 0) Store(0x11112222, i2z0) - CH04(ts, 1, 5, z177, 0x04c, 0, 0) // AE_NOT_FOUND + CH04(ts, 1, 5, z177, __LINE__, 0, 0) // AE_NOT_FOUND Store(0x11112222, \i2z0) - CH04(ts, 1, 5, z177, 0x04d, 0, 0) // AE_NOT_FOUND + CH04(ts, 1, 5, z177, __LINE__, 0, 0) // AE_NOT_FOUND } /* @@ -1480,39 +1480,39 @@ Method(m19e,, Serialized) Name(\i2z1, 0xabcd0000) if (LNotEqual(i2z1, 0xabcd0000)) { - err(ts, z177, 0x04e, 0, 0, i2z1, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, i2z1, 0xabcd0000) } if (LNotEqual(\i2z1, 0xabcd0000)) { - err(ts, z177, 0x04f, 0, 0, \i2z1, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, \i2z1, 0xabcd0000) } Store(0x12345678, i2z1) if (LNotEqual(i2z1, 0x12345678)) { - err(ts, z177, 0x050, 0, 0, i2z1, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i2z1, 0x12345678) } if (LNotEqual(\i2z1, 0x12345678)) { - err(ts, z177, 0x051, 0, 0, \i2z1, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i2z1, 0x12345678) } Store(0x22223333, \i2z1) if (LNotEqual(i2z1, 0x22223333)) { - err(ts, z177, 0x052, 0, 0, i2z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z1, 0x22223333) } if (LNotEqual(\i2z1, 0x22223333)) { - err(ts, z177, 0x053, 0, 0, \i2z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z1, 0x22223333) } } - CH03(ts, z177, 0x054, 0, 0) + CH03(ts, z177, 0x054, __LINE__, 0) m000(0) - CH03(ts, z177, 0x055, 0, 0) + CH03(ts, z177, 0x055, __LINE__, 0) Store(0x11112222, i2z1) - CH04(ts, 1, 5, z177, 0x056, 0, 0) // AE_NOT_FOUND + CH04(ts, 1, 5, z177, __LINE__, 0, 0) // AE_NOT_FOUND Store(0x11112222, \i2z1) - CH04(ts, 1, 5, z177, 0x057, 0, 0) // AE_NOT_FOUND + CH04(ts, 1, 5, z177, __LINE__, 0, 0) // AE_NOT_FOUND } /* @@ -1532,9 +1532,9 @@ Method(m19f,, Serialized) } } - CH03(ts, z177, 0x058, 0, 0) + CH03(ts, z177, 0x058, __LINE__, 0) m000(0) - CH04(ts, 0, 7, z177, 0x059, 0, 0) // AE_ALREADY_EXISTS + CH04(ts, 0, 7, z177, __LINE__, 0, 0) // AE_ALREADY_EXISTS } /* @@ -1554,9 +1554,9 @@ Method(m1b8,, Serialized) } } - CH03(ts, z177, 0x05a, 0, 0) + CH03(ts, z177, 0x05a, __LINE__, 0) m000(0) - CH04(ts, 0, 7, z177, 0x05b, 0, 0) // AE_ALREADY_EXISTS + CH04(ts, 0, 7, z177, __LINE__, 0, 0) // AE_ALREADY_EXISTS } @@ -1577,9 +1577,9 @@ Method(m1b9,, Serialized) Scope(\_SB) { Name(i2z4, 0xabcd0004) } } - CH03(ts, z177, 0x05c, 0, 0) + CH03(ts, z177, 0x05c, __LINE__, 0) m000(0) - CH03(ts, z177, 0x05d, 0, 0) + CH03(ts, z177, 0x05d, __LINE__, 0) } /* @@ -1595,9 +1595,9 @@ Method(m1ba,, Serialized) Scope(\_SB) { Name(i2z5, 0xabcd0005) } } - CH03(ts, z177, 0x05e, 0, 0) + CH03(ts, z177, 0x05e, __LINE__, 0) m000(0) - CH03(ts, z177, 0x05f, 0, 0) + CH03(ts, z177, 0x05f, __LINE__, 0) } /* @@ -1617,9 +1617,9 @@ Method(m1bb,, Serialized) } } - CH03(ts, z177, 0x060, 0, 0) + CH03(ts, z177, 0x060, __LINE__, 0) m000(0) - CH04(ts, 0, 7, z177, 0x061, 0, 0) // AE_ALREADY_EXISTS + CH04(ts, 0, 7, z177, __LINE__, 0, 0) // AE_ALREADY_EXISTS } /* @@ -1639,9 +1639,9 @@ Method(m1bc,, Serialized) } } - CH03(ts, z177, 0x062, 0, 0) + CH03(ts, z177, 0x062, __LINE__, 0) m000(0) - CH04(ts, 0, 7, z177, 0x063, 0, 0) // AE_ALREADY_EXISTS + CH04(ts, 0, 7, z177, __LINE__, 0, 0) // AE_ALREADY_EXISTS } /* @@ -1659,34 +1659,34 @@ Method(m1bd,, Serialized) Name(\i2z8, 0xabcd0108) if (LNotEqual(i2z8, 0xabcd0108)) { - err(ts, z177, 0x064, 0, 0, i2z8, 0xabcd0108) + err(ts, z177, __LINE__, 0, 0, i2z8, 0xabcd0108) } if (LNotEqual(\i2z8, 0xabcd0108)) { - err(ts, z177, 0x065, 0, 0, \i2z8, 0xabcd0108) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0xabcd0108) } } else { if (LNotEqual(i2z8, 0x22223333)) { - err(ts, z177, 0x066, 0, 0, i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z8, 0x22223333) } if (LNotEqual(\i2z8, 0x22223333)) { - err(ts, z177, 0x067, 0, 0, \i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0x22223333) } } Store(0x12345678, i2z8) if (LNotEqual(i2z8, 0x12345678)) { - err(ts, z177, 0x068, 0, 0, i2z8, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i2z8, 0x12345678) } if (LNotEqual(\i2z8, 0x12345678)) { - err(ts, z177, 0x069, 0, 0, \i2z8, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0x12345678) } Store(0x22223333, \i2z8) if (LNotEqual(i2z8, 0x22223333)) { - err(ts, z177, 0x06a, 0, 0, i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z8, 0x22223333) } if (LNotEqual(\i2z8, 0x22223333)) { - err(ts, z177, 0x06b, 0, 0, \i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0x22223333) } if (LNot(arg0)) { @@ -1695,17 +1695,17 @@ Method(m1bd,, Serialized) if (arg0) { if (LNotEqual(i2z8, 0x22223333)) { - err(ts, z177, 0x06c, 0, 0, i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z8, 0x22223333) } if (LNotEqual(\i2z8, 0x22223333)) { - err(ts, z177, 0x06d, 0, 0, \i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0x22223333) } } else { if (LNotEqual(i2z8, 0x66667777)) { - err(ts, z177, 0x06e, 0, 0, i2z8, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i2z8, 0x66667777) } if (LNotEqual(\i2z8, 0x66667777)) { - err(ts, z177, 0x06f, 0, 0, \i2z8, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0x66667777) } } @@ -1716,9 +1716,9 @@ Method(m1bd,, Serialized) } } - CH03(ts, z177, 0x070, 0, 0) + CH03(ts, z177, 0x070, __LINE__, 0) m000(0) - CH03(ts, z177, 0x071, 0, 0) + CH03(ts, z177, 0x071, __LINE__, 0) } /* @@ -1736,34 +1736,34 @@ Method(m1be,, Serialized) Name(\i2z9, 0xabcd0109) if (LNotEqual(i2z9, 0xabcd0109)) { - err(ts, z177, 0x072, 0, 0, i2z9, 0xabcd0109) + err(ts, z177, __LINE__, 0, 0, i2z9, 0xabcd0109) } if (LNotEqual(\i2z9, 0xabcd0109)) { - err(ts, z177, 0x073, 0, 0, \i2z9, 0xabcd0109) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0xabcd0109) } } else { if (LNotEqual(i2z9, 0x22223333)) { - err(ts, z177, 0x074, 0, 0, i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z9, 0x22223333) } if (LNotEqual(\i2z9, 0x22223333)) { - err(ts, z177, 0x075, 0, 0, \i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0x22223333) } } Store(0x12345678, i2z9) if (LNotEqual(i2z9, 0x12345678)) { - err(ts, z177, 0x076, 0, 0, i2z9, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i2z9, 0x12345678) } if (LNotEqual(\i2z9, 0x12345678)) { - err(ts, z177, 0x077, 0, 0, \i2z9, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0x12345678) } Store(0x22223333, \i2z9) if (LNotEqual(i2z9, 0x22223333)) { - err(ts, z177, 0x078, 0, 0, i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z9, 0x22223333) } if (LNotEqual(\i2z9, 0x22223333)) { - err(ts, z177, 0x079, 0, 0, \i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0x22223333) } if (LNot(arg0)) { @@ -1772,17 +1772,17 @@ Method(m1be,, Serialized) if (arg0) { if (LNotEqual(i2z9, 0x22223333)) { - err(ts, z177, 0x07a, 0, 0, i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z9, 0x22223333) } if (LNotEqual(\i2z9, 0x22223333)) { - err(ts, z177, 0x07b, 0, 0, \i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0x22223333) } } else { if (LNotEqual(i2z9, 0x66667777)) { - err(ts, z177, 0x07c, 0, 0, i2z9, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i2z9, 0x66667777) } if (LNotEqual(\i2z9, 0x66667777)) { - err(ts, z177, 0x07d, 0, 0, \i2z9, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0x66667777) } } @@ -1793,9 +1793,9 @@ Method(m1be,, Serialized) } } - CH03(ts, z177, 0x07e, 0, 0) + CH03(ts, z177, 0x07e, __LINE__, 0) m000(0) - CH03(ts, z177, 0x07f, 0, 0) + CH03(ts, z177, 0x07f, __LINE__, 0) } /* @@ -1811,17 +1811,17 @@ Method(m1de,, Serialized) { if (LNot(arg0)) { if (LNotEqual(i3z0, 0xabcd0000)) { - err(ts, z177, 0x080, 0, 0, i3z0, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, i3z0, 0xabcd0000) } } else { if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x081, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } } Store(0x12345678, i3z0) if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x082, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } if (LNot(arg0)) { @@ -1830,11 +1830,11 @@ Method(m1de,, Serialized) if (arg0) { if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x083, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } } else { if (LNotEqual(i3z0, 0x66667777)) { - err(ts, z177, 0x084, 0, 0, i3z0, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x66667777) } } @@ -1845,9 +1845,9 @@ Method(m1de,, Serialized) } } - CH03(ts, z177, 0x085, 0, 0) + CH03(ts, z177, 0x085, __LINE__, 0) m000(0) - CH03(ts, z177, 0x086, 0, 0) + CH03(ts, z177, 0x086, __LINE__, 0) } /* @@ -1863,17 +1863,17 @@ Method(m1df,, Serialized) { if (LNot(arg0)) { if (LNotEqual(i3z0, 0xabcd0000)) { - err(ts, z177, 0x087, 0, 0, i3z0, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, i3z0, 0xabcd0000) } } else { if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x088, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } } Store(0x12345678, i3z0) if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x089, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } if (LNot(arg0)) { @@ -1882,11 +1882,11 @@ Method(m1df,, Serialized) if (arg0) { if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x08a, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } } else { if (LNotEqual(i3z0, 0x66667777)) { - err(ts, z177, 0x08b, 0, 0, i3z0, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x66667777) } } @@ -1897,9 +1897,9 @@ Method(m1df,, Serialized) } } - CH03(ts, z177, 0x08c, 0, 0) + CH03(ts, z177, 0x08c, __LINE__, 0) m000(0) - CH03(ts, z177, 0x08d, 0, 0) + CH03(ts, z177, 0x08d, __LINE__, 0) } /* @@ -1916,16 +1916,16 @@ Method(m1ee,, Serialized) Name(\_SB.i0q8, 0xabcd0008) if (LNotEqual(\_SB.i0q8, 0xabcd0008)) { - err(ts, z177, 0x08e, 0, 0, \_SB.i0q8, 0xabcd0008) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q8, 0xabcd0008) } } else { if (LNotEqual(\_SB.i0q8, 0x22223333)) { - err(ts, z177, 0x08f, 0, 0, \_SB.i0q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q8, 0x22223333) } } Store(0x22223333, \_SB.i0q8) if (LNotEqual(\_SB.i0q8, 0x22223333)) { - err(ts, z177, 0x090, 0, 0, \_SB.i0q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q8, 0x22223333) } if (LNot(arg0)) { @@ -1934,11 +1934,11 @@ Method(m1ee,, Serialized) if (arg0) { if (LNotEqual(\_SB.i0q8, 0x22223333)) { - err(ts, z177, 0x091, 0, 0, \_SB.i0q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q8, 0x22223333) } } else { if (LNotEqual(\_SB.i0q8, 0x66667777)) { - err(ts, z177, 0x092, 0, 0, \_SB.i0q8, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q8, 0x66667777) } } if (arg0) { @@ -1948,9 +1948,9 @@ Method(m1ee,, Serialized) } } - CH03(ts, z177, 0x093, 0, 0) + CH03(ts, z177, 0x093, __LINE__, 0) m000(0) - CH03(ts, z177, 0x094, 0, 0) + CH03(ts, z177, 0x094, __LINE__, 0) } /* @@ -1968,17 +1968,17 @@ Method(m1ef,, Serialized) Name(\_SB.i0q9, 0xabcd0009) if (LNotEqual(\_SB.i0q9, 0xabcd0009)) { - err(ts, z177, 0x08e, 0, 0, \_SB.i0q9, 0xabcd0009) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q9, 0xabcd0009) } } else { if (LNotEqual(\_SB.i0q9, 0x22223333)) { - err(ts, z177, 0x08f, 0, 0, \_SB.i0q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q9, 0x22223333) } } Store(0x22223333, \_SB.i0q9) if (LNotEqual(\_SB.i0q9, 0x22223333)) { - err(ts, z177, 0x090, 0, 0, \_SB.i0q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q9, 0x22223333) } if (LNot(arg0)) { @@ -1987,11 +1987,11 @@ Method(m1ef,, Serialized) if (arg0) { if (LNotEqual(\_SB.i0q9, 0x22223333)) { - err(ts, z177, 0x091, 0, 0, \_SB.i0q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q9, 0x22223333) } } else { if (LNotEqual(\_SB.i0q9, 0x66667777)) { - err(ts, z177, 0x092, 0, 0, \_SB.i0q9, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q9, 0x66667777) } } @@ -2002,9 +2002,9 @@ Method(m1ef,, Serialized) } } - CH03(ts, z177, 0x093, 0, 0) + CH03(ts, z177, 0x093, __LINE__, 0) m000(0) - CH03(ts, z177, 0x094, 0, 0) + CH03(ts, z177, 0x094, __LINE__, 0) } /* @@ -2022,17 +2022,17 @@ Method(m1bf,, Serialized) Scope(\_SB) { Name(i1q8, 0xabcd0008) } if (LNotEqual(\_SB.i1q8, 0xabcd0008)) { - err(ts, z177, 0x095, 0, 0, \_SB.i1q8, 0xabcd0008) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q8, 0xabcd0008) } } else { if (LNotEqual(\_SB.i1q8, 0x22223333)) { - err(ts, z177, 0x096, 0, 0, \_SB.i1q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q8, 0x22223333) } } Store(0x22223333, \_SB.i1q8) if (LNotEqual(\_SB.i1q8, 0x22223333)) { - err(ts, z177, 0x097, 0, 0, \_SB.i1q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q8, 0x22223333) } if (LNot(arg0)) { @@ -2041,11 +2041,11 @@ Method(m1bf,, Serialized) if (arg0) { if (LNotEqual(\_SB.i1q8, 0x22223333)) { - err(ts, z177, 0x098, 0, 0, \_SB.i1q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q8, 0x22223333) } } else { if (LNotEqual(\_SB.i1q8, 0x66667777)) { - err(ts, z177, 0x099, 0, 0, \_SB.i1q8, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q8, 0x66667777) } } if (arg0) { @@ -2055,9 +2055,9 @@ Method(m1bf,, Serialized) } } - CH03(ts, z177, 0x09a, 0, 0) + CH03(ts, z177, 0x09a, __LINE__, 0) m000(0) - CH03(ts, z177, 0x09b, 0, 0) + CH03(ts, z177, 0x09b, __LINE__, 0) } /* @@ -2075,17 +2075,17 @@ Method(m1dd,, Serialized) Scope(\_SB) { Name(i1q9, 0xabcd0008) } if (LNotEqual(\_SB.i1q9, 0xabcd0008)) { - err(ts, z177, 0x09c, 0, 0, \_SB.i1q9, 0xabcd0008) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q9, 0xabcd0008) } } else { if (LNotEqual(\_SB.i1q9, 0x22223333)) { - err(ts, z177, 0x09d, 0, 0, \_SB.i1q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q9, 0x22223333) } } Store(0x22223333, \_SB.i1q9) if (LNotEqual(\_SB.i1q9, 0x22223333)) { - err(ts, z177, 0x09e, 0, 0, \_SB.i1q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q9, 0x22223333) } if (LNot(arg0)) { @@ -2094,11 +2094,11 @@ Method(m1dd,, Serialized) if (arg0) { if (LNotEqual(\_SB.i1q9, 0x22223333)) { - err(ts, z177, 0x09f, 0, 0, \_SB.i1q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q9, 0x22223333) } } else { if (LNotEqual(\_SB.i1q9, 0x66667777)) { - err(ts, z177, 0x0a0, 0, 0, \_SB.i1q9, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q9, 0x66667777) } } if (arg0) { @@ -2108,9 +2108,9 @@ Method(m1dd,, Serialized) } } - CH03(ts, z177, 0x0a1, 0, 0) + CH03(ts, z177, 0x0a1, __LINE__, 0) m000(0) - CH03(ts, z177, 0x0a2, 0, 0) + CH03(ts, z177, 0x0a2, __LINE__, 0) } @@ -2129,34 +2129,34 @@ Method(m277,, Serialized) Scope(\) { Name(i3z1, 0xabcd0208) } if (LNotEqual(i3z1, 0xabcd0208)) { - err(ts, z177, 0x064, 0, 0, i3z1, 0xabcd0208) + err(ts, z177, __LINE__, 0, 0, i3z1, 0xabcd0208) } if (LNotEqual(\i3z1, 0xabcd0208)) { - err(ts, z177, 0x065, 0, 0, \i3z1, 0xabcd0208) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0xabcd0208) } } else { if (LNotEqual(i3z1, 0x22223333)) { - err(ts, z177, 0x066, 0, 0, i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z1, 0x22223333) } if (LNotEqual(\i3z1, 0x22223333)) { - err(ts, z177, 0x067, 0, 0, \i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0x22223333) } } Store(0x12345678, i3z1) if (LNotEqual(i3z1, 0x12345678)) { - err(ts, z177, 0x068, 0, 0, i3z1, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z1, 0x12345678) } if (LNotEqual(\i3z1, 0x12345678)) { - err(ts, z177, 0x069, 0, 0, \i3z1, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0x12345678) } Store(0x22223333, \i3z1) if (LNotEqual(i3z1, 0x22223333)) { - err(ts, z177, 0x06a, 0, 0, i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z1, 0x22223333) } if (LNotEqual(\i3z1, 0x22223333)) { - err(ts, z177, 0x06b, 0, 0, \i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0x22223333) } if (LNot(arg0)) { @@ -2165,17 +2165,17 @@ Method(m277,, Serialized) if (arg0) { if (LNotEqual(i3z1, 0x22223333)) { - err(ts, z177, 0x06c, 0, 0, i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z1, 0x22223333) } if (LNotEqual(\i3z1, 0x22223333)) { - err(ts, z177, 0x06d, 0, 0, \i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0x22223333) } } else { if (LNotEqual(i3z1, 0x66667777)) { - err(ts, z177, 0x06e, 0, 0, i3z1, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i3z1, 0x66667777) } if (LNotEqual(\i3z1, 0x66667777)) { - err(ts, z177, 0x06f, 0, 0, \i3z1, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0x66667777) } } @@ -2186,9 +2186,9 @@ Method(m277,, Serialized) } } - CH03(ts, z177, 0x070, 0, 0) + CH03(ts, z177, 0x070, __LINE__, 0) m000(0) - CH03(ts, z177, 0x071, 0, 0) + CH03(ts, z177, 0x071, __LINE__, 0) } /* @@ -2206,34 +2206,34 @@ Method(m27d,, Serialized) Scope(\) { Name(i3z2, 0xabcd0209) } if (LNotEqual(i3z2, 0xabcd0209)) { - err(ts, z177, 0x072, 0, 0, i3z2, 0xabcd0209) + err(ts, z177, __LINE__, 0, 0, i3z2, 0xabcd0209) } if (LNotEqual(\i3z2, 0xabcd0209)) { - err(ts, z177, 0x073, 0, 0, \i3z2, 0xabcd0209) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0xabcd0209) } } else { if (LNotEqual(i3z2, 0x22223333)) { - err(ts, z177, 0x074, 0, 0, i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z2, 0x22223333) } if (LNotEqual(\i3z2, 0x22223333)) { - err(ts, z177, 0x075, 0, 0, \i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0x22223333) } } Store(0x12345678, i3z2) if (LNotEqual(i3z2, 0x12345678)) { - err(ts, z177, 0x076, 0, 0, i3z2, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z2, 0x12345678) } if (LNotEqual(\i3z2, 0x12345678)) { - err(ts, z177, 0x077, 0, 0, \i3z2, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0x12345678) } Store(0x22223333, \i3z2) if (LNotEqual(i3z2, 0x22223333)) { - err(ts, z177, 0x078, 0, 0, i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z2, 0x22223333) } if (LNotEqual(\i3z2, 0x22223333)) { - err(ts, z177, 0x079, 0, 0, \i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0x22223333) } if (LNot(arg0)) { @@ -2242,17 +2242,17 @@ Method(m27d,, Serialized) if (arg0) { if (LNotEqual(i3z2, 0x22223333)) { - err(ts, z177, 0x07a, 0, 0, i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z2, 0x22223333) } if (LNotEqual(\i3z2, 0x22223333)) { - err(ts, z177, 0x07b, 0, 0, \i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0x22223333) } } else { if (LNotEqual(i3z2, 0x66667777)) { - err(ts, z177, 0x07c, 0, 0, i3z2, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i3z2, 0x66667777) } if (LNotEqual(\i3z2, 0x66667777)) { - err(ts, z177, 0x07d, 0, 0, \i3z2, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0x66667777) } } @@ -2263,9 +2263,9 @@ Method(m27d,, Serialized) } } - CH03(ts, z177, 0x07e, 0, 0) + CH03(ts, z177, 0x07e, __LINE__, 0) m000(0) - CH03(ts, z177, 0x07f, 0, 0) + CH03(ts, z177, 0x07f, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/functional/control/Recursion/stack_overflow.asl b/tests/aslts/src/runtime/collections/functional/control/Recursion/stack_overflow.asl index 8d5f1b2..b235bac 100644 --- a/tests/aslts/src/runtime/collections/functional/control/Recursion/stack_overflow.asl +++ b/tests/aslts/src/runtime/collections/functional/control/Recursion/stack_overflow.asl @@ -41,282 +41,282 @@ Method(m0fc, 1, Serialized) // 0 - 99 - Method(m000) { CH03(ts, z178, 0x000, 0, 0) Add(i000, 0, i000) m001() } - Method(m001) { CH03(ts, z178, 0x001, 0, 0) Add(i000, 1, i000) m002() } - Method(m002) { CH03(ts, z178, 0x002, 0, 0) Add(i000, 2, i000) m003() } - Method(m003) { CH03(ts, z178, 0x003, 0, 0) Add(i000, 3, i000) m004() } - Method(m004) { CH03(ts, z178, 0x004, 0, 0) Add(i000, 4, i000) m005() } - Method(m005) { CH03(ts, z178, 0x005, 0, 0) Add(i000, 5, i000) m006() } - Method(m006) { CH03(ts, z178, 0x006, 0, 0) Add(i000, 6, i000) m007() } - Method(m007) { CH03(ts, z178, 0x007, 0, 0) Add(i000, 7, i000) m008() } - Method(m008) { CH03(ts, z178, 0x008, 0, 0) Add(i000, 8, i000) m009() } - Method(m009) { CH03(ts, z178, 0x009, 0, 0) Add(i000, 9, i000) m010() } - - Method(m010) { CH03(ts, z178, 0x010, 0, 0) Add(i000, 10, i000) m011() } - Method(m011) { CH03(ts, z178, 0x011, 0, 0) Add(i000, 11, i000) m012() } - Method(m012) { CH03(ts, z178, 0x012, 0, 0) Add(i000, 12, i000) m013() } - Method(m013) { CH03(ts, z178, 0x013, 0, 0) Add(i000, 13, i000) m014() } - Method(m014) { CH03(ts, z178, 0x014, 0, 0) Add(i000, 14, i000) m015() } - Method(m015) { CH03(ts, z178, 0x015, 0, 0) Add(i000, 15, i000) m016() } - Method(m016) { CH03(ts, z178, 0x016, 0, 0) Add(i000, 16, i000) m017() } - Method(m017) { CH03(ts, z178, 0x017, 0, 0) Add(i000, 17, i000) m018() } - Method(m018) { CH03(ts, z178, 0x018, 0, 0) Add(i000, 18, i000) m019() } - Method(m019) { CH03(ts, z178, 0x019, 0, 0) Add(i000, 19, i000) m020() } - - Method(m020) { CH03(ts, z178, 0x020, 0, 0) Add(i000, 20, i000) m021() } - Method(m021) { CH03(ts, z178, 0x021, 0, 0) Add(i000, 21, i000) m022() } - Method(m022) { CH03(ts, z178, 0x022, 0, 0) Add(i000, 22, i000) m023() } - Method(m023) { CH03(ts, z178, 0x023, 0, 0) Add(i000, 23, i000) m024() } - Method(m024) { CH03(ts, z178, 0x024, 0, 0) Add(i000, 24, i000) m025() } - Method(m025) { CH03(ts, z178, 0x025, 0, 0) Add(i000, 25, i000) m026() } - Method(m026) { CH03(ts, z178, 0x026, 0, 0) Add(i000, 26, i000) m027() } - Method(m027) { CH03(ts, z178, 0x027, 0, 0) Add(i000, 27, i000) m028() } - Method(m028) { CH03(ts, z178, 0x028, 0, 0) Add(i000, 28, i000) m029() } - Method(m029) { CH03(ts, z178, 0x029, 0, 0) Add(i000, 29, i000) m030() } - - Method(m030) { CH03(ts, z178, 0x030, 0, 0) Add(i000, 30, i000) m031() } - Method(m031) { CH03(ts, z178, 0x031, 0, 0) Add(i000, 31, i000) m032() } - Method(m032) { CH03(ts, z178, 0x032, 0, 0) Add(i000, 32, i000) m033() } - Method(m033) { CH03(ts, z178, 0x033, 0, 0) Add(i000, 33, i000) m034() } - Method(m034) { CH03(ts, z178, 0x034, 0, 0) Add(i000, 34, i000) m035() } - Method(m035) { CH03(ts, z178, 0x035, 0, 0) Add(i000, 35, i000) m036() } - Method(m036) { CH03(ts, z178, 0x036, 0, 0) Add(i000, 36, i000) m037() } - Method(m037) { CH03(ts, z178, 0x037, 0, 0) Add(i000, 37, i000) m038() } - Method(m038) { CH03(ts, z178, 0x038, 0, 0) Add(i000, 38, i000) m039() } - Method(m039) { CH03(ts, z178, 0x039, 0, 0) Add(i000, 39, i000) m040() } - - Method(m040) { CH03(ts, z178, 0x040, 0, 0) Add(i000, 40, i000) m041() } - Method(m041) { CH03(ts, z178, 0x041, 0, 0) Add(i000, 41, i000) m042() } - Method(m042) { CH03(ts, z178, 0x042, 0, 0) Add(i000, 42, i000) m043() } - Method(m043) { CH03(ts, z178, 0x043, 0, 0) Add(i000, 43, i000) m044() } - Method(m044) { CH03(ts, z178, 0x044, 0, 0) Add(i000, 44, i000) m045() } - Method(m045) { CH03(ts, z178, 0x045, 0, 0) Add(i000, 45, i000) m046() } - Method(m046) { CH03(ts, z178, 0x046, 0, 0) Add(i000, 46, i000) m047() } - Method(m047) { CH03(ts, z178, 0x047, 0, 0) Add(i000, 47, i000) m048() } - Method(m048) { CH03(ts, z178, 0x048, 0, 0) Add(i000, 48, i000) m049() } - Method(m049) { CH03(ts, z178, 0x049, 0, 0) Add(i000, 49, i000) m050() } - - Method(m050) { CH03(ts, z178, 0x050, 0, 0) Add(i000, 50, i000) m051() } - Method(m051) { CH03(ts, z178, 0x051, 0, 0) Add(i000, 51, i000) m052() } - Method(m052) { CH03(ts, z178, 0x052, 0, 0) Add(i000, 52, i000) m053() } - Method(m053) { CH03(ts, z178, 0x053, 0, 0) Add(i000, 53, i000) m054() } - Method(m054) { CH03(ts, z178, 0x054, 0, 0) Add(i000, 54, i000) m055() } - Method(m055) { CH03(ts, z178, 0x055, 0, 0) Add(i000, 55, i000) m056() } - Method(m056) { CH03(ts, z178, 0x056, 0, 0) Add(i000, 56, i000) m057() } - Method(m057) { CH03(ts, z178, 0x057, 0, 0) Add(i000, 57, i000) m058() } - Method(m058) { CH03(ts, z178, 0x058, 0, 0) Add(i000, 58, i000) m059() } - Method(m059) { CH03(ts, z178, 0x059, 0, 0) Add(i000, 59, i000) m060() } - - Method(m060) { CH03(ts, z178, 0x060, 0, 0) Add(i000, 60, i000) m061() } - Method(m061) { CH03(ts, z178, 0x061, 0, 0) Add(i000, 61, i000) m062() } - Method(m062) { CH03(ts, z178, 0x062, 0, 0) Add(i000, 62, i000) m063() } - Method(m063) { CH03(ts, z178, 0x063, 0, 0) Add(i000, 63, i000) m064() } - Method(m064) { CH03(ts, z178, 0x064, 0, 0) Add(i000, 64, i000) m065() } - Method(m065) { CH03(ts, z178, 0x065, 0, 0) Add(i000, 65, i000) m066() } - Method(m066) { CH03(ts, z178, 0x066, 0, 0) Add(i000, 66, i000) m067() } - Method(m067) { CH03(ts, z178, 0x067, 0, 0) Add(i000, 67, i000) m068() } - Method(m068) { CH03(ts, z178, 0x068, 0, 0) Add(i000, 68, i000) m069() } - Method(m069) { CH03(ts, z178, 0x069, 0, 0) Add(i000, 69, i000) m070() } - - Method(m070) { CH03(ts, z178, 0x070, 0, 0) Add(i000, 70, i000) m071() } - Method(m071) { CH03(ts, z178, 0x071, 0, 0) Add(i000, 71, i000) m072() } - Method(m072) { CH03(ts, z178, 0x072, 0, 0) Add(i000, 72, i000) m073() } - Method(m073) { CH03(ts, z178, 0x073, 0, 0) Add(i000, 73, i000) m074() } - Method(m074) { CH03(ts, z178, 0x074, 0, 0) Add(i000, 74, i000) m075() } - Method(m075) { CH03(ts, z178, 0x075, 0, 0) Add(i000, 75, i000) m076() } - Method(m076) { CH03(ts, z178, 0x076, 0, 0) Add(i000, 76, i000) m077() } - Method(m077) { CH03(ts, z178, 0x077, 0, 0) Add(i000, 77, i000) m078() } - Method(m078) { CH03(ts, z178, 0x078, 0, 0) Add(i000, 78, i000) m079() } - Method(m079) { CH03(ts, z178, 0x079, 0, 0) Add(i000, 79, i000) m080() } - - Method(m080) { CH03(ts, z178, 0x080, 0, 0) Add(i000, 80, i000) m081() } - Method(m081) { CH03(ts, z178, 0x081, 0, 0) Add(i000, 81, i000) m082() } - Method(m082) { CH03(ts, z178, 0x082, 0, 0) Add(i000, 82, i000) m083() } - Method(m083) { CH03(ts, z178, 0x083, 0, 0) Add(i000, 83, i000) m084() } - Method(m084) { CH03(ts, z178, 0x084, 0, 0) Add(i000, 84, i000) m085() } - Method(m085) { CH03(ts, z178, 0x085, 0, 0) Add(i000, 85, i000) m086() } - Method(m086) { CH03(ts, z178, 0x086, 0, 0) Add(i000, 86, i000) m087() } - Method(m087) { CH03(ts, z178, 0x087, 0, 0) Add(i000, 87, i000) m088() } - Method(m088) { CH03(ts, z178, 0x088, 0, 0) Add(i000, 88, i000) m089() } - Method(m089) { CH03(ts, z178, 0x089, 0, 0) Add(i000, 89, i000) m090() } - - Method(m090) { CH03(ts, z178, 0x090, 0, 0) Add(i000, 90, i000) m091() } - Method(m091) { CH03(ts, z178, 0x091, 0, 0) Add(i000, 91, i000) m092() } - Method(m092) { CH03(ts, z178, 0x092, 0, 0) Add(i000, 92, i000) m093() } - Method(m093) { CH03(ts, z178, 0x093, 0, 0) Add(i000, 93, i000) m094() } - Method(m094) { CH03(ts, z178, 0x094, 0, 0) Add(i000, 94, i000) m095() } - Method(m095) { CH03(ts, z178, 0x095, 0, 0) Add(i000, 95, i000) m096() } - Method(m096) { CH03(ts, z178, 0x096, 0, 0) Add(i000, 96, i000) m097() } - Method(m097) { CH03(ts, z178, 0x097, 0, 0) Add(i000, 97, i000) m098() } - Method(m098) { CH03(ts, z178, 0x098, 0, 0) Add(i000, 98, i000) m099() } - Method(m099) { CH03(ts, z178, 0x099, 0, 0) Add(i000, 99, i000) m100() } + Method(m000) { CH03(ts, z178, 0x000, __LINE__, 0) Add(i000, 0, i000) m001() } + Method(m001) { CH03(ts, z178, 0x001, __LINE__, 0) Add(i000, 1, i000) m002() } + Method(m002) { CH03(ts, z178, 0x002, __LINE__, 0) Add(i000, 2, i000) m003() } + Method(m003) { CH03(ts, z178, 0x003, __LINE__, 0) Add(i000, 3, i000) m004() } + Method(m004) { CH03(ts, z178, 0x004, __LINE__, 0) Add(i000, 4, i000) m005() } + Method(m005) { CH03(ts, z178, 0x005, __LINE__, 0) Add(i000, 5, i000) m006() } + Method(m006) { CH03(ts, z178, 0x006, __LINE__, 0) Add(i000, 6, i000) m007() } + Method(m007) { CH03(ts, z178, 0x007, __LINE__, 0) Add(i000, 7, i000) m008() } + Method(m008) { CH03(ts, z178, 0x008, __LINE__, 0) Add(i000, 8, i000) m009() } + Method(m009) { CH03(ts, z178, 0x009, __LINE__, 0) Add(i000, 9, i000) m010() } + + Method(m010) { CH03(ts, z178, 0x010, __LINE__, 0) Add(i000, 10, i000) m011() } + Method(m011) { CH03(ts, z178, 0x011, __LINE__, 0) Add(i000, 11, i000) m012() } + Method(m012) { CH03(ts, z178, 0x012, __LINE__, 0) Add(i000, 12, i000) m013() } + Method(m013) { CH03(ts, z178, 0x013, __LINE__, 0) Add(i000, 13, i000) m014() } + Method(m014) { CH03(ts, z178, 0x014, __LINE__, 0) Add(i000, 14, i000) m015() } + Method(m015) { CH03(ts, z178, 0x015, __LINE__, 0) Add(i000, 15, i000) m016() } + Method(m016) { CH03(ts, z178, 0x016, __LINE__, 0) Add(i000, 16, i000) m017() } + Method(m017) { CH03(ts, z178, 0x017, __LINE__, 0) Add(i000, 17, i000) m018() } + Method(m018) { CH03(ts, z178, 0x018, __LINE__, 0) Add(i000, 18, i000) m019() } + Method(m019) { CH03(ts, z178, 0x019, __LINE__, 0) Add(i000, 19, i000) m020() } + + Method(m020) { CH03(ts, z178, 0x020, __LINE__, 0) Add(i000, 20, i000) m021() } + Method(m021) { CH03(ts, z178, 0x021, __LINE__, 0) Add(i000, 21, i000) m022() } + Method(m022) { CH03(ts, z178, 0x022, __LINE__, 0) Add(i000, 22, i000) m023() } + Method(m023) { CH03(ts, z178, 0x023, __LINE__, 0) Add(i000, 23, i000) m024() } + Method(m024) { CH03(ts, z178, 0x024, __LINE__, 0) Add(i000, 24, i000) m025() } + Method(m025) { CH03(ts, z178, 0x025, __LINE__, 0) Add(i000, 25, i000) m026() } + Method(m026) { CH03(ts, z178, 0x026, __LINE__, 0) Add(i000, 26, i000) m027() } + Method(m027) { CH03(ts, z178, 0x027, __LINE__, 0) Add(i000, 27, i000) m028() } + Method(m028) { CH03(ts, z178, 0x028, __LINE__, 0) Add(i000, 28, i000) m029() } + Method(m029) { CH03(ts, z178, 0x029, __LINE__, 0) Add(i000, 29, i000) m030() } + + Method(m030) { CH03(ts, z178, 0x030, __LINE__, 0) Add(i000, 30, i000) m031() } + Method(m031) { CH03(ts, z178, 0x031, __LINE__, 0) Add(i000, 31, i000) m032() } + Method(m032) { CH03(ts, z178, 0x032, __LINE__, 0) Add(i000, 32, i000) m033() } + Method(m033) { CH03(ts, z178, 0x033, __LINE__, 0) Add(i000, 33, i000) m034() } + Method(m034) { CH03(ts, z178, 0x034, __LINE__, 0) Add(i000, 34, i000) m035() } + Method(m035) { CH03(ts, z178, 0x035, __LINE__, 0) Add(i000, 35, i000) m036() } + Method(m036) { CH03(ts, z178, 0x036, __LINE__, 0) Add(i000, 36, i000) m037() } + Method(m037) { CH03(ts, z178, 0x037, __LINE__, 0) Add(i000, 37, i000) m038() } + Method(m038) { CH03(ts, z178, 0x038, __LINE__, 0) Add(i000, 38, i000) m039() } + Method(m039) { CH03(ts, z178, 0x039, __LINE__, 0) Add(i000, 39, i000) m040() } + + Method(m040) { CH03(ts, z178, 0x040, __LINE__, 0) Add(i000, 40, i000) m041() } + Method(m041) { CH03(ts, z178, 0x041, __LINE__, 0) Add(i000, 41, i000) m042() } + Method(m042) { CH03(ts, z178, 0x042, __LINE__, 0) Add(i000, 42, i000) m043() } + Method(m043) { CH03(ts, z178, 0x043, __LINE__, 0) Add(i000, 43, i000) m044() } + Method(m044) { CH03(ts, z178, 0x044, __LINE__, 0) Add(i000, 44, i000) m045() } + Method(m045) { CH03(ts, z178, 0x045, __LINE__, 0) Add(i000, 45, i000) m046() } + Method(m046) { CH03(ts, z178, 0x046, __LINE__, 0) Add(i000, 46, i000) m047() } + Method(m047) { CH03(ts, z178, 0x047, __LINE__, 0) Add(i000, 47, i000) m048() } + Method(m048) { CH03(ts, z178, 0x048, __LINE__, 0) Add(i000, 48, i000) m049() } + Method(m049) { CH03(ts, z178, 0x049, __LINE__, 0) Add(i000, 49, i000) m050() } + + Method(m050) { CH03(ts, z178, 0x050, __LINE__, 0) Add(i000, 50, i000) m051() } + Method(m051) { CH03(ts, z178, 0x051, __LINE__, 0) Add(i000, 51, i000) m052() } + Method(m052) { CH03(ts, z178, 0x052, __LINE__, 0) Add(i000, 52, i000) m053() } + Method(m053) { CH03(ts, z178, 0x053, __LINE__, 0) Add(i000, 53, i000) m054() } + Method(m054) { CH03(ts, z178, 0x054, __LINE__, 0) Add(i000, 54, i000) m055() } + Method(m055) { CH03(ts, z178, 0x055, __LINE__, 0) Add(i000, 55, i000) m056() } + Method(m056) { CH03(ts, z178, 0x056, __LINE__, 0) Add(i000, 56, i000) m057() } + Method(m057) { CH03(ts, z178, 0x057, __LINE__, 0) Add(i000, 57, i000) m058() } + Method(m058) { CH03(ts, z178, 0x058, __LINE__, 0) Add(i000, 58, i000) m059() } + Method(m059) { CH03(ts, z178, 0x059, __LINE__, 0) Add(i000, 59, i000) m060() } + + Method(m060) { CH03(ts, z178, 0x060, __LINE__, 0) Add(i000, 60, i000) m061() } + Method(m061) { CH03(ts, z178, 0x061, __LINE__, 0) Add(i000, 61, i000) m062() } + Method(m062) { CH03(ts, z178, 0x062, __LINE__, 0) Add(i000, 62, i000) m063() } + Method(m063) { CH03(ts, z178, 0x063, __LINE__, 0) Add(i000, 63, i000) m064() } + Method(m064) { CH03(ts, z178, 0x064, __LINE__, 0) Add(i000, 64, i000) m065() } + Method(m065) { CH03(ts, z178, 0x065, __LINE__, 0) Add(i000, 65, i000) m066() } + Method(m066) { CH03(ts, z178, 0x066, __LINE__, 0) Add(i000, 66, i000) m067() } + Method(m067) { CH03(ts, z178, 0x067, __LINE__, 0) Add(i000, 67, i000) m068() } + Method(m068) { CH03(ts, z178, 0x068, __LINE__, 0) Add(i000, 68, i000) m069() } + Method(m069) { CH03(ts, z178, 0x069, __LINE__, 0) Add(i000, 69, i000) m070() } + + Method(m070) { CH03(ts, z178, 0x070, __LINE__, 0) Add(i000, 70, i000) m071() } + Method(m071) { CH03(ts, z178, 0x071, __LINE__, 0) Add(i000, 71, i000) m072() } + Method(m072) { CH03(ts, z178, 0x072, __LINE__, 0) Add(i000, 72, i000) m073() } + Method(m073) { CH03(ts, z178, 0x073, __LINE__, 0) Add(i000, 73, i000) m074() } + Method(m074) { CH03(ts, z178, 0x074, __LINE__, 0) Add(i000, 74, i000) m075() } + Method(m075) { CH03(ts, z178, 0x075, __LINE__, 0) Add(i000, 75, i000) m076() } + Method(m076) { CH03(ts, z178, 0x076, __LINE__, 0) Add(i000, 76, i000) m077() } + Method(m077) { CH03(ts, z178, 0x077, __LINE__, 0) Add(i000, 77, i000) m078() } + Method(m078) { CH03(ts, z178, 0x078, __LINE__, 0) Add(i000, 78, i000) m079() } + Method(m079) { CH03(ts, z178, 0x079, __LINE__, 0) Add(i000, 79, i000) m080() } + + Method(m080) { CH03(ts, z178, 0x080, __LINE__, 0) Add(i000, 80, i000) m081() } + Method(m081) { CH03(ts, z178, 0x081, __LINE__, 0) Add(i000, 81, i000) m082() } + Method(m082) { CH03(ts, z178, 0x082, __LINE__, 0) Add(i000, 82, i000) m083() } + Method(m083) { CH03(ts, z178, 0x083, __LINE__, 0) Add(i000, 83, i000) m084() } + Method(m084) { CH03(ts, z178, 0x084, __LINE__, 0) Add(i000, 84, i000) m085() } + Method(m085) { CH03(ts, z178, 0x085, __LINE__, 0) Add(i000, 85, i000) m086() } + Method(m086) { CH03(ts, z178, 0x086, __LINE__, 0) Add(i000, 86, i000) m087() } + Method(m087) { CH03(ts, z178, 0x087, __LINE__, 0) Add(i000, 87, i000) m088() } + Method(m088) { CH03(ts, z178, 0x088, __LINE__, 0) Add(i000, 88, i000) m089() } + Method(m089) { CH03(ts, z178, 0x089, __LINE__, 0) Add(i000, 89, i000) m090() } + + Method(m090) { CH03(ts, z178, 0x090, __LINE__, 0) Add(i000, 90, i000) m091() } + Method(m091) { CH03(ts, z178, 0x091, __LINE__, 0) Add(i000, 91, i000) m092() } + Method(m092) { CH03(ts, z178, 0x092, __LINE__, 0) Add(i000, 92, i000) m093() } + Method(m093) { CH03(ts, z178, 0x093, __LINE__, 0) Add(i000, 93, i000) m094() } + Method(m094) { CH03(ts, z178, 0x094, __LINE__, 0) Add(i000, 94, i000) m095() } + Method(m095) { CH03(ts, z178, 0x095, __LINE__, 0) Add(i000, 95, i000) m096() } + Method(m096) { CH03(ts, z178, 0x096, __LINE__, 0) Add(i000, 96, i000) m097() } + Method(m097) { CH03(ts, z178, 0x097, __LINE__, 0) Add(i000, 97, i000) m098() } + Method(m098) { CH03(ts, z178, 0x098, __LINE__, 0) Add(i000, 98, i000) m099() } + Method(m099) { CH03(ts, z178, 0x099, __LINE__, 0) Add(i000, 99, i000) m100() } // 100 - 199 - Method(m100) { CH03(ts, z178, 0x100, 0, 0) Add(i000, 100, i000) m101() } - Method(m101) { CH03(ts, z178, 0x101, 0, 0) Add(i000, 101, i000) m102() } - Method(m102) { CH03(ts, z178, 0x102, 0, 0) Add(i000, 102, i000) m103() } - Method(m103) { CH03(ts, z178, 0x103, 0, 0) Add(i000, 103, i000) m104() } - Method(m104) { CH03(ts, z178, 0x104, 0, 0) Add(i000, 104, i000) m105() } - Method(m105) { CH03(ts, z178, 0x105, 0, 0) Add(i000, 105, i000) m106() } - Method(m106) { CH03(ts, z178, 0x106, 0, 0) Add(i000, 106, i000) m107() } - Method(m107) { CH03(ts, z178, 0x107, 0, 0) Add(i000, 107, i000) m108() } - Method(m108) { CH03(ts, z178, 0x108, 0, 0) Add(i000, 108, i000) m109() } - Method(m109) { CH03(ts, z178, 0x109, 0, 0) Add(i000, 109, i000) m110() } - - Method(m110) { CH03(ts, z178, 0x110, 0, 0) Add(i000, 110, i000) m111() } - Method(m111) { CH03(ts, z178, 0x111, 0, 0) Add(i000, 111, i000) m112() } - Method(m112) { CH03(ts, z178, 0x112, 0, 0) Add(i000, 112, i000) m113() } - Method(m113) { CH03(ts, z178, 0x113, 0, 0) Add(i000, 113, i000) m114() } - Method(m114) { CH03(ts, z178, 0x114, 0, 0) Add(i000, 114, i000) m115() } - Method(m115) { CH03(ts, z178, 0x115, 0, 0) Add(i000, 115, i000) m116() } - Method(m116) { CH03(ts, z178, 0x116, 0, 0) Add(i000, 116, i000) m117() } - Method(m117) { CH03(ts, z178, 0x117, 0, 0) Add(i000, 117, i000) m118() } - Method(m118) { CH03(ts, z178, 0x118, 0, 0) Add(i000, 118, i000) m119() } - Method(m119) { CH03(ts, z178, 0x119, 0, 0) Add(i000, 119, i000) m120() } - - Method(m120) { CH03(ts, z178, 0x120, 0, 0) Add(i000, 120, i000) m121() } - Method(m121) { CH03(ts, z178, 0x121, 0, 0) Add(i000, 121, i000) m122() } - Method(m122) { CH03(ts, z178, 0x122, 0, 0) Add(i000, 122, i000) m123() } - Method(m123) { CH03(ts, z178, 0x123, 0, 0) Add(i000, 123, i000) m124() } - Method(m124) { CH03(ts, z178, 0x124, 0, 0) Add(i000, 124, i000) m125() } - Method(m125) { CH03(ts, z178, 0x125, 0, 0) Add(i000, 125, i000) m126() } - Method(m126) { CH03(ts, z178, 0x126, 0, 0) Add(i000, 126, i000) m127() } - Method(m127) { CH03(ts, z178, 0x127, 0, 0) Add(i000, 127, i000) m128() } - Method(m128) { CH03(ts, z178, 0x128, 0, 0) Add(i000, 128, i000) m129() } - Method(m129) { CH03(ts, z178, 0x129, 0, 0) Add(i000, 129, i000) m130() } - - Method(m130) { CH03(ts, z178, 0x130, 0, 0) Add(i000, 130, i000) m131() } - Method(m131) { CH03(ts, z178, 0x131, 0, 0) Add(i000, 131, i000) m132() } - Method(m132) { CH03(ts, z178, 0x132, 0, 0) Add(i000, 132, i000) m133() } - Method(m133) { CH03(ts, z178, 0x133, 0, 0) Add(i000, 133, i000) m134() } - Method(m134) { CH03(ts, z178, 0x134, 0, 0) Add(i000, 134, i000) m135() } - Method(m135) { CH03(ts, z178, 0x135, 0, 0) Add(i000, 135, i000) m136() } - Method(m136) { CH03(ts, z178, 0x136, 0, 0) Add(i000, 136, i000) m137() } - Method(m137) { CH03(ts, z178, 0x137, 0, 0) Add(i000, 137, i000) m138() } - Method(m138) { CH03(ts, z178, 0x138, 0, 0) Add(i000, 138, i000) m139() } - Method(m139) { CH03(ts, z178, 0x139, 0, 0) Add(i000, 139, i000) m140() } - - Method(m140) { CH03(ts, z178, 0x140, 0, 0) Add(i000, 140, i000) m141() } - Method(m141) { CH03(ts, z178, 0x141, 0, 0) Add(i000, 141, i000) m142() } - Method(m142) { CH03(ts, z178, 0x142, 0, 0) Add(i000, 142, i000) m143() } - Method(m143) { CH03(ts, z178, 0x143, 0, 0) Add(i000, 143, i000) m144() } - Method(m144) { CH03(ts, z178, 0x144, 0, 0) Add(i000, 144, i000) m145() } - Method(m145) { CH03(ts, z178, 0x145, 0, 0) Add(i000, 145, i000) m146() } - Method(m146) { CH03(ts, z178, 0x146, 0, 0) Add(i000, 146, i000) m147() } - Method(m147) { CH03(ts, z178, 0x147, 0, 0) Add(i000, 147, i000) m148() } - Method(m148) { CH03(ts, z178, 0x148, 0, 0) Add(i000, 148, i000) m149() } - Method(m149) { CH03(ts, z178, 0x149, 0, 0) Add(i000, 149, i000) m150() } - - Method(m150) { CH03(ts, z178, 0x150, 0, 0) Add(i000, 150, i000) m151() } - Method(m151) { CH03(ts, z178, 0x151, 0, 0) Add(i000, 151, i000) m152() } - Method(m152) { CH03(ts, z178, 0x152, 0, 0) Add(i000, 152, i000) m153() } - Method(m153) { CH03(ts, z178, 0x153, 0, 0) Add(i000, 153, i000) m154() } - Method(m154) { CH03(ts, z178, 0x154, 0, 0) Add(i000, 154, i000) m155() } - Method(m155) { CH03(ts, z178, 0x155, 0, 0) Add(i000, 155, i000) m156() } - Method(m156) { CH03(ts, z178, 0x156, 0, 0) Add(i000, 156, i000) m157() } - Method(m157) { CH03(ts, z178, 0x157, 0, 0) Add(i000, 157, i000) m158() } - Method(m158) { CH03(ts, z178, 0x158, 0, 0) Add(i000, 158, i000) m159() } - Method(m159) { CH03(ts, z178, 0x159, 0, 0) Add(i000, 159, i000) m160() } - - Method(m160) { CH03(ts, z178, 0x160, 0, 0) Add(i000, 160, i000) m161() } - Method(m161) { CH03(ts, z178, 0x161, 0, 0) Add(i000, 161, i000) m162() } - Method(m162) { CH03(ts, z178, 0x162, 0, 0) Add(i000, 162, i000) m163() } - Method(m163) { CH03(ts, z178, 0x163, 0, 0) Add(i000, 163, i000) m164() } - Method(m164) { CH03(ts, z178, 0x164, 0, 0) Add(i000, 164, i000) m165() } - Method(m165) { CH03(ts, z178, 0x165, 0, 0) Add(i000, 165, i000) m166() } - Method(m166) { CH03(ts, z178, 0x166, 0, 0) Add(i000, 166, i000) m167() } - Method(m167) { CH03(ts, z178, 0x167, 0, 0) Add(i000, 167, i000) m168() } - Method(m168) { CH03(ts, z178, 0x168, 0, 0) Add(i000, 168, i000) m169() } - Method(m169) { CH03(ts, z178, 0x169, 0, 0) Add(i000, 169, i000) m170() } - - Method(m170) { CH03(ts, z178, 0x170, 0, 0) Add(i000, 170, i000) m171() } - Method(m171) { CH03(ts, z178, 0x171, 0, 0) Add(i000, 171, i000) m172() } - Method(m172) { CH03(ts, z178, 0x172, 0, 0) Add(i000, 172, i000) m173() } - Method(m173) { CH03(ts, z178, 0x173, 0, 0) Add(i000, 173, i000) m174() } - Method(m174) { CH03(ts, z178, 0x174, 0, 0) Add(i000, 174, i000) m175() } - Method(m175) { CH03(ts, z178, 0x175, 0, 0) Add(i000, 175, i000) m176() } - Method(m176) { CH03(ts, z178, 0x176, 0, 0) Add(i000, 176, i000) m177() } - Method(m177) { CH03(ts, z178, 0x177, 0, 0) Add(i000, 177, i000) m178() } - Method(m178) { CH03(ts, z178, 0x178, 0, 0) Add(i000, 178, i000) m179() } - Method(m179) { CH03(ts, z178, 0x179, 0, 0) Add(i000, 179, i000) m180() } - - Method(m180) { CH03(ts, z178, 0x180, 0, 0) Add(i000, 180, i000) m181() } - Method(m181) { CH03(ts, z178, 0x181, 0, 0) Add(i000, 181, i000) m182() } - Method(m182) { CH03(ts, z178, 0x182, 0, 0) Add(i000, 182, i000) m183() } - Method(m183) { CH03(ts, z178, 0x183, 0, 0) Add(i000, 183, i000) m184() } - Method(m184) { CH03(ts, z178, 0x184, 0, 0) Add(i000, 184, i000) m185() } - Method(m185) { CH03(ts, z178, 0x185, 0, 0) Add(i000, 185, i000) m186() } - Method(m186) { CH03(ts, z178, 0x186, 0, 0) Add(i000, 186, i000) m187() } - Method(m187) { CH03(ts, z178, 0x187, 0, 0) Add(i000, 187, i000) m188() } - Method(m188) { CH03(ts, z178, 0x188, 0, 0) Add(i000, 188, i000) m189() } - Method(m189) { CH03(ts, z178, 0x189, 0, 0) Add(i000, 189, i000) m190() } - - Method(m190) { CH03(ts, z178, 0x190, 0, 0) Add(i000, 190, i000) m191() } - Method(m191) { CH03(ts, z178, 0x191, 0, 0) Add(i000, 191, i000) m192() } - Method(m192) { CH03(ts, z178, 0x192, 0, 0) Add(i000, 192, i000) m193() } - Method(m193) { CH03(ts, z178, 0x193, 0, 0) Add(i000, 193, i000) m194() } - Method(m194) { CH03(ts, z178, 0x194, 0, 0) Add(i000, 194, i000) m195() } - Method(m195) { CH03(ts, z178, 0x195, 0, 0) Add(i000, 195, i000) m196() } - Method(m196) { CH03(ts, z178, 0x196, 0, 0) Add(i000, 196, i000) m197() } - Method(m197) { CH03(ts, z178, 0x197, 0, 0) Add(i000, 197, i000) m198() } - Method(m198) { CH03(ts, z178, 0x198, 0, 0) Add(i000, 198, i000) m199() } - Method(m199) { CH03(ts, z178, 0x199, 0, 0) Add(i000, 199, i000) m200() } + Method(m100) { CH03(ts, z178, 0x100, __LINE__, 0) Add(i000, 100, i000) m101() } + Method(m101) { CH03(ts, z178, 0x101, __LINE__, 0) Add(i000, 101, i000) m102() } + Method(m102) { CH03(ts, z178, 0x102, __LINE__, 0) Add(i000, 102, i000) m103() } + Method(m103) { CH03(ts, z178, 0x103, __LINE__, 0) Add(i000, 103, i000) m104() } + Method(m104) { CH03(ts, z178, 0x104, __LINE__, 0) Add(i000, 104, i000) m105() } + Method(m105) { CH03(ts, z178, 0x105, __LINE__, 0) Add(i000, 105, i000) m106() } + Method(m106) { CH03(ts, z178, 0x106, __LINE__, 0) Add(i000, 106, i000) m107() } + Method(m107) { CH03(ts, z178, 0x107, __LINE__, 0) Add(i000, 107, i000) m108() } + Method(m108) { CH03(ts, z178, 0x108, __LINE__, 0) Add(i000, 108, i000) m109() } + Method(m109) { CH03(ts, z178, 0x109, __LINE__, 0) Add(i000, 109, i000) m110() } + + Method(m110) { CH03(ts, z178, 0x110, __LINE__, 0) Add(i000, 110, i000) m111() } + Method(m111) { CH03(ts, z178, 0x111, __LINE__, 0) Add(i000, 111, i000) m112() } + Method(m112) { CH03(ts, z178, 0x112, __LINE__, 0) Add(i000, 112, i000) m113() } + Method(m113) { CH03(ts, z178, 0x113, __LINE__, 0) Add(i000, 113, i000) m114() } + Method(m114) { CH03(ts, z178, 0x114, __LINE__, 0) Add(i000, 114, i000) m115() } + Method(m115) { CH03(ts, z178, 0x115, __LINE__, 0) Add(i000, 115, i000) m116() } + Method(m116) { CH03(ts, z178, 0x116, __LINE__, 0) Add(i000, 116, i000) m117() } + Method(m117) { CH03(ts, z178, 0x117, __LINE__, 0) Add(i000, 117, i000) m118() } + Method(m118) { CH03(ts, z178, 0x118, __LINE__, 0) Add(i000, 118, i000) m119() } + Method(m119) { CH03(ts, z178, 0x119, __LINE__, 0) Add(i000, 119, i000) m120() } + + Method(m120) { CH03(ts, z178, 0x120, __LINE__, 0) Add(i000, 120, i000) m121() } + Method(m121) { CH03(ts, z178, 0x121, __LINE__, 0) Add(i000, 121, i000) m122() } + Method(m122) { CH03(ts, z178, 0x122, __LINE__, 0) Add(i000, 122, i000) m123() } + Method(m123) { CH03(ts, z178, 0x123, __LINE__, 0) Add(i000, 123, i000) m124() } + Method(m124) { CH03(ts, z178, 0x124, __LINE__, 0) Add(i000, 124, i000) m125() } + Method(m125) { CH03(ts, z178, 0x125, __LINE__, 0) Add(i000, 125, i000) m126() } + Method(m126) { CH03(ts, z178, 0x126, __LINE__, 0) Add(i000, 126, i000) m127() } + Method(m127) { CH03(ts, z178, 0x127, __LINE__, 0) Add(i000, 127, i000) m128() } + Method(m128) { CH03(ts, z178, 0x128, __LINE__, 0) Add(i000, 128, i000) m129() } + Method(m129) { CH03(ts, z178, 0x129, __LINE__, 0) Add(i000, 129, i000) m130() } + + Method(m130) { CH03(ts, z178, 0x130, __LINE__, 0) Add(i000, 130, i000) m131() } + Method(m131) { CH03(ts, z178, 0x131, __LINE__, 0) Add(i000, 131, i000) m132() } + Method(m132) { CH03(ts, z178, 0x132, __LINE__, 0) Add(i000, 132, i000) m133() } + Method(m133) { CH03(ts, z178, 0x133, __LINE__, 0) Add(i000, 133, i000) m134() } + Method(m134) { CH03(ts, z178, 0x134, __LINE__, 0) Add(i000, 134, i000) m135() } + Method(m135) { CH03(ts, z178, 0x135, __LINE__, 0) Add(i000, 135, i000) m136() } + Method(m136) { CH03(ts, z178, 0x136, __LINE__, 0) Add(i000, 136, i000) m137() } + Method(m137) { CH03(ts, z178, 0x137, __LINE__, 0) Add(i000, 137, i000) m138() } + Method(m138) { CH03(ts, z178, 0x138, __LINE__, 0) Add(i000, 138, i000) m139() } + Method(m139) { CH03(ts, z178, 0x139, __LINE__, 0) Add(i000, 139, i000) m140() } + + Method(m140) { CH03(ts, z178, 0x140, __LINE__, 0) Add(i000, 140, i000) m141() } + Method(m141) { CH03(ts, z178, 0x141, __LINE__, 0) Add(i000, 141, i000) m142() } + Method(m142) { CH03(ts, z178, 0x142, __LINE__, 0) Add(i000, 142, i000) m143() } + Method(m143) { CH03(ts, z178, 0x143, __LINE__, 0) Add(i000, 143, i000) m144() } + Method(m144) { CH03(ts, z178, 0x144, __LINE__, 0) Add(i000, 144, i000) m145() } + Method(m145) { CH03(ts, z178, 0x145, __LINE__, 0) Add(i000, 145, i000) m146() } + Method(m146) { CH03(ts, z178, 0x146, __LINE__, 0) Add(i000, 146, i000) m147() } + Method(m147) { CH03(ts, z178, 0x147, __LINE__, 0) Add(i000, 147, i000) m148() } + Method(m148) { CH03(ts, z178, 0x148, __LINE__, 0) Add(i000, 148, i000) m149() } + Method(m149) { CH03(ts, z178, 0x149, __LINE__, 0) Add(i000, 149, i000) m150() } + + Method(m150) { CH03(ts, z178, 0x150, __LINE__, 0) Add(i000, 150, i000) m151() } + Method(m151) { CH03(ts, z178, 0x151, __LINE__, 0) Add(i000, 151, i000) m152() } + Method(m152) { CH03(ts, z178, 0x152, __LINE__, 0) Add(i000, 152, i000) m153() } + Method(m153) { CH03(ts, z178, 0x153, __LINE__, 0) Add(i000, 153, i000) m154() } + Method(m154) { CH03(ts, z178, 0x154, __LINE__, 0) Add(i000, 154, i000) m155() } + Method(m155) { CH03(ts, z178, 0x155, __LINE__, 0) Add(i000, 155, i000) m156() } + Method(m156) { CH03(ts, z178, 0x156, __LINE__, 0) Add(i000, 156, i000) m157() } + Method(m157) { CH03(ts, z178, 0x157, __LINE__, 0) Add(i000, 157, i000) m158() } + Method(m158) { CH03(ts, z178, 0x158, __LINE__, 0) Add(i000, 158, i000) m159() } + Method(m159) { CH03(ts, z178, 0x159, __LINE__, 0) Add(i000, 159, i000) m160() } + + Method(m160) { CH03(ts, z178, 0x160, __LINE__, 0) Add(i000, 160, i000) m161() } + Method(m161) { CH03(ts, z178, 0x161, __LINE__, 0) Add(i000, 161, i000) m162() } + Method(m162) { CH03(ts, z178, 0x162, __LINE__, 0) Add(i000, 162, i000) m163() } + Method(m163) { CH03(ts, z178, 0x163, __LINE__, 0) Add(i000, 163, i000) m164() } + Method(m164) { CH03(ts, z178, 0x164, __LINE__, 0) Add(i000, 164, i000) m165() } + Method(m165) { CH03(ts, z178, 0x165, __LINE__, 0) Add(i000, 165, i000) m166() } + Method(m166) { CH03(ts, z178, 0x166, __LINE__, 0) Add(i000, 166, i000) m167() } + Method(m167) { CH03(ts, z178, 0x167, __LINE__, 0) Add(i000, 167, i000) m168() } + Method(m168) { CH03(ts, z178, 0x168, __LINE__, 0) Add(i000, 168, i000) m169() } + Method(m169) { CH03(ts, z178, 0x169, __LINE__, 0) Add(i000, 169, i000) m170() } + + Method(m170) { CH03(ts, z178, 0x170, __LINE__, 0) Add(i000, 170, i000) m171() } + Method(m171) { CH03(ts, z178, 0x171, __LINE__, 0) Add(i000, 171, i000) m172() } + Method(m172) { CH03(ts, z178, 0x172, __LINE__, 0) Add(i000, 172, i000) m173() } + Method(m173) { CH03(ts, z178, 0x173, __LINE__, 0) Add(i000, 173, i000) m174() } + Method(m174) { CH03(ts, z178, 0x174, __LINE__, 0) Add(i000, 174, i000) m175() } + Method(m175) { CH03(ts, z178, 0x175, __LINE__, 0) Add(i000, 175, i000) m176() } + Method(m176) { CH03(ts, z178, 0x176, __LINE__, 0) Add(i000, 176, i000) m177() } + Method(m177) { CH03(ts, z178, 0x177, __LINE__, 0) Add(i000, 177, i000) m178() } + Method(m178) { CH03(ts, z178, 0x178, __LINE__, 0) Add(i000, 178, i000) m179() } + Method(m179) { CH03(ts, z178, 0x179, __LINE__, 0) Add(i000, 179, i000) m180() } + + Method(m180) { CH03(ts, z178, 0x180, __LINE__, 0) Add(i000, 180, i000) m181() } + Method(m181) { CH03(ts, z178, 0x181, __LINE__, 0) Add(i000, 181, i000) m182() } + Method(m182) { CH03(ts, z178, 0x182, __LINE__, 0) Add(i000, 182, i000) m183() } + Method(m183) { CH03(ts, z178, 0x183, __LINE__, 0) Add(i000, 183, i000) m184() } + Method(m184) { CH03(ts, z178, 0x184, __LINE__, 0) Add(i000, 184, i000) m185() } + Method(m185) { CH03(ts, z178, 0x185, __LINE__, 0) Add(i000, 185, i000) m186() } + Method(m186) { CH03(ts, z178, 0x186, __LINE__, 0) Add(i000, 186, i000) m187() } + Method(m187) { CH03(ts, z178, 0x187, __LINE__, 0) Add(i000, 187, i000) m188() } + Method(m188) { CH03(ts, z178, 0x188, __LINE__, 0) Add(i000, 188, i000) m189() } + Method(m189) { CH03(ts, z178, 0x189, __LINE__, 0) Add(i000, 189, i000) m190() } + + Method(m190) { CH03(ts, z178, 0x190, __LINE__, 0) Add(i000, 190, i000) m191() } + Method(m191) { CH03(ts, z178, 0x191, __LINE__, 0) Add(i000, 191, i000) m192() } + Method(m192) { CH03(ts, z178, 0x192, __LINE__, 0) Add(i000, 192, i000) m193() } + Method(m193) { CH03(ts, z178, 0x193, __LINE__, 0) Add(i000, 193, i000) m194() } + Method(m194) { CH03(ts, z178, 0x194, __LINE__, 0) Add(i000, 194, i000) m195() } + Method(m195) { CH03(ts, z178, 0x195, __LINE__, 0) Add(i000, 195, i000) m196() } + Method(m196) { CH03(ts, z178, 0x196, __LINE__, 0) Add(i000, 196, i000) m197() } + Method(m197) { CH03(ts, z178, 0x197, __LINE__, 0) Add(i000, 197, i000) m198() } + Method(m198) { CH03(ts, z178, 0x198, __LINE__, 0) Add(i000, 198, i000) m199() } + Method(m199) { CH03(ts, z178, 0x199, __LINE__, 0) Add(i000, 199, i000) m200() } // 200 - 299 - Method(m200) { CH03(ts, z178, 0x200, 0, 0) Add(i000, 200, i000) m201() } - Method(m201) { CH03(ts, z178, 0x201, 0, 0) Add(i000, 201, i000) m202() } - Method(m202) { CH03(ts, z178, 0x202, 0, 0) Add(i000, 202, i000) m203() } - Method(m203) { CH03(ts, z178, 0x203, 0, 0) Add(i000, 203, i000) m204() } - Method(m204) { CH03(ts, z178, 0x204, 0, 0) Add(i000, 204, i000) m205() } - Method(m205) { CH03(ts, z178, 0x205, 0, 0) Add(i000, 205, i000) m206() } - Method(m206) { CH03(ts, z178, 0x206, 0, 0) Add(i000, 206, i000) m207() } - Method(m207) { CH03(ts, z178, 0x207, 0, 0) Add(i000, 207, i000) m208() } - Method(m208) { CH03(ts, z178, 0x208, 0, 0) Add(i000, 208, i000) m209() } - Method(m209) { CH03(ts, z178, 0x209, 0, 0) Add(i000, 209, i000) m210() } - - Method(m210) { CH03(ts, z178, 0x210, 0, 0) Add(i000, 210, i000) m211() } - Method(m211) { CH03(ts, z178, 0x211, 0, 0) Add(i000, 211, i000) m212() } - Method(m212) { CH03(ts, z178, 0x212, 0, 0) Add(i000, 212, i000) m213() } - Method(m213) { CH03(ts, z178, 0x213, 0, 0) Add(i000, 213, i000) m214() } - Method(m214) { CH03(ts, z178, 0x214, 0, 0) Add(i000, 214, i000) m215() } - Method(m215) { CH03(ts, z178, 0x215, 0, 0) Add(i000, 215, i000) m216() } - Method(m216) { CH03(ts, z178, 0x216, 0, 0) Add(i000, 216, i000) m217() } - Method(m217) { CH03(ts, z178, 0x217, 0, 0) Add(i000, 217, i000) m218() } - Method(m218) { CH03(ts, z178, 0x218, 0, 0) Add(i000, 218, i000) m219() } - Method(m219) { CH03(ts, z178, 0x219, 0, 0) Add(i000, 219, i000) m220() } - - Method(m220) { CH03(ts, z178, 0x220, 0, 0) Add(i000, 220, i000) m221() } - Method(m221) { CH03(ts, z178, 0x221, 0, 0) Add(i000, 221, i000) m222() } - Method(m222) { CH03(ts, z178, 0x222, 0, 0) Add(i000, 222, i000) m223() } - Method(m223) { CH03(ts, z178, 0x223, 0, 0) Add(i000, 223, i000) m224() } - Method(m224) { CH03(ts, z178, 0x224, 0, 0) Add(i000, 224, i000) m225() } - Method(m225) { CH03(ts, z178, 0x225, 0, 0) Add(i000, 225, i000) m226() } - Method(m226) { CH03(ts, z178, 0x226, 0, 0) Add(i000, 226, i000) m227() } - Method(m227) { CH03(ts, z178, 0x227, 0, 0) Add(i000, 227, i000) m228() } - Method(m228) { CH03(ts, z178, 0x228, 0, 0) Add(i000, 228, i000) m229() } - Method(m229) { CH03(ts, z178, 0x229, 0, 0) Add(i000, 229, i000) m230() } - - Method(m230) { CH03(ts, z178, 0x230, 0, 0) Add(i000, 230, i000) m231() } - Method(m231) { CH03(ts, z178, 0x231, 0, 0) Add(i000, 231, i000) m232() } - Method(m232) { CH03(ts, z178, 0x232, 0, 0) Add(i000, 232, i000) m233() } - Method(m233) { CH03(ts, z178, 0x233, 0, 0) Add(i000, 233, i000) m234() } - Method(m234) { CH03(ts, z178, 0x234, 0, 0) Add(i000, 234, i000) m235() } - Method(m235) { CH03(ts, z178, 0x235, 0, 0) Add(i000, 235, i000) m236() } - Method(m236) { CH03(ts, z178, 0x236, 0, 0) Add(i000, 236, i000) m237() } - Method(m237) { CH03(ts, z178, 0x237, 0, 0) Add(i000, 237, i000) m238() } - Method(m238) { CH03(ts, z178, 0x238, 0, 0) Add(i000, 238, i000) m239() } - Method(m239) { CH03(ts, z178, 0x239, 0, 0) Add(i000, 239, i000) m240() } - - Method(m240) { CH03(ts, z178, 0x240, 0, 0) Add(i000, 240, i000) m241() } - Method(m241) { CH03(ts, z178, 0x241, 0, 0) Add(i000, 241, i000) m242() } - Method(m242) { CH03(ts, z178, 0x242, 0, 0) Add(i000, 242, i000) m243() } - Method(m243) { CH03(ts, z178, 0x243, 0, 0) Add(i000, 243, i000) m244() } - Method(m244) { CH03(ts, z178, 0x244, 0, 0) Add(i000, 244, i000) m245() } - Method(m245) { CH03(ts, z178, 0x245, 0, 0) Add(i000, 245, i000) m246() } + Method(m200) { CH03(ts, z178, 0x200, __LINE__, 0) Add(i000, 200, i000) m201() } + Method(m201) { CH03(ts, z178, 0x201, __LINE__, 0) Add(i000, 201, i000) m202() } + Method(m202) { CH03(ts, z178, 0x202, __LINE__, 0) Add(i000, 202, i000) m203() } + Method(m203) { CH03(ts, z178, 0x203, __LINE__, 0) Add(i000, 203, i000) m204() } + Method(m204) { CH03(ts, z178, 0x204, __LINE__, 0) Add(i000, 204, i000) m205() } + Method(m205) { CH03(ts, z178, 0x205, __LINE__, 0) Add(i000, 205, i000) m206() } + Method(m206) { CH03(ts, z178, 0x206, __LINE__, 0) Add(i000, 206, i000) m207() } + Method(m207) { CH03(ts, z178, 0x207, __LINE__, 0) Add(i000, 207, i000) m208() } + Method(m208) { CH03(ts, z178, 0x208, __LINE__, 0) Add(i000, 208, i000) m209() } + Method(m209) { CH03(ts, z178, 0x209, __LINE__, 0) Add(i000, 209, i000) m210() } + + Method(m210) { CH03(ts, z178, 0x210, __LINE__, 0) Add(i000, 210, i000) m211() } + Method(m211) { CH03(ts, z178, 0x211, __LINE__, 0) Add(i000, 211, i000) m212() } + Method(m212) { CH03(ts, z178, 0x212, __LINE__, 0) Add(i000, 212, i000) m213() } + Method(m213) { CH03(ts, z178, 0x213, __LINE__, 0) Add(i000, 213, i000) m214() } + Method(m214) { CH03(ts, z178, 0x214, __LINE__, 0) Add(i000, 214, i000) m215() } + Method(m215) { CH03(ts, z178, 0x215, __LINE__, 0) Add(i000, 215, i000) m216() } + Method(m216) { CH03(ts, z178, 0x216, __LINE__, 0) Add(i000, 216, i000) m217() } + Method(m217) { CH03(ts, z178, 0x217, __LINE__, 0) Add(i000, 217, i000) m218() } + Method(m218) { CH03(ts, z178, 0x218, __LINE__, 0) Add(i000, 218, i000) m219() } + Method(m219) { CH03(ts, z178, 0x219, __LINE__, 0) Add(i000, 219, i000) m220() } + + Method(m220) { CH03(ts, z178, 0x220, __LINE__, 0) Add(i000, 220, i000) m221() } + Method(m221) { CH03(ts, z178, 0x221, __LINE__, 0) Add(i000, 221, i000) m222() } + Method(m222) { CH03(ts, z178, 0x222, __LINE__, 0) Add(i000, 222, i000) m223() } + Method(m223) { CH03(ts, z178, 0x223, __LINE__, 0) Add(i000, 223, i000) m224() } + Method(m224) { CH03(ts, z178, 0x224, __LINE__, 0) Add(i000, 224, i000) m225() } + Method(m225) { CH03(ts, z178, 0x225, __LINE__, 0) Add(i000, 225, i000) m226() } + Method(m226) { CH03(ts, z178, 0x226, __LINE__, 0) Add(i000, 226, i000) m227() } + Method(m227) { CH03(ts, z178, 0x227, __LINE__, 0) Add(i000, 227, i000) m228() } + Method(m228) { CH03(ts, z178, 0x228, __LINE__, 0) Add(i000, 228, i000) m229() } + Method(m229) { CH03(ts, z178, 0x229, __LINE__, 0) Add(i000, 229, i000) m230() } + + Method(m230) { CH03(ts, z178, 0x230, __LINE__, 0) Add(i000, 230, i000) m231() } + Method(m231) { CH03(ts, z178, 0x231, __LINE__, 0) Add(i000, 231, i000) m232() } + Method(m232) { CH03(ts, z178, 0x232, __LINE__, 0) Add(i000, 232, i000) m233() } + Method(m233) { CH03(ts, z178, 0x233, __LINE__, 0) Add(i000, 233, i000) m234() } + Method(m234) { CH03(ts, z178, 0x234, __LINE__, 0) Add(i000, 234, i000) m235() } + Method(m235) { CH03(ts, z178, 0x235, __LINE__, 0) Add(i000, 235, i000) m236() } + Method(m236) { CH03(ts, z178, 0x236, __LINE__, 0) Add(i000, 236, i000) m237() } + Method(m237) { CH03(ts, z178, 0x237, __LINE__, 0) Add(i000, 237, i000) m238() } + Method(m238) { CH03(ts, z178, 0x238, __LINE__, 0) Add(i000, 238, i000) m239() } + Method(m239) { CH03(ts, z178, 0x239, __LINE__, 0) Add(i000, 239, i000) m240() } + + Method(m240) { CH03(ts, z178, 0x240, __LINE__, 0) Add(i000, 240, i000) m241() } + Method(m241) { CH03(ts, z178, 0x241, __LINE__, 0) Add(i000, 241, i000) m242() } + Method(m242) { CH03(ts, z178, 0x242, __LINE__, 0) Add(i000, 242, i000) m243() } + Method(m243) { CH03(ts, z178, 0x243, __LINE__, 0) Add(i000, 243, i000) m244() } + Method(m244) { CH03(ts, z178, 0x244, __LINE__, 0) Add(i000, 244, i000) m245() } + Method(m245) { CH03(ts, z178, 0x245, __LINE__, 0) Add(i000, 245, i000) m246() } /* * We should take into account there how many method @@ -329,7 +329,7 @@ Method(m0fc, 1, Serialized) Method(m246) { - CH03(ts, z178, 0x246, 0, 0) + CH03(ts, z178, 0x246, __LINE__, 0) Add(i000, 246, i000) if (LNot(MLVL)) { @@ -341,33 +341,33 @@ Method(m0fc, 1, Serialized) } Method(m247) { - CH03(ts, z178, 0x247, 0, 0) + CH03(ts, z178, 0x247, __LINE__, 0) Add(i000, 247, i000) if (i001) { // To cause AE_AML_METHOD_LIMIT exception m248() } } - Method(m248) { CH03(ts, z178, 0x248, 0, 0) Add(i000, 248, i000) } + Method(m248) { CH03(ts, z178, 0x248, __LINE__, 0) Add(i000, 248, i000) } - CH03(ts, z178, 0x300, 0, 0) + CH03(ts, z178, 0x300, __LINE__, 0) Store(arg0, i001) m000() if (arg0) { - CH04(ts, 0, 86, z178, 0x301, 0, 0) // AE_OWNER_ID_LIMIT + CH04(ts, 0, 86, z178, __LINE__, 0, 0) // AE_OWNER_ID_LIMIT } else { - CH03(ts, z178, 0x302, 0, 0) + CH03(ts, z178, 0x302, __LINE__, 0) if (MLVL) { Store(0x76AD, Local0) } else { Store(0x77A4, Local0) } if (LNotEqual(i000, Local0)) { - err(ts, z178, 0x303, 0, 0, i000, Local0) + err(ts, z178, __LINE__, 0, 0, i000, Local0) } } } @@ -383,7 +383,7 @@ Method(m0fe, 1, Serialized) Method(m000) { - CH03(ts, z178, 0x400, 0, 0) + CH03(ts, z178, 0x400, __LINE__, 0) Store(max0, Local0) if (i001) { @@ -396,18 +396,18 @@ Method(m0fe, 1, Serialized) } } - CH03(ts, z178, 0x401, 0, 0) + CH03(ts, z178, 0x401, __LINE__, 0) Store(arg0, i001) m000() if (arg0) { - CH04(ts, 0, 84, z178, 0x402, 0, 0) // AE_AML_METHOD_LIMIT + CH04(ts, 0, 84, z178, __LINE__, 0, 0) // AE_AML_METHOD_LIMIT } else { - CH03(ts, z178, 0x403, 0, 0) + CH03(ts, z178, 0x403, __LINE__, 0) if (LNotEqual(i000, 0xf7)) { - err(ts, z178, 0x404, 0, 0, i000, 0xf7) + err(ts, z178, __LINE__, 0, 0, i000, 0xf7) } } } @@ -443,7 +443,7 @@ return } - CH03("m0fd", z178, 0x405, 0, 0) + CH03("m0fd", z178, 0x405, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/functional/control/Return/return.asl b/tests/aslts/src/runtime/collections/functional/control/Return/return.asl index c97656a..8f39347 100644 --- a/tests/aslts/src/runtime/collections/functional/control/Return/return.asl +++ b/tests/aslts/src/runtime/collections/functional/control/Return/return.asl @@ -606,7 +606,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x000, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 0, 0) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -626,7 +626,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x001, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 1, 1) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -646,7 +646,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x002, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 2, 2) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -666,7 +666,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x003, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 3, 3) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -686,7 +686,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x004, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 4, 4) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -706,7 +706,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x005, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 5, 5) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -726,7 +726,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x006, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 6, 6) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -746,7 +746,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x007, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 7, 7) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -766,7 +766,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x008, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 8, 8) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -786,7 +786,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x009, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 9, 9) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) diff --git a/tests/aslts/src/runtime/collections/functional/control/ctl0.asl b/tests/aslts/src/runtime/collections/functional/control/ctl0.asl index cd18702..9bce217 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ctl0.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ctl0.asl @@ -100,13 +100,13 @@ Method(m074,, Serialized) Store(0, Local7) Store(m070(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 0, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } Store(0x12345678, Local7) Store(m070(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 1, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } // m071 @@ -115,7 +115,7 @@ Method(m074,, Serialized) While(LLess(Local7, 2)) { Store(m071(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 2, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -123,7 +123,7 @@ Method(m074,, Serialized) Store(0x12345678, Local7) Store(m071(Local7), Local0) if (LNotEqual(Local0, 1)){ - err(ts, z003, 3, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } // m072 @@ -132,7 +132,7 @@ Method(m074,, Serialized) While(LLess(Local7, 2)) { Store(m072(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 4, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -140,7 +140,7 @@ Method(m074,, Serialized) Store(0x12345678, Local7) Store(m072(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 5, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } // m073 @@ -149,7 +149,7 @@ Method(m074,, Serialized) While(LLess(Local7, 3)) { Store(m073(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 6, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -157,7 +157,7 @@ Method(m074,, Serialized) Store(0x12345678, Local7) Store(m073(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z003, 7, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/ctl1.asl b/tests/aslts/src/runtime/collections/functional/control/ctl1.asl index 4983048..10cdcf3 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ctl1.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ctl1.asl @@ -982,7 +982,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 1)) { Store(m080(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 0, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -990,7 +990,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m080(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 1, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m081 @@ -998,14 +998,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m081(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 2, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 2)) { Store(m081(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 3, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1013,7 +1013,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m081(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 4, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m082 @@ -1022,7 +1022,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 2)) { Store(m082(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 5, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1030,7 +1030,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m082(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 6, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m083 @@ -1038,14 +1038,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m083(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 7, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m083(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 8, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1053,7 +1053,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m083(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 9, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m090 @@ -1062,7 +1062,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 2)) { Store(m090(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 10, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1070,7 +1070,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m090(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 11, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m091 @@ -1079,7 +1079,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 2)) { Store(m091(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 12, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1087,7 +1087,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m091(Local7), Local0) if (LNotEqual(Local0, 1)){ - err(ts, z004, 13, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m092 @@ -1096,7 +1096,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m092(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 14, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1104,7 +1104,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m092(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 15, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m093 @@ -1112,14 +1112,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m093(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 16, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m093(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 17, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1127,7 +1127,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m093(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 18, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m094 @@ -1135,20 +1135,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m094(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 19, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m094(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 20, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 3)) { Store(m094(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 21, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1156,7 +1156,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m094(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 22, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m095 @@ -1164,14 +1164,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m095(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 23, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 2)) { Store(m095(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 24, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1180,14 +1180,14 @@ Method(m0b8,, Serialized) Store(3, Local7) Store(m095(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 25, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(4, Local7) While(LLessEqual(Local7, 5)) { Store(m095(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 26, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1196,7 +1196,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m095(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 27, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m096 @@ -1205,7 +1205,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m096(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 28, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1213,7 +1213,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m096(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 29, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m097 @@ -1222,7 +1222,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m097(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 30, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1230,7 +1230,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m097(Local7), Local0) if (LNotEqual(Local0, 1)){ - err(ts, z004, 31, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m098 @@ -1239,7 +1239,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 5)) { Store(m098(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 32, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1247,7 +1247,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m098(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 33, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m099 @@ -1255,14 +1255,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m099(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 34, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 4)) { Store(m099(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 35, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1270,7 +1270,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m099(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 36, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09a @@ -1278,20 +1278,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m09a(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 37, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m09a(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 38, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 4)) { Store(m09a(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 39, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1299,7 +1299,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09a(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 40, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09b @@ -1307,14 +1307,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m09b(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 41, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m09b(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 42, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1322,14 +1322,14 @@ Method(m0b8,, Serialized) Store(4, Local7) Store(m09b(Local7), Local0) if (LNotEqual(Local0, 7)){ - err(ts, z004, 43, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(5, Local7) While(LLessEqual(Local7, 7)) { Store(m09b(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 44, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1337,7 +1337,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09b(Local7), Local0) if (LNotEqual(Local0, 7)){ - err(ts, z004, 45, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09c @@ -1346,7 +1346,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 2)) { Store(m09c(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 46, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1354,7 +1354,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09c(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 47, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09d @@ -1363,7 +1363,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 2)) { Store(m09d(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 48, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1371,7 +1371,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09d(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 49, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09e @@ -1380,7 +1380,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m09e(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 50, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1388,7 +1388,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09e(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 51, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09f @@ -1396,14 +1396,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m09f(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 52, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m09f(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 53, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1411,7 +1411,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09f(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 54, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a0 @@ -1419,20 +1419,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0a0(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 55, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m0a0(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 56, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 3)) { Store(m0a0(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 57, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1440,7 +1440,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a0(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 58, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a1 @@ -1448,14 +1448,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0a1(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 59, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 2)) { Store(m0a1(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 60, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1463,14 +1463,14 @@ Method(m0b8,, Serialized) Store(3, Local7) Store(m0a1(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 61, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(4, Local7) While(LLessEqual(Local7, 5)) { Store(m0a1(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 62, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1478,7 +1478,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a1(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 63, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a2 @@ -1487,7 +1487,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m0a2(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 64, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1495,7 +1495,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a2(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 65, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a3 @@ -1504,7 +1504,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m0a3(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 66, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1512,7 +1512,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a3(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 67, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a4 @@ -1521,7 +1521,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 5)) { Store(m0a4(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 68, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1529,7 +1529,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a4(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 69, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a5 @@ -1537,14 +1537,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0a5(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 70, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 4)) { Store(m0a5(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 71, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1552,7 +1552,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a5(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 72, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a6 @@ -1560,20 +1560,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0a6(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 73, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m0a6(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 74, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 4)) { Store(m0a6(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 75, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1581,7 +1581,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a6(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 76, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a7 @@ -1589,14 +1589,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0a7(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 77, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m0a7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 78, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1604,14 +1604,14 @@ Method(m0b8,, Serialized) Store(4, Local7) Store(m0a7(Local7), Local0) if (LNotEqual(Local0, 7)){ - err(ts, z004, 79, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(5, Local7) While(LLessEqual(Local7, 7)) { Store(m0a7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 80, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1619,7 +1619,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 81, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a8 @@ -1628,7 +1628,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m0a8(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 82, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1636,7 +1636,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a8(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 83, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a9 @@ -1645,7 +1645,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m0a9(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 84, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1653,7 +1653,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a9(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 85, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0aa @@ -1662,7 +1662,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m0aa(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 86, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1670,7 +1670,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0aa(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 87, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0ab @@ -1679,7 +1679,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 5)) { Store(m0ab(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 88, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1687,21 +1687,21 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0ab(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 89, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0ac Store(0, Local7) Store(m0ac(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 90, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 4)) { Store(m0ac(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 91, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1709,7 +1709,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0ac(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 92, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0ad @@ -1717,20 +1717,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0ad(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 93, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m0ad(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 94, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 4)) { Store(m0ad(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 95, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1738,7 +1738,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0ad(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 96, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0ae @@ -1747,7 +1747,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 1)) { Store(m0ae(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 97, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1755,14 +1755,14 @@ Method(m0b8,, Serialized) Store(2, Local7) Store(m0ae(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 98, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(3, Local7) While(LLessEqual(Local7, 4)) { Store(m0ae(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 99, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1770,7 +1770,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0ae(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 100, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0af @@ -1779,14 +1779,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0af(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 101, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 2)) { Store(m0af(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 102, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1794,14 +1794,14 @@ Method(m0b8,, Serialized) Store(3, Local7) Store(m0af(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 103, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(4, Local7) While(LLessEqual(Local7, 5)) { Store(m0af(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 104, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1810,14 +1810,14 @@ Method(m0b8,, Serialized) Store(6, Local7) Store(m0af(Local7), Local0) if (LNotEqual(Local0, 8)){ - err(ts, z004, 105, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(7, Local7) While(LLessEqual(Local7, 8)) { Store(m0af(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 106, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1825,7 +1825,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0af(Local7), Local0) if (LNotEqual(Local0, 8)){ - err(ts, z004, 107, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b0 @@ -1834,7 +1834,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 4)) { Store(m0b0(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 108, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1842,7 +1842,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b0(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 109, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b1 @@ -1851,7 +1851,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 4)) { Store(m0b1(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 110, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1859,7 +1859,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b1(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 111, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b2 @@ -1868,7 +1868,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 4)) { Store(m0b2(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 112, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1876,7 +1876,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b2(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 113, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b3 @@ -1885,7 +1885,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 4)) { Store(m0b3(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 114, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1893,7 +1893,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b3(Local7), Local0) if (LNotEqual(Local0, 6)){ - err(ts, z004, 115, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b4 @@ -1901,14 +1901,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0b4(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 116, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 5)) { Store(m0b4(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 117, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1916,7 +1916,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b4(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 118, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b5 @@ -1924,20 +1924,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0b5(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 119, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m0b5(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 120, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 5)) { Store(m0b5(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 121, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1945,7 +1945,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b5(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 122, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b6 @@ -1954,7 +1954,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 1)) { Store(m0b6(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 123, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1962,14 +1962,14 @@ Method(m0b8,, Serialized) Store(2, Local7) Store(m0b6(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 124, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(3, Local7) While(LLessEqual(Local7, 5)) { Store(m0b6(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 125, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1977,7 +1977,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b6(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 126, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b7 @@ -1985,14 +1985,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0b7(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 127, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m0b7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 128, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -2000,14 +2000,14 @@ Method(m0b8,, Serialized) Store(4, Local7) Store(m0b7(Local7), Local0) if (LNotEqual(Local0, 7)){ - err(ts, z004, 129, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(5, Local7) While(LLessEqual(Local7, 7)) { Store(m0b7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 130, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -2015,14 +2015,14 @@ Method(m0b8,, Serialized) Store(8, Local7) Store(m0b7(Local7), Local0) if (LNotEqual(Local0, 11)){ - err(ts, z004, 131, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(9, Local7) While(LLessEqual(Local7, 11)) { Store(m0b7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 132, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -2030,14 +2030,14 @@ Method(m0b8,, Serialized) Store(12, Local7) Store(m0b7(Local7), Local0) if (LNotEqual(Local0, 15)){ - err(ts, z004, 133, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(13, Local7) While(LLessEqual(Local7, 15)) { Store(m0b7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 134, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -2045,7 +2045,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b7(Local7), Local0) if (LNotEqual(Local0, 15)){ - err(ts, z004, 135, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/ctl2.asl b/tests/aslts/src/runtime/collections/functional/control/ctl2.asl index dd4c8fb..1d49054 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ctl2.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ctl2.asl @@ -796,7 +796,7 @@ Method(IF00,, Serialized) While (LLess(Local7, 302)) { Store(m040(Local7), Local0) if (LNotEqual(Local0, Local7)) { - err(ts, z005, Local7, 0, 0, Local0, 0) + err(ts, z005, __LINE__, 0, 0, Local0, 0) } Increment(Local7) } diff --git a/tests/aslts/src/runtime/collections/functional/control/switch1.asl b/tests/aslts/src/runtime/collections/functional/control/switch1.asl index a2db729..d36c094 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch1.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch1.asl @@ -585,7 +585,7 @@ Method(m0c7, 3, Serialized) } if (LNotEqual(Local0, ix00)){ - err(arg0, z068, 0, 0, 0, Local0, ix00) + err(arg0, z068, __LINE__, 0, 0, Local0, ix00) } Increment(ix00) Increment(swi1) diff --git a/tests/aslts/src/runtime/collections/functional/control/switch2.asl b/tests/aslts/src/runtime/collections/functional/control/switch2.asl index a23930c..77323a6 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch2.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch2.asl @@ -243,7 +243,7 @@ Method(SW02,, Serialized) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, lpN0)) { - err(ts, z069, 0, 0, 0, Local1, lpN0) + err(ts, z069, __LINE__, 0, 0, Local1, lpN0) return (Ones) } Store(1, Index(b0sw, lpN0)) @@ -546,7 +546,7 @@ Method(SW03,, Serialized) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, lpN0)) { - err(ts, z069, 1, 0, 0, Local1, lpN0) + err(ts, z069, __LINE__, 0, 0, Local1, lpN0) return (Ones) } Store(2, Index(b0sw, lpN0)) @@ -567,7 +567,7 @@ Method(SW03,, Serialized) Increment(lpC0) Add(TMAX, lpN0, Local7) if (LNotEqual(Local1, Local7)) { - err(ts, z069, 2, 0, 0, Local1, Local7) + err(ts, z069, __LINE__, 0, 0, Local1, Local7) return (Ones) } } @@ -907,7 +907,7 @@ Method(SW04,, Serialized) Store(m0c3(), Local1) if (LNotEqual(Local1, Local7)) { - err(ts, z069, 3, 0, 0, Local1, Local7) + err(ts, z069, __LINE__, 0, 0, Local1, Local7) return (Ones) } @@ -922,7 +922,7 @@ Method(SW04,, Serialized) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, lpN0)) { - err(ts, z069, 4, 0, 0, Local1, lpN0) + err(ts, z069, __LINE__, 0, 0, Local1, lpN0) return (Ones) } } @@ -1271,7 +1271,7 @@ Method(SW05,, Serialized) Store(m0c4(lpC0), Local1) if (LNotEqual(Local1, lpC0)) { - err(ts, z069, 5, 0, 0, Local1, lpC0) + err(ts, z069, __LINE__, 0, 0, Local1, lpC0) return (Ones) } Decrement(lpN0) @@ -1611,7 +1611,7 @@ Method(SW06,, Serialized) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, Local7)) { - err(ts, z069, 6, 0, 0, Local1, Local7) + err(ts, z069, __LINE__, 0, 0, Local1, Local7) return (Ones) } } @@ -1628,7 +1628,7 @@ Method(SW06,, Serialized) Increment(lpC0) Add(TMAX, lpN0, Local7) if (LNotEqual(Local1, Local7)) { - err(ts, z069, 7, 0, 0, Local1, Local7) + err(ts, z069, __LINE__, 0, 0, Local1, Local7) return (Ones) } Store(2, Index(b0sw, lpN0)) diff --git a/tests/aslts/src/runtime/collections/functional/control/switch3.asl b/tests/aslts/src/runtime/collections/functional/control/switch3.asl index 9abee25..4b01f8d 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch3.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch3.asl @@ -349,7 +349,7 @@ Method(m0de, 1) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, lpN0)) { - err(arg0, z070, 0, 0, 0, Local1, lpN0) + err(arg0, z070, __LINE__, 0, 0, Local1, lpN0) return (Ones) } Store(2, Index(b0sw, lpN0)) @@ -370,7 +370,7 @@ Method(m0de, 1) Increment(lpC0) Add(TMAX, lpN0, Local7) if (LNotEqual(Local1, Local7)) { - err(arg0, z070, 1, 0, 0, Local1, Local7) + err(arg0, z070, __LINE__, 0, 0, Local1, Local7) return (Ones) } } @@ -712,7 +712,7 @@ Method(m0de, 1) Store(m002(), Local1) if (LNotEqual(Local1, Local7)) { - err(arg0, z070, 2, 0, 0, Local1, Local7) + err(arg0, z070, __LINE__, 0, 0, Local1, Local7) return (Ones) } @@ -727,7 +727,7 @@ Method(m0de, 1) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, lpN0)) { - err(arg0, z070, 3, 0, 0, Local1, lpN0) + err(arg0, z070, __LINE__, 0, 0, Local1, lpN0) return (Ones) } } @@ -912,7 +912,7 @@ Method(m0de, 1) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local0, lpN0)) { - err(arg0, z070, 4, 0, 0, Local0, lpN0) + err(arg0, z070, __LINE__, 0, 0, Local0, lpN0) return (Ones) } Store(1, Index(b0sw, lpN0)) diff --git a/tests/aslts/src/runtime/collections/functional/control/switch4.asl b/tests/aslts/src/runtime/collections/functional/control/switch4.asl index af05fa0..cff7085 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch4.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch4.asl @@ -218,55 +218,55 @@ Method(m0e0, 1) Store(m0df(0321), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 0, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0df(0xd1), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 1, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0df(9876543210), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z071, 2, 0, 0, Local0, 37) + err(arg0, z071, __LINE__, 0, 0, Local0, 37) } Store(m0df(0xc179b3fe), Local0) if (LNotEqual(Local0, 28)) { - err(arg0, z071, 4, 0, 0, Local0, 28) + err(arg0, z071, __LINE__, 0, 0, Local0, 28) } Store(m0df(0xfe7cb391d650a284), Local0) if (F64) { if (LNotEqual(Local0, 29)) { - err(arg0, z071, 0x100, 0, 0, Local0, 29) + err(arg0, z071, __LINE__, 0, 0, Local0, 29) } } else { if (LNotEqual(Local0, 39)) { - err(arg0, z071, 0x101, 0, 0, Local0, 39) + err(arg0, z071, __LINE__, 0, 0, Local0, 39) } } Store(m0df(0), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z071, 6, 0, 0, Local0, 14) + err(arg0, z071, __LINE__, 0, 0, Local0, 14) } Store(m0df(0xffffffff), Local0) if (LNotEqual(Local0, 16)) { - err(arg0, z071, 7, 0, 0, Local0, 16) + err(arg0, z071, __LINE__, 0, 0, Local0, 16) } Store(m0df(0xffffffffffffffff), Local0) if (F64) { if (LNotEqual(Local0, 17)) { - err(arg0, z071, 8, 0, 0, Local0, 17) + err(arg0, z071, __LINE__, 0, 0, Local0, 17) } } else { if (LNotEqual(Local0, 16)) { - err(arg0, z071, 9, 0, 0, Local0, 16) + err(arg0, z071, __LINE__, 0, 0, Local0, 16) } } Store(m0df(0xff), Local0) if (LNotEqual(Local0, 20)) { - err(arg0, z071, 10, 0, 0, Local0, 20) + err(arg0, z071, __LINE__, 0, 0, Local0, 20) } Store(m0df(0xabcdef), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z071, 11, 0, 0, Local0, 44) + err(arg0, z071, __LINE__, 0, 0, Local0, 44) } } @@ -451,62 +451,62 @@ Method(m0e2, 1) Store(m0e1(0321), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 12, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0e1(0xd1), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 13, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0e1(9876543210), Local0) // if (F64) { if (LNotEqual(Local0, 37)) { - err(arg0, z071, 14, 0, 0, Local0, 37) + err(arg0, z071, __LINE__, 0, 0, Local0, 37) } // } else { // if (LNotEqual(Local0, 45)) { -// err(arg0, z071, 15, 0, 0, Local0, 45) +// err(arg0, z071, __LINE__, 0, 0, Local0, 45) // } // } Store(m0e1(0xc179b3fe), Local0) if (LNotEqual(Local0, 28)) { - err(arg0, z071, 16, 0, 0, Local0, 28) + err(arg0, z071, __LINE__, 0, 0, Local0, 28) } Store(m0e1(0xfe7cb391d650a284), Local0) if (F64) { if (LNotEqual(Local0, 29)) { - err(arg0, z071, 0x102, 0, 0, Local0, 29) + err(arg0, z071, __LINE__, 0, 0, Local0, 29) } } else { if (LNotEqual(Local0, 39)) { - err(arg0, z071, 0x103, 0, 0, Local0, 39) + err(arg0, z071, __LINE__, 0, 0, Local0, 39) } } Store(m0e1(0), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z071, 18, 0, 0, Local0, 14) + err(arg0, z071, __LINE__, 0, 0, Local0, 14) } Store(m0e1(0xffffffff), Local0) if (LNotEqual(Local0, 16)) { - err(arg0, z071, 19, 0, 0, Local0, 16) + err(arg0, z071, __LINE__, 0, 0, Local0, 16) } Store(m0e1(0xffffffffffffffff), Local0) if (F64) { if (LNotEqual(Local0, 17)) { - err(arg0, z071, 20, 0, 0, Local0, 17) + err(arg0, z071, __LINE__, 0, 0, Local0, 17) } } else { if (LNotEqual(Local0, 16)) { - err(arg0, z071, 21, 0, 0, Local0, 16) + err(arg0, z071, __LINE__, 0, 0, Local0, 16) } } Store(m0e1(0xff), Local0) if (LNotEqual(Local0, 20)) { - err(arg0, z071, 22, 0, 0, Local0, 20) + err(arg0, z071, __LINE__, 0, 0, Local0, 20) } Store(m0e1(0xabcdef), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z071, 23, 0, 0, Local0, 44) + err(arg0, z071, __LINE__, 0, 0, Local0, 44) } } @@ -717,83 +717,83 @@ Method(m0e4, 1) Store(m0e3("0321"), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z071, 24, 0, 0, Local0, 34) + err(arg0, z071, __LINE__, 0, 0, Local0, 34) } Store(m0e3("321"), Local0) if (LNotEqual(Local0, 35)) { - err(arg0, z071, 25, 0, 0, Local0, 35) + err(arg0, z071, __LINE__, 0, 0, Local0, 35) } Store(m0e3("ba9876"), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 26, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0e3("c179b3fe"), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z071, 27, 0, 0, Local0, 37) + err(arg0, z071, __LINE__, 0, 0, Local0, 37) } Store(m0e3("fe7cb391d650a284"), Local0) if (LNotEqual(Local0, 38)) { - err(arg0, z071, 28, 0, 0, Local0, 38) + err(arg0, z071, __LINE__, 0, 0, Local0, 38) } Store(m0e3("ffffffff"), Local0) if (LNotEqual(Local0, 39)) { - err(arg0, z071, 29, 0, 0, Local0, 39) + err(arg0, z071, __LINE__, 0, 0, Local0, 39) } Store(m0e3("ffffffffffffffffff"), Local0) if (LNotEqual(Local0, 40)) { - err(arg0, z071, 30, 0, 0, Local0, 40) + err(arg0, z071, __LINE__, 0, 0, Local0, 40) } Store(m0e3("ffffffffffffffff"), Local0) if (LNotEqual(Local0, 41)) { - err(arg0, z071, 31, 0, 0, Local0, 41) + err(arg0, z071, __LINE__, 0, 0, Local0, 41) } Store(m0e3("ffffffffff"), Local0) if (LNotEqual(Local0, 42)) { - err(arg0, z071, 32, 0, 0, Local0, 42) + err(arg0, z071, __LINE__, 0, 0, Local0, 42) } Store(m0e3("ff"), Local0) if (LNotEqual(Local0, 43)) { - err(arg0, z071, 33, 0, 0, Local0, 43) + err(arg0, z071, __LINE__, 0, 0, Local0, 43) } Store(m0e3("fe7cb391d650a2841"), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z071, 34, 0, 0, Local0, 44) + err(arg0, z071, __LINE__, 0, 0, Local0, 44) } Store(m0e3("987654321"), Local0) if (LNotEqual(Local0, 45)) { - err(arg0, z071, 35, 0, 0, Local0, 45) + err(arg0, z071, __LINE__, 0, 0, Local0, 45) } Store(m0e3("0xfe7cb3"), Local0) if (LNotEqual(Local0, 46)) { - err(arg0, z071, 36, 0, 0, Local0, 46) + err(arg0, z071, __LINE__, 0, 0, Local0, 46) } Store(m0e3("1234q"), Local0) if (LNotEqual(Local0, 47)) { - err(arg0, z071, 37, 0, 0, Local0, 47) + err(arg0, z071, __LINE__, 0, 0, Local0, 47) } Store(m0e3(BIG0), Local0) if (LNotEqual(Local0, 48)) { - err(arg0, z071, 38, 0, 0, Local0, 48) + err(arg0, z071, __LINE__, 0, 0, Local0, 48) } Store(m0e3(""), Local0) if (LNotEqual(Local0, 49)) { - err(arg0, z071, 39, 0, 0, Local0, 49) + err(arg0, z071, __LINE__, 0, 0, Local0, 49) } Store(m0e3(" "), Local0) if (LNotEqual(Local0, 50)) { - err(arg0, z071, 40, 0, 0, Local0, 50) + err(arg0, z071, __LINE__, 0, 0, Local0, 50) } Store(m0e3(ALL0), Local0) if (LNotEqual(Local0, 51)) { - err(arg0, z071, 41, 0, 0, Local0, 51) + err(arg0, z071, __LINE__, 0, 0, Local0, 51) } Store(m0e3("abcdef"), Local0) if (LNotEqual(Local0, 52)) { - err(arg0, z071, 42, 0, 0, Local0, 52) + err(arg0, z071, __LINE__, 0, 0, Local0, 52) } Store(m0e3("ABCDEF"), Local0) if (LNotEqual(Local0, 53)) { - err(arg0, z071, 43, 0, 0, Local0, 53) + err(arg0, z071, __LINE__, 0, 0, Local0, 53) } } @@ -1060,51 +1060,51 @@ Method(m0e6, 1) Store(m0e5(Buffer(1){10}), Local0) if (LNotEqual(Local0, 29)) { - err(arg0, z071, 44, 0, 0, Local0, 29) + err(arg0, z071, __LINE__, 0, 0, Local0, 29) } Store(m0e5(Buffer(2){11,12}), Local0) if (LNotEqual(Local0, 30)) { - err(arg0, z071, 45, 0, 0, Local0, 30) + err(arg0, z071, __LINE__, 0, 0, Local0, 30) } Store(m0e5(Buffer() {13,14,15}), Local0) if (LNotEqual(Local0, 31)) { - err(arg0, z071, 46, 0, 0, Local0, 31) + err(arg0, z071, __LINE__, 0, 0, Local0, 31) } Store(m0e5(Buffer(2){16,17,18}), Local0) if (LNotEqual(Local0, 32)) { - err(arg0, z071, 47, 0, 0, Local0, 32) + err(arg0, z071, __LINE__, 0, 0, Local0, 32) } Store(m0e5(Buffer(3){19,20}), Local0) if (LNotEqual(Local0, 33)) { - err(arg0, z071, 48, 0, 0, Local0, 33) + err(arg0, z071, __LINE__, 0, 0, Local0, 33) } Store(m0e5(Buffer(3){21,22,23}), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z071, 49, 0, 0, Local0, 34) + err(arg0, z071, __LINE__, 0, 0, Local0, 34) } Store(m0e5(Buffer(4){24,25,26,27}), Local0) if (LNotEqual(Local0, 35)) { - err(arg0, z071, 50, 0, 0, Local0, 35) + err(arg0, z071, __LINE__, 0, 0, Local0, 35) } Store(m0e5(Buffer(5){28,29,30,31,32}), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 51, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0e5(Buffer(8){33,34,35,36,37,38,39,40}), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z071, 52, 0, 0, Local0, 37) + err(arg0, z071, __LINE__, 0, 0, Local0, 37) } Store(m0e5(Buffer(){0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}), Local0) if (LNotEqual(Local0, 38)) { - err(arg0, z071, 53, 0, 0, Local0, 38) + err(arg0, z071, __LINE__, 0, 0, Local0, 38) } Store(m0e5(Buffer(9){41,42,43,44,45,46,47,48,49}), Local0) if (LNotEqual(Local0, 39)) { - err(arg0, z071, 54, 0, 0, Local0, 39) + err(arg0, z071, __LINE__, 0, 0, Local0, 39) } Store(m0e5(Buffer(257){0x7d}), Local0) if (LNotEqual(Local0, 40)) { - err(arg0, z071, 55, 0, 0, Local0, 40) + err(arg0, z071, __LINE__, 0, 0, Local0, 40) } Store(m0e5(Buffer(257) { // 0-127 @@ -1145,7 +1145,7 @@ Method(m0e6, 1) // 256 0x01}), Local0) if (LNotEqual(Local0, 41)) { - err(arg0, z071, 56, 0, 0, Local0, 41) + err(arg0, z071, __LINE__, 0, 0, Local0, 41) } Store(m0e5(Buffer() { // 0-127 @@ -1186,71 +1186,71 @@ Method(m0e6, 1) // 256 0x02}), Local0) if (LNotEqual(Local0, 42)) { - err(arg0, z071, 57, 0, 0, Local0, 42) + err(arg0, z071, __LINE__, 0, 0, Local0, 42) } if (F64) { Store(m0e5(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 43)) { - err(arg0, z071, 58, 0, 0, Local0, 43) + err(arg0, z071, __LINE__, 0, 0, Local0, 43) } Store(m0e5(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 4)) { - err(arg0, z071, 59, 0, 0, Local0, 4) + err(arg0, z071, __LINE__, 0, 0, Local0, 4) } Store(m0e5(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 45)) { - err(arg0, z071, 60, 0, 0, Local0, 45) + err(arg0, z071, __LINE__, 0, 0, Local0, 45) } Store(m0e5(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 6)) { - err(arg0, z071, 61, 0, 0, Local0, 6) + err(arg0, z071, __LINE__, 0, 0, Local0, 6) } } else { Store(m0e5(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 4)) { - err(arg0, z071, 62, 0, 0, Local0, 4) + err(arg0, z071, __LINE__, 0, 0, Local0, 4) } Store(m0e5(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z071, 63, 0, 0, Local0, 44) + err(arg0, z071, __LINE__, 0, 0, Local0, 44) } Store(m0e5(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z071, 64, 0, 0, Local0, 5) + err(arg0, z071, __LINE__, 0, 0, Local0, 5) } Store(m0e5(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 47)) { - err(arg0, z071, 65, 0, 0, Local0, 47) + err(arg0, z071, __LINE__, 0, 0, Local0, 47) } } Store(m0e5(Buffer(9){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 46)) { - err(arg0, z071, 66, 0, 0, Local0, 46) + err(arg0, z071, __LINE__, 0, 0, Local0, 46) } Store(m0e5(Buffer(5){0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 48)) { - err(arg0, z071, 67, 0, 0, Local0, 48) + err(arg0, z071, __LINE__, 0, 0, Local0, 48) } Store(m0e5(Buffer(1){0xff}), Local0) if (LNotEqual(Local0, 49)) { - err(arg0, z071, 68, 0, 0, Local0, 49) + err(arg0, z071, __LINE__, 0, 0, Local0, 49) } Store(m0e5(Buffer(1){}), Local0) if (LNotEqual(Local0, 24)) { - err(arg0, z071, 69, 0, 0, Local0, 24) + err(arg0, z071, __LINE__, 0, 0, Local0, 24) } Store(m0e5(Buffer(5){}), Local0) if (LNotEqual(Local0, 51)) { - err(arg0, z071, 70, 0, 0, Local0, 51) + err(arg0, z071, __LINE__, 0, 0, Local0, 51) } Store(m0e5(Buffer(9){}), Local0) if (LNotEqual(Local0, 52)) { - err(arg0, z071, 71, 0, 0, Local0, 52) + err(arg0, z071, __LINE__, 0, 0, Local0, 52) } Store(m0e5(Buffer(9){0xab, 0xcd, 0xef}), Local0) if (LNotEqual(Local0, 53)) { - err(arg0, z071, 72, 0, 0, Local0, 53) + err(arg0, z071, __LINE__, 0, 0, Local0, 53) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/switch5.asl b/tests/aslts/src/runtime/collections/functional/control/switch5.asl index 0bb44a7..939fd67 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch5.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch5.asl @@ -222,55 +222,55 @@ Method(m0e8, 1) Store(m0e7(0321), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z072, 0, 0, 0, Local0, 36) + err(arg0, z072, __LINE__, 0, 0, Local0, 36) } Store(m0e7(0xd1), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z072, 1, 0, 0, Local0, 36) + err(arg0, z072, __LINE__, 0, 0, Local0, 36) } Store(m0e7(9876543210), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z072, 2, 0, 0, Local0, 37) + err(arg0, z072, __LINE__, 0, 0, Local0, 37) } Store(m0e7(0xc179b3fe), Local0) if (LNotEqual(Local0, 28)) { - err(arg0, z072, 4, 0, 0, Local0, 28) + err(arg0, z072, __LINE__, 0, 0, Local0, 28) } Store(m0e7(0xfe7cb391d650a284), Local0) if (F64) { if (LNotEqual(Local0, 29)) { - err(arg0, z072, 0x1005, 0, 0, Local0, 29) + err(arg0, z072, __LINE__, 0, 0, Local0, 29) } } else { if (LNotEqual(Local0, 39)) { - err(arg0, z072, 0x101, 0, 0, Local0, 39) + err(arg0, z072, __LINE__, 0, 0, Local0, 39) } } Store(m0e7(0), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z072, 6, 0, 0, Local0, 14) + err(arg0, z072, __LINE__, 0, 0, Local0, 14) } Store(m0e7(0xffffffff), Local0) if (LNotEqual(Local0, 16)) { - err(arg0, z072, 7, 0, 0, Local0, 16) + err(arg0, z072, __LINE__, 0, 0, Local0, 16) } Store(m0e7(0xffffffffffffffff), Local0) if (F64) { if (LNotEqual(Local0, 17)) { - err(arg0, z072, 8, 0, 0, Local0, 17) + err(arg0, z072, __LINE__, 0, 0, Local0, 17) } } else { if (LNotEqual(Local0, 16)) { - err(arg0, z072, 9, 0, 0, Local0, 16) + err(arg0, z072, __LINE__, 0, 0, Local0, 16) } } Store(m0e7(0xff), Local0) if (LNotEqual(Local0, 20)) { - err(arg0, z072, 10, 0, 0, Local0, 20) + err(arg0, z072, __LINE__, 0, 0, Local0, 20) } Store(m0e7(0xabcdef), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z072, 11, 0, 0, Local0, 44) + err(arg0, z072, __LINE__, 0, 0, Local0, 44) } } @@ -482,83 +482,83 @@ Method(m0ea, 1) Store(m0e9("0321"), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z072, 12, 0, 0, Local0, 34) + err(arg0, z072, __LINE__, 0, 0, Local0, 34) } Store(m0e9("321"), Local0) if (LNotEqual(Local0, 35)) { - err(arg0, z072, 13, 0, 0, Local0, 35) + err(arg0, z072, __LINE__, 0, 0, Local0, 35) } Store(m0e9("ba9876"), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z072, 14, 0, 0, Local0, 36) + err(arg0, z072, __LINE__, 0, 0, Local0, 36) } Store(m0e9("c179b3fe"), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z072, 15, 0, 0, Local0, 37) + err(arg0, z072, __LINE__, 0, 0, Local0, 37) } Store(m0e9("fe7cb391d650a284"), Local0) if (LNotEqual(Local0, 38)) { - err(arg0, z072, 16, 0, 0, Local0, 38) + err(arg0, z072, __LINE__, 0, 0, Local0, 38) } Store(m0e9("ffffffff"), Local0) if (LNotEqual(Local0, 39)) { - err(arg0, z072, 17, 0, 0, Local0, 39) + err(arg0, z072, __LINE__, 0, 0, Local0, 39) } Store(m0e9("ffffffffffffffffff"), Local0) if (LNotEqual(Local0, 40)) { - err(arg0, z072, 18, 0, 0, Local0, 40) + err(arg0, z072, __LINE__, 0, 0, Local0, 40) } Store(m0e9("ffffffffffffffff"), Local0) if (LNotEqual(Local0, 41)) { - err(arg0, z072, 19, 0, 0, Local0, 41) + err(arg0, z072, __LINE__, 0, 0, Local0, 41) } Store(m0e9("ffffffffff"), Local0) if (LNotEqual(Local0, 42)) { - err(arg0, z072, 20, 0, 0, Local0, 42) + err(arg0, z072, __LINE__, 0, 0, Local0, 42) } Store(m0e9("ff"), Local0) if (LNotEqual(Local0, 43)) { - err(arg0, z072, 21, 0, 0, Local0, 43) + err(arg0, z072, __LINE__, 0, 0, Local0, 43) } Store(m0e9("fe7cb391d650a2841"), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z072, 22, 0, 0, Local0, 44) + err(arg0, z072, __LINE__, 0, 0, Local0, 44) } Store(m0e9("987654321"), Local0) if (LNotEqual(Local0, 45)) { - err(arg0, z072, 23, 0, 0, Local0, 45) + err(arg0, z072, __LINE__, 0, 0, Local0, 45) } Store(m0e9("0xfe7cb3"), Local0) if (LNotEqual(Local0, 46)) { - err(arg0, z072, 24, 0, 0, Local0, 46) + err(arg0, z072, __LINE__, 0, 0, Local0, 46) } Store(m0e9("1234q"), Local0) if (LNotEqual(Local0, 47)) { - err(arg0, z072, 25, 0, 0, Local0, 47) + err(arg0, z072, __LINE__, 0, 0, Local0, 47) } Store(m0e9(BIG0), Local0) if (LNotEqual(Local0, 48)) { - err(arg0, z072, 26, 0, 0, Local0, 48) + err(arg0, z072, __LINE__, 0, 0, Local0, 48) } Store(m0e9(""), Local0) if (LNotEqual(Local0, 49)) { - err(arg0, z072, 27, 0, 0, Local0, 49) + err(arg0, z072, __LINE__, 0, 0, Local0, 49) } Store(m0e9(" "), Local0) if (LNotEqual(Local0, 50)) { - err(arg0, z072, 28, 0, 0, Local0, 50) + err(arg0, z072, __LINE__, 0, 0, Local0, 50) } Store(m0e9(ALL0), Local0) if (LNotEqual(Local0, 51)) { - err(arg0, z072, 29, 0, 0, Local0, 51) + err(arg0, z072, __LINE__, 0, 0, Local0, 51) } Store(m0e9("abcdef"), Local0) if (LNotEqual(Local0, 52)) { - err(arg0, z072, 30, 0, 0, Local0, 52) + err(arg0, z072, __LINE__, 0, 0, Local0, 52) } Store(m0e9("ABCDEF"), Local0) if (LNotEqual(Local0, 53)) { - err(arg0, z072, 31, 0, 0, Local0, 53) + err(arg0, z072, __LINE__, 0, 0, Local0, 53) } } @@ -826,51 +826,51 @@ Method(m0ec, 1) Store(m0eb(Buffer(1){10}), Local0) if (LNotEqual(Local0, 29)) { - err(arg0, z072, 32, 0, 0, Local0, 29) + err(arg0, z072, __LINE__, 0, 0, Local0, 29) } Store(m0eb(Buffer(2){11,12}), Local0) if (LNotEqual(Local0, 30)) { - err(arg0, z072, 33, 0, 0, Local0, 30) + err(arg0, z072, __LINE__, 0, 0, Local0, 30) } Store(m0eb(Buffer() {13,14,15}), Local0) if (LNotEqual(Local0, 31)) { - err(arg0, z072, 34, 0, 0, Local0, 31) + err(arg0, z072, __LINE__, 0, 0, Local0, 31) } Store(m0eb(Buffer(2){16,17,18}), Local0) if (LNotEqual(Local0, 32)) { - err(arg0, z072, 35, 0, 0, Local0, 32) + err(arg0, z072, __LINE__, 0, 0, Local0, 32) } Store(m0eb(Buffer(3){19,20}), Local0) if (LNotEqual(Local0, 33)) { - err(arg0, z072, 36, 0, 0, Local0, 33) + err(arg0, z072, __LINE__, 0, 0, Local0, 33) } Store(m0eb(Buffer(3){21,22,23}), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z072, 37, 0, 0, Local0, 34) + err(arg0, z072, __LINE__, 0, 0, Local0, 34) } Store(m0eb(Buffer(4){24,25,26,27}), Local0) if (LNotEqual(Local0, 35)) { - err(arg0, z072, 38, 0, 0, Local0, 35) + err(arg0, z072, __LINE__, 0, 0, Local0, 35) } Store(m0eb(Buffer(5){28,29,30,31,32}), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z072, 39, 0, 0, Local0, 36) + err(arg0, z072, __LINE__, 0, 0, Local0, 36) } Store(m0eb(Buffer(8){33,34,35,36,37,38,39,40}), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z072, 40, 0, 0, Local0, 37) + err(arg0, z072, __LINE__, 0, 0, Local0, 37) } Store(m0eb(Buffer(){0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}), Local0) if (LNotEqual(Local0, 38)) { - err(arg0, z072, 41, 0, 0, Local0, 38) + err(arg0, z072, __LINE__, 0, 0, Local0, 38) } Store(m0eb(Buffer(9){41,42,43,44,45,46,47,48,49}), Local0) if (LNotEqual(Local0, 39)) { - err(arg0, z072, 42, 0, 0, Local0, 39) + err(arg0, z072, __LINE__, 0, 0, Local0, 39) } Store(m0eb(Buffer(257){0x7d}), Local0) if (LNotEqual(Local0, 40)) { - err(arg0, z072, 43, 0, 0, Local0, 40) + err(arg0, z072, __LINE__, 0, 0, Local0, 40) } Store(m0eb(Buffer(257) { // 0-127 @@ -911,7 +911,7 @@ Method(m0ec, 1) // 256 0x01}), Local0) if (LNotEqual(Local0, 41)) { - err(arg0, z072, 44, 0, 0, Local0, 41) + err(arg0, z072, __LINE__, 0, 0, Local0, 41) } Store(m0eb(Buffer() { // 0-127 @@ -952,71 +952,71 @@ Method(m0ec, 1) // 256 0x02}), Local0) if (LNotEqual(Local0, 42)) { - err(arg0, z072, 45, 0, 0, Local0, 42) + err(arg0, z072, __LINE__, 0, 0, Local0, 42) } if (F64) { Store(m0eb(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 43)) { - err(arg0, z072, 46, 0, 0, Local0, 43) + err(arg0, z072, __LINE__, 0, 0, Local0, 43) } Store(m0eb(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 4)) { - err(arg0, z072, 47, 0, 0, Local0, 4) + err(arg0, z072, __LINE__, 0, 0, Local0, 4) } Store(m0eb(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 45)) { - err(arg0, z072, 48, 0, 0, Local0, 45) + err(arg0, z072, __LINE__, 0, 0, Local0, 45) } Store(m0eb(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 6)) { - err(arg0, z072, 49, 0, 0, Local0, 6) + err(arg0, z072, __LINE__, 0, 0, Local0, 6) } } else { Store(m0eb(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 4)) { - err(arg0, z072, 50, 0, 0, Local0, 4) + err(arg0, z072, __LINE__, 0, 0, Local0, 4) } Store(m0eb(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z072, 51, 0, 0, Local0, 44) + err(arg0, z072, __LINE__, 0, 0, Local0, 44) } Store(m0eb(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z072, 52, 0, 0, Local0, 5) + err(arg0, z072, __LINE__, 0, 0, Local0, 5) } Store(m0eb(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 47)) { - err(arg0, z072, 53, 0, 0, Local0, 47) + err(arg0, z072, __LINE__, 0, 0, Local0, 47) } } Store(m0eb(Buffer(9){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 46)) { - err(arg0, z072, 54, 0, 0, Local0, 46) + err(arg0, z072, __LINE__, 0, 0, Local0, 46) } Store(m0eb(Buffer(5){0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 48)) { - err(arg0, z072, 55, 0, 0, Local0, 48) + err(arg0, z072, __LINE__, 0, 0, Local0, 48) } Store(m0eb(Buffer(1){0xff}), Local0) if (LNotEqual(Local0, 49)) { - err(arg0, z072, 56, 0, 0, Local0, 49) + err(arg0, z072, __LINE__, 0, 0, Local0, 49) } Store(m0eb(Buffer(1){}), Local0) if (LNotEqual(Local0, 24)) { - err(arg0, z072, 57, 0, 0, Local0, 24) + err(arg0, z072, __LINE__, 0, 0, Local0, 24) } Store(m0eb(Buffer(5){}), Local0) if (LNotEqual(Local0, 51)) { - err(arg0, z072, 58, 0, 0, Local0, 51) + err(arg0, z072, __LINE__, 0, 0, Local0, 51) } Store(m0eb(Buffer(9){}), Local0) if (LNotEqual(Local0, 52)) { - err(arg0, z072, 59, 0, 0, Local0, 52) + err(arg0, z072, __LINE__, 0, 0, Local0, 52) } Store(m0eb(Buffer(9){0xab, 0xcd, 0xef}), Local0) if (LNotEqual(Local0, 53)) { - err(arg0, z072, 60, 0, 0, Local0, 53) + err(arg0, z072, __LINE__, 0, 0, Local0, 53) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/switch6.asl b/tests/aslts/src/runtime/collections/functional/control/switch6.asl index 4454ccd..798c475 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch6.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch6.asl @@ -133,56 +133,56 @@ Method(m101, 1) Store(m100(0321), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 0, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0xd1), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 1, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(9876543210), Local0) if (F64) { if (LNotEqual(Local0, 5)) { - err(arg0, z073, 2, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } else { if (LNotEqual(Local0, 5)) { - err(arg0, z073, 3, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } Store(m100(0xc179b3fe), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 4, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0xfe7cb391d650a284), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 5, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 6, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0xffffffff), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 7, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0xffffffffffffffff), Local0) if (F64) { if (LNotEqual(Local0, 5)) { - err(arg0, z073, 8, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } else { if (LNotEqual(Local0, 5)) { - err(arg0, z073, 9, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } Store(m100(0xff), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 10, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0xabcdef), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 11, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } @@ -292,83 +292,83 @@ Method(m103, 1) Store(m102("0321"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 12, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("321"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 13, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ba9876"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 14, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("c179b3fe"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 15, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("fe7cb391d650a284"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 16, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ffffffff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 17, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ffffffffffffffffff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 18, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ffffffffffffffff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 19, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ffffffffff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 20, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 21, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("fe7cb391d650a2841"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 22, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("987654321"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 23, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("0xfe7cb3"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 24, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("1234q"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 25, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102(BIG0), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 26, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102(""), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 27, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102(" "), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 28, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102(ALL0), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 29, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("abcdef"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 30, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ABCDEF"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 31, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } @@ -534,51 +534,51 @@ Method(m105, 1) Store(m104(Buffer(1){10}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 32, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(2){11,12}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 33, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer() {13,14,15}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 34, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(2){16,17,18}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 35, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(3){19,20}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 36, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(3){21,22,23}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 37, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(4){24,25,26,27}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 38, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(5){28,29,30,31,32}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 39, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(8){33,34,35,36,37,38,39,40}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 40, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(){0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 41, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(9){41,42,43,44,45,46,47,48,49}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 42, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(257){0x7d}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 43, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(257) { // 0-127 @@ -619,7 +619,7 @@ Method(m105, 1) // 256 0x01}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 44, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer() { // 0-127 @@ -660,71 +660,71 @@ Method(m105, 1) // 256 0x02}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 45, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } if (F64) { Store(m104(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 46, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 47, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 48, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 49, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } else { Store(m104(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 50, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 51, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 52, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 53, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } Store(m104(Buffer(9){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 54, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(5){0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 55, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(1){0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 56, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(1){}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 57, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(5){}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 58, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(9){}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 59, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(9){0xab, 0xcd, 0xef}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 60, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/timing.asl b/tests/aslts/src/runtime/collections/functional/control/timing.asl index 7fa44ac..db8e914 100644 --- a/tests/aslts/src/runtime/collections/functional/control/timing.asl +++ b/tests/aslts/src/runtime/collections/functional/control/timing.asl @@ -72,7 +72,7 @@ Method(m0c8, 6) if (LLess(Local6, Local4)) { Subtract(Local4, Local6, Local7) - err(arg0, z006, 0, 0, 0, Local5, arg2) + err(arg0, z006, __LINE__, 0, 0, Local5, arg2) Store(Local0, Debug) Store(Local4, Debug) Store(Local6, Debug) @@ -91,7 +91,7 @@ Method(m0c8, 6) if (LLess(Local6, Local4)) { Subtract(Local4, Local6, Local7) - err(arg0, z006, 1, 0, 0, Local5, arg2) + err(arg0, z006, __LINE__, 0, 0, Local5, arg2) Store(Local0, Debug) Store(Local4, Debug) Store(Local6, Debug) @@ -110,7 +110,7 @@ Method(m0c8, 6) if (LLess(Local6, Local4)) { Subtract(Local4, Local6, Local7) - err(arg0, z006, 2, 0, 0, Local5, arg2) + err(arg0, z006, __LINE__, 0, 0, Local5, arg2) Store(Local0, Debug) Store(Local4, Debug) Store(Local6, Debug) diff --git a/tests/aslts/src/runtime/collections/functional/control/while.asl b/tests/aslts/src/runtime/collections/functional/control/while.asl index 9ab7e78..82a0817 100644 --- a/tests/aslts/src/runtime/collections/functional/control/while.asl +++ b/tests/aslts/src/runtime/collections/functional/control/while.asl @@ -188,7 +188,7 @@ Method(m0f8, 4, Serialized) Store(m0f4(arg1, CHL0, lpC0), Local0) if (LEqual(Local0, 0)) { - err(arg0, z074, 0, 0, 0, 0, lpC0) + err(arg0, z074, __LINE__, 0, 0, 0, lpC0) } Decrement(lpN0) @@ -206,7 +206,7 @@ Method(m0f8, 4, Serialized) Store(m0f4(arg2, CNT0, lpC0), Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z074, 1, 0, 0, Local0, Local1) + err(arg0, z074, __LINE__, 0, 0, Local0, Local1) } Decrement(lpN0) @@ -224,7 +224,7 @@ Method(m0f8, 4, Serialized) Store(m0f4(arg2, BRK0, lpC0), Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z074, 2, 0, 0, Local0, Local1) + err(arg0, z074, __LINE__, 0, 0, Local0, Local1) } Decrement(lpN0) @@ -278,7 +278,7 @@ Method(m0fa, 2, Serialized) Store(Local0, Debug) if (LEqual(arg1, 0)) { - err(arg0, z074, 3, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Add(arg1, 1, Local0) @@ -3703,11 +3703,11 @@ Method(m0fa, 2, Serialized) if (c049) { // We should not be there - err(arg0, z074, 4, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b049) { // We should not be there - err(arg0, z074, 5, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln49), Local0) @@ -3724,7 +3724,7 @@ Method(m0fa, 2, Serialized) if (b049) { // We should not be there - err(arg0, z074, 6, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3745,11 +3745,11 @@ Method(m0fa, 2, Serialized) if (c048) { // We should not be there - err(arg0, z074, 7, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b048) { // We should not be there - err(arg0, z074, 8, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln48), Local0) @@ -3766,7 +3766,7 @@ Method(m0fa, 2, Serialized) if (b048) { // We should not be there - err(arg0, z074, 9, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3787,11 +3787,11 @@ Method(m0fa, 2, Serialized) if (c047) { // We should not be there - err(arg0, z074, 10, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b047) { // We should not be there - err(arg0, z074, 11, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln47), Local0) @@ -3808,7 +3808,7 @@ Method(m0fa, 2, Serialized) if (b047) { // We should not be there - err(arg0, z074, 12, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3829,11 +3829,11 @@ Method(m0fa, 2, Serialized) if (c046) { // We should not be there - err(arg0, z074, 13, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b046) { // We should not be there - err(arg0, z074, 14, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln46), Local0) @@ -3850,7 +3850,7 @@ Method(m0fa, 2, Serialized) if (b046) { // We should not be there - err(arg0, z074, 15, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3871,11 +3871,11 @@ Method(m0fa, 2, Serialized) if (c045) { // We should not be there - err(arg0, z074, 16, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b045) { // We should not be there - err(arg0, z074, 17, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln45), Local0) @@ -3892,7 +3892,7 @@ Method(m0fa, 2, Serialized) if (b045) { // We should not be there - err(arg0, z074, 18, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3913,11 +3913,11 @@ Method(m0fa, 2, Serialized) if (c044) { // We should not be there - err(arg0, z074, 19, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b044) { // We should not be there - err(arg0, z074, 20, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln44), Local0) @@ -3934,7 +3934,7 @@ Method(m0fa, 2, Serialized) if (b044) { // We should not be there - err(arg0, z074, 21, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3955,11 +3955,11 @@ Method(m0fa, 2, Serialized) if (c043) { // We should not be there - err(arg0, z074, 22, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b043) { // We should not be there - err(arg0, z074, 23, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln43), Local0) @@ -3976,7 +3976,7 @@ Method(m0fa, 2, Serialized) if (b043) { // We should not be there - err(arg0, z074, 24, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3997,11 +3997,11 @@ Method(m0fa, 2, Serialized) if (c042) { // We should not be there - err(arg0, z074, 25, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b042) { // We should not be there - err(arg0, z074, 26, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln42), Local0) @@ -4018,7 +4018,7 @@ Method(m0fa, 2, Serialized) if (b042) { // We should not be there - err(arg0, z074, 27, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4039,11 +4039,11 @@ Method(m0fa, 2, Serialized) if (c041) { // We should not be there - err(arg0, z074, 28, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b041) { // We should not be there - err(arg0, z074, 29, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln41), Local0) @@ -4060,7 +4060,7 @@ Method(m0fa, 2, Serialized) if (b041) { // We should not be there - err(arg0, z074, 30, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4081,11 +4081,11 @@ Method(m0fa, 2, Serialized) if (c040) { // We should not be there - err(arg0, z074, 31, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b040) { // We should not be there - err(arg0, z074, 32, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln40), Local0) @@ -4102,7 +4102,7 @@ Method(m0fa, 2, Serialized) if (b040) { // We should not be there - err(arg0, z074, 33, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4123,11 +4123,11 @@ Method(m0fa, 2, Serialized) if (c039) { // We should not be there - err(arg0, z074, 34, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b039) { // We should not be there - err(arg0, z074, 35, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln39), Local0) @@ -4144,7 +4144,7 @@ Method(m0fa, 2, Serialized) if (b039) { // We should not be there - err(arg0, z074, 36, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4165,11 +4165,11 @@ Method(m0fa, 2, Serialized) if (c038) { // We should not be there - err(arg0, z074, 37, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b038) { // We should not be there - err(arg0, z074, 38, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln38), Local0) @@ -4186,7 +4186,7 @@ Method(m0fa, 2, Serialized) if (b038) { // We should not be there - err(arg0, z074, 39, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4207,11 +4207,11 @@ Method(m0fa, 2, Serialized) if (c037) { // We should not be there - err(arg0, z074, 40, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b037) { // We should not be there - err(arg0, z074, 41, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln37), Local0) @@ -4228,7 +4228,7 @@ Method(m0fa, 2, Serialized) if (b037) { // We should not be there - err(arg0, z074, 42, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4249,11 +4249,11 @@ Method(m0fa, 2, Serialized) if (c036) { // We should not be there - err(arg0, z074, 43, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b036) { // We should not be there - err(arg0, z074, 44, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln36), Local0) @@ -4270,7 +4270,7 @@ Method(m0fa, 2, Serialized) if (b036) { // We should not be there - err(arg0, z074, 45, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4291,11 +4291,11 @@ Method(m0fa, 2, Serialized) if (c035) { // We should not be there - err(arg0, z074, 46, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b035) { // We should not be there - err(arg0, z074, 47, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln35), Local0) @@ -4312,7 +4312,7 @@ Method(m0fa, 2, Serialized) if (b035) { // We should not be there - err(arg0, z074, 48, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4333,11 +4333,11 @@ Method(m0fa, 2, Serialized) if (c034) { // We should not be there - err(arg0, z074, 49, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b034) { // We should not be there - err(arg0, z074, 50, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln34), Local0) @@ -4354,7 +4354,7 @@ Method(m0fa, 2, Serialized) if (b034) { // We should not be there - err(arg0, z074, 51, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4375,11 +4375,11 @@ Method(m0fa, 2, Serialized) if (c033) { // We should not be there - err(arg0, z074, 52, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b033) { // We should not be there - err(arg0, z074, 53, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln33), Local0) @@ -4396,7 +4396,7 @@ Method(m0fa, 2, Serialized) if (b033) { // We should not be there - err(arg0, z074, 54, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4417,11 +4417,11 @@ Method(m0fa, 2, Serialized) if (c032) { // We should not be there - err(arg0, z074, 55, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b032) { // We should not be there - err(arg0, z074, 56, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln32), Local0) @@ -4438,7 +4438,7 @@ Method(m0fa, 2, Serialized) if (b032) { // We should not be there - err(arg0, z074, 57, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4459,11 +4459,11 @@ Method(m0fa, 2, Serialized) if (c031) { // We should not be there - err(arg0, z074, 58, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b031) { // We should not be there - err(arg0, z074, 59, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln31), Local0) @@ -4480,7 +4480,7 @@ Method(m0fa, 2, Serialized) if (b031) { // We should not be there - err(arg0, z074, 60, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4501,11 +4501,11 @@ Method(m0fa, 2, Serialized) if (c030) { // We should not be there - err(arg0, z074, 61, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b030) { // We should not be there - err(arg0, z074, 62, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln30), Local0) @@ -4522,7 +4522,7 @@ Method(m0fa, 2, Serialized) if (b030) { // We should not be there - err(arg0, z074, 63, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4543,11 +4543,11 @@ Method(m0fa, 2, Serialized) if (c029) { // We should not be there - err(arg0, z074, 64, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b029) { // We should not be there - err(arg0, z074, 65, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln29), Local0) @@ -4564,7 +4564,7 @@ Method(m0fa, 2, Serialized) if (b029) { // We should not be there - err(arg0, z074, 66, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4585,11 +4585,11 @@ Method(m0fa, 2, Serialized) if (c028) { // We should not be there - err(arg0, z074, 67, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b028) { // We should not be there - err(arg0, z074, 68, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln28), Local0) @@ -4606,7 +4606,7 @@ Method(m0fa, 2, Serialized) if (b028) { // We should not be there - err(arg0, z074, 69, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4627,11 +4627,11 @@ Method(m0fa, 2, Serialized) if (c027) { // We should not be there - err(arg0, z074, 70, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b027) { // We should not be there - err(arg0, z074, 71, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln27), Local0) @@ -4648,7 +4648,7 @@ Method(m0fa, 2, Serialized) if (b027) { // We should not be there - err(arg0, z074, 72, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4669,11 +4669,11 @@ Method(m0fa, 2, Serialized) if (c026) { // We should not be there - err(arg0, z074, 73, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b026) { // We should not be there - err(arg0, z074, 74, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln26), Local0) @@ -4690,7 +4690,7 @@ Method(m0fa, 2, Serialized) if (b026) { // We should not be there - err(arg0, z074, 75, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4711,11 +4711,11 @@ Method(m0fa, 2, Serialized) if (c025) { // We should not be there - err(arg0, z074, 76, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b025) { // We should not be there - err(arg0, z074, 77, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln25), Local0) @@ -4732,7 +4732,7 @@ Method(m0fa, 2, Serialized) if (b025) { // We should not be there - err(arg0, z074, 78, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4753,11 +4753,11 @@ Method(m0fa, 2, Serialized) if (c024) { // We should not be there - err(arg0, z074, 79, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b024) { // We should not be there - err(arg0, z074, 80, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln24), Local0) @@ -4774,7 +4774,7 @@ Method(m0fa, 2, Serialized) if (b024) { // We should not be there - err(arg0, z074, 81, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4795,11 +4795,11 @@ Method(m0fa, 2, Serialized) if (c023) { // We should not be there - err(arg0, z074, 82, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b023) { // We should not be there - err(arg0, z074, 83, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln23), Local0) @@ -4816,7 +4816,7 @@ Method(m0fa, 2, Serialized) if (b023) { // We should not be there - err(arg0, z074, 84, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4837,11 +4837,11 @@ Method(m0fa, 2, Serialized) if (c022) { // We should not be there - err(arg0, z074, 85, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b022) { // We should not be there - err(arg0, z074, 86, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln22), Local0) @@ -4858,7 +4858,7 @@ Method(m0fa, 2, Serialized) if (b022) { // We should not be there - err(arg0, z074, 87, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4879,11 +4879,11 @@ Method(m0fa, 2, Serialized) if (c021) { // We should not be there - err(arg0, z074, 88, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b021) { // We should not be there - err(arg0, z074, 89, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln21), Local0) @@ -4900,7 +4900,7 @@ Method(m0fa, 2, Serialized) if (b021) { // We should not be there - err(arg0, z074, 90, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4921,11 +4921,11 @@ Method(m0fa, 2, Serialized) if (c020) { // We should not be there - err(arg0, z074, 91, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b020) { // We should not be there - err(arg0, z074, 92, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln20), Local0) @@ -4942,7 +4942,7 @@ Method(m0fa, 2, Serialized) if (b020) { // We should not be there - err(arg0, z074, 93, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4963,11 +4963,11 @@ Method(m0fa, 2, Serialized) if (c019) { // We should not be there - err(arg0, z074, 94, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b019) { // We should not be there - err(arg0, z074, 95, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln19), Local0) @@ -4984,7 +4984,7 @@ Method(m0fa, 2, Serialized) if (b019) { // We should not be there - err(arg0, z074, 96, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5005,11 +5005,11 @@ Method(m0fa, 2, Serialized) if (c018) { // We should not be there - err(arg0, z074, 97, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b018) { // We should not be there - err(arg0, z074, 98, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln18), Local0) @@ -5026,7 +5026,7 @@ Method(m0fa, 2, Serialized) if (b018) { // We should not be there - err(arg0, z074, 99, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5047,11 +5047,11 @@ Method(m0fa, 2, Serialized) if (c017) { // We should not be there - err(arg0, z074, 100, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b017) { // We should not be there - err(arg0, z074, 101, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln17), Local0) @@ -5068,7 +5068,7 @@ Method(m0fa, 2, Serialized) if (b017) { // We should not be there - err(arg0, z074, 102, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5089,11 +5089,11 @@ Method(m0fa, 2, Serialized) if (c016) { // We should not be there - err(arg0, z074, 103, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b016) { // We should not be there - err(arg0, z074, 104, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln16), Local0) @@ -5110,7 +5110,7 @@ Method(m0fa, 2, Serialized) if (b016) { // We should not be there - err(arg0, z074, 105, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5131,11 +5131,11 @@ Method(m0fa, 2, Serialized) if (c015) { // We should not be there - err(arg0, z074, 106, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b015) { // We should not be there - err(arg0, z074, 107, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln15), Local0) @@ -5152,7 +5152,7 @@ Method(m0fa, 2, Serialized) if (b015) { // We should not be there - err(arg0, z074, 108, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5173,11 +5173,11 @@ Method(m0fa, 2, Serialized) if (c014) { // We should not be there - err(arg0, z074, 109, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b014) { // We should not be there - err(arg0, z074, 110, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln14), Local0) @@ -5194,7 +5194,7 @@ Method(m0fa, 2, Serialized) if (b014) { // We should not be there - err(arg0, z074, 111, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5215,11 +5215,11 @@ Method(m0fa, 2, Serialized) if (c013) { // We should not be there - err(arg0, z074, 112, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b013) { // We should not be there - err(arg0, z074, 113, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln13), Local0) @@ -5236,7 +5236,7 @@ Method(m0fa, 2, Serialized) if (b013) { // We should not be there - err(arg0, z074, 114, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5257,11 +5257,11 @@ Method(m0fa, 2, Serialized) if (c012) { // We should not be there - err(arg0, z074, 115, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b012) { // We should not be there - err(arg0, z074, 116, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln12), Local0) @@ -5278,7 +5278,7 @@ Method(m0fa, 2, Serialized) if (b012) { // We should not be there - err(arg0, z074, 117, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5299,11 +5299,11 @@ Method(m0fa, 2, Serialized) if (c011) { // We should not be there - err(arg0, z074, 118, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b011) { // We should not be there - err(arg0, z074, 119, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln11), Local0) @@ -5320,7 +5320,7 @@ Method(m0fa, 2, Serialized) if (b011) { // We should not be there - err(arg0, z074, 120, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5341,11 +5341,11 @@ Method(m0fa, 2, Serialized) if (c010) { // We should not be there - err(arg0, z074, 121, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b010) { // We should not be there - err(arg0, z074, 122, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln10), Local0) @@ -5362,7 +5362,7 @@ Method(m0fa, 2, Serialized) if (b010) { // We should not be there - err(arg0, z074, 123, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5383,11 +5383,11 @@ Method(m0fa, 2, Serialized) if (c009) { // We should not be there - err(arg0, z074, 124, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b009) { // We should not be there - err(arg0, z074, 125, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln09), Local0) @@ -5404,7 +5404,7 @@ Method(m0fa, 2, Serialized) if (b009) { // We should not be there - err(arg0, z074, 126, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5425,11 +5425,11 @@ Method(m0fa, 2, Serialized) if (c008) { // We should not be there - err(arg0, z074, 127, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b008) { // We should not be there - err(arg0, z074, 128, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln08), Local0) @@ -5446,7 +5446,7 @@ Method(m0fa, 2, Serialized) if (b008) { // We should not be there - err(arg0, z074, 129, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5467,11 +5467,11 @@ Method(m0fa, 2, Serialized) if (c007) { // We should not be there - err(arg0, z074, 130, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b007) { // We should not be there - err(arg0, z074, 131, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln07), Local0) @@ -5488,7 +5488,7 @@ Method(m0fa, 2, Serialized) if (b007) { // We should not be there - err(arg0, z074, 132, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5509,11 +5509,11 @@ Method(m0fa, 2, Serialized) if (c006) { // We should not be there - err(arg0, z074, 133, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b006) { // We should not be there - err(arg0, z074, 134, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln06), Local0) @@ -5530,7 +5530,7 @@ Method(m0fa, 2, Serialized) if (b006) { // We should not be there - err(arg0, z074, 135, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5551,11 +5551,11 @@ Method(m0fa, 2, Serialized) if (c005) { // We should not be there - err(arg0, z074, 136, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b005) { // We should not be there - err(arg0, z074, 137, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln05), Local0) @@ -5572,7 +5572,7 @@ Method(m0fa, 2, Serialized) if (b005) { // We should not be there - err(arg0, z074, 138, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5593,11 +5593,11 @@ Method(m0fa, 2, Serialized) if (c004) { // We should not be there - err(arg0, z074, 139, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b004) { // We should not be there - err(arg0, z074, 140, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln04), Local0) @@ -5614,7 +5614,7 @@ Method(m0fa, 2, Serialized) if (b004) { // We should not be there - err(arg0, z074, 141, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5635,11 +5635,11 @@ Method(m0fa, 2, Serialized) if (c003) { // We should not be there - err(arg0, z074, 142, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b003) { // We should not be there - err(arg0, z074, 143, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln03), Local0) @@ -5656,7 +5656,7 @@ Method(m0fa, 2, Serialized) if (b003) { // We should not be there - err(arg0, z074, 144, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5677,11 +5677,11 @@ Method(m0fa, 2, Serialized) if (c002) { // We should not be there - err(arg0, z074, 145, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b002) { // We should not be there - err(arg0, z074, 146, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln02), Local0) @@ -5698,7 +5698,7 @@ Method(m0fa, 2, Serialized) if (b002) { // We should not be there - err(arg0, z074, 147, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5719,11 +5719,11 @@ Method(m0fa, 2, Serialized) if (c001) { // We should not be there - err(arg0, z074, 148, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b001) { // We should not be there - err(arg0, z074, 149, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln01), Local0) @@ -5740,7 +5740,7 @@ Method(m0fa, 2, Serialized) if (b001) { // We should not be there - err(arg0, z074, 150, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5756,11 +5756,11 @@ Method(m0fa, 2, Serialized) } if (c000) { // We should not be there - err(arg0, z074, 151, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b000) { // We should not be there - err(arg0, z074, 152, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln00), Local0) @@ -5776,7 +5776,7 @@ Method(m0fa, 2, Serialized) if (b000) { // We should not be there - err(arg0, z074, 153, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl index f46204b..1d1c8d8 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl @@ -1001,5 +1001,5 @@ Method(RT1b,, Serialized) m332(ts, 1, "p444", p442, p441, p444) - CH03(ts, z007, 0x123, 0, 0) + CH03(ts, z007, 0x123, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl index 302d786..cebb13b 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl @@ -188,7 +188,7 @@ Name (p456, Package() { Name (p457, Package() { Buffer (0x1D) { - /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x03, 0x00, + /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x07, 0x00, /* 0008 */ 0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49, /* 0018 */ 0x32, 0x43, 0x00, 0x79, 0x00 @@ -196,7 +196,7 @@ Name (p457, Package() { Buffer (0x1D) { - /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x03, 0x01, + /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x07, 0x01, /* 0008 */ 0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49, /* 0018 */ 0x32, 0x43, 0x00, 0x79, 0x00 @@ -204,7 +204,7 @@ Name (p457, Package() { Buffer (0x1D) { - /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x02, 0x00, + /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x06, 0x00, /* 0008 */ 0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49, /* 0018 */ 0x32, 0x43, 0x00, 0x79, 0x00 @@ -212,7 +212,7 @@ Name (p457, Package() { Buffer (0x1D) { - /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x02, 0x01, + /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x06, 0x01, /* 0008 */ 0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49, /* 0018 */ 0x32, 0x43, 0x00, 0x79, 0x00 @@ -220,7 +220,7 @@ Name (p457, Package() { Buffer (0x1D) { - /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x01, 0x00, + /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x05, 0x00, /* 0008 */ 0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49, /* 0018 */ 0x32, 0x43, 0x00, 0x79, 0x00 @@ -228,7 +228,7 @@ Name (p457, Package() { Buffer (0x1D) { - /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x01, 0x01, + /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x05, 0x01, /* 0008 */ 0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49, /* 0018 */ 0x32, 0x43, 0x00, 0x79, 0x00 @@ -236,7 +236,7 @@ Name (p457, Package() { Buffer (0x1D) { - /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x00, 0x00, + /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x04, 0x00, /* 0008 */ 0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49, /* 0018 */ 0x32, 0x43, 0x00, 0x79, 0x00 @@ -244,7 +244,7 @@ Name (p457, Package() { Buffer (0x1D) { - /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x00, 0x01, + /* 0000 */ 0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x04, 0x01, /* 0008 */ 0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49, /* 0018 */ 0x32, 0x43, 0x00, 0x79, 0x00 @@ -252,7 +252,7 @@ Name (p457, Package() { Buffer (0x19) { - /* 0000 */ 0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x03, 0x00, + /* 0000 */ 0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x07, 0x00, /* 0008 */ 0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79, /* 0018 */ 0x00 @@ -284,7 +284,7 @@ Name (p457, Package() { Buffer (0x19) { - /* 0000 */ 0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x01, 0x00, + /* 0000 */ 0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x05, 0x00, /* 0008 */ 0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79, /* 0018 */ 0x00 @@ -308,7 +308,7 @@ Name (p457, Package() { Buffer (0x19) { - /* 0000 */ 0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x00, 0x01, + /* 0000 */ 0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x04, 0x01, /* 0008 */ 0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79, /* 0018 */ 0x00 @@ -324,7 +324,7 @@ Name (p457, Package() { Buffer (0x0181) { - /* 0000 */ 0x8E, 0x7C, 0x01, 0x02, 0xEE, 0x01, 0x00, 0x01, + /* 0000 */ 0x8E, 0x7C, 0x01, 0x02, 0xEE, 0x01, 0x04, 0x01, /* 0008 */ 0x00, 0x01, 0x6E, 0x01, 0x44, 0x55, 0x77, 0x88, /* 0010 */ 0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, /* 0018 */ 0xB7, 0xB8, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl index f91bac0..99d3396 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl @@ -571,5 +571,5 @@ Method(RT18,, Serialized) m331(ts, 3, INT0._SHR, 0x1b, INT1._SHR, 0x63, "_SHR") m331(ts, 4, INT0._INT, 0x28, INT1._INT, 0x70, "_INT") - CH03(ts, z017, 0x123, 0, 0) + CH03(ts, z017, 0x123, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl index b8a8b17..98aa046 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl @@ -51,7 +51,7 @@ Method(m330, 5) // ts, len, msg, op, res Store(DeRefOf(Index(arg4, lpC0)), Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z029, 0, 0, 0, lpC0, arg2) + err(arg0, z029, __LINE__, 0, 0, lpC0, arg2) } Decrement(lpN0) @@ -63,10 +63,10 @@ Method(m330, 5) // ts, len, msg, op, res Method(m331, 7) // ts, grerr, val0, ver0, val1, ver1, msg { if (LNotEqual(arg2, arg3)) { - err(arg0, z029, arg1, arg6, arg6, arg2, arg3) + err(arg0, z029, __LINE__, arg6, arg6, arg2, arg3) } if (LNotEqual(arg4, arg5)) { - err(arg0, z029, arg1, arg6, arg6, arg4, arg5) + err(arg0, z029, __LINE__, arg6, arg6, arg4, arg5) } } @@ -98,7 +98,7 @@ Method(m332, 6, Serialized) // ts, len, msg, op1, op2, res if (LNotEqual(Local3, Local2)) { Store(Local3, Debug) Store(Local2, Debug) - err(arg0, z029, 3, 0, 0, lpC0, arg2) + err(arg0, z029, __LINE__, 0, 0, lpC0, arg2) } Decrement(lpN0) diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl index c04989c..dee060f 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl @@ -751,7 +751,7 @@ Name (p458, Package() { Name (p459, Package() { Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x02, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -759,7 +759,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x02, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -767,7 +767,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x02, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -775,7 +775,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x02, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -783,7 +783,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x02, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -791,7 +791,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x02, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -799,7 +799,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x02, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -807,7 +807,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x02, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -815,7 +815,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x03, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -823,7 +823,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x03, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -831,7 +831,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x03, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -839,7 +839,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x03, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -847,7 +847,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x03, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -855,7 +855,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x03, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -863,7 +863,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x03, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -871,7 +871,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x03, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -879,7 +879,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x00, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -887,7 +887,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x00, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -895,7 +895,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x00, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -903,7 +903,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x00, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -911,7 +911,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x00, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -919,7 +919,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x00, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -927,7 +927,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x00, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -935,7 +935,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x00, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -943,7 +943,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x01, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -951,7 +951,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x01, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -959,7 +959,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x01, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -967,7 +967,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x01, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -975,7 +975,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x01, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -983,7 +983,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x01, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -991,7 +991,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x01, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -999,7 +999,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x01, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -1263,42 +1263,42 @@ Name (p459, Package() { }, Buffer (0x1C) { - /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02, + /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x02, /* 0008 */ 0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50, /* 0018 */ 0x49, 0x00, 0x79, 0x00 }, Buffer (0x1C) { - /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02, + /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x02, /* 0008 */ 0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50, /* 0018 */ 0x49, 0x00, 0x79, 0x00 }, Buffer (0x1C) { - /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02, + /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x02, /* 0008 */ 0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50, /* 0018 */ 0x49, 0x00, 0x79, 0x00 }, Buffer (0x1C) { - /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02, + /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x07, 0x02, /* 0008 */ 0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50, /* 0018 */ 0x49, 0x00, 0x79, 0x00 }, Buffer (0x1C) { - /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02, + /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x02, /* 0008 */ 0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50, /* 0018 */ 0x49, 0x00, 0x79, 0x00 }, Buffer (0x1C) { - /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02, + /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x02, /* 0008 */ 0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50, /* 0018 */ 0x49, 0x00, 0x79, 0x00 @@ -1473,7 +1473,7 @@ Name (p459, Package() { }, Buffer (0x21) { - /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01, + /* 0000 */ 0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x01, /* 0008 */ 0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2, /* 0018 */ 0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79, @@ -1481,7 +1481,7 @@ Name (p459, Package() { }, Buffer (0x1C) { - /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01, + /* 0000 */ 0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x06, 0x01, /* 0008 */ 0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA, /* 0010 */ 0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50, /* 0018 */ 0x49, 0x00, 0x79, 0x00 diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl index 4aac2af..ec15555 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl @@ -533,14 +533,14 @@ Name (p45B, Package() { }, Buffer (0x1E) { - /* 0000 */ 0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x00, 0x31, + /* 0000 */ 0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x04, 0x31, /* 0008 */ 0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF, /* 0010 */ 0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0x5C, 0x55, /* 0018 */ 0x41, 0x52, 0x54, 0x00, 0x79, 0x00 }, Buffer (0x1E) { - /* 0000 */ 0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x00, 0x34, + /* 0000 */ 0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x04, 0x34, /* 0008 */ 0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF, /* 0010 */ 0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0x5C, 0x55, /* 0018 */ 0x41, 0x52, 0x54, 0x00, 0x79, 0x00 diff --git a/tests/aslts/src/runtime/collections/functional/local/local.asl b/tests/aslts/src/runtime/collections/functional/local/local.asl index 971fe08..6e8b780 100644 --- a/tests/aslts/src/runtime/collections/functional/local/local.asl +++ b/tests/aslts/src/runtime/collections/functional/local/local.asl @@ -70,25 +70,25 @@ Method(ma00, 7) } // 5 if (LNotEqual(arg0, 8)) { - err(arg0, z999, 0, 0, 0, arg0, 8) + err(arg0, z999, __LINE__, 0, 0, arg0, 8) } if (LNotEqual(arg1, 9)) { - err(arg0, z999, 0, 0, 0, arg0, 9) + err(arg0, z999, __LINE__, 0, 0, arg0, 9) } if (LNotEqual(arg2, 10)) { - err(arg0, z999, 0, 0, 0, arg0, 10) + err(arg0, z999, __LINE__, 0, 0, arg0, 10) } if (LNotEqual(arg3, 11)) { - err(arg0, z999, 0, 0, 0, arg0, 11) + err(arg0, z999, __LINE__, 0, 0, arg0, 11) } if (LNotEqual(arg4, 12)) { - err(arg0, z999, 0, 0, 0, arg0, 12) + err(arg0, z999, __LINE__, 0, 0, arg0, 12) } if (LNotEqual(arg5, 13)) { - err(arg0, z999, 0, 0, 0, arg0, 13) + err(arg0, z999, __LINE__, 0, 0, arg0, 13) } // if (LNotEqual(arg6, 7)) { -// err(arg0, z999, 0, 0, 0, arg0, 7) +// err(arg0, z999, __LINE__, 0, 0, arg0, 7) // } m000(14,15,16,17,18) @@ -96,49 +96,49 @@ Method(ma00, 7) } // 6 if (LNotEqual(arg0, 1)) { - err(arg0, z999, 0, 0, 0, arg0, 1) + err(arg0, z999, __LINE__, 0, 0, arg0, 1) } if (LNotEqual(arg1, 2)) { - err(arg0, z999, 0, 0, 0, arg0, 2) + err(arg0, z999, __LINE__, 0, 0, arg0, 2) } if (LNotEqual(arg2, 3)) { - err(arg0, z999, 0, 0, 0, arg0, 3) + err(arg0, z999, __LINE__, 0, 0, arg0, 3) } if (LNotEqual(arg3, 4)) { - err(arg0, z999, 0, 0, 0, arg0, 4) + err(arg0, z999, __LINE__, 0, 0, arg0, 4) } if (LNotEqual(arg4, 5)) { - err(arg0, z999, 0, 0, 0, arg0, 5) + err(arg0, z999, __LINE__, 0, 0, arg0, 5) } if (LNotEqual(arg5, 6)) { - err(arg0, z999, 0, 0, 0, arg0, 6) + err(arg0, z999, __LINE__, 0, 0, arg0, 6) } if (LNotEqual(arg6, 7)) { - err(arg0, z999, 0, 0, 0, arg0, 7) + err(arg0, z999, __LINE__, 0, 0, arg0, 7) } m000(8,9,10,11,12,13) if (LNotEqual(arg0, 1)) { - err(arg0, z999, 0, 0, 0, arg0, 1) + err(arg0, z999, __LINE__, 0, 0, arg0, 1) } if (LNotEqual(arg1, 2)) { - err(arg0, z999, 0, 0, 0, arg0, 2) + err(arg0, z999, __LINE__, 0, 0, arg0, 2) } if (LNotEqual(arg2, 3)) { - err(arg0, z999, 0, 0, 0, arg0, 3) + err(arg0, z999, __LINE__, 0, 0, arg0, 3) } if (LNotEqual(arg3, 4)) { - err(arg0, z999, 0, 0, 0, arg0, 4) + err(arg0, z999, __LINE__, 0, 0, arg0, 4) } if (LNotEqual(arg4, 5)) { - err(arg0, z999, 0, 0, 0, arg0, 5) + err(arg0, z999, __LINE__, 0, 0, arg0, 5) } if (LNotEqual(arg5, 6)) { - err(arg0, z999, 0, 0, 0, arg0, 6) + err(arg0, z999, __LINE__, 0, 0, arg0, 6) } if (LNotEqual(arg6, 7)) { - err(arg0, z999, 0, 0, 0, arg0, 7) + err(arg0, z999, __LINE__, 0, 0, arg0, 7) } } diff --git a/tests/aslts/src/runtime/collections/functional/logic/logical.asl b/tests/aslts/src/runtime/collections/functional/logic/logical.asl index 4ced24a..ac812fd 100644 --- a/tests/aslts/src/runtime/collections/functional/logic/logical.asl +++ b/tests/aslts/src/runtime/collections/functional/logic/logical.asl @@ -55,65 +55,65 @@ Method(m003, 6, Serialized) case (0) { Store(LNotEqual(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 0, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } Store(LNotEqual(Local1, Local0), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 1, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (1) { Store(LAnd(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 2, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } Store(LAnd(Local1, Local0), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 3, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (2) { Store(LOr(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 4, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } Store(LOr(Local1, Local0), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 5, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (3) { Store(LEqual(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 6, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } Store(LEqual(Local1, Local0), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 7, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (4) { Store(LGreater(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 8, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (5) { Store(LGreaterEqual(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 9, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (6) { Store(LLess(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 10, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (7) { Store(LLessEqual(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 11, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } } @@ -152,7 +152,7 @@ Method(m004, 6, Serialized) case (0) { Store(LNot(Local0), Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z035, 12, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } } @@ -576,7 +576,7 @@ Method(LEQ0,, Serialized) Store(LEqual(BIG0, BIG0), Local0) if (LNotEqual(Local0, Ones)) { - err(ts, z035, 13, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers @@ -640,7 +640,7 @@ Method(LGR0,, Serialized) Store(LGreater(BIG0, BIG0), Local0) if (LNotEqual(Local0, Zero)) { - err(ts, z035, 14, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers @@ -704,7 +704,7 @@ Method(LGE0,, Serialized) Store(LGreaterEqual(BIG0, BIG0), Local0) if (LNotEqual(Local0, Ones)) { - err(ts, z035, 15, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers @@ -768,7 +768,7 @@ Method(LL00,, Serialized) Store(LLess(BIG0, BIG0), Local0) if (LNotEqual(Local0, Zero)) { - err(ts, z035, 16, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers @@ -832,7 +832,7 @@ Method(LLE0,, Serialized) Store(LLessEqual(BIG0, BIG0), Local0) if (LNotEqual(Local0, Ones)) { - err(ts, z035, 17, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers @@ -896,7 +896,7 @@ Method(LNE0,, Serialized) Store(LNotEqual(BIG0, BIG0), Local0) if (LNotEqual(Local0, Zero)) { - err(ts, z035, 18, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl b/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl index e62183a..3092345 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl @@ -72,12 +72,12 @@ Method(m310, 4) Method(m311, 3) { if (LNotequal(ObjectType(arg1), 3)) { - err("m311: unexpected type of Arg1", z036, 0, 0, 0, 0, 0) + err("m311: unexpected type of Arg1", z036, __LINE__, 0, 0, 0, 0) return (Ones) } if (LNotequal(ObjectType(arg2), 3)) { - err("m311: unexpected type of Arg2", z036, 1, 0, 0, 0, 0) + err("m311: unexpected type of Arg2", z036, __LINE__, 0, 0, 0, 0) return (Ones) } @@ -119,7 +119,7 @@ Method(m312, 6, Serialized) Concatenate(Local0, Local1, Local7) if (m311(Arg0, Local7, Local2)) { - err(arg0, z036, 2, 0, 0, Local5, arg2) + err(arg0, z036, __LINE__, 0, 0, Local5, arg2) } } case (1) { @@ -128,11 +128,11 @@ Method(m312, 6, Serialized) Concatenate(Local0, Local1, Local7) if (LNotequal(ObjectType(Local7), 2)) { - err(arg0, z036, 3, 0, 0, Local7, arg2) + err(arg0, z036, __LINE__, 0, 0, Local7, arg2) } elseif (LNotequal(ObjectType(Local2), 2)) { - err(arg0, z036, 4, 0, 0, Local2, arg2) + err(arg0, z036, __LINE__, 0, 0, Local2, arg2) } elseif (LNotEqual(Local7, Local2)) { - err(arg0, z036, 5, 0, 0, Local7, arg2) + err(arg0, z036, __LINE__, 0, 0, Local7, arg2) } } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl b/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl index c716c4c..6fc8b00 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl @@ -224,7 +224,7 @@ Method(m308, 7, Serialized) Store(m306(arg5, Local0, Local1, Local2, Local3, Local4), Local6) if (LNotEqual(Local7, Local6)) { - err("err 1", z038, lpC0, 0, 0, lpC1, arg2) + err("err 1", z038, __LINE__, 0, 0, lpC1, arg2) } if (LAnd(arg6, LNotEqual(Local1, Local3))) { @@ -237,7 +237,7 @@ Method(m308, 7, Serialized) Store(m306(arg5, Local0, Local3, Local2, Local1, Local4), Local6) if (LNotEqual(Local7, Local6)) { - err("err 2", z038, Add(lpC0, 36), 0, 0, lpC2, arg2) + err("err 2", z038, __LINE__, 0, 0, lpC2, arg2) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl b/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl index c763266..f08dc4c 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl @@ -97,7 +97,7 @@ Method(m331, 1) { Store(m330(0x12), Local0) if (LNotEqual(Local0, Ones)) { - err(arg0, z075, 0, 0, 0, Local0, Ones) + err(arg0, z075, __LINE__, 0, 0, Local0, Ones) } } */ @@ -193,56 +193,56 @@ Method(m331, 1) Store(m330(0321), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z075, 0, Local0, 36) + err(arg0, z075, __LINE__, Local0, 36) } Store(m330(0xd1), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z075, 1, Local0, 36) + err(arg0, z075, __LINE__, Local0, 36) } Store(m330(9876543210), Local0) if (F64) { if (LNotEqual(Local0, 37)) { - err(arg0, z075, 2, Local0, 37) + err(arg0, z075, __LINE__, Local0, 37) } } else { if (LNotEqual(Local0, 45)) { - err(arg0, z075, 3, Local0, 45) + err(arg0, z075, __LINE__, Local0, 45) } } Store(m330(0xc179b3fe), Local0) if (LNotEqual(Local0, 28)) { - err(arg0, z075, 4, Local0, 28) + err(arg0, z075, __LINE__, Local0, 28) } Store(m330(0xfe7cb391d650a284), Local0) if (LNotEqual(Local0, 29)) { - err(arg0, z075, 5, Local0, 29) + err(arg0, z075, __LINE__, Local0, 29) } Store(m330(0), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z075, 6, Local0, 14) + err(arg0, z075, __LINE__, Local0, 14) } Store(m330(0xffffffff), Local0) if (LNotEqual(Local0, 16)) { - err(arg0, z075, 7, Local0, 16) + err(arg0, z075, __LINE__, Local0, 16) } Store(m330(0xffffffffffffffff), Local0) if (F64) { if (LNotEqual(Local0, 17)) { - err(arg0, z075, 8, Local0, 17) + err(arg0, z075, __LINE__, Local0, 17) } } else { if (LNotEqual(Local0, 16)) { - err(arg0, z075, 9, Local0, 16) + err(arg0, z075, __LINE__, Local0, 16) } } Store(m330(0xff), Local0) if (LNotEqual(Local0, 20)) { - err(arg0, z075, 10, Local0, 20) + err(arg0, z075, __LINE__, Local0, 20) } Store(m330(0xabcdef), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z075, 11, Local0, 44) + err(arg0, z075, __LINE__, Local0, 44) } } @@ -346,87 +346,87 @@ Method(m333, 1) if (0) { Store(m332("0321"), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z075, 24, Local0, 34) + err(arg0, z075, __LINE__, Local0, 34) } Store(m332("321"), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z075, 25, Local0, 34) + err(arg0, z075, __LINE__, Local0, 34) } Store(m332("ba9876"), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z075, 26, Local0, 36) + err(arg0, z075, __LINE__, Local0, 36) } Store(m332("c179b3fe"), Local0) if (LNotEqual(Local0, 2)) { - err(arg0, z075, 27, Local0, 2) + err(arg0, z075, __LINE__, Local0, 2) } Store(m332("fe7cb391d650a284"), Local0) if (LNotEqual(Local0, 3)) { - err(arg0, z075, 28, Local0, 3) + err(arg0, z075, __LINE__, Local0, 3) } Store(m332("ffffffff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z075, 29, Local0, 5) + err(arg0, z075, __LINE__, Local0, 5) } } Store(m332("ffffffffffffffffff"), Local0) if (LNotEqual(Local0, 40)) { - err(arg0, z075, 30, Local0, 40) + err(arg0, z075, __LINE__, Local0, 40) } if (0) { Store(m332("ffffffffffffffff"), Local0) if (LNotEqual(Local0, 41)) { - err(arg0, z075, 31, Local0, 41) + err(arg0, z075, __LINE__, Local0, 41) } Store(m332("ffffffffff"), Local0) if (LNotEqual(Local0, 42)) { - err(arg0, z075, 32, Local0, 42) + err(arg0, z075, __LINE__, Local0, 42) } Store(m332("ff"), Local0) if (LNotEqual(Local0, 43)) { - err(arg0, z075, 33, Local0, 43) + err(arg0, z075, __LINE__, Local0, 43) } Store(m332("fe7cb391d650a2841"), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z075, 34, Local0, 44) + err(arg0, z075, __LINE__, Local0, 44) } Store(m332("987654321"), Local0) if (LNotEqual(Local0, 45)) { - err(arg0, z075, 35, Local0, 45) + err(arg0, z075, __LINE__, Local0, 45) } Store(m332("0xfe7cb3"), Local0) if (LNotEqual(Local0, 46)) { - err(arg0, z075, 36, Local0, 46) + err(arg0, z075, __LINE__, Local0, 46) } Store(m332("1234q"), Local0) if (LNotEqual(Local0, 47)) { - err(arg0, z075, 37, Local0, 47) + err(arg0, z075, __LINE__, Local0, 47) } Store(m332(BIG0), Local0) if (LNotEqual(Local0, 48)) { - err(arg0, z075, 38, Local0, 48) + err(arg0, z075, __LINE__, Local0, 48) } Store(m332(""), Local0) if (LNotEqual(Local0, 49)) { - err(arg0, z075, 39, Local0, 49) + err(arg0, z075, __LINE__, Local0, 49) } Store(m332(" "), Local0) if (LNotEqual(Local0, 50)) { - err(arg0, z075, 40, Local0, 50) + err(arg0, z075, __LINE__, Local0, 50) } Store(m332(ALL0), Local0) if (LNotEqual(Local0, 51)) { - err(arg0, z075, 41, Local0, 51) + err(arg0, z075, __LINE__, Local0, 51) } Store(m332("abcdef"), Local0) if (LNotEqual(Local0, 52)) { - err(arg0, z075, 42, Local0, 52) + err(arg0, z075, __LINE__, Local0, 52) } Store(m332("ABCDEF"), Local0) if (LNotEqual(Local0, 53)) { - err(arg0, z075, 43, Local0, 53) + err(arg0, z075, __LINE__, Local0, 53) } } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl b/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl index a6a1f21..de069a3 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl @@ -61,13 +61,13 @@ Method(m304, 6, Serialized) case (0) { Mid(Local0, Local1, Local4, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z039, 0, 0, 0, Local5, arg2) + err(arg0, z039, __LINE__, 0, 0, Local5, arg2) } } case (1) { Mid(s200, Local1, Local4, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z039, 1, 0, 0, Local5, arg2) + err(arg0, z039, __LINE__, 0, 0, Local5, arg2) } } } @@ -283,10 +283,10 @@ Method(MID0,, Serialized) // Buffer, Mid(Buffer(0){}) Mid(Buffer(Local1) {}, 0, 1, Local7) if (LNotEqual(Local7, Buffer(Local1) {})) { - err(ts, z039, 2, 0, 0, 0, "Buffer(0)") + err(ts, z039, __LINE__, 0, 0, 0, "Buffer(0)") } Mid(Buffer(Local1) {}, 300, 300, Local7) if (LNotEqual(Local7, Buffer(Local1) {})) { - err(ts, z039, 3, 0, 0, 0, "Buffer(0)") + err(ts, z039, __LINE__, 0, 0, 0, "Buffer(0)") } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl b/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl index 0813b94..0be2a48 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl @@ -166,31 +166,31 @@ Method(m0f1, 7, Serialized) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 0, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 1, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local2), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 2, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local3), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 3, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local4), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 4, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local5), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 5, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local6), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 6, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } } case (1) { @@ -202,20 +202,20 @@ Method(m0f1, 7, Serialized) Store(0x12345678, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 7, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(Local0, 0x12345678)) { - err(arg0, z040, 8, 0, 0, Local0, 0x12345678) + err(arg0, z040, __LINE__, 0, 0, Local0, 0x12345678) } // By ArgX Store(ObjectType(Arg2), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 9, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(Arg2, 0x81223344)) { - err(arg0, z040, 10, 0, 0, Arg2, 0x81223344) + err(arg0, z040, __LINE__, 0, 0, Arg2, 0x81223344) } // By Name locally @@ -223,20 +223,20 @@ Method(m0f1, 7, Serialized) Name(n000, 0x98127364) Store(ObjectType(n000), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 11, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(n000, 0x98127364)) { - err(arg0, z040, 12, 0, 0, n000, 0x98127364) + err(arg0, z040, __LINE__, 0, 0, n000, 0x98127364) } // By Name globally Store(ObjectType(n002), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 13, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(n002, 0x90801020)) { - err(arg0, z040, 14, 0, 0, n002, 0x90801020) + err(arg0, z040, __LINE__, 0, 0, n002, 0x90801020) } // Not a Buffer in 32-bit mode @@ -244,7 +244,7 @@ Method(m0f1, 7, Serialized) Store(0xa1b2c3d4e5c6e7f8, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 15, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } } case (2) { @@ -258,20 +258,20 @@ Method(m0f1, 7, Serialized) Store(0xa1b2c3d4e5c6e7f8, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 16, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(Local0, 0xa1b2c3d4e5c6e7f8)) { - err(arg0, z040, 17, 0, 0, Local0, 0xa1b2c3d4e5c6e7f8) + err(arg0, z040, __LINE__, 0, 0, Local0, 0xa1b2c3d4e5c6e7f8) } // By ArgX Store(ObjectType(Arg2), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 18, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(Arg2, 0xfabefac489501248)) { - err(arg0, z040, 19, 0, 0, Arg2, 0xfabefac489501248) + err(arg0, z040, __LINE__, 0, 0, Arg2, 0xfabefac489501248) } // By Name locally @@ -279,20 +279,20 @@ Method(m0f1, 7, Serialized) Name(n001, 0x9081122384356647) Store(ObjectType(n001), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 20, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(n001, 0x9081122384356647)) { - err(arg0, z040, 21, 0, 0, n001, 0x9081122384356647) + err(arg0, z040, __LINE__, 0, 0, n001, 0x9081122384356647) } // By Name globally Store(ObjectType(n003), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 22, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(n003, 0x9189192989396949)) { - err(arg0, z040, 23, 0, 0, n003, 0x9189192989396949) + err(arg0, z040, __LINE__, 0, 0, n003, 0x9189192989396949) } } } @@ -305,35 +305,35 @@ Method(m0f1, 7, Serialized) Store("", Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 24, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } Store("1", Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 25, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } Store("abcd", Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 26, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } Store("qwrt", Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 27, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } // By ArgX Store(ObjectType(Arg2), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 28, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } if (LNotEqual(Arg2, "zxcvbnm0912345678ok")) { - err(arg0, z040, 29, 0, 0, Arg2, "zxcvbnm0912345678ok") + err(arg0, z040, __LINE__, 0, 0, Arg2, "zxcvbnm0912345678ok") } // By Name locally @@ -341,20 +341,20 @@ Method(m0f1, 7, Serialized) Name(n004, "") Store(ObjectType(n004), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 30, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } if (LNotEqual(n004, "")) { - err(arg0, z040, 31, 0, 0, n004, "") + err(arg0, z040, __LINE__, 0, 0, n004, "") } // By Name globally Store(ObjectType(n005), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 32, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } if (LNotEqual(n005, "9876")) { - err(arg0, z040, 33, 0, 0, n005, "9876") + err(arg0, z040, __LINE__, 0, 0, n005, "9876") } } @@ -374,27 +374,27 @@ Method(m0f1, 7, Serialized) Store(ObjectType(f000), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 34, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } if (LNotEqual(f000, 0x8d)) { - err(arg0, z040, 35, 0, 0, f000, 0x8d) + err(arg0, z040, __LINE__, 0, 0, f000, 0x8d) } Store(ObjectType(f222), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 36, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(f223), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 37, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(f224), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 38, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(f225), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 39, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } } case (5) { @@ -413,10 +413,10 @@ Method(m0f1, 7, Serialized) Store(ObjectType(bkf0), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 40, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } if (LNotEqual(bkf0, 0x95)) { - err(arg0, z040, 41, 0, 0, bkf0, 0x95) + err(arg0, z040, __LINE__, 0, 0, bkf0, 0x95) } } case (6) { @@ -440,19 +440,19 @@ Method(m0f1, 7, Serialized) Store(ObjectType(f00a), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 42, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(f00b), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 43, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(if00), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 44, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(if01), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 45, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } } case (7) { @@ -462,10 +462,10 @@ Method(m0f1, 7, Serialized) Store(Buffer(4) {0, 1, 2, 3}, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00b)) { - err(arg0, z040, 46, 0, 0, Local7, c00b) + err(arg0, z040, __LINE__, 0, 0, Local7, c00b) } if (LNotEqual(Local0, Buffer(4) {0, 1, 2, 3})) { - err(arg0, z040, 47, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (8) { @@ -474,10 +474,10 @@ Method(m0f1, 7, Serialized) Store(ObjectType(Arg2), Local7) if (LNotEqual(Local7, c00b)) { - err(arg0, z040, 48, 0, 0, Local7, c00b) + err(arg0, z040, __LINE__, 0, 0, Local7, c00b) } if (LNotEqual(Arg2, Buffer(4) {4, 5, 6, 7})) { - err(arg0, z040, 49, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (9) { @@ -487,10 +487,10 @@ Method(m0f1, 7, Serialized) Name(b000, Buffer(4) {8, 9, 10, 11}) Store(ObjectType(b000), Local7) if (LNotEqual(Local7, c00b)) { - err(arg0, z040, 50, 0, 0, Local7, c00b) + err(arg0, z040, __LINE__, 0, 0, Local7, c00b) } if (LNotEqual(b000, Buffer(4) {8, 9, 10, 11})) { - err(arg0, z040, 51, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (10) { @@ -499,10 +499,10 @@ Method(m0f1, 7, Serialized) Store(ObjectType(b003), Local7) if (LNotEqual(Local7, c00b)) { - err(arg0, z040, 52, 0, 0, Local7, c00b) + err(arg0, z040, __LINE__, 0, 0, Local7, c00b) } if (LNotEqual(b003, Buffer(4) {12, 13, 14, 15})) { - err(arg0, z040, 53, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (11) { @@ -513,10 +513,10 @@ Method(m0f1, 7, Serialized) CreateBitField(Local0, 3, f001) Store(ObjectType(f001), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 54, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer(4) {16, 17, 18, 19})) { - err(arg0, z040, 55, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (12) { @@ -527,10 +527,10 @@ Method(m0f1, 7, Serialized) CreateByteField(Local0, 3, f002) Store(ObjectType(f002), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 56, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer(4) {20, 21, 22, 23})) { - err(arg0, z040, 57, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (13) { @@ -541,10 +541,10 @@ Method(m0f1, 7, Serialized) CreateDWordField(Local0, 0, f003) Store(ObjectType(f003), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 58, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer(4) {24, 25, 26, 27})) { - err(arg0, z040, 59, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (14) { @@ -555,10 +555,10 @@ Method(m0f1, 7, Serialized) CreateField(Local0, 0, 32, f004) Store(ObjectType(f004), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 60, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer(4) {28, 29, 30, 31})) { - err(arg0, z040, 61, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (15) { @@ -569,11 +569,11 @@ Method(m0f1, 7, Serialized) CreateField(Local0, 0, 64, f005) Store(ObjectType(f005), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 62, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {33, 34, 35, 36, 37, 38, 39, 40, 41})) { - err(arg0, z040, 63, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (16) { @@ -584,21 +584,21 @@ Method(m0f1, 7, Serialized) CreateField(Local0, 0, 65, f006) Store(ObjectType(f006), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 64, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {42, 43, 44, 45, 46, 47, 48, 49, 50})) { - err(arg0, z040, 65, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } CreateField(Local0, 0, 17, f111) Store(ObjectType(f111), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 66, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } CreateField(Local0, 0, 57, f112) Store(ObjectType(f112), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 67, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } } case (17) { @@ -609,10 +609,10 @@ Method(m0f1, 7, Serialized) CreateQWordField(Local0, 0, f007) Store(ObjectType(f007), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 68, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {42, 43, 44, 45, 46, 47, 48, 49, 50})) { - err(arg0, z040, 69, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (18) { @@ -623,10 +623,10 @@ Method(m0f1, 7, Serialized) CreateWordField(Local0, 0, f008) Store(ObjectType(f008), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 70, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {51, 52, 53, 54})) { - err(arg0, z040, 71, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (19) { @@ -637,40 +637,40 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 72, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, "q")) { - err(arg0, z040, 73, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } Store("qw", Local0) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 74, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, "qw")) { - err(arg0, z040, 75, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } Store("qwertyu", Local0) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 76, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, "qwertyu")) { - err(arg0, z040, 77, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } Store("qwertyuiop", Local0) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 78, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, "qwertyuiop")) { - err(arg0, z040, 79, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (20) { @@ -681,30 +681,30 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 80, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {42, 43, 44, 45})) { - err(arg0, z040, 81, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } Store(Buffer() {42, 43, 44, 45, 46, 47, 48, 49}, Local0) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 82, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {42, 43, 44, 45, 46, 47, 48, 49})) { - err(arg0, z040, 83, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } Store(Buffer() {42, 43, 44, 45, 46, 47, 48, 49, 50}, Local0) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 84, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {42, 43, 44, 45, 46, 47, 48, 49, 50})) { - err(arg0, z040, 85, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (21) { @@ -726,7 +726,7 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 86, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } // Buffer @@ -734,7 +734,7 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 1), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c00b)) { - err(arg0, z040, 87, 0, 0, Local7, c00b) + err(arg0, z040, __LINE__, 0, 0, Local7, c00b) } // String @@ -742,7 +742,7 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 2), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 88, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } // Integer @@ -750,7 +750,7 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 3), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 89, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } } case (22) { @@ -760,7 +760,7 @@ Method(m0f1, 7, Serialized) DataTableRegion (HDR0, "DSDT", "", "") Store(ObjectType(HDR0), Local7) if (LNotEqual(Local7, c012)) { - err(arg0, z040, 90, 0, 0, Local7, c012) + err(arg0, z040, __LINE__, 0, 0, Local7, c012) } } case (23) { @@ -769,7 +769,7 @@ Method(m0f1, 7, Serialized) Store(ObjectType(Debug), Local7) if (LNotEqual(Local7, c018)) { - err(arg0, z040, 91, 0, 0, Local7, c018) + err(arg0, z040, __LINE__, 0, 0, Local7, c018) } } case (24) { @@ -779,7 +779,7 @@ Method(m0f1, 7, Serialized) Device(dv00) {} Store(ObjectType(dv00), Local7) if (LNotEqual(Local7, c00e)) { - err(arg0, z040, 92, 0, 0, Local7, c00e) + err(arg0, z040, __LINE__, 0, 0, Local7, c00e) } } case (25) { @@ -789,7 +789,7 @@ Method(m0f1, 7, Serialized) Event(evt0) Store(ObjectType(evt0), Local7) if (LNotEqual(Local7, c00f)) { - err(arg0, z040, 93, 0, 0, Local7, c00f) + err(arg0, z040, __LINE__, 0, 0, Local7, c00f) } } case (26) { @@ -799,7 +799,7 @@ Method(m0f1, 7, Serialized) Method(m0f2) { return (0x1234) } Store(ObjectType(m0f2), Local7) if (LNotEqual(Local7, c010)) { - err(arg0, z040, 94, 0, 0, Local7, c010) + err(arg0, z040, __LINE__, 0, 0, Local7, c010) } } case (27) { @@ -809,7 +809,7 @@ Method(m0f1, 7, Serialized) * Function(mof3) { return (0) } * Store(ObjectType(m0f3), Local7) * if (LNotEqual(Local7, c010)) { - * err(arg0, z040, 95, 0, 0, Local7, c010) + * err(arg0, z040, __LINE__, 0, 0, Local7, c010) * } */ } @@ -820,7 +820,7 @@ Method(m0f1, 7, Serialized) Mutex(mt00, 0) Store(ObjectType(mt00), Local7) if (LNotEqual(Local7, c011)) { - err(arg0, z040, 96, 0, 0, Local7, c011) + err(arg0, z040, __LINE__, 0, 0, Local7, c011) } } case (29) { @@ -829,11 +829,11 @@ Method(m0f1, 7, Serialized) Store(ObjectType(r000), Local7) if (LNotEqual(Local7, c012)) { - err(arg0, z040, 97, 0, 0, Local7, c012) + err(arg0, z040, __LINE__, 0, 0, Local7, c012) } Store(ObjectType(r001), Local7) if (LNotEqual(Local7, c012)) { - err(arg0, z040, 98, 0, 0, Local7, c012) + err(arg0, z040, __LINE__, 0, 0, Local7, c012) } } case (30) { @@ -865,83 +865,83 @@ Method(m0f1, 7, Serialized) Store(ObjectType(p000), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 99, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p001), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 100, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p002), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 101, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p003), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 102, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p004), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 103, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p005), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 104, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p006), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 105, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p007), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 106, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p008), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 107, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p009), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 108, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00a), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 109, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00b), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 110, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00c), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 111, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00d), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 112, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00e), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 113, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00f), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 114, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p010), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 115, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p011), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 116, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p012), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 117, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p013), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 118, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } } case (31) { @@ -951,7 +951,7 @@ Method(m0f1, 7, Serialized) PowerResource(pwr0, 1, 0) {Method(m000){return (0)}} Store(ObjectType(pwr0), Local7) if (LNotEqual(Local7, c013)) { - err(arg0, z040, 119, 0, 0, Local7, c013) + err(arg0, z040, __LINE__, 0, 0, Local7, c013) } } case (32) { @@ -961,14 +961,14 @@ Method(m0f1, 7, Serialized) Processor(pr00, 0, 0xFFFFFFFF, 0) {} Store(ObjectType(pr00), Local7) if (LNotEqual(Local7, c014)) { - err(arg0, z040, 120, 0, 0, Local7, c014) + err(arg0, z040, __LINE__, 0, 0, Local7, c014) } } case (33) { ThermalZone(tz00) {} Store(ObjectType(tz00), Local7) if (LNotEqual(Local7, c015)) { - err(arg0, z040, 121, 0, 0, Local7, c015) + err(arg0, z040, __LINE__, 0, 0, Local7, c015) } } case (34) { @@ -983,14 +983,14 @@ Store("==================================== zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz Store (LoadTable("OEM1", "MYOEM", "TABLE1"), Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c017)) { - err(arg0, z040, 122, 0, 0, Local7, c017) + err(arg0, z040, __LINE__, 0, 0, Local7, c017) } Store("==================================== uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu", Debug) */ } Default { - err(arg0, z040, 123, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl b/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl index 3622c39..851c3ab 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl @@ -47,27 +47,27 @@ Method(m1ef,, Serialized) Store(SizeOf(i000), Local0) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 8)) { - err(ts, z041, 0, 0, 0, Local0, 8) + err(ts, z041, __LINE__, 0, 0, Local0, 8) } } else { if (LNotEqual(Local0, 4)) { - err(ts, z041, 1, 0, 0, Local0, 4) + err(ts, z041, __LINE__, 0, 0, Local0, 4) } } Store(SizeOf(s000), Local0) if (LNotEqual(Local0, 3)) { - err(ts, z041, 2, 0, 0, Local0, 3) + err(ts, z041, __LINE__, 0, 0, Local0, 3) } Store(SizeOf(b000), Local0) if (LNotEqual(Local0, 5)) { - err(ts, z041, 3, 0, 0, Local0, 5) + err(ts, z041, __LINE__, 0, 0, Local0, 5) } Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 7)) { - err(ts, z041, 4, 0, 0, Local0, 7) + err(ts, z041, __LINE__, 0, 0, Local0, 7) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/store.asl b/tests/aslts/src/runtime/collections/functional/manipulation/store.asl index cee60f6..2759046 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/store.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/store.asl @@ -54,70 +54,70 @@ Method(m302, 6, Serialized) case (0) { ToInteger(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 0, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (1) { ToBuffer(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 1, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (2) { ToString(Local0, , Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 2, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (3) { ToDecimalString(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 3, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (4) { ToHexString(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 4, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (5) { ToBCD(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 5, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (6) { FromBCD(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 6, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (7) { // ToUUID macro Store(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 7, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (8) { // Unicode macro Store(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 8, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (9) { // EISAID macro Store(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 9, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } @@ -138,7 +138,7 @@ Method(ST00,, Serialized) Store(Store(0xabcdef12, Local0), Local1) if (LNotEqual(Local1, 0xabcdef12)) { - err(ts, z042, 10, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Integer arithmetic @@ -147,11 +147,11 @@ Method(ST00,, Serialized) Store(Add(0x12345678, 0x11111111, Local0), Local1) if (LNotEqual(Local1, 0x23456789)) { - err(ts, z042, 11, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Add(0x23456781, 0x11111111), Local0) if (LNotEqual(Local0, 0x34567892)) { - err(ts, z042, 12, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Add(0x12345678, 0xf0000000, Local0), Local1) @@ -161,38 +161,38 @@ Method(ST00,, Serialized) Store(Subtract(0x87654321, 0x11111111, Local0), Local1) if (LNotEqual(Local1, 0x76543210)) { - err(ts, z042, 13, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Subtract(0x72387654, 0x22221111), Local0) if (LNotEqual(Local0, 0x50166543)) { - err(ts, z042, 14, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Multiply Store(Multiply(0x12345, 0x7abc, Local0), Local1) if (LNotEqual(Local1, 0x8BA4C8AC)) { - err(ts, z042, 15, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Multiply(0x145ab, 0x3247), Local0) if (LNotEqual(Local0, 0x3FF5B86D)) { - err(ts, z042, 16, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Divide Store(Divide(0x12345678, 0x1000, Local0, Local1), Local2) if (LNotEqual(Local2, 0x12345)) { - err(ts, z042, 17, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Divide(0x7abc56e8, 0x1000, Local0), Local1) if (LNotEqual(Local1, 0x7ABC5)) { - err(ts, z042, 18, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Divide(0x55667788, 0x1000), Local0) if (LNotEqual(Local0, 0x55667)) { - err(ts, z042, 19, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Increment @@ -200,7 +200,7 @@ Method(ST00,, Serialized) Store(0x12345678, Local0) Store(Increment(Local0), Local1) if (LNotEqual(Local1, 0x12345679)) { - err(ts, z042, 20, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Decrement @@ -208,47 +208,47 @@ Method(ST00,, Serialized) Store(0x67812345, Local0) Store(Decrement(Local0), Local1) if (LNotEqual(Local1, 0x67812344)) { - err(ts, z042, 21, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // And Store(And(0x87654321, 0xaaaaaaaa, Local0), Local1) if (LNotEqual(Local1, 0x82200220)) { - err(ts, z042, 22, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(And(0x88aabbcc, 0xaaaaaaaa), Local0) if (LNotEqual(Local0, 0x88AAAA88)) { - err(ts, z042, 23, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // FindSetLeftBit Store(FindSetLeftBit(0x0000f001, Local0), Local1) if (LNotEqual(Local1, 16)) { - err(ts, z042, 24, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(FindSetLeftBit(0x09007001), Local0) if (LNotEqual(Local0, 28)) { - err(ts, z042, 25, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // FindSetRightBit Store(FindSetRightBit(0x01080040, Local0), Local1) if (LNotEqual(Local1, 7)) { - err(ts, z042, 26, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(FindSetRightBit(0x09800000), Local0) if (LNotEqual(Local0, 24)) { - err(ts, z042, 27, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Mod Store(Mod(0x1afb3c4d, 0x400000), Local0) if (LNotEqual(Local0, 0x3b3c4d)) { - err(ts, z042, 28, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ShiftLeft @@ -263,11 +263,11 @@ Method(ST00,, Serialized) Store(ShiftRight(0x87654321, 25, Local0), Local1) if (LNotEqual(Local1, 0x00000043)) { - err(ts, z042, 29, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ShiftRight(0x7654a0cb, 21), Local0) if (LNotEqual(Local0, 0x000003b2)) { - err(ts, z042, 30, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Nand @@ -298,22 +298,22 @@ Method(ST00,, Serialized) Store(Or(0x9a3533ac, 0x39a696ca, Local0), Local1) if (LNotEqual(Local1, 0xBBB7B7EE)) { - err(ts, z042, 31, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Or(0xca3533a9, 0xa9a696c3), Local0) if (LNotEqual(Local0, 0xEBB7B7EB)) { - err(ts, z042, 32, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Xor Store(Xor(0x9a365ac3, 0x39a96ca6, Local0), Local1) if (LNotEqual(Local1, 0xA39F3665)) { - err(ts, z042, 33, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Xor(0xa9365ac3, 0x93a96ca6), Local0) if (LNotEqual(Local0, 0x3A9F3665)) { - err(ts, z042, 34, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Logical operators @@ -334,7 +334,7 @@ Method(ST00,, Serialized) Store(Acquire(MT04, 0x0005), Local0) if (LNotEqual(Local0, Zero)) { - err(ts, z042, 35, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Release (None) @@ -343,11 +343,11 @@ Method(ST00,, Serialized) Store(ToInteger("0x89abcdef", Local0), Local1) if (LNotEqual(Local1, 0x89abcdef)) { - err(ts, z042, 36, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToInteger("0x89abcdef"), Local0) if (LNotEqual(Local0, 0x89abcdef)) { - err(ts, z042, 37, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ToString @@ -356,20 +356,20 @@ Method(ST00,, Serialized) Store(ToString(Local2, Ones, Local0), Local1) if (LNotEqual(Local1, "\x01")) { - err(ts, z042, 38, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToString(Local2, Ones), Local0) if (LNotEqual(Local0, "\x01")) { - err(ts, z042, 39, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToString(Local2, 1, Local0), Local1) if (LNotEqual(Local1, "\x01")) { - err(ts, z042, 40, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToString(Local2, 1), Local0) if (LNotEqual(Local0, "\x01")) { - err(ts, z042, 41, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ToBuffer @@ -378,11 +378,11 @@ Method(ST00,, Serialized) Store(ToBuffer(Local2, Local0), Local1) if (LNotEqual(Local1, Buffer(2){0x01, 0x00})) { - err(ts, z042, 42, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToBuffer(Local2), Local0) if (LNotEqual(Local0, Buffer(2){0x01, 0x00})) { - err(ts, z042, 43, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ToDecimalString @@ -391,11 +391,11 @@ Method(ST00,, Serialized) Store(ToDecimalString(Local2, Local0), Local1) if (LNotEqual(Local1, "12")) { - err(ts, z042, 44, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToDecimalString(Local2), Local0) if (LNotEqual(Local0, "12")) { - err(ts, z042, 45, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ToHexString @@ -404,11 +404,11 @@ Method(ST00,, Serialized) Store(ToHexString(Local2, Local0), Local1) if (LNotEqual(Local1, "EF")) { - err(ts, z042, 46, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToHexString(Local2), Local0) if (LNotEqual(Local0, "EF")) { - err(ts, z042, 47, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ToBCD @@ -417,11 +417,11 @@ Method(ST00,, Serialized) Store(ToBCD(Local2, Local0), Local1) if (LNotEqual(Local1, 0x10)) { - err(ts, z042, 48, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToBCD(Local2), Local0) if (LNotEqual(Local0, 0x10)) { - err(ts, z042, 49, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // FromBCD @@ -430,11 +430,11 @@ Method(ST00,, Serialized) Store(FromBCD(Local2, Local0), Local1) if (LNotEqual(Local1, 10)) { - err(ts, z042, 50, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(FromBCD(Local2), Local0) if (LNotEqual(Local0, 10)) { - err(ts, z042, 51, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Mid @@ -443,22 +443,22 @@ Method(ST00,, Serialized) Store(Mid(Local2, 1, 2, Local0), Local1) if (LNotEqual(Local1, "12")) { - err(ts, z042, 52, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Mid(Local2, 1, 2), Local0) if (LNotEqual(Local0, "12")) { - err(ts, z042, 53, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Buffer(){0, 1, 2, 3}, Local2) Store(Mid(Local2, 1, 2, Local0), Local1) if (LNotEqual(Local1, Buffer(){1, 2})) { - err(ts, z042, 54, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Mid(Local2, 1, 2), Local0) if (LNotEqual(Local0, Buffer(){1, 2})) { - err(ts, z042, 55, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Match @@ -467,7 +467,7 @@ Method(ST00,, Serialized) Store(Match(Local2, MTR, 0, MTR, 0, 0), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z042, 56, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ConcatenateResTemplate @@ -480,14 +480,14 @@ Method(ST00,, Serialized) * 20.12.2005: 0 instead of 0x87 */ if (LNotEqual(Local1, Buffer(){0x79, 0})) { - err(ts, z042, 57, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } /* * 20.12.2005: 0 instead of 0x87 */ Store(ConcatenateResTemplate(Local2, Local3), Local0) if (LNotEqual(Local0, Buffer(){0x79, 0})) { - err(ts, z042, 58, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } } @@ -499,7 +499,7 @@ Method(m30d,, Serialized) Store("A", Index(str0, 10)) if (LNotEqual(str0, str1)) { - err("m30d", z042, 59, 0, 0, str0, str1) + err("m30d", z042, __LINE__, 0, 0, str0, str1) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl index 7bea8a2..46422be 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl @@ -137,10 +137,10 @@ Name(p325, Package() Method(m320, 6) // ts, buffer, len, null, err, case { if (LNotequal(ObjectType(arg1), 3)) { - err(arg0, z043, arg3, 0, 0, arg2, "Type") + err(arg0, z043, __LINE__, 0, 0, arg2, "Type") } else { if (LNotEqual(Sizeof(arg1), Add(arg2, arg3))) { - err(arg0, z043, arg4, 0, 0, arg2, "Sizeof") + err(arg0, z043, __LINE__, 0, 0, arg2, "Sizeof") } else { m305(arg0, arg1, arg2, arg4, arg5) } @@ -179,7 +179,7 @@ Method(m321, 1, Serialized) // Verify obtained buffer with the benchmark one if (LNotEqual(Local3, Local5)) { - err(arg0, z043, 2, 0, 0, Local0, "NotEqual") + err(arg0, z043, __LINE__, 0, 0, Local0, "NotEqual") } // Check the source string was not corrupted @@ -220,7 +220,7 @@ Method(m322, 1, Serialized) ToBuffer(Local4, Local3) if (LNotEqual(Local3, Local4)) { - err(arg0, z043, 3, 0, 0, Local0, "NotEqual") + err(arg0, z043, __LINE__, 0, 0, Local0, "NotEqual") } // Check the buffers were not corrupted diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl index 01d2f4e..3d11a70 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl @@ -394,27 +394,27 @@ Method(TOI0,, Serialized) // Suppression of zeroes if (y602) { - CH03(ts, z047, 0, 0, 0) + CH03(ts, z047, 0, __LINE__, 0) Store("0x0123456789abcdefa", Local0) ToInteger(Local0, Local2) - CH04(ts, 0, 34, z047, 1, 0, 0) + CH04(ts, 0, 34, z047, __LINE__, 0, 0) - CH03(ts, z047, 2, 0, 0) + CH03(ts, z047, 2, __LINE__, 0) Store("0x000123456789abcdefa", Local0) ToInteger(Local0, Local2) - CH04(ts, 0, 34, z047, 3, 0, 0) + CH04(ts, 0, 34, z047, __LINE__, 0, 0) } else { Store("0x0123456789abcdefa", Local0) Store(0x123456789abcdefa, Local1) ToInteger(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(ts, z047, 4, 0, 0, Local0, 0) + err(ts, z047, __LINE__, 0, 0, Local0, 0) } Store("0x000123456789abcdefa", Local0) ToInteger(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(ts, z047, 5, 0, 0, Local0, 0) + err(ts, z047, __LINE__, 0, 0, Local0, 0) } } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl index 94f1efc..56ab1d1 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl @@ -92,7 +92,7 @@ Method(m305, 5) // ts, string, len, err, case While (LLess(Local0, arg2)) { Mod(Add(Local0, 1), 256, Local1) if (LNotEqual(Derefof(Index(arg1, Local0)), Local1)) { - err(arg0, z048, arg3, 0, 0, Local0, arg4) + err(arg0, z048, __LINE__, 0, 0, Local0, arg4) } Increment(Local0) } @@ -102,10 +102,10 @@ Method(m305, 5) // ts, string, len, err, case Method(m307, 5) // ts, string, len, ts, err, case { if (LNotequal(ObjectType(arg1), 2)) { - err(arg0, z048, arg3, 0, 0, arg2, "Type") + err(arg0, z048, __LINE__, 0, 0, arg2, "Type") } else { if (LNotEqual(Sizeof(arg1), arg2)) { - err(arg0, z048, arg3, 0, 0, arg2, "Sizeof") + err(arg0, z048, __LINE__, 0, 0, arg2, "Sizeof") } else { m305(arg0, arg1, arg2, arg3, arg4) } @@ -121,7 +121,7 @@ Method(m309, 3) // ts, indbuf, err Store(0, Local0) While (LLess(Local0, 8)) { if (LNotEqual(Derefof(Index(Local1, Local0)), 0xff)) { - err(arg0, z048, arg2, 0, 0, Local0, "buf8") + err(arg0, z048, __LINE__, 0, 0, Local0, "buf8") } Increment(Local0) } diff --git a/tests/aslts/src/runtime/collections/functional/module/object.asl b/tests/aslts/src/runtime/collections/functional/module/object.asl index f2feb5c..9cf963e 100644 --- a/tests/aslts/src/runtime/collections/functional/module/object.asl +++ b/tests/aslts/src/runtime/collections/functional/module/object.asl @@ -101,16 +101,16 @@ Method(MLO0,, Serialized) Store("TEST: MLO0, Type1Opcode is executable under objects", Debug) if (LNotEqual(ml10, 2)) { - err(ts, z181, 0, z181, 0, ml10, 2) + err(ts, z181, __LINE__, z181, 0, ml10, 2) } if (LNotEqual(ml11, 2)) { - err(ts, z181, 1, z181, 1, ml11, 2) + err(ts, z181, __LINE__, z181, 1, ml11, 2) } if (LNotEqual(ml12, 2)) { - err(ts, z181, 2, z181, 2, ml12, 2) + err(ts, z181, __LINE__, z181, 2, ml12, 2) } if (LNotEqual(ml13, 2)) { - err(ts, z181, 3, z181, 3, ml13, 2) + err(ts, z181, __LINE__, z181, 3, ml13, 2) } } @@ -166,15 +166,15 @@ Method(MLO1,, Serialized) Store("TEST: MLO1 Type2Opcode is executable under objects", Debug) if (LNotEqual(ml14, 2)) { - err(ts, z181, 4, z181, 4, ml14, 2) + err(ts, z181, __LINE__, z181, 4, ml14, 2) } if (LNotEqual(ml15, 2)) { - err(ts, z181, 5, z181, 5, ml15, 2) + err(ts, z181, __LINE__, z181, 5, ml15, 2) } if (LNotEqual(ml16, 2)) { - err(ts, z181, 6, z181, 6, ml16, 2) + err(ts, z181, __LINE__, z181, 6, ml16, 2) } if (LNotEqual(ml17, 2)) { - err(ts, z181, 7, z181, 7, ml17, 2) + err(ts, z181, __LINE__, z181, 7, ml17, 2) } } diff --git a/tests/aslts/src/runtime/collections/functional/module/order.asl b/tests/aslts/src/runtime/collections/functional/module/order.asl index 3e9f384..1b55471 100644 --- a/tests/aslts/src/runtime/collections/functional/module/order.asl +++ b/tests/aslts/src/runtime/collections/functional/module/order.asl @@ -58,6 +58,6 @@ Method(MLD0,, Serialized) Store("TEST: MLD0, Type2Opcode is executed right in place", Debug) if (LNotEqual(ml20, 1)) { - err(ts, z182, 6, z182, 6, ml20, 1) + err(ts, z182, __LINE__, z182, 6, ml20, 1) } } diff --git a/tests/aslts/src/runtime/collections/functional/module/scope.asl b/tests/aslts/src/runtime/collections/functional/module/scope.asl index ed3224d..bbe0beb 100644 --- a/tests/aslts/src/runtime/collections/functional/module/scope.asl +++ b/tests/aslts/src/runtime/collections/functional/module/scope.asl @@ -80,13 +80,13 @@ Method(MLS0,, Serialized) Store("TEST: MLS0, Type1Opcode is executable under scopes", Debug) if (LNotEqual(ml00, 2)) { - err(ts, z180, 0, z180, 0, ml00, 2) + err(ts, z180, __LINE__, z180, 0, ml00, 2) } if (LNotEqual(ml01, 2)) { - err(ts, z180, 1, z180, 1, ml01, 2) + err(ts, z180, __LINE__, z180, 1, ml01, 2) } if (LNotEqual(ml02, 2)) { - err(ts, z180, 2, z180, 2, ml02, 2) + err(ts, z180, __LINE__, z180, 2, ml02, 2) } } @@ -122,12 +122,12 @@ Method(MLS1,, Serialized) Store("TEST: MLS1, Type2Opcode is executable under scopes", Debug) if (LNotEqual(ml03, 2)) { - err(ts, z180, 3, z180, 3, ml03, 2) + err(ts, z180, __LINE__, z180, 3, ml03, 2) } if (LNotEqual(ml04, 2)) { - err(ts, z180, 4, z180, 4, ml04, 2) + err(ts, z180, __LINE__, z180, 4, ml04, 2) } if (LNotEqual(ml05, 2)) { - err(ts, z180, 5, z180, 5, ml05, 2) + err(ts, z180, __LINE__, z180, 5, ml05, 2) } } diff --git a/tests/aslts/src/runtime/collections/functional/name/function.asl b/tests/aslts/src/runtime/collections/functional/name/function.asl index e1f05a1..2cb1479 100644 --- a/tests/aslts/src/runtime/collections/functional/name/function.asl +++ b/tests/aslts/src/runtime/collections/functional/name/function.asl @@ -558,5 +558,5 @@ Method(NM02) m20e() - CH03("NM02", z134, 116, 0, 0) + CH03("NM02", z134, 116, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/functional/name/method.asl b/tests/aslts/src/runtime/collections/functional/name/method.asl index af41602..bcf897e 100644 --- a/tests/aslts/src/runtime/collections/functional/name/method.asl +++ b/tests/aslts/src/runtime/collections/functional/name/method.asl @@ -151,7 +151,7 @@ Method(m205, 4) Store(ObjectType(arg2), Local0) Store(ObjectType(arg3), Local1) if (LNotEqual(Local0, Local1)) { - err(Concatenate(arg0, "-OType"), z133, arg1, 0, 0, Local0, Local1) + err(Concatenate(arg0, "-OType"), z133, __LINE__, 0, 0, Local0, Local1) Return (1) } elseif (Derefof(Index(bz00, Local0))) { if (LNot(y119)) { @@ -163,7 +163,7 @@ Method(m205, 4) } } if (LNotEqual(arg2, arg3)) { - err(arg0, z133, arg1, 0, 0, arg2, arg3) + err(arg0, z133, __LINE__, 0, 0, arg2, arg3) Return (1) } } elseif (LEqual(Local0, 8)) { @@ -195,7 +195,7 @@ Method(m20a, 4) { Store(Sizeof(arg3), Local0) if (LNotEqual(Sizeof(arg2), Local0)) { - err(Concatenate(arg0, "-Size"), z133, arg1, 0, 0, Sizeof(arg2), Local0) + err(Concatenate(arg0, "-Size"), z133, __LINE__, 0, 0, Sizeof(arg2), Local0) Return (1) } While (Local0) { @@ -204,7 +204,7 @@ Method(m20a, 4) Store(ObjectType(Derefof(Index(arg3, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(Concatenate(arg0, "-OType"), z133, arg1, 0, 0, Local1, Local2) + err(Concatenate(arg0, "-OType"), z133, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(bz00, Local1))) { // the computational data type @@ -212,7 +212,7 @@ Method(m20a, 4) Derefof(Index(arg2, Local0)), Derefof(Index(arg3, Local0)))) { // The value is corrupted - err(arg0, z133, arg1, 0, 0, Derefof(Index(arg2, Local0)), Derefof(Index(arg3, Local0))) + err(arg0, z133, __LINE__, 0, 0, Derefof(Index(arg2, Local0)), Derefof(Index(arg3, Local0))) Return (1) } } @@ -1086,5 +1086,5 @@ Method(NM01) m207() - CH03("NM01", z133, 209, 0, 0) + CH03("NM01", z133, 209, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/functional/name/package.asl b/tests/aslts/src/runtime/collections/functional/name/package.asl index 952ecb1..f17072e 100644 --- a/tests/aslts/src/runtime/collections/functional/name/package.asl +++ b/tests/aslts/src/runtime/collections/functional/name/package.asl @@ -144,29 +144,29 @@ Method(m1f0,, Serialized) if (LLessEqual(Local1, 95)) { if (LNotEqual(Local2, Local3)) { - err(ts, z051, 0, 0, 0, Local2, Local3) + err(ts, z051, __LINE__, 0, 0, Local2, Local3) } } elseif (LLessEqual(Local1, 159)) { Add(0x8765ac00, Local4, Local3) if (LNotEqual(Local2, Local3)) { - err(ts, z051, 1, 0, 0, Local2, Local3) + err(ts, z051, __LINE__, 0, 0, Local2, Local3) } Add(Local4, Local6, Local4) } elseif (LLessEqual(Local1, 195)) { Add(0x8765acba11223300, Local5, Local3) if (LNotEqual(Local2, Local3)) { - err(ts, z051, 2, 0, 0, Local2, Local3) + err(ts, z051, __LINE__, 0, 0, Local2, Local3) } Add(Local5, Local6, Local5) } else { if (LNotEqual(Local2, Local3)) { - err(ts, z051, 3, 0, 0, Local2, Local3) + err(ts, z051, __LINE__, 0, 0, Local2, Local3) } } Store(ObjectType(Local2), Local3) if (LNotEqual(Local3, 1)) { - err(ts, z051, 4, 0, 0, Local3, 1) + err(ts, z051, __LINE__, 0, 0, Local3, 1) } Add(Local1, Local6, Local1) @@ -175,7 +175,7 @@ Method(m1f0,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 255)) { - err(ts, z051, 5, 0, 0, Local0, 255) + err(ts, z051, __LINE__, 0, 0, Local0, 255) } } @@ -206,12 +206,12 @@ Method(m1f1,, Serialized) } if (LNotEqual(Local4, Local3)) { - err(ts, z051, 6, 0, 0, Local4, Local3) + err(ts, z051, __LINE__, 0, 0, Local4, Local3) } Store(ObjectType(Local2), Local3) if (LNotEqual(Local3, 2)) { - err(ts, z051, 7, 0, 0, Local3, 2) + err(ts, z051, __LINE__, 0, 0, Local3, 2) } Increment(Local1) @@ -220,7 +220,7 @@ Method(m1f1,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 10)) { - err(ts, z051, 8, 0, 0, Local0, 10) + err(ts, z051, __LINE__, 0, 0, Local0, 10) } } @@ -331,12 +331,12 @@ Method(m1f2,, Serialized) Add(Local1, 1, Local4) if (LNotEqual(Local4, Local3)) { - err(ts, z051, 9, 0, 0, Local4, Local3) + err(ts, z051, __LINE__, 0, 0, Local4, Local3) } Store(ObjectType(Local2), Local3) if (LNotEqual(Local3, 3)) { - err(ts, z051, 10, 0, 0, Local3, 3) + err(ts, z051, __LINE__, 0, 0, Local3, 3) } Add(Local1, Local6, Local1) @@ -345,7 +345,7 @@ Method(m1f2,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 255)) { - err(ts, z051, 11, 0, 0, Local0, 255) + err(ts, z051, __LINE__, 0, 0, Local0, 255) } } @@ -460,12 +460,12 @@ Method(m1f3,, Serialized) Add(Local1, 1, Local4) if (LNotEqual(Local4, Local3)) { - err(ts, z051, 12, 0, 0, Local4, Local3) + err(ts, z051, __LINE__, 0, 0, Local4, Local3) } Store(ObjectType(Local2), Local3) if (LNotEqual(Local3, 4)) { - err(ts, z051, 13, 0, 0, Local3, 4) + err(ts, z051, __LINE__, 0, 0, Local3, 4) } Add(Local1, Local6, Local1) @@ -474,7 +474,7 @@ Method(m1f3,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 255)) { - err(ts, z051, 14, 0, 0, Local0, 255) + err(ts, z051, __LINE__, 0, 0, Local0, 255) } } @@ -548,7 +548,7 @@ Method(m1f5, 3, Serialized) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, n002)) { - err(arg0, z051, 15, 0, 0, Local0, n002) + err(arg0, z051, __LINE__, 0, 0, Local0, n002) } // Contents @@ -566,10 +566,10 @@ Method(m1f5, 3, Serialized) } if (LNotEqual(Local1, n004)) { - err(arg0, z051, 16, 0, 0, Local1, n004) + err(arg0, z051, __LINE__, 0, 0, Local1, n004) Store(1, Local6) } elseif (LNotEqual(Local7, Local0)) { - err(arg0, z051, 17, 0, 0, Local7, Local0) + err(arg0, z051, __LINE__, 0, 0, Local7, Local0) Store(1, Local6) } if (Local6) { @@ -991,12 +991,12 @@ Method(m1f6,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 255)) { - err(ts, z051, 18, 0, 0, Local0, 255) + err(ts, z051, __LINE__, 0, 0, Local0, 255) } Store(SizeOf(p001), Local0) if (LNotEqual(Local0, 29)) { - err(ts, z051, 19, 0, 0, Local0, 29) + err(ts, z051, __LINE__, 0, 0, Local0, 29) } } @@ -1057,7 +1057,7 @@ Method(m1f8, 3, Serialized) Store(Local1, Debug) } if (LNotEqual(Local1, Local0)) { - err(ts, z051, 20, 0, 0, Local1, Local0) + err(ts, z051, __LINE__, 0, 0, Local1, Local0) } Increment(Local0) Decrement(n000) @@ -1066,12 +1066,12 @@ Method(m1f8, 3, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, 4)) { - err(ts, z051, 21, 0, 0, Local0, 4) + err(ts, z051, __LINE__, 0, 0, Local0, 4) } Store(SizeOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z051, 22, 0, 0, Local0, arg1) + err(ts, z051, __LINE__, 0, 0, Local0, arg1) } } @@ -1133,7 +1133,7 @@ Method(m1fb, 3, Serialized) Store(Local1, Debug) } if (LNotEqual(Local1, Local0)) { - err(ts, z051, 23, 0, 0, Local1, Local0) + err(ts, z051, __LINE__, 0, 0, Local1, Local0) } Decrement(n000) Increment(ncur) @@ -1141,12 +1141,12 @@ Method(m1fb, 3, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, 4)) { - err(ts, z051, 24, 0, 0, Local0, 4) + err(ts, z051, __LINE__, 0, 0, Local0, 4) } Store(SizeOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z051, 25, 0, 0, Local0, arg1) + err(ts, z051, __LINE__, 0, 0, Local0, arg1) } } @@ -1211,7 +1211,7 @@ Method(m1fe, 3, Serialized) Store(Local1, Debug) } if (LNotEqual(Local1, Local0)) { - err(ts, z051, 26, 0, 0, 0, 0) + err(ts, z051, __LINE__, 0, 0, 0, 0) Store(Local0, Debug) Store(Local1, Debug) return (Ones) @@ -1222,12 +1222,12 @@ Method(m1fe, 3, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, 4)) { - err(ts, z051, 27, 0, 0, Local0, 4) + err(ts, z051, __LINE__, 0, 0, Local0, 4) } Store(SizeOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z051, 28, 0, 0, Local0, arg1) + err(ts, z051, __LINE__, 0, 0, Local0, arg1) } return (Zero) @@ -1302,7 +1302,7 @@ Method(m201, 3, Serialized) Store(DeRefOf(Index(arg0, ncur)), Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, 4)) { - err(ts, z051, 29, 0, 0, Local0, 4) + err(ts, z051, __LINE__, 0, 0, Local0, 4) return (Ones) } Decrement(n000) @@ -1311,12 +1311,12 @@ Method(m201, 3, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, 4)) { - err(ts, z051, 30, 0, 0, Local0, 4) + err(ts, z051, __LINE__, 0, 0, Local0, 4) } Store(SizeOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z051, 31, 0, 0, Local0, arg1) + err(ts, z051, __LINE__, 0, 0, Local0, arg1) } return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref00.asl b/tests/aslts/src/runtime/collections/functional/reference/ref00.asl index 3fed877..9c15863 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref00.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref00.asl @@ -60,7 +60,7 @@ Method(m1a0, 4) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(c080, z076, 0, 0, 0, Local0, arg1) + err(c080, z076, __LINE__, 0, 0, Local0, arg1) } else { if (c089) { @@ -129,18 +129,18 @@ Method(m1a0, 4) Store(RefOf(arg0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 1, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(1, Local7) } } elseif (LEqual(c08b, 2)) { Store(CondRefOf(arg0, Local0), Local1) if (LNotEqual(Local1, Ones)) { - err(c080, z076, 2, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 3, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(1, Local7) } @@ -155,14 +155,14 @@ Method(m1a0, 4) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 4, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { // Check DerefOf Store(ObjectType(DerefOf(Local0)), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 5, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } // Check that writing into M2-ArgX-RefOf_Reference @@ -171,9 +171,9 @@ Method(m1a0, 4) m002(Local0) Store(ObjectType(arg0), Local1) if (LNotEqual(Local1, c009)) { - err(c080, z076, 6, 0, 0, Local1, c009) + err(c080, z076, __LINE__, 0, 0, Local1, c009) } elseif (LNotEqual(arg0, 0xabcd001a)) { - err(c080, z076, 7, 0, 0, arg0, 0xabcd001a) + err(c080, z076, __LINE__, 0, 0, arg0, 0xabcd001a) } else { // Check that M1-LocalX-RefOf_Reference remains @@ -183,11 +183,11 @@ Method(m1a0, 4) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(c080, z076, 8, 0, 0, Local1, c009) + err(c080, z076, __LINE__, 0, 0, Local1, c009) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, ISZ0)) { - err(c080, z076, 9, 0, 0, Local1, ISZ0) + err(c080, z076, __LINE__, 0, 0, Local1, ISZ0) } } } @@ -220,7 +220,7 @@ Method(m1a2, 7, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(c080, z076, 10, 0, 0, Local0, arg1) + err(c080, z076, __LINE__, 0, 0, Local0, arg1) } else { if (c089) { @@ -307,10 +307,10 @@ Method(m1a2, 7, Serialized) Store(ObjectType(Local2), Local0) if (LNotEqual(Local0, arg4)) { - err(c080, z076, 11, 0, 0, Local0, arg4) + err(c080, z076, __LINE__, 0, 0, Local0, arg4) } else { if (LNotEqual(Local2, arg5)) { - err(c080, z076, 12, 0, 0, Local2, arg5) + err(c080, z076, __LINE__, 0, 0, Local2, arg5) } } } /* if(c084) */ @@ -346,18 +346,18 @@ Method(m1a2, 7, Serialized) Store(RefOf(arg0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 13, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(1, Local7) } } elseif (LEqual(c08b, 2)) { Store(CondRefOf(arg0, Local0), Local1) if (LNotEqual(Local1, Ones)) { - err(c080, z076, 14, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 15, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(1, Local7) } @@ -372,14 +372,14 @@ Method(m1a2, 7, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 16, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { // Check DerefOf Store(ObjectType(DerefOf(Local0)), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 17, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } // Check that writing into M2-ArgX-RefOf_Reference @@ -388,9 +388,9 @@ Method(m1a2, 7, Serialized) m002(Local0) Store(ObjectType(arg0), Local1) if (LNotEqual(Local1, c009)) { - err(c080, z076, 18, 0, 0, Local1, c009) + err(c080, z076, __LINE__, 0, 0, Local1, c009) } elseif (LNotEqual(arg0, 0xabcd001a)) { - err(c080, z076, 19, 0, 0, arg0, 0xabcd001a) + err(c080, z076, __LINE__, 0, 0, arg0, 0xabcd001a) } else { // Check that M1-LocalX-RefOf_Reference remains @@ -400,11 +400,11 @@ Method(m1a2, 7, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(c080, z076, 20, 0, 0, Local1, c009) + err(c080, z076, __LINE__, 0, 0, Local1, c009) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, ISZ0)) { - err(c080, z076, 21, 0, 0, Local1, ISZ0) + err(c080, z076, __LINE__, 0, 0, Local1, ISZ0) } } } @@ -430,10 +430,10 @@ Method(m1a4, 2) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z076, 22, 0, 0, Local0, c009) + err(c080, z076, __LINE__, 0, 0, Local0, c009) Store(0, Local7) } elseif (LNotEqual(arg0, Ones)) { - err(c080, z076, 23, 0, 0, arg0, Ones) + err(c080, z076, __LINE__, 0, 0, arg0, Ones) Store(0, Local7) } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref01.asl b/tests/aslts/src/runtime/collections/functional/reference/ref01.asl index 44192d6..7abe6fa 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref01.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref01.asl @@ -362,80 +362,80 @@ Method(m169,, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x100, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a1000)) { - err(c080, z077, 0x101, 0, 0, i900, 0xfe7cb391d65a1000) + err(c080, z077, __LINE__, 0, 0, i900, 0xfe7cb391d65a1000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x102, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0xc1791001)) { - err(c080, z077, 0x103, 0, 0, i901, 0xc1791001) + err(c080, z077, __LINE__, 0, 0, i901, 0xc1791001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x104, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(c080, z077, 0x105, 0, 0, i902, 0) + err(c080, z077, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x106, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(c080, z077, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(c080, z077, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x108, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(c080, z077, 0x109, 0, 0, i904, 0xffffffff) + err(c080, z077, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10a, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12341002")) { - err(c080, z077, 0x10b, 0, 0, s900, "12341002") + err(c080, z077, __LINE__, 0, 0, s900, "12341002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10c, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu1003")) { - err(c080, z077, 0x10d, 0, 0, s901, "qwrtyu1003") + err(c080, z077, __LINE__, 0, 0, s901, "qwrtyu1003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(c080, z077, 0x10e, 0, 0, Local0, c00b) + err(c080, z077, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0x10,0x11,0x12,0x13,0x14})) { - err(c080, z077, 0x10f, 0, 0, b900, Buffer() {0x10,0x11,0x12,0x13,0x14}) + err(c080, z077, __LINE__, 0, 0, b900, Buffer() {0x10,0x11,0x12,0x13,0x14}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(c080, z077, 0x110, 0, 0, Local0, c016) + err(c080, z077, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0x10)) { - err(c080, z077, 0x111, 0, 0, bf90, 0x10) + err(c080, z077, __LINE__, 0, 0, bf90, 0x10) } // One level Package @@ -443,87 +443,87 @@ Method(m169,, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(c080, z077, 0x112, 0, 0, Local1, c008) + err(c080, z077, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x113, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd1004)) { - err(c080, z077, 0x114, 0, 0, Local1, 0xabcd1004) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd1004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x115, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455661005)) { - err(c080, z077, 0x116, 0, 0, Local1, 0x1122334455661005) + err(c080, z077, __LINE__, 0, 0, Local1, 0x1122334455661005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x117, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12341006")) { - err(c080, z077, 0x118, 0, 0, Local1, "12341006") + err(c080, z077, __LINE__, 0, 0, Local1, "12341006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x119, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i81007")) { - err(c080, z077, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i81007") + err(c080, z077, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i81007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11b, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop1008")) { - err(c080, z077, 0x11c, 0, 0, Local1, "qwrtyuiop1008") + err(c080, z077, __LINE__, 0, 0, Local1, "qwrtyuiop1008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11d, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0251009")) { - err(c080, z077, 0x11e, 0, 0, Local1, "1234567890abdef0251009") + err(c080, z077, __LINE__, 0, 0, Local1, "1234567890abdef0251009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x11f, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xa0,0xa1,0xa2})) { - err(c080, z077, 0x120, 0, 0, Local1, Buffer() {0xa0,0xa1,0xa2}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xa0,0xa1,0xa2}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x121, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xa3,0xa4})) { - err(c080, z077, 0x122, 0, 0, Local1, Buffer() {0xa3,0xa4}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xa3,0xa4}) } // Two level Package @@ -534,10 +534,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(c080, z077, 0x123, 0, 0, Local4, c009) + err(c080, z077, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc100a)) { - err(c080, z077, 0x124, 0, 0, Local3, 0xabc100a) + err(c080, z077, __LINE__, 0, 0, Local3, 0xabc100a) } Store(Index(p905, 0), Local0) @@ -546,10 +546,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x125, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc100b")) { - err(c080, z077, 0x126, 0, 0, Local3, "0xabc100b") + err(c080, z077, __LINE__, 0, 0, Local3, "0xabc100b") } Store(Index(p905, 0), Local0) @@ -558,10 +558,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x127, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc100c")) { - err(c080, z077, 0x128, 0, 0, Local3, "abc100c") + err(c080, z077, __LINE__, 0, 0, Local3, "abc100c") } Store(Index(p906, 0), Local0) @@ -570,10 +570,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x129, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc100d")) { - err(c080, z077, 0x12a, 0, 0, Local3, "abc100d") + err(c080, z077, __LINE__, 0, 0, Local3, "abc100d") } Store(Index(p907, 0), Local0) @@ -582,10 +582,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x12b, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm100e")) { - err(c080, z077, 0x12c, 0, 0, Local3, "aqwevbgnm100e") + err(c080, z077, __LINE__, 0, 0, Local3, "aqwevbgnm100e") } Store(Index(p908, 0), Local0) @@ -594,10 +594,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(c080, z077, 0x12d, 0, 0, Local4, c00b) + err(c080, z077, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xa5,0xa6,0xa7,0xa8,0xa9})) { - err(c080, z077, 0x12e, 0, 0, Local3, Buffer() {0xa5,0xa6,0xa7,0xa8,0xa9}) + err(c080, z077, __LINE__, 0, 0, Local3, Buffer() {0xa5,0xa6,0xa7,0xa8,0xa9}) } // Three level Package @@ -610,10 +610,10 @@ Method(m169,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(c080, z077, 0x12f, 0, 0, Local6, c009) + err(c080, z077, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc100f)) { - err(c080, z077, 0x130, 0, 0, Local5, 0xabc100f) + err(c080, z077, __LINE__, 0, 0, Local5, 0xabc100f) } Store(Index(p90a, 0), Local0) @@ -624,10 +624,10 @@ Method(m169,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x131, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12341010")) { - err(c080, z077, 0x132, 0, 0, Local5, "12341010") + err(c080, z077, __LINE__, 0, 0, Local5, "12341010") } Store(Index(p90b, 0), Local0) @@ -638,10 +638,10 @@ Method(m169,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x133, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas1011")) { - err(c080, z077, 0x134, 0, 0, Local5, "zxswefas1011") + err(c080, z077, __LINE__, 0, 0, Local5, "zxswefas1011") } Store(Index(p90c, 0), Local0) @@ -652,30 +652,30 @@ Method(m169,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(c080, z077, 0x135, 0, 0, Local6, c00b) + err(c080, z077, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xaa,0xab,0xac})) { - err(c080, z077, 0x136, 0, 0, Local5, Buffer() {0xaa,0xab,0xac}) + err(c080, z077, __LINE__, 0, 0, Local5, Buffer() {0xaa,0xab,0xac}) } Store(Index(p953, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x137, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd1018)) { - err(c080, z077, 0x138, 0, 0, Local1, 0xabcd1018) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd1018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x139, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd1019)) { - err(c080, z077, 0x13a, 0, 0, Local1, 0xabcd1019) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd1019) } // Not Computational Data @@ -694,13 +694,13 @@ Method(m169,, Serialized) * // Field Unit (Field) * * if (LNotEqual(f900, 0xd7)) { - * err(c080, z077, 0x137, 0, 0, f900, 0xd7) + * err(c080, z077, __LINE__, 0, 0, f900, 0xd7) * } * * // Field Unit (IndexField) * * if (LNotEqual(if90, 0xd7)) { - * err(c080, z077, 0x138, 0, 0, if90, 0xd7) + * err(c080, z077, __LINE__, 0, 0, if90, 0xd7) * } */ } /* m000 */ @@ -1609,80 +1609,80 @@ Method(m16a, 1, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x100, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a2000)) { - err(c080, z077, 0x101, 0, 0, i900, 0xfe7cb391d65a2000) + err(c080, z077, __LINE__, 0, 0, i900, 0xfe7cb391d65a2000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x102, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0xc1792001)) { - err(c080, z077, 0x103, 0, 0, i901, 0xc1792001) + err(c080, z077, __LINE__, 0, 0, i901, 0xc1792001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x104, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(c080, z077, 0x105, 0, 0, i902, 0) + err(c080, z077, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x106, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(c080, z077, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(c080, z077, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x108, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(c080, z077, 0x109, 0, 0, i904, 0xffffffff) + err(c080, z077, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10a, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12342002")) { - err(c080, z077, 0x10b, 0, 0, s900, "12342002") + err(c080, z077, __LINE__, 0, 0, s900, "12342002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10c, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu2003")) { - err(c080, z077, 0x10d, 0, 0, s901, "qwrtyu2003") + err(c080, z077, __LINE__, 0, 0, s901, "qwrtyu2003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(c080, z077, 0x10e, 0, 0, Local0, c00b) + err(c080, z077, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0xc0,0xc1,0xc2,0xc3,0xc4})) { - err(c080, z077, 0x10f, 0, 0, b900, Buffer() {0xc0,0xc1,0xc2,0xc3,0xc4}) + err(c080, z077, __LINE__, 0, 0, b900, Buffer() {0xc0,0xc1,0xc2,0xc3,0xc4}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(c080, z077, 0x110, 0, 0, Local0, c016) + err(c080, z077, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0xc0)) { - err(c080, z077, 0x111, 0, 0, bf90, 0xc0) + err(c080, z077, __LINE__, 0, 0, bf90, 0xc0) } // One level Package @@ -1690,87 +1690,87 @@ Method(m16a, 1, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(c080, z077, 0x112, 0, 0, Local1, c008) + err(c080, z077, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x113, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd2004)) { - err(c080, z077, 0x114, 0, 0, Local1, 0xabcd2004) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd2004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x115, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455662005)) { - err(c080, z077, 0x116, 0, 0, Local1, 0x1122334455662005) + err(c080, z077, __LINE__, 0, 0, Local1, 0x1122334455662005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x117, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12342006")) { - err(c080, z077, 0x118, 0, 0, Local1, "12342006") + err(c080, z077, __LINE__, 0, 0, Local1, "12342006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x119, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i82007")) { - err(c080, z077, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i82007") + err(c080, z077, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i82007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11b, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop2008")) { - err(c080, z077, 0x11c, 0, 0, Local1, "qwrtyuiop2008") + err(c080, z077, __LINE__, 0, 0, Local1, "qwrtyuiop2008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11d, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0252009")) { - err(c080, z077, 0x11e, 0, 0, Local1, "1234567890abdef0252009") + err(c080, z077, __LINE__, 0, 0, Local1, "1234567890abdef0252009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x11f, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xc5,0xc6,0xc7})) { - err(c080, z077, 0x120, 0, 0, Local1, Buffer() {0xc5,0xc6,0xc7}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xc5,0xc6,0xc7}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x121, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xc8,0xc9})) { - err(c080, z077, 0x122, 0, 0, Local1, Buffer() {0xc8,0xc9}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xc8,0xc9}) } // Two level Package @@ -1781,10 +1781,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(c080, z077, 0x123, 0, 0, Local4, c009) + err(c080, z077, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc200a)) { - err(c080, z077, 0x124, 0, 0, Local3, 0xabc200a) + err(c080, z077, __LINE__, 0, 0, Local3, 0xabc200a) } Store(Index(p905, 0), Local0) @@ -1793,10 +1793,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x125, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc200b")) { - err(c080, z077, 0x126, 0, 0, Local3, "0xabc200b") + err(c080, z077, __LINE__, 0, 0, Local3, "0xabc200b") } Store(Index(p905, 0), Local0) @@ -1805,10 +1805,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x127, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc200c")) { - err(c080, z077, 0x128, 0, 0, Local3, "abc200c") + err(c080, z077, __LINE__, 0, 0, Local3, "abc200c") } Store(Index(p906, 0), Local0) @@ -1817,10 +1817,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x129, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc200d")) { - err(c080, z077, 0x12a, 0, 0, Local3, "abc200d") + err(c080, z077, __LINE__, 0, 0, Local3, "abc200d") } Store(Index(p907, 0), Local0) @@ -1829,10 +1829,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x12b, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm200e")) { - err(c080, z077, 0x12c, 0, 0, Local3, "aqwevbgnm200e") + err(c080, z077, __LINE__, 0, 0, Local3, "aqwevbgnm200e") } Store(Index(p908, 0), Local0) @@ -1841,10 +1841,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(c080, z077, 0x12d, 0, 0, Local4, c00b) + err(c080, z077, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xca,0xcb,0xcc,0xcd,0xce})) { - err(c080, z077, 0x12e, 0, 0, Local3, Buffer() {0xca,0xcb,0xcc,0xcd,0xce}) + err(c080, z077, __LINE__, 0, 0, Local3, Buffer() {0xca,0xcb,0xcc,0xcd,0xce}) } // Three level Package @@ -1857,10 +1857,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(c080, z077, 0x12f, 0, 0, Local6, c009) + err(c080, z077, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc200f)) { - err(c080, z077, 0x130, 0, 0, Local5, 0xabc200f) + err(c080, z077, __LINE__, 0, 0, Local5, 0xabc200f) } Store(Index(p90a, 0), Local0) @@ -1871,10 +1871,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x131, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12342010")) { - err(c080, z077, 0x132, 0, 0, Local5, "12342010") + err(c080, z077, __LINE__, 0, 0, Local5, "12342010") } Store(Index(p90b, 0), Local0) @@ -1885,10 +1885,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x133, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas2011")) { - err(c080, z077, 0x134, 0, 0, Local5, "zxswefas2011") + err(c080, z077, __LINE__, 0, 0, Local5, "zxswefas2011") } Store(Index(p90c, 0), Local0) @@ -1899,30 +1899,30 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(c080, z077, 0x135, 0, 0, Local6, c00b) + err(c080, z077, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xcf,0xd0,0xd1})) { - err(c080, z077, 0x136, 0, 0, Local5, Buffer() {0xcf,0xd0,0xd1}) + err(c080, z077, __LINE__, 0, 0, Local5, Buffer() {0xcf,0xd0,0xd1}) } Store(Index(p953, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x137, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd2018)) { - err(c080, z077, 0x138, 0, 0, Local1, 0xabcd2018) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd2018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x139, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd2019)) { - err(c080, z077, 0x13a, 0, 0, Local1, 0xabcd2019) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd2019) } // Not Computational Data @@ -1941,13 +1941,13 @@ Method(m16a, 1, Serialized) * // Field Unit (Field) * * if (LNotEqual(f900, 0xd7)) { - * err(c080, z077, 0x137, 0, 0, f900, 0xd7) + * err(c080, z077, __LINE__, 0, 0, f900, 0xd7) * } * * // Field Unit (IndexField) * * if (LNotEqual(if90, 0xd7)) { - * err(c080, z077, 0x138, 0, 0, if90, 0xd7) + * err(c080, z077, __LINE__, 0, 0, if90, 0xd7) * } */ } /* m000 */ @@ -2728,80 +2728,80 @@ Method(m16b,, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x100, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a3000)) { - err(c080, z077, 0x101, 0, 0, i900, 0xfe7cb391d65a3000) + err(c080, z077, __LINE__, 0, 0, i900, 0xfe7cb391d65a3000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x102, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0x21793001)) { - err(c080, z077, 0x103, 0, 0, i901, 0x21793001) + err(c080, z077, __LINE__, 0, 0, i901, 0x21793001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x104, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(c080, z077, 0x105, 0, 0, i902, 0) + err(c080, z077, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x106, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(c080, z077, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(c080, z077, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x108, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(c080, z077, 0x109, 0, 0, i904, 0xffffffff) + err(c080, z077, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10a, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12343002")) { - err(c080, z077, 0x10b, 0, 0, s900, "12343002") + err(c080, z077, __LINE__, 0, 0, s900, "12343002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10c, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu3003")) { - err(c080, z077, 0x10d, 0, 0, s901, "qwrtyu3003") + err(c080, z077, __LINE__, 0, 0, s901, "qwrtyu3003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(c080, z077, 0x10e, 0, 0, Local0, c00b) + err(c080, z077, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0xd0,0xd1,0xd2,0xd3,0xd4})) { - err(c080, z077, 0x10f, 0, 0, b900, Buffer() {0xd0,0xd1,0xd2,0xd3,0xd4}) + err(c080, z077, __LINE__, 0, 0, b900, Buffer() {0xd0,0xd1,0xd2,0xd3,0xd4}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(c080, z077, 0x110, 0, 0, Local0, c016) + err(c080, z077, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0xd0)) { - err(c080, z077, 0x111, 0, 0, bf90, 0xd0) + err(c080, z077, __LINE__, 0, 0, bf90, 0xd0) } // One level Package @@ -2809,87 +2809,87 @@ Method(m16b,, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(c080, z077, 0x112, 0, 0, Local1, c008) + err(c080, z077, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x113, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd3004)) { - err(c080, z077, 0x114, 0, 0, Local1, 0xabcd3004) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd3004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x115, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455663005)) { - err(c080, z077, 0x116, 0, 0, Local1, 0x1122334455663005) + err(c080, z077, __LINE__, 0, 0, Local1, 0x1122334455663005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x117, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12343006")) { - err(c080, z077, 0x118, 0, 0, Local1, "12343006") + err(c080, z077, __LINE__, 0, 0, Local1, "12343006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x119, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i83007")) { - err(c080, z077, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i83007") + err(c080, z077, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i83007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11b, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop3008")) { - err(c080, z077, 0x11c, 0, 0, Local1, "qwrtyuiop3008") + err(c080, z077, __LINE__, 0, 0, Local1, "qwrtyuiop3008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11d, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0253009")) { - err(c080, z077, 0x11e, 0, 0, Local1, "1234567890abdef0253009") + err(c080, z077, __LINE__, 0, 0, Local1, "1234567890abdef0253009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x11f, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xd5,0xd6,0xd7})) { - err(c080, z077, 0x120, 0, 0, Local1, Buffer() {0xd5,0xd6,0xd7}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xd5,0xd6,0xd7}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x121, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xd8,0xd9})) { - err(c080, z077, 0x122, 0, 0, Local1, Buffer() {0xd8,0xd9}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xd8,0xd9}) } // Two level Package @@ -2900,10 +2900,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(c080, z077, 0x123, 0, 0, Local4, c009) + err(c080, z077, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc300a)) { - err(c080, z077, 0x124, 0, 0, Local3, 0xabc300a) + err(c080, z077, __LINE__, 0, 0, Local3, 0xabc300a) } Store(Index(p905, 0), Local0) @@ -2912,10 +2912,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x125, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc300b")) { - err(c080, z077, 0x126, 0, 0, Local3, "0xabc300b") + err(c080, z077, __LINE__, 0, 0, Local3, "0xabc300b") } Store(Index(p905, 0), Local0) @@ -2924,10 +2924,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x127, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc300c")) { - err(c080, z077, 0x128, 0, 0, Local3, "abc300c") + err(c080, z077, __LINE__, 0, 0, Local3, "abc300c") } Store(Index(p906, 0), Local0) @@ -2936,10 +2936,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x129, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc300d")) { - err(c080, z077, 0x12a, 0, 0, Local3, "abc300d") + err(c080, z077, __LINE__, 0, 0, Local3, "abc300d") } Store(Index(p907, 0), Local0) @@ -2948,10 +2948,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x12b, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm300e")) { - err(c080, z077, 0x12c, 0, 0, Local3, "aqwevbgnm300e") + err(c080, z077, __LINE__, 0, 0, Local3, "aqwevbgnm300e") } Store(Index(p908, 0), Local0) @@ -2960,10 +2960,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(c080, z077, 0x12d, 0, 0, Local4, c00b) + err(c080, z077, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xda,0xdb,0xdc,0xdd,0xde})) { - err(c080, z077, 0x12e, 0, 0, Local3, Buffer() {0xda,0xdb,0xdc,0xdd,0xde}) + err(c080, z077, __LINE__, 0, 0, Local3, Buffer() {0xda,0xdb,0xdc,0xdd,0xde}) } // Three level Package @@ -2976,10 +2976,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(c080, z077, 0x12f, 0, 0, Local6, c009) + err(c080, z077, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc300f)) { - err(c080, z077, 0x130, 0, 0, Local5, 0xabc300f) + err(c080, z077, __LINE__, 0, 0, Local5, 0xabc300f) } Store(Index(p90a, 0), Local0) @@ -2990,10 +2990,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x131, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12343010")) { - err(c080, z077, 0x132, 0, 0, Local5, "12343010") + err(c080, z077, __LINE__, 0, 0, Local5, "12343010") } Store(Index(p90b, 0), Local0) @@ -3004,10 +3004,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x133, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas3011")) { - err(c080, z077, 0x134, 0, 0, Local5, "zxswefas3011") + err(c080, z077, __LINE__, 0, 0, Local5, "zxswefas3011") } Store(Index(p90c, 0), Local0) @@ -3018,30 +3018,30 @@ Method(m16b,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(c080, z077, 0x135, 0, 0, Local6, c00b) + err(c080, z077, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xdf,0x20,0x21})) { - err(c080, z077, 0x136, 0, 0, Local5, Buffer() {0xdf,0x20,0x21}) + err(c080, z077, __LINE__, 0, 0, Local5, Buffer() {0xdf,0x20,0x21}) } Store(Index(p953, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x137, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd3018)) { - err(c080, z077, 0x138, 0, 0, Local1, 0xabcd3018) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd3018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x139, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd3019)) { - err(c080, z077, 0x13a, 0, 0, Local1, 0xabcd3019) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd3019) } // Not Computational Data @@ -3060,13 +3060,13 @@ Method(m16b,, Serialized) * // Field Unit (Field) * * if (LNotEqual(f900, 0xd7)) { - * err(c080, z077, 0x137, 0, 0, f900, 0xd7) + * err(c080, z077, __LINE__, 0, 0, f900, 0xd7) * } * * // Field Unit (IndexField) * * if (LNotEqual(if90, 0xd7)) { - * err(c080, z077, 0x138, 0, 0, if90, 0xd7) + * err(c080, z077, __LINE__, 0, 0, if90, 0xd7) * } */ } /* m000 */ @@ -3768,80 +3768,80 @@ Method(m16c, 1, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x100, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a4000)) { - err(c080, z077, 0x101, 0, 0, i900, 0xfe7cb391d65a4000) + err(c080, z077, __LINE__, 0, 0, i900, 0xfe7cb391d65a4000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x102, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0xc1794001)) { - err(c080, z077, 0x103, 0, 0, i901, 0xc1794001) + err(c080, z077, __LINE__, 0, 0, i901, 0xc1794001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x104, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(c080, z077, 0x105, 0, 0, i902, 0) + err(c080, z077, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x106, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(c080, z077, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(c080, z077, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x108, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(c080, z077, 0x109, 0, 0, i904, 0xffffffff) + err(c080, z077, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10a, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12344002")) { - err(c080, z077, 0x10b, 0, 0, s900, "12344002") + err(c080, z077, __LINE__, 0, 0, s900, "12344002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10c, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu4003")) { - err(c080, z077, 0x10d, 0, 0, s901, "qwrtyu4003") + err(c080, z077, __LINE__, 0, 0, s901, "qwrtyu4003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(c080, z077, 0x10e, 0, 0, Local0, c00b) + err(c080, z077, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0xe0,0xe1,0xe2,0xe3,0xe4})) { - err(c080, z077, 0x10f, 0, 0, b900, Buffer() {0xe0,0xe1,0xe2,0xe3,0xe4}) + err(c080, z077, __LINE__, 0, 0, b900, Buffer() {0xe0,0xe1,0xe2,0xe3,0xe4}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(c080, z077, 0x110, 0, 0, Local0, c016) + err(c080, z077, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0xe0)) { - err(c080, z077, 0x111, 0, 0, bf90, 0xe0) + err(c080, z077, __LINE__, 0, 0, bf90, 0xe0) } // One level Package @@ -3849,87 +3849,87 @@ Method(m16c, 1, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(c080, z077, 0x112, 0, 0, Local1, c008) + err(c080, z077, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x113, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd4004)) { - err(c080, z077, 0x114, 0, 0, Local1, 0xabcd4004) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd4004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x115, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455664005)) { - err(c080, z077, 0x116, 0, 0, Local1, 0x1122334455664005) + err(c080, z077, __LINE__, 0, 0, Local1, 0x1122334455664005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x117, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12344006")) { - err(c080, z077, 0x118, 0, 0, Local1, "12344006") + err(c080, z077, __LINE__, 0, 0, Local1, "12344006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x119, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i84007")) { - err(c080, z077, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i84007") + err(c080, z077, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i84007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11b, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop4008")) { - err(c080, z077, 0x11c, 0, 0, Local1, "qwrtyuiop4008") + err(c080, z077, __LINE__, 0, 0, Local1, "qwrtyuiop4008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11d, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0254009")) { - err(c080, z077, 0x11e, 0, 0, Local1, "1234567890abdef0254009") + err(c080, z077, __LINE__, 0, 0, Local1, "1234567890abdef0254009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x11f, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xe5,0xe6,0xe7})) { - err(c080, z077, 0x120, 0, 0, Local1, Buffer() {0xe5,0xe6,0xe7}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xe5,0xe6,0xe7}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x121, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xe8,0xe9})) { - err(c080, z077, 0x122, 0, 0, Local1, Buffer() {0xe8,0xe9}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xe8,0xe9}) } // Two level Package @@ -3940,10 +3940,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(c080, z077, 0x123, 0, 0, Local4, c009) + err(c080, z077, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc400a)) { - err(c080, z077, 0x124, 0, 0, Local3, 0xabc400a) + err(c080, z077, __LINE__, 0, 0, Local3, 0xabc400a) } Store(Index(p905, 0), Local0) @@ -3952,10 +3952,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x125, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc400b")) { - err(c080, z077, 0x126, 0, 0, Local3, "0xabc400b") + err(c080, z077, __LINE__, 0, 0, Local3, "0xabc400b") } Store(Index(p905, 0), Local0) @@ -3964,10 +3964,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x127, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc400c")) { - err(c080, z077, 0x128, 0, 0, Local3, "abc400c") + err(c080, z077, __LINE__, 0, 0, Local3, "abc400c") } Store(Index(p906, 0), Local0) @@ -3976,10 +3976,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x129, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc400d")) { - err(c080, z077, 0x12a, 0, 0, Local3, "abc400d") + err(c080, z077, __LINE__, 0, 0, Local3, "abc400d") } Store(Index(p907, 0), Local0) @@ -3988,10 +3988,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x12b, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm400e")) { - err(c080, z077, 0x12c, 0, 0, Local3, "aqwevbgnm400e") + err(c080, z077, __LINE__, 0, 0, Local3, "aqwevbgnm400e") } Store(Index(p908, 0), Local0) @@ -4000,10 +4000,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(c080, z077, 0x12d, 0, 0, Local4, c00b) + err(c080, z077, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xea,0xeb,0xec,0xed,0xee})) { - err(c080, z077, 0x12e, 0, 0, Local3, Buffer() {0xea,0xeb,0xec,0xed,0xee}) + err(c080, z077, __LINE__, 0, 0, Local3, Buffer() {0xea,0xeb,0xec,0xed,0xee}) } // Three level Package @@ -4016,10 +4016,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(c080, z077, 0x12f, 0, 0, Local6, c009) + err(c080, z077, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc400f)) { - err(c080, z077, 0x130, 0, 0, Local5, 0xabc400f) + err(c080, z077, __LINE__, 0, 0, Local5, 0xabc400f) } Store(Index(p90a, 0), Local0) @@ -4030,10 +4030,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x131, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12344010")) { - err(c080, z077, 0x132, 0, 0, Local5, "12344010") + err(c080, z077, __LINE__, 0, 0, Local5, "12344010") } Store(Index(p90b, 0), Local0) @@ -4044,10 +4044,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x133, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas4011")) { - err(c080, z077, 0x134, 0, 0, Local5, "zxswefas4011") + err(c080, z077, __LINE__, 0, 0, Local5, "zxswefas4011") } Store(Index(p90c, 0), Local0) @@ -4058,30 +4058,30 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(c080, z077, 0x135, 0, 0, Local6, c00b) + err(c080, z077, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xef,0x30,0x31})) { - err(c080, z077, 0x136, 0, 0, Local5, Buffer() {0xef,0x30,0x31}) + err(c080, z077, __LINE__, 0, 0, Local5, Buffer() {0xef,0x30,0x31}) } Store(Index(p953, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x137, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd4018)) { - err(c080, z077, 0x138, 0, 0, Local1, 0xabcd4018) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd4018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x139, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd4019)) { - err(c080, z077, 0x13a, 0, 0, Local1, 0xabcd4019) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd4019) } // Not Computational Data @@ -4100,13 +4100,13 @@ Method(m16c, 1, Serialized) * // Field Unit (Field) * * if (LNotEqual(f900, 0xd7)) { - * err(c080, z077, 0x137, 0, 0, f900, 0xd7) + * err(c080, z077, __LINE__, 0, 0, f900, 0xd7) * } * * // Field Unit (IndexField) * * if (LNotEqual(if90, 0xd7)) { - * err(c080, z077, 0x138, 0, 0, if90, 0xd7) + * err(c080, z077, __LINE__, 0, 0, if90, 0xd7) * } */ } /* m000 */ @@ -5110,80 +5110,80 @@ Method(m16e,, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x100, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a5000)) { - err(c080, z077, 0x101, 0, 0, i900, 0xfe7cb391d65a5000) + err(c080, z077, __LINE__, 0, 0, i900, 0xfe7cb391d65a5000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x102, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0x41795001)) { - err(c080, z077, 0x103, 0, 0, i901, 0x41795001) + err(c080, z077, __LINE__, 0, 0, i901, 0x41795001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x104, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(c080, z077, 0x105, 0, 0, i902, 0) + err(c080, z077, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x106, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(c080, z077, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(c080, z077, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x108, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(c080, z077, 0x109, 0, 0, i904, 0xffffffff) + err(c080, z077, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10a, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12345002")) { - err(c080, z077, 0x10b, 0, 0, s900, "12345002") + err(c080, z077, __LINE__, 0, 0, s900, "12345002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10c, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu5003")) { - err(c080, z077, 0x10d, 0, 0, s901, "qwrtyu5003") + err(c080, z077, __LINE__, 0, 0, s901, "qwrtyu5003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(c080, z077, 0x10e, 0, 0, Local0, c00b) + err(c080, z077, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0xf0,0xf1,0xf2,0xf3,0xf4})) { - err(c080, z077, 0x10f, 0, 0, b900, Buffer() {0xf0,0xf1,0xf2,0xf3,0xf4}) + err(c080, z077, __LINE__, 0, 0, b900, Buffer() {0xf0,0xf1,0xf2,0xf3,0xf4}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(c080, z077, 0x110, 0, 0, Local0, c016) + err(c080, z077, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0xf0)) { - err(c080, z077, 0x111, 0, 0, bf90, 0xf0) + err(c080, z077, __LINE__, 0, 0, bf90, 0xf0) } // One level Package @@ -5191,87 +5191,87 @@ Method(m16e,, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(c080, z077, 0x112, 0, 0, Local1, c008) + err(c080, z077, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x113, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd5004)) { - err(c080, z077, 0x114, 0, 0, Local1, 0xabcd5004) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd5004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x115, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455665005)) { - err(c080, z077, 0x116, 0, 0, Local1, 0x1122334455665005) + err(c080, z077, __LINE__, 0, 0, Local1, 0x1122334455665005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x117, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12345006")) { - err(c080, z077, 0x118, 0, 0, Local1, "12345006") + err(c080, z077, __LINE__, 0, 0, Local1, "12345006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x119, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i85007")) { - err(c080, z077, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i85007") + err(c080, z077, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i85007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11b, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop5008")) { - err(c080, z077, 0x11c, 0, 0, Local1, "qwrtyuiop5008") + err(c080, z077, __LINE__, 0, 0, Local1, "qwrtyuiop5008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11d, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0255009")) { - err(c080, z077, 0x11e, 0, 0, Local1, "1234567890abdef0255009") + err(c080, z077, __LINE__, 0, 0, Local1, "1234567890abdef0255009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x11f, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xf5,0xf6,0xf7})) { - err(c080, z077, 0x120, 0, 0, Local1, Buffer() {0xf5,0xf6,0xf7}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xf5,0xf6,0xf7}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x121, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xf8,0xf9})) { - err(c080, z077, 0x122, 0, 0, Local1, Buffer() {0xf8,0xf9}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xf8,0xf9}) } // Two level Package @@ -5282,10 +5282,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(c080, z077, 0x123, 0, 0, Local4, c009) + err(c080, z077, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc500a)) { - err(c080, z077, 0x124, 0, 0, Local3, 0xabc500a) + err(c080, z077, __LINE__, 0, 0, Local3, 0xabc500a) } Store(Index(p905, 0), Local0) @@ -5294,10 +5294,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x125, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc500b")) { - err(c080, z077, 0x126, 0, 0, Local3, "0xabc500b") + err(c080, z077, __LINE__, 0, 0, Local3, "0xabc500b") } Store(Index(p905, 0), Local0) @@ -5306,10 +5306,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x127, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc500c")) { - err(c080, z077, 0x128, 0, 0, Local3, "abc500c") + err(c080, z077, __LINE__, 0, 0, Local3, "abc500c") } Store(Index(p906, 0), Local0) @@ -5318,10 +5318,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x129, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc500d")) { - err(c080, z077, 0x12a, 0, 0, Local3, "abc500d") + err(c080, z077, __LINE__, 0, 0, Local3, "abc500d") } Store(Index(p907, 0), Local0) @@ -5330,10 +5330,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x12b, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm500e")) { - err(c080, z077, 0x12c, 0, 0, Local3, "aqwevbgnm500e") + err(c080, z077, __LINE__, 0, 0, Local3, "aqwevbgnm500e") } Store(Index(p908, 0), Local0) @@ -5342,10 +5342,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(c080, z077, 0x12d, 0, 0, Local4, c00b) + err(c080, z077, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xfa,0xfb,0xfc,0xfd,0xfe})) { - err(c080, z077, 0x12e, 0, 0, Local3, Buffer() {0xfa,0xfb,0xfc,0xfd,0xfe}) + err(c080, z077, __LINE__, 0, 0, Local3, Buffer() {0xfa,0xfb,0xfc,0xfd,0xfe}) } // Three level Package @@ -5358,10 +5358,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(c080, z077, 0x12f, 0, 0, Local6, c009) + err(c080, z077, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc500f)) { - err(c080, z077, 0x130, 0, 0, Local5, 0xabc500f) + err(c080, z077, __LINE__, 0, 0, Local5, 0xabc500f) } Store(Index(p90a, 0), Local0) @@ -5372,10 +5372,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x131, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12345010")) { - err(c080, z077, 0x132, 0, 0, Local5, "12345010") + err(c080, z077, __LINE__, 0, 0, Local5, "12345010") } Store(Index(p90b, 0), Local0) @@ -5386,10 +5386,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x133, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas5011")) { - err(c080, z077, 0x134, 0, 0, Local5, "zxswefas5011") + err(c080, z077, __LINE__, 0, 0, Local5, "zxswefas5011") } Store(Index(p90c, 0), Local0) @@ -5400,30 +5400,30 @@ Method(m16e,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(c080, z077, 0x135, 0, 0, Local6, c00b) + err(c080, z077, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xff,0x40,0x41})) { - err(c080, z077, 0x136, 0, 0, Local5, Buffer() {0xff,0x40,0x41}) + err(c080, z077, __LINE__, 0, 0, Local5, Buffer() {0xff,0x40,0x41}) } Store(Index(p953, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x137, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd5018)) { - err(c080, z077, 0x138, 0, 0, Local1, 0xabcd5018) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd5018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x139, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd5019)) { - err(c080, z077, 0x13a, 0, 0, Local1, 0xabcd5019) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd5019) } // Not Computational Data @@ -5442,13 +5442,13 @@ Method(m16e,, Serialized) * // Field Unit (Field) * * if (LNotEqual(f900, 0xd7)) { - * err(c080, z077, 0x137, 0, 0, f900, 0xd7) + * err(c080, z077, __LINE__, 0, 0, f900, 0xd7) * } * * // Field Unit (IndexField) * * if (LNotEqual(if90, 0xd7)) { - * err(c080, z077, 0x138, 0, 0, if90, 0xd7) + * err(c080, z077, __LINE__, 0, 0, if90, 0xd7) * } */ } /* m000 */ diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl index fd12432..5d79ad7 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl @@ -100,7 +100,7 @@ Method(m1e1, 1, Serialized) Increment(i205) } Default { - err("m1e2", z110, 0, 0, 0, Local7, 0) + err("m1e2", z110, __LINE__, 0, 0, Local7, 0) } } @@ -711,7 +711,7 @@ Method(m1e0, 1, Serialized) m1a3(Local1, c010, z110, ts, 151) } Default { - err(ts, z110, 1, 0, 0, ind0, 0) + err(ts, z110, __LINE__, 0, 0, ind0, 0) } } /* Switch */ diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl index f662eb7..2f971e0 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl @@ -223,55 +223,55 @@ Method(m1c3, 7, Serialized) if (FL00) { Store(Index(p000, 0), Local5) - CH03(ts, z116, 0, 0, 0) + CH03(ts, z116, 0, __LINE__, 0) Add(Local5, 1, Local6) - CH04(ts, 0, 0xff, z116, 1, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 2, 0, 0) + CH03(ts, z116, 2, __LINE__, 0) Add(DerefOf(Local5), 1, Local6) - CH04(ts, 0, 0xff, z116, 3, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 4, 0, 0) + CH03(ts, z116, 4, __LINE__, 0) m390(Local5, V000, 0, 0) - CH04(ts, 0, 0xff, z116, 5, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 6, 0, 0) + CH03(ts, z116, 6, __LINE__, 0) m390(DerefOf(Local5), V000, 0, 0) - CH04(ts, 0, 0xff, z116, 7, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 0, Local2), Local5) - CH03(ts, z116, 8, 0, 0) + CH03(ts, z116, 8, __LINE__, 0) Add(Local5, 1, Local6) - CH04(ts, 0, 0xff, z116, 9, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 10, 0, 0) + CH03(ts, z116, 10, __LINE__, 0) Add(DerefOf(Local5), 1, Local6) - CH04(ts, 0, 0xff, z116, 11, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 12, 0, 0) + CH03(ts, z116, 12, __LINE__, 0) m390(Local5, V000, 0, 0) - CH04(ts, 0, 0xff, z116, 13, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 14, 0, 0) + CH03(ts, z116, 14, __LINE__, 0) m390(DerefOf(Local5), V000, 0, 0) - CH04(ts, 0, 0xff, z116, 15, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 16, 0, 0) + CH03(ts, z116, 16, __LINE__, 0) Add(Local2, 1, Local6) - CH04(ts, 0, 0xff, z116, 17, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 18, 0, 0) + CH03(ts, z116, 18, __LINE__, 0) Add(DerefOf(Local2), 1, Local6) - CH04(ts, 0, 0xff, z116, 19, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 20, 0, 0) + CH03(ts, z116, 20, __LINE__, 0) m390(Local2, V000, 0, 0) - CH04(ts, 0, 0xff, z116, 21, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 22, 0, 0) + CH03(ts, z116, 22, __LINE__, 0) m390(DerefOf(Local2), V000, 0, 0) - CH04(ts, 0, 0xff, z116, 23, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } if (q001) { @@ -302,55 +302,55 @@ Method(m1c3, 7, Serialized) if (FL00) { Store(Index(p000, 1), Local5) - CH03(ts, z116, 24, 0, 0) + CH03(ts, z116, 24, __LINE__, 0) Add(Local5, 1, Local6) - CH04(ts, 0, 0xff, z116, 25, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 26, 0, 0) + CH03(ts, z116, 26, __LINE__, 0) Add(DerefOf(Local5), 1, Local6) - CH04(ts, 0, 0xff, z116, 27, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 28, 0, 0) + CH03(ts, z116, 28, __LINE__, 0) m390(Local5, V000, 0, 33) - CH04(ts, 0, 0xff, z116, 29, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 30, 0, 0) + CH03(ts, z116, 30, __LINE__, 0) m390(DerefOf(Local5), V000, 0, 34) - CH04(ts, 0, 0xff, z116, 31, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 1, Local2), Local5) - CH03(ts, z116, 32, 0, 0) + CH03(ts, z116, 32, __LINE__, 0) Add(Local5, 1, Local6) - CH04(ts, 0, 0xff, z116, 33, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 34, 0, 0) + CH03(ts, z116, 34, __LINE__, 0) Add(DerefOf(Local5), 1, Local6) - CH04(ts, 0, 0xff, z116, 35, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 36, 0, 0) + CH03(ts, z116, 36, __LINE__, 0) m390(Local5, V000, 0, 35) - CH04(ts, 0, 0xff, z116, 37, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 38, 0, 0) + CH03(ts, z116, 38, __LINE__, 0) m390(DerefOf(Local5), V000, 0, 36) - CH04(ts, 0, 0xff, z116, 39, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 40, 0, 0) + CH03(ts, z116, 40, __LINE__, 0) Add(Local2, 1, Local6) - CH04(ts, 0, 0xff, z116, 41, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 42, 0, 0) + CH03(ts, z116, 42, __LINE__, 0) Add(DerefOf(Local2), 1, Local6) - CH04(ts, 0, 0xff, z116, 43, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 44, 0, 0) + CH03(ts, z116, 44, __LINE__, 0) m390(Local2, V000, 0, 37) - CH04(ts, 0, 0xff, z116, 45, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 46, 0, 0) + CH03(ts, z116, 46, __LINE__, 0) m390(DerefOf(Local2), V000, 0, 38) - CH04(ts, 0, 0xff, z116, 47, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } if (q001) { @@ -381,55 +381,55 @@ Method(m1c3, 7, Serialized) if (FL00) { Store(Index(p000, 0), arg5) - CH03(ts, z116, 48, 0, 0) + CH03(ts, z116, 48, __LINE__, 0) Add(arg5, 1, arg6) - CH04(ts, 0, 0xff, z116, 49, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 50, 0, 0) + CH03(ts, z116, 50, __LINE__, 0) Add(DerefOf(arg5), 1, arg6) - CH04(ts, 0, 0xff, z116, 51, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 52, 0, 0) + CH03(ts, z116, 52, __LINE__, 0) m390(arg5, V000, 0, 45) - CH04(ts, 0, 0xff, z116, 53, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 54, 0, 0) + CH03(ts, z116, 54, __LINE__, 0) m390(DerefOf(arg5), V000, 0, 46) - CH04(ts, 0, 0xff, z116, 55, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 0, arg2), arg5) - CH03(ts, z116, 56, 0, 0) + CH03(ts, z116, 56, __LINE__, 0) Add(arg5, 1, arg6) - CH04(ts, 0, 0xff, z116, 57, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 58, 0, 0) + CH03(ts, z116, 58, __LINE__, 0) Add(DerefOf(arg5), 1, arg6) - CH04(ts, 0, 0xff, z116, 59, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 60, 0, 0) + CH03(ts, z116, 60, __LINE__, 0) m390(arg5, V000, 0, 47) - CH04(ts, 0, 0xff, z116, 61, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 62, 0, 0) + CH03(ts, z116, 62, __LINE__, 0) m390(DerefOf(arg5), V000, 0, 48) - CH04(ts, 0, 0xff, z116, 63, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 64, 0, 0) + CH03(ts, z116, 64, __LINE__, 0) Add(arg2, 1, arg6) - CH04(ts, 0, 0xff, z116, 65, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 66, 0, 0) + CH03(ts, z116, 66, __LINE__, 0) Add(DerefOf(arg2), 1, arg6) - CH04(ts, 0, 0xff, z116, 67, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 68, 0, 0) + CH03(ts, z116, 68, __LINE__, 0) m390(arg2, V000, 0, 49) - CH04(ts, 0, 0xff, z116, 69, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 70, 0, 0) + CH03(ts, z116, 70, __LINE__, 0) m390(DerefOf(arg2), V000, 0, 50) - CH04(ts, 0, 0xff, z116, 71, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } if (q001) { @@ -460,55 +460,55 @@ Method(m1c3, 7, Serialized) if (FL00) { Store(Index(p000, 1), arg5) - CH03(ts, z116, 72, 0, 0) + CH03(ts, z116, 72, __LINE__, 0) Add(arg5, 1, arg6) - CH04(ts, 0, 0xff, z116, 73, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 74, 0, 0) + CH03(ts, z116, 74, __LINE__, 0) Add(DerefOf(arg5), 1, arg6) - CH04(ts, 0, 0xff, z116, 75, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 76, 0, 0) + CH03(ts, z116, 76, __LINE__, 0) m390(arg5, V000, 0, 57) - CH04(ts, 0, 0xff, z116, 77, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 78, 0, 0) + CH03(ts, z116, 78, __LINE__, 0) m390(DerefOf(arg5), V000, 0, 58) - CH04(ts, 0, 0xff, z116, 79, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 1, arg2), arg5) - CH03(ts, z116, 80, 0, 0) + CH03(ts, z116, 80, __LINE__, 0) Add(arg5, 1, arg6) - CH04(ts, 0, 0xff, z116, 81, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 82, 0, 0) + CH03(ts, z116, 82, __LINE__, 0) Add(DerefOf(arg5), 1, arg6) - CH04(ts, 0, 0xff, z116, 83, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 84, 0, 0) + CH03(ts, z116, 84, __LINE__, 0) m390(arg5, V000, 0, 59) - CH04(ts, 0, 0xff, z116, 85, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 86, 0, 0) + CH03(ts, z116, 86, __LINE__, 0) m390(DerefOf(arg5), V000, 0, 60) - CH04(ts, 0, 0xff, z116, 87, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 88, 0, 0) + CH03(ts, z116, 88, __LINE__, 0) Add(arg2, 1, arg6) - CH04(ts, 0, 0xff, z116, 89, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 90, 0, 0) + CH03(ts, z116, 90, __LINE__, 0) Add(DerefOf(arg2), 1, arg6) - CH04(ts, 0, 0xff, z116, 91, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 92, 0, 0) + CH03(ts, z116, 92, __LINE__, 0) m390(arg2, V000, 0, 61) - CH04(ts, 0, 0xff, z116, 93, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 94, 0, 0) + CH03(ts, z116, 94, __LINE__, 0) m390(DerefOf(arg2), V000, 0, 62) - CH04(ts, 0, 0xff, z116, 95, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } if (q001) { @@ -542,55 +542,55 @@ Method(m1c3, 7, Serialized) CopyObject(Index(ppp0, 0), i005) Store(Index(p000, 0), i005) - CH03(ts, z116, 96, 0, 0) + CH03(ts, z116, 96, __LINE__, 0) Add(i005, 1, i006) - CH04(ts, 0, 0xff, z116, 97, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 98, 0, 0) + CH03(ts, z116, 98, __LINE__, 0) Add(DerefOf(i005), 1, i006) - CH04(ts, 0, 0xff, z116, 99, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 100, 0, 0) + CH03(ts, z116, 100, __LINE__, 0) m390(i005, V000, 0, 69) - CH04(ts, 0, 0xff, z116, 101, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 102, 0, 0) + CH03(ts, z116, 102, __LINE__, 0) m390(DerefOf(i005), V000, 0, 70) - CH04(ts, 0, 0xff, z116, 103, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 0, i002), i005) - CH03(ts, z116, 104, 0, 0) + CH03(ts, z116, 104, __LINE__, 0) Add(i005, 1, i006) - CH04(ts, 0, 0xff, z116, 105, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 106, 0, 0) + CH03(ts, z116, 106, __LINE__, 0) Add(DerefOf(i005), 1, i006) - CH04(ts, 0, 0xff, z116, 107, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 108, 0, 0) + CH03(ts, z116, 108, __LINE__, 0) m390(i005, V000, 0, 71) - CH04(ts, 0, 0xff, z116, 109, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 110, 0, 0) + CH03(ts, z116, 110, __LINE__, 0) m390(DerefOf(i005), V000, 0, 72) - CH04(ts, 0, 0xff, z116, 111, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 112, 0, 0) + CH03(ts, z116, 112, __LINE__, 0) Add(i002, 1, i006) - CH04(ts, 0, 0xff, z116, 113, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 114, 0, 0) + CH03(ts, z116, 114, __LINE__, 0) Add(DerefOf(i002), 1, i006) - CH04(ts, 0, 0xff, z116, 115, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 116, 0, 0) + CH03(ts, z116, 116, __LINE__, 0) m390(i002, V000, 0, 73) - CH04(ts, 0, 0xff, z116, 117, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 118, 0, 0) + CH03(ts, z116, 118, __LINE__, 0) m390(DerefOf(i002), V000, 0, 74) - CH04(ts, 0, 0xff, z116, 119, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } if (q001) { @@ -621,55 +621,55 @@ Method(m1c3, 7, Serialized) if (FL00) { Store(Index(p000, 1), i005) - CH03(ts, z116, 120, 0, 0) + CH03(ts, z116, 120, __LINE__, 0) Add(i005, 1, i006) - CH04(ts, 0, 0xff, z116, 121, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 122, 0, 0) + CH03(ts, z116, 122, __LINE__, 0) Add(DerefOf(i005), 1, i006) - CH04(ts, 0, 0xff, z116, 123, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 124, 0, 0) + CH03(ts, z116, 124, __LINE__, 0) m390(i005, V000, 0, 81) - CH04(ts, 0, 0xff, z116, 125, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 126, 0, 0) + CH03(ts, z116, 126, __LINE__, 0) m390(DerefOf(i005), V000, 0, 82) - CH04(ts, 0, 0xff, z116, 127, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 1, i002), i005) - CH03(ts, z116, 128, 0, 0) + CH03(ts, z116, 128, __LINE__, 0) Add(i005, 1, i006) - CH04(ts, 0, 0xff, z116, 129, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 130, 0, 0) + CH03(ts, z116, 130, __LINE__, 0) Add(DerefOf(i005), 1, i006) - CH04(ts, 0, 0xff, z116, 131, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 132, 0, 0) + CH03(ts, z116, 132, __LINE__, 0) m390(i005, V000, 0, 83) - CH04(ts, 0, 0xff, z116, 133, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 134, 0, 0) + CH03(ts, z116, 134, __LINE__, 0) m390(DerefOf(i005), V000, 0, 84) - CH04(ts, 0, 0xff, z116, 135, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 136, 0, 0) + CH03(ts, z116, 136, __LINE__, 0) Add(i002, 1, i006) - CH04(ts, 0, 0xff, z116, 137, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 138, 0, 0) + CH03(ts, z116, 138, __LINE__, 0) Add(DerefOf(i002), 1, i006) - CH04(ts, 0, 0xff, z116, 139, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 140, 0, 0) + CH03(ts, z116, 140, __LINE__, 0) m390(i002, V000, 0, 85) - CH04(ts, 0, 0xff, z116, 141, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) - CH03(ts, z116, 142, 0, 0) + CH03(ts, z116, 142, __LINE__, 0) m390(DerefOf(i002), V000, 0, 86) - CH04(ts, 0, 0xff, z116, 143, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } if (q001) { @@ -933,51 +933,51 @@ Method(m1c9,, Serialized) Store(Index(p000, 0), Local0) m1a3(Local0, c010, z116, ts, 131) - CH03(ts, z116, 144, 0, 0) + CH03(ts, z116, 144, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04(ts, 0, 0xff, z116, 145, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 1), Local0) m1a3(Local0, c010, z116, ts, 132) - CH03(ts, z116, 146, 0, 0) + CH03(ts, z116, 146, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04(ts, 0, 0xff, z116, 147, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 2), Local0) m1a3(Local0, c010, z116, ts, 133) - CH03(ts, z116, 148, 0, 0) + CH03(ts, z116, 148, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04(ts, 0, 0xff, z116, 149, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 3), Local0) m1a3(Local0, c010, z116, ts, 134) - CH03(ts, z116, 150, 0, 0) + CH03(ts, z116, 150, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04(ts, 0, 0xff, z116, 151, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 4), Local0) m1a3(Local0, c010, z116, ts, 135) - CH03(ts, z116, 152, 0, 0) + CH03(ts, z116, 152, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04(ts, 0, 0xff, z116, 153, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 5), Local0) m1a3(Local0, c010, z116, ts, 136) - CH03(ts, z116, 154, 0, 0) + CH03(ts, z116, 154, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04(ts, 0, 0xff, z116, 155, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 6), Local0) m1a3(Local0, c010, z116, ts, 137) - CH03(ts, z116, 156, 0, 0) + CH03(ts, z116, 156, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04(ts, 0, 0xff, z116, 157, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 7), Local0) m1a3(Local0, c010, z116, ts, 138) - CH03(ts, z116, 158, 0, 0) + CH03(ts, z116, 158, __LINE__, 0) Store(DerefOf(Local0), Local1) - CH04(ts, 0, 0xff, z116, 159, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) m380(ts, i000, 0, 139) } @@ -991,9 +991,9 @@ Method(m1ca,, Serialized) { Name(p000, Package(arg0) {}) - CH03(ts, z116, 160, 0, 0) + CH03(ts, z116, 160, __LINE__, 0) Store(Index(p000, arg0), Local0) - CH04(ts, 0, 0xff, z116, 161, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } Method(m001, 1, Serialized) @@ -1023,7 +1023,7 @@ Method(m1ca,, Serialized) Store(Index(p000, lpC0), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, lpC0)) { - err(ts, z116, 0, z116, 0, Local1, lpC0) + err(ts, z116, __LINE__, z116, 0, Local1, lpC0) break } Decrement(lpN0) @@ -1035,18 +1035,18 @@ Method(m1ca,, Serialized) { Name(p000, Package(2) {}) - CH03(ts, z116, 162, 0, 0) + CH03(ts, z116, 162, __LINE__, 0) Store(Index(p000, 2), Local0) - CH04(ts, 0, 0xff, z116, 163, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } Method(m004,, Serialized) { Name(p000, Package(255) {}) - CH03(ts, z116, 164, 0, 0) + CH03(ts, z116, 164, __LINE__, 0) Store(Index(p000, 255), Local0) - CH04(ts, 0, 0xff, z116, 165, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } // Size not greater than 255 @@ -1074,7 +1074,7 @@ Method(m1cb,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 6)) { - err(ts, z116, 1, 0, 0, Local0, 6) + err(ts, z116, __LINE__, 0, 0, Local0, 6) } } @@ -1085,16 +1085,16 @@ Method(m1cb,, Serialized) // arg3 - exception is expected Method(m1cc, 4) { - CH03(arg0, z116, 166, 0, 0) + CH03(arg0, z116, 166, __LINE__, 0) Store(arg1, Local0) Add(Local0, 1, Local7) if (LNotEqual(Local7, arg2)) { - err(arg0, z116, 2, 0, 0, Local7, arg2) + err(arg0, z116, __LINE__, 0, 0, Local7, arg2) } - CH03(arg0, z116, 167, 0, 0) + CH03(arg0, z116, 167, __LINE__, 0) } // Check the read automatic dereference @@ -1104,15 +1104,15 @@ Method(m1cc, 4) // arg3 - exception is expected Method(m1cd, 4) { - CH03(arg0, z116, 168, 0, 0) + CH03(arg0, z116, 168, __LINE__, 0) Add(arg1, 1, Local7) if (LNotEqual(Local7, arg2)) { - err(arg0, z116, 3, 0, 0, Local7, arg2) + err(arg0, z116, __LINE__, 0, 0, Local7, arg2) } - CH03(arg0, z116, 169, 0, 0) + CH03(arg0, z116, 169, __LINE__, 0) } // Check the read automatic dereference @@ -1171,9 +1171,9 @@ Method(m1d0,, Serialized) * Method(m1d1) * { * Name(p000, Package(1) {0x77}) - * CH03(ts, z116, 170, 0, 0) + * CH03(ts, z116, 170, __LINE__, 0) * Add(Index(p000, 0, Local0), 1, Local7) - * CH04(ts, 0, 0xff, z116, 171, 0, 0) + * CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) * } */ @@ -1187,15 +1187,15 @@ Method(m1d1,, Serialized) Store(Index(p000, 0, Local0), Local1) - CH03(ts, z116, 172, 0, 0) + CH03(ts, z116, 172, __LINE__, 0) Add(Local0, 1, Local7) - CH04(ts, 0, 0xff, z116, 173, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Add(Local1, 1, Local7) - CH04(ts, 0, 0xff, z116, 174, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } Method(m1d2,, Serialized) @@ -1206,15 +1206,15 @@ Method(m1d2,, Serialized) CopyObject(Index(p000, 0, Local0), Local1) - CH03(ts, z116, 175, 0, 0) + CH03(ts, z116, 175, __LINE__, 0) Add(Local0, 1, Local7) - CH04(ts, 0, 0xff, z116, 176, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Add(Local1, 1, Local7) - CH04(ts, 0, 0xff, z116, 177, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } // ArgX @@ -1227,15 +1227,15 @@ Method(m1d3, 2, Serialized) Store(Index(p000, 0, Arg0), Arg1) - CH03(ts, z116, 178, 0, 0) + CH03(ts, z116, 178, __LINE__, 0) Add(Arg0, 1, Local7) - CH04(ts, 0, 0xff, z116, 179, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Add(Arg1, 1, Local7) - CH04(ts, 0, 0xff, z116, 180, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } Method(m1d4, 2, Serialized) @@ -1246,18 +1246,18 @@ Method(m1d4, 2, Serialized) CopyObject(Index(p000, 0, Arg0), Arg1) - CH03(ts, z116, 181, 0, 0) + CH03(ts, z116, 181, __LINE__, 0) Add(Arg0, 1, Local7) - CH04(ts, 0, 0xff, z116, 182, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) // Type of Arg1 should be IRef here, // so, exception is expected. Add(Arg1, 1, Local7) - CH04(ts, 0, 0xff, z116, 183, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } // NamedX @@ -1274,18 +1274,18 @@ Method(m1d5,, Serialized) Name(hg01, 0) // if non-zero - the test hangs Name(hg02, 0) // if non-zero - the test hangs - CH03(ts, z116, 184, 0, 0) + CH03(ts, z116, 184, __LINE__, 0) CopyObject(Index(p000, 1, Local0), i001) - CH03(ts, z116, 185, 0, 0) + CH03(ts, z116, 185, __LINE__, 0) // Type of i001 should be already IRef here, // so, don't expect exception. Store(Index(p000, 0, Local0), i001) - CH03(ts, z116, 186, 0, 0) + CH03(ts, z116, 186, __LINE__, 0) Add(Local0, 1, Local7) @@ -1318,11 +1318,11 @@ Method(m1d5,, Serialized) Store(Local7, debug) } - CH04(ts, 0, 0xff, z116, 187, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Add(i001, 1, Local7) - CH04(ts, 0, 0xff, z116, 188, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) /* * Looks identical to b248: "Incorrect ReferenceCount on Switch operation": @@ -1349,15 +1349,15 @@ Method(m1d6,, Serialized) Name(p000, Package(1) {0x77}) - CH03(ts, z116, 189, 0, 0) + CH03(ts, z116, 189, __LINE__, 0) CopyObject(Index(p000, 0, Local0), i001) - CH03(ts, z116, 190, 0, 0) + CH03(ts, z116, 190, __LINE__, 0) Add(i001, 1, Local7) - CH04(ts, 0, 0xff, z116, 192, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } // Out of Package @@ -1368,15 +1368,15 @@ Method(m1d7,, Serialized) Name(p000, Package(1) {0x77}) - CH03(ts, z116, 193, 0, 0) + CH03(ts, z116, 193, __LINE__, 0) Store(Index(p000, 1), Local0) - CH04(ts, 0, 0xff, z116, 194, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) Store(Index(p000, 1, Local0), Local1) - CH04(ts, 0, 0xff, z116, 195, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } Method(m1d8,, Serialized) @@ -1385,15 +1385,15 @@ Method(m1d8,, Serialized) Name(p000, Package(1) {0x77}) - CH03(ts, z116, 196, 0, 0) + CH03(ts, z116, 196, __LINE__, 0) CopyObject(Index(p000, 1), Local0) - CH04(ts, 0, 0xff, z116, 197, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) CopyObject(Index(p000, 1, Local0), Local1) - CH04(ts, 0, 0xff, z116, 198, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } Method(m1db,, Serialized) @@ -1404,11 +1404,11 @@ Method(m1db,, Serialized) Name(p000, Package(2) {0x77, 0x88}) - CH03(ts, z116, 199, 0, 0) + CH03(ts, z116, 199, __LINE__, 0) CopyObject(Index(p000, 1), i001) - CH03(ts, z116, 200, 0, 0) + CH03(ts, z116, 200, __LINE__, 0) // Type of i001 should be already IRef here, // so, don't expect exception. Writing to i001 @@ -1416,11 +1416,11 @@ Method(m1db,, Serialized) Index(p000, 0, i001) - CH03(ts, z116, 201, 0, 0) + CH03(ts, z116, 201, __LINE__, 0) Add(i001, 1, Local7) - CH04(ts, 0, 0xff, z116, 202, 0, 0) + CH04(ts, 0, 0xff, z116, __LINE__, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl index 83df725..a6ecfbf 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl @@ -236,11 +236,11 @@ Method(m22c,, Serialized) { CreateField(arg0, 8, 8, bf90) if (LNotEqual(bf90, 0x77)) { - err(ts, z111, 0, 0, 0, bf90, 0x77) + err(ts, z111, __LINE__, 0, 0, bf90, 0x77) } Store(0x9999992b, bf90) if (LNotEqual(bf90, 0x2b)) { - err(ts, z111, 1, 0, 0, bf90, 0x2b) + err(ts, z111, __LINE__, 0, 0, bf90, 0x2b) } } @@ -248,13 +248,13 @@ Method(m22c,, Serialized) { CreateField(arg0, 8, 8, bf90) if (LNotEqual(bf90, 0x77)) { - err(ts, z111, 2, 0, 0, bf90, 0x77) + err(ts, z111, __LINE__, 0, 0, bf90, 0x77) } Store(0x2b, bf90) CopyObject(0x9999992b, bf90) if (LNotEqual(bf90, 0x2b)) { - err(ts, z111, 3, 0, 0, bf90, 0x2b) + err(ts, z111, __LINE__, 0, 0, bf90, 0x2b) } } @@ -373,11 +373,11 @@ Method(m234,, Serialized) CreateField(Local2, 8, 8, bf90) if (LNotEqual(bf90, 0x77)) { - err(ts, z111, 0, 0, 0, bf90, 0x77) + err(ts, z111, __LINE__, 0, 0, bf90, 0x77) } Store(0x9999992b, bf90) if (LNotEqual(bf90, 0x2b)) { - err(ts, z111, 1, 0, 0, bf90, 0x2b) + err(ts, z111, __LINE__, 0, 0, bf90, 0x2b) } } @@ -387,11 +387,11 @@ Method(m234,, Serialized) CreateField(Local2, 8, 8, bf90) if (LNotEqual(bf90, 0x77)) { - err(ts, z111, 2, 0, 0, bf90, 0x77) + err(ts, z111, __LINE__, 0, 0, bf90, 0x77) } CopyObject(0x9999992b, bf90) if (LNotEqual(bf90, 0x2b)) { - err(ts, z111, 3, 0, 0, bf90, 0x2b) + err(ts, z111, __LINE__, 0, 0, bf90, 0x2b) } } @@ -789,7 +789,7 @@ Method(m236,, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z111, 8, 0, 0, Local0, arg1) + err(ts, z111, __LINE__, 0, 0, Local0, arg1) } // Overwrite LocalX which contains either @@ -1774,9 +1774,9 @@ Method(m354,, Serialized) Store(RefOf(i000), Local0) if (0) { // This is a reference - CH03(ts, 0, 0, 0, 0) + CH03(ts, 0, 0, __LINE__, 0) Add(Local0, 1, Local7) - CH04(ts, 0, 0xff, 0, 0, 0, 0) + CH04(ts, 0, 0xff, 0, __LINE__, 0, 0) } m1a3(Local0, c009, 0, 0, 2) m380(ts, DerefOf(Local0), 0, 3) @@ -1830,9 +1830,9 @@ Method(m355,, Serialized) CopyObject(RefOf(i000), Local0) if (0) { // This is a reference - CH03(ts, 0, 2, 0, 0) + CH03(ts, 0, 2, __LINE__, 0) Add(Local0, 1, Local7) - CH04(ts, 0, 0xff, 0, 1, 0, 0) + CH04(ts, 0, 0xff, 0, __LINE__, 0, 0) } m1a3(Local0, c009, 0, 0, 0) m380(ts, DerefOf(Local0), 0, 1) @@ -1921,9 +1921,9 @@ Method(m356, 1, Serialized) Store(RefOf(i000), arg0) if (0) { // This is a reference - CH03(ts, 0, 4, 0, 0) + CH03(ts, 0, 4, __LINE__, 0) Add(arg0, 1, Local7) - CH04(ts, 0, 0xff, 0, 2, 0, 0) + CH04(ts, 0, 0xff, 0, __LINE__, 0, 0) } m1a3(arg0, c009, 0, 0, 0) m380(ts, DerefOf(arg0), 0, 1) @@ -1977,9 +1977,9 @@ Method(m357, 1, Serialized) CopyObject(RefOf(i000), arg0) if (0) { // This is a reference - CH03(ts, 0, 6, 0, 0) + CH03(ts, 0, 6, __LINE__, 0) Add(arg0, 1, Local7) - CH04(ts, 0, 0xff, 0, 3, 0, 0) + CH04(ts, 0, 0xff, 0, __LINE__, 0, 0) } m1a3(arg0, c009, 0, 0, 0) m380(ts, DerefOf(arg0), 0, 1) @@ -2061,9 +2061,9 @@ Method(m358,, Serialized) Store(RefOf(i000), iii0) if (0) { // This is a reference - CH03(ts, 0, 8, 0, 0) + CH03(ts, 0, 8, __LINE__, 0) Add(iii0, 1, Local7) - CH04(ts, 0, 0xff, 0, 4, 0, 0) + CH04(ts, 0, 0xff, 0, __LINE__, 0, 0) } m1a3(iii0, c009, 0, 0, 0) m380(ts, DerefOf(iii0), 0, 1) @@ -2119,9 +2119,9 @@ Method(m359,, Serialized) CopyObject(RefOf(i000), iii0) if (0) { // This is a reference - CH03(ts, 0, 10, 0, 0) + CH03(ts, 0, 10, __LINE__, 0) Add(iii0, 1, Local7) - CH04(ts, 0, 0xff, 0, 5, 0, 0) + CH04(ts, 0, 0xff, 0, __LINE__, 0, 0) } m1a3(iii0, c009, 0, 0, 0) m380(ts, DerefOf(iii0), 0, 1) @@ -2994,9 +2994,9 @@ Method(m26c) */ Method(m26d) { - CH03("m26d", 0, 0, 0, 0) + CH03("m26d", 0, 0, __LINE__, 0) m1ae("m26d", "Buffer total", "Not implemented yet") - CH03("m26d", 0, 1, 0, 0) + CH03("m26d", 0, 1, __LINE__, 0) } /* @@ -3012,7 +3012,7 @@ Method(m26e,, Serialized) Store(ts, Debug) } - CH03(ts, 0, 0, 0, 0) + CH03(ts, 0, 0, __LINE__, 0) // Store m365() @@ -3020,7 +3020,7 @@ Method(m26e,, Serialized) // CopyObject m366() - CH03(ts, 0, 1, 0, 0) + CH03(ts, 0, 1, __LINE__, 0) } Method(m365,, Serialized) @@ -3355,12 +3355,12 @@ Method(m366,, Serialized) */ Method(m26f) { - CH03("m26f", 0, 0, 0, 0) + CH03("m26f", 0, 0, __LINE__, 0) m1ae("m26f", "All the legal ways of writing IRef reference to some target location", "Not implemented yet") - CH03("m26f", 0, 1, 0, 0) + CH03("m26f", 0, 1, __LINE__, 0) } /* @@ -3370,7 +3370,7 @@ Method(m270,, Serialized) { Name(ts, "m270") - CH03(ts, 0, 0, 0, 0) + CH03(ts, 0, 0, __LINE__, 0) if (y100) { ts00(ts) @@ -3378,22 +3378,22 @@ Method(m270,, Serialized) Store(ts, Debug) } - CH03(ts, 0, 1, 0, 0) + CH03(ts, 0, 1, __LINE__, 0) // Store m367() - CH03(ts, 0, 2, 0, 0) + CH03(ts, 0, 2, __LINE__, 0) // CopyObject m368() - CH03(ts, 0, 3, 0, 0) + CH03(ts, 0, 3, __LINE__, 0) m1ae("m270", "All the legal sources of references (ORef and IRef)", "Started, but not implemented yet") - CH03(ts, 0, 4, 0, 0) + CH03(ts, 0, 4, __LINE__, 0) } Method(m367,, Serialized) @@ -3643,7 +3643,7 @@ Method(m341,, Serialized) Store(DerefOf(Arg0), Local0) Add(Local0, 5, Local7) if (LNotEqual(Local7, 0x1928374b)) { - err(ts, z111, 9, 0, 0, Local7, 0x1928374b) + err(ts, z111, __LINE__, 0, 0, Local7, 0x1928374b) } } @@ -3683,7 +3683,7 @@ Method(m343,, Serialized) Store(DerefOf(Arg0), Local0) Add(Local0, 5, Local7) if (LNotEqual(Local7, 19)) { - err(ts, z111, 10, 0, 0, Local7, 19) + err(ts, z111, __LINE__, 0, 0, Local7, 19) } } @@ -3702,7 +3702,7 @@ Method(m344,, Serialized) { Add(Arg0, 5, Local7) if (LNotEqual(Local7, 19)) { - err(ts, z111, 11, 0, 0, Local7, 19) + err(ts, z111, __LINE__, 0, 0, Local7, 19) } } @@ -3729,11 +3729,11 @@ Method(m345,, Serialized) Store(0x90, Local0) if (LNotEqual(Local0, 0x90)) { - err(ts, z111, 12, 0, 0, Local0, 0x90) + err(ts, z111, __LINE__, 0, 0, Local0, 0x90) } Store(0x91, Local1) if (LNotEqual(Local1, 0x91)) { - err(ts, z111, 13, 0, 0, Local1, 0x91) + err(ts, z111, __LINE__, 0, 0, Local1, 0x91) } } @@ -3744,11 +3744,11 @@ Method(m345,, Serialized) CopyObject(0x94, Local0) if (LNotEqual(Local0, 0x94)) { - err(ts, z111, 14, 0, 0, Local0, 0x94) + err(ts, z111, __LINE__, 0, 0, Local0, 0x94) } CopyObject(0x95, Local1) if (LNotEqual(Local1, 0x95)) { - err(ts, z111, 15, 0, 0, Local1, 0x95) + err(ts, z111, __LINE__, 0, 0, Local1, 0x95) } } @@ -3827,24 +3827,24 @@ Method(m346,, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z111, 16, 0, 0, Local1, c009) + err(ts, z111, __LINE__, 0, 0, Local1, c009) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, ISZ0)) { - err(ts, z111, 17, 0, 0, Local1, ISZ0) + err(ts, z111, __LINE__, 0, 0, Local1, ISZ0) } if (LNotEqual(Local6, 0xabcd0000)) { - err(ts, z111, 18, 0, 0, Local6, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local6, 0xabcd0000) } if (LNotEqual(Local7, 0x11111111)) { - err(ts, z111, 19, 0, 0, Local7, 0x11111111) + err(ts, z111, __LINE__, 0, 0, Local7, 0x11111111) } } } m000(i000) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 20, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } } @@ -3859,21 +3859,21 @@ Method(m347,, Serialized) Store(DerefOf(RefOf(arg0)), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z111, 21, 0, 0, Local1, c009) + err(ts, z111, __LINE__, 0, 0, Local1, c009) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, ISZ0)) { - err(ts, z111, 22, 0, 0, Local1, ISZ0) + err(ts, z111, __LINE__, 0, 0, Local1, ISZ0) } if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z111, 23, 0, 0, Local0, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local0, 0xabcd0000) } } } m000(i000) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 24, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } } @@ -3889,7 +3889,7 @@ Method(m348,, Serialized) Store(DeRefOf(Local0), Local1) Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0xabcd0000)) { - err(ts, z111, 25, 0, 0, Local2, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local2, 0xabcd0000) } Store(0x11111111, RefOf(arg0)) @@ -3897,23 +3897,23 @@ Method(m348,, Serialized) Store(0x11111111, Local0) if (LNotEqual(Local0, 0x11111111)) { - err(ts, z111, 26, 0, 0, Local0, 0x11111111) + err(ts, z111, __LINE__, 0, 0, Local0, 0x11111111) } } m000(RefOf(i000)) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 27, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } Store(RefOf(i000), Local0) m000(Local0) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 28, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0xabcd0000)) { - err(ts, z111, 29, 0, 0, Local2, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local2, 0xabcd0000) } } @@ -3929,7 +3929,7 @@ Method(m349,, Serialized) Store(DeRefOf(RefOf(arg0)), Local1) Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0xabcd0000)) { - err(ts, z111, 30, 0, 0, Local2, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local2, 0xabcd0000) } } @@ -3943,18 +3943,18 @@ Method(m349,, Serialized) m000(RefOf(i000)) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 31, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } Store(RefOf(i000), Local0) m000(Local0) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 32, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0xabcd0000)) { - err(ts, z111, 33, 0, 0, Local2, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local2, 0xabcd0000) } } @@ -3962,18 +3962,18 @@ Method(m349,, Serialized) m001(RefOf(i001)) if (LNotEqual(i001, 0x11111111)) { - err(ts, z111, 34, 0, 0, i001, 0x11111111) + err(ts, z111, __LINE__, 0, 0, i001, 0x11111111) } Store(RefOf(i001), Local0) m001(Local0) if (LNotEqual(i001, 0x11111111)) { - err(ts, z111, 35, 0, 0, i001, 0x11111111) + err(ts, z111, __LINE__, 0, 0, i001, 0x11111111) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x11111111)) { - err(ts, z111, 36, 0, 0, Local2, 0x11111111) + err(ts, z111, __LINE__, 0, 0, Local2, 0x11111111) } } } @@ -3988,7 +3988,7 @@ Method(m34a,, Serialized) { Store(DeRefOf(arg0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 37, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4000,7 +4000,7 @@ Method(m34a,, Serialized) Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 38, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4011,7 +4011,7 @@ Method(m34a,, Serialized) Store(0x11111111, Local0) if (LNotEqual(Local0, 0x11111111)) { - err(ts, z111, 39, 0, 0, Local0, 0x11111111) + err(ts, z111, __LINE__, 0, 0, Local0, 0x11111111) } } @@ -4019,105 +4019,105 @@ Method(m34a,, Serialized) m000(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 40, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(Index(b000, 2), Local0) m000(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 41, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 42, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } Store(Index(b000, 2, Local0), Local1) m000(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 43, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 44, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } m000(Local1) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 45, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 46, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } // m001 m001(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 47, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(Index(b000, 2), Local0) m001(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 48, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 49, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } Store(Index(b000, 2, Local0), Local1) m001(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 50, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 51, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } m001(Local1) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 52, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 53, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } // m002 m002(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 54, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(Index(b000, 2), Local0) m002(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 55, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 56, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } Store(Index(b000, 2, Local0), Local1) m002(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 57, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 58, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } m002(Local1) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 59, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 60, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4132,7 +4132,7 @@ Method(m34b,, Serialized) { Store(DeRefOf(arg0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 61, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4143,7 +4143,7 @@ Method(m34b,, Serialized) Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 62, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4157,75 +4157,75 @@ Method(m34b,, Serialized) m000(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 63, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(Index(b000, 2), Local0) m000(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 64, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 65, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } Store(Index(b000, 2, Local0), Local1) m000(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 66, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 67, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } m000(Local1) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 68, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 69, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } // m001 m001(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 70, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(Index(b000, 2), Local0) m001(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 71, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 72, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } Store(Index(b000, 2, Local0), Local1) m001(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 73, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 74, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } m001(Local1) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 75, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } if (y512) { Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 76, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4233,40 +4233,40 @@ Method(m34b,, Serialized) m002(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x11,4,5})) { - err(ts, z111, 77, 0, 0, b000, Buffer() {1,2,0x11,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x11,4,5}) } Store(Index(b000, 2), Local0) m002(Local0) if (LNotEqual(b000, Buffer() {1,2,0x11,4,5})) { - err(ts, z111, 78, 0, 0, b000, Buffer() {1,2,0x11,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x11,4,5}) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x11)) { - err(ts, z111, 79, 0, 0, Local2, 0x11) + err(ts, z111, __LINE__, 0, 0, Local2, 0x11) } } Store(Index(b000, 2, Local0), Local1) m002(Local0) if (LNotEqual(b000, Buffer() {1,2,0x11,4,5})) { - err(ts, z111, 80, 0, 0, b000, Buffer() {1,2,0x11,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x11,4,5}) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x11)) { - err(ts, z111, 81, 0, 0, Local2, 0x11) + err(ts, z111, __LINE__, 0, 0, Local2, 0x11) } } m002(Local1) if (LNotEqual(b000, Buffer() {1,2,0x11,4,5})) { - err(ts, z111, 82, 0, 0, b000, Buffer() {1,2,0x11,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x11,4,5}) } if (y512) { Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x11)) { - err(ts, z111, 83, 0, 0, Local2, 0x11) + err(ts, z111, __LINE__, 0, 0, Local2, 0x11) } } } @@ -4299,18 +4299,18 @@ Method(m34c,, Serialized) Store(ObjectType(Local2), Local3) if (LNotEqual(Local3, arg1)) { - err(ts, z111, 84, 0, 0, Local3, arg1) + err(ts, z111, __LINE__, 0, 0, Local3, arg1) } Store(Index(Local2, 1, Local0), Local1) Store(0x90, Local0) if (LNotEqual(Local0, 0x90)) { - err(ts, z111, 85, 0, 0, Local0, 0x90) + err(ts, z111, __LINE__, 0, 0, Local0, 0x90) } Store(0x91, Local1) if (LNotEqual(Local1, 0x91)) { - err(ts, z111, 86, 0, 0, Local1, 0x91) + err(ts, z111, __LINE__, 0, 0, Local1, 0x91) } } @@ -4323,11 +4323,11 @@ Method(m34c,, Serialized) CopyObject(0x94, Local0) if (LNotEqual(Local0, 0x94)) { - err(ts, z111, 87, 0, 0, Local0, 0x94) + err(ts, z111, __LINE__, 0, 0, Local0, 0x94) } CopyObject(0x95, Local1) if (LNotEqual(Local1, 0x95)) { - err(ts, z111, 88, 0, 0, Local1, 0x95) + err(ts, z111, __LINE__, 0, 0, Local1, 0x95) } } @@ -4365,7 +4365,7 @@ Method(m34c,, Serialized) Store(DerefOf(Local0), Local2) if (LNotEqual(Local2, 0x2b)) { - err(ts, z111, 89, 0, 0, Local2, 0x2b) + err(ts, z111, __LINE__, 0, 0, Local2, 0x2b) } } @@ -4571,7 +4571,7 @@ Method(m34d, 1, Serialized) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg2)) { - err(ts, z111, 90, 0, 0, Local0, arg2) + err(ts, z111, __LINE__, 0, 0, Local0, arg2) } if (op00) { @@ -4781,7 +4781,7 @@ Method(m34e, 1, Serialized) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg2)) { - err(ts, z111, 91, 0, 0, Local0, arg2) + err(ts, z111, __LINE__, 0, 0, Local0, arg2) } if (op00) { CopyObject(0x2b, arg0) @@ -4913,11 +4913,11 @@ Method(m351, 1, Serialized) Store(Index(arg0, lpC0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z111, 92, 0, 0, Local1, c009) + err(ts, z111, __LINE__, 0, 0, Local1, c009) } else { Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, Local6)) { - err(ts, z111, 93, 0, 0, Local1, Local6) + err(ts, z111, __LINE__, 0, 0, Local1, Local6) } } Increment(Local6) @@ -5112,12 +5112,12 @@ Method(mfab,, Serialized) Index(p000, 15, Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c01c)) { - err("mfab", z111, 94, 0, 0, Local1, c01c) + err("mfab", z111, __LINE__, 0, 0, Local1, c01c) } Store(ObjectType(DerefOf(Local0)), Local1) if (LNotEqual(Local1, c01c)) { - err("mfab", z111, 95, 0, 0, Local1, c01c) + err("mfab", z111, __LINE__, 0, 0, Local1, c01c) } } @@ -5160,14 +5160,14 @@ Method(mfad,, Serialized) Store(ObjectType(Local0), Local1) Store(Local1, Debug) if (LNotEqual(Local1, c01c)) { - err("mfad", z111, 96, 0, 0, Local1, c01c) + err("mfad", z111, __LINE__, 0, 0, Local1, c01c) } } else { /* * ObjectType here falls into the infinitive loop. * Sort this out! */ - err("mfad", z111, 97, 0, 0, 0, 0) + err("mfad", z111, __LINE__, 0, 0, 0, 0) } } @@ -5210,14 +5210,14 @@ Method(mfc3,, Serialized) Store(SizeOf(Local0), Local1) Store(Local1, Debug) if (LNotEqual(Local1, 100)) { - err("mfc3", z111, 98, 0, 0, Local1, 100) + err("mfc3", z111, __LINE__, 0, 0, Local1, 100) } } else { /* * SizeOf here falls into the infinitive loop. * Sort this out! */ - err("mfc3", z111, 99, 0, 0, 0, 0) + err("mfc3", z111, __LINE__, 0, 0, 0, 0) } } @@ -5261,14 +5261,14 @@ Method(mfc4,, Serialized) Store(DerefOf(Local0), Local1) Store(Local1, Debug) if (LNotEqual(Local1, 100)) { - err("mfc4", z111, 100, 0, 0, Local1, 100) + err("mfc4", z111, __LINE__, 0, 0, Local1, 100) } } else { /* * SizeOf here falls into the infinitive loop. * Sort this out! */ - err("mfc4", z111, 101, 0, 0, 0, 0) + err("mfc4", z111, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl index 88e32ec..cebe9d8 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl @@ -55,10 +55,10 @@ Method(m1a7, 7, Serialized) } } - CH03(ts, z081, 0x200, arg6, arg6) + CH03(ts, z081, 0x200, __LINE__, arg6) /* // FILE BUG: hangs without printing error - Store(CH03(ts, z081, 0x200, arg6, arg6), Local0) + Store(CH03(ts, z081, 0x200, __LINE__, arg6), Local0) if (Local0) { Concatenate("Operation: 0x", arg6, Local0) Store(Local0, Debug) @@ -74,11 +74,11 @@ Method(m1a7, 7, Serialized) } } - CH04(c080, 0, 0xff, z081, 0x201, arg6, arg6) + CH04(c080, 0, 0xff, z081, __LINE__, arg6, arg6) /* // FILE BUG: hangs without printing error - Store(CH04(c080, 0, 0xff, z081, 0x201, arg6, arg6), Local0) + Store(CH04(c080, 0, 0xff, z081, __LINE__, arg6, arg6), Local0) if (Local0) { Concatenate("Operation: 0x", arg6, Local0) Store(Local0, Debug) @@ -99,7 +99,7 @@ Method(m1a7, 7, Serialized) */ Method(m167, 1, Serialized) { - CH03("m167", z081, 0x206, 56, 56) + CH03("m167", z081, 0x206, __LINE__, 56) Switch (ToInteger (arg0)) { Case (0) { Store(0, Local7) @@ -108,7 +108,7 @@ Method(m167, 1, Serialized) Store(1, Local7) } } - CH04(c080, 0, 0xff, z081, 0x207, 56, 56) + CH04(c080, 0, 0xff, z081, __LINE__, 56, 56) } // Check reaction on OPERAND-REFERENCE (exceptions are expected in most cases) @@ -128,34 +128,34 @@ Method(m1a8, 3, Serialized) // If Method(m001, 1) { - CH03(ts, z081, 0x202, 54, 54) + CH03(ts, z081, 0x202, __LINE__, 54) if (arg0) { Store(0, Local7) } - CH04(c080, 0, 0xff, z081, 0x203, 54, 54) + CH04(c080, 0, 0xff, z081, __LINE__, 54, 54) } // ElseIf Method(m002, 1) { - CH03(ts, z081, 0x204, 55, 55) + CH03(ts, z081, 0x204, __LINE__, 55) if (0) { Store(0, Local7) } elseif (arg0) { Store(1, Local7) } - CH04(c080, 0, 0xff, z081, 0x205, 55, 55) + CH04(c080, 0, 0xff, z081, __LINE__, 55, 55) } // While Method(m004, 1) { - CH03(ts, z081, 0x208, 58, 58) + CH03(ts, z081, 0x208, __LINE__, 58) While (arg0) { Store(0, Local7) Break } - CH04(c080, 0, 0xff, z081, 0x209, 58, 58) + CH04(c080, 0, 0xff, z081, __LINE__, 58, 58) } // Set parameters of current checking @@ -197,33 +197,33 @@ Method(m1a8, 3, Serialized) if (rn00) { // CondRefOf - CH03(ts, z081, 0x20a, 0, 0) + CH03(ts, z081, 0x20a, __LINE__, 0) m480(arg0, 0, 0, 0, 0, 0, 5) - CH03(ts, z081, 0x20b, 0, 0) + CH03(ts, z081, 0x20b, __LINE__, 0) } if (rn01) { // DerefOf - CH03(ts, z081, 0x20c, 0, 0) + CH03(ts, z081, 0x20c, __LINE__, 0) m480(arg0, 0, 0, 0, 0, 0, 8) - CH03(ts, z081, 0x20d, 0, 0) + CH03(ts, z081, 0x20d, __LINE__, 0) } if (rn02) { // ObjectType - CH03(ts, z081, 0x20e, 0, 0) + CH03(ts, z081, 0x20e, __LINE__, 0) m480(arg0, 0, 0, 0, 0, 0, 32) - CH03(ts, z081, 0x20f, 0, 0) + CH03(ts, z081, 0x20f, __LINE__, 0) } if (rn03) { // RefOf - CH03(ts, z081, 0x210, 0, 0) + CH03(ts, z081, 0x210, __LINE__, 0) m480(arg0, 0, 0, 0, 0, 0, 34) - CH03(ts, z081, 0x211, 0, 0) + CH03(ts, z081, 0x211, __LINE__, 0) } if (rn04) { @@ -263,9 +263,9 @@ Method(m1a8, 3, Serialized) } if (Local0) { - CH03(ts, z081, 0x212, 0, 0) + CH03(ts, z081, 0x212, __LINE__, 0) m480(arg0, 0, 0, 0, 0, 0, 41) - CH03(ts, z081, 0x213, 0, 0) + CH03(ts, z081, 0x213, __LINE__, 0) } else { m1a7(arg0, 0, 0, 0, 0, 0, 41) } @@ -276,18 +276,18 @@ Method(m1a8, 3, Serialized) // CopyObject - CH03(ts, z081, 0x214, 0, 0) + CH03(ts, z081, 0x214, __LINE__, 0) CopyObject(arg0, Local7) - CH03(ts, z081, 0x215, 0, 0) + CH03(ts, z081, 0x215, __LINE__, 0) } if (rn06) { // Return - CH03(ts, z081, 0x216, 0, 0) + CH03(ts, z081, 0x216, __LINE__, 0) m000(arg0) - CH03(ts, z081, 0x217, 0, 0) + CH03(ts, z081, 0x217, __LINE__, 0) } if (rn07) { @@ -490,9 +490,9 @@ Method(m1a8, 3, Serialized) // Store - CH03(ts, z081, 0x218, 0, 0) + CH03(ts, z081, 0x218, __LINE__, 0) Store(arg0, Local7) - CH03(ts, z081, 0x219, 0, 0) + CH03(ts, z081, 0x219, __LINE__, 0) // Subtract @@ -817,11 +817,11 @@ Method(m106,, Serialized) Method(m000, 1) { - CH03(ts, z081, 72, 0, 0) + CH03(ts, z081, 72, __LINE__, 0) Store(DerefOf(RefOf(DerefOf(RefOf(arg0)))), Debug) - CH04(c080, 0, 0xff, z081, 73, 0, 0) + CH04(c080, 0, 0xff, z081, __LINE__, 0, 0) } m000(i000) diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl index 66877cd..15b7e14 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl @@ -48,11 +48,11 @@ Method(m1b3,, Serialized) if (arg0) { Store(0, Local7) } - CH03(ts, z109, 0, 0, 0) + CH03(ts, z109, 0, __LINE__, 0) Store(Local7, Local0) if (LNot(SLCK)) { - CH04(ts, 0, 0xff, z109, 1, 0, 0) + CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) } } @@ -63,46 +63,46 @@ Method(m1b3,, Serialized) Store(i900, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(ts, z109, 2, 0, 0, Local7, c009) + err(ts, z109, __LINE__, 0, 0, Local7, c009) } Store(s900, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00a)) { - err(ts, z109, 3, 0, 0, Local7, c00a) + err(ts, z109, __LINE__, 0, 0, Local7, c00a) } Store(b900, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00b)) { - err(ts, z109, 4, 0, 0, Local7, c00b) + err(ts, z109, __LINE__, 0, 0, Local7, c00b) } Store(p900, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00c)) { - err(ts, z109, 5, 0, 0, Local7, c00c) + err(ts, z109, __LINE__, 0, 0, Local7, c00c) } Store(f900, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(ts, z109, 6, 0, 0, Local7, c009) + err(ts, z109, __LINE__, 0, 0, Local7, c009) } /* // Removed 09/2015. iASL now disallows these stores - CH03(ts, z109, 7, 0, 0) + CH03(ts, z109, 7, __LINE__, 0) Store(d900, Local0) if (LNot(SLCK)){ - CH04(ts, 0, 0xff, z109, 8, 0, 0) + CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) } - CH03(ts, z109, 9, 0, 0) + CH03(ts, z109, 9, __LINE__, 0) Store(e900, Local0) if (LNot(SLCK)){ - CH04(ts, 0, 0xff, z109, 10, 0, 0) + CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) } */ /* @@ -114,49 +114,49 @@ Method(m1b3,, Serialized) * invacation. */ if (X114) { - CH03(ts, z109, 11, 0, 0) + CH03(ts, z109, 11, __LINE__, 0) Store(m901, Local0) - //CH04(ts, 0, 0xff, z109, 12, 0, 0) + //CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) } /* // Removed 09/2015. iASL now disallows these stores - CH03(ts, z109, 13, 0, 0) + CH03(ts, z109, 13, __LINE__, 0) Store(mx90, Local0) if (LNot(SLCK)){ - CH04(ts, 0, 0xff, z109, 14, 0, 0) + CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) } - CH03(ts, z109, 15, 0, 0) + CH03(ts, z109, 15, __LINE__, 0) Store(r900, Local0) if (LNot(SLCK)){ - CH04(ts, 0, 0xff, z109, 16, 0, 0) + CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) } - CH03(ts, z109, 17, 0, 0) + CH03(ts, z109, 17, __LINE__, 0) Store(pw90, Local0) if (LNot(SLCK)){ - CH04(ts, 0, 0xff, z109, 18, 0, 0) + CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) } - CH03(ts, z109, 19, 0, 0) + CH03(ts, z109, 19, __LINE__, 0) Store(pr90, Local0) if (LNot(SLCK)){ - CH04(ts, 0, 0xff, z109, 20, 0, 0) + CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) } - CH03(ts, z109, 21, 0, 0) + CH03(ts, z109, 21, __LINE__, 0) Store(tz90, Local0) if (LNot(SLCK)) { - CH04(ts, 0, 0xff, z109, 22, 0, 0) + CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) } */ Store(bf90, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(ts, z109, 23, 0, 0, Local7, c009) + err(ts, z109, __LINE__, 0, 0, Local7, c009) } } diff --git a/tests/aslts/src/runtime/collections/functional/region/bankfield.asl b/tests/aslts/src/runtime/collections/functional/region/bankfield.asl index 72fea15..fb82027 100644 --- a/tests/aslts/src/runtime/collections/functional/region/bankfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/bankfield.asl @@ -69,9 +69,9 @@ OperationRegion(OPRj, SystemIO, 0x230, 0x133) Method(m7bf, 4) { if (LNotEqual(ObjectType(arg1), ObjectType(arg2))) { - err(arg0, z145, arg3, 0, 0, ObjectType(arg1), ObjectType(arg2)) + err(arg0, z145, __LINE__, 0, 0, ObjectType(arg1), ObjectType(arg2)) } elseif (LNotEqual(arg1, arg2)) { - err(arg0, z145, arg3, 0, 0, arg1, arg2) + err(arg0, z145, __LINE__, 0, 0, arg1, arg2) } } @@ -400,7 +400,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 11, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -528,7 +528,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z145, 12, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -656,7 +656,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z145, 13, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -784,7 +784,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z145, 14, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -912,7 +912,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z145, 15, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1040,7 +1040,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z145, 16, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1168,7 +1168,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z145, 17, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1296,7 +1296,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z145, 18, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1424,7 +1424,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z145, 19, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1552,7 +1552,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z145, 20, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1680,7 +1680,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z145, 21, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1808,7 +1808,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z145, 22, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1936,7 +1936,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z145, 23, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2064,7 +2064,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z145, 24, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2192,7 +2192,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z145, 25, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2320,13 +2320,13 @@ Method(m7d0, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 26, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z145, 27, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return} } @@ -2520,7 +2520,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 28, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2648,7 +2648,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z145, 29, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2776,7 +2776,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z145, 30, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2904,7 +2904,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z145, 31, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3032,7 +3032,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z145, 32, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3160,7 +3160,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z145, 33, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3288,7 +3288,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z145, 34, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3416,7 +3416,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z145, 35, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3544,7 +3544,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z145, 36, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3672,7 +3672,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z145, 37, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3800,7 +3800,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z145, 38, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3928,7 +3928,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z145, 39, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4056,7 +4056,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z145, 40, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4184,7 +4184,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z145, 41, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4312,7 +4312,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z145, 42, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4440,13 +4440,13 @@ Method(m7d1, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 43, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z145, 44, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return} } @@ -4640,7 +4640,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 45, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4768,7 +4768,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z145, 46, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4896,7 +4896,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z145, 47, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5024,7 +5024,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z145, 48, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5152,7 +5152,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z145, 49, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5280,7 +5280,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z145, 50, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5408,7 +5408,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z145, 51, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5536,7 +5536,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z145, 52, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5664,7 +5664,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z145, 53, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5792,7 +5792,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z145, 54, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5920,7 +5920,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z145, 55, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6048,7 +6048,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z145, 56, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6176,7 +6176,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z145, 32, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6312,7 +6312,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z145, 57, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6440,7 +6440,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z145, 58, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6568,13 +6568,13 @@ Method(m7d2, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 59, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z145, 60, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return} } @@ -6768,7 +6768,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 61, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6896,7 +6896,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z145, 62, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7024,7 +7024,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z145, 63, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7152,7 +7152,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z145, 64, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7280,7 +7280,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z145, 65, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7408,7 +7408,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z145, 66, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7536,7 +7536,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z145, 67, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7664,7 +7664,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z145, 68, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7792,7 +7792,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z145, 69, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7920,7 +7920,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z145, 70, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8048,7 +8048,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z145, 71, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8176,7 +8176,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z145, 72, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8304,7 +8304,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z145, 73, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8432,7 +8432,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z145, 74, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8560,7 +8560,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z145, 75, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8688,13 +8688,13 @@ Method(m7d3, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 76, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z145, 77, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return} } @@ -8888,7 +8888,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 78, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9016,7 +9016,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z145, 79, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9144,7 +9144,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z145, 80, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9272,7 +9272,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z145, 81, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9400,7 +9400,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z145, 82, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9528,7 +9528,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z145, 83, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9656,7 +9656,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z145, 84, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9784,7 +9784,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z145, 85, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9912,7 +9912,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z145, 86, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10040,7 +10040,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z145, 87, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10168,7 +10168,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z145, 88, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10296,7 +10296,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z145, 89, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10424,7 +10424,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z145, 90, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10552,7 +10552,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z145, 91, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10680,7 +10680,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z145, 92, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10808,13 +10808,13 @@ Method(m7d4, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 93, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z145, 94, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return} } @@ -11572,7 +11572,7 @@ Method(m7c8, 1, Serialized) } if (LNotEqual(bf03, i000)) { - err(arg0, z145, arg2, 0, 0, bf03, i000) + err(arg0, z145, __LINE__, 0, 0, bf03, i000) } } @@ -11581,13 +11581,13 @@ Method(m7c8, 1, Serialized) Store(i000, bf00) if (LNotEqual(bf00, i000)) { - err(arg0, z145, 115, 0, 0, bf00, i000) + err(arg0, z145, __LINE__, 0, 0, bf00, i000) } if (LNotEqual(bf01, i000)) { - err(arg0, z145, 116, 0, 0, bf00, i000) + err(arg0, z145, __LINE__, 0, 0, bf00, i000) } if (LNotEqual(bf02, i000)) { - err(arg0, z145, 117, 0, 0, bf00, i000) + err(arg0, z145, __LINE__, 0, 0, bf00, i000) } // diff --git a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl index 8ad59cc..d8aacf4 100644 --- a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl +++ b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl @@ -115,16 +115,16 @@ Method(m7f0, 1) \DTR0._REG(0x101, 2) if (LNotEqual(\DTR0.IRSK, 1)) { - err(arg0, z142, 1, 0, 0, \DTR0.IRSK, 1) + err(arg0, z142, __LINE__, 0, 0, \DTR0.IRSK, 1) } if (LNotEqual(\DTR0.IFLG, 1)) { - err(arg0, z142, 2, 0, 0, \DTR0.IFLG, 1) + err(arg0, z142, __LINE__, 0, 0, \DTR0.IFLG, 1) } if (LNotEqual(\DTR0.VRSK, 2)) { - err(arg0, z142, 3, 0, 0, \DTR0.VRSK, 2) + err(arg0, z142, __LINE__, 0, 0, \DTR0.VRSK, 2) } if (LNotEqual(Derefof(Index(\DTR0.VFLG, 1)), 2)) { - err(arg0, z142, 4, 0, 0, Derefof(Index(\DTR0.VFLG, 1)), 2) + err(arg0, z142, __LINE__, 0, 0, Derefof(Index(\DTR0.VFLG, 1)), 2) } } @@ -175,34 +175,34 @@ Method(m7f1, 1, Serialized) Concatenate(arg0, "-m7f1", arg0) if (LNotEqual(VRSK, 0)) { - err(arg0, z142, 5, 0, 0, VRSK, 0) + err(arg0, z142, __LINE__, 0, 0, VRSK, 0) } if (LNotEqual(Derefof(Index(VFLG, 1)), 0)) { - err(arg0, z142, 6, 0, 0, Derefof(Index(VFLG, 1)), 0) + err(arg0, z142, __LINE__, 0, 0, Derefof(Index(VFLG, 1)), 0) } DataTableRegion (DR00, "SSDT", "", "") if (LNotEqual(IRSK, 0)) { - err(arg0, z142, 8, 0, 0, IRSK, 0) + err(arg0, z142, __LINE__, 0, 0, IRSK, 0) } if (LNotEqual(IFLG, 0)) { - err(arg0, z142, 9, 0, 0, IFLG, 0) + err(arg0, z142, __LINE__, 0, 0, IFLG, 0) } _REG(0x101, 2) if (LNotEqual(IRSK, 1)) { - err(arg0, z142, 10, 0, 0, IRSK, 1) + err(arg0, z142, __LINE__, 0, 0, IRSK, 1) } if (LNotEqual(IFLG, 1)) { - err(arg0, z142, 11, 0, 0, IFLG, 1) + err(arg0, z142, __LINE__, 0, 0, IFLG, 1) } if (LNotEqual(VRSK, 1)) { - err(arg0, z142, 12, 0, 0, VRSK, 1) + err(arg0, z142, __LINE__, 0, 0, VRSK, 1) } if (LNotEqual(Derefof(Index(VFLG, 1)), 1)) { - err(arg0, z142, 13, 0, 0, Derefof(Index(VFLG, 1)), 1) + err(arg0, z142, __LINE__, 0, 0, Derefof(Index(VFLG, 1)), 1) } } @@ -221,12 +221,12 @@ Method(m7f2, 1, Serialized) Store(Derefof(Local0), Local2) - CH03(arg0, z142, 16, 0, 0) + CH03(arg0, z142, 16, __LINE__, 0) Store(\DTR0.SSDT, Local3) if (LNotEqual(Local2, Local3)) { - err(arg0, z142, 17, 0, 0, Local2, Local3) + err(arg0, z142, __LINE__, 0, 0, Local2, Local3) } } @@ -249,7 +249,7 @@ Method(m7f3, 1, Serialized) Store(\DTR0.SSDT, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z142, 18, 0, 0, Local0, Local1) + err(arg0, z142, __LINE__, 0, 0, Local0, Local1) } } @@ -264,7 +264,7 @@ Method(m7f3, 1, Serialized) Store(\DTR0.SSDT, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z142, 19, 0, 0, Local0, Local1) + err(arg0, z142, __LINE__, 0, 0, Local0, Local1) } } @@ -279,7 +279,7 @@ Method(m7f3, 1, Serialized) Store(\DTR0.SSDT, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z142, 20, 0, 0, Local0, Local1) + err(arg0, z142, __LINE__, 0, 0, Local0, Local1) } } @@ -298,7 +298,7 @@ Method(m7f3, 1, Serialized) Store(\DTR0.SSDT, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z142, 21, 0, 0, Local0, Local1) + err(arg0, z142, __LINE__, 0, 0, Local0, Local1) } } @@ -316,7 +316,7 @@ Method(m7f3, 1, Serialized) Store(\DTR0.SSDT, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z142, 22, 0, 0, Local0, Local1) + err(arg0, z142, __LINE__, 0, 0, Local0, Local1) } } @@ -343,7 +343,7 @@ Method(m7f4, 1) Store(ToString(FU00, 4), Local0) if (LNotEqual(Local0, arg1)) { - err(arg0, z142, arg2, 0, 0, Local0, arg1) + err(arg0, z142, __LINE__, 0, 0, Local0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/functional/region/indexfield.asl b/tests/aslts/src/runtime/collections/functional/region/indexfield.asl index 40b40e3..e4e141b 100644 --- a/tests/aslts/src/runtime/collections/functional/region/indexfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/indexfield.asl @@ -100,25 +100,25 @@ Method(m770, 1, Serialized) Store(ObjectType(reg0), Local0) Store(c00d, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z144, 1, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(ObjectType(reg1), Local0) Store(c00d, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z144, 2, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(ObjectType(reg2), Local0) Store(c00d, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 3, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(ObjectType(reg3), Local0) Store(c00d, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 4, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } // Check actual writes to the IndexField(s). @@ -131,7 +131,7 @@ Method(m770, 1, Serialized) Store(fk32, Local0) Store(0xF11A, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 5, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(i000, fk32) @@ -140,7 +140,7 @@ Method(m770, 1, Serialized) Store(fk32, Local0) Store(0xD25B, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 6, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(i000, fk32) @@ -149,7 +149,7 @@ Method(m770, 1, Serialized) Store(fk32, Local0) Store(0x939C, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 7, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(i000, fk32) @@ -158,7 +158,7 @@ Method(m770, 1, Serialized) Store(fk32, Local0) Store(0x54ED, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 8, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } } @@ -340,7 +340,7 @@ Method(m77e, 7) } if (LNotEqual(arg5, Local2)) { - err(arg0, z144, 9, z144, arg6, Local2, arg5) + err(arg0, z144, __LINE__, z144, arg6, Local2, arg5) } // Fill then immediately read @@ -352,7 +352,7 @@ Method(m77e, 7) Store(Derefof(arg2), Local2) if (LNotEqual(arg1, Local2)) { - err(arg0, z144, 10, z144, arg6, Local2, arg1) + err(arg0, z144, __LINE__, z144, arg6, Local2, arg1) } /* @@ -366,7 +366,7 @@ Method(m77e, 7) Store(Derefof(arg3), Local2) if (LNotEqual(arg5, Local2)) { - err(arg0, z144, 11, z144, arg6, Local2, arg5) + err(arg0, z144, __LINE__, z144, arg6, Local2, arg5) } */ } @@ -1347,7 +1347,7 @@ BreakPoint Store(Refof(g000), Local4) } default { - err(arg0, z144, 12, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -1459,7 +1459,7 @@ BreakPoint Store(Refof(g001), Local4) } default { - err(arg0, z144, 13, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -1571,7 +1571,7 @@ BreakPoint Store(Refof(g002), Local4) } default { - err(arg0, z144, 14, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -1683,7 +1683,7 @@ BreakPoint Store(Refof(g003), Local4) } default { - err(arg0, z144, 15, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -1795,7 +1795,7 @@ BreakPoint Store(Refof(g004), Local4) } default { - err(arg0, z144, 16, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -1907,7 +1907,7 @@ BreakPoint Store(Refof(g005), Local4) } default { - err(arg0, z144, 17, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2019,7 +2019,7 @@ BreakPoint Store(Refof(g006), Local4) } default { - err(arg0, z144, 18, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2131,7 +2131,7 @@ BreakPoint Store(Refof(g007), Local4) } default { - err(arg0, z144, 19, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2243,7 +2243,7 @@ BreakPoint Store(Refof(g008), Local4) } default { - err(arg0, z144, 20, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2355,7 +2355,7 @@ BreakPoint Store(Refof(g009), Local4) } default { - err(arg0, z144, 21, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2467,7 +2467,7 @@ BreakPoint Store(Refof(g00a), Local4) } default { - err(arg0, z144, 22, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2579,7 +2579,7 @@ BreakPoint Store(Refof(g00b), Local4) } default { - err(arg0, z144, 23, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2691,7 +2691,7 @@ BreakPoint Store(Refof(g00c), Local4) } default { - err(arg0, z144, 24, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2803,7 +2803,7 @@ BreakPoint Store(Refof(g00d), Local4) } default { - err(arg0, z144, 25, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2915,7 +2915,7 @@ BreakPoint Store(Refof(g00e), Local4) } default { - err(arg0, z144, 26, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3027,13 +3027,13 @@ BreakPoint Store(Refof(g000), Local4) } default { - err(arg0, z144, 27, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z144, 28, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return} } @@ -3301,7 +3301,7 @@ Method(m791, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 29, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3405,7 +3405,7 @@ Method(m791, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z144, 30, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3509,7 +3509,7 @@ Method(m791, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z144, 31, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3613,7 +3613,7 @@ Method(m791, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z144, 32, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3717,7 +3717,7 @@ Method(m791, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z144, 33, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3821,7 +3821,7 @@ Method(m791, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z144, 34, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3925,7 +3925,7 @@ Method(m791, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z144, 35, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4029,7 +4029,7 @@ Method(m791, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z144, 36, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4133,7 +4133,7 @@ Method(m791, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z144, 37, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4237,7 +4237,7 @@ Method(m791, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z144, 38, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4341,7 +4341,7 @@ Method(m791, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z144, 39, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4445,7 +4445,7 @@ Method(m791, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z144, 40, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4549,7 +4549,7 @@ Method(m791, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z144, 41, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4653,7 +4653,7 @@ Method(m791, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z144, 42, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4757,7 +4757,7 @@ Method(m791, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z144, 43, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4861,13 +4861,13 @@ Method(m791, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 44, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z144, 45, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return} } @@ -5135,7 +5135,7 @@ Method(m792, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 46, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5239,7 +5239,7 @@ Method(m792, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z144, 47, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5343,7 +5343,7 @@ Method(m792, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z144, 48, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5447,7 +5447,7 @@ Method(m792, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z144, 49, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5551,7 +5551,7 @@ Method(m792, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z144, 50, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5655,7 +5655,7 @@ Method(m792, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z144, 51, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5759,7 +5759,7 @@ Method(m792, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z144, 52, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5863,7 +5863,7 @@ Method(m792, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z144, 53, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5967,7 +5967,7 @@ Method(m792, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z144, 54, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6071,7 +6071,7 @@ Method(m792, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z144, 55, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6175,7 +6175,7 @@ Method(m792, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z144, 56, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6279,7 +6279,7 @@ Method(m792, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z144, 57, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6383,7 +6383,7 @@ Method(m792, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z144, 58, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6487,7 +6487,7 @@ Method(m792, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z144, 59, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6591,7 +6591,7 @@ Method(m792, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z144, 60, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6695,13 +6695,13 @@ Method(m792, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 61, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z144, 62, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return} } @@ -6971,7 +6971,7 @@ Method(m793, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 63, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7075,7 +7075,7 @@ Method(m793, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z144, 64, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7179,7 +7179,7 @@ Method(m793, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z144, 65, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7283,7 +7283,7 @@ Method(m793, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z144, 66, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7387,7 +7387,7 @@ Method(m793, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z144, 67, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7491,7 +7491,7 @@ Method(m793, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z144, 68, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7595,7 +7595,7 @@ Method(m793, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z144, 69, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7699,7 +7699,7 @@ Method(m793, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z144, 70, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7803,7 +7803,7 @@ Method(m793, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z144, 71, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7907,7 +7907,7 @@ Method(m793, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z144, 72, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8011,7 +8011,7 @@ Method(m793, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z144, 73, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8115,7 +8115,7 @@ Method(m793, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z144, 74, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8219,7 +8219,7 @@ Method(m793, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z144, 75, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8323,7 +8323,7 @@ Method(m793, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z144, 76, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8427,7 +8427,7 @@ Method(m793, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z144, 77, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8531,13 +8531,13 @@ Method(m793, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 78, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z144, 79, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return} } @@ -8807,7 +8807,7 @@ BreakPoint Store(Refof(g000), Local4) } default { - err(arg0, z144, 80, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8911,7 +8911,7 @@ BreakPoint Store(Refof(g001), Local4) } default { - err(arg0, z144, 81, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9015,7 +9015,7 @@ BreakPoint Store(Refof(g002), Local4) } default { - err(arg0, z144, 82, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9119,7 +9119,7 @@ BreakPoint Store(Refof(g003), Local4) } default { - err(arg0, z144, 83, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9223,7 +9223,7 @@ BreakPoint Store(Refof(g004), Local4) } default { - err(arg0, z144, 84, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9327,7 +9327,7 @@ BreakPoint Store(Refof(g005), Local4) } default { - err(arg0, z144, 85, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9431,7 +9431,7 @@ BreakPoint Store(Refof(g006), Local4) } default { - err(arg0, z144, 86, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9535,7 +9535,7 @@ BreakPoint Store(Refof(g007), Local4) } default { - err(arg0, z144, 87, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9639,7 +9639,7 @@ BreakPoint Store(Refof(g008), Local4) } default { - err(arg0, z144, 88, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9743,7 +9743,7 @@ BreakPoint Store(Refof(g009), Local4) } default { - err(arg0, z144, 89, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9847,7 +9847,7 @@ BreakPoint Store(Refof(g00a), Local4) } default { - err(arg0, z144, 90, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9951,7 +9951,7 @@ BreakPoint Store(Refof(g00b), Local4) } default { - err(arg0, z144, 91, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -10055,7 +10055,7 @@ BreakPoint Store(Refof(g00c), Local4) } default { - err(arg0, z144, 92, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -10159,7 +10159,7 @@ BreakPoint Store(Refof(g00d), Local4) } default { - err(arg0, z144, 93, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -10263,7 +10263,7 @@ BreakPoint Store(Refof(g00e), Local4) } default { - err(arg0, z144, 94, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -10367,13 +10367,13 @@ BreakPoint Store(Refof(g000), Local4) } default { - err(arg0, z144, 95, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z144, 100, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return} } diff --git a/tests/aslts/src/runtime/collections/functional/region/opregions.asl b/tests/aslts/src/runtime/collections/functional/region/opregions.asl index 3260ec9..865fde3 100644 --- a/tests/aslts/src/runtime/collections/functional/region/opregions.asl +++ b/tests/aslts/src/runtime/collections/functional/region/opregions.asl @@ -398,17 +398,17 @@ Method(m700, 1) // Check incorrect calls if (LNotEqual(IRSK, 0)) { - err(arg0, z141, 1, 0, 0, IRSK, 0) + err(arg0, z141, __LINE__, 0, 0, IRSK, 0) } if (LNotEqual(IFLG, 0)) { - err(arg0, z141, 2, 0, 0, IFLG, 0) + err(arg0, z141, __LINE__, 0, 0, IFLG, 0) } if (LNotEqual(\DOR0.IRSK, 0)) { - err(arg0, z141, 3, 0, 0, IRSK, 0) + err(arg0, z141, __LINE__, 0, 0, IRSK, 0) } if (LNotEqual(\DOR0.IFLG, 0)) { - err(arg0, z141, 4, 0, 0, IFLG, 0) + err(arg0, z141, __LINE__, 0, 0, IFLG, 0) } // Emulate and verify incorrect calls @@ -417,29 +417,29 @@ Method(m700, 1) \DOR0._REG(FRSK, 2) if (LNotEqual(IRSK, 1)) { - err(arg0, z141, 5, 0, 0, IRSK, 1) + err(arg0, z141, __LINE__, 0, 0, IRSK, 1) } if (LNotEqual(IFLG, 1)) { - err(arg0, z141, 6, 0, 0, IFLG, 1) + err(arg0, z141, __LINE__, 0, 0, IFLG, 1) } if (LNotEqual(\DOR0.IRSK, 1)) { - err(arg0, z141, 7, 0, 0, IRSK, 1) + err(arg0, z141, __LINE__, 0, 0, IRSK, 1) } if (LNotEqual(\DOR0.IFLG, 1)) { - err(arg0, z141, 8, 0, 0, IFLG, 1) + err(arg0, z141, __LINE__, 0, 0, IFLG, 1) } // Check total calls to \_REG if (LNotEqual(Derefof(Index(VFLG, 1)), 9)) { - err(arg0, z141, 9, 0, 0, Derefof(Index(VFLG, 1)), 9) + err(arg0, z141, __LINE__, 0, 0, Derefof(Index(VFLG, 1)), 9) } m70e(arg0, 1, VRSK, ERSK, 10) // Check total calls to \DOR0._REG if (LNotEqual(Derefof(Index(\DOR0.VFLG, 1)), 6)) { - err(arg0, z141, 11, 0, 0, Derefof(Index(\DOR0.VFLG, 1)), 6) + err(arg0, z141, __LINE__, 0, 0, Derefof(Index(\DOR0.VFLG, 1)), 6) } m70e(arg0, 1, \DOR0.VRSK, \DOR0.ERSK, 12) } @@ -452,35 +452,35 @@ Method(m701, 1) Concatenate(arg0, "-m701", arg0) if (LNotEqual(\DOR1.IREG, 0)) { - err(arg0, z141, 13, 0, 0, \DOR1.IREG, 0) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IREG, 0) } if (LNotEqual(\DOR1.IRSK, 0)) { - err(arg0, z141, 14, 0, 0, \DOR1.IRSK, 0) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IRSK, 0) } if (LNotEqual(\DOR1.IFLG, 0)) { - err(arg0, z141, 15, 0, 0, \DOR1.IFLG, 0) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IFLG, 0) } if (LNotEqual(Derefof(Index(\DOR1.VFLG, 1)), 0)) { - err(arg0, z141, 16, 0, 0, Derefof(Index(\DOR1.VFLG, 1)), 0) + err(arg0, z141, __LINE__, 0, 0, Derefof(Index(\DOR1.VFLG, 1)), 0) } m70e(arg0, 2, \DOR1.VRSK, 0, 17) \DOR1.M000() if (LNotEqual(\DOR1.IREG, 0)) { - err(arg0, z141, 18, 0, 0, \DOR1.IREG, 1) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IREG, 1) } if (LNotEqual(\DOR1.IRSK, 1)) { - err(arg0, z141, 19, 0, 0, \DOR1.IRSK, 1) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IRSK, 1) } if (LNotEqual(\DOR1.IFLG, 1)) { - err(arg0, z141, 20, 0, 0, \DOR1.IFLG, 1) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IFLG, 1) } // Check total calls to \DOR1._REG if (LNotEqual(Derefof(Index(\DOR1.VFLG, 1)), 6)) { - err(arg0, z141, 21, 0, 0, Derefof(Index(\DOR1.VFLG, 1)), 6) + err(arg0, z141, __LINE__, 0, 0, Derefof(Index(\DOR1.VFLG, 1)), 6) } m70e(arg0, 1, \DOR1.VRSK, \DOR1.ERSK, 22) } @@ -588,16 +588,16 @@ Method(m70c, 3, Serialized) else { Store(b000, Derefof(Local5)) - CH03(arg0, z141, 24, arg2, Local3) + CH03(arg0, z141, 24, __LINE__, Local3) Store(ObjectType(Derefof(Local6)), Local0) Store(c00b, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z141, 25, 0, 0, Local0, Local1) + err(arg0, z141, __LINE__, 0, 0, Local0, Local1) } else { Store(Derefof(Local6), Local0) if (LNotEqual(Local0, b000)) { - err(arg0, z141, 26, z141, arg2, Local0, b000) + err(arg0, z141, __LINE__, z141, arg2, Local0, b000) } } } @@ -650,12 +650,12 @@ Method(m70e, 5, Serialized) case (1) { Index(arg3, Local0, Local3) if (LNotEqual(DeRefof(Local1), DeRefof(Local3))) { - err(arg0, z141, arg4, z141, Local0, DeRefof(Local1), DeRefof(Local3)) + err(arg0, z141, __LINE__, z141, Local0, DeRefof(Local1), DeRefof(Local3)) } } case (2) { if (LNotEqual(DeRefof(Local1), 0)) { - err(arg0, z141, arg4, z141, Local0, DeRefof(Local1), 0) + err(arg0, z141, __LINE__, z141, Local0, DeRefof(Local1), 0) } } } @@ -704,7 +704,7 @@ Method(m70f, 5, Serialized) Store(Buffer(){1,1,1,2,2,2,2,2,2,2}, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z141, 27, z141, arg4, Local0, Local1) + err(arg0, z141, __LINE__, z141, arg4, Local0, Local1) } } @@ -717,7 +717,7 @@ Method(m704, 1, Serialized) Method(CHCK, 4) { if (LNotEqual(arg1, arg2)) { - err(arg0, z141, 28, z141, arg3, arg1, arg2) + err(arg0, z141, __LINE__, z141, arg3, arg1, arg2) } } @@ -793,7 +793,7 @@ Method(m705, 1, Serialized) Store(i002, Derefof(Local6)) Store(DeRefof(Local5), Local7) if (LNotEqual(i002, Local7)) { - err(arg0, z141, 29, z141, arg1, Local7, i002) + err(arg0, z141, __LINE__, z141, arg1, Local7, i002) } } @@ -828,7 +828,7 @@ Method(m705, 1, Serialized) Store(i002, Derefof(Local6)) Store(DeRefof(Local5), Local7) if (LNotEqual(i002, Local7)) { - err(arg0, z141, 30, z141, arg1, Local7, i002) + err(arg0, z141, __LINE__, z141, arg1, Local7, i002) } } @@ -866,7 +866,7 @@ Method(m705, 1, Serialized) Store(i002, Derefof(Local6)) Store(DeRefof(Local5), Local7) if (LNotEqual(i002, Local7)) { - err(arg0, z141, 31, z141, arg1, Local7, i002) + err(arg0, z141, __LINE__, z141, arg1, Local7, i002) } } @@ -904,7 +904,7 @@ Method(m705, 1, Serialized) Store(i002, Derefof(Local6)) Store(DeRefof(Local5), Local7) if (LNotEqual(i002, Local7)) { - err(arg0, z141, 32, z141, arg1, Local7, i002) + err(arg0, z141, __LINE__, z141, arg1, Local7, i002) } } @@ -972,7 +972,7 @@ Method(m706, 1, Serialized) FU04, 0x20} if (LNotEqual(FU04, i000)) { - err(arg0, z141, arg3, 0, 0, FU04, i000) + err(arg0, z141, __LINE__, 0, 0, FU04, i000) } } @@ -981,33 +981,33 @@ Method(m706, 1, Serialized) Store(i000, FU00) if (LNotEqual(FU00, i000)) { - err(arg0, z141, 33, 0, 0, FU00, i000) + err(arg0, z141, __LINE__, 0, 0, FU00, i000) } if (LNotEqual(0xfedcba987654321f, off0)) { - err(arg0, z141, 34, 0, 0, off0, 0xfedcba987654321f) + err(arg0, z141, __LINE__, 0, 0, off0, 0xfedcba987654321f) } elseif (LNotEqual(0x123, len0)) { - err(arg0, z141, 35, 0, 0, len0, 0x123) + err(arg0, z141, __LINE__, 0, 0, len0, 0x123) } elseif (LNotEqual(FU01, i000)) { - err(arg0, z141, 36, 0, 0, FU00, i000) + err(arg0, z141, __LINE__, 0, 0, FU00, i000) } if (LNotEqual(0xfedcba987654321f, offb)) { - err(arg0, z141, 37, 0, 0, offb, 0xfedcba987654321f) + err(arg0, z141, __LINE__, 0, 0, offb, 0xfedcba987654321f) } elseif (LNotEqual(0x123, lenb)) { - err(arg0, z141, 38, 0, 0, lenb, 0x123) + err(arg0, z141, __LINE__, 0, 0, lenb, 0x123) } elseif (LNotEqual(FU02, i000)) { - err(arg0, z141, 39, 0, 0, FU00, i000) + err(arg0, z141, __LINE__, 0, 0, FU00, i000) } if (LNotEqual(0xfedcba987654321f, offs)) { Add(offs, 0, Local0) - err(arg0, z141, 40, 0, 0, Local0, 0xfedcba987654321f) + err(arg0, z141, __LINE__, 0, 0, Local0, 0xfedcba987654321f) } elseif (LNotEqual(0x123, lens)) { Add(lens, 0, Local0) - err(arg0, z141, 41, 0, 0, Local0, 0x123) + err(arg0, z141, __LINE__, 0, 0, Local0, 0x123) } elseif (LNotEqual(FU03, i000)) { - err(arg0, z141, 42, 0, 0, FU00, i000) + err(arg0, z141, __LINE__, 0, 0, FU00, i000) } m000(arg0, off0, len0, 43) @@ -1087,7 +1087,7 @@ Method(m707, 1, Serialized) Store(Buffer(){4,4,4,4,4,4,2,2,5,5,1,1,6,6,3,3,7,7,7,7,7,7}, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z141, 43, 0, 0, Local0, Local1) + err(arg0, z141, __LINE__, 0, 0, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl index 8dade9c..7ba5c88 100644 --- a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl @@ -425,23 +425,23 @@ Method(m751, 1, Serialized) Store(Store(BUFF, FLD0), BUFR) // Invoke Write Quick transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 4, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 8, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x00)) { - err(arg0, z143, 12, 0, 0, DAT0, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x00) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 16, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 20, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x00)) { - err(arg0, z143, 24, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } Store(0x00, OB10) @@ -452,10 +452,10 @@ Method(m751, 1, Serialized) Store(FLD0, BUFF) // Invoke Read Quick transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 28, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x00)) { // Length is zero for Quick operations - err(arg0, z143, 32, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } /* Note: Since LEN0 should be zero there's no need to check DAT0 */ } @@ -490,36 +490,36 @@ Method(m752, 1, Serialized) Store(Store(BUFF, FLD0), BUFR) // Invoke a Send Byte transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 40, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 44, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x16)) { - err(arg0, z143, 48, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 52, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 56, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x16)) { - err(arg0, z143, 60, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Receive a byte of data from the device */ Store(FLD0, BUFF) // Invoke a Receive Byte transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 64, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x01)) { - err(arg0, z143, 68, 0, 0, LEN0, 0x01) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x01) } if (LNotEqual(DAT0, 0xA0)) { - err(arg0, z143, 72, 0, 0, DAT0, 0xA0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA0) } } @@ -555,36 +555,36 @@ Method(m753, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Byte transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 76, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 80, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x16)) { - err(arg0, z143, 84, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 88, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 92, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x16)) { - err(arg0, z143, 96, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Read a byte of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Byte transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 100, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x01)) { - err(arg0, z143, 104, 0, 0, LEN0, 0x01) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x01) } if (LNotEqual(DAT0, 0xA0)) { - err(arg0, z143, 108, 0, 0, DAT0, 0xA0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA0) } } @@ -620,36 +620,36 @@ Method(m754, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Word transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 112, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 116, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x5416)) { - err(arg0, z143, 120, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 124, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 128, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x5416)) { - err(arg0, z143, 132, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Read two bytes of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Word transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 136, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x02)) { - err(arg0, z143, 140, 0, 0, LEN0, 0x02) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x02) } if (LNotEqual(DAT0, 0xA1A0)) { - err(arg0, z143, 144, 0, 0, DAT0, 0xA1A0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA1A0) } } @@ -685,34 +685,34 @@ Method(m755, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 148, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 152, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 156, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 160, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 164, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, Local0)) { - err(arg0, z143, 168, 0, 0, DAT1, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local0) } /* Read block of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Block transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 172, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x20)) { - err(arg0, z143, 176, 0, 0, LEN0, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -721,7 +721,7 @@ Method(m755, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT0, Local1)) { - err(arg0, z143, 180, 0, 0, DAT0, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local1) } } @@ -757,23 +757,23 @@ Method(m756, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Process Call transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 184, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 188, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x5416)) { - err(arg0, z143, 192, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 196, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x02)) { - err(arg0, z143, 200, 0, 0, LEN1, 0x02) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x02) } if (LNotEqual(DAT1, 0xA1A0)) { - err(arg0, z143, 204, 0, 0, DAT1, 0xA1A0) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0xA1A0) } } @@ -808,21 +808,21 @@ Method(m757, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 208, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 212, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 216, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 220, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x20)) { - err(arg0, z143, 224, 0, 0, LEN1, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -831,7 +831,7 @@ Method(m757, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT1, Local1)) { - err(arg0, z143, 228, 0, 0, DAT1, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local1) } } @@ -919,23 +919,23 @@ Method(m758, 1, Serialized) Store(Store(BUFF, FLD0), BUFR) // Invoke Write Quick transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 232, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 236, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x00)) { - err(arg0, z143, 240, 0, 0, DAT0, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x00) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 244, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 248, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x00)) { - err(arg0, z143, 252, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } Store(0x00, OB10) @@ -946,10 +946,10 @@ Method(m758, 1, Serialized) Store(FLD0, BUFF) // Invoke Read Quick transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 256, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x00)) { // Length is zero for Quick operations - err(arg0, z143, 260, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } /* Note: Since LEN0 should be zero there's no need to check DAT0 */ } @@ -991,36 +991,36 @@ Method(m759, 1, Serialized) Store(Store(BUFF, FLD0), BUFR) // Invoke a Send Byte transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 268, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 272, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x16)) { - err(arg0, z143, 276, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 280, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 284, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x16)) { - err(arg0, z143, 288, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Receive a byte of data from the device */ Store(FLD0, BUFF) // Invoke a Receive Byte transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 292, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x01)) { - err(arg0, z143, 296, 0, 0, LEN0, 0x01) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x01) } if (LNotEqual(DAT0, 0xA0)) { - err(arg0, z143, 300, 0, 0, DAT0, 0xA0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA0) } } @@ -1063,36 +1063,36 @@ Method(m75a, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Byte transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 304, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 308, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x16)) { - err(arg0, z143, 312, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 316, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 320, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x16)) { - err(arg0, z143, 324, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Read a byte of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Byte transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 328, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x01)) { - err(arg0, z143, 332, 0, 0, LEN0, 0x01) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x01) } if (LNotEqual(DAT0, 0xA0)) { - err(arg0, z143, 336, 0, 0, DAT0, 0xA0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA0) } } @@ -1135,36 +1135,36 @@ Method(m75b, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Word transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 340, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 344, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x5416)) { - err(arg0, z143, 348, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 352, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 356, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x5416)) { - err(arg0, z143, 360, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Read two bytes of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Word transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 364, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x02)) { - err(arg0, z143, 368, 0, 0, LEN0, 0x02) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x02) } if (LNotEqual(DAT0, 0xA1A0)) { - err(arg0, z143, 372, 0, 0, DAT0, 0xA1A0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA1A0) } } @@ -1207,34 +1207,34 @@ Method(m75c, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 376, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 380, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 384, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 388, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 392, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, Local0)) { - err(arg0, z143, 396, 0, 0, DAT1, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local0) } /* Read block of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Block transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 400, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x20)) { - err(arg0, z143, 404, 0, 0, LEN0, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -1243,7 +1243,7 @@ Method(m75c, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT0, Local1)) { - err(arg0, z143, 408, 0, 0, DAT0, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local1) } } @@ -1286,23 +1286,23 @@ Method(m75d, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Process Call transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 412, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 416, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x5416)) { - err(arg0, z143, 420, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 424, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x02)) { - err(arg0, z143, 428, 0, 0, LEN1, 0x02) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x02) } if (LNotEqual(DAT1, 0xA1A0)) { - err(arg0, z143, 432, 0, 0, DAT1, 0xA1A0) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0xA1A0) } } @@ -1344,21 +1344,21 @@ Method(m75e, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 436, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 440, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 444, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 448, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x20)) { - err(arg0, z143, 452, 0, 0, LEN1, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -1367,7 +1367,7 @@ Method(m75e, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT1, Local1)) { - err(arg0, z143, 456, 0, 0, DAT1, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local1) } } @@ -1415,21 +1415,21 @@ Method(m75f, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 460, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 464, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 468, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 472, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x20)) { - err(arg0, z143, 476, 0, 0, LEN1, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -1438,7 +1438,7 @@ Method(m75f, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT1, Local1)) { - err(arg0, z143, 480, 0, 0, DAT1, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local1) } } @@ -1486,21 +1486,21 @@ Method(m760, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 484, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 488, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 492, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 496, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x20)) { - err(arg0, z143, 500, 0, 0, LEN1, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -1509,7 +1509,7 @@ Method(m760, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT1, Local1)) { - err(arg0, z143, 504, 0, 0, DAT1, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local1) } } @@ -1557,21 +1557,21 @@ Method(m761, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 508, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 512, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 516, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 520, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x20)) { - err(arg0, z143, 524, 0, 0, LEN1, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -1580,7 +1580,7 @@ Method(m761, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT1, Local1)) { - err(arg0, z143, 528, 0, 0, DAT1, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local1) } } @@ -1629,19 +1629,19 @@ Method(m764, 1, Serialized) Store(0x03, MODE) //Set both MODE bits. Power Mode 3 Store (MODE, Local0) if (LNotEqual(Local0, 0x03)) { - err(arg0, z143, 532, 0, 0, Local0, 0x03) + err(arg0, z143, __LINE__, 0, 0, Local0, 0x03) } Store(0x01, MODE) Store (MODE, Local0) if (LNotEqual(Local0, 0x01)) { - err(arg0, z143, 536, 0, 0, Local0, 0x01) + err(arg0, z143, __LINE__, 0, 0, Local0, 0x01) } Store(0x01, STAT) Store (STAT, Local0) if (LNotEqual(Local0, 0x01)) { - err(arg0, z143, 540, 0, 0, Local0, 0x01) + err(arg0, z143, __LINE__, 0, 0, Local0, 0x01) } Name (TBUF, Buffer(0x10) { @@ -1651,7 +1651,7 @@ Method(m764, 1, Serialized) Store(TBUF, BUFF) Store (BUFF, Local0) if (LNotEqual(Local0, TBUF)) { - err(arg0, z143, 544, 0, 0, Local0, TBUF) + err(arg0, z143, __LINE__, 0, 0, Local0, TBUF) } } @@ -1705,15 +1705,15 @@ Method(m768, 1, Serialized) If (LNotEqual (STAT, 0)) { - err(arg0, z143, 548, 0, 0, STAT, 0) + err(arg0, z143, __LINE__, 0, 0, STAT, 0) } If (LNotEqual (CMPC, 0)) { - err(arg0, z143, 552, 0, 0, CMPC, 0) + err(arg0, z143, __LINE__, 0, 0, CMPC, 0) } If (LNotEqual (BUFF, Local1)) { - err(arg0, z143, 556, 0, 0, Local1, BUFF) + err(arg0, z143, __LINE__, 0, 0, Local1, BUFF) } } @@ -2306,37 +2306,37 @@ Method(m72a, 3) // 1-1-1 Store(Derefof(Index(arg2, 0)), Local4) if(LNotEqual(Local4, Local0)) { - err(arg0, z143, 560, z143, Local3, Local4, Local0) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local0) } Store(Derefof(Index(arg2, 1)), Local4) if(LNotEqual(Local4, Local1)) { - err(arg0, z143, 564, z143, Local3, Local4, Local1) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local1) } Store(Derefof(Index(arg2, 2)), Local4) if(LNotEqual(Local4, Local2)) { - err(arg0, z143, 568, z143, Local3, Local4, Local2) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local2) } // 1-2 Store(Derefof(Index(arg2, 3)), Local4) if(LNotEqual(Local4, Local0)) { - err(arg0, z143, 572, z143, Local3, Local4, Local0) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local0) } Store(Derefof(Index(arg2, 4)), Local4) Or(Local1, ShiftLeft(Local2, 1), Local5) if(LNotEqual(Local4, Local5)) { - err(arg0, z143, 576, z143, Local3, Local4, Local5) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local5) } // 2-1 Store(Derefof(Index(arg2, 5)), Local4) Or(Local0, ShiftLeft(Local1, 1), Local5) if(LNotEqual(Local4, Local5)) { - err(arg0, z143, 580, z143, Local3, Local4, Local5) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local5) } Store(Derefof(Index(arg2, 6)), Local4) if(LNotEqual(Local4, Local2)) { - err(arg0, z143, 584, z143, Local3, Local4, Local2) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local2) } } @@ -2488,7 +2488,7 @@ Method(m72e, 6, Serialized) // Num of bits have to be non-zero if (LEqual(arg3, 0)) { - err(arg0, z143, 588, 0, 0, 0, 0) + err(arg0, z143, __LINE__, 0, 0, 0, 0) return (Ones) } @@ -2735,7 +2735,7 @@ Method(m72e, 6, Serialized) m7d4(arg0, arg1, arg2, arg3, arg5, Local6) } default { - err(arg0, z143, 592, 0, 0, Local4, Local5) + err(arg0, z143, __LINE__, 0, 0, Local4, Local5) return (Ones) } } @@ -2850,7 +2850,7 @@ Method(m730, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 596, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -2938,7 +2938,7 @@ Method(m730, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 600, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3026,7 +3026,7 @@ Method(m730, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 604, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3114,7 +3114,7 @@ Method(m730, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 608, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3202,7 +3202,7 @@ Method(m730, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 612, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3290,7 +3290,7 @@ Method(m730, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 616, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3378,7 +3378,7 @@ Method(m730, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 620, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3466,7 +3466,7 @@ Method(m730, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 624, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3554,7 +3554,7 @@ Method(m730, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 628, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3642,7 +3642,7 @@ Method(m730, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 632, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3730,7 +3730,7 @@ Method(m730, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 636, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3818,7 +3818,7 @@ Method(m730, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 640, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3906,7 +3906,7 @@ Method(m730, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 644, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3994,7 +3994,7 @@ Method(m730, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 648, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4082,7 +4082,7 @@ Method(m730, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 652, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4170,13 +4170,13 @@ Method(m730, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 656, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 660, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -4279,7 +4279,7 @@ Method(m731, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 664, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4367,7 +4367,7 @@ Method(m731, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 668, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4455,7 +4455,7 @@ Method(m731, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 672, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4543,7 +4543,7 @@ Method(m731, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 676, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4631,7 +4631,7 @@ Method(m731, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 680, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4719,7 +4719,7 @@ Method(m731, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 684, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4807,7 +4807,7 @@ Method(m731, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 688, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4895,7 +4895,7 @@ Method(m731, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 692, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4983,7 +4983,7 @@ Method(m731, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 696, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5071,7 +5071,7 @@ Method(m731, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 700, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5159,7 +5159,7 @@ Method(m731, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 704, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5247,7 +5247,7 @@ Method(m731, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 708, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5335,7 +5335,7 @@ Method(m731, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 712, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5423,7 +5423,7 @@ Method(m731, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 716, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5511,7 +5511,7 @@ Method(m731, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 720, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5599,13 +5599,13 @@ Method(m731, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 724, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 728, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -5708,7 +5708,7 @@ Method(m732, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 732, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5796,7 +5796,7 @@ Method(m732, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 736, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5884,7 +5884,7 @@ Method(m732, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 740, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5972,7 +5972,7 @@ Method(m732, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 744, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6060,7 +6060,7 @@ Method(m732, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 748, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6148,7 +6148,7 @@ Method(m732, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 752, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6236,7 +6236,7 @@ Method(m732, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 756, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6324,7 +6324,7 @@ Method(m732, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 760, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6412,7 +6412,7 @@ Method(m732, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 764, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6500,7 +6500,7 @@ Method(m732, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 768, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6588,7 +6588,7 @@ Method(m732, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 772, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6676,7 +6676,7 @@ Method(m732, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 776, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6764,7 +6764,7 @@ Method(m732, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 780, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6852,7 +6852,7 @@ Method(m732, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 784, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6940,7 +6940,7 @@ Method(m732, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 788, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7028,13 +7028,13 @@ Method(m732, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 792, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 796, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -7137,7 +7137,7 @@ Method(m733, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 800, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7225,7 +7225,7 @@ Method(m733, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 804, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7313,7 +7313,7 @@ Method(m733, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 808, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7401,7 +7401,7 @@ Method(m733, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 812, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7489,7 +7489,7 @@ Method(m733, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 816, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7577,7 +7577,7 @@ Method(m733, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 820, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7665,7 +7665,7 @@ Method(m733, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 824, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7753,7 +7753,7 @@ Method(m733, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 828, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7841,7 +7841,7 @@ Method(m733, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 832, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7929,7 +7929,7 @@ Method(m733, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 836, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8017,7 +8017,7 @@ Method(m733, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 840, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8105,7 +8105,7 @@ Method(m733, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 844, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8193,7 +8193,7 @@ Method(m733, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 848, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8281,7 +8281,7 @@ Method(m733, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 852, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8369,7 +8369,7 @@ Method(m733, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 856, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8457,13 +8457,13 @@ Method(m733, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 860, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 864, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -8566,7 +8566,7 @@ Method(m734, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 868, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8654,7 +8654,7 @@ Method(m734, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 872, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8742,7 +8742,7 @@ Method(m734, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 876, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8830,7 +8830,7 @@ Method(m734, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 880, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8918,7 +8918,7 @@ Method(m734, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 884, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9006,7 +9006,7 @@ Method(m734, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 888, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9094,7 +9094,7 @@ Method(m734, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 892, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9182,7 +9182,7 @@ Method(m734, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 896, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9270,7 +9270,7 @@ Method(m734, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 900, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9358,7 +9358,7 @@ Method(m734, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 904, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9446,7 +9446,7 @@ Method(m734, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 908, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9534,7 +9534,7 @@ Method(m734, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 912, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9622,7 +9622,7 @@ Method(m734, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 916, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9710,7 +9710,7 @@ Method(m734, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 920, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9798,7 +9798,7 @@ Method(m734, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 924, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9886,13 +9886,13 @@ Method(m734, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 928, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 932, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -9995,7 +9995,7 @@ Method(m735, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 936, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10083,7 +10083,7 @@ Method(m735, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 940, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10171,7 +10171,7 @@ Method(m735, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 944, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10259,7 +10259,7 @@ Method(m735, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 948, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10347,7 +10347,7 @@ Method(m735, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 952, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10435,7 +10435,7 @@ Method(m735, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 956, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10523,7 +10523,7 @@ Method(m735, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 960, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10611,7 +10611,7 @@ Method(m735, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 964, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10699,7 +10699,7 @@ Method(m735, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 968, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10787,7 +10787,7 @@ Method(m735, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 972, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10875,7 +10875,7 @@ Method(m735, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 976, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10963,7 +10963,7 @@ Method(m735, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 980, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11051,7 +11051,7 @@ Method(m735, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 984, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11139,7 +11139,7 @@ Method(m735, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 988, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11227,7 +11227,7 @@ Method(m735, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 992, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11315,13 +11315,13 @@ Method(m735, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 996, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1000, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -11424,7 +11424,7 @@ Method(m736, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1004, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11512,7 +11512,7 @@ Method(m736, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1008, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11600,7 +11600,7 @@ Method(m736, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1012, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11688,7 +11688,7 @@ Method(m736, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1016, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11776,7 +11776,7 @@ Method(m736, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1020, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11864,7 +11864,7 @@ Method(m736, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1024, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11952,7 +11952,7 @@ Method(m736, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1028, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12040,7 +12040,7 @@ Method(m736, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1032, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12128,7 +12128,7 @@ Method(m736, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1036, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12216,7 +12216,7 @@ Method(m736, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1040, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12304,7 +12304,7 @@ Method(m736, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1044, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12392,7 +12392,7 @@ Method(m736, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1048, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12480,7 +12480,7 @@ Method(m736, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1052, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12568,7 +12568,7 @@ Method(m736, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1056, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12656,7 +12656,7 @@ Method(m736, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1060, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12744,13 +12744,13 @@ Method(m736, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1064, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1068, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -12853,7 +12853,7 @@ Method(m737, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1072, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12941,7 +12941,7 @@ Method(m737, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1076, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13029,7 +13029,7 @@ Method(m737, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1080, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13117,7 +13117,7 @@ Method(m737, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1084, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13205,7 +13205,7 @@ Method(m737, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1088, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13293,7 +13293,7 @@ Method(m737, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1092, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13381,7 +13381,7 @@ Method(m737, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1096, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13469,7 +13469,7 @@ Method(m737, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1100, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13557,7 +13557,7 @@ Method(m737, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1104, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13645,7 +13645,7 @@ Method(m737, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1108, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13733,7 +13733,7 @@ Method(m737, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1112, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13821,7 +13821,7 @@ Method(m737, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1116, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13909,7 +13909,7 @@ Method(m737, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1120, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13997,7 +13997,7 @@ Method(m737, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1124, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14085,7 +14085,7 @@ Method(m737, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1128, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14173,13 +14173,13 @@ Method(m737, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1132, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1136, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -14282,7 +14282,7 @@ Method(m738, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1140, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14370,7 +14370,7 @@ Method(m738, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1144, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14458,7 +14458,7 @@ Method(m738, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1148, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14546,7 +14546,7 @@ Method(m738, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1152, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14634,7 +14634,7 @@ Method(m738, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1156, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14722,7 +14722,7 @@ Method(m738, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1160, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14810,7 +14810,7 @@ Method(m738, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1164, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14898,7 +14898,7 @@ Method(m738, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1168, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14986,7 +14986,7 @@ Method(m738, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1172, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15074,7 +15074,7 @@ Method(m738, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1176, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15162,7 +15162,7 @@ Method(m738, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1180, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15250,7 +15250,7 @@ Method(m738, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1184, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15338,7 +15338,7 @@ Method(m738, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1188, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15426,7 +15426,7 @@ Method(m738, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1192, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15514,7 +15514,7 @@ Method(m738, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1196, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15602,13 +15602,13 @@ Method(m738, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1200, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1204, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -15711,7 +15711,7 @@ Method(m739, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1208, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15799,7 +15799,7 @@ Method(m739, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1212, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15887,7 +15887,7 @@ Method(m739, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1216, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15975,7 +15975,7 @@ Method(m739, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1220, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16063,7 +16063,7 @@ Method(m739, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1224, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16151,7 +16151,7 @@ Method(m739, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1228, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16239,7 +16239,7 @@ Method(m739, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1232, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16327,7 +16327,7 @@ Method(m739, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1236, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16415,7 +16415,7 @@ Method(m739, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1240, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16503,7 +16503,7 @@ Method(m739, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1244, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16591,7 +16591,7 @@ Method(m739, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1248, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16679,7 +16679,7 @@ Method(m739, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1252, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16767,7 +16767,7 @@ Method(m739, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1256, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16855,7 +16855,7 @@ Method(m739, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1260, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16943,7 +16943,7 @@ Method(m739, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1264, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17031,13 +17031,13 @@ Method(m739, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1268, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1272, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -17140,7 +17140,7 @@ Method(m73a, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1276, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17228,7 +17228,7 @@ Method(m73a, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1280, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17316,7 +17316,7 @@ Method(m73a, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1284, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17404,7 +17404,7 @@ Method(m73a, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1288, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17492,7 +17492,7 @@ Method(m73a, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1292, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17580,7 +17580,7 @@ Method(m73a, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1296, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17668,7 +17668,7 @@ Method(m73a, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1300, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17756,7 +17756,7 @@ Method(m73a, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1304, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17844,7 +17844,7 @@ Method(m73a, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1308, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17932,7 +17932,7 @@ Method(m73a, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1312, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18020,7 +18020,7 @@ Method(m73a, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1316, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18108,7 +18108,7 @@ Method(m73a, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1320, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18196,7 +18196,7 @@ Method(m73a, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1324, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18284,7 +18284,7 @@ Method(m73a, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1328, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18372,7 +18372,7 @@ Method(m73a, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1332, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18460,13 +18460,13 @@ Method(m73a, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1336, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1340, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -18569,7 +18569,7 @@ Method(m73b, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1344, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18657,7 +18657,7 @@ Method(m73b, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1348, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18745,7 +18745,7 @@ Method(m73b, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1352, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18833,7 +18833,7 @@ Method(m73b, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1356, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18921,7 +18921,7 @@ Method(m73b, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1360, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19009,7 +19009,7 @@ Method(m73b, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1364, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19097,7 +19097,7 @@ Method(m73b, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1368, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19185,7 +19185,7 @@ Method(m73b, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1372, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19273,7 +19273,7 @@ Method(m73b, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1376, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19361,7 +19361,7 @@ Method(m73b, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1380, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19449,7 +19449,7 @@ Method(m73b, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1384, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19537,7 +19537,7 @@ Method(m73b, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1388, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19625,7 +19625,7 @@ Method(m73b, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1392, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19713,7 +19713,7 @@ Method(m73b, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1396, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19801,7 +19801,7 @@ Method(m73b, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1400, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19889,13 +19889,13 @@ Method(m73b, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1404, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1408, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -19998,7 +19998,7 @@ Method(m73c, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1412, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20086,7 +20086,7 @@ Method(m73c, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1416, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20174,7 +20174,7 @@ Method(m73c, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1420, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20262,7 +20262,7 @@ Method(m73c, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1424, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20350,7 +20350,7 @@ Method(m73c, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1428, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20438,7 +20438,7 @@ Method(m73c, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1432, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20526,7 +20526,7 @@ Method(m73c, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1436, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20614,7 +20614,7 @@ Method(m73c, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1440, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20702,7 +20702,7 @@ Method(m73c, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1444, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20790,7 +20790,7 @@ Method(m73c, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1448, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20878,7 +20878,7 @@ Method(m73c, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1452, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20966,7 +20966,7 @@ Method(m73c, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1456, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21054,7 +21054,7 @@ Method(m73c, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1460, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21142,7 +21142,7 @@ Method(m73c, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1464, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21230,7 +21230,7 @@ Method(m73c, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1468, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21318,13 +21318,13 @@ Method(m73c, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1472, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1476, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -21427,7 +21427,7 @@ Method(m73d, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1480, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21515,7 +21515,7 @@ Method(m73d, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1484, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21603,7 +21603,7 @@ Method(m73d, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1488, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21691,7 +21691,7 @@ Method(m73d, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1492, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21779,7 +21779,7 @@ Method(m73d, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1496, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21867,7 +21867,7 @@ Method(m73d, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1500, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21955,7 +21955,7 @@ Method(m73d, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1504, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22043,7 +22043,7 @@ Method(m73d, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1508, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22131,7 +22131,7 @@ Method(m73d, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1512, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22219,7 +22219,7 @@ Method(m73d, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1516, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22307,7 +22307,7 @@ Method(m73d, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1520, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22395,7 +22395,7 @@ Method(m73d, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1524, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22483,7 +22483,7 @@ Method(m73d, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1528, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22571,7 +22571,7 @@ Method(m73d, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1532, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22659,7 +22659,7 @@ Method(m73d, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1536, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22747,13 +22747,13 @@ Method(m73d, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1540, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1544, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -22856,7 +22856,7 @@ Method(m73e, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1548, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22944,7 +22944,7 @@ Method(m73e, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1552, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23032,7 +23032,7 @@ Method(m73e, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1556, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23120,7 +23120,7 @@ Method(m73e, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1560, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23208,7 +23208,7 @@ Method(m73e, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1564, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23296,7 +23296,7 @@ Method(m73e, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1568, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23384,7 +23384,7 @@ Method(m73e, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1572, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23472,7 +23472,7 @@ Method(m73e, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1576, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23560,7 +23560,7 @@ Method(m73e, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1580, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23648,7 +23648,7 @@ Method(m73e, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1584, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23736,7 +23736,7 @@ Method(m73e, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1588, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23824,7 +23824,7 @@ Method(m73e, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1592, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23912,7 +23912,7 @@ Method(m73e, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1596, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -24000,7 +24000,7 @@ Method(m73e, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1600, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -24088,7 +24088,7 @@ Method(m73e, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1604, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -24176,13 +24176,13 @@ Method(m73e, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1608, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1612, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -24230,7 +24230,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, 0xa5)) { - err(arg0, z143, 1616, 0, 0, Local0, 0xa5) + err(arg0, z143, __LINE__, 0, 0, Local0, 0xa5) } } } @@ -24244,7 +24244,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, Derefof(Index(fcp0, 2)))) { - err(arg0, z143, 1620, 0, 0, Local0, Derefof(Index(fcp0, 2))) + err(arg0, z143, __LINE__, 0, 0, Local0, Derefof(Index(fcp0, 2))) } } } @@ -24264,7 +24264,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, 0xa5)) { - err(arg0, z143, 1624, 0, 0, Local0, 0xa5) + err(arg0, z143, __LINE__, 0, 0, Local0, 0xa5) } } } @@ -24287,7 +24287,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, Derefof(Index(fcp0, 2)))) { - err(arg0, z143, 1628, 0, 0, Local0, Derefof(Index(fcp0, 2))) + err(arg0, z143, __LINE__, 0, 0, Local0, Derefof(Index(fcp0, 2))) } } } @@ -24296,7 +24296,7 @@ Method(m72d, 7, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00d)) { - err(arg0, z143, 1632, 0, 0, Local0, c00d) + err(arg0, z143, __LINE__, 0, 0, Local0, c00d) } // Retrieve the field back @@ -24309,7 +24309,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, 0xa5)) { - err(arg0, z143, 1636, 0, 0, Local0, 0xa5) + err(arg0, z143, __LINE__, 0, 0, Local0, 0xa5) } } } @@ -24331,11 +24331,11 @@ Method(m72d, 7, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, INT0)) { - err(arg0, z143, 1640, 0, 0, Local1, INT0) + err(arg0, z143, __LINE__, 0, 0, Local1, INT0) } if (LNotEqual(Local0, arg5)) { - err(arg0, z143, 1644, 0, 0, Local0, arg5) + err(arg0, z143, __LINE__, 0, 0, Local0, arg5) } switch(ToInteger (pr01)) { @@ -24344,7 +24344,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, Derefof(Index(fcp0, 2)))) { - err(arg0, z143, 1648, 0, 0, Local0, Derefof(Index(fcp0, 2))) + err(arg0, z143, __LINE__, 0, 0, Local0, Derefof(Index(fcp0, 2))) } } } @@ -24359,7 +24359,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, 0xa5)) { - err(arg0, z143, 1652, 0, 0, Local0, 0xa5) + err(arg0, z143, __LINE__, 0, 0, Local0, 0xa5) } } } @@ -24372,13 +24372,13 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, Derefof(Index(fcp0, 2)))) { - err(arg0, z143, 1656, 0, 0, Local0, Derefof(Index(fcp0, 2))) + err(arg0, z143, __LINE__, 0, 0, Local0, Derefof(Index(fcp0, 2))) } } } if (LNotEqual(Local1, brB0)) { - err(arg0, z143, 1660, 0, 0, Local1, brB0) + err(arg0, z143, __LINE__, 0, 0, Local1, brB0) } elseif (pr00) { Store("==PostGround==:", Debug) Store(Local1, Debug) @@ -24640,7 +24640,7 @@ Method(m743, 1, Serialized) case (14) { Store(Refof(f00e), Local4) } case (15) { Store(Refof(f00f), Local4) } default { - err(arg0, z143, 1664, 0, 0, Local1, Local3) + err(arg0, z143, __LINE__, 0, 0, Local1, Local3) return } } @@ -24664,7 +24664,7 @@ Method(m743, 1, Serialized) case (14) { Store(Refof(f01e), Local4) } case (15) { Store(Refof(f01f), Local4) } default { - err(arg0, z143, 1668, 0, 0, Local1, Local3) + err(arg0, z143, __LINE__, 0, 0, Local1, Local3) return } } @@ -24688,7 +24688,7 @@ Method(m743, 1, Serialized) case (14) { Store(Refof(f02e), Local4) } case (15) { Store(Refof(f02f), Local4) } default { - err(arg0, z143, 1672, 0, 0, Local1, Local3) + err(arg0, z143, __LINE__, 0, 0, Local1, Local3) return } } @@ -24712,13 +24712,13 @@ Method(m743, 1, Serialized) case (14) { Store(Refof(f03e), Local4) } case (15) { Store(Refof(f03f), Local4) } default { - err(arg0, z143, 1676, 0, 0, Local1, Local3) + err(arg0, z143, __LINE__, 0, 0, Local1, Local3) return } } } default { - err(arg0, z143, 1680, 0, 0, Local1, Local3) + err(arg0, z143, __LINE__, 0, 0, Local1, Local3) return } } @@ -24764,7 +24764,7 @@ Method(m743, 1, Serialized) Mid(Local6, Derefof(Index(Local4, 0)), Sizeof (Local5), Local7) if (LNotEqual(Local7, Local5)) { - err(arg0, z143, 1684, z143, Add(Multiply(16, Local1), Local3), Local7, Local5) + err(arg0, z143, __LINE__, z143, Add(Multiply(16, Local1), Local3), Local7, Local5) } // Check contents of the external accessed memory @@ -24787,7 +24787,7 @@ Method(m743, 1, Serialized) Derefof(Index(Local6, Subtract(Subtract(Derefof(Index(Local4, 0)), Local7), 1))), 0x00)) { - err(arg0, z143, 1688, z143, Add(Multiply(16, Local1), Local3), + err(arg0, z143, __LINE__, z143, Add(Multiply(16, Local1), Local3), Derefof(Index(Local6, Subtract(Derefof(Index(Local4, 0)), Local7))), 0x00 ) @@ -24799,7 +24799,7 @@ Method(m743, 1, Serialized) if (LNotEqual( Derefof(Index(Local6, Subtract(Derefof(Index(Local4, 0)), Local7))), 0xff)) { - err(arg0, z143, 1692, z143, Add(Multiply(16, Local1), Local3), + err(arg0, z143, __LINE__, z143, Add(Multiply(16, Local1), Local3), Derefof(Index(Local6, Subtract(Derefof(Index(Local4, 0)), Local7))), 0xff ) @@ -24825,7 +24825,7 @@ Method(m743, 1, Serialized) if (LNotEqual( Derefof(Index(Local6, Add(i000, Local7))), 0x00)) { - err(arg0, z143, 1696, z143, Add(Multiply(16, Local1), Local3), + err(arg0, z143, __LINE__, z143, Add(Multiply(16, Local1), Local3), Derefof(Index(Local6, Add(i000, Local7))), 0x00 ) @@ -24837,7 +24837,7 @@ Method(m743, 1, Serialized) if (LNotEqual( Derefof(Index(Local6, Add(i000, Local7))), 0xff)) { - err(arg0, z143, 1700, z143, Add(Multiply(16, Local1), Local3), + err(arg0, z143, __LINE__, z143, Add(Multiply(16, Local1), Local3), Derefof(Index(Local6, Add(i000, Local7))), 0xff ) @@ -24879,7 +24879,7 @@ Method(m744, 1, Serialized) Store(0x1, f001) if (LNotEqual(f000, 0x08)) { - err(arg0, z143, 1704, 0, 0, f000, 0x08) + err(arg0, z143, __LINE__, 0, 0, f000, 0x08) } } diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl index 5f1ab33..e6cb06f 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl @@ -714,7 +714,7 @@ Method(m032, 4) Increment(Local7) Decrement(arg1) } - CH03("MUX0", Z150, 0x000, 0, 0) + CH03("MUX0", Z150, 0x000, __LINE__, 0) } Method(m033,, Serialized) { diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl index b51b65c..4f636a2 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl @@ -76,75 +76,75 @@ Method(m301,, Serialized) Name(ts, "m301") - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) Store(Acquire(MT00, 0xffff), Local0) if (Local0) { - err(ts, z150, 1, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(\_GL, 0xffff), Local0) /* GL */ if (Local0) { - err(ts, z150, 3, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT10, 0xffff), Local0) if (Local0) { - err(ts, z150, 2, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT20, 0xffff), Local0) if (Local0) { - err(ts, z150, 3, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT30, 0xffff), Local0) if (Local0) { - err(ts, z150, 4, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT40, 0xffff), Local0) if (Local0) { - err(ts, z150, 5, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT50, 0xffff), Local0) if (Local0) { - err(ts, z150, 6, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT60, 0xffff), Local0) if (Local0) { - err(ts, z150, 7, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT70, 0xffff), Local0) if (Local0) { - err(ts, z150, 8, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT80, 0xffff), Local0) if (Local0) { - err(ts, z150, 9, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT90, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00a, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00b, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00c, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00d, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00e, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00f, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTf0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x010, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Release(MTF0) Release(MTE0) @@ -181,7 +181,7 @@ Method(m301,, Serialized) } } - CH03(ts, z150, 0x011, 0, 0) + CH03(ts, z150, 0x011, __LINE__, 0) } /* @@ -198,7 +198,7 @@ Method(m369, 1, Serialized) { Name(ts, "m369") - CH03(ts, z150, 0x022, 0, 0) + CH03(ts, z150, 0x022, __LINE__, 0) Mutex(MT00, 0) Mutex(MT10, 1) @@ -243,131 +243,131 @@ Method(m369, 1, Serialized) Store(Acquire(MT00, 0xffff), Local0) if (Local0) { - err(ts, z150, 1, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT01, 0xffff), Local0) /* the same level */ if (Local0) { - err(ts, z150, 2, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(\_GL, 0xffff), Local0) /* GL */ if (Local0) { - err(ts, z150, 3, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT10, 0xffff), Local0) if (Local0) { - err(ts, z150, 4, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT11, 0xffff), Local0) if (Local0) { - err(ts, z150, 5, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT20, 0xffff), Local0) if (Local0) { - err(ts, z150, 6, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT21, 0xffff), Local0) if (Local0) { - err(ts, z150, 7, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT30, 0xffff), Local0) if (Local0) { - err(ts, z150, 8, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT31, 0xffff), Local0) if (Local0) { - err(ts, z150, 9, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT40, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00a, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT41, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00b, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT50, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00c, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT51, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00d, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT60, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00e, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT61, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00f, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT70, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x010, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT71, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x011, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT80, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x012, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT81, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x013, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT90, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x014, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT91, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x015, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x016, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa1, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x017, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x018, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb1, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x019, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01a, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc1, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01b, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01c, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd1, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01d, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01e, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe1, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01f, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTf0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x020, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { if (arg0) { Store(Acquire(MTf1, 0xffff), Local0) @@ -375,7 +375,7 @@ Method(m369, 1, Serialized) Store(0, Local0) } if (Local0) { - err(ts, z150, 0x021, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { if (arg0) { Release(MTF1) @@ -447,9 +447,9 @@ Method(m369, 1, Serialized) } if (arg0) { - CH04(ts, 1, 18, z150, 0x122, 0, 0) // AE_LIMIT + CH04(ts, 1, 18, z150, __LINE__, 0, 0) // AE_LIMIT } else { - CH03(ts, z150, 0x123, 0, 0) + CH03(ts, z150, 0x123, __LINE__, 0) } } @@ -489,71 +489,71 @@ Method(m36a,, Serialized) Store(Acquire(MT00, 0xffff), Local0) if (Local0) { - err(ts, z150, 1, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { - err(ts, z150, 2, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT10, 0xffff), Local0) if (Local0) { - err(ts, z150, 3, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT20, 0xffff), Local0) if (Local0) { - err(ts, z150, 4, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT30, 0xffff), Local0) if (Local0) { - err(ts, z150, 5, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT40, 0xffff), Local0) if (Local0) { - err(ts, z150, 6, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT50, 0xffff), Local0) if (Local0) { - err(ts, z150, 7, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT60, 0xffff), Local0) if (Local0) { - err(ts, z150, 8, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT70, 0xffff), Local0) if (Local0) { - err(ts, z150, 9, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT80, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00a, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT90, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00b, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00c, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00d, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00e, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00f, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x010, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTf0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x011, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { m001() } @@ -596,9 +596,9 @@ Method(m36a,, Serialized) Release(MT00) } - CH03(ts, z150, 0x012, 0, 0) + CH03(ts, z150, 0x012, __LINE__, 0) m000() - CH03(ts, z150, 0x013, 0, 0) + CH03(ts, z150, 0x013, __LINE__, 0) } /* @@ -637,71 +637,71 @@ Method(m36b,, Serialized) Store(Acquire(MT00, 0xffff), Local0) if (Local0) { - err(ts, z150, 1, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { - err(ts, z150, 2, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT10, 0xffff), Local0) if (Local0) { - err(ts, z150, 3, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT20, 0xffff), Local0) if (Local0) { - err(ts, z150, 4, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT30, 0xffff), Local0) if (Local0) { - err(ts, z150, 5, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT40, 0xffff), Local0) if (Local0) { - err(ts, z150, 6, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT50, 0xffff), Local0) if (Local0) { - err(ts, z150, 7, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT60, 0xffff), Local0) if (Local0) { - err(ts, z150, 8, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT70, 0xffff), Local0) if (Local0) { - err(ts, z150, 9, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT80, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00a, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT90, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00b, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00c, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00d, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00e, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00f, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x010, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTf0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x011, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } } } @@ -742,11 +742,11 @@ Method(m36b,, Serialized) Release(MT00) } - CH03(ts, z150, 0x012, 0, 0) + CH03(ts, z150, 0x012, __LINE__, 0) m000() - CH03(ts, z150, 0x013, 0, 0) + CH03(ts, z150, 0x013, __LINE__, 0) m001() - CH03(ts, z150, 0x014, 0, 0) + CH03(ts, z150, 0x014, __LINE__, 0) } /* @@ -774,9 +774,9 @@ Method(m36c,, Serialized) { /* Acquire the first mutex */ - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) m36f(arg0, 0, 0, 0) // Acquire N-level mutex - CH03(ts, z150, 0x001, 0, 0) + CH03(ts, z150, 0x001, __LINE__, 0) /* * Attempt to Acquire the second mutex (exception is expected). @@ -795,11 +795,11 @@ Method(m36c,, Serialized) m36f(arg1, 0, 1, 0) // Acquire arg1-level mux } } - CH04(ts, 0, 64, z150, 0x002, 0, 0) // AE_AML_MUTEX_ORDER + CH04(ts, 0, 64, z150, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER m388(arg0, 0, 0) // Release - CH03(ts, z150, 0x003, 0, 0) + CH03(ts, z150, 0x003, __LINE__, 0) } /* @@ -853,19 +853,19 @@ Method(m389,, Serialized) /* arg0 - level of mutex */ Method(m000, 1) { - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) m36f(arg0, 0, 0, 0) // Acquire m388(arg0, 0, 0) // Release - CH03(ts, z150, 0x001, 0, 0) + CH03(ts, z150, 0x001, __LINE__, 0) /* Attempt to Release free mutex */ m388(arg0, 0, 0) // Release - CH04(ts, 0, 65, z150, 0x002, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x003, 0, 0) + CH03(ts, z150, 0x003, __LINE__, 0) m36f(arg0, 0, 0, 0) // Acquire m388(arg0, 0, 0) // Release - CH03(ts, z150, 0x004, 0, 0) + CH03(ts, z150, 0x004, __LINE__, 0) } Store(max0, lpN0) @@ -878,19 +878,19 @@ Method(m389,, Serialized) /* Separately for GL */ - CH03(ts, z150, 0x005, 0, 0) + CH03(ts, z150, 0x005, __LINE__, 0) m36f(GLLL, GLIX, 0, 0) // Acquire m388(GLLL, GLIX, 0) // Release - CH03(ts, z150, 0x006, 0, 0) + CH03(ts, z150, 0x006, __LINE__, 0) /* Attempt to Release free mutex */ m388(GLLL, GLIX, 0) // Release - CH04(ts, 0, 65, z150, 0x007, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x008, 0, 0) + CH03(ts, z150, 0x008, __LINE__, 0) m36f(GLLL, GLIX, 0, 0) // Acquire m388(GLLL, GLIX, 0) // Release - CH03(ts, z150, 0x009, 0, 0) + CH03(ts, z150, 0x009, __LINE__, 0) } /* @@ -920,140 +920,140 @@ Method(m07b,, Serialized) /* First time */ - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) Release(T000) - CH04(ts, 0, 65, z150, 0x001, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x002, 0, 0) + CH03(ts, z150, 0x002, __LINE__, 0) Release(\_GL) - CH04(ts, 0, 65, z150, 0x003, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x004, 0, 0) + CH03(ts, z150, 0x004, __LINE__, 0) Release(T100) - CH04(ts, 0, 65, z150, 0x005, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x006, 0, 0) + CH03(ts, z150, 0x006, __LINE__, 0) Release(T200) - CH04(ts, 0, 65, z150, 0x007, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x008, 0, 0) + CH03(ts, z150, 0x008, __LINE__, 0) Release(T300) - CH04(ts, 0, 65, z150, 0x009, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x00a, 0, 0) + CH03(ts, z150, 0x00a, __LINE__, 0) Release(T400) - CH04(ts, 0, 65, z150, 0x00b, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x00c, 0, 0) + CH03(ts, z150, 0x00c, __LINE__, 0) Release(T500) - CH04(ts, 0, 65, z150, 0x00d, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x00e, 0, 0) + CH03(ts, z150, 0x00e, __LINE__, 0) Release(T600) - CH04(ts, 0, 65, z150, 0x00f, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x010, 0, 0) + CH03(ts, z150, 0x010, __LINE__, 0) Release(T700) - CH04(ts, 0, 65, z150, 0x011, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x012, 0, 0) + CH03(ts, z150, 0x012, __LINE__, 0) Release(T800) - CH04(ts, 0, 65, z150, 0x013, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x014, 0, 0) + CH03(ts, z150, 0x014, __LINE__, 0) Release(T900) - CH04(ts, 0, 65, z150, 0x015, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x016, 0, 0) + CH03(ts, z150, 0x016, __LINE__, 0) Release(Ta00) - CH04(ts, 0, 65, z150, 0x017, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x018, 0, 0) + CH03(ts, z150, 0x018, __LINE__, 0) Release(Tb00) - CH04(ts, 0, 65, z150, 0x019, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x01a, 0, 0) + CH03(ts, z150, 0x01a, __LINE__, 0) Release(Tc00) - CH04(ts, 0, 65, z150, 0x01b, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x01c, 0, 0) + CH03(ts, z150, 0x01c, __LINE__, 0) Release(Td00) - CH04(ts, 0, 65, z150, 0x01d, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x01e, 0, 0) + CH03(ts, z150, 0x01e, __LINE__, 0) Release(Te00) - CH04(ts, 0, 65, z150, 0x01f, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x020, 0, 0) + CH03(ts, z150, 0x020, __LINE__, 0) Release(Tf00) - CH04(ts, 0, 65, z150, 0x021, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) /* Second time */ - CH03(ts, z150, 0x022, 0, 0) + CH03(ts, z150, 0x022, __LINE__, 0) Release(T000) - CH04(ts, 0, 65, z150, 0x023, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x024, 0, 0) + CH03(ts, z150, 0x024, __LINE__, 0) Release(T100) - CH04(ts, 0, 65, z150, 0x025, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x026, 0, 0) + CH03(ts, z150, 0x026, __LINE__, 0) Release(T200) - CH04(ts, 0, 65, z150, 0x027, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x028, 0, 0) + CH03(ts, z150, 0x028, __LINE__, 0) Release(T300) - CH04(ts, 0, 65, z150, 0x029, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x02a, 0, 0) + CH03(ts, z150, 0x02a, __LINE__, 0) Release(T400) - CH04(ts, 0, 65, z150, 0x02b, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x02c, 0, 0) + CH03(ts, z150, 0x02c, __LINE__, 0) Release(T500) - CH04(ts, 0, 65, z150, 0x02d, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x02e, 0, 0) + CH03(ts, z150, 0x02e, __LINE__, 0) Release(T600) - CH04(ts, 0, 65, z150, 0x02f, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x030, 0, 0) + CH03(ts, z150, 0x030, __LINE__, 0) Release(T700) - CH04(ts, 0, 65, z150, 0x031, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x032, 0, 0) + CH03(ts, z150, 0x032, __LINE__, 0) Release(T800) - CH04(ts, 0, 65, z150, 0x033, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x034, 0, 0) + CH03(ts, z150, 0x034, __LINE__, 0) Release(T900) - CH04(ts, 0, 65, z150, 0x035, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x036, 0, 0) + CH03(ts, z150, 0x036, __LINE__, 0) Release(Ta00) - CH04(ts, 0, 65, z150, 0x037, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x038, 0, 0) + CH03(ts, z150, 0x038, __LINE__, 0) Release(Tb00) - CH04(ts, 0, 65, z150, 0x039, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x03a, 0, 0) + CH03(ts, z150, 0x03a, __LINE__, 0) Release(Tc00) - CH04(ts, 0, 65, z150, 0x03b, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x03c, 0, 0) + CH03(ts, z150, 0x03c, __LINE__, 0) Release(Td00) - CH04(ts, 0, 65, z150, 0x03d, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x03e, 0, 0) + CH03(ts, z150, 0x03e, __LINE__, 0) Release(Te00) - CH04(ts, 0, 65, z150, 0x03f, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) - CH03(ts, z150, 0x040, 0, 0) + CH03(ts, z150, 0x040, __LINE__, 0) Release(Tf00) - CH04(ts, 0, 65, z150, 0x041, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) } /* @@ -1128,7 +1128,7 @@ Method(m38a,, Serialized) Increment(lpC0) } - CH03("m38a", z150, 0x000, 0, 0) + CH03("m38a", z150, 0x000, __LINE__, 0) } /* @@ -1271,7 +1271,7 @@ Method(m079, 2, Serialized) /* Release */ - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) Store(max0, lpN0) Subtract(max0, 1, lpC0) @@ -1293,9 +1293,9 @@ Method(m079, 2, Serialized) Store(max0, lpN0) Subtract(max0, 1, lpC0) While (lpN0) { - CH03(ts, z150, 0x001, 0, 0) + CH03(ts, z150, 0x001, __LINE__, 0) m388(lpC0, ix00, 0) - CH04(ts, 0, 65, z150, 0x002, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED Decrement(lpN0) Decrement(lpC0) } @@ -1332,7 +1332,7 @@ Method(m0b9,, Serialized) return } - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) } @@ -1344,7 +1344,7 @@ Method(m0bb,, Serialized) { Name(ts, "m0bb") - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) Method(m137) { @@ -1364,7 +1364,7 @@ Method(m0bb,, Serialized) Store(Acquire(T805, 0xffff), i103) if (i103) { - err(ts, z150, 0x001, 0, 0, 0, i103) + err(ts, z150, __LINE__, 0, 0, 0, i103) } Store("m13e completed", Debug) @@ -1394,15 +1394,15 @@ Method(m0bb,, Serialized) if (i102) { Store("Acquire(T804, 0xffff) failed", Debug) - err(ts, z150, 0x002, 0, 0, 0, i102) + err(ts, z150, __LINE__, 0, 0, 0, i102) } if (i103) { Store("Acquire(T805, 0xffff) failed", Debug) - err(ts, z150, 0x003, 0, 0, 0, i103) + err(ts, z150, __LINE__, 0, 0, 0, i103) } - CH03(ts, z150, 0x004, 0, 0) + CH03(ts, z150, 0x004, __LINE__, 0) } /* @@ -1420,96 +1420,96 @@ Method(m07c,, Serialized) /* Acquire and Release operations are in the same method */ Method(m000) { - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) /* Acquire all */ Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T000, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T100, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T200, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T300, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T400, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T500, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T600, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T700, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T800, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T900, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Ta00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tb00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tc00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Td00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Te00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tf00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) /* Release all */ @@ -1531,7 +1531,7 @@ Method(m07c,, Serialized) Release(T000) Release(\_GL) - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) } /* Acquire and Release operations are in different methods */ @@ -1539,99 +1539,99 @@ Method(m07c,, Serialized) { Method(mm00) { - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T000, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T100, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T200, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T300, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T400, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T500, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T600, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T700, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T800, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T900, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Ta00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tb00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tc00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Td00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Te00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tf00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) } Method(mm01) { - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) Release(Tf00) Release(Te00) @@ -1651,62 +1651,62 @@ Method(m07c,, Serialized) Release(T000) Release(\_GL) - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) } Method(mm02) { - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) Release(Tf00) - CH04(ts, 0, 65, z150, 0x001, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x002, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x002, __LINE__, 0) Release(Te00) - CH04(ts, 0, 65, z150, 0x003, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x004, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x004, __LINE__, 0) Release(Td00) - CH04(ts, 0, 65, z150, 0x005, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x006, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x006, __LINE__, 0) Release(Tc00) - CH04(ts, 0, 65, z150, 0x007, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x008, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x008, __LINE__, 0) Release(Tb00) - CH04(ts, 0, 65, z150, 0x009, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x00a, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x00a, __LINE__, 0) Release(Ta00) - CH04(ts, 0, 65, z150, 0x00b, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x00c, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x00c, __LINE__, 0) Release(T900) - CH04(ts, 0, 65, z150, 0x00d, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x00e, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x00e, __LINE__, 0) Release(T800) - CH04(ts, 0, 65, z150, 0x00f, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x010, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x010, __LINE__, 0) Release(T700) - CH04(ts, 0, 65, z150, 0x011, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x012, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x012, __LINE__, 0) Release(T600) - CH04(ts, 0, 65, z150, 0x013, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x014, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x014, __LINE__, 0) Release(T500) - CH04(ts, 0, 65, z150, 0x015, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x016, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x016, __LINE__, 0) Release(T400) - CH04(ts, 0, 65, z150, 0x017, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x018, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x018, __LINE__, 0) Release(T300) - CH04(ts, 0, 65, z150, 0x019, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x01a, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x01a, __LINE__, 0) Release(T200) - CH04(ts, 0, 65, z150, 0x01b, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x01c, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x01c, __LINE__, 0) Release(T100) - CH04(ts, 0, 65, z150, 0x01d, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x01e, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x01e, __LINE__, 0) Release(T000) - CH04(ts, 0, 65, z150, 0x01f, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED - CH03(ts, z150, 0x020, 0, 0) + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH03(ts, z150, 0x020, __LINE__, 0) Release(\_GL) - CH04(ts, 0, 65, z150, 0x021, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED + CH04(ts, 0, 65, z150, __LINE__, 0, 0) // AE_AML_MUTEX_NOT_ACQUIRED } mm00() @@ -1728,18 +1728,18 @@ Method(m0ba,, Serialized) { Name(ts, "m0ba") - CH03(ts, z150, 0x000, 0, 0) + CH03(ts, z150, 0x000, __LINE__, 0) /* Add */ Add(Acquire(\_GL, 0xffff), 1, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z150, 0x001, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Add(Acquire(T500, 0xffff), 1, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z150, 0x002, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Release(T500) @@ -1749,12 +1749,12 @@ Method(m0ba,, Serialized) Subtract(1, Acquire(\_GL, 0xffff), Local0) if (LNotEqual(Local0, 1)) { - err(ts, z150, 0x003, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Subtract(1, Acquire(T500, 0xffff), Local0) if (LNotEqual(Local0, 1)) { - err(ts, z150, 0x004, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Release(T500) @@ -1763,7 +1763,7 @@ Method(m0ba,, Serialized) /* LEqual */ if (LNotEqual(Acquire(T500, 0xffff), 0)) { - err(ts, z150, 0x004, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Release(T500) @@ -2105,7 +2105,7 @@ Method(m300) SRMT("m300") if (ERR7) { - err("ERRORS were detected during the loading stage", z150, 0x200, 0, 0, 0, ERR7) + err("ERRORS were detected during the loading stage", z150, __LINE__, 0, 0, 0, ERR7) } /* ATTENTION: this test must be run the first */ @@ -2247,7 +2247,7 @@ Method(m300) m08a() } - CH03("m300", z150, 0x000, 0, 0) + CH03("m300", z150, 0x000, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl index c86432c..0dfaf57 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl @@ -55,119 +55,119 @@ Method(m36d, 1, Serialized) } Store(Acquire(T000, 0xffff), Local0) if (Local0) { - err(ts, z151, 1, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 1)) { return } Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { - err(ts, z151, 2, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 2)) { return } Store(Acquire(T100, 0xffff), Local0) if (Local0) { - err(ts, z151, 3, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 3)) { return } Store(Acquire(T200, 0xffff), Local0) if (Local0) { - err(ts, z151, 4, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 4)) { return } Store(Acquire(T300, 0xffff), Local0) if (Local0) { - err(ts, z151, 5, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 5)) { return } Store(Acquire(T400, 0xffff), Local0) if (Local0) { - err(ts, z151, 6, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 6)) { return } Store(Acquire(T500, 0xffff), Local0) if (Local0) { - err(ts, z151, 7, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 7)) { return } Store(Acquire(T600, 0xffff), Local0) if (Local0) { - err(ts, z151, 8, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 8)) { return } Store(Acquire(T700, 0xffff), Local0) if (Local0) { - err(ts, z151, 9, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 9)) { return } Store(Acquire(T800, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00a, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 10)) { return } Store(Acquire(T900, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00b, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 11)) { return } Store(Acquire(Ta00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00c, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 12)) { return } Store(Acquire(Tb00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00d, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 13)) { return } Store(Acquire(Tc00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00e, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 14)) { return } Store(Acquire(Td00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00f, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 15)) { return } Store(Acquire(Te00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x010, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 16)) { return } Store(Acquire(Tf00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x011, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 17)) { return @@ -346,7 +346,7 @@ Method(m36f, 4, Serialized) if (LNot(arg2)) { if (Local0) { - err("m36f", z151, 0x002, 0, 0, Local0, 0) + err("m36f", z151, __LINE__, 0, 0, Local0, 0) } } @@ -448,11 +448,11 @@ Method(m38b, 4, Serialized) if (arg2) { if (arg3) { - CH03("m38b", z151, 0x000, 0, 0) + CH03("m38b", z151, 0x000, __LINE__, 0) } m36f(GLLL, GLIX, arg3, 0) // Acquire GL if (arg3) { - CH04("m38b", 0, arg3, z151, 0x001, 0, 0) + CH04("m38b", 0, arg3, z151, __LINE__, 0, 0) } } @@ -461,11 +461,11 @@ Method(m38b, 4, Serialized) While (lpN0) { if (arg3) { - CH03("m38b", z151, 0x000, 0, 0) + CH03("m38b", z151, 0x000, __LINE__, 0) } m36f(lpC0, 0, arg3, 0) // Acquire if (arg3) { - CH04("m38b", 0, arg3, z151, 0x001, 0, 0) + CH04("m38b", 0, arg3, z151, __LINE__, 0, 0) } Decrement(lpN0) @@ -494,11 +494,11 @@ Method(m38c, 4, Serialized) While (lpN0) { if (arg3) { - Store(LOr(CH03("m38b", z151, 0x000, 0, 0), Local7), Local7) + Store(LOr(CH03("m38b", z151, 0x000, __LINE__, 0), Local7), Local7) } m388(lpC0, 0, 0) // Release if (arg3) { - Store(LOr(CH04("m38b", 0, arg3, z151, 0x001, 0, 0), Local7), Local7) + Store(LOr(CH04("m38b", 0, arg3, z151, __LINE__, 0, 0), Local7), Local7) } Decrement(lpN0) @@ -507,11 +507,11 @@ Method(m38c, 4, Serialized) if (arg2) { if (arg3) { - Store(LOr(CH03("m38b", z151, 0x000, 0, 0), Local7), Local7) + Store(LOr(CH03("m38b", z151, 0x000, __LINE__, 0), Local7), Local7) } m388(GLLL, GLIX, 0) // Release GL if (arg3) { - Store(LOr(CH04("m38b", 0, arg3, z151, 0x001, 0, 0), Local7), Local7) + Store(LOr(CH04("m38b", 0, arg3, z151, __LINE__, 0, 0), Local7), Local7) } } @@ -563,11 +563,11 @@ Method(m088, 7, Serialized) Store(0, lpC2) While (lpN2) { if (exc1) { - CH03("m088", z151, 0x000, 0, 0) + CH03("m088", z151, 0x000, __LINE__, 0) } m36f(lpC0, lpC1, exc0, arg6) // Acquire if (exc1) { - CH04("m088", 0, exc0, z151, 0x001, 0, 0) + CH04("m088", 0, exc0, z151, __LINE__, 0, 0) } Decrement(lpN2) Increment(lpC2) @@ -682,11 +682,11 @@ Method(m089, 7, Serialized) While (lpN2) { if (exc1) { - CH03("m088", z151, 0x000, 0, 0) + CH03("m088", z151, 0x000, __LINE__, 0) } m388(lpC0, Local0, exc0) // Release if (exc1) { - CH04("m088", 0, exc0, z151, 0x001, 0, 0) + CH04("m088", 0, exc0, z151, __LINE__, 0, 0) } Decrement(lpN2) @@ -718,11 +718,11 @@ Method(m089, 7, Serialized) While (lpN2) { if (exc1) { - CH03("m088", z151, 0x000, 0, 0) + CH03("m088", z151, 0x000, __LINE__, 0) } m388(lpC0, Local0, exc0) // Release if (exc1) { - CH04("m088", 0, exc0, z151, 0x001, 0, 0) + CH04("m088", 0, exc0, z151, __LINE__, 0, 0) } Decrement(lpN2) diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl index 92edb2f..c79c219 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl @@ -60,13 +60,13 @@ Method(m3b0, 0, Serialized, 0) Increment(i000) Store("m016", Debug) if (LNotEqual(i000, 17)) { - err(ts, z173, 0x000, 0, 0, i000, 17) + err(ts, z173, __LINE__, 0, 0, i000, 17) } } - CH03(ts, z173, 0x001, 0, 0) + CH03(ts, z173, 0x001, __LINE__, 0) m000() - CH03(ts, z173, 0x002, 0, 0) + CH03(ts, z173, 0x002, __LINE__, 0) } /* @@ -98,13 +98,13 @@ Method(m3b1,, Serialized) Increment(i000) Store("m016", Debug) if (LNotEqual(i000, 17)) { - err(ts, z173, 0x003, 0, 0, i000, 17) + err(ts, z173, __LINE__, 0, 0, i000, 17) } } - CH03(ts, z173, 0x004, 0, 0) + CH03(ts, z173, 0x004, __LINE__, 0) m000() - CH03(ts, z173, 0x005, 0, 0) + CH03(ts, z173, 0x005, __LINE__, 0) } /* @@ -163,18 +163,18 @@ Method(m3b2, 0, Serialized, 0) Increment(i000) Store("m016", Debug) if (LNotEqual(i000, 28)) { - err(ts, z173, 0x006, 0, 0, i000, 28) + err(ts, z173, __LINE__, 0, 0, i000, 28) } Store(0xabcd0000, i001) } - CH03(ts, z173, 0x007, 0, 0) + CH03(ts, z173, 0x007, __LINE__, 0) m000() if (LNotEqual(i001, 0xabcd0000)) { - err(ts, z173, 0x008, 0, 0, i001, 0xabcd0000) + err(ts, z173, __LINE__, 0, 0, i001, 0xabcd0000) } - CH03(ts, z173, 0x009, 0, 0) + CH03(ts, z173, 0x009, __LINE__, 0) } /* @@ -296,7 +296,7 @@ Method(m3b3, 3, Serialized) } } - CH03(ts, z173, 0x00a, 0, 0) + CH03(ts, z173, 0x00a, __LINE__, 0) Store(arg0, i000) Store(arg1, i001) @@ -305,17 +305,17 @@ Method(m3b3, 3, Serialized) mm00(0, i000, i001) if (LGreater(arg0, arg1)) { - CH04(ts, 0, 64, z173, 0x00b, 0, 0) // AE_AML_MUTEX_ORDER + CH04(ts, 0, 64, z173, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER } else { if (LNotEqual(i003, arg0)) { - err(ts, z173, 0x00c, 0, 0, i003, arg0) + err(ts, z173, __LINE__, 0, 0, i003, arg0) } if (LNotEqual(i004, arg1)) { - err(ts, z173, 0x00d, 0, 0, i004, arg1) + err(ts, z173, __LINE__, 0, 0, i004, arg1) } } - CH03(ts, z173, 0x00e, 0, 0) + CH03(ts, z173, 0x00e, __LINE__, 0) } Method(m3b4,, Serialized) @@ -429,7 +429,7 @@ Method(m3b5, 2, Serialized) } } - CH03(ts, z173, 0x00f, 0, 0) + CH03(ts, z173, 0x00f, __LINE__, 0) Store(arg0, i000) Store(arg1, i001) @@ -437,17 +437,17 @@ Method(m3b5, 2, Serialized) mm00(0, i000, i001) if (LGreater(arg0, arg1)) { - CH04(ts, 0, 64, z173, 0x010, 0, 0) // AE_AML_MUTEX_ORDER + CH04(ts, 0, 64, z173, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER } else { if (LNotEqual(i003, arg0)) { - err(ts, z173, 0x011, 0, 0, i003, arg0) + err(ts, z173, __LINE__, 0, 0, i003, arg0) } if (LNotEqual(i004, arg1)) { - err(ts, z173, 0x012, 0, 0, i004, arg1) + err(ts, z173, __LINE__, 0, 0, i004, arg1) } } - CH03(ts, z173, 0x013, 0, 0) + CH03(ts, z173, 0x013, __LINE__, 0) } Method(m3b6,, Serialized) @@ -601,7 +601,7 @@ Method(m3b7, 3, Serialized) } } - CH03(ts, z173, 0x014, 0, 0) + CH03(ts, z173, 0x014, __LINE__, 0) Store(arg0, i000) Store(arg1, i001) @@ -610,17 +610,17 @@ Method(m3b7, 3, Serialized) mm00(0, i000, i001) if (LGreater(arg0, arg1)) { - CH04(ts, 0, 64, z173, 0x015, 0, 0) // AE_AML_MUTEX_ORDER + CH04(ts, 0, 64, z173, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER } else { if (LNotEqual(i003, arg0)) { - err(ts, z173, 0x016, 0, 0, i003, arg0) + err(ts, z173, __LINE__, 0, 0, i003, arg0) } if (LNotEqual(i004, arg1)) { - err(ts, z173, 0x017, 0, 0, i004, arg1) + err(ts, z173, __LINE__, 0, 0, i004, arg1) } } - CH03(ts, z173, 0x018, 0, 0) + CH03(ts, z173, 0x018, __LINE__, 0) } Method(m3b8,, Serialized) @@ -804,7 +804,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -821,7 +821,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -838,7 +838,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -855,7 +855,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -872,7 +872,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -889,7 +889,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -906,7 +906,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -923,7 +923,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -940,7 +940,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -957,7 +957,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -974,7 +974,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -991,7 +991,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -1008,7 +1008,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -1025,7 +1025,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -1042,7 +1042,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -1059,7 +1059,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -1211,7 +1211,7 @@ Method(m3bb, 3, Serialized) } } - CH03(ts, z173, 0x00a, 0, 0) + CH03(ts, z173, 0x00a, __LINE__, 0) Store(arg0, i000) Store(arg1, i001) @@ -1236,17 +1236,17 @@ Method(m3bb, 3, Serialized) } if (LNot(Local4)) { - CH04(ts, 1, 64, z173, 0x00b, 0, 0) // AE_AML_MUTEX_ORDER + CH04(ts, 1, 64, z173, __LINE__, 0, 0) // AE_AML_MUTEX_ORDER } else { if (LNotEqual(i003, arg0)) { - err(ts, z173, 0x00c, 0, 0, i003, arg0) + err(ts, z173, __LINE__, 0, 0, i003, arg0) } if (LNotEqual(i004, arg1)) { - err(ts, z173, 0x00d, 0, 0, i004, arg1) + err(ts, z173, __LINE__, 0, 0, i004, arg1) } } - CH03(ts, z173, 0x00e, 0, 0) + CH03(ts, z173, 0x00e, __LINE__, 0) } Method(m3bc,, Serialized) diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl index 76f06b3..c590856 100644 --- a/tests/aslts/src/runtime/collections/functional/table/load.asl +++ b/tests/aslts/src/runtime/collections/functional/table/load.asl @@ -312,7 +312,7 @@ Device(DTM0) { Store(BUF0, RFU0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x000, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } @@ -323,7 +323,7 @@ Device(DTM0) { Store(RFU0, Local0) Store(Add(SUM, CHSM(Local0, SizeOf (Local0))), SUM) - if (CH03(arg0, z174, 0x001, 0, 0)) { + if (CH03(arg0, z174, 0x001, __LINE__, 0)) { return } @@ -335,12 +335,12 @@ Device(DTM0) { case (3) {Load(RFU0, Index(PHI0, 0))} default { Store("Unexpected parameter of the test", Debug) - err(arg0, z174, 0x002, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } } - if (CH03(arg0, z174, 0x003, 0, 0)) { + if (CH03(arg0, z174, 0x003, __LINE__, 0)) { return } @@ -354,26 +354,26 @@ Device(DTM0) { case (3) {Store(ObjectType(Index(PHI0, 0)), Local1)} } if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z174, 0x004, 0, 0, Local1, c017) + err(arg0, z174, __LINE__, 0, 0, Local1, c017) } // Check the new Object appears if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x005, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) } Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { // Method - err(arg0, z174, 0x006, 0, 0, Local1, c010) + err(arg0, z174, __LINE__, 0, 0, Local1, c010) } else { Store(\SSS0(), Local0) - if (CH03(arg0, z174, 0x007, "\\SSS0", 1)) { + if (CH03(arg0, z174, 0x007, __LINE__, 1)) { return } if (LNotEqual("\\SSS0", Local0)) { - err(arg0, z174, 0x008, 0, 0, Local0, "\\SSS0") + err(arg0, z174, __LINE__, 0, 0, Local0, "\\SSS0") } } @@ -385,14 +385,14 @@ Device(DTM0) { case (3) {UnLoad(DeRefof(Index(PHI0, 0)))} } - if (CH03(arg0, z174, 0x009, 0, 0)) { + if (CH03(arg0, z174, 0x009, __LINE__, 0)) { return } Store("Table Unloaded", Debug) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x00a, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return @@ -407,7 +407,7 @@ Device(DTM0) { Store(BUF0, RFU0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x00b, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -418,14 +418,14 @@ Device(DTM0) { Store(RFU0, Local0) Store(Add(SUM, CHSM(Local0, SizeOf (Local0))), SUM) - if (CH03(arg0, z174, 0x00c, 0, 0)) { + if (CH03(arg0, z174, 0x00c, __LINE__, 0)) { return (1) } // Load operator execution Load(RFU0, Arg1) - if (CH03(arg0, z174, 0x00d, 0, 0)) { + if (CH03(arg0, z174, 0x00d, __LINE__, 0)) { return (1) } @@ -443,39 +443,39 @@ Device(DTM0) { // Check DDBHandle ObjectType Store(ObjectType(Arg1), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z174, 0x00e, 0, 0, Local1, c017) + err(arg0, z174, __LINE__, 0, 0, Local1, c017) } // Check the new Object appears if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x00f, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) } Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { // Method - err(arg0, z174, 0x010, 0, 0, Local1, c010) + err(arg0, z174, __LINE__, 0, 0, Local1, c010) } else { Store(\SSS0(), Local0) - if (CH03(arg0, z174, 0x011, "\\SSS0", 1)) { + if (CH03(arg0, z174, 0x011, __LINE__, 1)) { return } if (LNotEqual("\\SSS0", Local0)) { - err(arg0, z174, 0x012, 0, 0, Local0, "\\SSS0") + err(arg0, z174, __LINE__, 0, 0, Local0, "\\SSS0") } } UnLoad(Arg1) - if (CH03(arg0, z174, 0x013, 0, 0)) { + if (CH03(arg0, z174, 0x013, __LINE__, 0)) { return } Store("SSDT Unloaded", Debug) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x014, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return @@ -609,7 +609,7 @@ Device(DTM0) { Store(BUF0, RFU0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x015, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } @@ -620,7 +620,7 @@ Device(DTM0) { Store(RFU0, Local0) Store(Add(SUM, CHSM(Local0, SizeOf (Local0))), SUM) - if (CH03(arg0, z174, 0x016, 0, 0)) { + if (CH03(arg0, z174, 0x016, __LINE__, 0)) { return } @@ -632,12 +632,12 @@ Device(DTM0) { case (3) {Load(RFU0, Index(PHI0, 0))} default { Store("Unexpected parameter of the test", Debug) - err(arg0, z174, 0x017, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } } - if (CH03(arg0, z174, 0x018, 0, 0)) { + if (CH03(arg0, z174, 0x018, __LINE__, 0)) { return } @@ -651,26 +651,26 @@ Device(DTM0) { case (3) {Store(ObjectType(Index(PHI0, 0)), Local1)} } if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z174, 0x019, 0, 0, Local1, c017) + err(arg0, z174, __LINE__, 0, 0, Local1, c017) } // Check the new Object appears if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x01a, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) } Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { // Method - err(arg0, z174, 0x01b, 0, 0, Local1, c010) + err(arg0, z174, __LINE__, 0, 0, Local1, c010) } else { Store(\SSS0(), Local0) - if (CH03(arg0, z174, 0x01c, "\\SSS0", 1)) { + if (CH03(arg0, z174, 0x01c, __LINE__, 1)) { return } if (LNotEqual("\\SSS0", Local0)) { - err(arg0, z174, 0x01d, 0, 0, Local0, "\\SSS0") + err(arg0, z174, __LINE__, 0, 0, Local0, "\\SSS0") } } @@ -682,14 +682,14 @@ Device(DTM0) { case (3) {UnLoad(DeRefof(Index(PHI0, 0)))} } - if (CH03(arg0, z174, 0x01e, 0, 0)) { + if (CH03(arg0, z174, 0x01e, __LINE__, 0)) { return } Store("SSDT Unloaded", Debug) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x01f, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return @@ -727,7 +727,7 @@ Device(DTM0) { Store(BUF0, RFU0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x020, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -738,14 +738,14 @@ Device(DTM0) { Store(RFU0, Local0) Store(Add(SUM, CHSM(Local0, SizeOf (Local0))), SUM) - if (CH03(arg0, z174, 0x021, 0, 0)) { + if (CH03(arg0, z174, 0x021, __LINE__, 0)) { return (1) } // Load operator execution Load(RFU0, Arg1) - if (CH03(arg0, z174, 0x022, 0, 0)) { + if (CH03(arg0, z174, 0x022, __LINE__, 0)) { return (1) } @@ -818,7 +818,7 @@ Device(DTM0) { m003(Local4, Arg2) } else { Store("This Region type's AddrSpace Handler not installed", Debug) - err(arg0, z174, 0x023, 0, 0, Local2, Arg1) + err(arg0, z174, __LINE__, 0, 0, Local2, Arg1) } } @@ -888,10 +888,10 @@ Device(DTM0) { // Check absence if (CondRefof(NABS, Local0)) { - err(arg0, z174, 0x024, 0, 0, "NABS", 1) + err(arg0, z174, __LINE__, 0, 0, "NABS", 1) } if (CondRefof(NCRR, Local0)) { - err(arg0, z174, 0x025, 0, 0, "NCRR", 1) + err(arg0, z174, __LINE__, 0, 0, "NCRR", 1) } Store(BUF1, RFU1) @@ -901,36 +901,36 @@ Device(DTM0) { // Check existence if (CondRefof(NABS, Local0)) { if (LNotEqual("absolute location obj", Derefof(Local0))) { - err(arg0, z174, 0x026, 0, 0, Derefof(Local0), + err(arg0, z174, __LINE__, 0, 0, Derefof(Local0), "absolute location obj") } } else { - err(arg0, z174, 0x027, 0, 0, "NABS", 0) + err(arg0, z174, __LINE__, 0, 0, "NABS", 0) } if (CondRefof(NCRR, Local0)) { if (LNotEqual("current location obj", Derefof(Local0))) { - err(arg0, z174, 0x028, 0, 0, Derefof(Local0), + err(arg0, z174, __LINE__, 0, 0, Derefof(Local0), "current location obj") } } else { - err(arg0, z174, 0x029, 0, 0, "NCRR", 0) + err(arg0, z174, __LINE__, 0, 0, "NCRR", 0) } // Check location if (CondRefof(\NABS, Local0)) { } else { - err(arg0, z174, 0x02a, 0, 0, "NABS", 0) + err(arg0, z174, __LINE__, 0, 0, "NABS", 0) } //Note: We load the table objects relative to the root of the namespace. if (CondRefof(\NCRR, Local0)) { } else { - err(arg0, z174, 0x02b, 0, 0, "\\NCRR", 1) + err(arg0, z174, __LINE__, 0, 0, "\\NCRR", 1) } if (CondRefof(\DTM0.NCRR, Local0)) { - err(arg0, z174, 0x02c, 0, 0, "\\DTM0.NCRR", 1) + err(arg0, z174, __LINE__, 0, 0, "\\DTM0.NCRR", 1) } if (CondRefof(\DTM0.TST8.NCRR, Local0)) { - err(arg0, z174, 0x02d, 0, 0, "\\DTM0.TST8.NCRR", 0) + err(arg0, z174, __LINE__, 0, 0, "\\DTM0.TST8.NCRR", 0) } UnLoad(DDBH) @@ -938,10 +938,10 @@ Device(DTM0) { // Check absence if (CondRefof(NABS, Local0)) { - err(arg0, z174, 0x02e, 0, 0, "NABS", 1) + err(arg0, z174, __LINE__, 0, 0, "NABS", 1) } if (CondRefof(NCRR, Local0)) { - err(arg0, z174, 0x02f, 0, 0, "NCRR", 1) + err(arg0, z174, __LINE__, 0, 0, "NCRR", 1) } } @@ -1005,55 +1005,55 @@ Device(DTM0) { Store(BUF2, RFU2) if (CondRefof(\AUXD, Local0)) { - err(arg0, z174, 0x030, 0, 0, "\\AUXD", 1) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD", 1) return } - if (CH03(arg0, 0, 0x031, 0, 0)) { + if (CH03(arg0, 0, 0x031, __LINE__, 0)) { return } Load(RFU2, DDBH) - if (CH03(arg0, 0, 0x032, 0, 0)) { + if (CH03(arg0, 0, 0x032, __LINE__, 0)) { return } if (CondRefof(\AUXD, Local0)) { } else { - err(arg0, z174, 0x033, 0, 0, "\\AUXD", 0) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD", 0) return } Store (ObjectType(Local0), Local1) if (LNotEqual(Local1, 6)) { - err(arg0, z174, 0x034, 0, 0, Local1, 6) + err(arg0, z174, __LINE__, 0, 0, Local1, 6) return } if (CondRefof(\AUXD.REGC, Local0)) { } else { - err(arg0, z174, 0x035, 0, 0, "\\AUXD.REGC", 0) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD.REGC", 0) return } Store(Derefof(Local0), Local1) if (LNotEqual(1, Local1)) { - err(arg0, z174, 0x036, 0, 0, Local1, 1) + err(arg0, z174, __LINE__, 0, 0, Local1, 1) } if (CondRefof(\AUXD.REGD, Local0)) { } else { - err(arg0, z174, 0x037, 0, 0, "\\AUXD.REGD", 0) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD.REGD", 0) return } Store(Derefof(Local0), Local1) if (LNotEqual(0xFFFFFFFF, Local1)) { - err(arg0, z174, 0x038, 0, 0, Local1, 0xFFFFFFFF) + err(arg0, z174, __LINE__, 0, 0, Local1, 0xFFFFFFFF) } elseif (CondRefof(\AUXD.M000, Local2)) { \AUXD.M000() @@ -1061,16 +1061,16 @@ Device(DTM0) { Store(Derefof(Local0), Local1) if (LNotEqual(1, Local1)) { - err(arg0, z174, 0x039, 0, 0, Local1, 1) + err(arg0, z174, __LINE__, 0, 0, Local1, 1) } } else { - err(arg0, z174, 0x03a, 0, 0, "\\AUXD.M000", 0) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD.M000", 0) } UnLoad(DDBH) if (CondRefof(\AUXD, Local0)) { - err(arg0, z174, 0x03b, 0, 0, "\\AUXD", 1) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD", 1) } return } @@ -1082,7 +1082,7 @@ Device(DTM0) { Concatenate(arg0, "-LDCH", arg0) - if (CH03(arg0, z174, 0x040, 0, 0)) { + if (CH03(arg0, z174, 0x040, __LINE__, 0)) { return (1) } @@ -1115,18 +1115,18 @@ Device(DTM0) { CopyObject(Derefof(Local5), MAUX) if (LLess(Local1, HI0N)) { - if (CH03(arg0, z174, 0x041, 0, 0)) { + if (CH03(arg0, z174, 0x041, __LINE__, 0)) { return (2) } Store(MAUX(), Local2) - if (CH03(arg0, z174, 0x042, 0, 0)) { + if (CH03(arg0, z174, 0x042, __LINE__, 0)) { return (3) } if (LNotEqual(Local5, Local2)) { - err(arg0, z174, 0x043, 0, 0, Local2, Local5) + err(arg0, z174, __LINE__, 0, 0, Local2, Local5) } } else { - if (CH04(arg0, 0, 0xff, z174, 0x044, 0, 0)) { // AE_NOT_FOUND + if (CH04(arg0, 0, 0xff, z174, __LINE__, 0, 0)) { // AE_NOT_FOUND return (4) } } @@ -1144,26 +1144,26 @@ Device(DTM0) { Concatenate(arg0, "-tsta", arg0) if (INIT()) { - err(arg0, z174, 0x045, 0, 0, "INIT", 1) + err(arg0, z174, __LINE__, 0, 0, "INIT", 1) return (1) } - if (CH03(arg0, z174, 0x046, 0, 0)) { + if (CH03(arg0, z174, 0x046, __LINE__, 0)) { return (1) } Store(arg1, Local0) while (Local0) { if (LD()) { - err(arg0, z174, 0x047, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } - if (CH03(arg0, z174, 0x048, 0, 0)) { + if (CH03(arg0, z174, 0x048, __LINE__, 0)) { return (1) } Decrement(Local0) if (LDCH(arg0)) { - err(arg0, z174, 0x049, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } } @@ -1171,16 +1171,16 @@ Device(DTM0) { Store(arg1, Local0) while (Local0) { if (UNLD()) { - err(arg0, z174, 0x040a, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } - if (CH03(arg0, z174, 0x04b, 0, 0)) { + if (CH03(arg0, z174, 0x04b, __LINE__, 0)) { return (1) } Decrement(Local0) if (LDCH(arg0)) { - err(arg0, z174, 0x04c, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } } @@ -1247,7 +1247,7 @@ Device(DTM0) { Store(BUF3, RFU3) Load(RFU3, DDB0) - if (CH03(arg0, z174, 0x050, 0, 0)) { + if (CH03(arg0, z174, 0x050, __LINE__, 0)) { return (1) } @@ -1256,116 +1256,116 @@ Device(DTM0) { // Integer Load(\AUXD.INT0, DDBH) - CH04(arg0, 0, 47, z174, 0x051, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.INT0), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z174, 0x052, 0, 0, Local0, c009) + err(arg0, z174, __LINE__, 0, 0, Local0, c009) } // String Load(\AUXD.STR0, DDBH) - CH04(arg0, 0, 47, z174, 0x053, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.STR0), Local0) if (LNotEqual(c00a, Local0)) { - err(arg0, z174, 0x054, 0, 0, Local0, c00a) + err(arg0, z174, __LINE__, 0, 0, Local0, c00a) } // Buffer if (y282) { // TBD: LBZ480 update allows Buffer to be Source of Load Load(\AUXD.BUF0, DDBH) - CH04(arg0, 0, 47, z174, 0x055, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.BUF0), Local0) if (LNotEqual(c00b, Local0)) { - err(arg0, z174, 0x056, 0, 0, Local0, c00b) + err(arg0, z174, __LINE__, 0, 0, Local0, c00b) } } // Package Load(\AUXD.PAC0, DDBH) - CH04(arg0, 0, 47, z174, 0x057, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.PAC0), Local0) if (LNotEqual(c00c, Local0)) { - err(arg0, z174, 0x058, 0, 0, Local0, c00c) + err(arg0, z174, __LINE__, 0, 0, Local0, c00c) } // Field Unit // Device Load(\AUXD.DEV0, DDBH) - CH04(arg0, 0, 47, z174, 0x059, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.DEV0), Local0) if (LNotEqual(c00e, Local0)) { - err(arg0, z174, 0x05a, 0, 0, Local0, c00e) + err(arg0, z174, __LINE__, 0, 0, Local0, c00e) } // Event Load(\AUXD.EVE0, DDBH) - CH04(arg0, 0, 47, z174, 0x05b, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.EVE0), Local0) if (LNotEqual(c00f, Local0)) { - err(arg0, z174, 0x05c, 0, 0, Local0, c00f) + err(arg0, z174, __LINE__, 0, 0, Local0, c00f) } // Method Load(\AUXD.MMM0, DDBH) - CH04(arg0, 0, 47, z174, 0x05d, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.MMM0), Local0) if (LNotEqual(c010, Local0)) { - err(arg0, z174, 0x05e, 0, 0, Local0, c010) + err(arg0, z174, __LINE__, 0, 0, Local0, c010) } // Mutex Load(\AUXD.MTX0, DDBH) - CH04(arg0, 0, 47, z174, 0x05f, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.MTX0), Local0) if (LNotEqual(c011, Local0)) { - err(arg0, z174, 0x060, 0, 0, Local0, c011) + err(arg0, z174, __LINE__, 0, 0, Local0, c011) } // OpRegion // Power Resource Load(\AUXD.PWR0, DDBH) - CH04(arg0, 0, 47, z174, 0x061, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.PWR0), Local0) if (LNotEqual(c013, Local0)) { - err(arg0, z174, 0x062, 0, 0, Local0, c013) + err(arg0, z174, __LINE__, 0, 0, Local0, c013) } // Processor Load(\AUXD.CPU0, DDBH) - CH04(arg0, 0, 47, z174, 0x063, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.CPU0), Local0) if (LNotEqual(c014, Local0)) { - err(arg0, z174, 0x064, 0, 0, Local0, c014) + err(arg0, z174, __LINE__, 0, 0, Local0, c014) } // Thermal Zone Load(\AUXD.TZN0, DDBH) - CH04(arg0, 0, 47, z174, 0x065, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.TZN0), Local0) if (LNotEqual(c015, Local0)) { - err(arg0, z174, 0x066, 0, 0, Local0, c015) + err(arg0, z174, __LINE__, 0, 0, Local0, c015) } // Buffer Field if (y282) { // TBD: LBZ480 update allows Buffer Field to be Source of Load Load(\AUXD.BFL0, DDBH) - CH04(arg0, 0, 47, z174, 0x067, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.BFL0), Local0) if (LNotEqual(c016, Local0)) { - err(arg0, z174, 0x068, 0, 0, Local0, c016) + err(arg0, z174, __LINE__, 0, 0, Local0, c016) } } // DDB Handle Load(DDB0, DDBH) - CH04(arg0, 0, 47, z174, 0x069, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(DDB0), Local0) if (LNotEqual(c017, Local0)) { - err(arg0, z174, 0x06a, 0, 0, Local0, c017) + err(arg0, z174, __LINE__, 0, 0, Local0, c017) } UnLoad(DDB0) @@ -1393,80 +1393,80 @@ Device(DTM0) { OperationRegion(RGN8, 0xcf, 0xe80, 0x138) OperationRegion(RGN9, 0xff, 0xf80, 0x139) - if (CH03(arg0, z174, 0x06f, 0, 0)) { + if (CH03(arg0, z174, 0x06f, __LINE__, 0)) { return (1) } // SystemIO Load(RGN1, DDBH) - CH04(arg0, 0, 47, z174, 0x220, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN1), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x071, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // PCI_Config Load(RGN2, DDBH) - CH04(arg0, 0, 47, z174, 0x072, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN2), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x073, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // EmbeddedControl Load(RGN3, DDBH) - CH04(arg0, 0, 47, z174, 0x074, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN3), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x075, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // SMBus Load(RGN4, DDBH) - CH04(arg0, 0, 47, z174, 0x076, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN4), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x077, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // SystemCMOS Load(RGN5, DDBH) - CH04(arg0, 0, 47, z174, 0x078, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN5), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x079, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // PciBarTarget Load(RGN6, DDBH) - CH04(arg0, 0, 47, z174, 0x07a, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN6), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x07b, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // UserDefRegionSpace 0x80 Load(RGN7, DDBH) - CH04(arg0, 0, 47, z174, 0x07c, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN7), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x07d, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // UserDefRegionSpace 0xcf Load(RGN8, DDBH) - CH04(arg0, 0, 47, z174, 0x07e, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN8), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x07f, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // UserDefRegionSpace 0xff Load(RGN9, DDBH) - CH04(arg0, 0, 47, z174, 0x080, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z174, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN9), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x081, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } return (0) @@ -1481,7 +1481,7 @@ Device(DTM0) { Concatenate(arg0, "-tstd", arg0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x082, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1496,27 +1496,27 @@ Device(DTM0) { Store(RFU0, Local0) Store(Add(SUM, CHSM(Local0, SizeOf (Local0))), SUM) - if (CH03(arg0, z174, 0x083, 0, 0)) { + if (CH03(arg0, z174, 0x083, __LINE__, 0)) { return (1) } // Load operator execution, OpRegion case if (y290) { Load(IST0, HI0) - CH04(arg0, 0, 37, z174, 0x084, 0, 0) // AE_BAD_SIGNATURE + CH04(arg0, 0, 37, z174, __LINE__, 0, 0) // AE_BAD_SIGNATURE if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x085, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } } // Load operator execution, OpRegion Field case Load(RFU0, HI0) - CH04(arg0, 0, 37, z174, 0x086, 0, 0) // AE_BAD_SIGNATURE + CH04(arg0, 0, 37, z174, __LINE__, 0, 0) // AE_BAD_SIGNATURE if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x087, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return (0) @@ -1537,7 +1537,7 @@ Device(DTM0) { } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x090, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1556,25 +1556,25 @@ Device(DTM0) { Store(RFU0, Local0) Store(Add(SUM, CHSM(Local0, SizeOf (Local0))), SUM) - if (CH03(arg0, z174, 0x091, 0, 0)) { + if (CH03(arg0, z174, 0x091, __LINE__, 0)) { return (1) } // Load operator execution, OpRegion case if (y290) { Load(IST0, HI0) - CH04(arg0, 0, 42, z174, 0x092, 0, 0) // AE_INVALID_TABLE_LENGTH + CH04(arg0, 0, 42, z174, __LINE__, 0, 0) // AE_INVALID_TABLE_LENGTH if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x093, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) // CleanUp UnLoad(HI0) - if (CH03(arg0, z174, 0x094, 0, 0)) { + if (CH03(arg0, z174, 0x094, __LINE__, 0)) { return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x095, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } } @@ -1584,20 +1584,20 @@ Device(DTM0) { Load(RFU0, HI0) if(LNot(arg1)){ // If the table length in the header is larger than the buffer. - CH04(arg0, 0, 54, z174, 0x096, 0, 0) // AE_AML_BUFFER_LIMIT + CH04(arg0, 0, 54, z174, __LINE__, 0, 0) // AE_AML_BUFFER_LIMIT } else { // If the table length is smaller than an ACPI table header. - CH04(arg0, 0, 42, z174, 0x096, 0, 0) // AE_INVALID_TABLE_LENGTH + CH04(arg0, 0, 42, z174, __LINE__, 0, 0) // AE_INVALID_TABLE_LENGTH } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x097, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) UnLoad(HI0) - if (CH03(arg0, z174, 0x098, 0, 0)) { + if (CH03(arg0, z174, 0x098, __LINE__, 0)) { return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x099, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } } @@ -1613,7 +1613,7 @@ Device(DTM0) { Concatenate(arg0, "-tstf", arg0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0a0, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1626,21 +1626,21 @@ Device(DTM0) { // Spoil the CheckSum Store(Add(SUM, 1), SUM) - if (CH03(arg0, z174, 0x0a1, 0, 0)) { + if (CH03(arg0, z174, 0x0a1, __LINE__, 0)) { return (1) } // Load operator execution, OpRegion case if (y290) { Load(IST0, HI0) - CH04(arg0, 0, 39, z174, 0x0a2, 0, 0) // AE_BAD_CHECKSUM + CH04(arg0, 0, 39, z174, __LINE__, 0, 0) // AE_BAD_CHECKSUM if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0a3, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) //Cleanup UnLoad(HI0) - if (CH03(arg0, z174, 0x0a4, 0, 0)) { + if (CH03(arg0, z174, 0x0a4, __LINE__, 0)) { return (1) } Store(Add(SUM, 1), SUM) @@ -1649,17 +1649,17 @@ Device(DTM0) { // Load operator execution, OpRegion Field case Load(RFU0, HI0) - CH04(arg0, 0, 39, z174, 0x0a5, 0, 0) // AE_BAD_CHECKSUM + CH04(arg0, 0, 39, z174, __LINE__, 0, 0) // AE_BAD_CHECKSUM if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0a6, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) //Cleanup UnLoad(HI0) - if (CH03(arg0, z174, 0x0a7, 0, 0)) { + if (CH03(arg0, z174, 0x0a7, __LINE__, 0)) { return (1) } - if (CH03(arg0, z174, 0x0a8, 0, 0)) { + if (CH03(arg0, z174, 0x0a8, __LINE__, 0)) { return (1) } } @@ -1682,35 +1682,35 @@ Device(DTM0) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z174, 0x0b0, 0, 0, Local0, arg3) + err(arg0, z174, __LINE__, 0, 0, Local0, arg3) return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0b1, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } Load(RFU0, arg2) - if (CH03(arg0, z174, 0x0b2, 0, 0)) { + if (CH03(arg0, z174, 0x0b2, __LINE__, 0)) { return (1) } Store(ObjectType(arg2), Local0) if (LNotEqual(c017, Local0)) { - err(arg0, z174, 0x0b3, 0, 0, Local0, c017) + err(arg0, z174, __LINE__, 0, 0, Local0, c017) } if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x0b4, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) return (1) } UnLoad(Derefof(arg2)) - if (CH03(arg0, z174, 0x0b5, 0, 0)) { + if (CH03(arg0, z174, 0x0b5, __LINE__, 0)) { return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0b6, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1728,7 +1728,7 @@ Device(DTM0) { // Recalculate and save CheckSum Store(RFU0, Local0) Store(Add(SUM, CHSM(Local0, SizeOf (Local0))), SUM) - if (CH03(arg0, z174, 0x0b7, 0, 0)) { + if (CH03(arg0, z174, 0x0b7, __LINE__, 0)) { return (1) } @@ -1788,7 +1788,7 @@ Device(DTM0) { UnLoad(DDB0) - CH03(arg0, z174, 0x0b8, 0, 0) + CH03(arg0, z174, 0x0b8, __LINE__, 0) return (0) } @@ -1804,10 +1804,10 @@ Device(DTM0) { Concatenate(arg0, "-tsth", arg0) if (INIT()) { - err(arg0, z174, 0x0c0, 0, 0, "INIT", 1) + err(arg0, z174, __LINE__, 0, 0, "INIT", 1) return (1) } - if (CH03(arg0, z174, 0x0c1, 0, 0)) { + if (CH03(arg0, z174, 0x0c1, __LINE__, 0)) { return (1) } Store(BUF1, RFU1) @@ -1817,10 +1817,10 @@ Device(DTM0) { while (Local0) { Store(HI0N, Debug) if (LD()) { - err(arg0, z174, 0x0c2, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } - if (CH03(arg0, z174, 0x0c3, 0, 0)) { + if (CH03(arg0, z174, 0x0c3, __LINE__, 0)) { return (1) } Decrement(Local0) @@ -1840,22 +1840,22 @@ Device(DTM0) { // Futher 1 Method can be called UnLoad(DDB1) - CH04(arg0, 0, 86, z174, 0x0c4, 0, 0) // AE_OWNER_ID_LIMIT + CH04(arg0, 0, 86, z174, __LINE__, 0, 0) // AE_OWNER_ID_LIMIT Store(MAXT, Local0) while (Local0) { if (UNLD()) { - err(arg0, z174, 0x0c5, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } - if (CH03(arg0, z174, 0x0c6, 0, 0)) { + if (CH03(arg0, z174, 0x0c6, __LINE__, 0)) { return (1) } Decrement(Local0) } if (LDCH(0)) { - err(arg0, z174, 0x0c7, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } @@ -1872,7 +1872,7 @@ Device(DTM0) { Concatenate(arg0, "-tsti", arg0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0d0, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1882,24 +1882,24 @@ Device(DTM0) { Store(RFU0, Local0) Store(Add(SUM, CHSM(Local0, SizeOf (Local0))), SUM) - if (CH03(arg0, z174, 0x0d1, 0, 0)) { + if (CH03(arg0, z174, 0x0d1, __LINE__, 0)) { return (1) } // Load operator execution Load(RFU0, HI0) - if (CH03(arg0, z174, 0x0d2, 0, 0)) { + if (CH03(arg0, z174, 0x0d2, __LINE__, 0)) { return (1) } Store(ObjectType(HI0), Local0) if (LNotEqual(c017, Local0)) { - err(arg0, z174, 0x0d3, 0, 0, Local0, c017) + err(arg0, z174, __LINE__, 0, 0, Local0, c017) } if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x0d4, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) return (1) } @@ -1908,11 +1908,11 @@ Device(DTM0) { while (Local1) { // Repeated Load operator execution Load(RFU0, HI1) - CH04(arg0, 0, 7, z174, 0x0d5, 5, Local1) // AE_ALREADY_EXISTS + CH04(arg0, 0, 7, z174, __LINE__, 5, Local1) // AE_ALREADY_EXISTS Store(ObjectType(HI1), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z174, 0x0d6, 0, 0, Local0, c009) + err(arg0, z174, __LINE__, 0, 0, Local0, c009) } Decrement(Local1) @@ -1920,12 +1920,12 @@ Device(DTM0) { UnLoad(HI0) - if (CH03(arg0, z174, 0x0d7, 0, 0)) { + if (CH03(arg0, z174, 0x0d7, __LINE__, 0)) { return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0d8, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return (0) @@ -1941,7 +1941,7 @@ Device(DTM0) { Concatenate(arg0, "-tstj", arg0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0e0, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1951,24 +1951,24 @@ Device(DTM0) { Store(^RFU0, Local0) Store(Add(^SUM, CHSM(Local0, SizeOf (Local0))), ^SUM) - if (CH03(arg0, z174, 0x0e1, 0, 0)) { + if (CH03(arg0, z174, 0x0e1, __LINE__, 0)) { return (1) } // Load operator execution Load(^RFU0, HI0) - if (CH03(arg0, z174, 0x0e2, 0, 0)) { + if (CH03(arg0, z174, 0x0e2, __LINE__, 0)) { return (1) } Store(ObjectType(HI0), Local0) if (LNotEqual(c017, Local0)) { - err(arg0, z174, 0x0e3, 0, 0, Local0, c017) + err(arg0, z174, __LINE__, 0, 0, Local0, c017) } if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x0e4, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) return (1) } @@ -2010,11 +2010,11 @@ Device(DTM0) { while (Local1) { // Any next Load Load(RFU0, HI1) - CH04(arg0, 0, 7, z174, 0x0e5, 5, Local1) // AE_ALREADY_EXISTS + CH04(arg0, 0, 7, z174, __LINE__, 5, Local1) // AE_ALREADY_EXISTS Store(ObjectType(HI1), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z174, 0x0e6, 0, 0, Local0, c009) + err(arg0, z174, __LINE__, 0, 0, Local0, c009) } Decrement(Local1) @@ -2022,12 +2022,12 @@ Device(DTM0) { UnLoad(HI0) - if (CH03(arg0, z174, 0x0e7, 0, 0)) { + if (CH03(arg0, z174, 0x0e7, __LINE__, 0)) { return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0e8, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return (0) @@ -2070,48 +2070,48 @@ Device(DTM0) { Concatenate(arg0, "-tstk", arg0) if (CondRefof(\DDBX, Local0)) { - err(arg0, z174, 0x0f0, 0, 0, "\\DDBX", 1) + err(arg0, z174, __LINE__, 0, 0, "\\DDBX", 1) return } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0f1, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } Store(BUF5, RFU5) Load(RFU5, DDBH) - if (CH03(arg0, z174, 0x0f2, 0, 0)) { + if (CH03(arg0, z174, 0x0f2, __LINE__, 0)) { return (1) } if (CondRefof(\DDBX, Local0)) { } else { - err(arg0, z174, 0x0f3, 0, 0, "\\DDBX", 1) + err(arg0, z174, __LINE__, 0, 0, "\\DDBX", 1) return } if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x0f4, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } Unload(DDBX) - if (CH03(arg0, z174, 0x0f5, 0, 0)) { + if (CH03(arg0, z174, 0x0f5, __LINE__, 0)) { return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0f6, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } UnLoad(DDBH) - if (CH03(arg0, z174, 0x0f7, 0, 0)) { + if (CH03(arg0, z174, 0x0f7, __LINE__, 0)) { return (1) } if (CondRefof(\DDBX, Local0)) { - err(arg0, z174, 0x0f8, 0, 0, "\\DDBX", 1) + err(arg0, z174, __LINE__, 0, 0, "\\DDBX", 1) return } } @@ -2124,25 +2124,25 @@ Method(TLD0,, Serialized) // Loading SSDT from a SystemMemory OpRegion, // different targets for DDBHandle - CH03(ts, z174, 0x200, 0, 0) + CH03(ts, z174, 0x200, __LINE__, 0) // Named Objects SRMT("TLD0.tst0") \DTM0.tst0(ts) - CH03(ts, z174, 0x201, 0, 0) + CH03(ts, z174, 0x201, __LINE__, 0) // LocalX Object SRMT("TLD0.tst1") \DTM0.tst1(ts) - CH03(ts, z174, 0x202, 0, 0) + CH03(ts, z174, 0x202, __LINE__, 0) // Package element SRMT("TLD0.tst2") \DTM0.tst2(ts) - CH03(ts, z174, 0x203, 0, 0) + CH03(ts, z174, 0x203, __LINE__, 0) // By Reference in ArgX SRMT("TLD0.tst3") @@ -2151,38 +2151,38 @@ Method(TLD0,, Serialized) // Loading SSDT from a Field of an OpRegion of any type, // different targets for DDBHandle - CH03(ts, z174, 0x204, 0, 0) + CH03(ts, z174, 0x204, __LINE__, 0) // SystemMemory Region SRMT("TLD0.tst4") \DTM0.tst4(ts) - CH03(ts, z174, 0x205, 0, 0) + CH03(ts, z174, 0x205, __LINE__, 0) // SystemIO Region SRMT("TLD0.tst5") \DTM0.tst5(ts) - CH03(ts, z174, 0x206, 0, 0) + CH03(ts, z174, 0x206, __LINE__, 0) // EmbeddedControl Region SRMT("TLD0.tst6") \DTM0.tst6(ts) - CH03(ts, z174, 0x207, 0, 0) + CH03(ts, z174, 0x207, __LINE__, 0) // User defined Region SRMT("TLD0.tst7") \DTM0.tst7(ts) - CH03(ts, z174, 0x208, 0, 0) + CH03(ts, z174, 0x208, __LINE__, 0) // Check that "namespace location to load the Definition Block // is relative to the current namespace" scope, SRMT("TLD0.tst8") \DTM0.tst8(ts) - CH03(ts, z174, 0x209, 0, 0) + CH03(ts, z174, 0x209, __LINE__, 0) // Check global and dynamic declarations of OpRegions // and the appropriate _REG Methods invocation for the @@ -2190,13 +2190,13 @@ Method(TLD0,, Serialized) SRMT("TLD0.tst9") \DTM0.tst9(ts) - CH03(ts, z174, 0x20a, 0, 0) + CH03(ts, z174, 0x20a, __LINE__, 0) // Object of any type can be used as the DDBHandle argument SRMT("TLD0.tstg") \DTM0.tstg(ts) - CH03(ts, z174, 0x20b, 0, 0) + CH03(ts, z174, 0x20b, __LINE__, 0) // Loading a number of different SSDTs SRMT("TLD0.tsta") @@ -2206,13 +2206,13 @@ Method(TLD0,, Serialized) BLCK() } - CH03(ts, z174, 0x20c, 0, 0) + CH03(ts, z174, 0x20c, __LINE__, 0) // Recursive Load in module level SRMT("TLD0.tstk") \DTM0.tstk(ts) - CH03(ts, z174, 0x20d, 0, 0) + CH03(ts, z174, 0x20d, __LINE__, 0) } // Exceptional conditions diff --git a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl index 4eb5b07..4e623be 100644 --- a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl +++ b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl @@ -156,7 +156,7 @@ Device(DTM2) { Concatenate(arg0, "-tst0", arg0) if (LNotEqual(OEMT, FU00)) { - err(arg0, z176, 0x001, 0, 0, FU00, OEMT) + err(arg0, z176, __LINE__, 0, 0, FU00, OEMT) return (1) } @@ -175,7 +175,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x002, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -183,34 +183,34 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", "\\", PPST, 1), DDBH) - if (CH03(arg0, z176, 0x003, 0, 0)) { + if (CH03(arg0, z176, 0x003, __LINE__, 0)) { return (1) } Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x005, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x006, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x007, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x008, 0, 0)) { + if (CH03(arg0, z176, 0x008, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x009, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -225,7 +225,7 @@ Device(DTM2) { Concatenate(arg0, "-tst1", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x010, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -239,34 +239,34 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", "\\", PPST, 1), DDBH) } - if (CH03(arg0, z176, 0x011, 0, 0)) { + if (CH03(arg0, z176, 0x011, __LINE__, 0)) { return (1) } Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x012, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x013, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x014, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x015, 0, 0)) { + if (CH03(arg0, z176, 0x015, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x016, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Unhappy comparison due to the SignatureString @@ -275,41 +275,41 @@ Device(DTM2) { Store(ObjectType(Local2), Local1) if (LNotEqual(Local1, c008)) { - err(arg0, z176, 0x017, 0, 0, Local1, c008) + err(arg0, z176, __LINE__, 0, 0, Local1, c008) } Store(LoadTable("OeM1", "Intel", "Many", "\\", PPST, 1), Local2) if (y281) { // No exception - if (CH03(arg0, z176, 0x018, 0, 0)) { + if (CH03(arg0, z176, 0x018, __LINE__, 0)) { return (1) } } else { // Exception: AE_BAD_SIGNATURE - if (CH04(arg0, 1, 37, z176, 0x019, 0, 0)) { + if (CH04(arg0, 1, 37, z176, __LINE__, 0, 0)) { return (1) } } Store(ObjectType(Local2), Local1) if (y281) { if (LNotEqual(Local1, c009)) { - err(arg0, z176, 0x01a, 0, 0, Local1, c009) + err(arg0, z176, __LINE__, 0, 0, Local1, c009) } if (LNotEqual(Local2, 0)) { - err(arg0, z176, 0x01b, 0, 0, Local2, 0) + err(arg0, z176, __LINE__, 0, 0, Local2, 0) } } else { if (LNotEqual(Local1, c008)) { - err(arg0, z176, 0x01c, 0, 0, Local1, c008) + err(arg0, z176, __LINE__, 0, 0, Local1, c008) } } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x01d, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x01e, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Unhappy comparison due to the OEMIDString @@ -318,30 +318,30 @@ Device(DTM2) { Store(ObjectType(Local3), Local1) if (LNotEqual(Local1, c008)) { - err(arg0, z176, 0x01f, 0, 0, Local1, c008) + err(arg0, z176, __LINE__, 0, 0, Local1, c008) } Store(LoadTable("OEM1", "InteL", "Many", "\\", PPST, 1), Local3) - if (CH03(arg0, z176, 0x020, 0, 0)) { + if (CH03(arg0, z176, 0x020, __LINE__, 0)) { return (1) } Store(ObjectType(Local3), Local1) if (LNotEqual(Local1, c009)) { - err(arg0, z176, 0x021, 0, 0, Local1, c009) + err(arg0, z176, __LINE__, 0, 0, Local1, c009) } if (LNotEqual(Local3, 0)) { - err(arg0, z176, 0x022, 0, 0, Local3, 0) + err(arg0, z176, __LINE__, 0, 0, Local3, 0) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x023, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x024, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Unhappy comparison due to the OEMTableIDString @@ -350,30 +350,30 @@ Device(DTM2) { Store(ObjectType(Local4), Local1) if (LNotEqual(Local1, c008)) { - err(arg0, z176, 0x025, 0, 0, Local1, c008) + err(arg0, z176, __LINE__, 0, 0, Local1, c008) } Store(LoadTable("OEM1", "Intel", "many", "\\", PPST, 1), Local4) - if (CH03(arg0, z176, 0x026, 0, 0)) { + if (CH03(arg0, z176, 0x026, __LINE__, 0)) { return (1) } Store(ObjectType(Local4), Local1) if (LNotEqual(Local1, c009)) { - err(arg0, z176, 0x027, 0, 0, Local1, c009) + err(arg0, z176, __LINE__, 0, 0, Local1, c009) } if (LNotEqual(Local4, 0)) { - err(arg0, z176, 0x028, 0, 0, Local4, 0) + err(arg0, z176, __LINE__, 0, 0, Local4, 0) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x029, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x02a, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -391,7 +391,7 @@ Device(DTM2) { Concatenate(arg0, "-tst2", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x030, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -401,34 +401,34 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", , PPST, 1), DDB0) - if (CH03(arg0, z176, 0x031, 0, 0)) { + if (CH03(arg0, z176, 0x031, __LINE__, 0)) { return (1) } Store(ObjectType(DDB0), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x032, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x033, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x034, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB0) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x035, 0, 0)) { + if (CH03(arg0, z176, 0x035, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x036, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Check when ParameterPathString omitted @@ -437,34 +437,34 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", "\\", , 1), DDB1) - if (CH03(arg0, z176, 0x037, 0, 0)) { + if (CH03(arg0, z176, 0x037, __LINE__, 0)) { return (1) } Store(ObjectType(DDB1), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x038, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x039, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x03a, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB1) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x03b, 0, 0)) { + if (CH03(arg0, z176, 0x03b, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x03c, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Check when ParameterData omitted @@ -473,34 +473,34 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", "\\", PPST, ), DDB2) - if (CH03(arg0, z176, 0x03d, 0, 0)) { + if (CH03(arg0, z176, 0x03d, __LINE__, 0)) { return (1) } Store(ObjectType(DDB2), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x03e, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x03f, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x040, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB2) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x041, 0, 0)) { + if (CH03(arg0, z176, 0x041, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x042, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Check when all optional parameters omitted @@ -509,34 +509,34 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", , , ), DDB3) - if (CH03(arg0, z176, 0x043, 0, 0)) { + if (CH03(arg0, z176, 0x043, __LINE__, 0)) { return (1) } Store(ObjectType(DDB3), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x044, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x045, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x046, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB3) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x047, 0, 0)) { + if (CH03(arg0, z176, 0x047, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x048, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -565,34 +565,34 @@ Device(DTM2) { { Concatenate(arg0, arg2, arg0) - if (CH03(arg0, z176, 0x051, 0, 0)) { + if (CH03(arg0, z176, 0x051, __LINE__, 0)) { return (1) } Store(ObjectType(arg1), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x052, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x053, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x054, 0, 0, "\\DTM2._XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 0) } UnLoad(arg1) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x055, 0, 0)) { + if (CH03(arg0, z176, 0x055, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x056, 0, 0, "\\DTM2._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 1) return (1) } @@ -623,7 +623,7 @@ Device(DTM2) { } if (CondRefof(\DTM2._XT2, Local0)) { - err(arg0, z176, 0x057, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -750,34 +750,34 @@ Device(DTM2) { { Concatenate(arg0, arg2, arg0) - if (CH03(arg0, z176, 0x061, 0, 0)) { + if (CH03(arg0, z176, 0x061, __LINE__, 0)) { return (1) } Store(ObjectType(arg1), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x062, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x063, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\DTM2._XT2, Local0)) { } else { - err(arg0, z176, 0x064, 0, 0, "\\DTM2._XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 0) } UnLoad(arg1) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x065, 0, 0)) { + if (CH03(arg0, z176, 0x065, __LINE__, 0)) { return (1) } if (CondRefof(\DTM2._XT2, Local0)) { - err(arg0, z176, 0x066, 0, 0, "\\DTM2._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 1) return (1) } @@ -811,7 +811,7 @@ Device(DTM2) { Concatenate(arg0, "-tst4", arg0) if (CondRefof(\DTM2._XT2, Local0)) { - err(arg0, z176, 0x067, 0, 0, "\\DTM2._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 1) return (1) } @@ -932,12 +932,12 @@ Device(DTM2) { Concatenate(arg0, "-tst5", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x070, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } if (CondRefof(\DTM2.DEVR._XT2, Local0)) { - err(arg0, z176, 0x071, 0, 0, "\\DTM2.DEVR._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2.DEVR._XT2", 1) return (1) } @@ -945,42 +945,42 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", Arg1, PPST, 1), DDBH) - if (CH03(arg0, z176, 0x072, 0, 0)) { + if (CH03(arg0, z176, 0x072, __LINE__, 0)) { return (1) } Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x073, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x074, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x075, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } if (CondRefof(\DTM2.DEVR._XT2, Local0)) { } else { - err(arg0, z176, 0x076, 0, 0, "\\DTM2.DEVR._XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2.DEVR._XT2", 0) } UnLoad(DDBH) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x077, 0, 0)) { + if (CH03(arg0, z176, 0x077, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x078, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } if (CondRefof(\DTM2.DEVR._XT2, Local0)) { - err(arg0, z176, 0x079, 0, 0, "\\DTM2.DEVR._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2.DEVR._XT2", 1) } return (0) @@ -995,7 +995,7 @@ Device(DTM2) { Concatenate(arg0, "-tst6", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x080, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1003,34 +1003,34 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", , PPST, 1), DDBH) - if (CH03(arg0, z176, 0x081, 0, 0)) { + if (CH03(arg0, z176, 0x081, __LINE__, 0)) { return (1) } Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x082, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x083, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x084, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x085, 0, 0)) { + if (CH03(arg0, z176, 0x085, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x086, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -1049,23 +1049,23 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", RPST, "^TST7.PLDT", 1), DDBH) - if (CH03(arg0, z176, 0x091, 0, 0)) { + if (CH03(arg0, z176, 0x091, __LINE__, 0)) { return (1) } Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x092, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, PLDT)) { - err(arg0, z176, 0x093, 0, 0, PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, PLDT, 1) } UnLoad(DDBH) - if (CH03(arg0, z176, 0x094, 0, 0)) { + if (CH03(arg0, z176, 0x094, __LINE__, 0)) { return (1) } @@ -1074,27 +1074,27 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", RPST, "PLDT", 1), DDBH) - if (CH03(arg0, z176, 0x095, 0, 0)) { + if (CH03(arg0, z176, 0x095, __LINE__, 0)) { return (1) } Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x096, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(0, PLDT)) { - err(arg0, z176, 0x097, 0, 0, PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, PLDT, 0) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x098, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } UnLoad(DDBH) - if (CH03(arg0, z176, 0x099, 0, 0)) { + if (CH03(arg0, z176, 0x099, __LINE__, 0)) { return (1) } @@ -1119,10 +1119,10 @@ Device(DTM2) { LoadTable("OEM1X", "", "", RPST, PPST, 1) } - CH04(arg0, 0, 61, z176, 0x0a0, 0, 0) // AE_AML_STRING_LIMIT + CH04(arg0, 0, 61, z176, __LINE__, 0, 0) // AE_AML_STRING_LIMIT if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0a1, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) if (y287) { return (1) @@ -1136,20 +1136,20 @@ Device(DTM2) { // OEMIDString is greater than six characters LoadTable("OEM1", "IntelXX", "", RPST, PPST, 1) - CH04(arg0, 0, 61, z176, 0x0a2, 0, 0) // AE_AML_STRING_LIMIT + CH04(arg0, 0, 61, z176, __LINE__, 0, 0) // AE_AML_STRING_LIMIT if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0a3, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) return (1) } // OEMTableID is greater than eight characters LoadTable("OEM1", "", "ManyXXXXX", RPST, PPST, 1) - CH04(arg0, 0, 61, z176, 0x0a4, 0, 0) // AE_AML_STRING_LIMIT + CH04(arg0, 0, 61, z176, __LINE__, 0, 0) // AE_AML_STRING_LIMIT if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0a5, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) return (1) } @@ -1167,19 +1167,19 @@ Device(DTM2) { // SignatureString is "DSDT" LoadTable("DSDT", "", "", RPST, PPST, 1) - CH04(arg0, 0, 7, z176, 0x0a6, 0, 0) // AE_ALREADY_EXISTS + CH04(arg0, 0, 7, z176, __LINE__, 0, 0) // AE_ALREADY_EXISTS if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0a7, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } // SignatureString is "SSDT" LoadTable("SSDT", "", "", RPST, PPST, 1) - CH04(arg0, 0, 7, z176, 0x0a8, 0, 0) // AE_ALREADY_EXISTS + CH04(arg0, 0, 7, z176, __LINE__, 0, 0) // AE_ALREADY_EXISTS if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0a9, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } return (0) @@ -1193,7 +1193,7 @@ Device(DTM2) { Concatenate(arg0, "-tsta", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0b0, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1201,53 +1201,53 @@ Device(DTM2) { Store(LoadTable("OEM1", "", "", "\\", PPST, 1), DDBH) - if (CH03(arg0, z176, 0x0b1, 0, 0)) { + if (CH03(arg0, z176, 0x0b1, __LINE__, 0)) { return (1) } Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x0b2, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x0b3, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0b4, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } Store(0, \DTM2.PLDT) LoadTable("OEM1", "", "", "\\DTM2", PPST, 1) - CH04(arg0, 0, 7, z176, 0x0b5, 0, 0) // AE_ALREADY_EXISTS + CH04(arg0, 0, 7, z176, __LINE__, 0, 0) // AE_ALREADY_EXISTS if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0b6, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\DTM2._XT2, Local0)) { - err(arg0, z176, 0x0b7, 0, 0, "\\DTM2._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0b8, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) Store("OEM1 unloaded", Debug) - if (CH03(arg0, z176, 0x0b9, 0, 0)) { + if (CH03(arg0, z176, 0x0b9, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0ba, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -1281,52 +1281,52 @@ Device(DTM2) { Concatenate(arg0, "-tstb", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0c0, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } Store(BUF4, RFU4) Load(RFU4, DDBH) - if (CH03(arg0, z176, 0x0c1, 0, 0)) { + if (CH03(arg0, z176, 0x0c1, __LINE__, 0)) { return (1) } Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x0c2, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0c3, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } Store(0, \DTM2.PLDT) LoadTable("OEM1", "", "", "\\", PPST, 1) - CH04(arg0, 0, 7, z176, 0x0c4, 0, 0) // AE_ALREADY_EXISTS + CH04(arg0, 0, 7, z176, __LINE__, 0, 0) // AE_ALREADY_EXISTS if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0c5, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0c6, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) Store("SSDT unloaded", Debug) - if (CH03(arg0, z176, 0x0c7, 0, 0)) { + if (CH03(arg0, z176, 0x0c7, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0c8, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -1340,7 +1340,7 @@ Device(DTM2) { LoadTable("DSDT", "", "", RPST, "\\DTM2.NULL", 1) - CH04(arg0, 0, 5, z176, 0x0c9, 0, 0) // AE_NOT_FOUND + CH04(arg0, 0, 5, z176, __LINE__, 0, 0) // AE_NOT_FOUND return (0) } @@ -1355,14 +1355,14 @@ Device(DTM2) { LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \DTM2.DEVR) - CH04(arg0, 0, 47, z176, 0x0ca, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0cb, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0cc, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -1390,7 +1390,7 @@ Device(DTM2) { Switch(ToInteger (arg2)) { Case(0) { LoadTable(arg1, SOID, STID, RPST, PPST, 1) - return (CH04(arg0, 0, 37, z176, 0x0d0, 0, 0))// AE_BAD_SIGNATURE + return (CH04(arg0, 0, 37, z176, __LINE__, 0, 0))// AE_BAD_SIGNATURE } Case(1) { Store(LoadTable(SOEM, arg1, STID, RPST, PPST, 1), DDBH) @@ -1400,36 +1400,36 @@ Device(DTM2) { } Case(3) { LoadTable(SOEM, SOID, STID, arg1, PPST, 1) - return (CH04(arg0, 0, 30, z176, 0x0d1, 0, 0)) // AE_BAD_PATHNAME + return (CH04(arg0, 0, 30, z176, __LINE__, 0, 0)) // AE_BAD_PATHNAME } Case(4) { LoadTable(SOEM, SOID, STID, RPST, arg1, 1) - return (CH04(arg0, 0, 30, z176, 0x0d2, 0, 0)) // AE_BAD_PATHNAME + return (CH04(arg0, 0, 30, z176, __LINE__, 0, 0)) // AE_BAD_PATHNAME } } - if (CH03(arg0, z176, 0x0d3, 0, 0)) { + if (CH03(arg0, z176, 0x0d3, __LINE__, 0)) { return (1) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0d4, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) return (1) } Store(ObjectType(DDBH), Local5) - if (CH03(arg0, z176, 0x0d5, 0, 0)) { + if (CH03(arg0, z176, 0x0d5, __LINE__, 0)) { return (1) } if (LNotEqual(Local5, c009)) { // Integer - err(arg0, z176, 0x0d6, 0, 0, Local5, c009) + err(arg0, z176, __LINE__, 0, 0, Local5, c009) return (1) } if (LNotEqual(0, DDBH)) { - err(arg0, z176, 0x0d7, 0, 0, DDBH, 0) + err(arg0, z176, __LINE__, 0, 0, DDBH, 0) return (1) } @@ -1462,27 +1462,27 @@ Device(DTM2) { // Check consistency of the parameters if (LNotEqual(ToBuffer(SOEM), Local0)) { - err(arg0, z176, 0x0d8, 0, 0, Local0, ToBuffer(SOEM)) + err(arg0, z176, __LINE__, 0, 0, Local0, ToBuffer(SOEM)) return (1) } if (LNotEqual(ToBuffer(SOID), Local1)) { - err(arg0, z176, 0x0d9, 0, 0, Local1, ToBuffer(SOID)) + err(arg0, z176, __LINE__, 0, 0, Local1, ToBuffer(SOID)) return (1) } if (LNotEqual(ToBuffer(STID), Local2)) { - err(arg0, z176, 0x0da, 0, 0, Local2, ToBuffer(STID)) + err(arg0, z176, __LINE__, 0, 0, Local2, ToBuffer(STID)) return (1) } if (LNotEqual(ToBuffer(RPST), Local3)) { - err(arg0, z176, 0x0db, 0, 0, Local3, ToBuffer(RPST)) + err(arg0, z176, __LINE__, 0, 0, Local3, ToBuffer(RPST)) return (1) } if (LNotEqual(ToBuffer(PPST), Local4)) { - err(arg0, z176, 0x0dc, 0, 0, Local4, ToBuffer(PPST)) + err(arg0, z176, __LINE__, 0, 0, Local4, ToBuffer(PPST)) return (1) } @@ -1504,7 +1504,7 @@ Device(DTM2) { if (y293) { if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0e0, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1515,29 +1515,29 @@ Device(DTM2) { Store(LoadTable(SOEM, Local1, Local1, RPST, PPST, 1), DDBH) - if (CH03(arg0, z176, 0x0e1, 0, 0)) { + if (CH03(arg0, z176, 0x0e1, __LINE__, 0)) { return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x0e2, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) return (1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0e3, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } UnLoad(DDBH) - if (CH03(arg0, z176, 0x0e4, 0, 0)) { + if (CH03(arg0, z176, 0x0e4, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0e5, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } } @@ -1570,37 +1570,37 @@ Device(DTM2) { Concatenate(arg0, "-tstf", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0f1, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } Store(BUF4, RFU4) Load(RFU4, DDBH) - if (CH03(arg0, z176, 0x0f2, 0, 0)) { + if (CH03(arg0, z176, 0x0f2, __LINE__, 0)) { return (1) } Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x0f3, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0f4, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) Store("SSDT unloaded", Debug) - if (CH03(arg0, z176, 0x0f5, 0, 0)) { + if (CH03(arg0, z176, 0x0f5, __LINE__, 0)) { return (1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0f6, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1612,14 +1612,14 @@ Device(DTM2) { Store(LoadTable("SSDT", "iASLTS", "LTBL0001", "\\", PPST, 1), DDBH) } - CH04(arg0, 0, 28, z176, 0x0f7, 0, 0) // AE_BAD_PARAMETER + CH04(arg0, 0, 28, z176, __LINE__, 0, 0) // AE_BAD_PARAMETER if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0f8, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0f9, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) if (y289) { // Cleanup UnLoad(DDBH) @@ -1653,12 +1653,12 @@ Device(DTM2) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z176, 0x100, 0, 0, Local0, arg3) + err(arg0, z176, __LINE__, 0, 0, Local0, arg3) return (1) } LoadTable(Derefof(arg2), "", "", "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x101, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE return (0) } @@ -1670,12 +1670,12 @@ Device(DTM2) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z176, 0x102, 0, 0, Local0, arg3) + err(arg0, z176, __LINE__, 0, 0, Local0, arg3) return (1) } LoadTable("OEM1", Derefof(arg2), "", "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x103, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE return (0) } @@ -1687,12 +1687,12 @@ Device(DTM2) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z176, 0x104, 0, 0, Local0, arg3) + err(arg0, z176, __LINE__, 0, 0, Local0, arg3) return (1) } LoadTable("OEM1", "", Derefof(arg2), "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x105, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE return (0) } @@ -1704,15 +1704,15 @@ Device(DTM2) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z176, 0x106, 0, 0, Local0, arg3) + err(arg0, z176, __LINE__, 0, 0, Local0, arg3) return (1) } LoadTable("OEM1", "", "", Derefof(arg2), "\\DTM2.PLDT", 1) if (Derefof(Index(BTYP, arg3))) { - CH04(arg0, 0, 30, z176, 0x107, 0, 0) // AE_BAD_PATHNAME + CH04(arg0, 0, 30, z176, __LINE__, 0, 0) // AE_BAD_PATHNAME } else { - CH04(arg0, 0, 47, z176, 0x108, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } return (0) @@ -1725,15 +1725,15 @@ Device(DTM2) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z176, 0x109, 0, 0, Local0, arg3) + err(arg0, z176, __LINE__, 0, 0, Local0, arg3) return (1) } LoadTable("OEM1", "", "", "\\", Derefof(arg2), 1) if (Derefof(Index(BTYP, arg3))) { - CH04(arg0, 0, 30, z176, 0x10a, 0, 0) // AE_BAD_PATHNAME + CH04(arg0, 0, 30, z176, __LINE__, 0, 0) // AE_BAD_PATHNAME } else { - CH04(arg0, 0, 47, z176, 0x10b, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } return (0) @@ -1745,7 +1745,7 @@ Device(DTM2) { Store(\DTM0.BUF3, \DTM0.RFU3) Load(\DTM0.RFU3, DDB0) - if (CH03(arg0, z176, 0x10c, 0, 0)) { + if (CH03(arg0, z176, 0x10c, __LINE__, 0)) { return (1) } @@ -1755,43 +1755,43 @@ Device(DTM2) { } Store(ObjectType(Local1), Local0) if (LNotEqual(c008, Local0)) { - err(arg0, z176, 0x10d, 0, 0, Local0, c008) + err(arg0, z176, __LINE__, 0, 0, Local0, c008) } else { LoadTable(Local1, "", "", "\\", "\\DTM2.PLDT", 1) if (SLCK) { - CH04(arg0, 0, 61, z176, 0x10e, 0, 0) // AE_AML_STRING_LIMIT + CH04(arg0, 0, 61, z176, __LINE__, 0, 0) // AE_AML_STRING_LIMIT } else { - CH04(arg0, 0, 49, z176, 0x10e, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04(arg0, 0, 49, z176, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } LoadTable("OEM1", Local1, "", "\\", "\\DTM2.PLDT", 1) if (SLCK) { - CH04(arg0, 0, 61, z176, 0x10f, 0, 0) // AE_AML_STRING_LIMIT + CH04(arg0, 0, 61, z176, __LINE__, 0, 0) // AE_AML_STRING_LIMIT } else { - CH04(arg0, 0, 49, z176, 0x10f, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04(arg0, 0, 49, z176, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } LoadTable("OEM1", "", Local1, "\\", "\\DTM2.PLDT", 1) if (SLCK) { // ACPI_OEM_TABLE_ID_SIZE should be less than 8. // The size of the "Integer" converted from "Any" is ISZ0*2. if (LLessEqual(ISZ0, 4)) { - CH03(arg0, z176, 0x110, 0, 0) // No exception + CH03(arg0, z176, 0x110, __LINE__, 0) // No exception } else { - CH04(arg0, 0, 61, z176, 0x110, 0, 0) // AE_AML_STRING_LIMIT + CH04(arg0, 0, 61, z176, __LINE__, 0, 0) // AE_AML_STRING_LIMIT } } else { - CH04(arg0, 0, 49, z176, 0x110, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04(arg0, 0, 49, z176, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } LoadTable("OEM1", "", "", Local1, "\\DTM2.PLDT", 1) if (SLCK) { - CH04(arg0, 0, 30, z176, 0x111, 0, 0) // AE_BAD_PATHNAME + CH04(arg0, 0, 30, z176, __LINE__, 0, 0) // AE_BAD_PATHNAME } else { - CH04(arg0, 0, 49, z176, 0x111, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04(arg0, 0, 49, z176, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } LoadTable("OEM1", "", "", "\\", Local1, 1) if (SLCK) { - CH04(arg0, 0, 30, z176, 0x112, 0, 0) // AE_BAD_PATHNAME + CH04(arg0, 0, 30, z176, __LINE__, 0, 0) // AE_BAD_PATHNAME } else { - CH04(arg0, 0, 49, z176, 0x112, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04(arg0, 0, 49, z176, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } } @@ -1816,18 +1816,18 @@ Device(DTM2) { m004(arg0, "pac", Refof(\AUXD.PAC0), c00c) } LoadTable(\AUXD.PAC0, "", "", "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x113, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", \AUXD.PAC0, "", "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x114, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", "", \AUXD.PAC0, "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x115, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", "", "", \AUXD.PAC0, "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x116, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", "", "", "\\", \AUXD.PAC0, 1) - CH04(arg0, 0, 47, z176, 0x117, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.PAC0), Local0) if (LNotEqual(c00c, Local0)) { - err(arg0, z176, 0x118, 0, 0, Local0, c00c) + err(arg0, z176, __LINE__, 0, 0, Local0, c00c) } // Field Unit @@ -1836,18 +1836,18 @@ Device(DTM2) { // Device LoadTable(\AUXD.DEV0, "", "", "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x119, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", \AUXD.DEV0, "", "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x11a, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", "", \AUXD.DEV0, "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x11b, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", "", "", \AUXD.DEV0, "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x11c, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", "", "", "\\", \AUXD.DEV0, 1) - CH04(arg0, 0, 47, z176, 0x11d, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.DEV0), Local0) if (LNotEqual(c00e, Local0)) { - err(arg0, z176, 0x11e, 0, 0, Local0, c00e) + err(arg0, z176, __LINE__, 0, 0, Local0, c00e) } // Event @@ -1894,18 +1894,18 @@ Device(DTM2) { // Thermal Zone LoadTable(\AUXD.TZN0, "", "", "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x120, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", \AUXD.TZN0, "", "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x121, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", "", \AUXD.TZN0, "\\", "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x122, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", "", "", \AUXD.TZN0, "\\DTM2.PLDT", 1) - CH04(arg0, 0, 47, z176, 0x123, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE LoadTable("OEM1", "", "", "\\", \AUXD.TZN0, 1) - CH04(arg0, 0, 47, z176, 0x124, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.TZN0), Local0) if (LNotEqual(c015, Local0)) { - err(arg0, z176, 0x125, 0, 0, Local0, c015) + err(arg0, z176, __LINE__, 0, 0, Local0, c015) } // Buffer Field @@ -1914,7 +1914,7 @@ Device(DTM2) { UnLoad(DDB0) - CH03(arg0, z176, 0x126, 0, 0) + CH03(arg0, z176, 0x126, __LINE__, 0) return (0) } @@ -1932,7 +1932,7 @@ Device(DTM2) { Store(\DTM0.BUF3, \DTM0.RFU3) Load(\DTM0.RFU3, DDB0) - if (CH03(arg0, z176, 0x130, 0, 0)) { + if (CH03(arg0, z176, 0x130, __LINE__, 0)) { return (1) } @@ -1942,15 +1942,15 @@ Device(DTM2) { } Store(ObjectType(Local1), Local0) if (LNotEqual(c008, Local0)) { - err(arg0, z176, 0x131, 0, 0, Local0, c008) + err(arg0, z176, __LINE__, 0, 0, Local0, c008) } else { // Bug 288: iASL unexpectedly forbids ParameterData of Loadtable to be LocalX or UserTerm /* LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", Local1) if (SLCK) { - CH04(arg0, 0, 47, z176, 0x132, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } else { - CH04(arg0, 0, 49, z176, 0x132, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04(arg0, 0, 49, z176, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } */ } @@ -1958,58 +1958,58 @@ Device(DTM2) { // Integer Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x133, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } Store(LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.INT0), DDB1) - if (CH03(arg0, z176, 0x134, 0, 0)) { + if (CH03(arg0, z176, 0x134, __LINE__, 0)) { return (1) } Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x135, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } if (LNotEqual(\DTM2.PLDT, \AUXD.INT0)) { - err(arg0, z176, 0x136, 0, 0, \DTM2.PLDT, \AUXD.INT0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, \AUXD.INT0) return (1) } Unload(DDB1) - if (CH03(arg0, z176, 0x137, 0, 0)) { + if (CH03(arg0, z176, 0x137, __LINE__, 0)) { return (1) } Store(ObjectType(\AUXD.INT0), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x138, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) } // String if (y296) { Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x139, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } Store(LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.STR0), DDB1) - if (CH03(arg0, z176, 0x13a, 0, 0)) { + if (CH03(arg0, z176, 0x13a, __LINE__, 0)) { return (1) } Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x13b, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } if (LNotEqual(\DTM2.PLDT, \AUXD.STR0)) { - err(arg0, z176, 0x13c, 0, 0, \DTM2.PLDT, \AUXD.STR0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, \AUXD.STR0) return (1) } Unload(DDB1) - if (CH03(arg0, z176, 0x13d, 0, 0)) { + if (CH03(arg0, z176, 0x13d, __LINE__, 0)) { return (1) } Store(ObjectType(\AUXD.STR0), Local0) if (LNotEqual(c00a, Local0)) { - err(arg0, z176, 0x13e, 0, 0, Local0, c00a) + err(arg0, z176, __LINE__, 0, 0, Local0, c00a) } } @@ -2017,169 +2017,169 @@ Device(DTM2) { if (y296) { Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x13f, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } Store(LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.BUF0), DDB1) - if (CH03(arg0, z176, 0x140, 0, 0)) { + if (CH03(arg0, z176, 0x140, __LINE__, 0)) { return (1) } Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x141, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } if (LNotEqual(\DTM2.PLDT, \AUXD.BUF0)) { - err(arg0, z176, 0x142, 0, 0, \DTM2.PLDT, \AUXD.BUF0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, \AUXD.BUF0) return (1) } Unload(DDB1) - if (CH03(arg0, z176, 0x143, 0, 0)) { + if (CH03(arg0, z176, 0x143, __LINE__, 0)) { return (1) } Store(ObjectType(\AUXD.BUF0), Local0) if (LNotEqual(c00b, Local0)) { - err(arg0, z176, 0x144, 0, 0, Local0, c00b) + err(arg0, z176, __LINE__, 0, 0, Local0, c00b) } } // Package LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.PAC0) - CH04(arg0, 0, 47, z176, 0x145, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.PAC0), Local0) if (LNotEqual(c00c, Local0)) { - err(arg0, z176, 0x146, 0, 0, Local0, c00c) + err(arg0, z176, __LINE__, 0, 0, Local0, c00c) } // Field Unit if (y296) { Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x147, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } Store(LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.FLU0), DDB1) - if (CH03(arg0, z176, 0x148, 0, 0)) { + if (CH03(arg0, z176, 0x148, __LINE__, 0)) { return (1) } Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x149, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } if (LNotEqual(\DTM2.PLDT, \AUXD.FLU0)) { - err(arg0, z176, 0x14a, 0, 0, \DTM2.PLDT, \AUXD.FLU0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, \AUXD.FLU0) return (1) } Unload(DDB1) - if (CH03(arg0, z176, 0x14b, 0, 0)) { + if (CH03(arg0, z176, 0x14b, __LINE__, 0)) { return (1) } Store(ObjectType(\AUXD.FLU0), Local0) if (LNotEqual(c00d, Local0)) { - err(arg0, z176, 0x14c, 0, 0, Local0, c00d) + err(arg0, z176, __LINE__, 0, 0, Local0, c00d) } } // Device LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.DEV0) - CH04(arg0, 0, 47, z176, 0x14d, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.DEV0), Local0) if (LNotEqual(c00e, Local0)) { - err(arg0, z176, 0x14e, 0, 0, Local0, c00e) + err(arg0, z176, __LINE__, 0, 0, Local0, c00e) } // Event LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.EVE0) - CH04(arg0, 0, 47, z176, 0x14f, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.EVE0), Local0) if (LNotEqual(c00f, Local0)) { - err(arg0, z176, 0x150, 0, 0, Local0, c00f) + err(arg0, z176, __LINE__, 0, 0, Local0, c00f) } // Method if (y288) { LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.MMM0) - CH04(arg0, 0, 47, z176, 0x151, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.MMM0), Local0) if (LNotEqual(c010, Local0)) { - err(arg0, z176, 0x152, 0, 0, Local0, c010) + err(arg0, z176, __LINE__, 0, 0, Local0, c010) } } // Mutex LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.MTX0) - CH04(arg0, 0, 47, z176, 0x153, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.MTX0), Local0) if (LNotEqual(c011, Local0)) { - err(arg0, z176, 0x154, 0, 0, Local0, c011) + err(arg0, z176, __LINE__, 0, 0, Local0, c011) } // OpRegion LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.OPR0) - CH04(arg0, 0, 47, z176, 0x155, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.OPR0), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z176, 0x156, 0, 0, Local0, c012) + err(arg0, z176, __LINE__, 0, 0, Local0, c012) } // Power Resource LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.PWR0) - CH04(arg0, 0, 47, z176, 0x157, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.PWR0), Local0) if (LNotEqual(c013, Local0)) { - err(arg0, z176, 0x158, 0, 0, Local0, c013) + err(arg0, z176, __LINE__, 0, 0, Local0, c013) } // Processor LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.CPU0) - CH04(arg0, 0, 47, z176, 0x159, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.CPU0), Local0) if (LNotEqual(c014, Local0)) { - err(arg0, z176, 0x15a, 0, 0, Local0, c014) + err(arg0, z176, __LINE__, 0, 0, Local0, c014) } // Thermal Zone LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.TZN0) - CH04(arg0, 0, 47, z176, 0x15b, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z176, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.TZN0), Local0) if (LNotEqual(c015, Local0)) { - err(arg0, z176, 0x15c, 0, 0, Local0, c015) + err(arg0, z176, __LINE__, 0, 0, Local0, c015) } // Buffer Field if (y296) { Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x15d, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } Store(LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.BFL0), DDB1) - if (CH03(arg0, z176, 0x15e, 0, 0)) { + if (CH03(arg0, z176, 0x15e, __LINE__, 0)) { return (1) } Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x15f, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } if (LNotEqual(\DTM2.PLDT, \AUXD.BFL0)) { - err(arg0, z176, 0x160, 0, 0, \DTM2.PLDT, \AUXD.BFL0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, \AUXD.BFL0) return (1) } Unload(DDB1) - if (CH03(arg0, z176, 0x161, 0, 0)) { + if (CH03(arg0, z176, 0x161, __LINE__, 0)) { return (1) } Store(ObjectType(\AUXD.BFL0), Local0) if (LNotEqual(c016, Local0)) { - err(arg0, z176, 0x162, 0, 0, Local0, c016) + err(arg0, z176, __LINE__, 0, 0, Local0, c016) } } UnLoad(DDB0) - CH03(arg0, z176, 0x163, 0, 0) + CH03(arg0, z176, 0x163, __LINE__, 0) return (0) } @@ -2189,34 +2189,34 @@ Method(TLT0,, Serialized) { Name(ts, "TLT0") - CH03(ts, z176, 0x200, 0, 0) + CH03(ts, z176, 0x200, __LINE__, 0) // Simple Loadtable test SRMT("TLT0.tst0") \DTM2.tst0(ts) - CH03(ts, z176, 0x201, 0, 0) + CH03(ts, z176, 0x201, __LINE__, 0) // All comparisons of Loadtable parameters are case sensitive, // if no table matches the specified parameters, then 0 is returned SRMT("TLT0.tst1") \DTM2.tst1(ts) - CH03(ts, z176, 0x202, 0, 0) + CH03(ts, z176, 0x202, __LINE__, 0) // Any of the RootPathString, ParameterPathString, and ParameterData // parameters in LoadTable expression can be omitted SRMT("TLT0.tst2") \DTM2.tst2(ts) - CH03(ts, z176, 0x203, 0, 0) + CH03(ts, z176, 0x203, __LINE__, 0) // Different sources of the String parameters: Named Objects, LocalX, // ArgX, elements of Packages, results of functions, any TermArg SRMT("TLT0.tst3") \DTM2.tst3(ts) - CH03(ts, z176, 0x204, 0, 0) + CH03(ts, z176, 0x204, __LINE__, 0) // Different sources of the optional parameters (RootPathString, // ParameterPathString, and ParameterData): Named Objects, LocalX, @@ -2224,14 +2224,14 @@ Method(TLT0,, Serialized) SRMT("TLT0.tst4") \DTM2.tst4(ts) - CH03(ts, z176, 0x205, 0, 0) + CH03(ts, z176, 0x205, __LINE__, 0) // Namespace location to load the Definition Block is determined // by the RootPathString parameter of Loadtable SRMT("TLT0.tst5.0") \DTM2.tst5(ts, "\\DTM2.DEVR") - CH03(ts, z176, 0x206, 0, 0) + CH03(ts, z176, 0x206, __LINE__, 0) // The RootPathString value is evaluated using normal scoping rules, // assuming that the scope of the LoadTable operator is the current @@ -2239,14 +2239,14 @@ Method(TLT0,, Serialized) SRMT("TLT0.tst5.1") \DTM2.tst5(ts, "^DEVR") - CH03(ts, z176, 0x207, 0, 0) + CH03(ts, z176, 0x207, __LINE__, 0) // "\" is assumed to be Namespace location to load the Definition // Block if RootPathString parameter is not specified SRMT("TLT0.tst6") \DTM2.tst6(ts) - CH03(ts, z176, 0x208, 0, 0) + CH03(ts, z176, 0x208, __LINE__, 0) // If the first character of ParameterPathString is a backslash // or caret character, then the path of the object set up on success @@ -2255,20 +2255,20 @@ Method(TLT0,, Serialized) SRMT("TLT0.tst7") \DTM2.tst7(ts) - CH03(ts, z176, 0x209, 0, 0) + CH03(ts, z176, 0x209, __LINE__, 0) // Implicit operand conversion of the parameters specified to be strings SRMT("TLT0.tste") \DTM2.tste(ts) - CH03(ts, z176, 0x20a, 0, 0) + CH03(ts, z176, 0x20a, __LINE__, 0) // LoadTable returns 0 if some SSDT matching the LoadTable // parameters is originally not listed in XSDT //SRMT("TLT0.tstf") //\DTM2.tstf(ts) - CH03(ts, z176, 0x20b, 0, 0) + CH03(ts, z176, 0x20b, __LINE__, 0) } // Exceptional conditions diff --git a/tests/aslts/src/runtime/collections/functional/table/unload.asl b/tests/aslts/src/runtime/collections/functional/table/unload.asl index 8b7882c..0beee8a 100644 --- a/tests/aslts/src/runtime/collections/functional/table/unload.asl +++ b/tests/aslts/src/runtime/collections/functional/table/unload.asl @@ -95,7 +95,7 @@ Device(DTM1) { Store(\DTM0.BUF0, \DTM0.RFU0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z175, 0x000, 0, 0, "\\SSS0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\SSS0", 1) return } @@ -106,13 +106,13 @@ Device(DTM1) { Store(\DTM0.RFU0, Local0) Store(Add(\DTM0.SUM, \DTM0.CHSM(Local0, SizeOf (Local0))), \DTM0.SUM) - if (CH03(arg0, z175, 0x001, 0, 0)) { + if (CH03(arg0, z175, 0x001, __LINE__, 0)) { return } Load(\DTM0.RFU0, HI0) - if (CH03(arg0, z175, 0x002, 0, 0)) { + if (CH03(arg0, z175, 0x002, __LINE__, 0)) { return } @@ -120,40 +120,40 @@ Device(DTM1) { Store(ObjectType(HI0), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z175, 0x003, 0, 0, Local1, c017) + err(arg0, z175, __LINE__, 0, 0, Local1, c017) } // Check the new Object appears if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z175, 0x004, 0, 0, "\\SSS0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\SSS0", 0) } Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { // Method - err(arg0, z175, 0x005, 0, 0, Local1, c010) + err(arg0, z175, __LINE__, 0, 0, Local1, c010) } else { Store(\SSS0(), Local0) - if (CH03(arg0, z175, 0x006, "\\SSS0", 1)) { + if (CH03(arg0, z175, 0x006, __LINE__, 1)) { return } if (LNotEqual("\\SSS0", Local0)) { - err(arg0, z175, 0x007, 0, 0, Local0, "\\SSS0") + err(arg0, z175, __LINE__, 0, 0, Local0, "\\SSS0") } } // UnLoad operator execution UnLoad(m000()) - if (CH03(arg0, z175, 0x008, 0, 0)) { + if (CH03(arg0, z175, 0x008, __LINE__, 0)) { return } Store("Table Unloaded", Debug) if (CondRefof(\SSS0, Local0)) { - err(arg0, z175, 0x009, 0, 0, "\\SSS0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\SSS0", 1) } return } @@ -172,7 +172,7 @@ Device(DTM1) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z175, 0x010, 0, 0, Local0, arg3) + err(arg0, z175, __LINE__, 0, 0, Local0, arg3) return (1) } @@ -185,85 +185,85 @@ Device(DTM1) { // Integer if (CondRefof(\AUXD.INT0, Local0)) { - err(arg0, z175, 0x011, 0, 0, "\\AUXD.INT0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.INT0", 1) return (1) } // String if (CondRefof(\AUXD.STR0, Local0)) { - err(arg0, z175, 0x012, 0, 0, "\\AUXD.STR0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.STR0", 1) return (1) } // Buffer if (CondRefof(\AUXD.BUF0, Local0)) { - err(arg0, z175, 0x013, 0, 0, "\\AUXD.BUF0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.BUF0", 1) return (1) } // Package if (CondRefof(\AUXD.PAC0, Local0)) { - err(arg0, z175, 0x014, 0, 0, "\\AUXD.PAC0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.PAC0", 1) return (1) } // Field Unit if (CondRefof(\AUXD.FLU0, Local0)) { - err(arg0, z175, 0x015, 0, 0, "\\AUXD.FLU0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.FLU0", 1) return (1) } // Device if (CondRefof(\AUXD.DEV0, Local0)) { - err(arg0, z175, 0x016, 0, 0, "\\AUXD.DEV0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.DEV0", 1) return (1) } // Event if (CondRefof(\AUXD.EVE0, Local0)) { - err(arg0, z175, 0x017, 0, 0, "\\AUXD.EVE0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.EVE0", 1) return (1) } // Method if (CondRefof(\AUXD.MMM0, Local0)) { - err(arg0, z175, 0x018, 0, 0, "\\AUXD.MMM0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.MMM0", 1) return (1) } // Mutex if (CondRefof(\AUXD.MTX0, Local0)) { - err(arg0, z175, 0x019, 0, 0, "\\AUXD.MTX0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.MTX0", 1) return (1) } // OpRegion if (CondRefof(\AUXD.OPR0, Local0)) { - err(arg0, z175, 0x01a, 0, 0, "\\AUXD.OPR0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.OPR0", 1) return (1) } // Power Resource if (CondRefof(\AUXD.PWR0, Local0)) { - err(arg0, z175, 0x01b, 0, 0, "\\AUXD.PWR0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.PWR0", 1) return (1) } // Processor if (CondRefof(\AUXD.CPU0, Local0)) { - err(arg0, z175, 0x01c, 0, 0, "\\AUXD.CPU0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.CPU0", 1) return (1) } // Thermal Zone if (CondRefof(\AUXD.TZN0, Local0)) { - err(arg0, z175, 0x01d, 0, 0, "\\AUXD.TZN0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.TZN0", 1) return (1) } // Buffer Field if (CondRefof(\AUXD.BFL0, Local0)) { - err(arg0, z175, 0x01e, 0, 0, "\\AUXD.BFL0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.BFL0", 1) return (1) } @@ -281,7 +281,7 @@ Device(DTM1) { Store(\DTM0.BUF3, \DTM0.RFU3) Load(\DTM0.RFU3, DDB0) - if (CH03(arg0, z175, 0x01f, 0, 0)) { + if (CH03(arg0, z175, 0x01f, __LINE__, 0)) { return (1) } @@ -289,21 +289,21 @@ Device(DTM1) { if (CondRefof(\AUXD.INT0, Local0)) { m000(arg0, "int", Local0, c009) } else { - err(arg0, z175, 0x021, 0, 0, "\\AUXD.INT0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.INT0", 0) } // String if (CondRefof(\AUXD.STR0, Local0)) { m000(arg0, "str", Local0, c00a) } else { - err(arg0, z175, 0x022, 0, 0, "\\AUXD.STR0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.STR0", 0) } // Buffer if (CondRefof(\AUXD.BUF0, Local0)) { m000(arg0, "buf", Local0, c00b) } else { - err(arg0, z175, 0x023, 0, 0, "\\AUXD.BUF0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.BUF0", 0) } // Package @@ -311,7 +311,7 @@ Device(DTM1) { if (CondRefof(\AUXD.PAC0, Local0)) { m000(arg0, "pac", Local0, c00c) } else { - err(arg0, z175, 0x024, 0, 0, "\\AUXD.PAC0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.PAC0", 0) } } @@ -319,75 +319,75 @@ Device(DTM1) { if (CondRefof(\AUXD.FLU0, Local0)) { m000(arg0, "flu", Local0, c00d) } else { - err(arg0, z175, 0x025, 0, 0, "\\AUXD.FLU0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.FLU0", 0) } // Device if (CondRefof(\AUXD.DEV0, Local0)) { m000(arg0, "dev", Local0, c00e) } else { - err(arg0, z175, 0x026, 0, 0, "\\AUXD.DEV0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.DEV0", 0) } // Event if (CondRefof(\AUXD.EVE0, Local0)) { m000(arg0, "evt", Local0, c00f) } else { - err(arg0, z175, 0x027, 0, 0, "\\AUXD.EVE0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.EVE0", 0) } // Method if (CondRefof(\AUXD.MMM0, Local0)) { m000(arg0, "met", Local0, c010) } else { - err(arg0, z175, 0x028, 0, 0, "\\AUXD.MMM0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.MMM0", 0) } // Mutex if (CondRefof(\AUXD.MTX0, Local0)) { m000(arg0, "mtx", Local0, c011) } else { - err(arg0, z175, 0x029, 0, 0, "\\AUXD.MTX0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.MTX0", 0) } // OpRegion if (CondRefof(\AUXD.OPR0, Local0)) { m000(arg0, "opr", Local0, c012) } else { - err(arg0, z175, 0x02a, 0, 0, "\\AUXD.OPR0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.OPR0", 0) } // Power Resource if (CondRefof(\AUXD.PWR0, Local0)) { m000(arg0, "pwr", Local0, c013) } else { - err(arg0, z175, 0x02b, 0, 0, "\\AUXD.PWR0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.PWR0", 0) } // Processor if (CondRefof(\AUXD.CPU0, Local0)) { m000(arg0, "cpu", Local0, c014) } else { - err(arg0, z175, 0x02c, 0, 0, "\\AUXD.CPU0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.CPU0", 0) } // Thermal Zone if (CondRefof(\AUXD.TZN0, Local0)) { m000(arg0, "cpu", Local0, c015) } else { - err(arg0, z175, 0x02d, 0, 0, "\\AUXD.TZN0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.TZN0", 0) } // Buffer Field if (CondRefof(\AUXD.BFL0, Local0)) { m000(arg0, "bfl", Local0, c016) } else { - err(arg0, z175, 0x02e, 0, 0, "\\AUXD.BFL0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.BFL0", 0) } UnLoad(DDB0) - CH03(arg0, z175, 0x02f, 0, 0) + CH03(arg0, z175, 0x02f, __LINE__, 0) // Check absence of the auxiliary table Objects after UnLoad if (m001(Concatenate(arg0, ".after"))) { @@ -428,12 +428,12 @@ Device(DTM1) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z175, 0x031, 0, 0, Local0, arg3) + err(arg0, z175, __LINE__, 0, 0, Local0, arg3) return (1) } UnLoad(Derefof(arg2)) - CH04(arg0, 0, 47, z175, 0x032, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z175, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE return (0) } @@ -444,7 +444,7 @@ Device(DTM1) { Store(\DTM0.BUF3, \DTM0.RFU3) Load(\DTM0.RFU3, DDB0) - if (CH03(arg0, z175, 0x033, 0, 0)) { + if (CH03(arg0, z175, 0x033, __LINE__, 0)) { return (1) } @@ -454,13 +454,13 @@ Device(DTM1) { } Store(ObjectType(Local1), Local0) if (LNotEqual(c008, Local0)) { - err(arg0, z175, 0x034, 0, 0, Local0, c008) + err(arg0, z175, __LINE__, 0, 0, Local0, c008) } else { UnLoad(Local1) if (SLCK) { - CH04(arg0, 0, 47, z175, 0x035, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z175, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } else { - CH04(arg0, 0, 49, z175, 0x035, 0, 0) // AE_AML_UNINITIALIZED_LOCAL + CH04(arg0, 0, 49, z175, __LINE__, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } } @@ -481,10 +481,10 @@ Device(DTM1) { Store(ObjectType(\AUXD.PAC0), Local0) if (LNotEqual(c00c, Local0)) { - err(arg0, z175, 0x036, 0, 0, Local0, c00c) + err(arg0, z175, __LINE__, 0, 0, Local0, c00c) } else { UnLoad(\AUXD.PAC0) - CH04(arg0, 0, 47, z175, 0x037, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z175, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // Field Unit @@ -493,10 +493,10 @@ Device(DTM1) { // Device Store(ObjectType(\AUXD.DEV0), Local0) if (LNotEqual(c00e, Local0)) { - err(arg0, z175, 0x038, 0, 0, Local0, c00e) + err(arg0, z175, __LINE__, 0, 0, Local0, c00e) } else { UnLoad(\AUXD.DEV0) - CH04(arg0, 0, 47, z175, 0x039, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z175, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // Event @@ -520,10 +520,10 @@ Device(DTM1) { // Thermal Zone Store(ObjectType(\AUXD.TZN0), Local0) if (LNotEqual(c015, Local0)) { - err(arg0, z175, 0x03a, 0, 0, Local0, c015) + err(arg0, z175, __LINE__, 0, 0, Local0, c015) } else { UnLoad(\AUXD.TZN0) - CH04(arg0, 0, 47, z175, 0x03b, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z175, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // Buffer Field @@ -531,7 +531,7 @@ Device(DTM1) { UnLoad(DDB0) - CH03(arg0, z175, 0x03c, 0, 0) + CH03(arg0, z175, 0x03c, __LINE__, 0) return (0) } @@ -548,14 +548,14 @@ Device(DTM1) { Store(\DTM0.BUF3, \DTM0.RFU3) Load(\DTM0.RFU3, DDB0) - if (CH03(arg0, z175, 0x03d, 0, 0)) { + if (CH03(arg0, z175, 0x03d, __LINE__, 0)) { return (1) } // First Unload UnLoad(DDB0) - if (CH03(arg0, z175, 0x03e, 0, 0)) { + if (CH03(arg0, z175, 0x03e, __LINE__, 0)) { return (1) } @@ -565,7 +565,7 @@ Device(DTM1) { // Any next UnLoad(DDB0) - CH04(arg0, 0, 28, z175, 0x03f, 5, Local0) // AE_BAD_PARAMETER + CH04(arg0, 0, 28, z175, __LINE__, 5, Local0) // AE_BAD_PARAMETER Decrement(Local0) } @@ -574,7 +574,7 @@ Device(DTM1) { Store(\DTM0.BUF3, \DTM0.RFU3) Load(\DTM0.RFU3, DDB1) - if (CH03(arg0, z175, 0x040, 0, 0)) { + if (CH03(arg0, z175, 0x040, __LINE__, 0)) { return (1) } @@ -584,14 +584,14 @@ Device(DTM1) { // Any next UnLoad(DDB0) - CH04(arg0, 0, 28, z175, 0x041, 5, Local0) // AE_BAD_PARAMETER + CH04(arg0, 0, 28, z175, __LINE__, 5, Local0) // AE_BAD_PARAMETER Decrement(Local0) } UnLoad(DDB1) - if (CH03(arg0, z175, 0x042, 0, 0)) { + if (CH03(arg0, z175, 0x042, __LINE__, 0)) { return (1) } @@ -612,31 +612,31 @@ Device(DTM1) { Store(\DTM0.BUF3, \DTM0.RFU3) Load(\DTM0.RFU3, DDB0) - if (CH03(arg0, z175, 0x043, 0, 0)) { + if (CH03(arg0, z175, 0x043, __LINE__, 0)) { return (1) } // Device UnLoad(Derefof(Refof(\AUXD.DEV0))) - CH04(arg0, 0, 62, z175, 0x044, 0, 0) // AE_AML_NO_RETURN_VALUE + CH04(arg0, 0, 62, z175, __LINE__, 0, 0) // AE_AML_NO_RETURN_VALUE // Thermal Zone UnLoad(Derefof(Refof(\AUXD.TZN0))) - CH04(arg0, 0, 62, z175, 0x045, 0, 0) // AE_AML_NO_RETURN_VALUE + CH04(arg0, 0, 62, z175, __LINE__, 0, 0) // AE_AML_NO_RETURN_VALUE // Method execution CopyObject(m000, m001) UnLoad(m001()) if (SLCK) { - CH04(arg0, 0, 47, z175, 0x046, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z175, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } else { - CH04(arg0, 0, 47, z175, 0x047, 0, 0) // AE_AML_OPERAND_TYPE + CH04(arg0, 0, 47, z175, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } UnLoad(DDB0) - if (CH03(arg0, z175, 0x048, 0, 0)) { + if (CH03(arg0, z175, 0x048, __LINE__, 0)) { return (1) } @@ -648,7 +648,7 @@ Method(TUL0,, Serialized) { Name(ts, "TUL0") - CH03(ts, z175, 0x200, 0, 0) + CH03(ts, z175, 0x200, __LINE__, 0) // Different Sources to specify DDBHandle for UnLoad. // Most of them (Named Object, LocalX, ArgX, Derefof) @@ -657,20 +657,20 @@ Method(TUL0,, Serialized) SRMT("TUL0.tst0") \DTM1.tst0(ts) - CH03(ts, z175, 0x201, 0, 0) + CH03(ts, z175, 0x201, __LINE__, 0) // All namespace objects created as a result of the corresponding // Load operation are absent in the namespace after UnLoad SRMT("TUL0.tst1") \DTM1.tst1(ts) - CH03(ts, z175, 0x202, 0, 0) + CH03(ts, z175, 0x202, __LINE__, 0) // Load/UnLoad processing can be done with the same table many times SRMT("TUL0.tst2") \DTM1.tst2(ts) - CH03(ts, z175, 0x203, 0, 0) + CH03(ts, z175, 0x203, __LINE__, 0) } // Exceptional conditions diff --git a/tests/aslts/src/runtime/collections/mt/mutex/common.asl b/tests/aslts/src/runtime/collections/mt/mutex/common.asl index b5ad2f6..0363a37 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/common.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/common.asl @@ -635,7 +635,7 @@ Method(m106, 2, Serialized) * lpC0 - Index of thread * Local0 - the scale of its errors */ - err(arg0, z147, 0x000, 0, 0, lpC0, Local0) + err(arg0, z147, __LINE__, 0, 0, lpC0, Local0) } Decrement(lpN0) Increment(lpC0) @@ -673,7 +673,7 @@ Method(m107, 4) Store(m104(arg0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00c)) { - err("m107", z147, 0x001, 0, 0, Local1, c00c) + err("m107", z147, __LINE__, 0, 0, Local1, c00c) return (0) } @@ -682,12 +682,12 @@ Method(m107, 4) Store(DeRefOf(Index(Local0, 1)), Local7) if (LNotEqual(Local6, arg1)) { - err("m107", z147, 0x002, 0, 0, Local6, arg1) + err("m107", z147, __LINE__, 0, 0, Local6, arg1) return (0) } if (LNotEqual(Local7, arg2)) { - err("m107", z147, 0x003, 0, 0, Local7, arg2) + err("m107", z147, __LINE__, 0, 0, Local7, arg2) return (0) } } @@ -893,7 +893,7 @@ Method(m110, 4, Serialized) } elseif (cmd0) { if (LNotEqual(Local0, cmd0)) { - err("m110", z147, 0x004, 0, 0, Local0, cmd0) + err("m110", z147, __LINE__, 0, 0, Local0, cmd0) Store(lpC0, Debug) } if (LNot(Local1)) { @@ -902,7 +902,7 @@ Method(m110, 4, Serialized) break } elseif (LNotEqual(Local1, Local0)) { /* Has executed unexpected command */ - err("m110", z147, 0x005, 0, 0, Local1, Local0) + err("m110", z147, __LINE__, 0, 0, Local1, Local0) Store(lpC0, Debug) } } elseif (hng0) { @@ -921,15 +921,15 @@ Method(m110, 4, Serialized) /* Doesn't hang */ if (LNotEqual(Local4, Local0)) { /* Has executed unexpected command */ - err("m110", z147, 0x006, 0, 0, Local1, Local0) + err("m110", z147, __LINE__, 0, 0, Local1, Local0) Store(lpC0, Debug) } - err("m110", z147, 0x007, 0, 0, Local0, Local4) + err("m110", z147, __LINE__, 0, 0, Local0, Local4) Store(lpC0, Debug) } } elseif (idl0) { if (LNotEqual(Local0, c100)) { - err("m110", z147, 0x008, 0, 0, Local0, cmd0) + err("m110", z147, __LINE__, 0, 0, Local0, cmd0) Store(lpC0, Debug) } if (LNot(Local2)) { @@ -938,11 +938,11 @@ Method(m110, 4, Serialized) break } elseif (LNotEqual(Local2, c100)) { /* Has executed unexpected command */ - err("m110", z147, 0x009, 0, 0, Local0, cmd0) + err("m110", z147, __LINE__, 0, 0, Local0, cmd0) Store(lpC0, Debug) } } else { - err("m110", z147, 0x00a, 0, 0, lpC0, Local0) + err("m110", z147, __LINE__, 0, 0, lpC0, Local0) Store(lpC0, Debug) } } @@ -1116,7 +1116,7 @@ Method(m112, 4) /* FAIL of operation expected */ if (LNot(arg3)) { - err("m112", z147, 0x00e, 0, 0, arg3, 1) + err("m112", z147, __LINE__, 0, 0, arg3, 1) } } elseif (arg2) { diff --git a/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl b/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl index d3c7625..e901f86 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl @@ -489,7 +489,7 @@ Method(m333, 3) Store(DerefOf(Index(cnt0, arg0)), Local0) Store(DerefOf(Index(Local0, arg1)), Local1) if (LNotEqual(Local1, arg2)) { - err("m333", z149, 0x000, 0, 0, Local1, arg2) + err("m333", z149, __LINE__, 0, 0, Local1, arg2) Store(arg0, Debug) Store(arg1, Debug) } @@ -637,10 +637,10 @@ Method(m33d, 2) { Store(m10f(arg0, arg1), Local0) if (And(Local0, 0x01)) { - err("m33d", z149, 0x001, 0, 0, Local0, 0) + err("m33d", z149, __LINE__, 0, 0, Local0, 0) } if (And(Local0, 0x02)) { - err("m33d", z149, 0x002, 0, 0, Local0, 0) + err("m33d", z149, __LINE__, 0, 0, Local0, 0) } } @@ -778,7 +778,7 @@ Method(m33f, 7, Serialized) /* Check params */ Store(m344(arg5, arg6), Local0) if (Local0) { - err("m33f: incorrect parameters", z149, 0x003, 0, 0, arg5, arg6) + err("m33f: incorrect parameters", z149, __LINE__, 0, 0, arg5, arg6) Store(Local0, Debug) return } @@ -1024,7 +1024,7 @@ Method(m341, 4) Store(1, has0) } Default { - err("m341: unexpected command:", z149, 0x004, 0, 0, 0, arg0) + err("m341: unexpected command:", z149, __LINE__, 0, 0, 0, arg0) } } @@ -1140,7 +1140,7 @@ Method(m343, 4, Serialized) } if (err0) { - err("m333", z149, 0x005, 0, 0, 0, 0) + err("m333", z149, __LINE__, 0, 0, 0, 0) } return (b000) @@ -1200,12 +1200,12 @@ Method(m336, 2) if (arg1) { if (LNot(EXC0)) { /* Expected exceptions but have none */ - err("m333", z149, 0x006, 0, 0, EXC0, 0) + err("m333", z149, __LINE__, 0, 0, EXC0, 0) } } else { if (EXC0) { /* Unexpected exceptions */ - err("m333", z149, 0x007, 0, 0, EXC0, 0) + err("m333", z149, __LINE__, 0, 0, EXC0, 0) } } diff --git a/tests/aslts/src/runtime/collections/mt/mutex/service.asl b/tests/aslts/src/runtime/collections/mt/mutex/service.asl index fe11966..44567b5 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/service.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/service.asl @@ -82,7 +82,7 @@ Method(m210, 7, Serialized) Name(ix02, 0) if (LGreaterEqual(arg3, arg1)) { - err("m210", z153, 0x000, 0, 0, arg3, arg1) + err("m210", z153, __LINE__, 0, 0, arg3, arg1) return } @@ -94,7 +94,7 @@ Method(m210, 7, Serialized) } Add(arg3, sz01, ix02) if (LGreater(ix02, arg1)) { - err("m210", z153, 0x001, 0, 0, ix02, arg1) + err("m210", z153, __LINE__, 0, 0, ix02, arg1) Store(arg1, Debug) Store(arg3, Debug) Store(arg4, Debug) diff --git a/tests/aslts/src/runtime/collections/mt/mutex/tests.asl b/tests/aslts/src/runtime/collections/mt/mutex/tests.asl index 752886e..ad34e7f 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/tests.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/tests.asl @@ -2384,10 +2384,10 @@ Method(m818, 1, Serialized) m103(arg0) if (LNotequal(FLG2, thr1)) { - err(arg0, z152, 0x000, 0, 0, FLG2, thr1) + err(arg0, z152, __LINE__, 0, 0, FLG2, thr1) } if (LNotequal(FLG3, thr2)) { - err(arg0, z152, 0x001, 0, 0, FLG3, thr2) + err(arg0, z152, __LINE__, 0, 0, FLG3, thr2) } } diff --git a/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl b/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl index cd0df0e..ecfdb80 100644 --- a/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl +++ b/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl @@ -45,7 +45,7 @@ Method(SRV0,, Serialized) { Method(m280, 2) { SRMT(arg1) if (LNot(arg0)) { - err(arg0, z135, i000, 0, 0, 0, 1) + err(arg0, z135, __LINE__, 0, 0, 0, 1) } Increment(i000) } diff --git a/tests/aslts/src/runtime/common/TCI/tcicmd.asl b/tests/aslts/src/runtime/common/TCI/tcicmd.asl index 7e3c6fc..01babd4 100644 --- a/tests/aslts/src/runtime/common/TCI/tcicmd.asl +++ b/tests/aslts/src/runtime/common/TCI/tcicmd.asl @@ -184,12 +184,12 @@ Method(m165, 2, Serialized) Store(arg1, num) } Default { - err("m165", z128, 0, 0, 0, arg0, 0) + err("m165", z128, __LINE__, 0, 0, arg0, 0) } } if (LLess(num, c22b)) { - err("m165", z128, 0, 0, 0, num, c22b) + err("m165", z128, __LINE__, 0, 0, num, c22b) } else { Name(p000, Package(num) {}) Name(lpN0, 0) @@ -456,7 +456,7 @@ Method(m3a4, 7, Serialized) if (LNotEqual(Local6, Local5)) { if (LNot(DE00)) { - err("m3a4", z128, 1, 0, arg6, Local6, Local5) + err("m3a4", z128, __LINE__, 0, arg6, Local6, Local5) Store(lpC0, Debug) Store(Local0, Debug) Store(Local1, Debug) @@ -486,7 +486,7 @@ Method(m3a4, 7, Serialized) Store(DerefOf(Index(arg2, Local1)), Local3) if (LNotEqual(Local2, Local3)) { if (LNot(DE00)) { - err("m3a4", z128, 2, 0, arg6, Local2, Local3) + err("m3a4", z128, __LINE__, 0, arg6, Local2, Local3) } Store(1, Local7) } @@ -515,7 +515,7 @@ Method(m3a4, 7, Serialized) Add(Local4, Local5, Local6) if (LNotEqual(Local3, Local6)) { if (LNot(DE00)) { - err("m3a4", z128, 3, 0, arg6, Local3, Local6) + err("m3a4", z128, __LINE__, 0, arg6, Local3, Local6) } Store(1, Local7) } @@ -545,7 +545,7 @@ Method(m3a4, 7, Serialized) Add(Local4, Local5, Local6) if (LNotEqual(Local3, Local6)) { if (LNot(DE00)) { - err("m3a4", z128, 4, 0, arg6, Local3, Local6) + err("m3a4", z128, __LINE__, 0, arg6, Local3, Local6) } Store(1, Local7) } @@ -571,7 +571,7 @@ Method(m3a4, 7, Serialized) Store(DerefOf(Index(arg3, Local1)), Local3) if (LNotEqual(Local2, Local3)) { if (LNot(DE00)) { - err("m3a4", z128, 5, 0, arg6, Local2, Local3) + err("m3a4", z128, __LINE__, 0, arg6, Local2, Local3) } Store(1, Local7) } @@ -605,7 +605,7 @@ Method(m3a4, 7, Serialized) Store(DerefOf(Index(Local4, Local1)), Local3) if (LNotEqual(Local2, Local3)) { if (LNot(DE00)) { - err("m3a4", z128, 6, 0, arg6, Local2, Local3) + err("m3a4", z128, __LINE__, 0, arg6, Local2, Local3) } Store(1, Local7) } @@ -668,7 +668,7 @@ Method(m3a6, 3) Store(DerefOf(Index(arg0, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("m3a6", z128, 7, 0, arg2, Local1, Local0) + err("m3a6", z128, __LINE__, 0, arg2, Local1, Local0) Store(1, Local7) } @@ -676,7 +676,7 @@ Method(m3a6, 3) Store(DerefOf(Index(arg0, 1)), Local1) if (LNotEqual(Local1, c220)) { - err("m3a6", z128, 8, 0, arg2, Local1, c220) + err("m3a6", z128, __LINE__, 0, arg2, Local1, c220) Store(1, Local7) } @@ -690,7 +690,7 @@ Method(m3a6, 3) Store(DerefOf(Index(arg0, 2)), Local1) if (LNotEqual(Local1, Local0)) { - err("m3a6", z128, 9, 0, arg2, Local1, Local0) + err("m3a6", z128, __LINE__, 0, arg2, Local1, Local0) Store(1, Local7) } @@ -698,7 +698,7 @@ Method(m3a6, 3) Store(DerefOf(Index(arg0, 3)), Local1) if (LNot(Local1)) { - err("m3a6", z128, 10, 0, arg2, Local1, 1) + err("m3a6", z128, __LINE__, 0, arg2, Local1, 1) Store(1, Local7) } @@ -729,7 +729,7 @@ Method(m3a7, 3) Store(DerefOf(Index(arg0, Local0)), Local2) if (LNotEqual(Local2, Local1)) { - err("m3a7", z128, 11, 0, arg2, Local2, Local1) + err("m3a7", z128, __LINE__, 0, arg2, Local2, Local1) Store(1, Local7) } */ @@ -741,7 +741,7 @@ Method(m3a7, 3) Store(c21d, Local0) Store(DerefOf(Index(arg0, Local0)), Local1) if (Local1) { - err("m3a7", z128, 12, 0, arg2, Local1, 0) + err("m3a7", z128, __LINE__, 0, arg2, Local1, 0) Store(1, Local7) } @@ -750,7 +750,7 @@ Method(m3a7, 3) Increment(Local0) Store(DerefOf(Index(arg0, Local0)), Local1) if (Local1) { - err("m3a7", z128, 13, 0, arg2, Local1, 0) + err("m3a7", z128, __LINE__, 0, arg2, Local1, 0) Store(1, Local7) } @@ -759,7 +759,7 @@ Method(m3a7, 3) Increment(Local0) Store(DerefOf(Index(arg0, Local0)), Local1) if (Local1) { - err("m3a7", z128, 14, 0, arg2, Local1, 0) + err("m3a7", z128, __LINE__, 0, arg2, Local1, 0) Store(1, Local7) } @@ -768,7 +768,7 @@ Method(m3a7, 3) Increment(Local0) Store(DerefOf(Index(arg0, Local0)), Local1) if (Local1) { - err("m3a7", z128, 15, 0, arg2, Local1, 0) + err("m3a7", z128, __LINE__, 0, arg2, Local1, 0) Store(1, Local7) } @@ -777,7 +777,7 @@ Method(m3a7, 3) Increment(Local0) Store(DerefOf(Index(arg0, Local0)), Local1) if (Local1) { - err("m3a7", z128, 16, 0, arg2, Local1, 0) + err("m3a7", z128, __LINE__, 0, arg2, Local1, 0) Store(1, Local7) } } @@ -869,7 +869,7 @@ Method(m3aa,, Serialized) if (LEqual(Local6, Local7)) { Store("Internal error 0", Debug) - err("m3aa", z128, 17, 0, 0, Local6, Local7) + err("m3aa", z128, __LINE__, 0, 0, Local6, Local7) } elseif (Local6) { Store(1, FOPT) } else { diff --git a/tests/aslts/src/runtime/common/conversion/oproc.asl b/tests/aslts/src/runtime/common/conversion/oproc.asl index 73ff8f8..aff161b 100644 --- a/tests/aslts/src/runtime/common/conversion/oproc.asl +++ b/tests/aslts/src/runtime/common/conversion/oproc.asl @@ -570,7 +570,7 @@ Method(m484, 1, Serialized) default { if (LNotEqual(arg0, 0)) { - err("----------- ERROR, m484: incorrect Arg0:", z064, 0, 0, 0, 0, 0) + err("----------- ERROR, m484: incorrect Arg0:", z064, __LINE__, 0, 0, 0, 0) Store(arg0, Debug) } } @@ -645,13 +645,13 @@ Method(m485, 7, Serialized) if (ex00) { Store(FLG2, tmp0) - CH03(ts, z064, 0, 0, 0) + CH03(ts, z064, 0, __LINE__, 0) } Store(m482(Local0, Local1, Local2, Local3, Local4, tmp0, arg0), Local7) if (ex00) { - CH04(ts, 0, 0xff, z064, 1, 0, 0) + CH04(ts, 0, 0xff, z064, __LINE__, 0, 0) } elseif (FLG1) { // Verify the first result m489(ts, Local7, Local5) @@ -675,13 +675,13 @@ Method(m485, 7, Serialized) } if (ex00) { - CH03(ts, z064, 2, 0, 0) + CH03(ts, z064, 2, __LINE__, 0) } Store(m482(Local1, Local0, Local2, Local3, Local4, tmp0, arg0), Local7) if (ex00) { - CH04(ts, 0, 0xff, z064, 3, 0, 0) + CH04(ts, 0, 0xff, z064, __LINE__, 0, 0) } elseif (FLG1) { // Verify the second result m489(ts, Local7, Local5) @@ -790,7 +790,7 @@ Method(m487, 1, Serialized) default { if (LNotEqual(arg0, 0)) { - err("----------- ERROR, m487: incorrect Arg0:", z064, 1, 0, 0, 0, 0) + err("----------- ERROR, m487: incorrect Arg0:", z064, __LINE__, 0, 0, 0, 0) Store(arg0, Debug) Store(0, Local7) } @@ -887,9 +887,9 @@ Method(m489, 3) Store(ObjectType(arg2), Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z064, 2, 0, 0, Local0, Local1) + err(arg0, z064, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(arg1, arg2)) { - err(arg0, z064, 3, 0, 0, arg1, arg2) + err(arg0, z064, __LINE__, 0, 0, arg1, arg2) } } @@ -904,11 +904,11 @@ Method(m48a, 4) if (F64) { if (LNotEqual(arg2, Local7)) { - err(arg0, z064, 4, 0, 0, arg2, Local7) + err(arg0, z064, __LINE__, 0, 0, arg2, Local7) } } else { if (LNotEqual(arg2, Local6)) { - err(arg0, z064, 5, 0, 0, arg2, Local6) + err(arg0, z064, __LINE__, 0, 0, arg2, Local6) } } } @@ -1054,13 +1054,13 @@ Method(m48d, 7, Serialized) if (ex00) { Store(FLG2, tmp0) - CH03(ts, z064, 4, 0, 0) + CH03(ts, z064, 4, __LINE__, 0) } Store(m482(Local0, Local1, Local2, Local3, 0, tmp0, arg0), Local7) if (ex00) { - CH04(ts, 0, 0xff, z064, 5, 0, 0) + CH04(ts, 0, 0xff, z064, __LINE__, 0, 0) } else { // Verify the result diff --git a/tests/aslts/src/runtime/common/conversion/otest.asl b/tests/aslts/src/runtime/common/conversion/otest.asl index 1cf19a3..e3843ec 100644 --- a/tests/aslts/src/runtime/common/conversion/otest.asl +++ b/tests/aslts/src/runtime/common/conversion/otest.asl @@ -87,19 +87,19 @@ Method(m4a2, 1, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, 2)) { - err(arg0, z065, 0, 0, 0, Local1, 2) + err(arg0, z065, __LINE__, 0, 0, Local1, 2) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 1)) { - err(arg0, z065, 1, 0, 0, Local1, 1) + err(arg0, z065, __LINE__, 0, 0, Local1, 1) } else { - CH03(ts, z065, 0, 0, 0) + CH03(ts, z065, 0, __LINE__, 0) Add(Local0, 0, Local7) - CH04(arg0, 0, 34, z065, 1, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(arg0, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z065, 2, 0, 0) + CH03(ts, z065, 2, __LINE__, 0) Add(0, Local0, Local7) - CH04(arg0, 0, 34, z065, 3, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(arg0, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT } } @@ -126,19 +126,19 @@ Method(m4a4, 1, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, 2)) { - err(arg0, z065, 2, 0, 0, Local1, 2) + err(arg0, z065, __LINE__, 0, 0, Local1, 2) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 1)) { - err(arg0, z065, 3, 0, 0, Local1, 1) + err(arg0, z065, __LINE__, 0, 0, Local1, 1) } else { - CH03(ts, z065, 4, 0, 0) + CH03(ts, z065, 4, __LINE__, 0) Add(Local0, 0, Local7) - CH03(ts, z065, 5, 0, 0) + CH03(ts, z065, 5, __LINE__, 0) - CH03(ts, z065, 6, 0, 0) + CH03(ts, z065, 6, __LINE__, 0) Add(0, Local0, Local7) - CH03(ts, z065, 7, 0, 0) + CH03(ts, z065, 7, __LINE__, 0) } } @@ -158,48 +158,48 @@ Method(m4a0, 1, Serialized) if (arg0) { - CH03(ts, z065, 8, 0, 0) + CH03(ts, z065, 8, __LINE__, 0) Add("fedcba98765432101", 0, Local7) - CH04(ts, 0, 34, z065, 9, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z065, 10, 0, 0) + CH03(ts, z065, 10, __LINE__, 0) Add(0, "fedcba98765432101", Local7) - CH04(ts, 0, 34, z065, 11, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z065, 12, 0, 0) + CH03(ts, z065, 12, __LINE__, 0) Add("1234q", 0, Local7) - CH04(ts, 0, 34, z065, 13, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z065, 14, 0, 0) + CH03(ts, z065, 14, __LINE__, 0) Add(0, "1234q", Local7) - CH04(ts, 0, 34, z065, 15, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT if (0) { - CH03(ts, z065, 16, 0, 0) + CH03(ts, z065, 16, __LINE__, 0) Add("0xfedcba98765432", 0, Local7) - CH04(ts, 0, 34, z065, 17, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z065, 18, 0, 0) + CH03(ts, z065, 18, __LINE__, 0) Add(0, "0xfedcba98765432", Local7) - CH04(ts, 0, 34, z065, 19, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z065, 20, 0, 0) + CH03(ts, z065, 20, __LINE__, 0) Add("", 0, Local7) - CH04(ts, 0, 34, z065, 21, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z065, 22, 0, 0) + CH03(ts, z065, 22, __LINE__, 0) Add(0, "", Local7) - CH04(ts, 0, 34, z065, 23, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z065, 24, 0, 0) + CH03(ts, z065, 24, __LINE__, 0) Add(" ", 0, Local7) - CH04(ts, 0, 34, z065, 25, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT - CH03(ts, z065, 26, 0, 0) + CH03(ts, z065, 26, __LINE__, 0) Add(0, " ", Local7) - CH04(ts, 0, 34, z065, 27, 0, 0) // AE_BAD_HEX_CONSTANT + CH04(ts, 0, 34, z065, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT } m4a2(ts) diff --git a/tests/aslts/src/runtime/common/conversion/rproc.asl b/tests/aslts/src/runtime/common/conversion/rproc.asl index 506a792..00bbf6c 100644 --- a/tests/aslts/src/runtime/common/conversion/rproc.asl +++ b/tests/aslts/src/runtime/common/conversion/rproc.asl @@ -60,16 +60,16 @@ Method(m4c1, 7, Serialized) if (F64) { Store(ObjectType(Local0), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z066, 0, 0, 0, tmp0, tmp1) + err(arg0, z066, __LINE__, 0, 0, tmp0, tmp1) } elseif (LNotEqual(arg5, Local0)) { - err(arg0, z066, 1, 0, 0, arg5, Local0) + err(arg0, z066, __LINE__, 0, 0, arg5, Local0) } } else { Store(ObjectType(Local1), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z066, 2, 0, 0, tmp0, tmp1) + err(arg0, z066, __LINE__, 0, 0, tmp0, tmp1) } elseif (LNotEqual(arg5, Local1)) { - err(arg0, z066, 3, 0, 0, arg5, Local1) + err(arg0, z066, __LINE__, 0, 0, arg5, Local1) } } } else { @@ -92,16 +92,16 @@ Method(m4c1, 7, Serialized) if (F64) { Store(ObjectType(Local2), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z066, 4, 0, 0, tmp0, tmp1) + err(arg0, z066, __LINE__, 0, 0, tmp0, tmp1) } elseif (LNotEqual(arg6, Local2)) { - err(arg0, z066, 5, 0, 0, arg6, Local2) + err(arg0, z066, __LINE__, 0, 0, arg6, Local2) } } else { Store(ObjectType(Local3), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z066, 6, 0, 0, tmp0, tmp1) + err(arg0, z066, __LINE__, 0, 0, tmp0, tmp1) } elseif (LNotEqual(arg6, Local3)) { - err(arg0, z066, 7, 0, 0, arg6, Local3) + err(arg0, z066, __LINE__, 0, 0, arg6, Local3) } } } diff --git a/tests/aslts/src/runtime/common/conversion/rtest.asl b/tests/aslts/src/runtime/common/conversion/rtest.asl index f4ab588..16a3c58 100644 --- a/tests/aslts/src/runtime/common/conversion/rtest.asl +++ b/tests/aslts/src/runtime/common/conversion/rtest.asl @@ -311,16 +311,16 @@ Method(m563,, Serialized) Store(ObjectType(Local0), Local2) if (LNotEqual(Local2, 2)) { - err(ts, z067, 0, 0, 0, Local2, 2) + err(ts, z067, __LINE__, 0, 0, Local2, 2) } elseif (LNotEqual(Local0, "abcdef")) { - err(ts, z067, 1, 0, 0, Local0, "abcdef") + err(ts, z067, __LINE__, 0, 0, Local0, "abcdef") } Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 2)) { - err(ts, z067, 2, 0, 0, Local2, 2) + err(ts, z067, __LINE__, 0, 0, Local2, 2) } elseif (LNotEqual(Local1, "12345678")) { - err(ts, z067, 3, 0, 0, Local1, "12345678") + err(ts, z067, __LINE__, 0, 0, Local1, "12345678") } } @@ -519,16 +519,16 @@ Method(m564,, Serialized) Store(ObjectType(Local0), Local2) if (LNotEqual(Local2, 3)) { - err(ts, z067, 4, 0, 0, Local2, 3) + err(ts, z067, __LINE__, 0, 0, Local2, 3) } elseif (LNotEqual(Local0, b000)) { - err(ts, z067, 5, 0, 0, Local0, b000) + err(ts, z067, __LINE__, 0, 0, Local0, b000) } Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 3)) { - err(ts, z067, 6, 0, 0, Local2, 3) + err(ts, z067, __LINE__, 0, 0, Local2, 3) } elseif (LNotEqual(Local1, b001)) { - err(ts, z067, 7, 0, 0, Local1, b001) + err(ts, z067, __LINE__, 0, 0, Local1, b001) } } @@ -1187,9 +1187,9 @@ Method(m544, 1, Serialized) Store(ObjectType(ss00), Local0) if (LNotEqual(Local0, 2)) { - err(ts, z067, 8, 0, 0, Local0, 2) + err(ts, z067, __LINE__, 0, 0, Local0, 2) } elseif (LNotEqual(ss00, "ABC")) { - err(ts, z067, 9, 0, 0, ss00, "ABC") + err(ts, z067, __LINE__, 0, 0, ss00, "ABC") } // If the string is shorter than the buffer, the buffer size is reduced. @@ -1202,11 +1202,11 @@ Method(m544, 1, Serialized) Store(SizeOf(b000), Local1) if (LNotEqual(Local0, 3)) { - err(ts, z067, 10, 0, 0, Local0, 3) + err(ts, z067, __LINE__, 0, 0, Local0, 3) } elseif (LNotEqual(Local1, 6)) { - err(ts, z067, 11, 0, 0, Local1, 6) + err(ts, z067, __LINE__, 0, 0, Local1, 6) } elseif (LNotEqual(b000, b001)) { - err(ts, z067, 12, 0, 0, b000, b001) + err(ts, z067, __LINE__, 0, 0, b000, b001) } /* diff --git a/tests/aslts/src/runtime/common/dataproc.asl b/tests/aslts/src/runtime/common/dataproc.asl index 34d8953..6e861d8 100644 --- a/tests/aslts/src/runtime/common/dataproc.asl +++ b/tests/aslts/src/runtime/common/dataproc.asl @@ -42,7 +42,7 @@ Method(m1a3, 5) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err("m1a3", z114, 0, arg2, arg4, Local0, arg1) + err("m1a3", z114, __LINE__, arg2, arg4, Local0, arg1) Store(0, Local7) } @@ -60,80 +60,80 @@ Method(m1a6,, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z114, 0x100, 0, 0, Local0, c009) + err(ts, z114, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a0000)) { - err(ts, z114, 0x101, 0, 0, i900, 0xfe7cb391d65a0000) + err(ts, z114, __LINE__, 0, 0, i900, 0xfe7cb391d65a0000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z114, 0x102, 0, 0, Local0, c009) + err(ts, z114, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0xc1790001)) { - err(ts, z114, 0x103, 0, 0, i901, 0xc1790001) + err(ts, z114, __LINE__, 0, 0, i901, 0xc1790001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z114, 0x104, 0, 0, Local0, c009) + err(ts, z114, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(ts, z114, 0x105, 0, 0, i902, 0) + err(ts, z114, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z114, 0x106, 0, 0, Local0, c009) + err(ts, z114, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(ts, z114, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(ts, z114, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z114, 0x108, 0, 0, Local0, c009) + err(ts, z114, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(ts, z114, 0x109, 0, 0, i904, 0xffffffff) + err(ts, z114, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(ts, z114, 0x10a, 0, 0, Local0, c00a) + err(ts, z114, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12340002")) { - err(ts, z114, 0x10b, 0, 0, s900, "12340002") + err(ts, z114, __LINE__, 0, 0, s900, "12340002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(ts, z114, 0x10c, 0, 0, Local0, c00a) + err(ts, z114, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu0003")) { - err(ts, z114, 0x10d, 0, 0, s901, "qwrtyu0003") + err(ts, z114, __LINE__, 0, 0, s901, "qwrtyu0003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(ts, z114, 0x10e, 0, 0, Local0, c00b) + err(ts, z114, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4})) { - err(ts, z114, 0x10f, 0, 0, b900, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) + err(ts, z114, __LINE__, 0, 0, b900, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(ts, z114, 0x110, 0, 0, Local0, c016) + err(ts, z114, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0xb0)) { - err(ts, z114, 0x111, 0, 0, bf90, 0xb0) + err(ts, z114, __LINE__, 0, 0, bf90, 0xb0) } // One level Package @@ -141,87 +141,87 @@ Method(m1a6,, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(ts, z114, 0x112, 0, 0, Local1, c008) + err(ts, z114, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(ts, z114, 0x113, 0, 0, Local2, c009) + err(ts, z114, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd0004)) { - err(ts, z114, 0x114, 0, 0, Local1, 0xabcd0004) + err(ts, z114, __LINE__, 0, 0, Local1, 0xabcd0004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(ts, z114, 0x115, 0, 0, Local2, c009) + err(ts, z114, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455660005)) { - err(ts, z114, 0x116, 0, 0, Local1, 0x1122334455660005) + err(ts, z114, __LINE__, 0, 0, Local1, 0x1122334455660005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(ts, z114, 0x117, 0, 0, Local2, c00a) + err(ts, z114, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12340006")) { - err(ts, z114, 0x118, 0, 0, Local1, "12340006") + err(ts, z114, __LINE__, 0, 0, Local1, "12340006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(ts, z114, 0x119, 0, 0, Local2, c00a) + err(ts, z114, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i80007")) { - err(ts, z114, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i80007") + err(ts, z114, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i80007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(ts, z114, 0x11b, 0, 0, Local2, c00a) + err(ts, z114, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop0008")) { - err(ts, z114, 0x11c, 0, 0, Local1, "qwrtyuiop0008") + err(ts, z114, __LINE__, 0, 0, Local1, "qwrtyuiop0008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(ts, z114, 0x11d, 0, 0, Local2, c00a) + err(ts, z114, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0250009")) { - err(ts, z114, 0x11e, 0, 0, Local1, "1234567890abdef0250009") + err(ts, z114, __LINE__, 0, 0, Local1, "1234567890abdef0250009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(ts, z114, 0x11f, 0, 0, Local2, c00b) + err(ts, z114, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xb5,0xb6,0xb7})) { - err(ts, z114, 0x120, 0, 0, Local1, Buffer() {0xb5,0xb6,0xb7}) + err(ts, z114, __LINE__, 0, 0, Local1, Buffer() {0xb5,0xb6,0xb7}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(ts, z114, 0x121, 0, 0, Local2, c00b) + err(ts, z114, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xb8,0xb9})) { - err(ts, z114, 0x122, 0, 0, Local1, Buffer() {0xb8,0xb9}) + err(ts, z114, __LINE__, 0, 0, Local1, Buffer() {0xb8,0xb9}) } // Two level Package @@ -232,10 +232,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(ts, z114, 0x123, 0, 0, Local4, c009) + err(ts, z114, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc000a)) { - err(ts, z114, 0x124, 0, 0, Local3, 0xabc000a) + err(ts, z114, __LINE__, 0, 0, Local3, 0xabc000a) } Store(Index(p905, 0), Local0) @@ -244,10 +244,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(ts, z114, 0x125, 0, 0, Local4, c00a) + err(ts, z114, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc000b")) { - err(ts, z114, 0x126, 0, 0, Local3, "0xabc000b") + err(ts, z114, __LINE__, 0, 0, Local3, "0xabc000b") } Store(Index(p905, 0), Local0) @@ -256,10 +256,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(ts, z114, 0x127, 0, 0, Local4, c00a) + err(ts, z114, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc000c")) { - err(ts, z114, 0x128, 0, 0, Local3, "abc000c") + err(ts, z114, __LINE__, 0, 0, Local3, "abc000c") } Store(Index(p906, 0), Local0) @@ -268,10 +268,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(ts, z114, 0x129, 0, 0, Local4, c00a) + err(ts, z114, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc000d")) { - err(ts, z114, 0x12a, 0, 0, Local3, "abc000d") + err(ts, z114, __LINE__, 0, 0, Local3, "abc000d") } Store(Index(p907, 0), Local0) @@ -280,10 +280,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(ts, z114, 0x12b, 0, 0, Local4, c00a) + err(ts, z114, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm000e")) { - err(ts, z114, 0x12c, 0, 0, Local3, "aqwevbgnm000e") + err(ts, z114, __LINE__, 0, 0, Local3, "aqwevbgnm000e") } Store(Index(p908, 0), Local0) @@ -292,10 +292,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(ts, z114, 0x12d, 0, 0, Local4, c00b) + err(ts, z114, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xba,0xbb,0xbc,0xbd,0xbe})) { - err(ts, z114, 0x12e, 0, 0, Local3, Buffer() {0xba,0xbb,0xbc,0xbd,0xbe}) + err(ts, z114, __LINE__, 0, 0, Local3, Buffer() {0xba,0xbb,0xbc,0xbd,0xbe}) } // Three level Package @@ -308,10 +308,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(ts, z114, 0x12f, 0, 0, Local6, c009) + err(ts, z114, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc000f)) { - err(ts, z114, 0x130, 0, 0, Local5, 0xabc000f) + err(ts, z114, __LINE__, 0, 0, Local5, 0xabc000f) } Store(Index(p90a, 0), Local0) @@ -322,10 +322,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(ts, z114, 0x131, 0, 0, Local6, c00a) + err(ts, z114, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12340010")) { - err(ts, z114, 0x132, 0, 0, Local5, "12340010") + err(ts, z114, __LINE__, 0, 0, Local5, "12340010") } Store(Index(p90b, 0), Local0) @@ -336,10 +336,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(ts, z114, 0x133, 0, 0, Local6, c00a) + err(ts, z114, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas0011")) { - err(ts, z114, 0x134, 0, 0, Local5, "zxswefas0011") + err(ts, z114, __LINE__, 0, 0, Local5, "zxswefas0011") } Store(Index(p90c, 0), Local0) @@ -350,10 +350,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(ts, z114, 0x135, 0, 0, Local6, c00b) + err(ts, z114, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xbf,0xc0,0xc1})) { - err(ts, z114, 0x136, 0, 0, Local5, Buffer() {0xbf,0xc0,0xc1}) + err(ts, z114, __LINE__, 0, 0, Local5, Buffer() {0xbf,0xc0,0xc1}) } // Additional Packages @@ -364,20 +364,20 @@ Method(m1a6,, Serialized) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(ts, z114, 0x137, 0, 0, Local2, c009) + err(ts, z114, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd0018)) { - err(ts, z114, 0x138, 0, 0, Local1, 0xabcd0018) + err(ts, z114, __LINE__, 0, 0, Local1, 0xabcd0018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(ts, z114, 0x139, 0, 0, Local2, c009) + err(ts, z114, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd0019)) { - err(ts, z114, 0x13a, 0, 0, Local1, 0xabcd0019) + err(ts, z114, __LINE__, 0, 0, Local1, 0xabcd0019) } // p955 @@ -400,46 +400,46 @@ Method(m1a6,, Serialized) Store(ObjectType(f900), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x142, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(f901), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x143, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(f902), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x144, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(f903), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x145, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } // Field Unit (IndexField) Store(ObjectType(if90), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x146, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(if91), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x147, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } // Field Unit (BankField) Store(ObjectType(bn90), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x148, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } /* * if (LNotEqual(f900, 0xd7)) { - * err(ts, z114, 0x149, 0, 0, f900, 0xd7) + * err(ts, z114, __LINE__, 0, 0, f900, 0xd7) * } * * if (LNotEqual(if90, 0xd7)) { - * err(ts, z114, 0x14a, 0, 0, if90, 0xd7) + * err(ts, z114, __LINE__, 0, 0, if90, 0xd7) * } */ } @@ -457,11 +457,11 @@ Method(m1aa, 5) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z114, 8, 0, arg4, Local0, arg2) + err(arg0, z114, __LINE__, 0, arg4, Local0, arg2) Store(1, Local7) } elseif (LLess(arg2, c00c)) { if (LNotEqual(arg1, arg3)) { - err(arg0, z114, 9, 0, arg4, arg1, arg3) + err(arg0, z114, __LINE__, 0, arg4, arg1, arg3) Store(1, Local7) } } @@ -561,11 +561,11 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z114, 0x112, 0, 0, Local1, c009) + err(ts, z114, __LINE__, 0, 0, Local1, c009) } else { Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0)) { - err(ts, z113, 0x112, 0, 0, Local1, 0) + err(ts, z113, __LINE__, 0, 0, Local1, 0) } } @@ -573,7 +573,7 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z114, 0x112, 0, 0, Local1, c009) + err(ts, z114, __LINE__, 0, 0, Local1, c009) } else { Store(DerefOf(Local0), Local1) if (arg3) { @@ -581,7 +581,7 @@ Method(m1af, 4, Serialized) Store(Local2, Local1) } if (LNotEqual(Local1, 0xfe7cb391d65a0000)) { - err(ts, z114, 0x112, 0, 0, Local1, 0xfe7cb391d65a0000) + err(ts, z114, __LINE__, 0, 0, Local1, 0xfe7cb391d65a0000) } } @@ -589,7 +589,7 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00a)) { - err(ts, z114, 0x112, 0, 0, Local1, c00a) + err(ts, z114, __LINE__, 0, 0, Local1, c00a) } else { Store(DerefOf(Local0), Local1) if (arg3) { @@ -597,7 +597,7 @@ Method(m1af, 4, Serialized) Store(Local2, Local1) } if (LNotEqual(Local1, "12340002")) { - err(ts, z114, 0x112, 0, 0, Local1, "12340002") + err(ts, z114, __LINE__, 0, 0, Local1, "12340002") } } @@ -605,7 +605,7 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00b)) { - err(ts, z114, 0x112, 0, 0, Local1, c00a) + err(ts, z114, __LINE__, 0, 0, Local1, c00a) } else { Store(DerefOf(Local0), Local1) if (arg3) { @@ -613,7 +613,7 @@ Method(m1af, 4, Serialized) Store(Local2, Local1) } if (LNotEqual(Local1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4})) { - err(ts, z114, 0x112, 0, 0, Local1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) + err(ts, z114, __LINE__, 0, 0, Local1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) } } @@ -630,7 +630,7 @@ Method(m1af, 4, Serialized) if (arg3) { if (LNotEqual(Local1, c00d)) { - err(ts, z114, 0x112, 0, 0, Local1, c00d) + err(ts, z114, __LINE__, 0, 0, Local1, c00d) } else { Store(DerefOf(Local7), Local6) Store(Local6, Local7) @@ -640,10 +640,10 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local7), Local5) if (LNotEqual(Local5, c009)) { - err(ts, z114, 0x112, 0, 0, Local5, c009) + err(ts, z114, __LINE__, 0, 0, Local5, c009) } else { if (LNotEqual(Local7, 0)) { - err(ts, z114, 0x112, 0, 0, Local7, 0) + err(ts, z114, __LINE__, 0, 0, Local7, 0) } } } @@ -684,7 +684,7 @@ Method(m1af, 4, Serialized) if (arg3) { if (LNotEqual(Local1, c016)) { - err(ts, z114, 0x112, 0, 0, Local1, c016) + err(ts, z114, __LINE__, 0, 0, Local1, c016) } else { Store(DerefOf(Local7), Local6) Store(Local6, Local7) @@ -694,10 +694,10 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local7), Local5) if (LNotEqual(Local5, c009)) { - err(ts, z114, 0x112, 0, 0, Local5, c009) + err(ts, z114, __LINE__, 0, 0, Local5, c009) } else { if (LNotEqual(Local7, 0xb0)) { - err(ts, z114, 0x112, 0, 0, Local7, 0) + err(ts, z114, __LINE__, 0, 0, Local7, 0) } } } @@ -706,11 +706,11 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z114, 0x112, 0, 0, Local1, c009) + err(ts, z114, __LINE__, 0, 0, Local1, c009) } else { Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 15)) { - err(ts, z114, 0x112, 0, 0, Local1, 15) + err(ts, z114, __LINE__, 0, 0, Local1, 15) } } @@ -718,11 +718,11 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z114, 0x112, 0, 0, Local1, c009) + err(ts, z114, __LINE__, 0, 0, Local1, c009) } else { Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 16)) { - err(ts, z114, 0x112, 0, 0, Local1, 16) + err(ts, z114, __LINE__, 0, 0, Local1, 16) } } @@ -730,13 +730,13 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(ts, z114, 0x115, 0, 0, Local1, c008) + err(ts, z114, __LINE__, 0, 0, Local1, c008) } // Evaluation of Method m936 takes place if (LNotEqual(i905, 0xabcd001a)) { - err(ts, z114, 0x116, 0, 0, i905, 0xabcd001a) + err(ts, z114, __LINE__, 0, 0, i905, 0xabcd001a) } } diff --git a/tests/aslts/src/runtime/common/datastproc.asl b/tests/aslts/src/runtime/common/datastproc.asl index aa40ee4..7965ae8 100644 --- a/tests/aslts/src/runtime/common/datastproc.asl +++ b/tests/aslts/src/runtime/common/datastproc.asl @@ -43,9 +43,9 @@ Method(m380, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c009)) { - err(arg0, z115, 0, arg2, arg3, Local0, c009) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c009) } elseif (LNotEqual(arg1, 0x77)) { - err(arg0, z115, 1, arg2, arg3, arg1, 0x77) + err(arg0, z115, __LINE__, arg2, arg3, arg1, 0x77) } } @@ -58,9 +58,9 @@ Method(m381, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00a)) { - err(arg0, z115, 2, arg2, arg3, Local0, c00a) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00a) } elseif (LNotEqual(arg1, "qwer0000")) { - err(arg0, z115, 3, arg2, arg3, arg1, "qwer0000") + err(arg0, z115, __LINE__, arg2, arg3, arg1, "qwer0000") } } @@ -73,9 +73,9 @@ Method(m382, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00b)) { - err(arg0, z115, 4, arg2, arg3, Local0, c00b) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00b) } elseif (LNotEqual(arg1, Buffer(4) {1,0x77,3,4})) { - err(arg0, z115, 5, arg2, arg3, arg1, Buffer(4) {1,0x77,3,4}) + err(arg0, z115, __LINE__, arg2, arg3, arg1, Buffer(4) {1,0x77,3,4}) } } @@ -88,24 +88,24 @@ Method(m383, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00c)) { - err(arg0, z115, 6, arg2, arg3, Local0, c00c) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00c) } else { Index(arg1, 0, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 5)) { - err(arg0, z115, 7, arg2, arg3, Local1, 5) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 5) } Index(arg1, 1, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err(arg0, z115, 8, arg2, arg3, Local1, 0x77) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 0x77) } Index(arg1, 2, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 7)) { - err(arg0, z115, 9, arg2, arg3, Local1, 7) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 7) } } } @@ -121,9 +121,9 @@ Method(m384, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c009)) { - err(arg0, z115, 10, arg2, arg3, Local0, c009) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c009) } elseif (LNotEqual(arg1, 0x2b)) { - err(arg0, z115, 11, arg2, arg3, arg1, 0x2b) + err(arg0, z115, __LINE__, arg2, arg3, arg1, 0x2b) } } @@ -136,9 +136,9 @@ Method(m385, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00a)) { - err(arg0, z115, 12, arg2, arg3, Local0, c00a) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00a) } elseif (LNotEqual(arg1, "q+er0000")) { - err(arg0, z115, 13, arg2, arg3, arg1, "q+er0000") + err(arg0, z115, __LINE__, arg2, arg3, arg1, "q+er0000") } } @@ -151,9 +151,9 @@ Method(m386, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00b)) { - err(arg0, z115, 14, arg2, arg3, Local0, c00b) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00b) } elseif (LNotEqual(arg1, Buffer(4) {1,0x2b,3,4})) { - err(arg0, z115, 15, arg2, arg3, arg1, Buffer(4) {1,0x2b,3,4}) + err(arg0, z115, __LINE__, arg2, arg3, arg1, Buffer(4) {1,0x2b,3,4}) } } @@ -166,24 +166,24 @@ Method(m387, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00c)) { - err(arg0, z115, 16, arg2, arg3, Local0, c00c) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00c) } else { Index(arg1, 0, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 5)) { - err(arg0, z115, 17, arg2, arg3, Local1, 5) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 5) } Index(arg1, 1, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x2b)) { - err(arg0, z115, 18, arg2, arg3, Local1, 0x2b) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 0x2b) } Index(arg1, 2, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 7)) { - err(arg0, z115, 19, arg2, arg3, Local1, 7) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 7) } } } diff --git a/tests/aslts/src/runtime/common/operations.asl b/tests/aslts/src/runtime/common/operations.asl index 825da2d..debe587 100644 --- a/tests/aslts/src/runtime/common/operations.asl +++ b/tests/aslts/src/runtime/common/operations.asl @@ -416,47 +416,47 @@ Method(m480, 7, Serialized) Store(ObjectType(arg0), tmp0) if (LNotEqual(tmp0, OT00)) { - err(ts, z082, 0, 0, 0, tmp0, OT00) + err(ts, z082, __LINE__, 0, 0, tmp0, OT00) } Store(ObjectType(arg1), tmp0) if (LNotEqual(tmp0, OT01)) { - err(ts, z082, 1, 0, 0, tmp0, OT01) + err(ts, z082, __LINE__, 0, 0, tmp0, OT01) } Store(ObjectType(arg2), tmp0) if (LNotEqual(tmp0, OT02)) { - err(ts, z082, 2, 0, 0, tmp0, OT02) + err(ts, z082, __LINE__, 0, 0, tmp0, OT02) } Store(ObjectType(arg3), tmp0) if (LNotEqual(tmp0, OT03)) { - err(ts, z082, 3, 0, 0, tmp0, OT03) + err(ts, z082, __LINE__, 0, 0, tmp0, OT03) } Store(ObjectType(arg4), tmp0) if (LNotEqual(tmp0, OT04)) { - err(ts, z082, 4, 0, 0, tmp0, OT04) + err(ts, z082, __LINE__, 0, 0, tmp0, OT04) } if (res0) { Store(ObjectType(arg5), tmp0) if (LNotEqual(tmp0, OT05)) { - err(ts, z082, 5, 0, 0, tmp0, OT05) + err(ts, z082, __LINE__, 0, 0, tmp0, OT05) } } Store(ObjectType(arg6), tmp0) if (LNotEqual(tmp0, OT06)) { - err(ts, z082, 6, 0, 0, tmp0, OT06) + err(ts, z082, __LINE__, 0, 0, tmp0, OT06) } // Types of LocalX are save, and data of LocalX and ArgX are identical Store(ObjectType(Local0), tmp0) if (LNotEqual(tmp0, OT10)) { - err(ts, z082, 7, 0, 0, tmp0, OT10) + err(ts, z082, __LINE__, 0, 0, tmp0, OT10) } else { m481(ts, 8, tmp0, Local0, arg0) } Store(ObjectType(Local1), tmp0) if (LNotEqual(tmp0, OT11)) { - err(ts, z082, 9, 0, 0, tmp0, OT11) + err(ts, z082, __LINE__, 0, 0, tmp0, OT11) } else { m481(ts, 10, tmp0, Local1, arg1) } @@ -464,7 +464,7 @@ Method(m480, 7, Serialized) if (res1) { Store(ObjectType(Local2), tmp0) if (LNotEqual(tmp0, OT12)) { - err(ts, z082, 11, 0, 0, tmp0, OT12) + err(ts, z082, __LINE__, 0, 0, tmp0, OT12) } else { m481(ts, 12, tmp0, Local2, arg2) } @@ -472,38 +472,38 @@ Method(m480, 7, Serialized) Store(ObjectType(Local3), tmp0) if (LNotEqual(tmp0, OT13)) { - err(ts, z082, 13, 0, 0, tmp0, OT13) + err(ts, z082, __LINE__, 0, 0, tmp0, OT13) } else { m481(ts, 14, tmp0, Local3, arg3) } Store(ObjectType(Local4), tmp0) if (LNotEqual(tmp0, OT14)) { - err(ts, z082, 15, 0, 0, tmp0, OT14) + err(ts, z082, __LINE__, 0, 0, tmp0, OT14) } else { m481(ts, 16, tmp0, Local4, arg4) } Store(ObjectType(Local5), tmp0) if (LNotEqual(tmp0, OT15)) { - err(ts, z082, 17, 0, 0, tmp0, OT15) + err(ts, z082, __LINE__, 0, 0, tmp0, OT15) } elseif (res0) { m481(ts, 18, tmp0, Local5, arg5) } Store(ObjectType(Local6), tmp0) if (LNotEqual(tmp0, OT16)) { - err(ts, z082, 19, 0, 0, tmp0, OT16) + err(ts, z082, __LINE__, 0, 0, tmp0, OT16) } else { m481(ts, 20, tmp0, Local6, arg6) } if (res2) { if (LNotEqual(Local7, Ones)) { - err(ts, z082, 21, 0, 0, Local7, Ones) + err(ts, z082, __LINE__, 0, 0, Local7, Ones) } } elseif (res0) { Store(ObjectType(Local7), tmp0) Store(ObjectType(arg5), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(ts, z082, 22, 0, 0, tmp0, tmp1) + err(ts, z082, __LINE__, 0, 0, tmp0, tmp1) } else { m481(ts, 23, tmp0, Local7, arg5) } @@ -545,19 +545,19 @@ Method(m481, 5, Serialized) switch (ToInteger (arg2)) { case (1) { if (LNotEqual(arg3, arg4)) { - err(arg0, z082, 24, 0, 0, arg1, 0) + err(arg0, z082, __LINE__, 0, 0, arg1, 0) Store(1, Local0) } } case (2) { if (LNotEqual(arg3, arg4)) { - err(arg0, z082, 25, 0, 0, arg1, 0) + err(arg0, z082, __LINE__, 0, 0, arg1, 0) Store(1, Local0) } } case (3) { if (LNotEqual(arg3, arg4)) { - err(arg0, z082, 26, 0, 0, arg1, 0) + err(arg0, z082, __LINE__, 0, 0, arg1, 0) Store(1, Local0) } } @@ -650,75 +650,75 @@ Method(m482, 7, Serialized) Store(ObjectType(arg0), tmp0) if (LNotEqual(tmp0, OT00)) { - err(ts, z082, 27, 0, 0, tmp0, OT00) + err(ts, z082, __LINE__, 0, 0, tmp0, OT00) } Store(ObjectType(arg1), tmp0) if (LNotEqual(tmp0, OT01)) { - err(ts, z082, 28, 0, 0, tmp0, OT01) + err(ts, z082, __LINE__, 0, 0, tmp0, OT01) } Store(ObjectType(arg2), tmp0) if (LNotEqual(tmp0, OT02)) { - err(ts, z082, 29, 0, 0, tmp0, OT02) + err(ts, z082, __LINE__, 0, 0, tmp0, OT02) } Store(ObjectType(arg3), tmp0) if (LNotEqual(tmp0, OT03)) { - err(ts, z082, 30, 0, 0, tmp0, OT03) + err(ts, z082, __LINE__, 0, 0, tmp0, OT03) } Store(ObjectType(arg4), tmp0) if (LNotEqual(tmp0, OT04)) { - err(ts, z082, 31, 0, 0, tmp0, OT04) + err(ts, z082, __LINE__, 0, 0, tmp0, OT04) } Store(ObjectType(arg5), tmp0) if (LNotEqual(tmp0, OT05)) { - err(ts, z082, 32, 0, 0, tmp0, OT05) + err(ts, z082, __LINE__, 0, 0, tmp0, OT05) } Store(ObjectType(arg6), tmp0) if (LNotEqual(tmp0, OT06)) { - err(ts, z082, 33, 0, 0, tmp0, OT06) + err(ts, z082, __LINE__, 0, 0, tmp0, OT06) } // Types of LocalX are save, and data of LocalX and ArgX are identical Store(ObjectType(Local0), tmp0) if (LNotEqual(tmp0, OT10)) { - err(ts, z082, 34, 0, 0, tmp0, OT10) + err(ts, z082, __LINE__, 0, 0, tmp0, OT10) } else { m481(ts, 35, tmp0, Local0, arg0) } Store(ObjectType(Local1), tmp0) if (LNotEqual(tmp0, OT11)) { - err(ts, z082, 36, 0, 0, tmp0, OT11) + err(ts, z082, __LINE__, 0, 0, tmp0, OT11) } else { m481(ts, 37, tmp0, Local1, arg1) } Store(ObjectType(Local2), tmp0) if (LNotEqual(tmp0, OT12)) { - err(ts, z082, 38, 0, 0, tmp0, OT12) + err(ts, z082, __LINE__, 0, 0, tmp0, OT12) } else { m481(ts, 39, tmp0, Local2, arg2) } Store(ObjectType(Local3), tmp0) if (LNotEqual(tmp0, OT13)) { - err(ts, z082, 40, 0, 0, tmp0, OT13) + err(ts, z082, __LINE__, 0, 0, tmp0, OT13) } else { m481(ts, 41, tmp0, Local3, arg3) } Store(ObjectType(Local4), tmp0) if (LNotEqual(tmp0, OT14)) { - err(ts, z082, 42, 0, 0, tmp0, OT14) + err(ts, z082, __LINE__, 0, 0, tmp0, OT14) } else { m481(ts, 43, tmp0, Local4, arg4) } Store(ObjectType(Local5), tmp0) if (LNotEqual(tmp0, OT15)) { - err(ts, z082, 44, 0, 0, tmp0, OT15) + err(ts, z082, __LINE__, 0, 0, tmp0, OT15) } else { m481(ts, 45, tmp0, Local5, arg5) } Store(ObjectType(Local6), tmp0) if (LNotEqual(tmp0, OT16)) { - err(ts, z082, 46, 0, 0, tmp0, OT16) + err(ts, z082, __LINE__, 0, 0, tmp0, OT16) } else { // Package is passed by arg6 // m481(ts, 47, tmp0, Local6, arg6) @@ -744,14 +744,14 @@ Method(m482, 7, Serialized) Store(0, Local3) if (LNotEqual(Local2, Local0)) { - err(ts, z082, 48, 0, 0, 0, 0) + err(ts, z082, __LINE__, 0, 0, 0, 0) Store("Expected type of result:", Debug) Store(Local0, Debug) Store("The type of obtained result:", Debug) Store(Local2, Debug) Store(1, Local3) } elseif (LNotEqual(Local7, Local1)) { - err(ts, z082, 49, 0, 0, 0, 0) + err(ts, z082, __LINE__, 0, 0, 0, 0) Store(1, Local3) } if (Local3) { diff --git a/tests/misc/grammar.aml b/tests/misc/grammar.aml index d137398..b7c111d 100755 Binary files a/tests/misc/grammar.aml and b/tests/misc/grammar.aml differ diff --git a/tests/misc/grammar.asl b/tests/misc/grammar.asl index 8ace87f..981c74e 100644 --- a/tests/misc/grammar.asl +++ b/tests/misc/grammar.asl @@ -946,7 +946,7 @@ DefinitionBlock ( Notify (\_PR.CPU0, 0) } - Method (_ERR, 2) + Method (_ERR, 3) { Increment (ERRS) Store ("Run-time exception:", Debug) diff --git a/tests/misc/grammar.dsl b/tests/misc/grammar.dsl index 335126d..832aba6 100755 --- a/tests/misc/grammar.dsl +++ b/tests/misc/grammar.dsl @@ -1,22 +1,22 @@ /* * Intel ACPI Component Architecture - * AML/ASL+ Disassembler version 20170303 (32-bit version) + * AML/ASL+ Disassembler version 20170726 (32-bit version) * Copyright (c) 2000 - 2017 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of grammar.aml, Fri Jun 16 13:38:47 2017 + * Disassembly of grammar.aml, Thu Jul 27 12:12:05 2017 * * Original Table Header: * Signature "DSDT" * Length 0x0000AAEE (43758) * Revision 0x01 **** 32-bit table (V1), no 64-bit math support - * Checksum 0xB5 + * Checksum 0x8D * OEM ID "Intel" * OEM Table ID "GRMTEST" * OEM Revision 0x20090511 (537462033) * Compiler ID "INTL" - * Compiler Version 0x20170303 (538379011) + * Compiler Version 0x20170726 (538380070) */ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) { @@ -318,12 +318,12 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) } VendorShort () // Length = 0x03 { - 0x01, 0x02, 0x03 /* ... */ + 0x01, 0x02, 0x03 // ... } VendorLong () // Length = 0x09 { - /* 0000 */ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, /* ........ */ - /* 0008 */ 0x09 /* . */ + /* 0000 */ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // ........ + /* 0008 */ 0x09 // . } Register (SystemIO, 0x08, // Bit Width @@ -504,15 +504,15 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) { VendorShort () // Length = 0x03 { - 0x01, 0x02, 0x03 /* ... */ + 0x01, 0x02, 0x03 // ... } }) Name (CRSD, ResourceTemplate () { VendorLong () // Length = 0x09 { - /* 0000 */ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, /* ........ */ - /* 0008 */ 0x09 /* . */ + /* 0000 */ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // ........ + /* 0008 */ 0x09 // . } }) Name (CRSE, ResourceTemplate () @@ -866,7 +866,7 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) Notify (\_PR.CPU0, Zero) // Bus Check } - Method (_ERR, 2, NotSerialized) + Method (_ERR, 3, NotSerialized) { ERRS++ Debug = "Run-time exception:" @@ -1210,7 +1210,7 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) Name (BUFR, Buffer (Local0){}) Name (BUF1, Buffer (0x04) { - 0x01, 0x02, 0x03, 0x04 /* .... */ + 0x01, 0x02, 0x03, 0x04 // .... }) Name (BUF2, Buffer (0x04){}) BUF2 = BUF1 /* \OBJ1.BUF1 */ @@ -1721,7 +1721,7 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) { Name (BBUF, Buffer (0x08) { - 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7 /* ........ */ + 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7 // ........ }) Name (NEST, Package (0x02) { @@ -5798,8 +5798,8 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) Name (BUFR, Buffer (0x0A) { - /* 0000 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ........ */ - /* 0008 */ 0x00, 0x00 /* .. */ + /* 0000 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........ + /* 0008 */ 0x00, 0x00 // .. }) Device (DWDF) { @@ -6134,8 +6134,8 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) Name (BUFR, Buffer (0x10) { - /* 0000 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ........ */ - /* 0008 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* ........ */ + /* 0000 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........ + /* 0008 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ }) BUFR [Zero] = 0x01234567 BUFR [0x04] = 0x89ABCDEF @@ -6452,8 +6452,8 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) { Name (BUFR, Buffer (0x0A) { - /* 0000 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* ........ */ - /* 0008 */ 0x08, 0x09 /* .. */ + /* 0000 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, // ........ + /* 0008 */ 0x08, 0x09 // .. }) Local1 = BUFR /* \_SB_.IDX3.LCLB.BUFR */ Local3 = ObjectType (Local1) @@ -6572,7 +6572,7 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) "A short string", Buffer (0x04) { - 0x0A, 0x0B, 0x0C, 0x0D /* .... */ + 0x0A, 0x0B, 0x0C, 0x0D // .... }, 0x1234, @@ -6604,7 +6604,7 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) { Name (BUF0, Buffer (0x05) { - 0x01, 0x02, 0x03, 0x04, 0x05 /* ..... */ + 0x01, 0x02, 0x03, 0x04, 0x05 // ..... }) BUF0 [0x02] = 0x55 Local0 = DerefOf (BUF0 [0x02]) @@ -6622,7 +6622,7 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) { Name (BUF1, Buffer (0x05) { - 0x01, 0x02, 0x03, 0x04, 0x05 /* ..... */ + 0x01, 0x02, 0x03, 0x04, 0x05 // ..... }) Local0 = BUF1 [One] Local1 = DerefOf (Local0) @@ -7221,7 +7221,7 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) }) Name (TMD0, Buffer (0x14) { - 0xFF, 0xFF, 0xFF, 0xFF /* .... */ + 0xFF, 0xFF, 0xFF, 0xFF // .... }) CreateDWordField (TMD0, Zero, PIO0) CreateDWordField (TMD0, 0x04, DMA0) @@ -7918,7 +7918,7 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) Name (BUFR, Buffer (0x0C){}) Name (BUF1, Buffer (0x05) { - 0x01, 0x02, 0x03, 0x04, 0x05 /* ..... */ + 0x01, 0x02, 0x03, 0x04, 0x05 // ..... }) Name (PKG0, Package (0x04){}) Name (STR0, "String") @@ -8387,851 +8387,851 @@ DefinitionBlock ("", "DSDT", 1, "Intel", "GRMTEST", 0x20090511) Name (WQAB, Buffer (0x1A64) { - /* 0000 */ 0x46, 0x4F, 0x4D, 0x42, 0x01, 0x00, 0x00, 0x00, /* FOMB.... */ - /* 0008 */ 0x54, 0x1A, 0x00, 0x00, 0xBA, 0xAD, 0x00, 0x00, /* T....... */ - /* 0010 */ 0x44, 0x53, 0x00, 0x01, 0x1A, 0x7D, 0xDA, 0x54, /* DS...}.T */ - /* 0018 */ 0x98, 0xBD, 0x92, 0x00, 0x01, 0x06, 0x18, 0x42, /* .......B */ - /* 0020 */ 0x10, 0x47, 0x10, 0x92, 0x46, 0x62, 0x02, 0x89, /* .G..Fb.. */ - /* 0028 */ 0x80, 0x90, 0x18, 0x18, 0x14, 0x81, 0x85, 0x00, /* ........ */ - /* 0030 */ 0x49, 0x02, 0x88, 0xC4, 0x41, 0xE1, 0x20, 0xD4, /* I...A. . */ - /* 0038 */ 0x9F, 0x40, 0x7E, 0x05, 0x20, 0x74, 0x28, 0x40, /* .@~. t(@ */ - /* 0040 */ 0xA6, 0x00, 0x83, 0x02, 0x9C, 0x22, 0x88, 0xA0, /* .....".. */ - /* 0048 */ 0x57, 0x01, 0x36, 0x05, 0x98, 0x14, 0x60, 0x51, /* W.6...`Q */ - /* 0050 */ 0x80, 0x76, 0x01, 0x96, 0x05, 0xE8, 0x16, 0x20, /* .v..... */ - /* 0058 */ 0x1D, 0x96, 0x88, 0x04, 0x47, 0x89, 0x01, 0x47, /* ....G..G */ - /* 0060 */ 0xE9, 0xC4, 0x16, 0x6E, 0xD8, 0xE0, 0x85, 0xA2, /* ...n.... */ - /* 0068 */ 0x68, 0x06, 0x51, 0x12, 0x94, 0x8B, 0x20, 0x5D, /* h.Q... ] */ - /* 0070 */ 0x10, 0x52, 0x2E, 0xC0, 0x37, 0x82, 0x06, 0x10, /* .R..7... */ - /* 0078 */ 0xA5, 0x77, 0x01, 0xB6, 0x05, 0x98, 0x86, 0x27, /* .w.....' */ - /* 0080 */ 0xD2, 0x20, 0xE4, 0x60, 0x08, 0x54, 0xCE, 0x80, /* . .`.T.. */ - /* 0088 */ 0x20, 0x69, 0x44, 0x21, 0x1E, 0xA7, 0x44, 0x08, /* iD!..D. */ - /* 0090 */ 0x0A, 0x84, 0x90, 0xD4, 0xF1, 0xA0, 0xA0, 0x71, /* .......q */ - /* 0098 */ 0x88, 0xAD, 0xCE, 0x46, 0x93, 0xA9, 0x74, 0x7E, /* ...F..t~ */ - /* 00A0 */ 0x48, 0x82, 0x70, 0xC6, 0x2A, 0x7E, 0x3A, 0x9A, /* H.p.*~:. */ - /* 00A8 */ 0xD0, 0xD9, 0x9C, 0x60, 0xE7, 0x18, 0x72, 0x3C, /* ...`..r< */ - /* 00B0 */ 0x48, 0xF4, 0x20, 0xB8, 0x00, 0x0F, 0x1C, 0x2C, /* H. ...., */ - /* 00B8 */ 0x34, 0x84, 0x22, 0x6B, 0x80, 0xC1, 0x8C, 0xDD, /* 4."k.... */ - /* 00C0 */ 0x63, 0xB1, 0x0B, 0x4E, 0x0A, 0xEC, 0x61, 0xB3, /* c..N..a. */ - /* 00C8 */ 0x01, 0x19, 0xA2, 0x24, 0x38, 0xD4, 0x11, 0xC0, /* ...$8... */ - /* 00D0 */ 0x12, 0x05, 0x98, 0x1F, 0x87, 0x0C, 0x0F, 0x95, /* ........ */ - /* 00D8 */ 0x8C, 0x25, 0x24, 0x1B, 0xAB, 0x87, 0xC2, 0xA5, /* .%$..... */ - /* 00E0 */ 0x40, 0x68, 0x6C, 0x27, 0xED, 0x19, 0x45, 0x2C, /* @hl'..E, */ - /* 00E8 */ 0x79, 0x4A, 0x82, 0x49, 0xE0, 0x51, 0x44, 0x36, /* yJ.I.QD6 */ - /* 00F0 */ 0x1A, 0x27, 0x28, 0x1B, 0x1A, 0x25, 0x03, 0x42, /* .'(..%.B */ - /* 00F8 */ 0x9E, 0x05, 0x58, 0x07, 0x26, 0x04, 0x76, 0x2F, /* ..X.&.v/ */ - /* 0100 */ 0xC0, 0x9A, 0x00, 0x73, 0xB3, 0x90, 0xB1, 0xB9, /* ...s.... */ - /* 0108 */ 0xE8, 0xFF, 0x0F, 0x71, 0xB0, 0x31, 0xDA, 0x9A, /* ...q.1.. */ - /* 0110 */ 0xAE, 0x90, 0xC2, 0xC4, 0x88, 0x12, 0x2C, 0x5E, /* ......,^ */ - /* 0118 */ 0xC5, 0xC3, 0x10, 0xCA, 0x93, 0x42, 0xA8, 0x48, /* .....B.H */ - /* 0120 */ 0x95, 0xA1, 0x68, 0xB4, 0x51, 0x2A, 0x14, 0xE0, /* ..h.Q*.. */ - /* 0128 */ 0x4C, 0x80, 0x30, 0x5C, 0x1D, 0x03, 0x82, 0x46, /* L.0\...F */ - /* 0130 */ 0x88, 0x15, 0x29, 0x56, 0xFB, 0x83, 0x20, 0xF1, /* ..)V.. . */ - /* 0138 */ 0x2D, 0x40, 0x54, 0x01, 0xA2, 0x48, 0xA3, 0x41, /* -@T..H.A */ - /* 0140 */ 0x9D, 0x03, 0x3C, 0x5C, 0x0F, 0xF5, 0xF0, 0x3D, /* ..<\...= */ - /* 0148 */ 0xF6, 0x93, 0x0C, 0x72, 0x90, 0x67, 0xF1, 0xA8, /* ...r.g.. */ - /* 0150 */ 0x70, 0x9C, 0x06, 0x49, 0xE0, 0x0B, 0x80, 0x4F, /* p..I...O */ - /* 0158 */ 0x08, 0x1E, 0x38, 0xDE, 0x35, 0xA0, 0x66, 0x7C, /* ..8.5.f| */ - /* 0160 */ 0xBC, 0x4C, 0x10, 0x1C, 0x6A, 0x88, 0x1E, 0x68, /* .L..j..h */ - /* 0168 */ 0xB8, 0x13, 0x38, 0x44, 0x06, 0xE8, 0x49, 0x3D, /* ..8D..I= */ - /* 0170 */ 0x52, 0x60, 0x07, 0x77, 0x32, 0xEF, 0x01, 0xAF, /* R`.w2... */ - /* 0178 */ 0x0A, 0xCD, 0x5E, 0x12, 0x08, 0xC1, 0xF1, 0xF8, /* ..^..... */ - /* 0180 */ 0x7E, 0xC0, 0x26, 0x9C, 0xC0, 0xF2, 0x07, 0x81, /* ~.&..... */ - /* 0188 */ 0x1A, 0x99, 0xA1, 0x3D, 0xCA, 0xD3, 0x8A, 0x19, /* ...=.... */ - /* 0190 */ 0xF2, 0x31, 0xC1, 0x04, 0x16, 0x0B, 0x21, 0x05, /* .1....!. */ - /* 0198 */ 0x10, 0x1A, 0x0F, 0xF8, 0x6F, 0x00, 0x8F, 0x17, /* ....o... */ - /* 01A0 */ 0xBE, 0x12, 0xC4, 0xF6, 0x80, 0x12, 0x0C, 0x0B, /* ........ */ - /* 01A8 */ 0x21, 0x23, 0xAB, 0xF0, 0x78, 0xE8, 0x28, 0x7C, /* !#..x.(| */ - /* 01B0 */ 0x95, 0x38, 0x9C, 0xD3, 0x8A, 0x67, 0x82, 0xE1, /* .8...g.. */ - /* 01B8 */ 0x20, 0xF4, 0x05, 0x90, 0x00, 0x51, 0xE7, 0x0C, /* ....Q.. */ - /* 01C0 */ 0xD4, 0x61, 0xC1, 0xE7, 0x04, 0x76, 0x33, 0x38, /* .a...v38 */ - /* 01C8 */ 0x83, 0x47, 0x00, 0x8F, 0xE4, 0x84, 0xFC, 0x2B, /* .G.....+ */ - /* 01D0 */ 0xF1, 0xC0, 0xE0, 0x03, 0xE2, 0xEF, 0x1F, 0xA7, /* ........ */ - /* 01D8 */ 0xEC, 0x11, 0x9C, 0xA9, 0x01, 0x7D, 0x1C, 0xF0, /* .....}.. */ - /* 01E0 */ 0xFF, 0x7F, 0x28, 0x7C, 0x88, 0x1E, 0xDF, 0x29, /* ..(|...) */ - /* 01E8 */ 0x1F, 0xAF, 0x4F, 0x17, 0x96, 0x35, 0x4E, 0xE8, /* ..O..5N. */ - /* 01F0 */ 0x77, 0x08, 0x9F, 0x38, 0x7C, 0x64, 0x71, 0x44, /* w..8|dqD */ - /* 01F8 */ 0x08, 0x39, 0x39, 0x05, 0xA0, 0x81, 0x4F, 0xF7, /* .99...O. */ - /* 0200 */ 0xEC, 0x22, 0x9C, 0xAE, 0x27, 0xE5, 0x40, 0xC3, /* ."..'.@. */ - /* 0208 */ 0xA0, 0xE3, 0x04, 0xC7, 0x79, 0x00, 0x1C, 0xE3, /* ....y... */ - /* 0210 */ 0x84, 0x7F, 0x2E, 0x80, 0x3F, 0x40, 0x7E, 0xCA, /* ....?@~. */ - /* 0218 */ 0x78, 0xC5, 0x48, 0xE0, 0x98, 0x23, 0x44, 0x9F, /* x.H..#D. */ - /* 0220 */ 0x6B, 0x3C, 0x42, 0x2C, 0xFC, 0x53, 0x45, 0xE1, /* k... */ - /* 0250 */ 0x89, 0x46, 0xF3, 0xE2, 0xA7, 0x03, 0x7E, 0xF8, /* .F....~. */ - /* 0258 */ 0x00, 0x0F, 0xA8, 0x87, 0x84, 0x03, 0xC5, 0x4C, /* .......L */ - /* 0260 */ 0x9B, 0x83, 0x3E, 0xBB, 0x1C, 0x3A, 0x76, 0xB8, /* ..>..:v. */ - /* 0268 */ 0xE0, 0x3F, 0x81, 0x80, 0x4B, 0xDE, 0x21, 0x0C, /* .?..K.!. */ - /* 0270 */ 0x14, 0x23, 0xC6, 0x9F, 0x83, 0x7C, 0x0A, 0x03, /* .#...|.. */ - /* 0278 */ 0xFF, 0xFF, 0xFF, 0x14, 0x06, 0xFE, 0xE1, 0xF0, /* ........ */ - /* 0280 */ 0x20, 0x4F, 0x07, 0x9F, 0xB6, 0xA8, 0x74, 0x18, /* O....t. */ - /* 0288 */ 0xD4, 0x81, 0x0B, 0xB0, 0x32, 0x89, 0x08, 0xCF, /* ....2... */ - /* 0290 */ 0x12, 0xB5, 0x41, 0xE8, 0xD4, 0xF0, 0x36, 0xF1, /* ..A...6. */ - /* 0298 */ 0xB6, 0xE5, 0x5B, 0x40, 0x9C, 0xD3, 0xEC, 0xED, /* ..[@.... */ - /* 02A0 */ 0xC0, 0x45, 0x30, 0x22, 0xD4, 0x0C, 0x45, 0x4E, /* .E0"..EN */ - /* 02A8 */ 0x5A, 0x11, 0x63, 0x44, 0x79, 0xDC, 0x32, 0xCA, /* Z.cDy.2. */ - /* 02B0 */ 0xDB, 0xD6, 0x0B, 0x40, 0xBC, 0x13, 0x7B, 0xDE, /* ...@..{. */ - /* 02B8 */ 0x32, 0x46, 0xF0, 0xC8, 0x0F, 0x5C, 0x2C, 0xC6, /* 2F...\,. */ - /* 02C0 */ 0xEA, 0xF5, 0x5F, 0xF3, 0x81, 0x0B, 0x70, 0xF6, /* .._...p. */ - /* 02C8 */ 0xFF, 0x3F, 0x70, 0x01, 0x1C, 0x0A, 0x7A, 0x18, /* .?p...z. */ - /* 02D0 */ 0x42, 0x0F, 0xC3, 0x53, 0x39, 0x97, 0x87, 0xC8, /* B..S9... */ - /* 02D8 */ 0x53, 0x89, 0x18, 0x35, 0x4C, 0xD4, 0x67, 0x28, /* S..5L.g( */ - /* 02E0 */ 0xDF, 0x2D, 0x7C, 0x20, 0x02, 0xDF, 0x99, 0x0B, /* .-| .... */ - /* 02E8 */ 0xF8, 0xFD, 0xFF, 0x0F, 0x44, 0x70, 0x8E, 0x29, /* ....Dp.) */ - /* 02F0 */ 0xB8, 0x33, 0x0D, 0x78, 0x7C, 0xCE, 0x40, 0x20, /* .3.x|.@ */ - /* 02F8 */ 0xA7, 0xE2, 0x43, 0x0D, 0x60, 0x41, 0xF4, 0x13, /* ..C.`A.. */ - /* 0300 */ 0xC2, 0x27, 0x1A, 0x2A, 0x13, 0x06, 0x75, 0xA8, /* .'.*..u. */ - /* 0308 */ 0x01, 0xAC, 0x5C, 0x61, 0x9E, 0x46, 0xCF, 0xF9, /* ..\a.F.. */ - /* 0310 */ 0x59, 0xC6, 0xA7, 0x1A, 0x1F, 0x4A, 0x8D, 0x63, /* Y....J.c */ - /* 0318 */ 0x88, 0x97, 0x99, 0x87, 0x1A, 0x1F, 0x0B, 0x5E, /* .......^ */ - /* 0320 */ 0x49, 0x7D, 0xA8, 0x31, 0x54, 0x9C, 0x87, 0x1A, /* I}.1T... */ - /* 0328 */ 0x0F, 0x37, 0x50, 0xD4, 0x37, 0x9B, 0x67, 0x1B, /* .7P.7.g. */ - /* 0330 */ 0xA3, 0xC7, 0xF7, 0x0D, 0xD5, 0x10, 0x0F, 0x35, /* .......5 */ - /* 0338 */ 0x4C, 0xF2, 0x4A, 0x35, 0x16, 0x1F, 0x6A, 0xC0, /* L.J5..j. */ - /* 0340 */ 0xF1, 0xFF, 0x3F, 0xD4, 0x00, 0xFC, 0xFF, 0xFF, /* ..?..... */ - /* 0348 */ 0x1F, 0x6A, 0x00, 0x47, 0x47, 0x03, 0x38, 0x47, /* .j.GG.8G */ - /* 0350 */ 0x46, 0xDC, 0xD1, 0x00, 0x5C, 0x87, 0x52, 0xE0, /* F...\.R. */ - /* 0358 */ 0x70, 0x34, 0x00, 0x1E, 0x47, 0x21, 0x30, 0x5F, /* p4..G!0_ */ - /* 0360 */ 0x68, 0x7C, 0x14, 0x02, 0x16, 0xFF, 0xFF, 0xA3, /* h|...... */ - /* 0368 */ 0x10, 0xF8, 0x65, 0x9F, 0x83, 0x50, 0x42, 0x8F, /* ..e..PB. */ - /* 0370 */ 0x42, 0x80, 0xA0, 0xDB, 0xCF, 0x53, 0xC4, 0xB3, /* B....S.. */ - /* 0378 */ 0x8F, 0x2F, 0x3F, 0x0F, 0x04, 0x11, 0x5E, 0xF3, /* ./?...^. */ - /* 0380 */ 0x7D, 0x0A, 0xF2, 0x21, 0xDF, 0x47, 0x21, 0x06, /* }..!.G!. */ - /* 0388 */ 0x63, 0x28, 0x5F, 0x83, 0x7C, 0x14, 0x62, 0x50, /* c(_.|.bP */ - /* 0390 */ 0xAF, 0x41, 0xBE, 0xEF, 0x1B, 0xE4, 0xF1, 0x22, /* .A....." */ - /* 0398 */ 0x48, 0xEC, 0x67, 0x02, 0x1F, 0x85, 0x98, 0xE8, /* H.g..... */ - /* 03A0 */ 0xA3, 0x10, 0xA0, 0xF0, 0xFF, 0x7F, 0x14, 0x02, /* ........ */ - /* 03A8 */ 0xF8, 0xFF, 0xFF, 0x3F, 0x0A, 0x01, 0xCE, 0x02, /* ...?.... */ - /* 03B0 */ 0x1C, 0x0D, 0x40, 0x37, 0xAD, 0x47, 0x21, 0xF0, /* ..@7.G!. */ - /* 03B8 */ 0xDE, 0x59, 0x4E, 0xFB, 0x04, 0x7C, 0x16, 0x02, /* .YN..|.. */ - /* 03C0 */ 0xCC, 0xFE, 0xFF, 0xCF, 0x42, 0xC0, 0xEC, 0x28, /* ....B..( */ - /* 03C8 */ 0x74, 0x14, 0x67, 0xF9, 0x2A, 0xF4, 0x04, 0xF0, /* t.g.*... */ - /* 03D0 */ 0x02, 0x10, 0x23, 0xCC, 0x3B, 0xD0, 0x4B, 0x26, /* ..#.;.K& */ - /* 03D8 */ 0xBB, 0x8B, 0x1B, 0xE7, 0xC9, 0xE5, 0x2C, 0x9E, /* ......,. */ - /* 03E0 */ 0xC4, 0x7D, 0x09, 0xF2, 0x81, 0xE2, 0x59, 0xC8, /* .}....Y. */ - /* 03E8 */ 0x50, 0xA7, 0x1B, 0xF4, 0x8D, 0xDC, 0x03, 0x8B, /* P....... */ - /* 03F0 */ 0x19, 0x3F, 0xC4, 0xF3, 0x90, 0x21, 0x9E, 0x85, /* .?...!.. */ - /* 03F8 */ 0x00, 0x76, 0xFD, 0xFF, 0xCF, 0x42, 0x00, 0xFF, /* .v...B.. */ - /* 0400 */ 0xFF, 0xFF, 0x47, 0x03, 0xF8, 0x2F, 0x00, 0x9F, /* ..G../.. */ - /* 0408 */ 0x85, 0x80, 0xE7, 0x09, 0xE0, 0x41, 0xDB, 0x67, /* .....A.g */ - /* 0410 */ 0x21, 0x80, 0x33, 0x87, 0xCB, 0xF3, 0x7F, 0x05, /* !.3..... */ - /* 0418 */ 0x3A, 0x96, 0xF7, 0x08, 0xCF, 0xFA, 0x24, 0x5F, /* :.....$_ */ - /* 0420 */ 0x2F, 0x3D, 0xD3, 0x87, 0x82, 0x67, 0x21, 0x86, /* /=...g!. */ - /* 0428 */ 0x75, 0x18, 0x3E, 0x0B, 0x31, 0x88, 0x17, 0x4D, /* u.>.1..M */ - /* 0430 */ 0x43, 0xBC, 0x70, 0xFA, 0x30, 0xE0, 0xFF, 0x3F, /* C.p.0..? */ - /* 0438 */ 0x5E, 0xE0, 0x57, 0x4E, 0x03, 0x05, 0x09, 0xF4, /* ^.WN.... */ - /* 0440 */ 0x2C, 0x04, 0x30, 0xFE, 0xFF, 0x7F, 0x16, 0x02, /* ,.0..... */ - /* 0448 */ 0xC8, 0xB8, 0x46, 0x9D, 0x85, 0x80, 0xE5, 0x6D, /* ..F....m */ - /* 0450 */ 0xE5, 0x19, 0xDB, 0xA7, 0x95, 0x04, 0xFF, 0xFF, /* ........ */ - /* 0458 */ 0x67, 0x21, 0xC0, 0x41, 0x2E, 0x23, 0x07, 0x21, /* g!.A.#.! */ - /* 0460 */ 0x4C, 0xC4, 0x87, 0x83, 0x8F, 0x99, 0x80, 0x9E, /* L....... */ - /* 0468 */ 0x29, 0xBE, 0xB8, 0x1B, 0xE3, 0x09, 0xE0, 0x45, /* )......E */ - /* 0470 */ 0xE2, 0x31, 0x93, 0x1D, 0x35, 0x0D, 0xF3, 0x2C, /* .1..5.., */ - /* 0478 */ 0x64, 0xBC, 0xB3, 0x78, 0x0D, 0x78, 0x82, 0xF7, /* d..x.x.. */ - /* 0480 */ 0xE4, 0x9F, 0x85, 0x18, 0xD8, 0x61, 0x05, 0x7B, /* .....a.{ */ - /* 0488 */ 0x14, 0x32, 0xA8, 0xC1, 0x63, 0x87, 0x08, 0x13, /* .2..c... */ - /* 0490 */ 0xE8, 0x59, 0x88, 0xC5, 0x7D, 0xAE, 0xE8, 0x3C, /* .Y..}..< */ - /* 0498 */ 0xE1, 0xB3, 0x10, 0xF0, 0xFE, 0xFF, 0x9F, 0x25, /* .......% */ - /* 04A0 */ 0xE0, 0x5E, 0x0D, 0x9E, 0x85, 0x00, 0x13, 0x87, /* .^...... */ - /* 04A8 */ 0x0D, 0x9F, 0x35, 0xC0, 0x33, 0x7C, 0x8F, 0xEA, /* ..5.3|.. */ - /* 04B0 */ 0x1C, 0x1E, 0x8F, 0x81, 0x7F, 0x56, 0x1D, 0xE7, /* .....V.. */ - /* 04B8 */ 0x04, 0x96, 0x7B, 0xD1, 0xB2, 0x71, 0xA0, 0xA1, /* ..{..q.. */ - /* 04C0 */ 0x23, 0xB2, 0x3A, 0x20, 0x8D, 0x0D, 0x73, 0x29, /* #.: ..s) */ - /* 04C8 */ 0x89, 0x7C, 0x72, 0x6C, 0xD4, 0x56, 0x04, 0xA7, /* .|rl.V.. */ - /* 04D0 */ 0x33, 0x93, 0x4F, 0x00, 0xD6, 0x42, 0x21, 0x05, /* 3.O..B!. */ - /* 04D8 */ 0x34, 0x1A, 0x8B, 0xE1, 0x9D, 0xF9, 0xE8, 0x44, /* 4......D */ - /* 04E0 */ 0x41, 0x0C, 0xE8, 0xE3, 0x90, 0x6D, 0x1C, 0x0A, /* A....m.. */ - /* 04E8 */ 0x50, 0x7B, 0xD1, 0x14, 0xC8, 0x39, 0x07, 0xA3, /* P{...9.. */ - /* 04F0 */ 0x7F, 0x76, 0x74, 0x36, 0xBE, 0x13, 0x70, 0x0D, /* .vt6..p. */ - /* 04F8 */ 0x10, 0x3A, 0x25, 0x18, 0xDA, 0x6A, 0x04, 0xFC, /* .:%..j.. */ - /* 0500 */ 0xFF, 0x67, 0x89, 0x01, 0x33, 0xFE, 0x53, 0x8C, /* .g..3.S. */ - /* 0508 */ 0x09, 0x7C, 0x8E, 0xC1, 0x1F, 0x0C, 0xF0, 0x03, /* .|...... */ - /* 0510 */ 0x7F, 0x31, 0xA8, 0xFA, 0x5E, 0xA0, 0xFB, 0x82, /* .1..^... */ - /* 0518 */ 0xD5, 0xDD, 0x64, 0x20, 0xCC, 0xC8, 0x04, 0xF5, /* ..d .... */ - /* 0520 */ 0x9D, 0x0E, 0x40, 0x01, 0xE4, 0x0B, 0x81, 0xCF, /* ..@..... */ - /* 0528 */ 0x51, 0x0F, 0x05, 0x6C, 0x22, 0x21, 0xC2, 0x44, /* Q..l"!.D */ - /* 0530 */ 0x33, 0x3A, 0x62, 0xC2, 0xA8, 0xE8, 0x13, 0xA6, /* 3:b..... */ - /* 0538 */ 0x20, 0x9E, 0xB0, 0x63, 0x4D, 0x18, 0x3D, 0x13, /* ..cM.=. */ - /* 0540 */ 0x5F, 0x74, 0xD8, 0x88, 0x31, 0x21, 0xAE, 0x1E, /* _t..1!.. */ - /* 0548 */ 0xD0, 0x26, 0x18, 0xD4, 0x97, 0x22, 0x58, 0x43, /* .&..."XC */ - /* 0550 */ 0xE6, 0x63, 0xF1, 0x05, 0x02, 0x37, 0x65, 0x30, /* .c...7e0 */ - /* 0558 */ 0xCE, 0x89, 0x5D, 0x13, 0x7C, 0xD9, 0xC1, 0xCD, /* ..].|... */ - /* 0560 */ 0x19, 0x8C, 0xF0, 0x98, 0xBB, 0x18, 0xBF, 0x3A, /* .......: */ - /* 0568 */ 0x79, 0x74, 0xFC, 0xA0, 0xE0, 0x1B, 0x0E, 0xC3, /* yt...... */ - /* 0570 */ 0x7E, 0x32, 0xF3, 0x8C, 0xDE, 0xCB, 0x7C, 0x8D, /* ~2....|. */ - /* 0578 */ 0xC3, 0xC0, 0x7A, 0xBC, 0x1C, 0xD6, 0x68, 0x61, /* ..z...ha */ - /* 0580 */ 0x0F, 0xED, 0x3D, 0xC4, 0xFF, 0xFF, 0x43, 0x8C, /* ..=...C. */ - /* 0588 */ 0xCF, 0x13, 0xC6, 0x08, 0xEB, 0xDB, 0x0B, 0x38, /* .......8 */ - /* 0590 */ 0xEE, 0x59, 0xF0, 0xEF, 0x1A, 0xE0, 0xB9, 0x84, /* .Y...... */ - /* 0598 */ 0xF8, 0xAE, 0x01, 0x30, 0xF0, 0xFF, 0x7F, 0xD7, /* ...0.... */ - /* 05A0 */ 0x00, 0x4E, 0xD7, 0x04, 0xDF, 0x35, 0x80, 0xF7, /* .N...5.. */ - /* 05A8 */ 0xD0, 0x7D, 0xD7, 0x00, 0xAE, 0xD9, 0xEF, 0x1A, /* .}...... */ - /* 05B0 */ 0xA8, 0x63, 0x80, 0x15, 0xDE, 0x35, 0xA0, 0x5D, /* .c...5.] */ - /* 05B8 */ 0xD9, 0xDE, 0xD7, 0x9E, 0xB0, 0xAC, 0xE9, 0xB2, /* ........ */ - /* 05C0 */ 0x81, 0x52, 0x73, 0xD9, 0x00, 0x14, 0xFC, 0xFF, /* .Rs..... */ - /* 05C8 */ 0x2F, 0x1B, 0x80, 0x01, 0x29, 0x13, 0x46, 0x85, /* /...).F. */ - /* 05D0 */ 0x9F, 0x30, 0x05, 0xF1, 0x84, 0x1D, 0xEC, 0xB2, /* .0...... */ - /* 05D8 */ 0x01, 0x8A, 0x18, 0x97, 0x0D, 0xD0, 0x8F, 0xED, /* ........ */ - /* 05E0 */ 0x65, 0x03, 0x18, 0xDC, 0x13, 0xF8, 0x6D, 0x03, /* e.....m. */ - /* 05E8 */ 0x78, 0x43, 0xFA, 0xB6, 0x01, 0xD6, 0xFF, 0xFF, /* xC...... */ - /* 05F0 */ 0x6D, 0x03, 0xAC, 0xF9, 0x6F, 0x1B, 0x28, 0x0E, /* m...o.(. */ - /* 05F8 */ 0xAB, 0xBC, 0x6D, 0x40, 0x3C, 0xC9, 0x33, 0x02, /* ..m@<.3. */ - /* 0600 */ 0xAB, 0xBA, 0x6E, 0xA0, 0xF4, 0x5C, 0x37, 0x00, /* ..n..\7. */ - /* 0608 */ 0x12, 0x88, 0x99, 0x30, 0x2A, 0xFE, 0x84, 0x29, /* ...0*..) */ - /* 0610 */ 0x88, 0x27, 0xEC, 0x68, 0xD7, 0x0D, 0x50, 0x04, /* .'.h..P. */ - /* 0618 */ 0xB9, 0x6E, 0x80, 0x7E, 0x5E, 0x09, 0xFE, 0xFF, /* .n.~^... */ - /* 0620 */ 0xAF, 0x1B, 0xC0, 0xE0, 0xA2, 0x80, 0xB9, 0x6F, /* .......o */ - /* 0628 */ 0x00, 0x6F, 0x58, 0x7E, 0xDF, 0x00, 0x7C, 0xDC, /* .oX~..|. */ - /* 0630 */ 0xC4, 0x31, 0xF7, 0x0D, 0xC0, 0xCC, 0xFF, 0xFF, /* .1...... */ - /* 0638 */ 0xBE, 0x01, 0xB0, 0xE7, 0xA2, 0x80, 0xBB, 0x6F, /* .......o */ - /* 0640 */ 0x00, 0xEF, 0x8B, 0xB4, 0xEF, 0x1B, 0x60, 0xFE, /* ......`. */ - /* 0648 */ 0xFF, 0xDF, 0x37, 0xC0, 0x28, 0x6D, 0xFD, 0x1E, /* ..7.(m.. */ - /* 0650 */ 0x1C, 0x3D, 0x21, 0x78, 0x7C, 0xB8, 0xFB, 0xA5, /* .=!x|... */ - /* 0658 */ 0xC7, 0xE7, 0xBB, 0x39, 0x38, 0x06, 0x79, 0x8C, /* ...98.y. */ - /* 0660 */ 0x87, 0x76, 0xC0, 0xAF, 0xEF, 0x9E, 0x98, 0xEF, /* .v...... */ - /* 0668 */ 0xE6, 0xC0, 0xFF, 0x4C, 0x70, 0x3C, 0x18, 0x68, /* ...Lp<.h */ - /* 0670 */ 0x1C, 0x62, 0xAB, 0x97, 0x06, 0x72, 0x34, 0x38, /* .b...r48 */ - /* 0678 */ 0x3F, 0xDC, 0x19, 0x81, 0x61, 0x15, 0x7F, 0xF2, /* ?...a... */ - /* 0680 */ 0x47, 0x38, 0xC7, 0xD0, 0xD9, 0xE1, 0x20, 0xB1, /* G8.... . */ - /* 0688 */ 0x83, 0xE0, 0xC1, 0x56, 0x6D, 0x02, 0x85, 0x86, /* ...Vm... */ - /* 0690 */ 0x50, 0x14, 0x18, 0x14, 0x8B, 0x0F, 0x18, 0xF8, /* P....... */ - /* 0698 */ 0x61, 0xB3, 0xB3, 0x00, 0x93, 0x04, 0x87, 0x3A, /* a......: */ - /* 06A0 */ 0x02, 0xF8, 0x3E, 0xD1, 0xFC, 0x38, 0x74, 0x37, /* ..>..8t7 */ - /* 06A8 */ 0x38, 0x54, 0x8F, 0xE5, 0xA1, 0x80, 0x9E, 0x01, /* 8T...... */ - /* 06B0 */ 0x71, 0xC7, 0x0C, 0x32, 0x69, 0xCF, 0x28, 0xE2, /* q..2i.(. */ - /* 06B8 */ 0x53, 0xC2, 0x29, 0x85, 0x49, 0xE0, 0xF3, 0x03, /* S.).I... */ - /* 06C0 */ 0x43, 0xE3, 0x04, 0xAF, 0x0D, 0xA1, 0xF9, 0xFF, /* C....... */ - /* 06C8 */ 0xFF, 0xA4, 0xC0, 0x3C, 0xDF, 0x31, 0x04, 0x6C, /* ...<.1.l */ - /* 06D0 */ 0x02, 0xBB, 0xBF, 0x64, 0xC8, 0xDA, 0xC0, 0x75, /* ...d...u */ - /* 06D8 */ 0x4B, 0x32, 0x44, 0x6F, 0x38, 0xB2, 0x85, 0xA2, /* K2Do8... */ - /* 06E0 */ 0xE9, 0x44, 0x79, 0xDF, 0x88, 0x62, 0x67, 0x08, /* .Dy..bg. */ - /* 06E8 */ 0xC2, 0x88, 0x12, 0x2C, 0xC8, 0xA3, 0x42, 0xAC, /* ...,..B. */ - /* 06F0 */ 0x28, 0x2F, 0x05, 0x46, 0x88, 0x18, 0xE2, 0x95, /* (/.F.... */ - /* 06F8 */ 0x23, 0xD0, 0x09, 0x87, 0x0F, 0xF2, 0xD8, 0x14, /* #....... */ - /* 0700 */ 0xA7, 0xFD, 0x41, 0x90, 0x58, 0x4F, 0x02, 0x8D, /* ..A.XO.. */ - /* 0708 */ 0xC5, 0x91, 0x46, 0x83, 0x3A, 0x07, 0x78, 0xB8, /* ..F.:.x. */ - /* 0710 */ 0x3E, 0xC4, 0x78, 0xF8, 0x0F, 0x21, 0x06, 0x39, /* >.x..!.9 */ - /* 0718 */ 0xC8, 0x73, 0x7B, 0x54, 0x38, 0x4E, 0x5F, 0x25, /* .s{T8N_% */ - /* 0720 */ 0x4C, 0xF0, 0x02, 0xE0, 0x83, 0x0A, 0x1C, 0xD7, /* L....... */ - /* 0728 */ 0x80, 0x9A, 0xF1, 0x33, 0x06, 0x58, 0x8E, 0xE3, /* ...3.X.. */ - /* 0730 */ 0x3E, 0xA9, 0xC0, 0x1D, 0x8F, 0xEF, 0x07, 0x6C, /* >......l */ - /* 0738 */ 0xC2, 0x09, 0x2C, 0x7F, 0x10, 0xA8, 0xE3, 0x0C, /* ..,..... */ - /* 0740 */ 0x9F, 0xE7, 0x0B, 0x8B, 0x21, 0x1F, 0x13, 0x4C, /* ....!..L */ - /* 0748 */ 0x60, 0xB1, 0x27, 0x1B, 0x3A, 0x1E, 0xF0, 0xDF, /* `.'.:... */ - /* 0750 */ 0x63, 0x1E, 0x2F, 0x7C, 0x32, 0xF1, 0x7C, 0x4D, /* c./|2.|M */ - /* 0758 */ 0x30, 0x22, 0x84, 0x9C, 0x8C, 0x07, 0x7D, 0x87, /* 0"....}. */ - /* 0760 */ 0xC0, 0x5C, 0x6F, 0xD8, 0xB9, 0x85, 0x8B, 0x3A, /* .\o....: */ - /* 0768 */ 0x68, 0xA0, 0x4E, 0x0B, 0x3E, 0x28, 0xB0, 0x9B, /* h.N.>(.. */ - /* 0770 */ 0x11, 0xE6, 0xB8, 0xCE, 0xCF, 0x2A, 0x60, 0xF8, /* .....*`. */ - /* 0778 */ 0xFF, 0x9F, 0x55, 0x60, 0x8F, 0x10, 0xFE, 0xED, /* ..U`.... */ - /* 0780 */ 0xC1, 0xF3, 0xF2, 0x95, 0xE1, 0xD5, 0x21, 0x81, /* ......!. */ - /* 0788 */ 0x43, 0x8E, 0x10, 0x3D, 0x2E, 0x8F, 0x10, 0x73, /* C..=...s */ - /* 0790 */ 0x3E, 0xC2, 0x0C, 0x11, 0x5C, 0x67, 0x01, 0x70, /* >...\g.p */ - /* 0798 */ 0x0C, 0x11, 0xF8, 0x1C, 0x70, 0xC0, 0x71, 0x69, /* ....p.qi */ - /* 07A0 */ 0xE2, 0x03, 0xF5, 0x01, 0x07, 0x70, 0x70, 0x4D, /* .....ppM */ - /* 07A8 */ 0xC3, 0x1D, 0x70, 0xC0, 0x71, 0x16, 0x60, 0xFF, /* ..p.q.`. */ - /* 07B0 */ 0xFF, 0xC3, 0x0D, 0x2C, 0x49, 0x26, 0x0E, 0x23, /* ...,I&.# */ - /* 07B8 */ 0x18, 0x11, 0x30, 0x28, 0x02, 0x02, 0xA4, 0xB3, /* ..0(.... */ - /* 07C0 */ 0x80, 0x0F, 0x29, 0x00, 0x1F, 0xAE, 0x0C, 0x0F, /* ..)..... */ - /* 07C8 */ 0x29, 0xD8, 0x93, 0x86, 0x07, 0x8E, 0x1B, 0x85, /* )....... */ - /* 07D0 */ 0x07, 0x8D, 0x0B, 0x30, 0x68, 0x7A, 0xE2, 0x80, /* ...0hz.. */ - /* 07D8 */ 0x7F, 0x4C, 0xF0, 0x19, 0x05, 0x1C, 0xE3, 0x06, /* .L...... */ - /* 07E0 */ 0xDF, 0x2A, 0x0C, 0xFC, 0xFF, 0x3F, 0x30, 0xCC, /* .*...?0. */ - /* 07E8 */ 0xE1, 0xC2, 0x63, 0x39, 0x8A, 0xA0, 0x07, 0x1E, /* ..c9.... */ - /* 07F0 */ 0xD4, 0xF7, 0x8C, 0x33, 0xF7, 0x24, 0x8F, 0xD1, /* ...3.$.. */ - /* 07F8 */ 0x51, 0x0F, 0x27, 0xF4, 0xE4, 0x85, 0x3B, 0x57, /* Q.'...;W */ - /* 0800 */ 0xF9, 0x0A, 0x71, 0x14, 0x18, 0xB8, 0x77, 0x29, /* ..q...w) */ - /* 0808 */ 0x8F, 0xCF, 0x17, 0x2B, 0xC3, 0x63, 0x46, 0xFB, /* ...+.cF. */ - /* 0810 */ 0x1E, 0x72, 0xD6, 0x11, 0x02, 0xE2, 0x2F, 0x75, /* .r..../u */ - /* 0818 */ 0x6C, 0xC0, 0x60, 0x39, 0x18, 0x00, 0x87, 0x01, /* l.`9.... */ - /* 0820 */ 0xE3, 0x13, 0x0D, 0x58, 0x67, 0x1B, 0x3C, 0xF4, /* ...Xg.<. */ - /* 0828 */ 0x69, 0x31, 0xC4, 0xE3, 0x0B, 0xFB, 0x56, 0x61, /* i1....Va */ - /* 0830 */ 0x82, 0xEA, 0x41, 0x75, 0x12, 0xF4, 0xD0, 0xC0, /* ..Au.... */ - /* 0838 */ 0x01, 0xE8, 0xA1, 0xC1, 0x3F, 0xB9, 0x90, 0xFB, /* ....?... */ - /* 0840 */ 0x2B, 0x1D, 0x82, 0xB5, 0xE2, 0x69, 0xDE, 0x47, /* +....i.G */ - /* 0848 */ 0x1E, 0xF3, 0xDC, 0xA2, 0xBC, 0x0D, 0x3C, 0x07, /* ......<. */ - /* 0850 */ 0xF0, 0xD3, 0x82, 0x87, 0xE3, 0x63, 0x81, 0xC7, /* .....c.. */ - /* 0858 */ 0xE9, 0x4B, 0x58, 0x82, 0xF7, 0x1A, 0x9F, 0x6C, /* .KX....l */ - /* 0860 */ 0x1E, 0x5C, 0x58, 0xB2, 0x21, 0xA0, 0x06, 0xEB, /* .\X.!... */ - /* 0868 */ 0x21, 0x60, 0xA6, 0x9A, 0xC0, 0x49, 0x46, 0x80, /* !`...IF. */ - /* 0870 */ 0xCA, 0x00, 0xA1, 0x1B, 0xCB, 0xE9, 0x3E, 0x8B, /* ......>. */ - /* 0878 */ 0x84, 0x38, 0xCD, 0x47, 0x99, 0xC7, 0x02, 0x8F, /* .8.G.... */ - /* 0880 */ 0xF5, 0xC1, 0xC0, 0xFF, 0x7F, 0xCD, 0x23, 0xD4, /* ......#. */ - /* 0888 */ 0x7D, 0xCD, 0x33, 0x7B, 0x3A, 0xC0, 0xAC, 0x22, /* }.3{:.." */ - /* 0890 */ 0xDC, 0x7B, 0xCE, 0x1B, 0x86, 0xD1, 0x9E, 0x2D, /* .{.....- */ - /* 0898 */ 0x7C, 0xCD, 0x78, 0xD6, 0x34, 0x42, 0x38, 0x76, /* |.x.4B8v */ - /* 08A0 */ 0x83, 0xF3, 0x48, 0x8C, 0xF0, 0x82, 0xC0, 0x4E, /* ..H....N */ - /* 08A8 */ 0x0C, 0x0F, 0x30, 0xC6, 0x39, 0x79, 0xC3, 0xFA, /* ..0.9y.. */ - /* 08B0 */ 0xC2, 0xCB, 0x40, 0x83, 0x19, 0xDB, 0x97, 0x01, /* ..@..... */ - /* 08B8 */ 0x36, 0x2A, 0xDF, 0x88, 0xC0, 0x97, 0xFC, 0x62, /* 6*.....b */ - /* 08C0 */ 0x00, 0x65, 0x16, 0xBE, 0x9E, 0xF8, 0xA0, 0xC4, /* .e...... */ - /* 08C8 */ 0x2E, 0x06, 0x2C, 0xE5, 0xC5, 0x00, 0x54, 0x37, /* ..,...T7 */ - /* 08D0 */ 0x0C, 0x5F, 0x0C, 0xE0, 0x5F, 0x89, 0x5E, 0x0C, /* ._.._.^. */ - /* 08D8 */ 0xC0, 0x70, 0x71, 0xF2, 0x3D, 0xC0, 0x1E, 0xEE, /* .pq.=... */ - /* 08E0 */ 0xA3, 0x74, 0x9C, 0xBE, 0xFD, 0xBD, 0x19, 0xF8, /* .t...... */ - /* 08E8 */ 0x6C, 0xC0, 0x60, 0x3C, 0xC3, 0x30, 0xC6, 0x08, /* l.`<.0.. */ - /* 08F0 */ 0xE3, 0x51, 0x86, 0x31, 0xC1, 0xDC, 0xB7, 0x03, /* .Q.1.... */ - /* 08F8 */ 0xE8, 0x39, 0x87, 0x81, 0x4A, 0x78, 0x3B, 0x80, /* .9..Jx;. */ - /* 0900 */ 0x72, 0x0E, 0xE8, 0xF2, 0x68, 0x42, 0x4F, 0x01, /* r...hBO. */ - /* 0908 */ 0x4F, 0x07, 0x3E, 0x29, 0x1A, 0xA2, 0xAF, 0xB1, /* O.>).... */ - /* 0910 */ 0x0A, 0x26, 0x50, 0xC4, 0x07, 0x0D, 0x3E, 0xB5, /* .&P...>. */ - /* 0918 */ 0x28, 0x3E, 0x15, 0x78, 0x2D, 0xCF, 0x4E, 0xE1, /* (>.x-.N. */ - /* 0920 */ 0xE2, 0x9C, 0x89, 0xA7, 0x6A, 0x38, 0x03, 0xBD, /* ....j8.. */ - /* 0928 */ 0xE6, 0x86, 0x63, 0xFF, 0x7F, 0x38, 0xFC, 0xA9, /* ..c..8.. */ - /* 0930 */ 0xE0, 0x35, 0x80, 0x1D, 0x24, 0x3D, 0x2D, 0x23, /* .5..$=-# */ - /* 0938 */ 0xC2, 0x38, 0xA4, 0x3C, 0x32, 0xF8, 0xB6, 0x18, /* .8.<2... */ - /* 0940 */ 0xC7, 0x90, 0x0F, 0x91, 0xBE, 0x13, 0x18, 0xF2, /* ........ */ - /* 0948 */ 0x21, 0xEF, 0x79, 0xC7, 0xC0, 0xAF, 0x08, 0x71, /* !.y....q */ - /* 0950 */ 0x9E, 0xB2, 0x7C, 0x67, 0xF0, 0x65, 0x01, 0x7C, /* ..|g.e.| */ - /* 0958 */ 0x91, 0x2E, 0x0B, 0x68, 0x68, 0x9F, 0x64, 0x7C, /* ...hh.d| */ - /* 0960 */ 0x41, 0x30, 0xEC, 0x89, 0xB3, 0x00, 0x77, 0x05, /* A0....w. */ - /* 0968 */ 0x50, 0x81, 0xFA, 0xAE, 0x00, 0xFF, 0x42, 0xF0, /* P.....B. */ - /* 0970 */ 0xAE, 0x00, 0x86, 0x79, 0xF9, 0x56, 0xC0, 0x35, /* ...y.V.5 */ - /* 0978 */ 0x1D, 0x4A, 0xD0, 0x67, 0x12, 0x5F, 0x17, 0x70, /* .J.g._.p */ - /* 0980 */ 0x53, 0x64, 0xA9, 0x8E, 0x0A, 0xD0, 0x53, 0x4C, /* Sd....SL */ - /* 0988 */ 0x02, 0x75, 0x47, 0xF7, 0x51, 0x01, 0xC6, 0x4D, /* .uG.Q..M */ - /* 0990 */ 0xD9, 0x07, 0x54, 0x76, 0x5A, 0x60, 0x67, 0x21, /* ..TvZ`g! */ - /* 0998 */ 0x76, 0x1D, 0xC1, 0x5D, 0x49, 0x18, 0xCA, 0xB3, /* v..]I... */ - /* 09A0 */ 0x81, 0x2F, 0x59, 0xFC, 0x70, 0x00, 0x03, 0xDC, /* ./Y.p... */ - /* 09A8 */ 0xB3, 0x38, 0xC4, 0x08, 0xB1, 0xD9, 0x81, 0xEB, /* .8...... */ - /* 09B0 */ 0x75, 0xD2, 0x70, 0x2F, 0x44, 0xEC, 0xFF, 0x7F, /* u.p/D... */ - /* 09B8 */ 0x32, 0x00, 0xE3, 0x51, 0x1B, 0x1C, 0x27, 0x9D, /* 2..Q..'. */ - /* 09C0 */ 0xF0, 0x91, 0x9E, 0x59, 0xF8, 0x49, 0x19, 0x30, /* ...Y.I.0 */ - /* 09C8 */ 0x71, 0xF2, 0x03, 0xE3, 0xC9, 0x1A, 0xC6, 0x00, /* q....... */ - /* 09D0 */ 0xB8, 0xBC, 0x57, 0x95, 0x81, 0xFC, 0x43, 0x90, /* ..W...C. */ - /* 09D8 */ 0x20, 0x18, 0xD4, 0x29, 0x19, 0x38, 0x1C, 0xC5, /* ..).8.. */ - /* 09E0 */ 0x70, 0xA7, 0x64, 0x78, 0x50, 0xF8, 0xC3, 0x00, /* p.dxP... */ - /* 09E8 */ 0xE6, 0x46, 0xE8, 0x7B, 0x82, 0xA1, 0xDE, 0x93, /* .F.{.... */ - /* 09F0 */ 0x0E, 0xE3, 0x91, 0xD0, 0x04, 0x3E, 0x2D, 0xC3, /* .....>-. */ - /* 09F8 */ 0xFA, 0xFF, 0x9F, 0x96, 0x81, 0xD5, 0xB1, 0xDD, /* ........ */ - /* 0A00 */ 0x43, 0xF6, 0x59, 0x01, 0x77, 0x76, 0x80, 0x3B, /* C.Y.wv.; */ - /* 0A08 */ 0x3D, 0x7E, 0x7A, 0x00, 0x9C, 0x00, 0x3D, 0x3D, /* =~z...== */ - /* 0A10 */ 0x80, 0xED, 0xBC, 0x01, 0xF7, 0x40, 0x80, 0x38, /* .....@.8 */ - /* 0A18 */ 0xFE, 0xA3, 0x82, 0x5F, 0x59, 0x28, 0x1C, 0x3F, /* ..._Y(.? */ - /* 0A20 */ 0xB6, 0xF3, 0x63, 0x09, 0xEE, 0x70, 0xE0, 0x23, /* ..c..p.# */ - /* 0A28 */ 0x83, 0x0F, 0x90, 0xB8, 0xA1, 0xF8, 0x50, 0x81, /* ......P. */ - /* 0A30 */ 0x3C, 0x0B, 0x80, 0x62, 0xF4, 0x6C, 0x04, 0xEC, /* <..b.l.. */ - /* 0A38 */ 0x06, 0xF3, 0xD2, 0x12, 0xE5, 0xFF, 0xFF, 0xDE, /* ........ */ - /* 0A40 */ 0xC0, 0x4E, 0x29, 0xB8, 0x83, 0x00, 0xF8, 0x8E, /* .N)..... */ - /* 0A48 */ 0x01, 0xE0, 0x1D, 0x0C, 0x97, 0x35, 0x66, 0x94, /* .....5f. */ - /* 0A50 */ 0x10, 0x18, 0x8D, 0x19, 0x77, 0x08, 0xE1, 0x27, /* ....w..' */ - /* 0A58 */ 0x02, 0xDC, 0x98, 0x3D, 0x6E, 0x8F, 0x19, 0x77, /* ...=n..w */ - /* 0A60 */ 0x9C, 0xE5, 0xA3, 0x7A, 0xCA, 0x08, 0xE5, 0x03, /* ...z.... */ - /* 0A68 */ 0x07, 0x3B, 0x67, 0xBC, 0x11, 0xF0, 0xA1, 0x03, /* .;g..... */ - /* 0A70 */ 0x8F, 0x03, 0x0C, 0xEE, 0x48, 0x01, 0xC6, 0xCB, /* ....H... */ - /* 0A78 */ 0x01, 0x1B, 0x3B, 0xB8, 0x83, 0x90, 0x53, 0x20, /* ..;...S */ - /* 0A80 */ 0x4B, 0x87, 0xD1, 0xD8, 0x71, 0xB2, 0x81, 0x74, /* K...q..t */ - /* 0A88 */ 0x8C, 0xF1, 0x21, 0xD7, 0x63, 0xC7, 0x0D, 0xD6, /* ..!.c... */ - /* 0A90 */ 0x63, 0xC7, 0x1D, 0x5F, 0xB0, 0xFF, 0xFF, 0xE3, /* c.._.... */ - /* 0A98 */ 0x0B, 0x18, 0xC6, 0xC0, 0xC5, 0x0F, 0x03, 0x7D, /* .......} */ - /* 0AA0 */ 0xF3, 0xF3, 0xE8, 0x0C, 0xEE, 0x61, 0xFB, 0x04, /* .....a.. */ - /* 0AA8 */ 0x13, 0xE3, 0xF9, 0x25, 0xC4, 0x23, 0xCC, 0x8B, /* ...%.#.. */ - /* 0AB0 */ 0x4B, 0x84, 0xA3, 0x08, 0xF2, 0xE6, 0x12, 0xE7, /* K....... */ - /* 0AB8 */ 0xD5, 0x20, 0xCC, 0x63, 0x4B, 0x94, 0x10, 0x11, /* . .cK... */ - /* 0AC0 */ 0x0E, 0x26, 0xCE, 0x13, 0x8C, 0x11, 0x0E, 0x3C, /* .&.....< */ - /* 0AC8 */ 0x8A, 0x21, 0x22, 0x9C, 0x40, 0x88, 0x93, 0x3E, /* .!".@..> */ - /* 0AD0 */ 0xD9, 0x20, 0xE1, 0x63, 0x84, 0x8D, 0xF6, 0x04, /* . .c.... */ - /* 0AD8 */ 0xC3, 0xC7, 0xC2, 0xCF, 0x2B, 0x1E, 0x3C, 0x3F, /* ....+... */ - /* 0B38 */ 0x41, 0xC0, 0x87, 0x3A, 0x54, 0x0F, 0xF3, 0xA8, /* A..:T... */ - /* 0B40 */ 0x5E, 0x0A, 0x19, 0xCE, 0xD9, 0xC1, 0x1D, 0x04, /* ^....... */ - /* 0B48 */ 0xF6, 0xF8, 0xE1, 0x41, 0xF0, 0x9B, 0x25, 0x1F, /* ...A..%. */ - /* 0B50 */ 0x04, 0x3B, 0xDF, 0xBC, 0xC1, 0x19, 0xE4, 0xFF, /* .;...... */ - /* 0B58 */ 0x7F, 0x0C, 0xB0, 0xCF, 0x54, 0x3E, 0x9A, 0x20, /* ....T>. */ - /* 0B60 */ 0x8E, 0x80, 0xE8, 0xF3, 0x87, 0xC7, 0xF0, 0x26, /* .......& */ - /* 0B68 */ 0xC7, 0x87, 0x83, 0x3D, 0x7A, 0xE0, 0x4E, 0x22, /* ...=z.N" */ - /* 0B70 */ 0x70, 0x8F, 0x5D, 0x07, 0xED, 0x6B, 0x9C, 0x2F, /* p.]..k./ */ - /* 0B78 */ 0x5A, 0x30, 0xEE, 0x7B, 0xCF, 0x22, 0xE0, 0xC7, /* Z0.{.".. */ - /* 0B80 */ 0x78, 0x6C, 0x01, 0xC7, 0xA1, 0x04, 0xDC, 0xC1, /* xl...... */ - /* 0B88 */ 0x8E, 0x6B, 0x1C, 0x42, 0x51, 0x60, 0x74, 0x28, /* .k.BQ`t( */ - /* 0B90 */ 0xC1, 0xC5, 0x00, 0x12, 0x8C, 0x63, 0x9C, 0xD1, /* .....c.. */ - /* 0B98 */ 0xD0, 0x97, 0x48, 0x1F, 0xD2, 0xE0, 0x0C, 0x1A, /* ..H..... */ - /* 0BA0 */ 0xF6, 0x3C, 0x9F, 0x50, 0xB8, 0x3D, 0x01, 0x8A, /* .<.P.=.. */ - /* 0BA8 */ 0x4E, 0x28, 0x20, 0xC3, 0x7D, 0x06, 0xC1, 0x9E, /* N( .}... */ - /* 0BB0 */ 0x10, 0xF8, 0x19, 0x84, 0xFD, 0xFF, 0x0F, 0x8E, /* ........ */ - /* 0BB8 */ 0x1E, 0xF7, 0x7B, 0xA3, 0x4F, 0x8D, 0x6C, 0xEE, /* ..{.O.l. */ - /* 0BC0 */ 0x0F, 0x01, 0x27, 0x70, 0xEE, 0xEC, 0xD4, 0x8C, /* ..'p.... */ - /* 0BC8 */ 0x3B, 0x33, 0x60, 0xCF, 0x1F, 0x1E, 0x02, 0x3F, /* ;3`....? */ - /* 0BD0 */ 0x17, 0x78, 0xF8, 0x1E, 0x02, 0x7E, 0xF0, 0x0F, /* .x...~.. */ - /* 0BD8 */ 0xCC, 0x06, 0x07, 0xE3, 0x29, 0xC2, 0xD7, 0x0E, /* ....)... */ - /* 0BE0 */ 0x0E, 0xCE, 0x4F, 0x03, 0x06, 0xE7, 0xAF, 0x50, /* ..O....P */ - /* 0BE8 */ 0x9F, 0xE7, 0x19, 0x38, 0xF6, 0xD4, 0xEB, 0x7B, /* ...8...{ */ - /* 0BF0 */ 0x87, 0xE7, 0xEB, 0x43, 0x05, 0xFE, 0xA6, 0xE7, /* ...C.... */ - /* 0BF8 */ 0x43, 0x05, 0x38, 0x0E, 0x0F, 0xFC, 0xB0, 0xC2, /* C.8..... */ - /* 0C00 */ 0x86, 0xF0, 0x28, 0x80, 0x3F, 0xB5, 0xF8, 0xF8, /* ..(.?... */ - /* 0C08 */ 0x17, 0xE7, 0x29, 0x82, 0xDD, 0x46, 0xB0, 0x87, /* ..)..F.. */ - /* 0C10 */ 0x0B, 0xC0, 0x51, 0xB4, 0xB3, 0x18, 0x2A, 0xCC, /* ..Q...*. */ - /* 0C18 */ 0x59, 0x8C, 0xFC, 0xFF, 0xCF, 0x51, 0xA8, 0xB3, /* Y....Q.. */ - /* 0C20 */ 0x18, 0x3D, 0x5C, 0x00, 0x2E, 0x04, 0x1F, 0x0F, /* .=\..... */ - /* 0C28 */ 0x40, 0x73, 0x10, 0x78, 0x5C, 0xF0, 0x85, 0xE0, /* @s.x\... */ - /* 0C30 */ 0x48, 0x0E, 0xE4, 0xE9, 0x00, 0xF0, 0x19, 0x4A, /* H......J */ - /* 0C38 */ 0xC3, 0xA1, 0x09, 0x13, 0x03, 0x06, 0x75, 0x3E, /* ......u> */ - /* 0C40 */ 0xF0, 0x09, 0xC5, 0xC7, 0x0E, 0x7E, 0x36, 0xF0, /* .....~6. */ - /* 0C48 */ 0x8D, 0xDC, 0x43, 0xE5, 0xA7, 0x66, 0x5F, 0xF2, /* ..C..f_. */ - /* 0C50 */ 0x11, 0xE0, 0x02, 0x75, 0xA0, 0x61, 0xA0, 0x46, /* ...u.a.F */ - /* 0C58 */ 0xE4, 0x23, 0xD2, 0xFF, 0xFF, 0xB9, 0x0D, 0x1B, /* .#...... */ - /* 0C60 */ 0x60, 0x68, 0xF4, 0x1C, 0x0E, 0xE3, 0x80, 0xEB, /* `h...... */ - /* 0C68 */ 0x73, 0x38, 0x76, 0x40, 0x3E, 0x87, 0xC3, 0x3F, /* s8v@>..? */ - /* 0C70 */ 0x47, 0xC3, 0x1F, 0x1B, 0x3B, 0xDD, 0xF3, 0x81, /* G...;... */ - /* 0C78 */ 0xC1, 0xBA, 0x7E, 0x63, 0x06, 0x06, 0xB6, 0x6F, /* ..~c...o */ - /* 0C80 */ 0x91, 0x07, 0x06, 0x1C, 0x51, 0xCF, 0xC6, 0x57, /* ....Q..W */ - /* 0C88 */ 0x08, 0x0F, 0x0C, 0x6C, 0x80, 0x1E, 0x18, 0xF0, /* ...l.... */ - /* 0C90 */ 0x89, 0x05, 0x21, 0x27, 0x03, 0x43, 0x9D, 0x32, /* ..!'.C.2 */ - /* 0C98 */ 0x8C, 0x1C, 0xF3, 0x89, 0xC3, 0xC3, 0xF0, 0xA1, /* ........ */ - /* 0CA0 */ 0x22, 0xEA, 0x33, 0xC0, 0x23, 0x1E, 0x1B, 0x1B, /* ".3.#... */ - /* 0CA8 */ 0xFB, 0xFF, 0x8F, 0x0D, 0x2C, 0xC7, 0x16, 0x8F, /* ....,... */ - /* 0CB0 */ 0x0D, 0xFC, 0x47, 0x78, 0xFC, 0xD8, 0xE0, 0x8C, /* ..Gx.... */ - /* 0CB8 */ 0xE5, 0xD1, 0xC4, 0x97, 0x99, 0x23, 0x3B, 0x8D, /* .....#;. */ - /* 0CC0 */ 0x33, 0x7B, 0x0D, 0xF1, 0xD1, 0xEE, 0xF1, 0xDB, /* 3{...... */ - /* 0CC8 */ 0x63, 0x03, 0x97, 0x85, 0xB1, 0x01, 0xA5, 0x90, /* c....... */ - /* 0CD0 */ 0x63, 0x43, 0x1F, 0x52, 0x7C, 0x0A, 0xB0, 0x71, /* cC.R|..q */ - /* 0CD8 */ 0x54, 0x32, 0x0F, 0x1F, 0xAF, 0x7C, 0x62, 0x38, /* T2...|b8 */ - /* 0CE0 */ 0xBA, 0x20, 0x6F, 0xE8, 0xBE, 0x5C, 0xF8, 0x48, /* . o..\.H */ - /* 0CE8 */ 0x63, 0x30, 0x5F, 0x5A, 0x7C, 0x06, 0xE5, 0x43, /* c0_Z|..C */ - /* 0CF0 */ 0x04, 0xD7, 0x57, 0xC5, 0x43, 0x04, 0x3E, 0xA1, /* ..W.C.>. */ - /* 0CF8 */ 0x86, 0x88, 0x1E, 0xCF, 0xFF, 0xFF, 0x11, 0xCC, /* ........ */ - /* 0D00 */ 0x43, 0x64, 0x43, 0x03, 0xAF, 0x87, 0xA1, 0x01, /* CdC..... */ - /* 0D08 */ 0xA5, 0x98, 0xC0, 0x5E, 0x85, 0x87, 0x46, 0x4F, /* ...^..FO */ - /* 0D10 */ 0x3F, 0x3E, 0x04, 0x30, 0x08, 0xDF, 0x06, 0xD8, /* ?>.0.... */ - /* 0D18 */ 0x55, 0xC0, 0x57, 0x21, 0x83, 0x24, 0x18, 0xE7, /* U.W!.$.. */ - /* 0D20 */ 0x64, 0x41, 0x07, 0x07, 0x8E, 0x21, 0x79, 0x70, /* dA...!yp */ - /* 0D28 */ 0xF0, 0x07, 0xE3, 0x21, 0x70, 0x60, 0xCF, 0xE0, /* ...!p`.. */ - /* 0D30 */ 0xB9, 0xE8, 0x31, 0xD8, 0xA7, 0x1D, 0x9F, 0x4A, /* ..1....J */ - /* 0D38 */ 0xC0, 0x77, 0xE6, 0x04, 0xC7, 0xE9, 0x1D, 0x7B, /* .w.....{ */ - /* 0D40 */ 0x29, 0xF0, 0x08, 0x1E, 0xAD, 0x3C, 0x02, 0x7E, /* )....<.~ */ - /* 0D48 */ 0xB4, 0x02, 0x66, 0xFF, 0xFF, 0xA3, 0x15, 0x30, /* ..f....0 */ - /* 0D50 */ 0x09, 0x7A, 0xE6, 0xA4, 0x03, 0x77, 0x34, 0x18, /* .z...w4. */ - /* 0D58 */ 0xD4, 0xD1, 0x0A, 0x5C, 0x11, 0xC0, 0x75, 0xDC, /* ...\..u. */ - /* 0D60 */ 0xF0, 0xD1, 0x02, 0xCE, 0x50, 0x0F, 0xDA, 0x07, /* ....P... */ - /* 0D68 */ 0x65, 0xCF, 0xDA, 0x97, 0x21, 0x76, 0xB4, 0x00, /* e...!v.. */ - /* 0D70 */ 0x97, 0x89, 0x43, 0x08, 0xD0, 0x04, 0x3E, 0x89, /* ..C...>. */ - /* 0D78 */ 0x67, 0xEF, 0x43, 0x03, 0xB3, 0x8A, 0xA1, 0x01, /* g.C..... */ - /* 0D80 */ 0xA5, 0xA3, 0x01, 0xEE, 0x44, 0x81, 0xFD, 0xFF, /* ....D... */ - /* 0D88 */ 0x9F, 0x28, 0x60, 0xDE, 0x30, 0x70, 0x07, 0x0A, /* .(`.0p.. */ - /* 0D90 */ 0xC0, 0xCD, 0xE9, 0xDB, 0xE3, 0xE2, 0xD0, 0x38, /* .......8 */ - /* 0D98 */ 0xC4, 0xE7, 0xA7, 0x73, 0xF6, 0xD1, 0xE8, 0x4C, /* ...s...L */ - /* 0DA0 */ 0x71, 0x67, 0x11, 0x30, 0x9C, 0x7D, 0x11, 0x8F, /* qg.0.}.. */ - /* 0DA8 */ 0x18, 0x03, 0xF9, 0x81, 0x21, 0x59, 0x30, 0x28, /* ....!Y0( */ - /* 0DB0 */ 0x16, 0x0F, 0xC5, 0x07, 0x03, 0x0E, 0xEC, 0x23, /* .......# */ - /* 0DB8 */ 0x02, 0x3B, 0x17, 0xB0, 0x73, 0xAD, 0xE1, 0xF8, /* .;..s... */ - /* 0DC0 */ 0x59, 0xC0, 0xA7, 0x84, 0xB7, 0xA6, 0x17, 0x7B, /* Y......{ */ - /* 0DC8 */ 0x9F, 0xD7, 0x7D, 0xD6, 0x08, 0xC9, 0xCE, 0xF4, /* ..}..... */ - /* 0DD0 */ 0x3E, 0x89, 0xE2, 0x0E, 0xA2, 0x70, 0x4E, 0x9F, /* >....pN. */ - /* 0DD8 */ 0xE0, 0x22, 0xF0, 0x65, 0xDF, 0xA3, 0xE0, 0xA7, /* .".e.... */ - /* 0DE0 */ 0x07, 0xCF, 0xF1, 0x8D, 0xC1, 0xA7, 0x07, 0xE6, /* ........ */ - /* 0DE8 */ 0x7E, 0xF8, 0x9A, 0xF1, 0x33, 0xC3, 0xE3, 0x43, /* ~...3..C */ - /* 0DF0 */ 0x88, 0x27, 0xE2, 0xDA, 0xA6, 0x20, 0x5B, 0x18, /* .'... [. */ - /* 0DF8 */ 0x42, 0x09, 0xF4, 0xFF, 0x8F, 0x10, 0xE5, 0x6D, /* B......m */ - /* 0E00 */ 0x20, 0xCA, 0x29, 0x44, 0x88, 0x12, 0xA4, 0xB1, /* .)D.... */ - /* 0E08 */ 0xC9, 0x0B, 0x35, 0xCA, 0xD9, 0x45, 0x6E, 0x6D, /* ..5..Enm */ - /* 0E10 */ 0xF6, 0x82, 0x0B, 0x14, 0x2A, 0x66, 0x9C, 0x28, /* ....*f.( */ - /* 0E18 */ 0xEF, 0x10, 0xB1, 0xDA, 0x1F, 0x04, 0x91, 0xF4, /* ........ */ - /* 0E20 */ 0x32, 0xD0, 0x71, 0xC9, 0x91, 0x0E, 0x7D, 0xE8, /* 2.q...}. */ - /* 0E28 */ 0x61, 0xFB, 0x04, 0x8C, 0x3F, 0x48, 0xE2, 0xAE, /* a...?H.. */ - /* 0E30 */ 0x2A, 0x3E, 0x28, 0xF8, 0x00, 0x80, 0x77, 0x09, /* *>(...w. */ - /* 0E38 */ 0xA8, 0x5B, 0x9D, 0xC7, 0xED, 0xF3, 0x06, 0xF8, /* .[...... */ - /* 0E40 */ 0xAF, 0x17, 0x58, 0x82, 0xF2, 0x07, 0x81, 0x1A, /* ..X..... */ - /* 0E48 */ 0x99, 0xA1, 0x3D, 0xCC, 0xB7, 0x19, 0x43, 0xBE, /* ..=...C. */ - /* 0E50 */ 0x07, 0x1C, 0x16, 0x3B, 0x27, 0xF9, 0xF0, 0x08, /* ...;'... */ - /* 0E58 */ 0x1C, 0x8E, 0x01, 0x4F, 0x1B, 0xBE, 0x51, 0x7B, /* ...O..Q{ */ - /* 0E60 */ 0xBE, 0x3E, 0x62, 0x01, 0x8E, 0xFE, 0xFF, 0x47, /* .>b....G */ - /* 0E68 */ 0x2C, 0x30, 0x9D, 0xDF, 0x7D, 0x82, 0x01, 0xC7, /* ,0..}... */ - /* 0E70 */ 0xCD, 0x82, 0x9F, 0x61, 0x00, 0x67, 0x40, 0xCF, /* ...a.g@. */ - /* 0E78 */ 0x30, 0x60, 0x1F, 0x2A, 0x6E, 0x08, 0x5C, 0xEE, /* 0`.*n.\. */ - /* 0E80 */ 0x8A, 0x28, 0x90, 0x05, 0xC2, 0xA0, 0x0E, 0xFD, /* .(...... */ - /* 0E88 */ 0xE4, 0x08, 0x42, 0xCF, 0x9C, 0x70, 0x86, 0x72, /* ..B..p.r */ - /* 0E90 */ 0xB2, 0xBD, 0x5F, 0x1D, 0xC8, 0x2D, 0xC2, 0x43, /* .._..-.C */ - /* 0E98 */ 0x3D, 0x8B, 0xC7, 0x04, 0x76, 0xDA, 0x02, 0x36, /* =...v..6 */ - /* 0EA0 */ 0xFF, 0xFF, 0xE3, 0x29, 0xB0, 0x98, 0xF7, 0xD3, /* ...).... */ - /* 0EA8 */ 0x69, 0x84, 0x63, 0x03, 0xFB, 0x71, 0x0B, 0x38, /* i.c..q.8 */ - /* 0EB0 */ 0x1D, 0xCC, 0xE0, 0xDC, 0x7F, 0xD8, 0x2D, 0x1A, /* ......-. */ - /* 0EB8 */ 0x37, 0x34, 0xB0, 0x0D, 0xCC, 0x43, 0x03, 0x3E, /* 74...C.> */ - /* 0EC0 */ 0x27, 0x47, 0x30, 0x9E, 0x98, 0xF8, 0x55, 0xE2, /* 'G0...U. */ - /* 0EC8 */ 0xE1, 0x89, 0x1F, 0x43, 0xC0, 0xFA, 0xFF, 0x3F, /* ...C...? */ - /* 0ED0 */ 0x99, 0x01, 0xF6, 0x84, 0x1E, 0xCB, 0x50, 0xD2, /* ......P. */ - /* 0ED8 */ 0x4E, 0x66, 0x80, 0xC0, 0xFB, 0xD8, 0x3B, 0xC3, /* Nf....;. */ - /* 0EE0 */ 0x4B, 0x83, 0xE7, 0x74, 0xD2, 0xCF, 0x62, 0x3E, /* K..t..b> */ - /* 0EE8 */ 0x99, 0x19, 0x21, 0x0A, 0xBB, 0x8F, 0x19, 0xAD, /* ..!..... */ - /* 0EF0 */ 0x37, 0x14, 0xCD, 0x3C, 0xE8, 0x3B, 0x99, 0x51, /* 7..<.;.Q */ - /* 0EF8 */ 0x62, 0x46, 0x6A, 0x0E, 0x4C, 0x48, 0x11, 0x0F, /* bFj.LH.. */ - /* 0F00 */ 0x27, 0x4A, 0x88, 0x60, 0xAF, 0x13, 0x6F, 0x67, /* 'J.`..og */ - /* 0F08 */ 0x4F, 0x66, 0x4C, 0xD6, 0xC9, 0x0C, 0x24, 0xFF, /* OfL...$. */ - /* 0F10 */ 0xFF, 0x93, 0x19, 0x98, 0x5C, 0x9F, 0xCC, 0x80, /* ....\... */ - /* 0F18 */ 0xCA, 0x39, 0x0A, 0x7F, 0x32, 0x03, 0x78, 0x74, /* .9..2.xt */ - /* 0F20 */ 0xC0, 0xC2, 0x9D, 0xCC, 0xC0, 0xF2, 0xFF, 0x3F, /* .......? */ - /* 0F28 */ 0xC4, 0x00, 0xCE, 0xC7, 0x0A, 0x63, 0x0C, 0x3C, /* .....c.< */ - /* 0F30 */ 0xDA, 0xC1, 0x0C, 0x15, 0xE6, 0x6C, 0x86, 0x0E, /* .....l.. */ - /* 0F38 */ 0x72, 0x08, 0xA1, 0xC1, 0x0E, 0x21, 0x50, 0xE6, /* r....!P. */ - /* 0F40 */ 0x72, 0xA0, 0xA7, 0xF0, 0x9A, 0xE0, 0x73, 0x14, /* r.....s. */ - /* 0F48 */ 0xD8, 0x0F, 0x67, 0xC0, 0xE1, 0xD4, 0x80, 0x0F, /* ..g..... */ - /* 0F50 */ 0x74, 0xE2, 0x42, 0x8F, 0xC2, 0x23, 0x0E, 0x58, /* t.B..#.X */ - /* 0F58 */ 0xFD, 0xC0, 0xC8, 0xFF, 0xFF, 0x64, 0x06, 0x18, /* .....d.. */ - /* 0F60 */ 0x78, 0x6A, 0xF8, 0x40, 0x82, 0x63, 0x31, 0xEA, /* xj.@.c1. */ - /* 0F68 */ 0x1B, 0xC4, 0x21, 0xBE, 0x8D, 0xF8, 0xE8, 0xFE, /* ..!..... */ - /* 0F70 */ 0x6A, 0xE2, 0x4B, 0x00, 0xE6, 0x42, 0xE2, 0xD3, /* j.K..B.. */ - /* 0F78 */ 0x09, 0xB3, 0x70, 0x38, 0x03, 0x5A, 0x43, 0x60, /* ..p8.ZC` */ - /* 0F80 */ 0x57, 0x26, 0xCF, 0x9C, 0x0F, 0xE1, 0x6C, 0x3C, /* W&....l< */ - /* 0F88 */ 0x7A, 0xDC, 0xE9, 0x04, 0xDE, 0x38, 0x7C, 0x3A, /* z....8|: */ - /* 0F90 */ 0x01, 0x5E, 0x07, 0x0C, 0xCC, 0x0C, 0xC2, 0x3F, /* .^.....? */ - /* 0F98 */ 0x84, 0xB0, 0x21, 0x9C, 0xAA, 0xC7, 0x70, 0xEE, /* ..!...p. */ - /* 0FA0 */ 0xAF, 0x38, 0x3E, 0x9D, 0x80, 0xF3, 0xFF, 0x7F, /* .8>..... */ - /* 0FA8 */ 0x62, 0x03, 0x0C, 0x0A, 0x7E, 0x32, 0xF8, 0xB8, /* b...~2.. */ - /* 0FB0 */ 0x46, 0x25, 0xC2, 0xA0, 0x8E, 0xE6, 0x80, 0x7B, /* F%.....{ */ - /* 0FB8 */ 0x98, 0x27, 0x36, 0x26, 0x6F, 0xC5, 0x1A, 0x8B, /* .'6&o... */ - /* 0FC0 */ 0x4F, 0x6C, 0x30, 0xFF, 0xFF, 0x27, 0x36, 0x80, /* Ol0..'6. */ - /* 0FC8 */ 0xD1, 0x87, 0x20, 0xB0, 0xFD, 0xFF, 0x0F, 0x41, /* .. ....A */ - /* 0FD0 */ 0x60, 0x1C, 0xA0, 0x0F, 0x41, 0x80, 0x9B, 0xD3, /* `...A... */ - /* 0FD8 */ 0x09, 0xEE, 0xC4, 0x07, 0xB6, 0x63, 0x10, 0x60, /* .....c.` */ - /* 0FE0 */ 0x6D, 0xE8, 0x3E, 0x06, 0x81, 0xF9, 0xFF, 0x3F, /* m.>....? */ - /* 0FE8 */ 0x5A, 0x98, 0xA3, 0xE0, 0xC2, 0x8E, 0x7C, 0x28, /* Z.....|( */ - /* 0FF0 */ 0x29, 0xA7, 0x3E, 0xB4, 0x0C, 0x20, 0x69, 0x38, /* ).>.. i8 */ - /* 0FF8 */ 0xC9, 0x01, 0x9D, 0xD3, 0x3D, 0x70, 0x92, 0x75, /* ....=p.u */ - /* 1000 */ 0xEA, 0x40, 0x8F, 0xC7, 0xA0, 0xAF, 0x1C, 0xBE, /* .@...... */ - /* 1008 */ 0x12, 0xF0, 0x23, 0x07, 0x93, 0x00, 0xAA, 0x41, /* ..#....A */ - /* 1010 */ 0xFA, 0xCC, 0x07, 0x9C, 0x8E, 0x1C, 0xE0, 0x38, /* .......8 */ - /* 1018 */ 0x26, 0x05, 0xC6, 0xDE, 0x0E, 0xDE, 0x22, 0x3D, /* &....."= */ - /* 1020 */ 0x89, 0xA7, 0xA1, 0xE3, 0x0C, 0x51, 0x38, 0x26, /* .....Q8& */ - /* 1028 */ 0x39, 0x18, 0x44, 0x7A, 0x95, 0x62, 0x03, 0x7C, /* 9.Dz.b.| */ - /* 1030 */ 0xAB, 0xF1, 0xD9, 0xC8, 0x07, 0x10, 0x78, 0xE3, /* ......x. */ - /* 1038 */ 0xF6, 0xD8, 0x61, 0xFF, 0xFF, 0x0F, 0x75, 0xC0, /* ..a...u. */ - /* 1040 */ 0x01, 0xE2, 0xA4, 0xF8, 0x21, 0xC3, 0x98, 0x67, /* ....!..g */ - /* 1048 */ 0xC5, 0x0F, 0x75, 0x80, 0xF5, 0x18, 0x27, 0x3A, /* ..u...': */ - /* 1050 */ 0x94, 0xF0, 0x43, 0x1D, 0x20, 0xE8, 0xFF, 0x7F, /* ..C. ... */ - /* 1058 */ 0xA8, 0x03, 0x86, 0x38, 0x6F, 0x24, 0xD1, 0x1E, /* ...8o$.. */ - /* 1060 */ 0xEA, 0x98, 0xE8, 0x43, 0x1D, 0x40, 0xC8, 0xFF, /* ...C.@.. */ - /* 1068 */ 0xFF, 0xA1, 0x0E, 0x18, 0x9E, 0x87, 0x00, 0xAE, /* ........ */ - /* 1070 */ 0x9C, 0xEF, 0xC0, 0x7C, 0x22, 0x02, 0xEF, 0xFF, /* ...|"... */ - /* 1078 */ 0xFF, 0x7C, 0x07, 0xB8, 0x1B, 0x2D, 0xCC, 0x51, /* .|...-.Q */ - /* 1080 */ 0x70, 0x41, 0xAF, 0x0E, 0x03, 0x51, 0x09, 0x30, /* pA...Q.0 */ - /* 1088 */ 0x28, 0x02, 0xC7, 0x5F, 0x9B, 0x60, 0x1C, 0xEA, /* (.._.`.. */ - /* 1090 */ 0x7C, 0x87, 0x3E, 0x2F, 0x78, 0xD8, 0x4F, 0x05, /* |.>/x.O. */ - /* 1098 */ 0x9E, 0xC4, 0xA9, 0xFA, 0x5A, 0x70, 0x14, 0x4F, /* ....Zp.O */ - /* 10A0 */ 0x00, 0x3E, 0xE1, 0x01, 0xFF, 0xA1, 0xC1, 0x9A, /* .>...... */ - /* 10A8 */ 0x44, 0xF1, 0x43, 0x03, 0xF5, 0x11, 0xE4, 0xFF, /* D.C..... */ - /* 10B0 */ 0x7F, 0x68, 0xC0, 0x28, 0xEA, 0xF9, 0x06, 0x7D, /* .h.(...} */ - /* 10B8 */ 0xCC, 0xF2, 0xD9, 0x20, 0xE6, 0x0B, 0x48, 0x84, /* ... ..H. */ - /* 10C0 */ 0x07, 0x10, 0x5F, 0x1F, 0xD8, 0x71, 0xD2, 0x67, /* .._..q.g */ - /* 10C8 */ 0xA0, 0x40, 0x51, 0xDE, 0x37, 0xF8, 0x09, 0x07, /* .@Q.7... */ - /* 10D0 */ 0x5C, 0x83, 0xF3, 0x09, 0x07, 0xBC, 0x87, 0x23, /* \......# */ - /* 10D8 */ 0x1F, 0x4B, 0xC0, 0x77, 0xD0, 0x84, 0x73, 0x81, /* .K.w..s. */ - /* 10E0 */ 0xF1, 0x8D, 0x8D, 0x9D, 0x06, 0xC0, 0x76, 0x00, /* ......v. */ - /* 10E8 */ 0x06, 0xDF, 0x69, 0x00, 0x1C, 0xC7, 0x24, 0x7E, /* ..i...$~ */ - /* 10F0 */ 0x3A, 0x04, 0x13, 0xCC, 0xC1, 0xBC, 0x34, 0xFB, /* :.....4. */ - /* 10F8 */ 0xFF, 0xEF, 0xFD, 0x94, 0x43, 0xCF, 0x86, 0x80, /* ....C... */ - /* 1100 */ 0x75, 0x49, 0x07, 0x43, 0x94, 0x88, 0xB3, 0x21, /* uI.C...! */ - /* 1108 */ 0x20, 0xFD, 0xFF, 0x7F, 0x36, 0xC4, 0x20, 0xC4, /* ...6. . */ - /* 1110 */ 0x09, 0xFC, 0x12, 0xD1, 0xDC, 0xD9, 0x90, 0xAE, /* ........ */ - /* 1118 */ 0xD8, 0x67, 0x43, 0x80, 0xE1, 0xFF, 0xFF, 0x23, /* .gC....# */ - /* 1120 */ 0x00, 0xF6, 0x7C, 0x04, 0x38, 0x3D, 0x64, 0x83, /* ..|.8=d. */ - /* 1128 */ 0xE7, 0x14, 0x08, 0xE3, 0xE4, 0x03, 0x38, 0xFE, /* ......8. */ - /* 1130 */ 0xFF, 0x8F, 0x15, 0xE6, 0x18, 0x78, 0xEA, 0x97, /* .....x.. */ - /* 1138 */ 0x9B, 0x8F, 0x03, 0x54, 0xD4, 0x2B, 0xC2, 0x30, /* ...T.+.0 */ - /* 1140 */ 0x94, 0xC5, 0x87, 0x05, 0x1F, 0x11, 0xF8, 0x61, /* .......a */ - /* 1148 */ 0xC1, 0x23, 0xA8, 0x78, 0x9C, 0xF4, 0x74, 0xE3, /* .#.x..t. */ - /* 1150 */ 0x33, 0x21, 0x3B, 0x24, 0x38, 0xFC, 0x20, 0xE9, /* 3!;$8. . */ - /* 1158 */ 0x41, 0x13, 0x3C, 0xE7, 0x23, 0x78, 0xB7, 0x1E, /* A.<.#x.. */ - /* 1160 */ 0x38, 0xA7, 0x02, 0xC0, 0x4D, 0xAE, 0x27, 0xA3, /* 8...M.'. */ - /* 1168 */ 0x4E, 0x17, 0x0E, 0x70, 0x8E, 0x92, 0x8D, 0x63, /* N..p...c */ - /* 1170 */ 0x08, 0xE5, 0x70, 0xCC, 0xB7, 0x87, 0xA6, 0xC9, /* ..p..... */ - /* 1178 */ 0x4E, 0x56, 0x30, 0x63, 0x41, 0xEA, 0x24, 0xE0, /* NV0cA.$. */ - /* 1180 */ 0x01, 0x38, 0x10, 0x8C, 0xB4, 0x93, 0x68, 0x34, /* .8....h4 */ - /* 1188 */ 0x86, 0xB3, 0x5A, 0x18, 0xC1, 0x19, 0xC4, 0xC7, /* ..Z..... */ - /* 1190 */ 0x11, 0xE7, 0x3A, 0x19, 0xA1, 0x3F, 0x07, 0x3E, /* ..:..?.> */ - /* 1198 */ 0x15, 0x61, 0x82, 0xDC, 0x4B, 0xE8, 0xBC, 0x7D, /* .a..K..} */ - /* 11A0 */ 0x37, 0xE0, 0x57, 0x61, 0x8F, 0xC5, 0xFF, 0x7F, /* 7.Wa.... */ - /* 11A8 */ 0x60, 0xDF, 0x4E, 0xC0, 0x31, 0x17, 0xAB, 0x01, /* `.N.1... */ - /* 11B0 */ 0x45, 0x0D, 0xC0, 0x68, 0x98, 0x53, 0xC0, 0x53, /* E..h.S.S */ - /* 11B8 */ 0x09, 0xB8, 0x82, 0xCD, 0x0D, 0x7D, 0x61, 0xB1, /* .....}a. */ - /* 11C0 */ 0xD6, 0xA9, 0xE8, 0x14, 0xF4, 0x3E, 0x70, 0x70, /* .....>pp */ - /* 11C8 */ 0xC0, 0x63, 0xF6, 0x1E, 0x1C, 0x2C, 0x34, 0x0F, /* .c...,4. */ - /* 11D0 */ 0x0E, 0x6C, 0xD9, 0x06, 0x87, 0x56, 0x72, 0x17, /* .l...Vr. */ - /* 11D8 */ 0x21, 0x87, 0x0F, 0xFC, 0xEC, 0x80, 0x03, 0xA0, /* !....... */ - /* 11E0 */ 0x67, 0x07, 0x0B, 0xC9, 0xB3, 0x03, 0x9B, 0xBE, /* g....... */ - /* 11E8 */ 0xB3, 0x08, 0x28, 0x70, 0xFE, 0xFF, 0x11, 0xDE, /* ..(p.... */ - /* 11F0 */ 0x3B, 0x7C, 0x6E, 0x79, 0xF6, 0x60, 0x63, 0x78, /* ;|ny.`cx */ - /* 11F8 */ 0x74, 0x31, 0x9A, 0xD1, 0xB9, 0xA6, 0xDB, 0x04, /* t1...... */ - /* 1200 */ 0x4A, 0xC5, 0x6D, 0x82, 0x82, 0xF8, 0x06, 0xE0, /* J.m..... */ - /* 1208 */ 0x84, 0x34, 0xBA, 0x75, 0xE2, 0x66, 0x62, 0xFC, /* .4.u.fb. */ - /* 1210 */ 0x47, 0x0C, 0x1F, 0x11, 0x0E, 0xE9, 0x6C, 0x4D, /* G.....lM */ - /* 1218 */ 0x30, 0x0F, 0xA4, 0x9E, 0x81, 0xBE, 0xB3, 0xE1, /* 0....... */ - /* 1220 */ 0x67, 0x1F, 0xF2, 0xC1, 0xC5, 0xD3, 0xF0, 0xF5, /* g....... */ - /* 1228 */ 0x86, 0xDC, 0x3B, 0xE8, 0xB4, 0x7D, 0x66, 0xC0, /* ..;..}f. */ - /* 1230 */ 0x1C, 0x74, 0x7D, 0x9D, 0x7A, 0x83, 0x27, 0x57, /* .t}.z.'W */ - /* 1238 */ 0x09, 0xEA, 0xE1, 0x02, 0x42, 0x2F, 0x34, 0xBE, /* ....B/4. */ - /* 1240 */ 0xDC, 0x25, 0x78, 0xE0, 0xF4, 0xE9, 0xEE, 0xBD, /* .%x..... */ - /* 1248 */ 0x84, 0x9D, 0xF1, 0x12, 0xBC, 0xE0, 0x25, 0x98, /* ......%. */ - /* 1250 */ 0x77, 0x10, 0xA8, 0x51, 0x79, 0x10, 0x98, 0xAB, /* w..Qy... */ - /* 1258 */ 0x3C, 0xCB, 0x37, 0x06, 0x54, 0xB2, 0x8B, 0x16, /* <.7.T... */ - /* 1260 */ 0x3D, 0xC3, 0xBC, 0xC3, 0xF8, 0x92, 0xE0, 0xEB, /* =....... */ - /* 1268 */ 0x87, 0xCF, 0x2D, 0x5E, 0xC0, 0xEB, 0x16, 0x0C, /* ..-^.... */ - /* 1270 */ 0x82, 0x67, 0xA0, 0x57, 0x17, 0xDF, 0xD9, 0x0D, /* .g.W.... */ - /* 1278 */ 0xFC, 0x2A, 0xF0, 0x46, 0x13, 0x22, 0x98, 0x61, /* .*.F.".a */ - /* 1280 */ 0x0F, 0xFF, 0xDD, 0xDD, 0xA8, 0xBE, 0xE9, 0x18, /* ........ */ - /* 1288 */ 0xEB, 0x75, 0xC4, 0x23, 0xE5, 0xC7, 0x96, 0x03, /* .u.#.... */ - /* 1290 */ 0x8A, 0xF4, 0xF2, 0xE6, 0x09, 0xF8, 0x2C, 0xE3, /* ......,. */ - /* 1298 */ 0x53, 0xDD, 0x49, 0xF9, 0x7A, 0x68, 0xF4, 0x57, /* S.I.zh.W */ - /* 12A0 */ 0x08, 0x1F, 0x7E, 0x8C, 0xEC, 0x73, 0x0E, 0x3B, /* ..~..s.; */ - /* 12A8 */ 0xDF, 0xB1, 0x41, 0x71, 0xC4, 0x07, 0x86, 0x97, /* ..Aq.... */ - /* 12B0 */ 0x1A, 0x4F, 0x85, 0x9D, 0xBB, 0x60, 0x1C, 0x1C, /* .O...`.. */ - /* 12B8 */ 0xD8, 0xB1, 0x08, 0x73, 0x7C, 0x05, 0xD7, 0xC9, /* ...s|... */ - /* 12C0 */ 0xE6, 0xFF, 0xFF, 0xE4, 0x00, 0x6E, 0x78, 0xCC, /* .....nx. */ - /* 12C8 */ 0xC1, 0xD7, 0xE7, 0x0D, 0xDF, 0x0C, 0x3C, 0x2E, /* ......<. */ - /* 12D0 */ 0x7E, 0xE4, 0xF0, 0x49, 0xE3, 0xA5, 0xD3, 0xD8, /* ~..I.... */ - /* 12D8 */ 0xA7, 0xE9, 0xA3, 0xD1, 0xCB, 0x9B, 0x4F, 0x2F, /* ......O/ */ - /* 12E0 */ 0x18, 0x58, 0x5F, 0x1A, 0x38, 0xAC, 0xD1, 0xC2, /* .X_.8... */ - /* 12E8 */ 0x3E, 0x06, 0x9C, 0xB9, 0x2F, 0x44, 0xB8, 0xC3, /* >.../D.. */ - /* 12F0 */ 0x23, 0x58, 0x00, 0xF1, 0xB7, 0x92, 0x47, 0x0E, /* #X....G. */ - /* 12F8 */ 0x4F, 0xC0, 0x80, 0x4C, 0xD3, 0xBA, 0x74, 0x20, /* O..L..t */ - /* 1300 */ 0xE2, 0xA7, 0x3C, 0x2B, 0x5F, 0x99, 0x2E, 0x43, /* ..<+_..C */ - /* 1308 */ 0x0C, 0xE3, 0xA9, 0xF2, 0xF1, 0xC3, 0xB3, 0xF1, /* ........ */ - /* 1310 */ 0x51, 0xC0, 0xC7, 0x28, 0xCF, 0xFC, 0x8C, 0x22, /* Q..(..." */ - /* 1318 */ 0xBD, 0x32, 0x10, 0x50, 0x9D, 0x88, 0xB8, 0x42, /* .2.P...B */ - /* 1320 */ 0x18, 0x89, 0xA1, 0xD1, 0x9D, 0x83, 0xC7, 0x1F, /* ........ */ - /* 1328 */ 0x22, 0x05, 0x31, 0xA0, 0x6F, 0x2E, 0xC0, 0xF4, /* ".1.o... */ - /* 1330 */ 0x4C, 0x04, 0x5C, 0xFE, 0xFF, 0x37, 0x17, 0x80, /* L.\..7.. */ - /* 1338 */ 0xFF, 0xFF, 0xFF, 0x9B, 0x0B, 0xE0, 0xE6, 0xFE, /* ........ */ - /* 1340 */ 0xE0, 0x9B, 0x0B, 0x70, 0x8D, 0xB4, 0x2A, 0x7A, /* ...p..*z */ - /* 1348 */ 0x61, 0x77, 0x08, 0x18, 0xD4, 0x9D, 0x1D, 0x70, /* aw.....p */ - /* 1350 */ 0x78, 0x2B, 0x78, 0x67, 0x87, 0xF5, 0xFF, 0xBF, /* x+xg.... */ - /* 1358 */ 0xB3, 0xC3, 0xC3, 0x8C, 0x13, 0xE5, 0x85, 0x21, /* .......! */ - /* 1360 */ 0xC6, 0x3B, 0x3B, 0x0B, 0xF0, 0x26, 0xD0, 0x51, /* .;;..&.Q */ - /* 1368 */ 0xC6, 0x77, 0x76, 0x80, 0x1F, 0x67, 0xD8, 0x77, /* .wv..g.w */ - /* 1370 */ 0x69, 0xF0, 0x5E, 0x75, 0x81, 0xF5, 0xFF, 0xFF, /* i.^u.... */ - /* 1378 */ 0xAA, 0x0B, 0x3C, 0x04, 0xDF, 0xA7, 0x41, 0x3E, /* ..<...A> */ - /* 1380 */ 0x5E, 0x30, 0x8C, 0x83, 0x2B, 0x27, 0xA1, 0xC7, /* ^0..+'.. */ - /* 1388 */ 0x02, 0x6B, 0x85, 0x41, 0xDD, 0xA9, 0xC1, 0xA5, /* .k.A.... */ - /* 1390 */ 0x09, 0x5C, 0x17, 0x5F, 0x1F, 0x6A, 0x7C, 0xA4, /* .\._.j|. */ - /* 1398 */ 0xC5, 0x9F, 0x2F, 0x70, 0x01, 0x86, 0x4C, 0x4F, /* ../p..LO */ - /* 13A0 */ 0x65, 0x30, 0xAE, 0x29, 0x3E, 0x95, 0x61, 0xEE, /* e0.)>.a. */ - /* 13A8 */ 0x0E, 0x1E, 0x90, 0x8F, 0x18, 0xC0, 0x67, 0x15, /* ......g. */ - /* 13B0 */ 0x1E, 0x18, 0xEE, 0xB4, 0xE0, 0x9B, 0x92, 0x41, /* .......A */ - /* 13B8 */ 0xCF, 0x31, 0xA8, 0x8F, 0x3C, 0x27, 0xEF, 0x7B, /* .1..<'.{ */ - /* 13C0 */ 0xC2, 0xE3, 0x84, 0xA3, 0x9E, 0x83, 0xE8, 0xD8, /* ........ */ - /* 13C8 */ 0xC0, 0x71, 0xDC, 0xC0, 0xFD, 0xFF, 0xC7, 0x06, /* .q...... */ - /* 13D0 */ 0xEF, 0x70, 0x83, 0x3B, 0xE8, 0xF8, 0x62, 0x70, /* .p.;..bp */ - /* 13D8 */ 0x5C, 0x18, 0xB8, 0xE7, 0x02, 0x0F, 0xC3, 0x37, /* \......7 */ - /* 13E0 */ 0x1D, 0x8F, 0x08, 0x33, 0xFE, 0xD7, 0x3F, 0x23, /* ...3..?# */ - /* 13E8 */ 0x04, 0xC4, 0x5F, 0x8C, 0xD8, 0x80, 0xC1, 0x78, /* .._....x */ - /* 13F0 */ 0x6B, 0xF3, 0xF5, 0x0D, 0x37, 0x60, 0x5F, 0x1D, /* k...7`_. */ - /* 13F8 */ 0x7C, 0xC1, 0xF0, 0x09, 0xCC, 0xE8, 0x2F, 0x30, /* |...../0 */ - /* 1400 */ 0x4F, 0x62, 0x3E, 0x36, 0x90, 0x0B, 0x1C, 0x1D, /* Ob>6.... */ - /* 1408 */ 0x30, 0x38, 0x00, 0x3D, 0x60, 0xF8, 0x87, 0x8B, /* 08.=`... */ - /* 1410 */ 0x77, 0x39, 0x30, 0x5C, 0x05, 0x7D, 0x5C, 0xF0, /* w90\.}\. */ - /* 1418 */ 0xB1, 0xC7, 0x8A, 0xEE, 0x72, 0xE8, 0x9B, 0x9C, /* ....r... */ - /* 1420 */ 0x61, 0xE2, 0x18, 0xE2, 0x0D, 0x8C, 0xDD, 0x25, /* a......% */ - /* 1428 */ 0xC8, 0x61, 0x0E, 0xEA, 0x5D, 0xC2, 0x73, 0xE0, /* .a..].s. */ - /* 1430 */ 0x67, 0x0B, 0x9F, 0xE0, 0x7C, 0xF3, 0x09, 0x71, /* g...|..q */ - /* 1438 */ 0xAA, 0x8F, 0x56, 0xEF, 0x01, 0x3E, 0x7A, 0xBC, /* ..V..>z. */ - /* 1440 */ 0x77, 0xF9, 0xEC, 0xC4, 0x2E, 0x02, 0x3E, 0x72, /* w.....>r */ - /* 1448 */ 0x19, 0xC7, 0xD3, 0xF4, 0x15, 0xD0, 0x43, 0x36, /* ......C6 */ - /* 1450 */ 0xD8, 0xAB, 0x86, 0x4F, 0x60, 0x3E, 0xBA, 0xE1, /* ...O`>.. */ - /* 1458 */ 0x8E, 0x51, 0x9E, 0x89, 0xA7, 0xEF, 0x3B, 0x08, /* .Q....;. */ - /* 1460 */ 0x3B, 0x92, 0x1C, 0x75, 0xA8, 0x6B, 0x7A, 0x44, /* ;..u.kzD */ - /* 1468 */ 0xF9, 0xFF, 0x9F, 0xD0, 0x81, 0xF8, 0xD6, 0x06, /* ........ */ - /* 1470 */ 0xCE, 0x68, 0xF7, 0x0F, 0xF4, 0x36, 0x3D, 0x32, /* .h...6=2 */ - /* 1478 */ 0xCC, 0xD1, 0x00, 0xD6, 0x25, 0x04, 0x5C, 0x77, /* ....%.\w */ - /* 1480 */ 0x0C, 0x5F, 0x42, 0x80, 0x4F, 0xD0, 0x4B, 0x04, /* ._B.O.K. */ - /* 1488 */ 0xFA, 0x9A, 0xE1, 0xD1, 0x3D, 0x02, 0x60, 0xAE, /* ....=.`. */ - /* 1490 */ 0x18, 0xEC, 0x58, 0xE0, 0xC3, 0x86, 0xAF, 0x01, /* ..X..... */ - /* 1498 */ 0xEC, 0x5E, 0xE0, 0x30, 0xF7, 0x08, 0x50, 0x81, /* .^.0..P. */ - /* 14A0 */ 0x7A, 0x78, 0xF0, 0xD5, 0xDE, 0x23, 0x40, 0x71, /* zx...#@q */ - /* 14A8 */ 0xB2, 0xF4, 0xA1, 0xC1, 0x03, 0xB5, 0xAA, 0x33, /* .......3 */ - /* 14B0 */ 0x26, 0x94, 0x23, 0x26, 0x3F, 0x9B, 0xF9, 0x26, /* &.#&?..& */ - /* 14B8 */ 0x81, 0xB9, 0x5D, 0xFA, 0x26, 0x01, 0x37, 0xCF, /* ..].&.7. */ - /* 14C0 */ 0x2C, 0x50, 0x49, 0x20, 0xF4, 0xFF, 0xBF, 0x49, /* ,PI ...I */ - /* 14C8 */ 0xC0, 0x85, 0xE9, 0xF2, 0x32, 0x43, 0xE7, 0x7F, /* ....2C.. */ - /* 14D0 */ 0xE0, 0xBE, 0xD5, 0x79, 0x84, 0x3E, 0x44, 0x30, /* ...y.>D0 */ - /* 14D8 */ 0x94, 0xF7, 0x3C, 0x9F, 0xC2, 0xF8, 0x19, 0xC2, /* ..<..... */ - /* 14E0 */ 0x07, 0x4C, 0x76, 0xA6, 0xE0, 0x67, 0x4D, 0xDC, /* .Lv..gM. */ - /* 14E8 */ 0x1D, 0xC0, 0x28, 0x6F, 0x9E, 0x9E, 0x00, 0x3B, /* ..(o...; */ - /* 14F0 */ 0x7F, 0x1A, 0xF9, 0xDD, 0xE0, 0x5D, 0xC0, 0xD3, /* .....].. */ - /* 14F8 */ 0xF7, 0xBD, 0x88, 0x9F, 0x28, 0xC0, 0x17, 0xEC, /* ....(... */ - /* 1500 */ 0x4E, 0x07, 0x05, 0xFA, 0x84, 0x3C, 0x22, 0xA3, /* N....<". */ - /* 1508 */ 0xFA, 0x88, 0xC0, 0x2F, 0x49, 0x60, 0x3C, 0x92, /* .../I`<. */ - /* 1510 */ 0xF8, 0x40, 0x01, 0x84, 0xEE, 0x05, 0xA8, 0xD3, /* .@...... */ - /* 1518 */ 0x07, 0x47, 0x3D, 0xE3, 0x17, 0x54, 0x63, 0xBE, /* .G=..Tc. */ - /* 1520 */ 0x5B, 0x3D, 0xC2, 0x79, 0x72, 0x98, 0xCB, 0x01, /* [=.yr... */ - /* 1528 */ 0x8B, 0x73, 0x4D, 0x02, 0xD5, 0x71, 0x97, 0x8F, /* .sM..q.. */ - /* 1530 */ 0x0E, 0xEE, 0xB5, 0x15, 0xFB, 0xFF, 0x27, 0x38, /* ......'8 */ - /* 1538 */ 0xB8, 0x77, 0x96, 0x77, 0x3E, 0x43, 0x79, 0x90, /* .w.w>Cy. */ - /* 1540 */ 0xE0, 0xBB, 0xB6, 0x82, 0xE3, 0xAA, 0x06, 0xE3, /* ........ */ - /* 1548 */ 0xD8, 0xC2, 0x2F, 0x79, 0x80, 0x9D, 0x61, 0x71, /* ../y..aq */ - /* 1550 */ 0xC1, 0x7F, 0x0F, 0x03, 0x51, 0x89, 0x30, 0x28, /* ....Q.0( */ - /* 1558 */ 0x02, 0xCB, 0xBB, 0xB7, 0x52, 0xF8, 0x43, 0x06, /* ....R.C. */ - /* 1560 */ 0xE3, 0x4D, 0x81, 0x4F, 0x1A, 0x3B, 0x6A, 0xE0, /* .M.O.;j. */ - /* 1568 */ 0xFB, 0xFF, 0x1F, 0x35, 0xD8, 0x86, 0x8A, 0xBB, /* ...5.... */ - /* 1570 */ 0x29, 0x82, 0x75, 0xAA, 0x98, 0x21, 0xF0, 0x60, /* ).u..!.` */ - /* 1578 */ 0x0F, 0x00, 0x9F, 0xAF, 0x7C, 0x06, 0x50, 0x14, /* ....|.P. */ - /* 1580 */ 0x18, 0xD4, 0xA1, 0x1D, 0xCE, 0x6D, 0x18, 0x70, /* .....m.p */ - /* 1588 */ 0x30, 0x62, 0xDC, 0xA5, 0x10, 0xEE, 0x94, 0xDF, /* 0b...... */ - /* 1590 */ 0x51, 0x62, 0x3F, 0x97, 0xB3, 0xE9, 0xE2, 0xAE, /* Qb?..... */ - /* 1598 */ 0xE6, 0x3E, 0x9D, 0xB0, 0x0B, 0x32, 0x8C, 0xB3, /* .>...2.. */ - /* 15A0 */ 0xC0, 0x23, 0xC0, 0xAB, 0x39, 0xBF, 0x20, 0x3F, /* .#..9. ? */ - /* 15A8 */ 0x17, 0xBF, 0x10, 0x3C, 0x26, 0x85, 0x78, 0x53, /* ...<&.xS */ - /* 15B0 */ 0x7A, 0x25, 0x36, 0xC6, 0x93, 0x71, 0x73, 0xB7, /* z%6..qs. */ - /* 15B8 */ 0x62, 0x72, 0xDE, 0x79, 0x41, 0x36, 0xC6, 0xD1, /* br.yA6.. */ - /* 15C0 */ 0x44, 0x8C, 0x72, 0x6E, 0x0F, 0x03, 0x91, 0x5F, /* D.rn..._ */ - /* 15C8 */ 0x90, 0x7D, 0x3F, 0x79, 0x21, 0x88, 0x18, 0xCD, /* .}?y!... */ - /* 15D0 */ 0x10, 0x41, 0x9F, 0x97, 0x8D, 0x15, 0x28, 0xDE, /* .A....(. */ - /* 15D8 */ 0x0B, 0x32, 0x13, 0xF8, 0x56, 0xD0, 0xC1, 0xC5, /* .2..V... */ - /* 15E0 */ 0x17, 0x64, 0xEC, 0xFF, 0xFF, 0x82, 0x0C, 0x30, /* .d.....0 */ - /* 15E8 */ 0xE2, 0x64, 0x04, 0xF8, 0x3C, 0x71, 0xE0, 0xCE, /* .d..... + /* 0250 */ 0x89, 0x46, 0xF3, 0xE2, 0xA7, 0x03, 0x7E, 0xF8, // .F....~. + /* 0258 */ 0x00, 0x0F, 0xA8, 0x87, 0x84, 0x03, 0xC5, 0x4C, // .......L + /* 0260 */ 0x9B, 0x83, 0x3E, 0xBB, 0x1C, 0x3A, 0x76, 0xB8, // ..>..:v. + /* 0268 */ 0xE0, 0x3F, 0x81, 0x80, 0x4B, 0xDE, 0x21, 0x0C, // .?..K.!. + /* 0270 */ 0x14, 0x23, 0xC6, 0x9F, 0x83, 0x7C, 0x0A, 0x03, // .#...|.. + /* 0278 */ 0xFF, 0xFF, 0xFF, 0x14, 0x06, 0xFE, 0xE1, 0xF0, // ........ + /* 0280 */ 0x20, 0x4F, 0x07, 0x9F, 0xB6, 0xA8, 0x74, 0x18, // O....t. + /* 0288 */ 0xD4, 0x81, 0x0B, 0xB0, 0x32, 0x89, 0x08, 0xCF, // ....2... + /* 0290 */ 0x12, 0xB5, 0x41, 0xE8, 0xD4, 0xF0, 0x36, 0xF1, // ..A...6. + /* 0298 */ 0xB6, 0xE5, 0x5B, 0x40, 0x9C, 0xD3, 0xEC, 0xED, // ..[@.... + /* 02A0 */ 0xC0, 0x45, 0x30, 0x22, 0xD4, 0x0C, 0x45, 0x4E, // .E0"..EN + /* 02A8 */ 0x5A, 0x11, 0x63, 0x44, 0x79, 0xDC, 0x32, 0xCA, // Z.cDy.2. + /* 02B0 */ 0xDB, 0xD6, 0x0B, 0x40, 0xBC, 0x13, 0x7B, 0xDE, // ...@..{. + /* 02B8 */ 0x32, 0x46, 0xF0, 0xC8, 0x0F, 0x5C, 0x2C, 0xC6, // 2F...\,. + /* 02C0 */ 0xEA, 0xF5, 0x5F, 0xF3, 0x81, 0x0B, 0x70, 0xF6, // .._...p. + /* 02C8 */ 0xFF, 0x3F, 0x70, 0x01, 0x1C, 0x0A, 0x7A, 0x18, // .?p...z. + /* 02D0 */ 0x42, 0x0F, 0xC3, 0x53, 0x39, 0x97, 0x87, 0xC8, // B..S9... + /* 02D8 */ 0x53, 0x89, 0x18, 0x35, 0x4C, 0xD4, 0x67, 0x28, // S..5L.g( + /* 02E0 */ 0xDF, 0x2D, 0x7C, 0x20, 0x02, 0xDF, 0x99, 0x0B, // .-| .... + /* 02E8 */ 0xF8, 0xFD, 0xFF, 0x0F, 0x44, 0x70, 0x8E, 0x29, // ....Dp.) + /* 02F0 */ 0xB8, 0x33, 0x0D, 0x78, 0x7C, 0xCE, 0x40, 0x20, // .3.x|.@ + /* 02F8 */ 0xA7, 0xE2, 0x43, 0x0D, 0x60, 0x41, 0xF4, 0x13, // ..C.`A.. + /* 0300 */ 0xC2, 0x27, 0x1A, 0x2A, 0x13, 0x06, 0x75, 0xA8, // .'.*..u. + /* 0308 */ 0x01, 0xAC, 0x5C, 0x61, 0x9E, 0x46, 0xCF, 0xF9, // ..\a.F.. + /* 0310 */ 0x59, 0xC6, 0xA7, 0x1A, 0x1F, 0x4A, 0x8D, 0x63, // Y....J.c + /* 0318 */ 0x88, 0x97, 0x99, 0x87, 0x1A, 0x1F, 0x0B, 0x5E, // .......^ + /* 0320 */ 0x49, 0x7D, 0xA8, 0x31, 0x54, 0x9C, 0x87, 0x1A, // I}.1T... + /* 0328 */ 0x0F, 0x37, 0x50, 0xD4, 0x37, 0x9B, 0x67, 0x1B, // .7P.7.g. + /* 0330 */ 0xA3, 0xC7, 0xF7, 0x0D, 0xD5, 0x10, 0x0F, 0x35, // .......5 + /* 0338 */ 0x4C, 0xF2, 0x4A, 0x35, 0x16, 0x1F, 0x6A, 0xC0, // L.J5..j. + /* 0340 */ 0xF1, 0xFF, 0x3F, 0xD4, 0x00, 0xFC, 0xFF, 0xFF, // ..?..... + /* 0348 */ 0x1F, 0x6A, 0x00, 0x47, 0x47, 0x03, 0x38, 0x47, // .j.GG.8G + /* 0350 */ 0x46, 0xDC, 0xD1, 0x00, 0x5C, 0x87, 0x52, 0xE0, // F...\.R. + /* 0358 */ 0x70, 0x34, 0x00, 0x1E, 0x47, 0x21, 0x30, 0x5F, // p4..G!0_ + /* 0360 */ 0x68, 0x7C, 0x14, 0x02, 0x16, 0xFF, 0xFF, 0xA3, // h|...... + /* 0368 */ 0x10, 0xF8, 0x65, 0x9F, 0x83, 0x50, 0x42, 0x8F, // ..e..PB. + /* 0370 */ 0x42, 0x80, 0xA0, 0xDB, 0xCF, 0x53, 0xC4, 0xB3, // B....S.. + /* 0378 */ 0x8F, 0x2F, 0x3F, 0x0F, 0x04, 0x11, 0x5E, 0xF3, // ./?...^. + /* 0380 */ 0x7D, 0x0A, 0xF2, 0x21, 0xDF, 0x47, 0x21, 0x06, // }..!.G!. + /* 0388 */ 0x63, 0x28, 0x5F, 0x83, 0x7C, 0x14, 0x62, 0x50, // c(_.|.bP + /* 0390 */ 0xAF, 0x41, 0xBE, 0xEF, 0x1B, 0xE4, 0xF1, 0x22, // .A....." + /* 0398 */ 0x48, 0xEC, 0x67, 0x02, 0x1F, 0x85, 0x98, 0xE8, // H.g..... + /* 03A0 */ 0xA3, 0x10, 0xA0, 0xF0, 0xFF, 0x7F, 0x14, 0x02, // ........ + /* 03A8 */ 0xF8, 0xFF, 0xFF, 0x3F, 0x0A, 0x01, 0xCE, 0x02, // ...?.... + /* 03B0 */ 0x1C, 0x0D, 0x40, 0x37, 0xAD, 0x47, 0x21, 0xF0, // ..@7.G!. + /* 03B8 */ 0xDE, 0x59, 0x4E, 0xFB, 0x04, 0x7C, 0x16, 0x02, // .YN..|.. + /* 03C0 */ 0xCC, 0xFE, 0xFF, 0xCF, 0x42, 0xC0, 0xEC, 0x28, // ....B..( + /* 03C8 */ 0x74, 0x14, 0x67, 0xF9, 0x2A, 0xF4, 0x04, 0xF0, // t.g.*... + /* 03D0 */ 0x02, 0x10, 0x23, 0xCC, 0x3B, 0xD0, 0x4B, 0x26, // ..#.;.K& + /* 03D8 */ 0xBB, 0x8B, 0x1B, 0xE7, 0xC9, 0xE5, 0x2C, 0x9E, // ......,. + /* 03E0 */ 0xC4, 0x7D, 0x09, 0xF2, 0x81, 0xE2, 0x59, 0xC8, // .}....Y. + /* 03E8 */ 0x50, 0xA7, 0x1B, 0xF4, 0x8D, 0xDC, 0x03, 0x8B, // P....... + /* 03F0 */ 0x19, 0x3F, 0xC4, 0xF3, 0x90, 0x21, 0x9E, 0x85, // .?...!.. + /* 03F8 */ 0x00, 0x76, 0xFD, 0xFF, 0xCF, 0x42, 0x00, 0xFF, // .v...B.. + /* 0400 */ 0xFF, 0xFF, 0x47, 0x03, 0xF8, 0x2F, 0x00, 0x9F, // ..G../.. + /* 0408 */ 0x85, 0x80, 0xE7, 0x09, 0xE0, 0x41, 0xDB, 0x67, // .....A.g + /* 0410 */ 0x21, 0x80, 0x33, 0x87, 0xCB, 0xF3, 0x7F, 0x05, // !.3..... + /* 0418 */ 0x3A, 0x96, 0xF7, 0x08, 0xCF, 0xFA, 0x24, 0x5F, // :.....$_ + /* 0420 */ 0x2F, 0x3D, 0xD3, 0x87, 0x82, 0x67, 0x21, 0x86, // /=...g!. + /* 0428 */ 0x75, 0x18, 0x3E, 0x0B, 0x31, 0x88, 0x17, 0x4D, // u.>.1..M + /* 0430 */ 0x43, 0xBC, 0x70, 0xFA, 0x30, 0xE0, 0xFF, 0x3F, // C.p.0..? + /* 0438 */ 0x5E, 0xE0, 0x57, 0x4E, 0x03, 0x05, 0x09, 0xF4, // ^.WN.... + /* 0440 */ 0x2C, 0x04, 0x30, 0xFE, 0xFF, 0x7F, 0x16, 0x02, // ,.0..... + /* 0448 */ 0xC8, 0xB8, 0x46, 0x9D, 0x85, 0x80, 0xE5, 0x6D, // ..F....m + /* 0450 */ 0xE5, 0x19, 0xDB, 0xA7, 0x95, 0x04, 0xFF, 0xFF, // ........ + /* 0458 */ 0x67, 0x21, 0xC0, 0x41, 0x2E, 0x23, 0x07, 0x21, // g!.A.#.! + /* 0460 */ 0x4C, 0xC4, 0x87, 0x83, 0x8F, 0x99, 0x80, 0x9E, // L....... + /* 0468 */ 0x29, 0xBE, 0xB8, 0x1B, 0xE3, 0x09, 0xE0, 0x45, // )......E + /* 0470 */ 0xE2, 0x31, 0x93, 0x1D, 0x35, 0x0D, 0xF3, 0x2C, // .1..5.., + /* 0478 */ 0x64, 0xBC, 0xB3, 0x78, 0x0D, 0x78, 0x82, 0xF7, // d..x.x.. + /* 0480 */ 0xE4, 0x9F, 0x85, 0x18, 0xD8, 0x61, 0x05, 0x7B, // .....a.{ + /* 0488 */ 0x14, 0x32, 0xA8, 0xC1, 0x63, 0x87, 0x08, 0x13, // .2..c... + /* 0490 */ 0xE8, 0x59, 0x88, 0xC5, 0x7D, 0xAE, 0xE8, 0x3C, // .Y..}..< + /* 0498 */ 0xE1, 0xB3, 0x10, 0xF0, 0xFE, 0xFF, 0x9F, 0x25, // .......% + /* 04A0 */ 0xE0, 0x5E, 0x0D, 0x9E, 0x85, 0x00, 0x13, 0x87, // .^...... + /* 04A8 */ 0x0D, 0x9F, 0x35, 0xC0, 0x33, 0x7C, 0x8F, 0xEA, // ..5.3|.. + /* 04B0 */ 0x1C, 0x1E, 0x8F, 0x81, 0x7F, 0x56, 0x1D, 0xE7, // .....V.. + /* 04B8 */ 0x04, 0x96, 0x7B, 0xD1, 0xB2, 0x71, 0xA0, 0xA1, // ..{..q.. + /* 04C0 */ 0x23, 0xB2, 0x3A, 0x20, 0x8D, 0x0D, 0x73, 0x29, // #.: ..s) + /* 04C8 */ 0x89, 0x7C, 0x72, 0x6C, 0xD4, 0x56, 0x04, 0xA7, // .|rl.V.. + /* 04D0 */ 0x33, 0x93, 0x4F, 0x00, 0xD6, 0x42, 0x21, 0x05, // 3.O..B!. + /* 04D8 */ 0x34, 0x1A, 0x8B, 0xE1, 0x9D, 0xF9, 0xE8, 0x44, // 4......D + /* 04E0 */ 0x41, 0x0C, 0xE8, 0xE3, 0x90, 0x6D, 0x1C, 0x0A, // A....m.. + /* 04E8 */ 0x50, 0x7B, 0xD1, 0x14, 0xC8, 0x39, 0x07, 0xA3, // P{...9.. + /* 04F0 */ 0x7F, 0x76, 0x74, 0x36, 0xBE, 0x13, 0x70, 0x0D, // .vt6..p. + /* 04F8 */ 0x10, 0x3A, 0x25, 0x18, 0xDA, 0x6A, 0x04, 0xFC, // .:%..j.. + /* 0500 */ 0xFF, 0x67, 0x89, 0x01, 0x33, 0xFE, 0x53, 0x8C, // .g..3.S. + /* 0508 */ 0x09, 0x7C, 0x8E, 0xC1, 0x1F, 0x0C, 0xF0, 0x03, // .|...... + /* 0510 */ 0x7F, 0x31, 0xA8, 0xFA, 0x5E, 0xA0, 0xFB, 0x82, // .1..^... + /* 0518 */ 0xD5, 0xDD, 0x64, 0x20, 0xCC, 0xC8, 0x04, 0xF5, // ..d .... + /* 0520 */ 0x9D, 0x0E, 0x40, 0x01, 0xE4, 0x0B, 0x81, 0xCF, // ..@..... + /* 0528 */ 0x51, 0x0F, 0x05, 0x6C, 0x22, 0x21, 0xC2, 0x44, // Q..l"!.D + /* 0530 */ 0x33, 0x3A, 0x62, 0xC2, 0xA8, 0xE8, 0x13, 0xA6, // 3:b..... + /* 0538 */ 0x20, 0x9E, 0xB0, 0x63, 0x4D, 0x18, 0x3D, 0x13, // ..cM.=. + /* 0540 */ 0x5F, 0x74, 0xD8, 0x88, 0x31, 0x21, 0xAE, 0x1E, // _t..1!.. + /* 0548 */ 0xD0, 0x26, 0x18, 0xD4, 0x97, 0x22, 0x58, 0x43, // .&..."XC + /* 0550 */ 0xE6, 0x63, 0xF1, 0x05, 0x02, 0x37, 0x65, 0x30, // .c...7e0 + /* 0558 */ 0xCE, 0x89, 0x5D, 0x13, 0x7C, 0xD9, 0xC1, 0xCD, // ..].|... + /* 0560 */ 0x19, 0x8C, 0xF0, 0x98, 0xBB, 0x18, 0xBF, 0x3A, // .......: + /* 0568 */ 0x79, 0x74, 0xFC, 0xA0, 0xE0, 0x1B, 0x0E, 0xC3, // yt...... + /* 0570 */ 0x7E, 0x32, 0xF3, 0x8C, 0xDE, 0xCB, 0x7C, 0x8D, // ~2....|. + /* 0578 */ 0xC3, 0xC0, 0x7A, 0xBC, 0x1C, 0xD6, 0x68, 0x61, // ..z...ha + /* 0580 */ 0x0F, 0xED, 0x3D, 0xC4, 0xFF, 0xFF, 0x43, 0x8C, // ..=...C. + /* 0588 */ 0xCF, 0x13, 0xC6, 0x08, 0xEB, 0xDB, 0x0B, 0x38, // .......8 + /* 0590 */ 0xEE, 0x59, 0xF0, 0xEF, 0x1A, 0xE0, 0xB9, 0x84, // .Y...... + /* 0598 */ 0xF8, 0xAE, 0x01, 0x30, 0xF0, 0xFF, 0x7F, 0xD7, // ...0.... + /* 05A0 */ 0x00, 0x4E, 0xD7, 0x04, 0xDF, 0x35, 0x80, 0xF7, // .N...5.. + /* 05A8 */ 0xD0, 0x7D, 0xD7, 0x00, 0xAE, 0xD9, 0xEF, 0x1A, // .}...... + /* 05B0 */ 0xA8, 0x63, 0x80, 0x15, 0xDE, 0x35, 0xA0, 0x5D, // .c...5.] + /* 05B8 */ 0xD9, 0xDE, 0xD7, 0x9E, 0xB0, 0xAC, 0xE9, 0xB2, // ........ + /* 05C0 */ 0x81, 0x52, 0x73, 0xD9, 0x00, 0x14, 0xFC, 0xFF, // .Rs..... + /* 05C8 */ 0x2F, 0x1B, 0x80, 0x01, 0x29, 0x13, 0x46, 0x85, // /...).F. + /* 05D0 */ 0x9F, 0x30, 0x05, 0xF1, 0x84, 0x1D, 0xEC, 0xB2, // .0...... + /* 05D8 */ 0x01, 0x8A, 0x18, 0x97, 0x0D, 0xD0, 0x8F, 0xED, // ........ + /* 05E0 */ 0x65, 0x03, 0x18, 0xDC, 0x13, 0xF8, 0x6D, 0x03, // e.....m. + /* 05E8 */ 0x78, 0x43, 0xFA, 0xB6, 0x01, 0xD6, 0xFF, 0xFF, // xC...... + /* 05F0 */ 0x6D, 0x03, 0xAC, 0xF9, 0x6F, 0x1B, 0x28, 0x0E, // m...o.(. + /* 05F8 */ 0xAB, 0xBC, 0x6D, 0x40, 0x3C, 0xC9, 0x33, 0x02, // ..m@<.3. + /* 0600 */ 0xAB, 0xBA, 0x6E, 0xA0, 0xF4, 0x5C, 0x37, 0x00, // ..n..\7. + /* 0608 */ 0x12, 0x88, 0x99, 0x30, 0x2A, 0xFE, 0x84, 0x29, // ...0*..) + /* 0610 */ 0x88, 0x27, 0xEC, 0x68, 0xD7, 0x0D, 0x50, 0x04, // .'.h..P. + /* 0618 */ 0xB9, 0x6E, 0x80, 0x7E, 0x5E, 0x09, 0xFE, 0xFF, // .n.~^... + /* 0620 */ 0xAF, 0x1B, 0xC0, 0xE0, 0xA2, 0x80, 0xB9, 0x6F, // .......o + /* 0628 */ 0x00, 0x6F, 0x58, 0x7E, 0xDF, 0x00, 0x7C, 0xDC, // .oX~..|. + /* 0630 */ 0xC4, 0x31, 0xF7, 0x0D, 0xC0, 0xCC, 0xFF, 0xFF, // .1...... + /* 0638 */ 0xBE, 0x01, 0xB0, 0xE7, 0xA2, 0x80, 0xBB, 0x6F, // .......o + /* 0640 */ 0x00, 0xEF, 0x8B, 0xB4, 0xEF, 0x1B, 0x60, 0xFE, // ......`. + /* 0648 */ 0xFF, 0xDF, 0x37, 0xC0, 0x28, 0x6D, 0xFD, 0x1E, // ..7.(m.. + /* 0650 */ 0x1C, 0x3D, 0x21, 0x78, 0x7C, 0xB8, 0xFB, 0xA5, // .=!x|... + /* 0658 */ 0xC7, 0xE7, 0xBB, 0x39, 0x38, 0x06, 0x79, 0x8C, // ...98.y. + /* 0660 */ 0x87, 0x76, 0xC0, 0xAF, 0xEF, 0x9E, 0x98, 0xEF, // .v...... + /* 0668 */ 0xE6, 0xC0, 0xFF, 0x4C, 0x70, 0x3C, 0x18, 0x68, // ...Lp<.h + /* 0670 */ 0x1C, 0x62, 0xAB, 0x97, 0x06, 0x72, 0x34, 0x38, // .b...r48 + /* 0678 */ 0x3F, 0xDC, 0x19, 0x81, 0x61, 0x15, 0x7F, 0xF2, // ?...a... + /* 0680 */ 0x47, 0x38, 0xC7, 0xD0, 0xD9, 0xE1, 0x20, 0xB1, // G8.... . + /* 0688 */ 0x83, 0xE0, 0xC1, 0x56, 0x6D, 0x02, 0x85, 0x86, // ...Vm... + /* 0690 */ 0x50, 0x14, 0x18, 0x14, 0x8B, 0x0F, 0x18, 0xF8, // P....... + /* 0698 */ 0x61, 0xB3, 0xB3, 0x00, 0x93, 0x04, 0x87, 0x3A, // a......: + /* 06A0 */ 0x02, 0xF8, 0x3E, 0xD1, 0xFC, 0x38, 0x74, 0x37, // ..>..8t7 + /* 06A8 */ 0x38, 0x54, 0x8F, 0xE5, 0xA1, 0x80, 0x9E, 0x01, // 8T...... + /* 06B0 */ 0x71, 0xC7, 0x0C, 0x32, 0x69, 0xCF, 0x28, 0xE2, // q..2i.(. + /* 06B8 */ 0x53, 0xC2, 0x29, 0x85, 0x49, 0xE0, 0xF3, 0x03, // S.).I... + /* 06C0 */ 0x43, 0xE3, 0x04, 0xAF, 0x0D, 0xA1, 0xF9, 0xFF, // C....... + /* 06C8 */ 0xFF, 0xA4, 0xC0, 0x3C, 0xDF, 0x31, 0x04, 0x6C, // ...<.1.l + /* 06D0 */ 0x02, 0xBB, 0xBF, 0x64, 0xC8, 0xDA, 0xC0, 0x75, // ...d...u + /* 06D8 */ 0x4B, 0x32, 0x44, 0x6F, 0x38, 0xB2, 0x85, 0xA2, // K2Do8... + /* 06E0 */ 0xE9, 0x44, 0x79, 0xDF, 0x88, 0x62, 0x67, 0x08, // .Dy..bg. + /* 06E8 */ 0xC2, 0x88, 0x12, 0x2C, 0xC8, 0xA3, 0x42, 0xAC, // ...,..B. + /* 06F0 */ 0x28, 0x2F, 0x05, 0x46, 0x88, 0x18, 0xE2, 0x95, // (/.F.... + /* 06F8 */ 0x23, 0xD0, 0x09, 0x87, 0x0F, 0xF2, 0xD8, 0x14, // #....... + /* 0700 */ 0xA7, 0xFD, 0x41, 0x90, 0x58, 0x4F, 0x02, 0x8D, // ..A.XO.. + /* 0708 */ 0xC5, 0x91, 0x46, 0x83, 0x3A, 0x07, 0x78, 0xB8, // ..F.:.x. + /* 0710 */ 0x3E, 0xC4, 0x78, 0xF8, 0x0F, 0x21, 0x06, 0x39, // >.x..!.9 + /* 0718 */ 0xC8, 0x73, 0x7B, 0x54, 0x38, 0x4E, 0x5F, 0x25, // .s{T8N_% + /* 0720 */ 0x4C, 0xF0, 0x02, 0xE0, 0x83, 0x0A, 0x1C, 0xD7, // L....... + /* 0728 */ 0x80, 0x9A, 0xF1, 0x33, 0x06, 0x58, 0x8E, 0xE3, // ...3.X.. + /* 0730 */ 0x3E, 0xA9, 0xC0, 0x1D, 0x8F, 0xEF, 0x07, 0x6C, // >......l + /* 0738 */ 0xC2, 0x09, 0x2C, 0x7F, 0x10, 0xA8, 0xE3, 0x0C, // ..,..... + /* 0740 */ 0x9F, 0xE7, 0x0B, 0x8B, 0x21, 0x1F, 0x13, 0x4C, // ....!..L + /* 0748 */ 0x60, 0xB1, 0x27, 0x1B, 0x3A, 0x1E, 0xF0, 0xDF, // `.'.:... + /* 0750 */ 0x63, 0x1E, 0x2F, 0x7C, 0x32, 0xF1, 0x7C, 0x4D, // c./|2.|M + /* 0758 */ 0x30, 0x22, 0x84, 0x9C, 0x8C, 0x07, 0x7D, 0x87, // 0"....}. + /* 0760 */ 0xC0, 0x5C, 0x6F, 0xD8, 0xB9, 0x85, 0x8B, 0x3A, // .\o....: + /* 0768 */ 0x68, 0xA0, 0x4E, 0x0B, 0x3E, 0x28, 0xB0, 0x9B, // h.N.>(.. + /* 0770 */ 0x11, 0xE6, 0xB8, 0xCE, 0xCF, 0x2A, 0x60, 0xF8, // .....*`. + /* 0778 */ 0xFF, 0x9F, 0x55, 0x60, 0x8F, 0x10, 0xFE, 0xED, // ..U`.... + /* 0780 */ 0xC1, 0xF3, 0xF2, 0x95, 0xE1, 0xD5, 0x21, 0x81, // ......!. + /* 0788 */ 0x43, 0x8E, 0x10, 0x3D, 0x2E, 0x8F, 0x10, 0x73, // C..=...s + /* 0790 */ 0x3E, 0xC2, 0x0C, 0x11, 0x5C, 0x67, 0x01, 0x70, // >...\g.p + /* 0798 */ 0x0C, 0x11, 0xF8, 0x1C, 0x70, 0xC0, 0x71, 0x69, // ....p.qi + /* 07A0 */ 0xE2, 0x03, 0xF5, 0x01, 0x07, 0x70, 0x70, 0x4D, // .....ppM + /* 07A8 */ 0xC3, 0x1D, 0x70, 0xC0, 0x71, 0x16, 0x60, 0xFF, // ..p.q.`. + /* 07B0 */ 0xFF, 0xC3, 0x0D, 0x2C, 0x49, 0x26, 0x0E, 0x23, // ...,I&.# + /* 07B8 */ 0x18, 0x11, 0x30, 0x28, 0x02, 0x02, 0xA4, 0xB3, // ..0(.... + /* 07C0 */ 0x80, 0x0F, 0x29, 0x00, 0x1F, 0xAE, 0x0C, 0x0F, // ..)..... + /* 07C8 */ 0x29, 0xD8, 0x93, 0x86, 0x07, 0x8E, 0x1B, 0x85, // )....... + /* 07D0 */ 0x07, 0x8D, 0x0B, 0x30, 0x68, 0x7A, 0xE2, 0x80, // ...0hz.. + /* 07D8 */ 0x7F, 0x4C, 0xF0, 0x19, 0x05, 0x1C, 0xE3, 0x06, // .L...... + /* 07E0 */ 0xDF, 0x2A, 0x0C, 0xFC, 0xFF, 0x3F, 0x30, 0xCC, // .*...?0. + /* 07E8 */ 0xE1, 0xC2, 0x63, 0x39, 0x8A, 0xA0, 0x07, 0x1E, // ..c9.... + /* 07F0 */ 0xD4, 0xF7, 0x8C, 0x33, 0xF7, 0x24, 0x8F, 0xD1, // ...3.$.. + /* 07F8 */ 0x51, 0x0F, 0x27, 0xF4, 0xE4, 0x85, 0x3B, 0x57, // Q.'...;W + /* 0800 */ 0xF9, 0x0A, 0x71, 0x14, 0x18, 0xB8, 0x77, 0x29, // ..q...w) + /* 0808 */ 0x8F, 0xCF, 0x17, 0x2B, 0xC3, 0x63, 0x46, 0xFB, // ...+.cF. + /* 0810 */ 0x1E, 0x72, 0xD6, 0x11, 0x02, 0xE2, 0x2F, 0x75, // .r..../u + /* 0818 */ 0x6C, 0xC0, 0x60, 0x39, 0x18, 0x00, 0x87, 0x01, // l.`9.... + /* 0820 */ 0xE3, 0x13, 0x0D, 0x58, 0x67, 0x1B, 0x3C, 0xF4, // ...Xg.<. + /* 0828 */ 0x69, 0x31, 0xC4, 0xE3, 0x0B, 0xFB, 0x56, 0x61, // i1....Va + /* 0830 */ 0x82, 0xEA, 0x41, 0x75, 0x12, 0xF4, 0xD0, 0xC0, // ..Au.... + /* 0838 */ 0x01, 0xE8, 0xA1, 0xC1, 0x3F, 0xB9, 0x90, 0xFB, // ....?... + /* 0840 */ 0x2B, 0x1D, 0x82, 0xB5, 0xE2, 0x69, 0xDE, 0x47, // +....i.G + /* 0848 */ 0x1E, 0xF3, 0xDC, 0xA2, 0xBC, 0x0D, 0x3C, 0x07, // ......<. + /* 0850 */ 0xF0, 0xD3, 0x82, 0x87, 0xE3, 0x63, 0x81, 0xC7, // .....c.. + /* 0858 */ 0xE9, 0x4B, 0x58, 0x82, 0xF7, 0x1A, 0x9F, 0x6C, // .KX....l + /* 0860 */ 0x1E, 0x5C, 0x58, 0xB2, 0x21, 0xA0, 0x06, 0xEB, // .\X.!... + /* 0868 */ 0x21, 0x60, 0xA6, 0x9A, 0xC0, 0x49, 0x46, 0x80, // !`...IF. + /* 0870 */ 0xCA, 0x00, 0xA1, 0x1B, 0xCB, 0xE9, 0x3E, 0x8B, // ......>. + /* 0878 */ 0x84, 0x38, 0xCD, 0x47, 0x99, 0xC7, 0x02, 0x8F, // .8.G.... + /* 0880 */ 0xF5, 0xC1, 0xC0, 0xFF, 0x7F, 0xCD, 0x23, 0xD4, // ......#. + /* 0888 */ 0x7D, 0xCD, 0x33, 0x7B, 0x3A, 0xC0, 0xAC, 0x22, // }.3{:.." + /* 0890 */ 0xDC, 0x7B, 0xCE, 0x1B, 0x86, 0xD1, 0x9E, 0x2D, // .{.....- + /* 0898 */ 0x7C, 0xCD, 0x78, 0xD6, 0x34, 0x42, 0x38, 0x76, // |.x.4B8v + /* 08A0 */ 0x83, 0xF3, 0x48, 0x8C, 0xF0, 0x82, 0xC0, 0x4E, // ..H....N + /* 08A8 */ 0x0C, 0x0F, 0x30, 0xC6, 0x39, 0x79, 0xC3, 0xFA, // ..0.9y.. + /* 08B0 */ 0xC2, 0xCB, 0x40, 0x83, 0x19, 0xDB, 0x97, 0x01, // ..@..... + /* 08B8 */ 0x36, 0x2A, 0xDF, 0x88, 0xC0, 0x97, 0xFC, 0x62, // 6*.....b + /* 08C0 */ 0x00, 0x65, 0x16, 0xBE, 0x9E, 0xF8, 0xA0, 0xC4, // .e...... + /* 08C8 */ 0x2E, 0x06, 0x2C, 0xE5, 0xC5, 0x00, 0x54, 0x37, // ..,...T7 + /* 08D0 */ 0x0C, 0x5F, 0x0C, 0xE0, 0x5F, 0x89, 0x5E, 0x0C, // ._.._.^. + /* 08D8 */ 0xC0, 0x70, 0x71, 0xF2, 0x3D, 0xC0, 0x1E, 0xEE, // .pq.=... + /* 08E0 */ 0xA3, 0x74, 0x9C, 0xBE, 0xFD, 0xBD, 0x19, 0xF8, // .t...... + /* 08E8 */ 0x6C, 0xC0, 0x60, 0x3C, 0xC3, 0x30, 0xC6, 0x08, // l.`<.0.. + /* 08F0 */ 0xE3, 0x51, 0x86, 0x31, 0xC1, 0xDC, 0xB7, 0x03, // .Q.1.... + /* 08F8 */ 0xE8, 0x39, 0x87, 0x81, 0x4A, 0x78, 0x3B, 0x80, // .9..Jx;. + /* 0900 */ 0x72, 0x0E, 0xE8, 0xF2, 0x68, 0x42, 0x4F, 0x01, // r...hBO. + /* 0908 */ 0x4F, 0x07, 0x3E, 0x29, 0x1A, 0xA2, 0xAF, 0xB1, // O.>).... + /* 0910 */ 0x0A, 0x26, 0x50, 0xC4, 0x07, 0x0D, 0x3E, 0xB5, // .&P...>. + /* 0918 */ 0x28, 0x3E, 0x15, 0x78, 0x2D, 0xCF, 0x4E, 0xE1, // (>.x-.N. + /* 0920 */ 0xE2, 0x9C, 0x89, 0xA7, 0x6A, 0x38, 0x03, 0xBD, // ....j8.. + /* 0928 */ 0xE6, 0x86, 0x63, 0xFF, 0x7F, 0x38, 0xFC, 0xA9, // ..c..8.. + /* 0930 */ 0xE0, 0x35, 0x80, 0x1D, 0x24, 0x3D, 0x2D, 0x23, // .5..$=-# + /* 0938 */ 0xC2, 0x38, 0xA4, 0x3C, 0x32, 0xF8, 0xB6, 0x18, // .8.<2... + /* 0940 */ 0xC7, 0x90, 0x0F, 0x91, 0xBE, 0x13, 0x18, 0xF2, // ........ + /* 0948 */ 0x21, 0xEF, 0x79, 0xC7, 0xC0, 0xAF, 0x08, 0x71, // !.y....q + /* 0950 */ 0x9E, 0xB2, 0x7C, 0x67, 0xF0, 0x65, 0x01, 0x7C, // ..|g.e.| + /* 0958 */ 0x91, 0x2E, 0x0B, 0x68, 0x68, 0x9F, 0x64, 0x7C, // ...hh.d| + /* 0960 */ 0x41, 0x30, 0xEC, 0x89, 0xB3, 0x00, 0x77, 0x05, // A0....w. + /* 0968 */ 0x50, 0x81, 0xFA, 0xAE, 0x00, 0xFF, 0x42, 0xF0, // P.....B. + /* 0970 */ 0xAE, 0x00, 0x86, 0x79, 0xF9, 0x56, 0xC0, 0x35, // ...y.V.5 + /* 0978 */ 0x1D, 0x4A, 0xD0, 0x67, 0x12, 0x5F, 0x17, 0x70, // .J.g._.p + /* 0980 */ 0x53, 0x64, 0xA9, 0x8E, 0x0A, 0xD0, 0x53, 0x4C, // Sd....SL + /* 0988 */ 0x02, 0x75, 0x47, 0xF7, 0x51, 0x01, 0xC6, 0x4D, // .uG.Q..M + /* 0990 */ 0xD9, 0x07, 0x54, 0x76, 0x5A, 0x60, 0x67, 0x21, // ..TvZ`g! + /* 0998 */ 0x76, 0x1D, 0xC1, 0x5D, 0x49, 0x18, 0xCA, 0xB3, // v..]I... + /* 09A0 */ 0x81, 0x2F, 0x59, 0xFC, 0x70, 0x00, 0x03, 0xDC, // ./Y.p... + /* 09A8 */ 0xB3, 0x38, 0xC4, 0x08, 0xB1, 0xD9, 0x81, 0xEB, // .8...... + /* 09B0 */ 0x75, 0xD2, 0x70, 0x2F, 0x44, 0xEC, 0xFF, 0x7F, // u.p/D... + /* 09B8 */ 0x32, 0x00, 0xE3, 0x51, 0x1B, 0x1C, 0x27, 0x9D, // 2..Q..'. + /* 09C0 */ 0xF0, 0x91, 0x9E, 0x59, 0xF8, 0x49, 0x19, 0x30, // ...Y.I.0 + /* 09C8 */ 0x71, 0xF2, 0x03, 0xE3, 0xC9, 0x1A, 0xC6, 0x00, // q....... + /* 09D0 */ 0xB8, 0xBC, 0x57, 0x95, 0x81, 0xFC, 0x43, 0x90, // ..W...C. + /* 09D8 */ 0x20, 0x18, 0xD4, 0x29, 0x19, 0x38, 0x1C, 0xC5, // ..).8.. + /* 09E0 */ 0x70, 0xA7, 0x64, 0x78, 0x50, 0xF8, 0xC3, 0x00, // p.dxP... + /* 09E8 */ 0xE6, 0x46, 0xE8, 0x7B, 0x82, 0xA1, 0xDE, 0x93, // .F.{.... + /* 09F0 */ 0x0E, 0xE3, 0x91, 0xD0, 0x04, 0x3E, 0x2D, 0xC3, // .....>-. + /* 09F8 */ 0xFA, 0xFF, 0x9F, 0x96, 0x81, 0xD5, 0xB1, 0xDD, // ........ + /* 0A00 */ 0x43, 0xF6, 0x59, 0x01, 0x77, 0x76, 0x80, 0x3B, // C.Y.wv.; + /* 0A08 */ 0x3D, 0x7E, 0x7A, 0x00, 0x9C, 0x00, 0x3D, 0x3D, // =~z...== + /* 0A10 */ 0x80, 0xED, 0xBC, 0x01, 0xF7, 0x40, 0x80, 0x38, // .....@.8 + /* 0A18 */ 0xFE, 0xA3, 0x82, 0x5F, 0x59, 0x28, 0x1C, 0x3F, // ..._Y(.? + /* 0A20 */ 0xB6, 0xF3, 0x63, 0x09, 0xEE, 0x70, 0xE0, 0x23, // ..c..p.# + /* 0A28 */ 0x83, 0x0F, 0x90, 0xB8, 0xA1, 0xF8, 0x50, 0x81, // ......P. + /* 0A30 */ 0x3C, 0x0B, 0x80, 0x62, 0xF4, 0x6C, 0x04, 0xEC, // <..b.l.. + /* 0A38 */ 0x06, 0xF3, 0xD2, 0x12, 0xE5, 0xFF, 0xFF, 0xDE, // ........ + /* 0A40 */ 0xC0, 0x4E, 0x29, 0xB8, 0x83, 0x00, 0xF8, 0x8E, // .N)..... + /* 0A48 */ 0x01, 0xE0, 0x1D, 0x0C, 0x97, 0x35, 0x66, 0x94, // .....5f. + /* 0A50 */ 0x10, 0x18, 0x8D, 0x19, 0x77, 0x08, 0xE1, 0x27, // ....w..' + /* 0A58 */ 0x02, 0xDC, 0x98, 0x3D, 0x6E, 0x8F, 0x19, 0x77, // ...=n..w + /* 0A60 */ 0x9C, 0xE5, 0xA3, 0x7A, 0xCA, 0x08, 0xE5, 0x03, // ...z.... + /* 0A68 */ 0x07, 0x3B, 0x67, 0xBC, 0x11, 0xF0, 0xA1, 0x03, // .;g..... + /* 0A70 */ 0x8F, 0x03, 0x0C, 0xEE, 0x48, 0x01, 0xC6, 0xCB, // ....H... + /* 0A78 */ 0x01, 0x1B, 0x3B, 0xB8, 0x83, 0x90, 0x53, 0x20, // ..;...S + /* 0A80 */ 0x4B, 0x87, 0xD1, 0xD8, 0x71, 0xB2, 0x81, 0x74, // K...q..t + /* 0A88 */ 0x8C, 0xF1, 0x21, 0xD7, 0x63, 0xC7, 0x0D, 0xD6, // ..!.c... + /* 0A90 */ 0x63, 0xC7, 0x1D, 0x5F, 0xB0, 0xFF, 0xFF, 0xE3, // c.._.... + /* 0A98 */ 0x0B, 0x18, 0xC6, 0xC0, 0xC5, 0x0F, 0x03, 0x7D, // .......} + /* 0AA0 */ 0xF3, 0xF3, 0xE8, 0x0C, 0xEE, 0x61, 0xFB, 0x04, // .....a.. + /* 0AA8 */ 0x13, 0xE3, 0xF9, 0x25, 0xC4, 0x23, 0xCC, 0x8B, // ...%.#.. + /* 0AB0 */ 0x4B, 0x84, 0xA3, 0x08, 0xF2, 0xE6, 0x12, 0xE7, // K....... + /* 0AB8 */ 0xD5, 0x20, 0xCC, 0x63, 0x4B, 0x94, 0x10, 0x11, // . .cK... + /* 0AC0 */ 0x0E, 0x26, 0xCE, 0x13, 0x8C, 0x11, 0x0E, 0x3C, // .&.....< + /* 0AC8 */ 0x8A, 0x21, 0x22, 0x9C, 0x40, 0x88, 0x93, 0x3E, // .!".@..> + /* 0AD0 */ 0xD9, 0x20, 0xE1, 0x63, 0x84, 0x8D, 0xF6, 0x04, // . .c.... + /* 0AD8 */ 0xC3, 0xC7, 0xC2, 0xCF, 0x2B, 0x1E, 0x3C, 0x3F, // ....+... + /* 0B38 */ 0x41, 0xC0, 0x87, 0x3A, 0x54, 0x0F, 0xF3, 0xA8, // A..:T... + /* 0B40 */ 0x5E, 0x0A, 0x19, 0xCE, 0xD9, 0xC1, 0x1D, 0x04, // ^....... + /* 0B48 */ 0xF6, 0xF8, 0xE1, 0x41, 0xF0, 0x9B, 0x25, 0x1F, // ...A..%. + /* 0B50 */ 0x04, 0x3B, 0xDF, 0xBC, 0xC1, 0x19, 0xE4, 0xFF, // .;...... + /* 0B58 */ 0x7F, 0x0C, 0xB0, 0xCF, 0x54, 0x3E, 0x9A, 0x20, // ....T>. + /* 0B60 */ 0x8E, 0x80, 0xE8, 0xF3, 0x87, 0xC7, 0xF0, 0x26, // .......& + /* 0B68 */ 0xC7, 0x87, 0x83, 0x3D, 0x7A, 0xE0, 0x4E, 0x22, // ...=z.N" + /* 0B70 */ 0x70, 0x8F, 0x5D, 0x07, 0xED, 0x6B, 0x9C, 0x2F, // p.]..k./ + /* 0B78 */ 0x5A, 0x30, 0xEE, 0x7B, 0xCF, 0x22, 0xE0, 0xC7, // Z0.{.".. + /* 0B80 */ 0x78, 0x6C, 0x01, 0xC7, 0xA1, 0x04, 0xDC, 0xC1, // xl...... + /* 0B88 */ 0x8E, 0x6B, 0x1C, 0x42, 0x51, 0x60, 0x74, 0x28, // .k.BQ`t( + /* 0B90 */ 0xC1, 0xC5, 0x00, 0x12, 0x8C, 0x63, 0x9C, 0xD1, // .....c.. + /* 0B98 */ 0xD0, 0x97, 0x48, 0x1F, 0xD2, 0xE0, 0x0C, 0x1A, // ..H..... + /* 0BA0 */ 0xF6, 0x3C, 0x9F, 0x50, 0xB8, 0x3D, 0x01, 0x8A, // .<.P.=.. + /* 0BA8 */ 0x4E, 0x28, 0x20, 0xC3, 0x7D, 0x06, 0xC1, 0x9E, // N( .}... + /* 0BB0 */ 0x10, 0xF8, 0x19, 0x84, 0xFD, 0xFF, 0x0F, 0x8E, // ........ + /* 0BB8 */ 0x1E, 0xF7, 0x7B, 0xA3, 0x4F, 0x8D, 0x6C, 0xEE, // ..{.O.l. + /* 0BC0 */ 0x0F, 0x01, 0x27, 0x70, 0xEE, 0xEC, 0xD4, 0x8C, // ..'p.... + /* 0BC8 */ 0x3B, 0x33, 0x60, 0xCF, 0x1F, 0x1E, 0x02, 0x3F, // ;3`....? + /* 0BD0 */ 0x17, 0x78, 0xF8, 0x1E, 0x02, 0x7E, 0xF0, 0x0F, // .x...~.. + /* 0BD8 */ 0xCC, 0x06, 0x07, 0xE3, 0x29, 0xC2, 0xD7, 0x0E, // ....)... + /* 0BE0 */ 0x0E, 0xCE, 0x4F, 0x03, 0x06, 0xE7, 0xAF, 0x50, // ..O....P + /* 0BE8 */ 0x9F, 0xE7, 0x19, 0x38, 0xF6, 0xD4, 0xEB, 0x7B, // ...8...{ + /* 0BF0 */ 0x87, 0xE7, 0xEB, 0x43, 0x05, 0xFE, 0xA6, 0xE7, // ...C.... + /* 0BF8 */ 0x43, 0x05, 0x38, 0x0E, 0x0F, 0xFC, 0xB0, 0xC2, // C.8..... + /* 0C00 */ 0x86, 0xF0, 0x28, 0x80, 0x3F, 0xB5, 0xF8, 0xF8, // ..(.?... + /* 0C08 */ 0x17, 0xE7, 0x29, 0x82, 0xDD, 0x46, 0xB0, 0x87, // ..)..F.. + /* 0C10 */ 0x0B, 0xC0, 0x51, 0xB4, 0xB3, 0x18, 0x2A, 0xCC, // ..Q...*. + /* 0C18 */ 0x59, 0x8C, 0xFC, 0xFF, 0xCF, 0x51, 0xA8, 0xB3, // Y....Q.. + /* 0C20 */ 0x18, 0x3D, 0x5C, 0x00, 0x2E, 0x04, 0x1F, 0x0F, // .=\..... + /* 0C28 */ 0x40, 0x73, 0x10, 0x78, 0x5C, 0xF0, 0x85, 0xE0, // @s.x\... + /* 0C30 */ 0x48, 0x0E, 0xE4, 0xE9, 0x00, 0xF0, 0x19, 0x4A, // H......J + /* 0C38 */ 0xC3, 0xA1, 0x09, 0x13, 0x03, 0x06, 0x75, 0x3E, // ......u> + /* 0C40 */ 0xF0, 0x09, 0xC5, 0xC7, 0x0E, 0x7E, 0x36, 0xF0, // .....~6. + /* 0C48 */ 0x8D, 0xDC, 0x43, 0xE5, 0xA7, 0x66, 0x5F, 0xF2, // ..C..f_. + /* 0C50 */ 0x11, 0xE0, 0x02, 0x75, 0xA0, 0x61, 0xA0, 0x46, // ...u.a.F + /* 0C58 */ 0xE4, 0x23, 0xD2, 0xFF, 0xFF, 0xB9, 0x0D, 0x1B, // .#...... + /* 0C60 */ 0x60, 0x68, 0xF4, 0x1C, 0x0E, 0xE3, 0x80, 0xEB, // `h...... + /* 0C68 */ 0x73, 0x38, 0x76, 0x40, 0x3E, 0x87, 0xC3, 0x3F, // s8v@>..? + /* 0C70 */ 0x47, 0xC3, 0x1F, 0x1B, 0x3B, 0xDD, 0xF3, 0x81, // G...;... + /* 0C78 */ 0xC1, 0xBA, 0x7E, 0x63, 0x06, 0x06, 0xB6, 0x6F, // ..~c...o + /* 0C80 */ 0x91, 0x07, 0x06, 0x1C, 0x51, 0xCF, 0xC6, 0x57, // ....Q..W + /* 0C88 */ 0x08, 0x0F, 0x0C, 0x6C, 0x80, 0x1E, 0x18, 0xF0, // ...l.... + /* 0C90 */ 0x89, 0x05, 0x21, 0x27, 0x03, 0x43, 0x9D, 0x32, // ..!'.C.2 + /* 0C98 */ 0x8C, 0x1C, 0xF3, 0x89, 0xC3, 0xC3, 0xF0, 0xA1, // ........ + /* 0CA0 */ 0x22, 0xEA, 0x33, 0xC0, 0x23, 0x1E, 0x1B, 0x1B, // ".3.#... + /* 0CA8 */ 0xFB, 0xFF, 0x8F, 0x0D, 0x2C, 0xC7, 0x16, 0x8F, // ....,... + /* 0CB0 */ 0x0D, 0xFC, 0x47, 0x78, 0xFC, 0xD8, 0xE0, 0x8C, // ..Gx.... + /* 0CB8 */ 0xE5, 0xD1, 0xC4, 0x97, 0x99, 0x23, 0x3B, 0x8D, // .....#;. + /* 0CC0 */ 0x33, 0x7B, 0x0D, 0xF1, 0xD1, 0xEE, 0xF1, 0xDB, // 3{...... + /* 0CC8 */ 0x63, 0x03, 0x97, 0x85, 0xB1, 0x01, 0xA5, 0x90, // c....... + /* 0CD0 */ 0x63, 0x43, 0x1F, 0x52, 0x7C, 0x0A, 0xB0, 0x71, // cC.R|..q + /* 0CD8 */ 0x54, 0x32, 0x0F, 0x1F, 0xAF, 0x7C, 0x62, 0x38, // T2...|b8 + /* 0CE0 */ 0xBA, 0x20, 0x6F, 0xE8, 0xBE, 0x5C, 0xF8, 0x48, // . o..\.H + /* 0CE8 */ 0x63, 0x30, 0x5F, 0x5A, 0x7C, 0x06, 0xE5, 0x43, // c0_Z|..C + /* 0CF0 */ 0x04, 0xD7, 0x57, 0xC5, 0x43, 0x04, 0x3E, 0xA1, // ..W.C.>. + /* 0CF8 */ 0x86, 0x88, 0x1E, 0xCF, 0xFF, 0xFF, 0x11, 0xCC, // ........ + /* 0D00 */ 0x43, 0x64, 0x43, 0x03, 0xAF, 0x87, 0xA1, 0x01, // CdC..... + /* 0D08 */ 0xA5, 0x98, 0xC0, 0x5E, 0x85, 0x87, 0x46, 0x4F, // ...^..FO + /* 0D10 */ 0x3F, 0x3E, 0x04, 0x30, 0x08, 0xDF, 0x06, 0xD8, // ?>.0.... + /* 0D18 */ 0x55, 0xC0, 0x57, 0x21, 0x83, 0x24, 0x18, 0xE7, // U.W!.$.. + /* 0D20 */ 0x64, 0x41, 0x07, 0x07, 0x8E, 0x21, 0x79, 0x70, // dA...!yp + /* 0D28 */ 0xF0, 0x07, 0xE3, 0x21, 0x70, 0x60, 0xCF, 0xE0, // ...!p`.. + /* 0D30 */ 0xB9, 0xE8, 0x31, 0xD8, 0xA7, 0x1D, 0x9F, 0x4A, // ..1....J + /* 0D38 */ 0xC0, 0x77, 0xE6, 0x04, 0xC7, 0xE9, 0x1D, 0x7B, // .w.....{ + /* 0D40 */ 0x29, 0xF0, 0x08, 0x1E, 0xAD, 0x3C, 0x02, 0x7E, // )....<.~ + /* 0D48 */ 0xB4, 0x02, 0x66, 0xFF, 0xFF, 0xA3, 0x15, 0x30, // ..f....0 + /* 0D50 */ 0x09, 0x7A, 0xE6, 0xA4, 0x03, 0x77, 0x34, 0x18, // .z...w4. + /* 0D58 */ 0xD4, 0xD1, 0x0A, 0x5C, 0x11, 0xC0, 0x75, 0xDC, // ...\..u. + /* 0D60 */ 0xF0, 0xD1, 0x02, 0xCE, 0x50, 0x0F, 0xDA, 0x07, // ....P... + /* 0D68 */ 0x65, 0xCF, 0xDA, 0x97, 0x21, 0x76, 0xB4, 0x00, // e...!v.. + /* 0D70 */ 0x97, 0x89, 0x43, 0x08, 0xD0, 0x04, 0x3E, 0x89, // ..C...>. + /* 0D78 */ 0x67, 0xEF, 0x43, 0x03, 0xB3, 0x8A, 0xA1, 0x01, // g.C..... + /* 0D80 */ 0xA5, 0xA3, 0x01, 0xEE, 0x44, 0x81, 0xFD, 0xFF, // ....D... + /* 0D88 */ 0x9F, 0x28, 0x60, 0xDE, 0x30, 0x70, 0x07, 0x0A, // .(`.0p.. + /* 0D90 */ 0xC0, 0xCD, 0xE9, 0xDB, 0xE3, 0xE2, 0xD0, 0x38, // .......8 + /* 0D98 */ 0xC4, 0xE7, 0xA7, 0x73, 0xF6, 0xD1, 0xE8, 0x4C, // ...s...L + /* 0DA0 */ 0x71, 0x67, 0x11, 0x30, 0x9C, 0x7D, 0x11, 0x8F, // qg.0.}.. + /* 0DA8 */ 0x18, 0x03, 0xF9, 0x81, 0x21, 0x59, 0x30, 0x28, // ....!Y0( + /* 0DB0 */ 0x16, 0x0F, 0xC5, 0x07, 0x03, 0x0E, 0xEC, 0x23, // .......# + /* 0DB8 */ 0x02, 0x3B, 0x17, 0xB0, 0x73, 0xAD, 0xE1, 0xF8, // .;..s... + /* 0DC0 */ 0x59, 0xC0, 0xA7, 0x84, 0xB7, 0xA6, 0x17, 0x7B, // Y......{ + /* 0DC8 */ 0x9F, 0xD7, 0x7D, 0xD6, 0x08, 0xC9, 0xCE, 0xF4, // ..}..... + /* 0DD0 */ 0x3E, 0x89, 0xE2, 0x0E, 0xA2, 0x70, 0x4E, 0x9F, // >....pN. + /* 0DD8 */ 0xE0, 0x22, 0xF0, 0x65, 0xDF, 0xA3, 0xE0, 0xA7, // .".e.... + /* 0DE0 */ 0x07, 0xCF, 0xF1, 0x8D, 0xC1, 0xA7, 0x07, 0xE6, // ........ + /* 0DE8 */ 0x7E, 0xF8, 0x9A, 0xF1, 0x33, 0xC3, 0xE3, 0x43, // ~...3..C + /* 0DF0 */ 0x88, 0x27, 0xE2, 0xDA, 0xA6, 0x20, 0x5B, 0x18, // .'... [. + /* 0DF8 */ 0x42, 0x09, 0xF4, 0xFF, 0x8F, 0x10, 0xE5, 0x6D, // B......m + /* 0E00 */ 0x20, 0xCA, 0x29, 0x44, 0x88, 0x12, 0xA4, 0xB1, // .)D.... + /* 0E08 */ 0xC9, 0x0B, 0x35, 0xCA, 0xD9, 0x45, 0x6E, 0x6D, // ..5..Enm + /* 0E10 */ 0xF6, 0x82, 0x0B, 0x14, 0x2A, 0x66, 0x9C, 0x28, // ....*f.( + /* 0E18 */ 0xEF, 0x10, 0xB1, 0xDA, 0x1F, 0x04, 0x91, 0xF4, // ........ + /* 0E20 */ 0x32, 0xD0, 0x71, 0xC9, 0x91, 0x0E, 0x7D, 0xE8, // 2.q...}. + /* 0E28 */ 0x61, 0xFB, 0x04, 0x8C, 0x3F, 0x48, 0xE2, 0xAE, // a...?H.. + /* 0E30 */ 0x2A, 0x3E, 0x28, 0xF8, 0x00, 0x80, 0x77, 0x09, // *>(...w. + /* 0E38 */ 0xA8, 0x5B, 0x9D, 0xC7, 0xED, 0xF3, 0x06, 0xF8, // .[...... + /* 0E40 */ 0xAF, 0x17, 0x58, 0x82, 0xF2, 0x07, 0x81, 0x1A, // ..X..... + /* 0E48 */ 0x99, 0xA1, 0x3D, 0xCC, 0xB7, 0x19, 0x43, 0xBE, // ..=...C. + /* 0E50 */ 0x07, 0x1C, 0x16, 0x3B, 0x27, 0xF9, 0xF0, 0x08, // ...;'... + /* 0E58 */ 0x1C, 0x8E, 0x01, 0x4F, 0x1B, 0xBE, 0x51, 0x7B, // ...O..Q{ + /* 0E60 */ 0xBE, 0x3E, 0x62, 0x01, 0x8E, 0xFE, 0xFF, 0x47, // .>b....G + /* 0E68 */ 0x2C, 0x30, 0x9D, 0xDF, 0x7D, 0x82, 0x01, 0xC7, // ,0..}... + /* 0E70 */ 0xCD, 0x82, 0x9F, 0x61, 0x00, 0x67, 0x40, 0xCF, // ...a.g@. + /* 0E78 */ 0x30, 0x60, 0x1F, 0x2A, 0x6E, 0x08, 0x5C, 0xEE, // 0`.*n.\. + /* 0E80 */ 0x8A, 0x28, 0x90, 0x05, 0xC2, 0xA0, 0x0E, 0xFD, // .(...... + /* 0E88 */ 0xE4, 0x08, 0x42, 0xCF, 0x9C, 0x70, 0x86, 0x72, // ..B..p.r + /* 0E90 */ 0xB2, 0xBD, 0x5F, 0x1D, 0xC8, 0x2D, 0xC2, 0x43, // .._..-.C + /* 0E98 */ 0x3D, 0x8B, 0xC7, 0x04, 0x76, 0xDA, 0x02, 0x36, // =...v..6 + /* 0EA0 */ 0xFF, 0xFF, 0xE3, 0x29, 0xB0, 0x98, 0xF7, 0xD3, // ...).... + /* 0EA8 */ 0x69, 0x84, 0x63, 0x03, 0xFB, 0x71, 0x0B, 0x38, // i.c..q.8 + /* 0EB0 */ 0x1D, 0xCC, 0xE0, 0xDC, 0x7F, 0xD8, 0x2D, 0x1A, // ......-. + /* 0EB8 */ 0x37, 0x34, 0xB0, 0x0D, 0xCC, 0x43, 0x03, 0x3E, // 74...C.> + /* 0EC0 */ 0x27, 0x47, 0x30, 0x9E, 0x98, 0xF8, 0x55, 0xE2, // 'G0...U. + /* 0EC8 */ 0xE1, 0x89, 0x1F, 0x43, 0xC0, 0xFA, 0xFF, 0x3F, // ...C...? + /* 0ED0 */ 0x99, 0x01, 0xF6, 0x84, 0x1E, 0xCB, 0x50, 0xD2, // ......P. + /* 0ED8 */ 0x4E, 0x66, 0x80, 0xC0, 0xFB, 0xD8, 0x3B, 0xC3, // Nf....;. + /* 0EE0 */ 0x4B, 0x83, 0xE7, 0x74, 0xD2, 0xCF, 0x62, 0x3E, // K..t..b> + /* 0EE8 */ 0x99, 0x19, 0x21, 0x0A, 0xBB, 0x8F, 0x19, 0xAD, // ..!..... + /* 0EF0 */ 0x37, 0x14, 0xCD, 0x3C, 0xE8, 0x3B, 0x99, 0x51, // 7..<.;.Q + /* 0EF8 */ 0x62, 0x46, 0x6A, 0x0E, 0x4C, 0x48, 0x11, 0x0F, // bFj.LH.. + /* 0F00 */ 0x27, 0x4A, 0x88, 0x60, 0xAF, 0x13, 0x6F, 0x67, // 'J.`..og + /* 0F08 */ 0x4F, 0x66, 0x4C, 0xD6, 0xC9, 0x0C, 0x24, 0xFF, // OfL...$. + /* 0F10 */ 0xFF, 0x93, 0x19, 0x98, 0x5C, 0x9F, 0xCC, 0x80, // ....\... + /* 0F18 */ 0xCA, 0x39, 0x0A, 0x7F, 0x32, 0x03, 0x78, 0x74, // .9..2.xt + /* 0F20 */ 0xC0, 0xC2, 0x9D, 0xCC, 0xC0, 0xF2, 0xFF, 0x3F, // .......? + /* 0F28 */ 0xC4, 0x00, 0xCE, 0xC7, 0x0A, 0x63, 0x0C, 0x3C, // .....c.< + /* 0F30 */ 0xDA, 0xC1, 0x0C, 0x15, 0xE6, 0x6C, 0x86, 0x0E, // .....l.. + /* 0F38 */ 0x72, 0x08, 0xA1, 0xC1, 0x0E, 0x21, 0x50, 0xE6, // r....!P. + /* 0F40 */ 0x72, 0xA0, 0xA7, 0xF0, 0x9A, 0xE0, 0x73, 0x14, // r.....s. + /* 0F48 */ 0xD8, 0x0F, 0x67, 0xC0, 0xE1, 0xD4, 0x80, 0x0F, // ..g..... + /* 0F50 */ 0x74, 0xE2, 0x42, 0x8F, 0xC2, 0x23, 0x0E, 0x58, // t.B..#.X + /* 0F58 */ 0xFD, 0xC0, 0xC8, 0xFF, 0xFF, 0x64, 0x06, 0x18, // .....d.. + /* 0F60 */ 0x78, 0x6A, 0xF8, 0x40, 0x82, 0x63, 0x31, 0xEA, // xj.@.c1. + /* 0F68 */ 0x1B, 0xC4, 0x21, 0xBE, 0x8D, 0xF8, 0xE8, 0xFE, // ..!..... + /* 0F70 */ 0x6A, 0xE2, 0x4B, 0x00, 0xE6, 0x42, 0xE2, 0xD3, // j.K..B.. + /* 0F78 */ 0x09, 0xB3, 0x70, 0x38, 0x03, 0x5A, 0x43, 0x60, // ..p8.ZC` + /* 0F80 */ 0x57, 0x26, 0xCF, 0x9C, 0x0F, 0xE1, 0x6C, 0x3C, // W&....l< + /* 0F88 */ 0x7A, 0xDC, 0xE9, 0x04, 0xDE, 0x38, 0x7C, 0x3A, // z....8|: + /* 0F90 */ 0x01, 0x5E, 0x07, 0x0C, 0xCC, 0x0C, 0xC2, 0x3F, // .^.....? + /* 0F98 */ 0x84, 0xB0, 0x21, 0x9C, 0xAA, 0xC7, 0x70, 0xEE, // ..!...p. + /* 0FA0 */ 0xAF, 0x38, 0x3E, 0x9D, 0x80, 0xF3, 0xFF, 0x7F, // .8>..... + /* 0FA8 */ 0x62, 0x03, 0x0C, 0x0A, 0x7E, 0x32, 0xF8, 0xB8, // b...~2.. + /* 0FB0 */ 0x46, 0x25, 0xC2, 0xA0, 0x8E, 0xE6, 0x80, 0x7B, // F%.....{ + /* 0FB8 */ 0x98, 0x27, 0x36, 0x26, 0x6F, 0xC5, 0x1A, 0x8B, // .'6&o... + /* 0FC0 */ 0x4F, 0x6C, 0x30, 0xFF, 0xFF, 0x27, 0x36, 0x80, // Ol0..'6. + /* 0FC8 */ 0xD1, 0x87, 0x20, 0xB0, 0xFD, 0xFF, 0x0F, 0x41, // .. ....A + /* 0FD0 */ 0x60, 0x1C, 0xA0, 0x0F, 0x41, 0x80, 0x9B, 0xD3, // `...A... + /* 0FD8 */ 0x09, 0xEE, 0xC4, 0x07, 0xB6, 0x63, 0x10, 0x60, // .....c.` + /* 0FE0 */ 0x6D, 0xE8, 0x3E, 0x06, 0x81, 0xF9, 0xFF, 0x3F, // m.>....? + /* 0FE8 */ 0x5A, 0x98, 0xA3, 0xE0, 0xC2, 0x8E, 0x7C, 0x28, // Z.....|( + /* 0FF0 */ 0x29, 0xA7, 0x3E, 0xB4, 0x0C, 0x20, 0x69, 0x38, // ).>.. i8 + /* 0FF8 */ 0xC9, 0x01, 0x9D, 0xD3, 0x3D, 0x70, 0x92, 0x75, // ....=p.u + /* 1000 */ 0xEA, 0x40, 0x8F, 0xC7, 0xA0, 0xAF, 0x1C, 0xBE, // .@...... + /* 1008 */ 0x12, 0xF0, 0x23, 0x07, 0x93, 0x00, 0xAA, 0x41, // ..#....A + /* 1010 */ 0xFA, 0xCC, 0x07, 0x9C, 0x8E, 0x1C, 0xE0, 0x38, // .......8 + /* 1018 */ 0x26, 0x05, 0xC6, 0xDE, 0x0E, 0xDE, 0x22, 0x3D, // &....."= + /* 1020 */ 0x89, 0xA7, 0xA1, 0xE3, 0x0C, 0x51, 0x38, 0x26, // .....Q8& + /* 1028 */ 0x39, 0x18, 0x44, 0x7A, 0x95, 0x62, 0x03, 0x7C, // 9.Dz.b.| + /* 1030 */ 0xAB, 0xF1, 0xD9, 0xC8, 0x07, 0x10, 0x78, 0xE3, // ......x. + /* 1038 */ 0xF6, 0xD8, 0x61, 0xFF, 0xFF, 0x0F, 0x75, 0xC0, // ..a...u. + /* 1040 */ 0x01, 0xE2, 0xA4, 0xF8, 0x21, 0xC3, 0x98, 0x67, // ....!..g + /* 1048 */ 0xC5, 0x0F, 0x75, 0x80, 0xF5, 0x18, 0x27, 0x3A, // ..u...': + /* 1050 */ 0x94, 0xF0, 0x43, 0x1D, 0x20, 0xE8, 0xFF, 0x7F, // ..C. ... + /* 1058 */ 0xA8, 0x03, 0x86, 0x38, 0x6F, 0x24, 0xD1, 0x1E, // ...8o$.. + /* 1060 */ 0xEA, 0x98, 0xE8, 0x43, 0x1D, 0x40, 0xC8, 0xFF, // ...C.@.. + /* 1068 */ 0xFF, 0xA1, 0x0E, 0x18, 0x9E, 0x87, 0x00, 0xAE, // ........ + /* 1070 */ 0x9C, 0xEF, 0xC0, 0x7C, 0x22, 0x02, 0xEF, 0xFF, // ...|"... + /* 1078 */ 0xFF, 0x7C, 0x07, 0xB8, 0x1B, 0x2D, 0xCC, 0x51, // .|...-.Q + /* 1080 */ 0x70, 0x41, 0xAF, 0x0E, 0x03, 0x51, 0x09, 0x30, // pA...Q.0 + /* 1088 */ 0x28, 0x02, 0xC7, 0x5F, 0x9B, 0x60, 0x1C, 0xEA, // (.._.`.. + /* 1090 */ 0x7C, 0x87, 0x3E, 0x2F, 0x78, 0xD8, 0x4F, 0x05, // |.>/x.O. + /* 1098 */ 0x9E, 0xC4, 0xA9, 0xFA, 0x5A, 0x70, 0x14, 0x4F, // ....Zp.O + /* 10A0 */ 0x00, 0x3E, 0xE1, 0x01, 0xFF, 0xA1, 0xC1, 0x9A, // .>...... + /* 10A8 */ 0x44, 0xF1, 0x43, 0x03, 0xF5, 0x11, 0xE4, 0xFF, // D.C..... + /* 10B0 */ 0x7F, 0x68, 0xC0, 0x28, 0xEA, 0xF9, 0x06, 0x7D, // .h.(...} + /* 10B8 */ 0xCC, 0xF2, 0xD9, 0x20, 0xE6, 0x0B, 0x48, 0x84, // ... ..H. + /* 10C0 */ 0x07, 0x10, 0x5F, 0x1F, 0xD8, 0x71, 0xD2, 0x67, // .._..q.g + /* 10C8 */ 0xA0, 0x40, 0x51, 0xDE, 0x37, 0xF8, 0x09, 0x07, // .@Q.7... + /* 10D0 */ 0x5C, 0x83, 0xF3, 0x09, 0x07, 0xBC, 0x87, 0x23, // \......# + /* 10D8 */ 0x1F, 0x4B, 0xC0, 0x77, 0xD0, 0x84, 0x73, 0x81, // .K.w..s. + /* 10E0 */ 0xF1, 0x8D, 0x8D, 0x9D, 0x06, 0xC0, 0x76, 0x00, // ......v. + /* 10E8 */ 0x06, 0xDF, 0x69, 0x00, 0x1C, 0xC7, 0x24, 0x7E, // ..i...$~ + /* 10F0 */ 0x3A, 0x04, 0x13, 0xCC, 0xC1, 0xBC, 0x34, 0xFB, // :.....4. + /* 10F8 */ 0xFF, 0xEF, 0xFD, 0x94, 0x43, 0xCF, 0x86, 0x80, // ....C... + /* 1100 */ 0x75, 0x49, 0x07, 0x43, 0x94, 0x88, 0xB3, 0x21, // uI.C...! + /* 1108 */ 0x20, 0xFD, 0xFF, 0x7F, 0x36, 0xC4, 0x20, 0xC4, // ...6. . + /* 1110 */ 0x09, 0xFC, 0x12, 0xD1, 0xDC, 0xD9, 0x90, 0xAE, // ........ + /* 1118 */ 0xD8, 0x67, 0x43, 0x80, 0xE1, 0xFF, 0xFF, 0x23, // .gC....# + /* 1120 */ 0x00, 0xF6, 0x7C, 0x04, 0x38, 0x3D, 0x64, 0x83, // ..|.8=d. + /* 1128 */ 0xE7, 0x14, 0x08, 0xE3, 0xE4, 0x03, 0x38, 0xFE, // ......8. + /* 1130 */ 0xFF, 0x8F, 0x15, 0xE6, 0x18, 0x78, 0xEA, 0x97, // .....x.. + /* 1138 */ 0x9B, 0x8F, 0x03, 0x54, 0xD4, 0x2B, 0xC2, 0x30, // ...T.+.0 + /* 1140 */ 0x94, 0xC5, 0x87, 0x05, 0x1F, 0x11, 0xF8, 0x61, // .......a + /* 1148 */ 0xC1, 0x23, 0xA8, 0x78, 0x9C, 0xF4, 0x74, 0xE3, // .#.x..t. + /* 1150 */ 0x33, 0x21, 0x3B, 0x24, 0x38, 0xFC, 0x20, 0xE9, // 3!;$8. . + /* 1158 */ 0x41, 0x13, 0x3C, 0xE7, 0x23, 0x78, 0xB7, 0x1E, // A.<.#x.. + /* 1160 */ 0x38, 0xA7, 0x02, 0xC0, 0x4D, 0xAE, 0x27, 0xA3, // 8...M.'. + /* 1168 */ 0x4E, 0x17, 0x0E, 0x70, 0x8E, 0x92, 0x8D, 0x63, // N..p...c + /* 1170 */ 0x08, 0xE5, 0x70, 0xCC, 0xB7, 0x87, 0xA6, 0xC9, // ..p..... + /* 1178 */ 0x4E, 0x56, 0x30, 0x63, 0x41, 0xEA, 0x24, 0xE0, // NV0cA.$. + /* 1180 */ 0x01, 0x38, 0x10, 0x8C, 0xB4, 0x93, 0x68, 0x34, // .8....h4 + /* 1188 */ 0x86, 0xB3, 0x5A, 0x18, 0xC1, 0x19, 0xC4, 0xC7, // ..Z..... + /* 1190 */ 0x11, 0xE7, 0x3A, 0x19, 0xA1, 0x3F, 0x07, 0x3E, // ..:..?.> + /* 1198 */ 0x15, 0x61, 0x82, 0xDC, 0x4B, 0xE8, 0xBC, 0x7D, // .a..K..} + /* 11A0 */ 0x37, 0xE0, 0x57, 0x61, 0x8F, 0xC5, 0xFF, 0x7F, // 7.Wa.... + /* 11A8 */ 0x60, 0xDF, 0x4E, 0xC0, 0x31, 0x17, 0xAB, 0x01, // `.N.1... + /* 11B0 */ 0x45, 0x0D, 0xC0, 0x68, 0x98, 0x53, 0xC0, 0x53, // E..h.S.S + /* 11B8 */ 0x09, 0xB8, 0x82, 0xCD, 0x0D, 0x7D, 0x61, 0xB1, // .....}a. + /* 11C0 */ 0xD6, 0xA9, 0xE8, 0x14, 0xF4, 0x3E, 0x70, 0x70, // .....>pp + /* 11C8 */ 0xC0, 0x63, 0xF6, 0x1E, 0x1C, 0x2C, 0x34, 0x0F, // .c...,4. + /* 11D0 */ 0x0E, 0x6C, 0xD9, 0x06, 0x87, 0x56, 0x72, 0x17, // .l...Vr. + /* 11D8 */ 0x21, 0x87, 0x0F, 0xFC, 0xEC, 0x80, 0x03, 0xA0, // !....... + /* 11E0 */ 0x67, 0x07, 0x0B, 0xC9, 0xB3, 0x03, 0x9B, 0xBE, // g....... + /* 11E8 */ 0xB3, 0x08, 0x28, 0x70, 0xFE, 0xFF, 0x11, 0xDE, // ..(p.... + /* 11F0 */ 0x3B, 0x7C, 0x6E, 0x79, 0xF6, 0x60, 0x63, 0x78, // ;|ny.`cx + /* 11F8 */ 0x74, 0x31, 0x9A, 0xD1, 0xB9, 0xA6, 0xDB, 0x04, // t1...... + /* 1200 */ 0x4A, 0xC5, 0x6D, 0x82, 0x82, 0xF8, 0x06, 0xE0, // J.m..... + /* 1208 */ 0x84, 0x34, 0xBA, 0x75, 0xE2, 0x66, 0x62, 0xFC, // .4.u.fb. + /* 1210 */ 0x47, 0x0C, 0x1F, 0x11, 0x0E, 0xE9, 0x6C, 0x4D, // G.....lM + /* 1218 */ 0x30, 0x0F, 0xA4, 0x9E, 0x81, 0xBE, 0xB3, 0xE1, // 0....... + /* 1220 */ 0x67, 0x1F, 0xF2, 0xC1, 0xC5, 0xD3, 0xF0, 0xF5, // g....... + /* 1228 */ 0x86, 0xDC, 0x3B, 0xE8, 0xB4, 0x7D, 0x66, 0xC0, // ..;..}f. + /* 1230 */ 0x1C, 0x74, 0x7D, 0x9D, 0x7A, 0x83, 0x27, 0x57, // .t}.z.'W + /* 1238 */ 0x09, 0xEA, 0xE1, 0x02, 0x42, 0x2F, 0x34, 0xBE, // ....B/4. + /* 1240 */ 0xDC, 0x25, 0x78, 0xE0, 0xF4, 0xE9, 0xEE, 0xBD, // .%x..... + /* 1248 */ 0x84, 0x9D, 0xF1, 0x12, 0xBC, 0xE0, 0x25, 0x98, // ......%. + /* 1250 */ 0x77, 0x10, 0xA8, 0x51, 0x79, 0x10, 0x98, 0xAB, // w..Qy... + /* 1258 */ 0x3C, 0xCB, 0x37, 0x06, 0x54, 0xB2, 0x8B, 0x16, // <.7.T... + /* 1260 */ 0x3D, 0xC3, 0xBC, 0xC3, 0xF8, 0x92, 0xE0, 0xEB, // =....... + /* 1268 */ 0x87, 0xCF, 0x2D, 0x5E, 0xC0, 0xEB, 0x16, 0x0C, // ..-^.... + /* 1270 */ 0x82, 0x67, 0xA0, 0x57, 0x17, 0xDF, 0xD9, 0x0D, // .g.W.... + /* 1278 */ 0xFC, 0x2A, 0xF0, 0x46, 0x13, 0x22, 0x98, 0x61, // .*.F.".a + /* 1280 */ 0x0F, 0xFF, 0xDD, 0xDD, 0xA8, 0xBE, 0xE9, 0x18, // ........ + /* 1288 */ 0xEB, 0x75, 0xC4, 0x23, 0xE5, 0xC7, 0x96, 0x03, // .u.#.... + /* 1290 */ 0x8A, 0xF4, 0xF2, 0xE6, 0x09, 0xF8, 0x2C, 0xE3, // ......,. + /* 1298 */ 0x53, 0xDD, 0x49, 0xF9, 0x7A, 0x68, 0xF4, 0x57, // S.I.zh.W + /* 12A0 */ 0x08, 0x1F, 0x7E, 0x8C, 0xEC, 0x73, 0x0E, 0x3B, // ..~..s.; + /* 12A8 */ 0xDF, 0xB1, 0x41, 0x71, 0xC4, 0x07, 0x86, 0x97, // ..Aq.... + /* 12B0 */ 0x1A, 0x4F, 0x85, 0x9D, 0xBB, 0x60, 0x1C, 0x1C, // .O...`.. + /* 12B8 */ 0xD8, 0xB1, 0x08, 0x73, 0x7C, 0x05, 0xD7, 0xC9, // ...s|... + /* 12C0 */ 0xE6, 0xFF, 0xFF, 0xE4, 0x00, 0x6E, 0x78, 0xCC, // .....nx. + /* 12C8 */ 0xC1, 0xD7, 0xE7, 0x0D, 0xDF, 0x0C, 0x3C, 0x2E, // ......<. + /* 12D0 */ 0x7E, 0xE4, 0xF0, 0x49, 0xE3, 0xA5, 0xD3, 0xD8, // ~..I.... + /* 12D8 */ 0xA7, 0xE9, 0xA3, 0xD1, 0xCB, 0x9B, 0x4F, 0x2F, // ......O/ + /* 12E0 */ 0x18, 0x58, 0x5F, 0x1A, 0x38, 0xAC, 0xD1, 0xC2, // .X_.8... + /* 12E8 */ 0x3E, 0x06, 0x9C, 0xB9, 0x2F, 0x44, 0xB8, 0xC3, // >.../D.. + /* 12F0 */ 0x23, 0x58, 0x00, 0xF1, 0xB7, 0x92, 0x47, 0x0E, // #X....G. + /* 12F8 */ 0x4F, 0xC0, 0x80, 0x4C, 0xD3, 0xBA, 0x74, 0x20, // O..L..t + /* 1300 */ 0xE2, 0xA7, 0x3C, 0x2B, 0x5F, 0x99, 0x2E, 0x43, // ..<+_..C + /* 1308 */ 0x0C, 0xE3, 0xA9, 0xF2, 0xF1, 0xC3, 0xB3, 0xF1, // ........ + /* 1310 */ 0x51, 0xC0, 0xC7, 0x28, 0xCF, 0xFC, 0x8C, 0x22, // Q..(..." + /* 1318 */ 0xBD, 0x32, 0x10, 0x50, 0x9D, 0x88, 0xB8, 0x42, // .2.P...B + /* 1320 */ 0x18, 0x89, 0xA1, 0xD1, 0x9D, 0x83, 0xC7, 0x1F, // ........ + /* 1328 */ 0x22, 0x05, 0x31, 0xA0, 0x6F, 0x2E, 0xC0, 0xF4, // ".1.o... + /* 1330 */ 0x4C, 0x04, 0x5C, 0xFE, 0xFF, 0x37, 0x17, 0x80, // L.\..7.. + /* 1338 */ 0xFF, 0xFF, 0xFF, 0x9B, 0x0B, 0xE0, 0xE6, 0xFE, // ........ + /* 1340 */ 0xE0, 0x9B, 0x0B, 0x70, 0x8D, 0xB4, 0x2A, 0x7A, // ...p..*z + /* 1348 */ 0x61, 0x77, 0x08, 0x18, 0xD4, 0x9D, 0x1D, 0x70, // aw.....p + /* 1350 */ 0x78, 0x2B, 0x78, 0x67, 0x87, 0xF5, 0xFF, 0xBF, // x+xg.... + /* 1358 */ 0xB3, 0xC3, 0xC3, 0x8C, 0x13, 0xE5, 0x85, 0x21, // .......! + /* 1360 */ 0xC6, 0x3B, 0x3B, 0x0B, 0xF0, 0x26, 0xD0, 0x51, // .;;..&.Q + /* 1368 */ 0xC6, 0x77, 0x76, 0x80, 0x1F, 0x67, 0xD8, 0x77, // .wv..g.w + /* 1370 */ 0x69, 0xF0, 0x5E, 0x75, 0x81, 0xF5, 0xFF, 0xFF, // i.^u.... + /* 1378 */ 0xAA, 0x0B, 0x3C, 0x04, 0xDF, 0xA7, 0x41, 0x3E, // ..<...A> + /* 1380 */ 0x5E, 0x30, 0x8C, 0x83, 0x2B, 0x27, 0xA1, 0xC7, // ^0..+'.. + /* 1388 */ 0x02, 0x6B, 0x85, 0x41, 0xDD, 0xA9, 0xC1, 0xA5, // .k.A.... + /* 1390 */ 0x09, 0x5C, 0x17, 0x5F, 0x1F, 0x6A, 0x7C, 0xA4, // .\._.j|. + /* 1398 */ 0xC5, 0x9F, 0x2F, 0x70, 0x01, 0x86, 0x4C, 0x4F, // ../p..LO + /* 13A0 */ 0x65, 0x30, 0xAE, 0x29, 0x3E, 0x95, 0x61, 0xEE, // e0.)>.a. + /* 13A8 */ 0x0E, 0x1E, 0x90, 0x8F, 0x18, 0xC0, 0x67, 0x15, // ......g. + /* 13B0 */ 0x1E, 0x18, 0xEE, 0xB4, 0xE0, 0x9B, 0x92, 0x41, // .......A + /* 13B8 */ 0xCF, 0x31, 0xA8, 0x8F, 0x3C, 0x27, 0xEF, 0x7B, // .1..<'.{ + /* 13C0 */ 0xC2, 0xE3, 0x84, 0xA3, 0x9E, 0x83, 0xE8, 0xD8, // ........ + /* 13C8 */ 0xC0, 0x71, 0xDC, 0xC0, 0xFD, 0xFF, 0xC7, 0x06, // .q...... + /* 13D0 */ 0xEF, 0x70, 0x83, 0x3B, 0xE8, 0xF8, 0x62, 0x70, // .p.;..bp + /* 13D8 */ 0x5C, 0x18, 0xB8, 0xE7, 0x02, 0x0F, 0xC3, 0x37, // \......7 + /* 13E0 */ 0x1D, 0x8F, 0x08, 0x33, 0xFE, 0xD7, 0x3F, 0x23, // ...3..?# + /* 13E8 */ 0x04, 0xC4, 0x5F, 0x8C, 0xD8, 0x80, 0xC1, 0x78, // .._....x + /* 13F0 */ 0x6B, 0xF3, 0xF5, 0x0D, 0x37, 0x60, 0x5F, 0x1D, // k...7`_. + /* 13F8 */ 0x7C, 0xC1, 0xF0, 0x09, 0xCC, 0xE8, 0x2F, 0x30, // |...../0 + /* 1400 */ 0x4F, 0x62, 0x3E, 0x36, 0x90, 0x0B, 0x1C, 0x1D, // Ob>6.... + /* 1408 */ 0x30, 0x38, 0x00, 0x3D, 0x60, 0xF8, 0x87, 0x8B, // 08.=`... + /* 1410 */ 0x77, 0x39, 0x30, 0x5C, 0x05, 0x7D, 0x5C, 0xF0, // w90\.}\. + /* 1418 */ 0xB1, 0xC7, 0x8A, 0xEE, 0x72, 0xE8, 0x9B, 0x9C, // ....r... + /* 1420 */ 0x61, 0xE2, 0x18, 0xE2, 0x0D, 0x8C, 0xDD, 0x25, // a......% + /* 1428 */ 0xC8, 0x61, 0x0E, 0xEA, 0x5D, 0xC2, 0x73, 0xE0, // .a..].s. + /* 1430 */ 0x67, 0x0B, 0x9F, 0xE0, 0x7C, 0xF3, 0x09, 0x71, // g...|..q + /* 1438 */ 0xAA, 0x8F, 0x56, 0xEF, 0x01, 0x3E, 0x7A, 0xBC, // ..V..>z. + /* 1440 */ 0x77, 0xF9, 0xEC, 0xC4, 0x2E, 0x02, 0x3E, 0x72, // w.....>r + /* 1448 */ 0x19, 0xC7, 0xD3, 0xF4, 0x15, 0xD0, 0x43, 0x36, // ......C6 + /* 1450 */ 0xD8, 0xAB, 0x86, 0x4F, 0x60, 0x3E, 0xBA, 0xE1, // ...O`>.. + /* 1458 */ 0x8E, 0x51, 0x9E, 0x89, 0xA7, 0xEF, 0x3B, 0x08, // .Q....;. + /* 1460 */ 0x3B, 0x92, 0x1C, 0x75, 0xA8, 0x6B, 0x7A, 0x44, // ;..u.kzD + /* 1468 */ 0xF9, 0xFF, 0x9F, 0xD0, 0x81, 0xF8, 0xD6, 0x06, // ........ + /* 1470 */ 0xCE, 0x68, 0xF7, 0x0F, 0xF4, 0x36, 0x3D, 0x32, // .h...6=2 + /* 1478 */ 0xCC, 0xD1, 0x00, 0xD6, 0x25, 0x04, 0x5C, 0x77, // ....%.\w + /* 1480 */ 0x0C, 0x5F, 0x42, 0x80, 0x4F, 0xD0, 0x4B, 0x04, // ._B.O.K. + /* 1488 */ 0xFA, 0x9A, 0xE1, 0xD1, 0x3D, 0x02, 0x60, 0xAE, // ....=.`. + /* 1490 */ 0x18, 0xEC, 0x58, 0xE0, 0xC3, 0x86, 0xAF, 0x01, // ..X..... + /* 1498 */ 0xEC, 0x5E, 0xE0, 0x30, 0xF7, 0x08, 0x50, 0x81, // .^.0..P. + /* 14A0 */ 0x7A, 0x78, 0xF0, 0xD5, 0xDE, 0x23, 0x40, 0x71, // zx...#@q + /* 14A8 */ 0xB2, 0xF4, 0xA1, 0xC1, 0x03, 0xB5, 0xAA, 0x33, // .......3 + /* 14B0 */ 0x26, 0x94, 0x23, 0x26, 0x3F, 0x9B, 0xF9, 0x26, // &.#&?..& + /* 14B8 */ 0x81, 0xB9, 0x5D, 0xFA, 0x26, 0x01, 0x37, 0xCF, // ..].&.7. + /* 14C0 */ 0x2C, 0x50, 0x49, 0x20, 0xF4, 0xFF, 0xBF, 0x49, // ,PI ...I + /* 14C8 */ 0xC0, 0x85, 0xE9, 0xF2, 0x32, 0x43, 0xE7, 0x7F, // ....2C.. + /* 14D0 */ 0xE0, 0xBE, 0xD5, 0x79, 0x84, 0x3E, 0x44, 0x30, // ...y.>D0 + /* 14D8 */ 0x94, 0xF7, 0x3C, 0x9F, 0xC2, 0xF8, 0x19, 0xC2, // ..<..... + /* 14E0 */ 0x07, 0x4C, 0x76, 0xA6, 0xE0, 0x67, 0x4D, 0xDC, // .Lv..gM. + /* 14E8 */ 0x1D, 0xC0, 0x28, 0x6F, 0x9E, 0x9E, 0x00, 0x3B, // ..(o...; + /* 14F0 */ 0x7F, 0x1A, 0xF9, 0xDD, 0xE0, 0x5D, 0xC0, 0xD3, // .....].. + /* 14F8 */ 0xF7, 0xBD, 0x88, 0x9F, 0x28, 0xC0, 0x17, 0xEC, // ....(... + /* 1500 */ 0x4E, 0x07, 0x05, 0xFA, 0x84, 0x3C, 0x22, 0xA3, // N....<". + /* 1508 */ 0xFA, 0x88, 0xC0, 0x2F, 0x49, 0x60, 0x3C, 0x92, // .../I`<. + /* 1510 */ 0xF8, 0x40, 0x01, 0x84, 0xEE, 0x05, 0xA8, 0xD3, // .@...... + /* 1518 */ 0x07, 0x47, 0x3D, 0xE3, 0x17, 0x54, 0x63, 0xBE, // .G=..Tc. + /* 1520 */ 0x5B, 0x3D, 0xC2, 0x79, 0x72, 0x98, 0xCB, 0x01, // [=.yr... + /* 1528 */ 0x8B, 0x73, 0x4D, 0x02, 0xD5, 0x71, 0x97, 0x8F, // .sM..q.. + /* 1530 */ 0x0E, 0xEE, 0xB5, 0x15, 0xFB, 0xFF, 0x27, 0x38, // ......'8 + /* 1538 */ 0xB8, 0x77, 0x96, 0x77, 0x3E, 0x43, 0x79, 0x90, // .w.w>Cy. + /* 1540 */ 0xE0, 0xBB, 0xB6, 0x82, 0xE3, 0xAA, 0x06, 0xE3, // ........ + /* 1548 */ 0xD8, 0xC2, 0x2F, 0x79, 0x80, 0x9D, 0x61, 0x71, // ../y..aq + /* 1550 */ 0xC1, 0x7F, 0x0F, 0x03, 0x51, 0x89, 0x30, 0x28, // ....Q.0( + /* 1558 */ 0x02, 0xCB, 0xBB, 0xB7, 0x52, 0xF8, 0x43, 0x06, // ....R.C. + /* 1560 */ 0xE3, 0x4D, 0x81, 0x4F, 0x1A, 0x3B, 0x6A, 0xE0, // .M.O.;j. + /* 1568 */ 0xFB, 0xFF, 0x1F, 0x35, 0xD8, 0x86, 0x8A, 0xBB, // ...5.... + /* 1570 */ 0x29, 0x82, 0x75, 0xAA, 0x98, 0x21, 0xF0, 0x60, // ).u..!.` + /* 1578 */ 0x0F, 0x00, 0x9F, 0xAF, 0x7C, 0x06, 0x50, 0x14, // ....|.P. + /* 1580 */ 0x18, 0xD4, 0xA1, 0x1D, 0xCE, 0x6D, 0x18, 0x70, // .....m.p + /* 1588 */ 0x30, 0x62, 0xDC, 0xA5, 0x10, 0xEE, 0x94, 0xDF, // 0b...... + /* 1590 */ 0x51, 0x62, 0x3F, 0x97, 0xB3, 0xE9, 0xE2, 0xAE, // Qb?..... + /* 1598 */ 0xE6, 0x3E, 0x9D, 0xB0, 0x0B, 0x32, 0x8C, 0xB3, // .>...2.. + /* 15A0 */ 0xC0, 0x23, 0xC0, 0xAB, 0x39, 0xBF, 0x20, 0x3F, // .#..9. ? + /* 15A8 */ 0x17, 0xBF, 0x10, 0x3C, 0x26, 0x85, 0x78, 0x53, // ...<&.xS + /* 15B0 */ 0x7A, 0x25, 0x36, 0xC6, 0x93, 0x71, 0x73, 0xB7, // z%6..qs. + /* 15B8 */ 0x62, 0x72, 0xDE, 0x79, 0x41, 0x36, 0xC6, 0xD1, // br.yA6.. + /* 15C0 */ 0x44, 0x8C, 0x72, 0x6E, 0x0F, 0x03, 0x91, 0x5F, // D.rn..._ + /* 15C8 */ 0x90, 0x7D, 0x3F, 0x79, 0x21, 0x88, 0x18, 0xCD, // .}?y!... + /* 15D0 */ 0x10, 0x41, 0x9F, 0x97, 0x8D, 0x15, 0x28, 0xDE, // .A....(. + /* 15D8 */ 0x0B, 0x32, 0x13, 0xF8, 0x56, 0xD0, 0xC1, 0xC5, // .2..V... + /* 15E0 */ 0x17, 0x64, 0xEC, 0xFF, 0xFF, 0x82, 0x0C, 0x30, // .d.....0 + /* 15E8 */ 0xE2, 0x64, 0x04, 0xF8, 0x3C, 0x71, 0xE0, 0xCE, // .d..