From b40d981d9c4d557be86c696427087d98e7afca7c Mon Sep 17 00:00:00 2001 From: Al Stone Date: May 13 2018 02:23:34 +0000 Subject: New upstream version 20180313 --- diff --git a/changes.txt b/changes.txt index 61afab3..855f361 100644 --- a/changes.txt +++ b/changes.txt @@ -1,4 +1,50 @@ ---------------------------------------- +13 March 2018. Summary of changes for version 20180313: + + +1) ACPICA kernel-resident subsystem: + +Implemented various improvements to the GPE support: + +1) Dispatch all active GPEs at initialization time so that no GPEs are +lost. +2) Enable runtime GPEs earlier. Some systems expect GPEs to be enabled +before devices are enumerated. +3) Don't unconditionally clear ACPI IRQs during suspend/resume, so that +IRQs are not lost. +4) Add parallel GPE handling to eliminate the possibility of dispatching +the same GPE twice. +5) Dispatch any pending GPEs after enabling for the first time. + +AcpiGetObjectInfo - removed support for the _STA method. This was causing +problems on some platforms. + +Added a new _OSI string, "Windows 2017.2". + +Cleaned up and simplified the module-level code support. These changes +are in preparation for the eventual removal of the legacy MLC support +(deferred execution), replaced by the new MLC architecture which executes +the MLC as a table is loaded (DSDT/SSDTs). + +Changed a compile-time option to a runtime option. Changes the option to +ignore ACPI table load-time package resolution errors into a runtime +option. Used only for platforms that generate many AE_NOT_FOUND errors +during boot. AcpiGbl_IgnorePackageResolutionErrors. + +Fixed the ACPI_ERROR_NAMESPACE macro. This change involves putting some +ACPI_ERROR_NAMESPACE parameters inside macros. By doing so, we avoid +compilation errors from unused variables (seen with some compilers). + + +2) iASL Compiler/Disassembler and Tools: + +ASLTS: parallelized execution in order to achieve an (approximately) 2X +performance increase. + +ASLTS: Updated to use the iASL __LINE__ and __METHOD__ macros. Improves +error reporting. + +---------------------------------------- 09 February 2018. Summary of changes for version 20180209: diff --git a/source/components/debugger/dbdisply.c b/source/components/debugger/dbdisply.c index 886a34e..357484f 100644 --- a/source/components/debugger/dbdisply.c +++ b/source/components/debugger/dbdisply.c @@ -712,9 +712,8 @@ AcpiDbDisplayObjectType ( return; } - AcpiOsPrintf ("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n", - ACPI_FORMAT_UINT64 (Info->Address), - Info->CurrentStatus, Info->Flags); + AcpiOsPrintf ("ADR: %8.8X%8.8X, Flags: %X\n", + ACPI_FORMAT_UINT64 (Info->Address), Info->Flags); AcpiOsPrintf ("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n", Info->HighestDstates[0], Info->HighestDstates[1], diff --git a/source/components/dispatcher/dspkginit.c b/source/components/dispatcher/dspkginit.c index 4083e02..56ab585 100644 --- a/source/components/dispatcher/dspkginit.c +++ b/source/components/dispatcher/dspkginit.c @@ -438,34 +438,33 @@ AcpiDsResolvePackageElement ( ScopeInfo.Scope.Node = Element->Reference.Node; /* Prefix node */ - Status = AcpiNsLookup (&ScopeInfo, - (char *) Element->Reference.Aml, /* Pointer to AML path */ + Status = AcpiNsLookup (&ScopeInfo, (char *) Element->Reference.Aml, ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL, &ResolvedNode); if (ACPI_FAILURE (Status)) { -#if defined ACPI_IGNORE_PACKAGE_RESOLUTION_ERRORS && !defined ACPI_APPLICATION - /* - * For the kernel-resident ACPICA, optionally be silent about the - * NOT_FOUND case. Although this is potentially a serious problem, - * it can generate a lot of noise/errors on platforms whose - * firmware carries around a bunch of unused Package objects. - * To disable these errors, define ACPI_IGNORE_PACKAGE_RESOLUTION_ERRORS - * in the OS-specific header. - * - * All errors are always reported for ACPICA applications such as - * AcpiExec. - */ - if (Status == AE_NOT_FOUND) + if ((Status == AE_NOT_FOUND) && AcpiGbl_IgnorePackageResolutionErrors) { - /* Reference name not found, set the element to NULL */ + /* + * Optionally be silent about the NOT_FOUND case for the referenced + * name. Although this is potentially a serious problem, + * it can generate a lot of noise/errors on platforms whose + * firmware carries around a bunch of unused Package objects. + * To disable these errors, set this global to TRUE: + * AcpiGbl_IgnorePackageResolutionErrors + * + * If the AML actually tries to use such a package, the unresolved + * element(s) will be replaced with NULL elements. + */ + + /* Referenced name not found, set the element to NULL */ AcpiUtRemoveReference (*ElementPtr); *ElementPtr = NULL; return_VOID; } -#endif + Status2 = AcpiNsExternalizeName (ACPI_UINT32_MAX, (char *) Element->Reference.Aml, NULL, &ExternalPath); diff --git a/source/components/events/evevent.c b/source/components/events/evevent.c index f802e9b..cec39cb 100644 --- a/source/components/events/evevent.c +++ b/source/components/events/evevent.c @@ -236,6 +236,7 @@ AcpiEvFixedEventDetect ( UINT32 FixedStatus; UINT32 FixedEnable; UINT32 i; + ACPI_STATUS Status; ACPI_FUNCTION_NAME (EvFixedEventDetect); @@ -245,8 +246,12 @@ AcpiEvFixedEventDetect ( * Read the fixed feature status and enable registers, as all the cases * depend on their values. Ignore errors here. */ - (void) AcpiHwRegisterRead (ACPI_REGISTER_PM1_STATUS, &FixedStatus); - (void) AcpiHwRegisterRead (ACPI_REGISTER_PM1_ENABLE, &FixedEnable); + Status = AcpiHwRegisterRead (ACPI_REGISTER_PM1_STATUS, &FixedStatus); + Status |= AcpiHwRegisterRead (ACPI_REGISTER_PM1_ENABLE, &FixedEnable); + if (ACPI_FAILURE (Status)) + { + return (IntStatus); + } ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS, "Fixed Event Block: Enable %08X Status %08X\n", diff --git a/source/components/events/evgpe.c b/source/components/events/evgpe.c index 34294c0..15e260a 100644 --- a/source/components/events/evgpe.c +++ b/source/components/events/evgpe.c @@ -118,7 +118,7 @@ AcpiEvUpdateGpeEnableMask ( * * RETURN: Status * - * DESCRIPTION: Clear a GPE of stale events and enable it. + * DESCRIPTION: Enable a GPE. * ******************************************************************************/ @@ -132,14 +132,6 @@ AcpiEvEnableGpe ( ACPI_FUNCTION_TRACE (EvEnableGpe); - /* Clear the GPE (of stale events) */ - - Status = AcpiHwClearGpe (GpeEventInfo); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } - /* Enable the requested GPE */ Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE); @@ -434,17 +426,12 @@ UINT32 AcpiEvGpeDetect ( ACPI_GPE_XRUPT_INFO *GpeXruptList) { - ACPI_STATUS Status; ACPI_GPE_BLOCK_INFO *GpeBlock; ACPI_NAMESPACE_NODE *GpeDevice; ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; ACPI_GPE_EVENT_INFO *GpeEventInfo; UINT32 GpeNumber; - ACPI_GPE_HANDLER_INFO *GpeHandlerInfo; UINT32 IntStatus = ACPI_INTERRUPT_NOT_HANDLED; - UINT8 EnabledStatusByte; - UINT64 StatusReg; - UINT64 EnableReg; ACPI_CPU_FLAGS Flags; UINT32 i; UINT32 j; @@ -500,105 +487,25 @@ AcpiEvGpeDetect ( continue; } - /* Read the Status Register */ - - Status = AcpiHwRead (&StatusReg, &GpeRegisterInfo->StatusAddress); - if (ACPI_FAILURE (Status)) - { - goto UnlockAndExit; - } - - /* Read the Enable Register */ - - Status = AcpiHwRead (&EnableReg, &GpeRegisterInfo->EnableAddress); - if (ACPI_FAILURE (Status)) - { - goto UnlockAndExit; - } - - ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS, - "Read registers for GPE %02X-%02X: Status=%02X, Enable=%02X, " - "RunEnable=%02X, WakeEnable=%02X\n", - GpeRegisterInfo->BaseGpeNumber, - GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1), - (UINT32) StatusReg, (UINT32) EnableReg, - GpeRegisterInfo->EnableForRun, - GpeRegisterInfo->EnableForWake)); - - /* Check if there is anything active at all in this register */ - - EnabledStatusByte = (UINT8) (StatusReg & EnableReg); - if (!EnabledStatusByte) - { - /* No active GPEs in this register, move on */ - - continue; - } - /* Now look at the individual GPEs in this byte register */ for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) { - /* Examine one GPE bit */ + /* Detect and dispatch one GPE bit */ GpeEventInfo = &GpeBlock->EventInfo[((ACPI_SIZE) i * ACPI_GPE_REGISTER_WIDTH) + j]; GpeNumber = j + GpeRegisterInfo->BaseGpeNumber; - - if (EnabledStatusByte & (1 << j)) - { - /* Invoke global event handler if present */ - - AcpiGpeCount++; - if (AcpiGbl_GlobalEventHandler) - { - AcpiGbl_GlobalEventHandler (ACPI_EVENT_TYPE_GPE, - GpeDevice, GpeNumber, - AcpiGbl_GlobalEventHandlerContext); - } - - /* Found an active GPE */ - - if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == - ACPI_GPE_DISPATCH_RAW_HANDLER) - { - /* Dispatch the event to a raw handler */ - - GpeHandlerInfo = GpeEventInfo->Dispatch.Handler; - - /* - * There is no protection around the namespace node - * and the GPE handler to ensure a safe destruction - * because: - * 1. The namespace node is expected to always - * exist after loading a table. - * 2. The GPE handler is expected to be flushed by - * AcpiOsWaitEventsComplete() before the - * destruction. - */ - AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); - IntStatus |= GpeHandlerInfo->Address ( - GpeDevice, GpeNumber, GpeHandlerInfo->Context); - Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); - } - else - { - /* - * Dispatch the event to a standard handler or - * method. - */ - IntStatus |= AcpiEvGpeDispatch (GpeDevice, - GpeEventInfo, GpeNumber); - } - } + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); + IntStatus |= AcpiEvDetectGpe ( + GpeDevice, GpeEventInfo, GpeNumber); + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); } } GpeBlock = GpeBlock->Next; } -UnlockAndExit: - AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); return (IntStatus); } @@ -786,6 +693,137 @@ AcpiEvFinishGpe ( /******************************************************************************* * + * FUNCTION: AcpiEvDetectGpe + * + * PARAMETERS: GpeDevice - Device node. NULL for GPE0/GPE1 + * GpeEventInfo - Info for this GPE + * GpeNumber - Number relative to the parent GPE block + * + * RETURN: INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED + * + * DESCRIPTION: Detect and dispatch a General Purpose Event to either a function + * (e.g. EC) or method (e.g. _Lxx/_Exx) handler. + * NOTE: GPE is W1C, so it is possible to handle a single GPE from both + * task and irq context in parallel as long as the process to + * detect and mask the GPE is atomic. + * However the atomicity of ACPI_GPE_DISPATCH_RAW_HANDLER is + * dependent on the raw handler itself. + * + ******************************************************************************/ + +UINT32 +AcpiEvDetectGpe ( + ACPI_NAMESPACE_NODE *GpeDevice, + ACPI_GPE_EVENT_INFO *GpeEventInfo, + UINT32 GpeNumber) +{ + UINT32 IntStatus = ACPI_INTERRUPT_NOT_HANDLED; + UINT8 EnabledStatusByte; + UINT64 StatusReg; + UINT64 EnableReg; + UINT32 RegisterBit; + ACPI_GPE_REGISTER_INFO *GpeRegisterInfo; + ACPI_GPE_HANDLER_INFO *GpeHandlerInfo; + ACPI_CPU_FLAGS Flags; + ACPI_STATUS Status; + + + ACPI_FUNCTION_TRACE (EvGpeDetect); + + + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); + + /* Get the info block for the entire GPE register */ + + GpeRegisterInfo = GpeEventInfo->RegisterInfo; + + /* Get the register bitmask for this GPE */ + + RegisterBit = AcpiHwGetGpeRegisterBit (GpeEventInfo); + + /* GPE currently enabled (enable bit == 1)? */ + + Status = AcpiHwRead (&EnableReg, &GpeRegisterInfo->EnableAddress); + if (ACPI_FAILURE (Status)) + { + goto ErrorExit; + } + + /* GPE currently active (status bit == 1)? */ + + Status = AcpiHwRead (&StatusReg, &GpeRegisterInfo->StatusAddress); + if (ACPI_FAILURE (Status)) + { + goto ErrorExit; + } + + /* Check if there is anything active at all in this GPE */ + + ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS, + "Read registers for GPE %02X: Status=%02X, Enable=%02X, " + "RunEnable=%02X, WakeEnable=%02X\n", + GpeNumber, + (UINT32) (StatusReg & RegisterBit), + (UINT32) (EnableReg & RegisterBit), + GpeRegisterInfo->EnableForRun, + GpeRegisterInfo->EnableForWake)); + + EnabledStatusByte = (UINT8) (StatusReg & EnableReg); + if (!(EnabledStatusByte & RegisterBit)) + { + goto ErrorExit; + } + + /* Invoke global event handler if present */ + + AcpiGpeCount++; + if (AcpiGbl_GlobalEventHandler) + { + AcpiGbl_GlobalEventHandler (ACPI_EVENT_TYPE_GPE, + GpeDevice, GpeNumber, + AcpiGbl_GlobalEventHandlerContext); + } + + /* Found an active GPE */ + + if (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == + ACPI_GPE_DISPATCH_RAW_HANDLER) + { + /* Dispatch the event to a raw handler */ + + GpeHandlerInfo = GpeEventInfo->Dispatch.Handler; + + /* + * There is no protection around the namespace node + * and the GPE handler to ensure a safe destruction + * because: + * 1. The namespace node is expected to always + * exist after loading a table. + * 2. The GPE handler is expected to be flushed by + * AcpiOsWaitEventsComplete() before the + * destruction. + */ + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); + IntStatus |= GpeHandlerInfo->Address ( + GpeDevice, GpeNumber, GpeHandlerInfo->Context); + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); + } + else + { + /* Dispatch the event to a standard handler or method. */ + + IntStatus |= AcpiEvGpeDispatch (GpeDevice, + GpeEventInfo, GpeNumber); + } + +ErrorExit: + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); + return (IntStatus); +} + + +/******************************************************************************* + * * FUNCTION: AcpiEvGpeDispatch * * PARAMETERS: GpeDevice - Device node. NULL for GPE0/GPE1 @@ -797,8 +835,6 @@ AcpiEvFinishGpe ( * DESCRIPTION: Dispatch a General Purpose Event to either a function (e.g. EC) * or method (e.g. _Lxx/_Exx) handler. * - * This function executes at interrupt level. - * ******************************************************************************/ UINT32 diff --git a/source/components/events/evgpeblk.c b/source/components/events/evgpeblk.c index 6c929e7..cded059 100644 --- a/source/components/events/evgpeblk.c +++ b/source/components/events/evgpeblk.c @@ -477,7 +477,7 @@ ACPI_STATUS AcpiEvInitializeGpeBlock ( ACPI_GPE_XRUPT_INFO *GpeXruptInfo, ACPI_GPE_BLOCK_INFO *GpeBlock, - void *Ignored) + void *Context) { ACPI_STATUS Status; ACPI_GPE_EVENT_INFO *GpeEventInfo; @@ -485,6 +485,8 @@ AcpiEvInitializeGpeBlock ( UINT32 GpeIndex; UINT32 i; UINT32 j; + BOOLEAN *IsPollingNeeded = Context; + ACPI_ERROR_ONLY (UINT32 GpeNumber); ACPI_FUNCTION_TRACE (EvInitializeGpeBlock); @@ -514,14 +516,14 @@ AcpiEvInitializeGpeBlock ( GpeIndex = (i * ACPI_GPE_REGISTER_WIDTH) + j; GpeEventInfo = &GpeBlock->EventInfo[GpeIndex]; + ACPI_ERROR_ONLY(GpeNumber = GpeBlock->BlockBaseNumber + GpeIndex); + GpeEventInfo->Flags |= ACPI_GPE_INITIALIZED; /* * Ignore GPEs that have no corresponding _Lxx/_Exx method * and GPEs that are used to wake the system */ - if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_NONE) || - (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_HANDLER) || - (ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) == ACPI_GPE_DISPATCH_RAW_HANDLER) || + if ((ACPI_GPE_DISPATCH_TYPE (GpeEventInfo->Flags) != ACPI_GPE_DISPATCH_METHOD) || (GpeEventInfo->Flags & ACPI_GPE_CAN_WAKE)) { continue; @@ -532,10 +534,18 @@ AcpiEvInitializeGpeBlock ( { ACPI_EXCEPTION ((AE_INFO, Status, "Could not enable GPE 0x%02X", - GpeIndex + GpeBlock->BlockBaseNumber)); + GpeNumber)); continue; } + GpeEventInfo->Flags |= ACPI_GPE_AUTO_ENABLED; + + if (IsPollingNeeded && + ACPI_GPE_IS_POLLING_NEEDED (GpeEventInfo)) + { + *IsPollingNeeded = TRUE; + } + GpeEnabledCount++; } } diff --git a/source/components/events/evrgnini.c b/source/components/events/evrgnini.c index 7ed8ae5..0ab23c1 100644 --- a/source/components/events/evrgnini.c +++ b/source/components/events/evrgnini.c @@ -628,9 +628,12 @@ AcpiEvInitializeRegion ( * Node's object was replaced by this Method object and we * saved the handler in the method object. * + * Note: Only used for the legacy MLC support. Will + * be removed in the future. + * * See AcpiNsExecModuleCode */ - if (!AcpiGbl_ParseTableAsTermList && + if (!AcpiGbl_ExecuteTablesAsMethods && ObjDesc->Method.InfoFlags & ACPI_METHOD_MODULE_LEVEL) { HandlerObj = ObjDesc->Method.Dispatch.Handler; diff --git a/source/components/events/evxface.c b/source/components/events/evxface.c index 1591847..79dc347 100644 --- a/source/components/events/evxface.c +++ b/source/components/events/evxface.c @@ -1149,6 +1149,15 @@ AcpiRemoveGpeHandler ( Handler->OriginallyEnabled) { (void) AcpiEvAddGpeReference (GpeEventInfo); + if (ACPI_GPE_IS_POLLING_NEEDED (GpeEventInfo)) + { + /* Poll edge triggered GPEs to handle existing events */ + + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); + (void) AcpiEvDetectGpe ( + GpeDevice, GpeEventInfo, GpeNumber); + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); + } } AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); diff --git a/source/components/events/evxfgpe.c b/source/components/events/evxfgpe.c index 2b6be57..0b1b22e 100644 --- a/source/components/events/evxfgpe.c +++ b/source/components/events/evxfgpe.c @@ -80,6 +80,7 @@ AcpiUpdateAllGpes ( void) { ACPI_STATUS Status; + BOOLEAN IsPollingNeeded = FALSE; ACPI_FUNCTION_TRACE (AcpiUpdateAllGpes); @@ -96,7 +97,8 @@ AcpiUpdateAllGpes ( goto UnlockAndExit; } - Status = AcpiEvWalkGpeList (AcpiEvInitializeGpeBlock, NULL); + Status = AcpiEvWalkGpeList (AcpiEvInitializeGpeBlock, + &IsPollingNeeded); if (ACPI_SUCCESS (Status)) { AcpiGbl_AllGpesInitialized = TRUE; @@ -104,6 +106,13 @@ AcpiUpdateAllGpes ( UnlockAndExit: (void) AcpiUtReleaseMutex (ACPI_MTX_EVENTS); + + if (IsPollingNeeded && AcpiGbl_AllGpesInitialized) + { + /* Poll GPEs to handle already triggered events */ + + AcpiEvGpeDetect (AcpiGbl_GpeXruptListHead); + } return_ACPI_STATUS (Status); } @@ -151,6 +160,16 @@ AcpiEnableGpe ( ACPI_GPE_DISPATCH_NONE) { Status = AcpiEvAddGpeReference (GpeEventInfo); + if (ACPI_SUCCESS (Status) && + ACPI_GPE_IS_POLLING_NEEDED (GpeEventInfo)) + { + /* Poll edge-triggered GPEs to handle existing events */ + + AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags); + (void) AcpiEvDetectGpe ( + GpeDevice, GpeEventInfo, GpeNumber); + Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); + } } else { @@ -501,6 +520,16 @@ AcpiSetupGpeForWake ( GpeEventInfo->Flags = (ACPI_GPE_DISPATCH_NOTIFY | ACPI_GPE_LEVEL_TRIGGERED); } + else if (GpeEventInfo->Flags & ACPI_GPE_AUTO_ENABLED) + { + /* + * A reference to this GPE has been added during the GPE block + * initialization, so drop it now to prevent the GPE from being + * permanently enabled and clear its ACPI_GPE_AUTO_ENABLED flag. + */ + (void) AcpiEvRemoveGpeReference (GpeEventInfo); + GpeEventInfo->Flags &= ~~ACPI_GPE_AUTO_ENABLED; + } /* * If we already have an implicit notify on this GPE, add diff --git a/source/components/executer/exdebug.c b/source/components/executer/exdebug.c index e31b381..e340fb1 100644 --- a/source/components/executer/exdebug.c +++ b/source/components/executer/exdebug.c @@ -96,15 +96,14 @@ AcpiExDoDebugObject ( return_VOID; } - /* Null string or newline -- don't emit the line header */ + /* Newline -- don't emit the line header */ if (SourceDesc && (ACPI_GET_DESCRIPTOR_TYPE (SourceDesc) == ACPI_DESC_TYPE_OPERAND) && (SourceDesc->Common.Type == ACPI_TYPE_STRING)) { - if ((SourceDesc->String.Length == 0) || - ((SourceDesc->String.Length == 1) && - (*SourceDesc->String.Pointer == '\n'))) + if ((SourceDesc->String.Length == 1) && + (*SourceDesc->String.Pointer == '\n')) { AcpiOsPrintf ("\n"); return_VOID; diff --git a/source/components/hardware/hwgpe.c b/source/components/hardware/hwgpe.c index dff688d..788fc56 100644 --- a/source/components/hardware/hwgpe.c +++ b/source/components/hardware/hwgpe.c @@ -550,7 +550,6 @@ AcpiHwDisableAllGpes ( Status = AcpiEvWalkGpeList (AcpiHwDisableGpeBlock, NULL); - Status = AcpiEvWalkGpeList (AcpiHwClearGpeBlock, NULL); return_ACPI_STATUS (Status); } diff --git a/source/components/hardware/hwsleep.c b/source/components/hardware/hwsleep.c index 5a89bfc..8fce247 100644 --- a/source/components/hardware/hwsleep.c +++ b/source/components/hardware/hwsleep.c @@ -90,16 +90,8 @@ AcpiHwLegacySleep ( return_ACPI_STATUS (Status); } - /* Clear all fixed and general purpose status bits */ - - Status = AcpiHwClearAcpiStatus (); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } - /* - * 1) Disable/Clear all GPEs + * 1) Disable all GPEs * 2) Enable all wakeup GPEs */ Status = AcpiHwDisableAllGpes (); @@ -319,7 +311,7 @@ AcpiHwLegacyWake ( * might get fired there * * Restore the GPEs: - * 1) Disable/Clear all GPEs + * 1) Disable all GPEs * 2) Enable all runtime GPEs */ Status = AcpiHwDisableAllGpes (); diff --git a/source/components/hardware/hwxfsleep.c b/source/components/hardware/hwxfsleep.c index 8170f83..f6e3ec1 100644 --- a/source/components/hardware/hwxfsleep.c +++ b/source/components/hardware/hwxfsleep.c @@ -229,7 +229,7 @@ AcpiEnterSleepStateS4bios ( } /* - * 1) Disable/Clear all GPEs + * 1) Disable all GPEs * 2) Enable all wakeup GPEs */ Status = AcpiHwDisableAllGpes (); diff --git a/source/components/namespace/nsdumpdv.c b/source/components/namespace/nsdumpdv.c index e1dba85..cc5f9d1 100644 --- a/source/components/namespace/nsdumpdv.c +++ b/source/components/namespace/nsdumpdv.c @@ -99,9 +99,8 @@ AcpiNsDumpOneDevice ( } ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, - " HID: %s, ADR: %8.8X%8.8X, Status: %X\n", - Info->HardwareId.Value, ACPI_FORMAT_UINT64 (Info->Address), - Info->CurrentStatus)); + " HID: %s, ADR: %8.8X%8.8X\n", + Info->HardwareId.Value, ACPI_FORMAT_UINT64 (Info->Address))); ACPI_FREE (Info); } diff --git a/source/components/namespace/nseval.c b/source/components/namespace/nseval.c index ca38b4e..8e6b32f 100644 --- a/source/components/namespace/nseval.c +++ b/source/components/namespace/nseval.c @@ -320,6 +320,16 @@ AcpiNsEvaluate ( Status = AE_OK; } + else if (ACPI_FAILURE(Status)) + { + /* If ReturnObject exists, delete it */ + + if (Info->ReturnObject) + { + AcpiUtRemoveReference (Info->ReturnObject); + Info->ReturnObject = NULL; + } + } ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "*** Completed evaluation of object %s ***\n", @@ -348,6 +358,17 @@ Cleanup: * DESCRIPTION: Execute all elements of the global module-level code list. * Each element is executed as a single control method. * + * NOTE: With this option enabled, each block of detected executable AML + * code that is outside of any control method is wrapped with a temporary + * control method object and placed on a global list. The methods on this + * list are executed below. + * + * This function executes the module-level code for all tables only after + * all of the tables have been loaded. It is a legacy option and is + * not compatible with other ACPI implementations. See AcpiNsLoadTable. + * + * This function will be removed when the legacy option is removed. + * ******************************************************************************/ void @@ -368,6 +389,9 @@ AcpiNsExecModuleCodeList ( Next = AcpiGbl_ModuleCodeList; if (!Next) { + ACPI_DEBUG_PRINT ((ACPI_DB_INIT_NAMES, + "Legacy MLC block list is empty\n")); + return_VOID; } diff --git a/source/components/namespace/nsload.c b/source/components/namespace/nsload.c index 920d1bd..0c92d31 100644 --- a/source/components/namespace/nsload.c +++ b/source/components/namespace/nsload.c @@ -162,23 +162,17 @@ Unlock: "**** Completed Table Object Initialization\n")); /* - * Execute any module-level code that was detected during the table load - * phase. Although illegal since ACPI 2.0, there are many machines that - * contain this type of code. Each block of detected executable AML code - * outside of any control method is wrapped with a temporary control - * method object and placed on a global list. The methods on this list - * are executed below. + * This case handles the legacy option that groups all module-level + * code blocks together and defers execution until all of the tables + * are loaded. Execute all of these blocks at this time. + * Execute any module-level code that was detected during the table + * load phase. * - * This case executes the module-level code for each table immediately - * after the table has been loaded. This provides compatibility with - * other ACPI implementations. Optionally, the execution can be deferred - * until later, see AcpiInitializeObjects. + * Note: this option is deprecated and will be eliminated in the + * future. Use of this option can cause problems with AML code that + * depends upon in-order immediate execution of module-level code. */ - if (!AcpiGbl_ParseTableAsTermList && !AcpiGbl_GroupModuleLevelCode) - { - AcpiNsExecModuleCodeList (); - } - + AcpiNsExecModuleCodeList (); return_ACPI_STATUS (Status); } diff --git a/source/components/namespace/nsparse.c b/source/components/namespace/nsparse.c index adbed97..2700400 100644 --- a/source/components/namespace/nsparse.c +++ b/source/components/namespace/nsparse.c @@ -63,8 +63,17 @@ * * RETURN: Status * - * DESCRIPTION: Load ACPI/AML table by executing the entire table as a - * TermList. + * DESCRIPTION: Load ACPI/AML table by executing the entire table as a single + * large control method. + * + * NOTE: The point of this is to execute any module-level code in-place + * as the table is parsed. Some AML code depends on this behavior. + * + * It is a run-time option at this time, but will eventually become + * the default. + * + * Note: This causes the table to only have a single-pass parse. + * However, this is compatible with other ACPI implementations. * ******************************************************************************/ @@ -295,8 +304,19 @@ AcpiNsParseTable ( ACPI_FUNCTION_TRACE (NsParseTable); - if (AcpiGbl_ParseTableAsTermList) + if (AcpiGbl_ExecuteTablesAsMethods) { + /* + * This case executes the AML table as one large control method. + * The point of this is to execute any module-level code in-place + * as the table is parsed. Some AML code depends on this behavior. + * + * It is a run-time option at this time, but will eventually become + * the default. + * + * Note: This causes the table to only have a single-pass parse. + * However, this is compatible with other ACPI implementations. + */ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_PARSE, "%s: **** Start table execution pass\n", ACPI_GET_FUNCTION_NAME)); diff --git a/source/components/namespace/nsxfname.c b/source/components/namespace/nsxfname.c index 755cc15..3f693a0 100644 --- a/source/components/namespace/nsxfname.c +++ b/source/components/namespace/nsxfname.c @@ -268,7 +268,7 @@ AcpiNsCopyDeviceId ( * namespace node and possibly by running several standard * control methods (Such as in the case of a device.) * - * For Device and Processor objects, run the Device _HID, _UID, _CID, _STA, + * For Device and Processor objects, run the Device _HID, _UID, _CID, * _CLS, _ADR, _SxW, and _SxD methods. * * Note: Allocates the return buffer, must be freed by the caller. @@ -277,8 +277,9 @@ AcpiNsCopyDeviceId ( * discovery namespace traversal. Therefore, no complex methods can be * executed, especially those that access operation regions. Therefore, do * not add any additional methods that could cause problems in this area. - * this was the fate of the _SUB method which was found to cause such - * problems and was removed (11/2015). + * Because of this reason support for the following methods has been removed: + * 1) _SUB method was removed (11/2015) + * 2) _STA method was removed (02/2018) * ******************************************************************************/ @@ -409,26 +410,13 @@ AcpiGetObjectInfo ( { /* * Get extra info for ACPI Device/Processor objects only: - * Run the _STA, _ADR and, SxW, and _SxD methods. + * Run the _ADR and, SxW, and _SxD methods. * * Notes: none of these methods are required, so they may or may * not be present for this device. The Info->Valid bitfield is used * to indicate which methods were found and run successfully. - * - * For _STA, if the method does not exist, then (as per the ACPI - * specification), the returned CurrentStatus flags will indicate - * that the device is present/functional/enabled. Otherwise, the - * CurrentStatus flags reflect the value returned from _STA. */ - /* Execute the Device._STA method */ - - Status = AcpiUtExecute_STA (Node, &Info->CurrentStatus); - if (ACPI_SUCCESS (Status)) - { - Valid |= ACPI_VALID_STA; - } - /* Execute the Device._ADR method */ Status = AcpiUtEvaluateNumericObject (METHOD_NAME__ADR, Node, diff --git a/source/components/parser/psargs.c b/source/components/parser/psargs.c index bb7a1bb..8147c1e 100644 --- a/source/components/parser/psargs.c +++ b/source/components/parser/psargs.c @@ -943,6 +943,9 @@ AcpiPsGetNextArg ( if (Arg->Common.AmlOpcode == AML_INT_METHODCALL_OP) { + /* Free method call op and corresponding namestring sub-ob */ + + AcpiPsFreeOp (Arg->Common.Value.Arg); AcpiPsFreeOp (Arg); Arg = NULL; WalkState->ArgCount = 1; diff --git a/source/components/parser/psloop.c b/source/components/parser/psloop.c index e98dcc3..5894a3e 100644 --- a/source/components/parser/psloop.c +++ b/source/components/parser/psloop.c @@ -179,10 +179,18 @@ AcpiPsGetArguments ( WalkState->ArgCount, WalkState->PassNumber)); /* - * Handle executable code at "module-level". This refers to - * executable opcodes that appear outside of any control method. + * This case handles the legacy option that groups all module-level + * code blocks together and defers execution until all of the tables + * are loaded. Execute all of these blocks at this time. + * Execute any module-level code that was detected during the table + * load phase. + * + * Note: this option is deprecated and will be eliminated in the + * future. Use of this option can cause problems with AML code that + * depends upon in-order immediate execution of module-level code. */ - if ((WalkState->PassNumber <= ACPI_IMODE_LOAD_PASS2) && + if (AcpiGbl_GroupModuleLevelCode && + (WalkState->PassNumber <= ACPI_IMODE_LOAD_PASS2) && ((WalkState->ParseFlags & ACPI_PARSE_DISASSEMBLE) == 0)) { /* @@ -332,6 +340,16 @@ AcpiPsGetArguments ( * object to the global list. Note, the mutex field of the method * object is used to link multiple module-level code objects. * + * NOTE: In this legacy option, each block of detected executable AML + * code that is outside of any control method is wrapped with a temporary + * control method object and placed on a global list below. + * + * This function executes the module-level code for all tables only after + * all of the tables have been loaded. It is a legacy option and is + * not compatible with other ACPI implementations. See AcpiNsLoadTable. + * + * This function will be removed when the legacy option is removed. + * ******************************************************************************/ static void diff --git a/source/components/parser/psobject.c b/source/components/parser/psobject.c index f595b28..2dc4ddf 100644 --- a/source/components/parser/psobject.c +++ b/source/components/parser/psobject.c @@ -74,7 +74,7 @@ static ACPI_STATUS AcpiPsGetAmlOpcode ( ACPI_WALK_STATE *WalkState) { - UINT32 AmlOffset; + ACPI_ERROR_ONLY (UINT32 AmlOffset); ACPI_FUNCTION_TRACE_PTR (PsGetAmlOpcode, WalkState); @@ -109,8 +109,8 @@ AcpiPsGetAmlOpcode ( if (WalkState->PassNumber == 2) { - AmlOffset = (UINT32) ACPI_PTR_DIFF (WalkState->Aml, - WalkState->ParserState.AmlStart); + ACPI_ERROR_ONLY(AmlOffset = (UINT32) ACPI_PTR_DIFF (WalkState->Aml, + WalkState->ParserState.AmlStart)); ACPI_ERROR ((AE_INFO, "Unknown opcode 0x%.2X at table offset 0x%.4X, ignoring", diff --git a/source/components/tables/tbdata.c b/source/components/tables/tbdata.c index 3fb2f66..a3779b6 100644 --- a/source/components/tables/tbdata.c +++ b/source/components/tables/tbdata.c @@ -1082,12 +1082,18 @@ AcpiTbLoadTable ( Status = AcpiNsLoadTable (TableIndex, ParentNode); - /* Execute any module-level code that was found in the table */ - - if (!AcpiGbl_ParseTableAsTermList && AcpiGbl_GroupModuleLevelCode) - { - AcpiNsExecModuleCodeList (); - } + /* + * This case handles the legacy option that groups all module-level + * code blocks together and defers execution until all of the tables + * are loaded. Execute all of these blocks at this time. + * Execute any module-level code that was detected during the table + * load phase. + * + * Note: this option is deprecated and will be eliminated in the + * future. Use of this option can cause problems with AML code that + * depends upon in-order immediate execution of module-level code. + */ + AcpiNsExecModuleCodeList (); /* * Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is diff --git a/source/components/tables/tbinstal.c b/source/components/tables/tbinstal.c index b26942a..279b0a5 100644 --- a/source/components/tables/tbinstal.c +++ b/source/components/tables/tbinstal.c @@ -248,11 +248,11 @@ AcpiTbOverrideTable ( ACPI_TABLE_DESC *OldTableDesc) { ACPI_STATUS Status; - char *OverrideType; ACPI_TABLE_DESC NewTableDesc; ACPI_TABLE_HEADER *Table; ACPI_PHYSICAL_ADDRESS Address; UINT32 Length; + ACPI_ERROR_ONLY (char *OverrideType); /* (1) Attempt logical override (returns a logical address) */ @@ -262,7 +262,7 @@ AcpiTbOverrideTable ( { AcpiTbAcquireTempTable (&NewTableDesc, ACPI_PTR_TO_PHYSADDR (Table), ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL); - OverrideType = "Logical"; + ACPI_ERROR_ONLY (OverrideType = "Logical"); goto FinishOverride; } @@ -274,7 +274,7 @@ AcpiTbOverrideTable ( { AcpiTbAcquireTempTable (&NewTableDesc, Address, ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL); - OverrideType = "Physical"; + ACPI_ERROR_ONLY (OverrideType = "Physical"); goto FinishOverride; } diff --git a/source/components/tables/tbxfload.c b/source/components/tables/tbxfload.c index be7347b..f8d1c2e 100644 --- a/source/components/tables/tbxfload.c +++ b/source/components/tables/tbxfload.c @@ -111,13 +111,16 @@ AcpiLoadTables ( "While loading namespace from ACPI tables")); } - if (AcpiGbl_ParseTableAsTermList || !AcpiGbl_GroupModuleLevelCode) + if (AcpiGbl_ExecuteTablesAsMethods || !AcpiGbl_GroupModuleLevelCode) { /* - * Initialize the objects that remain uninitialized. This - * runs the executable AML that may be part of the - * declaration of these objects: - * OperationRegions, BufferFields, Buffers, and Packages. + * If the module-level code support is enabled, initialize the objects + * in the namespace that remain uninitialized. This runs the executable + * AML that may be part of the declaration of these name objects: + * OperationRegions, BufferFields, Buffers, and Packages. + * + * Note: The module-level code is optional at this time, but will + * become the default in the future. */ Status = AcpiNsInitializeObjects (); if (ACPI_FAILURE (Status)) diff --git a/source/components/utilities/utosi.c b/source/components/utilities/utosi.c index 5a5eeb3..bc9044c 100644 --- a/source/components/utilities/utosi.c +++ b/source/components/utilities/utosi.c @@ -108,6 +108,7 @@ static ACPI_INTERFACE_INFO AcpiDefaultSupportedInterfaces[] = {"Windows 2015", NULL, 0, ACPI_OSI_WIN_10}, /* Windows 10 - Added 03/2015 */ {"Windows 2016", NULL, 0, ACPI_OSI_WIN_10_RS1}, /* Windows 10 version 1607 - Added 12/2017 */ {"Windows 2017", NULL, 0, ACPI_OSI_WIN_10_RS2}, /* Windows 10 version 1703 - Added 12/2017 */ + {"Windows 2017.2", NULL, 0, ACPI_OSI_WIN_10_RS3}, /* Windows 10 version 1709 - Added 02/2018 */ /* Feature Group Strings */ diff --git a/source/components/utilities/utxfinit.c b/source/components/utilities/utxfinit.c index 64abe7d..b8aa132 100644 --- a/source/components/utilities/utxfinit.c +++ b/source/components/utilities/utxfinit.c @@ -273,43 +273,31 @@ AcpiInitializeObjects ( ACPI_FUNCTION_TRACE (AcpiInitializeObjects); -#ifdef ACPI_EXEC_APP /* - * This call implements the "initialization file" option for AcpiExec. - * This is the precise point that we want to perform the overrides. + * This case handles the legacy option that groups all module-level + * code blocks together and defers execution until all of the tables + * are loaded. Execute all of these blocks at this time. + * Execute any module-level code that was detected during the table + * load phase. + * + * Note: this option is deprecated and will be eliminated in the + * future. Use of this option can cause problems with AML code that + * depends upon in-order immediate execution of module-level code. */ - AeDoObjectOverrides (); -#endif + AcpiNsExecModuleCodeList (); /* - * Execute any module-level code that was detected during the table load - * phase. Although illegal since ACPI 2.0, there are many machines that - * contain this type of code. Each block of detected executable AML code - * outside of any control method is wrapped with a temporary control - * method object and placed on a global list. The methods on this list - * are executed below. - * - * This case executes the module-level code for all tables only after - * all of the tables have been loaded. It is a legacy option and is - * not compatible with other ACPI implementations. See AcpiNsLoadTable. + * Initialize the objects that remain uninitialized. This + * runs the executable AML that may be part of the + * declaration of these objects: + * OperationRegions, BufferFields, Buffers, and Packages. */ - if (!AcpiGbl_ParseTableAsTermList && AcpiGbl_GroupModuleLevelCode) + if (!(Flags & ACPI_NO_OBJECT_INIT)) { - AcpiNsExecModuleCodeList (); - - /* - * Initialize the objects that remain uninitialized. This - * runs the executable AML that may be part of the - * declaration of these objects: - * OperationRegions, BufferFields, Buffers, and Packages. - */ - if (!(Flags & ACPI_NO_OBJECT_INIT)) + Status = AcpiNsInitializeObjects (); + if (ACPI_FAILURE (Status)) { - Status = AcpiNsInitializeObjects (); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + return_ACPI_STATUS (Status); } } diff --git a/source/include/acevents.h b/source/include/acevents.h index de7b8c6..5559544 100644 --- a/source/include/acevents.h +++ b/source/include/acevents.h @@ -46,6 +46,21 @@ /* + * Conditions to trigger post enabling GPE polling: + * It is not sufficient to trigger edge-triggered GPE with specific GPE + * chips, software need to poll once after enabling. + */ +#ifdef ACPI_USE_GPE_POLLING +#define ACPI_GPE_IS_POLLING_NEEDED(__gpe__) \ + ((__gpe__)->RuntimeCount == 1 && \ + (__gpe__)->Flags & ACPI_GPE_INITIALIZED && \ + ((__gpe__)->Flags & ACPI_GPE_XRUPT_TYPE_MASK) == ACPI_GPE_EDGE_TRIGGERED) +#else +#define ACPI_GPE_IS_POLLING_NEEDED(__gpe__) FALSE +#endif + + +/* * evevent */ ACPI_STATUS @@ -142,6 +157,12 @@ ACPI_STATUS AcpiEvFinishGpe ( ACPI_GPE_EVENT_INFO *GpeEventInfo); +UINT32 +AcpiEvDetectGpe ( + ACPI_NAMESPACE_NODE *GpeDevice, + ACPI_GPE_EVENT_INFO *GpeEventInfo, + UINT32 GpeNumber); + /* * evgpeblk - Upper-level GPE block support diff --git a/source/include/acmacros.h b/source/include/acmacros.h index 1816c3f..b7aba87 100644 --- a/source/include/acmacros.h +++ b/source/include/acmacros.h @@ -464,16 +464,18 @@ #define ACPI_WARN_PREDEFINED(plist) AcpiUtPredefinedWarning plist #define ACPI_INFO_PREDEFINED(plist) AcpiUtPredefinedInfo plist #define ACPI_BIOS_ERROR_PREDEFINED(plist) AcpiUtPredefinedBiosError plist +#define ACPI_ERROR_ONLY(s) s #else /* No error messages */ -#define ACPI_ERROR_NAMESPACE(s, e) +#define ACPI_ERROR_NAMESPACE(s, p, e) #define ACPI_ERROR_METHOD(s, n, p, e) #define ACPI_WARN_PREDEFINED(plist) #define ACPI_INFO_PREDEFINED(plist) #define ACPI_BIOS_ERROR_PREDEFINED(plist) +#define ACPI_ERROR_ONLY(s) #endif /* ACPI_NO_ERROR_MESSAGES */ diff --git a/source/include/acpixf.h b/source/include/acpixf.h index 8d2a28e..04f7942 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 0x20180209 +#define ACPI_CA_VERSION 0x20180313 #include "acconfig.h" #include "actypes.h" @@ -200,13 +200,12 @@ ACPI_INIT_GLOBAL (UINT8, AcpiGbl_DoNotUseXsdt, FALSE); ACPI_INIT_GLOBAL (UINT8, AcpiGbl_GroupModuleLevelCode, FALSE); /* - * Optionally support module level code by parsing the entire table as - * a TermList. Default is FALSE, do not execute entire table until some - * lock order issues are fixed. + * Optionally support module level code by parsing an entire table as + * a method as it is loaded. Default is TRUE. * NOTE, this is essentially obsolete and will be removed soon * (01/2018). */ -ACPI_INIT_GLOBAL (UINT8, AcpiGbl_ParseTableAsTermList, TRUE); +ACPI_INIT_GLOBAL (UINT8, AcpiGbl_ExecuteTablesAsMethods, TRUE); /* * Optionally use 32-bit FADT addresses if and when there is a conflict @@ -273,6 +272,16 @@ ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_ReducedHardware, FALSE); ACPI_INIT_GLOBAL (UINT32, AcpiGbl_MaxLoopIterations, ACPI_MAX_LOOP_TIMEOUT); /* + * Optionally ignore AE_NOT_FOUND errors from named reference package elements + * during DSDT/SSDT table loading. This reduces error "noise" in platforms + * whose firmware is carrying around a bunch of unused package objects that + * refer to non-existent named objects. However, If the AML actually tries to + * use such a package, the unresolved element(s) will be replaced with NULL + * elements. + */ +ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_IgnorePackageResolutionErrors, FALSE); + +/* * This mechanism is used to trace a specified AML method. The method is * traced each time it is executed. */ diff --git a/source/include/actypes.h b/source/include/actypes.h index a820939..3cdbcb7 100644 --- a/source/include/actypes.h +++ b/source/include/actypes.h @@ -585,17 +585,17 @@ typedef UINT64 ACPI_INTEGER; ******************************************************************************/ /* - * Initialization sequence + * Initialization sequence options */ -#define ACPI_FULL_INITIALIZATION 0x00 -#define ACPI_NO_ADDRESS_SPACE_INIT 0x01 -#define ACPI_NO_HARDWARE_INIT 0x02 -#define ACPI_NO_EVENT_INIT 0x04 -#define ACPI_NO_HANDLER_INIT 0x08 -#define ACPI_NO_ACPI_ENABLE 0x10 -#define ACPI_NO_DEVICE_INIT 0x20 -#define ACPI_NO_OBJECT_INIT 0x40 -#define ACPI_NO_FACS_INIT 0x80 +#define ACPI_FULL_INITIALIZATION 0x0000 +#define ACPI_NO_FACS_INIT 0x0001 +#define ACPI_NO_ACPI_ENABLE 0x0002 +#define ACPI_NO_HARDWARE_INIT 0x0004 +#define ACPI_NO_EVENT_INIT 0x0008 +#define ACPI_NO_HANDLER_INIT 0x0010 +#define ACPI_NO_OBJECT_INIT 0x0020 +#define ACPI_NO_DEVICE_INIT 0x0040 +#define ACPI_NO_ADDRESS_SPACE_INIT 0x0080 /* * Initialization state @@ -798,7 +798,7 @@ typedef UINT32 ACPI_EVENT_STATUS; * | | | | +-- Type of dispatch:to method, handler, notify, or none * | | | +----- Interrupt type: edge or level triggered * | | +------- Is a Wake GPE - * | +--------- Is GPE masked by the software GPE masking mechanism + * | +--------- Has been enabled automatically at init time * +------------ */ #define ACPI_GPE_DISPATCH_NONE (UINT8) 0x00 @@ -814,6 +814,8 @@ typedef UINT32 ACPI_EVENT_STATUS; #define ACPI_GPE_XRUPT_TYPE_MASK (UINT8) 0x08 #define ACPI_GPE_CAN_WAKE (UINT8) 0x10 +#define ACPI_GPE_AUTO_ENABLED (UINT8) 0x20 +#define ACPI_GPE_INITIALIZED (UINT8) 0x40 /* * Flags for GPE and Lock interfaces @@ -1280,7 +1282,6 @@ typedef struct acpi_device_info UINT8 Flags; /* Miscellaneous info */ UINT8 HighestDstates[4]; /* _SxD values: 0xFF indicates not valid */ UINT8 LowestDstates[5]; /* _SxW values: 0xFF indicates not valid */ - UINT32 CurrentStatus; /* _STA value */ UINT64 Address; /* _ADR value */ ACPI_PNP_DEVICE_ID HardwareId; /* _HID value */ ACPI_PNP_DEVICE_ID UniqueId; /* _UID value */ @@ -1295,7 +1296,6 @@ typedef struct acpi_device_info /* Flags for Valid field above (AcpiGetObjectInfo) */ -#define ACPI_VALID_STA 0x0001 #define ACPI_VALID_ADR 0x0002 #define ACPI_VALID_HID 0x0004 #define ACPI_VALID_UID 0x0008 @@ -1403,6 +1403,7 @@ typedef enum #define ACPI_OSI_WIN_10 0x0D #define ACPI_OSI_WIN_10_RS1 0x0E #define ACPI_OSI_WIN_10_RS2 0x0F +#define ACPI_OSI_WIN_10_RS3 0x10 /* Definitions of getopt */ diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h index 62ff25b..57d28f8 100644 --- a/source/include/platform/aclinux.h +++ b/source/include/platform/aclinux.h @@ -64,6 +64,7 @@ #ifdef __KERNEL__ #define ACPI_USE_SYSTEM_INTTYPES +#define ACPI_USE_GPE_POLLING /* Kernel specific ACPICA configuration */ diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c index c7457ae..02dc4eb 100644 --- a/source/tools/acpiexec/aemain.c +++ b/source/tools/acpiexec/aemain.c @@ -234,7 +234,7 @@ AeDoOptions ( case 'p': - AcpiGbl_ParseTableAsTermList = FALSE; + AcpiGbl_ExecuteTablesAsMethods = FALSE; break; case 'r': @@ -499,6 +499,11 @@ main ( AcpiDbgLevel = ACPI_NORMAL_DEFAULT; AcpiDbgLayer = 0xFFFFFFFF; + /* Module-level code. Use new architecture */ + + AcpiGbl_ExecuteTablesAsMethods = TRUE; + AcpiGbl_GroupModuleLevelCode = FALSE; + /* * Initialize ACPICA and start debugger thread. * @@ -603,6 +608,25 @@ main ( goto EnterDebugger; } + Status = AeLoadTables (); + + /* + * Exit namespace initialization for the "load namespace only" option. + * No control methods will be executed. However, still enter the + * the debugger. + */ + if (AcpiGbl_AeLoadOnly) + { + goto EnterDebugger; + } + + if (ACPI_FAILURE (Status)) + { + printf ("**** Could not load ACPI tables, %s\n", + AcpiFormatException (Status)); + goto EnterDebugger; + } + /* Setup initialization flags for ACPICA */ InitFlags = (ACPI_NO_HANDLER_INIT | ACPI_NO_ACPI_ENABLE); @@ -629,31 +653,18 @@ main ( goto EnterDebugger; } - Status = AeLoadTables (); - - /* - * Exit namespace initialization for the "load namespace only" option. - * No control methods will be executed. However, still enter the - * the debugger. - */ - if (AcpiGbl_AeLoadOnly) - { - goto EnterDebugger; - } - - if (ACPI_FAILURE (Status)) - { - printf ("**** Could not load ACPI tables, %s\n", - AcpiFormatException (Status)); - goto EnterDebugger; - } - /* * Install handlers for "device driver" space IDs (EC,SMBus, etc.) * and fixed event handlers */ AeInstallLateHandlers (); + /* + * This call implements the "initialization file" option for AcpiExec. + * This is the precise point that we want to perform the overrides. + */ + AeDoObjectOverrides (); + /* Finish the ACPICA initialization */ Status = AcpiInitializeObjects (InitFlags); diff --git a/source/tools/acpiexec/aetables.c b/source/tools/acpiexec/aetables.c index d54e48f..77e5639 100644 --- a/source/tools/acpiexec/aetables.c +++ b/source/tools/acpiexec/aetables.c @@ -151,9 +151,9 @@ AeInitializeTableHeader ( Header->Length = Length; Header->OemRevision = 0x1001; - strncpy (Header->OemId, "Intel", ACPI_OEM_ID_SIZE); - strncpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE); - strncpy (Header->AslCompilerId, "INTL", ACPI_NAME_SIZE); + memcpy (Header->OemId, "Intel ", ACPI_OEM_ID_SIZE); + memcpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE); + ACPI_MOVE_NAME (Header->AslCompilerId, "INTL"); Header->AslCompilerRevision = ACPI_CA_VERSION; /* Set the checksum, must set to zero first */ @@ -389,12 +389,12 @@ AeBuildLocalTables ( /* Miscellaneous FADT fields */ - LocalFADT.Gpe0BlockLength = 0x08; - LocalFADT.Gpe0Block = 0x00001234; + LocalFADT.Gpe0BlockLength = 0x20; + LocalFADT.Gpe0Block = 0x00003210; - LocalFADT.Gpe1BlockLength = 0x80; - LocalFADT.Gpe1Block = 0x00005678; - LocalFADT.Gpe1Base = 100; + LocalFADT.Gpe1BlockLength = 0x20; + LocalFADT.Gpe1Block = 0x0000BA98; + LocalFADT.Gpe1Base = 0x80; LocalFADT.Pm1EventLength = 4; LocalFADT.Pm1aEventBlock = 0x00001aaa; diff --git a/source/tools/acpinames/anmain.c b/source/tools/acpinames/anmain.c index ae3daab..59d6b25 100644 --- a/source/tools/acpinames/anmain.c +++ b/source/tools/acpinames/anmain.c @@ -129,6 +129,11 @@ main ( AcpiDbgLevel = ACPI_NORMAL_DEFAULT | ACPI_LV_TABLES; AcpiDbgLayer = 0xFFFFFFFF; + /* Set flags so that the interpreter is not used */ + + AcpiGbl_ExecuteTablesAsMethods = FALSE; + AcpiGbl_GroupModuleLevelCode = TRUE; + Status = AcpiInitializeSubsystem (); ACPI_CHECK_OK (AcpiInitializeSubsystem, Status); if (ACPI_FAILURE (Status)) @@ -253,9 +258,9 @@ AnDumpEntireNamespace ( return (-1); } - /* Load the ACPI namespace */ + /* Build the namespace from the tables */ - Status = AcpiTbLoadNamespace (); + Status = AcpiLoadTables (); if (Status == AE_CTRL_TERMINATE) { /* At least one table load failed -- terminate with error */ @@ -277,32 +282,15 @@ AnDumpEntireNamespace ( } /* - * Enable ACPICA. These calls don't do much for this - * utility, since we only dump the namespace. There is no - * hardware or event manager code underneath. + * NOTE: + * We don't need to do any further ACPICA initialization, since we don't + * have any hardware, nor is the interpreter configured. + * + * Namely, we don't need these calls: + * AcpiEnableSubsystem + * AcpiInitializeObjects */ - Status = AcpiEnableSubsystem ( - ACPI_NO_ACPI_ENABLE | - ACPI_NO_ADDRESS_SPACE_INIT | - ACPI_NO_EVENT_INIT | - ACPI_NO_HANDLER_INIT); - if (ACPI_FAILURE (Status)) - { - printf ("**** Could not EnableSubsystem, %s\n", - AcpiFormatException (Status)); - return (-1); - } - Status = AcpiInitializeObjects ( - ACPI_NO_ADDRESS_SPACE_INIT | - ACPI_NO_DEVICE_INIT | - ACPI_NO_EVENT_INIT); - if (ACPI_FAILURE (Status)) - { - printf ("**** Could not InitializeObjects, %s\n", - AcpiFormatException (Status)); - return (-1); - } /* * Perform a namespace walk to dump the contents diff --git a/source/tools/acpinames/anstubs.c b/source/tools/acpinames/anstubs.c index 7c87969..0952fd7 100644 --- a/source/tools/acpinames/anstubs.c +++ b/source/tools/acpinames/anstubs.c @@ -65,6 +65,9 @@ AcpiUtCopyIobjectToEobject ( ACPI_OPERAND_OBJECT *Obj, ACPI_BUFFER *RetBuffer) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -73,6 +76,9 @@ AcpiUtCopyEobjectToIobject ( ACPI_OBJECT *Obj, ACPI_OPERAND_OBJECT **InternalObj) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -82,6 +88,9 @@ AcpiUtCopyIobjectToIobject ( ACPI_OPERAND_OBJECT **DestDesc, ACPI_WALK_STATE *WalkState) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -140,6 +149,9 @@ AcpiExReadDataFromField ( ACPI_OPERAND_OBJECT *ObjDesc, ACPI_OPERAND_OBJECT **RetBufferDesc) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -149,6 +161,9 @@ AcpiExWriteDataToField ( ACPI_OPERAND_OBJECT *ObjDesc, ACPI_OPERAND_OBJECT **ResultDesc) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -159,6 +174,9 @@ AcpiExStoreObjectToNode ( ACPI_WALK_STATE *WalkState, UINT8 ImplicitConversion) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -169,6 +187,9 @@ ACPI_STATUS AcpiNsEvaluate ( ACPI_EVALUATE_INFO *Info) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -176,6 +197,7 @@ void AcpiNsExecModuleCodeList ( void) { + return; } void @@ -256,6 +278,9 @@ AcpiDsCallControlMethod ( ACPI_WALK_STATE *WalkState, ACPI_PARSE_OBJECT *Op) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -264,6 +289,9 @@ AcpiDsRestartControlMethod ( ACPI_WALK_STATE *WalkState, ACPI_OPERAND_OBJECT *ReturnDesc) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -279,6 +307,9 @@ AcpiDsMethodError ( ACPI_STATUS Status, ACPI_WALK_STATE *WalkState) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -288,6 +319,9 @@ AcpiDsBeginMethodExecution ( ACPI_OPERAND_OBJECT *ObjDesc, ACPI_WALK_STATE *WalkState) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -296,6 +330,9 @@ AcpiDsGetPredicateValue ( ACPI_WALK_STATE *WalkState, ACPI_OPERAND_OBJECT *ResultObj) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -339,6 +376,9 @@ AcpiDsExecBeginOp ( ACPI_WALK_STATE *WalkState, ACPI_PARSE_OBJECT **OutOp) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } @@ -346,5 +386,8 @@ ACPI_STATUS AcpiDsExecEndOp ( ACPI_WALK_STATE *State) { + ACPI_EXCEPTION ((AE_INFO, AE_NOT_IMPLEMENTED, + "Stubbed function")); + return (AE_NOT_IMPLEMENTED); } diff --git a/source/tools/acpinames/antables.c b/source/tools/acpinames/antables.c index 47b2efe..bc99663 100644 --- a/source/tools/acpinames/antables.c +++ b/source/tools/acpinames/antables.c @@ -102,9 +102,9 @@ AnInitializeTableHeader ( Header->Length = Length; Header->OemRevision = 0x1001; - strncpy (Header->OemId, "Intel", ACPI_OEM_ID_SIZE); - strncpy (Header->OemTableId, "AcpiName", ACPI_OEM_TABLE_ID_SIZE); - strncpy (Header->AslCompilerId, "INTL", ACPI_NAME_SIZE); + memcpy (Header->OemId, "Intel ", ACPI_OEM_ID_SIZE); + memcpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE); + ACPI_MOVE_NAME (Header->AslCompilerId, "INTL"); Header->AslCompilerRevision = ACPI_CA_VERSION; /* Set the checksum, must set to zero first */ diff --git a/source/tools/acpisrc/acpisrc.h b/source/tools/acpisrc/acpisrc.h index aff3102..1bcb6d9 100644 --- a/source/tools/acpisrc/acpisrc.h +++ b/source/tools/acpisrc/acpisrc.h @@ -58,7 +58,7 @@ #define LINES_IN_LEGAL_HEADER 115+36 /* intel+dual license. See legal header above at module start */ #define LEGAL_HEADER_SIGNATURE " * 2.1. This is your license from Intel Corp. under its intellectual property" -#define LINES_IN_LINUX_HEADER 34 +#define LINES_IN_LINUX_HEADER 2 /* SPDX header is 1 line Intel copyright is another line */ #define LINUX_HEADER_SIGNATURE " * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS" #define LINES_IN_ASL_HEADER 29 /* Header as output from disassembler */ @@ -172,6 +172,7 @@ typedef struct acpi_conversion_table ACPI_TYPED_IDENTIFIER_TABLE *LowerCaseTable; + char *SourceSpdxHeader; ACPI_STRING_TABLE *SourceStringTable; ACPI_IDENTIFIER_TABLE *SourceLineTable; ACPI_IDENTIFIER_TABLE *SourceConditionalTable; @@ -180,6 +181,7 @@ typedef struct acpi_conversion_table ACPI_IDENTIFIER_TABLE *SourceSpecialMacroTable; UINT32 SourceFunctions; + char *HeaderSpdxHeader; ACPI_STRING_TABLE *HeaderStringTable; ACPI_IDENTIFIER_TABLE *HeaderLineTable; ACPI_IDENTIFIER_TABLE *HeaderConditionalTable; @@ -188,6 +190,7 @@ typedef struct acpi_conversion_table ACPI_IDENTIFIER_TABLE *HeaderSpecialMacroTable; UINT32 HeaderFunctions; + /* SPDX header conversion for patches is not supported */ ACPI_STRING_TABLE *PatchStringTable; ACPI_IDENTIFIER_TABLE *PatchLineTable; ACPI_IDENTIFIER_TABLE *PatchConditionalTable; @@ -356,6 +359,11 @@ AsReplaceHeader ( char *NewHeader); void +AsDoSpdxHeader ( + char *Buffer, + char *SpdxHeader); + +void AsConvertFile ( ACPI_CONVERSION_TABLE *ConversionTable, char *FileBuffer, diff --git a/source/tools/acpisrc/asconvrt.c b/source/tools/acpisrc/asconvrt.c index 0d752b5..d0bd854 100644 --- a/source/tools/acpisrc/asconvrt.c +++ b/source/tools/acpisrc/asconvrt.c @@ -75,12 +75,18 @@ AsCountLines ( char *Filename); + +#define MODULE_HEADER_BEGIN "/******************************************************************************\n *\n * Module Name:"; +#define MODULE_HEADER_END " *****************************************************************************/\n\n" +#define INTEL_COPYRIGHT " * Copyright (C) 2000 - 2018, Intel Corp.\n" + /* Opening signature of the Intel legal header */ char *HeaderBegin = "/******************************************************************************\n *\n * 1. Copyright Notice"; UINT32 NonAnsiCommentCount; +char CopyRightHeaderEnd[] = INTEL_COPYRIGHT " *\n" MODULE_HEADER_END; /****************************************************************************** * @@ -651,6 +657,39 @@ AsReplaceHeader ( /****************************************************************************** * + * FUNCTION: AsDoSpdxHeader + * + * DESCRIPTION: Replace the default Intel legal header with a new header + * + ******************************************************************************/ + +void +AsDoSpdxHeader ( + char *Buffer, + char *SpdxHeader) +{ + char *SubBuffer; + + + /* Place an SPDX header at the very top */ + + AsReplaceData (Buffer, 0, + SpdxHeader, strlen (SpdxHeader)); + + /* Place an Intel copyright notice in the module header */ + + SubBuffer = strstr (Buffer, MODULE_HEADER_END); + if (!SubBuffer) + { + return; + } + + AsReplaceData (SubBuffer, strlen (MODULE_HEADER_END), + CopyRightHeaderEnd, strlen (CopyRightHeaderEnd)); +} + +/****************************************************************************** + * * FUNCTION: AsReplaceString * * DESCRIPTION: Replace all instances of a target string with a replacement diff --git a/source/tools/acpisrc/asfile.c b/source/tools/acpisrc/asfile.c index ea56d4f..d90540d 100644 --- a/source/tools/acpisrc/asfile.c +++ b/source/tools/acpisrc/asfile.c @@ -314,6 +314,7 @@ AsConvertFile ( ACPI_IDENTIFIER_TABLE *LineTable; ACPI_TYPED_IDENTIFIER_TABLE *StructTable; ACPI_IDENTIFIER_TABLE *SpecialMacroTable; + char *SpdxHeader=NULL; switch (FileType) @@ -326,6 +327,7 @@ AsConvertFile ( ConditionalTable = ConversionTable->SourceConditionalTable; StructTable = ConversionTable->SourceStructTable; SpecialMacroTable = ConversionTable->SourceSpecialMacroTable; + SpdxHeader = ConversionTable->SourceSpdxHeader; break; case FILE_TYPE_HEADER: @@ -336,6 +338,7 @@ AsConvertFile ( ConditionalTable = ConversionTable->HeaderConditionalTable; StructTable = ConversionTable->HeaderStructTable; SpecialMacroTable = ConversionTable->HeaderSpecialMacroTable; + SpdxHeader = ConversionTable->HeaderSpdxHeader; break; case FILE_TYPE_PATCH: @@ -531,6 +534,10 @@ AsConvertFile ( { AsReplaceHeader (FileBuffer, ConversionTable->NewHeader); } + if (SpdxHeader) + { + AsDoSpdxHeader (FileBuffer, SpdxHeader); + } } /******************************************************************************* diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c index aedc087..819ebd8 100644 --- a/source/tools/acpisrc/astable.c +++ b/source/tools/acpisrc/astable.c @@ -86,6 +86,7 @@ ACPI_STRING_TABLE StandardDataTypes[] = { * ******************************************************************************/ +char EmptyHeader[] = ""; char DualLicenseHeader[] = "/*\n" " * Copyright (C) 2000 - 2018, Intel Corp.\n" @@ -848,13 +849,14 @@ ACPI_IDENTIFIER_TABLE LinuxSpecialMacros[] = { ACPI_CONVERSION_TABLE LinuxConversionTable = { - DualLicenseHeader, + EmptyHeader, FLG_NO_CARRIAGE_RETURNS | FLG_LOWERCASE_DIRNAMES, AcpiIdentifiers, /* C source files */ + "// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0\n", LinuxDataTypes, LinuxEliminateLines_C, NULL, @@ -869,6 +871,7 @@ ACPI_CONVERSION_TABLE LinuxConversionTable = /* C header files */ + "/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */\n", LinuxDataTypes, LinuxEliminateLines_H, LinuxConditionalIdentifiers, @@ -912,6 +915,7 @@ ACPI_CONVERSION_TABLE CleanupConversionTable = NULL, NULL, NULL, + NULL, (CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES | CVT_CHECK_BRACES | CVT_TRIM_LINES | CVT_TRIM_WHITESPACE), @@ -923,6 +927,7 @@ ACPI_CONVERSION_TABLE CleanupConversionTable = NULL, NULL, NULL, + NULL, (CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES | CVT_TRIM_LINES | CVT_TRIM_WHITESPACE), @@ -952,6 +957,7 @@ ACPI_CONVERSION_TABLE StatsConversionTable = NULL, NULL, NULL, + NULL, (CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES | CVT_COUNT_SHORTMULTILINE_COMMENTS), @@ -963,6 +969,7 @@ ACPI_CONVERSION_TABLE StatsConversionTable = NULL, NULL, NULL, + NULL, (CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES | CVT_COUNT_SHORTMULTILINE_COMMENTS), @@ -999,6 +1006,7 @@ ACPI_CONVERSION_TABLE LicenseConversionTable = NULL, NULL, NULL, + NULL, (CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES | CVT_COUNT_SHORTMULTILINE_COMMENTS), @@ -1010,6 +1018,7 @@ ACPI_CONVERSION_TABLE LicenseConversionTable = NULL, NULL, NULL, + NULL, (CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES | CVT_COUNT_SHORTMULTILINE_COMMENTS), @@ -1094,6 +1103,7 @@ ACPI_CONVERSION_TABLE CustomConversionTable = /* C source files */ + NULL, CustomReplacements, LinuxEliminateLines_H, NULL, @@ -1105,6 +1115,7 @@ ACPI_CONVERSION_TABLE CustomConversionTable = /* C header files */ + NULL, CustomReplacements, LinuxEliminateLines_H, NULL, @@ -1141,6 +1152,7 @@ ACPI_CONVERSION_TABLE IndentConversionTable = /* C source files */ + NULL, LinuxSpecialStrings, NULL, NULL, @@ -1152,6 +1164,7 @@ ACPI_CONVERSION_TABLE IndentConversionTable = /* C header files */ + NULL, LinuxSpecialStrings, NULL, NULL, diff --git a/source/tools/acpisrc/asutils.c b/source/tools/acpisrc/asutils.c index b39575e..1f76411 100644 --- a/source/tools/acpisrc/asutils.c +++ b/source/tools/acpisrc/asutils.c @@ -135,12 +135,9 @@ AsReplaceData ( * 1) If adding more bytes than removing, make room for the new data * 2) if removing more bytes than adding, delete the extra space */ - if (LengthToRemove > 0) - { - Gbl_MadeChanges = TRUE; - memmove ((Buffer + LengthToAdd), (Buffer + LengthToRemove), - (BufferLength - LengthToRemove)); - } + Gbl_MadeChanges = TRUE; + memmove ((Buffer + LengthToAdd), (Buffer + LengthToRemove), + (BufferLength - LengthToRemove)); } /* diff --git a/tests/aslts/bin/asltsrun b/tests/aslts/bin/asltsrun index f07edec..5f44930 100755 --- a/tests/aslts/bin/asltsrun +++ b/tests/aslts/bin/asltsrun @@ -63,6 +63,7 @@ cent_str_to_cent_units() eval "rval=$[ (((1$1 - 100) * 60 + (1$2 - 100)) * 60 + (1$3 - 100)) * 100 + (1$4 - 100) ]" echo "$rval" } +export -f cent_str_to_cent_units # Convert {h:m:s} string to centisecond time units # arg1 - time string {h:m:s} @@ -76,6 +77,7 @@ sec_str_to_cent_units() echo "$rval" } +export -f sec_str_to_cent_units # Return the length ot time period in centisecond time units # Note: assumed the total running time is less than 24 hours @@ -96,6 +98,7 @@ get_cent_units_diff() echo "$rval" } +export -f get_cent_units_diff # Calculate and return the length ot time period as string {[h:]m:s.c} # arg1 - start time string {h:m:s} @@ -111,6 +114,7 @@ get_cent_str_diff() echo "$rval" } +export -f get_cent_str_diff # Get version of AcpiExec get_acpiexec_version() @@ -138,6 +142,7 @@ get_aml_code_path() path="$ASLTSDIR/tmp/aml/$EXECVERSION/$OPTMODE/$BITMODE/$1.aml" echo "$path" } +export -f get_aml_code_path # Run particular test case # arg1 - the name of test case @@ -155,6 +160,13 @@ run_test_case() TEST_TITLE="$tcase $modename" + amlcodepath=`get_aml_code_path $1 $2` + if [ ! -f "$amlcodepath" ]; then + echo "Test doesn't exist: $amlcodepath" + AML_DONT_EXIST=$[ $AML_DONT_EXIST + 1 ] + return + fi + # Start time FMT_INITIME=$(date +%T) @@ -215,6 +227,7 @@ run_test_case() return $TEST_RET } +export -f run_test_case # Run a set of test cases (specified by INIT_SET_OF_TEST_CASES) # in one particular mode. @@ -224,6 +237,10 @@ run_test_case() run_set_of_test_cases() { local x y z q status=0 total modepart modename tcase amlcodepath + test_case_arr=($3) + res_dir=$2 + bit_mode=$1 + procs=`nproc --all` modepart=`get_mode_string $1 0` modename=`get_mode_string $1 1` @@ -235,36 +252,16 @@ run_set_of_test_cases() total="$x $y" - for tcase in $3; do - amlcodepath=`get_aml_code_path $tcase $1` - if [ ! -f "$amlcodepath" ]; then - echo "Test doesn't exist: $amlcodepath" - AML_DONT_EXIST=$[ $AML_DONT_EXIST + 1 ] - else - if [ $ENABLELOG != 0 ]; then - run_test_case $tcase $1 > "$2/$modepart/$tcase" - else - run_test_case $tcase $1 - fi - # See comment below. - # if [ $? -ne 0 ]; then - # status=1 - # fi - fi - done + # Explanation of command below: + # For each testcase that we will run, we are goin to parallelize the + # execution with the number of available processors. + printf '%s\n' "${test_case_arr[@]}" |\ + xargs -n 1 -P $procs -I {} bash -c 'run_test_case $1 $2 > $3/$4/$1'\ + _ {} $bit_mode $res_dir $modepart z=$(date +%T) q=`get_cent_str_diff $y $z` - # AcpiExec doesn't provide status of test execution, - # so dont report STATUS of AcpiExec execution here - # not to mislead as if it means STATUS of the tests - # execution. - # if [ $status == 0 ]; then - # status=PASS - # else - # status=FAIL - # fi x="$(date +%F)" multi_log "$modename finished $x $z, ($q)" @@ -930,7 +927,7 @@ AML_DONT_EXIST=0 DO_INNER_MODES_COMPARE=no MULTIPATH= -EXECVERSION= +export EXECVERSION= COMMONLOGFILE= MODES_TIMES= MODES_SUMMARIES= diff --git a/tests/aslts/bin/common b/tests/aslts/bin/common index 5350b88..6be4149 100755 --- a/tests/aslts/bin/common +++ b/tests/aslts/bin/common @@ -137,6 +137,7 @@ get_mode_string() echo "$OPTMODE" fi } +export -f get_mode_string # Return string describing mode of run # arg1 - bitmap of mode @@ -574,6 +575,7 @@ cent_units_to_cent_str() echo "$rval" } +export -f cent_units_to_cent_str # Convert time to centisecond units # @@ -679,8 +681,8 @@ diff_of_str_times() # Constants # Bitmap: 1 - 64, 2 - opt -FLAG64=1 -FLAGOPT=2 +export FLAG64=1 +export FLAGOPT=2 NORM32=0 NORM64=1 OPT32=2 diff --git a/tests/aslts/src/runtime/cntl/common.asl b/tests/aslts/src/runtime/cntl/common.asl index 69e431c..7d78cb3 100644 --- a/tests/aslts/src/runtime/cntl/common.asl +++ b/tests/aslts/src/runtime/cntl/common.asl @@ -263,7 +263,7 @@ { If (ERR0) { - ERR ("SET0", Z062, 0x0114, 0x00, 0x00, ERR0, 0x00) + ERR ("SET0", Z062, __LINE__, 0x00, 0x00, ERR0, 0x00) } Else { @@ -582,7 +582,7 @@ Method (FTTT, 0, NotSerialized) { - CH03 ("FTTT", 0x00, 0x00, 0x0231, 0x00) + CH03 ("FTTT", 0x00, __LINE__, 0x00, 0x00) /* Report completion of previous root Method */ RPT0 () @@ -690,9 +690,9 @@ * * arg0 - diagnostic message (usually, the name of method conglomeration of tests) * arg1 - absolute index of file reporting the error - * arg2 - index of error (inside the file) + * arg2 - line number of error (inside the file) * arg3 - absolute index of file initiating the checking - * arg4 - index of checking (inside the file) + * arg4 - line number of of checking (inside the file) * arg5 - first value (usually, received value) * arg6 - second value (usually, expected value) */ @@ -854,10 +854,7 @@ Concatenate ("ERROR, File : ", Local1, Local0) Debug = Local0 - Concatenate (" Index : 0x", Arg1, Local0) - Concatenate (Local0, ", (", Local0) - Concatenate (Local0, ToDecimalString (Arg1), Local0) - Concatenate (Local0, ")", Local0) + Concatenate (" Line : ", ToDecimalString(Arg1), Local0) Debug = Local0 /* Checking */ @@ -882,7 +879,7 @@ Debug = Local0 } - Concatenate (" Index : ", Arg4, Local0) + Concatenate (" Line : ", ToDecimalString(Arg4), Local0) Debug = Local0 } } @@ -941,7 +938,7 @@ { If ((Arg3 != Zero)) { - ERR (Arg0, Z062, 0x0393, 0x00, 0x00, Arg1, Arg2) + ERR (Arg0, Z062, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -956,7 +953,7 @@ { If ((Arg3 != Ones)) { - ERR (Arg0, Z062, 0x03A1, 0x00, 0x00, Arg1, Arg2) + ERR (Arg0, Z062, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -999,132 +996,132 @@ { If ((C000 != 0x0A)) { - ERR ("c000 corrupted", Z062, 0x03C6, 0x00, 0x00, 0x00, 0x00) + ERR ("c000 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C001 != 0x05)) { - ERR ("c001 corrupted", Z062, 0x03C9, 0x00, 0x00, 0x00, 0x00) + ERR ("c001 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C002 != 0x0D)) { - ERR ("c002 corrupted", Z062, 0x03CD, 0x00, 0x00, 0x00, 0x00) + ERR ("c002 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C003 != 0x0C)) { - ERR ("c003 corrupted", Z062, 0x03D0, 0x00, 0x00, 0x00, 0x00) + ERR ("c003 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C004 != 0x06)) { - ERR ("c004 corrupted", Z062, 0x03D3, 0x00, 0x00, 0x00, 0x00) + ERR ("c004 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C005 != 0x04)) { - ERR ("c005 corrupted", Z062, 0x03D6, 0x00, 0x00, 0x00, 0x00) + ERR ("c005 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C006 != 0x1F)) { - ERR ("c006 corrupted", Z062, 0x03D9, 0x00, 0x00, 0x00, 0x00) + ERR ("c006 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C007 != 0x33)) { - ERR ("c007 corrupted", Z062, 0x03DC, 0x00, 0x00, 0x00, 0x00) + ERR ("c007 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C008 != 0x00)) { - ERR ("c008 corrupted", Z062, 0x03E0, 0x00, 0x00, 0x00, 0x00) + ERR ("c008 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C009 != 0x01)) { - ERR ("c009 corrupted", Z062, 0x03E3, 0x00, 0x00, 0x00, 0x00) + ERR ("c009 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C00A != 0x02)) { - ERR ("c00a corrupted", Z062, 0x03E6, 0x00, 0x00, 0x00, 0x00) + ERR ("c00a corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C00B != 0x03)) { - ERR ("c00b corrupted", Z062, 0x03E9, 0x00, 0x00, 0x00, 0x00) + ERR ("c00b corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C00C != 0x04)) { - ERR ("c00c corrupted", Z062, 0x03EC, 0x00, 0x00, 0x00, 0x00) + ERR ("c00c corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C00D != 0x05)) { - ERR ("c00d corrupted", Z062, 0x03EF, 0x00, 0x00, 0x00, 0x00) + ERR ("c00d corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C00E != 0x06)) { - ERR ("c00e corrupted", Z062, 0x03F2, 0x00, 0x00, 0x00, 0x00) + ERR ("c00e corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C00F != 0x07)) { - ERR ("c00f corrupted", Z062, 0x03F5, 0x00, 0x00, 0x00, 0x00) + ERR ("c00f corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C010 != 0x08)) { - ERR ("c010 corrupted", Z062, 0x03F8, 0x00, 0x00, 0x00, 0x00) + ERR ("c010 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C011 != 0x09)) { - ERR ("c011 corrupted", Z062, 0x03FB, 0x00, 0x00, 0x00, 0x00) + ERR ("c011 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C012 != 0x0A)) { - ERR ("c012 corrupted", Z062, 0x03FE, 0x00, 0x00, 0x00, 0x00) + ERR ("c012 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C013 != 0x0B)) { - ERR ("c013 corrupted", Z062, 0x0401, 0x00, 0x00, 0x00, 0x00) + ERR ("c013 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C014 != 0x0C)) { - ERR ("c014 corrupted", Z062, 0x0404, 0x00, 0x00, 0x00, 0x00) + ERR ("c014 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C015 != 0x0D)) { - ERR ("c015 corrupted", Z062, 0x0407, 0x00, 0x00, 0x00, 0x00) + ERR ("c015 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C016 != 0x0E)) { - ERR ("c016 corrupted", Z062, 0x040A, 0x00, 0x00, 0x00, 0x00) + ERR ("c016 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C017 != 0x0F)) { - ERR ("c017 corrupted", Z062, 0x040D, 0x00, 0x00, 0x00, 0x00) + ERR ("c017 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C018 != 0x10)) { - ERR ("c018 corrupted", Z062, 0x0410, 0x00, 0x00, 0x00, 0x00) + ERR ("c018 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } If ((C019 != 0x11)) { - ERR ("c019 corrupted", Z062, 0x0413, 0x00, 0x00, 0x00, 0x00) + ERR ("c019 corrupted", Z062, __LINE__, 0x00, 0x00, 0x00, 0x00) } } @@ -1229,13 +1226,13 @@ Name (REST, 0x00) If ((Arg2 < 0x01)) { - ERR ("sft", Z062, 0x047D, 0x00, 0x00, Arg2, 0x01) + ERR ("sft", Z062, __LINE__, 0x00, 0x00, Arg2, 0x01) Return (Ones) } If ((Arg1 > 0x07)) { - ERR ("sft", Z062, 0x0482, 0x00, 0x00, Arg1, 0x07) + ERR ("sft", Z062, __LINE__, 0x00, 0x00, Arg1, 0x07) Return (Ones) } @@ -1371,12 +1368,12 @@ TMP1 = ObjectType (Arg2) If ((TMP0 != TMP1)) { - ERR (Arg0, Z062, 0x050A, 0x00, 0x00, TMP0, TMP1) + ERR (Arg0, Z062, __LINE__, 0x00, 0x00, TMP0, TMP1) Local7 = 0x01 } ElseIf ((Arg1 != Arg2)) { - ERR (Arg0, Z062, 0x050D, 0x00, 0x00, Arg1, Arg2) + ERR (Arg0, Z062, __LINE__, 0x00, 0x00, Arg1, Arg2) Local7 = 0x01 } } @@ -1385,12 +1382,12 @@ TMP1 = ObjectType (Arg3) If ((TMP0 != TMP1)) { - ERR (Arg0, Z062, 0x0513, 0x00, 0x00, TMP0, TMP1) + ERR (Arg0, Z062, __LINE__, 0x00, 0x00, TMP0, TMP1) Local7 = 0x01 } ElseIf ((Arg1 != Arg3)) { - ERR (Arg0, Z062, 0x0516, 0x00, 0x00, Arg1, Arg3) + ERR (Arg0, Z062, __LINE__, 0x00, 0x00, Arg1, Arg3) Local7 = 0x01 } } @@ -1469,7 +1466,7 @@ ERR7++ /* Reset internal information about exceptions */ - CH03 ("", 0x00, 0x0888, 0x0561, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) EXC0 = 0x00 EXC1 = 0x00 } @@ -2100,7 +2097,7 @@ { /* Check, the current number of exceptions is zero */ - CH03 ("FNSH", 0x00, 0x00, 0x07B5, 0x00) + CH03 ("FNSH", 0x00, __LINE__, 0x00, 0x00) /* Check all the constants are not corrupted */ CST0 () diff --git a/tests/aslts/src/runtime/cntl/ehandle.asl b/tests/aslts/src/runtime/cntl/ehandle.asl index 9f3cadb..873e603 100644 --- a/tests/aslts/src/runtime/cntl/ehandle.asl +++ b/tests/aslts/src/runtime/cntl/ehandle.asl @@ -732,7 +732,7 @@ Else { Debug = "Maximal number of exceptions exceeded" - ERR ("_ERR", Z063, 0xC5, 0x00, 0x00, EXC0, EXC2) + ERR ("_ERR", Z063, __LINE__, 0x00, 0x00, EXC0, EXC2) } } @@ -752,7 +752,7 @@ If (EXC1) { Concatenate ("Some unexpected exceptions were handled, 0x", EXC1, Local0) - ERR ("CH02", Z063, 0xD9, 0x00, 0x00, Local0, 0x00) + ERR ("CH02", Z063, __LINE__, 0x00, 0x00, Local0, 0x00) } Return (EXC1) /* \EXC1 */ @@ -776,7 +776,7 @@ Concatenate (Local1, EX01, Local0) Concatenate (Local0, ", ", Local1) Concatenate (Local1, EX00, Debug) - ERR (Arg0, Z063, 0xF0, Arg1, Arg2, Arg3, Arg4) + ERR (Arg0, Z063, __LINE__, Arg1, Arg2, Arg3, Arg4) Local7 = EXC0 /* \EXC0 */ } @@ -903,7 +903,7 @@ EX04 = 0x00 If (Local5) { - ERR (Arg0, Z063, 0x0166, Arg3, Arg4, Arg5, Arg6) + ERR (Arg0, Z063, __LINE__, Arg3, Arg4, Arg5, Arg6) } Return (Local5) @@ -911,20 +911,20 @@ Method (CH05, 0, NotSerialized) { - Return (CH03 ("CH05", 0x00, 0x00, 0x016E, 0x00)) + Return (CH03 ("CH05", 0x00, __LINE__, 0x00, 0x00)) } Method (CH06, 3, NotSerialized) { If (EXCV) { - Return (CH04 (Arg0, 0x00, Arg2, 0x00, 0x0174, 0x00, 0x00)) + Return (CH04 (Arg0, 0x00, Arg2, 0x00, __LINE__, 0x00, 0x00)) } Else { /* Just only presence of ANY exception(s) */ - Return (CH04 (Arg0, 0x00, 0xFF, 0x00, 0x0177, 0x00, 0x00)) + Return (CH04 (Arg0, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00)) } } @@ -935,11 +935,11 @@ { If (SLCK) { - CH03 (Arg0, Arg3, Arg4, 0x0181, Arg6) + CH03 (Arg0, Arg3, __LINE__, 0x00, Arg6) } Else { - CH04 (Arg0, Arg1, Arg2, Arg3, 0x0183, Arg5, Arg6) + CH04 (Arg0, Arg1, Arg2, Arg3, __LINE__, Arg5, Arg6) } } @@ -1034,7 +1034,7 @@ Concatenate (Local0, ", number of exceptions 0x", Local1) Concatenate (Local1, Local4, Local0) MSG0 (Arg1, Local0) - ERR (Arg0, Z063, 0x01DE, Arg2, Arg3, Arg4, Arg5) + ERR (Arg0, Z063, __LINE__, Arg2, Arg3, Arg4, Arg5) Local7 = 0x01 } @@ -1115,7 +1115,7 @@ */ If (Local5) { - ERR ("", Z063, 0x022E, Arg3, Arg4, 0x00, 0x00) + ERR (__METHOD__, Z063, __LINE__, Arg3, Arg4, 0x00, 0x00) } Arg5 = Local7 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 74ca835..0dbbb61 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 @@ -49,11 +49,11 @@ SET0 (Z132, __METHOD__, 0x00) If (RN00) { - CH03 (__METHOD__, Z132, 0x00, 0x3B, 0x00) + CH03 (__METHOD__, Z132, __LINE__, 0x00, 0x00) _TCI (C200, Local1) M000 (0x00) _TCI (C201, PP0A) - CH04 (__METHOD__, 0x00, 0xFF, Z132, 0x41, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z132, __LINE__, 0x00, 0x00) M3A3 (Local1, PP0A, Local3) M3A4 (Local1, PP0A, Local3, 0x00, 0x00, 0x00, 0x00) } 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 9f7c04b..0f8f31c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl @@ -39,58 +39,58 @@ * Check that exceptions initiated by some bdemo tests on the * global level are all actually handled and reset at this point. */ - CH03 ("", 0x00, 0x0999, 0x2D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (0x01 && 0x01) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x00 == 0x00) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x01 > 0x00) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x01 >= 0x01) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x00 < 0x01) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x45, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x01 <= 0x01) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = !0x00 If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x01 != 0x00) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x54, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x00 || 0x01) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x59, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } } 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 7a42bc5..bd6bb8c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl @@ -53,6 +53,6 @@ If ((Local0 != 0x55555555)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local0, 0x55555555) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 1cc5644..54f0cf1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl @@ -42,12 +42,12 @@ Local0 = ObjectType (Local5) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } Local5++ If ((Local5 != 0x01)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local5, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local5, 0x01) } } 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 de4da80..dfacff8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl @@ -52,12 +52,12 @@ { If ((Local7 != 0x1234)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local7, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x1234) } } ElseIf ((Local7 != 0x5678)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, Local7, 0x5678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 45aef9c..3f66ba5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl @@ -35,12 +35,12 @@ ToInteger ("0x12345678", Local0) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x27, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } ToInteger ("12345678", Local0) If ((Local0 != 0x00BC614E)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local0, 0x00BC614E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00BC614E) } } 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 4081605..d420893 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl @@ -40,6 +40,6 @@ ToString (B000, Local0, Local1) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } 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 c4ea3e9..0353fe5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl @@ -41,6 +41,6 @@ Local0 = ObjectType (F000) If ((Local0 != C00D)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local0, C00D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 559d746..f1bd431 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl @@ -35,7 +35,7 @@ Local7 = ObjectType (Local0) If ((Local7 != C008)) { - ERR ("", ZFFF, 0x27, 0x00, 0x00, Local7, C008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C008) } } @@ -49,7 +49,7 @@ Local7 = ObjectType (Local0) If ((Local7 != C008)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local7, C008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 28847ad..a6e7572 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl @@ -40,7 +40,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local2, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x04) @@ -48,7 +48,7 @@ 0x0A, 0x0B, 0x0C, 0x0D // .... })) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local1, Buffer (0x04) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Buffer (0x04) { 0x0A, 0x0B, 0x0C, 0x0D // .... }) @@ -57,7 +57,7 @@ Local2 = ObjectType (Local0) If ((Local2 != C00B)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local2, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local0 != Buffer (0x04) @@ -65,7 +65,7 @@ 0x0A, 0x0B, 0x0C, 0x0D // .... })) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, Local0, Buffer (0x04) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x04) { 0x0A, 0x0B, 0x0C, 0x0D // .... }) 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 0ea56ab..736d193 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl @@ -44,48 +44,48 @@ Local7 = ObjectType (BF00) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF01) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF02) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF03) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF04) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF05) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF06) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x50, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF07) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x55, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 76614b4..d61c90c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl @@ -37,13 +37,13 @@ Method (MDAF, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MDAE (0x64) - CH03 ("", 0x00, 0x01, 0x2C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MDAE (0x65) - CH04 ("", 0x00, 0x30, 0x00, 0x2E, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ + CH04 (__METHOD__, 0x00, 0x30, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ MDAE (0xFF) - CH04 ("", 0x00, 0x30, 0x00, 0x30, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ + CH04 (__METHOD__, 0x00, 0x30, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ MDAE (0x0100) - CH04 ("", 0x00, 0x30, 0x00, 0x32, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ + CH04 (__METHOD__, 0x00, 0x30, 0x00, __LINE__, 0x00, 0x00) /* 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 c175005..d95d8fa 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl @@ -39,12 +39,12 @@ ToDecimalString (B000, Local0) If ((Local0 != "1,1")) { - ERR ("", ZFFF, 0x2A, 0x00, 0x00, Local0, "1,1") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "1,1") } Local1 = SizeOf (Local0) If ((Local1 != 0x03)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, Local1, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x03) } } 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 c3d61f1..8cbc35a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0016/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0016/DECL.asl @@ -38,9 +38,9 @@ /* 101 characters */ Local1 = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Concatenate (Local0, Local1, Local2) - CH03 ("", 0x00, 0x01, 0x2F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * The length of String is no more restricted. * 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 a827177..be21ca2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl @@ -42,7 +42,7 @@ } If ((Local0 == Local1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } If ((Local0 != Buffer (0x05) @@ -50,7 +50,7 @@ 0x20, 0x21, 0x22, 0x00, 0x25 // !".% })) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, Buffer (0x05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x05) { 0x20, 0x21, 0x22, 0x00, 0x25 // !".% }) @@ -61,7 +61,7 @@ 0x20, 0x21, 0x22, 0x00, 0x26 // !".& })) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local1, Buffer (0x05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Buffer (0x05) { 0x20, 0x21, 0x22, 0x00, 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 ee83f7f..a79cb14 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl @@ -47,7 +47,7 @@ } Else { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 b11a443..5350d65 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl @@ -42,6 +42,6 @@ } If ((Local0 >= Local1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 8a308d5..a521acc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl @@ -47,7 +47,7 @@ } Else { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 b7e20d3..94faae0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl @@ -42,6 +42,6 @@ } If ((Local0 <= Local1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 3658384..227e01c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl @@ -47,7 +47,7 @@ } Else { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 d8957cf..265f6c5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl @@ -36,34 +36,34 @@ Local0 = 0x0000009999999999 Local1 = 0x00000002540BE3FF - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) FromBCD (Local0, Local2) If ((Local2 != Local1)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local2, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local1) } /* Bug, FromBCD(0x10000000000) */ Local0 = 0x0000010000000000 Local1 = 0x00000002540BE400 - CH03 ("", 0x00, 0x03, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) FromBCD (Local0, Local2) If ((Local2 != Local1)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, Local2, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local1) } /* Ok, ToBCD(10000000000) */ Local0 = 0x00000002540BE400 Local1 = 0x0000010000000000 - CH03 ("", 0x00, 0x06, 0x40, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToBCD (Local0, Local2) If ((Local2 != Local1)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local2, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local1) } - CH03 ("", 0x00, 0x00, 0x46, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 ee21b2c..e861041 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl @@ -45,33 +45,33 @@ Method (MDBD, 0, Serialized) { Name (B000, Buffer (0x10){}) - CH03 ("", 0x00, 0x00, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateBitField (B000, 0x80, F000) - CH04 ("", 0x00, 0x36, 0x00, 0x36, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x02, 0x38, 0x00) + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateByteField (B000, 0x10, F001) - CH04 ("", 0x00, 0x36, 0x00, 0x3A, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x04, 0x3C, 0x00) + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateWordField (B000, 0x0F, F002) - CH04 ("", 0x00, 0x36, 0x00, 0x3E, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x06, 0x40, 0x00) + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateDWordField (B000, 0x0D, F003) - CH04 ("", 0x00, 0x36, 0x00, 0x42, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x08, 0x44, 0x00) + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateQWordField (B000, 0x09, F004) - CH04 ("", 0x00, 0x36, 0x00, 0x46, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x0A, 0x48, 0x00) + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x7F, 0x02, F005) - CH04 ("", 0x00, 0x36, 0x00, 0x4A, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x0C, 0x4C, 0x00) + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x78, 0x09, F006) - CH04 ("", 0x00, 0x36, 0x00, 0x4E, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x0E, 0x50, 0x00) + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x80, 0x01, F007) - CH04 ("", 0x00, 0x36, 0x00, 0x52, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x10, 0x54, 0x00) + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x79, 0x08, F008) - CH04 ("", 0x00, 0x36, 0x00, 0x56, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } Method (MDBE, 0, NotSerialized) 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 9012cf3..d1b6f6e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl @@ -43,7 +43,7 @@ Local4 = (Arg1 * 0x2710) If ((Local6 < Local4)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local6, Local4) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local6, Local4) } } Case (0x01) @@ -55,7 +55,7 @@ Local4 = (Arg1 * 0x0A) If ((Local6 < Local4)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local6, Local4) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local6, Local4) } } Case (0x02) @@ -67,7 +67,7 @@ Local4 = (Arg1 * 0x2710) If ((Local6 < Local4)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local6, Local4) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 61e42aa..32891be 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 @@ -49,10 +49,10 @@ Name (ID28, 0x00) Method (MDC7, 0, Serialized) { - CH03 ("", 0x00, 0x00, 0x37, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = 0x12345678 Name (I000, 0x00) - CH04 ("", 0x00, 0xFF, 0x00, 0x3A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } Method (M800, 0, Serialized) @@ -78,36 +78,36 @@ { Name (I000, 0x00) I000 = 0xABCD0000 - CH03 ("", 0x00, 0x02, 0x55, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Name (I001, 0x00) I001 = 0xABCD0001 - CH03 ("", 0x00, 0x03, 0x5A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Name (I002, 0xABCD0002) - CH03 ("", 0x00, 0x03, 0x5E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If (Y084) { - CH03 ("", 0x00, 0x04, 0x62, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Method (M000, 0, Serialized) { Name (I000, 0xABCD0003) If ((I000 != 0xABCD0003)) { - ERR ("", ZFFF, 0x68, 0x00, 0x00, I000, 0xABCD0003) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0003) } } - CH03 ("", 0x00, 0x05, 0x6C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Method (M001, 0, Serialized) { Name (I000, 0xABCD0004) I000 = 0xABCD0005 If ((I000 != 0xABCD0005)) { - ERR ("", ZFFF, 0x73, 0x00, 0x00, I000, 0xABCD0005) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0005) } } - CH03 ("", 0x00, 0x06, 0x77, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Method (M002, 0, Serialized) { Debug = I000 /* \M802.M002.I000 */ @@ -115,11 +115,11 @@ I000 = 0xABCD0007 If ((I000 != 0xABCD0007)) { - ERR ("", ZFFF, 0x7F, 0x00, 0x00, I000, 0xABCD0007) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0007) } } - CH03 ("", 0x00, 0x07, 0x83, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Method (M003, 0, Serialized) { Debug = "------------------------------ 000000000" @@ -127,40 +127,40 @@ Name (ID28, 0xABCD0008) If ((ID28 != 0xABCD0008)) { - ERR ("", ZFFF, 0x8B, 0x00, 0x00, ID28, 0xABCD0008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID28, 0xABCD0008) } } - CH03 ("", 0x00, 0x08, 0x8F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } - CH03 ("", 0x00, 0x09, 0x92, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((I000 != 0xABCD0000)) { - ERR ("", ZFFF, 0x95, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } If ((I001 != 0xABCD0001)) { - ERR ("", ZFFF, 0x98, 0x00, 0x00, I001, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I001, 0xABCD0001) } If ((I002 != 0xABCD0002)) { - ERR ("", ZFFF, 0x9B, 0x00, 0x00, I002, 0xABCD0002) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I002, 0xABCD0002) } If (Y084) { - CH03 ("", 0x00, 0x0D, 0x9F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 () - CH03 ("", 0x00, 0x0E, 0xA1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M001 () - CH03 ("", 0x00, 0x0F, 0xA3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M002 () - CH03 ("", 0x00, 0x10, 0xA5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M003 () - CH03 ("", 0x00, 0x11, 0xA7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -168,17 +168,17 @@ BLCK () } - CH03 ("", 0x00, 0x12, 0xAD, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) II99 = 0xABCD0009 Name (II99, 0x00) - CH04 ("", 0x00, 0xFF, 0x00, 0xB2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } Method (M1DC, 0, NotSerialized) { /* Successful compilation itself of this test is error */ - ERR ("", ZFFF, 0xB8, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Method (MDC6, 0, NotSerialized) 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 30d33ba..21c143e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl @@ -40,7 +40,7 @@ Debug = N000 /* \MDCE.N000 */ If ((N000 != 0xFDEACB01)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, N000, 0xFDEACB01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, N000, 0xFDEACB01) } /* Show that LGreater operator indicates correctly */ @@ -51,7 +51,7 @@ } Else { - ERR ("", ZFFF, 0x38, 0x00, 0x00, 0x42345678, 0x32547698) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x42345678, 0x32547698) } /* Show that (in 32-bit mode) "FdeAcb0132547698" passed to Name operator */ @@ -63,7 +63,7 @@ } Else { - ERR ("", ZFFF, 0x42, 0x00, 0x00, N000, 0x42345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, N000, 0x42345678) } /* Show that, nevertheless, (in 32-bit mode) "FdeAcb01Fdeacb03" passed */ @@ -75,7 +75,7 @@ } Else { - ERR ("", ZFFF, 0x4C, 0x00, 0x00, 0xFDEACB02, "FdeAcb01Fdeacb03") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 f738f7f..b40a170 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 @@ -39,7 +39,7 @@ Local0 = ObjectType (Debug) If ((Local0 != C018)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local0, C018) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C018) } /* Method */ @@ -52,6 +52,6 @@ Local0 = ObjectType (M0F2) If ((Local0 != C010)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local0, C010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 b905f9a..34e24ad 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl @@ -39,6 +39,6 @@ Local7 = (Local0 + 0x01) If ((Local7 != 0x01)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local7, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x01) } } 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 6a70a2e..eab3ab9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl @@ -39,6 +39,6 @@ Local7 = (Local0 + 0x01) If ((Local7 != 0x01)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local7, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x01) } } 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 daf5943..17acd1f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl @@ -39,6 +39,6 @@ Local7 = (Local0 + 0x01) If ((Local7 != 0x0B)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local7, 0x0B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x0B) } } 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 3d42542..c9a5113 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl @@ -44,6 +44,6 @@ } If ((Local0 != Local1)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 1ef59a8..3b37241 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl @@ -57,24 +57,24 @@ ToDecimalString (B001, Local0) If ((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, 0x36, 0x00, 0x00, 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 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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") } Local1 = SizeOf (Local0) If ((Local1 != 0x63)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local1, 0x63) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x63) } ToDecimalString (B000, Local0) If ((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, 0x41, 0x00, 0x00, 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 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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") } Local1 = SizeOf (Local0) If ((Local1 != 0x65)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local1, 0x65) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x65) } } 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 7a4b4b5..bb0baeb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl @@ -59,24 +59,24 @@ ToHexString (B001, Local0) If ((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, 0x36, 0x00, 0x00, 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 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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") } Local1 = SizeOf (Local0) If ((Local1 != 0xC5)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Local1, 0xC5) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0xC5) } ToHexString (B000, Local0) If ((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, 0x43, 0x00, 0x00, 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 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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") } Local1 = SizeOf (Local0) If ((Local1 != 0xC8)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local1, 0xC8) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0xC8) } } 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 80686a4..67d79e9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl @@ -76,7 +76,7 @@ { /* if (Local5) { */ - ERR ("", ZFFF, 0x56, 0x00, 0x00, Local0, Local7) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local7) Debug = Concatenate ("Cur timer : 0x", Local7) Debug = Concatenate ("Start timer : 0x", Local0) Debug = Concatenate ("Step of cycle : 0x", TSLP) 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 a7f2167..1412968 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl @@ -40,12 +40,12 @@ Local1 = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" /* Concatenate 100-byte long string with 101-byte long */ /* string and expect AE_AML_STRING_LIMIT exception. */ - CH03 ("", 0x00, 0x00, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local2 = Concatenate (Local0, Local1) /* * No restriction on the length of String objects now: * * CH04("", 0, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT */ - CH03 ("", 0x00, 0x01, 0x38, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 b93a372..b40015d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0049/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0049/DECL.asl @@ -53,12 +53,12 @@ /* ToDecimalString for 101-byte long buffer attempt */ /* to produce 201 byte long string and have to result */ /* in AE_AML_STRING_LIMIT exception. */ - CH03 ("", 0x00, 0x00, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToDecimalString (B000, Local0) /* * No restriction on the length of String objects now: * * CH04("", 0, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT */ - CH03 ("", 0x00, 0x01, 0x40, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 bb078fa..949e3f5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl @@ -49,7 +49,7 @@ /* ToHexString for 68-byte long buffer attempt */ /* to produce 203 byte long string and have to */ /* result in AE_AML_STRING_LIMIT exception. */ - CH03 ("", 0x00, 0x00, 0x33, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToHexString (B000, Local0) - CH04 ("", 0x00, 0x3D, 0x00, 0x35, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (__METHOD__, 0x00, 0x3D, 0x00, __LINE__, 0x00, 0x00) /* 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 8b19f57..30b4024 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 @@ -36,12 +36,12 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg1) } If ((Arg2 != Arg3)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -87,6 +87,6 @@ MDDB (0x38, 0x07, 0xB0, 0x16, "_ADR") If ((RT00 != BUF0)) { - ERR ("", ZFFF, 0x4C, 0x00, 0x00, RT00, BUF0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 4adfc0d..bf70a28 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl @@ -42,18 +42,18 @@ Local0 = 0x19 If ((Local0 != 0x19)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, 0x19) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x19) } Local0 = 0x1A If ((Local0 != 0x1A)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local0, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } Local0 = 0x1B If ((Local0 != 0x1B)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local0, 0x1B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 2587e4d..74c5a1d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl @@ -51,7 +51,7 @@ 0x79, 0x00 // y. })) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x00 // y. }) @@ -75,7 +75,7 @@ 0x79, 0x00 // y. })) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x00 // y. }) @@ -90,7 +90,7 @@ 0x79, 0x00 // y. })) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x00 // y. }) @@ -111,7 +111,7 @@ 0x79, 0x00 // y. })) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x00 // y. }) @@ -132,7 +132,7 @@ }) If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x54, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } Local0 = (Buffer (0x01) @@ -141,7 +141,7 @@ } == B000) If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x59, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } } @@ -156,7 +156,7 @@ }) If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x61, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } } @@ -174,7 +174,7 @@ }) If ((Local0 != Zero)) { - ERR ("", ZFFF, 0x6D, 0x00, 0x00, Local0, Zero) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Zero) } Local0 = (Buffer (0x01) @@ -183,7 +183,7 @@ } > B000) If ((Local0 != Zero)) { - ERR ("", ZFFF, 0x72, 0x00, 0x00, Local0, Zero) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Zero) } } @@ -198,7 +198,7 @@ }) If ((Local0 != Zero)) { - ERR ("", ZFFF, 0x7A, 0x00, 0x00, Local0, Zero) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Zero) } } @@ -219,7 +219,7 @@ 0x79, 0x79 // yy })) { - ERR ("", ZFFF, 0x88, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x79 // yy }) @@ -234,7 +234,7 @@ 0x79, 0x79 // yy })) { - ERR ("", ZFFF, 0x8D, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x79 // yy }) @@ -255,7 +255,7 @@ 0x79, 0x79 // yy })) { - ERR ("", ZFFF, 0x95, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x79 // yy }) @@ -276,7 +276,7 @@ }) If ((Local0 != 0xF2)) { - ERR ("", ZFFF, 0xA1, 0x00, 0x00, Local0, 0xF2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xF2) } Local0 = (Buffer (0x01) @@ -285,7 +285,7 @@ } + B000) /* \MDE8.B000 */ If ((Local0 != 0xF2)) { - ERR ("", ZFFF, 0xA6, 0x00, 0x00, Local0, 0xF2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xF2) } } @@ -300,7 +300,7 @@ }) If ((Local0 != 0xF2)) { - ERR ("", ZFFF, 0xAE, 0x00, 0x00, Local0, 0xF2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 bc9665d..adbf9de 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 @@ /* Store("ERROR 0: mdf2, after Return !!!", Debug) */ } - ERR ("", ZFFF, 0x3C, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) MDF0 () MDF1 () Return (0x5678) @@ -73,10 +73,10 @@ Return ( /* ASL-compiler DOESN'T report Warning in this case!!! */ /* And the Store operator below is actually processed!!! */ Zero) - ERR ("", ZFFF, 0x52, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } - ERR ("", ZFFF, 0x55, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) MDF0 () MDF1 () Return (Zero) 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 e137a08..8798db2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl @@ -50,7 +50,7 @@ /* 0008 */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ })) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local0, Buffer (0x10) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x10) { /* 0000 */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........ /* 0008 */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ @@ -62,7 +62,7 @@ 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 // ........ })) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, Local0, Buffer (0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x08) { 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 // ........ }) @@ -89,7 +89,7 @@ /* 0008 */ 0x90, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // .x...... })) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local0, Buffer (0x10) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x10) { /* 0000 */ 0x34, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 4....... /* 0008 */ 0x90, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // .x...... @@ -101,7 +101,7 @@ 0x34, 0x12, 0x00, 0x00, 0x90, 0x78, 0x00, 0x00 // 4....x.. })) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, Local0, Buffer (0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x08) { 0x34, 0x12, 0x00, 0x00, 0x90, 0x78, 0x00, 0x00 // 4....x.. }) @@ -125,7 +125,7 @@ /* 0008 */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ })) { - ERR ("", ZFFF, 0x58, 0x00, 0x00, Local0, Buffer (0x10) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x10) { /* 0000 */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........ /* 0008 */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ @@ -137,7 +137,7 @@ 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 // ........ })) { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, Local0, Buffer (0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x08) { 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 // ........ }) 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 3d3c9c8..8d0446b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl @@ -79,14 +79,14 @@ Local1 = SizeOf (B000) If ((Local0 != 0x03)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local0, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x03) } ElseIf ((Local1 != 0xCA)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local0, 0xCA) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xCA) } ElseIf ((B000 != B001)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, B000, B001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 2b42223..c0e06c2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl @@ -37,11 +37,11 @@ { If (SLCK) { - CH03 ("", 0x00, Arg0, 0x29, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { - CH04 ("", 0x00, 0x2F, 0x00, 0x2B, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) } } @@ -108,6 +108,6 @@ ME06 () If ((ID09 != 0x01)) { - ERR ("", ZFFF, 0x77, 0x00, 0x00, ID09, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID09, 0x01) } } 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 3f5b56a..1302dea 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 @@ -56,6 +56,6 @@ If ((Local0 != S000)) { - ERR ("", ZFFF, 0x90, 0x00, 0x00, S000, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 bc28fb8..5dfa76a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl @@ -32,35 +32,35 @@ { /* Hex: 0x - dec */ - CH03 ("", 0x00, 0x0100, 0x25, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToInteger ("0x0", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("0x0000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("0x1", Local0) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } ToInteger ("0x12345678", Local0) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } ToInteger ("0x12345", Local0) If ((Local0 != 0x00012345)) { - ERR ("", ZFFF, 0x3D, 0x00, 0x00, Local0, 0x00012345) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00012345) } If (F64) @@ -69,14 +69,14 @@ ToInteger (Local1, Local0) If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } Local1 = "0x123456789012345" ToInteger (Local1, Local0) If ((Local0 != 0x0123456789012345)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, Local0, 0x0123456789012345) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0123456789012345) } } @@ -85,13 +85,13 @@ ToInteger ("0xabcdefef", Local0) If ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0x52, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } ToInteger ("0xabcdef", Local0) If ((Local0 != 0x00ABCDEF)) { - ERR ("", ZFFF, 0x57, 0x00, 0x00, Local0, 0x00ABCDEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00ABCDEF) } If (F64) @@ -100,14 +100,14 @@ ToInteger (Local1, Local0) If ((Local0 != 0xABCDEFEFADEFBCDF)) { - ERR ("", ZFFF, 0x5E, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) } Local1 = "0xabcdefefadefbcd" ToInteger (Local1, Local0) If ((Local0 != 0x0ABCDEFEFADEFBCD)) { - ERR ("", ZFFF, 0x64, 0x00, 0x00, Local0, 0x0ABCDEFEFADEFBCD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0ABCDEFEFADEFBCD) } } @@ -116,7 +116,7 @@ ToInteger ("0x1ab2cd34", Local0) If ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x6C, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } If (F64) @@ -125,18 +125,18 @@ ToInteger (Local1, Local0) If ((Local0 != 0x1AB2CD340FE05678)) { - ERR ("", ZFFF, 0x73, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) } Local1 = "0x1ab2cd340fe0" ToInteger (Local1, Local0) If ((Local0 != 0x00001AB2CD340FE0)) { - ERR ("", ZFFF, 0x79, 0x00, 0x00, Local0, 0x00001AB2CD340FE0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00001AB2CD340FE0) } } - CH03 ("", 0x00, 0x0219, 0x7D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -144,53 +144,53 @@ */ Method (MF93, 0, NotSerialized) { - CH03 ("", 0x00, 0x010F, 0x85, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToInteger ("0", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x89, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("0000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x8E, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("000000000000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x93, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("000000000000000000000000000000000000000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x98, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("1", Local0) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x9D, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } ToInteger ("1234567890", Local0) If ((Local0 != 0x499602D2)) { - ERR ("", ZFFF, 0xA2, 0x00, 0x00, Local0, 0x499602D2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x499602D2) } ToInteger ("1234567", Local0) If ((Local0 != 0x0012D687)) { - ERR ("", ZFFF, 0xA7, 0x00, 0x00, Local0, 0x0012D687) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0012D687) } ToInteger ("4294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0xAC, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } If (F64) @@ -199,11 +199,11 @@ ToInteger (Local1, Local0) If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR ("", ZFFF, 0xB3, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } } - CH03 ("", 0x00, 0x0119, 0xB7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -212,35 +212,35 @@ */ Method (MF94, 0, NotSerialized) { - CH03 ("", 0x00, 0x011A, 0xC0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToInteger (" 0x0", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0xC4, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" 0x00000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0xC9, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" 0x1", Local0) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0xCE, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } ToInteger (" 0x12345678", Local0) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0xD3, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } ToInteger (" 0x12345", Local0) If ((Local0 != 0x00012345)) { - ERR ("", ZFFF, 0xD8, 0x00, 0x00, Local0, 0x00012345) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00012345) } If (F64) @@ -249,33 +249,33 @@ ToInteger (Local1, Local0) If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0xDF, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } Local1 = " 0x123456789012345" ToInteger (Local1, Local0) If ((Local0 != 0x0123456789012345)) { - ERR ("", ZFFF, 0xE5, 0x00, 0x00, Local0, 0x0123456789012345) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0123456789012345) } } ToInteger (" 0xabcdefef", Local0) If ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0xEB, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } ToInteger (" 0xabcdef", Local0) If ((Local0 != 0x00ABCDEF)) { - ERR ("", ZFFF, 0xF0, 0x00, 0x00, Local0, 0x00ABCDEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00ABCDEF) } ToInteger ("\t0xabcdef", Local0) If ((Local0 != 0x00ABCDEF)) { - ERR ("", ZFFF, 0xF5, 0x00, 0x00, Local0, 0x00ABCDEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00ABCDEF) } If (F64) @@ -284,21 +284,21 @@ ToInteger (Local1, Local0) If ((Local0 != 0xABCDEFEFADEFBCDF)) { - ERR ("", ZFFF, 0xFC, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) } Local1 = " 0xabcdefefadefbcd" ToInteger (Local1, Local0) If ((Local0 != 0x0ABCDEFEFADEFBCD)) { - ERR ("", ZFFF, 0x0102, 0x00, 0x00, Local0, 0x0ABCDEFEFADEFBCD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0ABCDEFEFADEFBCD) } } ToInteger (" 0x1ab2cd34", Local0) If ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x0108, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } If (F64) @@ -307,75 +307,75 @@ ToInteger (Local1, Local0) If ((Local0 != 0x1AB2CD340FE05678)) { - ERR ("", ZFFF, 0x010F, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) } Local1 = " 0x1ab2cd340fe0" ToInteger (Local1, Local0) If ((Local0 != 0x00001AB2CD340FE0)) { - ERR ("", ZFFF, 0x0115, 0x00, 0x00, Local0, 0x00001AB2CD340FE0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00001AB2CD340FE0) } } ToInteger (" 0", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x011B, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" \t0000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0120, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("\t000000000000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0125, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" 000000000000000000000000000000000000000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x012A, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" 1", Local0) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x012F, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } ToInteger (" 1234567890", Local0) If ((Local0 != 0x499602D2)) { - ERR ("", ZFFF, 0x0134, 0x00, 0x00, Local0, 0x499602D2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x499602D2) } ToInteger ("\t1234567890", Local0) If ((Local0 != 0x499602D2)) { - ERR ("", ZFFF, 0x0139, 0x00, 0x00, Local0, 0x499602D2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x499602D2) } ToInteger ("\t\t\t\t\t\t\t\t\t1234567890", Local0) If ((Local0 != 0x499602D2)) { - ERR ("", ZFFF, 0x013E, 0x00, 0x00, Local0, 0x499602D2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x499602D2) } ToInteger (" \t 1234567", Local0) If ((Local0 != 0x0012D687)) { - ERR ("", ZFFF, 0x0143, 0x00, 0x00, Local0, 0x0012D687) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0012D687) } ToInteger (" \t 4294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x0148, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } If (F64) @@ -384,11 +384,11 @@ ToInteger (Local1, Local0) If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR ("", ZFFF, 0x014F, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } } - CH03 ("", 0x00, 0x0135, 0x0153, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -396,83 +396,83 @@ */ Method (MF95, 0, NotSerialized) { - CH03 ("", 0x00, 0x0136, 0x015B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToInteger (" 0", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x015F, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" 2", Local0) If ((Local0 != 0x02)) { - ERR ("", ZFFF, 0x0164, 0x00, 0x00, Local0, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x02) } ToInteger (" 0xa", Local0) If ((Local0 != 0x0A)) { - ERR ("", ZFFF, 0x0169, 0x00, 0x00, Local0, 0x0A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0A) } ToInteger (" 04294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x016E, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("04294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x0173, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("000000000000000000004294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x0178, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger (" 000000000000000000004294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x017D, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("\t000000000000000000004294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x0182, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("\t \t \t \t \t000000000000000000004294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x0187, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("\t \t \t \t \t04294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x018C, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("\t \t \t \t \t0123456789", Local0) If ((Local0 != 0x075BCD15)) { - ERR ("", ZFFF, 0x0191, 0x00, 0x00, Local0, 0x075BCD15) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x075BCD15) } ToInteger ("0123456789", Local0) If ((Local0 != 0x075BCD15)) { - ERR ("", ZFFF, 0x0196, 0x00, 0x00, Local0, 0x075BCD15) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x075BCD15) } ToInteger ("00123456789", Local0) If ((Local0 != 0x075BCD15)) { - ERR ("", ZFFF, 0x019B, 0x00, 0x00, Local0, 0x075BCD15) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x075BCD15) } If (F64) @@ -481,25 +481,25 @@ ToInteger (Local1, Local0) If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR ("", ZFFF, 0x01A2, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } Local1 = "018446744073709551615" ToInteger (Local1, Local0) If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR ("", ZFFF, 0x01A8, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } Local1 = "000000000000000000000000000000000000000018446744073709551615" ToInteger (Local1, Local0) If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR ("", ZFFF, 0x01AE, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } } - CH03 ("", 0x00, 0x0219, 0x01B2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -509,164 +509,164 @@ { /* 5. "1234cd" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0147, 0x01BB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "1234cd" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01BE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 6. "000x1234" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0149, 0x01C1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "000x1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01C4, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ - CH03 ("", 0x00, 0x014B, 0x01C7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x1234cdQ" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01CA, 0x00, 0x00) - CH03 ("", 0x00, 0x014D, 0x01CC, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x0x12345" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01CF, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 8. "1234 " (white space in dec image) */ - CH03 ("", 0x00, 0x014F, 0x01D2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "1234 " ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01D5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 9. "0x1234cd " (white space in '0x'-image) */ - CH03 ("", 0x00, 0x0151, 0x01D8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x1234cd " ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01DB, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 10. "0x 1234cdQ" (white space after '0x') */ - CH03 ("", 0x00, 0x0153, 0x01DE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x 1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01E1, 0x00, 0x00) - CH03 ("", 0x00, 0x0155, 0x01E3, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x0x 1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01E6, 0x00, 0x00) - CH03 ("", 0x00, 0x0157, 0x01E8, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x0x 0x 1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01EB, 0x00, 0x00) - CH03 ("", 0x00, 0x0159, 0x01ED, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x 0x 1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01F0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 11. (decimal image exceeding maximal) */ /* 32-bit mode � the value exceeding "4294967295" */ If (!F64) { - CH03 ("", 0x00, 0x015B, 0x01F5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "4294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01F8, 0x00, 0x00) - CH03 ("", 0x00, 0x015D, 0x01FA, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "123456789012345678904294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01FD, 0x00, 0x00) - CH03 ("", 0x00, 0x015F, 0x01FF, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = " \t \t\t00004294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0202, 0x00, 0x00) - CH03 ("", 0x00, 0x0161, 0x0204, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "\t0123456789012345678904294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0207, 0x00, 0x00) - CH03 ("", 0x00, 0x0163, 0x0209, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0123456789012345678904294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x020C, 0x00, 0x00) - CH03 ("", 0x00, 0x0165, 0x020E, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = " 123456789012345678904294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0211, 0x00, 0x00) - CH03 ("", 0x00, 0x0167, 0x0213, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "\t123456789012345678904294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0216, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } /* 64-bit mode � the value exceeding "18446744073709551615" */ - CH03 ("", 0x00, 0x0169, 0x021A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "18446744073709551616" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x021D, 0x00, 0x00) - CH03 ("", 0x00, 0x016B, 0x021F, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "\t18446744073709551616" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0222, 0x00, 0x00) - CH03 ("", 0x00, 0x016D, 0x0224, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = " 18446744073709551616" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0227, 0x00, 0x00) - CH03 ("", 0x00, 0x016F, 0x0229, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "018446744073709551616" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x022C, 0x00, 0x00) - CH03 ("", 0x00, 0x0171, 0x022E, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = " \t000000000018446744073709551616" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0231, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 12. "0x12345678901234567" (hex image exceeding maximal) */ - CH03 ("", 0x00, 0x0173, 0x0234, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x12345678901234567" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0237, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ - CH03 ("", 0x00, 0x0175, 0x023A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x00000000000001234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x023D, 0x00, 0x00) - CH03 ("", 0x00, 0x0178, 0x023F, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x0000000000000000000001234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0242, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) */ If (!F64) { - CH03 ("", 0x00, 0x017A, 0x0246, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x123456789" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0249, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } /* 15. "0x" (incomplete '0x' image) */ - CH03 ("", 0x00, 0x017C, 0x024D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0250, 0x00, 0x00) - CH03 ("", 0x00, 0x017E, 0x0252, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x " ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0255, 0x00, 0x00) - CH03 ("", 0x00, 0x0180, 0x0257, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x\t" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x025A, 0x00, 0x00) - CH03 ("", 0x00, 0x0182, 0x025C, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x 1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x025F, 0x00, 0x00) - CH03 ("", 0x00, 0x0184, 0x0261, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x\t1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0264, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 16. Empty string */ - CH03 ("", 0x00, 0x0186, 0x0267, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x026A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } 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 1cf848b..9a802cd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl @@ -32,35 +32,35 @@ { /* Hex: 0x - dec */ - CH03 ("", 0x00, 0x0200, 0x25, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("0x0" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("0x1" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("0x12345678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("0x1234567890123456" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x3D, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - hex */ @@ -68,13 +68,13 @@ Local0 = ("0xabcdefef" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("0xabcdefefadefbcdf" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - dec/hex */ @@ -82,18 +82,18 @@ Local0 = ("0x1ab2cd340fe05678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x50, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0208, 0x53, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x1ab2cd340fe0567823456789123456789987" + 0x00) - CH03 ("", 0x00, 0x0209, 0x55, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x58, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x020B, 0x5B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -101,42 +101,42 @@ */ Method (MF98, 0, NotSerialized) { - CH03 ("", 0x00, 0x0200, 0x63, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x67, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0201, 0x6A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x6E, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0202, 0x71, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x75, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0203, 0x78, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("1" + 0x00) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x7C, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } - CH03 ("", 0x00, 0x0204, 0x7F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("12345678" + 0x00) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x83, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x0205, 0x86, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -144,7 +144,7 @@ */ Method (MF99, 0, NotSerialized) { - CH03 ("", 0x00, 0x0213, 0x8E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Hex: 0x - dec */ Local0 = ("1234567890123456" + 0x00) @@ -152,12 +152,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x95, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x99, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } /* Hex: 0x - hex */ @@ -165,13 +165,13 @@ Local0 = ("abcdefef" + 0x00) If ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0xA1, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } Local0 = ("abcdefe" + 0x00) If ((Local0 != 0x0ABCDEFE)) { - ERR ("", ZFFF, 0xA6, 0x00, 0x00, Local0, 0x0ABCDEFE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0ABCDEFE) } Local0 = ("abcdefefadefbcdf" + 0x00) @@ -179,12 +179,12 @@ { If ((Local0 != 0xABCDEFEFADEFBCDF)) { - ERR ("", ZFFF, 0xAC, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) } } ElseIf ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0xB0, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } /* Hex: 0x - dec/hex */ @@ -194,12 +194,12 @@ { If ((Local0 != 0x1AB2CD340FE05678)) { - ERR ("", ZFFF, 0xB9, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0xBD, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = ("1ab2cd340fe05" + 0x00) @@ -207,21 +207,21 @@ { If ((Local0 != 0x0001AB2CD340FE05)) { - ERR ("", ZFFF, 0xC4, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0xC8, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = ("1a" + 0x00) If ((Local0 != 0x1A)) { - ERR ("", ZFFF, 0xCE, 0x00, 0x00, Local0, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } - CH03 ("", 0x00, 0x0219, 0xD1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -231,315 +231,315 @@ { /* 5. "1234cd" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0220, 0xDA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("1234cd" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0xDD, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 6. "000x1234" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0223, 0xE1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("000x1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0xE4, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ - CH03 ("", 0x00, 0x0225, 0xE8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x1234cdQ" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0xEB, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0227, 0xED, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("1234cdQ" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0xF0, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } - CH03 ("", 0x00, 0x0229, 0xF3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x0x12345" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0xF6, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 8. "1234 " (white space in dec image) */ - CH03 ("", 0x00, 0x022B, 0xFA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("1234 " + 0x00) If ((Local0 != 0x1234)) { - ERR ("", ZFFF, 0xFD, 0x00, 0x00, Local0, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234) } /* 9. "0x1234cd " (white space in '0x'-image) */ - CH03 ("", 0x00, 0x022D, 0x0101, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("1234cd " + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x0104, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 10. "0x 1234cdQ" (white space after '0x') */ - CH03 ("", 0x00, 0x022F, 0x0108, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x010B, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0231, 0x010E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0111, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0233, 0x0114, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0117, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0235, 0x011A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x011D, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 11. (decimal image exceeding maximal) */ /* 32-bit mode � the value exceeding "4294967295" */ If (0x01) { - CH03 ("", 0x00, 0x0237, 0x0123, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("4294967296" + 0x00) If (F64) { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x0127, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x012B, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x023A, 0x012F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0133, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0137, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x023D, 0x013B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t00004294967296" + 0x00) If (F64) { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x013F, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x0143, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x0240, 0x0147, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x014B, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x014F, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x0243, 0x0153, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0157, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x015B, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x0246, 0x015F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0163, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0167, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x0249, 0x016B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x016F, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0173, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } } /* 64-bit mode � the value exceeding "18446744073709551615" */ - CH03 ("", 0x00, 0x024C, 0x0179, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("18446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x017D, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0181, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x024F, 0x0185, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t18446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0189, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x018D, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x0252, 0x0191, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 18446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0195, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0199, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x0255, 0x019D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("018446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x01A1, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x01A5, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x0258, 0x01A9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t000000000018446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x01AD, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x01B1, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } /* 12. "0x12345678901234567" (hex image exceeding maximal) */ - CH03 ("", 0x00, 0x025B, 0x01B6, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x12345678901234567" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01B9, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ - CH03 ("", 0x00, 0x025E, 0x01BD, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x00000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01C0, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0260, 0x01C3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x0000000000000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01C6, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) */ If (0x01) { - CH03 ("", 0x00, 0x0262, 0x01CB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x123456789" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01CE, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } /* 15. "0x" (incomplete '0x' image) */ - CH03 ("", 0x00, 0x0264, 0x01D3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01D6, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0266, 0x01D8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -551,29 +551,29 @@ { /* Hex: 0x - dec */ - CH03 ("", 0x00, 0x0267, 0x01E4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0x0" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01E8, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t0x1" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01ED, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t 0x12345678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01F2, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = (" \t0x1234567890123456" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01F7, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - hex */ @@ -581,13 +581,13 @@ Local0 = (" 0xabcdefef" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01FE, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t\t0xabcdefefadefbcdf" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0203, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - dec/hex */ @@ -595,72 +595,72 @@ Local0 = (" \t \t \t \t \t0x1ab2cd340fe05678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x020A, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x026F, 0x020D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t \t \t \t \t \t0x1ab2cd340fe0567823456789123456789987" + 0x00) - CH03 ("", 0x00, 0x0270, 0x020F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0212, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0272, 0x0215, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * Implicit String to Integer () * * Method(mf98) */ - CH03 ("", 0x00, 0x0273, 0x021D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0221, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0275, 0x0224, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t\t\t0000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0228, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0277, 0x022B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x022F, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0279, 0x0232, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t\t\t\t000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0236, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x027B, 0x0239, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t 1" + 0x00) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x023D, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } - CH03 ("", 0x00, 0x027D, 0x0240, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t12345678" + 0x00) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0244, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x027F, 0x0247, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * Implicit String to Integer () * * Method(mf99) */ - CH03 ("", 0x00, 0x0280, 0x024F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Hex: 0x - dec */ Local0 = ("\t\t\t\t1234567890123456" + 0x00) @@ -668,12 +668,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0256, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x025A, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } /* Hex: 0x - hex */ @@ -681,13 +681,13 @@ Local0 = ("\t\t\t\tabcdefef" + 0x00) If ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0x0262, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } Local0 = (" abcdefe" + 0x00) If ((Local0 != 0x0ABCDEFE)) { - ERR ("", ZFFF, 0x0267, 0x00, 0x00, Local0, 0x0ABCDEFE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0ABCDEFE) } Local0 = (" abcdefefadefbcdf" + 0x00) @@ -695,12 +695,12 @@ { If ((Local0 != 0xABCDEFEFADEFBCDF)) { - ERR ("", ZFFF, 0x026D, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) } } ElseIf ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0x0271, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } /* Hex: 0x - dec/hex */ @@ -710,12 +710,12 @@ { If ((Local0 != 0x1AB2CD340FE05678)) { - ERR ("", ZFFF, 0x027A, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x027E, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = (" 1ab2cd340fe05" + 0x00) @@ -723,343 +723,343 @@ { If ((Local0 != 0x0001AB2CD340FE05)) { - ERR ("", ZFFF, 0x0285, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x0289, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = ("\t1a" + 0x00) If ((Local0 != 0x1A)) { - ERR ("", ZFFF, 0x028F, 0x00, 0x00, Local0, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } - CH03 ("", 0x00, 0x028D, 0x0292, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * No exceptions in special cases which force exceptions on ToInteger * * Method(mf9a) */ /* 5. "1234cd" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x028E, 0x029B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t1234cd" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x029E, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 6. "000x1234" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0290, 0x02A2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t\t 000x1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02A5, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ - CH03 ("", 0x00, 0x0292, 0x02A9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t\t\t 0x1234cdQ" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02AC, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0294, 0x02AE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 1234cdQ" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x02B1, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } - CH03 ("", 0x00, 0x0296, 0x02B4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t0x0x12345" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02B7, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 8. "1234 " (white space in dec image) */ - CH03 ("", 0x00, 0x0298, 0x02BB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t1234 " + 0x00) If ((Local0 != 0x1234)) { - ERR ("", ZFFF, 0x02BE, 0x00, 0x00, Local0, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234) } /* 9. "0x1234cd " (white space in '0x'-image) */ - CH03 ("", 0x00, 0x029A, 0x02C2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t 1234cd " + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x02C5, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 10. "0x 1234cdQ" (white space after '0x') */ - CH03 ("", 0x00, 0x029C, 0x02C9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t \t \t \t\t0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02CC, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x029E, 0x02CF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t\t \t0x0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02D2, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x02A0, 0x02D5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t \t\t0x0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02D8, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x02A2, 0x02DB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t \t \t \t\t 0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02DE, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 11. (decimal image exceeding maximal) */ /* 32-bit mode � the value exceeding "4294967295" */ If (0x01) { - CH03 ("", 0x00, 0x02A4, 0x02E4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t4294967296" + 0x00) If (F64) { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x02E8, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x02EC, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x02A7, 0x02F0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t \t\t\t123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x02F4, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x02F8, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x02AA, 0x02FC, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t00004294967296" + 0x00) If (F64) { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x0300, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x0304, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x02AD, 0x0308, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x030C, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0310, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x02B0, 0x0314, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0318, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x031C, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x02B3, 0x0320, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0324, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0328, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x02B6, 0x032C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0330, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0334, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } } /* 64-bit mode � the value exceeding "18446744073709551615" */ - CH03 ("", 0x00, 0x02B8, 0x033A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t18446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x033E, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0342, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x02BB, 0x0346, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t18446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x034A, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x034E, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x02BE, 0x0352, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 18446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0356, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x035A, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x02C1, 0x035E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t018446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0362, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0366, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x02C4, 0x036A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t000000000018446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x036E, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0372, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } /* 12. "0x12345678901234567" (hex image exceeding maximal) */ - CH03 ("", 0x00, 0x02C7, 0x0377, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t0x12345678901234567" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x037A, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ - CH03 ("", 0x00, 0x02CA, 0x037E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0x00000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0381, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x02CC, 0x0384, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t0x0000000000000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0387, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) */ If (0x01) { - CH03 ("", 0x00, 0x02CE, 0x038C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x123456789" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x038F, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } /* 15. "0x" (incomplete '0x' image) */ - CH03 ("", 0x00, 0x02D0, 0x0394, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0x" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0397, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x02D2, 0x0399, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0x" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x039D, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x02D4, 0x039F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -1077,29 +1077,29 @@ { /* Hex: 0x - dec */ - CH03 ("", 0x00, 0x0367, 0x03B1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0000000000x0" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03B5, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t0000000000x1" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03BA, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t 0000000000x12345678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03BF, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = (" \t0000000000x1234567890123456" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03C4, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - hex */ @@ -1107,13 +1107,13 @@ Local0 = (" 0000000000xabcdefef" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03CB, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t\t0000000000xabcdefefadefbcdf" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03D0, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - dec/hex */ @@ -1121,72 +1121,72 @@ Local0 = (" \t \t \t \t \t0000000000x1ab2cd340fe05678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03D7, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x036F, 0x03DA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t \t \t \t \t \t0000000000x1ab2cd340fe0567823456789123456789987" + 0x00) - CH03 ("", 0x00, 0x0370, 0x03DC, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03DF, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0372, 0x03E2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * Implicit String to Integer () * * Method(mf98) */ - CH03 ("", 0x00, 0x0373, 0x03EA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03EE, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0375, 0x03F1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t\t\t0000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03F5, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0377, 0x03F8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 000000000000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03FC, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0379, 0x03FF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t\t\t\t000000000000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0403, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x037B, 0x0406, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t 0000000001" + 0x00) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x040A, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } - CH03 ("", 0x00, 0x037D, 0x040D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t00000000012345678" + 0x00) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0411, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x037F, 0x0414, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * Implicit String to Integer () * * Method(mf99) */ - CH03 ("", 0x00, 0x0380, 0x041C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Hex: 0x - dec */ Local0 = ("\t\t\t\t0000000001234567890123456" + 0x00) @@ -1194,12 +1194,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0423, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0427, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } /* Hex: 0x - hex */ @@ -1207,13 +1207,13 @@ Local0 = ("\t\t\t\t000000000abcdefef" + 0x00) If ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0x042F, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } Local0 = (" 000000000abcdefe" + 0x00) If ((Local0 != 0x0ABCDEFE)) { - ERR ("", ZFFF, 0x0434, 0x00, 0x00, Local0, 0x0ABCDEFE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0ABCDEFE) } Local0 = (" 000000000abcdefefadefbcdf" + 0x00) @@ -1221,12 +1221,12 @@ { If ((Local0 != 0xABCDEFEFADEFBCDF)) { - ERR ("", ZFFF, 0x043A, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) } } ElseIf ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0x043E, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } /* Hex: 0x - dec/hex */ @@ -1236,12 +1236,12 @@ { If ((Local0 != 0x1AB2CD340FE05678)) { - ERR ("", ZFFF, 0x0447, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x044B, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = (" 0000000001ab2cd340fe05" + 0x00) @@ -1249,341 +1249,341 @@ { If ((Local0 != 0x0001AB2CD340FE05)) { - ERR ("", ZFFF, 0x0452, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x0456, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = ("\t0000000001a" + 0x00) If ((Local0 != 0x1A)) { - ERR ("", ZFFF, 0x045C, 0x00, 0x00, Local0, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } - CH03 ("", 0x00, 0x038D, 0x045F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * No exceptions in special cases which force exceptions on ToInteger * * Method(mf9a) */ /* 5. "1234cd" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x038E, 0x0468, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0000000001234cd" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x046B, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 6. "000x1234" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0390, 0x046F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t\t 000000000000x1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0472, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ - CH03 ("", 0x00, 0x0392, 0x0476, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t\t\t 0000000000x1234cdQ" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0479, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0394, 0x047B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0000000001234cdQ" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x047E, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } - CH03 ("", 0x00, 0x0396, 0x0481, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t0000000000x0x12345" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0484, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 8. "1234 " (white space in dec image) */ - CH03 ("", 0x00, 0x0398, 0x0488, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t0000000001234 " + 0x00) If ((Local0 != 0x1234)) { - ERR ("", ZFFF, 0x048B, 0x00, 0x00, Local0, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234) } /* 9. "0x1234cd " (white space in '0x'-image) */ - CH03 ("", 0x00, 0x039A, 0x048F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t 0000000001234cd " + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x0492, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 10. "0x 1234cdQ" (white space after '0x') */ - CH03 ("", 0x00, 0x039C, 0x0496, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t \t \t \t\t0000000000x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0499, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x039E, 0x049C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t\t \t0000000000x0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x049F, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x03A0, 0x04A2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t \t\t0000000000x0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x04A5, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x03A2, 0x04A8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t \t \t \t\t 0000000000x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x04AB, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 11. (decimal image exceeding maximal) */ /* 32-bit mode � the value exceeding "4294967295" */ If (0x01) { - CH03 ("", 0x00, 0x03A4, 0x04B1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t0000000004294967296" + 0x00) If (F64) { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x04B5, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x04B9, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x03A7, 0x04BD, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t \t\t\t000000000123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x04C1, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x04C5, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x03AA, 0x04C9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t00000000000004294967296" + 0x00) If (F64) { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x04CD, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x04D1, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x03AD, 0x04D5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0000000000123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x04D9, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x04DD, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x03B0, 0x04E1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0000000000123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x04E5, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x04E9, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x03B3, 0x04ED, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 000000000123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x04F1, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x04F5, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x03B6, 0x04F9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t000000000123456789012345678904294967296" + 0x00) If (F64) { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x04FD, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0501, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } } /* 64-bit mode � the value exceeding "18446744073709551615" */ - CH03 ("", 0x00, 0x03B8, 0x0507, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t00000000018446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x050B, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x050F, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x03BB, 0x0513, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t00000000018446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0517, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x051B, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x03BE, 0x051F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 00000000018446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0523, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0527, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x03C1, 0x052B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t000000000018446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x052F, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0533, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x03C4, 0x0537, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t000000000000000000018446744073709551616" + 0x00) If (F64) { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x053B, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x053F, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } /* 12. "0x12345678901234567" (hex image exceeding maximal) */ - CH03 ("", 0x00, 0x03C7, 0x0544, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t0000000000x12345678901234567" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0547, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ - CH03 ("", 0x00, 0x03CA, 0x054B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0000000000x00000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x054E, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x03CC, 0x0551, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t0000000000x0000000000000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0554, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) */ If (0x01) { - CH03 ("", 0x00, 0x03CE, 0x0559, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x123456789" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x055C, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } /* 15. "0x" (incomplete '0x' image) */ - CH03 ("", 0x00, 0x03D0, 0x0561, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0000000000x" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0564, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x03D2, 0x0566, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0000000000x" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x056A, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x03D4, 0x056C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 b0a1d62..8bc8783 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl @@ -87,7 +87,7 @@ Local0 = ("12345678" + 0x11111111) If ((Local0 != 0x23456789)) { - ERR ("", ZFFF, 0x5E, 0x00, 0x00, Local0, 0x23456789) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x23456789) } /* 8 hex */ @@ -95,7 +95,7 @@ Local0 = ("abcdefab" + 0x11111111) If ((Local0 != 0xBCDF00BC)) { - ERR ("", ZFFF, 0x64, 0x00, 0x00, Local0, 0xBCDF00BC) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xBCDF00BC) } /* 16 decimal */ @@ -103,7 +103,7 @@ Local0 = ("1234567890876543" + 0x1111111111111111) If ((Local0 != 0x23456789A1987654)) { - ERR ("", ZFFF, 0x6A, 0x00, 0x00, Local0, 0x23456789A1987654) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x23456789A1987654) } /* 16 hex */ @@ -111,7 +111,7 @@ Local0 = ("abcdefababcdfead" + 0x1111111111111111) If ((Local0 != 0xBCDF00BCBCDF0FBE)) { - ERR ("", ZFFF, 0x70, 0x00, 0x00, Local0, 0xBCDF00BCBCDF0FBE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xBCDF00BCBCDF0FBE) } /* 17 hex */ @@ -119,7 +119,7 @@ Local0 = ("1234567890123456z" + 0x1111111111111111) If ((Local0 != 0x23456789A1234567)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, Local0, 0x23456789A1234567) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x23456789A1234567) } /* 17 hex (caused AE_BAD_HEX_CONSTANT, 28.09.2005) */ @@ -127,7 +127,7 @@ Local0 = ("12345678901234560" + 0x1111111111111111) If ((Local0 != 0x23456789A1234567)) { - ERR ("", ZFFF, 0x7C, 0x00, 0x00, Local0, 0x23456789A1234567) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x23456789A1234567) } /* Looks like octal, but should be treated as hex */ @@ -135,7 +135,7 @@ Local0 = ("01111" + 0x2222) If ((Local0 != 0x3333)) { - ERR ("", ZFFF, 0x82, 0x00, 0x00, Local0, 0x3333) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x3333) } /* The first zeros each must be put into value */ @@ -143,31 +143,31 @@ Local0 = ("000010234" + 0x00) If ((Local0 != 0x00010234)) { - ERR ("", ZFFF, 0x89, 0x00, 0x00, Local0, 0x00010234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00010234) } Local0 = ("000000000000000010234" + 0x00) If ((Local0 != 0x00010234)) { - ERR ("", ZFFF, 0x8E, 0x00, 0x00, Local0, 0x00010234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00010234) } Local0 = ("00000000000000010234" + 0x00) If ((Local0 != 0x00010234)) { - ERR ("", ZFFF, 0x93, 0x00, 0x00, Local0, 0x00010234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00010234) } Local0 = ("0000000010234" + 0x00) If ((Local0 != 0x00010234)) { - ERR ("", ZFFF, 0x98, 0x00, 0x00, Local0, 0x00010234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00010234) } Local0 = ("000000010234" + 0x00) If ((Local0 != 0x00010234)) { - ERR ("", ZFFF, 0x9D, 0x00, 0x00, Local0, 0x00010234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00010234) } /* Non-complete 4 hex, should be extended with zeros */ @@ -175,7 +175,7 @@ Local0 = ("abcd" + 0x1111) If ((Local0 != 0xBCDE)) { - ERR ("", ZFFF, 0xA3, 0x00, 0x00, Local0, 0xBCDE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xBCDE) } /* Non-complete 5 decimal, should be extended with zeros */ @@ -183,10 +183,10 @@ Local0 = ("12345" + 0x1111) If ((Local0 != 0x00013456)) { - ERR ("", ZFFF, 0xA9, 0x00, 0x00, Local0, 0x00013456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00013456) } - CH03 (__METHOD__, ZFFF, 0x0100, 0xAC, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Too large, all hex, should be trancated */ Local0 = ("abcdef0123456789112233445566778890" + 0x00) @@ -194,15 +194,15 @@ { If ((Local0 != 0xABCDEF0123456789)) { - ERR ("", ZFFF, 0xB2, 0x00, 0x00, Local0, 0xABCDEF0123456789) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEF0123456789) } } ElseIf ((Local0 != 0xABCDEF01)) { - ERR ("", ZFFF, 0xB6, 0x00, 0x00, Local0, 0xABCDEF01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEF01) } - CH03 (__METHOD__, ZFFF, 0x0101, 0xBA, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Large, all hex, looks like octal, should be trancated */ Local0 = ("0abcdef0123456789112233445566778890" + 0x1234) @@ -210,57 +210,57 @@ { If ((Local0 != 0xABCDEF0123456789)) { - ERR ("", ZFFF, 0xC0, 0x00, 0x00, Local0, 0xABCDEF0123456789) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEF0123456789) } } ElseIf ((Local0 != 0xABCDEF01)) { - ERR ("", ZFFF, 0xC4, 0x00, 0x00, Local0, 0xABCDEF01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEF01) } - CH03 (__METHOD__, ZFFF, 0x0102, 0xC8, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Looks like usual hex, but 'x' terminates conversion */ Local0 = ("0x1111" + 0x2222) If ((Local0 != 0x2222)) { - ERR ("", ZFFF, 0xCD, 0x00, 0x00, Local0, 0x2222) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x2222) } - CH03 (__METHOD__, ZFFF, 0x0103, 0xD0, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Empty string, no action - the relevant parameter of Add remains zero */ Local0 = ("" + 0xDE) If ((Local0 != 0xDE)) { - ERR ("", ZFFF, 0xD5, 0x00, 0x00, Local0, 0xDE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xDE) } - CH03 (__METHOD__, ZFFF, 0x0104, 0xD8, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Blank string, no action - the relevant parameter of Add remains zero */ Local0 = (" " + 0x0333) If ((Local0 != 0x0333)) { - ERR ("", ZFFF, 0xDD, 0x00, 0x00, Local0, 0x0333) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0333) } - CH03 (__METHOD__, ZFFF, 0x0105, 0xE0, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Blank string, no action - the relevant parameter of Add remains zero */ Local0 = (" " + 0x92) If ((Local0 != 0x92)) { - ERR ("", ZFFF, 0xE5, 0x00, 0x00, Local0, 0x92) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x92) } - CH03 (__METHOD__, ZFFF, 0x0106, 0xE8, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Conversion is terminated just by the first symbol (non-hex) though followed by hex-es, remains zero */ Local0 = ("k1234567" + 0x01E9) If ((Local0 != 0x01E9)) { - ERR ("", ZFFF, 0xED, 0x00, 0x00, Local0, 0x01E9) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01E9) } /* Conversion is terminated just by the first symbol (non-hex), single */ @@ -268,25 +268,25 @@ Local0 = ("k" + 0x000000ABCDEF0000) If ((Local0 != 0x000000ABCDEF0000)) { - ERR ("", ZFFF, 0xF3, 0x00, 0x00, Local0, 0x000000ABCDEF0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x000000ABCDEF0000) } - CH03 (__METHOD__, ZFFF, 0x0107, 0xF6, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Looks like designation of hex (terminated by x) */ Local0 = ("0x" + 0x12345678) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0xFB, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 (__METHOD__, ZFFF, 0x0108, 0xFE, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Special symbol in the hex designation (terminated by x) */ Local0 = ("x" + 0x00BC614E) If ((Local0 != 0x00BC614E)) { - ERR ("", ZFFF, 0x0103, 0x00, 0x00, Local0, 0x00BC614E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00BC614E) } /* Starts with the special symbol in the hex designation (terminated by x) */ @@ -294,7 +294,7 @@ Local0 = ("x12345" + 0x6F) If ((Local0 != 0x6F)) { - ERR ("", ZFFF, 0x0109, 0x00, 0x00, Local0, 0x6F) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x6F) } /* No one hex, conversion is terminated just by the first symbol Z */ @@ -302,7 +302,7 @@ Local0 = ("ZZZZ" + 0x0001E240) If ((Local0 != 0x0001E240)) { - ERR ("", ZFFF, 0x010F, 0x00, 0x00, Local0, 0x0001E240) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001E240) } /* Short <= 8, conversion is terminated by non-hex symbol Z */ @@ -310,7 +310,7 @@ Local0 = ("abcdZZZZ" + 0x11) If ((Local0 != 0xABDE)) { - ERR ("", ZFFF, 0x0115, 0x00, 0x00, Local0, 0xABDE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABDE) } /* Short <= 8, hex in the middle (terminated by Z) */ @@ -318,7 +318,7 @@ Local0 = ("ZQ123MMM" + 0x0001E240) If ((Local0 != 0x0001E240)) { - ERR ("", ZFFF, 0x011B, 0x00, 0x00, Local0, 0x0001E240) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001E240) } /* Short <= 8, hex at the end (terminated by Z) */ @@ -326,7 +326,7 @@ Local0 = ("ZQMMM123" + 0x0001E240) If ((Local0 != 0x0001E240)) { - ERR ("", ZFFF, 0x0121, 0x00, 0x00, Local0, 0x0001E240) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001E240) } /* Long exceeding 16, no one hex */ @@ -334,7 +334,7 @@ Local0 = ("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu" + 0x7B) If ((Local0 != 0x7B)) { - ERR ("", ZFFF, 0x0127, 0x00, 0x00, Local0, 0x7B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x7B) } /* Long exceeding 16, hex at the beginning */ @@ -342,7 +342,7 @@ Local0 = ("1234zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu" + 0x53) If ((Local0 != 0x1287)) { - ERR ("", ZFFF, 0x012D, 0x00, 0x00, Local0, 0x1287) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1287) } /* Long exceeding 16, hex everywhere */ @@ -350,7 +350,7 @@ Local0 = ("123z4s5qr6rr7rrrrrrrrr8ttttttt9ttttttattttbttttcyyyydyyeyyyyyyyyuuuuuuuuuuuuuuuuuuuuf" + 0x53) If ((Local0 != 0x0176)) { - ERR ("", ZFFF, 0x0133, 0x00, 0x00, Local0, 0x0176) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0176) } /* Long exceeding 16, hex at the end */ @@ -358,7 +358,7 @@ Local0 = ("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu1234" + 0x14D1) If ((Local0 != 0x14D1)) { - ERR ("", ZFFF, 0x0139, 0x00, 0x00, Local0, 0x14D1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x14D1) } /* Long exceeding 16, hex in the middle inside the possible Integer */ @@ -366,7 +366,7 @@ Local0 = ("zx1234swqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu" + 0x00012321) If ((Local0 != 0x00012321)) { - ERR ("", ZFFF, 0x013F, 0x00, 0x00, Local0, 0x00012321) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00012321) } /* Long exceeding 16, hex in the middle beyond the bounds of the possible Integer */ @@ -374,10 +374,10 @@ Local0 = ("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuu1234uu" + 0x3021) If ((Local0 != 0x3021)) { - ERR ("", ZFFF, 0x0145, 0x00, 0x00, Local0, 0x3021) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x3021) } - CH03 (__METHOD__, ZFFF, 0x0109, 0x0148, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Only decimal, much more than 16 */ Store (("123456789012345601112223334446667788990087654" + 0x00), Local1) @@ -385,15 +385,15 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x014E, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0152, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 (__METHOD__, ZFFF, 0x010A, 0x0156, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Only hex, much more than 16 */ Store (("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabc" + 0x00), Local1) @@ -401,15 +401,15 @@ { If ((Local0 != 0xABCDEFABCDEFABCD)) { - ERR ("", ZFFF, 0x015C, 0x00, 0x00, Local0, 0xABCDEFABCDEFABCD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFABCDEFABCD) } } ElseIf ((Local0 != 0xABCDEFAB)) { - ERR ("", ZFFF, 0x0160, 0x00, 0x00, Local0, 0xABCDEFAB) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFAB) } - CH03 (__METHOD__, ZFFF, 0x010B, 0x0164, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Only decimal, much more than 16, non-hex at the end */ Store (("123456789012345601112223334446667788990087654ZZZZ" + 0x00), Local1) @@ -417,15 +417,15 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x016A, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x016E, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 (__METHOD__, ZFFF, 0x010C, 0x0172, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Only hex, much more than 16, non-hex at the end */ Store (("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcZZZZ" + 0x00), Local1) @@ -433,15 +433,15 @@ { If ((Local0 != 0xABCDEFABCDEFABCD)) { - ERR ("", ZFFF, 0x0178, 0x00, 0x00, Local0, 0xABCDEFABCDEFABCD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFABCDEFABCD) } } ElseIf ((Local0 != 0xABCDEFAB)) { - ERR ("", ZFFF, 0x017C, 0x00, 0x00, Local0, 0xABCDEFAB) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFAB) } - CH03 (__METHOD__, ZFFF, 0x010D, 0x0180, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) } Method (MD75, 0, NotSerialized) @@ -451,9 +451,9 @@ Method (MD76, 0, Serialized) { - CH03 (__METHOD__, ZFFF, 0x010E, 0x018B, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) MD74 () - CH03 (__METHOD__, ZFFF, 0x010F, 0x018D, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) MD75 () - CH03 (__METHOD__, ZFFF, 0x0110, 0x018F, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) } 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 51234c8..1e31f2d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl @@ -32,52 +32,52 @@ */ Method (MF61, 1, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x26, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("" + 0xABCD0000) If ((Local0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } - CH03 ("", 0x00, 0x02, 0x2B, 0x00) - CH03 ("", 0x00, 0x03, 0x2D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" " + 0xABCD0001) If ((Local0 != 0xABCD0001)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Local0, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0001) } - CH03 ("", 0x00, 0x05, 0x32, 0x00) - CH03 ("", 0x00, 0x06, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x24, 0x00, 0x37, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ - CH03 ("", 0x00, 0x08, 0x39, 0x00) + CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = " " ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x24, 0x00, 0x3C, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ - CH03 ("", 0x00, 0x0A, 0x3E, 0x00) + CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("q" + 0xABCD0002) If ((Local0 != 0xABCD0002)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local0, 0xABCD0002) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0002) } - CH03 ("", 0x00, 0x0C, 0x43, 0x00) - CH03 ("", 0x00, 0x0D, 0x45, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("q " + 0xABCD0003) If ((Local0 != 0xABCD0003)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local0, 0xABCD0003) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0003) } - CH03 ("", 0x00, 0x0F, 0x4A, 0x00) - CH03 ("", 0x00, 0x10, 0x4C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "q" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x24, 0x00, 0x4F, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ - CH03 ("", 0x00, 0x12, 0x51, 0x00) + CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "q " ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x24, 0x00, 0x54, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* 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 a6a5710..cc7cb01 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl @@ -43,7 +43,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } } @@ -54,7 +54,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != C00B)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, Local0, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00B) } } @@ -65,13 +65,13 @@ Local0 = ObjectType (BF30) If ((Local0 != C016)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C016) } Local0 = ObjectType (BF31) If ((Local0 != C016)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local0, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 4dedaaf..9336cfa 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl @@ -43,7 +43,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } } @@ -54,7 +54,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != C00B)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, Local0, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00B) } } @@ -65,13 +65,13 @@ Local0 = ObjectType (FD00) If ((Local0 != C00D)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, C00D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00D) } Local0 = ObjectType (FD01) If ((Local0 != C00D)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local0, C00D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 cbbd0c0..ccf69cd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl @@ -54,7 +54,7 @@ Local0 = ObjectType (Local7) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } /* BufferField converted to Buffer before return */ @@ -63,6 +63,6 @@ Local0 = ObjectType (Local7) If ((Local0 != C00B)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local0, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 9c367c5..a002262 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl @@ -54,7 +54,7 @@ Local0 = ObjectType (Local7) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } /* FiledUnit converted to Buffer before return */ @@ -63,6 +63,6 @@ Local0 = ObjectType (Local7) If ((Local0 != C00B)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local0, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 e0ee5cb..44aa832 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl @@ -43,7 +43,7 @@ 0x02 // . })) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local0, Buffer (0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x01) { 0x02 // . }) 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 086dea0..25a7c33 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl @@ -46,6 +46,6 @@ } ElseIf ((Ones != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Ones, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 3500230..5f5968a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl @@ -36,9 +36,9 @@ Debug = Local0 Store (PD01 [0x00], Local1) Debug = Local1 - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Local1 + 0x00) - CH04 ("", 0x00, 0x2F, 0x00, 0x2D, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local2 = RefOf (ID0A) Debug = Local2 } 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 814b0ca..fc2fdac 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl @@ -33,10 +33,10 @@ Method (ME2A, 0, Serialized) { Name (I000, 0x89ABCDEF) - CH03 ("", 0x00, 0x00, 0x27, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ToInteger ("0") /* AE_BAD_DECIMAL_CONSTANT */ Local0 = ToInteger ("0x0") /* AE_BAD_HEX_CONSTANT */ Store (("0" + 0x01), Local0) /* AE_BAD_HEX_CONSTANT */ I000 = "0" /* AE_BAD_HEX_CONSTANT */ - CH03 ("", 0x00, 0x00, 0x31, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 aa7c3fe..2681ffd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl @@ -50,7 +50,7 @@ Local0 = ObjectType (ME31) If ((Local0 != C010)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local0, C010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C010) } /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ /* */ 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 e7b21e1..83c913b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl @@ -77,7 +77,7 @@ { If ((I000 != 0xABCD0000)) { - ERR ("", ZFFF, 0x55, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } I000 = 0xABCD0001 @@ -89,7 +89,7 @@ { If ((I000 != 0xABCD0001)) { - ERR ("", ZFFF, 0x60, 0x00, 0x00, I000, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0001) } I000 = 0xABCD0003 @@ -101,7 +101,7 @@ { If ((I000 != 0xABCD0003)) { - ERR ("", ZFFF, 0x6B, 0x00, 0x00, I000, 0xABCD0003) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0003) } I000 = 0xABCD0005 @@ -113,7 +113,7 @@ { If ((I000 != 0xABCD0005)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, I000, 0xABCD0005) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0005) } I000 = 0xABCD0007 @@ -132,7 +132,7 @@ { If ((I000 != 0xABCD0000)) { - ERR ("", ZFFF, 0x88, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } I000 = 0xABCD0001 @@ -144,7 +144,7 @@ { If ((I000 != 0xABCD0001)) { - ERR ("", ZFFF, 0x93, 0x00, 0x00, I000, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0001) } I000 = 0xABCD0003 @@ -156,7 +156,7 @@ { If ((I000 != 0xABCD0003)) { - ERR ("", ZFFF, 0x9E, 0x00, 0x00, I000, 0xABCD0003) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0003) } I000 = 0xABCD0005 @@ -168,7 +168,7 @@ { If ((I000 != 0xABCD0005)) { - ERR ("", ZFFF, 0xA9, 0x00, 0x00, I000, 0xABCD0005) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0005) } I000 = 0xABCD0007 @@ -185,7 +185,7 @@ { If ((I000 != 0xABCD0007)) { - ERR ("", ZFFF, 0xB9, 0x00, 0x00, I000, 0xABCD0007) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0007) } I000 = 0xABCD0008 @@ -197,7 +197,7 @@ { If ((I000 != 0xABCD0008)) { - ERR ("", ZFFF, 0xC4, 0x00, 0x00, I000, 0xABCD0008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0008) } I000 = 0xABCD000A @@ -209,7 +209,7 @@ { If ((I000 != 0xABCD000A)) { - ERR ("", ZFFF, 0xCF, 0x00, 0x00, I000, 0xABCD000A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD000A) } I000 = 0xABCD000C @@ -221,7 +221,7 @@ { If ((I000 != 0xABCD000C)) { - ERR ("", ZFFF, 0xDA, 0x00, 0x00, I000, 0xABCD000C) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD000C) } I000 = 0xABCD000E @@ -238,7 +238,7 @@ { If ((I000 != 0xABCD000E)) { - ERR ("", ZFFF, 0xEA, 0x00, 0x00, I000, 0xABCD000E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD000E) } I000 = 0xABCD0010 @@ -250,7 +250,7 @@ { If ((I000 != 0xABCD0010)) { - ERR ("", ZFFF, 0xF5, 0x00, 0x00, I000, 0xABCD0010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0010) } I000 = 0xABCD0012 @@ -262,7 +262,7 @@ { If ((I000 != 0xABCD0012)) { - ERR ("", ZFFF, 0x0100, 0x00, 0x00, I000, 0xABCD0012) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0012) } I000 = 0xABCD0014 @@ -274,7 +274,7 @@ { If ((I000 != 0xABCD0014)) { - ERR ("", ZFFF, 0x010B, 0x00, 0x00, I000, 0xABCD0014) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0014) } I000 = 0xABCD0016 @@ -287,6 +287,6 @@ M002 () If ((I000 != 0xABCD0016)) { - ERR ("", ZFFF, 0x0117, 0x00, 0x00, I000, 0xABCD0016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0016) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl index b1582e0..a132a09 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl @@ -54,7 +54,7 @@ Debug = Arg0 Local1 = DerefOf (Arg0) - CH04 ("", 0x02, 0x3E, 0x01, 0x00, 0x00, 0x00) + CH04 (__METHOD__, 0x02, 0x3E, 0x01, __LINE__, 0x00, 0x00) } Else { 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 3aaba14..432c8d0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl @@ -48,7 +48,7 @@ If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } } @@ -75,7 +75,7 @@ If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } } 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 433aea8..be02750 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl @@ -46,19 +46,19 @@ If ((Arg0 == 0x00)) { Debug = "Package as a named object:" - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (P000 [0x05]) If ((Local0 != 0x06)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local0, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x06) } - CH03 ("", 0x00, 0x02, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } ElseIf ((Arg0 == 0x01)) { Debug = "The same Package but substituted immediately:" - CH03 ("", 0x00, 0x03, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index (Package (0x08) { 0x01, @@ -75,19 +75,19 @@ Local0 = DerefOf (Local1) If ((Local0 != 0x06)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, Local0, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x06) } - CH03 ("", 0x00, 0x05, 0x3C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x3E, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else { - CH03 ("", 0x00, 0x07, 0x42, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (Index (Package (0x08) { 0x01, @@ -103,14 +103,14 @@ { If ((Local0 != 0x06)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local0, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x06) } - CH03 ("", 0x00, 0x09, 0x48, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x4A, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 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 6be763a..a325cd2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl @@ -39,19 +39,19 @@ If ((Arg0 == 0x00)) { Debug = "Buffer as a named object:" - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (B000 [0x05]) If ((Local0 != 0x42)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local0, 0x42) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42) } - CH03 ("", 0x00, 0x02, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } ElseIf ((Arg0 == 0x01)) { Debug = "The same Buffer but substituted immediately:" - CH03 ("", 0x00, 0x03, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index (Buffer (0x08) { 0x0B, 0x16, 0x21, 0x2C, 0x37, 0x42, 0x4D, 0x58 // ..!,7BMX @@ -61,19 +61,19 @@ Local0 = DerefOf (Local1) If ((Local0 != 0x42)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, 0x42) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42) } - CH03 ("", 0x00, 0x05, 0x3D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x3F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else { - CH03 ("", 0x00, 0x07, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (Index (Buffer (0x08) { 0x0B, 0x16, 0x21, 0x2C, 0x37, 0x42, 0x4D, 0x58 // ..!,7BMX @@ -82,14 +82,14 @@ { If ((Local0 != 0x42)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local0, 0x42) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42) } - CH03 ("", 0x00, 0x09, 0x4A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x4C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 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 d020756..91d68d1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl @@ -36,51 +36,51 @@ If ((Arg0 == 0x00)) { Debug = "String as a named object:" - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (S000 [0x05]) If ((Local0 != 0x75)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local0, 0x75) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x75) } - CH03 ("", 0x00, 0x02, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } ElseIf ((Arg0 == 0x01)) { Debug = "The same String but substituted immediately:" - CH03 ("", 0x00, 0x03, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index ("qwrtyuiop", 0x05), Local1) If (Y900) { Local0 = DerefOf (Local1) If ((Local0 != 0x75)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, 0x75) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x75) } - CH03 ("", 0x00, 0x05, 0x3D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x3F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else { - CH03 ("", 0x00, 0x07, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (Index ("qwrtyuiop", 0x05)) If (Y900) { If ((Local0 != 0x75)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local0, 0x75) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x75) } - CH03 ("", 0x00, 0x09, 0x4A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x4C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } } 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 5815f8d..70d5c07 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl @@ -42,7 +42,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C010)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C010) } Return (0x00) @@ -64,7 +64,7 @@ Debug = Local1 If ((Local1 != C010)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C010) } Debug = "Finish of test" 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 6d208db..ecc2e68 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl @@ -67,11 +67,11 @@ ME66 () If (ID0D) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (ID0E) { - ERR ("", ZFFF, 0x45, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } } 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 496f1e8..ad80fa0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl @@ -41,7 +41,7 @@ Debug = Local1 If ((Local1 != C008)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local1, C008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C008) } Debug = "Finish of test" 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 7de736f..7a3fa56 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl @@ -40,7 +40,7 @@ Debug = Local1 If ((Local1 != C010)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C010) } Debug = "Finish of test" 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 6c1baac..945d16c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl @@ -40,6 +40,6 @@ Debug = Local2 If ((Local2 != C018)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Local2, C018) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 2d6a1b7..d98bdfd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl @@ -36,7 +36,7 @@ Debug = Local0 If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } } @@ -46,7 +46,7 @@ Debug = Local0 If ((Local0 != 0x1235)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, 0x1235) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1235) } } @@ -56,7 +56,7 @@ Debug = Local0 If ((Local0 != 0xFFFFFFFFFFFFEDCB)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFEDCB) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFEDCB) } } 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 ee3536b..1e9e0a9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl @@ -68,7 +68,7 @@ ME73 ("1") If (!ID0F) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -78,14 +78,14 @@ }) If (!ID0F) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 ME73 ("0") If (ID0F) { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -95,7 +95,7 @@ }) If (ID0F) { - ERR ("", ZFFF, 0x55, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ////////// */ @@ -104,7 +104,7 @@ ME74 ("1", 0x00) If ((ID0F != 0x02)) { - ERR ("", ZFFF, 0x5D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -114,14 +114,14 @@ }, 0x00) If ((ID0F != 0x02)) { - ERR ("", ZFFF, 0x63, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 ME74 ("0", 0x00) If (ID0F) { - ERR ("", ZFFF, 0x69, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -131,14 +131,14 @@ }, 0x00) If (ID0F) { - ERR ("", ZFFF, 0x6F, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 ME74 ("1", 0x01) If ((ID0F != 0x01)) { - ERR ("", ZFFF, 0x75, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -148,14 +148,14 @@ }, 0x01) If ((ID0F != 0x01)) { - ERR ("", ZFFF, 0x7B, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 ME75 ("0") If (ID0F) { - ERR ("", ZFFF, 0x81, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -165,14 +165,14 @@ }) If (ID0F) { - ERR ("", ZFFF, 0x87, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 ME75 ("01") If (!ID0F) { - ERR ("", ZFFF, 0x8D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -182,6 +182,6 @@ }) If (!ID0F) { - ERR ("", ZFFF, 0x93, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } } 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 c19b7ae..80522e5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl @@ -39,29 +39,29 @@ Debug = Arg4 Debug = Arg5 Debug = "Test 0" - CH03 ("", 0x00, 0x00, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg0 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x30, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 1" - CH03 ("", 0x00, 0x02, 0x33, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg1 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x35, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 2" - CH03 ("", 0x00, 0x04, 0x38, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg2 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x3A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 3" - CH03 ("", 0x00, 0x06, 0x3D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg3 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x3F, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 4" - CH03 ("", 0x00, 0x08, 0x42, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg4 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x44, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 5" - CH03 ("", 0x00, 0x0A, 0x47, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg5 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x49, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (ME7A, 0, 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 bdaa378..66f938c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl @@ -89,7 +89,7 @@ ME7E (ME85 (), Local0) If ((ID10 != Local0)) { - ERR ("", ZFFF, 0x55, 0x00, 0x00, ID10, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID10, Local0) } /* To show: all methods return Index references (Ok) */ @@ -111,7 +111,7 @@ Local1 = DerefOf (PD04 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x6A, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } Local0 = 0xABCD0002 @@ -119,7 +119,7 @@ Local1 = DerefOf (PD05 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x71, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } Local0 = 0xABCD0003 @@ -127,7 +127,7 @@ Local1 = DerefOf (PD06 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x78, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } Local0 = 0xABCD0004 @@ -135,7 +135,7 @@ Local1 = DerefOf (PD07 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x7F, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } Local0 = 0xABCD0005 @@ -143,7 +143,7 @@ Local1 = DerefOf (PD08 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x86, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } Local0 = 0xABCD0006 @@ -151,6 +151,6 @@ Local1 = DerefOf (PD09 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x8D, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 07d5ba3..c20442c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl @@ -40,11 +40,11 @@ Debug = "Modification of the copied string" If ((Local0 != "Strang")) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Local0, "Strang") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "Strang") } If ((S000 != "String")) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, S000, "String") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, S000, "String") } } 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 c3b03b5..aa31557 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl @@ -55,31 +55,31 @@ Local5 = (Local1 + 0x79) If ((Local4 != C009)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local4, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local4, C009) } ElseIf ((Local5 != 0xAAAA0279)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local5, 0xAAAA0279) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local5, 0xAAAA0279) } If ((I000 != 0xAAAA0300)) { - ERR ("", ZFFF, 0x47, 0x00, 0x00, I000, 0xAAAA0300) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xAAAA0300) } If ((Local2 != C009)) { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, Local2, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local3 != C009)) { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, Local3, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local3, C009) } - CH03 ("", 0x00, 0x05, 0x52, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local5 = (Local0 + 0x79) - CH04 ("", 0x00, 0x2F, 0x00, 0x54, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MF81, 0, Serialized) @@ -108,31 +108,31 @@ II05 = (II01 + 0x79) If ((II04 != C009)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, II04, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II04, C009) } ElseIf ((II05 != 0xAAAA0279)) { - ERR ("", ZFFF, 0x78, 0x00, 0x00, II05, 0xAAAA0279) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II05, 0xAAAA0279) } If ((I000 != 0xAAAA0300)) { - ERR ("", ZFFF, 0x7C, 0x00, 0x00, I000, 0xAAAA0300) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xAAAA0300) } If ((II02 != C009)) { - ERR ("", ZFFF, 0x80, 0x00, 0x00, II02, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II02, C009) } If ((II03 != C009)) { - ERR ("", ZFFF, 0x84, 0x00, 0x00, II03, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II03, C009) } - CH03 ("", 0x00, 0x0C, 0x87, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) II05 = (Local0 + 0x79) - CH04 ("", 0x00, 0x2F, 0x00, 0x89, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MF82, 0, Serialized) @@ -159,31 +159,31 @@ II05 = (II01 + 0x79) If ((II04 != C009)) { - ERR ("", ZFFF, 0xA9, 0x00, 0x00, II04, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II04, C009) } ElseIf ((II05 != 0xAAAA0279)) { - ERR ("", ZFFF, 0xAB, 0x00, 0x00, II05, 0xAAAA0279) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II05, 0xAAAA0279) } If ((I000 != 0xAAAA0300)) { - ERR ("", ZFFF, 0xAF, 0x00, 0x00, I000, 0xAAAA0300) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xAAAA0300) } If ((II02 != C009)) { - ERR ("", ZFFF, 0xB3, 0x00, 0x00, II02, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II02, C009) } If ((II03 != C009)) { - ERR ("", ZFFF, 0xB7, 0x00, 0x00, II03, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II03, C009) } - CH03 ("", 0x00, 0x13, 0xBA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) II05 = (II00 + 0x79) - CH04 ("", 0x00, 0x2F, 0x00, 0xBC, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MD79, 0, NotSerialized) @@ -193,11 +193,11 @@ Local0 = ObjectType (Local1) If ((Local0 != C009)) { - ERR ("", ZFFF, 0xC6, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } ElseIf ((Local1 != 0xFE7CB391D650A284)) { - ERR ("", ZFFF, 0xC9, 0x00, 0x00, Local1, 0xFE7CB391D650A284) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0xFE7CB391D650A284) } } @@ -210,7 +210,7 @@ Local0 = ObjectType (Local1) If ((Local0 != C016)) { - ERR ("", ZFFF, 0xD7, 0x00, 0x00, Local0, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C016) } Else { @@ -224,7 +224,7 @@ { If ((Local1 != 0x59)) { - ERR ("", ZFFF, 0xE1, 0x00, 0x00, Local1, 0x59) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x59) } } } @@ -239,7 +239,7 @@ Local0 = ObjectType (Local1) If ((Local0 != C00D)) { - ERR ("", ZFFF, 0xF0, 0x00, 0x00, Local0, C00D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00D) } Else { @@ -253,7 +253,7 @@ { If ((Local1 != 0x00)) { - ERR ("", ZFFF, 0xFB, 0x00, 0x00, Local1, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x00) } } } 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 d5fc919..951421c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl @@ -39,13 +39,13 @@ } Else { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } Local1 = (0xFFFFFFFF < 0x0000000100000000) If (Local1) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local1, Zero) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Zero) } Else { 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 30ece16..eefeba5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl @@ -42,7 +42,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C014)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local1, C014) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C014) } } @@ -58,7 +58,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C012)) { - ERR ("", ZFFF, 0x39, 0x00, 0x00, Local1, C012) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C012) } } @@ -74,7 +74,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C013)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local1, C013) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C013) } } @@ -90,7 +90,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C00F)) { - ERR ("", ZFFF, 0x53, 0x00, 0x00, Local1, C00F) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C00F) } } @@ -106,7 +106,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C011)) { - ERR ("", ZFFF, 0x60, 0x00, 0x00, Local1, C011) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C011) } } @@ -117,15 +117,15 @@ DD0D }) Local0 = PP00 [0x00] - CH03 ("", 0x00, 0x05, 0x6A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = ObjectType (Local0) - CH03 ("", 0x00, 0x06, 0x6C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = DerefOf (Local0) - CH03 ("", 0x00, 0x07, 0x6E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C00E)) { - ERR ("", ZFFF, 0x72, 0x00, 0x00, Local1, C00E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C00E) } } @@ -136,14 +136,14 @@ TZD2 }) Local0 = PP00 [0x00] - CH03 ("", 0x00, 0x09, 0x7C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = ObjectType (Local0) - CH03 ("", 0x00, 0x0A, 0x7E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = DerefOf (Local0) - CH03 ("", 0x00, 0x0B, 0x80, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C015)) { - ERR ("", ZFFF, 0x84, 0x00, 0x00, Local1, C015) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 605f29e..d1ce594 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl @@ -39,28 +39,28 @@ 0xFF, 0xFF // .. }) Name (I000, 0x00) - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x00, 0x10, BF00) - CH03 ("", 0x00, 0x00, 0x2C, 0x00) - CH03 ("", 0x00, 0x02, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x00, I000, BF01) - CH04 ("", 0x00, 0xFF, 0x00, 0x30, 0x00, 0x00) - CH03 ("", 0x00, 0x04, 0x32, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x01, I000, BF02) - CH04 ("", 0x00, 0xFF, 0x00, 0x34, 0x00, 0x00) - CH03 ("", 0x00, 0x06, 0x36, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x07, I000, BF03) - CH04 ("", 0x00, 0xFF, 0x00, 0x38, 0x00, 0x00) - CH03 ("", 0x00, 0x08, 0x3A, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x08, I000, BF04) - CH04 ("", 0x00, 0xFF, 0x00, 0x3C, 0x00, 0x00) - CH03 ("", 0x00, 0x0A, 0x3E, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x0F, I000, BF05) - CH04 ("", 0x00, 0xFF, 0x00, 0x40, 0x00, 0x00) - CH03 ("", 0x00, 0x0C, 0x42, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x10, I000, BF06) - CH04 ("", 0x00, 0xFF, 0x00, 0x44, 0x00, 0x00) - CH03 ("", 0x00, 0x0E, 0x46, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "All CreateField-s finished" Debug = BF00 /* \MF03.BF00 */ Debug = BF01 /* \MF03.BF01 */ @@ -69,6 +69,6 @@ Debug = BF04 /* \MF03.BF04 */ Debug = BF05 /* \MF03.BF05 */ Debug = BF06 /* \MF03.BF06 */ - CH04 ("", 0x00, 0xFF, 0x00, 0x52, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Debug = "All Store-to-Debug-s finished" } 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 039e686..8a27fc2 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 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = Match (P000, MEQ, 0x01, MEQ, 0x01, 0x0000000100000001) - CH04 ("", 0x00, 0xFF, 0x00, 0x2C, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 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 97a35c3..8afc8c8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl @@ -44,13 +44,13 @@ Name (S000, "5678") /* a) Index > 0xffffffff */ /* c) Modulo(Index, 0x100000000) < Size. */ - CH03 ("", 0x00, 0x00, 0x2C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (P000 [0x0000000100000001], Local0) - CH04 ("", 0x01, 0x37, 0x00, 0x2E, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ - CH03 ("", 0x00, 0x02, 0x30, 0x00) + CH04 (__METHOD__, 0x01, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (B000 [0x0000000100000002], Local0) - CH04 ("", 0x01, 0x36, 0x00, 0x32, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x04, 0x34, 0x00) + CH04 (__METHOD__, 0x01, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (S000 [0x0000000100000003], Local0) - CH04 ("", 0x01, 0x3D, 0x00, 0x36, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (__METHOD__, 0x01, 0x3D, 0x00, __LINE__, 0x00, 0x00) /* 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 a35d2e4..98c84a9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl @@ -42,7 +42,7 @@ Mid (Arg1, Arg2, Arg3, Local0) If ((Arg4 != Local0)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Arg4, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 0a35681..7a72ddc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl @@ -37,12 +37,12 @@ Local7 = (Local0 + 0x01) If ((Local0 != 0x07)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local0, 0x07) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x07) } If ((Local7 != 0x08)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, Local7, 0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x08) } Debug = "m000 finished" @@ -55,12 +55,12 @@ Local7 = (Arg0 + 0x01) If ((Arg0 != 0x07)) { - ERR ("", ZFFF, 0x3E, 0x00, 0x00, Arg0, 0x07) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, 0x07) } If ((Local7 != 0x08)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Arg0, 0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, 0x08) } Debug = "m001 finished" 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 d519bf2..7741b17 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl @@ -34,19 +34,19 @@ Method (MF13, 0, NotSerialized) { Local1 = Local0 = PD11 [0x00] - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local0 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x2C, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ - CH03 ("", 0x00, 0x02, 0x2E, 0x00) + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local1 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x30, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local1 = Local0 = PD11 [0x01] - CH03 ("", 0x00, 0x04, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local0 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x36, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ - CH03 ("", 0x00, 0x06, 0x38, 0x00) + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local1 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x3A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } /* CopyObject */ @@ -54,24 +54,24 @@ Method (MF14, 0, NotSerialized) { CopyObject (Local0 = PD11 [0x00], Local1) - CH03 ("", 0x00, 0x08, 0x43, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local0 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x45, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ - CH03 ("", 0x00, 0x0A, 0x47, 0x00) + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local1 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x49, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MF15, 0, NotSerialized) { - CH03 ("", 0x00, 0x0C, 0x4E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (Local0 = PD11 [0x01], Local1) - CH03 ("", 0x00, 0x0D, 0x52, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local0 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x54, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ - CH03 ("", 0x00, 0x0F, 0x56, 0x00) + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local1 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x58, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MF16, 0, NotSerialized) 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 4a7470b..00623da 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl @@ -39,7 +39,7 @@ Debug = Local1 If ((Local1 != 0x1234)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local1, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x1234) } } @@ -47,7 +47,7 @@ { Name (REF0, 0x00) Name (I000, 0x1234) - CH03 ("", 0x00, 0x00, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (I000), REF0) /* \MF18.REF0 */ Debug = "Before printing ref0" Debug = REF0 /* \MF18.REF0 */ @@ -58,10 +58,10 @@ Debug = "Before LNotEqual" If ((Local1 != 0x1234)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local1, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x1234) } - CH03 ("", 0x00, 0x02, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MF9E, 0, Serialized) @@ -86,7 +86,7 @@ 0x04 }) Name (REF0, 0x00) - CH03 ("", 0x00, 0x00, 0x54, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (I000), REF0) /* \MF9E.REF0 */ MF88 (DerefOf (REF0), C009, II00, 0x01, 0x02, 0x01) CopyObject (RefOf (B000), REF0) /* \MF9E.REF0 */ @@ -95,7 +95,7 @@ MF88 (DerefOf (REF0), C00A, SS00, 0x03, 0x04, 0x01) CopyObject (RefOf (P000), REF0) /* \MF9E.REF0 */ MF88 (DerefOf (REF0), C00C, SS00, 0x05, 0x06, 0x00) - CH03 ("", 0x00, 0x07, 0x62, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MF9F, 0, Serialized) @@ -124,33 +124,33 @@ /* Checkings */ - CH03 ("", 0x00, 0x26, 0x73, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (E000), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C00F, 0x00, 0x27, 0x28, 0x00) - CH03 ("", 0x00, 0x29, 0x77, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (MX00), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C011, 0x00, 0x2A, 0x2B, 0x00) If (Y511) { - CH03 ("", 0x00, 0x2C, 0x7C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (D000), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C00E, 0x00, 0x2D, 0x2E, 0x00) } If (Y508) { - CH03 ("", 0x00, 0x2F, 0x82, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (TZ00), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C015, 0x00, 0x30, 0x31, 0x00) } - CH03 ("", 0x00, 0x32, 0x87, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (PR00), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C014, 0x00, 0x33, 0x34, 0x00) - CH03 ("", 0x00, 0x35, 0x8B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (R000), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C012, 0x00, 0x36, 0x37, 0x00) - CH03 ("", 0x00, 0x38, 0x8F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (PW00), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C013, 0x00, 0x39, 0x3A, 0x00) } 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 77f8e8c..c0c7823 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl @@ -50,7 +50,7 @@ MF1A (SD04) If ((SD04 != "qwer0000")) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, SD04, "qwer0000") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, SD04, "qwer0000") } /* Index of Buffer */ @@ -61,7 +61,7 @@ 0x01, 0x77, 0x03, 0x04 // .w.. })) { - ERR ("", ZFFF, 0x3D, 0x00, 0x00, BD08, Buffer (0x04) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BD08, Buffer (0x04) { 0x01, 0x77, 0x03, 0x04 // .w.. }) @@ -74,6 +74,6 @@ Local1 = DerefOf (Local0) If ((Local1 != 0x77)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local1, 0x77) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 0ec4e98..f7fa204 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl @@ -69,7 +69,7 @@ Local0 = DerefOf (P000 [0x00]) If ((Local0 != 0xABCD0001)) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, Local0, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0001) } /* // Removed 09/2015 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 e2acd88..fbba466 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl @@ -33,12 +33,12 @@ Method (MF1F, 2, NotSerialized) { Debug = Arg0 - CH03 ("", 0x00, 0x00, 0x27, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Arg0 + 0x01) - CH03 ("", 0x00, 0x01, 0x29, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((Local7 != 0x78)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, ID12, 0x05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID12, 0x05) } } 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 cb0cc39..78dc241 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl @@ -43,7 +43,7 @@ MF21 (Local0) If ((ID13 != 0x77)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, ID13, 0x77) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID13, 0x77) } /* Writing by Index to String */ @@ -52,7 +52,7 @@ MF21 (Local0) If ((SD05 != "qwer0000")) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, SD05, "qwer0000") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, SD05, "qwer0000") } /* Writing by Index to Buffer */ @@ -64,7 +64,7 @@ 0x01, 0x77, 0x03, 0x04 // .w.. })) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, BD09, Buffer (0x04) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BD09, Buffer (0x04) { 0x01, 0x77, 0x03, 0x04 // .w.. }) @@ -78,6 +78,6 @@ Local1 = DerefOf (Local0) If ((Local1 != 0x77)) { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, Local1, 0x77) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 7078769..1669d5a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl @@ -44,7 +44,7 @@ Debug = Local6 If ((Local6 != 0x11)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local6, 0x11) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local6, 0x11) } Debug = "LocalX case of Method finished" @@ -64,7 +64,7 @@ Debug = Arg6 If ((Arg6 != 0x11)) { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, Arg6, 0x11) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg6, 0x11) } Debug = "ArgX case (1) of Method finished" @@ -84,7 +84,7 @@ Debug = Arg6 If ((Arg6 != 0x11)) { - ERR ("", ZFFF, 0x62, 0x00, 0x00, Arg6, 0x11) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg6, 0x11) } Debug = "ArgX case (2) of Method finished" 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 c1e20eb..ac6c769 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl @@ -45,6 +45,6 @@ CopyObject (B000, B001) /* \MF27.B001 */ If ((B000 != B001)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, B000, B001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 ce4c9c0..ea63cfb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl @@ -40,13 +40,13 @@ Local0 = ObjectType (STR0) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } FromBCD (0x12345678, STR1) /* \MF28.STR1 */ Local0 = ObjectType (STR1) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 0e02fda..c4794e9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl @@ -43,7 +43,7 @@ /* 0008 */ 0x00 // . })) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, BF00, Buffer (0x09) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF00, Buffer (0x09) { /* 0000 */ 0x10, 0x32, 0x54, 0x76, 0x00, 0x00, 0x00, 0x00, // .2Tv.... /* 0008 */ 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 2814bb7..31a1ed2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl @@ -36,7 +36,7 @@ { If ((ID1B != 0xFEDCBA9876543210)) { - ERR ("", ZFFF, 0x28, 0x00, 0x00, ID1B, 0xFEDCBA9876543210) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1B, 0xFEDCBA9876543210) } Else { @@ -45,7 +45,7 @@ Local0 = ID1B /* \ID1B */ If ((ID1B != 0xFEDCBA9876543210)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, ID1B, 0xFEDCBA9876543210) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1B, 0xFEDCBA9876543210) } } } @@ -56,7 +56,7 @@ Local0 = RefOf (ID1C) If ((ID1C != 0xFEDCBA9876543211)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, ID1C, 0xFEDCBA9876543211) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1C, 0xFEDCBA9876543211) } Else { @@ -65,7 +65,7 @@ Local1 = DerefOf (Local0) If ((ID1C != 0xFEDCBA9876543211)) { - ERR ("", ZFFF, 0x45, 0x00, 0x00, ID1C, 0xFEDCBA9876543211) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 55f91c3..47f2bd5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl @@ -50,13 +50,13 @@ Local0 = MF30 (0x01, 0x02) If ((Local0 != 0x03)) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, Local0, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x03) } Local0 = MF31 ("FFFF") If ((Local0 != "FFFF")) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, "FFFF") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "FFFF") } Local0 = MF32 (0x03, "F", Buffer (0x01) @@ -65,6 +65,6 @@ }) If ((Local0 != 0x0111)) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, Local0, 0x0111) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0111) } } 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 bc42de1..d599232 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl @@ -55,24 +55,24 @@ Local0 = MF34 (0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = MF35 (0x01) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } Local0 = MF36 (0x02) If ((Local0 != 0x02)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x02) } Local0 = MF37 ("3") If ((Local0 != "3")) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local0, "3") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 6e8a2f6..3a8a0a0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl @@ -61,6 +61,6 @@ }) If ((Local0 != 0x00012389)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, 0x00012389) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00012389) } } 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 7cc2e1a..6d0504a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl @@ -41,6 +41,6 @@ Local0 = MF3C () If ((Local0 != "mf3czxcvbnm")) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local0, "mf3czxcvbnm") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 9baa1a9..4160293 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl @@ -56,14 +56,14 @@ Local1 = 0x00 If (Acquire (MX00, 0x0001)) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { Local0 = 0x01 If (Acquire (MX01, 0x0001)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -96,14 +96,14 @@ Local1 = 0x00 If (Acquire (MX00, 0x0001)) { - ERR ("", ZFFF, 0x60, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { Local0 = 0x01 - CH03 ("", 0x00, 0x03, 0x63, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Acquire (MX01, 0x0001) - CH04 ("", 0x00, 0x40, 0x00, 0x65, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } If (Local0) @@ -130,14 +130,14 @@ Local1 = 0x00 If (Acquire (MX00, 0x0001)) { - ERR ("", ZFFF, 0x7E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { Local0 = 0x01 - CH03 ("", 0x00, 0x06, 0x81, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MX01 () - CH03 ("", 0x00, 0x07, 0x83, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } If (Local0) @@ -164,14 +164,14 @@ Local1 = 0x00 If (Acquire (MX00, 0x0001)) { - ERR ("", ZFFF, 0x9D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { Local0 = 0x01 - CH03 ("", 0x00, 0x09, 0xA0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MX01 () - CH04 ("", 0x00, 0x40, 0x00, 0xA2, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* 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 e59caa1..8b3cca8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl @@ -56,7 +56,7 @@ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 // ....... })) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local0, Buffer (0x07) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x07) { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 // ....... }) @@ -76,7 +76,7 @@ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 // ....... })) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local0, Buffer (0x07) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x07) { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 // ....... }) @@ -98,7 +98,7 @@ Concatenate (S000, S001, Local0) If ((Local0 != "String1")) { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, Local0, "String1") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "String1") } /* 4. */ @@ -112,7 +112,7 @@ Concatenate (Local0, S001, Local0) If ((Local0 != "String1")) { - ERR ("", ZFFF, 0x6B, 0x00, 0x00, Local0, "String1") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "String1") } } 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 232d40f..1c18577 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl @@ -46,25 +46,25 @@ Local0 = ObjectType (ID1D) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } If ((ID1D != 0xFEDCBA9876543210)) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, ID1D, 0xFEDCBA9876543210) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1D, 0xFEDCBA9876543210) } MF43 (ED02) Local0 = ObjectType (ED02) If ((Local0 != C00F)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, C00F) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00F) } MF43 (DD0B) Local0 = ObjectType (DD0B) If ((Local0 != C00E)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local0, C00E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 33e611c..038a375 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl @@ -41,16 +41,16 @@ { If ((ID1F != 0x32)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, ID1F, 0x32) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1F, 0x32) } If ((ID20 != 0x08)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, ID20, 0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID20, 0x08) } If ((BFD3 != 0x99)) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, BFD3, 0x99) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 3a48368..6a319a6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl @@ -71,10 +71,10 @@ Local0 = "Local0" Local0 = M000 () MMM0 () - CH03 ("", 0x00, 0x00, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If (("md00.m000" != Local0)) { - ERR ("", ZFFF, 0x47, 0x00, 0x00, Local0, "md00.m000") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "md00.m000") } /* Function */ @@ -82,11 +82,11 @@ Local0 = "Local0" Local0 = MM00 () MMM1 () - CH03 ("", 0x00, 0x02, 0x53, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If (("md00.mm00" != Local0)) { - ERR ("", ZFFF, 0x56, 0x00, 0x00, Local0, "md00.mm00") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "md00.mm00") } - CH03 ("", 0x00, 0x04, 0x59, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 79a3339..2d20f82 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0160/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0160/DECL.asl @@ -34,7 +34,7 @@ */ Method (MF48, 0, Serialized) { - CH03 ("", 0x00, 0x00, 0x27, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "mf48 started" Field (RD05, ByteAcc, NoLock, Preserve) { @@ -42,12 +42,12 @@ } Debug = "mf48 finished" - CH03 ("", 0x00, 0x01, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MF49, 0, Serialized) { - CH03 ("", 0x00, 0x02, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "mf49 started" If (0x01) { @@ -58,5 +58,5 @@ } Debug = "mf49 finished" - CH03 ("", 0x00, 0x03, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 1468e63..e6f88d8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl @@ -37,12 +37,12 @@ { If ((BF32 != 0x14)) { - ERR ("", ZFFF, 0x2A, 0x00, 0x00, BF32, 0x14) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF32, 0x14) } If ((BF33 != 0x1615)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, BF33, 0x1615) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF33, 0x1615) } } @@ -50,12 +50,12 @@ { If ((BF34 != 0x18)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, BF34, 0x18) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF34, 0x18) } If ((BF35 != 0x19)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, BF35, 0x19) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF35, 0x19) } } @@ -63,12 +63,12 @@ { If ((BF36 != 0x1A)) { - ERR ("", ZFFF, 0x3E, 0x00, 0x00, BF36, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF36, 0x1A) } If ((BF37 != 0x1C1B)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, BF37, 0x1C1B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF37, 0x1C1B) } } @@ -80,12 +80,12 @@ CreateField (BD02, 0x28, (ID03 + 0x08), BF33) If ((BF32 != 0x14)) { - ERR ("", ZFFF, 0x4D, 0x00, 0x00, BF32, 0x14) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF32, 0x14) } If ((BF33 != 0x1615)) { - ERR ("", ZFFF, 0x50, 0x00, 0x00, BF33, 0x1615) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF33, 0x1615) } } @@ -95,12 +95,12 @@ CreateField (BD02, (ID04 + 0x08), 0x08, BF35) If ((BF34 != 0x18)) { - ERR ("", ZFFF, 0x5A, 0x00, 0x00, BF34, 0x18) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF34, 0x18) } If ((BF35 != 0x19)) { - ERR ("", ZFFF, 0x5D, 0x00, 0x00, BF35, 0x19) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF35, 0x19) } } @@ -110,12 +110,12 @@ CreateField (BD02, (ID07 + 0x08), (ID08 + 0x08), BF37) If ((BF36 != 0x1A)) { - ERR ("", ZFFF, 0x67, 0x00, 0x00, BF36, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF36, 0x1A) } If ((BF37 != 0x1C1B)) { - ERR ("", ZFFF, 0x6A, 0x00, 0x00, BF37, 0x1C1B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF37, 0x1C1B) } } @@ -127,12 +127,12 @@ CreateField (BD03, 0x28, (ID03 + 0x08), BF33) If ((BF32 != 0x14)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, BF32, 0x14) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF32, 0x14) } If ((BF33 != 0x1615)) { - ERR ("", ZFFF, 0x79, 0x00, 0x00, BF33, 0x1615) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF33, 0x1615) } } @@ -142,12 +142,12 @@ CreateField (BD03, (ID04 + 0x08), 0x08, BF35) If ((BF34 != 0x18)) { - ERR ("", ZFFF, 0x83, 0x00, 0x00, BF34, 0x18) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF34, 0x18) } If ((BF35 != 0x19)) { - ERR ("", ZFFF, 0x86, 0x00, 0x00, BF35, 0x19) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF35, 0x19) } } @@ -157,12 +157,12 @@ CreateField (BD03, (ID07 + 0x08), (ID08 + 0x08), BF37) If ((BF36 != 0x1A)) { - ERR ("", ZFFF, 0x90, 0x00, 0x00, BF36, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF36, 0x1A) } If ((BF37 != 0x1C1B)) { - ERR ("", ZFFF, 0x93, 0x00, 0x00, BF37, 0x1C1B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF37, 0x1C1B) } } @@ -174,39 +174,39 @@ }) If ((Arg0 != 0x01)) { - ERR ("", ZFFF, 0x9C, 0x00, 0x00, Arg0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, 0x01) } If ((Arg1 != 0x5D)) { - ERR ("", ZFFF, 0x9F, 0x00, 0x00, Arg1, 0x5D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg1, 0x5D) } If ((Arg2 != 0x125D)) { - ERR ("", ZFFF, 0xA2, 0x00, 0x00, Arg2, 0x125D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg2, 0x125D) } If ((Arg3 != 0x1413125D)) { - ERR ("", ZFFF, 0xA5, 0x00, 0x00, Arg3, 0x1413125D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg3, 0x1413125D) } If (F64) { If ((Arg4 != 0x181716151413125D)) { - ERR ("", ZFFF, 0xAA, 0x00, 0x00, Arg4, 0x181716151413125D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg4, 0x181716151413125D) } } ElseIf ((Arg4 != B000)) { - ERR ("", ZFFF, 0xAE, 0x00, 0x00, Arg4, B000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg4, B000) } If ((Arg5 != 0x5D)) { - ERR ("", ZFFF, 0xB3, 0x00, 0x00, Arg5, 0x5D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg5, 0x5D) } } @@ -214,12 +214,12 @@ { If ((Arg0 != 0x5D)) { - ERR ("", ZFFF, 0xBA, 0x00, 0x00, Arg0, 0x5D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, 0x5D) } If ((Arg1 != 0x5D)) { - ERR ("", ZFFF, 0xBD, 0x00, 0x00, Arg1, 0x5D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 4044bcc..b2c1393 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 @@ */ If (ID01) { - ERR ("", ZFFF, 0x47, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } } 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 f9a48bc..0e1c389 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl @@ -311,7 +311,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0x0100)) { - ERR ("", ZFFF, 0x4D, 0x00, 0x00, Local0, 0x0100) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0100) } Else { @@ -322,7 +322,7 @@ Local3 = DerefOf (P000 [Local2]) If ((Local3 != Local1)) { - ERR ("", ZFFF, 0x54, 0x00, 0x00, Local3, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local3, Local1) Break } @@ -383,13 +383,13 @@ MM00 (0x00) If ((I000 != 0x01)) { - ERR ("", ZFFF, 0x87, 0x00, 0x00, I000, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x01) } I000 = 0x00 MM00 (0x01) If ((I000 != 0x02)) { - ERR ("", ZFFF, 0x8D, 0x00, 0x00, I000, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x02) } } 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 e31a1e7..2060cb3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl @@ -35,24 +35,24 @@ Local0 = (0xFFFFFFFFFFFFFFFF << 0x40) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x27, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = (0xFFFFFFFFFFFFFFFF << 0x41) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = (0xFFFFFFFFFFFFFFFF >> 0x40) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = (0xFFFFFFFFFFFFFFFF >> 0x41) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } 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 8728b16..882795f 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 @@ Local0 = ObjectType (BF90) If ((Local0 != 0x0E)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, 0x0E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0E) } Else { @@ -50,11 +50,11 @@ Local1 = ObjectType (BF90) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } ElseIf ((BF90 != 0x2B)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 b099b7e..1bcac5c 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 @@ -46,12 +46,12 @@ Local0 = ("C179B3FE" == 0xC179B3FE) If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } Local0 = (0xC179B3FE == "C179B3FE") If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } } 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 266435a..b668fbb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl @@ -34,6 +34,6 @@ { If ((RTD1 != BD0C)) { - ERR ("", ZFFF, 0x26, 0x00, 0x00, RTD1, BD0C) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 570f69c..26430f6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0175/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0175/DECL.asl @@ -32,7 +32,7 @@ */ Method (MF5D, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x25, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = PRD1 /* \PRD1 */ Debug = RD06 /* \RD06 */ Debug = PWD1 /* \PWD1 */ @@ -43,5 +43,5 @@ Debug = "Printing ThermalZone:" Debug = TZD1 /* \TZD1 */ - CH03 ("", 0x00, 0x01, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 044a0b3..3bcc0db 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl @@ -68,18 +68,18 @@ /* Named */ - CH03 ("", 0x00, 0x00, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (P000 [0x02], Local1) - CH04 ("", 0x01, 0x37, 0x00, 0x37, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ - CH03 ("", 0x00, 0x02, 0x39, 0x00) + CH04 (__METHOD__, 0x01, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (B000 [0x03], Local1) - CH04 ("", 0x01, 0x36, 0x00, 0x3B, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x04, 0x3D, 0x00) + CH04 (__METHOD__, 0x01, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (S000 [0x04], Local1) - CH04 ("", 0x01, 0x3D, 0x00, 0x3F, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (__METHOD__, 0x01, 0x3D, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ /* Immediate */ - CH03 ("", 0x00, 0x06, 0x43, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index (Package (0x02) { 0x00, @@ -87,44 +87,44 @@ }, 0x02), Local1) If (Y900) { - CH04 ("", 0x01, 0x37, 0x00, 0x46, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } Else { - CH04 ("", 0x00, 0x55, 0x00, 0x48, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } - CH03 ("", 0x00, 0x09, 0x4B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index (Buffer (0x03) { 0x02, 0x03, 0x04 // ... }, 0x03), Local1) If (Y900) { - CH04 ("", 0x01, 0x36, 0x00, 0x4E, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x01, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } Else { - CH04 ("", 0x00, 0x55, 0x00, 0x50, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } - CH03 ("", 0x00, 0x0C, 0x53, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index ("5678", 0x04), Local1) If (Y900) { - CH04 ("", 0x01, 0x3D, 0x00, 0x56, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (__METHOD__, 0x01, 0x3D, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } Else { - CH04 ("", 0x00, 0x55, 0x00, 0x58, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Fields */ - CH03 ("", 0x00, 0x0F, 0x5D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = F000 /* \MF07.F000 */ - CH03 ("", 0x00, 0x10, 0x5F, 0x00) - CH03 ("", 0x00, 0x11, 0x61, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = F001 /* \MF07.F001 */ If (Y263) { @@ -135,23 +135,23 @@ * - and on Store-to-debug stage * Check opcode of the last exception. */ - CH04 ("", 0x02, 0x35, 0x00, 0x6B, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x02, 0x35, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ } Else { - CH04 ("", 0x00, 0x35, 0x00, 0x6D, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x00, 0x35, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ } - CH03 ("", 0x00, 0x14, 0x70, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF07.BKF0 */ If (Y263) { /* See comment to sub-test above */ - CH04 ("", 0x02, 0x44, 0x00, 0x74, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ + CH04 (__METHOD__, 0x02, 0x44, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ } Else { - CH04 ("", 0x00, 0x44, 0x00, 0x76, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x44, 0x00, __LINE__, 0x00, 0x00) /* 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 bbcad73..c12953c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl @@ -43,7 +43,7 @@ BKF0, 9 } - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF0A.BKF0 */ If (Y263) { @@ -54,11 +54,11 @@ * - and on Store-to-debug stage * Check opcode of the last exception. */ - CH04 ("", 0x02, 0x44, 0x00, 0x35, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ + CH04 (__METHOD__, 0x02, 0x44, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ } Else { - CH04 ("", 0x00, 0x44, 0x00, 0x37, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x44, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ } } @@ -76,9 +76,9 @@ BKF0, 9 } - CH03 ("", 0x00, 0x02, 0x43, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF0B.BKF0 */ - CH04 ("", 0x00, 0x44, 0x00, 0x45, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x44, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ } Method (MF0C, 0, Serialized) @@ -94,9 +94,9 @@ BKF0, 9 } - CH03 ("", 0x00, 0x04, 0x4F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF0C.BKF0 */ - CH03 ("", 0x00, 0x05, 0x51, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MF0D, 0, Serialized) @@ -113,9 +113,9 @@ BKF0, 9 } - CH03 ("", 0x00, 0x06, 0x5C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF0D.BKF0 */ - CH03 ("", 0x00, 0x07, 0x5E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MF0E, 0, Serialized) @@ -132,7 +132,7 @@ BKF0, 9 } - CH03 ("", 0x00, 0x08, 0x69, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF0E.BKF0 */ - CH03 ("", 0x00, 0x09, 0x6B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 9a1a483..7d2d361 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl @@ -35,6 +35,6 @@ Local0 = ConcatenateResTemplate (RTD0, RTD0) If ((Local0 != BD0B)) { - ERR ("", ZFFF, 0x28, 0x00, 0x00, Local0, 0x0100) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0100) } } 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 266c23f..af660f9 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 @@ -54,7 +54,7 @@ { If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -62,7 +62,7 @@ { If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } } @@ -70,7 +70,7 @@ { If ((Local0 != 0x02)) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, Local0, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x02) } } } 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 60266d1..57e149b 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 @@ -41,6 +41,6 @@ MM20 (0x01) If ((I000 != 0x20)) { - ERR ("", ZFFF, 0x2A, 0x00, 0x00, I000, 0x20) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x20) } } 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 7d0f13e..91c623f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl @@ -36,19 +36,19 @@ Name (ID23, 0xABCD0000) Method (MF78, 0, Serialized) { - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((ID23 != 0xABCD0000)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, ID23, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID23, 0xABCD0000) } Name (ID23, 0xABCD0001) If ((ID23 != 0xABCD0001)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, ID23, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID23, 0xABCD0001) } - CH03 ("", 0x00, 0x03, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -57,12 +57,12 @@ */ Method (MF85, 0, Serialized) { - CH03 ("", 0x00, 0x04, 0x3F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((I9Z8 != 0xABCD0001)) { - ERR ("", ZFFF, 0x42, 0x00, 0x00, I9Z8, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I9Z8, 0xABCD0001) } Name (I9Z8, 0xABCD0001) - CH04 ("", 0x00, 0xFF, 0x00, 0x47, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } 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 849e7eb..bab864e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl @@ -44,16 +44,16 @@ Method (MF7A, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "mf79(250):" Debug = MF79 (0xFA) - CH03 ("", 0x00, 0x01, 0x33, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M27E, 0, NotSerialized) { - CH03 ("", 0x00, 0x02, 0x38, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "mf79(248):" Debug = MF79 (0xF8) - CH03 ("", 0x00, 0x03, 0x3D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 86f7893..9870759 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0184/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0184/DECL.asl @@ -38,7 +38,7 @@ } Debug = "mf7b" - CH03 ("", 0x00, 0x00, 0x2C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 () - CH03 ("", 0x00, 0x01, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 08dc40f..525313d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl @@ -60,14 +60,14 @@ /* m000 */ I000 = 0xDDDD9000 - CH03 ("", 0x00, 0x00, 0x43, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M000 () If (SLCK) { - CH03 ("", 0x00, 0x01, 0x48, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((I000 != 0x00)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, I000, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x00) } } Else @@ -78,14 +78,14 @@ /* m009 */ I000 = 0xDDDD9000 - CH03 ("", 0x00, 0x04, 0x54, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M009 () If (SLCK) { - CH03 ("", 0x00, 0x05, 0x59, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((I000 != 0x00)) { - ERR ("", ZFFF, 0x5B, 0x00, 0x00, I000, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x00) } } Else 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 a168048..362f19b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl @@ -77,11 +77,11 @@ /* m000 */ I000 = 0xDDDD0000 - CH03 ("", 0x00, 0x00, 0x4D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M000 () If (SLCK) { - CH03 ("", 0x00, 0x01, 0x52, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /*y901: Predicate generates Implicit Return since ACPICA release 20080926 */ If (Y901) @@ -95,7 +95,7 @@ If ((I000 != Local0)) { - ERR ("", ZFFF, 0x5B, 0x00, 0x00, I000, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, Local0) } } Else @@ -106,11 +106,11 @@ /* m001 */ I000 = 0xDDDD0001 - CH03 ("", 0x00, 0x04, 0x65, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M001 () If (SLCK) { - CH03 ("", 0x00, 0x05, 0x6A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /*y901: Predicate generates Implicit Return since ACPICA release 20080926 */ If (Y901) @@ -124,7 +124,7 @@ If ((I000 != Local0)) { - ERR ("", ZFFF, 0x73, 0x00, 0x00, I000, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, Local0) } } Else @@ -135,11 +135,11 @@ /* m002 */ I000 = 0xDDDD0002 - CH03 ("", 0x00, 0x08, 0x7D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M001 () If (SLCK) { - CH03 ("", 0x00, 0x09, 0x82, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /*y901: Predicate generates Implicit Return since ACPICA release 20080926 */ If (Y901) @@ -153,7 +153,7 @@ If ((I000 != Local0)) { - ERR ("", ZFFF, 0x8B, 0x00, 0x00, I000, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, Local0) } } Else 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 f54c308..10150bb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl @@ -41,14 +41,14 @@ /* m000 */ I000 = 0xDDDD9000 - CH03 ("", 0x00, 0x00, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M000 () If (SLCK) { - CH03 ("", 0x00, 0x01, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((I000 != 0x00)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, I000, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x00) } } Else 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 6a55de8..6408449 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl @@ -44,19 +44,19 @@ }) /* Empty buffer */ - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = 0x00 Local1 = Buffer (Local0){} Local2 = ConcatenateResTemplate (RT00, Local1) If ((Local2 != B000)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local2, B000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, B000) } If ((RT00 != B000)) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, RT00, B000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RT00, B000) } - CH03 ("", 0x00, 0x03, 0x39, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 32a4912..c82929d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl @@ -41,13 +41,13 @@ { 0x79 // y } - CH03 ("", 0x00, 0x00, 0x29, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = ConcatenateResTemplate (RT00, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x2D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Local0 = Buffer (0x01) { 0x78 // x } Local1 = ConcatenateResTemplate (RT00, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x33, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } 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 0bcd46b..65c3a42 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl @@ -43,7 +43,7 @@ { 0x2A, 0x10, 0x05, 0x79 // *..y } - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = ConcatenateResTemplate (RT00, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x2F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } 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 0d6ea43..6a39822 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl @@ -36,24 +36,24 @@ Local0 = ObjectType (BF90) If ((Local0 != 0x0E)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, 0x0E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0E) } If ((BF90 != 0x77)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, BF90, 0x77) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF90, 0x77) } CopyObject (0x9999992B, BF90) /* \MFA3.BF90 */ Local0 = ObjectType (BF90) If ((Local0 != 0x0E)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local0, 0x0E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0E) } If ((BF90 != 0x2B)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF90, 0x2B) Debug = BF90 /* \MFA3.BF90 */ } } 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 dc7a458..322c508 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 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 899ebcf..01bda89 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl @@ -65,7 +65,7 @@ } Else { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, BFL1, BD10) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BFL1, BD10) } /* Optional storing */ @@ -90,7 +90,7 @@ } Else { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, BFL1, BD10) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 b96499d..9942d56 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl @@ -78,7 +78,7 @@ ToBuffer (B001, B000) /* \MFA7.B000 */ If (!BCMP (B000, BB01)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, B000, BB01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, B000, BB01) } } Else @@ -87,7 +87,7 @@ ToBuffer (B000, B001) /* \MFA7.B001 */ If (!BCMP (B001, BB00)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, B001, BB00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 8de51a5..4f35338 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl @@ -61,21 +61,21 @@ Local1 = ObjectType (S001) If ((Local0 != Local1)) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } ElseIf ((S000 != S001)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, S000, S001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, S000, S001) } If ((Local0 != 0x02)) { - ERR ("", ZFFF, 0x45, 0x00, 0x00, Local0, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x02) } If ((Local1 != 0x02)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local1, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x02) } B000++ @@ -88,20 +88,20 @@ Local1 = ObjectType (B001) If ((Local0 != Local1)) { - ERR ("", ZFFF, 0x58, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } ElseIf ((B000 != B001)) { - ERR ("", ZFFF, 0x5A, 0x00, 0x00, B000, B001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, B000, B001) } If ((Local0 != 0x03)) { - ERR ("", ZFFF, 0x5E, 0x00, 0x00, Local0, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x03) } If ((Local1 != 0x03)) { - ERR ("", ZFFF, 0x62, 0x00, 0x00, Local1, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x03) } } 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 509b685..d428316 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl @@ -32,8 +32,8 @@ */ Method (MFB0, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x25, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x0x12345678" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x22, 0x00, 0x28, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x22, 0x00, __LINE__, 0x00, 0x00) /* 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 55feb3d..779b8a3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl @@ -32,8 +32,8 @@ */ Method (MFB1, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x25, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x 12345678" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x22, 0x00, 0x28, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x22, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ } 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 cd98128..726cc71 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl @@ -162,9 +162,9 @@ SRMT ("mfb5") If (Y200) { - CH03 ("", 0x00, 0x00, 0x9C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFB5 () - CH04 ("", 0x00, 0xFF, 0x00, 0x9E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -174,9 +174,9 @@ SRMT ("mfbd") If (Y200) { - CH03 ("", 0x00, 0x02, 0xA5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFBD () - CH04 ("", 0x00, 0xFF, 0x00, 0xA7, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -186,9 +186,9 @@ SRMT ("mfbe") If (Y200) { - CH03 ("", 0x00, 0x04, 0xAE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFBE () - CH04 ("", 0x00, 0xFF, 0x00, 0xB0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -199,32 +199,32 @@ * These work Ok: */ SRMT ("mfb6") - CH03 ("", 0x00, 0x06, 0xBA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFB6 () - CH04 ("", 0x00, 0xFF, 0x00, 0xBC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfb7") - CH03 ("", 0x00, 0x08, 0xBF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFB7 () - CH04 ("", 0x00, 0xFF, 0x00, 0xC1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfb8") - CH03 ("", 0x00, 0x0A, 0xC4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFB8 () - CH04 ("", 0x00, 0xFF, 0x00, 0xC6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfb9") - CH03 ("", 0x00, 0x0C, 0xC9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFB9 () - CH04 ("", 0x00, 0xFF, 0x00, 0xCB, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfba") - CH03 ("", 0x00, 0x0E, 0xCE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFBA () - CH04 ("", 0x00, 0xFF, 0x00, 0xD0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfbb") - CH03 ("", 0x00, 0x10, 0xD3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFBB () - CH04 ("", 0x00, 0xFF, 0x00, 0xD5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfbf") - CH03 ("", 0x00, 0x12, 0xD8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFBF () - CH04 ("", 0x00, 0xFF, 0x00, 0xDA, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Debug = "mfc0 ==== successfully returned to mfc0; finished !!!!!" } 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 7e13001..50560df 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 @@ -38,5 +38,5 @@ { Debug = "To be investigated:" Debug = "many Outstanding allocations on Reference ASLTS test run and other ASLTS tests." - ERR ("", ZFFF, 0x2C, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } 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 482384e..24f1754 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl @@ -169,7 +169,7 @@ If ((Local7 != C008)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local7, C008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 aa3d3cb..52665eb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl @@ -46,9 +46,9 @@ Method (M000, 1, NotSerialized) { Local0 = 0x02 - CH03 ("", 0x00, 0x00, 0x33, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Divide (0x01, Arg0, Local0) - CH04 ("", 0x00, 0x38, 0x00, 0x35, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ + CH04 (__METHOD__, 0x00, 0x38, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ } Method (M001, 0, NotSerialized) @@ -59,5 +59,5 @@ M001 () Debug = "Fight Outstanding allocations here" - ERR ("", ZFFF, 0x41, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } 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 fb20198..628bb40 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl @@ -382,7 +382,7 @@ CopyObject (DerefOf (IR00), Local0) If ((Local0 != Arg0)) { - ERR ("", ZFFF, 0x017A, 0x00, 0x00, Local0, Arg0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Arg0) } } 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 560d0a7..c2fe146 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl @@ -50,9 +50,9 @@ Return (Local0) } - CH03 ("", 0x00, 0x00, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = M000 () - CH04 ("", 0x00, 0xFF, 0x00, 0x36, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Debug = DerefOf (Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x38, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } 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 8b2da29..98c456e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl @@ -55,31 +55,31 @@ M000 (OPR1) If ((RFU0 != 0x01)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, RFU0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RFU0, 0x01) } RFU0 = 0x02 M000 (OPR1) If ((RFU0 != 0x02)) { - ERR ("", ZFFF, 0x42, 0x00, 0x00, RFU0, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RFU0, 0x02) } RFU0 = 0x03 M000 (OPR1) If ((RFU0 != 0x03)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, RFU0, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RFU0, 0x03) } RFU0 = 0x04 If ((RFU0 != 0x04)) { - ERR ("", ZFFF, 0x4D, 0x00, 0x00, RFU0, 0x04) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RFU0, 0x04) } } - CH03 ("", 0x00, 0x00, 0x51, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M001 () - CH03 ("", 0x00, 0x01, 0x53, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 efeccf5..f3941ac 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl @@ -80,23 +80,23 @@ IDF0 = 0x01 If ((IDF0 != 0x01)) { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, IDF0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IDF0, 0x01) } IDF1 = 0x01 If ((IDF1 != 0x01)) { - ERR ("", ZFFF, 0x50, 0x00, 0x00, IDF1, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IDF1, 0x01) } IDF2 = 0x01 If ((IDF2 != 0x01)) { - ERR ("", ZFFF, 0x55, 0x00, 0x00, IDF2, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IDF2, 0x01) } } - CH03 ("", 0x00, 0x00, 0x59, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 () - CH03 ("", 0x00, 0x01, 0x5B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 4567bfa..f2096c1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0216/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0216/DECL.asl @@ -1065,7 +1065,7 @@ Method (M831, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x02CF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m831-0") If (0x01) { @@ -1075,23 +1075,23 @@ M821 () } - CH03 ("", 0x00, 0x01, 0x02D9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m831-1") If (0x01) { M822 () - CH03 ("", 0x00, 0x02, 0x02DE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M823 () - CH03 ("", 0x00, 0x03, 0x02E0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M824 () - CH03 ("", 0x00, 0x04, 0x02E2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M825 () - CH03 ("", 0x00, 0x05, 0x02E4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M826 () - CH03 ("", 0x00, 0x06, 0x02E6, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } - CH03 ("", 0x00, 0x07, 0x02E9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m831-2") If (0x01) { @@ -1102,7 +1102,7 @@ M82B () } - CH03 ("", 0x00, 0x08, 0x02F4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m831-3") If (0x01) { @@ -1113,7 +1113,7 @@ M830 () } - CH03 ("", 0x00, 0x09, 0x02FF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m831-4") If (0x01) { @@ -1124,5 +1124,5 @@ M836 () } - CH03 ("", 0x00, 0x0A, 0x030A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 38a81dd..37119f6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl @@ -43,7 +43,7 @@ OperationRegion (OPR0, SystemMemory, 0x2000, 0x0100) If ((ID2A != 0x01)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, ID2A, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID2A, 0x01) } } @@ -51,7 +51,7 @@ { If ((ID2A != 0x00)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, ID2A, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID2A, 0x00) } 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 7419b2d..2551703 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl @@ -73,18 +73,18 @@ Debug = Local0 If ((I000 != ID29)) { - ERR ("", ZFFF, 0x52, 0x00, 0x00, I000, ID29) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, ID29) } If ((Local0 != ID29)) { - ERR ("", ZFFF, 0x56, 0x00, 0x00, Local0, ID29) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ID29) } } Method (M038, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x5B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M037 () - CH03 ("", 0x00, 0x01, 0x5D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 c1a2118..36436d6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl @@ -48,6 +48,6 @@ }) If ((RT00 != BUF0)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, RT00, BUF0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 2b5414c..a0066d0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl @@ -65,12 +65,12 @@ { If (\D220.NERR) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, \D220.NERR, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \D220.NERR, 0x00) } Local0 = (\D220.ACTV - \D220.DACT) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x45, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } } 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 317a4ed..9e55ef9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl @@ -37,7 +37,7 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 13dde95..502211d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl @@ -36,7 +36,7 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x28, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 1797938..bc0d61e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl @@ -60,7 +60,7 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 44fd6e6..da1d0a8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl @@ -37,7 +37,7 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x2A, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 fe4549b..9e3936a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl @@ -55,7 +55,7 @@ Local0 = TOT0 /* \M10E.TOT0 */ If ((Local0 != 0x8001)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, 0x8001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x8001) } } @@ -72,11 +72,11 @@ { If ((BF00 != 0x123456789ABCDEF0)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, BF00, 0x123456789ABCDEF0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF00, 0x123456789ABCDEF0) } } ElseIf ((BF00 != B001)) { - ERR ("", ZFFF, 0x4D, 0x00, 0x00, BF00, B001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF00, B001) } } 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 f292cf9..a1aa79f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl @@ -33,10 +33,10 @@ Method (M10F, 1, Serialized) { Name (B000, Buffer (Arg0){}) - CH03 ("", 0x00, 0x00, 0x27, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (B000 + 0x00) - CH03 ("", 0x00, 0x01, 0x29, 0x00) - CH03 ("", 0x00, 0x02, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToInteger (B000, Local0) - CH04 ("", 0x00, 0x36, 0x00, 0x2D, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* 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 b37b958..c31394d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl @@ -235,9 +235,9 @@ Debug = "Finish of test" } - CH03 ("", 0x00, 0x00, 0x70, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M100 () /* Expect either ASL compiler error or any AML interpreter exception */ - CH04 ("", 0x00, 0xFF, 0x00, 0x75, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } 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 e30da58..aa1f827 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl @@ -140,9 +140,9 @@ Debug = "Finish of test" } - CH03 ("", 0x00, 0x00, 0x5F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M100 () /* Expect either ASL compiler error or any AML interpreter exception */ - CH04 ("", 0x00, 0xFF, 0x00, 0x64, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } 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 feb6db1..daaff92 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl @@ -40,17 +40,17 @@ Acquire (MX07, 0xFFFF) Acquire (MX08, 0xFFFF) Acquire (MX09, 0xFFFF) - CH03 ("", 0x00, 0x00, 0x2F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (MX08) /* * Release(MX08) above doesn't cause exception * but, seems, it should. */ - CH04 ("", 0x00, 0x40, 0x00, 0x35, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ /* Also this */ Release (MX07) - CH04 ("", 0x00, 0x40, 0x00, 0x39, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ /* * Now, the Release(MX09) below causes exception, * so we have no way to release MX09. @@ -63,7 +63,7 @@ Release (MX09) Release (MX08) Release (MX07) - CH03 ("", 0x00, 0x03, 0x47, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } M000 () 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 2180212..a33c223 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl @@ -45,7 +45,7 @@ } Local2 = RefOf (FU01) - If (CH03 ("", 0x00, 0x00, 0x32, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -62,7 +62,7 @@ EXC0 = 0x01 } - CH04 ("", 0x00, 0x3E, 0x00, 0x41, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ + CH04 (__METHOD__, 0x00, 0x3E, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ } M000 (0x0100) 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 6e1d7ce..35fd5de 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl @@ -53,7 +53,7 @@ If (Local0) { Debug = "ERROR: Acquire T000 (Level 0, index 0)" - ERR ("", ZFFF, 0x3E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -64,7 +64,7 @@ If (Local0) { Debug = "ERROR: Acquire T001 (Level 0, index 1)" - ERR ("", ZFFF, 0x46, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -75,7 +75,7 @@ If (Local0) { Debug = "ERROR: Acquire T002 (Level 0, index 2)" - ERR ("", ZFFF, 0x4E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -86,7 +86,7 @@ If (Local0) { Debug = "ERROR: Acquire T003 (Level 0, index 3)" - ERR ("", ZFFF, 0x56, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -95,21 +95,21 @@ Debug = "Releasing mutexes of level 0:" Debug = "Release T000 (Level 0, index 0)" - CH03 ("", 0x00, 0x04, 0x5F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T000) - CH03 ("", 0x00, 0x05, 0x61, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T001 (Level 0, index 1)" - CH03 ("", 0x00, 0x06, 0x64, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T001) - CH03 ("", 0x00, 0x07, 0x66, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T002 (Level 0, index 2)" - CH03 ("", 0x00, 0x08, 0x69, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T002) - CH03 ("", 0x00, 0x09, 0x6B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T003 (Level 0, index 3)" - CH03 ("", 0x00, 0x0A, 0x6E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T003) - CH03 ("", 0x00, 0x0B, 0x70, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -125,7 +125,7 @@ If (Local0) { Debug = "ERROR: Acquire T100 (Level 1, index 0)" - ERR ("", ZFFF, 0x81, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -136,7 +136,7 @@ If (Local0) { Debug = "ERROR: Acquire T101 (Level 1, index 1)" - ERR ("", ZFFF, 0x89, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -147,7 +147,7 @@ If (Local0) { Debug = "ERROR: Acquire T102 (Level 1, index 2)" - ERR ("", ZFFF, 0x91, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -158,7 +158,7 @@ If (Local0) { Debug = "ERROR: Acquire T103 (Level 1, index 3)" - ERR ("", ZFFF, 0x99, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -167,21 +167,21 @@ Debug = "Releasing mutexes of Level 1:" Debug = "Release T100 (Level 1, index 0)" - CH03 ("", 0x00, 0x10, 0xA2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T100) - CH03 ("", 0x00, 0x11, 0xA4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T101 (Level 1, index 1)" - CH03 ("", 0x00, 0x12, 0xA7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T101) - CH03 ("", 0x00, 0x13, 0xA9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T102 (Level 1, index 2)" - CH03 ("", 0x00, 0x14, 0xAC, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T102) - CH03 ("", 0x00, 0x15, 0xAE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T103 (Level 1, index 3)" - CH03 ("", 0x00, 0x16, 0xB1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T103) - CH03 ("", 0x00, 0x17, 0xB3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -198,7 +198,7 @@ If (Local0) { Debug = "ERROR: Acquire T100 (Level 1, index 0)" - ERR ("", ZFFF, 0xC5, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -209,7 +209,7 @@ If (Local0) { Debug = "ERROR: Acquire T101 (Level 1, index 1)" - ERR ("", ZFFF, 0xCD, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -220,7 +220,7 @@ If (Local0) { Debug = "ERROR: Acquire T102 (Level 1, index 2)" - ERR ("", ZFFF, 0xD5, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -231,7 +231,7 @@ If (Local0) { Debug = "ERROR: Acquire T103 (Level 1, index 3)" - ERR ("", ZFFF, 0xDD, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -240,21 +240,21 @@ Debug = "Releasing mutexes of Level 1:" Debug = "Release T101 (Level 1, index 1)" - CH03 ("", 0x00, 0x1C, 0xE6, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T101) - CH03 ("", 0x00, 0x1D, 0xE8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T102 (Level 1, index 2)" - CH03 ("", 0x00, 0x1E, 0xEB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T102) - CH03 ("", 0x00, 0x1F, 0xED, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T103 (Level 1, index 3)" - CH03 ("", 0x00, 0x20, 0xF0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T103) - CH03 ("", 0x00, 0x21, 0xF2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T100 (Level 1, index 0)" - CH03 ("", 0x00, 0x22, 0xF5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T100) - CH03 ("", 0x00, 0x23, 0xF7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MM00, 0, NotSerialized) @@ -264,7 +264,7 @@ M002 () } - CH03 ("", 0x00, 0x24, 0x0101, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MM00 () - CH03 ("", 0x00, 0x25, 0x0103, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 914fea8..a4372d0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl @@ -45,7 +45,7 @@ If (Local0) { Debug = "!!!!!!!! ERROR 0: Acquire T500 (Level 5, index 0)" - ERR ("", ZFFF, 0x32, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -59,7 +59,7 @@ If (Local0) { Debug = "!!!!!!!! ERROR 1: Acquire T600 (Level 6, index 0)" - ERR ("", ZFFF, 0x3C, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -75,7 +75,7 @@ * If no exception there: * ERROR: NO exception though expected! (it is the contents of bug 238) */ - CH04 ("", 0x00, 0x40, 0x00, 0x49, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ /* (4) */ Debug = "Acquiring mutex of level 7:" @@ -83,7 +83,7 @@ If (Local0) { Debug = "!!!!!!!! ERROR 3: Acquire T700 (Level 7, index 0)" - ERR ("", ZFFF, 0x50, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -91,12 +91,12 @@ Debug = "Current level is equal to 7!" } - CH03 ("", 0x00, 0x04, 0x55, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* (5) */ Debug = "Releasing the mutex of the current level: T700 (Level 7, index 0)" Release (T700) - CH03 ("", 0x00, 0x05, 0x5A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * (6) * @@ -105,12 +105,12 @@ */ Debug = "Releasing mutex of level 6: T600 (Level 6, index 0)" Release (T600) - CH03 ("", 0x00, 0x06, 0x64, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* (7) */ Debug = "Releasing mutex of level 5: T500 (Level 5, index 0)" Release (T500) - CH03 ("", 0x00, 0x07, 0x69, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MM00, 0, NotSerialized) 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 70adb27..27692c6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl @@ -260,16 +260,16 @@ If (!I101) { Debug = "******** Test was not run !!!!!!!!!!!!!" - ERR ("", ZFFF, 0x0139, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Zero) } Debug = "******** Test started" - CH03 ("", 0x00, 0x01, 0x013F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If (I104) { Debug = "!!!!!!!! ERROR 1: Acquire(T804, 0xffff) failed" - ERR ("", ZFFF, 0x0144, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -279,7 +279,7 @@ If (I105) { Debug = "!!!!!!!! ERROR 2: Acquire(T805, 0xffff) failed" - ERR ("", ZFFF, 0x014B, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -287,9 +287,9 @@ } Release (T804) - CH04 ("", 0x00, 0x41, 0x00, 0x0151, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ Release (T805) - CH04 ("", 0x00, 0x41, 0x00, 0x0154, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ /* Release T807 */ If (!I107) @@ -299,10 +299,10 @@ Else { Debug = "!!!!!!!! ERROR 7: Acquire(T807, 0xffff) failed" - ERR ("", ZFFF, 0x015C, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } - CH03 ("", 0x00, 0x07, 0x015E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Release T806 */ If (!I106) @@ -312,10 +312,10 @@ Else { Debug = "!!!!!!!! ERROR 5: Acquire(T806, 0xffff) failed" - ERR ("", ZFFF, 0x0166, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } - CH03 ("", 0x00, 0x09, 0x0168, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "******** Test finished" } 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 4de4345..a3458cd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl @@ -38,7 +38,7 @@ Local2 = 0x00 While (Local0) { - If (CH03 ("", 0x00, Local2, 0x2B, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -59,7 +59,7 @@ } - If (CH03 ("", 0x00, Local2, 0x39, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -70,6 +70,6 @@ If ((Local1 != 0x03)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local1, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x03) } } 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 979f34c..ec6afcd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl @@ -43,7 +43,7 @@ Local0 = 0x02 While (Local0) { - If (CH03 ("", 0x00, ERRN, 0x32, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -74,7 +74,7 @@ } - If (CH03 ("", 0x00, ERRN, 0x46, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -85,25 +85,25 @@ If ((CH10 != Arg1)) { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, CH10, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, CH10, Arg1) } ERRN++ If ((CH11 == Arg1)) { - ERR ("", ZFFF, 0x52, 0x00, 0x00, CH11, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, CH11, Arg1) } ERRN++ If ((CH20 != Arg2)) { - ERR ("", ZFFF, 0x56, 0x00, 0x00, CH20, Arg2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, CH20, Arg2) } ERRN++ If ((CH21 == Arg2)) { - ERR ("", ZFFF, 0x5A, 0x00, 0x00, CH21, Arg2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, CH21, Arg2) } 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 9cac8f4..bdf11f8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl @@ -94,7 +94,7 @@ If ((DerefOf (Local0) != 0xABCD0000)) { - ERR ("", ZFFF, 0x5A, 0x00, 0x00, DerefOf (Local0), 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, DerefOf (Local0), 0xABCD0000) } Debug = "============== sit 0 (Local0):" @@ -125,7 +125,7 @@ Debug = "============== before checking:" If ((DerefOf (Local0) != 0xABCD0000)) { - ERR ("", ZFFF, 0x80, 0x00, 0x00, DerefOf (Local0), 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, DerefOf (Local0), 0xABCD0000) } Debug = "============== end of test" @@ -136,11 +136,11 @@ M1A9 () } - CH03 ("", 0x00, 0x02, 0x8A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MM00 () /* Check opcode of the last exception */ - CH04 ("", 0x02, 0x2F, 0x00, 0x8E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x02, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } /* @@ -158,13 +158,13 @@ Name (HG00, 0x01) /* if non-zero - the test hangs */ Name (HG01, 0x01) /* if non-zero - the test hangs */ Name (HG02, 0x01) /* if non-zero - the test hangs */ - CH03 ("", 0x00, 0xB8, 0x9F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (Local0 = P000 [0x01], I001) /* \M03D.I001 */ - CH03 ("", 0x00, 0xB9, 0xA3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Type of i001 should be already IRef here, */ /* so, don't expect exception. */ I001 = Local0 = P000 [0x00] - CH03 ("", 0x00, 0xBA, 0xAA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) If (Y248) { @@ -201,9 +201,9 @@ Debug = Local7 } - CH04 ("", 0x00, 0xFF, 0x00, 0xCB, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Local7 = (I001 + 0x01) - CH04 ("", 0x00, 0xFF, 0x00, 0xCF, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* * Looks identical to b248: "Incorrect ReferenceCount on Switch operation" * (though there is no Switch operation) 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 6c70111..f9c5b0b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl @@ -68,17 +68,17 @@ F257 = B257 /* \B257 */ If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) Return (Zero) } - If (CH03 ("", 0x00, 0x01, 0x53, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } Load (F257, H257) /* \H257 */ - If (CH03 ("", 0x00, 0x02, 0x59, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -86,27 +86,27 @@ If (CondRefOf (\AUXD, Local0)){} Else { - ERR ("", ZFFF, 0x5F, 0x00, 0x00, "\\AUXD", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x00) Return (Zero) } Local1 = ObjectType (Local0) If ((Local1 != 0x06)) { - ERR ("", ZFFF, 0x66, 0x00, 0x00, Local1, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x06) Return (Zero) } Local0 = ObjectType (\AUXD.M000) If ((Local0 != 0x08)) { - ERR ("", ZFFF, 0x6C, 0x00, 0x00, Local0, 0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x08) Return (Zero) } Unload (H257) If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x73, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) } } 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 b0b0899..c68befc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl @@ -68,17 +68,17 @@ F258 = B258 /* \B258 */ If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) Return (Zero) } - If (CH03 ("", 0x00, 0x01, 0x52, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } Load (R258, H258) /* \H258 */ - If (CH04 ("", 0x00, 0x08, 0x00, 0x58, 0x00, 0x00)) + If (CH04 (__METHOD__, 0x00, 0x08, 0x00, __LINE__, 0x00, 0x00)) { Return ( /* AE_TYPE */ @@ -88,27 +88,27 @@ Zero) If (CondRefOf (\AUXD, Local0)){} Else { - ERR ("", ZFFF, 0x5E, 0x00, 0x00, "\\AUXD", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x00) Return (Zero) } Local1 = ObjectType (Local0) If ((Local1 != 0x06)) { - ERR ("", ZFFF, 0x65, 0x00, 0x00, Local1, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x06) Return (Zero) } Local0 = ObjectType (\AUXD.M000) If ((Local0 != 0x08)) { - ERR ("", ZFFF, 0x6B, 0x00, 0x00, Local0, 0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x08) Return (Zero) } Unload (H258) If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x72, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) } } 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 e6b8913..b196239 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl @@ -73,17 +73,17 @@ F259 = B259 /* \B259 */ If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x51, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) Return (Zero) } - If (CH03 ("", 0x00, 0x01, 0x55, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } Load (R259, H259) /* \H259 */ - If (CH03 ("", 0x00, 0x02, 0x5B, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -91,27 +91,27 @@ If (CondRefOf (\AUXD, Local0)){} Else { - ERR ("", ZFFF, 0x61, 0x00, 0x00, "\\AUXD", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x00) Return (Zero) } Local1 = ObjectType (Local0) If ((Local1 != 0x06)) { - ERR ("", ZFFF, 0x68, 0x00, 0x00, Local1, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x06) Return (Zero) } Local0 = \AUXD.REGC /* External reference */ If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x6E, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) Return (Zero) } Unload (H259) If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x75, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) } } 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 cdb61ca..cbb543f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl @@ -52,11 +52,11 @@ Method (M000, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x3B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) RFU0 = BUF0 /* \M029.BUF0 */ If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Zero) } @@ -65,7 +65,7 @@ If (CondRefOf (\AUXD, Local0)){} Else { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Zero) } @@ -73,7 +73,7 @@ If ((Local1 != 0x0F)) { Debug = Local1 - ERR ("", ZFFF, 0x51, 0x00, 0x00, Local1, 0x0F) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x0F) Return (Zero) } @@ -81,10 +81,10 @@ Debug = "SSDT unloaded" If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x5A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } - CH03 ("", 0x00, 0x05, 0x5D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Return (Zero) } 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 6881015..6fb1a02 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl @@ -55,11 +55,11 @@ Method (M000, 0, Serialized) { Name (PAC0, Package (0x01){}) - CH03 ("", 0x00, 0x00, 0x3F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) RFU0 = BUF0 /* \M028.BUF0 */ If (CondRefOf (\AUXZ, Local0)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, 0x01777777) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) Return (Zero) } @@ -68,7 +68,7 @@ If (CondRefOf (\AUXZ, Local0)){} Else { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, Local0, 0x01777777) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) Return (Zero) } @@ -76,7 +76,7 @@ If ((Local1 != 0x0F)) { Debug = Local1 - ERR ("", ZFFF, 0x55, 0x00, 0x00, Local0, 0x01777777) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) Return (Zero) } @@ -84,10 +84,10 @@ Debug = "SSDT unloaded" If (CondRefOf (\AUXZ, Local0)) { - ERR ("", ZFFF, 0x5E, 0x00, 0x00, Local0, 0x01777777) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) } - CH03 ("", 0x00, 0x05, 0x61, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Return (Zero) } 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 5ce68d2..6d73ec2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl @@ -63,11 +63,11 @@ Debug = Local0 If ((Local0 != 0x01777777)) { - ERR ("", ZFFF, 0x3E, 0x00, 0x00, Local0, 0x01777777) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) } } - CH03 ("", 0x00, 0x01, 0x42, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 () - CH03 ("", 0x00, 0x02, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 1255748..dd11117 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl @@ -46,12 +46,12 @@ Debug = I000 /* \M026.MM00.I000 */ If ((Local0 != 0x50000001)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local0, 0x50000001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x50000001) } If ((I000 != 0x50000000)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, I000, 0x50000000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x50000000) } } @@ -122,12 +122,12 @@ Store ((I000 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR ("", ZFFF, 0x72, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((I000 != 0x80000000)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, I000, 0x80000000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x80000000) } } 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 a0fc195..099c5ef 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl @@ -49,7 +49,7 @@ { I000 }) - CH03 ("", 0x00, 0x00, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) DerefOf (P000 [0x00]) = 0xABCD0001 /* Specify then what should be there the result of Store operation above? @@ -58,7 +58,7 @@ err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0000) } */ - CH03 ("", 0x00, 0x01, 0x42, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M001, 0, Serialized) @@ -68,9 +68,9 @@ { I000 }) - CH03 ("", 0x00, 0x02, 0x4A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) DerefOf (Local0 = P000 [0x00]) = 0xABCD0001 - CH03 ("", 0x00, 0x03, 0x4C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M002, 0, Serialized) @@ -80,10 +80,10 @@ { I000 }) - CH03 ("", 0x00, 0x04, 0x54, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = P000 [0x00] DerefOf (Local0) = 0xABCD0001 - CH03 ("", 0x00, 0x05, 0x57, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M003, 0, Serialized) @@ -93,10 +93,10 @@ { I000 }) - CH03 ("", 0x00, 0x06, 0x5F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (P000 [0x00], Local0) DerefOf (Local0) = 0xABCD0001 - CH03 ("", 0x00, 0x07, 0x62, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M004, 0, Serialized) @@ -106,10 +106,10 @@ { I000 }) - CH03 ("", 0x00, 0x08, 0x6A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = Local0 = P000 [0x00] DerefOf (Local0) = 0xABCD0001 - CH03 ("", 0x00, 0x09, 0x6D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M005, 0, Serialized) @@ -119,10 +119,10 @@ { I000 }) - CH03 ("", 0x00, 0x0A, 0x75, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = Local0 = P000 [0x00] DerefOf (Local1) = 0xABCD0001 - CH03 ("", 0x00, 0x0B, 0x78, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M006, 0, NotSerialized) 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 c0fab2c..e1e2400 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl @@ -86,14 +86,14 @@ Store ((DerefOf (S000 [0x01]) + M001 ()), Local0) If ((Local0 != 0x24)) { - ERR ("", ZFFF, 0x54, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x24) } Local0 = DerefOf (S000 [0x01]) Local1 = 0x08 If ((Local0 != Local1)) { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 b9ab102..418b1df 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl @@ -47,7 +47,7 @@ Debug = I000 /* \M023.I000 */ If ((Arg0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Arg0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, 0xABCD0000) } } @@ -59,6 +59,6 @@ Debug = I000 /* \M023.I000 */ If ((I000 != 0x11223344)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, I000, 0x11223344) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 31bb952..3c4ef0f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl @@ -100,21 +100,21 @@ Return (MADD (I000, M002 ())) } - CH03 ("", 0x00, 0x00, 0x5D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = MADD (I000, M001 ()) If ((Local0 != 0x87654321)) { - ERR ("", ZFFF, 0x62, 0x00, 0x00, Local0, C00E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00E) } If ((I000 != 0x80000000)) { - ERR ("", ZFFF, 0x66, 0x00, 0x00, Local0, C00E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00E) } Debug = "Result:" Debug = Local0 Debug = "i000:" Debug = I000 /* \M022.I000 */ - CH03 ("", 0x00, 0x00, 0x6F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 e1fba7d..6b3e156 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl @@ -52,21 +52,21 @@ Debug = "-------------------------." } - CH03 ("", 0x00, 0x00, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M123 (I000) Local0 = ObjectType (I001) If ((Local0 != C00E)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Local0, C00E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00E) } - CH03 ("", 0x00, 0x02, 0x3E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (I002, I001) /* \M021.I001 */ Local0 = ObjectType (I001) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } - CH03 ("", 0x00, 0x04, 0x46, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 6dba344..00a2021 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl @@ -52,21 +52,21 @@ Debug = "-------------------------." } - CH03 ("", 0x00, 0x00, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M123 (I000) Local0 = ObjectType (I001) If ((Local0 != C015)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Local0, C015) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C015) } - CH03 ("", 0x00, 0x02, 0x3E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (I002, I001) /* \M020.I001 */ Local0 = ObjectType (I001) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } - CH03 ("", 0x00, 0x04, 0x46, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 83fcea0..d51eee0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl @@ -73,39 +73,39 @@ If ((F273 != SSDT)) { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, F273, SSDT) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, F273, SSDT) } If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x52, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } If (CondRefOf (\D273._XT2, Local0)) { - ERR ("", ZFFF, 0x56, 0x00, 0x00, "\\D273._XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\D273._XT2", 0x01) } LD () If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } If (CondRefOf (\D273._XT2, Local0)){} Else { - ERR ("", ZFFF, 0x61, 0x00, 0x00, "\\D273._XT2", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\D273._XT2", 0x00) } UNLD () If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x67, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } If (CondRefOf (\D273._XT2, Local0)) { - ERR ("", ZFFF, 0x6B, 0x00, 0x00, "\\D273._XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\D273._XT2", 0x01) } } 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 5e4aebf..068b579 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl @@ -51,7 +51,7 @@ Local0 = DerefOf (Arg1 [Arg2]) If ((Local0 != Arg0)) { - ERR ("", ZFFF, 0x39, 0x00, 0x00, Arg0, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 003ad57..ac8880a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl @@ -53,20 +53,20 @@ Method (M002, 2, NotSerialized) { Local0 = Arg0 [0x01] - If (CH03 ("", 0x00, 0x01, 0x36, 0x01)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x01)) { Return (Zero) } Local1 = DerefOf (Local0) - If (CH03 ("", 0x00, 0x02, 0x3B, 0x01)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x01)) { Return (Zero) } If ((Local1 != 0xABCD0001)) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, Local1, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0xABCD0001) } Return (Zero) 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 0af6b4f..13836d5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl @@ -60,12 +60,12 @@ If (CondRefOf (NABS, Local0)) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, "NABS", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NABS", 0x01) } If (CondRefOf (NCRR, Local0)) { - ERR ("", ZFFF, 0x42, 0x00, 0x00, "NCRR", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NCRR", 0x01) } RFU0 = SSDT /* \D278.SSDT */ @@ -77,24 +77,24 @@ { If (("absolute location obj" != DerefOf (Local0))) { - ERR ("", ZFFF, 0x4C, 0x00, 0x00, "absolute location NABS", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "absolute location NABS", 0x01) } } Else { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, "NABS", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NABS", 0x00) } If (CondRefOf (NCRR, Local0)) { If (("current location obj" != DerefOf (Local0))) { - ERR ("", ZFFF, 0x53, 0x00, 0x00, "current location NCRR", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "current location NCRR", 0x01) } } Else { - ERR ("", ZFFF, 0x56, 0x00, 0x00, "NCRR", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NCRR", 0x00) } /* Check location */ @@ -102,23 +102,23 @@ If (CondRefOf (\NABS, Local0)){} Else { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, "\\NABS", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\NABS", 0x00) } If (CondRefOf (\NCRR, Local0)) { - ERR ("", ZFFF, 0x5F, 0x00, 0x00, "\\NCRR", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\NCRR", 0x01) } If (CondRefOf (\D278.NCRR, Local0)) { - ERR ("", ZFFF, 0x62, 0x00, 0x00, "\\D278.NCRR", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\D278.NCRR", 0x01) } If (CondRefOf (\D278.TST0.NCRR, Local0)){} Else { - ERR ("", ZFFF, 0x66, 0x00, 0x00, "\\D278.TST0.NCRR", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\D278.TST0.NCRR", 0x00) } Unload (DDBH) @@ -127,12 +127,12 @@ If (CondRefOf (NABS, Local0)) { - ERR ("", ZFFF, 0x6E, 0x00, 0x00, "NABS", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NABS", 0x01) } If (CondRefOf (NCRR, Local0)) { - ERR ("", ZFFF, 0x71, 0x00, 0x00, "NCRR", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NCRR", 0x01) } } } 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 9e3c313..c8e6626 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl @@ -47,13 +47,13 @@ If ((PLDT != 0x00)) { Debug = PLDT /* \D281.PLDT */ - ERR ("", ZFFF, 0x38, 0x00, 0x00, PLDT, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x3D, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Successful case: spaces is replaced with zeroes */ @@ -68,7 +68,7 @@ If ((PLDT != 0x01)) { Debug = PLDT /* \D281.PLDT */ - ERR ("", ZFFF, 0x4F, 0x00, 0x00, PLDT, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x01) Return (0x01) } @@ -76,14 +76,14 @@ If (CondRefOf (\_XT2, Local0)){} Else { - ERR ("", ZFFF, 0x56, 0x00, 0x00, "\\_XT2", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB0) Debug = "OEM1 unloaded" If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x5D, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Unhappy case: normal strings */ @@ -93,7 +93,7 @@ If ((PLDT != 0x01)) { Debug = PLDT /* \D281.PLDT */ - ERR ("", ZFFF, 0x68, 0x00, 0x00, PLDT, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x01) Return (0x01) } @@ -101,14 +101,14 @@ If (CondRefOf (\_XT2, Local0)){} Else { - ERR ("", ZFFF, 0x6F, 0x00, 0x00, "\\_XT2", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB1) Debug = "OEM1 unloaded" If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) 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 92286a3..54ad109 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0282/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0282/DECL.asl @@ -42,7 +42,7 @@ Debug = BUF0 /* \D282.BUF0 */ Load (BUF0, Local0) Debug = BUF0 /* \D282.BUF0 */ - CH03 ("", 0x00, 0x01, 0x2F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } 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 c5d246e..4ea637c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0283/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0283/DECL.asl @@ -67,9 +67,9 @@ /* "Incorrect checksum" ACPI warning is expected */ Load (RFU0, HI0) /* \D283.TST0.HI0_ */ - CH03 ("", 0x00, 0x01, 0x49, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Unload (HI0) - CH03 ("", 0x00, 0x02, 0x4D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } 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 308aa7c..9219440 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl @@ -67,10 +67,10 @@ /* An exception is expected */ Load (RFU0, HI0) /* \D284.TST0.HI0_ */ - If (CH04 ("", 0x00, 0xFF, 0x00, 0x49, 0x00, 0x00)) + If (CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00)) { Unload (HI0) - CH03 ("", 0x00, 0x02, 0x4B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } } 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 c3518a4..0f3b2e6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0285/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0285/DECL.asl @@ -60,10 +60,10 @@ RFU0 = BUF0 /* \D285.BUF0 */ Load (RFU0, HI0) /* \D285.TST0.HI0_ */ Unload (M000 ()) - If (CH03 ("", 0x00, 0x01, 0x42, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Unload (HI0) - CH03 ("", 0x00, 0x02, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } } 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 b27401c..033ba44 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl @@ -65,11 +65,11 @@ RFU3 = BUF3 /* \D286.BUF3 */ Load (RFU3, DDB0) /* \D286.TST0.DDB0 */ M000 (RefOf (\AUXD.PAC0)) - CH04 ("", 0x00, 0xFF, 0x00, 0x4A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Debug = DerefOf (\AUXD.PAC0 [0x00]) - CH03 ("", 0x00, 0x02, 0x4D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Unload (DDB0) - CH03 ("", 0x00, 0x03, 0x50, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } 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 5af9348..3b6a618 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl @@ -39,30 +39,30 @@ /* SignatureString is greater than four characters */ LoadTable ("OEMXX", "", "", "", "\\D287.PLDT", 0x01) - CH04 ("", 0x00, 0xFF, 0x00, 0x2D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) If ((PLDT != 0x00)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, PLDT, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) Return (0x01) } /* OEMIDString is greater than six characters */ LoadTable ("OEM1", "IntelXX", "", "", "\\D287.PLDT", 0x01) - CH04 ("", 0x00, 0xFF, 0x00, 0x36, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) If ((PLDT != 0x00)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, PLDT, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) Return (0x01) } /* OEMTableID is greater than eight characters */ LoadTable ("OEM1", "", "ManyXXXXX", "", "\\D287.PLDT", 0x01) - CH04 ("", 0x00, 0xFF, 0x00, 0x3F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) If ((PLDT != 0x00)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, PLDT, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) Return (0x01) } 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 83a9919..ceb94a1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl @@ -64,7 +64,7 @@ DDBH = LoadTable ("SSDT", "iASLTS", "LTBL0001", "\\", "\\D289.PLDT", 0x01) If ((PLDT == 0x01)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, "PLDT", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "PLDT", 0x01) 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 d3e0e8f..e199011 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl @@ -56,19 +56,19 @@ RFU0 = BUF0 /* \D290.BUF0 */ If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x3E, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) Return (Zero) } Load (IST0, Local1) - If (CH03 ("", 0x00, 0x01, 0x44, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } ElseIf (CondRefOf (\AUXD, Local0)){} Else { - ERR ("", ZFFF, 0x48, 0x00, 0x00, "\\AUXD", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x00) Return (Zero) } @@ -77,7 +77,7 @@ Debug = "SSDT unloaded" If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x53, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) } Return (Zero) 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 afc2e54..7f6ab1e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl @@ -57,12 +57,12 @@ Load (RFU4, DDB0) /* \D292.TST0.DDB0 */ Debug = "SSDT loaded" Unload (DDB0) - CH03 ("", 0x00, 0x01, 0x40, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "SSDT unloaded" Unload (DDB0) - CH04 ("", 0x00, 0xFF, 0x00, 0x44, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Unload (DDB0) - CH04 ("", 0x00, 0xFF, 0x00, 0x47, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } } 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 04077ca..2f386b4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl @@ -44,41 +44,41 @@ Debug = SizeOf (Local3) If ((SizeOf (Local2) != 0x00)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, SizeOf (Local2), 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, SizeOf (Local2), 0x00) } If ((SizeOf (Local3) != 0x00)) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, SizeOf (Local3), 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, SizeOf (Local3), 0x00) } If (("" != Local1)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, "", Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "", Local1) } If (("" != Local2)) { - ERR ("", ZFFF, 0x3E, 0x00, 0x00, "", Local2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "", Local2) } If (("" != Local3)) { - ERR ("", ZFFF, 0x42, 0x00, 0x00, "", Local3) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "", Local3) } If ((Local2 != Local3)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local2, Local3) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local3) } If ((Local2 != Local1)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, Local2, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local1) } If ((Local3 != Local1)) { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, Local3, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 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 2c67ae4..1e6fa5b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl @@ -234,7 +234,7 @@ Name (DDB3, 0x00) If (INIT ()) { - ERR ("", ZFFF, 0xF1, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (0x01) } @@ -247,7 +247,7 @@ If (LD ()) { - ERR ("", ZFFF, 0xFC, 0x00, 0x00, Local0, HI0N) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, HI0N) Return (0x01) } @@ -261,7 +261,7 @@ /* The following Load should cause AE_OWNER_ID_LIMIT */ Load (RFU3, DDB3) /* \D294.TST0.DDB3 */ - CH04 ("", 0x00, 0xFF, 0x00, 0x010A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Return (0x00) } } 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 e2fd6d9..67b9192 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl @@ -37,7 +37,7 @@ Method (TST0, 0, NotSerialized) { Local0 = LoadTable ("OEM1", "", "", "", "\\PLDT", "1") - If (CH03 ("", 0x00, 0x01, 0x2C, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -45,15 +45,15 @@ Local1 = ObjectType (PLDT) If ((Local1 != 0x01)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local1, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x01) } ElseIf ((0x01 != PLDT)) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, 0x01, PLDT) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x01, PLDT) } Unload (Local0) - CH03 ("", 0x00, 0x04, 0x39, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } 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 85fd2c3..22cf087 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 @@ -35,7 +35,7 @@ */ Method (M1E4, 1, Serialized) { - CH03 ("", 0x00, 0x00, 0x28, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Mutex (MT00, 0x00) Mutex (MT10, 0x01) Mutex (MT20, 0x02) @@ -187,7 +187,7 @@ Local0 = Acquire (MT00, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xCA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -196,7 +196,7 @@ If (Local0) { - ERR ("", ZFFF, 0xCE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -205,210 +205,210 @@ If (Local0) { - ERR ("", ZFFF, 0xD2, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT10, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xD6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT11, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xDA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT20, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xDE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT21, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xE2, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT30, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xE6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT31, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xEA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT40, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xEE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT41, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xF2, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT50, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xF6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT51, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xFA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT60, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xFE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT61, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0102, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT70, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0106, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT71, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x010A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT80, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x010E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT81, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0112, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT90, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0116, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT91, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x011A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x011E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA1, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0122, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0126, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB1, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x012A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x012E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC1, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0132, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0136, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD1, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x013A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x013E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE1, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0142, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTF0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0146, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -423,7 +423,7 @@ If (Local0) { - ERR ("", ZFFF, 0x014E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -500,11 +500,11 @@ If (Arg0) { - CH04 ("", 0x01, 0x12, 0x00, 0x0196, 0x00, 0x00) /* AE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x12, 0x00, __LINE__, 0x00, 0x00) /* AE_LIMIT */ } Else { - CH03 ("", 0x00, 0x23, 0x0198, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } @@ -515,7 +515,7 @@ * * Event(E000) */ - CH03 ("", 0x00, 0x24, 0x01A4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * This causes messages (but no exceptions): * @@ -525,7 +525,7 @@ * ACPI Error (exutils-0180): Could not acquire AML Interpreter mutex [20061215] */ Sleep (0x64) - CH03 ("", 0x00, 0x25, 0x01B0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M1E6, 0, NotSerialized) @@ -536,7 +536,7 @@ M1E4 (0x00) SRMT ("m1e5") M1E5 () - CH03 ("", 0x00, 0x26, 0x01BB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * m1e5 shows appearance of bug but doesn't cause exceptions * (so it is not detected automatically), so actions are required @@ -545,5 +545,5 @@ * report below (or try to find how to detect this situation * automatically now (for not fixed yet)): */ - ERR ("", ZFFF, 0x01C5, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } 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 0f5d111..122498f 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 @@ -47,9 +47,9 @@ { Local0 = 0x0123 Acquire (MX03, 0x0100) - CH03 ("", 0x00, 0x00, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Acquire (MX02, 0x0100) - CH04 ("", 0x00, 0x40, 0x00, 0x37, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ Local2 = RefOf (P000) /* L0(0x004d5ec8, 0x123), L2 (0x004d5dc8, res of RefOf) */ Local3 = DerefOf (Local2) Debug = "Sit 1: Local2 contains bad object there!!!!!" @@ -64,14 +64,14 @@ Debug = Local4 If ((Local4 != 0x11111233)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local4, 0x11111233) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local4, 0x11111233) } Debug = "============================== 3" - CH03 ("", 0x00, 0x02, 0x4A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * The problem is not automatically detected, * so remove this error report after the problem has been resolved. */ - ERR ("", ZFFF, 0x50, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } 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 e279161..6e28f36 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 @@ -127,7 +127,7 @@ MM00 (0x00, I000, I001) } - CH03 ("", 0x00, 0x00, 0x66, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M306 (0x09, 0x00) M306 (0x09, 0x00) M306 (0x09, 0x00) @@ -144,10 +144,10 @@ M306 (0x09, 0x00) M306 (0x09, 0x00) M306 (0x09, 0x00) - CH04 ("", 0x01, 0x40, 0x00, 0x77, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x01, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ /* * The problem is not automatically detected, * so remove this error report after the problem has been resolved. */ - ERR ("", ZFFF, 0x7D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } 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 755b33d..0df7cdd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl @@ -70,19 +70,19 @@ If ((Arg0 != II00)) { - ERR ("", ZFFF, 0x4C, 0x00, 0x00, Arg0, II00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, II00) } If ((Arg0 != Local5)) { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, Arg0, Local5) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Local5) } } M100 (0x00) } - CH03 ("", 0x00, 0x02, 0x55, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 () - CH03 ("", 0x00, 0x03, 0x57, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 bfa0083..538d69b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0301/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0301/DECL.asl @@ -145,7 +145,7 @@ M100 () } - CH03 ("", 0x00, 0x00, 0x88, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M19C () - CH03 ("", 0x00, 0x01, 0x8A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 3830182..f63d530 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl @@ -51,7 +51,7 @@ { If ((\_SB.I2Z7 != 0xABCD0007)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, \_SB.I2Z7, 0xABCD0007) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \_SB.I2Z7, 0xABCD0007) } } @@ -77,14 +77,14 @@ { If ((\I2Z4 != 0xABCD0004)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, \I2Z4, 0xABCD0004) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \I2Z4, 0xABCD0004) } } M202 () } - CH03 ("", 0x00, 0x02, 0x50, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m1eb-m100") M100 () SRMT ("m1eb-m101") @@ -97,5 +97,5 @@ BLCK () } - CH03 ("", 0x00, 0x03, 0x5C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 52fb900..099c35c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl @@ -41,12 +41,12 @@ Name (\I4Z0, 0xABCD0000) If ((I4Z0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, I4Z0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I4Z0, 0xABCD0000) } If ((\I4Z0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, \I4Z0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \I4Z0, 0xABCD0000) } M101 () @@ -56,12 +56,12 @@ { If ((I4Z0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, I4Z0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I4Z0, 0xABCD0000) } If ((\I4Z0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, \I4Z0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \I4Z0, 0xABCD0000) } } @@ -83,12 +83,12 @@ If ((I4Z1 != 0xABCD0000)) { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, I4Z1, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I4Z1, 0xABCD0000) } If ((\I4Z1 != 0xABCD0000)) { - ERR ("", ZFFF, 0x51, 0x00, 0x00, \I4Z1, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \I4Z1, 0xABCD0000) } M101 () @@ -98,12 +98,12 @@ { If ((I4Z1 != 0xABCD0000)) { - ERR ("", ZFFF, 0x59, 0x00, 0x00, I4Z1, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I4Z1, 0xABCD0000) } If ((\I4Z1 != 0xABCD0000)) { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, \I4Z1, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \I4Z1, 0xABCD0000) } } @@ -112,11 +112,11 @@ Debug = "---------------- Completed" } - CH03 ("", 0x00, 0x08, 0x65, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m1ec-m000") M000 () - CH03 ("", 0x00, 0x09, 0x68, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m1ec-m001") M001 () - CH03 ("", 0x00, 0x0A, 0x6B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 830fd7b..5ab5b5a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl @@ -153,7 +153,7 @@ Local1 = DerefOf (Arg3 [LPC0]) If ((Local0 != Local1)) { - ERR ("", ZFFF, 0x8E, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) Debug = Arg0 Debug = LPC0 /* \M1ED.M18A.M802.LPC0 */ } @@ -168,28 +168,28 @@ { If ((IND1 != N100)) { - ERR ("", ZFFF, 0x99, 0x00, 0x00, IND1, N100) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IND1, N100) } } Case (0x02) { If ((IND2 != N200)) { - ERR ("", ZFFF, 0x9E, 0x00, 0x00, IND2, N200) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IND2, N200) } } Case (0x03) { If ((IND3 != N300)) { - ERR ("", ZFFF, 0xA3, 0x00, 0x00, IND3, N300) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IND3, N300) } } Case (0x04) { If ((IND4 != N400)) { - ERR ("", ZFFF, 0xA8, 0x00, 0x00, IND4, N400) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IND4, N400) } } @@ -229,7 +229,7 @@ Local1 = DerefOf (P100 [Local1]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0xCE, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -254,7 +254,7 @@ Local1 = DerefOf (P200 [Local1]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0xE1, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -288,7 +288,7 @@ Local1 = DerefOf (P300 [Local1]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0xFA, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -312,7 +312,7 @@ Local1 = DerefOf (P400 [Local1]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x010C, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -323,19 +323,19 @@ If (Arg0) { - CH04 ("", 0x00, 0x54, 0x00, 0x0119, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */ + CH04 (__METHOD__, 0x00, 0x54, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */ } Else { - CH03 ("", 0x00, 0x0A, 0x011B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } - CH03 ("", 0x00, 0x0B, 0x011F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m18a-0") M18A (0x00) - CH03 ("", 0x00, 0x0C, 0x0122, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m18a-1") M18A (0x01) - CH03 ("", 0x00, 0x0D, 0x0125, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 d18ea17..2ef2127 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl @@ -53,11 +53,11 @@ Debug = "==================== 1" If ((Local0 != 0xABCD0003)) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, Local0, 0xABCD0003) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0003) } } - CH03 ("", 0x00, 0x00, 0x39, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 (0x00) - CH03 ("", 0x00, 0x01, 0x3B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 9783bab..36e6ee9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl @@ -38,18 +38,18 @@ Arg0 = "87654321" } - CH03 ("", 0x00, 0x00, 0x2C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = 0x12345678 Local0 = "87654321" If ((ObjectType (Local0) != 0x02)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, ObjectType (Local0), 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ObjectType (Local0), 0x02) } M000 (RefOf (Local1)) If ((ObjectType (Local1) != 0x02)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, ObjectType (Local1), 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ObjectType (Local1), 0x02) } Local3 = RefOf (Local2) @@ -58,8 +58,8 @@ DerefOf (Local4) = "87654321" If ((ObjectType (Local2) != 0x02)) { - ERR ("", ZFFF, 0x42, 0x00, 0x00, ObjectType (Local2), 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ObjectType (Local2), 0x02) } - CH03 ("", 0x00, 0x04, 0x45, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 3ca8dfb..f6775ff 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl @@ -75,7 +75,7 @@ TRC1 (Arg0, LPC0, Local0) If ((Local0 != LPC0)) { - ERR ("", ZFFF, 0x4D, 0x00, 0x00, Local0, LPC0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, LPC0) } LPN0-- @@ -91,7 +91,7 @@ TRC1 (Arg0, 0x00, Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x59, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Last pre-initialized element */ @@ -101,7 +101,7 @@ TRC1 (Arg0, Local0, Local1) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x61, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } /* Middle pre-initialized element */ @@ -111,7 +111,7 @@ TRC1 (Arg0, Local0, Local1) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x69, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -132,7 +132,7 @@ TRC1 (Arg0, LPC0, Local0) If ((Local0 != LPC0)) { - ERR ("", ZFFF, 0x7A, 0x00, 0x00, Local0, LPC0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, LPC0) } LPN0-- @@ -148,7 +148,7 @@ TRC1 (Arg0, Arg3, Local0) If ((Local0 != Arg3)) { - ERR ("", ZFFF, 0x86, 0x00, 0x00, Local0, Arg3) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Arg3) } /* Last written element */ @@ -159,7 +159,7 @@ TRC1 (Arg0, Local0, Local1) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x8F, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } /* Middle written element */ @@ -170,7 +170,7 @@ TRC1 (Arg0, Local0, Local1) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x98, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -186,17 +186,17 @@ TRC1 (Arg0, Arg2, 0xF0F0F0F0) Store (Arg0 [Arg2], Local0) - CH03 ("", 0x00, 0x0100, 0xA6, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xA8, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ /* Just before written area */ Local1 = (Arg3 - 0x01) TRC1 (Arg0, Local1, 0xF0F0F0F0) Store (Arg0 [Local1], Local0) - CH03 ("", 0x00, 0x0102, 0xAF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xB1, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } /* Just after pre-initialized and written areas */ @@ -211,17 +211,17 @@ { TRC1 (Arg0, Local7, 0xF0F0F0F0) Store (Arg0 [Local7], Local0) - CH03 ("", 0x00, 0x0104, 0xBE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xC0, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ /* Last element of Package */ Local1 = (Arg1 - 0x01) TRC1 (Arg0, Local1, 0xF0F0F0F0) Store (Arg0 [Local1], Local0) - CH03 ("", 0x00, 0x0106, 0xC7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xC9, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } } Else @@ -230,41 +230,41 @@ TRC1 (Arg0, Arg2, 0xF0F0F0F0) Store (Arg0 [Arg2], Local0) - CH03 ("", 0x00, 0x0108, 0xD0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xD2, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ /* Last element of Package */ Local1 = (Arg1 - 0x01) TRC1 (Arg0, Local1, 0xF0F0F0F0) Store (Arg0 [Local1], Local0) - CH03 ("", 0x00, 0x010A, 0xD9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xDB, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } } /* Check exception on out of Package access */ TRC1 (Arg0, Arg1, 0xF0F0F0F0) - CH03 ("", 0x00, 0x010C, 0xE2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = Arg0 [Arg1] - CH04 ("", 0x00, 0x37, 0x00, 0xE4, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ Local7 = (Arg1 + 0x01) If ((Local7 >= Arg1)) { TRC1 (Arg0, Local7, 0xF0F0F0F0) - CH03 ("", 0x00, 0x010E, 0xE9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = Arg0 [Local7] - CH04 ("", 0x00, 0x37, 0x00, 0xEB, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } If ((0xFFFFFFFFFFFFFFFF >= Arg1)) { TRC1 (Arg0, 0xFFFFFFFFFFFFFFFF, 0xF0F0F0F0) - CH03 ("", 0x00, 0x0110, 0xF0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = Arg0 [0xFFFFFFFFFFFFFFFF] - CH04 ("", 0x00, 0x37, 0x00, 0xF2, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } /* Check near the maximal bound of a simple Package */ @@ -306,15 +306,15 @@ { /* Was initialized */ - CH03 ("", 0x00, 0x0112, 0x011B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (Arg0 [Arg5]) TRC1 (Arg0, Arg5, Local0) If ((Local0 != Arg5)) { - ERR ("", ZFFF, 0x011F, 0x00, 0x00, Local0, Arg5) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Arg5) } - CH03 ("", 0x00, 0x0113, 0x0121, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } ElseIf ((Arg5 < Arg1)) { @@ -322,18 +322,18 @@ TRC1 (Arg0, Arg5, 0xF0F0F0F0) Store (Arg0 [Arg5], Local0) - CH03 ("", 0x00, 0x0114, 0x0129, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0x012B, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } Else { /* Check exception on out of Package access */ TRC1 (Arg0, Arg5, 0xF0F0F0F0) - CH03 ("", 0x00, 0x0116, 0x0132, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = Arg0 [Arg5] - CH04 ("", 0x00, 0x37, 0x00, 0x0134, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } } @@ -353,7 +353,7 @@ * - number of exceptions NOT GREATER than two */ /* Check opcode of the first exception */ - CH04 ("", 0x01, 0x38, 0x00, 0x014B, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ + CH04 (__METHOD__, 0x01, 0x38, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ /* Number of exceptions not greater than two */ If ((EXC1 > 0x02)) @@ -369,7 +369,7 @@ ID01 = 0x01 } - CH03 ("", 0x00, 0x0119, 0x0159, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Return (0x01) } @@ -387,14 +387,14 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg1)) { - ERR ("", ZFFF, 0x016B, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Arg1) } If (Arg5) { If ((Arg0 != Arg2)) { - ERR ("", ZFFF, 0x016F, 0x00, 0x00, Arg0, Arg2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg2) } } } @@ -402,5 +402,5 @@ Method (M02A, 0, NotSerialized) { Debug = "Check the error manually and remove call to m02a() when the bug is fixed." - ERR ("", ZFFF, 0x0178, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/complex/misc/misc.asl b/tests/aslts/src/runtime/collections/complex/misc/misc.asl index bd3e9a9..854898d 100644 --- a/tests/aslts/src/runtime/collections/complex/misc/misc.asl +++ b/tests/aslts/src/runtime/collections/complex/misc/misc.asl @@ -57,7 +57,7 @@ If ((Local0 != 0x01)) { - ERR (Arg0, Z054, 0x3B, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -74,14 +74,14 @@ M111 (Local0) If ((Local0 != 0x00)) { - ERR (Arg0, Z054, 0x4A, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = 0x00 Local5 = Concatenate ("qwertyuiop", Local0) If ((Local0 != 0x00)) { - ERR (Arg0, Z054, 0x50, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -98,7 +98,7 @@ Local0 = ObjectType (RefOf (F000)) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x60, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -129,18 +129,18 @@ BNK0 = 0x00 If ((BNK0 != 0x00)) { - ERR (Arg0, Z054, 0x7B, 0x00, 0x00, BNK0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BNK0, 0x00) } BF00 = 0x87 If ((BNK0 != 0x00)) { - ERR (Arg0, Z054, 0x80, 0x00, 0x00, BNK0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BNK0, 0x00) } If ((BF00 != 0x87)) { - ERR (Arg0, Z054, 0x84, 0x00, 0x00, BF00, 0x87) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BF00, 0x87) } /* Deal with 1-th bank layout: */ @@ -148,7 +148,7 @@ BNK0 = 0x01 If ((BNK0 != 0x01)) { - ERR (Arg0, Z054, 0x8B, 0x00, 0x00, BNK0, 0x01) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BNK0, 0x01) } BF01 = 0x96 @@ -156,13 +156,13 @@ { If ((BNK0 != 0x01)) { - ERR (Arg0, Z054, 0x92, 0x00, 0x00, BNK0, 0x01) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BNK0, 0x01) } } If ((BF01 != 0x96)) { - ERR (Arg0, Z054, 0x97, 0x00, 0x00, BF01, 0x96) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BF01, 0x96) } } @@ -177,7 +177,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C00B)) { - ERR (Arg0, Z054, 0xA2, 0x00, 0x00, Local1, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local1, 0x00) } ToBuffer (Local0, Local2) @@ -185,7 +185,7 @@ Local3 = ObjectType (Local0) If ((Local3 != C00B)) { - ERR (Arg0, Z054, 0xAC, 0x00, 0x00, Local3, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local3, 0x00) } } @@ -208,14 +208,14 @@ Local0 = 0x00 } - CH03 (__METHOD__, Z054, 0x0100, 0xC4, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != 0x00)) { - ERR (Arg0, Z054, 0xC9, 0x00, 0x00, Local1, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local1, 0x00) } - CH03 (__METHOD__, Z054, 0x0101, 0xCC, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) } Method (M118, 1, NotSerialized) @@ -242,13 +242,13 @@ Local2 = ObjectType (Local1) If ((Local2 != 0x03)) { - ERR (Arg0, Z054, 0xE9, 0x00, 0x00, Local2, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local2, 0x00) } Debug = "================ 2:" Debug = Local1 Debug = Local2 - CH03 (Arg0, Z054, 0x0102, 0xF1, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) Return (0x00) } @@ -321,7 +321,7 @@ /* are passed immediately */ Method (M11C, 1, Serialized) { - CH03 (__METHOD__, Z054, 0x0103, 0x0154, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Store ((Buffer (0x01) { 0x79 // y @@ -329,7 +329,7 @@ { 0x79 // y }), Local5) - CH03 (__METHOD__, Z054, 0x0104, 0x0158, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) } /* Bug 57: The empty Return operator (without specifying the returning value) */ @@ -345,7 +345,7 @@ /* Store("ERROR 0: m121, after Return !!!", Debug) */ } - ERR (Arg0, Z054, 0x0167, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (0x5678) } @@ -356,10 +356,10 @@ Return ( /* ASL-compiler DOESN'T report Warning in this case!!! */ /* And the Store operator below is actually processed!!! */ Zero) - ERR (Arg0, Z054, 0x0175, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, 0x00, 0x00) } - ERR (Arg0, Z054, 0x0178, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Zero) } @@ -400,7 +400,7 @@ Zero) 0x01, 0x02, 0x00, 0x00 // .... })) { - ERR (Arg0, Z054, 0x019E, 0x00, 0x00, BUF0, Buffer (0x04) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BUF0, Buffer (0x04) { 0x01, 0x02, 0x00, 0x00 // .... }) @@ -431,13 +431,13 @@ Zero) Local0 = ObjectType (Arg1) If ((Local0 != Arg2)) { - ERR (Arg0, Z054, 0x01B9, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (Arg1) If ((Local0 != Arg3)) { - ERR (Arg0, Z054, 0x01BE, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg3) } } @@ -446,37 +446,37 @@ Zero) Local0 = ObjectType (BF00) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01C6, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } Local0 = ObjectType (BF01) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01CA, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } Local0 = ObjectType (BF02) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01CE, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } Local0 = ObjectType (BF03) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01D2, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } Local0 = ObjectType (BF04) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01D6, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } Local0 = ObjectType (BF05) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01DA, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } If (F64) @@ -528,13 +528,13 @@ Zero) Local0 = ObjectType (Arg1) If ((Local0 != Arg2)) { - ERR (Arg0, Z054, 0x0208, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (Arg1) If ((Local0 != Arg3)) { - ERR (Arg0, Z054, 0x020D, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg3) } } @@ -543,37 +543,37 @@ Zero) Local0 = ObjectType (F000) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x0215, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = ObjectType (F001) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x0219, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = ObjectType (F002) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x021D, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = ObjectType (F003) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x0221, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = ObjectType (F004) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x0225, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = ObjectType (F005) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x0229, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } If (F64) @@ -652,13 +652,13 @@ Zero) Local0 = ObjectType (Local1) If ((Local0 != Arg2)) { - ERR (Arg0, Z054, 0x0269, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (Local1) If ((Local0 != Arg3)) { - ERR (Arg0, Z054, 0x026E, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg3) } } @@ -744,13 +744,13 @@ Zero) Local0 = ObjectType (Local1) If ((Local0 != Arg2)) { - ERR (Arg0, Z054, 0x02B2, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (Local1) If ((Local0 != Arg3)) { - ERR (Arg0, Z054, 0x02B7, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg3) } } @@ -855,11 +855,11 @@ Zero) Return (0x12345678) } - CH03 (Arg0, Z054, 0x0105, 0x031A, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) Local0 = ObjectType (M000) If ((Local0 != C010)) { - ERR (Arg0, Z054, 0x031E, 0x00, 0x00, Local0, C010) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, C010) } /* Bug 81. */ /* @@ -898,12 +898,12 @@ Zero) Local0 [0x03] = 0x61 If ((Local0 != "Strang")) { - ERR (Arg0, Z054, 0x0349, 0x00, 0x00, Local0, "Strang") + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, "Strang") } If ((S000 != "String")) { - ERR (Arg0, Z054, 0x034C, 0x00, 0x00, S000, "String") + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, S000, "String") } } @@ -920,7 +920,7 @@ Zero) 0xA0, 0xA1, 0xA2, 0x61, 0xA4, 0xA5 // ...a.. })) { - ERR (Arg0, Z054, 0x0359, 0x00, 0x00, Local0, Buffer (0x06) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Buffer (0x06) { 0xA0, 0xA1, 0xA2, 0x61, 0xA4, 0xA5 // ...a.. }) @@ -931,7 +931,7 @@ Zero) 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5 // ...... })) { - ERR (Arg0, Z054, 0x035C, 0x00, 0x00, B000, Buffer (0x06) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, B000, Buffer (0x06) { 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5 // ...... }) @@ -953,62 +953,62 @@ Zero) Local0 [0x03] = 0x61 If ((DerefOf (Local0 [0x00]) != 0xFFF0)) { - ERR (Arg0, Z054, 0x0369, 0x00, 0x00, DerefOf (Local0 [0x00]), 0xFFF0) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x00]), 0xFFF0) } If ((DerefOf (Local0 [0x01]) != 0xFFF1)) { - ERR (Arg0, Z054, 0x036C, 0x00, 0x00, DerefOf (Local0 [0x01]), 0xFFF1) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x01]), 0xFFF1) } If ((DerefOf (Local0 [0x02]) != 0xFFF2)) { - ERR (Arg0, Z054, 0x036F, 0x00, 0x00, DerefOf (Local0 [0x02]), 0xFFF2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x02]), 0xFFF2) } If ((DerefOf (Local0 [0x03]) != 0x61)) { - ERR (Arg0, Z054, 0x0372, 0x00, 0x00, DerefOf (Local0 [0x03]), 0x61) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x03]), 0x61) } If ((DerefOf (Local0 [0x04]) != 0xFFF4)) { - ERR (Arg0, Z054, 0x0375, 0x00, 0x00, DerefOf (Local0 [0x04]), 0xFFF4) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x04]), 0xFFF4) } If ((DerefOf (Local0 [0x05]) != 0xFFF5)) { - ERR (Arg0, Z054, 0x0378, 0x00, 0x00, DerefOf (Local0 [0x05]), 0xFFF5) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x05]), 0xFFF5) } If ((DerefOf (P000 [0x00]) != 0xFFF0)) { - ERR (Arg0, Z054, 0x037C, 0x00, 0x00, DerefOf (P000 [0x00]), 0xFFF0) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x00]), 0xFFF0) } If ((DerefOf (P000 [0x01]) != 0xFFF1)) { - ERR (Arg0, Z054, 0x037F, 0x00, 0x00, DerefOf (P000 [0x01]), 0xFFF1) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x01]), 0xFFF1) } If ((DerefOf (P000 [0x02]) != 0xFFF2)) { - ERR (Arg0, Z054, 0x0382, 0x00, 0x00, DerefOf (P000 [0x02]), 0xFFF2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x02]), 0xFFF2) } If ((DerefOf (P000 [0x03]) != 0xFFF3)) { - ERR (Arg0, Z054, 0x0385, 0x00, 0x00, DerefOf (P000 [0x03]), 0xFFF3) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x03]), 0xFFF3) } If ((DerefOf (P000 [0x04]) != 0xFFF4)) { - ERR (Arg0, Z054, 0x0388, 0x00, 0x00, DerefOf (P000 [0x04]), 0xFFF4) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x04]), 0xFFF4) } If ((DerefOf (P000 [0x05]) != 0xFFF5)) { - ERR (Arg0, Z054, 0x038B, 0x00, 0x00, DerefOf (P000 [0x05]), 0xFFF5) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x05]), 0xFFF5) } } @@ -1116,21 +1116,21 @@ Zero) } } - CH03 (Arg0, Z054, 0x0107, 0x03CE, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) MF74 () - CH03 (Arg0, Z054, 0x0108, 0x03D0, 0x00) - CH03 (Arg0, Z054, 0x0109, 0x03D2, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) MM00 () - CH03 (Arg0, Z054, 0x010A, 0x03D4, 0x00) - CH03 (Arg0, Z054, 0x010B, 0x03D6, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) MM01 () - CH03 (Arg0, Z054, 0x010C, 0x03D8, 0x00) - CH03 (Arg0, Z054, 0x010D, 0x03DA, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) MM02 () - CH03 (Arg0, Z054, 0x010E, 0x03DC, 0x00) - CH03 (Arg0, Z054, 0x010F, 0x03DE, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) MM03 () - CH03 (Arg0, Z054, 0x0110, 0x03E0, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) } /* @@ -1167,34 +1167,34 @@ Zero) /* Bug 196 */ Method (MF86, 1, NotSerialized) { - CH03 ("mf86", Z054, 0x4A, 0x0407, 0x00) + CH03 ("mf86", Z054, __LINE__, 0x00, 0x00) Local1 = "0x0x12345678" ToInteger (Local1, Local0) If ((Local0 != 0x00)) { - ERR (Arg0, Z054, 0x040C, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH04 ("mf86", 0x00, 0xFF, Z054, 0x040F, 0x00, 0x00) + CH04 ("mf86", 0x00, 0xFF, Z054, __LINE__, 0x00, 0x00) } Method (MF87, 1, NotSerialized) { - CH03 ("mf87", Z054, 0x00, 0x0414, 0x00) + CH03 ("mf87", Z054, __LINE__, 0x00, 0x00) Local0 = ("0x0xabcdef" + 0x00010234) If ((Local0 != 0x00010234)) { - ERR (Arg0, Z054, 0x0418, 0x00, 0x00, Local0, 0x00010234) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00010234) } - CH03 ("mf87", Z054, 0x01, 0x041B, 0x00) + CH03 ("mf87", Z054, __LINE__, 0x00, 0x00) Local0 = (0x00010234 + "0x0xabcdef") If ((Local0 != 0x00010234)) { - ERR (Arg0, Z054, 0x041F, 0x00, 0x00, Local0, 0x00010234) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00010234) } - CH03 ("mf87", Z054, 0x02, 0x0422, 0x00) + CH03 ("mf87", Z054, __LINE__, 0x00, 0x00) } Method (M15B, 0, Serialized) @@ -1219,45 +1219,45 @@ Zero) Local0 = MM00 () If ((Local0 != 0xABCD0000)) { - ERR (__METHOD__, Z054, 0x043A, 0x00, 0x00, Local0, 0xABCD0000) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } } Method (M001, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x01, 0x0440, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local0 = DerefOf (RefOf (MM00)) If (SLCK) { - CH03 (__METHOD__, Z054, 0x02, 0x0443, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C010)) { - ERR (__METHOD__, Z054, 0x0446, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local1, C010) } } Else { - CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x0449, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z054, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } } Method (M002, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x05, 0x044F, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local0 = DerefOf (P000 [0x01]) If (SLCK) { - CH03 (__METHOD__, Z054, 0x06, 0x0452, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C010)) { - ERR (__METHOD__, Z054, 0x0455, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local1, C010) } } Else { - CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x0458, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z054, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } } @@ -1284,31 +1284,31 @@ Zero) CopyObject (MM00 (), Local0) If ((Local0 != 0xABCD0000)) { - ERR (__METHOD__, Z054, 0x0472, 0x00, 0x00, Local0, 0xABCD0000) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } } Method (M005, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x0E, 0x0478, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) CopyObject (DerefOf (RefOf (MM00)), Local0) - CH03 (__METHOD__, Z054, 0x0F, 0x047A, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C010)) { - ERR (__METHOD__, Z054, 0x047E, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local1, C010) } } Method (M006, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x11, 0x0484, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) CopyObject (DerefOf (P000 [0x01]), Local0) - CH03 (__METHOD__, Z054, 0x12, 0x0486, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C010)) { - ERR (__METHOD__, Z054, 0x048A, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local1, C010) } } @@ -1332,22 +1332,22 @@ Zero) Local0 = (MM00 () + 0x01) If ((Local0 != 0xABCD0001)) { - ERR (__METHOD__, Z054, 0x04A2, 0x00, 0x00, Local0, 0xABCD0001) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, 0xABCD0001) } } Method (M009, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x18, 0x04A8, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local0 = (DerefOf (RefOf (MM00)) + 0x02) - CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x04AA, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z054, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (M00A, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x1A, 0x04AF, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local0 = (DerefOf (P000 [0x01]) + 0x03) - CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x04B1, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z054, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (M00B, 0, NotSerialized) @@ -1365,7 +1365,7 @@ Zero) Local0 = ObjectType (MM00) If ((Local0 != C010)) { - ERR (__METHOD__, Z054, 0x04C3, 0x00, 0x00, Local0, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, C010) } } @@ -1374,7 +1374,7 @@ Zero) Local0 = ObjectType (DerefOf (RefOf (MM00))) If ((Local0 != C010)) { - ERR (__METHOD__, Z054, 0x04CB, 0x00, 0x00, Local0, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, C010) } } @@ -1383,7 +1383,7 @@ Zero) Local0 = ObjectType (DerefOf (P000 [0x01])) If ((Local0 != C010)) { - ERR (__METHOD__, Z054, 0x04D3, 0x00, 0x00, Local0, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, 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 a00eaea..ba4dde9 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl @@ -39,12 +39,12 @@ Name (\I4Z0, 0xABCD0000) If ((I4Z0 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x30, 0x00, 0x00, I4Z0, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, I4Z0, 0xABCD0000) } If ((\I4Z0 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x33, 0x00, 0x00, \I4Z0, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, \I4Z0, 0xABCD0000) } M001 () @@ -54,18 +54,18 @@ { If ((I4Z0 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x3B, 0x00, 0x00, I4Z0, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, I4Z0, 0xABCD0000) } If ((\I4Z0 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x3E, 0x00, 0x00, \I4Z0, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, \I4Z0, 0xABCD0000) } } - CH03 (__METHOD__, Z179, 0x44, 0x42, 0x00) + CH03 (__METHOD__, Z179, __LINE__, 0x00, 0x00) M000 () - CH03 (__METHOD__, Z179, 0x45, 0x44, 0x00) + CH03 (__METHOD__, Z179, __LINE__, 0x00, 0x00) } Method (FP01, 0, Serialized) @@ -79,12 +79,12 @@ If ((I4Z1 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x52, 0x00, 0x00, I4Z1, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, I4Z1, 0xABCD0000) } If ((\I4Z1 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x55, 0x00, 0x00, \I4Z1, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, \I4Z1, 0xABCD0000) } M001 () @@ -94,18 +94,18 @@ { If ((I4Z1 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x5D, 0x00, 0x00, I4Z1, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, I4Z1, 0xABCD0000) } If ((\I4Z1 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x60, 0x00, 0x00, \I4Z1, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, \I4Z1, 0xABCD0000) } } - CH03 (__METHOD__, Z179, 0x44, 0x64, 0x00) + CH03 (__METHOD__, Z179, __LINE__, 0x00, 0x00) M000 (0x00) - CH03 (__METHOD__, Z179, 0x45, 0x66, 0x00) + CH03 (__METHOD__, Z179, __LINE__, 0x00, 0x00) } Method (FPD0, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl index 27ff816..785b4c9 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 @@ 0x04 }) Name (I001, 0x00) - CH03 (__METHOD__, Z154, 0x00, 0x38, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -78,11 +78,11 @@ Store ((I000 + M001 ()), Local0) If ((Local0 != 0xABCD0003)) { - ERR (__METHOD__, Z154, 0x4D, 0x00, 0x00, Local0, 0xABCD0003) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0xABCD0003) } Debug = Local0 - CH03 (__METHOD__, Z154, 0x02, 0x51, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } Method (M001, 1, Serialized) @@ -152,15 +152,15 @@ Store ((I000 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0x8B, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((I000 != 0x80000000)) { - ERR (__METHOD__, Z154, 0x8F, 0x00, 0x00, I000, 0x80000000) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, I000, 0x80000000) } - CH03 (__METHOD__, Z154, 0x05, 0x92, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } Method (M002, 0, Serialized) @@ -183,15 +183,15 @@ Store ((I000 + M001 ()), Local0) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z154, 0xA8, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } If ((I000 != 0x00100064)) { - ERR (__METHOD__, Z154, 0xAC, 0x00, 0x00, I000, 0x00100064) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, I000, 0x00100064) } - CH03 (__METHOD__, Z154, 0x08, 0xAF, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } Method (M003, 0, Serialized) @@ -213,15 +213,15 @@ Store ((I000 + M001 ()), Local0) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z154, 0xC4, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } If ((I000 != 0x00100064)) { - ERR (__METHOD__, Z154, 0xC8, 0x00, 0x00, I000, 0x00100064) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, I000, 0x00100064) } - CH03 (__METHOD__, Z154, 0x0B, 0xCB, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } /* @@ -294,15 +294,15 @@ Store ((Local7 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0x0109, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((Local7 != 0x01)) { - ERR (__METHOD__, Z154, 0x010D, 0x00, 0x00, Local7, 0x01) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local7, 0x01) } - CH03 (__METHOD__, Z154, 0x0E, 0x0110, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } /* @@ -375,15 +375,15 @@ Store ((Arg1 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0x014E, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((Arg1 != 0x01)) { - ERR (__METHOD__, Z154, 0x0152, 0x00, 0x00, Arg1, 0x01) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Arg1, 0x01) } - CH03 (__METHOD__, Z154, 0x11, 0x0155, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } Method (N000, 0, NotSerialized) 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 e33041c..a8beac4 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl @@ -47,7 +47,7 @@ 0x04 }) I001 = Arg0 - CH03 (__METHOD__, Z154, 0x14, 0x30, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) Method (M001, 0, NotSerialized) { Method (M002, 0, NotSerialized) @@ -103,20 +103,20 @@ Store ((D000.I000 + M001 ()), Local0) If (FLG9) { - CH03 (__METHOD__, Z154, 0x14, 0x61, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0x63, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((D000.I000 != 0x80000000)) { - ERR (__METHOD__, Z154, 0x66, 0x00, 0x00, D000.I000, 0x80000000) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, D000.I000, 0x80000000) } } Else { - CH04 (__METHOD__, 0x01, 0x05, Z154, 0x69, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x01, 0x05, Z154, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } } @@ -139,7 +139,7 @@ 0x04 }) I001 = Arg0 - CH03 (__METHOD__, Z154, 0x14, 0x7C, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) Method (M001, 0, NotSerialized) { Method (M002, 0, NotSerialized) @@ -195,20 +195,20 @@ Store ((TZ00.I000 + M001 ()), Local0) If (FLG9) { - CH03 (__METHOD__, Z154, 0x14, 0xAC, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0xAE, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((TZ00.I000 != 0x80000000)) { - ERR (__METHOD__, Z154, 0xB1, 0x00, 0x00, TZ00.I000, 0x80000000) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, TZ00.I000, 0x80000000) } } Else { - CH04 (__METHOD__, 0x01, 0x05, Z154, 0xB4, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x01, 0x05, Z154, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } } @@ -231,7 +231,7 @@ 0x04 }) I001 = Arg0 - CH03 (__METHOD__, Z154, 0x14, 0xC7, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) Method (M001, 0, NotSerialized) { Method (M002, 0, NotSerialized) @@ -287,20 +287,20 @@ Store ((PR00.I000 + M001 ()), Local0) If (FLG9) { - CH03 (__METHOD__, Z154, 0x14, 0xF8, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0xFA, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((PR00.I000 != 0x80000000)) { - ERR (__METHOD__, Z154, 0xFD, 0x00, 0x00, PR00.I000, 0x80000000) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, PR00.I000, 0x80000000) } } Else { - CH04 (__METHOD__, 0x01, 0x05, Z154, 0x0100, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x01, 0x05, Z154, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } } @@ -323,7 +323,7 @@ 0x04 }) I001 = Arg0 - CH03 (__METHOD__, Z154, 0x1D, 0x0113, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) Method (M001, 0, NotSerialized) { Method (M002, 0, NotSerialized) @@ -379,20 +379,20 @@ Store ((PW00.I000 + M001 ()), Local0) If (FLG9) { - CH03 (__METHOD__, Z154, 0x14, 0x0144, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0x0146, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((PW00.I000 != 0x80000000)) { - ERR (__METHOD__, Z154, 0x0149, 0x00, 0x00, PW00.I000, 0x80000000) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, PW00.I000, 0x80000000) } } Else { - CH04 (__METHOD__, 0x01, 0x05, Z154, 0x014C, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x01, 0x05, Z154, __LINE__, 0x00, 0x00) /* 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 260401f..467a5fd 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 @@ Local0 = DerefOf (P000 [0x00]) If ((Local0 != 0x11112222)) { - ERR (__METHOD__, Z155, 0x34, 0x00, 0x00, Local0, 0x11112222) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x11112222) } - CH03 (__METHOD__, Z155, 0x01, 0x37, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } Method (M101, 0, Serialized) @@ -70,10 +70,10 @@ Local0 = DerefOf (B000 [0x00]) If ((Local0 != 0x67)) { - ERR (__METHOD__, Z155, 0x48, 0x00, 0x00, Local0, 0x67) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x67) } - CH03 (__METHOD__, Z155, 0x03, 0x4B, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } Method (M102, 0, Serialized) @@ -88,10 +88,10 @@ Local0 = DerefOf (S000 [0x00]) If ((Local0 != 0x38)) { - ERR (__METHOD__, Z155, 0x5C, 0x00, 0x00, Local0, 0x38) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x38) } - CH03 (__METHOD__, Z155, 0x05, 0x5F, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -113,7 +113,7 @@ 0x01, 0x22223333 }) - CH03 (__METHOD__, Z155, 0x06, 0x6C, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -170,16 +170,16 @@ Store ((DerefOf (PP00 [0x01]) + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z155, 0x9E, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local0 = DerefOf (PP00 [0x01]) If ((Local0 != 0x80000000)) { - ERR (__METHOD__, Z155, 0xA4, 0x00, 0x00, Local0, 0x80000000) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x80000000) } - CH03 (__METHOD__, Z155, 0x09, 0xA7, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -212,16 +212,16 @@ Store ((DerefOf (PP00 [0x01]) + M001 ()), Local0) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z155, 0xC3, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } Local0 = DerefOf (PP00 [0x01]) If ((Local0 != 0x00100064)) { - ERR (__METHOD__, Z155, 0xC9, 0x00, 0x00, Local0, 0x00100064) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x00100064) } - CH03 (__METHOD__, Z155, 0x0C, 0xCC, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -232,7 +232,7 @@ Name (I001, 0x00) Name (B000, Buffer (0x10){}) CreateField (B000, 0x05, 0x20, BF00) - CH03 (__METHOD__, Z155, 0x0D, 0xD9, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -290,7 +290,7 @@ Store ((BF00 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z155, 0x010E, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If (Arg0) @@ -304,10 +304,10 @@ If ((BF00 != Local1)) { - ERR (__METHOD__, Z155, 0x0118, 0x00, 0x00, BF00, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, BF00, Local1) } - CH03 (__METHOD__, Z155, 0x10, 0x011B, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -323,7 +323,7 @@ F001, 32 } - CH03 (__METHOD__, Z155, 0x11, 0x0128, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -381,7 +381,7 @@ Store ((F001 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z155, 0x015D, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If (Arg0) @@ -395,10 +395,10 @@ If ((F001 != Local1)) { - ERR (__METHOD__, Z155, 0x0167, 0x00, 0x00, F001, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, F001, Local1) } - CH03 (__METHOD__, Z155, 0x14, 0x016A, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -421,7 +421,7 @@ BNK0, 32 } - CH03 (__METHOD__, Z155, 0x15, 0x017A, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -479,7 +479,7 @@ Store ((BNK0 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z155, 0x01AF, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If (Arg0) @@ -493,10 +493,10 @@ If ((BNK0 != Local1)) { - ERR (__METHOD__, Z155, 0x01B9, 0x00, 0x00, BNK0, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, BNK0, Local1) } - CH03 (__METHOD__, Z155, 0x18, 0x01BC, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -519,7 +519,7 @@ IF00, 32 } - CH03 (__METHOD__, Z155, 0x19, 0x01CC, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -577,7 +577,7 @@ Store ((IF00 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z155, 0x0201, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If (Arg0) @@ -591,10 +591,10 @@ If ((IF00 != Local1)) { - ERR (__METHOD__, Z155, 0x020B, 0x00, 0x00, IF00, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, IF00, Local1) } - CH03 (__METHOD__, Z155, 0x1C, 0x020E, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -607,7 +607,7 @@ { 0x11, 0x01, 0x22 // .." }) - CH03 (__METHOD__, Z155, 0x1D, 0x021A, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -664,7 +664,7 @@ Store ((DerefOf (B000 [0x01]) + M001 ()), Local0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z155, 0x024C, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x24) } Local0 = DerefOf (B000 [0x01]) @@ -679,10 +679,10 @@ If ((Local0 != Local1)) { - ERR (__METHOD__, Z155, 0x0258, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, Local1) } - CH03 (__METHOD__, Z155, 0x20, 0x025B, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -692,7 +692,7 @@ { Name (I001, 0x00) Name (S000, "q\x01ertyuiop") - CH03 (__METHOD__, Z155, 0x21, 0x0267, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -749,7 +749,7 @@ Store ((DerefOf (S000 [0x01]) + M001 ()), Local0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z155, 0x0299, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x24) } Local0 = DerefOf (S000 [0x01]) @@ -764,10 +764,10 @@ If ((Local0 != Local1)) { - ERR (__METHOD__, Z155, 0x02A5, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, Local1) } - CH03 (__METHOD__, Z155, 0x24, 0x02A8, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } Method (N001, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl index 75a6f07..7264587 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 @@ Local0 = DerefOf (D000.P000 [0x00]) If ((Local0 != 0x11112222)) { - ERR (__METHOD__, Z156, 0x36, 0x00, 0x00, Local0, 0x11112222) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x11112222) } - CH03 (__METHOD__, Z156, 0x01, 0x39, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } Method (M201, 0, Serialized) @@ -76,10 +76,10 @@ Local0 = DerefOf (D000.B000 [0x00]) If ((Local0 != 0x67)) { - ERR (__METHOD__, Z156, 0x4D, 0x00, 0x00, Local0, 0x67) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x67) } - CH03 (__METHOD__, Z156, 0x03, 0x50, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } Method (M202, 0, Serialized) @@ -98,10 +98,10 @@ Local0 = DerefOf (D000.S000 [0x00]) If ((Local0 != 0x38)) { - ERR (__METHOD__, Z156, 0x64, 0x00, 0x00, Local0, 0x38) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x38) } - CH03 (__METHOD__, Z156, 0x05, 0x67, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } /* @@ -138,16 +138,16 @@ Store ((DerefOf (D000.PP00 [0x01]) + M001 ()), Local0) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z156, 0x86, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } Local0 = DerefOf (D000.PP00 [0x01]) If ((Local0 != 0x00100064)) { - ERR (__METHOD__, Z156, 0x8C, 0x00, 0x00, Local0, 0x00100064) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x00100064) } - CH03 (__METHOD__, Z156, 0x0C, 0x8F, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } Method (N002, 0, NotSerialized) 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 61ea925..bd5a581 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl @@ -51,7 +51,7 @@ }) } - CH03 (__METHOD__, Z156, 0x06, 0x2E, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -108,16 +108,16 @@ Store ((DerefOf (D000.PP00 [0x01]) + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z156, 0x60, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local0 = DerefOf (D000.PP00 [0x01]) If ((Local0 != 0x80000000)) { - ERR (__METHOD__, Z156, 0x66, 0x00, 0x00, Local0, 0x80000000) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x80000000) } - CH03 (__METHOD__, Z156, 0x09, 0x69, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } /* @@ -133,14 +133,14 @@ 0x03, 0x04 }) - CH03 (__METHOD__, Z156, 0x0D, 0x75, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) Device (D000) { Name (B000, Buffer (0x10){}) CreateField (B000, 0x05, 0x20, BF00) } - CH03 (__METHOD__, Z156, 0x0E, 0x7D, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) If (0x00) { CreateField (D000.B000, 0x05, 0x20, BF00) @@ -202,16 +202,16 @@ Store ((DerefOf (D000.BF00 [0x01]) + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z156, 0xB3, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local0 = DerefOf (D000.BF00 [0x01]) If ((Local0 != 0x80000000)) { - ERR (__METHOD__, Z156, 0xB9, 0x00, 0x00, Local0, 0x80000000) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x80000000) } - CH03 (__METHOD__, Z156, 0x11, 0xBC, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } Method (N102, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl index 8ef76b5..f0df5bd 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl @@ -49,7 +49,7 @@ Local0 = DerefOf (Arg0 [0x00]) If ((Local0 != 0x11112222)) { - ERR (__METHOD__, Z157, 0x33, 0x00, 0x00, Local0, 0x11112222) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x11112222) } } @@ -57,10 +57,10 @@ Local0 = DerefOf (P000 [0x00]) If ((Local0 != 0x11112222)) { - ERR (__METHOD__, Z157, 0x3C, 0x00, 0x00, Local0, 0x11112222) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x11112222) } - CH03 (__METHOD__, Z157, 0x02, 0x3F, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } Method (M301, 0, Serialized) @@ -80,7 +80,7 @@ Local0 = DerefOf (Arg0 [0x00]) If ((Local0 != 0x67)) { - ERR (__METHOD__, Z157, 0x53, 0x00, 0x00, Local0, 0x67) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x67) } } @@ -88,10 +88,10 @@ Local0 = DerefOf (B000 [0x00]) If ((Local0 != 0x67)) { - ERR (__METHOD__, Z157, 0x5C, 0x00, 0x00, Local0, 0x67) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x67) } - CH03 (__METHOD__, Z157, 0x05, 0x5F, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } Method (M302, 0, Serialized) @@ -108,7 +108,7 @@ Local0 = DerefOf (Arg0 [0x00]) If ((Local0 != 0x38)) { - ERR (__METHOD__, Z157, 0x72, 0x00, 0x00, Local0, 0x38) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x38) } } @@ -116,10 +116,10 @@ Local0 = DerefOf (S000 [0x00]) If ((Local0 != 0x38)) { - ERR (__METHOD__, Z157, 0x7B, 0x00, 0x00, Local0, 0x38) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x38) } - CH03 (__METHOD__, Z157, 0x08, 0x7E, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -143,7 +143,7 @@ 0x03, 0x04 }) - CH03 (__METHOD__, Z157, 0x09, 0x8E, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) I001 = Arg1 Method (M001, 1, NotSerialized) { @@ -200,32 +200,32 @@ Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0xC0, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = DerefOf (Arg0 [0x01]) If ((Local1 != 0x80000000)) { - ERR (__METHOD__, Z157, 0xC6, 0x00, 0x00, Local1, 0x80000000) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, 0x80000000) } - CH03 (__METHOD__, Z157, 0x0C, 0xC9, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } Local0 = M000 (PP00, Arg0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0xD1, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local0 = DerefOf (PP00 [0x01]) If ((Local0 != 0x80000000)) { - ERR (__METHOD__, Z157, 0xD7, 0x00, 0x00, Local0, 0x80000000) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x80000000) } - CH03 (__METHOD__, Z157, 0x0F, 0xDA, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -260,13 +260,13 @@ Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z157, 0xF7, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } Local1 = DerefOf (Arg0 [0x01]) If ((Local1 != 0x00100064)) { - ERR (__METHOD__, Z157, 0xFD, 0x00, 0x00, Local1, 0x00100064) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, 0x00100064) } Return (Local0) @@ -275,16 +275,16 @@ Local0 = M000 (PP00) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z157, 0x0105, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } Local1 = DerefOf (PP00 [0x01]) If ((Local1 != 0x00100064)) { - ERR (__METHOD__, Z157, 0x010B, 0x00, 0x00, Local1, 0x00100064) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, 0x00100064) } - CH03 (__METHOD__, Z157, 0x14, 0x010E, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -293,7 +293,7 @@ Method (M305, 0, Serialized) { Name (B000, Buffer (0x10){}) - CH03 (__METHOD__, Z157, 0x15, 0x0119, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) CreateField (B000, 0x05, 0x20, BF00) BF00 = 0xABCDEF70 Method (M000, 1, NotSerialized) @@ -349,32 +349,32 @@ Store ((Arg0 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x014D, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0x01 If ((Arg0 != Local1)) { - ERR (__METHOD__, Z157, 0x0153, 0x00, 0x00, Arg0, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } - CH03 (__METHOD__, Z157, 0x18, 0x0156, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } Local0 = M000 (BF00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x015E, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0xABCDEF70 If ((BF00 != Local1)) { - ERR (__METHOD__, Z157, 0x0164, 0x00, 0x00, BF00, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, BF00, Local1) } - CH03 (__METHOD__, Z157, 0x1B, 0x0167, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -390,7 +390,7 @@ F001, 32 } - CH03 (__METHOD__, Z157, 0x1C, 0x0174, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) F000 = 0xABCDEF70 Method (M000, 1, NotSerialized) { @@ -445,32 +445,32 @@ Store ((Arg0 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x01A7, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0x01 If ((Arg0 != Local1)) { - ERR (__METHOD__, Z157, 0x01AD, 0x00, 0x00, Arg0, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } - CH03 (__METHOD__, Z157, 0x1F, 0x01B0, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } Local0 = M000 (F000) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x01B8, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0xABCDEF70 If ((F000 != Local1)) { - ERR (__METHOD__, Z157, 0x01BE, 0x00, 0x00, F000, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, F000, Local1) } - CH03 (__METHOD__, Z157, 0x22, 0x01C1, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -491,7 +491,7 @@ BNK0, 32 } - CH03 (__METHOD__, Z157, 0x23, 0x01CF, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) BNK0 = 0xABCDEF70 Method (M000, 1, NotSerialized) { @@ -546,32 +546,32 @@ Store ((Arg0 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x0202, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0x01 If ((Arg0 != Local1)) { - ERR (__METHOD__, Z157, 0x0208, 0x00, 0x00, Arg0, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } - CH03 (__METHOD__, Z157, 0x26, 0x020B, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } Local0 = M000 (BNK0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x0213, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0xABCDEF70 If ((BNK0 != Local1)) { - ERR (__METHOD__, Z157, 0x0219, 0x00, 0x00, BNK0, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, BNK0, Local1) } - CH03 (__METHOD__, Z157, 0x29, 0x021C, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -592,7 +592,7 @@ IF00, 32 } - CH03 (__METHOD__, Z157, 0x2A, 0x022A, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) IF00 = 0xABCDEF70 Method (M000, 1, NotSerialized) { @@ -647,32 +647,32 @@ Store ((Arg0 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x025D, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0x01 If ((Arg0 != Local1)) { - ERR (__METHOD__, Z157, 0x0263, 0x00, 0x00, Arg0, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } - CH03 (__METHOD__, Z157, 0x2D, 0x0266, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } Local0 = M000 (IF00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x026E, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0xABCDEF70 If ((IF00 != Local1)) { - ERR (__METHOD__, Z157, 0x0274, 0x00, 0x00, IF00, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, IF00, Local1) } - CH03 (__METHOD__, Z157, 0x30, 0x0277, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -685,7 +685,7 @@ { 0x11, 0x01, 0x22 // .." }) - CH03 (__METHOD__, Z157, 0x31, 0x0283, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M000, 2, NotSerialized) { @@ -744,7 +744,7 @@ Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z157, 0x02B7, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x24) } Local1 = DerefOf (Arg0 [0x01]) @@ -759,17 +759,17 @@ If ((Local1 != Local2)) { - ERR (__METHOD__, Z157, 0x02C3, 0x00, 0x00, Local1, Local2) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } - CH03 (__METHOD__, Z157, 0x34, 0x02C6, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } Local0 = M000 (B000, Arg0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z157, 0x02CE, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x24) } Local1 = DerefOf (B000 [0x01]) @@ -784,10 +784,10 @@ If ((Local1 != Local2)) { - ERR (__METHOD__, Z157, 0x02DA, 0x00, 0x00, Local1, Local2) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } - CH03 (__METHOD__, Z157, 0x37, 0x02DD, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -797,7 +797,7 @@ { Name (I001, 0x00) Name (S000, "q\x01ertyuiop") - CH03 (__METHOD__, Z157, 0x38, 0x02E9, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M000, 2, NotSerialized) { @@ -856,7 +856,7 @@ Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z157, 0x031D, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x24) } Local1 = DerefOf (Arg0 [0x01]) @@ -871,17 +871,17 @@ If ((Local1 != Local2)) { - ERR (__METHOD__, Z157, 0x0329, 0x00, 0x00, Local1, Local2) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } - CH03 (__METHOD__, Z157, 0x3B, 0x032C, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } Local0 = M000 (S000, Arg0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z157, 0x0334, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x24) } Local1 = DerefOf (S000 [0x01]) @@ -896,10 +896,10 @@ If ((Local1 != Local2)) { - ERR (__METHOD__, Z157, 0x0340, 0x00, 0x00, Local1, Local2) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } - CH03 (__METHOD__, Z157, 0x3E, 0x0343, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -912,7 +912,7 @@ Name (I001, 0x00) Name (B000, Buffer (0x10){}) I001 = Arg0 - CH03 (__METHOD__, Z157, 0x3F, 0x0353, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Method (M000, 2, NotSerialized) { CreateField (B000, 0x05, 0x20, BF00) @@ -972,7 +972,7 @@ Store ((BF00 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x038A, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If (Arg1) @@ -986,20 +986,20 @@ If ((BF00 != Local1)) { - ERR (__METHOD__, Z157, 0x0394, 0x00, 0x00, BF00, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, BF00, Local1) } - CH03 (__METHOD__, Z157, 0x42, 0x0397, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } Local0 = M000 (0x00, Arg0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x039F, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } - CH03 (__METHOD__, Z157, 0x44, 0x03A2, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } Method (N003, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl index c9cbbda..d4d28bd 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 @@ 0x03, 0x04 }) - CH03 (__METHOD__, Z158, 0x00, 0x2F, 0x00) + CH03 (__METHOD__, Z158, __LINE__, 0x00, 0x00) I001 = Arg0 Method (MADD, 2, NotSerialized) { @@ -107,15 +107,15 @@ Local0 = MADD (I000, M001 ()) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z158, 0x67, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z158, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((I000 != 0x80000000)) { - ERR (__METHOD__, Z158, 0x6B, 0x00, 0x00, I000, 0x80000000) + ERR (__METHOD__, Z158, __LINE__, 0x00, 0x00, I000, 0x80000000) } - CH03 (__METHOD__, Z158, 0x03, 0x6E, 0x00) + CH03 (__METHOD__, Z158, __LINE__, 0x00, 0x00) } Method (N004, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl index f66fd9c..2106fa2 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl @@ -9,14 +9,14 @@ I000 = 0x11223344 If ((Arg0 != 0xABCD0000)) { - ERR (__METHOD__, Z160, 0x0D, 0x00, 0x00, Arg0, 0xABCD0000) + ERR (__METHOD__, Z160, __LINE__, 0x00, 0x00, Arg0, 0xABCD0000) } } M000 (I000) If ((I000 != 0x11223344)) { - ERR (__METHOD__, Z160, 0x14, 0x00, 0x00, I000, 0x11223344) + ERR (__METHOD__, Z160, __LINE__, 0x00, 0x00, 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 333e02b..e2e8dc5 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/scope.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/scope.asl @@ -39,9 +39,9 @@ } } - CH03 (__METHOD__, Z178, 0x44, 0x2C, 0x00) + CH03 (__METHOD__, Z178, __LINE__, 0x00, 0x00) M000 (0x00) - CH03 (__METHOD__, Z178, 0x45, 0x2E, 0x00) + CH03 (__METHOD__, Z178, __LINE__, 0x00, 0x00) } Method (SCP0, 0, NotSerialized) 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 41ef2ea..8e0bcd5 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl @@ -1102,11 +1102,11 @@ Local1 = ObjectType (Arg3) If ((Local0 != Local1)) { - ERR (Concatenate (Arg0, "-OType"), Z084, 0x0313, 0x00, 0x00, Local0, Local1) + ERR (Concatenate (Arg0, "-OType"), Z084, __LINE__, 0x00, 0x00, Local0, Local1) } ElseIf ((Arg2 != Arg3)) { - ERR (Arg0, Z084, 0x0315, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } @@ -1219,7 +1219,7 @@ } Default { - ERR (TERR, Z084, 0x0369, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -1276,7 +1276,7 @@ } Default { - ERR (TERR, Z084, 0x0391, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -1352,7 +1352,7 @@ } Default { - ERR (TERR, Z084, 0x03B3, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -1386,14 +1386,14 @@ } Default { - ERR (TERR, Z084, 0x03BF, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } } Default { - ERR (TERR, Z084, 0x03C4, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -1789,7 +1789,7 @@ } Default { - ERR (TERR, Z084, 0x04BD, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -1978,7 +1978,7 @@ } Default { - ERR (TERR, Z084, 0x0532, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -2135,7 +2135,7 @@ } Default { - ERR (TERR, Z084, 0x0593, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -2164,21 +2164,21 @@ } Default { - ERR (TERR, Z084, 0x05A4, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } } Default { - ERR (TERR, Z084, 0x05A9, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } } Else { - ERR (TERR, Z084, 0x05AD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } Return (Local0) @@ -2217,14 +2217,14 @@ } Default { - ERR (TERR, Z084, 0x05C9, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Else { - ERR (TERR, Z084, 0x05CD, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } Case (0x02) @@ -2250,14 +2250,14 @@ } Default { - ERR (TERR, Z084, 0x05DE, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Else { - ERR (TERR, Z084, 0x05E2, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } Case (0x03) @@ -2283,14 +2283,14 @@ } Default { - ERR (TERR, Z084, 0x05F3, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Else { - ERR (TERR, Z084, 0x05F7, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } Case (0x04) @@ -2316,19 +2316,19 @@ } Default { - ERR (TERR, Z084, 0x0608, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Else { - ERR (TERR, Z084, 0x060C, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } Default { - ERR (TERR, Z084, 0x0610, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -2351,7 +2351,7 @@ If (Arg3) { - ERR (TERR, Z084, 0x0620, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } Switch (ToInteger (Arg1)) @@ -2388,7 +2388,7 @@ } Default { - ERR (TERR, Z084, 0x0638, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -2449,7 +2449,7 @@ } Default { - ERR (TERR, Z084, 0x0663, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -2541,14 +2541,14 @@ } Default { - ERR (TERR, Z084, 0x068D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Default { - ERR (TERR, Z084, 0x0692, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -2584,7 +2584,7 @@ } Default { - ERR (TERR, Z084, 0x06A7, 0x00, 0x00, Arg2, Arg3) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } @@ -2608,21 +2608,21 @@ } Default { - ERR (TERR, Z084, 0x06B8, 0x00, 0x00, Arg2, Arg3) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } } Default { - ERR (TERR, Z084, 0x06BD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Default { - ERR (TERR, Z084, 0x06C2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -2656,14 +2656,14 @@ } Default { - ERR (TERR, Z084, 0x06D6, 0x00, 0x00, Arg2, Arg3) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } } Else { - ERR (TERR, Z084, 0x06DA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } Case (0x02) @@ -2689,14 +2689,14 @@ } Default { - ERR (TERR, Z084, 0x06EB, 0x00, 0x00, Arg2, Arg3) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } } Else { - ERR (TERR, Z084, 0x06EF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } Case (0x03) @@ -2722,26 +2722,26 @@ } Default { - ERR (TERR, Z084, 0x0700, 0x00, 0x00, Arg2, Arg3) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } } Else { - ERR (TERR, Z084, 0x0704, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } Default { - ERR (TERR, Z084, 0x0708, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Default { - ERR (TERR, Z084, 0x070D, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } 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 a5a64e7..fd9b5f3 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 @@ -9983,13 +9983,13 @@ } Else { - CH03 (Arg0, Z121, 0x00, 0x2E2A, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [Arg1], Local3) - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E2D, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [Arg1], Local3) - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E30, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [Arg1], Local3) - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E33, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10039,13 +10039,13 @@ } Else { - CH03 (Arg0, Z121, 0x00, 0x2E6E, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [Arg1] - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E71, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [Arg1] - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E74, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [Arg1] - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E77, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10120,7 +10120,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 4, NotSerialized) { - CH03 (Arg0, Z121, 0x00, 0x2EC8, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, Arg1) If (F64) { @@ -10131,7 +10131,7 @@ Fatal (0xFF, 0xFFFFFFFF, Arg3) } - CH03 (Arg0, Z121, 0x01, 0x2ECF, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -10711,29 +10711,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 3, NotSerialized) { - CH03 (Arg0, Z121, 0x02, 0x3143, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (Arg1) - CH03 (Arg0, Z121, 0x03, 0x314A, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x314F, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (Arg2) - CH03 (Arg0, Z121, 0x04, 0x3157, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z121, 0x315C, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10743,17 +10743,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z121, 0x05, 0x3167, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, arg1) */ - CH03 (Arg0, Z121, 0x06, 0x316E, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x3173, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10762,15 +10762,15 @@ Method (M033, 2, Serialized) { Event (EVT0) - CH03 (Arg0, Z121, 0x07, 0x317D, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, Arg1) - CH03 (Arg0, Z121, 0x08, 0x3182, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x3187, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20151,7 +20151,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 3, NotSerialized) { - CH03 (Arg0, Z121, 0x09, 0x5B70, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, Arg1) If (F64) { @@ -20162,7 +20162,7 @@ Fatal (0xFF, 0xFFFFFFFF, Arg2) } - CH03 (Arg0, Z121, 0x0A, 0x5B77, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -20742,29 +20742,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 3, NotSerialized) { - CH03 (Arg0, Z121, 0x0B, 0x5DEB, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (Arg1) - CH03 (Arg0, Z121, 0x0C, 0x5DF2, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x5DF7, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (Arg2) - CH03 (Arg0, Z121, 0x0D, 0x5DFF, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z121, 0x5E04, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -20774,17 +20774,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z121, 0x0E, 0x5E10, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, arg1) */ - CH03 (Arg0, Z121, 0x0F, 0x5E17, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x5E1C, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20793,15 +20793,15 @@ Method (M06D, 2, Serialized) { Event (EVT0) - CH03 (Arg0, Z121, 0x10, 0x5E26, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, Arg1) - CH03 (Arg0, Z121, 0x11, 0x5E2B, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x5E30, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, 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 87cd56b..91d6cc9 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 @@ -10869,13 +10869,13 @@ } Else { - CH03 (Arg0, Z085, 0x00, 0x2FE8, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) ["B"], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x2FEB, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) ["B"], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x2FEE, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) ["B"], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x2FF1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10925,13 +10925,13 @@ } Else { - CH03 (Arg0, Z085, 0x00, 0x302D, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) ["B"] - CH04 (Arg0, 0x00, 0x55, Z085, 0x3030, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) ["B"] - CH04 (Arg0, 0x00, 0x55, Z085, 0x3033, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) ["B"] - CH04 (Arg0, 0x00, 0x55, Z085, 0x3036, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -11006,7 +11006,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z085, 0x00, 0x3088, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, "0321") If (F64) { @@ -11017,7 +11017,7 @@ Fatal (0xFF, 0xFFFFFFFF, "C179B3FE") } - CH03 (Arg0, Z085, 0x01, 0x308F, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -11686,29 +11686,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z085, 0x02, 0x3349, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep ("0321") - CH03 (Arg0, Z085, 0x03, 0x3350, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x3355, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall ("63") - CH03 (Arg0, Z085, 0x04, 0x335D, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z085, 0x3362, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -11718,17 +11718,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z085, 0x05, 0x336D, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, "0321") */ - CH03 (Arg0, Z085, 0x06, 0x3374, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x3379, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -11737,15 +11737,15 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z085, 0x07, 0x3383, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, "0321") - CH03 (Arg0, Z085, 0x08, 0x3388, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x338D, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -30669,22 +30669,22 @@ } Else { - CH03 (Arg0, Z085, 0x00, 0x5E8A, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [Buffer (0x01) { 0x0B // . }], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x5E8D, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [Buffer (0x01) { 0x0B // . }], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x5E90, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [Buffer (0x01) { 0x0B // . }], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x5E93, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -30779,22 +30779,22 @@ } Else { - CH03 (Arg0, Z085, 0x00, 0x5ECE, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [Buffer (0x01) { 0x0B // . }] - CH04 (Arg0, 0x00, 0x55, Z085, 0x5ED1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [Buffer (0x01) { 0x0B // . }] - CH04 (Arg0, 0x00, 0x55, Z085, 0x5ED4, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [Buffer (0x01) { 0x0B // . }] - CH04 (Arg0, 0x00, 0x55, Z085, 0x5ED7, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -30923,7 +30923,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z085, 0x09, 0x5F28, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, Buffer (0x03) { 0x21, 0x03, 0x00 // !.. @@ -30945,7 +30945,7 @@ }) } - CH03 (Arg0, Z085, 0x0A, 0x5F2F, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -32360,7 +32360,7 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z085, 0x0B, 0x61C9, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer @@ -32368,12 +32368,12 @@ { 0x21, 0x03, 0x00 // !.. }) - CH03 (Arg0, Z085, 0x0C, 0x61D0, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x61D5, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -32383,12 +32383,12 @@ { 0x3F // ? }) - CH03 (Arg0, Z085, 0x0D, 0x61DD, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z085, 0x61E2, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -32398,17 +32398,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z085, 0x0E, 0x61EE, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Buffer(3){0x21, 0x03, 0x00}) */ - CH03 (Arg0, Z085, 0x0F, 0x61F5, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x61FA, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -32417,18 +32417,18 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z085, 0x10, 0x6204, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, Buffer (0x03) { 0x21, 0x03, 0x00 // !.. }) - CH03 (Arg0, Z085, 0x11, 0x6209, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x620E, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, 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 35a29f8..3dbb4d0 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 @@ -10108,13 +10108,13 @@ } Else { - CH03 (Arg0, Z117, 0x00, 0x2EED, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [Local1], Local5) - CH04 (Arg0, 0x00, 0x55, Z117, 0x2EF0, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [Local1], Local5) - CH04 (Arg0, 0x00, 0x55, Z117, 0x2EF3, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [Local1], Local5) - CH04 (Arg0, 0x00, 0x55, Z117, 0x2EF6, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10164,13 +10164,13 @@ } Else { - CH03 (Arg0, Z117, 0x00, 0x2F31, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [Local1] - CH04 (Arg0, 0x00, 0x55, Z117, 0x2F34, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [Local1] - CH04 (Arg0, 0x00, 0x55, Z117, 0x2F37, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [Local1] - CH04 (Arg0, 0x00, 0x55, Z117, 0x2F3A, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10248,7 +10248,7 @@ Local1 = "0321" Local2 = "FE7CB391D650A284" Local3 = "C179B3FE" - CH03 (Arg0, Z117, 0x00, 0x2F8F, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, Local1) If (F64) { @@ -10259,7 +10259,7 @@ Fatal (0xFF, 0xFFFFFFFF, Local3) } - CH03 (Arg0, Z117, 0x01, 0x2F96, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -10847,29 +10847,29 @@ { Local3 = "0321" Local4 = "63" - CH03 (Arg0, Z117, 0x02, 0x3217, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (Local3) - CH03 (Arg0, Z117, 0x03, 0x321E, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x3223, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (Local4) - CH03 (Arg0, Z117, 0x04, 0x322B, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z117, 0x3230, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10880,17 +10880,17 @@ Local3 = "0321" Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z117, 0x05, 0x323D, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Local3) */ - CH03 (Arg0, Z117, 0x06, 0x3244, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x3249, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10900,15 +10900,15 @@ { Local1 = "0321" Event (EVT0) - CH03 (Arg0, Z117, 0x07, 0x3255, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, Local1) - CH03 (Arg0, Z117, 0x08, 0x325A, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x325F, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20453,7 +20453,7 @@ /* 0000 */ 0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, // ..P...|. /* 0008 */ 0xA5 // . } - CH03 (Arg0, Z117, 0x09, 0x5CD9, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, Local1) If (F64) { @@ -20464,7 +20464,7 @@ Fatal (0xFF, 0xFFFFFFFF, Local2) } - CH03 (Arg0, Z117, 0x0A, 0x5CE0, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -21078,29 +21078,29 @@ { 0x3F // ? } - CH03 (Arg0, Z117, 0x0B, 0x5F61, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (Local3) - CH03 (Arg0, Z117, 0x0C, 0x5F68, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x5F6D, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (Local4) - CH03 (Arg0, Z117, 0x0D, 0x5F75, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z117, 0x5F7A, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -21114,17 +21114,17 @@ } Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z117, 0x0E, 0x5F88, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Local3) */ - CH03 (Arg0, Z117, 0x0F, 0x5F8F, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x5F94, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -21137,15 +21137,15 @@ 0x21, 0x03, 0x00 // !.. } Event (EVT0) - CH03 (Arg0, Z117, 0x10, 0x5FA0, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, Local1) - CH03 (Arg0, Z117, 0x11, 0x5FA5, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x5FAA, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, 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 b6b748e..6c75126 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 @@ -9984,13 +9984,13 @@ } Else { - CH03 (Arg0, Z086, 0x00, 0x2E2C, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E2F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E32, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E35, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10040,13 +10040,13 @@ } Else { - CH03 (Arg0, Z086, 0x00, 0x2E70, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [S614] /* \S614 */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E73, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [S614] /* \S614 */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E76, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [S614] /* \S614 */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E79, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10121,7 +10121,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z086, 0x00, 0x2ECA, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, S601) If (F64) { @@ -10132,7 +10132,7 @@ Fatal (0xFF, 0xFFFFFFFF, S604) } - CH03 (Arg0, Z086, 0x01, 0x2ED1, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -10712,29 +10712,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z086, 0x02, 0x3145, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (S601) - CH03 (Arg0, Z086, 0x03, 0x314C, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x3151, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (S61B) - CH03 (Arg0, Z086, 0x04, 0x3159, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z086, 0x315E, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10744,17 +10744,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z086, 0x05, 0x3169, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, s601) */ - CH03 (Arg0, Z086, 0x06, 0x3170, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x3175, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10763,15 +10763,15 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z086, 0x07, 0x317F, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, S601) - CH03 (Arg0, Z086, 0x08, 0x3184, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x3189, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -19730,13 +19730,13 @@ } Else { - CH03 (Arg0, Z086, 0x00, 0x5AC9, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x5ACC, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x5ACF, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x5AD2, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -19786,13 +19786,13 @@ } Else { - CH03 (Arg0, Z086, 0x00, 0x5B0D, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [B60E] /* \B60E */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x5B10, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [B60E] /* \B60E */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x5B13, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [B60E] /* \B60E */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x5B16, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -19867,7 +19867,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z086, 0x09, 0x5B67, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, B606) If (F64) { @@ -19878,7 +19878,7 @@ Fatal (0xFF, 0xFFFFFFFF, B60A) } - CH03 (Arg0, Z086, 0x0A, 0x5B6E, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -20458,29 +20458,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z086, 0x0B, 0x5DE2, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (B606) - CH03 (Arg0, Z086, 0x0C, 0x5DE9, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x5DEE, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (B613) - CH03 (Arg0, Z086, 0x0D, 0x5DF6, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z086, 0x5DFB, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -20490,17 +20490,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z086, 0x0E, 0x5E07, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, b606) */ - CH03 (Arg0, Z086, 0x0F, 0x5E0E, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x5E13, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20509,15 +20509,15 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z086, 0x10, 0x5E1D, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, B606) - CH03 (Arg0, Z086, 0x11, 0x5E22, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x5E27, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, 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 865dc21..1416b35 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 @@ -9365,13 +9365,13 @@ } Else { - CH03 (Arg0, Z087, 0x00, 0x2B41, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B44, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B47, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B4A, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -9421,13 +9421,13 @@ } Else { - CH03 (Arg0, Z087, 0x00, 0x2B85, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [BF74] /* \BF74 */ - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B88, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [BF74] /* \BF74 */ - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B8B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [BF74] /* \BF74 */ - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B8E, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -9502,7 +9502,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z087, 0x00, 0x2BDF, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, BF61) If (F64) { @@ -9513,7 +9513,7 @@ Fatal (0xFF, 0xFFFFFFFF, BF65) } - CH03 (Arg0, Z087, 0x01, 0x2BE6, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) } /* Buffer Field to Integer conversion of the Buffer Field Index */ @@ -10091,29 +10091,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z087, 0x02, 0x2E56, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (BF61) - CH03 (Arg0, Z087, 0x03, 0x2E5D, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z087, 0x2E62, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z087, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (BF75) - CH03 (Arg0, Z087, 0x04, 0x2E6A, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z087, 0x2E6F, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z087, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10123,17 +10123,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z087, 0x05, 0x2E7B, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, bf61) */ - CH03 (Arg0, Z087, 0x06, 0x2E82, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z087, 0x2E87, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z087, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10142,15 +10142,15 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z087, 0x07, 0x2E91, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, BF61) - CH03 (Arg0, Z087, 0x08, 0x2E96, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z087, 0x2E9B, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z087, __LINE__, 0x00, 0x00, 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 ebeba53..5c70106 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 @@ -10110,13 +10110,13 @@ } Else { - CH03 (Arg0, Z088, 0x00, 0x2EEF, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x2EF2, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x2EF5, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x2EF8, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10166,13 +10166,13 @@ } Else { - CH03 (Arg0, Z088, 0x00, 0x2F33, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [S614] /* \M613.M02D.S614 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2F36, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [S614] /* \M613.M02D.S614 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2F39, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [S614] /* \M613.M02D.S614 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2F3C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10250,7 +10250,7 @@ Name (S601, "0321") Name (S604, "C179B3FE") Name (S605, "FE7CB391D650A284") - CH03 (Arg0, Z088, 0x00, 0x2F91, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, S601) If (F64) { @@ -10261,7 +10261,7 @@ Fatal (0xFF, 0xFFFFFFFF, S604) } - CH03 (Arg0, Z088, 0x01, 0x2F98, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -10849,29 +10849,29 @@ { Name (S601, "0321") Name (S61B, "63") - CH03 (Arg0, Z088, 0x02, 0x3219, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (S601) - CH03 (Arg0, Z088, 0x03, 0x3220, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x3225, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (S61B) - CH03 (Arg0, Z088, 0x04, 0x322D, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z088, 0x3232, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10882,17 +10882,17 @@ Name (S601, "0321") Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z088, 0x05, 0x323F, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, s601) */ - CH03 (Arg0, Z088, 0x06, 0x3246, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x324B, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10902,15 +10902,15 @@ { Name (S601, "0321") Event (EVT0) - CH03 (Arg0, Z088, 0x07, 0x3257, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, S601) - CH03 (Arg0, Z088, 0x08, 0x325C, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x3261, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20323,13 +20323,13 @@ } Else { - CH03 (Arg0, Z088, 0x00, 0x5C4F, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C52, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C55, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C58, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -20379,13 +20379,13 @@ } Else { - CH03 (Arg0, Z088, 0x00, 0x5C93, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [B60E] /* \M613.M067.B60E */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C96, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [B60E] /* \M613.M067.B60E */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C99, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [B60E] /* \M613.M067.B60E */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C9C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -20469,7 +20469,7 @@ /* 0000 */ 0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, // ..P...|. /* 0008 */ 0xA5 // . }) - CH03 (Arg0, Z088, 0x09, 0x5CF0, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, B606) If (F64) { @@ -20480,7 +20480,7 @@ Fatal (0xFF, 0xFFFFFFFF, B60A) } - CH03 (Arg0, Z088, 0x0A, 0x5CF7, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -21094,29 +21094,29 @@ { 0x3F // ? }) - CH03 (Arg0, Z088, 0x0B, 0x5F78, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (B606) - CH03 (Arg0, Z088, 0x0C, 0x5F7F, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x5F84, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (B613) - CH03 (Arg0, Z088, 0x0D, 0x5F8C, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z088, 0x5F91, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -21130,17 +21130,17 @@ }) Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z088, 0x0E, 0x5F9F, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, b606) */ - CH03 (Arg0, Z088, 0x0F, 0x5FA6, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x5FAB, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -21153,15 +21153,15 @@ 0x21, 0x03, 0x00 // !.. }) Event (EVT0) - CH03 (Arg0, Z088, 0x10, 0x5FB7, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, B606) - CH03 (Arg0, Z088, 0x11, 0x5FBC, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x5FC1, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, 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 7db9e0a..596fc4a 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 @@ -9952,13 +9952,13 @@ } Else { - CH03 (Arg0, Z089, 0x00, 0x2CBE, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z089, 0x2CC1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z089, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z089, 0x2CC4, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z089, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z089, 0x2CC7, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z089, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10008,13 +10008,13 @@ } Else { - CH03 (Arg0, Z088, 0x00, 0x2D02, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [BF74] /* \M614.M067.BF74 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2D05, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [BF74] /* \M614.M067.BF74 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2D08, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [BF74] /* \M614.M067.BF74 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2D0B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10099,7 +10099,7 @@ { 0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE // ..P...|. } - CH03 (Arg0, Z089, 0x00, 0x2D62, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, BF61) If (F64) { @@ -10110,7 +10110,7 @@ Fatal (0xFF, 0xFFFFFFFF, BF65) } - CH03 (Arg0, Z089, 0x01, 0x2D69, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) } /* Buffer Field to Integer conversion of the Buffer Field Index */ @@ -10713,29 +10713,29 @@ 0x21, 0x03, 0x00 // !.. } BF75 = 0x3F - CH03 (Arg0, Z089, 0x02, 0x2FF3, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (BF61) - CH03 (Arg0, Z089, 0x03, 0x2FFA, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z089, 0x2FFF, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z089, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (BF75) - CH03 (Arg0, Z089, 0x04, 0x3007, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z089, 0x300C, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z089, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10750,17 +10750,17 @@ } Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z089, 0x05, 0x301C, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, bf61) */ - CH03 (Arg0, Z089, 0x06, 0x3023, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z089, 0x3028, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z089, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10774,15 +10774,15 @@ 0x21, 0x03, 0x00 // !.. } Event (EVT0) - CH03 (Arg0, Z089, 0x07, 0x3036, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, BF61) - CH03 (Arg0, Z089, 0x08, 0x303B, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z089, 0x3040, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z089, __LINE__, 0x00, 0x00, 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 2057358..98ddef5 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 @@ -10677,13 +10677,13 @@ } Else { - CH03 (Arg0, Z090, 0x00, 0x2E2C, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (PS60 [0x14])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E2F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (PS60 [0x14])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E32, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (PS60 [0x14])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E35, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10736,13 +10736,13 @@ } Else { - CH03 (Arg0, Z090, 0x00, 0x2E70, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (PS60 [0x14])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E73, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (PS60 [0x14])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E76, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (PS60 [0x14])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E79, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10823,7 +10823,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z090, 0x00, 0x2ECA, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (PS60 [0x01])) If (F64) { @@ -10834,7 +10834,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (PS60 [0x04])) } - CH03 (Arg0, Z090, 0x01, 0x2ED1, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -11520,29 +11520,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z090, 0x02, 0x3145, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (PS60 [0x01])) - CH03 (Arg0, Z090, 0x03, 0x314C, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x3151, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (DerefOf (PS60 [0x1B])) - CH03 (Arg0, Z090, 0x04, 0x3159, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z090, 0x315E, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -11552,17 +11552,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z090, 0x05, 0x3169, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Index(ps60, 1))) */ - CH03 (Arg0, Z090, 0x06, 0x3170, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x3175, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -11571,15 +11571,15 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z090, 0x07, 0x317F, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (PS60 [0x01])) - CH03 (Arg0, Z090, 0x08, 0x3184, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x3189, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -21117,13 +21117,13 @@ } Else { - CH03 (Arg0, Z090, 0x00, 0x5AC9, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (PB60 [0x0E])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x5ACC, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (PB60 [0x0E])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x5ACF, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (PB60 [0x0E])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x5AD2, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -21176,13 +21176,13 @@ } Else { - CH03 (Arg0, Z090, 0x00, 0x5B0D, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (PB60 [0x0E])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x5B10, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (PB60 [0x0E])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x5B13, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (PB60 [0x0E])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x5B16, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -21263,7 +21263,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z090, 0x09, 0x5B67, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (PB60 [0x06])) If (F64) { @@ -21274,7 +21274,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (PB60 [0x0A])) } - CH03 (Arg0, Z090, 0x0A, 0x5B6E, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -21960,29 +21960,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z090, 0x0B, 0x5DE2, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (PB60 [0x06])) - CH03 (Arg0, Z090, 0x0C, 0x5DE9, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x5DEE, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (DerefOf (PB60 [0x13])) - CH03 (Arg0, Z090, 0x0D, 0x5DF6, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z090, 0x5DFB, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -21992,17 +21992,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z090, 0x0E, 0x5E07, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Index(pb60, 6))) */ - CH03 (Arg0, Z090, 0x0F, 0x5E0E, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x5E13, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -22011,15 +22011,15 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z090, 0x10, 0x5E1D, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (PB60 [0x06])) - CH03 (Arg0, Z090, 0x11, 0x5E22, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x5E27, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, 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 1ff194a..4fd60f3 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 @@ -9996,13 +9996,13 @@ } Else { - CH03 (Arg0, Z091, 0x00, 0x2E2C, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (RefOf (S614))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E2F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (RefOf (S614))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E32, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (RefOf (S614))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E35, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10052,13 +10052,13 @@ } Else { - CH03 (Arg0, Z091, 0x00, 0x2E70, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (RefOf (S614))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E73, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (RefOf (S614))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E76, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (RefOf (S614))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E79, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10133,7 +10133,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z091, 0x00, 0x2ECA, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (S601))) If (F64) { @@ -10144,7 +10144,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (S604))) } - CH03 (Arg0, Z091, 0x01, 0x2ED1, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -10770,29 +10770,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z091, 0x02, 0x3145, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (RefOf (S601))) - CH03 (Arg0, Z091, 0x03, 0x314C, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x3151, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (DerefOf (RefOf (S61B))) - CH03 (Arg0, Z091, 0x04, 0x3159, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z091, 0x315E, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10802,17 +10802,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z091, 0x05, 0x3169, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Refof(s601))) */ - CH03 (Arg0, Z091, 0x06, 0x3170, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x3175, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10821,15 +10821,15 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z091, 0x07, 0x317F, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (RefOf (S601))) - CH03 (Arg0, Z091, 0x08, 0x3184, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x3189, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -19788,13 +19788,13 @@ } Else { - CH03 (Arg0, Z091, 0x00, 0x5AC9, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (RefOf (B60E))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x5ACC, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (RefOf (B60E))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x5ACF, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (RefOf (B60E))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x5AD2, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -19844,13 +19844,13 @@ } Else { - CH03 (Arg0, Z091, 0x00, 0x5B0D, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (RefOf (B60E))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x5B10, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (RefOf (B60E))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x5B13, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (RefOf (B60E))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x5B16, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -19925,7 +19925,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z091, 0x09, 0x5B67, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (B606))) If (F64) { @@ -19936,7 +19936,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (B60A))) } - CH03 (Arg0, Z091, 0x0A, 0x5B6E, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -20562,29 +20562,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z091, 0x0B, 0x5DE2, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (RefOf (B606))) - CH03 (Arg0, Z091, 0x0C, 0x5DE9, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x5DEE, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (DerefOf (RefOf (B613))) - CH03 (Arg0, Z091, 0x0D, 0x5DF6, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z091, 0x5DFB, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -20594,17 +20594,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z091, 0x0E, 0x5E07, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Refof(b606))) */ - CH03 (Arg0, Z091, 0x0F, 0x5E0E, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x5E13, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20613,15 +20613,15 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z091, 0x10, 0x5E1D, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (RefOf (B606))) - CH03 (Arg0, Z091, 0x11, 0x5E22, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x5E27, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, 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 474663f..53cf457 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 @@ -9373,13 +9373,13 @@ } Else { - CH03 (Arg0, Z120, 0x00, 0x2B33, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (RefOf (BF74))], Local3) - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B36, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (RefOf (BF74))], Local3) - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B39, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (RefOf (BF74))], Local3) - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B3C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -9429,13 +9429,13 @@ } Else { - CH03 (Arg0, Z120, 0x00, 0x2B77, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (RefOf (BF74))] - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B7A, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (RefOf (BF74))] - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B7D, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (RefOf (BF74))] - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B80, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -9510,7 +9510,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z120, 0x00, 0x2BD1, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (BF61))) If (F64) { @@ -9521,7 +9521,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (BF65))) } - CH03 (Arg0, Z120, 0x01, 0x2BD8, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) } /* Buffer Field to Integer conversion of the Buffer Field Index */ @@ -10145,29 +10145,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z120, 0x02, 0x2E48, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (RefOf (BF61))) - CH03 (Arg0, Z120, 0x03, 0x2E4F, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z120, 0x2E54, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z120, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (DerefOf (RefOf (BF75))) - CH03 (Arg0, Z120, 0x04, 0x2E5C, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z120, 0x2E61, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z120, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10177,17 +10177,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z120, 0x05, 0x2E6D, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Refof(bf61))) */ - CH03 (Arg0, Z120, 0x06, 0x2E74, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z120, 0x2E79, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z120, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10196,15 +10196,15 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z120, 0x07, 0x2E83, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (RefOf (BF61))) - CH03 (Arg0, Z120, 0x08, 0x2E88, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z120, 0x2E8D, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z120, __LINE__, 0x00, 0x00, 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 a33ea48..e8ced69 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 @@ -11500,16 +11500,16 @@ } Else { - CH03 (Arg0, Z119, 0x00, 0x2E2D, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E30, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E33, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E36, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -11565,13 +11565,13 @@ } Else { - CH03 (Arg0, Z119, 0x00, 0x2E71, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E74, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E77, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E7A, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -11661,7 +11661,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z119, 0x00, 0x2ECB, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (M604 (0x02, 0x02, 0x01, 0x01))) If (F64) { @@ -11672,7 +11672,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (M604 (0x02, 0x02, 0x04, 0x01))) } - CH03 (Arg0, Z119, 0x01, 0x2ED2, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -12358,29 +12358,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z119, 0x02, 0x3146, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (M604 (0x02, 0x02, 0x01, 0x01))) - CH03 (Arg0, Z119, 0x03, 0x314D, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x3152, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (DerefOf (M604 (0x02, 0x02, 0x1B, 0x01))) - CH03 (Arg0, Z119, 0x04, 0x315A, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z119, 0x315F, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -12390,17 +12390,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z119, 0x05, 0x316A, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(m604(2, 2, 1, 1))) */ - CH03 (Arg0, Z119, 0x06, 0x3171, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x3176, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -12409,15 +12409,15 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z119, 0x07, 0x3180, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (M604 (0x02, 0x02, 0x01, 0x01))) - CH03 (Arg0, Z119, 0x08, 0x3185, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x318A, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -22700,16 +22700,16 @@ } Else { - CH03 (Arg0, Z119, 0x00, 0x5ACB, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x5ACE, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x5AD1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x5AD4, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -22765,13 +22765,13 @@ } Else { - CH03 (Arg0, Z119, 0x00, 0x5B0F, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x5B12, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x5B15, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x5B18, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -22861,7 +22861,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z119, 0x09, 0x5B69, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (M604 (0x02, 0x03, 0x06, 0x01))) If (F64) { @@ -22872,7 +22872,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (M604 (0x02, 0x03, 0x0A, 0x01))) } - CH03 (Arg0, Z119, 0x0A, 0x5B70, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -23558,29 +23558,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z119, 0x0B, 0x5DE4, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (M604 (0x02, 0x03, 0x06, 0x01))) - CH03 (Arg0, Z119, 0x0C, 0x5DEB, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x5DF0, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (DerefOf (M604 (0x02, 0x03, 0x13, 0x01))) - CH03 (Arg0, Z119, 0x0D, 0x5DF8, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z119, 0x5DFD, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -23590,17 +23590,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z119, 0x0E, 0x5E09, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(m604(2, 3, 6, 1))) */ - CH03 (Arg0, Z119, 0x0F, 0x5E10, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x5E15, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -23609,15 +23609,15 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z119, 0x10, 0x5E1F, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (M604 (0x02, 0x03, 0x06, 0x01))) - CH03 (Arg0, Z119, 0x11, 0x5E24, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x5E29, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, 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 17f9012..69d56ba 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 @@ -10677,13 +10677,13 @@ } Else { - CH03 (Arg0, Z118, 0x00, 0x2E2C, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E2F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E32, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [M604 (0x00, 0x02, 0x14, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E35, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10736,13 +10736,13 @@ } Else { - CH03 (Arg0, Z118, 0x00, 0x2E70, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E73, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E76, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [M604 (0x00, 0x02, 0x14, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E79, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10823,7 +10823,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z118, 0x00, 0x2ECA, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, M604 (0x00, 0x02, 0x01, 0x00)) If (F64) { @@ -10834,7 +10834,7 @@ Fatal (0xFF, 0xFFFFFFFF, M604 (0x00, 0x02, 0x04, 0x00)) } - CH03 (Arg0, Z118, 0x01, 0x2ED1, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -11520,29 +11520,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z118, 0x02, 0x3145, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (M604 (0x00, 0x02, 0x01, 0x00)) - CH03 (Arg0, Z118, 0x03, 0x314C, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x3151, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (M604 (0x00, 0x02, 0x1B, 0x00)) - CH03 (Arg0, Z118, 0x04, 0x3159, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z118, 0x315E, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -11552,17 +11552,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z118, 0x05, 0x3169, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, m604(0, 2, 1, 0)) */ - CH03 (Arg0, Z118, 0x06, 0x3170, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x3175, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -11571,15 +11571,15 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z118, 0x07, 0x317F, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, M604 (0x00, 0x02, 0x01, 0x00)) - CH03 (Arg0, Z118, 0x08, 0x3184, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x3189, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -21118,13 +21118,13 @@ } Else { - CH03 (Arg0, Z118, 0x00, 0x5AC9, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x5ACC, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x5ACF, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [M604 (0x00, 0x03, 0x0E, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x5AD2, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -21177,13 +21177,13 @@ } Else { - CH03 (Arg0, Z118, 0x00, 0x5B0D, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x5B10, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x5B13, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [M604 (0x00, 0x03, 0x0E, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x5B16, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -21264,7 +21264,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z118, 0x09, 0x5B67, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, M604 (0x00, 0x03, 0x06, 0x00)) If (F64) { @@ -21275,7 +21275,7 @@ Fatal (0xFF, 0xFFFFFFFF, M604 (0x00, 0x03, 0x0A, 0x00)) } - CH03 (Arg0, Z118, 0x0A, 0x5B6E, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -21961,29 +21961,29 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z118, 0x0B, 0x5DE2, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (M604 (0x00, 0x03, 0x06, 0x00)) - CH03 (Arg0, Z118, 0x0C, 0x5DE9, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x5DEE, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ Local0 = Timer Stall (M604 (0x00, 0x03, 0x13, 0x00)) - CH03 (Arg0, Z118, 0x0D, 0x5DF6, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z118, 0x5DFB, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -21993,17 +21993,17 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z118, 0x0E, 0x5E07, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, m604(0, 3, 6, 0)) */ - CH03 (Arg0, Z118, 0x0F, 0x5E0E, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x5E13, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -22012,15 +22012,15 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z118, 0x10, 0x5E1D, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, M604 (0x00, 0x03, 0x06, 0x00)) - CH03 (Arg0, Z118, 0x11, 0x5E22, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x5E27, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, 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 0c6abf4..9d4d1f9 100644 --- a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl +++ b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl @@ -46,10 +46,10 @@ Local2 = ToString (B000, Local0) If ((Local0 != 0x00)) { - ERR (Arg0, Z055, 0x33, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 (Arg0, Z055, 0x01, 0x36, 0x00) + CH03 (Arg0, Z055, __LINE__, 0x00, 0x00) } /* Store-like actions affect the source objects passed as parameter */ @@ -68,10 +68,10 @@ M131 (Local0) If ((Local0 != 0x0A)) { - ERR (Arg0, Z055, 0x48, 0x00, 0x00, Local0, 0x0A) + ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x0A) } - CH03 (Arg0, Z055, 0x03, 0x4B, 0x00) + CH03 (Arg0, Z055, __LINE__, 0x00, 0x00) } /* Operator doesn't update the source object passed to method as a REFERENCE */ @@ -83,10 +83,10 @@ M131 (Local1) If ((Local0 != 0x09)) { - ERR (Arg0, Z055, 0x56, 0x00, 0x00, Local0, 0x09) + ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x09) } - CH03 (Arg0, Z055, 0x05, 0x59, 0x00) + CH03 (Arg0, Z055, __LINE__, 0x00, 0x00) } Method (M134, 1, NotSerialized) @@ -95,10 +95,10 @@ M131 (RefOf (Local0)) If ((Local0 != 0x09)) { - ERR (Arg0, Z055, 0x61, 0x00, 0x00, Local0, 0x09) + ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x09) } - CH03 (Arg0, Z055, 0x07, 0x64, 0x00) + CH03 (Arg0, Z055, __LINE__, 0x00, 0x00) } Method (M135, 1, NotSerialized) @@ -112,10 +112,10 @@ M135 (RefOf (Local0)) If ((Local0 != 0x05)) { - ERR (Arg0, Z055, 0x71, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x05) } - CH03 (Arg0, Z055, 0x09, 0x74, 0x00) + CH03 (Arg0, Z055, __LINE__, 0x00, 0x00) } /* 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 0302abe..fb6a251 100644 --- a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl +++ b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl @@ -659,14 +659,14 @@ Local1 = ObjectType (Arg4) If ((Local0 != Local1)) { - ERR (Concatenate (Arg0, "-OType"), Z122, 0x0148, Arg2, 0x00, Local0, Local1) + ERR (Concatenate (Arg0, "-OType"), Z122, __LINE__, Arg2, 0x00, Local0, Local1) Return (0x01) } ElseIf (DerefOf (B679 [Local0])) { If ((Arg3 != Arg4)) { - ERR (Arg0, Z122, 0x014C, Arg2, 0x00, Arg3, Arg4) + ERR (Arg0, Z122, __LINE__, Arg2, 0x00, Arg3, Arg4) Return (0x01) } } @@ -1121,7 +1121,7 @@ Method (M003, 1, NotSerialized) { - If (CH03 (Arg0, Z122, 0x01, 0x026F, 0x00)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, 0x00)) { If (STCS) { @@ -1140,7 +1140,7 @@ { If ((Arg0 != Arg1)) { - ERR (Arg0, Z122, 0x027D, 0x00, 0x00, Arg0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Arg0, Arg1) If (STCS) { M000 (0x03, 0x0100, Arg2, Arg1) @@ -1674,13 +1674,13 @@ Default { - ERR (Concatenate (Arg0, TERR), Z122, 0x0452, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } } - If (CH03 (Arg0, Z122, 0x05, 0x0456, 0x00)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, 0x00)) { /*Exception during preparing of Target Object */ @@ -1699,7 +1699,7 @@ { /* ObjectType of Target can not be set up */ - ERR (Arg0, Z122, 0x0463, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -1823,13 +1823,13 @@ Default { - ERR (Concatenate (Arg0, TERR), Z122, 0x04BC, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } } - If (CH03 (Arg0, Z122, 0x08, 0x04C0, 0x00)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, 0x00)) { /* Exception during preparing of Source Object */ @@ -1848,7 +1848,7 @@ { /* ObjectType of Source can not be set up */ - ERR (Arg0, Z122, 0x04CD, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -1867,7 +1867,7 @@ /* Check that it can be used as reference */ Local0 = DerefOf (Arg2) Local3 = DerefOf (Local0) - If (CH03 (Arg0, Z122, 0x0A, 0x04E0, Local0)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Local0)) { /* Derefof caused unexpected exception */ @@ -1882,7 +1882,7 @@ { /* ObjectType of Source object is corrupted */ - ERR (Arg0, Z122, 0x04EA, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -1976,7 +1976,7 @@ Default { - ERR (Arg0, Z122, 0x052C, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -1986,7 +1986,7 @@ { /* Mismatch of Source Type against specified Result Type */ - ERR (Arg0, Z122, 0x0533, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) If (STCS) { M000 (0x03, 0x01000000, Local0, Arg1) @@ -2004,13 +2004,13 @@ { If ((INT0 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x053D, 0x00, 0x00, INT0, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, INT0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != INT0)) { - ERR (Arg0, Z122, 0x0541, 0x00, 0x00, DerefOf (Arg2), INT0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), INT0) Return (0x01) } } @@ -2018,13 +2018,13 @@ { If ((STR0 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0547, 0x00, 0x00, STR0, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, STR0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != STR0)) { - ERR (Arg0, Z122, 0x054B, 0x00, 0x00, DerefOf (Arg2), STR0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), STR0) Return (0x01) } } @@ -2032,13 +2032,13 @@ { If ((BUF0 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0551, 0x00, 0x00, BUF0, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BUF0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != BUF0)) { - ERR (Arg0, Z122, 0x0555, 0x00, 0x00, DerefOf (Arg2), BUF0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), BUF0) Return (0x01) } } @@ -2047,7 +2047,7 @@ Local0 = SizeOf (PAC0) If ((SizeOf (Arg3) != Local0)) { - ERR (Arg0, Z122, 0x055D, 0x00, 0x00, SizeOf (Arg3), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg3), Local0) Return (0x01) } @@ -2060,7 +2060,7 @@ { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x0566, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -2072,7 +2072,7 @@ { /* The value is corrupted */ - ERR (Arg0, Z122, 0x056E, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), Local0) Return (0x01) } @@ -2082,7 +2082,7 @@ Local0 = SizeOf (PAC0) If ((SizeOf (Arg2) != Local0)) { - ERR (Arg0, Z122, 0x0576, 0x00, 0x00, SizeOf (Arg2), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg2), Local0) Return (0x01) } @@ -2095,7 +2095,7 @@ { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x057F, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -2107,7 +2107,7 @@ { /* The value is corrupted */ - ERR (Arg0, Z122, 0x0587, 0x00, 0x00, DerefOf (DerefOf (Arg2) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg2) [Local0]), Local0) Return (0x01) } @@ -2121,14 +2121,14 @@ { If ((FLU0 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x0591, 0x00, 0x00, FLU0, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, FLU0, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != FLU0)) { - ERR (Arg0, Z122, 0x0595, 0x00, 0x00, DerefOf (Arg2), FLU0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), FLU0) Return (0x01) } } @@ -2136,14 +2136,14 @@ { If ((FLU2 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x059A, 0x00, 0x00, FLU2, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, FLU2, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != FLU2)) { - ERR (Arg0, Z122, 0x059E, 0x00, 0x00, DerefOf (Arg2), FLU2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), FLU2) Return (0x01) } } @@ -2151,14 +2151,14 @@ { If ((FLU4 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x05A3, 0x00, 0x00, FLU4, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, FLU4, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != FLU4)) { - ERR (Arg0, Z122, 0x05A7, 0x00, 0x00, DerefOf (Arg2), FLU4) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), FLU4) Return (0x01) } } @@ -2168,7 +2168,7 @@ CopyObject (DerefOf (Arg2), MMM2) /* \M689.M005.MMM2 */ If ((MMM2 != MMM0)) { - ERR (Arg0, Z122, 0x05AF, 0x00, 0x00, MMM2, MMM0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, MMM2, MMM0) Return (0x01) } } @@ -2179,14 +2179,14 @@ { If ((BFL0 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x05B7, 0x00, 0x00, BFL0, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BFL0, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != BFL0)) { - ERR (Arg0, Z122, 0x05BB, 0x00, 0x00, DerefOf (Arg2), BFL0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), BFL0) Return (0x01) } } @@ -2194,14 +2194,14 @@ { If ((BFL2 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x05C0, 0x00, 0x00, BFL2, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BFL2, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != BFL2)) { - ERR (Arg0, Z122, 0x05C4, 0x00, 0x00, DerefOf (Arg2), BFL2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), BFL2) Return (0x01) } } @@ -2209,14 +2209,14 @@ { If ((BFL4 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x05C9, 0x00, 0x00, BFL4, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BFL4, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != BFL4)) { - ERR (Arg0, Z122, 0x05CD, 0x00, 0x00, DerefOf (Arg2), BFL4) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), BFL4) Return (0x01) } } @@ -2259,7 +2259,7 @@ } Else { - ERR (Arg0, Z122, 0x05EE, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local2, Arg2) } If (STCS) @@ -2280,7 +2280,7 @@ /* Check that Target can be used as reference */ Local0 = DerefOf (Arg1) Local3 = DerefOf (Local0) - If (CH03 (Arg0, Z122, 0x28, 0x05FF, Arg3)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg3)) { /* Derefof caused unexpected exception */ @@ -2291,14 +2291,14 @@ { /* Types mismatch Result/Target on storing */ - ERR (Arg0, Z122, 0x0605, 0x00, 0x00, Local2, Arg3) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local2, Arg3) Return (0x01) } ElseIf ((Local2 != 0x03)) { /* Types mismatch Result/Target on storing */ /* Test fixed type Objects are converted to Buffer */ - ERR (Arg0, Z122, 0x060A, 0x00, 0x00, Local2, 0x03) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local2, 0x03) Return (0x01) } @@ -2346,7 +2346,7 @@ CopyObject (DerefOf (Arg1), MMM2) /* \M689.M006.MMM2 */ If ((MMM2 != Local7)) { - ERR (Arg0, Z122, 0x062B, 0x00, 0x00, MMM2, Local7) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, MMM2, Local7) Return (0x01) } } @@ -2356,7 +2356,7 @@ If ((DerefOf (Arg1) != Local7)) { - ERR (Arg0, Z122, 0x0630, 0x00, 0x00, DerefOf (Arg1), Local7) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local7) Return (0x01) } } @@ -2367,7 +2367,7 @@ Local0 = SizeOf (Local7) If ((SizeOf (Arg1) != Local0)) { - ERR (Arg0, Z122, 0x0636, 0x00, 0x00, SizeOf (Arg1), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg1), Local0) Return (0x01) } @@ -2380,7 +2380,7 @@ { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x063F, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -2392,7 +2392,7 @@ { /* The value is corrupted */ - ERR (Arg0, Z122, 0x0647, 0x00, 0x00, DerefOf (DerefOf (Arg1) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg1) [Local0]), DerefOf (Local7 [Local0])) Return (0x01) } @@ -2430,7 +2430,7 @@ Else { DerefOf (Local3) = Ones - If (CH03 (Arg0, Z122, 0x30, 0x0665, Arg1)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1)) { /* Store caused unexpected exception */ @@ -2453,7 +2453,7 @@ Else { DerefOf (Local3) = Ones - If (CH03 (Arg0, Z122, 0x31, 0x0673, Arg1)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1)) { /* Store caused unexpected exception */ @@ -2489,7 +2489,7 @@ Store (~ToInteger (DerefOf (Arg1)), Arg1) } - If (CH03 (Arg0, Z122, 0x32, 0x0687, Arg1)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1)) { /* Update caused unexpected exception */ @@ -2612,7 +2612,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x06D1, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -2647,11 +2647,11 @@ { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x06E2, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } - If (CH03 (Arg0, Z122, 0x35, 0x06E6, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -2759,7 +2759,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x071C, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -2861,7 +2861,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x074E, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -2959,7 +2959,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0782, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -2981,7 +2981,7 @@ } Else { - CH03 (Arg0, Z122, 0x39, 0x078E, Arg2) + CH03 (Arg0, Z122, __LINE__, 0x00, Arg2) } } ElseIf (!CH06 (Arg0, 0x39, 0xFF)) @@ -2996,7 +2996,7 @@ Return (0x00) } - ElseIf (CH03 (Arg0, Z122, 0x3A, 0x0797, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -3242,7 +3242,7 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0839, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -3253,11 +3253,11 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0841, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } - If (CH03 (Arg0, Z122, 0x3D, 0x0845, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -3361,7 +3361,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x087A, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -3377,7 +3377,7 @@ DerefOf (Index (Buffer (0x12) } } } - ElseIf (CH03 (Arg0, Z122, 0x3F, 0x0883, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -3493,7 +3493,7 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x08D1, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -3528,11 +3528,11 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x08E2, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } - If (CH03 (Arg0, Z122, 0x42, 0x08E6, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -3561,7 +3561,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x08F3, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -3585,7 +3585,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x08FD, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -3605,7 +3605,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0909, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -3628,7 +3628,7 @@ DerefOf (Index (Buffer (0x12) } Else { - CH03 (Arg0, Z122, 0x46, 0x0915, Arg2) + CH03 (Arg0, Z122, __LINE__, 0x00, Arg2) } } ElseIf (!CH06 (Arg0, 0x46, 0xFF)) @@ -3643,7 +3643,7 @@ DerefOf (Index (Buffer (0x12) Return (0x00) } - ElseIf (CH03 (Arg0, Z122, 0x47, 0x091E, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -3812,7 +3812,7 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0995, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -3823,11 +3823,11 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x099D, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } - If (CH03 (Arg0, Z122, 0x4A, 0x09A1, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -3852,7 +3852,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x09AD, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -3868,7 +3868,7 @@ DerefOf (Index (Buffer (0x12) } } } - ElseIf (CH03 (Arg0, Z122, 0x4C, 0x09B6, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -4042,12 +4042,12 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0A2C, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } Local1 = RefOf (Arg1) - If (CH03 (Arg0, Z122, 0x4E, 0x0A32, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -4151,7 +4151,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0A69, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -4174,7 +4174,7 @@ DerefOf (Index (Buffer (0x12) } Else { - CH03 (Arg0, Z122, 0x50, 0x0A77, Arg2) + CH03 (Arg0, Z122, __LINE__, 0x00, Arg2) } } ElseIf (!CH06 (Arg0, 0x50, 0xFF)) @@ -4185,7 +4185,7 @@ DerefOf (Index (Buffer (0x12) } } } - ElseIf (CH03 (Arg0, Z122, 0x51, 0x0A7E, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -4311,11 +4311,11 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0ACE, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } - If (CH03 (Arg0, Z122, 0x53, 0x0AD2, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -4451,11 +4451,11 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0B2D, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } - If (CH03 (Arg0, Z122, 0x55, 0x0B31, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -4559,7 +4559,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0B68, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -4581,7 +4581,7 @@ DerefOf (Index (Buffer (0x12) } Else { - CH03 (Arg0, Z122, 0x57, 0x0B74, Arg2) + CH03 (Arg0, Z122, __LINE__, 0x00, Arg2) } } ElseIf (!CH06 (Arg0, 0x57, 0xFF)) @@ -4592,7 +4592,7 @@ DerefOf (Index (Buffer (0x12) } } } - ElseIf (CH03 (Arg0, Z122, 0x58, 0x0B7B, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -4727,11 +4727,11 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0BD0, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } - If (CH03 (Arg0, Z122, 0x5A, 0x0BD4, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -4778,7 +4778,7 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0BF6, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -4790,11 +4790,11 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0BFF, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } - If (CH03 (Arg0, Z122, 0x5D, 0x0C03, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -4807,7 +4807,7 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0C0B, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -4825,7 +4825,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0C16, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -4841,7 +4841,7 @@ DerefOf (Index (Buffer (0x12) } } } - ElseIf (CH03 (Arg0, Z122, 0x61, 0x0C1F, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -4973,13 +4973,13 @@ DerefOf (Index (Buffer (0x12) Default { - ERR (Concatenate (Arg0, TERR), Z122, 0x0C7C, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } } - If (CH03 (Arg0, Z122, 0x63, 0x0C80, 0x00)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, 0x00)) { /*Exception during preparing of Target Object */ @@ -4998,7 +4998,7 @@ DerefOf (Index (Buffer (0x12) { /* ObjectType of Target can not be set up */ - ERR (Arg0, Z122, 0x0C8D, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -5017,7 +5017,7 @@ DerefOf (Index (Buffer (0x12) /* Check that it can be used as reference */ Local0 = DerefOf (Arg2) Local3 = DerefOf (Local0) - If (CH03 (Arg0, Z122, 0x65, 0x0CA0, Local0)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Local0)) { /* Derefof caused unexpected exception */ @@ -5031,7 +5031,7 @@ DerefOf (Index (Buffer (0x12) { /* ObjectType of Target object is corrupted */ - ERR (Arg0, Z122, 0x0CA8, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } } @@ -5103,7 +5103,7 @@ DerefOf (Index (Buffer (0x12) /*Store(Derefof(REF1), Local3) */ Local3 = REF1 /* \M689.REF1 */ - If (CH03 (Arg0, Z122, 0x67, 0x0CDE, Local0)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Local0)) { /* Derefof caused unexpected exception */ @@ -5116,7 +5116,7 @@ DerefOf (Index (Buffer (0x12) Default { - ERR (Arg0, Z122, 0x0CE6, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -5126,7 +5126,7 @@ DerefOf (Index (Buffer (0x12) { /* Mismatch of Target Type against the specified one */ - ERR (Arg0, Z122, 0x0CED, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) If (STCS) { M000 (0x03, 0x01000000, Local0, Arg1) @@ -5144,13 +5144,13 @@ DerefOf (Index (Buffer (0x12) { If ((INT1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0CF7, 0x00, 0x00, INT1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, INT1, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != INT1)) { - ERR (Arg0, Z122, 0x0CFB, 0x00, 0x00, DerefOf (Arg2), INT1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), INT1) Return (0x01) } } @@ -5158,13 +5158,13 @@ DerefOf (Index (Buffer (0x12) { If ((STR1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0D01, 0x00, 0x00, STR1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, STR1, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != STR1)) { - ERR (Arg0, Z122, 0x0D05, 0x00, 0x00, DerefOf (Arg2), STR1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), STR1) Return (0x01) } } @@ -5172,13 +5172,13 @@ DerefOf (Index (Buffer (0x12) { If ((BUF1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0D0B, 0x00, 0x00, BUF1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BUF1, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != BUF1)) { - ERR (Arg0, Z122, 0x0D0F, 0x00, 0x00, DerefOf (Arg2), BUF1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), BUF1) Return (0x01) } } @@ -5187,7 +5187,7 @@ DerefOf (Index (Buffer (0x12) Local0 = SizeOf (PAC1) If ((SizeOf (Arg3) != Local0)) { - ERR (Arg0, Z122, 0x0D17, 0x00, 0x00, SizeOf (Arg3), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg3), Local0) Return (0x01) } @@ -5200,7 +5200,7 @@ DerefOf (Index (Buffer (0x12) { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x0D20, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -5212,7 +5212,7 @@ DerefOf (Index (Buffer (0x12) { /* The value is corrupted */ - ERR (Arg0, Z122, 0x0D28, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), Local0) Return (0x01) } @@ -5222,7 +5222,7 @@ DerefOf (Index (Buffer (0x12) Local0 = SizeOf (PAC1) If ((SizeOf (Arg2) != Local0)) { - ERR (Arg0, Z122, 0x0D30, 0x00, 0x00, SizeOf (Arg2), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg2), Local0) Return (0x01) } @@ -5235,7 +5235,7 @@ DerefOf (Index (Buffer (0x12) { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x0D39, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -5247,7 +5247,7 @@ DerefOf (Index (Buffer (0x12) { /* The value is corrupted */ - ERR (Arg0, Z122, 0x0D41, 0x00, 0x00, DerefOf (DerefOf (Arg2) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg2) [Local0]), Local0) Return (0x01) } @@ -5258,7 +5258,7 @@ DerefOf (Index (Buffer (0x12) { If ((DerefOf (Arg2) != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0D49, 0x00, 0x00, DerefOf (Arg2), DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), DerefOf (Arg3)) Return (0x01) } } @@ -5267,7 +5267,7 @@ DerefOf (Index (Buffer (0x12) CopyObject (DerefOf (Arg2), MMM2) /* \M689.M015.MMM2 */ If ((MMM2 != MMM1)) { - ERR (Arg0, Z122, 0x0D50, 0x00, 0x00, MMM2, MMM1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, MMM2, MMM1) Return (0x01) } } @@ -5275,7 +5275,7 @@ DerefOf (Index (Buffer (0x12) { If ((DerefOf (Arg2) != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0D56, 0x00, 0x00, DerefOf (Arg2), DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), DerefOf (Arg3)) Return (0x01) } } @@ -5358,7 +5358,7 @@ DerefOf (Index (Buffer (0x12) /*Store(Derefof(REF1), Local3) */ Local3 = REF1 /* \M689.REF1 */ - If (CH03 (Arg0, Z122, 0x79, 0x0D95, 0x00)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, 0x00)) { /* Derefof caused unexpected exception */ @@ -5371,7 +5371,7 @@ DerefOf (Index (Buffer (0x12) Default { - ERR (Arg0, Z122, 0x0D9D, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -5381,7 +5381,7 @@ DerefOf (Index (Buffer (0x12) { /* Mismatch of Target Type against the specified one */ - ERR (Arg0, Z122, 0x0DA4, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) If (STCS) { M000 (0x03, 0x01000000, Local0, Arg1) @@ -5399,7 +5399,7 @@ DerefOf (Index (Buffer (0x12) { If ((INT1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0DAE, 0x00, 0x00, INT1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, INT1, DerefOf (Arg3)) Return (0x01) } } @@ -5407,7 +5407,7 @@ DerefOf (Index (Buffer (0x12) { If ((STR1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0DB4, 0x00, 0x00, STR1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, STR1, DerefOf (Arg3)) Return (0x01) } } @@ -5415,7 +5415,7 @@ DerefOf (Index (Buffer (0x12) { If ((BUF1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0DBA, 0x00, 0x00, BUF1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BUF1, DerefOf (Arg3)) Return (0x01) } } @@ -5424,7 +5424,7 @@ DerefOf (Index (Buffer (0x12) Local0 = SizeOf (PAC1) If ((SizeOf (Arg3) != Local0)) { - ERR (Arg0, Z122, 0x0DC2, 0x00, 0x00, SizeOf (Arg3), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg3), Local0) Return (0x01) } @@ -5437,7 +5437,7 @@ DerefOf (Index (Buffer (0x12) { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x0DCB, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -5449,7 +5449,7 @@ DerefOf (Index (Buffer (0x12) { /* The value is corrupted */ - ERR (Arg0, Z122, 0x0DD3, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), Local0) Return (0x01) } @@ -5490,7 +5490,7 @@ DerefOf (Index (Buffer (0x12) Else { DerefOf (Local3) = Ones - If (CH03 (Arg0, Z122, 0x82, 0x0DF2, Arg1 [0x00])) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1 [0x00])) { /* Store caused unexpected exception */ @@ -5513,7 +5513,7 @@ DerefOf (Index (Buffer (0x12) Else { DerefOf (Local3) = Ones - If (CH03 (Arg0, Z122, 0x83, 0x0E00, Arg1 [0x00])) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1 [0x00])) { /* Store caused unexpected exception */ @@ -5550,7 +5550,7 @@ DerefOf (Index (Buffer (0x12) 0x00]) } - If (CH03 (Arg0, Z122, 0x84, 0x0E14, Arg1 [0x00])) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1 [0x00])) { /* Update caused unexpected exception */ @@ -7067,7 +7067,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x10F7, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -7075,7 +7075,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Source-Target pair */ - ERR (Concatenate (Arg0, TERR), Z122, 0x10FD, 0x00, 0x00, Arg5, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg5, 0x00) Return (0x01) } @@ -7146,7 +7146,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected data package */ - ERR (Concatenate (Arg0, TERR), Z122, 0x1130, 0x00, 0x00, Arg1, LPC1) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg1, LPC1) Return (0x01) } 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 580775a..303f9c2 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 @@ -277,7 +277,7 @@ Local0 = SizeOf (BUF1) If ((Local0 != 0x11)) { - ERR (Concatenate (Arg0, TERR), Z126, 0x0103, 0x00, 0x00, Local0, 0x11) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Local0, 0x11) Return (0x01) } @@ -343,13 +343,13 @@ Default { - ERR (Concatenate (Arg0, TERR), Z126, 0x0133, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } } - If (CH03 (Arg0, Z126, 0x03, 0x0137, 0x00)) + If (CH03 (Arg0, Z126, __LINE__, 0x00, 0x00)) { /*Exception during preparing of Target Object */ @@ -361,7 +361,7 @@ { /* ObjectType of Target can not be set up */ - ERR (Arg0, Z126, 0x013F, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -401,13 +401,13 @@ Default { - ERR (Concatenate (Arg0, TERR), Z126, 0x015C, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } } - If (CH03 (Arg0, Z126, 0x06, 0x0160, 0x00)) + If (CH03 (Arg0, Z126, __LINE__, 0x00, 0x00)) { /* Exception during preparing of Source Object */ @@ -419,7 +419,7 @@ { /* ObjectType of Source can not be set up */ - ERR (Arg0, Z126, 0x0168, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -436,7 +436,7 @@ { /* ObjectType of Source object is corrupted */ - ERR (Arg0, Z126, 0x0177, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -458,7 +458,7 @@ Default { - ERR (Arg0, Z126, 0x0187, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -468,7 +468,7 @@ { /* Mismatch of Source Type against specified one */ - ERR (Arg0, Z126, 0x018E, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local0, Arg1) If (STCS) { M000 (0x03, 0x01000000, Local0, Arg0) @@ -486,13 +486,13 @@ { If ((INT0 != DerefOf (Arg3))) { - ERR (Arg0, Z126, 0x0196, 0x00, 0x00, INT0, DerefOf (Arg3)) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, INT0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != INT0)) { - ERR (Arg0, Z126, 0x019A, 0x00, 0x00, DerefOf (Arg2), INT0) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, DerefOf (Arg2), INT0) Return (0x01) } } @@ -500,13 +500,13 @@ { If ((STR0 != DerefOf (Arg3))) { - ERR (Arg0, Z126, 0x01A0, 0x00, 0x00, STR0, DerefOf (Arg3)) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, STR0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != STR0)) { - ERR (Arg0, Z126, 0x01A4, 0x00, 0x00, DerefOf (Arg2), STR0) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, DerefOf (Arg2), STR0) Return (0x01) } } @@ -514,13 +514,13 @@ { If ((BUF0 != DerefOf (Arg3))) { - ERR (Arg0, Z126, 0x01AA, 0x00, 0x00, BUF0, DerefOf (Arg3)) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, BUF0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != BUF0)) { - ERR (Arg0, Z126, 0x01AE, 0x00, 0x00, DerefOf (Arg2), BUF0) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, DerefOf (Arg2), BUF0) Return (0x01) } } @@ -558,12 +558,12 @@ { If (X170) { - ERR (Arg0, Z126, 0x01CA, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local2, Arg2) } } Else { - ERR (Arg0, Z126, 0x01CD, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local2, Arg2) } If (STCS) @@ -582,14 +582,14 @@ { /* Types mismatch Result/Target on storing */ - ERR (Arg0, Z126, 0x01D8, 0x00, 0x00, Local2, Arg3) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local2, Arg3) Return (0x01) } ElseIf ((Local2 != 0x03)) { /* Types mismatch Result/Target on storing */ /* Test fixed type Objects are converted to Buffer */ - ERR (Arg0, Z126, 0x01DD, 0x00, 0x00, Local2, 0x03) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local2, 0x03) Return (0x01) } @@ -618,12 +618,12 @@ { If (X194) { - ERR (Arg0, Z126, 0x01F1, 0x00, 0x00, DerefOf (Arg1), Local7) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local7) } } Else { - ERR (Arg0, Z126, 0x01F4, 0x00, 0x00, DerefOf (Arg1), Local7) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local7) } Return (0x01) @@ -663,7 +663,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z126, 0x0212, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -698,7 +698,7 @@ { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z126, 0x0223, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -823,7 +823,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z126, 0x0249, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -946,7 +946,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z126, 0x026D, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -1065,7 +1065,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z126, 0x0291, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -1081,7 +1081,7 @@ } } } - ElseIf (CH03 (Arg0, Z126, 0x1B, 0x029A, Arg2)) + ElseIf (CH03 (Arg0, Z126, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -1148,7 +1148,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z126, 0x02CA, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -1159,7 +1159,7 @@ { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z126, 0x02D2, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -1280,7 +1280,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z126, 0x02F7, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -1296,7 +1296,7 @@ } } } - ElseIf (CH03 (Arg0, Z126, 0x20, 0x0300, Arg2)) + ElseIf (CH03 (Arg0, Z126, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -2513,7 +2513,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (TS, TERR), Z126, 0x050B, 0x00, 0x00, Arg0, 0x00) + ERR (Concatenate (TS, TERR), Z126, __LINE__, 0x00, 0x00, Arg0, 0x00) Return (0x01) } @@ -2521,7 +2521,7 @@ { /* Unexpected Kind of Source-Target pair */ - ERR (Concatenate (TS, TERR), Z126, 0x0511, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (TS, TERR), Z126, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } 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 da86348..4063ce4 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 @@ -321,13 +321,13 @@ Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x0112, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } } - If (CH03 (Arg0, Z125, 0x02, 0x0116, 0x00)) + If (CH03 (Arg0, Z125, __LINE__, 0x00, 0x00)) { /* Exception during preparing of Source Object */ @@ -339,7 +339,7 @@ { /* ObjectType of Source can not be set up */ - ERR (Arg0, Z125, 0x011E, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -363,12 +363,12 @@ { If (X195) { - ERR (Arg0, Z125, 0x0134, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, Local2, Arg2) } } Else { - ERR (Arg0, Z125, 0x0137, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, Local2, Arg2) } If (STCS) @@ -404,7 +404,7 @@ If ((DerefOf (Arg1) != Local0)) { - ERR (Arg0, Z125, 0x014A, 0x00, 0x00, DerefOf (Arg1), Local0) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local0) Return (0x01) } } @@ -427,7 +427,7 @@ If ((DerefOf (Arg1) != Local0)) { - ERR (Arg0, Z125, 0x0158, 0x00, 0x00, DerefOf (Arg1), Local0) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local0) Return (0x01) } } @@ -450,13 +450,13 @@ If ((DerefOf (Arg1) != Local0)) { - ERR (Arg0, Z125, 0x0166, 0x00, 0x00, DerefOf (Arg1), Local0) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local0) Return (0x01) } } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x016B, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -485,13 +485,13 @@ If ((DerefOf (Arg1) != STR1)) { - ERR (Arg0, Z125, 0x017C, 0x00, 0x00, DerefOf (Arg1), STR1) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), STR1) Return (0x01) } } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x0181, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -520,13 +520,13 @@ If ((DerefOf (Arg1) != BUF1)) { - ERR (Arg0, Z125, 0x0192, 0x00, 0x00, DerefOf (Arg1), BUF1) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), BUF1) Return (0x01) } } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x0197, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -555,13 +555,13 @@ If ((DerefOf (Arg1) != FLU1)) { - ERR (Arg0, Z125, 0x01A8, 0x00, 0x00, DerefOf (Arg1), FLU1) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), FLU1) Return (0x01) } } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x01AD, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -590,13 +590,13 @@ If ((DerefOf (Arg1) != BFL1)) { - ERR (Arg0, Z125, 0x01BE, 0x00, 0x00, DerefOf (Arg1), BFL1) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), BFL1) Return (0x01) } } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x01C3, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -604,7 +604,7 @@ } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x01C9, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -656,7 +656,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z125, 0x01EC, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -682,7 +682,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x01F8, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -706,7 +706,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x0202, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -726,7 +726,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x020B, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -742,7 +742,7 @@ } } } - ElseIf (CH03 (Arg0, Z125, 0x17, 0x0214, Arg2)) + ElseIf (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { /* Processing caused unexpected exception */ @@ -784,7 +784,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z125, 0x0230, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -804,7 +804,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x023A, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -817,7 +817,7 @@ /* will be converted to Integer 0, thus no */ /* exception caused by implicit source */ /* conversion. */ - If (CH03 (Arg0, Z125, 0x1A, 0x0245, Arg2)) + If (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { If (STCS) { @@ -835,7 +835,7 @@ } } } - ElseIf (CH03 (Arg0, Z125, 0x1B, 0x024E, Arg2)) + ElseIf (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { /* Processing caused unexpected exception */ @@ -890,7 +890,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z125, 0x0277, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -910,7 +910,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x0281, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -923,7 +923,7 @@ /* will be converted to Integer 0, thus no */ /* exception caused by implicit source */ /* conversion. */ - If (CH03 (Arg0, Z125, 0x1E, 0x028C, Arg2)) + If (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { If (STCS) { @@ -941,7 +941,7 @@ } } } - ElseIf (CH03 (Arg0, Z125, 0x1F, 0x0295, Arg2)) + ElseIf (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { /* Processing caused unexpected exception */ @@ -1015,7 +1015,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z125, 0x02C7, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -1037,7 +1037,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x02D2, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -1053,7 +1053,7 @@ } } } - ElseIf (CH03 (Arg0, Z125, 0x23, 0x02DB, Arg2)) + ElseIf (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { /* Processing caused unexpected exception */ @@ -1097,7 +1097,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (TS, TERR), Z125, 0x02FB, 0x00, 0x00, Arg0, 0x00) + ERR (Concatenate (TS, TERR), Z125, __LINE__, 0x00, 0x00, Arg0, 0x00) Return (0x01) } 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 93583dc..1e33b66 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 @@ -319,7 +319,7 @@ Local0 = SizeOf (BUF1) If ((Local0 != 0x11)) { - ERR (Concatenate (Arg0, TERR), Z127, 0x0120, 0x00, 0x00, Local0, 0x11) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Local0, 0x11) Return (0x01) } @@ -385,13 +385,13 @@ Default { - ERR (Concatenate (Arg0, TERR), Z127, 0x0150, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } } - If (CH03 (Arg0, Z127, 0x03, 0x0154, 0x00)) + If (CH03 (Arg0, Z127, __LINE__, 0x00, 0x00)) { /*Exception during preparing of Target Object */ @@ -410,7 +410,7 @@ { /* ObjectType of Target can not be set up */ - ERR (Arg0, Z127, 0x0161, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -455,13 +455,13 @@ Default { - ERR (Concatenate (Arg0, TERR), Z127, 0x0182, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } } - If (CH03 (Arg0, Z127, 0x06, 0x0186, 0x00)) + If (CH03 (Arg0, Z127, __LINE__, 0x00, 0x00)) { /* Exception during preparing of Source Object */ @@ -473,7 +473,7 @@ { /* ObjectType of Source can not be set up */ - ERR (Arg0, Z127, 0x018E, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -490,7 +490,7 @@ { /* ObjectType of Source object is corrupted */ - ERR (Arg0, Z127, 0x019D, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -516,7 +516,7 @@ Default { - ERR (Arg0, Z127, 0x01B0, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -526,7 +526,7 @@ { /* Mismatch of Source Type against specified one */ - ERR (Arg0, Z127, 0x01B7, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local0, Arg1) If (STCS) { M000 (0x03, 0x01000000, Local0, Arg0) @@ -544,13 +544,13 @@ { If ((INT0 != DerefOf (Arg3))) { - ERR (Arg0, Z127, 0x01BF, 0x00, 0x00, INT0, DerefOf (Arg3)) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, INT0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != INT0)) { - ERR (Arg0, Z127, 0x01C3, 0x00, 0x00, DerefOf (Arg2), INT0) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, DerefOf (Arg2), INT0) Return (0x01) } } @@ -558,13 +558,13 @@ { If ((STR0 != DerefOf (Arg3))) { - ERR (Arg0, Z127, 0x01C9, 0x00, 0x00, STR0, DerefOf (Arg3)) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, STR0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != STR0)) { - ERR (Arg0, Z127, 0x01CD, 0x00, 0x00, DerefOf (Arg2), STR0) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, DerefOf (Arg2), STR0) Return (0x01) } } @@ -572,13 +572,13 @@ { If ((BUF0 != DerefOf (Arg3))) { - ERR (Arg0, Z127, 0x01D3, 0x00, 0x00, BUF0, DerefOf (Arg3)) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, BUF0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != BUF0)) { - ERR (Arg0, Z127, 0x01D7, 0x00, 0x00, DerefOf (Arg2), BUF0) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, DerefOf (Arg2), BUF0) Return (0x01) } } @@ -619,7 +619,7 @@ } Else { - ERR (Arg0, Z127, 0x01F5, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local2, Arg2) } If (STCS) @@ -640,7 +640,7 @@ /* Check that Target can be used as reference */ Local0 = DerefOf (Arg1) Local3 = DerefOf (Local0) - If (CH03 (Arg0, Z127, 0x12, 0x0204, Arg3)) + If (CH03 (Arg0, Z127, __LINE__, 0x00, Arg3)) { /* Derefof caused unexpected exception */ @@ -651,14 +651,14 @@ { /* Types mismatch Result/Target on storing */ - ERR (Arg0, Z127, 0x020A, 0x00, 0x00, Local2, Arg3) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local2, Arg3) Return (0x01) } ElseIf ((Local2 != 0x03)) { /* Types mismatch Result/Target on storing */ /* Test fixed type Objects are converted to Buffer */ - ERR (Arg0, Z127, 0x020F, 0x00, 0x00, Local2, 0x03) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local2, 0x03) Return (0x01) } @@ -687,12 +687,12 @@ { If (X193) { - ERR (Arg0, Z127, 0x0223, 0x00, 0x00, DerefOf (Arg1), Local7) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local7) } } Else { - ERR (Arg0, Z127, 0x0226, 0x00, 0x00, DerefOf (Arg1), Local7) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local7) } Return (0x01) @@ -743,7 +743,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z127, 0x024A, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -778,7 +778,7 @@ { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z127, 0x025B, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -1056,7 +1056,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z127, 0x02A5, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -1332,7 +1332,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z127, 0x02ED, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -1604,7 +1604,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z127, 0x0335, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -1623,7 +1623,7 @@ } } } - ElseIf (CH03 (Arg0, Z127, 0x1C, 0x0341, Arg2)) + ElseIf (CH03 (Arg0, Z127, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -1681,7 +1681,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z127, 0x036B, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -1692,7 +1692,7 @@ { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z127, 0x0373, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -1966,7 +1966,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z127, 0x03BC, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -1985,7 +1985,7 @@ } } } - ElseIf (CH03 (Arg0, Z127, 0x21, 0x03C8, Arg2)) + ElseIf (CH03 (Arg0, Z127, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -5089,7 +5089,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (TS, TERR), Z127, 0x08D0, 0x00, 0x00, Arg0, 0x00) + ERR (Concatenate (TS, TERR), Z127, __LINE__, 0x00, 0x00, Arg0, 0x00) Return (0x01) } @@ -5097,7 +5097,7 @@ { /* Unexpected Kind of Source-Target pair */ - ERR (Concatenate (TS, TERR), Z127, 0x08D6, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (TS, TERR), Z127, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } 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 c0c84d3..61011b0 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 @@ -87,7 +87,7 @@ /* ArgX Object */ /* Store(Src0, arg3) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x53, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x03)) @@ -101,7 +101,7 @@ /* Reference in ArgX Object */ /* Store(Src0, arg4) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x5C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x05)) @@ -109,13 +109,13 @@ /* Elemenf of a Package */ /* Store(Src0, Index(p680, 0)) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x62, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Else { Debug = "Unexpected Kind of the Object to store into" - ERR (TERR, Z123, 0x66, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } } @@ -128,7 +128,7 @@ /* Constant */ /* Store(Src0, "") */ Debug = "Not implemented" - ERR (TERR, Z123, 0x70, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x01)) @@ -142,7 +142,7 @@ /* ArgX Object */ /* Store(Src0, arg3) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x79, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x03)) @@ -156,7 +156,7 @@ /* Reference in ArgX Object */ /* Store(Src0, arg4) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x82, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x05)) @@ -164,13 +164,13 @@ /* Elemenf of a Package */ /* Store(Src0, Index(p680, 0)) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x88, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Else { Debug = "Unexpected Kind of the Object to store into" - ERR (TERR, Z123, 0x8C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } } @@ -183,7 +183,7 @@ /* Constant */ /* Store(Src0, Buffer(1){}) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x96, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x01)) @@ -197,7 +197,7 @@ /* ArgX Object */ /* Store(Src0, arg3) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x9F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x03)) @@ -205,7 +205,7 @@ /* LocalX Object */ /* Store(Src0, Local2) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xA5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x04)) @@ -213,7 +213,7 @@ /* Reference in ArgX Object */ /* Store(Src0, arg4) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xAB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x05)) @@ -221,13 +221,13 @@ /* Elemenf of a Package */ /* Store(Src0, Index(p680, 0)) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xB1, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Else { Debug = "Unexpected Kind of the Object to store into" - ERR (TERR, Z123, 0xB5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } } @@ -236,7 +236,7 @@ /* Package */ /* Store(Src0, p680) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xBC, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -248,7 +248,7 @@ /* Constant (like Store(Src0, Zero)) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xC4, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x01)) @@ -264,7 +264,7 @@ /* ArgX Object */ /* Store(Src0, arg3) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xCF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x03)) @@ -272,7 +272,7 @@ /* LocalX Object */ /* Store(Src0, Local2) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xD5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x04)) @@ -280,7 +280,7 @@ /* Reference in ArgX Object */ /* Store(Src0, arg4) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xDB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x05)) @@ -288,20 +288,20 @@ /* Elemenf of a Package */ /* Store(Src0, Index(p680, 0)) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xE1, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Else { Debug = "Unexpected Kind of the Object to store into" - ERR (TERR, Z123, 0xE5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } } Default { Debug = "Unexpected type of the Object to store into" - ERR (TERR, Z123, 0xEB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -386,7 +386,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x011D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -394,7 +394,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0122, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -441,7 +441,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x013D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -449,7 +449,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0142, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -501,7 +501,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0162, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -509,7 +509,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0167, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -553,7 +553,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x017F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -561,7 +561,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0184, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -608,7 +608,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x019A, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -616,7 +616,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x019F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -656,7 +656,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01B5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -664,7 +664,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01BA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -714,7 +714,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01D5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -722,7 +722,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01DA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -766,7 +766,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01F2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -774,7 +774,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01F7, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -818,7 +818,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x020F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -826,7 +826,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0214, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -870,7 +870,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x022C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -878,7 +878,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0231, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -891,7 +891,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x023C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -970,7 +970,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0270, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -978,7 +978,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0275, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1053,7 +1053,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x02A6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1061,7 +1061,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x02AB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1131,7 +1131,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x02D8, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1139,7 +1139,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x02DD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1217,7 +1217,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0311, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1225,7 +1225,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0316, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1272,7 +1272,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x032C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1280,7 +1280,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0331, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1418,7 +1418,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0387, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1426,7 +1426,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x038C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1498,7 +1498,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x03B9, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1506,7 +1506,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x03BE, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1578,7 +1578,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x03EB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1586,7 +1586,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x03F0, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1658,7 +1658,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x041D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1666,7 +1666,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0422, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1679,7 +1679,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x042D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1754,7 +1754,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x045B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1762,7 +1762,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0460, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1833,7 +1833,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x048B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1841,7 +1841,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0490, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1906,7 +1906,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x04B7, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1914,7 +1914,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x04BC, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1979,7 +1979,7 @@ Default { Debug = "Unexpected type of the result Object to be stored" - ERR (TERR, Z123, 0x04E1, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2032,7 +2032,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x04FA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2040,7 +2040,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x04FF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2168,7 +2168,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0545, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2176,7 +2176,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x054A, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2302,7 +2302,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x058F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2310,7 +2310,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0594, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2377,7 +2377,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x05BA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2385,7 +2385,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x05BF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2398,7 +2398,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x05CA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2474,7 +2474,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x05FA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2482,7 +2482,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x05FF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2554,7 +2554,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x062C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2562,7 +2562,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0631, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2623,7 +2623,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0656, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2631,7 +2631,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x065B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2700,7 +2700,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0684, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2708,7 +2708,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0689, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2755,7 +2755,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x069F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2763,7 +2763,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x06A4, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2895,7 +2895,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x06F2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2903,7 +2903,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x06F7, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2972,7 +2972,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0720, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2980,7 +2980,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0725, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3049,7 +3049,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x074E, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3057,7 +3057,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0753, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3126,7 +3126,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x077D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3134,7 +3134,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0782, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3147,7 +3147,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x078D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3267,7 +3267,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x07BD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3275,7 +3275,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x07C2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3391,7 +3391,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x07EF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3399,7 +3399,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x07F4, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3488,7 +3488,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x081B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3496,7 +3496,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0820, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3609,7 +3609,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0849, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3617,7 +3617,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x084E, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3664,7 +3664,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0864, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3672,7 +3672,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0869, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3892,7 +3892,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x08B7, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3900,7 +3900,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x08BC, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4013,7 +4013,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x08E5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4021,7 +4021,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x08EA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4134,7 +4134,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0913, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4142,7 +4142,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0918, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4255,7 +4255,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0942, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4263,7 +4263,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0947, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4276,7 +4276,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x0952, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4327,7 +4327,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0972, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4335,7 +4335,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0977, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4382,7 +4382,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0993, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4390,7 +4390,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0998, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4483,7 +4483,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x09DD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4491,7 +4491,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x09E2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4535,7 +4535,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x09FA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4543,7 +4543,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x09FF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4590,7 +4590,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A15, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4598,7 +4598,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A1A, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4680,7 +4680,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A46, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4688,7 +4688,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A4B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4732,7 +4732,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A63, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4740,7 +4740,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A68, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4784,7 +4784,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A80, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4792,7 +4792,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A85, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4847,7 +4847,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0AA6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4855,7 +4855,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0AAB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4868,7 +4868,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x0AB6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4919,7 +4919,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0AD6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4927,7 +4927,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0ADB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4974,7 +4974,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0AF7, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4982,7 +4982,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0AFC, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5147,7 +5147,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B5F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5155,7 +5155,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B64, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5199,7 +5199,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B7C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5207,7 +5207,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B81, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5254,7 +5254,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B97, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5262,7 +5262,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B9C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5344,7 +5344,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0BC8, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5352,7 +5352,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0BCD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5396,7 +5396,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0BE5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5404,7 +5404,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0BEA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5448,7 +5448,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C02, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5456,7 +5456,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C07, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5555,7 +5555,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C38, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5563,7 +5563,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C3D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5576,7 +5576,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x0C48, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5627,7 +5627,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C68, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5635,7 +5635,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C6D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5682,7 +5682,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C89, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5690,7 +5690,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C8E, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5827,7 +5827,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0CDD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5835,7 +5835,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0CE2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5879,7 +5879,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0CFA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5887,7 +5887,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0CFF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5934,7 +5934,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D15, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5942,7 +5942,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D1A, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6024,7 +6024,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D46, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6032,7 +6032,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D4B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6076,7 +6076,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D63, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6084,7 +6084,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D68, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6128,7 +6128,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D80, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6136,7 +6136,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D85, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6206,7 +6206,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0DA6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6214,7 +6214,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0DAB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6227,7 +6227,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x0DB6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6302,7 +6302,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0DE4, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6310,7 +6310,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0DE9, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6381,7 +6381,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E14, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6389,7 +6389,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E19, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6454,7 +6454,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E40, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6462,7 +6462,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E45, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6527,7 +6527,7 @@ Default { Debug = "Unexpected type of the result Object to be stored" - ERR (TERR, Z123, 0x0E6A, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6580,7 +6580,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E83, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6588,7 +6588,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E88, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6716,7 +6716,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0ECE, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6724,7 +6724,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0ED3, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6850,7 +6850,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0F18, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6858,7 +6858,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0F1D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6925,7 +6925,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0F43, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6933,7 +6933,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0F48, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6946,7 +6946,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x0F53, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl index 98a8096..00a7568 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl @@ -36,34 +36,34 @@ Method (M140, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local1 = 0x01 Local0 = 0x02 Divide (Local1, Local0, Local2) - CH03 (__METHOD__, Z058, 0x01, 0x31, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = 0x00 Divide (Local1, Local0, Local2) - CH04 (__METHOD__, 0x00, 0x38, Z058, 0x36, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ + CH04 (__METHOD__, 0x00, 0x38, Z058, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ Local0 = 0x02 Divide (Local1, Local0, Local2) - CH03 (__METHOD__, Z058, 0x03, 0x3B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* Modulo divide by zero */ Method (M141, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x04, 0x43, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local1 = 0x01 Local0 = 0x02 Local2 = (Local1 % Local0) - CH03 (__METHOD__, Z058, 0x05, 0x49, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = 0x00 Local2 = (Local1 % Local0) - CH04 (__METHOD__, 0x00, 0x38, Z058, 0x4E, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ + CH04 (__METHOD__, 0x00, 0x38, Z058, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ Local0 = 0x02 Local2 = (Local1 % Local0) - CH03 (__METHOD__, Z058, 0x07, 0x53, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* Release ownership on a Mutex that is not currently owned */ @@ -71,9 +71,9 @@ Method (M142, 0, Serialized) { Mutex (MTX0, 0x00) - CH03 (__METHOD__, Z058, 0x08, 0x5D, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Release (MTX0) - CH04 (__METHOD__, 0x00, 0x41, Z058, 0x61, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z058, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ } /* SizeOf for data types not an Integer, Buffer, String or Package object */ @@ -131,19 +131,19 @@ /* Buffer Field */ Local0 = BUF0 [0x00] - CH03 (__METHOD__, Z058, 0x0A, 0x93, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = SizeOf (STR0) Local5 = SizeOf (BUF0) Local5 = SizeOf (PAC0) Local5 = SizeOf (INT0) - CH03 (__METHOD__, Z058, 0x0B, 0x9A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If (INT0) { Local1 = 0x00 } Local5 = SizeOf (Local1) - CH04 (__METHOD__, 0x01, 0x31, Z058, 0xA0, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (__METHOD__, 0x01, 0x31, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ /* These are now caught by the compiler - Aug 2015 */ /* Store(SizeOf(DEV0), Local5) */ /* CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE */ @@ -179,9 +179,9 @@ Local0++ } - CH03 (__METHOD__, Z058, 0x14, 0xC6, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToString (B000, Ones, Local5) - CH03 (__METHOD__, Z058, 0x15, 0xCA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Name (B001, Buffer (0xC9){}) Local0 = 0x00 While ((Local0 < 0xC9)) @@ -197,7 +197,7 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x16, 0xDC, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* Access out of Package */ @@ -216,27 +216,27 @@ 0x01, 0x02 }) - CH03 (__METHOD__, Z058, 0x17, 0xE7, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Package() */ Store (P000 [0x02], Local5) - CH03 (__METHOD__, Z058, 0x18, 0xED, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Store (P000 [0x03], Local5) - CH04 (__METHOD__, 0x01, 0x37, Z058, 0xF1, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ Local0 = P000 [0x02] - CH03 (__METHOD__, Z058, 0x1A, 0xF5, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = P000 [0x03] - CH04 (__METHOD__, 0x00, 0x37, Z058, 0xF9, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ /* Package(3) */ Store (P001 [0x02], Local5) - CH03 (__METHOD__, Z058, 0x1C, 0xFF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = P001 [0x03] - CH04 (__METHOD__, 0x00, 0x37, Z058, 0x0103, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ Local0 = P001 [0x02] - CH03 (__METHOD__, Z058, 0x1E, 0x0107, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = P001 [0x03] - CH04 (__METHOD__, 0x00, 0x37, Z058, 0x010B, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } /* Access out of String */ @@ -244,17 +244,17 @@ Method (M085, 0, Serialized) { Name (S000, "123") - CH03 (__METHOD__, Z058, 0x20, 0x0115, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = S000 [0x02] - CH03 (__METHOD__, Z058, 0x21, 0x0119, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = S000 [0x03] /* Bug 177, Bugzilla 5480. */ - CH04 (__METHOD__, 0x00, 0x3D, Z058, 0x011E, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (__METHOD__, 0x00, 0x3D, Z058, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ Local0 = S000 [0x02] - CH03 (__METHOD__, Z058, 0x23, 0x0122, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = S000 [0x03] - CH04 (__METHOD__, 0x00, 0x3D, Z058, 0x0126, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (__METHOD__, 0x00, 0x3D, Z058, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } /* Access out of Buffer */ @@ -269,34 +269,34 @@ { 0x00, 0x01, 0x02 // ... }) - CH03 (__METHOD__, Z058, 0x25, 0x0131, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Buffer() */ Local5 = B000 [0x02] - CH03 (__METHOD__, Z058, 0x26, 0x0137, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = B000 [0x03] - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x013B, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ Local0 = B000 [0x02] - CH03 (__METHOD__, Z058, 0x28, 0x013F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = B000 [0x03] - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0143, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ /* Buffer(3) */ Local5 = B001 [0x02] - CH03 (__METHOD__, Z058, 0x2A, 0x0149, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = B001 [0x03] - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x014D, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ Local0 = B001 [0x02] - CH03 (__METHOD__, Z058, 0x2C, 0x0151, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = B001 [0x03] - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0155, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } /* ToInteger() passed with an image of a number which value */ /* exceeds the maximum of an integer for the current mode. */ Method (M146, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x2E, 0x015E, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local0 = "0xffffffffffffffff" @@ -307,7 +307,7 @@ } ToInteger (Local0, Local5) - CH03 (__METHOD__, Z058, 0x2F, 0x0167, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local0 = "0x11111111111111111" @@ -318,7 +318,7 @@ } ToInteger (Local0, Local5) - CH04 (__METHOD__, 0x00, 0x2E, Z058, 0x0170, 0x00, 0x00) /* AE_AML_NO_OPERAND */ + CH04 (__METHOD__, 0x00, 0x2E, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_OPERAND */ } /* [Uninitialized] None. */ @@ -331,9 +331,9 @@ Local0 = 0x00 } - CH03 (__METHOD__, Z058, 0x31, 0x017E, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0++ - CH04 (__METHOD__, 0x00, 0x31, Z058, 0x0182, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (__METHOD__, 0x00, 0x31, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } Method (M148, 0, NotSerialized) @@ -345,18 +345,18 @@ Method (M149, 1, Serialized) { - CH03 (__METHOD__, Z058, 0x33, 0x0190, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Stall (Arg0) - CH03 (__METHOD__, Z058, 0x34, 0x0194, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } Method (M14A, 1, Serialized) { - CH03 (__METHOD__, Z058, 0x35, 0x019B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Stall (Arg0) /* It is now bug 14. */ - CH04 (__METHOD__, 0x00, 0x30, Z058, 0x01A0, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ + CH04 (__METHOD__, 0x00, 0x30, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ } /* Bug 14. */ @@ -388,9 +388,9 @@ /* 101 characters */ Local1 = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" - CH03 (__METHOD__, Z058, 0x37, 0x01C0, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Concatenate (Local0, Local0, Local5) - CH03 (__METHOD__, Z058, 0x38, 0x01C4, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Concatenate (Local0, Local1, Local5) /* * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT @@ -398,7 +398,7 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x39, 0x01CF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* ToDecimalString() when the number of result characters in string exceeds 200 */ @@ -441,9 +441,9 @@ /* 0058 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, // ........ /* 0060 */ 0x01, 0x01, 0x01, 0x01, 0x01 // ..... }) - CH03 (__METHOD__, Z058, 0x3A, 0x01EB, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToDecimalString (B000, Local5) - CH03 (__METHOD__, Z058, 0x3B, 0x01EF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToDecimalString (B001, Local5) /* * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT @@ -451,14 +451,14 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x3C, 0x01FA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* ToBCD() when a specified integer overflows a number of the BCD format */ Method (M14E, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x3D, 0x0202, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local4 = 0x002386F26FC0FFFF @@ -469,7 +469,7 @@ ToBCD (0x05F5E0FF, Local5) } - CH03 (__METHOD__, Z058, 0x3E, 0x020B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local4 = 0x002386F26FC10000 @@ -481,7 +481,7 @@ ToBCD (Local4, Local5) } - CH04 (__METHOD__, 0x00, 0x34, Z058, 0x0215, 0x00, 0x00) /* AE_AML_NUMERIC_OVERFLOW */ + CH04 (__METHOD__, 0x00, 0x34, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NUMERIC_OVERFLOW */ } /* Create field out of buffer */ @@ -489,41 +489,41 @@ Method (M14F, 0, Serialized) { Name (B001, Buffer (0x10){}) - CH03 (__METHOD__, Z058, 0x40, 0x021F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateBitField (B001, 0x7F, F000) - CH03 (__METHOD__, Z058, 0x41, 0x0221, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateBitField (B001, 0x80, F001) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0223, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x43, 0x0225, 0x00) + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateByteField (B001, 0x0F, F002) - CH03 (__METHOD__, Z058, 0x44, 0x0227, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateByteField (B001, 0x10, F003) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0229, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x46, 0x022B, 0x00) + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateWordField (B001, 0x0E, F004) - CH03 (__METHOD__, Z058, 0x47, 0x022D, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateWordField (B001, 0x0F, F005) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x022F, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x49, 0x0231, 0x00) + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateDWordField (B001, 0x0C, F006) - CH03 (__METHOD__, Z058, 0x4A, 0x0233, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateDWordField (B001, 0x0D, F007) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0235, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x4C, 0x0237, 0x00) + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateQWordField (B001, 0x08, F008) - CH03 (__METHOD__, Z058, 0x4D, 0x0239, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateQWordField (B001, 0x09, F009) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x023B, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x4F, 0x023D, 0x00) + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x7F, 0x01, F00A) - CH03 (__METHOD__, Z058, 0x50, 0x023F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x80, 0x01, F00B) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0241, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x52, 0x0243, 0x00) + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x78, 0x08, F00C) - CH03 (__METHOD__, Z058, 0x53, 0x0245, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x78, 0x09, F00D) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0247, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } /* Access to uninitialized local */ @@ -535,9 +535,9 @@ Local0 = 0x00 } - CH03 (__METHOD__, Z058, 0x55, 0x0253, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = Local0 [0x00] - CH04 (__METHOD__, 0x00, 0x31, Z058, 0x0257, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (__METHOD__, 0x00, 0x31, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } /* Access to an uninitialized element of package */ @@ -550,9 +550,9 @@ 0x01, 0x02 }) - CH03 (__METHOD__, Z058, 0x57, 0x0261, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = DerefOf (P000 [0x02]) - CH03 (__METHOD__, Z058, 0x58, 0x0265, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = DerefOf (P000 [0x03]) /* * Obsolete: @@ -565,15 +565,15 @@ * OBSOLETE July 2013. DerefOf on an empty package element now causes error * CH04(ts, 0, 62, z058, __LINE__, 0, 0) */ - CH04 (__METHOD__, 0x01, 0x33, Z058, 0x0274, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ Local5 = (DerefOf (P000 [0x03]) + 0x01) If (EXCV) { - CH04 (__METHOD__, 0x00, 0x33, Z058, 0x0279, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x00, 0x33, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } Else { - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x027B, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } Return (0x00) @@ -611,9 +611,9 @@ /* 0038 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, // ........ /* 0040 */ 0x01, 0x01, 0x01, 0x01 // .... }) - CH03 (__METHOD__, Z058, 0x5A, 0x0296, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToHexString (B000, Local5) - CH03 (__METHOD__, Z058, 0x5B, 0x029A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToHexString (B001, Local5) /* * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT @@ -621,7 +621,7 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x5C, 0x02A5, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* StartIndex in Match greater than the package size */ @@ -632,11 +632,11 @@ { 0x00 }) - CH03 (__METHOD__, Z058, 0x5D, 0x02AF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = Match (PAC0, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z058, 0x5E, 0x02B3, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = Match (PAC0, MTR, 0x00, MTR, 0x00, 0x01) - CH04 (__METHOD__, 0x01, 0x37, Z058, 0x02B7, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } /* Exeptional conditions of ConcatenateResTemplate */ @@ -652,13 +652,13 @@ Local0 = 0x00 Local2 = Buffer (Local0){} - CH03 (__METHOD__, Z058, 0x60, 0x02C7, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ConcatenateResTemplate (RT00, RT00, Local5) - CH03 (__METHOD__, Z058, 0x61, 0x02CB, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ConcatenateResTemplate (RT00, Local2, Local5) /* Bug 188. */ - CH03 (__METHOD__, Z058, 0x62, 0x02D0, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* CH04(ts, 0, 71, z058, __LINE__, 0, 0) // AE_AML_NO_RESOURCE_END_TAG */ /* One-element buffer */ Local2 = Buffer (0x01) @@ -674,11 +674,11 @@ */ If (EXCV) { - CH04 (__METHOD__, 0x00, 0x47, Z058, 0x02E0, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ + CH04 (__METHOD__, 0x00, 0x47, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ } Else { - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x02E2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* One-element 0x79 buffer */ @@ -690,7 +690,7 @@ ConcatenateResTemplate (RT00, Local2, Local5) /* Bug 189. */ - CH04 (__METHOD__, 0x00, 0x47, Z058, 0x02EC, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ + CH04 (__METHOD__, 0x00, 0x47, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ /* Not resource template buffer */ Local2 = Buffer (0x03) @@ -700,11 +700,11 @@ ConcatenateResTemplate (RT00, Local2, Local5) If (EXCV) { - CH04 (__METHOD__, 0x00, 0x47, Z058, 0x02F5, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ + CH04 (__METHOD__, 0x00, 0x47, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ } Else { - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x02F7, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Nearly resource template buffer */ @@ -716,7 +716,7 @@ ConcatenateResTemplate (RT00, Local2, Local5) /* Bug 190. */ - CH04 (__METHOD__, 0x00, 0x47, Z058, 0x0301, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ + CH04 (__METHOD__, 0x00, 0x47, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ /* Like resource template buffer */ Local2 = Buffer (0x05) @@ -726,14 +726,14 @@ ConcatenateResTemplate (RT00, Local2, Local5) If (EXCV) { - CH04 (__METHOD__, 0x00, 0x47, Z058, 0x030A, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ + CH04 (__METHOD__, 0x00, 0x47, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ } Else { - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x030C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } - CH03 (__METHOD__, Z058, 0xAB, 0x030F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* @@ -753,7 +753,7 @@ */ Method (M155, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x69, 0x0325, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = ("0x1111" + 0x00) /* * Obsolete: @@ -761,12 +761,12 @@ * * New: */ - CH03 (__METHOD__, Z058, 0x6A, 0x032F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((Local0 != 0x1111)) { /* Bug 63, Bugzilla 5329. */ - ERR (__METHOD__, Z058, 0x0332, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, Z058, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -781,43 +781,43 @@ { Local0 = 0x00 Name (B000, Buffer (Local0){}) - CH03 (__METHOD__, Z058, 0x6B, 0x0344, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Add, empty String */ Local5 = ("" + 0x00) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH03 (__METHOD__, Z058, 0x6C, 0x034A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Add, String filled with blanks */ Local5 = (" " + 0x00) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH03 (__METHOD__, Z058, 0x6D, 0x0350, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* ToInteger, empty String */ Local4 = "" ToInteger (Local4, Local5) - CH04 (__METHOD__, 0x00, 0x24, Z058, 0x0356, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x24, Z058, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ /* ToInteger, String filled with blanks */ Local4 = " " ToInteger (Local4, Local5) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH04 (__METHOD__, 0x00, 0x24, Z058, 0x035D, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x24, Z058, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ /* Add, zero-length Buffer */ Local5 = (B000 + 0x00) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0363, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ /* ToInteger, zero-length Buffer */ ToInteger (B000, Local5) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0369, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } /* ////////////////////////////////////////////////////////// */ @@ -829,15 +829,15 @@ Method (M157, 0, Serialized) { Name (I000, 0xAAAAAAAA) - CH03 (__METHOD__, Z058, 0x72, 0x0379, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Store (I000 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x037D, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = I000 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x0381, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (I000 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0385, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = I000 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0389, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Bug 83 */ @@ -845,15 +845,15 @@ Method (M158, 0, Serialized) { Name (I000, 0xAAAAAAAA) - CH03 (__METHOD__, Z058, 0x77, 0x0394, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Bug 83, Bugzilla 5387. */ Local5 = DerefOf (I000) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0399, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (I000) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x039E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Index(Local7-Integer) */ @@ -862,23 +862,23 @@ { Name (I000, 0xAAAAAAAA) Local7 = I000 /* \M087.I000 */ - CH03 (__METHOD__, Z058, 0x7A, 0x03AB, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Index(Integer) */ Store (Local7 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x03B1, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = Local7 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x03B5, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (Local7 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03B9, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = Local7 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03BD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) /* DerefOf(Integer) */ Local5 = DerefOf (Local7) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03C3, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (Local7) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03C7, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Index(Buffer Field) */ @@ -891,17 +891,17 @@ /* 0008 */ 0x09 // . }) CreateField (B000, 0x00, 0x08, BF00) - CH03 (__METHOD__, Z058, 0x81, 0x03D2, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Store (BF00 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x03D6, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = BF00 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x03DA, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (BF00 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03DE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Store (BF00 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03E2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = BF00 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03E6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Bug 83 */ @@ -914,15 +914,15 @@ /* 0008 */ 0x09 // . }) CreateField (B000, 0x00, 0x08, BF00) - CH03 (__METHOD__, Z058, 0x87, 0x03F2, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = DerefOf (BF00) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03F7, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (BF00) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03FC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Index(Field Unit) */ @@ -953,43 +953,43 @@ IF01, 1 } - CH03 (__METHOD__, Z058, 0x8A, 0x040A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Field */ Store (F000 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x0410, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = F000 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x0414, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (F000 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0418, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Store (F000 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x041C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = F000 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0420, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) /* BankField */ Store (BKF0 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x0426, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = BKF0 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x042A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (BKF0 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x042E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Store (BKF0 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0432, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = BKF0 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0436, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) /* IndexField */ Store (IF00 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x043C, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = IF00 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x0440, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (IF00 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0444, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Store (IF00 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0448, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = IF00 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x044C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Bug 83 */ @@ -1020,37 +1020,37 @@ IF01, 1 } - CH03 (__METHOD__, Z058, 0x9A, 0x045B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Field */ Local5 = DerefOf (F000) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0462, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (F000) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0467, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) /* BankField */ Local5 = DerefOf (BKF0) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x046E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (BKF0) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0473, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) /* IndexField */ Local5 = DerefOf (IF00) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x047A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (IF00) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x047F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* UPDATE exc.m084: Implement this test for all the types of objects */ @@ -1072,7 +1072,7 @@ }) } - CH03 (__METHOD__, Z058, 0xA1, 0x0490, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Discuss: now the ObjectType doesnt cause exception! Is it correct? Understand and discuss it. @@ -1088,14 +1088,14 @@ Store (P000 [0x00], Local0) If (!Arg0) { - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x04A5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } Else { - CH03 (__METHOD__, Z058, 0xA7, 0x04A7, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } - CH03 (__METHOD__, Z058, 0xA8, 0x04AA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } Method (MF9D, 0, NotSerialized) @@ -1123,12 +1123,12 @@ { } - CH03 ("mf9d", Z058, 0xAB, 0x04C4, 0x00) + CH03 ("mf9d", Z058, __LINE__, 0x00, 0x00) M000 () - CH04 ("mf9d", 0x00, 0xFF, Z058, 0x04C8, 0x00, 0x00) - CH03 ("mf9d", Z058, 0xAD, 0x04CA, 0x00) + CH04 ("mf9d", 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) + CH03 ("mf9d", Z058, __LINE__, 0x00, 0x00) M001 () - CH04 ("mf9d", 0x00, 0xFF, Z058, 0x04CE, 0x00, 0x00) + CH04 ("mf9d", 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Access out of OpRegion and DataTableRegion */ @@ -1191,13 +1191,13 @@ } Local3 = RefOf (Local2) - CH03 (__METHOD__, Z058, 0x04F6, 0x00, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Write: except DataTableRegion */ If ((Local1 < 0x03)) { DerefOf (Local3) = 0x12345678 - CH04 (__METHOD__, 0x00, 0x35, Z058, 0x04FB, 0x00, 0x00)/* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x00, 0x35, Z058, __LINE__, 0x00, 0x00)/* AE_AML_REGION_LIMIT */ } /* Read */ @@ -1212,7 +1212,7 @@ * Indicate we only care about the first by placing a 1 * in the second argument */ - CH04 (__METHOD__, 0x01, 0x35, Z058, 0x050A, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x01, 0x35, Z058, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ Local0-- Local1++ } @@ -1274,11 +1274,11 @@ FU01, 8 } - CH03 (__METHOD__, Z058, 0xBF, 0x053F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) FU00 = 0x12 - CH04 (__METHOD__, 0x00, 0x35, Z058, 0x0543, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x00, 0x35, Z058, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ FU01 = 0x12 - CH04 (__METHOD__, 0x00, 0x35, Z058, 0x0547, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x00, 0x35, Z058, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ } /* Attempt to write into DataTableRegion */ @@ -1292,9 +1292,9 @@ } Local0 = FU00 /* \M70B.FU00 */ - CH03 (__METHOD__, Z058, 0xC2, 0x0556, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) FU00 = 0x00 - CH04 (__METHOD__, 0x00, 0x10, Z058, 0x055A, 0x00, 0x00) /* AE_SUPPORT */ + CH04 (__METHOD__, 0x00, 0x10, Z058, __LINE__, 0x00, 0x00) /* AE_SUPPORT */ } /* Check non-String DataTableRegion *String arguments */ @@ -1310,19 +1310,19 @@ { 0x12 }) - CH03 (__METHOD__, Z058, 0xC1, 0x0566, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) DataTableRegion (DR00, B000, "", "") - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0569, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR01, "SSDT", B000, "") - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x056C, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR02, "SSDT", "", B000) - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x056F, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR03, I000, "", "") - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0572, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR04, "SSDT", I000, "") - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0575, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR05, "SSDT", "", I000) - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0578, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ /* These are now caught by the compiler - Aug 2015 */ /* */ /* DataTableRegion (DR06, p000, "", i000) */ @@ -1349,11 +1349,11 @@ /* Create improper SMBus data buffer */ Name (BUFF, Buffer (0x21){}) - CH03 (__METHOD__, Z058, 0xCD, 0x0595, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Invoke Write Quick transaction */ FLD0 = BUFF /* \M7F6.BUFF */ - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x059A, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } /* Name space issues */ @@ -1376,12 +1376,12 @@ Local1 = M000 () If ((Local0 != 0xABCD0000)) { - ERR (__METHOD__, Z058, 0x05B3, 0x00, 0x00, Local0, 0xABCD0000) + ERR (__METHOD__, Z058, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } If ((Local1 != 0xABCD0001)) { - ERR (__METHOD__, Z058, 0x05B7, 0x00, 0x00, Local1, 0xABCD0001) + ERR (__METHOD__, Z058, __LINE__, 0x00, 0x00, Local1, 0xABCD0001) } } @@ -1392,18 +1392,18 @@ Return (0xABCD0002) } - CH03 (__METHOD__, Z058, 0xD0, 0x05C2, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) M004 () - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x05C4, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } Method (M003, 0, NotSerialized) { /* Recursion */ - CH03 (__METHOD__, Z058, 0xD0, 0x05CA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) M003 () - CH04 (__METHOD__, 0x00, 0x54, Z058, 0x05CC, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */ + CH04 (__METHOD__, 0x00, 0x54, Z058, __LINE__, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */ Method (M003, 0, NotSerialized) { Return (0xABCD0002) 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 676c95b..c13037f 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 @@ -52,7 +52,7 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z092, 0x01, 0x3B, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) @@ -92,11 +92,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z092, 0x02, 0x6D, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z092, 0x03, 0x72, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -344,7 +344,7 @@ /* DeRefOf(Index(Package, Ind)) */ Local1 = DerefOf (P000 [0x00]) - CH04 (__METHOD__, 0x01, 0x33, Z092, 0x01A2, 0x00, 0x00) + CH04 (__METHOD__, 0x01, 0x33, Z092, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (P000 [0x00]), Local1) @@ -390,7 +390,7 @@ If (X104) { Local1 = ObjectType (DerefOf (P000 [0x00])) - CH03 (__METHOD__, Z092, 0x05, 0x01DA, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) } /* RefOf */ @@ -947,12 +947,12 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x00)) { - ERR (Arg0, Z092, 0x04F4, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, Local0, 0x00) Return (0x01) } Local1 = DerefOf (Arg1) - CH04 (__METHOD__, 0x00, 0x3E, Z092, 0x04F9, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x3E, Z092, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) @@ -998,7 +998,7 @@ If (X104) { Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z092, 0x0B, 0x0531, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) } /* RefOf */ @@ -1378,7 +1378,7 @@ CH06 (Arg0, 0x00, 0x33) If ((I001 != 0x00)) { - ERR (Arg0, Z092, 0x06F3, 0x00, 0x00, I001, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } I001 = 0x00 @@ -1387,7 +1387,7 @@ CH06 (Arg0, 0x02, 0x33) If ((I001 != 0x00)) { - ERR (Arg0, Z092, 0x06FB, 0x00, 0x00, I001, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } I001 = 0x00 @@ -1395,7 +1395,7 @@ CH06 (Arg0, 0x04, 0x33) If ((I001 != 0x00)) { - ERR (Arg0, Z092, 0x0702, 0x00, 0x00, I001, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } I001 = 0x00 @@ -1404,7 +1404,7 @@ CH06 (Arg0, 0x06, 0x33) If ((I001 != 0x00)) { - ERR (Arg0, Z092, 0x070A, 0x00, 0x00, I001, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } I001 = 0x00 @@ -1413,11 +1413,11 @@ CH06 (Arg0, 0x08, 0x33) If ((I001 != 0x00)) { - ERR (Arg0, Z092, 0x0712, 0x00, 0x00, I001, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } } - CH03 (__METHOD__, Z092, 0x0C, 0x0716, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* Uninitialized Local */ M000 (Concatenate (__METHOD__, "-m000"), 0x00) @@ -1517,7 +1517,7 @@ CH06 (__METHOD__, 0x09, 0x31) If ((I001 != 0x00)) { - ERR (__METHOD__, Z092, 0x077B, 0x00, 0x00, I001, 0x00) + ERR (__METHOD__, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } /* Uninitialized element of Package as parameter of a method */ 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 c81350d..376691d 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 @@ -243,12 +243,12 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x01)) { - ERR (Arg0, Z093, 0xF7, 0x00, 0x00, Local0, 0x01) + ERR (Arg0, Z093, __LINE__, 0x00, 0x00, Local0, 0x01) Return (0x01) } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z093, 0x00, 0xFC, 0x00) + CH03 (__METHOD__, Z093, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x2F, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) @@ -274,7 +274,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z093, 0x0119, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z093, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -349,7 +349,7 @@ { If ((I001 != Arg1)) { - ERR (Arg0, Z093, 0x015D, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z093, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -360,7 +360,7 @@ Local0 = (0x03 * LPC0) /* \M4B1.M007.LPC0 */ I001 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z093, 0x016A, 0x00, 0x00) + CH03 (__METHOD__, Z093, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x3C + Local0), 0x2F) @@ -376,7 +376,7 @@ } } - CH03 (__METHOD__, Z093, 0x03, 0x017E, 0x00) + CH03 (__METHOD__, Z093, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 3c31be6..0ce3cca 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 @@ -57,7 +57,7 @@ /* Index */ Local1 = S000 [0x00] - CH03 (__METHOD__, Z094, 0x01, 0x42, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* ConcatenateResTemplate */ ConcatenateResTemplate (S000, Buffer (0x02) @@ -85,7 +85,7 @@ /* Index */ Local1 = S100 [0x00] - CH03 (__METHOD__, Z094, 0x03, 0x59, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* ConcatenateResTemplate */ ConcatenateResTemplate (S100, Buffer (0x02) @@ -139,7 +139,7 @@ /* Index */ Local1 = Arg1 [0x00] - CH03 (__METHOD__, Z094, 0x05, 0x8C, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* Wait */ Local1 = Wait (Arg1, 0x00) @@ -190,7 +190,7 @@ /* Index */ Local1 = Local0 [0x00] - CH03 (__METHOD__, Z094, 0x07, 0xC2, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* Wait */ Local1 = Wait (Local0, 0x00) @@ -214,7 +214,7 @@ Local1 = DerefOf (DerefOf (P000 [0x00])) CH06 (Arg0, 0x20, 0x05) Store (DerefOf (P000 [0x00]) [0x00], Local1) - CH03 (__METHOD__, Z094, 0x08, 0xDA, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x21, 0x2F) @@ -223,7 +223,7 @@ Local1 = DerefOf (DerefOf (Local0 = P000 [0x00])) CH06 (Arg0, 0x22, 0x05) Store (DerefOf (Local0 = P000 [0x00]) [0x00], Local1) - CH03 (__METHOD__, Z094, 0x09, 0xE5, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x23, 0x2F) @@ -238,16 +238,16 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x02)) { - ERR (Arg0, Z094, 0xF3, 0x00, 0x00, Local0, 0x02) + ERR (Arg0, Z094, __LINE__, 0x00, 0x00, Local0, 0x02) Return (0x01) } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z094, 0x0A, 0xF8, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x25, 0x05) Store (DerefOf (Arg1) [0x00], Local1) - CH03 (__METHOD__, Z094, 0x0B, 0xFE, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x26, 0x2F) Return (0x00) @@ -269,7 +269,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z094, 0x0115, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z094, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -304,16 +304,16 @@ CH00 (Arg0, 0x05) } - CH03 (__METHOD__, Z094, 0x0C, 0x0135, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Store (M000 (0x06) [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z094, 0x0C, 0x0138, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x06) } Else { - CH04 (__METHOD__, 0x00, 0x55, Z094, 0x013B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } Local1 = Wait (M000 (0x07), 0x00) @@ -353,7 +353,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z094, 0x015E, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z094, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -364,7 +364,7 @@ Local0 = (0x03 * LPC0) /* \M4B2.M007.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z094, 0x016B, 0x00, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x30 + Local0), 0x2F) @@ -380,7 +380,7 @@ } } - CH03 (__METHOD__, Z094, 0x0F, 0x017F, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 e82919f..490712d 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 @@ -60,7 +60,7 @@ } Store (B000 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x00, 0x3C, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) } /* Global Named Object */ @@ -74,7 +74,7 @@ } Store (B100 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x01, 0x48, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) } /* Argument */ @@ -92,7 +92,7 @@ Local1 = Acquire (Arg1, 0x0000) CH06 (Arg0, 0x06, 0x2F) Store (Arg1 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x02, 0x5E, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Wait (Arg1, 0x00) CH06 (Arg0, 0x07, 0x2F) Local1 = Match (Arg1, MTR, 0x00, MTR, 0x00, 0x00) @@ -118,7 +118,7 @@ Local1 = Acquire (Local0, 0x0000) CH06 (Arg0, 0x0D, 0x2F) Store (Local0 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x03, 0x7C, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Wait (Local0, 0x00) CH06 (Arg0, 0x0E, 0x2F) Local1 = Match (Local0, MTR, 0x00, MTR, 0x00, 0x00) @@ -141,7 +141,7 @@ Local1 = DerefOf (DerefOf (Local0 = P000 [0x00])) CH06 (Arg0, 0x12, 0x2F) Store (DerefOf (Local0 = P000 [0x00]) [0x00], Local1) - CH03 (__METHOD__, Z095, 0x05, 0x90, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x13, 0x2F) @@ -156,16 +156,16 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x03)) { - ERR (Arg0, Z095, 0x9E, 0x00, 0x00, Local0, 0x03) + ERR (Arg0, Z095, __LINE__, 0x00, 0x00, Local0, 0x03) Return (0x01) } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z095, 0x06, 0xA3, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x15, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) - CH03 (__METHOD__, Z095, 0x07, 0xA9, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x16, 0x2F) Return (0x00) @@ -190,7 +190,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z095, 0xC0, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z095, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -225,16 +225,16 @@ CH00 (Arg0, 0x05) } - CH03 (__METHOD__, Z095, 0x0C, 0xE0, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Store (M000 (0x06) [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z095, 0x08, 0xE3, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x06) } Else { - CH04 (__METHOD__, 0x00, 0x55, Z095, 0xE6, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z095, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } Local1 = Wait (M000 (0x07), 0x00) @@ -277,7 +277,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z095, 0x0109, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z095, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -288,7 +288,7 @@ Local0 = (0x03 * LPC0) /* \M4B3.M007.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z095, 0x0116, 0x00, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x20 + Local0), 0x2F) @@ -304,7 +304,7 @@ } } - CH03 (__METHOD__, Z095, 0x0B, 0x012A, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 97b5598..342d42b 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 @@ -59,13 +59,13 @@ /* CondRefOf */ Local1 = CondRefOf (P000) - CH03 (__METHOD__, Z096, 0x00, 0x3F, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CondRefOf (P000, Local1) - CH03 (__METHOD__, Z096, 0x01, 0x42, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (P000, Local1) - CH03 (__METHOD__, Z096, 0x02, 0x47, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ /* DerefOf */ /* These are now caught by the compiler - Aug 2015 @@ -82,22 +82,22 @@ /* Not */ /* ObjectType */ Local1 = ObjectType (P000) - CH03 (__METHOD__, Z096, 0x03, 0x63, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (P000) - CH03 (__METHOD__, Z096, 0x04, 0x68, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ /* Reset */ /* Signal */ /* SizeOf */ Local1 = SizeOf (P000) - CH03 (__METHOD__, Z096, 0x05, 0x73, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ /* Stall */ /* Store */ Local1 = P000 /* \M4B4.M000.P000 */ - CH03 (__METHOD__, Z096, 0x06, 0x7C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ /* ToBuffer */ /* ToDecimalString */ @@ -112,9 +112,9 @@ /* Fatal */ /* Index */ Local1 = P000 [0x00] - CH03 (__METHOD__, Z096, 0x07, 0x99, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Store (P000 [0x00], Local1) - CH03 (__METHOD__, Z096, 0x08, 0x9C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* LEqual */ /* LGreater */ /* LGreaterEqual */ @@ -136,7 +136,7 @@ /* Mid */ /* Match */ Local1 = Match (P000, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x09, 0xC7, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) } /* Global Named Object */ @@ -146,11 +146,11 @@ /* CondRefOf */ CondRefOf (P100, Local1) - CH03 (__METHOD__, Z096, 0x0B, 0xD0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (P100, Local1) - CH03 (__METHOD__, Z096, 0x0C, 0xD5, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ /* DerefOf */ /* These are now caught by the compiler - Aug 2015 @@ -167,22 +167,22 @@ /* Not */ /* ObjectType */ Local1 = ObjectType (P100) - CH03 (__METHOD__, Z096, 0x0D, 0xF0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (P100) - CH03 (__METHOD__, Z096, 0x0E, 0xF5, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ /* Reset */ /* Signal */ /* SizeOf */ Local1 = SizeOf (P100) - CH03 (__METHOD__, Z096, 0x0F, 0x0100, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ /* Stall */ /* Store */ Local1 = P100 /* \P100 */ - CH03 (__METHOD__, Z096, 0x10, 0x0109, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ /* ToBuffer */ /* ToDecimalString */ @@ -197,7 +197,7 @@ /* Fatal */ /* Index */ Store (P100 [0x00], Local1) - CH03 (__METHOD__, Z096, 0x12, 0x0126, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* LEqual */ /* LGreater */ /* LGreaterEqual */ @@ -219,7 +219,7 @@ /* Mid */ /* Match */ Local1 = Match (P100, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x13, 0x0151, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) } /* Argument */ @@ -230,11 +230,11 @@ /* CondRefOf */ CondRefOf (Arg1, Local1) - CH03 (__METHOD__, Z096, 0x15, 0x015C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Arg1, Local1) - CH03 (__METHOD__, Z096, 0x16, 0x0161, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ Arg1-- @@ -270,11 +270,11 @@ /* ObjectType */ Local1 = ObjectType (Arg1) - CH03 (__METHOD__, Z096, 0x17, 0x018E, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Arg1) - CH03 (__METHOD__, Z096, 0x18, 0x0193, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ Release (Arg1) @@ -290,7 +290,7 @@ /* SizeOf */ Local1 = SizeOf (Arg1) - CH03 (__METHOD__, Z096, 0x19, 0x01A7, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (Arg1) @@ -302,7 +302,7 @@ /* Store */ Local1 = Arg1 - CH03 (__METHOD__, Z096, 0x1A, 0x01B6, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (Arg1, Local1) @@ -374,7 +374,7 @@ /* Index */ Local1 = Arg1 [0x00] - CH03 (__METHOD__, Z096, 0x1C, 0x020C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", Arg1, Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -496,7 +496,7 @@ /* Match */ Local1 = Match (Arg1, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x1D, 0x02AF, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -525,11 +525,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z096, 0x1F, 0x02C3, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z096, 0x20, 0x02C8, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -565,11 +565,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z096, 0x21, 0x02F5, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z096, 0x22, 0x02FA, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -585,7 +585,7 @@ /* SizeOf */ Local1 = SizeOf (Local0) - CH03 (__METHOD__, Z096, 0x23, 0x030E, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (Local0) @@ -597,7 +597,7 @@ /* Store */ Local1 = Local0 - CH03 (__METHOD__, Z096, 0x24, 0x031D, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (Local0, Local1) @@ -667,7 +667,7 @@ /* Index */ Local1 = Local0 [0x00] - CH03 (__METHOD__, Z096, 0x26, 0x0370, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", Local0, Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -789,7 +789,7 @@ /* Match */ Local1 = Match (Local0, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x27, 0x0413, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -825,7 +825,7 @@ /* CopyObject */ CopyObject (DerefOf (P000 [0x00]), Local1) - CH03 (__METHOD__, Z096, 0x28, 0x042E, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (P000 [0x00])-- @@ -861,7 +861,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (P000 [0x00])) - CH03 (__METHOD__, Z096, 0x29, 0x045B, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (P000 [0x00])) @@ -871,7 +871,7 @@ /* Signal */ /* SizeOf */ Local1 = SizeOf (DerefOf (P000 [0x00])) - CH03 (__METHOD__, Z096, 0x2A, 0x046B, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (DerefOf (P000 [0x00])) @@ -883,7 +883,7 @@ /* Store */ Local1 = DerefOf (P000 [0x00]) - CH03 (__METHOD__, Z096, 0x2B, 0x047A, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (DerefOf (P000 [0x00]), Local1) @@ -951,7 +951,7 @@ /* Index */ Local1 = DerefOf (P000 [0x00]) [0x00] - CH03 (__METHOD__, Z096, 0x2D, 0x04CD, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", DerefOf (P000 [0x00]), Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -1072,7 +1072,7 @@ Local1 = Match (DerefOf (P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x2E, 0x056D, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -1095,7 +1095,7 @@ /* CopyObject */ CopyObject (DerefOf (Local0 = P000 [0x00]), Local1) - CH03 (__METHOD__, Z096, 0x2F, 0x0583, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Local0 = P000 [0x00])-- @@ -1131,7 +1131,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Local0 = P000 [0x00])) - CH03 (__METHOD__, Z096, 0x30, 0x05B0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Local0 = P000 [0x00])) @@ -1141,7 +1141,7 @@ /* Signal */ /* SizeOf */ Local1 = SizeOf (DerefOf (Local0 = P000 [0x00])) - CH03 (__METHOD__, Z096, 0x31, 0x05C0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (DerefOf (Local0 = P000 [0x00])) @@ -1153,7 +1153,7 @@ /* Store */ Local1 = DerefOf (Local0 = P000 [0x00]) - CH03 (__METHOD__, Z096, 0x32, 0x05CF, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (DerefOf (Local0 = P000 [0x00]), Local1) @@ -1221,7 +1221,7 @@ /* Index */ Local1 = DerefOf (Local0 = P000 [0x00]) [0x00] - CH03 (__METHOD__, Z096, 0x34, 0x0622, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", DerefOf (Local0 = P000 [0x00]), Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -1342,7 +1342,7 @@ Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x35, 0x06C2, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -1369,12 +1369,12 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x04)) { - ERR (Arg0, Z096, 0x06D6, 0x00, 0x00, Local0, 0x04) + ERR (Arg0, Z096, __LINE__, 0x00, 0x00, Local0, 0x04) Return (0x01) } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z096, 0x36, 0x06DB, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CondRefOf */ Local1 = CondRefOf (DerefOf (Arg1)) @@ -1384,7 +1384,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z096, 0x37, 0x06E8, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -1420,7 +1420,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z096, 0x38, 0x0715, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -1430,7 +1430,7 @@ /* Signal */ /* SizeOf */ Local1 = SizeOf (DerefOf (Arg1)) - CH03 (__METHOD__, Z096, 0x39, 0x0725, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (DerefOf (Arg1)) @@ -1442,7 +1442,7 @@ /* Store */ Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z096, 0x3A, 0x0734, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (DerefOf (Arg1), Local1) @@ -1510,7 +1510,7 @@ /* Index */ Local1 = DerefOf (Arg1) [0x00] - CH03 (__METHOD__, Z096, 0x3C, 0x0787, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", DerefOf (Arg1), Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -1630,7 +1630,7 @@ /* Match */ Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x3D, 0x0827, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -1679,7 +1679,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z096, 0x3E, 0x0852, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -1715,7 +1715,7 @@ /* **** ObjectType */ /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z096, 0x3F, 0x0880, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1818,22 +1818,22 @@ If (Y900) { Local1 = M000 () [0x00] - CH03 (__METHOD__, Z096, 0x41, 0x08FF, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", M000 (), Local1) CH06 (Arg0, 0x39, 0x2F) } Else { - CH03 (__METHOD__, Z096, 0x0123, 0x0904, 0x00) - CH03 (__METHOD__, Z096, 0x0127, 0x0905, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = M000 () [0x00] - CH04 (__METHOD__, 0x00, 0x55, Z094, 0x0907, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ - CH03 (__METHOD__, Z096, 0x0129, 0x0909, 0x00) + CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", M000 (), Local1) - CH04 (__METHOD__, 0x00, 0xFF, Z094, 0x090B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ - CH03 (__METHOD__, Z096, 0x0129, 0x090D, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = SS00 [M000 ()] - CH04 (__METHOD__, 0x00, 0x2F, Z094, 0x090F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x2F, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* LEqual */ @@ -1955,7 +1955,7 @@ /* Match */ Local1 = Match (M000 (), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x42, 0x09B0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -2001,7 +2001,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z096, 0x09D1, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z096, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -2012,7 +2012,7 @@ Local0 = (0x03 * LPC0) /* \M4B4.M007.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z096, 0x09DE, 0x00, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x01 + Local0), 0x2F) @@ -2047,7 +2047,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z096, 0x0A01, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z096, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -2117,16 +2117,16 @@ /* Index */ - CH03 (__METHOD__, Z094, 0x0123, 0x0A48, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Store (M000 (0x09) [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z096, 0x45, 0x0A4B, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x09) } Else { - CH04 (__METHOD__, 0x00, 0x55, Z094, 0x0A4E, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Wait */ @@ -2141,12 +2141,12 @@ /* Match */ Local1 = Match (M000 (0x0B), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x46, 0x0A5C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x0B) } SET0 (Z096, __METHOD__, 0x00) - CH03 (__METHOD__, Z096, 0x46, 0x0A62, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 af6699f..4b866bc 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 @@ -92,11 +92,11 @@ Store (FU03 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z097, 0x00, 0x5A, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { - CH04 (__METHOD__, 0x00, 0x55, Z094, 0x5C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } @@ -127,11 +127,11 @@ Store (FU01 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z097, 0x01, 0x79, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { - CH04 (__METHOD__, 0x00, 0x55, Z094, 0x7B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } @@ -144,12 +144,12 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x05)) { - ERR (Arg0, Z097, 0x87, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z097, __LINE__, 0x00, 0x00, Local0, 0x05) Return (0x01) } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z097, 0x02, 0x8C, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x07, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) @@ -159,11 +159,11 @@ If (Y900) { - CH03 (__METHOD__, Z097, 0x03, 0x96, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { - CH04 (__METHOD__, 0x00, 0x55, Z097, 0x98, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z097, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else @@ -217,7 +217,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z097, 0xC1, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z097, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -232,7 +232,7 @@ Local0 = (0x03 * LPC0) /* \M4B5.M003.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z097, 0xD3, 0x00, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x0B + Local0), 0x2F) @@ -244,11 +244,11 @@ If (Y900) { - CH03 (__METHOD__, Z097, 0xDF, 0x00, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { - CH04 (__METHOD__, 0x00, 0x55, Z097, 0xE1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z097, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else @@ -267,7 +267,7 @@ } } - CH03 (__METHOD__, Z097, 0x0C, 0xF2, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 80a8884..7e77aca 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 @@ -78,11 +78,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z098, 0x01, 0x56, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z098, 0x02, 0x5B, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -118,11 +118,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z098, 0x03, 0x88, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z098, 0x04, 0x8D, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -370,7 +370,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x06)) { - ERR (Arg0, Z098, 0x01BC, 0x00, 0x00, Local0, 0x06) + ERR (Arg0, Z098, __LINE__, 0x00, 0x00, Local0, 0x06) Return (0x01) } @@ -383,7 +383,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z098, 0x05, 0x01C7, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) @@ -427,7 +427,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z098, 0x06, 0x01FE, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -675,7 +675,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z098, 0x07, 0x0334, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -711,7 +711,7 @@ /* **** ObjectType */ /* Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z098, 0x08, 0x0362, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* Store (RefOf(m000()), Local1) */ @@ -982,7 +982,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z098, 0x04A5, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z098, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -993,7 +993,7 @@ Local0 = (0x03 * LPC0) /* \M4B6.M005.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z098, 0x04B2, 0x00, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x01 + Local0), 0x2F) @@ -1009,7 +1009,7 @@ } } - CH03 (__METHOD__, Z098, 0x0B, 0x04C6, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Local Named Object */ /* m000(ts) */ /* Global Named Object */ 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 8bca445..cfac31b 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 @@ -69,11 +69,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z099, 0x01, 0x57, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z099, 0x02, 0x5C, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -109,11 +109,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z099, 0x03, 0x89, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z099, 0x04, 0x8E, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -121,11 +121,11 @@ /* Reset */ Reset (Local0) - CH03 (__METHOD__, Z099, 0x0E, 0x98, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Signal */ Signal (Local0) - CH03 (__METHOD__, Z099, 0x0F, 0x9D, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* SizeOf */ Local1 = SizeOf (Local0) @@ -315,7 +315,7 @@ /* Wait */ Local1 = Wait (Local0, I000) - CH03 (__METHOD__, Z099, 0x6C, 0x018F, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) Local1 = Wait (E000, Local0) CH06 (Arg0, 0x6D, 0x2F) /* XOr */ @@ -360,14 +360,14 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x07)) { - ERR (Arg0, Z099, 0x01BB, 0x00, 0x00, Local0, 0x07) + ERR (Arg0, Z099, __LINE__, 0x00, 0x00, Local0, 0x07) Return (0x01) } Local1 = DerefOf (Arg1) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z099, 0x01C1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z099, __LINE__, 0x00, 0x00) } /* CondRefOf */ @@ -377,7 +377,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z099, 0x02, 0x01CC, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -413,7 +413,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z099, 0x06, 0x01F9, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -667,7 +667,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z099, 0x07, 0x0334, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -703,7 +703,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z099, 0x08, 0x0362, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -973,7 +973,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z099, 0x04A7, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z099, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -986,7 +986,7 @@ Local1 = DerefOf (M000 (0x01, LPC0)) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z099, 0x04B5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z099, __LINE__, 0x00, 0x00) } CH00 (Arg0, 0x01) @@ -1009,7 +1009,7 @@ } SET0 (Z099, __METHOD__, 0x00) - CH03 (__METHOD__, Z099, 0x0B, 0x04CE, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Local Named Object */ /* m000(ts) */ /* Global Named Object */ 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 47f83cd..a838961 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 @@ -90,11 +90,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z100, 0x01, 0x55, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z100, 0x02, 0x5A, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -130,11 +130,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z100, 0x03, 0x87, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z100, 0x04, 0x8C, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -381,14 +381,14 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x08)) { - ERR (Arg0, Z100, 0x01B9, 0x00, 0x00, Local0, 0x08) + ERR (Arg0, Z100, __LINE__, 0x00, 0x00, Local0, 0x08) Return (0x01) } Local1 = DerefOf (Arg1) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z100, 0x01BF, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z100, __LINE__, 0x00, 0x00) } /* CondRefOf */ @@ -398,7 +398,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z100, 0x02, 0x01CA, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -434,7 +434,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z100, 0x06, 0x01F7, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -688,7 +688,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z100, 0x07, 0x0331, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -724,7 +724,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z100, 0x08, 0x035F, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -998,7 +998,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z100, 0x04A4, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z100, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -1011,7 +1011,7 @@ Local1 = DerefOf (M000 (0x01, LPC0)) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z100, 0x04B2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z100, __LINE__, 0x00, 0x00) } CH00 (Arg0, 0x01) @@ -1034,7 +1034,7 @@ } SET0 (Z100, __METHOD__, 0x00) - CH03 (__METHOD__, Z100, 0x0B, 0x04CB, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 52500f9..6092f99 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 @@ -76,11 +76,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z101, 0x01, 0x5A, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z101, 0x02, 0x5F, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -116,11 +116,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z101, 0x03, 0x8C, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z101, 0x04, 0x91, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -172,7 +172,7 @@ /* Acquire */ Local1 = Acquire (Local0, 0x0064) - CH03 (__METHOD__, Z101, 0x1E, 0xD2, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Add */ Local1 = (Local0 + I000) /* \M4B9.I000 */ @@ -367,14 +367,14 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x09)) { - ERR (Arg0, Z101, 0x01BE, 0x00, 0x00, Local0, 0x09) + ERR (Arg0, Z101, __LINE__, 0x00, 0x00, Local0, 0x09) Return (0x01) } Local1 = DerefOf (Arg1) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z101, 0x01C4, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z101, __LINE__, 0x00, 0x00) } /* CondRefOf */ @@ -384,7 +384,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z101, 0x02, 0x01CE, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -420,7 +420,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z101, 0x06, 0x01FB, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -674,7 +674,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z101, 0x07, 0x0335, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -710,7 +710,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z101, 0x08, 0x0363, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -980,7 +980,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z101, 0x04A8, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z101, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -993,7 +993,7 @@ Local1 = DerefOf (M000 (0x01, LPC0)) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z101, 0x04B6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z101, __LINE__, 0x00, 0x00) } CH00 (Arg0, 0x01) @@ -1016,7 +1016,7 @@ } SET0 (Z101, __METHOD__, 0x00) - CH03 (__METHOD__, Z101, 0x0B, 0x04CF, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 4f2273e..c825f44 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 @@ -74,13 +74,13 @@ /* CondRefOf */ Local1 = CondRefOf (Local0) - CH03 (__METHOD__, Z102, 0x00, 0x58, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z102, 0x01, 0x5B, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z102, 0x02, 0x60, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -116,11 +116,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z102, 0x03, 0x8D, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z102, 0x04, 0x92, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -367,12 +367,12 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x0A)) { - ERR (Arg0, Z102, 0x01BF, 0x00, 0x00, Local0, 0x0A) + ERR (Arg0, Z102, __LINE__, 0x00, 0x00, Local0, 0x0A) Return (0x01) } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z102, 0x05, 0x01C4, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) @@ -416,7 +416,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z102, 0x06, 0x01FB, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -664,7 +664,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z102, 0x07, 0x0330, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -700,7 +700,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z102, 0x08, 0x035E, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* Store (RefOf(m000()), Local1) */ @@ -968,7 +968,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z102, 0x04A1, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z102, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -995,7 +995,7 @@ } } - CH03 (__METHOD__, Z102, 0x0B, 0x04C2, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 6cd9108..4c0a602 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 @@ -97,11 +97,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z103, 0x01, 0x59, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z103, 0x02, 0x5E, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -137,11 +137,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z103, 0x03, 0x8B, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z103, 0x04, 0x90, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -388,14 +388,14 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x0B)) { - ERR (Arg0, Z103, 0x01BD, 0x00, 0x00, Local0, 0x0B) + ERR (Arg0, Z103, __LINE__, 0x00, 0x00, Local0, 0x0B) Return (0x01) } Local1 = DerefOf (Arg1) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z103, 0x01C3, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z103, __LINE__, 0x00, 0x00) } /* CondRefOf */ @@ -405,7 +405,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z103, 0x02, 0x01CE, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -441,7 +441,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z103, 0x06, 0x01FB, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -695,7 +695,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z103, 0x07, 0x0335, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -731,7 +731,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z103, 0x08, 0x0363, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1008,7 +1008,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z103, 0x04A8, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z103, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -1021,7 +1021,7 @@ Local1 = DerefOf (M000 (0x01, LPC0)) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z103, 0x04B6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z103, __LINE__, 0x00, 0x00) } CH00 (Arg0, 0x01) @@ -1044,7 +1044,7 @@ } SET0 (Z103, __METHOD__, 0x00) - CH03 (__METHOD__, Z103, 0x0B, 0x04CF, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 f5258ea..c8c3760 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 @@ -76,11 +76,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z104, 0x01, 0x5B, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z104, 0x02, 0x60, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -116,11 +116,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z104, 0x03, 0x8D, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z104, 0x04, 0x92, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -367,14 +367,14 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x0C)) { - ERR (Arg0, Z104, 0x01BF, 0x00, 0x00, Local0, 0x0C) + ERR (Arg0, Z104, __LINE__, 0x00, 0x00, Local0, 0x0C) Return (0x01) } Local1 = DerefOf (Arg1) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z104, 0x01C5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z104, __LINE__, 0x00, 0x00) } /* CondRefOf */ @@ -384,7 +384,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z104, 0x02, 0x01D0, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -420,7 +420,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z104, 0x06, 0x01FD, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -674,7 +674,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z104, 0x07, 0x0337, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -710,7 +710,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z104, 0x08, 0x0365, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -980,7 +980,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z104, 0x04AA, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z104, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -993,7 +993,7 @@ Local1 = DerefOf (M000 (0x01, LPC0)) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z104, 0x04B8, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z104, __LINE__, 0x00, 0x00) } CH00 (Arg0, 0x01) @@ -1016,7 +1016,7 @@ } SET0 (Z104, __METHOD__, 0x00) - CH03 (__METHOD__, Z104, 0x0B, 0x04D1, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 2b8f56c..ee49c4a 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,11 +86,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z105, 0x01, 0x59, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z105, 0x02, 0x5E, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -126,11 +126,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z105, 0x03, 0x8B, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z105, 0x04, 0x90, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -378,7 +378,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x0D)) { - ERR (Arg0, Z105, 0x01BF, 0x00, 0x00, Local0, 0x0D) + ERR (Arg0, Z105, __LINE__, 0x00, 0x00, Local0, 0x0D) Return (0x01) } @@ -391,7 +391,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z105, 0x05, 0x01CA, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) @@ -435,7 +435,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z105, 0x06, 0x0201, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -683,7 +683,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z105, 0x07, 0x0336, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -719,7 +719,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z105, 0x08, 0x0364, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* Store (RefOf(m000()), Local1) */ @@ -991,7 +991,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z105, 0x04A7, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z105, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -1002,7 +1002,7 @@ Local0 = (0x03 * LPC0) /* \M4BD.M005.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z105, 0x04B4, 0x00, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x01 + Local0), 0x2F) @@ -1018,7 +1018,7 @@ } } - CH03 (__METHOD__, Z105, 0x0B, 0x04C8, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 5b1d41f..5ec938c 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 @@ -80,11 +80,11 @@ Store (BF03 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z106, 0x00, 0x56, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) } Else { - CH04 (__METHOD__, 0x00, 0x55, Z106, 0x58, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z106, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } @@ -115,11 +115,11 @@ Store (BF21 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z106, 0x01, 0x75, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) } Else { - CH04 (__METHOD__, 0x00, 0x55, Z106, 0x77, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z106, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } @@ -132,12 +132,12 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x0E)) { - ERR (Arg0, Z106, 0x84, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z106, __LINE__, 0x00, 0x00, Local0, 0x0E) Return (0x01) } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z106, 0x02, 0x89, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x07, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) @@ -147,11 +147,11 @@ If (Y900) { - CH03 (__METHOD__, Z106, 0x03, 0x93, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) } Else { - CH04 (__METHOD__, 0x00, 0x55, Z106, 0x95, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z106, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else @@ -201,7 +201,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z106, 0xBD, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z106, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -232,7 +232,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z106, 0xDD, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z106, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else @@ -251,7 +251,7 @@ } } - CH03 (__METHOD__, Z106, 0x0C, 0xEE, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl b/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl index c224adb..6aea0b4 100644 --- a/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl +++ b/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl @@ -53,13 +53,13 @@ Local7 = (Local0 + Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x3A, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 + Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x3E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x01) @@ -67,7 +67,7 @@ Local7 = (Local0 - Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x44, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x02) @@ -75,13 +75,13 @@ Local7 = (Local0 * Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x4A, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 * Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x4E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x03) @@ -89,13 +89,13 @@ Local7 = (Local0 & Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x54, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 & Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x58, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x04) @@ -103,13 +103,13 @@ NAnd (Local0, Local1, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x5E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } NAnd (Local1, Local0, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x62, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x05) @@ -117,13 +117,13 @@ NOr (Local0, Local1, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x68, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } NOr (Local1, Local0, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x6C, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x06) @@ -131,13 +131,13 @@ Local7 = (Local0 | Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x72, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 | Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x76, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x07) @@ -145,13 +145,13 @@ Local7 = (Local0 ^ Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x7C, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 ^ Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x80, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x08) @@ -159,7 +159,7 @@ Local7 = (Local0 % Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x86, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x09) @@ -167,7 +167,7 @@ Local7 = (Local0 << Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x8C, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x0A) @@ -175,7 +175,7 @@ Local7 = (Local0 >> Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x92, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -213,12 +213,12 @@ Divide (Local0, Local1, Local6, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0xB5, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } If ((Local6 != Local3)) { - ERR (Arg0, Z083, 0xB8, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -250,7 +250,7 @@ Local0++ If ((Local0 != Local1)) { - ERR (Arg0, Z083, 0xD5, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x01) @@ -258,7 +258,7 @@ Local0-- If ((Local0 != Local1)) { - ERR (Arg0, Z083, 0xDB, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x02) @@ -266,7 +266,7 @@ Local2 = ~Local0 If ((Local2 != Local1)) { - ERR (Arg0, Z083, 0xE1, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x03) @@ -274,7 +274,7 @@ FindSetLeftBit (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z083, 0xE7, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x04) @@ -282,7 +282,7 @@ FindSetRightBit (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z083, 0xED, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -1635,7 +1635,7 @@ Local4 = (Local1 + 0x01) If ((Local3 != Local4)) { - ERR (__METHOD__, Z083, 0x05A4, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, Z083, __LINE__, 0x00, 0x00, Local0, 0x00) } Local1++ @@ -1704,7 +1704,7 @@ FindSetRightBit (Local2, Local3) If ((Local3 != Local4)) { - ERR (__METHOD__, Z083, 0x05E1, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, Z083, __LINE__, 0x00, 0x00, Local0, 0x00) } Local1++ diff --git a/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl b/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl index d74342b..c58c9b0 100644 --- a/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl +++ b/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl @@ -155,13 +155,13 @@ Local0 = F001 /* \M210.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0xAF, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = Arg2 If ((B001 != B002)) { - ERR (Arg0, Z001, 0xB5, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -181,13 +181,13 @@ Local0 = F001 /* \M210.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0xC9, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = Arg5 If ((B001 != B002)) { - ERR (Arg0, Z001, 0xCF, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -207,13 +207,13 @@ Local0 = F001 /* \M210.F001 */ If ((Local0 != 0x01)) { - ERR (Arg0, Z001, 0xE2, 0x00, 0x00, Local0, 0x01) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x01) } B002 = Arg3 If ((B001 != B002)) { - ERR (Arg0, Z001, 0xE8, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -233,13 +233,13 @@ Local0 = F001 /* \M210.F001 */ If ((Local0 != 0x01)) { - ERR (Arg0, Z001, 0xFB, 0x00, 0x00, Local0, 0x01) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x01) } B002 = Arg4 If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0101, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -252,19 +252,19 @@ Local0 = SizeOf (B001) If ((Local0 != Arg6)) { - ERR (Arg0, Z001, 0x010C, 0x00, 0x00, Local0, Arg6) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg6) } Local0 = SizeOf (B002) If ((Local0 != Arg6)) { - ERR (Arg0, Z001, 0x0111, 0x00, 0x00, Local0, Arg6) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg6) } Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x0116, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } If (PR00) @@ -293,7 +293,7 @@ { If ((NCUR >= BSZ1)) { - ERR (__METHOD__, Z001, 0x0136, 0x00, 0x00, NCUR, BSZ1) + ERR (__METHOD__, Z001, __LINE__, 0x00, 0x00, NCUR, BSZ1) Break } @@ -338,13 +338,13 @@ Local0 = F001 /* \M212.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x016A, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B000 /* \B000 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0170, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -364,13 +364,13 @@ Local0 = F001 /* \M212.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x0184, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B101 /* \B101 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x018A, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -390,13 +390,13 @@ Local0 = F001 /* \M212.F001 */ If ((Local0 != 0xFF)) { - ERR (Arg0, Z001, 0x019D, 0x00, 0x00, Local0, 0xFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFF) } B002 = B0FF /* \B0FF */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x01A3, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -416,13 +416,13 @@ Local0 = F001 /* \M212.F001 */ If ((Local0 != 0xFF)) { - ERR (Arg0, Z001, 0x01B6, 0x00, 0x00, Local0, 0xFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFF) } B002 = B010 /* \B010 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x01BC, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -442,13 +442,13 @@ Local0 = F001 /* \M212.F001 */ If ((Local0 != 0x96)) { - ERR (Arg0, Z001, 0x01CF, 0x00, 0x00, Local0, 0x96) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x96) } B002 = B0B0 /* \B0B0 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x01D5, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -461,19 +461,19 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x01E0, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x01E5, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x01EA, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } If (PR00) @@ -502,7 +502,7 @@ { If ((NCUR >= BSZ1)) { - ERR (__METHOD__, Z001, 0x020A, 0x00, 0x00, NCUR, BSZ1) + ERR (__METHOD__, Z001, __LINE__, 0x00, 0x00, NCUR, BSZ1) Break } @@ -548,13 +548,13 @@ Local0 = F001 /* \M214.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x023E, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B000 /* \B000 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0244, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -574,13 +574,13 @@ Local0 = F001 /* \M214.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x0258, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B101 /* \B101 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x025E, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -600,13 +600,13 @@ Local0 = F001 /* \M214.F001 */ If ((Local0 != 0xFFFF)) { - ERR (Arg0, Z001, 0x0271, 0x00, 0x00, Local0, 0xFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFF) } B002 = B0FF /* \B0FF */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0277, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -626,13 +626,13 @@ Local0 = F001 /* \M214.F001 */ If ((Local0 != 0xFFFF)) { - ERR (Arg0, Z001, 0x028A, 0x00, 0x00, Local0, 0xFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFF) } B002 = B010 /* \B010 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0290, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -643,13 +643,13 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x0299, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x029E, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } /*////////////// E. 0->1 (000->010) */ @@ -664,13 +664,13 @@ Local0 = F001 /* \M214.F001 */ If ((Local0 != 0x7698)) { - ERR (Arg0, Z001, 0x02AD, 0x00, 0x00, Local0, 0x7698) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x7698) } B002 = B0B0 /* \B0B0 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x02B3, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -683,19 +683,19 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x02BE, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x02C3, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x02C8, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } If (PR00) @@ -724,7 +724,7 @@ { If ((NCUR >= BSZ1)) { - ERR (__METHOD__, Z001, 0x02E8, 0x00, 0x00, NCUR, BSZ1) + ERR (__METHOD__, Z001, __LINE__, 0x00, 0x00, NCUR, BSZ1) Break } @@ -775,13 +775,13 @@ Local0 = F001 /* \M216.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x0324, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B000 /* \B000 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x032A, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -801,13 +801,13 @@ Local0 = F001 /* \M216.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x033E, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B101 /* \B101 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0344, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -827,13 +827,13 @@ Local0 = F001 /* \M216.F001 */ If ((Local0 != 0xFFFFFFFF)) { - ERR (Arg0, Z001, 0x0357, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } B002 = B0FF /* \B0FF */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x035D, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -853,13 +853,13 @@ Local0 = F001 /* \M216.F001 */ If ((Local0 != 0xFFFFFFFF)) { - ERR (Arg0, Z001, 0x0370, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } B002 = B010 /* \B010 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0376, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -870,13 +870,13 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x037F, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x0384, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } /*////////////// E. 0->1 (000->010) */ @@ -891,13 +891,13 @@ Local0 = F001 /* \M216.F001 */ If ((Local0 != 0x32547698)) { - ERR (Arg0, Z001, 0x0393, 0x00, 0x00, Local0, 0x32547698) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x32547698) } B002 = B0B0 /* \B0B0 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0399, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -910,19 +910,19 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x03A4, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x03A9, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x03AE, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } If (PR00) @@ -951,7 +951,7 @@ { If ((NCUR >= BSZ1)) { - ERR (__METHOD__, Z001, 0x03CE, 0x00, 0x00, NCUR, BSZ1) + ERR (__METHOD__, Z001, __LINE__, 0x00, 0x00, NCUR, BSZ1) Break } @@ -1033,18 +1033,18 @@ { If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x0426, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } } ElseIf ((Local0 != BB00)) { - ERR (Arg0, Z001, 0x042A, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } B002 = B000 /* \B000 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0431, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -1068,18 +1068,18 @@ { If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x0448, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } } ElseIf ((Local0 != BB00)) { - ERR (Arg0, Z001, 0x044C, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } B002 = B101 /* \B101 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0453, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -1105,7 +1105,7 @@ { If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR (Arg0, Z001, 0x046B, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } } ElseIf ((Local0 != BB01)) @@ -1118,7 +1118,7 @@ Debug = "=========================." } - ERR (Arg0, Z001, 0x0477, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } B002 = B0FF /* \B0FF */ @@ -1139,7 +1139,7 @@ Debug = "=========================." } - ERR (Arg0, Z001, 0x048B, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -1181,7 +1181,7 @@ { If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR (Arg0, Z001, 0x04B3, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } } ElseIf ((Local0 != BB01)) @@ -1194,7 +1194,7 @@ Debug = "=========================." } - ERR (Arg0, Z001, 0x04BF, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } B002 = B010 /* \B010 */ @@ -1215,7 +1215,7 @@ Debug = "=========================." } - ERR (Arg0, Z001, 0x04D3, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -1227,13 +1227,13 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x04DD, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x04E2, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } /*////////////// E. 0->1 (000->010) */ @@ -1264,12 +1264,12 @@ { If ((Local0 != 0xEFCDAB1032547698)) { - ERR (Arg0, Z001, 0x04FF, 0x00, 0x00, Local0, 0xEFCDAB1032547698) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xEFCDAB1032547698) } } ElseIf ((Local0 != BB02)) { - ERR (Arg0, Z001, 0x0503, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } B002 = B0B0 /* \B0B0 */ @@ -1282,7 +1282,7 @@ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x050F, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -1297,19 +1297,19 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x051C, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x0521, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x0526, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } If (PR00) @@ -1350,7 +1350,7 @@ { If ((NCUR >= BSZ1)) { - ERR (__METHOD__, Z001, 0x054F, 0x00, 0x00, NCUR, BSZ1) + ERR (__METHOD__, Z001, __LINE__, 0x00, 0x00, NCUR, BSZ1) Break } @@ -1445,7 +1445,7 @@ Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x05BE, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } /* Fill the entire buffer (ground) */ @@ -1481,12 +1481,12 @@ INT1 = Arg5 If ((Local0 != INT1)) { - ERR (Arg0, Z001, 0x05E2, 0x00, 0x00, Local0, INT1) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, INT1) } } ElseIf ((Local0 != Arg5)) { - ERR (Arg0, Z001, 0x05E6, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Check the contents of Buffer */ @@ -1494,7 +1494,7 @@ B002 = B0B0 /* \B0B0 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x05EF, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) If (PR00) { Debug = "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE:" @@ -1549,7 +1549,7 @@ If ((Arg3 == 0x00)) { - ERR (Arg0, Z001, 0x0629, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) 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 b889a6a..1dcedb0 100644 --- a/tests/aslts/src/runtime/collections/functional/constant/constants.asl +++ b/tests/aslts/src/runtime/collections/functional/constant/constants.asl @@ -35,34 +35,34 @@ { If ((Zero != 0x00)) { - ERR (__METHOD__, Z002, 0x29, 0x00, 0x00, Zero, 0x00) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, Zero, 0x00) } If ((One != 0x01)) { - ERR (__METHOD__, Z002, 0x2D, 0x00, 0x00, One, 0x01) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, One, 0x01) } If ((F64 == 0x01)) { If ((Ones != 0xFFFFFFFFFFFFFFFF)) { - ERR (__METHOD__, Z002, 0x32, 0x00, 0x00, Ones, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, Ones, 0xFFFFFFFFFFFFFFFF) } } ElseIf ((Ones != 0xFFFFFFFF)) { - ERR (__METHOD__, Z002, 0x36, 0x00, 0x00, Ones, 0xFFFFFFFF) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, Ones, 0xFFFFFFFF) } If ((Revision < 0x20140114)) { - ERR (__METHOD__, Z002, 0x3B, 0x00, 0x00, Revision, 0x20050114) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, Revision, 0x20050114) } If ((Revision > 0x20500000)) { - ERR (__METHOD__, Z002, 0x3F, 0x00, 0x00, Revision, 0x20500000) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, Revision, 0x20500000) } /* @@ -74,6 +74,6 @@ */ If ((\_REV != 0x02)) { - ERR (__METHOD__, Z002, 0x4A, 0x00, 0x00, \_REV, 0x02) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, \_REV, 0x02) } } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl index e750d20..a28477f 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl @@ -2162,5 +2162,5 @@ /* Store(Local1, Index(p441, 1)) */ M332 (__METHOD__, 0x01, "p443", P441, P442, P443) M332 (__METHOD__, 0x01, "p444", P442, P441, P444) - CH03 (__METHOD__, Z007, 0x0123, 0x03EC, 0x00) + CH03 (__METHOD__, Z007, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl b/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl index 2f751b1..580627d 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl @@ -123,7 +123,7 @@ If ((SizeOf (P450) != SizeOf (P451))) { - ERR (__METHOD__, 0xB1, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB1, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl b/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl index 3b4df72..c8c04c7 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl @@ -7357,7 +7357,7 @@ If ((SizeOf (P452) != SizeOf (P453))) { - ERR (__METHOD__, 0xB2, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB2, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl index deb36f3..3b4a090 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl @@ -5333,7 +5333,7 @@ If ((SizeOf (P454) != SizeOf (P455))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl index 1aa8801..d4f97f0 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl @@ -477,7 +477,7 @@ If ((SizeOf (P456) != SizeOf (P457))) { - ERR (__METHOD__, 0xB4, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB4, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl index 3f9389f..00c9e92 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl @@ -1736,5 +1736,5 @@ M331 (__METHOD__, 0x02, 0x1A, 0x1A, 0x62, 0x62, "_LL") M331 (__METHOD__, 0x03, 0x1B, 0x1B, 0x63, 0x63, "_SHR") M331 (__METHOD__, 0x04, 0x28, 0x28, 0x70, 0x70, "_INT") - CH03 (__METHOD__, Z017, 0x0123, 0x023E, 0x00) + CH03 (__METHOD__, Z017, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl index 694abd5..afa9cb1 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl @@ -1087,7 +1087,7 @@ If ((SizeOf (P45E) != SizeOf (P45F))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl index 1c90465..2caf55b 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl @@ -301,7 +301,7 @@ If ((SizeOf (P45C) != SizeOf (P45D))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl index e49c248..52f4f74 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl @@ -243,7 +243,7 @@ If ((SizeOf (P460) != SizeOf (P461))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl index bee68d7..54281f2 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl @@ -695,7 +695,7 @@ If ((SizeOf (P464) != SizeOf (P465))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl index efcaa38..9672e1e 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl @@ -159,7 +159,7 @@ If ((SizeOf (P462) != SizeOf (P463))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/register.asl b/tests/aslts/src/runtime/collections/functional/descriptor/register.asl index 82f5a7b..d608bf5 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/register.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/register.asl @@ -414,7 +414,7 @@ If ((SizeOf (P436) != SizeOf (P437))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl index 6c56cae..35859b9 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl @@ -45,7 +45,7 @@ Local1 = DerefOf (Arg4 [LPC0]) If ((Local0 != Local1)) { - ERR (Arg0, Z029, 0x36, 0x00, 0x00, LPC0, Arg2) + ERR (Arg0, Z029, __LINE__, 0x00, 0x00, LPC0, Arg2) } LPN0-- @@ -59,12 +59,12 @@ { If ((Arg2 != Arg3)) { - ERR (Arg0, Z029, 0x42, Arg6, Arg6, Arg2, Arg3) + ERR (Arg0, Z029, __LINE__, Arg6, Arg6, Arg2, Arg3) } If ((Arg4 != Arg5)) { - ERR (Arg0, Z029, 0x45, Arg6, Arg6, Arg4, Arg5) + ERR (Arg0, Z029, __LINE__, Arg6, Arg6, Arg4, Arg5) } } @@ -90,7 +90,7 @@ { Debug = Local3 Debug = Local2 - ERR (Arg0, Z029, 0x65, 0x00, 0x00, LPC0, Arg2) + ERR (Arg0, Z029, __LINE__, 0x00, 0x00, LPC0, Arg2) } LPN0-- diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl index 783ba71..252e862 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl @@ -2759,7 +2759,7 @@ If ((SizeOf (P458) != SizeOf (P459))) { - ERR (__METHOD__, 0xB5, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB5, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl index 1192b5d..f5cb197 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl @@ -953,7 +953,7 @@ If ((SizeOf (P45A) != SizeOf (P45B))) { - ERR (__METHOD__, 0xB6, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB6, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/external/external.asl b/tests/aslts/src/runtime/collections/functional/external/external.asl index 8a24c09..4472b09 100644 --- a/tests/aslts/src/runtime/collections/functional/external/external.asl +++ b/tests/aslts/src/runtime/collections/functional/external/external.asl @@ -89,7 +89,7 @@ Local2 = ObjectType (Arg3) If ((Local1 != Local2)) { - ERR (DerefOf (Arg0), Z204, 0x01, Z204, Arg1, Local1, Local2) + ERR (DerefOf (Arg0), Z204, __LINE__, Z204, Arg1, Local1, Local2) } } @@ -100,7 +100,7 @@ Local1 = ObjectType (E000) If ((Local1 != 0x01)) { - ERR (__METHOD__, Z204, 0x00, 0x00, 0x00, Local1, 0x01) + ERR (__METHOD__, Z204, __LINE__, 0x00, 0x00, Local1, 0x01) } EXT0 (__METHOD__, 0x01, E001, NM01) diff --git a/tests/aslts/src/runtime/collections/functional/logic/logical.asl b/tests/aslts/src/runtime/collections/functional/logic/logical.asl index a4379a5..a9f2acd 100644 --- a/tests/aslts/src/runtime/collections/functional/logic/logical.asl +++ b/tests/aslts/src/runtime/collections/functional/logic/logical.asl @@ -53,13 +53,13 @@ Local7 = (Local0 != Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x3A, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 != Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x3E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x01) @@ -67,13 +67,13 @@ Local7 = (Local0 && Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x44, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 && Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x48, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x02) @@ -81,13 +81,13 @@ Local7 = (Local0 || Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x4E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 || Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x52, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x03) @@ -95,13 +95,13 @@ Local7 = (Local0 == Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x58, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 == Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x5C, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x04) @@ -109,7 +109,7 @@ Local7 = (Local0 > Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x62, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x05) @@ -117,7 +117,7 @@ Local7 = (Local0 >= Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x68, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x06) @@ -125,7 +125,7 @@ Local7 = (Local0 < Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x6E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x07) @@ -133,7 +133,7 @@ Local7 = (Local0 <= Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x74, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -175,7 +175,7 @@ Local2 = !Local0 If ((Local2 != Local1)) { - ERR (Arg0, Z035, 0x9B, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -1100,7 +1100,7 @@ Local0 = (BIG0 == BIG0) If ((Local0 != Ones)) { - ERR (__METHOD__, Z035, 0x0243, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ @@ -1250,7 +1250,7 @@ Local0 = (BIG0 > BIG0) If ((Local0 != Zero)) { - ERR (__METHOD__, Z035, 0x0283, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ @@ -1400,7 +1400,7 @@ Local0 = (BIG0 >= BIG0) If ((Local0 != Ones)) { - ERR (__METHOD__, Z035, 0x02C3, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ @@ -1550,7 +1550,7 @@ Local0 = (BIG0 < BIG0) If ((Local0 != Zero)) { - ERR (__METHOD__, Z035, 0x0303, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ @@ -1700,7 +1700,7 @@ Local0 = (BIG0 <= BIG0) If ((Local0 != Ones)) { - ERR (__METHOD__, Z035, 0x0343, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ @@ -1850,7 +1850,7 @@ Local0 = (BIG0 != BIG0) If ((Local0 != Zero)) { - ERR (__METHOD__, Z035, 0x0383, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl b/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl index 0c7e8cb..c463324 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl @@ -71,13 +71,13 @@ { If ((ObjectType (Arg1) != 0x03)) { - ERR ("m311: unexpected type of Arg1", Z036, 0x4B, 0x00, 0x00, 0x00, 0x00) + ERR ("m311: unexpected type of Arg1", Z036, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Ones) } If ((ObjectType (Arg2) != 0x03)) { - ERR ("m311: unexpected type of Arg2", Z036, 0x50, 0x00, 0x00, 0x00, 0x00) + ERR ("m311: unexpected type of Arg2", Z036, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Ones) } @@ -121,7 +121,7 @@ Concatenate (Local0, Local1, Local7) If (M311 (Arg0, Local7, Local2)) { - ERR (Arg0, Z036, 0x7A, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z036, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x01) @@ -131,15 +131,15 @@ Concatenate (Local0, Local1, Local7) If ((ObjectType (Local7) != 0x02)) { - ERR (Arg0, Z036, 0x83, 0x00, 0x00, Local7, Arg2) + ERR (Arg0, Z036, __LINE__, 0x00, 0x00, Local7, Arg2) } ElseIf ((ObjectType (Local2) != 0x02)) { - ERR (Arg0, Z036, 0x85, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z036, __LINE__, 0x00, 0x00, Local2, Arg2) } ElseIf ((Local7 != Local2)) { - ERR (Arg0, Z036, 0x87, 0x00, 0x00, Local7, Arg2) + ERR (Arg0, Z036, __LINE__, 0x00, 0x00, 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 47dd96c..fd20211 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl @@ -273,7 +273,7 @@ Local6 = M306 (Arg5, Local0, Local1, Local2, Local3, Local4) If ((Local7 != Local6)) { - ERR ("err 1", Z038, 0xE3, 0x00, 0x00, LPC1, Arg2) + ERR ("err 1", Z038, __LINE__, 0x00, 0x00, LPC1, Arg2) } If ((Arg6 && (Local1 != Local3))) @@ -285,7 +285,7 @@ Local6 = M306 (Arg5, Local0, Local3, Local2, Local1, Local4) If ((Local7 != Local6)) { - ERR ("err 2", Z038, 0xF0, 0x00, 0x00, LPC2, Arg2) + ERR ("err 2", Z038, __LINE__, 0x00, 0x00, LPC2, Arg2) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl b/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl index 73f396d..fba0ed1 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl @@ -58,7 +58,7 @@ Mid (Local0, Local1, Local4, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z039, 0x40, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z039, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x01) @@ -66,7 +66,7 @@ Mid (S200, Local1, Local4, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z039, 0x46, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z039, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -444,12 +444,12 @@ Mid (Buffer (Local1){}, 0x00, 0x01, Local7) If ((Local7 != Buffer (Local1){})) { - ERR (__METHOD__, Z039, 0x011E, 0x00, 0x00, 0x00, "Buffer(0)") + ERR (__METHOD__, Z039, __LINE__, 0x00, 0x00, 0x00, "Buffer(0)") } Mid (Buffer (Local1){}, 0x012C, 0x012C, Local7) If ((Local7 != Buffer (Local1){})) { - ERR (__METHOD__, Z039, 0x0122, 0x00, 0x00, 0x00, "Buffer(0)") + ERR (__METHOD__, Z039, __LINE__, 0x00, 0x00, 0x00, "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 c44f1e3..673b90f 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl @@ -160,43 +160,43 @@ Local7 = ObjectType (Local0) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xA9, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local1) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xAD, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local2) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xB1, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local3) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xB5, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local4) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xB9, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local5) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xBD, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local6) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xC1, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } } Case (0x01) @@ -207,12 +207,12 @@ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0xCD, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((Local0 != 0x12345678)) { - ERR (Arg0, Z040, 0xD0, 0x00, 0x00, Local0, 0x12345678) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local0, 0x12345678) } /* By ArgX */ @@ -220,12 +220,12 @@ Local7 = ObjectType (Arg2) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0xD7, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((Arg2 != 0x81223344)) { - ERR (Arg0, Z040, 0xDA, 0x00, 0x00, Arg2, 0x81223344) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Arg2, 0x81223344) } /* By Name locally */ @@ -234,12 +234,12 @@ Local7 = ObjectType (N000) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0xE2, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((N000 != 0x98127364)) { - ERR (Arg0, Z040, 0xE5, 0x00, 0x00, N000, 0x98127364) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N000, 0x98127364) } /* By Name globally */ @@ -247,12 +247,12 @@ Local7 = ObjectType (N002) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0xEC, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((N002 != 0x90801020)) { - ERR (Arg0, Z040, 0xEF, 0x00, 0x00, N002, 0x90801020) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N002, 0x90801020) } /* Not a Buffer in 32-bit mode */ @@ -261,7 +261,7 @@ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0xF7, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } } Case (0x02) @@ -276,12 +276,12 @@ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0x0105, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((Local0 != 0xA1B2C3D4E5C6E7F8)) { - ERR (Arg0, Z040, 0x0108, 0x00, 0x00, Local0, 0xA1B2C3D4E5C6E7F8) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local0, 0xA1B2C3D4E5C6E7F8) } /* By ArgX */ @@ -289,12 +289,12 @@ Local7 = ObjectType (Arg2) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0x010F, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((Arg2 != 0xFABEFAC489501248)) { - ERR (Arg0, Z040, 0x0112, 0x00, 0x00, Arg2, 0xFABEFAC489501248) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Arg2, 0xFABEFAC489501248) } /* By Name locally */ @@ -303,12 +303,12 @@ Local7 = ObjectType (N001) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0x011A, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((N001 != 0x9081122384356647)) { - ERR (Arg0, Z040, 0x011D, 0x00, 0x00, N001, 0x9081122384356647) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N001, 0x9081122384356647) } /* By Name globally */ @@ -316,12 +316,12 @@ Local7 = ObjectType (N003) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0x0124, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((N003 != 0x9189192989396949)) { - ERR (Arg0, Z040, 0x0127, 0x00, 0x00, N003, 0x9189192989396949) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N003, 0x9189192989396949) } } } @@ -333,28 +333,28 @@ Local7 = ObjectType (Local0) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x0134, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } Local0 = "1" Local7 = ObjectType (Local0) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x013A, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } Local0 = "abcd" Local7 = ObjectType (Local0) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x0140, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } Local0 = "qwrt" Local7 = ObjectType (Local0) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x0146, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } /* By ArgX */ @@ -362,12 +362,12 @@ Local7 = ObjectType (Arg2) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x014D, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } If ((Arg2 != "zxcvbnm0912345678ok")) { - ERR (Arg0, Z040, 0x0150, 0x00, 0x00, Arg2, "zxcvbnm0912345678ok") + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Arg2, "zxcvbnm0912345678ok") } /* By Name locally */ @@ -376,12 +376,12 @@ Local7 = ObjectType (N004) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x0158, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } If ((N004 != "")) { - ERR (Arg0, Z040, 0x015B, 0x00, 0x00, N004, "") + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N004, "") } /* By Name globally */ @@ -389,12 +389,12 @@ Local7 = ObjectType (N005) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x0162, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } If ((N005 != "9876")) { - ERR (Arg0, Z040, 0x0165, 0x00, 0x00, N005, "9876") + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N005, "9876") } } Case (0x04) @@ -414,36 +414,36 @@ Local7 = ObjectType (F000) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x0179, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } If ((F000 != 0x8D)) { - ERR (Arg0, Z040, 0x017C, 0x00, 0x00, F000, 0x8D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, F000, 0x8D) } Local7 = ObjectType (F222) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x0181, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (F223) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x0185, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (F224) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x0189, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (F225) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x018D, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } } Case (0x05) @@ -465,12 +465,12 @@ Local7 = ObjectType (BKF0) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x01A0, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } If ((BKF0 != 0x95)) { - ERR (Arg0, Z040, 0x01A3, 0x00, 0x00, BKF0, 0x95) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, BKF0, 0x95) } } Case (0x06) @@ -497,25 +497,25 @@ Local7 = ObjectType (F00A) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x01BB, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (F00B) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x01BF, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (IF00) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x01C3, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (IF01) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x01C7, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } } Case (0x07) @@ -529,7 +529,7 @@ Local7 = ObjectType (Local0) If ((Local7 != C00B)) { - ERR (Arg0, Z040, 0x01D1, 0x00, 0x00, Local7, C00B) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00B) } If ((Local0 != Buffer (0x04) @@ -537,7 +537,7 @@ 0x00, 0x01, 0x02, 0x03 // .... })) { - ERR (Arg0, Z040, 0x01D4, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x08) @@ -547,7 +547,7 @@ Local7 = ObjectType (Arg2) If ((Local7 != C00B)) { - ERR (Arg0, Z040, 0x01DD, 0x00, 0x00, Local7, C00B) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00B) } If ((Arg2 != Buffer (0x04) @@ -555,7 +555,7 @@ 0x04, 0x05, 0x06, 0x07 // .... })) { - ERR (Arg0, Z040, 0x01E0, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x09) @@ -569,7 +569,7 @@ Local7 = ObjectType (B000) If ((Local7 != C00B)) { - ERR (Arg0, Z040, 0x01EA, 0x00, 0x00, Local7, C00B) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00B) } If ((B000 != Buffer (0x04) @@ -577,7 +577,7 @@ 0x08, 0x09, 0x0A, 0x0B // .... })) { - ERR (Arg0, Z040, 0x01ED, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0A) @@ -587,7 +587,7 @@ Local7 = ObjectType (B003) If ((Local7 != C00B)) { - ERR (Arg0, Z040, 0x01F6, 0x00, 0x00, Local7, C00B) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00B) } If ((B003 != Buffer (0x04) @@ -595,7 +595,7 @@ 0x0C, 0x0D, 0x0E, 0x0F // .... })) { - ERR (Arg0, Z040, 0x01F9, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0B) @@ -610,7 +610,7 @@ Local7 = ObjectType (F001) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0204, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -618,7 +618,7 @@ 0x10, 0x11, 0x12, 0x13 // .... })) { - ERR (Arg0, Z040, 0x0207, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0C) @@ -633,7 +633,7 @@ Local7 = ObjectType (F002) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0212, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -641,7 +641,7 @@ 0x14, 0x15, 0x16, 0x17 // .... })) { - ERR (Arg0, Z040, 0x0215, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0D) @@ -656,7 +656,7 @@ Local7 = ObjectType (F003) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0220, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -664,7 +664,7 @@ 0x18, 0x19, 0x1A, 0x1B // .... })) { - ERR (Arg0, Z040, 0x0223, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0E) @@ -679,7 +679,7 @@ Local7 = ObjectType (F004) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x022E, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -687,7 +687,7 @@ 0x1C, 0x1D, 0x1E, 0x1F // .... })) { - ERR (Arg0, Z040, 0x0231, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0F) @@ -703,7 +703,7 @@ Local7 = ObjectType (F005) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x023C, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x09) @@ -712,7 +712,7 @@ /* 0008 */ 0x29 // ) })) { - ERR (Arg0, Z040, 0x0240, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x10) @@ -728,7 +728,7 @@ Local7 = ObjectType (F006) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x024B, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x09) @@ -737,21 +737,21 @@ /* 0008 */ 0x32 // 2 })) { - ERR (Arg0, Z040, 0x024E, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } CreateField (Local0, 0x00, 0x11, F111) Local7 = ObjectType (F111) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0254, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } CreateField (Local0, 0x00, 0x39, F112) Local7 = ObjectType (F112) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0259, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } } Case (0x11) @@ -767,7 +767,7 @@ Local7 = ObjectType (F007) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0264, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x09) @@ -776,7 +776,7 @@ /* 0008 */ 0x32 // 2 })) { - ERR (Arg0, Z040, 0x0267, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x12) @@ -791,7 +791,7 @@ Local7 = ObjectType (F008) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0272, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -799,7 +799,7 @@ 0x33, 0x34, 0x35, 0x36 // 3456 })) { - ERR (Arg0, Z040, 0x0275, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x13) @@ -811,12 +811,12 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0280, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != "q")) { - ERR (Arg0, Z040, 0x0283, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = "qw" @@ -824,12 +824,12 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x028A, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != "qw")) { - ERR (Arg0, Z040, 0x028D, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = "qwertyu" @@ -837,12 +837,12 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0294, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != "qwertyu")) { - ERR (Arg0, Z040, 0x0297, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = "qwertyuiop" @@ -850,12 +850,12 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x029E, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != "qwertyuiop")) { - ERR (Arg0, Z040, 0x02A1, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x14) @@ -870,7 +870,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x02AC, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -878,7 +878,7 @@ 0x2A, 0x2B, 0x2C, 0x2D // *+,- })) { - ERR (Arg0, Z040, 0x02AF, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = Buffer (0x08) @@ -889,7 +889,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x02B6, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x08) @@ -897,7 +897,7 @@ 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31 // *+,-./01 })) { - ERR (Arg0, Z040, 0x02B9, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = Buffer (0x09) @@ -909,7 +909,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x02C0, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x09) @@ -918,7 +918,7 @@ /* 0008 */ 0x32 // 2 })) { - ERR (Arg0, Z040, 0x02C3, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x15) @@ -957,7 +957,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x02D9, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } /* Buffer */ @@ -966,7 +966,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C00B)) { - ERR (Arg0, Z040, 0x02E1, 0x00, 0x00, Local7, C00B) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00B) } /* String */ @@ -975,7 +975,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x02E9, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } /* Integer */ @@ -984,7 +984,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0x02F1, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } } Case (0x16) @@ -995,7 +995,7 @@ Local7 = ObjectType (HDR0) If ((Local7 != C012)) { - ERR (Arg0, Z040, 0x02FB, 0x00, 0x00, Local7, C012) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C012) } } Case (0x17) @@ -1005,7 +1005,7 @@ Local7 = ObjectType (Debug) If ((Local7 != C018)) { - ERR (Arg0, Z040, 0x0304, 0x00, 0x00, Local7, C018) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C018) } } Case (0x18) @@ -1019,7 +1019,7 @@ Local7 = ObjectType (DV00) If ((Local7 != C00E)) { - ERR (Arg0, Z040, 0x030E, 0x00, 0x00, Local7, C00E) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00E) } } Case (0x19) @@ -1030,7 +1030,7 @@ Local7 = ObjectType (EVT0) If ((Local7 != C00F)) { - ERR (Arg0, Z040, 0x0318, 0x00, 0x00, Local7, C00F) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00F) } } Case (0x1A) @@ -1045,7 +1045,7 @@ Local7 = ObjectType (M0F2) If ((Local7 != C010)) { - ERR (Arg0, Z040, 0x0322, 0x00, 0x00, Local7, C010) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C010) } } Case (0x1B) @@ -1068,7 +1068,7 @@ Local7 = ObjectType (MT00) If ((Local7 != C011)) { - ERR (Arg0, Z040, 0x0337, 0x00, 0x00, Local7, C011) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C011) } } Case (0x1D) @@ -1078,13 +1078,13 @@ Local7 = ObjectType (R000) If ((Local7 != C012)) { - ERR (Arg0, Z040, 0x0340, 0x00, 0x00, Local7, C012) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C012) } Local7 = ObjectType (R001) If ((Local7 != C012)) { - ERR (Arg0, Z040, 0x0344, 0x00, 0x00, Local7, C012) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C012) } } Case (0x1E) @@ -1236,121 +1236,121 @@ Local7 = ObjectType (P000) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0364, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P001) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0368, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P002) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x036C, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P003) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0370, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P004) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0374, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P005) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0378, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P006) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x037C, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P007) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0380, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P008) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0384, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P009) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0388, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00A) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x038C, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00B) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0390, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00C) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0394, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00D) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0398, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00E) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x039C, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00F) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x03A0, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P010) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x03A4, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P011) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x03A8, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P012) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x03AC, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P013) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x03B0, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } } Case (0x1F) @@ -1368,7 +1368,7 @@ Local7 = ObjectType (PWR0) If ((Local7 != C013)) { - ERR (Arg0, Z040, 0x03BA, 0x00, 0x00, Local7, C013) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C013) } } Case (0x20) @@ -1379,7 +1379,7 @@ Local7 = ObjectType (PR00) If ((Local7 != C014)) { - ERR (Arg0, Z040, 0x03C4, 0x00, 0x00, Local7, C014) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C014) } } Case (0x21) @@ -1391,7 +1391,7 @@ Local7 = ObjectType (TZ00) If ((Local7 != C015)) { - ERR (Arg0, Z040, 0x03CB, 0x00, 0x00, Local7, C015) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C015) } } Case (0x22) @@ -1411,7 +1411,7 @@ } Default { - ERR (Arg0, Z040, 0x03E1, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl b/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl index 0266015..bedb051 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl @@ -56,30 +56,30 @@ { If ((Local0 != 0x08)) { - ERR (__METHOD__, Z041, 0x32, 0x00, 0x00, Local0, 0x08) + ERR (__METHOD__, Z041, __LINE__, 0x00, 0x00, Local0, 0x08) } } ElseIf ((Local0 != 0x04)) { - ERR (__METHOD__, Z041, 0x36, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z041, __LINE__, 0x00, 0x00, Local0, 0x04) } Local0 = SizeOf (S000) If ((Local0 != 0x03)) { - ERR (__METHOD__, Z041, 0x3C, 0x00, 0x00, Local0, 0x03) + ERR (__METHOD__, Z041, __LINE__, 0x00, 0x00, Local0, 0x03) } Local0 = SizeOf (B000) If ((Local0 != 0x05)) { - ERR (__METHOD__, Z041, 0x41, 0x00, 0x00, Local0, 0x05) + ERR (__METHOD__, Z041, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = SizeOf (P000) If ((Local0 != 0x07)) { - ERR (__METHOD__, Z041, 0x46, 0x00, 0x00, Local0, 0x07) + ERR (__METHOD__, Z041, __LINE__, 0x00, 0x00, Local0, 0x07) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/store.asl b/tests/aslts/src/runtime/collections/functional/manipulation/store.asl index 7aac326..1c15aa9 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/store.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/store.asl @@ -51,7 +51,7 @@ ToInteger (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x39, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -60,7 +60,7 @@ ToBuffer (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x40, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -69,7 +69,7 @@ ToString (Local0, Ones, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x47, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -78,7 +78,7 @@ ToDecimalString (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x4E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -87,7 +87,7 @@ ToHexString (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x55, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -96,7 +96,7 @@ ToBCD (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x5C, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -105,7 +105,7 @@ FromBCD (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x63, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -116,7 +116,7 @@ Local2 = Local0 If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x6A, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -127,7 +127,7 @@ Local2 = Local0 If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x71, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -138,7 +138,7 @@ Local2 = Local0 If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x78, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -160,7 +160,7 @@ Local1 = Local0 = 0xABCDEF12 If ((Local1 != 0xABCDEF12)) { - ERR (__METHOD__, Z042, 0x8D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Integer arithmetic */ @@ -168,13 +168,13 @@ Local1 = Local0 = (0x12345678 + 0x11111111) If ((Local1 != 0x23456789)) { - ERR (__METHOD__, Z042, 0x96, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x23456781 + 0x11111111), Local0) If ((Local0 != 0x34567892)) { - ERR (__METHOD__, Z042, 0x9A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local1 = Local0 = (0x12345678 + 0xF0000000) @@ -184,13 +184,13 @@ Local1 = Local0 = (0x87654321 - 0x11111111) If ((Local1 != 0x76543210)) { - ERR (__METHOD__, Z042, 0xA4, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x72387654 - 0x22221111), Local0) If ((Local0 != 0x50166543)) { - ERR (__METHOD__, Z042, 0xA8, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Multiply */ @@ -198,13 +198,13 @@ Local1 = Local0 = (0x00012345 * 0x7ABC) If ((Local1 != 0x8BA4C8AC)) { - ERR (__METHOD__, Z042, 0xAF, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x000145AB * 0x3247), Local0) If ((Local0 != 0x3FF5B86D)) { - ERR (__METHOD__, Z042, 0xB3, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Divide */ @@ -212,19 +212,19 @@ Local2 = Divide (0x12345678, 0x1000, Local0, Local1) If ((Local2 != 0x00012345)) { - ERR (__METHOD__, Z042, 0xBA, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store (Divide (0x7ABC56E8, 0x1000, Local0), Local1) If ((Local1 != 0x0007ABC5)) { - ERR (__METHOD__, Z042, 0xBE, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x55667788 / 0x1000), Local0) If ((Local0 != 0x00055667)) { - ERR (__METHOD__, Z042, 0xC3, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Increment */ @@ -233,7 +233,7 @@ Local1 = Local0++ If ((Local1 != 0x12345679)) { - ERR (__METHOD__, Z042, 0xCB, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Decrement */ @@ -242,7 +242,7 @@ Local1 = Local0-- If ((Local1 != 0x67812344)) { - ERR (__METHOD__, Z042, 0xD3, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* And */ @@ -250,13 +250,13 @@ Local1 = Local0 = (0x87654321 & 0xAAAAAAAA) If ((Local1 != 0x82200220)) { - ERR (__METHOD__, Z042, 0xDA, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x88AABBCC & 0xAAAAAAAA), Local0) If ((Local0 != 0x88AAAA88)) { - ERR (__METHOD__, Z042, 0xDE, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* FindSetLeftBit */ @@ -264,13 +264,13 @@ Local1 = FindSetLeftBit (0xF001, Local0) If ((Local1 != 0x10)) { - ERR (__METHOD__, Z042, 0xE5, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = FindSetLeftBit (0x09007001) If ((Local0 != 0x1C)) { - ERR (__METHOD__, Z042, 0xE9, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* FindSetRightBit */ @@ -278,13 +278,13 @@ Local1 = FindSetRightBit (0x01080040, Local0) If ((Local1 != 0x07)) { - ERR (__METHOD__, Z042, 0xF0, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = FindSetRightBit (0x09800000) If ((Local0 != 0x18)) { - ERR (__METHOD__, Z042, 0xF4, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Mod */ @@ -292,7 +292,7 @@ Store ((0x1AFB3C4D % 0x00400000), Local0) If ((Local0 != 0x003B3C4D)) { - ERR (__METHOD__, Z042, 0xFB, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ShiftLeft */ @@ -306,13 +306,13 @@ Local1 = Local0 = (0x87654321 >> 0x19) If ((Local1 != 0x43)) { - ERR (__METHOD__, Z042, 0x010A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x7654A0CB >> 0x15), Local0) If ((Local0 != 0x03B2)) { - ERR (__METHOD__, Z042, 0x010E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Nand */ @@ -338,13 +338,13 @@ Local1 = Local0 = (0x9A3533AC | 0x39A696CA) If ((Local1 != 0xBBB7B7EE)) { - ERR (__METHOD__, Z042, 0x012D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0xCA3533A9 | 0xA9A696C3), Local0) If ((Local0 != 0xEBB7B7EB)) { - ERR (__METHOD__, Z042, 0x0131, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Xor */ @@ -352,13 +352,13 @@ Local1 = Local0 = (0x9A365AC3 ^ 0x39A96CA6) If ((Local1 != 0xA39F3665)) { - ERR (__METHOD__, Z042, 0x0138, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0xA9365AC3 ^ 0x93A96CA6), Local0) If ((Local0 != 0x3A9F3665)) { - ERR (__METHOD__, Z042, 0x013C, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Logical operators */ @@ -376,7 +376,7 @@ Local0 = Acquire (MT04, 0x0005) If ((Local0 != Zero)) { - ERR (__METHOD__, Z042, 0x0151, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Release (None) */ @@ -384,13 +384,13 @@ Local1 = ToInteger ("0x89abcdef", Local0) If ((Local1 != 0x89ABCDEF)) { - ERR (__METHOD__, Z042, 0x015A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToInteger ("0x89abcdef") If ((Local0 != 0x89ABCDEF)) { - ERR (__METHOD__, Z042, 0x015E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ToString */ @@ -402,25 +402,25 @@ Local1 = ToString (Local2, Ones, Local0) If ((Local1 != "\x01")) { - ERR (__METHOD__, Z042, 0x0167, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToString (Local2, Ones) If ((Local0 != "\x01")) { - ERR (__METHOD__, Z042, 0x016B, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local1 = ToString (Local2, 0x01, Local0) If ((Local1 != "\x01")) { - ERR (__METHOD__, Z042, 0x0170, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToString (Local2, 0x01) If ((Local0 != "\x01")) { - ERR (__METHOD__, Z042, 0x0174, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ToBuffer */ @@ -432,7 +432,7 @@ 0x01, 0x00 // .. })) { - ERR (__METHOD__, Z042, 0x017D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToBuffer (Local2) @@ -441,7 +441,7 @@ 0x01, 0x00 // .. })) { - ERR (__METHOD__, Z042, 0x0181, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ToDecimalString */ @@ -450,13 +450,13 @@ Local1 = ToDecimalString (Local2, Local0) If ((Local1 != "12")) { - ERR (__METHOD__, Z042, 0x018A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToDecimalString (Local2) If ((Local0 != "12")) { - ERR (__METHOD__, Z042, 0x018E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ToHexString */ @@ -468,13 +468,13 @@ Local1 = ToHexString (Local2, Local0) If ((Local1 != "EF")) { - ERR (__METHOD__, Z042, 0x0197, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToHexString (Local2) If ((Local0 != "EF")) { - ERR (__METHOD__, Z042, 0x019B, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ToBCD */ @@ -483,13 +483,13 @@ Local1 = ToBCD (Local2, Local0) If ((Local1 != 0x10)) { - ERR (__METHOD__, Z042, 0x01A4, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToBCD (Local2) If ((Local0 != 0x10)) { - ERR (__METHOD__, Z042, 0x01A8, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* FromBCD */ @@ -498,13 +498,13 @@ Local1 = FromBCD (Local2, Local0) If ((Local1 != 0x0A)) { - ERR (__METHOD__, Z042, 0x01B1, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = FromBCD (Local2) If ((Local0 != 0x0A)) { - ERR (__METHOD__, Z042, 0x01B5, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Mid */ @@ -513,13 +513,13 @@ Local1 = Mid (Local2, 0x01, 0x02, Local0) If ((Local1 != "12")) { - ERR (__METHOD__, Z042, 0x01BE, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = Mid (Local2, 0x01, 0x02) If ((Local0 != "12")) { - ERR (__METHOD__, Z042, 0x01C2, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local2 = Buffer (0x04) @@ -532,7 +532,7 @@ 0x01, 0x02 // .. })) { - ERR (__METHOD__, Z042, 0x01C9, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = Mid (Local2, 0x01, 0x02) @@ -541,7 +541,7 @@ 0x01, 0x02 // .. })) { - ERR (__METHOD__, Z042, 0x01CD, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Match */ @@ -553,7 +553,7 @@ Local0 = Match (Local2, MTR, 0x00, MTR, 0x00, 0x00) If ((Local0 != 0x00)) { - ERR (__METHOD__, Z042, 0x01D6, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ConcatenateResTemplate */ @@ -575,7 +575,7 @@ 0x79, 0x00 // y. })) { - ERR (__METHOD__, Z042, 0x01E3, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* @@ -587,7 +587,7 @@ 0x79, 0x00 // y. })) { - ERR (__METHOD__, Z042, 0x01EA, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } } @@ -598,7 +598,7 @@ STR0 [0x0A] = "A" If ((STR0 != STR1)) { - ERR ("m30d", Z042, 0x01F6, 0x00, 0x00, STR0, STR1) + ERR ("m30d", Z042, __LINE__, 0x00, 0x00, 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 cda17cd..93a68e5 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl @@ -246,11 +246,11 @@ { If ((ObjectType (Arg1) != 0x03)) { - ERR (Arg0, Z043, 0x8C, 0x00, 0x00, Arg2, "Type") + ERR (Arg0, Z043, __LINE__, 0x00, 0x00, Arg2, "Type") } ElseIf ((SizeOf (Arg1) != (Arg2 + Arg3))) { - ERR (Arg0, Z043, 0x8F, 0x00, 0x00, Arg2, "Sizeof") + ERR (Arg0, Z043, __LINE__, 0x00, 0x00, Arg2, "Sizeof") } Else { @@ -290,7 +290,7 @@ If ((Local3 != Local5)) { - ERR (Arg0, Z043, 0xB6, 0x00, 0x00, Local0, "NotEqual") + ERR (Arg0, Z043, __LINE__, 0x00, 0x00, Local0, "NotEqual") } /* Check the source string was not corrupted */ @@ -330,7 +330,7 @@ ToBuffer (Local4, Local3) If ((Local3 != Local4)) { - ERR (Arg0, Z043, 0xDF, 0x00, 0x00, Local0, "NotEqual") + ERR (Arg0, Z043, __LINE__, 0x00, 0x00, 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 3942d09..d0ac4cb 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl @@ -433,14 +433,14 @@ If (Y602) { - CH03 (__METHOD__, Z047, 0x00, 0x018D, 0x00) + CH03 (__METHOD__, Z047, __LINE__, 0x00, 0x00) Local0 = "0x0123456789abcdefa" ToInteger (Local0, Local2) - CH04 (__METHOD__, 0x00, 0x22, Z047, 0x0190, 0x00, 0x00) - CH03 (__METHOD__, Z047, 0x02, 0x0192, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z047, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z047, __LINE__, 0x00, 0x00) Local0 = "0x000123456789abcdefa" ToInteger (Local0, Local2) - CH04 (__METHOD__, 0x00, 0x22, Z047, 0x0195, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z047, __LINE__, 0x00, 0x00) } Else { @@ -449,14 +449,14 @@ ToInteger (Local0, Local2) If ((Local2 != Local1)) { - ERR (__METHOD__, Z047, 0x019B, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, Z047, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = "0x000123456789abcdefa" ToInteger (Local0, Local2) If ((Local2 != Local1)) { - ERR (__METHOD__, Z047, 0x01A1, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, Z047, __LINE__, 0x00, 0x00, Local0, 0x00) } } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl index 17b5f71..4ec2521 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl @@ -165,7 +165,7 @@ Local1 = ((Local0 + 0x01) % 0x0100) If ((DerefOf (Arg1 [Local0]) != Local1)) { - ERR (Arg0, Z048, 0x5F, 0x00, 0x00, Local0, Arg4) + ERR (Arg0, Z048, __LINE__, 0x00, 0x00, Local0, Arg4) } Local0++ @@ -178,11 +178,11 @@ { If ((ObjectType (Arg1) != 0x02)) { - ERR (Arg0, Z048, 0x69, 0x00, 0x00, Arg2, "Type") + ERR (Arg0, Z048, __LINE__, 0x00, 0x00, Arg2, "Type") } ElseIf ((SizeOf (Arg1) != Arg2)) { - ERR (Arg0, Z048, 0x6C, 0x00, 0x00, Arg2, "Sizeof") + ERR (Arg0, Z048, __LINE__, 0x00, 0x00, Arg2, "Sizeof") } Else { @@ -202,7 +202,7 @@ { If ((DerefOf (Local1 [Local0]) != 0xFF)) { - ERR (Arg0, Z048, 0x7C, 0x00, 0x00, Local0, "buf8") + ERR (Arg0, Z048, __LINE__, 0x00, 0x00, Local0, "buf8") } Local0++ diff --git a/tests/aslts/src/runtime/collections/functional/name/function.asl b/tests/aslts/src/runtime/collections/functional/name/function.asl index fa059ec..04dc664 100644 --- a/tests/aslts/src/runtime/collections/functional/name/function.asl +++ b/tests/aslts/src/runtime/collections/functional/name/function.asl @@ -725,5 +725,5 @@ { Debug = "TEST: NM02, Declare Function Control Method Named Object" M20E () - CH03 ("NM02", Z134, 0x74, 0x0231, 0x00) + CH03 ("NM02", Z134, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/functional/name/method.asl b/tests/aslts/src/runtime/collections/functional/name/method.asl index c55d5da..e10dd00 100644 --- a/tests/aslts/src/runtime/collections/functional/name/method.asl +++ b/tests/aslts/src/runtime/collections/functional/name/method.asl @@ -152,7 +152,7 @@ Local1 = ObjectType (Arg3) If ((Local0 != Local1)) { - ERR (Concatenate (Arg0, "-OType"), Z133, 0x9A, 0x00, 0x00, Local0, Local1) + ERR (Concatenate (Arg0, "-OType"), Z133, __LINE__, 0x00, 0x00, Local0, Local1) Return (0x01) } ElseIf (DerefOf (BZ00 [Local0])) @@ -172,7 +172,7 @@ If ((Arg2 != Arg3)) { - ERR (Arg0, Z133, 0xA6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z133, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (0x01) } } @@ -212,7 +212,7 @@ Local0 = SizeOf (Arg3) If ((SizeOf (Arg2) != Local0)) { - ERR (Concatenate (Arg0, "-Size"), Z133, 0xC6, 0x00, 0x00, SizeOf (Arg2), Local0) + ERR (Concatenate (Arg0, "-Size"), Z133, __LINE__, 0x00, 0x00, SizeOf (Arg2), Local0) Return (0x01) } @@ -225,7 +225,7 @@ { /* ObjectType is corrupted */ - ERR (Concatenate (Arg0, "-OType"), Z133, 0xCF, 0x00, 0x00, Local1, Local2) + ERR (Concatenate (Arg0, "-OType"), Z133, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (BZ00 [Local1])) @@ -237,7 +237,7 @@ { /* The value is corrupted */ - ERR (Arg0, Z133, 0xD7, 0x00, 0x00, DerefOf (Arg2 [Local0]), DerefOf ( + ERR (Arg0, Z133, __LINE__, 0x00, 0x00, DerefOf (Arg2 [Local0]), DerefOf ( Arg3 [Local0])) Return (0x01) } @@ -1386,5 +1386,5 @@ { Debug = "TEST: NM01, Declare Control Method Named Object" M207 () - CH03 ("NM01", Z133, 0xD1, 0x0441, 0x00) + CH03 ("NM01", Z133, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/functional/name/package.asl b/tests/aslts/src/runtime/collections/functional/name/package.asl index 4694cf7..5066f33 100644 --- a/tests/aslts/src/runtime/collections/functional/name/package.asl +++ b/tests/aslts/src/runtime/collections/functional/name/package.asl @@ -337,7 +337,7 @@ { If ((Local2 != Local3)) { - ERR (__METHOD__, Z051, 0x93, 0x00, 0x00, Local2, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local2, Local3) } } ElseIf ((Local1 <= 0x9F)) @@ -345,7 +345,7 @@ Local3 = (0x8765AC00 + Local4) If ((Local2 != Local3)) { - ERR (__METHOD__, Z051, 0x98, 0x00, 0x00, Local2, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local2, Local3) } Local4 += Local6 @@ -355,20 +355,20 @@ Local3 = (0x8765ACBA11223300 + Local5) If ((Local2 != Local3)) { - ERR (__METHOD__, Z051, 0x9E, 0x00, 0x00, Local2, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local2, Local3) } Local5 += Local6 } ElseIf ((Local2 != Local3)) { - ERR (__METHOD__, Z051, 0xA3, 0x00, 0x00, Local2, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local2, Local3) } Local3 = ObjectType (Local2) If ((Local3 != 0x01)) { - ERR (__METHOD__, Z051, 0xA9, 0x00, 0x00, Local3, 0x01) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local3, 0x01) } Local1 += Local6 @@ -378,7 +378,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0xFF)) { - ERR (__METHOD__, Z051, 0xB2, 0x00, 0x00, Local0, 0xFF) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0xFF) } } @@ -415,13 +415,13 @@ If ((Local4 != Local3)) { - ERR (__METHOD__, Z051, 0xD1, 0x00, 0x00, Local4, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local4, Local3) } Local3 = ObjectType (Local2) If ((Local3 != 0x02)) { - ERR (__METHOD__, Z051, 0xD6, 0x00, 0x00, Local3, 0x02) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local3, 0x02) } Local1++ @@ -431,7 +431,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0x0A)) { - ERR (__METHOD__, Z051, 0xDF, 0x00, 0x00, Local0, 0x0A) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x0A) } } @@ -765,13 +765,13 @@ Local4 = (Local1 + 0x01) If ((Local4 != Local3)) { - ERR (__METHOD__, Z051, 0x014E, 0x00, 0x00, Local4, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local4, Local3) } Local3 = ObjectType (Local2) If ((Local3 != 0x03)) { - ERR (__METHOD__, Z051, 0x0153, 0x00, 0x00, Local3, 0x03) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local3, 0x03) } Local1 += Local6 @@ -781,7 +781,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0xFF)) { - ERR (__METHOD__, Z051, 0x015C, 0x00, 0x00, Local0, 0xFF) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0xFF) } } @@ -1246,13 +1246,13 @@ Local4 = (Local1 + 0x01) If ((Local4 != Local3)) { - ERR (__METHOD__, Z051, 0x01CF, 0x00, 0x00, Local4, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local4, Local3) } Local3 = ObjectType (Local2) If ((Local3 != 0x04)) { - ERR (__METHOD__, Z051, 0x01D4, 0x00, 0x00, Local3, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local3, 0x04) } Local1 += Local6 @@ -1262,7 +1262,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0xFF)) { - ERR (__METHOD__, Z051, 0x01DD, 0x00, 0x00, Local0, 0xFF) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0xFF) } } @@ -1354,7 +1354,7 @@ Local0 = ObjectType (Local7) If ((Local0 != N002)) { - ERR (Arg0, Z051, 0x0227, 0x00, 0x00, Local0, N002) + ERR (Arg0, Z051, __LINE__, 0x00, 0x00, Local0, N002) } /* Contents */ @@ -1373,12 +1373,12 @@ If ((Local1 != N004)) { - ERR (Arg0, Z051, 0x0239, 0x00, 0x00, Local1, N004) + ERR (Arg0, Z051, __LINE__, 0x00, 0x00, Local1, N004) Local6 = 0x01 } ElseIf ((Local7 != Local0)) { - ERR (Arg0, Z051, 0x023C, 0x00, 0x00, Local7, Local0) + ERR (Arg0, Z051, __LINE__, 0x00, 0x00, Local7, Local0) Local6 = 0x01 } @@ -4655,13 +4655,13 @@ Local0 = SizeOf (P000) If ((Local0 != 0xFF)) { - ERR (__METHOD__, Z051, 0x03E2, 0x00, 0x00, Local0, 0xFF) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0xFF) } Local0 = SizeOf (P001) If ((Local0 != 0x1D)) { - ERR (__METHOD__, Z051, 0x03E7, 0x00, 0x00, Local0, 0x1D) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x1D) } } @@ -4720,7 +4720,7 @@ If ((Local1 != Local0)) { - ERR (__METHOD__, Z051, 0x0424, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local1, Local0) } Local0++ @@ -4731,13 +4731,13 @@ Local0 = ObjectType (Arg0) If ((Local0 != 0x04)) { - ERR (__METHOD__, Z051, 0x042D, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x04) } Local0 = SizeOf (Arg0) If ((Local0 != Arg1)) { - ERR (__METHOD__, Z051, 0x0432, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, Arg1) } } @@ -4799,7 +4799,7 @@ If ((Local1 != Local0)) { - ERR (__METHOD__, Z051, 0x0470, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local1, Local0) } N000-- @@ -4809,13 +4809,13 @@ Local0 = ObjectType (Arg0) If ((Local0 != 0x04)) { - ERR (__METHOD__, Z051, 0x0478, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x04) } Local0 = SizeOf (Arg0) If ((Local0 != Arg1)) { - ERR (__METHOD__, Z051, 0x047D, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, Arg1) } } @@ -4879,7 +4879,7 @@ If ((Local1 != Local0)) { - ERR (__METHOD__, Z051, 0x04BE, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, 0x00, 0x00) Debug = Local0 Debug = Local1 Return (Ones) @@ -4892,13 +4892,13 @@ Local0 = ObjectType (Arg0) If ((Local0 != 0x04)) { - ERR (__METHOD__, Z051, 0x04C9, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x04) } Local0 = SizeOf (Arg0) If ((Local0 != Arg1)) { - ERR (__METHOD__, Z051, 0x04CE, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, Arg1) } Return (Zero) @@ -4980,7 +4980,7 @@ Local0 = ObjectType (Local1) If ((Local0 != 0x04)) { - ERR (__METHOD__, Z051, 0x0519, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x04) Return (Ones) } @@ -4991,13 +4991,13 @@ Local0 = ObjectType (Arg0) If ((Local0 != 0x04)) { - ERR (__METHOD__, Z051, 0x0522, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x04) } Local0 = SizeOf (Arg0) If ((Local0 != Arg1)) { - ERR (__METHOD__, Z051, 0x0527, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, 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 7ec0020..5ae0ab0 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref00.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref00.asl @@ -55,7 +55,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg1)) { - ERR (C080, Z076, 0x3F, 0x00, 0x00, Local0, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local0, Arg1) } /* if (c08b) */ /* ATTENTION: exactly the same in m1a0 and m1a2 */ @@ -133,7 +133,7 @@ Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x84, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -145,14 +145,14 @@ Local1 = CondRefOf (Arg0, Local0) If ((Local1 != Ones)) { - ERR (C080, Z076, 0x8B, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x8F, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -169,7 +169,7 @@ Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x9E, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -178,7 +178,7 @@ Local1 = ObjectType (DerefOf (Local0)) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0xA5, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } /* Check that writing into M2-ArgX-RefOf_Reference */ @@ -187,11 +187,11 @@ Local1 = ObjectType (Arg0) If ((Local1 != C009)) { - ERR (C080, Z076, 0xAE, 0x00, 0x00, Local1, C009) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, C009) } ElseIf ((Arg0 != 0xABCD001A)) { - ERR (C080, Z076, 0xB0, 0x00, 0x00, Arg0, 0xABCD001A) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Arg0, 0xABCD001A) } Else { @@ -202,14 +202,14 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (C080, Z076, 0xBA, 0x00, 0x00, Local1, C009) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = SizeOf (Local0) If ((Local1 != ISZ0)) { - ERR (C080, Z076, 0xBE, 0x00, 0x00, Local1, ISZ0) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, ISZ0) } } } @@ -241,7 +241,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg1)) { - ERR (C080, Z076, 0xDF, 0x00, 0x00, Local0, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local0, Arg1) } /* if (c08b) */ /* ATTENTION: exactly the same in m1a0 and m1a2 */ @@ -349,11 +349,11 @@ Local0 = ObjectType (Local2) If ((Local0 != Arg4)) { - ERR (C080, Z076, 0x0136, 0x00, 0x00, Local0, Arg4) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local0, Arg4) } ElseIf ((Local2 != Arg5)) { - ERR (C080, Z076, 0x0139, 0x00, 0x00, Local2, Arg5) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local2, Arg5) } } @@ -392,7 +392,7 @@ Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x015D, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -404,14 +404,14 @@ Local1 = CondRefOf (Arg0, Local0) If ((Local1 != Ones)) { - ERR (C080, Z076, 0x0164, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x0168, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -428,7 +428,7 @@ Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x0177, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -437,7 +437,7 @@ Local1 = ObjectType (DerefOf (Local0)) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x017E, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } /* Check that writing into M2-ArgX-RefOf_Reference */ @@ -446,11 +446,11 @@ Local1 = ObjectType (Arg0) If ((Local1 != C009)) { - ERR (C080, Z076, 0x0187, 0x00, 0x00, Local1, C009) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, C009) } ElseIf ((Arg0 != 0xABCD001A)) { - ERR (C080, Z076, 0x0189, 0x00, 0x00, Arg0, 0xABCD001A) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Arg0, 0xABCD001A) } Else { @@ -461,14 +461,14 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (C080, Z076, 0x0193, 0x00, 0x00, Local1, C009) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = SizeOf (Local0) If ((Local1 != ISZ0)) { - ERR (C080, Z076, 0x0197, 0x00, 0x00, Local1, ISZ0) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, ISZ0) } } } @@ -489,12 +489,12 @@ Local0 = ObjectType (Arg0) If ((Local0 != C009)) { - ERR (C080, Z076, 0x01B1, 0x00, 0x00, Local0, C009) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local0, C009) Local7 = 0x00 } ElseIf ((Arg0 != Ones)) { - ERR (C080, Z076, 0x01B4, 0x00, 0x00, Arg0, Ones) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Arg0, Ones) Local7 = 0x00 } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref01.asl b/tests/aslts/src/runtime/collections/functional/reference/ref01.asl index e797d10..0100259 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref01.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref01.asl @@ -1041,56 +1041,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (C080, Z077, 0x016D, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A1000)) { - ERR (C080, Z077, 0x0170, 0x00, 0x00, I900, 0xFE7CB391D65A1000) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A1000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0175, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0xC1791001)) { - ERR (C080, Z077, 0x0178, 0x00, 0x00, I901, 0xC1791001) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I901, 0xC1791001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (C080, Z077, 0x017D, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (C080, Z077, 0x0180, 0x00, 0x00, I902, 0x00) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0185, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (C080, Z077, 0x0188, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (C080, Z077, 0x018D, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (C080, Z077, 0x0190, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -1098,23 +1098,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0197, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12341002")) { - ERR (C080, Z077, 0x019A, 0x00, 0x00, S900, "12341002") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S900, "12341002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x019F, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu1003")) { - ERR (C080, Z077, 0x01A2, 0x00, 0x00, S901, "qwrtyu1003") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S901, "qwrtyu1003") } /* Buffer */ @@ -1122,7 +1122,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (C080, Z077, 0x01A9, 0x00, 0x00, Local0, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -1130,7 +1130,7 @@ 0x10, 0x11, 0x12, 0x13, 0x14 // ..... })) { - ERR (C080, Z077, 0x01AC, 0x00, 0x00, B900, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0x10, 0x11, 0x12, 0x13, 0x14 // ..... }) @@ -1141,12 +1141,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (C080, Z077, 0x01B3, 0x00, 0x00, Local0, C016) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0x10)) { - ERR (C080, Z077, 0x01B6, 0x00, 0x00, BF90, 0x10) + ERR (C080, Z077, __LINE__, 0x00, 0x00, BF90, 0x10) } /* One level Package */ @@ -1155,7 +1155,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (C080, Z077, 0x01BE, 0x00, 0x00, Local1, C008) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -1163,12 +1163,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x01C5, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD1004)) { - ERR (C080, Z077, 0x01C8, 0x00, 0x00, Local1, 0xABCD1004) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD1004) } Store (P901 [0x01], Local0) @@ -1176,12 +1176,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x01CF, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455661005)) { - ERR (C080, Z077, 0x01D2, 0x00, 0x00, Local1, 0x1122334455661005) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0x1122334455661005) } Store (P902 [0x00], Local0) @@ -1189,12 +1189,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x01D9, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12341006")) { - ERR (C080, Z077, 0x01DC, 0x00, 0x00, Local1, "12341006") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "12341006") } Store (P902 [0x01], Local0) @@ -1202,12 +1202,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x01E3, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i81007")) { - ERR (C080, Z077, 0x01E6, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i81007") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i81007") } Store (P903 [0x00], Local0) @@ -1215,12 +1215,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x01ED, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop1008")) { - ERR (C080, Z077, 0x01F0, 0x00, 0x00, Local1, "qwrtyuiop1008") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop1008") } Store (P903 [0x01], Local0) @@ -1228,12 +1228,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x01F7, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0251009")) { - ERR (C080, Z077, 0x01FA, 0x00, 0x00, Local1, "1234567890abdef0251009") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0251009") } Store (P904 [0x00], Local0) @@ -1241,7 +1241,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x0201, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -1249,7 +1249,7 @@ 0xA0, 0xA1, 0xA2 // ... })) { - ERR (C080, Z077, 0x0204, 0x00, 0x00, Local1, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xA0, 0xA1, 0xA2 // ... }) @@ -1260,7 +1260,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x020B, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -1268,7 +1268,7 @@ 0xA3, 0xA4 // .. })) { - ERR (C080, Z077, 0x020E, 0x00, 0x00, Local1, Buffer (0x02) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xA3, 0xA4 // .. }) @@ -1283,12 +1283,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (C080, Z077, 0x0219, 0x00, 0x00, Local4, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC100A)) { - ERR (C080, Z077, 0x021C, 0x00, 0x00, Local3, 0x0ABC100A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, 0x0ABC100A) } Store (P905 [0x00], Local0) @@ -1298,12 +1298,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0225, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc100b")) { - ERR (C080, Z077, 0x0228, 0x00, 0x00, Local3, "0xabc100b") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "0xabc100b") } Store (P905 [0x00], Local0) @@ -1313,12 +1313,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0231, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc100c")) { - ERR (C080, Z077, 0x0234, 0x00, 0x00, Local3, "abc100c") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc100c") } Store (P906 [0x00], Local0) @@ -1328,12 +1328,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x023D, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc100d")) { - ERR (C080, Z077, 0x0240, 0x00, 0x00, Local3, "abc100d") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc100d") } Store (P907 [0x00], Local0) @@ -1343,12 +1343,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0249, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm100e")) { - ERR (C080, Z077, 0x024C, 0x00, 0x00, Local3, "aqwevbgnm100e") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm100e") } Store (P908 [0x00], Local0) @@ -1358,7 +1358,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (C080, Z077, 0x0255, 0x00, 0x00, Local4, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -1366,7 +1366,7 @@ 0xA5, 0xA6, 0xA7, 0xA8, 0xA9 // ..... })) { - ERR (C080, Z077, 0x0258, 0x00, 0x00, Local3, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xA5, 0xA6, 0xA7, 0xA8, 0xA9 // ..... }) @@ -1383,12 +1383,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (C080, Z077, 0x0265, 0x00, 0x00, Local6, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC100F)) { - ERR (C080, Z077, 0x0268, 0x00, 0x00, Local5, 0x0ABC100F) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, 0x0ABC100F) } Store (P90A [0x00], Local0) @@ -1400,12 +1400,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0273, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12341010")) { - ERR (C080, Z077, 0x0276, 0x00, 0x00, Local5, "12341010") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "12341010") } Store (P90B [0x00], Local0) @@ -1417,12 +1417,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0281, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas1011")) { - ERR (C080, Z077, 0x0284, 0x00, 0x00, Local5, "zxswefas1011") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "zxswefas1011") } Store (P90C [0x00], Local0) @@ -1434,7 +1434,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (C080, Z077, 0x028F, 0x00, 0x00, Local6, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -1442,7 +1442,7 @@ 0xAA, 0xAB, 0xAC // ... })) { - ERR (C080, Z077, 0x0292, 0x00, 0x00, Local5, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xAA, 0xAB, 0xAC // ... }) @@ -1453,12 +1453,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0299, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD1018)) { - ERR (C080, Z077, 0x029C, 0x00, 0x00, Local1, 0xABCD1018) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD1018) } Store (P953 [0x01], Local0) @@ -1466,12 +1466,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x02A3, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD1019)) { - ERR (C080, Z077, 0x02A6, 0x00, 0x00, Local1, 0xABCD1019) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD1019) } /* Not Computational Data */ @@ -2861,56 +2861,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (C080, Z077, 0x064C, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A2000)) { - ERR (C080, Z077, 0x064F, 0x00, 0x00, I900, 0xFE7CB391D65A2000) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A2000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0654, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0xC1792001)) { - ERR (C080, Z077, 0x0657, 0x00, 0x00, I901, 0xC1792001) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I901, 0xC1792001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (C080, Z077, 0x065C, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (C080, Z077, 0x065F, 0x00, 0x00, I902, 0x00) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0664, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (C080, Z077, 0x0667, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (C080, Z077, 0x066C, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (C080, Z077, 0x066F, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -2918,23 +2918,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0676, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12342002")) { - ERR (C080, Z077, 0x0679, 0x00, 0x00, S900, "12342002") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S900, "12342002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x067E, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu2003")) { - ERR (C080, Z077, 0x0681, 0x00, 0x00, S901, "qwrtyu2003") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S901, "qwrtyu2003") } /* Buffer */ @@ -2942,7 +2942,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (C080, Z077, 0x0688, 0x00, 0x00, Local0, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -2950,7 +2950,7 @@ 0xC0, 0xC1, 0xC2, 0xC3, 0xC4 // ..... })) { - ERR (C080, Z077, 0x068B, 0x00, 0x00, B900, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0xC0, 0xC1, 0xC2, 0xC3, 0xC4 // ..... }) @@ -2961,12 +2961,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (C080, Z077, 0x0692, 0x00, 0x00, Local0, C016) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0xC0)) { - ERR (C080, Z077, 0x0695, 0x00, 0x00, BF90, 0xC0) + ERR (C080, Z077, __LINE__, 0x00, 0x00, BF90, 0xC0) } /* One level Package */ @@ -2975,7 +2975,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (C080, Z077, 0x069D, 0x00, 0x00, Local1, C008) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -2983,12 +2983,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x06A4, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD2004)) { - ERR (C080, Z077, 0x06A7, 0x00, 0x00, Local1, 0xABCD2004) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD2004) } Store (P901 [0x01], Local0) @@ -2996,12 +2996,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x06AE, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455662005)) { - ERR (C080, Z077, 0x06B1, 0x00, 0x00, Local1, 0x1122334455662005) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0x1122334455662005) } Store (P902 [0x00], Local0) @@ -3009,12 +3009,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x06B8, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12342006")) { - ERR (C080, Z077, 0x06BB, 0x00, 0x00, Local1, "12342006") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "12342006") } Store (P902 [0x01], Local0) @@ -3022,12 +3022,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x06C2, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i82007")) { - ERR (C080, Z077, 0x06C5, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i82007") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i82007") } Store (P903 [0x00], Local0) @@ -3035,12 +3035,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x06CC, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop2008")) { - ERR (C080, Z077, 0x06CF, 0x00, 0x00, Local1, "qwrtyuiop2008") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop2008") } Store (P903 [0x01], Local0) @@ -3048,12 +3048,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x06D6, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0252009")) { - ERR (C080, Z077, 0x06D9, 0x00, 0x00, Local1, "1234567890abdef0252009") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0252009") } Store (P904 [0x00], Local0) @@ -3061,7 +3061,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x06E0, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -3069,7 +3069,7 @@ 0xC5, 0xC6, 0xC7 // ... })) { - ERR (C080, Z077, 0x06E3, 0x00, 0x00, Local1, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xC5, 0xC6, 0xC7 // ... }) @@ -3080,7 +3080,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x06EA, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -3088,7 +3088,7 @@ 0xC8, 0xC9 // .. })) { - ERR (C080, Z077, 0x06ED, 0x00, 0x00, Local1, Buffer (0x02) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xC8, 0xC9 // .. }) @@ -3103,12 +3103,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (C080, Z077, 0x06F8, 0x00, 0x00, Local4, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC200A)) { - ERR (C080, Z077, 0x06FB, 0x00, 0x00, Local3, 0x0ABC200A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, 0x0ABC200A) } Store (P905 [0x00], Local0) @@ -3118,12 +3118,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0704, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc200b")) { - ERR (C080, Z077, 0x0707, 0x00, 0x00, Local3, "0xabc200b") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "0xabc200b") } Store (P905 [0x00], Local0) @@ -3133,12 +3133,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0710, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc200c")) { - ERR (C080, Z077, 0x0713, 0x00, 0x00, Local3, "abc200c") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc200c") } Store (P906 [0x00], Local0) @@ -3148,12 +3148,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x071C, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc200d")) { - ERR (C080, Z077, 0x071F, 0x00, 0x00, Local3, "abc200d") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc200d") } Store (P907 [0x00], Local0) @@ -3163,12 +3163,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0728, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm200e")) { - ERR (C080, Z077, 0x072B, 0x00, 0x00, Local3, "aqwevbgnm200e") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm200e") } Store (P908 [0x00], Local0) @@ -3178,7 +3178,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (C080, Z077, 0x0734, 0x00, 0x00, Local4, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -3186,7 +3186,7 @@ 0xCA, 0xCB, 0xCC, 0xCD, 0xCE // ..... })) { - ERR (C080, Z077, 0x0737, 0x00, 0x00, Local3, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xCA, 0xCB, 0xCC, 0xCD, 0xCE // ..... }) @@ -3203,12 +3203,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (C080, Z077, 0x0744, 0x00, 0x00, Local6, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC200F)) { - ERR (C080, Z077, 0x0747, 0x00, 0x00, Local5, 0x0ABC200F) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, 0x0ABC200F) } Store (P90A [0x00], Local0) @@ -3220,12 +3220,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0752, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12342010")) { - ERR (C080, Z077, 0x0755, 0x00, 0x00, Local5, "12342010") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "12342010") } Store (P90B [0x00], Local0) @@ -3237,12 +3237,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0760, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas2011")) { - ERR (C080, Z077, 0x0763, 0x00, 0x00, Local5, "zxswefas2011") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "zxswefas2011") } Store (P90C [0x00], Local0) @@ -3254,7 +3254,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (C080, Z077, 0x076E, 0x00, 0x00, Local6, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -3262,7 +3262,7 @@ 0xCF, 0xD0, 0xD1 // ... })) { - ERR (C080, Z077, 0x0771, 0x00, 0x00, Local5, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xCF, 0xD0, 0xD1 // ... }) @@ -3273,12 +3273,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0778, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD2018)) { - ERR (C080, Z077, 0x077B, 0x00, 0x00, Local1, 0xABCD2018) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD2018) } Store (P953 [0x01], Local0) @@ -3286,12 +3286,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0782, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD2019)) { - ERR (C080, Z077, 0x0785, 0x00, 0x00, Local1, 0xABCD2019) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD2019) } /* Not Computational Data */ @@ -4532,56 +4532,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0AAB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A3000)) { - ERR (C080, Z077, 0x0AAE, 0x00, 0x00, I900, 0xFE7CB391D65A3000) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A3000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0AB3, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0x21793001)) { - ERR (C080, Z077, 0x0AB6, 0x00, 0x00, I901, 0x21793001) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I901, 0x21793001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0ABB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (C080, Z077, 0x0ABE, 0x00, 0x00, I902, 0x00) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0AC3, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (C080, Z077, 0x0AC6, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0ACB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (C080, Z077, 0x0ACE, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -4589,23 +4589,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0AD5, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12343002")) { - ERR (C080, Z077, 0x0AD8, 0x00, 0x00, S900, "12343002") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S900, "12343002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0ADD, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu3003")) { - ERR (C080, Z077, 0x0AE0, 0x00, 0x00, S901, "qwrtyu3003") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S901, "qwrtyu3003") } /* Buffer */ @@ -4613,7 +4613,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (C080, Z077, 0x0AE7, 0x00, 0x00, Local0, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -4621,7 +4621,7 @@ 0xD0, 0xD1, 0xD2, 0xD3, 0xD4 // ..... })) { - ERR (C080, Z077, 0x0AEA, 0x00, 0x00, B900, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0xD0, 0xD1, 0xD2, 0xD3, 0xD4 // ..... }) @@ -4632,12 +4632,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (C080, Z077, 0x0AF1, 0x00, 0x00, Local0, C016) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0xD0)) { - ERR (C080, Z077, 0x0AF4, 0x00, 0x00, BF90, 0xD0) + ERR (C080, Z077, __LINE__, 0x00, 0x00, BF90, 0xD0) } /* One level Package */ @@ -4646,7 +4646,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (C080, Z077, 0x0AFC, 0x00, 0x00, Local1, C008) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -4654,12 +4654,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0B03, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD3004)) { - ERR (C080, Z077, 0x0B06, 0x00, 0x00, Local1, 0xABCD3004) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD3004) } Store (P901 [0x01], Local0) @@ -4667,12 +4667,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0B0D, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455663005)) { - ERR (C080, Z077, 0x0B10, 0x00, 0x00, Local1, 0x1122334455663005) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0x1122334455663005) } Store (P902 [0x00], Local0) @@ -4680,12 +4680,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0B17, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12343006")) { - ERR (C080, Z077, 0x0B1A, 0x00, 0x00, Local1, "12343006") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "12343006") } Store (P902 [0x01], Local0) @@ -4693,12 +4693,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0B21, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i83007")) { - ERR (C080, Z077, 0x0B24, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i83007") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i83007") } Store (P903 [0x00], Local0) @@ -4706,12 +4706,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0B2B, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop3008")) { - ERR (C080, Z077, 0x0B2E, 0x00, 0x00, Local1, "qwrtyuiop3008") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop3008") } Store (P903 [0x01], Local0) @@ -4719,12 +4719,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0B35, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0253009")) { - ERR (C080, Z077, 0x0B38, 0x00, 0x00, Local1, "1234567890abdef0253009") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0253009") } Store (P904 [0x00], Local0) @@ -4732,7 +4732,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x0B3F, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -4740,7 +4740,7 @@ 0xD5, 0xD6, 0xD7 // ... })) { - ERR (C080, Z077, 0x0B42, 0x00, 0x00, Local1, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xD5, 0xD6, 0xD7 // ... }) @@ -4751,7 +4751,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x0B49, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -4759,7 +4759,7 @@ 0xD8, 0xD9 // .. })) { - ERR (C080, Z077, 0x0B4C, 0x00, 0x00, Local1, Buffer (0x02) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xD8, 0xD9 // .. }) @@ -4774,12 +4774,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (C080, Z077, 0x0B57, 0x00, 0x00, Local4, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC300A)) { - ERR (C080, Z077, 0x0B5A, 0x00, 0x00, Local3, 0x0ABC300A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, 0x0ABC300A) } Store (P905 [0x00], Local0) @@ -4789,12 +4789,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0B63, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc300b")) { - ERR (C080, Z077, 0x0B66, 0x00, 0x00, Local3, "0xabc300b") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "0xabc300b") } Store (P905 [0x00], Local0) @@ -4804,12 +4804,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0B6F, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc300c")) { - ERR (C080, Z077, 0x0B72, 0x00, 0x00, Local3, "abc300c") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc300c") } Store (P906 [0x00], Local0) @@ -4819,12 +4819,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0B7B, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc300d")) { - ERR (C080, Z077, 0x0B7E, 0x00, 0x00, Local3, "abc300d") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc300d") } Store (P907 [0x00], Local0) @@ -4834,12 +4834,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0B87, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm300e")) { - ERR (C080, Z077, 0x0B8A, 0x00, 0x00, Local3, "aqwevbgnm300e") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm300e") } Store (P908 [0x00], Local0) @@ -4849,7 +4849,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (C080, Z077, 0x0B93, 0x00, 0x00, Local4, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -4857,7 +4857,7 @@ 0xDA, 0xDB, 0xDC, 0xDD, 0xDE // ..... })) { - ERR (C080, Z077, 0x0B96, 0x00, 0x00, Local3, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xDA, 0xDB, 0xDC, 0xDD, 0xDE // ..... }) @@ -4874,12 +4874,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (C080, Z077, 0x0BA3, 0x00, 0x00, Local6, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC300F)) { - ERR (C080, Z077, 0x0BA6, 0x00, 0x00, Local5, 0x0ABC300F) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, 0x0ABC300F) } Store (P90A [0x00], Local0) @@ -4891,12 +4891,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0BB1, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12343010")) { - ERR (C080, Z077, 0x0BB4, 0x00, 0x00, Local5, "12343010") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "12343010") } Store (P90B [0x00], Local0) @@ -4908,12 +4908,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0BBF, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas3011")) { - ERR (C080, Z077, 0x0BC2, 0x00, 0x00, Local5, "zxswefas3011") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "zxswefas3011") } Store (P90C [0x00], Local0) @@ -4925,7 +4925,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (C080, Z077, 0x0BCD, 0x00, 0x00, Local6, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -4933,7 +4933,7 @@ 0xDF, 0x20, 0x21 // . ! })) { - ERR (C080, Z077, 0x0BD0, 0x00, 0x00, Local5, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xDF, 0x20, 0x21 // . ! }) @@ -4944,12 +4944,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0BD7, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD3018)) { - ERR (C080, Z077, 0x0BDA, 0x00, 0x00, Local1, 0xABCD3018) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD3018) } Store (P953 [0x01], Local0) @@ -4957,12 +4957,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0BE1, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD3019)) { - ERR (C080, Z077, 0x0BE4, 0x00, 0x00, Local1, 0xABCD3019) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD3019) } /* Not Computational Data */ @@ -6123,56 +6123,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0EBB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A4000)) { - ERR (C080, Z077, 0x0EBE, 0x00, 0x00, I900, 0xFE7CB391D65A4000) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A4000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0EC3, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0xC1794001)) { - ERR (C080, Z077, 0x0EC6, 0x00, 0x00, I901, 0xC1794001) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I901, 0xC1794001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0ECB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (C080, Z077, 0x0ECE, 0x00, 0x00, I902, 0x00) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0ED3, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (C080, Z077, 0x0ED6, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0EDB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (C080, Z077, 0x0EDE, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -6180,23 +6180,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0EE5, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12344002")) { - ERR (C080, Z077, 0x0EE8, 0x00, 0x00, S900, "12344002") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S900, "12344002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0EED, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu4003")) { - ERR (C080, Z077, 0x0EF0, 0x00, 0x00, S901, "qwrtyu4003") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S901, "qwrtyu4003") } /* Buffer */ @@ -6204,7 +6204,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (C080, Z077, 0x0EF7, 0x00, 0x00, Local0, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -6212,7 +6212,7 @@ 0xE0, 0xE1, 0xE2, 0xE3, 0xE4 // ..... })) { - ERR (C080, Z077, 0x0EFA, 0x00, 0x00, B900, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0xE0, 0xE1, 0xE2, 0xE3, 0xE4 // ..... }) @@ -6223,12 +6223,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (C080, Z077, 0x0F01, 0x00, 0x00, Local0, C016) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0xE0)) { - ERR (C080, Z077, 0x0F04, 0x00, 0x00, BF90, 0xE0) + ERR (C080, Z077, __LINE__, 0x00, 0x00, BF90, 0xE0) } /* One level Package */ @@ -6237,7 +6237,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (C080, Z077, 0x0F0C, 0x00, 0x00, Local1, C008) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -6245,12 +6245,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0F13, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD4004)) { - ERR (C080, Z077, 0x0F16, 0x00, 0x00, Local1, 0xABCD4004) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD4004) } Store (P901 [0x01], Local0) @@ -6258,12 +6258,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0F1D, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455664005)) { - ERR (C080, Z077, 0x0F20, 0x00, 0x00, Local1, 0x1122334455664005) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0x1122334455664005) } Store (P902 [0x00], Local0) @@ -6271,12 +6271,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0F27, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12344006")) { - ERR (C080, Z077, 0x0F2A, 0x00, 0x00, Local1, "12344006") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "12344006") } Store (P902 [0x01], Local0) @@ -6284,12 +6284,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0F31, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i84007")) { - ERR (C080, Z077, 0x0F34, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i84007") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i84007") } Store (P903 [0x00], Local0) @@ -6297,12 +6297,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0F3B, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop4008")) { - ERR (C080, Z077, 0x0F3E, 0x00, 0x00, Local1, "qwrtyuiop4008") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop4008") } Store (P903 [0x01], Local0) @@ -6310,12 +6310,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0F45, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0254009")) { - ERR (C080, Z077, 0x0F48, 0x00, 0x00, Local1, "1234567890abdef0254009") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0254009") } Store (P904 [0x00], Local0) @@ -6323,7 +6323,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x0F4F, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -6331,7 +6331,7 @@ 0xE5, 0xE6, 0xE7 // ... })) { - ERR (C080, Z077, 0x0F52, 0x00, 0x00, Local1, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xE5, 0xE6, 0xE7 // ... }) @@ -6342,7 +6342,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x0F59, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -6350,7 +6350,7 @@ 0xE8, 0xE9 // .. })) { - ERR (C080, Z077, 0x0F5C, 0x00, 0x00, Local1, Buffer (0x02) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xE8, 0xE9 // .. }) @@ -6365,12 +6365,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (C080, Z077, 0x0F67, 0x00, 0x00, Local4, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC400A)) { - ERR (C080, Z077, 0x0F6A, 0x00, 0x00, Local3, 0x0ABC400A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, 0x0ABC400A) } Store (P905 [0x00], Local0) @@ -6380,12 +6380,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0F73, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc400b")) { - ERR (C080, Z077, 0x0F76, 0x00, 0x00, Local3, "0xabc400b") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "0xabc400b") } Store (P905 [0x00], Local0) @@ -6395,12 +6395,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0F7F, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc400c")) { - ERR (C080, Z077, 0x0F82, 0x00, 0x00, Local3, "abc400c") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc400c") } Store (P906 [0x00], Local0) @@ -6410,12 +6410,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0F8B, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc400d")) { - ERR (C080, Z077, 0x0F8E, 0x00, 0x00, Local3, "abc400d") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc400d") } Store (P907 [0x00], Local0) @@ -6425,12 +6425,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0F97, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm400e")) { - ERR (C080, Z077, 0x0F9A, 0x00, 0x00, Local3, "aqwevbgnm400e") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm400e") } Store (P908 [0x00], Local0) @@ -6440,7 +6440,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (C080, Z077, 0x0FA3, 0x00, 0x00, Local4, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -6448,7 +6448,7 @@ 0xEA, 0xEB, 0xEC, 0xED, 0xEE // ..... })) { - ERR (C080, Z077, 0x0FA6, 0x00, 0x00, Local3, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xEA, 0xEB, 0xEC, 0xED, 0xEE // ..... }) @@ -6465,12 +6465,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (C080, Z077, 0x0FB3, 0x00, 0x00, Local6, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC400F)) { - ERR (C080, Z077, 0x0FB6, 0x00, 0x00, Local5, 0x0ABC400F) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, 0x0ABC400F) } Store (P90A [0x00], Local0) @@ -6482,12 +6482,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0FC1, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12344010")) { - ERR (C080, Z077, 0x0FC4, 0x00, 0x00, Local5, "12344010") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "12344010") } Store (P90B [0x00], Local0) @@ -6499,12 +6499,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0FCF, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas4011")) { - ERR (C080, Z077, 0x0FD2, 0x00, 0x00, Local5, "zxswefas4011") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "zxswefas4011") } Store (P90C [0x00], Local0) @@ -6516,7 +6516,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (C080, Z077, 0x0FDD, 0x00, 0x00, Local6, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -6524,7 +6524,7 @@ 0xEF, 0x30, 0x31 // .01 })) { - ERR (C080, Z077, 0x0FE0, 0x00, 0x00, Local5, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xEF, 0x30, 0x31 // .01 }) @@ -6535,12 +6535,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0FE7, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD4018)) { - ERR (C080, Z077, 0x0FEA, 0x00, 0x00, Local1, 0xABCD4018) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD4018) } Store (P953 [0x01], Local0) @@ -6548,12 +6548,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0FF1, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD4019)) { - ERR (C080, Z077, 0x0FF4, 0x00, 0x00, Local1, 0xABCD4019) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD4019) } /* Not Computational Data */ @@ -8366,56 +8366,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (C080, Z077, 0x13F9, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A5000)) { - ERR (C080, Z077, 0x13FC, 0x00, 0x00, I900, 0xFE7CB391D65A5000) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A5000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (C080, Z077, 0x1401, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0x41795001)) { - ERR (C080, Z077, 0x1404, 0x00, 0x00, I901, 0x41795001) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I901, 0x41795001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (C080, Z077, 0x1409, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (C080, Z077, 0x140C, 0x00, 0x00, I902, 0x00) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (C080, Z077, 0x1411, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (C080, Z077, 0x1414, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (C080, Z077, 0x1419, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (C080, Z077, 0x141C, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -8423,23 +8423,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x1423, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12345002")) { - ERR (C080, Z077, 0x1426, 0x00, 0x00, S900, "12345002") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S900, "12345002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x142B, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu5003")) { - ERR (C080, Z077, 0x142E, 0x00, 0x00, S901, "qwrtyu5003") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S901, "qwrtyu5003") } /* Buffer */ @@ -8447,7 +8447,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (C080, Z077, 0x1435, 0x00, 0x00, Local0, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -8455,7 +8455,7 @@ 0xF0, 0xF1, 0xF2, 0xF3, 0xF4 // ..... })) { - ERR (C080, Z077, 0x1438, 0x00, 0x00, B900, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0xF0, 0xF1, 0xF2, 0xF3, 0xF4 // ..... }) @@ -8466,12 +8466,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (C080, Z077, 0x143F, 0x00, 0x00, Local0, C016) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0xF0)) { - ERR (C080, Z077, 0x1442, 0x00, 0x00, BF90, 0xF0) + ERR (C080, Z077, __LINE__, 0x00, 0x00, BF90, 0xF0) } /* One level Package */ @@ -8480,7 +8480,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (C080, Z077, 0x144A, 0x00, 0x00, Local1, C008) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -8488,12 +8488,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x1451, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD5004)) { - ERR (C080, Z077, 0x1454, 0x00, 0x00, Local1, 0xABCD5004) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD5004) } Store (P901 [0x01], Local0) @@ -8501,12 +8501,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x145B, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455665005)) { - ERR (C080, Z077, 0x145E, 0x00, 0x00, Local1, 0x1122334455665005) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0x1122334455665005) } Store (P902 [0x00], Local0) @@ -8514,12 +8514,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x1465, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12345006")) { - ERR (C080, Z077, 0x1468, 0x00, 0x00, Local1, "12345006") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "12345006") } Store (P902 [0x01], Local0) @@ -8527,12 +8527,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x146F, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i85007")) { - ERR (C080, Z077, 0x1472, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i85007") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i85007") } Store (P903 [0x00], Local0) @@ -8540,12 +8540,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x1479, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop5008")) { - ERR (C080, Z077, 0x147C, 0x00, 0x00, Local1, "qwrtyuiop5008") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop5008") } Store (P903 [0x01], Local0) @@ -8553,12 +8553,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x1483, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0255009")) { - ERR (C080, Z077, 0x1486, 0x00, 0x00, Local1, "1234567890abdef0255009") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0255009") } Store (P904 [0x00], Local0) @@ -8566,7 +8566,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x148D, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -8574,7 +8574,7 @@ 0xF5, 0xF6, 0xF7 // ... })) { - ERR (C080, Z077, 0x1490, 0x00, 0x00, Local1, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xF5, 0xF6, 0xF7 // ... }) @@ -8585,7 +8585,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x1497, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -8593,7 +8593,7 @@ 0xF8, 0xF9 // .. })) { - ERR (C080, Z077, 0x149A, 0x00, 0x00, Local1, Buffer (0x02) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xF8, 0xF9 // .. }) @@ -8608,12 +8608,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (C080, Z077, 0x14A5, 0x00, 0x00, Local4, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC500A)) { - ERR (C080, Z077, 0x14A8, 0x00, 0x00, Local3, 0x0ABC500A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, 0x0ABC500A) } Store (P905 [0x00], Local0) @@ -8623,12 +8623,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x14B1, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc500b")) { - ERR (C080, Z077, 0x14B4, 0x00, 0x00, Local3, "0xabc500b") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "0xabc500b") } Store (P905 [0x00], Local0) @@ -8638,12 +8638,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x14BD, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc500c")) { - ERR (C080, Z077, 0x14C0, 0x00, 0x00, Local3, "abc500c") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc500c") } Store (P906 [0x00], Local0) @@ -8653,12 +8653,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x14C9, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc500d")) { - ERR (C080, Z077, 0x14CC, 0x00, 0x00, Local3, "abc500d") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc500d") } Store (P907 [0x00], Local0) @@ -8668,12 +8668,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x14D5, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm500e")) { - ERR (C080, Z077, 0x14D8, 0x00, 0x00, Local3, "aqwevbgnm500e") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm500e") } Store (P908 [0x00], Local0) @@ -8683,7 +8683,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (C080, Z077, 0x14E1, 0x00, 0x00, Local4, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -8691,7 +8691,7 @@ 0xFA, 0xFB, 0xFC, 0xFD, 0xFE // ..... })) { - ERR (C080, Z077, 0x14E4, 0x00, 0x00, Local3, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xFA, 0xFB, 0xFC, 0xFD, 0xFE // ..... }) @@ -8708,12 +8708,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (C080, Z077, 0x14F1, 0x00, 0x00, Local6, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC500F)) { - ERR (C080, Z077, 0x14F4, 0x00, 0x00, Local5, 0x0ABC500F) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, 0x0ABC500F) } Store (P90A [0x00], Local0) @@ -8725,12 +8725,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x14FF, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12345010")) { - ERR (C080, Z077, 0x1502, 0x00, 0x00, Local5, "12345010") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "12345010") } Store (P90B [0x00], Local0) @@ -8742,12 +8742,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x150D, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas5011")) { - ERR (C080, Z077, 0x1510, 0x00, 0x00, Local5, "zxswefas5011") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "zxswefas5011") } Store (P90C [0x00], Local0) @@ -8759,7 +8759,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (C080, Z077, 0x151B, 0x00, 0x00, Local6, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -8767,7 +8767,7 @@ 0xFF, 0x40, 0x41 // .@A })) { - ERR (C080, Z077, 0x151E, 0x00, 0x00, Local5, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xFF, 0x40, 0x41 // .@A }) @@ -8778,12 +8778,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x1525, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD5018)) { - ERR (C080, Z077, 0x1528, 0x00, 0x00, Local1, 0xABCD5018) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD5018) } Store (P953 [0x01], Local0) @@ -8791,12 +8791,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x152F, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD5019)) { - ERR (C080, Z077, 0x1532, 0x00, 0x00, Local1, 0xABCD5019) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD5019) } /* Not Computational Data */ diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl index 4751a09..54ac84b 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl @@ -102,7 +102,7 @@ } Default { - ERR ("m1e2", Z110, 0x67, 0x00, 0x00, Local7, 0x00) + ERR ("m1e2", Z110, __LINE__, 0x00, 0x00, Local7, 0x00) } } @@ -794,7 +794,7 @@ } Default { - ERR (__METHOD__, Z110, 0x02CA, 0x00, 0x00, IND0, 0x00) + ERR (__METHOD__, Z110, __LINE__, 0x00, 0x00, IND0, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl index 4c44d5e..0e48458 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl @@ -116,10 +116,10 @@ V000 = C00C /* type of the Standard Data object */ /* \C00C */ V001 = 0x03 /* index of element of Package */ M1C3 (PPP0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00) - M380 (__METHOD__, I000, 0x00, 0x00) - M381 (__METHOD__, S000, 0x00, 0x01) - M382 (__METHOD__, B000, 0x00, 0x02) - M383 (__METHOD__, P000, 0x00, 0x03) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) } /* All the ways reading element of Package given by ArgX */ @@ -144,48 +144,48 @@ /* LocalX */ Store (Arg0 [V001], Local3) - M390 (DerefOf (Local3), V000, 0x00, 0x04) + M390 (DerefOf (Local3), V000, 0x00, __LINE__) Local4 = DerefOf (Local3) - M390 (Local4, V000, 0x00, 0x05) + M390 (Local4, V000, 0x00, __LINE__) M390 (DerefOf (Arg0 [V001]), V000, 0x00, 0x06) Local3 = Local2 = Arg0 [V001] /* \V001 */ - M390 (DerefOf (Local3), V000, 0x00, 0x07) + M390 (DerefOf (Local3), V000, 0x00, __LINE__) Local4 = DerefOf (Local3) - M390 (Local4, V000, 0x00, 0x08) - M390 (DerefOf (Local2), V000, 0x00, 0x09) + M390 (Local4, V000, 0x00, __LINE__) + M390 (DerefOf (Local2), V000, 0x00, __LINE__) Local4 = DerefOf (Local2) - M390 (Local4, V000, 0x00, 0x0A) + M390 (Local4, V000, 0x00, __LINE__) /* ArgX */ Store (Arg0 [V001], Arg3) - M390 (DerefOf (Arg3), V000, 0x00, 0x0B) + M390 (DerefOf (Arg3), V000, 0x00, __LINE__) Arg4 = DerefOf (Arg3) - M390 (Arg4, V000, 0x00, 0x0C) + M390 (Arg4, V000, 0x00, __LINE__) M390 (DerefOf (Arg0 [V001]), V000, 0x00, 0x0D) Arg3 = Arg2 = Arg0 [V001] /* \V001 */ - M390 (DerefOf (Arg3), V000, 0x00, 0x0E) + M390 (DerefOf (Arg3), V000, 0x00, __LINE__) Arg4 = DerefOf (Arg3) - M390 (Arg4, V000, 0x00, 0x0F) - M390 (DerefOf (Arg2), V000, 0x00, 0x10) + M390 (Arg4, V000, 0x00, __LINE__) + M390 (DerefOf (Arg2), V000, 0x00, __LINE__) Arg4 = DerefOf (Arg2) - M390 (Arg4, V000, 0x00, 0x11) + M390 (Arg4, V000, 0x00, __LINE__) /* NamedX */ If (Y127) { CopyObject (PPP0 [0x00], I003) /* \M1C3.I003 */ Store (Arg0 [V001], I003) /* \M1C3.I003 */ - M390 (DerefOf (I003), V000, 0x00, 0x12) + M390 (DerefOf (I003), V000, 0x00, __LINE__) I004 = DerefOf (I003) - M390 (I004, V000, 0x00, 0x13) + M390 (I004, V000, 0x00, __LINE__) M390 (DerefOf (Arg0 [V001]), V000, 0x00, 0x14) I003 = I002 = Arg0 [V001] /* \V001 */ - M390 (DerefOf (I003), V000, 0x00, 0x15) + M390 (DerefOf (I003), V000, 0x00, __LINE__) I004 = DerefOf (I003) - M390 (I004, V000, 0x00, 0x16) - M390 (DerefOf (I002), V000, 0x00, 0x17) + M390 (I004, V000, 0x00, __LINE__) + M390 (DerefOf (I002), V000, 0x00, __LINE__) I004 = DerefOf (I002) - M390 (I004, V000, 0x00, 0x18) + M390 (I004, V000, 0x00, __LINE__) } /* @@ -218,61 +218,61 @@ If (FL00) { Store (P000 [0x00], Local5) - CH03 (__METHOD__, Z116, 0x00, 0xE2, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xE4, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x02, 0xE6, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xE8, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x04, 0xEA, 0x00) - M390 (Local5, V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xEC, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x06, 0xEE, 0x00) - M390 (DerefOf (Local5), V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xF0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Local5, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Local5), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local5 = Local2 = P000 [0x00] - CH03 (__METHOD__, Z116, 0x08, 0xF4, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xF6, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x0A, 0xF8, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xFA, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x0C, 0xFC, 0x00) - M390 (Local5, V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xFE, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x0E, 0x0100, 0x00) - M390 (DerefOf (Local5), V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0102, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x10, 0x0104, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Local5, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Local5), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local2 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0106, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x12, 0x0108, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local2) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x010A, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x14, 0x010C, 0x00) - M390 (Local2, V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x010E, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x16, 0x0110, 0x00) - M390 (DerefOf (Local2), V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0112, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Local2, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Local2), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) { Store (P000 [0x00], Local5) Local3 = DerefOf (Local5) - M390 (DerefOf (Local3), V000, 0x00, 0x1B) + M390 (DerefOf (Local3), V000, 0x00, __LINE__) Local4 = DerefOf (Local3) - M390 (Local4, V000, 0x00, 0x1C) + M390 (Local4, V000, 0x00, __LINE__) Local5 = Local2 = P000 [0x00] Local3 = DerefOf (Local5) - M390 (DerefOf (Local3), V000, 0x00, 0x1D) + M390 (DerefOf (Local3), V000, 0x00, __LINE__) Local4 = DerefOf (Local3) - M390 (Local4, V000, 0x00, 0x1E) + M390 (Local4, V000, 0x00, __LINE__) Local3 = DerefOf (Local2) - M390 (DerefOf (Local3), V000, 0x00, 0x1F) + M390 (DerefOf (Local3), V000, 0x00, __LINE__) Local4 = DerefOf (Local3) - M390 (Local4, V000, 0x00, 0x20) + M390 (Local4, V000, 0x00, __LINE__) } /* if(q001) */ @@ -280,61 +280,61 @@ If (FL00) { Store (P000 [0x01], Local5) - CH03 (__METHOD__, Z116, 0x18, 0x0131, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0133, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x1A, 0x0135, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0137, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x1C, 0x0139, 0x00) - M390 (Local5, V000, 0x00, 0x21) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x013B, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x1E, 0x013D, 0x00) - M390 (DerefOf (Local5), V000, 0x00, 0x22) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x013F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Local5, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Local5), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local5 = Local2 = P000 [0x01] - CH03 (__METHOD__, Z116, 0x20, 0x0143, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0145, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x22, 0x0147, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0149, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x24, 0x014B, 0x00) - M390 (Local5, V000, 0x00, 0x23) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x014D, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x26, 0x014F, 0x00) - M390 (DerefOf (Local5), V000, 0x00, 0x24) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0151, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x28, 0x0153, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Local5, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Local5), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local2 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0155, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x2A, 0x0157, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local2) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0159, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x2C, 0x015B, 0x00) - M390 (Local2, V000, 0x00, 0x25) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x015D, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x2E, 0x015F, 0x00) - M390 (DerefOf (Local2), V000, 0x00, 0x26) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0161, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Local2, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Local2), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) { Store (P000 [0x01], Local5) Local3 = DerefOf (Local5) - M390 (DerefOf (Local3), V000, 0x00, 0x27) + M390 (DerefOf (Local3), V000, 0x00, __LINE__) Local4 = DerefOf (Local3) - M390 (Local4, V000, 0x00, 0x28) + M390 (Local4, V000, 0x00, __LINE__) Local5 = Local2 = P000 [0x01] Local3 = DerefOf (Local5) - M390 (DerefOf (Local3), V000, 0x00, 0x29) + M390 (DerefOf (Local3), V000, 0x00, __LINE__) Local4 = DerefOf (Local3) - M390 (Local4, V000, 0x00, 0x2A) + M390 (Local4, V000, 0x00, __LINE__) Local3 = DerefOf (Local2) - M390 (DerefOf (Local3), V000, 0x00, 0x2B) + M390 (DerefOf (Local3), V000, 0x00, __LINE__) Local4 = DerefOf (Local3) - M390 (Local4, V000, 0x00, 0x2C) + M390 (Local4, V000, 0x00, __LINE__) } /* if(q001) */ @@ -342,61 +342,61 @@ If (FL00) { Store (P000 [0x00], Arg5) - CH03 (__METHOD__, Z116, 0x30, 0x0180, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0182, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x32, 0x0184, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0186, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x34, 0x0188, 0x00) - M390 (Arg5, V000, 0x00, 0x2D) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x018A, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x36, 0x018C, 0x00) - M390 (DerefOf (Arg5), V000, 0x00, 0x2E) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x018E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Arg5, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Arg5), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Arg5 = Arg2 = P000 [0x00] - CH03 (__METHOD__, Z116, 0x38, 0x0192, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0194, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x3A, 0x0196, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0198, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x3C, 0x019A, 0x00) - M390 (Arg5, V000, 0x00, 0x2F) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x019C, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x3E, 0x019E, 0x00) - M390 (DerefOf (Arg5), V000, 0x00, 0x30) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01A0, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x40, 0x01A2, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Arg5, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Arg5), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg2 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01A4, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x42, 0x01A6, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg2) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01A8, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x44, 0x01AA, 0x00) - M390 (Arg2, V000, 0x00, 0x31) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01AC, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x46, 0x01AE, 0x00) - M390 (DerefOf (Arg2), V000, 0x00, 0x32) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01B0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Arg2, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Arg2), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) { Store (P000 [0x00], Arg5) Arg3 = DerefOf (Arg5) - M390 (DerefOf (Arg3), V000, 0x00, 0x33) + M390 (DerefOf (Arg3), V000, 0x00, __LINE__) Arg4 = DerefOf (Arg3) - M390 (Arg4, V000, 0x00, 0x34) + M390 (Arg4, V000, 0x00, __LINE__) Arg5 = Arg2 = P000 [0x00] Arg3 = DerefOf (Arg5) - M390 (DerefOf (Arg3), V000, 0x00, 0x35) + M390 (DerefOf (Arg3), V000, 0x00, __LINE__) Arg4 = DerefOf (Arg3) - M390 (Arg4, V000, 0x00, 0x36) + M390 (Arg4, V000, 0x00, __LINE__) Arg3 = DerefOf (Arg2) - M390 (DerefOf (Arg3), V000, 0x00, 0x37) + M390 (DerefOf (Arg3), V000, 0x00, __LINE__) Arg4 = DerefOf (Arg3) - M390 (Arg4, V000, 0x00, 0x38) + M390 (Arg4, V000, 0x00, __LINE__) } /* if(q001) */ @@ -404,61 +404,61 @@ If (FL00) { Store (P000 [0x01], Arg5) - CH03 (__METHOD__, Z116, 0x48, 0x01CF, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01D1, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x4A, 0x01D3, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01D5, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x4C, 0x01D7, 0x00) - M390 (Arg5, V000, 0x00, 0x39) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01D9, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x4E, 0x01DB, 0x00) - M390 (DerefOf (Arg5), V000, 0x00, 0x3A) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01DD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Arg5, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Arg5), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Arg5 = Arg2 = P000 [0x01] - CH03 (__METHOD__, Z116, 0x50, 0x01E1, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01E3, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x52, 0x01E5, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01E7, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x54, 0x01E9, 0x00) - M390 (Arg5, V000, 0x00, 0x3B) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01EB, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x56, 0x01ED, 0x00) - M390 (DerefOf (Arg5), V000, 0x00, 0x3C) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01EF, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x58, 0x01F1, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Arg5, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Arg5), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg2 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01F3, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x5A, 0x01F5, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg2) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01F7, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x5C, 0x01F9, 0x00) - M390 (Arg2, V000, 0x00, 0x3D) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01FB, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x5E, 0x01FD, 0x00) - M390 (DerefOf (Arg2), V000, 0x00, 0x3E) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01FF, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (Arg2, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (Arg2), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) { Store (P000 [0x01], Arg5) Arg3 = DerefOf (Arg5) - M390 (DerefOf (Arg3), V000, 0x00, 0x3F) + M390 (DerefOf (Arg3), V000, 0x00, __LINE__) Arg4 = DerefOf (Arg3) - M390 (Arg4, V000, 0x00, 0x40) + M390 (Arg4, V000, 0x00, __LINE__) Arg5 = Arg2 = P000 [0x01] Arg3 = DerefOf (Arg5) - M390 (DerefOf (Arg3), V000, 0x00, 0x41) + M390 (DerefOf (Arg3), V000, 0x00, __LINE__) Arg4 = DerefOf (Arg3) - M390 (Arg4, V000, 0x00, 0x42) + M390 (Arg4, V000, 0x00, __LINE__) Arg3 = DerefOf (Arg2) - M390 (DerefOf (Arg3), V000, 0x00, 0x43) + M390 (DerefOf (Arg3), V000, 0x00, __LINE__) Arg4 = DerefOf (Arg3) - M390 (Arg4, V000, 0x00, 0x44) + M390 (Arg4, V000, 0x00, __LINE__) } /* if(q001) */ @@ -471,61 +471,61 @@ { CopyObject (PPP0 [0x00], I005) /* \M1C3.I005 */ Store (P000 [0x00], I005) /* \M1C3.I005 */ - CH03 (__METHOD__, Z116, 0x60, 0x0221, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I005 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0223, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x62, 0x0225, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I005) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0227, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x64, 0x0229, 0x00) - M390 (I005, V000, 0x00, 0x45) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x022B, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x66, 0x022D, 0x00) - M390 (DerefOf (I005), V000, 0x00, 0x46) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x022F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (I005, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (I005), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) I005 = I002 = P000 [0x00] - CH03 (__METHOD__, Z116, 0x68, 0x0233, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I005 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0235, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x6A, 0x0237, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I005) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0239, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x6C, 0x023B, 0x00) - M390 (I005, V000, 0x00, 0x47) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x023D, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x6E, 0x023F, 0x00) - M390 (DerefOf (I005), V000, 0x00, 0x48) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0241, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x70, 0x0243, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (I005, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (I005), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I002 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0245, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x72, 0x0247, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I002) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0249, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x74, 0x024B, 0x00) - M390 (I002, V000, 0x00, 0x49) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x024D, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x76, 0x024F, 0x00) - M390 (DerefOf (I002), V000, 0x00, 0x4A) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0251, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (I002, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (I002), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) { Store (P000 [0x00], I005) /* \M1C3.I005 */ I003 = DerefOf (I005) - M390 (DerefOf (I003), V000, 0x00, 0x4B) + M390 (DerefOf (I003), V000, 0x00, __LINE__) I004 = DerefOf (I003) - M390 (I004, V000, 0x00, 0x4C) + M390 (I004, V000, 0x00, __LINE__) I005 = I002 = P000 [0x00] I003 = DerefOf (I005) - M390 (DerefOf (I003), V000, 0x00, 0x4D) + M390 (DerefOf (I003), V000, 0x00, __LINE__) I004 = DerefOf (I003) - M390 (I004, V000, 0x00, 0x4E) + M390 (I004, V000, 0x00, __LINE__) I003 = DerefOf (I002) - M390 (DerefOf (I003), V000, 0x00, 0x4F) + M390 (DerefOf (I003), V000, 0x00, __LINE__) I004 = DerefOf (I003) - M390 (I004, V000, 0x00, 0x50) + M390 (I004, V000, 0x00, __LINE__) } /* if(q001) */ @@ -533,61 +533,61 @@ If (FL00) { Store (P000 [0x01], I005) /* \M1C3.I005 */ - CH03 (__METHOD__, Z116, 0x78, 0x0270, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I005 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0272, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x7A, 0x0274, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I005) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0276, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x7C, 0x0278, 0x00) - M390 (I005, V000, 0x00, 0x51) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x027A, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x7E, 0x027C, 0x00) - M390 (DerefOf (I005), V000, 0x00, 0x52) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x027E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (I005, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (I005), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) I005 = I002 = P000 [0x01] - CH03 (__METHOD__, Z116, 0x80, 0x0282, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I005 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0284, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x82, 0x0286, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I005) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0288, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x84, 0x028A, 0x00) - M390 (I005, V000, 0x00, 0x53) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x028C, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x86, 0x028E, 0x00) - M390 (DerefOf (I005), V000, 0x00, 0x54) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0290, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x88, 0x0292, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (I005, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (I005), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I002 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0294, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x8A, 0x0296, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I002) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0298, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x8C, 0x029A, 0x00) - M390 (I002, V000, 0x00, 0x55) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x029C, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x8E, 0x029E, 0x00) - M390 (DerefOf (I002), V000, 0x00, 0x56) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x02A0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (I002, V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) + M390 (DerefOf (I002), V000, 0x00, __LINE__) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) { Store (P000 [0x01], I005) /* \M1C3.I005 */ I003 = DerefOf (I005) - M390 (DerefOf (I003), V000, 0x00, 0x57) + M390 (DerefOf (I003), V000, 0x00, __LINE__) I004 = DerefOf (I003) - M390 (I004, V000, 0x00, 0x58) + M390 (I004, V000, 0x00, __LINE__) I005 = I002 = P000 [0x01] I003 = DerefOf (I005) - M390 (DerefOf (I003), V000, 0x00, 0x59) + M390 (DerefOf (I003), V000, 0x00, __LINE__) I004 = DerefOf (I003) - M390 (I004, V000, 0x00, 0x5A) + M390 (I004, V000, 0x00, __LINE__) I003 = DerefOf (I002) - M390 (DerefOf (I003), V000, 0x00, 0x5B) + M390 (DerefOf (I003), V000, 0x00, __LINE__) I004 = DerefOf (I003) - M390 (I004, V000, 0x00, 0x5C) + M390 (I004, V000, 0x00, __LINE__) } /* if(q001) */ } @@ -752,7 +752,7 @@ M1A3 (Local0, C009, Z116, __METHOD__, 0x76) Store (P000 [0x09], Local0) M1A3 (Local0, C009, Z116, __METHOD__, 0x77) - M380 (__METHOD__, I000, 0x00, 0x00) + M380 (__METHOD__, I000, 0x00, __LINE__) } /* CURRENTLY: compiler failed, Too few arguments (M002 requires X) */ @@ -806,7 +806,7 @@ m1a3(Local0, c009, z116, ts, 128) Store(Index(p000, 9), Local0) m1a3(Local0, c009, z116, ts, 129) - m380(ts, i000, 0, 130) + m380 (ts, i000, 0, __LINE__) */ } @@ -852,45 +852,45 @@ }) Store (P000 [0x00], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x83) - CH03 (__METHOD__, Z116, 0x90, 0x03A8, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03AA, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x01], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x84) - CH03 (__METHOD__, Z116, 0x92, 0x03AE, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03B0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x02], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x85) - CH03 (__METHOD__, Z116, 0x94, 0x03B4, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03B6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x03], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x86) - CH03 (__METHOD__, Z116, 0x96, 0x03BA, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03BC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x04], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x87) - CH03 (__METHOD__, Z116, 0x98, 0x03C0, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03C2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x05], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x88) - CH03 (__METHOD__, Z116, 0x9A, 0x03C6, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03C8, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x06], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x89) - CH03 (__METHOD__, Z116, 0x9C, 0x03CC, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03CE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x07], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x8A) - CH03 (__METHOD__, Z116, 0x9E, 0x03D2, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03D4, 0x00, 0x00) - M380 (__METHOD__, I000, 0x00, 0x8B) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) + M380 (__METHOD__, I000, 0x00, __LINE__) } /* Size of Package */ @@ -900,9 +900,9 @@ Method (M000, 1, Serialized) { Name (P000, Package (Arg0){}) - CH03 (__METHOD__, Z116, 0xA0, 0x03E2, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Store (P000 [Arg0], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03E4, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M001, 1, Serialized) @@ -931,7 +931,7 @@ Local1 = DerefOf (Local0) If ((Local1 != LPC0)) { - ERR (__METHOD__, Z116, 0x0402, Z116, 0x00, Local1, LPC0) + ERR (__METHOD__, Z116, __LINE__, Z116, 0x00, Local1, LPC0) Break } @@ -943,17 +943,17 @@ Method (M003, 0, Serialized) { Name (P000, Package (0x02){}) - CH03 (__METHOD__, Z116, 0xA2, 0x040E, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x02], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0410, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M004, 0, Serialized) { Name (P000, Package (0xFF){}) - CH03 (__METHOD__, Z116, 0xA4, 0x0417, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Store (P000 [0xFF], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0419, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } /* Size not greater than 255 */ @@ -985,7 +985,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0x06)) { - ERR (__METHOD__, Z116, 0x0435, 0x00, 0x00, Local0, 0x06) + ERR (__METHOD__, Z116, __LINE__, 0x00, 0x00, Local0, 0x06) } } @@ -996,15 +996,15 @@ /* arg3 - exception is expected */ Method (M1CC, 4, NotSerialized) { - CH03 (Arg0, Z116, 0xA6, 0x0440, 0x00) + CH03 (Arg0, Z116, __LINE__, 0x00, 0x00) Local0 = Arg1 Local7 = (Local0 + 0x01) If ((Local7 != Arg2)) { - ERR (Arg0, Z116, 0x0446, 0x00, 0x00, Local7, Arg2) + ERR (Arg0, Z116, __LINE__, 0x00, 0x00, Local7, Arg2) } - CH03 (Arg0, Z116, 0xA7, 0x0449, 0x00) + CH03 (Arg0, Z116, __LINE__, 0x00, 0x00) } /* Check the read automatic dereference */ @@ -1014,14 +1014,14 @@ /* arg3 - exception is expected */ Method (M1CD, 4, NotSerialized) { - CH03 (Arg0, Z116, 0xA8, 0x0453, 0x00) + CH03 (Arg0, Z116, __LINE__, 0x00, 0x00) Local7 = (Arg1 + 0x01) If ((Local7 != Arg2)) { - ERR (Arg0, Z116, 0x0458, 0x00, 0x00, Local7, Arg2) + ERR (Arg0, Z116, __LINE__, 0x00, 0x00, Local7, Arg2) } - CH03 (Arg0, Z116, 0xA9, 0x045B, 0x00) + CH03 (Arg0, Z116, __LINE__, 0x00, 0x00) } /* Check the read automatic dereference */ @@ -1086,11 +1086,11 @@ 0x77 }) Local1 = Local0 = P000 [0x00] - CH03 (__METHOD__, Z116, 0xAC, 0x04A6, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04AA, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (Local1 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04AE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M1D2, 0, Serialized) @@ -1100,11 +1100,11 @@ 0x77 }) CopyObject (Local0 = P000 [0x00], Local1) - CH03 (__METHOD__, Z116, 0xAF, 0x04B9, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04BD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (Local1 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04C1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } /* ArgX */ @@ -1116,11 +1116,11 @@ 0x77 }) Arg1 = Arg0 = P000 [0x00] - CH03 (__METHOD__, Z116, 0xB2, 0x04CE, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (Arg0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04D2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (Arg1 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04D6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M1D4, 2, Serialized) @@ -1130,13 +1130,13 @@ 0x77 }) CopyObject (Arg0 = P000 [0x00], Arg1) - CH03 (__METHOD__, Z116, 0xB5, 0x04E1, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (Arg0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04E5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) /* Type of Arg1 should be IRef here, */ /* so, exception is expected. */ Local7 = (Arg1 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04EC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } /* NamedX */ @@ -1153,13 +1153,13 @@ Name (HG00, 0x00) /* if non-zero - the test hangs */ Name (HG01, 0x00) /* if non-zero - the test hangs */ Name (HG02, 0x00) /* if non-zero - the test hangs */ - CH03 (__METHOD__, Z116, 0xB8, 0x04FD, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) CopyObject (Local0 = P000 [0x01], I001) /* \M1D5.I001 */ - CH03 (__METHOD__, Z116, 0xB9, 0x0501, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) /* Type of i001 should be already IRef here, */ /* so, don't expect exception. */ I001 = Local0 = P000 [0x00] - CH03 (__METHOD__, Z116, 0xBA, 0x0508, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) If (Y248) { @@ -1196,9 +1196,9 @@ Debug = Local7 } - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0529, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (I001 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x052D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) /* * Looks identical to b248: "Incorrect ReferenceCount on Switch operation": * @@ -1223,11 +1223,11 @@ { 0x77 }) - CH03 (__METHOD__, Z116, 0xBD, 0x0548, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) CopyObject (Local0 = P000 [0x00], I001) /* \M1D6.I001 */ - CH03 (__METHOD__, Z116, 0xBE, 0x054C, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (I001 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0550, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } /* Out of Package */ @@ -1238,11 +1238,11 @@ { 0x77 }) - CH03 (__METHOD__, Z116, 0xC1, 0x055B, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x01], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x055F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local1 = Local0 = P000 [0x01] - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0563, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M1D8, 0, Serialized) @@ -1251,11 +1251,11 @@ { 0x77 }) - CH03 (__METHOD__, Z116, 0xC4, 0x056C, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) CopyObject (P000 [0x01], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0570, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CopyObject (Local0 = P000 [0x01], Local1) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0574, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M1DB, 0, Serialized) @@ -1266,16 +1266,16 @@ 0x77, 0x88 }) - CH03 (__METHOD__, Z116, 0xC7, 0x057F, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) CopyObject (P000 [0x01], I001) /* \M1DB.I001 */ - CH03 (__METHOD__, Z116, 0xC8, 0x0583, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) /* Type of i001 should be already IRef here, */ /* so, don't expect exception. Writing to i001 */ /* is here identical to Store into it. */ I001 = P000 [0x00] - CH03 (__METHOD__, Z116, 0xC9, 0x058B, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (I001 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x058F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } /* WRITE */ @@ -1295,7 +1295,7 @@ } M000 (P000 [0x01]) - M383 ("m1d9", P000, Z116, 0x8C) + M383 ("m1d9", P000, Z116, __LINE__) } Method (M1DA, 0, Serialized) @@ -1312,5 +1312,5 @@ } M000 (P000 [0x01]) - M383 ("m1da", P000, Z116, 0x8D) + M383 ("m1da", P000, Z116, __LINE__) } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl index 6f5075d..fa949d9 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl @@ -218,13 +218,13 @@ CreateField (Arg0, 0x08, 0x08, BF90) If ((BF90 != 0x77)) { - ERR (__METHOD__, Z111, 0xEF, 0x00, 0x00, BF90, 0x77) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x77) } BF90 = 0x9999992B If ((BF90 != 0x2B)) { - ERR (__METHOD__, Z111, 0xF3, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x2B) } } @@ -233,14 +233,14 @@ CreateField (Arg0, 0x08, 0x08, BF90) If ((BF90 != 0x77)) { - ERR (__METHOD__, Z111, 0xFB, 0x00, 0x00, BF90, 0x77) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x77) } BF90 = 0x2B CopyObject (0x9999992B, BF90) /* \M22C.M001.BF90 */ If ((BF90 != 0x2B)) { - ERR (__METHOD__, Z111, 0x0101, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x2B) } } @@ -251,10 +251,10 @@ M001 (B010) } - M386 (__METHOD__, B000, 0x00, 0x04) + M386 (__METHOD__, B000, 0x00, __LINE__) If (X191) { - M386 (__METHOD__, B010, 0x00, 0x05) + M386 (__METHOD__, B010, 0x00, __LINE__) } END0 () @@ -360,13 +360,13 @@ CreateField (Local2, 0x08, 0x08, BF90) If ((BF90 != 0x77)) { - ERR (__METHOD__, Z111, 0x0178, 0x00, 0x00, BF90, 0x77) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x77) } BF90 = 0x9999992B If ((BF90 != 0x2B)) { - ERR (__METHOD__, Z111, 0x017C, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x2B) } } @@ -376,13 +376,13 @@ CreateField (Local2, 0x08, 0x08, BF90) If ((BF90 != 0x77)) { - ERR (__METHOD__, Z111, 0x0186, 0x00, 0x00, BF90, 0x77) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x77) } CopyObject (0x9999992B, BF90) /* \M234.M001.BF90 */ If ((BF90 != 0x2B)) { - ERR (__METHOD__, Z111, 0x018A, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x2B) } } @@ -392,15 +392,15 @@ M000 (Local0) If ((Arg1 == C00A)) { - M381 (__METHOD__, Arg0, 0x00, 0x0100) + M381 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Arg0, 0x00, 0x0101) + M382 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Arg0, 0x00, 0x0102) + M383 (__METHOD__, Arg0, 0x00, __LINE__) } } @@ -409,15 +409,15 @@ M000 (RefOf (Arg0)) If ((Arg1 == C00A)) { - M381 (__METHOD__, Arg0, 0x00, 0x0103) + M381 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Arg0, 0x00, 0x0104) + M382 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Arg0, 0x00, 0x0105) + M383 (__METHOD__, Arg0, 0x00, __LINE__) } } @@ -427,15 +427,15 @@ M001 (Local0) If ((Arg1 == C00A)) { - M381 (__METHOD__, Arg0, 0x00, 0x0106) + M381 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Arg0, 0x00, 0x0107) + M382 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Arg0, 0x00, 0x0108) + M383 (__METHOD__, Arg0, 0x00, __LINE__) } } @@ -444,33 +444,33 @@ M001 (RefOf (Arg0)) If ((Arg1 == C00A)) { - M381 (__METHOD__, Arg0, 0x00, 0x0109) + M381 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Arg0, 0x00, 0x010A) + M382 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Arg0, 0x00, 0x010B) + M383 (__METHOD__, Arg0, 0x00, __LINE__) } } BEG0 (Z111, __METHOD__) M010 (B000, C00B) - M382 (__METHOD__, B000, 0x00, 0x010C) + M382 (__METHOD__, B000, 0x00, __LINE__) M020 (B000, C00B) - M382 (__METHOD__, B000, 0x00, 0x010D) + M382 (__METHOD__, B000, 0x00, __LINE__) If (X191) { M011 (B000, C00B) - M382 (__METHOD__, B000, 0x00, 0x010E) + M382 (__METHOD__, B000, 0x00, __LINE__) } If (X191) { M021 (B000, C00B) - M382 (__METHOD__, B000, 0x00, 0x010F) + M382 (__METHOD__, B000, 0x00, __LINE__) } END0 () @@ -528,19 +528,19 @@ Arg1 = Arg0 If ((Arg2 == C009)) { - M380 (__METHOD__, Arg1, 0x00, 0x00) + M380 (__METHOD__, Arg1, 0x00, __LINE__) } ElseIf ((Arg2 == C00A)) { - M381 (__METHOD__, Arg1, 0x00, 0x01) + M381 (__METHOD__, Arg1, 0x00, __LINE__) } ElseIf ((Arg2 == C00B)) { - M382 (__METHOD__, Arg1, 0x00, 0x02) + M382 (__METHOD__, Arg1, 0x00, __LINE__) } ElseIf ((Arg2 == C00C)) { - M383 (__METHOD__, Arg1, 0x00, 0x03) + M383 (__METHOD__, Arg1, 0x00, __LINE__) } } @@ -549,19 +549,19 @@ CopyObject (Arg0, Arg1) If ((Arg2 == C009)) { - M380 (__METHOD__, Arg1, 0x00, 0x04) + M380 (__METHOD__, Arg1, 0x00, __LINE__) } ElseIf ((Arg2 == C00A)) { - M381 (__METHOD__, Arg1, 0x00, 0x05) + M381 (__METHOD__, Arg1, 0x00, __LINE__) } ElseIf ((Arg2 == C00B)) { - M382 (__METHOD__, Arg1, 0x00, 0x06) + M382 (__METHOD__, Arg1, 0x00, __LINE__) } ElseIf ((Arg2 == C00C)) { - M383 (__METHOD__, Arg1, 0x00, 0x07) + M383 (__METHOD__, Arg1, 0x00, __LINE__) } } @@ -571,19 +571,19 @@ Local2 = DerefOf (Arg1) If ((Arg2 == C009)) { - M380 (__METHOD__, Local2, 0x00, 0x08) + M380 (__METHOD__, Local2, 0x00, __LINE__) } ElseIf ((Arg2 == C00A)) { - M381 (__METHOD__, Local2, 0x00, 0x09) + M381 (__METHOD__, Local2, 0x00, __LINE__) } ElseIf ((Arg2 == C00B)) { - M382 (__METHOD__, Local2, 0x00, 0x0A) + M382 (__METHOD__, Local2, 0x00, __LINE__) } ElseIf ((Arg2 == C00C)) { - M383 (__METHOD__, Local2, 0x00, 0x0B) + M383 (__METHOD__, Local2, 0x00, __LINE__) } } @@ -593,26 +593,26 @@ Local2 = DerefOf (Arg1) If ((Arg2 == C009)) { - M380 (__METHOD__, Local2, 0x00, 0x0C) + M380 (__METHOD__, Local2, 0x00, __LINE__) } ElseIf ((Arg2 == C00A)) { - M381 (__METHOD__, Local2, 0x00, 0x0D) + M381 (__METHOD__, Local2, 0x00, __LINE__) } ElseIf ((Arg2 == C00B)) { - M382 (__METHOD__, Local2, 0x00, 0x0E) + M382 (__METHOD__, Local2, 0x00, __LINE__) } ElseIf ((Arg2 == C00C)) { - M383 (__METHOD__, Local2, 0x00, 0x0F) + M383 (__METHOD__, Local2, 0x00, __LINE__) } } Method (M004, 2, NotSerialized) { Arg1 = Arg0 - M380 (__METHOD__, Arg1, 0x00, 0x10) + M380 (__METHOD__, Arg1, 0x00, __LINE__) } Method (M005, 2, NotSerialized) @@ -624,117 +624,117 @@ /* ArgX-Object -->> ArgY-Object */ M000 (I000, I001, C009) - M380 (__METHOD__, I000, 0x00, 0x11) - M384 (__METHOD__, I001, 0x00, 0x12) + M380 (__METHOD__, I000, 0x00, __LINE__) + M384 (__METHOD__, I001, 0x00, __LINE__) M001 (I000, I001, C009) - M380 (__METHOD__, I000, 0x00, 0x13) - M384 (__METHOD__, I001, 0x00, 0x14) + M380 (__METHOD__, I000, 0x00, __LINE__) + M384 (__METHOD__, I001, 0x00, __LINE__) /* ArgX-Object -->> ArgY-ORef */ M002 (I000, RefOf (I001), C009) - M380 (__METHOD__, I000, 0x00, 0x15) - M380 (__METHOD__, I001, 0x00, 0x16) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, I001, 0x00, __LINE__) M003 (I000, RefOf (I021), C009) - M380 (__METHOD__, I000, 0x00, 0x17) - M380 (__METHOD__, I021, 0x00, 0x18) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, I021, 0x00, __LINE__) Local0 = RefOf (I031) M002 (I000, Local0, C009) - M380 (__METHOD__, I000, 0x00, 0x19) - M380 (__METHOD__, I031, 0x00, 0x1A) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, I031, 0x00, __LINE__) Local2 = DerefOf (Local0) - M380 (__METHOD__, Local2, 0x00, 0x1B) + M380 (__METHOD__, Local2, 0x00, __LINE__) Local0 = RefOf (I041) M003 (I000, Local0, C009) - M380 (__METHOD__, I000, 0x00, 0x1C) - M380 (__METHOD__, I041, 0x00, 0x1D) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, I041, 0x00, __LINE__) Local2 = DerefOf (Local0) - M380 (__METHOD__, Local2, 0x00, 0x1E) + M380 (__METHOD__, Local2, 0x00, __LINE__) /* ArgX-Object -->> ArgY-IRef */ M004 (I000, Local0 = S021 [0x01]) - M380 (__METHOD__, I000, 0x00, 0x1F) - M385 (__METHOD__, S021, 0x00, 0x20) + M380 (__METHOD__, I000, 0x00, __LINE__) + M385 (__METHOD__, S021, 0x00, __LINE__) Local2 = DerefOf (Local0) - M384 (__METHOD__, Local2, 0x00, 0x21) + M384 (__METHOD__, Local2, 0x00, __LINE__) Local1 = Local0 = S021 [0x01] M004 (I000, Local0) - M380 (__METHOD__, I000, 0x00, 0x22) - M385 (__METHOD__, S021, 0x00, 0x23) + M380 (__METHOD__, I000, 0x00, __LINE__) + M385 (__METHOD__, S021, 0x00, __LINE__) Local2 = DerefOf (Local0) - M384 (__METHOD__, Local2, 0x00, 0x24) + M384 (__METHOD__, Local2, 0x00, __LINE__) M004 (I000, Local1) - M380 (__METHOD__, I000, 0x00, 0x25) - M385 (__METHOD__, S021, 0x00, 0x26) + M380 (__METHOD__, I000, 0x00, __LINE__) + M385 (__METHOD__, S021, 0x00, __LINE__) Local2 = DerefOf (Local1) - M384 (__METHOD__, Local2, 0x00, 0x27) + M384 (__METHOD__, Local2, 0x00, __LINE__) /* ArgX-ORef -->> ArgY-Object */ M005 (RefOf (I000), S000) - M380 (__METHOD__, I000, 0x00, 0x28) - M381 (__METHOD__, S000, 0x00, 0x29) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) M005 (RefOf (I000), I051) - M380 (__METHOD__, I000, 0x00, 0x2A) - M384 (__METHOD__, I051, 0x00, 0x2B) + M380 (__METHOD__, I000, 0x00, __LINE__) + M384 (__METHOD__, I051, 0x00, __LINE__) Local0 = RefOf (I000) M005 (Local0, S000) - M380 (__METHOD__, I000, 0x00, 0x2C) - M381 (__METHOD__, S000, 0x00, 0x2D) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) M005 (Local0, I051) - M380 (__METHOD__, I000, 0x00, 0x2E) - M384 (__METHOD__, I051, 0x00, 0x2F) + M380 (__METHOD__, I000, 0x00, __LINE__) + M384 (__METHOD__, I051, 0x00, __LINE__) /* ArgX-IRef -->> ArgY-Object */ M005 (Local0 = S000 [0x01], I000) - M381 (__METHOD__, S000, 0x00, 0x30) - M380 (__METHOD__, I000, 0x00, 0x31) + M381 (__METHOD__, S000, 0x00, __LINE__) + M380 (__METHOD__, I000, 0x00, __LINE__) /* The entire expression (exercised below): */ /* m005(Index(s021, 1, Local0), RefOf(i010)) */ /* here is executed step by step: */ - M385 (__METHOD__, S021, 0x00, 0x32) - M380 (__METHOD__, I010, 0x00, 0x33) + M385 (__METHOD__, S021, 0x00, __LINE__) + M380 (__METHOD__, I010, 0x00, __LINE__) M005 (Local0 = S021 [0x01], I010) - M385 (__METHOD__, S021, 0x00, 0x34) - M380 (__METHOD__, I010, 0x00, 0x35) + M385 (__METHOD__, S021, 0x00, __LINE__) + M380 (__METHOD__, I010, 0x00, __LINE__) M005 (I051, RefOf (I010)) - M385 (__METHOD__, S021, 0x00, 0x36) - M384 (__METHOD__, I051, 0x00, 0x37) - M384 (__METHOD__, I010, 0x00, 0x38) + M385 (__METHOD__, S021, 0x00, __LINE__) + M384 (__METHOD__, I051, 0x00, __LINE__) + M384 (__METHOD__, I010, 0x00, __LINE__) If (Y513) { /* ArgX-IRef -->> ArgY-ORef */ M005 (Local0 = S021 [0x01], RefOf (I020)) - M385 (__METHOD__, S021, 0x00, 0x39) - M384 (__METHOD__, I020, 0x00, 0x3A) + M385 (__METHOD__, S021, 0x00, __LINE__) + M384 (__METHOD__, I020, 0x00, __LINE__) Local1 = DerefOf (Local0) - M384 (__METHOD__, Local1, 0x00, 0x3B) + M384 (__METHOD__, Local1, 0x00, __LINE__) } /* ArgX-IRef -->> ArgY-IRef */ M005 (Local0 = S021 [0x01], Local1 = S010 [0x01]) - M385 (__METHOD__, S021, 0x00, 0x3C) - M381 (__METHOD__, S010, 0x00, 0x3D) + M385 (__METHOD__, S021, 0x00, __LINE__) + M381 (__METHOD__, S010, 0x00, __LINE__) Local2 = DerefOf (Local0) - M384 (__METHOD__, Local2, 0x00, 0x3E) + M384 (__METHOD__, Local2, 0x00, __LINE__) Local2 = DerefOf (Local1) - M380 (__METHOD__, Local2, 0x00, 0x3F) + M380 (__METHOD__, Local2, 0x00, __LINE__) If (Y513) { /* ArgX-ORef -->> ArgY-ORef */ M005 (RefOf (I000), RefOf (I061)) - M380 (__METHOD__, I000, 0x00, 0x40) - M380 (__METHOD__, I061, 0x00, 0x41) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, I061, 0x00, __LINE__) } /* ArgX-ORef -->> ArgY-IRef */ M005 (RefOf (I000), Local0 = S031 [0x01]) - M380 (__METHOD__, I000, 0x00, 0x42) - M385 (__METHOD__, S031, 0x00, 0x43) + M380 (__METHOD__, I000, 0x00, __LINE__) + M385 (__METHOD__, S031, 0x00, __LINE__) Local2 = DerefOf (Local0) - M384 (__METHOD__, Local2, 0x00, 0x44) + M384 (__METHOD__, Local2, 0x00, __LINE__) END0 () } @@ -777,19 +777,19 @@ Local0 = Arg0 If ((Arg1 == C009)) { - M380 (__METHOD__, Local0, 0x00, 0x00) + M380 (__METHOD__, Local0, 0x00, __LINE__) } ElseIf ((Arg1 == C00A)) { - M381 (__METHOD__, Local0, 0x00, 0x01) + M381 (__METHOD__, Local0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Local0, 0x00, 0x02) + M382 (__METHOD__, Local0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Local0, 0x00, 0x03) + M383 (__METHOD__, Local0, 0x00, __LINE__) } Local0 = 0x11 @@ -801,7 +801,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg1)) { - ERR (__METHOD__, Z111, 0x0318, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, Arg1) } /* Overwrite LocalX which contains either */ @@ -816,29 +816,29 @@ M000 (S000, C00A) M000 (B000, C00B) M000 (P000, C00C) - M380 (__METHOD__, I000, 0x00, 0x04) - M381 (__METHOD__, S000, 0x00, 0x05) - M382 (__METHOD__, B000, 0x00, 0x06) - M383 (__METHOD__, P000, 0x00, 0x07) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) /* ArgX-ORef -->> LocalX */ M001 (RefOf (I000), C009) M001 (RefOf (S000), C00A) M001 (RefOf (B000), C00B) M001 (RefOf (P000), C00C) - M380 (__METHOD__, I000, 0x00, 0x08) - M381 (__METHOD__, S000, 0x00, 0x09) - M382 (__METHOD__, B000, 0x00, 0x0A) - M383 (__METHOD__, P000, 0x00, 0x0B) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) /* ArgX-IRef -->> LocalX */ M001 (S000 [0x01], C016) M001 (B000 [0x01], C016) M001 (P000 [0x01], C009) - M380 (__METHOD__, I000, 0x00, 0x0C) - M381 (__METHOD__, S000, 0x00, 0x0D) - M382 (__METHOD__, B000, 0x00, 0x0E) - M383 (__METHOD__, P000, 0x00, 0x0F) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) END0 () } @@ -891,10 +891,10 @@ M000 (S000) M000 (B000) M000 (P000) - M380 (__METHOD__, I000, 0x00, 0x00) - M381 (__METHOD__, S000, 0x00, 0x01) - M382 (__METHOD__, B000, 0x00, 0x02) - M383 (__METHOD__, P000, 0x00, 0x03) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) END0 () } @@ -964,17 +964,17 @@ M000 (S000) M000 (B000) M000 (P000) - M380 (__METHOD__, I000, 0x00, 0x00) - M381 (__METHOD__, S000, 0x00, 0x01) - M382 (__METHOD__, B000, 0x00, 0x02) - M383 (__METHOD__, P000, 0x00, 0x03) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) M001 (S000) M001 (B000) M001 (P000) - M380 (__METHOD__, I000, 0x00, 0x04) - M381 (__METHOD__, S000, 0x00, 0x05) - M382 (__METHOD__, B000, 0x00, 0x06) - M383 (__METHOD__, P000, 0x00, 0x07) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) END0 () } @@ -1054,14 +1054,14 @@ M000 (SA00, SA10) M000 (BA00, BA10) M000 (PA00, PA10) - M380 (__METHOD__, IA00, 0x00, 0x00) - M381 (__METHOD__, SA00, 0x00, 0x01) - M382 (__METHOD__, BA00, 0x00, 0x02) - M383 (__METHOD__, PA00, 0x00, 0x03) - M380 (__METHOD__, IA10, 0x00, 0x04) - M381 (__METHOD__, SA10, 0x00, 0x05) - M382 (__METHOD__, BA10, 0x00, 0x06) - M383 (__METHOD__, PA10, 0x00, 0x07) + M380 (__METHOD__, IA00, 0x00, __LINE__) + M381 (__METHOD__, SA00, 0x00, __LINE__) + M382 (__METHOD__, BA00, 0x00, __LINE__) + M383 (__METHOD__, PA00, 0x00, __LINE__) + M380 (__METHOD__, IA10, 0x00, __LINE__) + M381 (__METHOD__, SA10, 0x00, __LINE__) + M382 (__METHOD__, BA10, 0x00, __LINE__) + M383 (__METHOD__, PA10, 0x00, __LINE__) If (Y514) { /* m001 */ @@ -1070,28 +1070,28 @@ M001 (SA00, SA10) M001 (BA00, BA10) M001 (PA00, PA10) - M380 (__METHOD__, IA00, 0x00, 0x08) - M381 (__METHOD__, SA00, 0x00, 0x09) - M382 (__METHOD__, BA00, 0x00, 0x0A) - M383 (__METHOD__, PA00, 0x00, 0x0B) - M380 (__METHOD__, IA10, 0x00, 0x0C) - M381 (__METHOD__, SA10, 0x00, 0x0D) - M382 (__METHOD__, BA10, 0x00, 0x0E) - M383 (__METHOD__, PA10, 0x00, 0x0F) + M380 (__METHOD__, IA00, 0x00, __LINE__) + M381 (__METHOD__, SA00, 0x00, __LINE__) + M382 (__METHOD__, BA00, 0x00, __LINE__) + M383 (__METHOD__, PA00, 0x00, __LINE__) + M380 (__METHOD__, IA10, 0x00, __LINE__) + M381 (__METHOD__, SA10, 0x00, __LINE__) + M382 (__METHOD__, BA10, 0x00, __LINE__) + M383 (__METHOD__, PA10, 0x00, __LINE__) /* m002 */ M002 (IA00, IA10) M002 (SA00, SA10) M002 (BA00, BA10) M002 (PA00, PA10) - M380 (__METHOD__, IA00, 0x00, 0x10) - M381 (__METHOD__, SA00, 0x00, 0x11) - M382 (__METHOD__, BA00, 0x00, 0x12) - M383 (__METHOD__, PA00, 0x00, 0x13) - M380 (__METHOD__, IA10, 0x00, 0x14) - M381 (__METHOD__, SA10, 0x00, 0x15) - M382 (__METHOD__, BA10, 0x00, 0x16) - M383 (__METHOD__, PA10, 0x00, 0x17) + M380 (__METHOD__, IA00, 0x00, __LINE__) + M381 (__METHOD__, SA00, 0x00, __LINE__) + M382 (__METHOD__, BA00, 0x00, __LINE__) + M383 (__METHOD__, PA00, 0x00, __LINE__) + M380 (__METHOD__, IA10, 0x00, __LINE__) + M381 (__METHOD__, SA10, 0x00, __LINE__) + M382 (__METHOD__, BA10, 0x00, __LINE__) + M383 (__METHOD__, PA10, 0x00, __LINE__) } /* m003 */ @@ -1100,14 +1100,14 @@ M003 (SA00, SA10) M003 (BA00, BA10) M003 (PA00, PA10) - M380 (__METHOD__, IA00, 0x00, 0x18) - M381 (__METHOD__, SA00, 0x00, 0x19) - M382 (__METHOD__, BA00, 0x00, 0x1A) - M383 (__METHOD__, PA00, 0x00, 0x1B) - M380 (__METHOD__, IA10, 0x00, 0x1C) - M381 (__METHOD__, SA10, 0x00, 0x1D) - M382 (__METHOD__, BA10, 0x00, 0x1E) - M383 (__METHOD__, PA10, 0x00, 0x1F) + M380 (__METHOD__, IA00, 0x00, __LINE__) + M381 (__METHOD__, SA00, 0x00, __LINE__) + M382 (__METHOD__, BA00, 0x00, __LINE__) + M383 (__METHOD__, PA00, 0x00, __LINE__) + M380 (__METHOD__, IA10, 0x00, __LINE__) + M381 (__METHOD__, SA10, 0x00, __LINE__) + M382 (__METHOD__, BA10, 0x00, __LINE__) + M383 (__METHOD__, PA10, 0x00, __LINE__) END0 () } @@ -1211,14 +1211,14 @@ M000 (S000, S010) M000 (B000, B010) M000 (P000, P010) - M380 (__METHOD__, I000, 0x00, 0x00) - M381 (__METHOD__, S000, 0x00, 0x01) - M382 (__METHOD__, B000, 0x00, 0x02) - M383 (__METHOD__, P000, 0x00, 0x03) - M380 (__METHOD__, I010, 0x00, 0x04) - M381 (__METHOD__, S010, 0x00, 0x05) - M382 (__METHOD__, B010, 0x00, 0x06) - M383 (__METHOD__, P010, 0x00, 0x07) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) + M380 (__METHOD__, I010, 0x00, __LINE__) + M381 (__METHOD__, S010, 0x00, __LINE__) + M382 (__METHOD__, B010, 0x00, __LINE__) + M383 (__METHOD__, P010, 0x00, __LINE__) If (Y514) { /* m001 */ @@ -1227,28 +1227,28 @@ M001 (S000, S010) M001 (B000, B010) M001 (P000, P010) - M380 (__METHOD__, I000, 0x00, 0x08) - M381 (__METHOD__, S000, 0x00, 0x09) - M382 (__METHOD__, B000, 0x00, 0x0A) - M383 (__METHOD__, P000, 0x00, 0x0B) - M380 (__METHOD__, I010, 0x00, 0x0C) - M381 (__METHOD__, S010, 0x00, 0x0D) - M382 (__METHOD__, B010, 0x00, 0x0E) - M383 (__METHOD__, P010, 0x00, 0x0F) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) + M380 (__METHOD__, I010, 0x00, __LINE__) + M381 (__METHOD__, S010, 0x00, __LINE__) + M382 (__METHOD__, B010, 0x00, __LINE__) + M383 (__METHOD__, P010, 0x00, __LINE__) /* m002 */ M002 (I000, I010) M002 (S000, S010) M002 (B000, B010) M002 (P000, P010) - M380 (__METHOD__, I000, 0x00, 0x10) - M381 (__METHOD__, S000, 0x00, 0x11) - M382 (__METHOD__, B000, 0x00, 0x12) - M383 (__METHOD__, P000, 0x00, 0x13) - M380 (__METHOD__, I010, 0x00, 0x14) - M381 (__METHOD__, S010, 0x00, 0x15) - M382 (__METHOD__, B010, 0x00, 0x16) - M383 (__METHOD__, P010, 0x00, 0x17) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) + M380 (__METHOD__, I010, 0x00, __LINE__) + M381 (__METHOD__, S010, 0x00, __LINE__) + M382 (__METHOD__, B010, 0x00, __LINE__) + M383 (__METHOD__, P010, 0x00, __LINE__) } /* m003 */ @@ -1257,14 +1257,14 @@ M003 (S000, S010) M003 (B000, B010) M003 (P000, P010) - M380 (__METHOD__, I000, 0x00, 0x18) - M381 (__METHOD__, S000, 0x00, 0x19) - M382 (__METHOD__, B000, 0x00, 0x1A) - M383 (__METHOD__, P000, 0x00, 0x1B) - M380 (__METHOD__, I010, 0x00, 0x1C) - M381 (__METHOD__, S010, 0x00, 0x1D) - M382 (__METHOD__, B010, 0x00, 0x1E) - M383 (__METHOD__, P010, 0x00, 0x1F) + M380 (__METHOD__, I000, 0x00, __LINE__) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) + M380 (__METHOD__, I010, 0x00, __LINE__) + M381 (__METHOD__, S010, 0x00, __LINE__) + M382 (__METHOD__, B010, 0x00, __LINE__) + M383 (__METHOD__, P010, 0x00, __LINE__) END0 () } @@ -1434,14 +1434,14 @@ /* Store */ S000 [0x01] = 0x2B - M385 (__METHOD__, S000, 0x00, 0x00) + M385 (__METHOD__, S000, 0x00, __LINE__) Local0 = S010 [0x01] S010 [0x01] = 0x2B - M385 (__METHOD__, S010, 0x00, 0x01) + M385 (__METHOD__, S010, 0x00, __LINE__) /* CopyObject */ /* CURRENTLY: compiler failed CopyObject(xx, Index(xx,xx)) */ /* CopyObject(0x2b, Index(s020, 1)) */ - /* m385(ts, s020, 0, 2) */ + /* m385 (ts, s020, 0, __LINE__)*/ END0 () } @@ -1463,10 +1463,10 @@ /* Store */ B000 [0x01] = 0x2B - M386 (__METHOD__, B000, 0x00, 0x00) + M386 (__METHOD__, B000, 0x00, __LINE__) Local0 = B010 [0x01] B010 [0x01] = 0x2B - M386 (__METHOD__, B010, 0x00, 0x01) + M386 (__METHOD__, B010, 0x00, __LINE__) END0 () } @@ -1588,10 +1588,10 @@ /* Store */ P000 [0x01] = 0x2B - M387 (__METHOD__, P000, 0x00, 0x00) + M387 (__METHOD__, P000, 0x00, __LINE__) Local0 = P010 [0x01] P010 [0x01] = 0x2B - M387 (__METHOD__, P010, 0x00, 0x01) + M387 (__METHOD__, P010, 0x00, __LINE__) END0 () } @@ -1702,34 +1702,34 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x00, 0x06F1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x06F3, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (Local0, C009, 0x00, 0x00, 0x02) - M380 (__METHOD__, DerefOf (Local0), 0x00, 0x03) + M380 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) M000 (Local0) - M384 (__METHOD__, DerefOf (Local0), 0x00, 0x04) + M384 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) Local0 = RefOf (S000) M1A3 (Local0, C00A, 0x00, 0x00, 0x05) - M381 (__METHOD__, DerefOf (Local0), 0x00, 0x06) + M381 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) M000 (Local0) - M384 (__METHOD__, DerefOf (Local0), 0x00, 0x07) + M384 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) Local0 = RefOf (B000) M1A3 (Local0, C00B, 0x00, 0x00, 0x08) - M382 (__METHOD__, DerefOf (Local0), 0x00, 0x09) + M382 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) M000 (Local0) - M384 (__METHOD__, DerefOf (Local0), 0x00, 0x0A) + M384 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) Local0 = RefOf (P000) M1A3 (Local0, C00C, 0x00, 0x00, 0x0B) - M383 (__METHOD__, DerefOf (Local0), 0x00, 0x0C) + M383 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) M000 (Local0) - M384 (__METHOD__, DerefOf (Local0), 0x00, 0x0D) + M384 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) Local0 = RefOf (D000) M1A3 (Local0, C00E, 0x00, 0x00, 0x0E) M000 (Local0) - M384 (__METHOD__, DerefOf (Local0), 0x00, 0x0F) + M384 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) END0 () } @@ -1763,34 +1763,34 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x02, 0x0729, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x072B, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (Local0, C009, 0x00, 0x00, 0x00) - M380 (__METHOD__, DerefOf (Local0), 0x00, 0x01) + M380 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) M000 (Local0) - M384 (__METHOD__, DerefOf (Local0), 0x00, 0x02) + M384 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) CopyObject (RefOf (S000), Local0) M1A3 (Local0, C00A, 0x00, 0x00, 0x03) - M381 (__METHOD__, DerefOf (Local0), 0x00, 0x04) + M381 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) M000 (Local0) - M384 (__METHOD__, DerefOf (Local0), 0x00, 0x05) + M384 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) CopyObject (RefOf (B000), Local0) M1A3 (Local0, C00B, 0x00, 0x00, 0x06) - M382 (__METHOD__, DerefOf (Local0), 0x00, 0x07) + M382 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) M000 (Local0) - M384 (__METHOD__, DerefOf (Local0), 0x00, 0x08) + M384 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) CopyObject (RefOf (P000), Local0) M1A3 (Local0, C00C, 0x00, 0x00, 0x09) - M383 (__METHOD__, DerefOf (Local0), 0x00, 0x0A) + M383 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) M000 (Local0) - M384 (__METHOD__, DerefOf (Local0), 0x00, 0x0B) + M384 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) CopyObject (RefOf (D000), Local0) M1A3 (Local0, C00E, 0x00, 0x00, 0x0C) M000 (Local0) - M384 (__METHOD__, DerefOf (Local0), 0x00, 0x0D) + M384 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) END0 () } @@ -1808,7 +1808,7 @@ If (Y519) { M356 (I000) - M380 (__METHOD__, I000, 0x00, 0x00) + M380 (__METHOD__, I000, 0x00, __LINE__) } Else { @@ -1820,7 +1820,7 @@ If (Y520) { M357 (I001) - M380 (__METHOD__, I001, 0x00, 0x01) + M380 (__METHOD__, I001, 0x00, __LINE__) } Else { @@ -1860,34 +1860,34 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x04, 0x0784, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Arg0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x0786, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (Arg0, C009, 0x00, 0x00, 0x00) - M380 (__METHOD__, DerefOf (Arg0), 0x00, 0x01) + M380 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) M000 (Arg0) - M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x02) + M384 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) Arg0 = RefOf (S000) M1A3 (Arg0, C00A, 0x00, 0x00, 0x03) - M381 (__METHOD__, DerefOf (Arg0), 0x00, 0x04) + M381 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) M000 (Arg0) - M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x05) + M384 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) Arg0 = RefOf (B000) M1A3 (Arg0, C00B, 0x00, 0x00, 0x06) - M382 (__METHOD__, DerefOf (Arg0), 0x00, 0x07) + M382 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) M000 (Arg0) - M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x08) + M384 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) Arg0 = RefOf (P000) M1A3 (Arg0, C00C, 0x00, 0x00, 0x09) - M383 (__METHOD__, DerefOf (Arg0), 0x00, 0x0A) + M383 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) M000 (Arg0) - M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x0B) + M384 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) Arg0 = RefOf (D000) M1A3 (Arg0, C00E, 0x00, 0x00, 0x0C) M000 (Arg0) - M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x0D) + M384 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) END0 () } @@ -1921,34 +1921,34 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x06, 0x07BC, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Arg0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x07BE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (Arg0, C009, 0x00, 0x00, 0x00) - M380 (__METHOD__, DerefOf (Arg0), 0x00, 0x01) + M380 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) M000 (Arg0) - M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x02) + M384 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) CopyObject (RefOf (S000), Arg0) M1A3 (Arg0, C00A, 0x00, 0x00, 0x03) - M381 (__METHOD__, DerefOf (Arg0), 0x00, 0x04) + M381 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) M000 (Arg0) - M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x05) + M384 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) CopyObject (RefOf (B000), Arg0) M1A3 (Arg0, C00B, 0x00, 0x00, 0x06) - M382 (__METHOD__, DerefOf (Arg0), 0x00, 0x07) + M382 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) M000 (Arg0) - M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x08) + M384 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) CopyObject (RefOf (P000), Arg0) M1A3 (Arg0, C00C, 0x00, 0x00, 0x09) - M383 (__METHOD__, DerefOf (Arg0), 0x00, 0x0A) + M383 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) M000 (Arg0) - M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x0B) + M384 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) CopyObject (RefOf (D000), Arg0) M1A3 (Arg0, C00E, 0x00, 0x00, 0x0C) M000 (Arg0) - M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x0D) + M384 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) END0 () } @@ -2012,34 +2012,34 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x08, 0x0810, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (III0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x0812, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (III0, C009, 0x00, 0x00, 0x00) - M380 (__METHOD__, DerefOf (III0), 0x00, 0x01) + M380 (__METHOD__, DerefOf (III0), 0x00, __LINE__) M000 (III0) - M384 (__METHOD__, DerefOf (III0), 0x00, 0x02) + M384 (__METHOD__, DerefOf (III0), 0x00, __LINE__) III0 = RefOf (S000) M1A3 (III0, C00A, 0x00, 0x00, 0x03) - M381 (__METHOD__, DerefOf (III0), 0x00, 0x04) + M381 (__METHOD__, DerefOf (III0), 0x00, __LINE__) M000 (III0) - M384 (__METHOD__, DerefOf (III0), 0x00, 0x05) + M384 (__METHOD__, DerefOf (III0), 0x00, __LINE__) III0 = RefOf (B000) M1A3 (III0, C00B, 0x00, 0x00, 0x06) - M382 (__METHOD__, DerefOf (III0), 0x00, 0x07) + M382 (__METHOD__, DerefOf (III0), 0x00, __LINE__) M000 (III0) - M384 (__METHOD__, DerefOf (III0), 0x00, 0x08) + M384 (__METHOD__, DerefOf (III0), 0x00, __LINE__) III0 = RefOf (P000) M1A3 (III0, C00C, 0x00, 0x00, 0x09) - M383 (__METHOD__, DerefOf (III0), 0x00, 0x0A) + M383 (__METHOD__, DerefOf (III0), 0x00, __LINE__) M000 (III0) - M384 (__METHOD__, DerefOf (III0), 0x00, 0x0B) + M384 (__METHOD__, DerefOf (III0), 0x00, __LINE__) III0 = RefOf (D000) M1A3 (III0, C00E, 0x00, 0x00, 0x0C) M000 (III0) - M384 (__METHOD__, DerefOf (III0), 0x00, 0x0D) + M384 (__METHOD__, DerefOf (III0), 0x00, __LINE__) END0 () } @@ -2074,34 +2074,34 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x0A, 0x084A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (III0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x084C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (III0, C009, 0x00, 0x00, 0x00) - M380 (__METHOD__, DerefOf (III0), 0x00, 0x01) + M380 (__METHOD__, DerefOf (III0), 0x00, __LINE__) M000 (III0) - M384 (__METHOD__, DerefOf (III0), 0x00, 0x02) + M384 (__METHOD__, DerefOf (III0), 0x00, __LINE__) CopyObject (RefOf (S000), III0) /* \M359.III0 */ M1A3 (III0, C00A, 0x00, 0x00, 0x03) - M381 (__METHOD__, DerefOf (III0), 0x00, 0x04) + M381 (__METHOD__, DerefOf (III0), 0x00, __LINE__) M000 (III0) - M384 (__METHOD__, DerefOf (III0), 0x00, 0x05) + M384 (__METHOD__, DerefOf (III0), 0x00, __LINE__) CopyObject (RefOf (B000), III0) /* \M359.III0 */ M1A3 (III0, C00B, 0x00, 0x00, 0x06) - M382 (__METHOD__, DerefOf (III0), 0x00, 0x07) + M382 (__METHOD__, DerefOf (III0), 0x00, __LINE__) M000 (III0) - M384 (__METHOD__, DerefOf (III0), 0x00, 0x08) + M384 (__METHOD__, DerefOf (III0), 0x00, __LINE__) CopyObject (RefOf (P000), III0) /* \M359.III0 */ M1A3 (III0, C00C, 0x00, 0x00, 0x09) - M383 (__METHOD__, DerefOf (III0), 0x00, 0x0A) + M383 (__METHOD__, DerefOf (III0), 0x00, __LINE__) M000 (III0) - M384 (__METHOD__, DerefOf (III0), 0x00, 0x0B) + M384 (__METHOD__, DerefOf (III0), 0x00, __LINE__) CopyObject (RefOf (D000), III0) /* \M359.III0 */ M1A3 (III0, C00E, 0x00, 0x00, 0x0C) M000 (III0) - M384 (__METHOD__, DerefOf (III0), 0x00, 0x0D) + M384 (__METHOD__, DerefOf (III0), 0x00, __LINE__) END0 () } @@ -2147,16 +2147,16 @@ PPP0 [0x04] = RefOf (D000) Local0 = DerefOf (PPP0 [0x00]) M1A3 (Local0, C009, 0x00, 0x00, 0x00) - M380 (__METHOD__, DerefOf (Local0), 0x00, 0x01) + M380 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) Local0 = DerefOf (PPP0 [0x01]) M1A3 (Local0, C00A, 0x00, 0x00, 0x02) - M381 (__METHOD__, DerefOf (Local0), 0x00, 0x03) + M381 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) Local0 = DerefOf (PPP0 [0x02]) M1A3 (Local0, C00B, 0x00, 0x00, 0x04) - M382 (__METHOD__, DerefOf (Local0), 0x00, 0x05) + M382 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) Local0 = DerefOf (PPP0 [0x03]) M1A3 (Local0, C00C, 0x00, 0x00, 0x06) - M383 (__METHOD__, DerefOf (Local0), 0x00, 0x07) + M383 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) Local0 = DerefOf (PPP0 [0x04]) M1A3 (Local0, C00E, 0x00, 0x00, 0x08) /* Replace */ @@ -2164,19 +2164,19 @@ PPP0 [0x00] = RefOf (I000) Local0 = DerefOf (PPP0 [0x00]) M1A3 (Local0, C009, 0x00, 0x00, 0x09) - M380 (__METHOD__, DerefOf (Local0), 0x00, 0x0A) + M380 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) PPP0 [0x00] = RefOf (S000) Local0 = DerefOf (PPP0 [0x00]) M1A3 (Local0, C00A, 0x00, 0x00, 0x0B) - M381 (__METHOD__, DerefOf (Local0), 0x00, 0x0C) + M381 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) PPP0 [0x00] = RefOf (B000) Local0 = DerefOf (PPP0 [0x00]) M1A3 (Local0, C00B, 0x00, 0x00, 0x0D) - M382 (__METHOD__, DerefOf (Local0), 0x00, 0x0E) + M382 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) PPP0 [0x00] = RefOf (P000) Local0 = DerefOf (PPP0 [0x00]) M1A3 (Local0, C00C, 0x00, 0x00, 0x0F) - M383 (__METHOD__, DerefOf (Local0), 0x00, 0x10) + M383 (__METHOD__, DerefOf (Local0), 0x00, __LINE__) PPP0 [0x00] = RefOf (D000) Local0 = DerefOf (PPP0 [0x00]) M1A3 (Local0, C00E, 0x00, 0x00, 0x11) @@ -2203,35 +2203,35 @@ CopyObject(RefOf(d000), Index(ppp0, 4)) CopyObject(DerefOf(Index(ppp0, 0)), Local0) m1a3(Local0, c009, 0, 0, 0) - m380(ts, DerefOf(Local0), 0, 1) + m380 (ts, DerefOf(Local0), 0, __LINE__) CopyObject(DerefOf(Index(ppp0, 1)), Local0) m1a3(Local0, c00a, 0, 0, 2) - m381(ts, DerefOf(Local0), 0, 3) + m381 (ts, DerefOf(Local0), 0, __LINE__) CopyObject(DerefOf(Index(ppp0, 2)), Local0) m1a3(Local0, c00b, 0, 0, 4) - m382(ts, DerefOf(Local0), 0, 5) + m382 (ts, DerefOf(Local0), 0, __LINE__) CopyObject(DerefOf(Index(ppp0, 3)), Local0) m1a3(Local0, c00c, 0, 0, 6) - m383(ts, DerefOf(Local0), 0, 7) + m383 (ts, DerefOf(Local0), 0, __LINE__) CopyObject(DerefOf(Index(ppp0, 4)), Local0) m1a3(Local0, c00e, 0, 0, 8) // Replace CopyObject(RefOf(i000), Index(ppp0, 0)) CopyObject(DerefOf(Index(ppp0, 0)), Local0) m1a3(Local0, c009, 0, 0, 9) - m380(ts, DerefOf(Local0), 0, 10) + m380 (ts, DerefOf(Local0), 0, __LINE__) CopyObject(RefOf(s000), Index(ppp0, 0)) CopyObject(DerefOf(Index(ppp0, 0)), Local0) m1a3(Local0, c00a, 0, 0, 11) - m381(ts, DerefOf(Local0), 0, 12) + m381 (ts, DerefOf(Local0), 0, __LINE__) CopyObject(RefOf(b000), Index(ppp0, 0)) CopyObject(DerefOf(Index(ppp0, 0)), Local0) m1a3(Local0, c00b, 0, 0, 13) - m382(ts, DerefOf(Local0), 0, 14) + m382 (ts, DerefOf(Local0), 0, __LINE__) CopyObject(RefOf(p000), Index(ppp0, 0)) CopyObject(DerefOf(Index(ppp0, 0)), Local0) m1a3(Local0, c00c, 0, 0, 15) - m383(ts, DerefOf(Local0), 0, 16) + m383 (ts, DerefOf(Local0), 0, __LINE__) CopyObject(RefOf(d000), Index(ppp0, 0)) CopyObject(DerefOf(Index(ppp0, 0)), Local0) m1a3(Local0, c00e, 0, 0, 17) @@ -2367,11 +2367,11 @@ /* Store */ M35E (I000) - M380 (__METHOD__, I000, Z111, 0x00) + M380 (__METHOD__, I000, Z111, __LINE__) /* CopyObject */ M35F (I010) - M380 (__METHOD__, I010, Z111, 0x01) + M380 (__METHOD__, I010, Z111, __LINE__) } Method (M35E, 1, Serialized) @@ -2709,15 +2709,15 @@ } M1D3 (I000, I001) - M380 (__METHOD__, I000, 0x00, 0x00) - M380 (__METHOD__, I001, 0x00, 0x01) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, I001, 0x00, __LINE__) If (X127) { M1D4 (I000, I001) /* bug 127 */ } - M380 (__METHOD__, I000, 0x00, 0x02) - M380 (__METHOD__, I001, 0x00, 0x03) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, I001, 0x00, __LINE__) If (X127) { M1D5 () /* bug 127 */ @@ -2754,9 +2754,9 @@ */ Method (M26D, 0, NotSerialized) { - CH03 ("m26d", 0x00, 0x00, 0x0BB5, 0x00) + CH03 ("m26d", 0x00, __LINE__, 0x00, 0x00) M1AE ("m26d", "Buffer total", "Not implemented yet") - CH03 ("m26d", 0x00, 0x01, 0x0BB7, 0x00) + CH03 ("m26d", 0x00, __LINE__, 0x00, 0x00) } /* @@ -2773,14 +2773,14 @@ Debug = __METHOD__ /* \M26E.TS__ */ } - CH03 (__METHOD__, 0x00, 0x00, 0x0BC7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Store */ M365 () /* CopyObject */ M366 () - CH03 (__METHOD__, 0x00, 0x01, 0x0BCF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M365, 0, Serialized) @@ -2807,8 +2807,8 @@ { Name (I002, 0x77) Arg0 = RefOf (I002) - M380 (__METHOD__, DerefOf (Arg0), 0x00, 0x00) - M380 (__METHOD__, I002, 0x00, 0x01) + M380 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) + M380 (__METHOD__, I002, 0x00, __LINE__) } Method (M001, 1, NotSerialized) @@ -2821,7 +2821,7 @@ Arg0 = 0x00 M001 (RefOf (Arg0)) Arg1 = DerefOf (Arg0) - M380 (__METHOD__, Arg1, 0x00, 0x02) + M380 (__METHOD__, Arg1, 0x00, __LINE__) } Method (M003, 0, NotSerialized) @@ -2851,7 +2851,7 @@ Arg0 = 0x00 M005 (RefOf (Arg0)) Arg1 = DerefOf (Arg0) - M380 (__METHOD__, Arg1, 0x00, 0x03) + M380 (__METHOD__, Arg1, 0x00, __LINE__) } Method (M007, 1, NotSerialized) @@ -2869,21 +2869,21 @@ Local0 = RefOf (I000) Local1 = DerefOf (Local0) - M380 (__METHOD__, Local1, 0x00, 0x04) - M380 (__METHOD__, I000, 0x00, 0x05) + M380 (__METHOD__, Local1, 0x00, __LINE__) + M380 (__METHOD__, I000, 0x00, __LINE__) /* 2. */ M000 (I001) - M380 (__METHOD__, I001, 0x00, 0x06) + M380 (__METHOD__, I001, 0x00, __LINE__) /* 3. */ CopyObject (RefOf (I000), III0) /* \M365.III0 */ III0 = RefOf (I001) Local1 = DerefOf (III0) - M380 (__METHOD__, I001, 0x00, 0x07) + M380 (__METHOD__, I001, 0x00, __LINE__) If (Y523) { - M380 (__METHOD__, Local1, 0x00, 0x08) + M380 (__METHOD__, Local1, 0x00, __LINE__) } /* 4. */ @@ -2891,12 +2891,12 @@ Local0 = 0x00 M001 (RefOf (Local0)) Local1 = DerefOf (Local0) - M380 (__METHOD__, Local1, 0x00, 0x09) + M380 (__METHOD__, Local1, 0x00, __LINE__) /* 5. */ M002 (I001, I002) - M380 (__METHOD__, I001, 0x00, 0x0A) - M380 (__METHOD__, I002, 0x00, 0x0B) + M380 (__METHOD__, I001, 0x00, __LINE__) + M380 (__METHOD__, I002, 0x00, __LINE__) /* 6. */ If (Y526) @@ -2904,7 +2904,7 @@ CopyObject (RefOf (I003), III5) /* \M365.III5 */ M007 (RefOf (III5)) Local1 = DerefOf (III5) - M380 (__METHOD__, Local1, 0x00, 0x0C) + M380 (__METHOD__, Local1, 0x00, __LINE__) } /* 7. */ @@ -2915,7 +2915,7 @@ Store (PPP0 [0x00], Local0) Local1 = DerefOf (Local0) Local2 = DerefOf (Local1) - M380 (__METHOD__, Local2, 0x00, 0x0D) + M380 (__METHOD__, Local2, 0x00, __LINE__) } /* 8. */ @@ -2925,8 +2925,8 @@ CopyObject (RefOf (III3), III4) /* \M365.III4 */ RefOf (III4) = RefOf (I000) Local1 = DerefOf (III4) - M380 (__METHOD__, I000, 0x00, 0x0E) - M380 (__METHOD__, Local1, 0x00, 0x0F) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, Local1, 0x00, __LINE__) } /* 9. */ @@ -2934,8 +2934,8 @@ PPP1 [0x00] = RefOf (I000) Local2 = DerefOf (PPP1 [0x00]) Local1 = DerefOf (Local2) - M380 (__METHOD__, Local1, 0x00, 0x10) - M380 (__METHOD__, I000, 0x00, 0x11) + M380 (__METHOD__, Local1, 0x00, __LINE__) + M380 (__METHOD__, I000, 0x00, __LINE__) /* 10. */ /* * There are some statements try to pass a value of an integer to a LocalX via reference, @@ -2949,8 +2949,8 @@ Local6 = RefOf (Local7) DerefOf (Local6) = RefOf (I000) Local0 = DerefOf (Local7) - M380 (__METHOD__, Local0, 0x00, 0x18) - M380 (__METHOD__, I000, 0x00, 0x19) + M380 (__METHOD__, Local0, 0x00, __LINE__) + M380 (__METHOD__, I000, 0x00, __LINE__) } /* Particular cases of (12): */ @@ -2962,12 +2962,12 @@ Local0 = 0x00 M005 (RefOf (Local0)) Local1 = DerefOf (Local0) - M380 (__METHOD__, Local1, 0x00, 0x1A) + M380 (__METHOD__, Local1, 0x00, __LINE__) /* 14. (5) */ M006 (I001, I002) - M380 (__METHOD__, I001, 0x00, 0x1B) - M380 (__METHOD__, I002, 0x00, 0x1C) + M380 (__METHOD__, I001, 0x00, __LINE__) + M380 (__METHOD__, I002, 0x00, __LINE__) /* 15. (6) */ If (Y526) @@ -2975,7 +2975,7 @@ CopyObject (RefOf (I003), III6) /* \M365.III6 */ M008 (RefOf (III6)) Local1 = DerefOf (III6) - M380 (__METHOD__, Local1, 0x00, 0x1D) + M380 (__METHOD__, Local1, 0x00, __LINE__) } /* 16. (7) */ @@ -2986,7 +2986,7 @@ Store (PPP0 [0x00], Local0) Local1 = DerefOf (Local0) Local2 = DerefOf (Local1) - M380 (__METHOD__, Local2, 0x00, 0x1E) + M380 (__METHOD__, Local2, 0x00, __LINE__) } /* 17. (8) */ @@ -2996,8 +2996,8 @@ CopyObject (RefOf (III3), III4) /* \M365.III4 */ DerefOf (RefOf (III4)) = RefOf (I000) Local1 = DerefOf (III4) - M380 (__METHOD__, I000, 0x00, 0x1F) - M380 (__METHOD__, Local1, 0x00, 0x20) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, Local1, 0x00, __LINE__) } /* 18. (9) */ @@ -3005,20 +3005,20 @@ DerefOf (PPP1 [0x00]) = RefOf (I000) Local2 = DerefOf (PPP1 [0x00]) Local1 = DerefOf (Local2) - M380 (__METHOD__, Local1, 0x00, 0x21) - M380 (__METHOD__, I000, 0x00, 0x22) + M380 (__METHOD__, Local1, 0x00, __LINE__) + M380 (__METHOD__, I000, 0x00, __LINE__) /* 19. (10) */ DerefOf (M003 ()) = RefOf (I000) Local1 = DerefOf (III1) - M380 (__METHOD__, I000, 0x00, 0x23) - M380 (__METHOD__, Local1, 0x00, 0x24) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, Local1, 0x00, __LINE__) /* 20. (11) */ DerefOf (M004 (0x00)) = RefOf (I000) Local1 = DerefOf (III2) - M380 (__METHOD__, I000, 0x00, 0x25) - M380 (__METHOD__, Local1, 0x00, 0x26) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, Local1, 0x00, __LINE__) } END0 () @@ -3040,8 +3040,8 @@ { Name (I002, 0x77) CopyObject (RefOf (I002), Arg0) - M380 (__METHOD__, DerefOf (Arg0), 0x00, 0x00) - M380 (__METHOD__, I002, 0x00, 0x01) + M380 (__METHOD__, DerefOf (Arg0), 0x00, __LINE__) + M380 (__METHOD__, I002, 0x00, __LINE__) } Method (M001, 1, NotSerialized) @@ -3054,7 +3054,7 @@ Arg0 = 0x00 M001 (RefOf (Arg0)) Arg1 = DerefOf (Arg0) - M380 (__METHOD__, Arg1, 0x00, 0x02) + M380 (__METHOD__, Arg1, 0x00, __LINE__) } BEG0 (Z111, __METHOD__) @@ -3062,20 +3062,20 @@ CopyObject (RefOf (I000), Local0) Local1 = DerefOf (Local0) - M380 (__METHOD__, Local1, 0x00, 0x03) - M380 (__METHOD__, I000, 0x00, 0x04) + M380 (__METHOD__, Local1, 0x00, __LINE__) + M380 (__METHOD__, I000, 0x00, __LINE__) /* 22. */ M000 (I001) - M380 (__METHOD__, I001, 0x00, 0x05) + M380 (__METHOD__, I001, 0x00, __LINE__) /* 23. */ If (Y128) { CopyObject (RefOf (I000), III0) /* \M366.III0 */ Local1 = DerefOf (III0) - M380 (__METHOD__, Local1, 0x00, 0x06) - M380 (__METHOD__, I000, 0x00, 0x07) + M380 (__METHOD__, Local1, 0x00, __LINE__) + M380 (__METHOD__, I000, 0x00, __LINE__) } /* 24. */ @@ -3083,12 +3083,12 @@ Local0 = 0x00 M001 (RefOf (Local0)) Local1 = DerefOf (Local0) - M380 (__METHOD__, Local1, 0x00, 0x08) + M380 (__METHOD__, Local1, 0x00, __LINE__) /* 25. */ M002 (I001, I002) - M380 (__METHOD__, I001, 0x00, 0x09) - M380 (__METHOD__, I002, 0x00, 0x0A) + M380 (__METHOD__, I001, 0x00, __LINE__) + M380 (__METHOD__, I002, 0x00, __LINE__) /* 26. */ If (Y526) @@ -3096,7 +3096,7 @@ III1 = 0x00 M001 (RefOf (III1)) Local1 = DerefOf (III1) - M380 (__METHOD__, Local1, 0x00, 0x0B) + M380 (__METHOD__, Local1, 0x00, __LINE__) } /* 27. */ @@ -3107,7 +3107,7 @@ Store (PPP1 [0x00], Local0) Local1 = DerefOf (Local0) Local2 = DerefOf (Local1) - M380 (__METHOD__, Local2, 0x00, 0x0C) + M380 (__METHOD__, Local2, 0x00, __LINE__) } /* @@ -3116,8 +3116,8 @@ * CopyObject(RefOf(i000), Index(ppp0, 0)) * Store(DerefOf(Index(ppp0, 0)), Local2) * Store(DerefOf(Local2), Local1) - * m380(ts, Local1, 0, 13) - * m380(ts, i000, 0, 14) + * m380 (ts, Local1, 0, __LINE__) + * m380 (ts, i000, 0, __LINE__) */ END0 () } @@ -3127,9 +3127,9 @@ */ Method (M26F, 0, NotSerialized) { - CH03 ("m26f", 0x00, 0x00, 0x0D1E, 0x00) + CH03 ("m26f", 0x00, __LINE__, 0x00, 0x00) M1AE ("m26f", "All the legal ways of writing IRef reference to some target location", "Not implemented yet") - CH03 ("m26f", 0x00, 0x01, 0x0D23, 0x00) + CH03 ("m26f", 0x00, __LINE__, 0x00, 0x00) } /* @@ -3137,7 +3137,7 @@ */ Method (M270, 0, Serialized) { - CH03 (__METHOD__, 0x00, 0x00, 0x0D2D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If (Y100) { TS00 (__METHOD__) @@ -3147,17 +3147,17 @@ Debug = __METHOD__ /* \M270.TS__ */ } - CH03 (__METHOD__, 0x00, 0x01, 0x0D35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Store */ M367 () - CH03 (__METHOD__, 0x00, 0x02, 0x0D3A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* CopyObject */ M368 () - CH03 (__METHOD__, 0x00, 0x03, 0x0D3F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M1AE ("m270", "All the legal sources of references (ORef and IRef)", "Started, but not implemented yet") - CH03 (__METHOD__, 0x00, 0x04, 0x0D44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M367, 0, Serialized) @@ -3182,19 +3182,19 @@ Arg5 = Local0 Arg6 = Local0 Local7 = DerefOf (Arg0) - M380 (__METHOD__, Local7, 0x00, 0x00) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Arg1) - M380 (__METHOD__, Local7, 0x00, 0x01) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Arg2) - M380 (__METHOD__, Local7, 0x00, 0x02) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Arg3) - M380 (__METHOD__, Local7, 0x00, 0x03) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Arg4) - M380 (__METHOD__, Local7, 0x00, 0x04) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Arg5) - M380 (__METHOD__, Local7, 0x00, 0x05) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Arg6) - M380 (__METHOD__, Local7, 0x00, 0x06) + M380 (__METHOD__, Local7, 0x00, __LINE__) } Method (M002, 7, NotSerialized) @@ -3206,19 +3206,19 @@ Arg4 = Arg3 Arg5 = Arg4 Arg6 = Arg5 - M380 (__METHOD__, DerefOf (Arg6), 0x00, 0x07) + M380 (__METHOD__, DerefOf (Arg6), 0x00, __LINE__) Arg6 = DerefOf (Arg0) - M380 (__METHOD__, Arg6, 0x00, 0x08) + M380 (__METHOD__, Arg6, 0x00, __LINE__) Arg6 = DerefOf (Arg1) - M380 (__METHOD__, Arg6, 0x00, 0x09) + M380 (__METHOD__, Arg6, 0x00, __LINE__) Arg6 = DerefOf (Arg2) - M380 (__METHOD__, Arg6, 0x00, 0x0A) + M380 (__METHOD__, Arg6, 0x00, __LINE__) Arg6 = DerefOf (Arg3) - M380 (__METHOD__, Arg6, 0x00, 0x0B) + M380 (__METHOD__, Arg6, 0x00, __LINE__) Arg6 = DerefOf (Arg4) - M380 (__METHOD__, Arg6, 0x00, 0x0C) + M380 (__METHOD__, Arg6, 0x00, __LINE__) Arg6 = DerefOf (Arg5) - M380 (__METHOD__, Arg6, 0x00, 0x0D) + M380 (__METHOD__, Arg6, 0x00, __LINE__) } BEG0 (Z111, __METHOD__) @@ -3232,43 +3232,43 @@ Local5 = Local4 Local6 = Local5 Local7 = Local6 - M380 (__METHOD__, DerefOf (Local7), 0x00, 0x0E) + M380 (__METHOD__, DerefOf (Local7), 0x00, __LINE__) Local7 = DerefOf (Local0) - M380 (__METHOD__, Local7, 0x00, 0x0F) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Local1) - M380 (__METHOD__, Local7, 0x00, 0x10) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Local2) - M380 (__METHOD__, Local7, 0x00, 0x11) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Local3) - M380 (__METHOD__, Local7, 0x00, 0x12) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Local4) - M380 (__METHOD__, Local7, 0x00, 0x13) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Local5) - M380 (__METHOD__, Local7, 0x00, 0x14) + M380 (__METHOD__, Local7, 0x00, __LINE__) Local7 = DerefOf (Local6) - M380 (__METHOD__, Local7, 0x00, 0x15) + M380 (__METHOD__, Local7, 0x00, __LINE__) /* 2. ORef-LocalX */ M001 (I000, I001, I002, I003, I004, I005, I006) - M380 (__METHOD__, I000, 0x00, 0x16) - M380 (__METHOD__, I001, 0x00, 0x17) - M380 (__METHOD__, I002, 0x00, 0x18) - M380 (__METHOD__, I003, 0x00, 0x19) - M380 (__METHOD__, I004, 0x00, 0x1A) - M380 (__METHOD__, I005, 0x00, 0x1B) - M380 (__METHOD__, I006, 0x00, 0x1C) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, I001, 0x00, __LINE__) + M380 (__METHOD__, I002, 0x00, __LINE__) + M380 (__METHOD__, I003, 0x00, __LINE__) + M380 (__METHOD__, I004, 0x00, __LINE__) + M380 (__METHOD__, I005, 0x00, __LINE__) + M380 (__METHOD__, I006, 0x00, __LINE__) If (Y134) { /* 2. ORef-ArgX */ M002 (I000, I001, I002, I003, I004, I005, I006) - M380 (__METHOD__, I000, 0x00, 0x1D) - M380 (__METHOD__, I001, 0x00, 0x1E) - M380 (__METHOD__, I002, 0x00, 0x1F) - M380 (__METHOD__, I003, 0x00, 0x20) - M380 (__METHOD__, I004, 0x00, 0x21) - M380 (__METHOD__, I005, 0x00, 0x22) - M380 (__METHOD__, I006, 0x00, 0x23) + M380 (__METHOD__, I000, 0x00, __LINE__) + M380 (__METHOD__, I001, 0x00, __LINE__) + M380 (__METHOD__, I002, 0x00, __LINE__) + M380 (__METHOD__, I003, 0x00, __LINE__) + M380 (__METHOD__, I004, 0x00, __LINE__) + M380 (__METHOD__, I005, 0x00, __LINE__) + M380 (__METHOD__, I006, 0x00, __LINE__) } /* 3. ORef-LocalX */ @@ -3281,10 +3281,10 @@ Local0 = RefOf (I000) III0 = Local0 Local1 = DerefOf (III0) - M380 (__METHOD__, I000, 0x00, 0x24) + M380 (__METHOD__, I000, 0x00, __LINE__) If (Y523) { - M380 (__METHOD__, Local1, 0x00, 0x25) + M380 (__METHOD__, Local1, 0x00, __LINE__) } } @@ -3305,21 +3305,21 @@ CopyObject (Local4, Local5) CopyObject (Local5, Local6) CopyObject (Local6, Local7) - M380 (__METHOD__, DerefOf (Local7), 0x00, 0x00) + M380 (__METHOD__, DerefOf (Local7), 0x00, __LINE__) CopyObject (DerefOf (Local0), Local7) - M380 (__METHOD__, Local7, 0x00, 0x01) + M380 (__METHOD__, Local7, 0x00, __LINE__) CopyObject (DerefOf (Local1), Local7) - M380 (__METHOD__, Local7, 0x00, 0x02) + M380 (__METHOD__, Local7, 0x00, __LINE__) CopyObject (DerefOf (Local2), Local7) - M380 (__METHOD__, Local7, 0x00, 0x03) + M380 (__METHOD__, Local7, 0x00, __LINE__) CopyObject (DerefOf (Local3), Local7) - M380 (__METHOD__, Local7, 0x00, 0x04) + M380 (__METHOD__, Local7, 0x00, __LINE__) CopyObject (DerefOf (Local4), Local7) - M380 (__METHOD__, Local7, 0x00, 0x05) + M380 (__METHOD__, Local7, 0x00, __LINE__) CopyObject (DerefOf (Local5), Local7) - M380 (__METHOD__, Local7, 0x00, 0x06) + M380 (__METHOD__, Local7, 0x00, __LINE__) CopyObject (DerefOf (Local6), Local7) - M380 (__METHOD__, Local7, 0x00, 0x07) + M380 (__METHOD__, Local7, 0x00, __LINE__) END0 () } @@ -3405,7 +3405,7 @@ Local7 = (Local0 + 0x05) If ((Local7 != 0x1928374B)) { - ERR (__METHOD__, Z111, 0x0E3E, 0x00, 0x00, Local7, 0x1928374B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local7, 0x1928374B) } } @@ -3445,7 +3445,7 @@ Local7 = (Local0 + 0x05) If ((Local7 != 0x13)) { - ERR (__METHOD__, Z111, 0x0E66, 0x00, 0x00, Local7, 0x13) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local7, 0x13) } } @@ -3470,7 +3470,7 @@ Local7 = (Arg0 + 0x05) If ((Local7 != 0x13)) { - ERR (__METHOD__, Z111, 0x0E79, 0x00, 0x00, Local7, 0x13) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local7, 0x13) } } @@ -3511,13 +3511,13 @@ Local0 = 0x90 If ((Local0 != 0x90)) { - ERR (__METHOD__, Z111, 0x0E94, 0x00, 0x00, Local0, 0x90) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x90) } Local1 = 0x91 If ((Local1 != 0x91)) { - ERR (__METHOD__, Z111, 0x0E98, 0x00, 0x00, Local1, 0x91) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, 0x91) } } @@ -3529,13 +3529,13 @@ CopyObject (0x94, Local0) If ((Local0 != 0x94)) { - ERR (__METHOD__, Z111, 0x0EA3, 0x00, 0x00, Local0, 0x94) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x94) } CopyObject (0x95, Local1) If ((Local1 != 0x95)) { - ERR (__METHOD__, Z111, 0x0EA7, 0x00, 0x00, Local1, 0x95) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, 0x95) } } @@ -3566,27 +3566,27 @@ M000 (S000) M000 (B000) M000 (P000) - M381 (__METHOD__, S000, 0x00, 0x00) - M382 (__METHOD__, B000, 0x00, 0x01) - M383 (__METHOD__, P000, 0x00, 0x02) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) M001 (S000) M001 (B000) M001 (P000) - M381 (__METHOD__, S000, 0x00, 0x03) - M382 (__METHOD__, B000, 0x00, 0x04) - M383 (__METHOD__, P000, 0x00, 0x05) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) M002 (S000) M002 (B000) M002 (P000) - M385 (__METHOD__, S000, 0x00, 0x06) - M386 (__METHOD__, B000, 0x00, 0x07) - M387 (__METHOD__, P000, 0x00, 0x08) + M385 (__METHOD__, S000, 0x00, __LINE__) + M386 (__METHOD__, B000, 0x00, __LINE__) + M387 (__METHOD__, P000, 0x00, __LINE__) M003 (S010) M003 (B010) M003 (P010) - M385 (__METHOD__, S010, 0x00, 0x09) - M386 (__METHOD__, B010, 0x00, 0x0A) - M387 (__METHOD__, P010, 0x00, 0x0B) + M385 (__METHOD__, S010, 0x00, __LINE__) + M386 (__METHOD__, B010, 0x00, __LINE__) + M387 (__METHOD__, P010, 0x00, __LINE__) END0 () } @@ -3604,24 +3604,24 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (__METHOD__, Z111, 0x0EF6, 0x00, 0x00, Local1, C009) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = SizeOf (Local0) If ((Local1 != ISZ0)) { - ERR (__METHOD__, Z111, 0x0EFA, 0x00, 0x00, Local1, ISZ0) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, ISZ0) } If ((Local6 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0EFD, 0x00, 0x00, Local6, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local6, 0xABCD0000) } If ((Local7 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0F00, 0x00, 0x00, Local7, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local7, 0x11111111) } } } @@ -3629,7 +3629,7 @@ M000 (I000) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F07, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } } @@ -3642,19 +3642,19 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (__METHOD__, Z111, 0x0F16, 0x00, 0x00, Local1, C009) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = SizeOf (Local0) If ((Local1 != ISZ0)) { - ERR (__METHOD__, Z111, 0x0F1A, 0x00, 0x00, Local1, ISZ0) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, ISZ0) } If ((Local0 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F1D, 0x00, 0x00, Local0, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } } } @@ -3662,7 +3662,7 @@ M000 (I000) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F24, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } } @@ -3676,7 +3676,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F34, 0x00, 0x00, Local2, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0xABCD0000) } RefOf (Arg0) = 0x11111111 @@ -3684,27 +3684,27 @@ Local0 = 0x11111111 If ((Local0 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0F3C, 0x00, 0x00, Local0, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x11111111) } } M000 (RefOf (I000)) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F42, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } Local0 = RefOf (I000) M000 (Local0) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F48, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } Local2 = DerefOf (Local0) If ((Local2 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F4C, 0x00, 0x00, Local2, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0xABCD0000) } } @@ -3718,7 +3718,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F5C, 0x00, 0x00, Local2, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0xABCD0000) } } @@ -3733,14 +3733,14 @@ M000 (RefOf (I000)) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F6A, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } Local0 = RefOf (I000) M000 (Local0) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F70, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } If (Y512) @@ -3748,7 +3748,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F75, 0x00, 0x00, Local2, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0xABCD0000) } } @@ -3757,14 +3757,14 @@ M001 (RefOf (I001)) If ((I001 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0F7D, 0x00, 0x00, I001, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I001, 0x11111111) } Local0 = RefOf (I001) M001 (Local0) If ((I001 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0F83, 0x00, 0x00, I001, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I001, 0x11111111) } If (Y512) @@ -3772,7 +3772,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0F88, 0x00, 0x00, Local2, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x11111111) } } } @@ -3788,7 +3788,7 @@ Local2 = DerefOf (Arg0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0F97, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -3801,7 +3801,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FA3, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -3812,7 +3812,7 @@ Local0 = 0x11111111 If ((Local0 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0FAE, 0x00, 0x00, Local0, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x11111111) } } @@ -3824,7 +3824,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FB6, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3837,7 +3837,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FBC, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3846,7 +3846,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FC0, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } Local1 = Local0 = B000 [0x02] @@ -3856,7 +3856,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FC6, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3865,7 +3865,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FCA, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } M000 (Local1) @@ -3874,7 +3874,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FCE, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3883,7 +3883,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FD2, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } /* m001 */ @@ -3894,7 +3894,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FD9, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3907,7 +3907,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FDF, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3916,7 +3916,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FE3, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } Local1 = Local0 = B000 [0x02] @@ -3926,7 +3926,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FE9, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3935,7 +3935,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FED, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } M001 (Local1) @@ -3944,7 +3944,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FF1, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3953,7 +3953,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FF5, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } /* m002 */ @@ -3964,7 +3964,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FFC, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3977,7 +3977,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1002, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3986,7 +3986,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1006, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } Local1 = Local0 = B000 [0x02] @@ -3996,7 +3996,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x100C, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4005,7 +4005,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1010, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } M002 (Local1) @@ -4014,7 +4014,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1014, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4023,7 +4023,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1018, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4042,7 +4042,7 @@ Local2 = DerefOf (Arg0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1027, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4054,7 +4054,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1032, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4072,7 +4072,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1040, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4085,7 +4085,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1046, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4094,7 +4094,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x104A, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } Local1 = Local0 = B000 [0x02] @@ -4104,7 +4104,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1050, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4113,7 +4113,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1054, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } M000 (Local1) @@ -4122,7 +4122,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1058, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4131,7 +4131,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x105C, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } /* m001 */ @@ -4142,7 +4142,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1063, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4155,7 +4155,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1069, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4166,7 +4166,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x106E, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4177,7 +4177,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1075, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4188,7 +4188,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x107A, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4198,7 +4198,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x107F, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4209,7 +4209,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1084, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4221,7 +4221,7 @@ 0x01, 0x02, 0x11, 0x04, 0x05 // ..... })) { - ERR (__METHOD__, Z111, 0x108C, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x11, 0x04, 0x05 // ..... }) @@ -4234,7 +4234,7 @@ 0x01, 0x02, 0x11, 0x04, 0x05 // ..... })) { - ERR (__METHOD__, Z111, 0x1092, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x11, 0x04, 0x05 // ..... }) @@ -4245,7 +4245,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x11)) { - ERR (__METHOD__, Z111, 0x1097, 0x00, 0x00, Local2, 0x11) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x11) } } @@ -4256,7 +4256,7 @@ 0x01, 0x02, 0x11, 0x04, 0x05 // ..... })) { - ERR (__METHOD__, Z111, 0x109E, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x11, 0x04, 0x05 // ..... }) @@ -4267,7 +4267,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x11)) { - ERR (__METHOD__, Z111, 0x10A3, 0x00, 0x00, Local2, 0x11) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x11) } } @@ -4277,7 +4277,7 @@ 0x01, 0x02, 0x11, 0x04, 0x05 // ..... })) { - ERR (__METHOD__, Z111, 0x10A8, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x11, 0x04, 0x05 // ..... }) @@ -4288,7 +4288,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x11)) { - ERR (__METHOD__, Z111, 0x10AD, 0x00, 0x00, Local2, 0x11) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x11) } } } @@ -4349,20 +4349,20 @@ Local3 = ObjectType (Local2) If ((Local3 != Arg1)) { - ERR (__METHOD__, Z111, 0x10CE, 0x00, 0x00, Local3, Arg1) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local3, Arg1) } Local1 = Local0 = Local2 [0x01] Local0 = 0x90 If ((Local0 != 0x90)) { - ERR (__METHOD__, Z111, 0x10D5, 0x00, 0x00, Local0, 0x90) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x90) } Local1 = 0x91 If ((Local1 != 0x91)) { - ERR (__METHOD__, Z111, 0x10D9, 0x00, 0x00, Local1, 0x91) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, 0x91) } } @@ -4375,13 +4375,13 @@ CopyObject (0x94, Local0) If ((Local0 != 0x94)) { - ERR (__METHOD__, Z111, 0x10E6, 0x00, 0x00, Local0, 0x94) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x94) } CopyObject (0x95, Local1) If ((Local1 != 0x95)) { - ERR (__METHOD__, Z111, 0x10EA, 0x00, 0x00, Local1, 0x95) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, 0x95) } } @@ -4393,15 +4393,15 @@ Local2 [0x01] = 0x2B If ((Arg1 == C00A)) { - M385 (__METHOD__, Local2, 0x00, 0x00) + M385 (__METHOD__, Local2, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M386 (__METHOD__, Local2, 0x00, 0x01) + M386 (__METHOD__, Local2, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M387 (__METHOD__, Local2, 0x00, 0x02) + M387 (__METHOD__, Local2, 0x00, __LINE__) } } @@ -4414,21 +4414,21 @@ Local2 [0x01] = 0x2B If ((Arg1 == C00A)) { - M385 (__METHOD__, Local2, 0x00, 0x03) + M385 (__METHOD__, Local2, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M386 (__METHOD__, Local2, 0x00, 0x04) + M386 (__METHOD__, Local2, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M387 (__METHOD__, Local2, 0x00, 0x05) + M387 (__METHOD__, Local2, 0x00, __LINE__) } Local2 = DerefOf (Local0) If ((Local2 != 0x2B)) { - ERR (__METHOD__, Z111, 0x1110, 0x00, 0x00, Local2, 0x2B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x2B) } } @@ -4439,15 +4439,15 @@ M000 (RefOf (Arg0), Arg1) If ((Arg1 == C00A)) { - M381 (__METHOD__, Arg0, 0x00, 0x06) + M381 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Arg0, 0x00, 0x07) + M382 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Arg0, 0x00, 0x08) + M383 (__METHOD__, Arg0, 0x00, __LINE__) } } @@ -4458,15 +4458,15 @@ M001 (RefOf (Arg0)) If ((Arg1 == C00A)) { - M381 (__METHOD__, Arg0, 0x00, 0x09) + M381 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Arg0, 0x00, 0x0A) + M382 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Arg0, 0x00, 0x0B) + M383 (__METHOD__, Arg0, 0x00, __LINE__) } } @@ -4476,15 +4476,15 @@ M002 (Local0, Arg1) If ((Arg1 == C00A)) { - M381 (__METHOD__, Arg0, 0x00, 0x0C) + M381 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Arg0, 0x00, 0x0D) + M382 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Arg0, 0x00, 0x0E) + M383 (__METHOD__, Arg0, 0x00, __LINE__) } } @@ -4493,15 +4493,15 @@ M002 (RefOf (Arg0), Arg1) If ((Arg1 == C00A)) { - M381 (__METHOD__, Arg0, 0x00, 0x0F) + M381 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Arg0, 0x00, 0x10) + M382 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Arg0, 0x00, 0x11) + M383 (__METHOD__, Arg0, 0x00, __LINE__) } } @@ -4511,15 +4511,15 @@ M003 (Local0, Arg1) If ((Arg1 == C00A)) { - M381 (__METHOD__, Arg0, 0x00, 0x12) + M381 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Arg0, 0x00, 0x13) + M382 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Arg0, 0x00, 0x14) + M383 (__METHOD__, Arg0, 0x00, __LINE__) } } @@ -4528,15 +4528,15 @@ M003 (RefOf (Arg0), Arg1) If ((Arg1 == C00A)) { - M381 (__METHOD__, Arg0, 0x00, 0x15) + M381 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (__METHOD__, Arg0, 0x00, 0x16) + M382 (__METHOD__, Arg0, 0x00, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (__METHOD__, Arg0, 0x00, 0x17) + M383 (__METHOD__, Arg0, 0x00, __LINE__) } } @@ -4544,39 +4544,39 @@ M010 (S000, C00A) M010 (B000, C00B) M010 (P000, C00C) - M381 (__METHOD__, S000, 0x00, 0x18) - M382 (__METHOD__, B000, 0x00, 0x19) - M383 (__METHOD__, P000, 0x00, 0x1A) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) M011 (S000, C00A) M011 (B000, C00B) M011 (P000, C00C) - M381 (__METHOD__, S000, 0x00, 0x1B) - M382 (__METHOD__, B000, 0x00, 0x1C) - M383 (__METHOD__, P000, 0x00, 0x1D) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) M012 (S000, C00A) M012 (B000, C00B) M012 (P000, C00C) - M381 (__METHOD__, S000, 0x00, 0x1E) - M382 (__METHOD__, B000, 0x00, 0x1F) - M383 (__METHOD__, P000, 0x00, 0x20) + M381 (__METHOD__, S000, 0x00, __LINE__) + M382 (__METHOD__, B000, 0x00, __LINE__) + M383 (__METHOD__, P000, 0x00, __LINE__) M022 (S010, C00A) M022 (B010, C00B) M022 (P010, C00C) - M381 (__METHOD__, S010, 0x00, 0x21) - M382 (__METHOD__, B010, 0x00, 0x22) - M383 (__METHOD__, P010, 0x00, 0x23) + M381 (__METHOD__, S010, 0x00, __LINE__) + M382 (__METHOD__, B010, 0x00, __LINE__) + M383 (__METHOD__, P010, 0x00, __LINE__) M013 (S020, C00A) M013 (B020, C00B) M013 (P020, C00C) - M381 (__METHOD__, S020, 0x00, 0x24) - M382 (__METHOD__, B020, 0x00, 0x25) - M383 (__METHOD__, P020, 0x00, 0x26) + M381 (__METHOD__, S020, 0x00, __LINE__) + M382 (__METHOD__, B020, 0x00, __LINE__) + M383 (__METHOD__, P020, 0x00, __LINE__) M023 (S030, C00A) M023 (B030, C00B) M023 (P030, C00C) - M381 (__METHOD__, S030, 0x00, 0x27) - M382 (__METHOD__, B030, 0x00, 0x28) - M383 (__METHOD__, P030, 0x00, 0x29) + M381 (__METHOD__, S030, 0x00, __LINE__) + M382 (__METHOD__, B030, 0x00, __LINE__) + M383 (__METHOD__, P030, 0x00, __LINE__) END0 () } @@ -4704,7 +4704,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg2)) { - ERR (__METHOD__, Z111, 0x11DE, 0x00, 0x00, Local0, Arg2) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, Arg2) } If (OP00) @@ -4764,22 +4764,22 @@ } Local0 = DerefOf (Arg0) - M391 (Local0, Arg1, 0x00, 0x00) + M391 (Local0, Arg1, 0x00, __LINE__) } M000 (Arg0, Arg1, Arg2) Local0 = DerefOf (Arg0) - M391 (Local0, Arg1, 0x00, 0x01) + M391 (Local0, Arg1, 0x00, __LINE__) } M000 (Arg0, Arg1, Arg2) Local0 = DerefOf (Arg0) - M391 (Local0, Arg1, 0x00, 0x02) + M391 (Local0, Arg1, 0x00, __LINE__) } M000 (Arg0, Arg1, Arg2) Local0 = DerefOf (Arg0) - M391 (Local0, Arg1, 0x00, 0x03) + M391 (Local0, Arg1, 0x00, __LINE__) } BEG0 (Z111, __METHOD__) @@ -4787,53 +4787,53 @@ Local0 = RefOf (I000) M000 (Local0, C009, C009) - M391 (I000, C009, 0x00, 0x04) + M391 (I000, C009, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C009, 0x00, 0x05) + M391 (Local2, C009, 0x00, __LINE__) Local0 = RefOf (S000) M000 (Local0, C009, C00A) - M391 (S000, C009, 0x00, 0x06) + M391 (S000, C009, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C009, 0x00, 0x07) + M391 (Local2, C009, 0x00, __LINE__) Local0 = RefOf (B000) M000 (Local0, C009, C00B) - M391 (B000, C009, 0x00, 0x08) + M391 (B000, C009, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C009, 0x00, 0x09) + M391 (Local2, C009, 0x00, __LINE__) /* Write String */ Local0 = RefOf (I010) M000 (Local0, C00A, C009) - M391 (I010, C00A, 0x00, 0x0C) + M391 (I010, C00A, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C00A, 0x00, 0x0D) + M391 (Local2, C00A, 0x00, __LINE__) Local0 = RefOf (S010) M000 (Local0, C00A, C00A) - M391 (S010, C00A, 0x00, 0x0E) + M391 (S010, C00A, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C00A, 0x00, 0x0F) + M391 (Local2, C00A, 0x00, __LINE__) Local0 = RefOf (B010) M000 (Local0, C00A, C00B) - M391 (B010, C00A, 0x00, 0x10) + M391 (B010, C00A, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C00A, 0x00, 0x11) + M391 (Local2, C00A, 0x00, __LINE__) /* Write Buffer */ Local0 = RefOf (I020) M000 (Local0, C00B, C009) - M391 (I020, C00B, 0x00, 0x14) + M391 (I020, C00B, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C00B, 0x00, 0x15) + M391 (Local2, C00B, 0x00, __LINE__) Local0 = RefOf (S020) M000 (Local0, C00B, C00A) - M391 (S020, C00B, 0x00, 0x16) + M391 (S020, C00B, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C00B, 0x00, 0x17) + M391 (Local2, C00B, 0x00, __LINE__) Local0 = RefOf (B020) M000 (Local0, C00B, C00B) - M391 (B020, C00B, 0x00, 0x18) + M391 (B020, C00B, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C00B, 0x00, 0x19) + M391 (Local2, C00B, 0x00, __LINE__) /* Write Package */ If (!OP00) @@ -4848,62 +4848,62 @@ { Local0 = RefOf (I030) M000 (Local0, C00C, C009) - M391 (I030, C00C, 0x00, 0x1C) + M391 (I030, C00C, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C00C, 0x00, 0x1D) + M391 (Local2, C00C, 0x00, __LINE__) Local0 = RefOf (S030) M000 (Local0, C00C, C00A) - M391 (S030, C00C, 0x00, 0x1E) + M391 (S030, C00C, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C00C, 0x00, 0x1F) + M391 (Local2, C00C, 0x00, __LINE__) Local0 = RefOf (B030) M000 (Local0, C00C, C00B) - M391 (B030, C00C, 0x00, 0x20) + M391 (B030, C00C, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C00C, 0x00, 0x21) + M391 (Local2, C00C, 0x00, __LINE__) Local0 = RefOf (P030) M000 (Local0, C00C, C00C) - M391 (P030, C00C, 0x00, 0x22) + M391 (P030, C00C, 0x00, __LINE__) Local2 = DerefOf (Local0) - M391 (Local2, C00C, 0x00, 0x23) + M391 (Local2, C00C, 0x00, __LINE__) } /* Write Integer */ M000 (RefOf (I040), C009, C009) - M391 (I040, C009, 0x00, 0x24) + M391 (I040, C009, 0x00, __LINE__) M000 (RefOf (S040), C009, C00A) - M391 (I040, C009, 0x00, 0x25) + M391 (I040, C009, 0x00, __LINE__) M000 (RefOf (B040), C009, C00B) - M391 (I040, C009, 0x00, 0x26) + M391 (I040, C009, 0x00, __LINE__) /* Write String */ M000 (RefOf (I050), C00A, C009) - M391 (I050, C00A, 0x00, 0x28) + M391 (I050, C00A, 0x00, __LINE__) M000 (RefOf (S050), C00A, C00A) - M391 (I050, C00A, 0x00, 0x29) + M391 (I050, C00A, 0x00, __LINE__) M000 (RefOf (B050), C00A, C00B) - M391 (I050, C00A, 0x00, 0x2A) + M391 (I050, C00A, 0x00, __LINE__) /* Write Bufer */ M000 (RefOf (I060), C00B, C009) - M391 (I060, C00B, 0x00, 0x2C) + M391 (I060, C00B, 0x00, __LINE__) M000 (RefOf (S060), C00B, C00A) - M391 (I060, C00B, 0x00, 0x2D) + M391 (I060, C00B, 0x00, __LINE__) M000 (RefOf (B060), C00B, C00B) - M391 (I060, C00B, 0x00, 0x2E) + M391 (I060, C00B, 0x00, __LINE__) /* Write Package */ If (OP01) { M000 (RefOf (I070), C00C, C009) - M391 (I070, C00C, 0x00, 0x30) + M391 (I070, C00C, 0x00, __LINE__) M000 (RefOf (S070), C00C, C00A) - M391 (I070, C00C, 0x00, 0x31) + M391 (I070, C00C, 0x00, __LINE__) M000 (RefOf (B070), C00C, C00B) - M391 (I070, C00C, 0x00, 0x32) + M391 (I070, C00C, 0x00, __LINE__) M000 (RefOf (P070), C00C, C00C) - M391 (I070, C00C, 0x00, 0x33) + M391 (I070, C00C, 0x00, __LINE__) } END0 () @@ -4935,7 +4935,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg2)) { - ERR (__METHOD__, Z111, 0x12B0, 0x00, 0x00, Local0, Arg2) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, Arg2) } If (OP00) @@ -4947,22 +4947,22 @@ Arg0 = 0x2B } - M391 (Arg0, Arg1, 0x00, 0x00) + M391 (Arg0, Arg1, 0x00, __LINE__) } M000 (Arg0, Arg1, Arg2) Local0 = DerefOf (Arg0) - M390 (Local0, Arg1, 0x00, 0x01) + M390 (Local0, Arg1, 0x00, __LINE__) } M000 (Arg0, Arg1, Arg2) Local0 = DerefOf (Arg0) - M390 (Local0, Arg1, 0x00, 0x02) + M390 (Local0, Arg1, 0x00, __LINE__) } M000 (Arg0, Arg1, Arg2) Local0 = DerefOf (Arg0) - M390 (Local0, Arg1, 0x00, 0x03) + M390 (Local0, Arg1, 0x00, __LINE__) } BEG0 (Z111, __METHOD__) @@ -4970,23 +4970,23 @@ Store (S000 [0x01], Local0) M000 (Local0, C009, C016) - M390 (S000, C00A, 0x00, 0x04) + M390 (S000, C00A, 0x00, __LINE__) Local2 = DerefOf (Local0) - M380 (__METHOD__, Local2, 0x00, 0x05) + M380 (__METHOD__, Local2, 0x00, __LINE__) /* Buffer */ Store (B000 [0x01], Local0) M000 (Local0, C009, C016) - M390 (B000, C00B, 0x00, 0x06) + M390 (B000, C00B, 0x00, __LINE__) Local2 = DerefOf (Local0) - M380 (__METHOD__, Local2, 0x00, 0x07) + M380 (__METHOD__, Local2, 0x00, __LINE__) /* Package */ Store (P000 [0x01], Local0) M000 (Local0, C009, C009) - M390 (P000, C00C, 0x00, 0x08) + M390 (P000, C00C, 0x00, __LINE__) Local2 = DerefOf (Local0) - M380 (__METHOD__, Local2, 0x00, 0x09) + M380 (__METHOD__, Local2, 0x00, __LINE__) END0 () } @@ -4994,7 +4994,7 @@ { BEG0 (Z111, __METHOD__) RefOf (I900) = 0x77 - M380 (__METHOD__, I900, 0x00, 0x00) + M380 (__METHOD__, I900, 0x00, __LINE__) RefOf (S900) = 0x77 M4C0 (__METHOD__, S900, "0000000000000077", "00000077") RefOf (B900) = 0x77 @@ -5003,29 +5003,29 @@ 0x77, 0x00, 0x00, 0x00, 0x00 // w.... }, 0x01) RefOf (P953) = 0x77 - M380 (__METHOD__, P953, 0x00, 0x02) + M380 (__METHOD__, P953, 0x00, __LINE__) RefOf (E900) = 0x77 - M380 (__METHOD__, E900, 0x00, 0x03) + M380 (__METHOD__, E900, 0x00, __LINE__) RefOf (MX90) = 0x77 - M380 (__METHOD__, MX90, 0x00, 0x04) + M380 (__METHOD__, MX90, 0x00, __LINE__) RefOf (D900) = 0x77 - M380 (__METHOD__, D900, 0x00, 0x05) + M380 (__METHOD__, D900, 0x00, __LINE__) If (Y508) { RefOf (TZ90) = 0x77 - M380 (__METHOD__, TZ90, 0x00, 0x06) + M380 (__METHOD__, TZ90, 0x00, __LINE__) } RefOf (PR90) = 0x77 - M380 (__METHOD__, PR90, 0x00, 0x07) + M380 (__METHOD__, PR90, 0x00, __LINE__) If (Y510) { RefOf (R900) = 0x77 - M380 (__METHOD__, R900, 0x00, 0x08) + M380 (__METHOD__, R900, 0x00, __LINE__) } RefOf (PW90) = 0x77 - M380 (__METHOD__, PW90, 0x00, 0x09) + M380 (__METHOD__, PW90, 0x00, __LINE__) M1AC () M1A6 () END0 () @@ -5064,14 +5064,14 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (__METHOD__, Z111, 0x1334, 0x00, 0x00, Local1, C009) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = DerefOf (Local0) If ((Local1 != Local6)) { - ERR (__METHOD__, Z111, 0x1338, 0x00, 0x00, Local1, Local6) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, Local6) } } @@ -5147,7 +5147,7 @@ } M000 (RefOf (I000)) - M380 ("m362", I000, Z111, 0x00) + M380 ("m362", I000, Z111, __LINE__) } Method (M363, 0, Serialized) @@ -5159,7 +5159,7 @@ } M000 (RefOf (I000)) - M380 ("m363", I000, Z111, 0x00) + M380 ("m363", I000, Z111, __LINE__) } Method (M364, 0, Serialized) @@ -5172,7 +5172,7 @@ Local0 = RefOf (I000) M000 (Local0) - M380 ("m364", I000, Z111, 0x00) + M380 ("m364", I000, Z111, __LINE__) } /* @@ -5284,13 +5284,13 @@ Local1 = ObjectType (Local0) If ((Local1 != C01C)) { - ERR ("mfab", Z111, 0x13FB, 0x00, 0x00, Local1, C01C) + ERR ("mfab", Z111, __LINE__, 0x00, 0x00, Local1, C01C) } Local1 = ObjectType (DerefOf (Local0)) If ((Local1 != C01C)) { - ERR ("mfab", Z111, 0x1400, 0x00, 0x00, Local1, C01C) + ERR ("mfab", Z111, __LINE__, 0x00, 0x00, Local1, C01C) } } @@ -5347,7 +5347,7 @@ Debug = Local1 If ((Local1 != C01C)) { - ERR ("mfad", Z111, 0x142B, 0x00, 0x00, Local1, C01C) + ERR ("mfad", Z111, __LINE__, 0x00, 0x00, Local1, C01C) } } Else @@ -5356,7 +5356,7 @@ * ObjectType here falls into the infinitive loop. * Sort this out! */ - ERR ("mfad", Z111, 0x1432, 0x00, 0x00, 0x00, 0x00) + ERR ("mfad", Z111, __LINE__, 0x00, 0x00, 0x00, 0x00) } } @@ -5413,7 +5413,7 @@ Debug = Local1 If ((Local1 != 0x64)) { - ERR ("mfc3", Z111, 0x145D, 0x00, 0x00, Local1, 0x64) + ERR ("mfc3", Z111, __LINE__, 0x00, 0x00, Local1, 0x64) } } Else @@ -5422,7 +5422,7 @@ * SizeOf here falls into the infinitive loop. * Sort this out! */ - ERR ("mfc3", Z111, 0x1464, 0x00, 0x00, 0x00, 0x00) + ERR ("mfc3", Z111, __LINE__, 0x00, 0x00, 0x00, 0x00) } } @@ -5479,7 +5479,7 @@ Debug = Local1 If ((Local1 != 0x64)) { - ERR ("mfc4", Z111, 0x1490, 0x00, 0x00, Local1, 0x64) + ERR ("mfc4", Z111, __LINE__, 0x00, 0x00, Local1, 0x64) } } Else @@ -5488,7 +5488,7 @@ * SizeOf here falls into the infinitive loop. * Sort this out! */ - ERR ("mfc4", Z111, 0x1497, 0x00, 0x00, 0x00, 0x00) + ERR ("mfc4", Z111, __LINE__, 0x00, 0x00, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl index 58f2eff..6c3bd3f 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl @@ -53,7 +53,7 @@ } } - CH03 (__METHOD__, Z081, 0x0200, 0x3A, Arg6) + CH03 (__METHOD__, Z081, __LINE__, 0x00, Arg6) /* // FILE BUG: hangs without printing error Store(CH03(ts, z081, 0x200, __LINE__, arg6), Local0) @@ -75,7 +75,7 @@ } - CH04 (C080, 0x00, 0xFF, Z081, 0x4D, Arg6, Arg6) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, Arg6, Arg6) /* // FILE BUG: hangs without printing error Store(CH04(c080, 0, 0xff, z081, __LINE__, arg6, arg6), Local0) @@ -98,7 +98,7 @@ */ Method (M167, 1, Serialized) { - CH03 ("m167", Z081, 0x0206, 0x66, 0x38) + CH03 ("m167", Z081, __LINE__, 0x00, 0x38) Switch (ToInteger (Arg0)) { Case (0x00) @@ -112,7 +112,7 @@ } - CH04 (C080, 0x00, 0xFF, Z081, 0x6F, 0x38, 0x38) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 0x38, 0x38) } /* Check reaction on OPERAND-REFERENCE (exceptions are expected in most cases) */ @@ -132,20 +132,20 @@ Method (M001, 1, NotSerialized) { - CH03 (__METHOD__, Z081, 0x0202, 0x83, 0x36) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x36) If (Arg0) { Local7 = 0x00 } - CH04 (C080, 0x00, 0xFF, Z081, 0x87, 0x36, 0x36) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 0x36, 0x36) } /* ElseIf */ Method (M002, 1, NotSerialized) { - CH03 (__METHOD__, Z081, 0x0204, 0x8D, 0x37) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x37) If (0x00) { Local7 = 0x00 @@ -155,21 +155,21 @@ Local7 = 0x01 } - CH04 (C080, 0x00, 0xFF, Z081, 0x93, 0x37, 0x37) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 0x37, 0x37) } /* While */ Method (M004, 1, NotSerialized) { - CH03 (__METHOD__, Z081, 0x0208, 0x99, 0x3A) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x3A) While (Arg0) { Local7 = 0x00 Break } - CH04 (C080, 0x00, 0xFF, Z081, 0x9E, 0x3A, 0x3A) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 0x3A, 0x3A) } /* Set parameters of current checking */ @@ -228,36 +228,36 @@ { /* CondRefOf */ - CH03 (__METHOD__, Z081, 0x020A, 0xC8, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05) - CH03 (__METHOD__, Z081, 0x020B, 0xCA, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN01) { /* DerefOf */ - CH03 (__METHOD__, Z081, 0x020C, 0xD0, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08) - CH03 (__METHOD__, Z081, 0x020D, 0xD2, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN02) { /* ObjectType */ - CH03 (__METHOD__, Z081, 0x020E, 0xD8, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20) - CH03 (__METHOD__, Z081, 0x020F, 0xDA, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN03) { /* RefOf */ - CH03 (__METHOD__, Z081, 0x0210, 0xE0, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22) - CH03 (__METHOD__, Z081, 0x0211, 0xE2, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN04) @@ -319,9 +319,9 @@ If (Local0) { - CH03 (__METHOD__, Z081, 0x0212, 0x010A, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29) - CH03 (__METHOD__, Z081, 0x0213, 0x010C, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } Else { @@ -335,18 +335,18 @@ { /* CopyObject */ - CH03 (__METHOD__, Z081, 0x0214, 0x0117, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) CopyObject (Arg0, Local7) - CH03 (__METHOD__, Z081, 0x0215, 0x0119, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN06) { /* Return */ - CH03 (__METHOD__, Z081, 0x0216, 0x0120, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M000 (Arg0) - CH03 (__METHOD__, Z081, 0x0217, 0x0122, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN07) @@ -513,9 +513,9 @@ M1A7 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B) /* Store */ - CH03 (__METHOD__, Z081, 0x0218, 0x01ED, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) Local7 = Arg0 - CH03 (__METHOD__, Z081, 0x0219, 0x01EF, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) /* Subtract */ M1A7 (Arg0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x2D) @@ -806,9 +806,9 @@ Name (I000, 0xABCD0000) Method (M000, 1, NotSerialized) { - CH03 (__METHOD__, Z081, 0x48, 0x0334, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) Debug = DerefOf (RefOf (DerefOf (RefOf (Arg0)))) - CH04 (C080, 0x00, 0xFF, Z081, 0x0338, 0x00, 0x00) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 0x00, 0x00) } 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 00412b4..bb6dbcb 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl @@ -44,11 +44,11 @@ Local7 = 0x00 } - CH03 (__METHOD__, Z109, 0x00, 0x33, 0x00) + CH03 (__METHOD__, Z109, __LINE__, 0x00, 0x00) Local0 = Local7 If (!SLCK) { - CH04 (__METHOD__, 0x00, 0xFF, Z109, 0x37, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z109, __LINE__, 0x00, 0x00) } } @@ -62,35 +62,35 @@ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (__METHOD__, Z109, 0x42, 0x00, 0x00, Local7, C009) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C009) } Local0 = S900 /* \S900 */ Local7 = ObjectType (Local0) If ((Local7 != C00A)) { - ERR (__METHOD__, Z109, 0x48, 0x00, 0x00, Local7, C00A) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C00A) } Local0 = B900 /* \B900 */ Local7 = ObjectType (Local0) If ((Local7 != C00B)) { - ERR (__METHOD__, Z109, 0x4E, 0x00, 0x00, Local7, C00B) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C00B) } Local0 = P900 /* \P900 */ Local7 = ObjectType (Local0) If ((Local7 != C00C)) { - ERR (__METHOD__, Z109, 0x54, 0x00, 0x00, Local7, C00C) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C00C) } Local0 = F900 /* \F900 */ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (__METHOD__, Z109, 0x5A, 0x00, 0x00, Local7, C009) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C009) } /* @@ -116,7 +116,7 @@ */ If (X114) { - CH03 (__METHOD__, Z109, 0x0B, 0x75, 0x00) + CH03 (__METHOD__, Z109, __LINE__, 0x00, 0x00) Local0 = M901 () /*CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) */ } @@ -154,6 +154,6 @@ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (__METHOD__, Z109, 0xA0, 0x00, 0x00, Local7, C009) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, 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 5e79ecf..5f2eab6 100644 --- a/tests/aslts/src/runtime/collections/functional/region/bankfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/bankfield.asl @@ -65,11 +65,11 @@ { If ((ObjectType (Arg1) != ObjectType (Arg2))) { - ERR (Arg0, Z145, 0x48, 0x00, 0x00, ObjectType (Arg1), ObjectType (Arg2)) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, ObjectType (Arg1), ObjectType (Arg2)) } ElseIf ((Arg1 != Arg2)) { - ERR (Arg0, Z145, 0x4A, 0x00, 0x00, Arg1, Arg2) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -557,7 +557,7 @@ } Default { - ERR (Arg0, Z145, 0x0193, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -769,7 +769,7 @@ } Default { - ERR (Arg0, Z145, 0x0213, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -981,7 +981,7 @@ } Default { - ERR (Arg0, Z145, 0x0293, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -1193,7 +1193,7 @@ } Default { - ERR (Arg0, Z145, 0x0313, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -1405,7 +1405,7 @@ } Default { - ERR (Arg0, Z145, 0x0393, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -1617,7 +1617,7 @@ } Default { - ERR (Arg0, Z145, 0x0413, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -1829,7 +1829,7 @@ } Default { - ERR (Arg0, Z145, 0x0493, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2041,7 +2041,7 @@ } Default { - ERR (Arg0, Z145, 0x0513, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2253,7 +2253,7 @@ } Default { - ERR (Arg0, Z145, 0x0593, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2465,7 +2465,7 @@ } Default { - ERR (Arg0, Z145, 0x0613, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2693,7 +2693,7 @@ } Default { - ERR (Arg0, Z145, 0x0693, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2905,7 +2905,7 @@ } Default { - ERR (Arg0, Z145, 0x0713, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3117,7 +3117,7 @@ } Default { - ERR (Arg0, Z145, 0x0793, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3329,7 +3329,7 @@ } Default { - ERR (Arg0, Z145, 0x0813, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3541,7 +3541,7 @@ } Default { - ERR (Arg0, Z145, 0x0893, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3769,7 +3769,7 @@ } Default { - ERR (Arg0, Z145, 0x0913, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3777,7 +3777,7 @@ } Default { - ERR (Arg0, Z145, 0x0919, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4085,7 +4085,7 @@ } Default { - ERR (Arg0, Z145, 0x09DB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4297,7 +4297,7 @@ } Default { - ERR (Arg0, Z145, 0x0A5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4509,7 +4509,7 @@ } Default { - ERR (Arg0, Z145, 0x0ADB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4721,7 +4721,7 @@ } Default { - ERR (Arg0, Z145, 0x0B5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4933,7 +4933,7 @@ } Default { - ERR (Arg0, Z145, 0x0BDB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5145,7 +5145,7 @@ } Default { - ERR (Arg0, Z145, 0x0C5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5357,7 +5357,7 @@ } Default { - ERR (Arg0, Z145, 0x0CDB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5569,7 +5569,7 @@ } Default { - ERR (Arg0, Z145, 0x0D5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5781,7 +5781,7 @@ } Default { - ERR (Arg0, Z145, 0x0DDB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5993,7 +5993,7 @@ } Default { - ERR (Arg0, Z145, 0x0E5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6221,7 +6221,7 @@ } Default { - ERR (Arg0, Z145, 0x0EDB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6433,7 +6433,7 @@ } Default { - ERR (Arg0, Z145, 0x0F5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6645,7 +6645,7 @@ } Default { - ERR (Arg0, Z145, 0x0FDB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6857,7 +6857,7 @@ } Default { - ERR (Arg0, Z145, 0x105B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7069,7 +7069,7 @@ } Default { - ERR (Arg0, Z145, 0x10DB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7297,7 +7297,7 @@ } Default { - ERR (Arg0, Z145, 0x115B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7305,7 +7305,7 @@ } Default { - ERR (Arg0, Z145, 0x1161, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7613,7 +7613,7 @@ } Default { - ERR (Arg0, Z145, 0x1223, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7825,7 +7825,7 @@ } Default { - ERR (Arg0, Z145, 0x12A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8037,7 +8037,7 @@ } Default { - ERR (Arg0, Z145, 0x1323, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8249,7 +8249,7 @@ } Default { - ERR (Arg0, Z145, 0x13A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8461,7 +8461,7 @@ } Default { - ERR (Arg0, Z145, 0x1423, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8673,7 +8673,7 @@ } Default { - ERR (Arg0, Z145, 0x14A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8885,7 +8885,7 @@ } Default { - ERR (Arg0, Z145, 0x1523, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9097,7 +9097,7 @@ } Default { - ERR (Arg0, Z145, 0x15A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9309,7 +9309,7 @@ } Default { - ERR (Arg0, Z145, 0x1623, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9521,7 +9521,7 @@ } Default { - ERR (Arg0, Z145, 0x16A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9749,7 +9749,7 @@ } Default { - ERR (Arg0, Z145, 0x1723, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9961,7 +9961,7 @@ } Default { - ERR (Arg0, Z145, 0x17A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10173,7 +10173,7 @@ } Default { - ERR (Arg0, Z145, 0x1823, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10389,7 +10389,7 @@ } Default { - ERR (Arg0, Z145, 0x18AB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10601,7 +10601,7 @@ } Default { - ERR (Arg0, Z145, 0x192B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10829,7 +10829,7 @@ } Default { - ERR (Arg0, Z145, 0x19AB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10837,7 +10837,7 @@ } Default { - ERR (Arg0, Z145, 0x19B1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11145,7 +11145,7 @@ } Default { - ERR (Arg0, Z145, 0x1A73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11357,7 +11357,7 @@ } Default { - ERR (Arg0, Z145, 0x1AF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11569,7 +11569,7 @@ } Default { - ERR (Arg0, Z145, 0x1B73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11781,7 +11781,7 @@ } Default { - ERR (Arg0, Z145, 0x1BF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11993,7 +11993,7 @@ } Default { - ERR (Arg0, Z145, 0x1C73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12205,7 +12205,7 @@ } Default { - ERR (Arg0, Z145, 0x1CF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12417,7 +12417,7 @@ } Default { - ERR (Arg0, Z145, 0x1D73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12629,7 +12629,7 @@ } Default { - ERR (Arg0, Z145, 0x1DF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12841,7 +12841,7 @@ } Default { - ERR (Arg0, Z145, 0x1E73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13053,7 +13053,7 @@ } Default { - ERR (Arg0, Z145, 0x1EF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13281,7 +13281,7 @@ } Default { - ERR (Arg0, Z145, 0x1F73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13493,7 +13493,7 @@ } Default { - ERR (Arg0, Z145, 0x1FF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13705,7 +13705,7 @@ } Default { - ERR (Arg0, Z145, 0x2073, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13917,7 +13917,7 @@ } Default { - ERR (Arg0, Z145, 0x20F3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14129,7 +14129,7 @@ } Default { - ERR (Arg0, Z145, 0x2173, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14357,7 +14357,7 @@ } Default { - ERR (Arg0, Z145, 0x21F3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14365,7 +14365,7 @@ } Default { - ERR (Arg0, Z145, 0x21F9, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14673,7 +14673,7 @@ } Default { - ERR (Arg0, Z145, 0x22BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14885,7 +14885,7 @@ } Default { - ERR (Arg0, Z145, 0x233B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15097,7 +15097,7 @@ } Default { - ERR (Arg0, Z145, 0x23BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15309,7 +15309,7 @@ } Default { - ERR (Arg0, Z145, 0x243B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15521,7 +15521,7 @@ } Default { - ERR (Arg0, Z145, 0x24BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15733,7 +15733,7 @@ } Default { - ERR (Arg0, Z145, 0x253B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15945,7 +15945,7 @@ } Default { - ERR (Arg0, Z145, 0x25BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16157,7 +16157,7 @@ } Default { - ERR (Arg0, Z145, 0x263B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16369,7 +16369,7 @@ } Default { - ERR (Arg0, Z145, 0x26BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16581,7 +16581,7 @@ } Default { - ERR (Arg0, Z145, 0x273B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16809,7 +16809,7 @@ } Default { - ERR (Arg0, Z145, 0x27BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17021,7 +17021,7 @@ } Default { - ERR (Arg0, Z145, 0x283B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17233,7 +17233,7 @@ } Default { - ERR (Arg0, Z145, 0x28BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17445,7 +17445,7 @@ } Default { - ERR (Arg0, Z145, 0x293B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17657,7 +17657,7 @@ } Default { - ERR (Arg0, Z145, 0x29BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17885,7 +17885,7 @@ } Default { - ERR (Arg0, Z145, 0x2A3B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17893,7 +17893,7 @@ } Default { - ERR (Arg0, Z145, 0x2A41, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18793,7 +18793,7 @@ If ((BF03 != I000)) { - ERR (Arg0, Z145, 0x2D37, 0x00, 0x00, BF03, I000) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, BF03, I000) } } @@ -18801,17 +18801,17 @@ BF00 = I000 /* \M7C8.I000 */ If ((BF00 != I000)) { - ERR (Arg0, Z145, 0x2D40, 0x00, 0x00, BF00, I000) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, BF00, I000) } If ((BF01 != I000)) { - ERR (Arg0, Z145, 0x2D43, 0x00, 0x00, BF00, I000) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, BF00, I000) } If ((BF02 != I000)) { - ERR (Arg0, Z145, 0x2D46, 0x00, 0x00, BF00, I000) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, 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 e6fc823..fea7dfa 100644 --- a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl +++ b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl @@ -115,22 +115,22 @@ \DTR0._REG (0x0101, 0x02) If ((\DTR0.IRSK != 0x01)) { - ERR (Arg0, Z142, 0x76, 0x00, 0x00, \DTR0.IRSK, 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, \DTR0.IRSK, 0x01) } If ((\DTR0.IFLG != 0x01)) { - ERR (Arg0, Z142, 0x79, 0x00, 0x00, \DTR0.IFLG, 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, \DTR0.IFLG, 0x01) } If ((\DTR0.VRSK != 0x02)) { - ERR (Arg0, Z142, 0x7C, 0x00, 0x00, \DTR0.VRSK, 0x02) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, \DTR0.VRSK, 0x02) } If ((DerefOf (\DTR0.VFLG [0x01]) != 0x02)) { - ERR (Arg0, Z142, 0x7F, 0x00, 0x00, DerefOf (\DTR0.VFLG [0x01]), 0x02) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, DerefOf (\DTR0.VFLG [0x01]), 0x02) } } @@ -186,44 +186,44 @@ Concatenate (Arg0, "-m7f1", Arg0) If ((VRSK != 0x00)) { - ERR (Arg0, Z142, 0xB2, 0x00, 0x00, VRSK, 0x00) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, VRSK, 0x00) } If ((DerefOf (VFLG [0x01]) != 0x00)) { - ERR (Arg0, Z142, 0xB5, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x00) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x00) } DataTableRegion (DR00, "SSDT", "", "") If ((IRSK != 0x00)) { - ERR (Arg0, Z142, 0xBB, 0x00, 0x00, IRSK, 0x00) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, IRSK, 0x00) } If ((IFLG != 0x00)) { - ERR (Arg0, Z142, 0xBE, 0x00, 0x00, IFLG, 0x00) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, IFLG, 0x00) } _REG (0x0101, 0x02) If ((IRSK != 0x01)) { - ERR (Arg0, Z142, 0xC4, 0x00, 0x00, IRSK, 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, IRSK, 0x01) } If ((IFLG != 0x01)) { - ERR (Arg0, Z142, 0xC7, 0x00, 0x00, IFLG, 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, IFLG, 0x01) } If ((VRSK != 0x01)) { - ERR (Arg0, Z142, 0xCA, 0x00, 0x00, VRSK, 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, VRSK, 0x01) } If ((DerefOf (VFLG [0x01]) != 0x01)) { - ERR (Arg0, Z142, 0xCD, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x01) } } @@ -243,11 +243,11 @@ Local0 = RefOf (FU01) Local1 = RefOf (Local0) Local2 = DerefOf (Local0) - CH03 (Arg0, Z142, 0x10, 0xE0, 0x00) + CH03 (Arg0, Z142, __LINE__, 0x00, 0x00) Local3 = \DTR0.SSDT If ((Local2 != Local3)) { - ERR (Arg0, Z142, 0xE5, 0x00, 0x00, Local2, Local3) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local2, Local3) } } @@ -273,7 +273,7 @@ Local1 = \DTR0.SSDT If ((Local0 != Local1)) { - ERR (Arg0, Z142, 0xFC, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -293,7 +293,7 @@ Local1 = \DTR0.SSDT If ((Local0 != Local1)) { - ERR (Arg0, Z142, 0x010B, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -313,7 +313,7 @@ Local1 = \DTR0.SSDT If ((Local0 != Local1)) { - ERR (Arg0, Z142, 0x011A, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -336,7 +336,7 @@ Local1 = \DTR0.SSDT If ((Local0 != Local1)) { - ERR (Arg0, Z142, 0x012D, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -358,7 +358,7 @@ Local1 = \DTR0.SSDT If ((Local0 != Local1)) { - ERR (Arg0, Z142, 0x013F, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -386,7 +386,7 @@ Local0 = ToString (FU00, 0x04) If ((Local0 != Arg1)) { - ERR (Arg0, Z142, 0x015A, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, 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 7e2724f..bebad71 100644 --- a/tests/aslts/src/runtime/collections/functional/region/indexfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/indexfield.asl @@ -98,28 +98,28 @@ Local1 = C00D /* \C00D */ If ((Local0 != Local1)) { - ERR (Arg0, Z144, 0x67, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } Local0 = ObjectType (REG1) Local1 = C00D /* \C00D */ If ((Local0 != Local1)) { - ERR (Arg0, Z144, 0x6D, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } Local0 = ObjectType (REG2) Local1 = C00D /* \C00D */ If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0x73, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } Local0 = ObjectType (REG3) Local1 = C00D /* \C00D */ If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0x79, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } /* Check actual writes to the IndexField(s). */ @@ -131,7 +131,7 @@ Local1 = 0xF11A If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0x86, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } FK32 = I000 /* \M770.I000 */ @@ -140,7 +140,7 @@ Local1 = 0xD25B If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0x8F, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } FK32 = I000 /* \M770.I000 */ @@ -149,7 +149,7 @@ Local1 = 0x939C If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0x98, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } FK32 = I000 /* \M770.I000 */ @@ -158,7 +158,7 @@ Local1 = 0x54ED If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0xA1, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -410,7 +410,7 @@ If ((Arg5 != Local2)) { - ERR (Arg0, Z144, 0x0157, Z144, Arg6, Local2, Arg5) + ERR (Arg0, Z144, __LINE__, Z144, Arg6, Local2, Arg5) } /* Fill then immediately read */ @@ -421,7 +421,7 @@ Local2 = DerefOf (Arg2) If ((Arg1 != Local2)) { - ERR (Arg0, Z144, 0x0163, Z144, Arg6, Local2, Arg1) + ERR (Arg0, Z144, __LINE__, Z144, Arg6, Local2, Arg1) } /* * November 2011: @@ -1720,7 +1720,7 @@ } Default { - ERR (Arg0, Z144, 0x0546, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -1932,7 +1932,7 @@ } Default { - ERR (Arg0, Z144, 0x05B6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2128,7 +2128,7 @@ } Default { - ERR (Arg0, Z144, 0x0626, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2324,7 +2324,7 @@ } Default { - ERR (Arg0, Z144, 0x0696, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2520,7 +2520,7 @@ } Default { - ERR (Arg0, Z144, 0x0706, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2716,7 +2716,7 @@ } Default { - ERR (Arg0, Z144, 0x0776, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2912,7 +2912,7 @@ } Default { - ERR (Arg0, Z144, 0x07E6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3108,7 +3108,7 @@ } Default { - ERR (Arg0, Z144, 0x0856, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3304,7 +3304,7 @@ } Default { - ERR (Arg0, Z144, 0x08C6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3500,7 +3500,7 @@ } Default { - ERR (Arg0, Z144, 0x0936, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3712,7 +3712,7 @@ } Default { - ERR (Arg0, Z144, 0x09A6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3908,7 +3908,7 @@ } Default { - ERR (Arg0, Z144, 0x0A16, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4104,7 +4104,7 @@ } Default { - ERR (Arg0, Z144, 0x0A86, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4300,7 +4300,7 @@ } Default { - ERR (Arg0, Z144, 0x0AF6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4496,7 +4496,7 @@ } Default { - ERR (Arg0, Z144, 0x0B66, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4708,7 +4708,7 @@ } Default { - ERR (Arg0, Z144, 0x0BD6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4716,7 +4716,7 @@ } Default { - ERR (Arg0, Z144, 0x0BDC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5113,7 +5113,7 @@ } Default { - ERR (Arg0, Z144, 0x0CE8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5317,7 +5317,7 @@ } Default { - ERR (Arg0, Z144, 0x0D50, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5505,7 +5505,7 @@ } Default { - ERR (Arg0, Z144, 0x0DB8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5693,7 +5693,7 @@ } Default { - ERR (Arg0, Z144, 0x0E20, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5881,7 +5881,7 @@ } Default { - ERR (Arg0, Z144, 0x0E88, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6069,7 +6069,7 @@ } Default { - ERR (Arg0, Z144, 0x0EF0, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6257,7 +6257,7 @@ } Default { - ERR (Arg0, Z144, 0x0F58, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6445,7 +6445,7 @@ } Default { - ERR (Arg0, Z144, 0x0FC0, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6633,7 +6633,7 @@ } Default { - ERR (Arg0, Z144, 0x1028, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6821,7 +6821,7 @@ } Default { - ERR (Arg0, Z144, 0x1090, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7025,7 +7025,7 @@ } Default { - ERR (Arg0, Z144, 0x10F8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7213,7 +7213,7 @@ } Default { - ERR (Arg0, Z144, 0x1160, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7401,7 +7401,7 @@ } Default { - ERR (Arg0, Z144, 0x11C8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7589,7 +7589,7 @@ } Default { - ERR (Arg0, Z144, 0x1230, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7777,7 +7777,7 @@ } Default { - ERR (Arg0, Z144, 0x1298, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7981,7 +7981,7 @@ } Default { - ERR (Arg0, Z144, 0x1300, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7989,7 +7989,7 @@ } Default { - ERR (Arg0, Z144, 0x1306, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8386,7 +8386,7 @@ } Default { - ERR (Arg0, Z144, 0x1412, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8590,7 +8590,7 @@ } Default { - ERR (Arg0, Z144, 0x147A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8778,7 +8778,7 @@ } Default { - ERR (Arg0, Z144, 0x14E2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8966,7 +8966,7 @@ } Default { - ERR (Arg0, Z144, 0x154A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9154,7 +9154,7 @@ } Default { - ERR (Arg0, Z144, 0x15B2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9342,7 +9342,7 @@ } Default { - ERR (Arg0, Z144, 0x161A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9530,7 +9530,7 @@ } Default { - ERR (Arg0, Z144, 0x1682, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9718,7 +9718,7 @@ } Default { - ERR (Arg0, Z144, 0x16EA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9906,7 +9906,7 @@ } Default { - ERR (Arg0, Z144, 0x1752, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10094,7 +10094,7 @@ } Default { - ERR (Arg0, Z144, 0x17BA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10298,7 +10298,7 @@ } Default { - ERR (Arg0, Z144, 0x1822, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10486,7 +10486,7 @@ } Default { - ERR (Arg0, Z144, 0x188A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10674,7 +10674,7 @@ } Default { - ERR (Arg0, Z144, 0x18F2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10862,7 +10862,7 @@ } Default { - ERR (Arg0, Z144, 0x195A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11050,7 +11050,7 @@ } Default { - ERR (Arg0, Z144, 0x19C2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11254,7 +11254,7 @@ } Default { - ERR (Arg0, Z144, 0x1A2A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11262,7 +11262,7 @@ } Default { - ERR (Arg0, Z144, 0x1A30, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11661,7 +11661,7 @@ } Default { - ERR (Arg0, Z144, 0x1B3E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11865,7 +11865,7 @@ } Default { - ERR (Arg0, Z144, 0x1BA6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12053,7 +12053,7 @@ } Default { - ERR (Arg0, Z144, 0x1C0E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12241,7 +12241,7 @@ } Default { - ERR (Arg0, Z144, 0x1C76, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12429,7 +12429,7 @@ } Default { - ERR (Arg0, Z144, 0x1CDE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12617,7 +12617,7 @@ } Default { - ERR (Arg0, Z144, 0x1D46, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12805,7 +12805,7 @@ } Default { - ERR (Arg0, Z144, 0x1DAE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12993,7 +12993,7 @@ } Default { - ERR (Arg0, Z144, 0x1E16, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13181,7 +13181,7 @@ } Default { - ERR (Arg0, Z144, 0x1E7E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13369,7 +13369,7 @@ } Default { - ERR (Arg0, Z144, 0x1EE6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13573,7 +13573,7 @@ } Default { - ERR (Arg0, Z144, 0x1F4E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13761,7 +13761,7 @@ } Default { - ERR (Arg0, Z144, 0x1FB6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13949,7 +13949,7 @@ } Default { - ERR (Arg0, Z144, 0x201E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14137,7 +14137,7 @@ } Default { - ERR (Arg0, Z144, 0x2086, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14325,7 +14325,7 @@ } Default { - ERR (Arg0, Z144, 0x20EE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14529,7 +14529,7 @@ } Default { - ERR (Arg0, Z144, 0x2156, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14537,7 +14537,7 @@ } Default { - ERR (Arg0, Z144, 0x215C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14935,7 +14935,7 @@ } Default { - ERR (Arg0, Z144, 0x226A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15139,7 +15139,7 @@ } Default { - ERR (Arg0, Z144, 0x22D2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15327,7 +15327,7 @@ } Default { - ERR (Arg0, Z144, 0x233A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15515,7 +15515,7 @@ } Default { - ERR (Arg0, Z144, 0x23A2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15703,7 +15703,7 @@ } Default { - ERR (Arg0, Z144, 0x240A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15891,7 +15891,7 @@ } Default { - ERR (Arg0, Z144, 0x2472, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16079,7 +16079,7 @@ } Default { - ERR (Arg0, Z144, 0x24DA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16267,7 +16267,7 @@ } Default { - ERR (Arg0, Z144, 0x2542, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16455,7 +16455,7 @@ } Default { - ERR (Arg0, Z144, 0x25AA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16643,7 +16643,7 @@ } Default { - ERR (Arg0, Z144, 0x2612, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16847,7 +16847,7 @@ } Default { - ERR (Arg0, Z144, 0x267A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17035,7 +17035,7 @@ } Default { - ERR (Arg0, Z144, 0x26E2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17223,7 +17223,7 @@ } Default { - ERR (Arg0, Z144, 0x274A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17411,7 +17411,7 @@ } Default { - ERR (Arg0, Z144, 0x27B2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17599,7 +17599,7 @@ } Default { - ERR (Arg0, Z144, 0x281A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17803,7 +17803,7 @@ } Default { - ERR (Arg0, Z144, 0x2882, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17811,7 +17811,7 @@ } Default { - ERR (Arg0, Z144, 0x2888, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/region/opregions.asl b/tests/aslts/src/runtime/collections/functional/region/opregions.asl index 3fe94eb..923647a 100644 --- a/tests/aslts/src/runtime/collections/functional/region/opregions.asl +++ b/tests/aslts/src/runtime/collections/functional/region/opregions.asl @@ -545,22 +545,22 @@ Package (NRSK) If ((IRSK != 0x00)) { - ERR (Arg0, Z141, 0x0191, 0x00, 0x00, IRSK, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IRSK, 0x00) } If ((IFLG != 0x00)) { - ERR (Arg0, Z141, 0x0194, 0x00, 0x00, IFLG, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IFLG, 0x00) } If ((\DOR0.IRSK != 0x00)) { - ERR (Arg0, Z141, 0x0198, 0x00, 0x00, IRSK, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IRSK, 0x00) } If ((\DOR0.IFLG != 0x00)) { - ERR (Arg0, Z141, 0x019B, 0x00, 0x00, IFLG, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IFLG, 0x00) } /* Emulate and verify incorrect calls */ @@ -569,29 +569,29 @@ Package (NRSK) \DOR0._REG (FRSK, 0x02) If ((IRSK != 0x01)) { - ERR (Arg0, Z141, 0x01A4, 0x00, 0x00, IRSK, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IRSK, 0x01) } If ((IFLG != 0x01)) { - ERR (Arg0, Z141, 0x01A7, 0x00, 0x00, IFLG, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IFLG, 0x01) } If ((\DOR0.IRSK != 0x01)) { - ERR (Arg0, Z141, 0x01AA, 0x00, 0x00, IRSK, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IRSK, 0x01) } If ((\DOR0.IFLG != 0x01)) { - ERR (Arg0, Z141, 0x01AD, 0x00, 0x00, IFLG, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IFLG, 0x01) } /* Check total calls to \_REG */ If ((DerefOf (VFLG [0x01]) != 0x09)) { - ERR (Arg0, Z141, 0x01B3, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x09) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x09) } M70E (Arg0, 0x01, VRSK, ERSK, 0x0A) @@ -599,7 +599,7 @@ Package (NRSK) If ((DerefOf (\DOR0.VFLG [0x01]) != 0x06)) { - ERR (Arg0, Z141, 0x01BA, 0x00, 0x00, DerefOf (\DOR0.VFLG [0x01]), 0x06) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, DerefOf (\DOR0.VFLG [0x01]), 0x06) } M70E (Arg0, 0x01, \DOR0.VRSK, \DOR0.ERSK, 0x0C) @@ -613,46 +613,46 @@ Package (NRSK) Concatenate (Arg0, "-m701", Arg0) If ((\DOR1.IREG != 0x00)) { - ERR (Arg0, Z141, 0x01C7, 0x00, 0x00, \DOR1.IREG, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IREG, 0x00) } If ((\DOR1.IRSK != 0x00)) { - ERR (Arg0, Z141, 0x01CA, 0x00, 0x00, \DOR1.IRSK, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IRSK, 0x00) } If ((\DOR1.IFLG != 0x00)) { - ERR (Arg0, Z141, 0x01CD, 0x00, 0x00, \DOR1.IFLG, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IFLG, 0x00) } If ((DerefOf (\DOR1.VFLG [0x01]) != 0x00)) { - ERR (Arg0, Z141, 0x01D0, 0x00, 0x00, DerefOf (\DOR1.VFLG [0x01]), 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, DerefOf (\DOR1.VFLG [0x01]), 0x00) } M70E (Arg0, 0x02, \DOR1.VRSK, 0x00, 0x11) \DOR1.M000 () If ((\DOR1.IREG != 0x00)) { - ERR (Arg0, Z141, 0x01D7, 0x00, 0x00, \DOR1.IREG, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IREG, 0x01) } If ((\DOR1.IRSK != 0x01)) { - ERR (Arg0, Z141, 0x01DA, 0x00, 0x00, \DOR1.IRSK, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IRSK, 0x01) } If ((\DOR1.IFLG != 0x01)) { - ERR (Arg0, Z141, 0x01DD, 0x00, 0x00, \DOR1.IFLG, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IFLG, 0x01) } /* Check total calls to \DOR1._REG */ If ((DerefOf (\DOR1.VFLG [0x01]) != 0x06)) { - ERR (Arg0, Z141, 0x01E3, 0x00, 0x00, DerefOf (\DOR1.VFLG [0x01]), 0x06) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, DerefOf (\DOR1.VFLG [0x01]), 0x06) } M70E (Arg0, 0x01, \DOR1.VRSK, \DOR1.ERSK, 0x16) @@ -753,19 +753,19 @@ Package (NRSK) Else { DerefOf (Local5) = B000 /* \M70C.B000 */ - CH03 (Arg0, Z141, 0x18, 0x024F, Local3) + CH03 (Arg0, Z141, __LINE__, 0x00, Local3) Local0 = ObjectType (DerefOf (Local6)) Local1 = C00B /* \C00B */ If ((Local0 != Local1)) { - ERR (Arg0, Z141, 0x0254, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, Local0, Local1) } Else { Local0 = DerefOf (Local6) If ((Local0 != B000)) { - ERR (Arg0, Z141, 0x0258, Z141, Arg2, Local0, B000) + ERR (Arg0, Z141, __LINE__, Z141, Arg2, Local0, B000) } } } @@ -823,14 +823,14 @@ Package (NRSK) Local3 = Arg3 [Local0] If ((DerefOf (Local1) != DerefOf (Local3))) { - ERR (Arg0, Z141, 0x028D, Z141, Local0, DerefOf (Local1), DerefOf (Local3)) + ERR (Arg0, Z141, __LINE__, Z141, Local0, DerefOf (Local1), DerefOf (Local3)) } } Case (0x02) { If ((DerefOf (Local1) != 0x00)) { - ERR (Arg0, Z141, 0x0292, Z141, Local0, DerefOf (Local1), 0x00) + ERR (Arg0, Z141, __LINE__, Z141, Local0, DerefOf (Local1), 0x00) } } @@ -890,7 +890,7 @@ Package (NRSK) } If ((Local0 != Local1)) { - ERR (Arg0, Z141, 0x02C3, Z141, Arg4, Local0, Local1) + ERR (Arg0, Z141, __LINE__, Z141, Arg4, Local0, Local1) } } @@ -904,7 +904,7 @@ Package (NRSK) { If ((Arg1 != Arg2)) { - ERR (Arg0, Z141, 0x02D0, Z141, Arg3, Arg1, Arg2) + ERR (Arg0, Z141, __LINE__, Z141, Arg3, Arg1, Arg2) } } @@ -990,7 +990,7 @@ Package (NRSK) Local7 = DerefOf (Local5) If ((I002 != Local7)) { - ERR (Arg0, Z141, 0x031C, Z141, Arg1, Local7, I002) + ERR (Arg0, Z141, __LINE__, Z141, Arg1, Local7, I002) } } @@ -1038,7 +1038,7 @@ Package (NRSK) Local7 = DerefOf (Local5) If ((I002 != Local7)) { - ERR (Arg0, Z141, 0x033F, Z141, Arg1, Local7, I002) + ERR (Arg0, Z141, __LINE__, Z141, Arg1, Local7, I002) } } @@ -1088,7 +1088,7 @@ Package (NRSK) Local7 = DerefOf (Local5) If ((I002 != Local7)) { - ERR (Arg0, Z141, 0x0365, Z141, Arg1, Local7, I002) + ERR (Arg0, Z141, __LINE__, Z141, Arg1, Local7, I002) } } @@ -1137,7 +1137,7 @@ Package (NRSK) Local7 = DerefOf (Local5) If ((I002 != Local7)) { - ERR (Arg0, Z141, 0x038B, Z141, Arg1, Local7, I002) + ERR (Arg0, Z141, __LINE__, Z141, Arg1, Local7, I002) } } @@ -1218,7 +1218,7 @@ Package (NRSK) If ((FU04 != I000)) { - ERR (Arg0, Z141, 0x03CF, 0x00, 0x00, FU04, I000) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, FU04, I000) } } @@ -1226,48 +1226,48 @@ Package (NRSK) FU00 = I000 /* \M706.I000 */ If ((FU00 != I000)) { - ERR (Arg0, Z141, 0x03D8, 0x00, 0x00, FU00, I000) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, FU00, I000) } If ((0xFEDCBA987654321F != OFF0)) { - ERR (Arg0, Z141, 0x03DC, 0x00, 0x00, OFF0, 0xFEDCBA987654321F) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, OFF0, 0xFEDCBA987654321F) } ElseIf ((0x0123 != LEN0)) { - ERR (Arg0, Z141, 0x03DE, 0x00, 0x00, LEN0, 0x0123) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, LEN0, 0x0123) } ElseIf ((FU01 != I000)) { - ERR (Arg0, Z141, 0x03E0, 0x00, 0x00, FU00, I000) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, FU00, I000) } If ((0xFEDCBA987654321F != OFFB)) { - ERR (Arg0, Z141, 0x03E4, 0x00, 0x00, OFFB, 0xFEDCBA987654321F) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, OFFB, 0xFEDCBA987654321F) } ElseIf ((0x0123 != LENB)) { - ERR (Arg0, Z141, 0x03E6, 0x00, 0x00, LENB, 0x0123) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, LENB, 0x0123) } ElseIf ((FU02 != I000)) { - ERR (Arg0, Z141, 0x03E8, 0x00, 0x00, FU00, I000) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, FU00, I000) } If ((0xFEDCBA987654321F != OFFS)) { Local0 = (OFFS + 0x00) - ERR (Arg0, Z141, 0x03ED, 0x00, 0x00, Local0, 0xFEDCBA987654321F) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, Local0, 0xFEDCBA987654321F) } ElseIf ((0x0123 != LENS)) { Local0 = (LENS + 0x00) - ERR (Arg0, Z141, 0x03F0, 0x00, 0x00, Local0, 0x0123) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, Local0, 0x0123) } ElseIf ((FU03 != I000)) { - ERR (Arg0, Z141, 0x03F2, 0x00, 0x00, FU00, I000) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, FU00, I000) } M000 (Arg0, OFF0, LEN0, 0x2B) @@ -1361,7 +1361,7 @@ Package (NRSK) } If ((Local0 != Local1)) { - ERR (Arg0, Z141, 0x0442, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, 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 34d7ed2..507042d 100644 --- a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl @@ -615,32 +615,32 @@ BUFR = FLD0 = BUFF /* \M751.BUFF */ /* Invoke Write Quick transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x01AC, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x01AF, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x00)) { - ERR (Arg0, Z143, 0x01B2, 0x00, 0x00, DAT0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x00) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x01B6, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x01B9, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x00)) { - ERR (Arg0, Z143, 0x01BC, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } OB10 = 0x00 @@ -651,14 +651,14 @@ BUFF = FLD0 /* Invoke Read Quick transaction */ /* \M751.FLD0 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x01C7, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x00)) { /* Length is zero for Quick operations */ - ERR (Arg0, Z143, 0x01CA, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } /* Note: Since LEN0 should be zero there's no need to check DAT0 */ } @@ -694,32 +694,32 @@ BUFR = FLD0 = BUFF /* \M752.BUFF */ /* Invoke a Send Byte transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x01ED, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x01F0, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x16)) { - ERR (Arg0, Z143, 0x01F3, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x01F7, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x01FA, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x16)) { - ERR (Arg0, Z143, 0x01FD, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Receive a byte of data from the device */ @@ -727,17 +727,17 @@ BUFF = FLD0 /* Invoke a Receive Byte transaction */ /* \M752.FLD0 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x0204, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x01)) { - ERR (Arg0, Z143, 0x0207, 0x00, 0x00, LEN0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x01) } If ((DAT0 != 0xA0)) { - ERR (Arg0, Z143, 0x020A, 0x00, 0x00, DAT0, 0xA0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA0) } } @@ -774,32 +774,32 @@ BUFR = FLD2 = BUFF /* \M753.BUFF */ /* Invoke a Write Byte transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x022E, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x0231, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x16)) { - ERR (Arg0, Z143, 0x0234, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0238, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x023B, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x16)) { - ERR (Arg0, Z143, 0x023E, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Read a byte of data from the device using command value 1 */ @@ -807,17 +807,17 @@ BUFF = FLD1 /* Invoke a Read Byte transaction */ /* \M753.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x0245, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x01)) { - ERR (Arg0, Z143, 0x0248, 0x00, 0x00, LEN0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x01) } If ((DAT0 != 0xA0)) { - ERR (Arg0, Z143, 0x024B, 0x00, 0x00, DAT0, 0xA0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA0) } } @@ -854,32 +854,32 @@ BUFR = FLD2 = BUFF /* \M754.BUFF */ /* Invoke a Write Word transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x026F, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x0272, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x5416)) { - ERR (Arg0, Z143, 0x0275, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0279, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x027C, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x5416)) { - ERR (Arg0, Z143, 0x027F, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Read two bytes of data from the device using command value 1 */ @@ -887,17 +887,17 @@ BUFF = FLD1 /* Invoke a Read Word transaction */ /* \M754.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x0286, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x02)) { - ERR (Arg0, Z143, 0x0289, 0x00, 0x00, LEN0, 0x02) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x02) } If ((DAT0 != 0xA1A0)) { - ERR (Arg0, Z143, 0x028C, 0x00, 0x00, DAT0, 0xA1A0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA1A0) } } @@ -934,12 +934,12 @@ BUFR = FLD2 = BUFF /* \M755.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x02B0, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x02B3, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -948,22 +948,22 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x02B7, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x02BB, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x02BE, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != Local0)) { - ERR (Arg0, Z143, 0x02C1, 0x00, 0x00, DAT1, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local0) } /* Read block of data from the device using command value 1 */ @@ -971,12 +971,12 @@ BUFF = FLD1 /* Invoke a Read Block transaction */ /* \M755.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x02C8, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x20)) { - ERR (Arg0, Z143, 0x02CB, 0x00, 0x00, LEN0, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x20) } Local1 = Buffer (0x20) @@ -988,7 +988,7 @@ } If ((DAT0 != Local1)) { - ERR (Arg0, Z143, 0x02D4, 0x00, 0x00, DAT0, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local1) } } @@ -1025,32 +1025,32 @@ BUFR = FLD1 = BUFF /* \M756.BUFF */ /* Invoke a Process Call transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x02F8, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x02FB, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x5416)) { - ERR (Arg0, Z143, 0x02FE, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0302, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x02)) { - ERR (Arg0, Z143, 0x0305, 0x00, 0x00, LEN1, 0x02) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x02) } If ((DAT1 != 0xA1A0)) { - ERR (Arg0, Z143, 0x0308, 0x00, 0x00, DAT1, 0xA1A0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0xA1A0) } } @@ -1086,12 +1086,12 @@ BUFR = FLD1 = BUFF /* \M757.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x032B, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x032E, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1100,17 +1100,17 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x0332, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0336, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x20)) { - ERR (Arg0, Z143, 0x0339, 0x00, 0x00, LEN1, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x20) } Local1 = Buffer (0x20) @@ -1122,7 +1122,7 @@ } If ((DAT1 != Local1)) { - ERR (Arg0, Z143, 0x0342, 0x00, 0x00, DAT1, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local1) } } @@ -1209,32 +1209,32 @@ BUFR = FLD0 = BUFF /* \M758.BUFF */ /* Invoke Write Quick transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x039A, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x039D, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x00)) { - ERR (Arg0, Z143, 0x03A0, 0x00, 0x00, DAT0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x00) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x03A4, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x03A7, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x00)) { - ERR (Arg0, Z143, 0x03AA, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } OB10 = 0x00 @@ -1245,14 +1245,14 @@ BUFF = FLD0 /* Invoke Read Quick transaction */ /* \M758.FLD0 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x03B5, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x00)) { /* Length is zero for Quick operations */ - ERR (Arg0, Z143, 0x03B8, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } /* Note: Since LEN0 should be zero there's no need to check DAT0 */ } @@ -1296,32 +1296,32 @@ BUFR = FLD0 = BUFF /* \M759.BUFF */ /* Invoke a Send Byte transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x03E2, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x03E5, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x16)) { - ERR (Arg0, Z143, 0x03E8, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x03EC, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x03EF, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x16)) { - ERR (Arg0, Z143, 0x03F2, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Receive a byte of data from the device */ @@ -1329,17 +1329,17 @@ BUFF = FLD0 /* Invoke a Receive Byte transaction */ /* \M759.FLD0 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x03F9, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x01)) { - ERR (Arg0, Z143, 0x03FC, 0x00, 0x00, LEN0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x01) } If ((DAT0 != 0xA0)) { - ERR (Arg0, Z143, 0x03FF, 0x00, 0x00, DAT0, 0xA0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA0) } } @@ -1384,32 +1384,32 @@ BUFR = FLD2 = BUFF /* \M75A.BUFF */ /* Invoke a Write Byte transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x042A, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x042D, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x16)) { - ERR (Arg0, Z143, 0x0430, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0434, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x0437, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x16)) { - ERR (Arg0, Z143, 0x043A, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Read a byte of data from the device using command value 1 */ @@ -1417,17 +1417,17 @@ BUFF = FLD1 /* Invoke a Read Byte transaction */ /* \M75A.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x0441, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x01)) { - ERR (Arg0, Z143, 0x0444, 0x00, 0x00, LEN0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x01) } If ((DAT0 != 0xA0)) { - ERR (Arg0, Z143, 0x0447, 0x00, 0x00, DAT0, 0xA0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA0) } } @@ -1472,32 +1472,32 @@ BUFR = FLD2 = BUFF /* \M75B.BUFF */ /* Invoke a Write Word transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x0472, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x0475, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x5416)) { - ERR (Arg0, Z143, 0x0478, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x047C, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x047F, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x5416)) { - ERR (Arg0, Z143, 0x0482, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Read two bytes of data from the device using command value 1 */ @@ -1505,17 +1505,17 @@ BUFF = FLD1 /* Invoke a Read Word transaction */ /* \M75B.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x0489, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x02)) { - ERR (Arg0, Z143, 0x048C, 0x00, 0x00, LEN0, 0x02) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x02) } If ((DAT0 != 0xA1A0)) { - ERR (Arg0, Z143, 0x048F, 0x00, 0x00, DAT0, 0xA1A0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA1A0) } } @@ -1560,12 +1560,12 @@ BUFR = FLD2 = BUFF /* \M75C.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x04BA, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x04BD, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1574,22 +1574,22 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x04C1, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x04C5, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x04C8, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != Local0)) { - ERR (Arg0, Z143, 0x04CB, 0x00, 0x00, DAT1, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local0) } /* Read block of data from the device using command value 1 */ @@ -1597,12 +1597,12 @@ BUFF = FLD1 /* Invoke a Read Block transaction */ /* \M75C.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x04D2, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x20)) { - ERR (Arg0, Z143, 0x04D5, 0x00, 0x00, LEN0, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x20) } Local1 = Buffer (0x20) @@ -1614,7 +1614,7 @@ } If ((DAT0 != Local1)) { - ERR (Arg0, Z143, 0x04DE, 0x00, 0x00, DAT0, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local1) } } @@ -1659,32 +1659,32 @@ BUFR = FLD1 = BUFF /* \M75D.BUFF */ /* Invoke a Process Call transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x0509, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x050C, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x5416)) { - ERR (Arg0, Z143, 0x050F, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0513, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x02)) { - ERR (Arg0, Z143, 0x0516, 0x00, 0x00, LEN1, 0x02) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x02) } If ((DAT1 != 0xA1A0)) { - ERR (Arg0, Z143, 0x0519, 0x00, 0x00, DAT1, 0xA1A0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0xA1A0) } } @@ -1728,12 +1728,12 @@ BUFR = FLD1 = BUFF /* \M75E.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x0543, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x0546, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1742,17 +1742,17 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x054A, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x054E, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x20)) { - ERR (Arg0, Z143, 0x0551, 0x00, 0x00, LEN1, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x20) } Local1 = Buffer (0x20) @@ -1764,7 +1764,7 @@ } If ((DAT1 != Local1)) { - ERR (Arg0, Z143, 0x055A, 0x00, 0x00, DAT1, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local1) } } @@ -1812,12 +1812,12 @@ BUFR = FLD1 = BUFF /* \M75F.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x058A, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x058D, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1826,17 +1826,17 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x0591, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0595, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x20)) { - ERR (Arg0, Z143, 0x0598, 0x00, 0x00, LEN1, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x20) } Local1 = Buffer (0x20) @@ -1848,7 +1848,7 @@ } If ((DAT1 != Local1)) { - ERR (Arg0, Z143, 0x05A1, 0x00, 0x00, DAT1, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local1) } } @@ -1896,12 +1896,12 @@ BUFR = FLD1 = BUFF /* \M760.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x05D1, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x05D4, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1910,17 +1910,17 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x05D8, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x05DC, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x20)) { - ERR (Arg0, Z143, 0x05DF, 0x00, 0x00, LEN1, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x20) } Local1 = Buffer (0x20) @@ -1932,7 +1932,7 @@ } If ((DAT1 != Local1)) { - ERR (Arg0, Z143, 0x05E8, 0x00, 0x00, DAT1, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local1) } } @@ -1980,12 +1980,12 @@ BUFR = FLD1 = BUFF /* \M761.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x0618, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x061B, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1994,17 +1994,17 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x061F, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0623, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x20)) { - ERR (Arg0, Z143, 0x0626, 0x00, 0x00, LEN1, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x20) } Local1 = Buffer (0x20) @@ -2016,7 +2016,7 @@ } If ((DAT1 != Local1)) { - ERR (Arg0, Z143, 0x062F, 0x00, 0x00, DAT1, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local1) } } @@ -2083,21 +2083,21 @@ Local0 = MODE /* \M764.MODE */ If ((Local0 != 0x03)) { - ERR (Arg0, Z143, 0x0660, 0x00, 0x00, Local0, 0x03) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0x03) } MODE = 0x01 Local0 = MODE /* \M764.MODE */ If ((Local0 != 0x01)) { - ERR (Arg0, Z143, 0x0666, 0x00, 0x00, Local0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0x01) } STAT = 0x01 Local0 = STAT /* \M764.STAT */ If ((Local0 != 0x01)) { - ERR (Arg0, Z143, 0x066C, 0x00, 0x00, Local0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0x01) } Name (TBUF, Buffer (0x10) @@ -2109,7 +2109,7 @@ Local0 = BUFF /* \M764.BUFF */ If ((Local0 != TBUF)) { - ERR (Arg0, Z143, 0x0676, 0x00, 0x00, Local0, TBUF) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, TBUF) } } @@ -2159,17 +2159,17 @@ } If ((STAT != 0x00)) { - ERR (Arg0, Z143, 0x06AC, 0x00, 0x00, STAT, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, STAT, 0x00) } If ((CMPC != 0x00)) { - ERR (Arg0, Z143, 0x06B0, 0x00, 0x00, CMPC, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, CMPC, 0x00) } If ((BUFF != Local1)) { - ERR (Arg0, Z143, 0x06B4, 0x00, 0x00, Local1, BUFF) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, BUFF) } } @@ -2877,19 +2877,19 @@ Local4 = DerefOf (Arg2 [0x00]) If ((Local4 != Local0)) { - ERR (Arg0, Z143, 0x0905, Z143, Local3, Local4, Local0) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local0) } Local4 = DerefOf (Arg2 [0x01]) If ((Local4 != Local1)) { - ERR (Arg0, Z143, 0x0909, Z143, Local3, Local4, Local1) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local1) } Local4 = DerefOf (Arg2 [0x02]) If ((Local4 != Local2)) { - ERR (Arg0, Z143, 0x090D, Z143, Local3, Local4, Local2) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local2) } /* 1-2 */ @@ -2897,14 +2897,14 @@ Local4 = DerefOf (Arg2 [0x03]) If ((Local4 != Local0)) { - ERR (Arg0, Z143, 0x0913, Z143, Local3, Local4, Local0) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local0) } Local4 = DerefOf (Arg2 [0x04]) Local5 = (Local1 | (Local2 << 0x01)) If ((Local4 != Local5)) { - ERR (Arg0, Z143, 0x0918, Z143, Local3, Local4, Local5) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local5) } /* 2-1 */ @@ -2913,13 +2913,13 @@ Local5 = (Local0 | (Local1 << 0x01)) If ((Local4 != Local5)) { - ERR (Arg0, Z143, 0x091F, Z143, Local3, Local4, Local5) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local5) } Local4 = DerefOf (Arg2 [0x06]) If ((Local4 != Local2)) { - ERR (Arg0, Z143, 0x0923, Z143, Local3, Local4, Local2) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local2) } } @@ -3071,7 +3071,7 @@ If ((Arg3 == 0x00)) { - ERR (Arg0, Z143, 0x09BB, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Ones) } @@ -3375,7 +3375,7 @@ } Default { - ERR (Arg0, Z143, 0x0AB2, 0x00, 0x00, Local4, Local5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local4, Local5) Return (Ones) } @@ -3574,7 +3574,7 @@ } Default { - ERR (Arg0, Z143, 0x0B25, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3746,7 +3746,7 @@ } Default { - ERR (Arg0, Z143, 0x0B7D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3934,7 +3934,7 @@ } Default { - ERR (Arg0, Z143, 0x0BD5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4106,7 +4106,7 @@ } Default { - ERR (Arg0, Z143, 0x0C2D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4278,7 +4278,7 @@ } Default { - ERR (Arg0, Z143, 0x0C85, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4450,7 +4450,7 @@ } Default { - ERR (Arg0, Z143, 0x0CDD, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4622,7 +4622,7 @@ } Default { - ERR (Arg0, Z143, 0x0D35, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4794,7 +4794,7 @@ } Default { - ERR (Arg0, Z143, 0x0D8D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4966,7 +4966,7 @@ } Default { - ERR (Arg0, Z143, 0x0DE5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5138,7 +5138,7 @@ } Default { - ERR (Arg0, Z143, 0x0E3D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5326,7 +5326,7 @@ } Default { - ERR (Arg0, Z143, 0x0E95, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5498,7 +5498,7 @@ } Default { - ERR (Arg0, Z143, 0x0EED, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5670,7 +5670,7 @@ } Default { - ERR (Arg0, Z143, 0x0F45, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5842,7 +5842,7 @@ } Default { - ERR (Arg0, Z143, 0x0F9D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6014,7 +6014,7 @@ } Default { - ERR (Arg0, Z143, 0x0FF5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6202,7 +6202,7 @@ } Default { - ERR (Arg0, Z143, 0x104D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6210,7 +6210,7 @@ } Default { - ERR (Arg0, Z143, 0x1053, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6398,7 +6398,7 @@ } Default { - ERR (Arg0, Z143, 0x10BA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6570,7 +6570,7 @@ } Default { - ERR (Arg0, Z143, 0x1112, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6758,7 +6758,7 @@ } Default { - ERR (Arg0, Z143, 0x116A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6930,7 +6930,7 @@ } Default { - ERR (Arg0, Z143, 0x11C2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7102,7 +7102,7 @@ } Default { - ERR (Arg0, Z143, 0x121A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7274,7 +7274,7 @@ } Default { - ERR (Arg0, Z143, 0x1272, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7446,7 +7446,7 @@ } Default { - ERR (Arg0, Z143, 0x12CA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7618,7 +7618,7 @@ } Default { - ERR (Arg0, Z143, 0x1322, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7790,7 +7790,7 @@ } Default { - ERR (Arg0, Z143, 0x137A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7962,7 +7962,7 @@ } Default { - ERR (Arg0, Z143, 0x13D2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8150,7 +8150,7 @@ } Default { - ERR (Arg0, Z143, 0x142A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8322,7 +8322,7 @@ } Default { - ERR (Arg0, Z143, 0x1482, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8494,7 +8494,7 @@ } Default { - ERR (Arg0, Z143, 0x14DA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8666,7 +8666,7 @@ } Default { - ERR (Arg0, Z143, 0x1532, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8838,7 +8838,7 @@ } Default { - ERR (Arg0, Z143, 0x158A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9026,7 +9026,7 @@ } Default { - ERR (Arg0, Z143, 0x15E2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9034,7 +9034,7 @@ } Default { - ERR (Arg0, Z143, 0x15E8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9222,7 +9222,7 @@ } Default { - ERR (Arg0, Z143, 0x164F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9394,7 +9394,7 @@ } Default { - ERR (Arg0, Z143, 0x16A7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9582,7 +9582,7 @@ } Default { - ERR (Arg0, Z143, 0x16FF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9754,7 +9754,7 @@ } Default { - ERR (Arg0, Z143, 0x1757, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9926,7 +9926,7 @@ } Default { - ERR (Arg0, Z143, 0x17AF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10098,7 +10098,7 @@ } Default { - ERR (Arg0, Z143, 0x1807, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10270,7 +10270,7 @@ } Default { - ERR (Arg0, Z143, 0x185F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10442,7 +10442,7 @@ } Default { - ERR (Arg0, Z143, 0x18B7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10614,7 +10614,7 @@ } Default { - ERR (Arg0, Z143, 0x190F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10786,7 +10786,7 @@ } Default { - ERR (Arg0, Z143, 0x1967, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10974,7 +10974,7 @@ } Default { - ERR (Arg0, Z143, 0x19BF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11146,7 +11146,7 @@ } Default { - ERR (Arg0, Z143, 0x1A17, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11318,7 +11318,7 @@ } Default { - ERR (Arg0, Z143, 0x1A6F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11490,7 +11490,7 @@ } Default { - ERR (Arg0, Z143, 0x1AC7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11662,7 +11662,7 @@ } Default { - ERR (Arg0, Z143, 0x1B1F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11850,7 +11850,7 @@ } Default { - ERR (Arg0, Z143, 0x1B77, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11858,7 +11858,7 @@ } Default { - ERR (Arg0, Z143, 0x1B7D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12046,7 +12046,7 @@ } Default { - ERR (Arg0, Z143, 0x1BE4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12218,7 +12218,7 @@ } Default { - ERR (Arg0, Z143, 0x1C3C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12406,7 +12406,7 @@ } Default { - ERR (Arg0, Z143, 0x1C94, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12578,7 +12578,7 @@ } Default { - ERR (Arg0, Z143, 0x1CEC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12750,7 +12750,7 @@ } Default { - ERR (Arg0, Z143, 0x1D44, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12922,7 +12922,7 @@ } Default { - ERR (Arg0, Z143, 0x1D9C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13094,7 +13094,7 @@ } Default { - ERR (Arg0, Z143, 0x1DF4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13266,7 +13266,7 @@ } Default { - ERR (Arg0, Z143, 0x1E4C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13438,7 +13438,7 @@ } Default { - ERR (Arg0, Z143, 0x1EA4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13610,7 +13610,7 @@ } Default { - ERR (Arg0, Z143, 0x1EFC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13798,7 +13798,7 @@ } Default { - ERR (Arg0, Z143, 0x1F54, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13970,7 +13970,7 @@ } Default { - ERR (Arg0, Z143, 0x1FAC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14142,7 +14142,7 @@ } Default { - ERR (Arg0, Z143, 0x2004, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14314,7 +14314,7 @@ } Default { - ERR (Arg0, Z143, 0x205C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14486,7 +14486,7 @@ } Default { - ERR (Arg0, Z143, 0x20B4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14674,7 +14674,7 @@ } Default { - ERR (Arg0, Z143, 0x210C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14682,7 +14682,7 @@ } Default { - ERR (Arg0, Z143, 0x2112, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14870,7 +14870,7 @@ } Default { - ERR (Arg0, Z143, 0x2179, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15042,7 +15042,7 @@ } Default { - ERR (Arg0, Z143, 0x21D1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15230,7 +15230,7 @@ } Default { - ERR (Arg0, Z143, 0x2229, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15402,7 +15402,7 @@ } Default { - ERR (Arg0, Z143, 0x2281, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15574,7 +15574,7 @@ } Default { - ERR (Arg0, Z143, 0x22D9, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15746,7 +15746,7 @@ } Default { - ERR (Arg0, Z143, 0x2331, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15918,7 +15918,7 @@ } Default { - ERR (Arg0, Z143, 0x2389, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16090,7 +16090,7 @@ } Default { - ERR (Arg0, Z143, 0x23E1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16262,7 +16262,7 @@ } Default { - ERR (Arg0, Z143, 0x2439, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16434,7 +16434,7 @@ } Default { - ERR (Arg0, Z143, 0x2491, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16622,7 +16622,7 @@ } Default { - ERR (Arg0, Z143, 0x24E9, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16794,7 +16794,7 @@ } Default { - ERR (Arg0, Z143, 0x2541, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16966,7 +16966,7 @@ } Default { - ERR (Arg0, Z143, 0x2599, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17138,7 +17138,7 @@ } Default { - ERR (Arg0, Z143, 0x25F1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17310,7 +17310,7 @@ } Default { - ERR (Arg0, Z143, 0x2649, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17498,7 +17498,7 @@ } Default { - ERR (Arg0, Z143, 0x26A1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17506,7 +17506,7 @@ } Default { - ERR (Arg0, Z143, 0x26A7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17694,7 +17694,7 @@ } Default { - ERR (Arg0, Z143, 0x270E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17866,7 +17866,7 @@ } Default { - ERR (Arg0, Z143, 0x2766, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18054,7 +18054,7 @@ } Default { - ERR (Arg0, Z143, 0x27BE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18226,7 +18226,7 @@ } Default { - ERR (Arg0, Z143, 0x2816, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18398,7 +18398,7 @@ } Default { - ERR (Arg0, Z143, 0x286E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18570,7 +18570,7 @@ } Default { - ERR (Arg0, Z143, 0x28C6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18742,7 +18742,7 @@ } Default { - ERR (Arg0, Z143, 0x291E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18914,7 +18914,7 @@ } Default { - ERR (Arg0, Z143, 0x2976, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19086,7 +19086,7 @@ } Default { - ERR (Arg0, Z143, 0x29CE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19258,7 +19258,7 @@ } Default { - ERR (Arg0, Z143, 0x2A26, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19446,7 +19446,7 @@ } Default { - ERR (Arg0, Z143, 0x2A7E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19618,7 +19618,7 @@ } Default { - ERR (Arg0, Z143, 0x2AD6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19790,7 +19790,7 @@ } Default { - ERR (Arg0, Z143, 0x2B2E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19962,7 +19962,7 @@ } Default { - ERR (Arg0, Z143, 0x2B86, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20134,7 +20134,7 @@ } Default { - ERR (Arg0, Z143, 0x2BDE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20322,7 +20322,7 @@ } Default { - ERR (Arg0, Z143, 0x2C36, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20330,7 +20330,7 @@ } Default { - ERR (Arg0, Z143, 0x2C3C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20518,7 +20518,7 @@ } Default { - ERR (Arg0, Z143, 0x2CA3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20690,7 +20690,7 @@ } Default { - ERR (Arg0, Z143, 0x2CFB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20878,7 +20878,7 @@ } Default { - ERR (Arg0, Z143, 0x2D53, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21050,7 +21050,7 @@ } Default { - ERR (Arg0, Z143, 0x2DAB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21222,7 +21222,7 @@ } Default { - ERR (Arg0, Z143, 0x2E03, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21394,7 +21394,7 @@ } Default { - ERR (Arg0, Z143, 0x2E5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21566,7 +21566,7 @@ } Default { - ERR (Arg0, Z143, 0x2EB3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21738,7 +21738,7 @@ } Default { - ERR (Arg0, Z143, 0x2F0B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21910,7 +21910,7 @@ } Default { - ERR (Arg0, Z143, 0x2F63, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22082,7 +22082,7 @@ } Default { - ERR (Arg0, Z143, 0x2FBB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22270,7 +22270,7 @@ } Default { - ERR (Arg0, Z143, 0x3013, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22442,7 +22442,7 @@ } Default { - ERR (Arg0, Z143, 0x306B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22614,7 +22614,7 @@ } Default { - ERR (Arg0, Z143, 0x30C3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22786,7 +22786,7 @@ } Default { - ERR (Arg0, Z143, 0x311B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22958,7 +22958,7 @@ } Default { - ERR (Arg0, Z143, 0x3173, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23146,7 +23146,7 @@ } Default { - ERR (Arg0, Z143, 0x31CB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23154,7 +23154,7 @@ } Default { - ERR (Arg0, Z143, 0x31D1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23342,7 +23342,7 @@ } Default { - ERR (Arg0, Z143, 0x3238, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23514,7 +23514,7 @@ } Default { - ERR (Arg0, Z143, 0x3290, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23702,7 +23702,7 @@ } Default { - ERR (Arg0, Z143, 0x32E8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23874,7 +23874,7 @@ } Default { - ERR (Arg0, Z143, 0x3340, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24046,7 +24046,7 @@ } Default { - ERR (Arg0, Z143, 0x3398, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24218,7 +24218,7 @@ } Default { - ERR (Arg0, Z143, 0x33F0, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24390,7 +24390,7 @@ } Default { - ERR (Arg0, Z143, 0x3448, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24562,7 +24562,7 @@ } Default { - ERR (Arg0, Z143, 0x34A0, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24734,7 +24734,7 @@ } Default { - ERR (Arg0, Z143, 0x34F8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24906,7 +24906,7 @@ } Default { - ERR (Arg0, Z143, 0x3550, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25094,7 +25094,7 @@ } Default { - ERR (Arg0, Z143, 0x35A8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25266,7 +25266,7 @@ } Default { - ERR (Arg0, Z143, 0x3600, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25438,7 +25438,7 @@ } Default { - ERR (Arg0, Z143, 0x3658, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25610,7 +25610,7 @@ } Default { - ERR (Arg0, Z143, 0x36B0, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25782,7 +25782,7 @@ } Default { - ERR (Arg0, Z143, 0x3708, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25970,7 +25970,7 @@ } Default { - ERR (Arg0, Z143, 0x3760, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25978,7 +25978,7 @@ } Default { - ERR (Arg0, Z143, 0x3766, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -26166,7 +26166,7 @@ } Default { - ERR (Arg0, Z143, 0x37CD, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -26338,7 +26338,7 @@ } Default { - ERR (Arg0, Z143, 0x3825, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -26526,7 +26526,7 @@ } Default { - ERR (Arg0, Z143, 0x387D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -26698,7 +26698,7 @@ } Default { - ERR (Arg0, Z143, 0x38D5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -26870,7 +26870,7 @@ } Default { - ERR (Arg0, Z143, 0x392D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27042,7 +27042,7 @@ } Default { - ERR (Arg0, Z143, 0x3985, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27214,7 +27214,7 @@ } Default { - ERR (Arg0, Z143, 0x39DD, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27386,7 +27386,7 @@ } Default { - ERR (Arg0, Z143, 0x3A35, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27558,7 +27558,7 @@ } Default { - ERR (Arg0, Z143, 0x3A8D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27730,7 +27730,7 @@ } Default { - ERR (Arg0, Z143, 0x3AE5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27918,7 +27918,7 @@ } Default { - ERR (Arg0, Z143, 0x3B3D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28090,7 +28090,7 @@ } Default { - ERR (Arg0, Z143, 0x3B95, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28262,7 +28262,7 @@ } Default { - ERR (Arg0, Z143, 0x3BED, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28434,7 +28434,7 @@ } Default { - ERR (Arg0, Z143, 0x3C45, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28606,7 +28606,7 @@ } Default { - ERR (Arg0, Z143, 0x3C9D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28794,7 +28794,7 @@ } Default { - ERR (Arg0, Z143, 0x3CF5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28802,7 +28802,7 @@ } Default { - ERR (Arg0, Z143, 0x3CFB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28990,7 +28990,7 @@ } Default { - ERR (Arg0, Z143, 0x3D62, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -29162,7 +29162,7 @@ } Default { - ERR (Arg0, Z143, 0x3DBA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -29350,7 +29350,7 @@ } Default { - ERR (Arg0, Z143, 0x3E12, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -29522,7 +29522,7 @@ } Default { - ERR (Arg0, Z143, 0x3E6A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -29694,7 +29694,7 @@ } Default { - ERR (Arg0, Z143, 0x3EC2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -29866,7 +29866,7 @@ } Default { - ERR (Arg0, Z143, 0x3F1A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30038,7 +30038,7 @@ } Default { - ERR (Arg0, Z143, 0x3F72, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30210,7 +30210,7 @@ } Default { - ERR (Arg0, Z143, 0x3FCA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30382,7 +30382,7 @@ } Default { - ERR (Arg0, Z143, 0x4022, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30554,7 +30554,7 @@ } Default { - ERR (Arg0, Z143, 0x407A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30742,7 +30742,7 @@ } Default { - ERR (Arg0, Z143, 0x40D2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30914,7 +30914,7 @@ } Default { - ERR (Arg0, Z143, 0x412A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31086,7 +31086,7 @@ } Default { - ERR (Arg0, Z143, 0x4182, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31258,7 +31258,7 @@ } Default { - ERR (Arg0, Z143, 0x41DA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31430,7 +31430,7 @@ } Default { - ERR (Arg0, Z143, 0x4232, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31618,7 +31618,7 @@ } Default { - ERR (Arg0, Z143, 0x428A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31626,7 +31626,7 @@ } Default { - ERR (Arg0, Z143, 0x4290, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31814,7 +31814,7 @@ } Default { - ERR (Arg0, Z143, 0x42F7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31986,7 +31986,7 @@ } Default { - ERR (Arg0, Z143, 0x434F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -32174,7 +32174,7 @@ } Default { - ERR (Arg0, Z143, 0x43A7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -32346,7 +32346,7 @@ } Default { - ERR (Arg0, Z143, 0x43FF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -32518,7 +32518,7 @@ } Default { - ERR (Arg0, Z143, 0x4457, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -32690,7 +32690,7 @@ } Default { - ERR (Arg0, Z143, 0x44AF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -32862,7 +32862,7 @@ } Default { - ERR (Arg0, Z143, 0x4507, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33034,7 +33034,7 @@ } Default { - ERR (Arg0, Z143, 0x455F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33206,7 +33206,7 @@ } Default { - ERR (Arg0, Z143, 0x45B7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33378,7 +33378,7 @@ } Default { - ERR (Arg0, Z143, 0x460F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33566,7 +33566,7 @@ } Default { - ERR (Arg0, Z143, 0x4667, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33738,7 +33738,7 @@ } Default { - ERR (Arg0, Z143, 0x46BF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33910,7 +33910,7 @@ } Default { - ERR (Arg0, Z143, 0x4717, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34082,7 +34082,7 @@ } Default { - ERR (Arg0, Z143, 0x476F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34254,7 +34254,7 @@ } Default { - ERR (Arg0, Z143, 0x47C7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34442,7 +34442,7 @@ } Default { - ERR (Arg0, Z143, 0x481F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34450,7 +34450,7 @@ } Default { - ERR (Arg0, Z143, 0x4825, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34638,7 +34638,7 @@ } Default { - ERR (Arg0, Z143, 0x488C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34810,7 +34810,7 @@ } Default { - ERR (Arg0, Z143, 0x48E4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34998,7 +34998,7 @@ } Default { - ERR (Arg0, Z143, 0x493C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -35170,7 +35170,7 @@ } Default { - ERR (Arg0, Z143, 0x4994, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -35342,7 +35342,7 @@ } Default { - ERR (Arg0, Z143, 0x49EC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -35514,7 +35514,7 @@ } Default { - ERR (Arg0, Z143, 0x4A44, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -35686,7 +35686,7 @@ } Default { - ERR (Arg0, Z143, 0x4A9C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -35858,7 +35858,7 @@ } Default { - ERR (Arg0, Z143, 0x4AF4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36030,7 +36030,7 @@ } Default { - ERR (Arg0, Z143, 0x4B4C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36202,7 +36202,7 @@ } Default { - ERR (Arg0, Z143, 0x4BA4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36390,7 +36390,7 @@ } Default { - ERR (Arg0, Z143, 0x4BFC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36562,7 +36562,7 @@ } Default { - ERR (Arg0, Z143, 0x4C54, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36734,7 +36734,7 @@ } Default { - ERR (Arg0, Z143, 0x4CAC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36906,7 +36906,7 @@ } Default { - ERR (Arg0, Z143, 0x4D04, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37078,7 +37078,7 @@ } Default { - ERR (Arg0, Z143, 0x4D5C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37266,7 +37266,7 @@ } Default { - ERR (Arg0, Z143, 0x4DB4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37274,7 +37274,7 @@ } Default { - ERR (Arg0, Z143, 0x4DBA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37462,7 +37462,7 @@ } Default { - ERR (Arg0, Z143, 0x4E21, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37634,7 +37634,7 @@ } Default { - ERR (Arg0, Z143, 0x4E79, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37822,7 +37822,7 @@ } Default { - ERR (Arg0, Z143, 0x4ED1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37994,7 +37994,7 @@ } Default { - ERR (Arg0, Z143, 0x4F29, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -38166,7 +38166,7 @@ } Default { - ERR (Arg0, Z143, 0x4F81, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -38338,7 +38338,7 @@ } Default { - ERR (Arg0, Z143, 0x4FD9, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -38510,7 +38510,7 @@ } Default { - ERR (Arg0, Z143, 0x5031, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -38682,7 +38682,7 @@ } Default { - ERR (Arg0, Z143, 0x5089, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -38854,7 +38854,7 @@ } Default { - ERR (Arg0, Z143, 0x50E1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39026,7 +39026,7 @@ } Default { - ERR (Arg0, Z143, 0x5139, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39214,7 +39214,7 @@ } Default { - ERR (Arg0, Z143, 0x5191, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39386,7 +39386,7 @@ } Default { - ERR (Arg0, Z143, 0x51E9, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39558,7 +39558,7 @@ } Default { - ERR (Arg0, Z143, 0x5241, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39730,7 +39730,7 @@ } Default { - ERR (Arg0, Z143, 0x5299, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39902,7 +39902,7 @@ } Default { - ERR (Arg0, Z143, 0x52F1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40090,7 +40090,7 @@ } Default { - ERR (Arg0, Z143, 0x5349, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40098,7 +40098,7 @@ } Default { - ERR (Arg0, Z143, 0x534F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40286,7 +40286,7 @@ } Default { - ERR (Arg0, Z143, 0x53B6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40458,7 +40458,7 @@ } Default { - ERR (Arg0, Z143, 0x540E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40646,7 +40646,7 @@ } Default { - ERR (Arg0, Z143, 0x5466, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40818,7 +40818,7 @@ } Default { - ERR (Arg0, Z143, 0x54BE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40990,7 +40990,7 @@ } Default { - ERR (Arg0, Z143, 0x5516, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -41162,7 +41162,7 @@ } Default { - ERR (Arg0, Z143, 0x556E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -41334,7 +41334,7 @@ } Default { - ERR (Arg0, Z143, 0x55C6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -41506,7 +41506,7 @@ } Default { - ERR (Arg0, Z143, 0x561E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -41678,7 +41678,7 @@ } Default { - ERR (Arg0, Z143, 0x5676, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -41850,7 +41850,7 @@ } Default { - ERR (Arg0, Z143, 0x56CE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42038,7 +42038,7 @@ } Default { - ERR (Arg0, Z143, 0x5726, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42210,7 +42210,7 @@ } Default { - ERR (Arg0, Z143, 0x577E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42382,7 +42382,7 @@ } Default { - ERR (Arg0, Z143, 0x57D6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42554,7 +42554,7 @@ } Default { - ERR (Arg0, Z143, 0x582E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42726,7 +42726,7 @@ } Default { - ERR (Arg0, Z143, 0x5886, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42914,7 +42914,7 @@ } Default { - ERR (Arg0, Z143, 0x58DE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42922,7 +42922,7 @@ } Default { - ERR (Arg0, Z143, 0x58E4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43110,7 +43110,7 @@ } Default { - ERR (Arg0, Z143, 0x594B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43282,7 +43282,7 @@ } Default { - ERR (Arg0, Z143, 0x59A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43470,7 +43470,7 @@ } Default { - ERR (Arg0, Z143, 0x59FB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43642,7 +43642,7 @@ } Default { - ERR (Arg0, Z143, 0x5A53, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43814,7 +43814,7 @@ } Default { - ERR (Arg0, Z143, 0x5AAB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43986,7 +43986,7 @@ } Default { - ERR (Arg0, Z143, 0x5B03, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -44158,7 +44158,7 @@ } Default { - ERR (Arg0, Z143, 0x5B5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -44330,7 +44330,7 @@ } Default { - ERR (Arg0, Z143, 0x5BB3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -44502,7 +44502,7 @@ } Default { - ERR (Arg0, Z143, 0x5C0B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -44674,7 +44674,7 @@ } Default { - ERR (Arg0, Z143, 0x5C63, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -44862,7 +44862,7 @@ } Default { - ERR (Arg0, Z143, 0x5CBB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45034,7 +45034,7 @@ } Default { - ERR (Arg0, Z143, 0x5D13, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45206,7 +45206,7 @@ } Default { - ERR (Arg0, Z143, 0x5D6B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45378,7 +45378,7 @@ } Default { - ERR (Arg0, Z143, 0x5DC3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45550,7 +45550,7 @@ } Default { - ERR (Arg0, Z143, 0x5E1B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45738,7 +45738,7 @@ } Default { - ERR (Arg0, Z143, 0x5E73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45746,7 +45746,7 @@ } Default { - ERR (Arg0, Z143, 0x5E79, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45803,7 +45803,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != 0xA5)) { - ERR (Arg0, Z143, 0x5EA9, 0x00, 0x00, Local0, 0xA5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0xA5) } } @@ -45820,7 +45820,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != DerefOf (FCP0 [0x02]))) { - ERR (Arg0, Z143, 0x5EB7, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) } } @@ -45844,7 +45844,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != 0xA5)) { - ERR (Arg0, Z143, 0x5ECB, 0x00, 0x00, Local0, 0xA5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0xA5) } } @@ -45872,7 +45872,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != DerefOf (FCP0 [0x02]))) { - ERR (Arg0, Z143, 0x5EE2, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) } } @@ -45883,7 +45883,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != C00D)) { - ERR (Arg0, Z143, 0x5EEB, 0x00, 0x00, Local0, C00D) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, C00D) } /* Retrieve the field back */ @@ -45898,7 +45898,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != 0xA5)) { - ERR (Arg0, Z143, 0x5EF8, 0x00, 0x00, Local0, 0xA5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0xA5) } } @@ -45926,12 +45926,12 @@ Local1 = ObjectType (Local0) If ((Local1 != INT0)) { - ERR (Arg0, Z143, 0x5F0E, 0x00, 0x00, Local1, INT0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, INT0) } If ((Local0 != Arg5)) { - ERR (Arg0, Z143, 0x5F12, 0x00, 0x00, Local0, Arg5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, Arg5) } Switch (ToInteger (PR01)) @@ -45943,7 +45943,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != DerefOf (FCP0 [0x02]))) { - ERR (Arg0, Z143, 0x5F1B, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) } } @@ -45961,7 +45961,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != 0xA5)) { - ERR (Arg0, Z143, 0x5F2A, 0x00, 0x00, Local0, 0xA5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0xA5) } } @@ -45977,7 +45977,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != DerefOf (FCP0 [0x02]))) { - ERR (Arg0, Z143, 0x5F37, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) } } @@ -45985,7 +45985,7 @@ If ((Local1 != BRB0)) { - ERR (Arg0, Z143, 0x5F3D, 0x00, 0x00, Local1, BRB0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, BRB0) } ElseIf (PR00) { @@ -46878,7 +46878,7 @@ } Default { - ERR (Arg0, Z143, 0x6043, 0x00, 0x00, Local1, Local3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, Local3) Return (Zero) } @@ -46954,7 +46954,7 @@ } Default { - ERR (Arg0, Z143, 0x605B, 0x00, 0x00, Local1, Local3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, Local3) Return (Zero) } @@ -47030,7 +47030,7 @@ } Default { - ERR (Arg0, Z143, 0x6073, 0x00, 0x00, Local1, Local3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, Local3) Return (Zero) } @@ -47106,7 +47106,7 @@ } Default { - ERR (Arg0, Z143, 0x608B, 0x00, 0x00, Local1, Local3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, Local3) Return (Zero) } @@ -47114,7 +47114,7 @@ } Default { - ERR (Arg0, Z143, 0x6091, 0x00, 0x00, Local1, Local3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, Local3) Return (Zero) } @@ -47161,7 +47161,7 @@ Mid (Local6, DerefOf (Local4 [0x00]), SizeOf (Local5), Local7) If ((Local7 != Local5)) { - ERR (Arg0, Z143, 0x60BF, Z143, ((0x10 * Local1) + Local3), + ERR (Arg0, Z143, __LINE__, Z143, ((0x10 * Local1) + Local3), Local7, Local5) } @@ -47189,7 +47189,7 @@ If ((DerefOf (Local6 [((DerefOf (Local4 [0x00] ) - Local7) - 0x01)]) != 0x00)) { - ERR (Arg0, Z143, 0x60D6, Z143, ((0x10 * Local1) + Local3), + ERR (Arg0, Z143, __LINE__, Z143, ((0x10 * Local1) + Local3), DerefOf (Local6 [(DerefOf (Local4 [0x00]) - Local7)]), 0x00) } } @@ -47201,7 +47201,7 @@ If ((DerefOf (Local6 [(DerefOf (Local4 [0x00]) - Local7)]) != 0xFF)) { - ERR (Arg0, Z143, 0x60E2, Z143, ((0x10 * Local1) + Local3), + ERR (Arg0, Z143, __LINE__, Z143, ((0x10 * Local1) + Local3), DerefOf (Local6 [(DerefOf (Local4 [0x00]) - Local7)]), 0xFF) } @@ -47226,7 +47226,7 @@ If ((DerefOf (Local6 [(I000 + Local7)]) != 0x00)) { - ERR (Arg0, Z143, 0x60FC, Z143, ((0x10 * Local1) + Local3), + ERR (Arg0, Z143, __LINE__, Z143, ((0x10 * Local1) + Local3), DerefOf (Local6 [(I000 + Local7)]), 0x00) } @@ -47237,7 +47237,7 @@ Local7-- If ((DerefOf (Local6 [(I000 + Local7)]) != 0xFF)) { - ERR (Arg0, Z143, 0x6108, Z143, ((0x10 * Local1) + Local3), + ERR (Arg0, Z143, __LINE__, Z143, ((0x10 * Local1) + Local3), DerefOf (Local6 [(I000 + Local7)]), 0xFF) } } @@ -47284,7 +47284,7 @@ F001 = 0x01 If ((F000 != 0x08)) { - ERR (Arg0, Z143, 0x6132, 0x00, 0x00, F000, 0x08) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, 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 b086c36..86f1f63 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl @@ -1431,7 +1431,7 @@ Arg1-- } - CH03 ("MUX0", Z150, 0x00, 0x02CD, 0x00) + CH03 ("MUX0", Z150, __LINE__, 0x00, 0x00) } Method (M033, 0, Serialized) diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl index 7bb1b14..26fbf87 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl @@ -67,11 +67,11 @@ Mutex (MTD0, 0x0D) Mutex (MTE0, 0x0E) Mutex (MTF0, 0x0F) - CH03 (__METHOD__, Z150, 0x00, 0x4F, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Local0 = Acquire (MT00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x53, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -80,112 +80,112 @@ If (Local0) { - ERR (__METHOD__, Z150, 0x57, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT10, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x5B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT20, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x5F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT30, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x63, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT40, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x67, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT50, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x6B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT60, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x6F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT70, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x73, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT80, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x77, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT90, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x7B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x7F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x83, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x87, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x8B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x8F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTF0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x93, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -224,7 +224,7 @@ } } - CH03 (__METHOD__, Z150, 0x11, 0xB8, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -239,7 +239,7 @@ */ Method (M369, 1, Serialized) { - CH03 (__METHOD__, Z150, 0x22, 0xC9, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Mutex (MT00, 0x00) Mutex (MT10, 0x01) Mutex (MT20, 0x02) @@ -284,7 +284,7 @@ Local0 = Acquire (MT00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0xF6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -293,7 +293,7 @@ If (Local0) { - ERR (__METHOD__, Z150, 0xFA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -302,210 +302,210 @@ If (Local0) { - ERR (__METHOD__, Z150, 0xFE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT10, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0102, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT11, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0106, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT20, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x010A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT21, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x010E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT30, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0112, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT31, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0116, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT40, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x011A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT41, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x011E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT50, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0122, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT51, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0126, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT60, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x012A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT61, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x012E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT70, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0132, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT71, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0136, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT80, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x013A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT81, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x013E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT90, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0142, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT91, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0146, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x014A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA1, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x014E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0152, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB1, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0156, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x015A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC1, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x015E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0162, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD1, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0166, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x016A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE1, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x016E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTF0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0172, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -520,7 +520,7 @@ If (Local0) { - ERR (__METHOD__, Z150, 0x017A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -597,11 +597,11 @@ If (Arg0) { - CH04 (__METHOD__, 0x01, 0x12, Z150, 0x01C2, 0x00, 0x00) /* AE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x12, Z150, __LINE__, 0x00, 0x00) /* AE_LIMIT */ } Else { - CH03 (__METHOD__, Z150, 0x0123, 0x01C4, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } } @@ -638,119 +638,119 @@ Local0 = Acquire (MT00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x01EC, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x01F0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT10, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x01F4, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT20, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x01F8, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT30, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x01FC, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT40, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0200, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT50, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0204, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT60, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0208, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT70, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x020C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT80, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0210, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT90, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0214, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0218, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x021C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0220, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0224, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0228, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTF0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x022C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -797,9 +797,9 @@ Release (MT00) } - CH03 (__METHOD__, Z150, 0x12, 0x0257, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M000 () - CH03 (__METHOD__, Z150, 0x13, 0x0259, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -835,119 +835,119 @@ Local0 = Acquire (MT00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0280, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0284, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT10, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0288, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT20, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x028C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT30, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0290, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT40, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0294, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT50, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0298, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT60, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x029C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT70, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02A0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT80, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02A4, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT90, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02A8, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02AC, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02B0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02B4, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02B8, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02BC, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTF0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02C0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } } } @@ -990,11 +990,11 @@ Release (MT00) } - CH03 (__METHOD__, Z150, 0x12, 0x02E9, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M000 () - CH03 (__METHOD__, Z150, 0x13, 0x02EB, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M001 () - CH03 (__METHOD__, Z150, 0x14, 0x02ED, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -1020,9 +1020,9 @@ { /* Acquire the first mutex */ - CH03 (__METHOD__, Z150, 0x00, 0x0309, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M36F (Arg0, 0x00, 0x00, 0x00) /* Acquire N-level mutex */ - CH03 (__METHOD__, Z150, 0x01, 0x030B, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* * Attempt to Acquire the second mutex (exception is expected). * @@ -1046,9 +1046,9 @@ } - CH04 (__METHOD__, 0x00, 0x40, Z150, 0x031E, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ M388 (Arg0, 0x00, 0x00) /* Release */ - CH03 (__METHOD__, Z150, 0x03, 0x0322, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -1104,18 +1104,18 @@ Method (M000, 1, NotSerialized) { - CH03 (__METHOD__, Z150, 0x00, 0x0358, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M36F (Arg0, 0x00, 0x00, 0x00) /* Acquire */ M388 (Arg0, 0x00, 0x00) /* Release */ - CH03 (__METHOD__, Z150, 0x01, 0x035B, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* Attempt to Release free mutex */ M388 (Arg0, 0x00, 0x00) /* Release */ - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x035F, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x03, 0x0361, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M36F (Arg0, 0x00, 0x00, 0x00) /* Acquire */ M388 (Arg0, 0x00, 0x00) /* Release */ - CH03 (__METHOD__, Z150, 0x04, 0x0364, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } LPN0 = MAX0 /* \MAX0 */ @@ -1129,18 +1129,18 @@ /* Separately for GL */ - CH03 (__METHOD__, Z150, 0x05, 0x0371, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M36F (GLLL, GLIX, 0x00, 0x00) /* Acquire */ M388 (GLLL, GLIX, 0x00) /* Release */ - CH03 (__METHOD__, Z150, 0x06, 0x0374, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* Attempt to Release free mutex */ M388 (GLLL, GLIX, 0x00) /* Release */ - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0378, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x08, 0x037A, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M36F (GLLL, GLIX, 0x00, 0x00) /* Acquire */ M388 (GLLL, GLIX, 0x00) /* Release */ - CH03 (__METHOD__, Z150, 0x09, 0x037D, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -1167,107 +1167,107 @@ Mutex (TF00, 0x0F) /* First time */ - CH03 (__METHOD__, Z150, 0x00, 0x039B, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T000) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x039D, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x02, 0x039F, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (\_GL) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03A1, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x04, 0x03A3, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T100) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03A5, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x06, 0x03A7, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T200) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03A9, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x08, 0x03AB, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T300) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03AD, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x0A, 0x03AF, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T400) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03B1, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x0C, 0x03B3, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T500) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03B5, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x0E, 0x03B7, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T600) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03B9, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x10, 0x03BB, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T700) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03BD, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x12, 0x03BF, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T800) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03C1, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x14, 0x03C3, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T900) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03C5, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x16, 0x03C7, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TA00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03C9, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x18, 0x03CB, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TB00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03CD, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x1A, 0x03CF, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TC00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03D1, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x1C, 0x03D3, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TD00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03D5, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x1E, 0x03D7, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TE00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03D9, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x20, 0x03DB, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TF00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03DD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* Second time */ - CH03 (__METHOD__, Z150, 0x22, 0x03E2, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T000) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03E4, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x24, 0x03E6, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T100) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03E8, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x26, 0x03EA, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T200) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03EC, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x28, 0x03EE, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T300) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03F0, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x2A, 0x03F2, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T400) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03F4, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x2C, 0x03F6, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T500) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03F8, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x2E, 0x03FA, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T600) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03FC, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x30, 0x03FE, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T700) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0400, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x32, 0x0402, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T800) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0404, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x34, 0x0406, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T900) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0408, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x36, 0x040A, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TA00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x040C, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x38, 0x040E, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TB00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0410, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x3A, 0x0412, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TC00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0414, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x3C, 0x0416, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TD00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0418, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x3E, 0x041A, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TE00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x041C, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x40, 0x041E, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TF00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0420, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) } /* @@ -1339,7 +1339,7 @@ LPC0++ } - CH03 ("m38a", Z150, 0x00, 0x046B, 0x00) + CH03 ("m38a", Z150, __LINE__, 0x00, 0x00) } /* @@ -1485,7 +1485,7 @@ /* Release */ - CH03 (__METHOD__, Z150, 0x00, 0x04FA, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) LPN0 = MAX0 /* \MAX0 */ LPC0 = (MAX0 - 0x01) While (LPN0) @@ -1511,9 +1511,9 @@ LPC0 = (MAX0 - 0x01) While (LPN0) { - CH03 (__METHOD__, Z150, 0x01, 0x0510, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M388 (LPC0, IX00, 0x00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0512, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ LPN0-- LPC0-- } @@ -1549,7 +1549,7 @@ Return (Zero) } - CH03 (__METHOD__, Z150, 0x00, 0x0537, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -1558,7 +1558,7 @@ */ Method (M0BB, 0, Serialized) { - CH03 (__METHOD__, Z150, 0x00, 0x0543, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Method (M137, 0, NotSerialized) { Debug = "m137 started" @@ -1577,7 +1577,7 @@ I103 = Acquire (T805, 0xFFFF) If (I103) { - ERR (__METHOD__, Z150, 0x0557, 0x00, 0x00, 0x00, I103) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, I103) } Debug = "m13e completed" @@ -1617,16 +1617,16 @@ If (I102) { Debug = "Acquire(T804, 0xffff) failed" - ERR (__METHOD__, Z150, 0x0575, 0x00, 0x00, 0x00, I102) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, I102) } If (I103) { Debug = "Acquire(T805, 0xffff) failed" - ERR (__METHOD__, Z150, 0x057A, 0x00, 0x00, 0x00, I103) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, I103) } - CH03 (__METHOD__, Z150, 0x04, 0x057D, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -1643,112 +1643,112 @@ Method (M000, 0, NotSerialized) { - CH03 (__METHOD__, Z150, 0x00, 0x058F, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* Acquire all */ Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0595, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T000, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x059A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T100, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x059F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T200, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05A4, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T300, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05A9, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T400, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05AE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T500, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05B3, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T600, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05B8, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T700, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05BD, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T800, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05C2, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T900, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05C7, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TA00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05CC, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TB00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05D1, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TC00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05D6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TD00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05DB, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TE00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05E0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TF00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05E5, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } - CH03 (__METHOD__, Z150, 0x00, 0x05E8, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* Release all */ Release (TF00) @@ -1768,7 +1768,7 @@ Release (T100) Release (T000) Release (\_GL) - CH03 (__METHOD__, Z150, 0x00, 0x05FE, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* Acquire and Release operations are in different methods */ @@ -1777,115 +1777,115 @@ { Method (MM00, 0, NotSerialized) { - CH03 (__METHOD__, Z150, 0x00, 0x0606, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x060A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T000, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x060F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T100, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0614, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T200, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0619, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T300, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x061E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T400, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0623, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T500, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0628, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T600, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x062D, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T700, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0632, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T800, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0637, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T900, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x063C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TA00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0641, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TB00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0646, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TC00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x064B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TD00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0650, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TE00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0655, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TF00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x065A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } - CH03 (__METHOD__, Z150, 0x00, 0x065D, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } Method (MM01, 0, NotSerialized) { - CH03 (__METHOD__, Z150, 0x00, 0x0662, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TF00) Release (TE00) Release (TD00) @@ -1903,62 +1903,62 @@ Release (T100) Release (T000) Release (\_GL) - CH03 (__METHOD__, Z150, 0x00, 0x0676, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } Method (MM02, 0, NotSerialized) { - CH03 (__METHOD__, Z150, 0x00, 0x067B, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TF00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x067D, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x02, 0x067E, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TE00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0680, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x04, 0x0681, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TD00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0683, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x06, 0x0684, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TC00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0686, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x08, 0x0687, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TB00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0689, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x0A, 0x068A, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TA00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x068C, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x0C, 0x068D, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T900) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x068F, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x0E, 0x0690, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T800) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0692, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x10, 0x0693, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T700) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0695, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x12, 0x0696, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T600) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0698, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x14, 0x0699, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T500) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x069B, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x16, 0x069C, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T400) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x069E, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x18, 0x069F, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T300) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06A1, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x1A, 0x06A2, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T200) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06A4, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x1C, 0x06A5, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T100) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06A7, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x1E, 0x06A8, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T000) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06AA, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x20, 0x06AB, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (\_GL) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06AD, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ } MM00 () @@ -1979,19 +1979,19 @@ */ Method (M0BA, 0, Serialized) { - CH03 (__METHOD__, Z150, 0x00, 0x06C3, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* Add */ Local0 = (Acquire (\_GL, 0xFFFF) + 0x01) If ((Local0 != 0x01)) { - ERR (__METHOD__, Z150, 0x06C9, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = (Acquire (T500, 0xFFFF) + 0x01) If ((Local0 != 0x01)) { - ERR (__METHOD__, Z150, 0x06CE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Release (T500) @@ -2001,13 +2001,13 @@ Local0 = (0x01 - Acquire (\_GL, 0xFFFF)) If ((Local0 != 0x01)) { - ERR (__METHOD__, Z150, 0x06D8, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = (0x01 - Acquire (T500, 0xFFFF)) If ((Local0 != 0x01)) { - ERR (__METHOD__, Z150, 0x06DD, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Release (T500) @@ -2016,7 +2016,7 @@ If ((Acquire (T500, 0xFFFF) != 0x00)) { - ERR (__METHOD__, Z150, 0x06E6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Release (T500) @@ -2027,7 +2027,7 @@ M08A () } - CH04 (__METHOD__, 0x01, 0x40, Z150, 0x01, 0x00, 0x00) + CH04 (__METHOD__, 0x01, 0x40, Z150, __LINE__, 0x00, 0x00) } /* @@ -2347,7 +2347,7 @@ SRMT ("m300") If (ERR7) { - ERR ("ERRORS were detected during the loading stage", Z150, 0x083C, 0x00, 0x00, 0x00, ERR7) + ERR ("ERRORS were detected during the loading stage", Z150, __LINE__, 0x00, 0x00, 0x00, ERR7) } /* ATTENTION: this test must be run the first */ @@ -2496,5 +2496,5 @@ M08A () } - CH03 ("m300", Z150, 0x00, 0x08CA, 0x00) + CH03 ("m300", Z150, __LINE__, 0x00, 0x00) } 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 3b7b23c..9d7c70a 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl @@ -52,7 +52,7 @@ Local0 = Acquire (T000, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x3A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -64,7 +64,7 @@ Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x41, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -76,7 +76,7 @@ Local0 = Acquire (T100, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x48, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -88,7 +88,7 @@ Local0 = Acquire (T200, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x4F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -100,7 +100,7 @@ Local0 = Acquire (T300, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x56, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -112,7 +112,7 @@ Local0 = Acquire (T400, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x5D, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -124,7 +124,7 @@ Local0 = Acquire (T500, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x64, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -136,7 +136,7 @@ Local0 = Acquire (T600, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x6B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -148,7 +148,7 @@ Local0 = Acquire (T700, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x72, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -160,7 +160,7 @@ Local0 = Acquire (T800, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x79, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -172,7 +172,7 @@ Local0 = Acquire (T900, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x80, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -184,7 +184,7 @@ Local0 = Acquire (TA00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x87, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -196,7 +196,7 @@ Local0 = Acquire (TB00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x8E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -208,7 +208,7 @@ Local0 = Acquire (TC00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x95, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -220,7 +220,7 @@ Local0 = Acquire (TD00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x9C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -232,7 +232,7 @@ Local0 = Acquire (TE00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0xA3, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -244,7 +244,7 @@ Local0 = Acquire (TF00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0xAA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } ElseIf ((Arg0 == 0x11)) { @@ -491,7 +491,7 @@ { If (Local0) { - ERR ("m36f", Z151, 0x015D, 0x00, 0x00, Local0, 0x00) + ERR ("m36f", Z151, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -617,13 +617,13 @@ Zero) { If (Arg3) { - CH03 ("m38b", Z151, 0x00, 0x01C3, 0x00) + CH03 ("m38b", Z151, __LINE__, 0x00, 0x00) } M36F (GLLL, GLIX, Arg3, 0x00) /* Acquire GL */ If (Arg3) { - CH04 ("m38b", 0x00, Arg3, Z151, 0x01C7, 0x00, 0x00) + CH04 ("m38b", 0x00, Arg3, Z151, __LINE__, 0x00, 0x00) } } @@ -633,13 +633,13 @@ Zero) { If (Arg3) { - CH03 ("m38b", Z151, 0x00, 0x01D0, 0x00) + CH03 ("m38b", Z151, __LINE__, 0x00, 0x00) } M36F (LPC0, 0x00, Arg3, 0x00) /* Acquire */ If (Arg3) { - CH04 ("m38b", 0x00, Arg3, Z151, 0x01D4, 0x00, 0x00) + CH04 ("m38b", 0x00, Arg3, Z151, __LINE__, 0x00, 0x00) } LPN0-- @@ -667,13 +667,13 @@ Zero) { If (Arg3) { - Local7 = (CH03 ("m38b", Z151, 0x00, 0x01F1, 0x00) || Local7) + Local7 = (CH03 ("m38b", Z151, __LINE__, 0x00, 0x00) || Local7) } M388 (LPC0, 0x00, 0x00) /* Release */ If (Arg3) { - Local7 = (CH04 ("m38b", 0x00, Arg3, Z151, 0x01F5, 0x00, 0x00) || Local7) + Local7 = (CH04 ("m38b", 0x00, Arg3, Z151, __LINE__, 0x00, 0x00) || Local7) } LPN0-- @@ -684,13 +684,13 @@ Zero) { If (Arg3) { - Local7 = (CH03 ("m38b", Z151, 0x00, 0x01FE, 0x00) || Local7) + Local7 = (CH03 ("m38b", Z151, __LINE__, 0x00, 0x00) || Local7) } M388 (GLLL, GLIX, 0x00) /* Release GL */ If (Arg3) { - Local7 = (CH04 ("m38b", 0x00, Arg3, Z151, 0x0202, 0x00, 0x00) || Local7) + Local7 = (CH04 ("m38b", 0x00, Arg3, Z151, __LINE__, 0x00, 0x00) || Local7) } } @@ -748,13 +748,13 @@ Zero) { If (EXC1) { - CH03 ("m088", Z151, 0x00, 0x0236, 0x00) + CH03 ("m088", Z151, __LINE__, 0x00, 0x00) } M36F (LPC0, LPC1, EXC0, Arg6) /* Acquire */ If (EXC1) { - CH04 ("m088", 0x00, EXC0, Z151, 0x023A, 0x00, 0x00) + CH04 ("m088", 0x00, EXC0, Z151, __LINE__, 0x00, 0x00) } LPN2-- @@ -875,13 +875,13 @@ Zero) { If (EXC1) { - CH03 ("m088", Z151, 0x00, 0x02AD, 0x00) + CH03 ("m088", Z151, __LINE__, 0x00, 0x00) } M388 (LPC0, Local0, EXC0) /* Release */ If (EXC1) { - CH04 ("m088", 0x00, EXC0, Z151, 0x02B1, 0x00, 0x00) + CH04 ("m088", 0x00, EXC0, Z151, __LINE__, 0x00, 0x00) } LPN2-- @@ -919,13 +919,13 @@ Zero) { If (EXC1) { - CH03 ("m088", Z151, 0x00, 0x02D1, 0x00) + CH03 ("m088", Z151, __LINE__, 0x00, 0x00) } M388 (LPC0, Local0, EXC0) /* Release */ If (EXC1) { - CH04 ("m088", 0x00, EXC0, Z151, 0x02D5, 0x00, 0x00) + CH04 ("m088", 0x00, EXC0, Z151, __LINE__, 0x00, 0x00) } LPN2-- diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl index ab6940f..902a137 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl @@ -137,13 +137,13 @@ Debug = "m016" If ((I000 != 0x11)) { - ERR (__METHOD__, Z173, 0x3F, 0x00, 0x00, I000, 0x11) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I000, 0x11) } } - CH03 (__METHOD__, Z173, 0x01, 0x43, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) M000 () - CH03 (__METHOD__, Z173, 0x02, 0x45, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } /* @@ -255,13 +255,13 @@ Debug = "m016" If ((I000 != 0x11)) { - ERR (__METHOD__, Z173, 0x65, 0x00, 0x00, I000, 0x11) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I000, 0x11) } } - CH03 (__METHOD__, Z173, 0x04, 0x69, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) M000 () - CH03 (__METHOD__, Z173, 0x05, 0x6B, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } /* @@ -440,20 +440,20 @@ Debug = "m016" If ((I000 != 0x1C)) { - ERR (__METHOD__, Z173, 0xA6, 0x00, 0x00, I000, 0x1C) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I000, 0x1C) } I001 = 0xABCD0000 } - CH03 (__METHOD__, Z173, 0x07, 0xAB, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) M000 () If ((I001 != 0xABCD0000)) { - ERR (__METHOD__, Z173, 0xAF, 0x00, 0x00, I001, 0xABCD0000) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I001, 0xABCD0000) } - CH03 (__METHOD__, Z173, 0x09, 0xB1, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } /* @@ -798,29 +798,29 @@ } } - CH03 (__METHOD__, Z173, 0x0A, 0x012B, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) I000 = Arg0 I001 = Arg1 I005 = Arg2 MM00 (0x00, I000, I001) If ((Arg0 > Arg1)) { - CH04 (__METHOD__, 0x00, 0x40, Z173, 0x0134, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, Z173, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } Else { If ((I003 != Arg0)) { - ERR (__METHOD__, Z173, 0x0137, 0x00, 0x00, I003, Arg0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I003, Arg0) } If ((I004 != Arg1)) { - ERR (__METHOD__, Z173, 0x013A, 0x00, 0x00, I004, Arg1) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I004, Arg1) } } - CH03 (__METHOD__, Z173, 0x0E, 0x013E, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } Method (M3B4, 0, Serialized) @@ -1168,28 +1168,28 @@ } } - CH03 (__METHOD__, Z173, 0x0F, 0x01B0, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) I000 = Arg0 I001 = Arg1 MM00 (0x00, I000, I001) If ((Arg0 > Arg1)) { - CH04 (__METHOD__, 0x00, 0x40, Z173, 0x01B8, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, Z173, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } Else { If ((I003 != Arg0)) { - ERR (__METHOD__, Z173, 0x01BB, 0x00, 0x00, I003, Arg0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I003, Arg0) } If ((I004 != Arg1)) { - ERR (__METHOD__, Z173, 0x01BE, 0x00, 0x00, I004, Arg1) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I004, Arg1) } } - CH03 (__METHOD__, Z173, 0x13, 0x01C2, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } Method (M3B6, 0, Serialized) @@ -1577,29 +1577,29 @@ } } - CH03 (__METHOD__, Z173, 0x14, 0x025C, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) I000 = Arg0 I001 = Arg1 I005 = Arg2 MM00 (0x00, I000, I001) If ((Arg0 > Arg1)) { - CH04 (__METHOD__, 0x00, 0x40, Z173, 0x0265, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, Z173, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } Else { If ((I003 != Arg0)) { - ERR (__METHOD__, Z173, 0x0268, 0x00, 0x00, I003, Arg0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I003, Arg0) } If ((I004 != Arg1)) { - ERR (__METHOD__, Z173, 0x026B, 0x00, 0x00, I004, Arg1) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I004, Arg1) } } - CH03 (__METHOD__, Z173, 0x18, 0x026F, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } Method (M3B8, 0, Serialized) @@ -1984,7 +1984,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0327, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2011,7 +2011,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0338, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2038,7 +2038,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0349, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2065,7 +2065,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x035A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2092,7 +2092,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x036B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2119,7 +2119,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x037C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2146,7 +2146,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x038D, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2173,7 +2173,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x039E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2200,7 +2200,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x03AF, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2227,7 +2227,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x03C0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2254,7 +2254,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x03D1, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2281,7 +2281,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x03E2, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2308,7 +2308,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x03F3, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2335,7 +2335,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0404, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2362,7 +2362,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0415, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2389,7 +2389,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0426, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2594,7 +2594,7 @@ } } - CH03 (__METHOD__, Z173, 0x0A, 0x04BE, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) I000 = Arg0 I001 = Arg1 I005 = Arg2 @@ -2628,22 +2628,22 @@ If (!Local4) { - CH04 (__METHOD__, 0x01, 0x40, Z173, 0x04D7, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x01, 0x40, Z173, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } Else { If ((I003 != Arg0)) { - ERR (__METHOD__, Z173, 0x04DA, 0x00, 0x00, I003, Arg0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I003, Arg0) } If ((I004 != Arg1)) { - ERR (__METHOD__, Z173, 0x04DD, 0x00, 0x00, I004, Arg1) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I004, Arg1) } } - CH03 (__METHOD__, Z173, 0x0E, 0x04E1, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } Method (M3BC, 0, Serialized) diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl index cfb378e..6d335dc 100644 --- a/tests/aslts/src/runtime/collections/functional/table/load.asl +++ b/tests/aslts/src/runtime/collections/functional/table/load.asl @@ -316,7 +316,7 @@ RFU0 = BUF0 /* \DTM0.BUF0 */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x013B, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -327,7 +327,7 @@ Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0x01, 0x0146, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -355,13 +355,13 @@ Default { Debug = "Unexpected parameter of the test" - ERR (Arg0, Z174, 0x0152, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } } - If (CH03 (Arg0, Z174, 0x03, 0x0157, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -394,7 +394,7 @@ { /* DDB Handle */ - ERR (Arg0, Z174, 0x0165, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C017) } /* Check the new Object appears */ @@ -402,7 +402,7 @@ If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x016C, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) } Local1 = ObjectType (Local0) @@ -410,19 +410,19 @@ { /* Method */ - ERR (Arg0, Z174, 0x0171, 0x00, 0x00, Local1, C010) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C010) } Else { Local0 = \SSS0 () - If (CH03 (Arg0, Z174, 0x07, 0x0174, 0x01)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x01)) { Return (Zero) } If (("\\SSS0" != Local0)) { - ERR (Arg0, Z174, 0x0178, 0x00, 0x00, Local0, "\\SSS0") + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, "\\SSS0") } } @@ -449,7 +449,7 @@ } - If (CH03 (Arg0, Z174, 0x09, 0x0184, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -457,7 +457,7 @@ Debug = "Table Unloaded" If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x018B, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (Zero) @@ -471,7 +471,7 @@ RFU0 = BUF0 /* \DTM0.BUF0 */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x019A, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -482,7 +482,7 @@ Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0x0C, 0x01A5, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -490,7 +490,7 @@ /* Load operator execution */ Load (RFU0, Arg1) - If (CH03 (Arg0, Z174, 0x0D, 0x01AC, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -511,7 +511,7 @@ { /* DDB Handle */ - ERR (Arg0, Z174, 0x01BE, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C017) } /* Check the new Object appears */ @@ -519,7 +519,7 @@ If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x01C5, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) } Local1 = ObjectType (Local0) @@ -527,24 +527,24 @@ { /* Method */ - ERR (Arg0, Z174, 0x01CA, 0x00, 0x00, Local1, C010) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C010) } Else { Local0 = \SSS0 () - If (CH03 (Arg0, Z174, 0x11, 0x01CD, 0x01)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x01)) { Return (Zero) } If (("\\SSS0" != Local0)) { - ERR (Arg0, Z174, 0x01D1, 0x00, 0x00, Local0, "\\SSS0") + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, "\\SSS0") } } Unload (Arg1) - If (CH03 (Arg0, Z174, 0x13, 0x01D7, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -552,7 +552,7 @@ Debug = "SSDT Unloaded" If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x01DE, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (Zero) @@ -693,7 +693,7 @@ RFU0 = BUF0 /* \DTM0.BUF0 */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0264, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -704,7 +704,7 @@ Local0 = RFU0 /* \DTM0.M003.M000.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.M003.M000.SUM_ */ - If (CH03 (Arg0, Z174, 0x16, 0x026F, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -732,13 +732,13 @@ Default { Debug = "Unexpected parameter of the test" - ERR (Arg0, Z174, 0x027B, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } } - If (CH03 (Arg0, Z174, 0x18, 0x0280, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -771,7 +771,7 @@ { /* DDB Handle */ - ERR (Arg0, Z174, 0x028E, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C017) } /* Check the new Object appears */ @@ -779,7 +779,7 @@ If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x0295, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) } Local1 = ObjectType (Local0) @@ -787,19 +787,19 @@ { /* Method */ - ERR (Arg0, Z174, 0x029A, 0x00, 0x00, Local1, C010) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C010) } Else { Local0 = \SSS0 () - If (CH03 (Arg0, Z174, 0x1C, 0x029D, 0x01)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x01)) { Return (Zero) } If (("\\SSS0" != Local0)) { - ERR (Arg0, Z174, 0x02A1, 0x00, 0x00, Local0, "\\SSS0") + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, "\\SSS0") } } @@ -826,7 +826,7 @@ } - If (CH03 (Arg0, Z174, 0x1E, 0x02AD, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -834,7 +834,7 @@ Debug = "SSDT Unloaded" If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x02B4, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (Zero) @@ -871,7 +871,7 @@ RFU0 = BUF0 /* \DTM0.BUF0 */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x02DA, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -882,7 +882,7 @@ Local0 = RFU0 /* \DTM0.M003.M001.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.M003.M001.SUM_ */ - If (CH03 (Arg0, Z174, 0x21, 0x02E5, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -890,7 +890,7 @@ /* Load operator execution */ Load (RFU0, Arg1) - If (CH03 (Arg0, Z174, 0x22, 0x02EC, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -969,7 +969,7 @@ Local2 = Buffer (0x0A) Else { Debug = "This Region type\'s AddrSpace Handler not installed" - ERR (Arg0, Z174, 0x0335, 0x00, 0x00, Local2, Arg1) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local2, Arg1) } } @@ -1038,12 +1038,12 @@ Local2 = Buffer (0x0A) If (CondRefOf (NABS, Local0)) { - ERR (Arg0, Z174, 0x037B, 0x00, 0x00, "NABS", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NABS", 0x01) } If (CondRefOf (NCRR, Local0)) { - ERR (Arg0, Z174, 0x037E, 0x00, 0x00, "NCRR", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NCRR", 0x01) } RFU1 = BUF1 /* \DTM0.BUF1 */ @@ -1055,24 +1055,24 @@ Local2 = Buffer (0x0A) { If (("absolute location obj" != DerefOf (Local0))) { - ERR (Arg0, Z174, 0x0388, 0x00, 0x00, DerefOf (Local0), "absolute location obj") + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, DerefOf (Local0), "absolute location obj") } } Else { - ERR (Arg0, Z174, 0x038C, 0x00, 0x00, "NABS", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NABS", 0x00) } If (CondRefOf (NCRR, Local0)) { If (("current location obj" != DerefOf (Local0))) { - ERR (Arg0, Z174, 0x0390, 0x00, 0x00, DerefOf (Local0), "current location obj") + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, DerefOf (Local0), "current location obj") } } Else { - ERR (Arg0, Z174, 0x0394, 0x00, 0x00, "NCRR", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NCRR", 0x00) } /* Check location */ @@ -1080,7 +1080,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\NABS, Local0)){} Else { - ERR (Arg0, Z174, 0x039A, 0x00, 0x00, "NABS", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NABS", 0x00) } /*Note: We load the table objects relative to the root of the namespace. */ @@ -1088,17 +1088,17 @@ Local2 = Buffer (0x0A) If (CondRefOf (\NCRR, Local0)){} Else { - ERR (Arg0, Z174, 0x039F, 0x00, 0x00, "\\NCRR", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\NCRR", 0x01) } If (CondRefOf (\DTM0.NCRR, Local0)) { - ERR (Arg0, Z174, 0x03A2, 0x00, 0x00, "\\DTM0.NCRR", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\DTM0.NCRR", 0x01) } If (CondRefOf (\DTM0.TST8.NCRR, Local0)) { - ERR (Arg0, Z174, 0x03A5, 0x00, 0x00, "\\DTM0.TST8.NCRR", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\DTM0.TST8.NCRR", 0x00) } Unload (DDBH) @@ -1107,12 +1107,12 @@ Local2 = Buffer (0x0A) If (CondRefOf (NABS, Local0)) { - ERR (Arg0, Z174, 0x03AD, 0x00, 0x00, "NABS", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NABS", 0x01) } If (CondRefOf (NCRR, Local0)) { - ERR (Arg0, Z174, 0x03B0, 0x00, 0x00, "NCRR", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NCRR", 0x01) } } @@ -1172,17 +1172,17 @@ Local2 = Buffer (0x0A) RFU2 = BUF2 /* \DTM0.BUF2 */ If (CondRefOf (\AUXD, Local0)) { - ERR (Arg0, Z174, 0x03F0, 0x00, 0x00, "\\AUXD", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) Return (Zero) } - If (CH03 (Arg0, 0x00, 0x31, 0x03F4, 0x00)) + If (CH03 (Arg0, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } Load (RFU2, DDBH) /* \DTM0.TST9.DDBH */ - If (CH03 (Arg0, 0x00, 0x32, 0x03FA, 0x00)) + If (CH03 (Arg0, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -1190,41 +1190,41 @@ Local2 = Buffer (0x0A) If (CondRefOf (\AUXD, Local0)){} Else { - ERR (Arg0, Z174, 0x0400, 0x00, 0x00, "\\AUXD", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD", 0x00) Return (Zero) } Local1 = ObjectType (Local0) If ((Local1 != 0x06)) { - ERR (Arg0, Z174, 0x0407, 0x00, 0x00, Local1, 0x06) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, 0x06) Return (Zero) } If (CondRefOf (\AUXD.REGC, Local0)){} Else { - ERR (Arg0, Z174, 0x040D, 0x00, 0x00, "\\AUXD.REGC", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD.REGC", 0x00) Return (Zero) } Local1 = DerefOf (Local0) If ((0x01 != Local1)) { - ERR (Arg0, Z174, 0x0414, 0x00, 0x00, Local1, 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, 0x01) } If (CondRefOf (\AUXD.REGD, Local0)){} Else { - ERR (Arg0, Z174, 0x0419, 0x00, 0x00, "\\AUXD.REGD", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD.REGD", 0x00) Return (Zero) } Local1 = DerefOf (Local0) If ((0xFFFFFFFF != Local1)) { - ERR (Arg0, Z174, 0x0420, 0x00, 0x00, Local1, 0xFFFFFFFF) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, 0xFFFFFFFF) } ElseIf (CondRefOf (\AUXD.M000, Local2)) { @@ -1232,18 +1232,18 @@ Local2 = Buffer (0x0A) Local1 = DerefOf (Local0) If ((0x01 != Local1)) { - ERR (Arg0, Z174, 0x0428, 0x00, 0x00, Local1, 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, 0x01) } } Else { - ERR (Arg0, Z174, 0x042B, 0x00, 0x00, "\\AUXD.M000", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD.M000", 0x00) } Unload (DDBH) If (CondRefOf (\AUXD, Local0)) { - ERR (Arg0, Z174, 0x0431, 0x00, 0x00, "\\AUXD", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) } Return (Zero) @@ -1259,7 +1259,7 @@ Local2 = Buffer (0x0A) } Concatenate (Arg0, "-LDCH", Arg0) - If (CH03 (Arg0, Z174, 0x40, 0x043D, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1301,23 +1301,23 @@ Local2 = Buffer (0x0A) CopyObject (DerefOf (Local5), MAUX) /* \DTM0.LDCH.MAUX */ If ((Local1 < HI0N)) { - If (CH03 (Arg0, Z174, 0x41, 0x045E, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x02) } Local2 = MAUX () - If (CH03 (Arg0, Z174, 0x42, 0x0462, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x03) } If ((Local5 != Local2)) { - ERR (Arg0, Z174, 0x0466, 0x00, 0x00, Local2, Local5) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local2, Local5) } } - ElseIf (CH04 (Arg0, 0x00, 0xFF, Z174, 0x0469, 0x00, 0x00)) + ElseIf (CH04 (Arg0, 0x00, 0xFF, Z174, __LINE__, 0x00, 0x00)) { /* AE_NOT_FOUND */ @@ -1338,11 +1338,11 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tsta", Arg0) If (INIT ()) { - ERR (Arg0, Z174, 0x047B, 0x00, 0x00, "INIT", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "INIT", 0x01) Return (0x01) } - If (CH03 (Arg0, Z174, 0x46, 0x047E, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1352,11 +1352,11 @@ Local2 = Buffer (0x0A) { If (LD ()) { - ERR (Arg0, Z174, 0x0485, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } - If (CH03 (Arg0, Z174, 0x48, 0x0488, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1364,7 +1364,7 @@ Local2 = Buffer (0x0A) Local0-- If (LDCH (Arg0)) { - ERR (Arg0, Z174, 0x048E, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } } @@ -1374,11 +1374,11 @@ Local2 = Buffer (0x0A) { If (UNLD ()) { - ERR (Arg0, Z174, 0x0496, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } - If (CH03 (Arg0, Z174, 0x4B, 0x0499, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1386,7 +1386,7 @@ Local2 = Buffer (0x0A) Local0-- If (LDCH (Arg0)) { - ERR (Arg0, Z174, 0x049F, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } } @@ -1449,7 +1449,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tstb", Arg0) RFU3 = BUF3 /* \DTM0.BUF3 */ Load (RFU3, DDB0) /* \DTM0.TSTB.DDB0 */ - If (CH03 (Arg0, Z174, 0x50, 0x04E2, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1458,21 +1458,21 @@ Local2 = Buffer (0x0A) /* allows NameString only to be used as Object parameter */ /* Integer */ Load (\AUXD.INT0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x04EB, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.INT0) If ((C009 != Local0)) { - ERR (Arg0, Z174, 0x04EE, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C009) } /* String */ Load (\AUXD.STR0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x04F3, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.STR0) If ((C00A != Local0)) { - ERR (Arg0, Z174, 0x04F6, 0x00, 0x00, Local0, C00A) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C00A) } /* Buffer */ @@ -1482,92 +1482,92 @@ Local2 = Buffer (0x0A) /* TBD: LBZ480 update allows Buffer to be Source of Load */ Load (\AUXD.BUF0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x04FD, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.BUF0) If ((C00B != Local0)) { - ERR (Arg0, Z174, 0x0500, 0x00, 0x00, Local0, C00B) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C00B) } } /* Package */ Load (\AUXD.PAC0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0506, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { - ERR (Arg0, Z174, 0x0509, 0x00, 0x00, Local0, C00C) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C00C) } /* Field Unit */ /* Device */ Load (\AUXD.DEV0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0510, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { - ERR (Arg0, Z174, 0x0513, 0x00, 0x00, Local0, C00E) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C00E) } /* Event */ Load (\AUXD.EVE0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0518, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.EVE0) If ((C00F != Local0)) { - ERR (Arg0, Z174, 0x051B, 0x00, 0x00, Local0, C00F) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C00F) } /* Method */ Load (\AUXD.MMM0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0520, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.MMM0) If ((C010 != Local0)) { - ERR (Arg0, Z174, 0x0523, 0x00, 0x00, Local0, C010) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C010) } /* Mutex */ Load (\AUXD.MTX0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0528, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.MTX0) If ((C011 != Local0)) { - ERR (Arg0, Z174, 0x052B, 0x00, 0x00, Local0, C011) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C011) } /* OpRegion */ /* Power Resource */ Load (\AUXD.PWR0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0532, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.PWR0) If ((C013 != Local0)) { - ERR (Arg0, Z174, 0x0535, 0x00, 0x00, Local0, C013) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C013) } /* Processor */ Load (\AUXD.CPU0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x053A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.CPU0) If ((C014 != Local0)) { - ERR (Arg0, Z174, 0x053D, 0x00, 0x00, Local0, C014) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C014) } /* Thermal Zone */ Load (\AUXD.TZN0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0542, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { - ERR (Arg0, Z174, 0x0545, 0x00, 0x00, Local0, C015) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C015) } /* Buffer Field */ @@ -1577,22 +1577,22 @@ Local2 = Buffer (0x0A) /* TBD: LBZ480 update allows Buffer Field to be Source of Load */ Load (\AUXD.BFL0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x054C, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.BFL0) If ((C016 != Local0)) { - ERR (Arg0, Z174, 0x054F, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C016) } } /* DDB Handle */ Load (DDB0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0555, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (DDB0) If ((C017 != Local0)) { - ERR (Arg0, Z174, 0x0558, 0x00, 0x00, Local0, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C017) } Unload (DDB0) @@ -1616,7 +1616,7 @@ Local2 = Buffer (0x0A) OperationRegion (RGN7, 0x80, 0x0D80, 0x0137) OperationRegion (RGN8, 0xCF, 0x0E80, 0x0138) OperationRegion (RGN9, 0xFF, 0x0F80, 0x0139) - If (CH03 (Arg0, Z174, 0x6F, 0x0574, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1624,91 +1624,91 @@ Local2 = Buffer (0x0A) /* SystemIO */ Load (RGN1, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x057A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN1) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x057D, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* PCI_Config */ Load (RGN2, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0582, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN2) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x0585, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* EmbeddedControl */ Load (RGN3, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x058A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN3) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x058D, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* SMBus */ Load (RGN4, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0592, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN4) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x0595, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* SystemCMOS */ Load (RGN5, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x059A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN5) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x059D, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* PciBarTarget */ Load (RGN6, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x05A2, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN6) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x05A5, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* UserDefRegionSpace 0x80 */ Load (RGN7, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x05AA, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN7) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x05AD, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* UserDefRegionSpace 0xcf */ Load (RGN8, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x05B2, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN8) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x05B5, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* UserDefRegionSpace 0xff */ Load (RGN9, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x05BA, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN9) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x05BD, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } Return (0x00) @@ -1722,7 +1722,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tstd", Arg0) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x05CC, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -1736,7 +1736,7 @@ Local2 = Buffer (0x0A) Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0x83, 0x05DB, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1746,10 +1746,10 @@ Local2 = Buffer (0x0A) If (Y290) { Load (IST0, HI0) /* \DTM0.TSTD.HI0_ */ - CH04 (Arg0, 0x00, 0x25, Z174, 0x05E2, 0x00, 0x00) /* AE_BAD_SIGNATURE */ + CH04 (Arg0, 0x00, 0x25, Z174, __LINE__, 0x00, 0x00) /* AE_BAD_SIGNATURE */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x05E5, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } } @@ -1757,10 +1757,10 @@ Local2 = Buffer (0x0A) /* Load operator execution, OpRegion Field case */ Load (RFU0, HI0) /* \DTM0.TSTD.HI0_ */ - CH04 (Arg0, 0x00, 0x25, Z174, 0x05EC, 0x00, 0x00) /* AE_BAD_SIGNATURE */ + CH04 (Arg0, 0x00, 0x25, Z174, __LINE__, 0x00, 0x00) /* AE_BAD_SIGNATURE */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x05EF, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (0x00) @@ -1781,7 +1781,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0604, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -1803,7 +1803,7 @@ Local2 = Buffer (0x0A) Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0x91, 0x0617, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1813,21 +1813,21 @@ Local2 = Buffer (0x0A) If (Y290) { Load (IST0, HI0) /* \DTM0.TSTE.HI0_ */ - CH04 (Arg0, 0x00, 0x2A, Z174, 0x061E, 0x00, 0x00) /* AE_INVALID_TABLE_LENGTH */ + CH04 (Arg0, 0x00, 0x2A, Z174, __LINE__, 0x00, 0x00) /* AE_INVALID_TABLE_LENGTH */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0621, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) /* CleanUp */ Unload (HI0) - If (CH03 (Arg0, Z174, 0x94, 0x0625, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0629, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } } @@ -1840,27 +1840,27 @@ Local2 = Buffer (0x0A) { /* If the table length in the header is larger than the buffer. */ - CH04 (Arg0, 0x00, 0x36, Z174, 0x0633, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (Arg0, 0x00, 0x36, Z174, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } Else { /* If the table length is smaller than an ACPI table header. */ - CH04 (Arg0, 0x00, 0x2A, Z174, 0x0636, 0x00, 0x00) /* AE_INVALID_TABLE_LENGTH */ + CH04 (Arg0, 0x00, 0x2A, Z174, __LINE__, 0x00, 0x00) /* AE_INVALID_TABLE_LENGTH */ } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x063A, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Unload (HI0) - If (CH03 (Arg0, Z174, 0x98, 0x063C, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0640, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } } @@ -1876,7 +1876,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tstf", Arg0) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0650, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -1888,7 +1888,7 @@ Local2 = Buffer (0x0A) /* Spoil the CheckSum */ Store ((SUM + 0x01), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0xA1, 0x065D, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1898,14 +1898,14 @@ Local2 = Buffer (0x0A) If (Y290) { Load (IST0, HI0) /* \DTM0.TSTF.HI0_ */ - CH04 (Arg0, 0x00, 0x27, Z174, 0x0664, 0x00, 0x00) /* AE_BAD_CHECKSUM */ + CH04 (Arg0, 0x00, 0x27, Z174, __LINE__, 0x00, 0x00) /* AE_BAD_CHECKSUM */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0667, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) /*Cleanup */ Unload (HI0) - If (CH03 (Arg0, Z174, 0xA4, 0x066B, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1917,19 +1917,19 @@ Local2 = Buffer (0x0A) /* Load operator execution, OpRegion Field case */ Load (RFU0, HI0) /* \DTM0.TSTF.HI0_ */ - CH04 (Arg0, 0x00, 0x27, Z174, 0x0674, 0x00, 0x00) /* AE_BAD_CHECKSUM */ + CH04 (Arg0, 0x00, 0x27, Z174, __LINE__, 0x00, 0x00) /* AE_BAD_CHECKSUM */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0677, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) /*Cleanup */ Unload (HI0) - If (CH03 (Arg0, Z174, 0xA7, 0x067B, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } - If (CH03 (Arg0, Z174, 0xA8, 0x067E, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1952,18 +1952,18 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z174, 0x0695, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x069A, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } Load (RFU0, Arg2) - If (CH03 (Arg0, Z174, 0xB2, 0x069F, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1971,25 +1971,25 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (Arg2) If ((C017 != Local0)) { - ERR (Arg0, Z174, 0x06A4, 0x00, 0x00, Local0, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C017) } If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x06A8, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) Return (0x01) } Unload (DerefOf (Arg2)) - If (CH03 (Arg0, Z174, 0xB5, 0x06AD, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x06B1, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -2006,7 +2006,7 @@ Local2 = Buffer (0x0A) Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0xB7, 0x06C3, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2068,7 +2068,7 @@ Local2 = Buffer (0x0A) } Unload (DDB0) - CH03 (Arg0, Z174, 0xB8, 0x06FF, 0x00) + CH03 (Arg0, Z174, __LINE__, 0x00, 0x00) Return (0x00) } @@ -2082,11 +2082,11 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tsth", Arg0) If (INIT ()) { - ERR (Arg0, Z174, 0x070F, 0x00, 0x00, "INIT", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "INIT", 0x01) Return (0x01) } - If (CH03 (Arg0, Z174, 0xC1, 0x0712, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2099,11 +2099,11 @@ Local2 = Buffer (0x0A) Debug = HI0N /* \DTM0.HI0N */ If (LD ()) { - ERR (Arg0, Z174, 0x071C, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } - If (CH03 (Arg0, Z174, 0xC3, 0x071F, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2128,17 +2128,17 @@ Local2 = Buffer (0x0A) /* Futher 1 Method can be called */ Unload (DDB1) - CH04 (Arg0, 0x00, 0x56, Z174, 0x0733, 0x00, 0x00) /* AE_OWNER_ID_LIMIT */ + CH04 (Arg0, 0x00, 0x56, Z174, __LINE__, 0x00, 0x00) /* AE_OWNER_ID_LIMIT */ Local0 = MAXT /* \DTM0.TSTH.MAXT */ While (Local0) { If (UNLD ()) { - ERR (Arg0, Z174, 0x0738, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } - If (CH03 (Arg0, Z174, 0xC6, 0x073B, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2148,7 +2148,7 @@ Local2 = Buffer (0x0A) If (LDCH (0x00)) { - ERR (Arg0, Z174, 0x0742, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } @@ -2164,7 +2164,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tsti", Arg0) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0753, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -2173,7 +2173,7 @@ Local2 = Buffer (0x0A) Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0xD1, 0x075D, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2181,7 +2181,7 @@ Local2 = Buffer (0x0A) /* Load operator execution */ Load (RFU0, HI0) /* \DTM0.TSTI.HI0_ */ - If (CH03 (Arg0, Z174, 0xD2, 0x0763, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2189,13 +2189,13 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (HI0) If ((C017 != Local0)) { - ERR (Arg0, Z174, 0x0769, 0x00, 0x00, Local0, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C017) } If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x076E, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) Return (0x01) } @@ -2205,25 +2205,25 @@ Local2 = Buffer (0x0A) /* Repeated Load operator execution */ Load (RFU0, HI1) /* \DTM0.TSTI.HI1_ */ - CH04 (Arg0, 0x00, 0x07, Z174, 0x0777, 0x05, Local1) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z174, __LINE__, 0x05, Local1) /* AE_ALREADY_EXISTS */ Local0 = ObjectType (HI1) If ((C009 != Local0)) { - ERR (Arg0, Z174, 0x077B, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C009) } Local1-- } Unload (HI0) - If (CH03 (Arg0, Z174, 0xD7, 0x0783, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0788, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (0x00) @@ -2238,7 +2238,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tstj", Arg0) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0798, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -2247,7 +2247,7 @@ Local2 = Buffer (0x0A) Local0 = ^RFU0 /* \DTM0.RFU0 */ Store ((^SUM + CHSM (Local0, SizeOf (Local0))), ^SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0xE1, 0x07A2, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2255,7 +2255,7 @@ Local2 = Buffer (0x0A) /* Load operator execution */ Load (^RFU0, HI0) /* \DTM0.TSTJ.HI0_ */ - If (CH03 (Arg0, Z174, 0xE2, 0x07A8, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2263,13 +2263,13 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (HI0) If ((C017 != Local0)) { - ERR (Arg0, Z174, 0x07AE, 0x00, 0x00, Local0, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C017) } If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x07B3, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) Return (0x01) } @@ -2312,25 +2312,25 @@ Local2 = Buffer (0x0A) /* Any next Load */ Load (RFU0, HI1) /* \DTM0.TSTJ.HI1_ */ - CH04 (Arg0, 0x00, 0x07, Z174, 0x07DD, 0x05, Local1) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z174, __LINE__, 0x05, Local1) /* AE_ALREADY_EXISTS */ Local0 = ObjectType (HI1) If ((C009 != Local0)) { - ERR (Arg0, Z174, 0x07E1, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C009) } Local1-- } Unload (HI0) - If (CH03 (Arg0, Z174, 0xE7, 0x07E9, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x07EE, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (0x00) @@ -2377,19 +2377,19 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tstk", Arg0) If (CondRefOf (\DDBX, Local0)) { - ERR (Arg0, Z174, 0x0819, 0x00, 0x00, "\\DDBX", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\DDBX", 0x01) Return (Zero) } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x081D, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } RFU5 = BUF5 /* \DTM0.BUF5 */ Load (RFU5, DDBH) /* \DTM0.TSTK.DDBH */ - If (CH03 (Arg0, Z174, 0xF2, 0x0823, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2397,38 +2397,38 @@ Local2 = Buffer (0x0A) If (CondRefOf (\DDBX, Local0)){} Else { - ERR (Arg0, Z174, 0x0829, 0x00, 0x00, "\\DDBX", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\DDBX", 0x01) Return (Zero) } If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x082E, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } Unload (DDBX) - If (CH03 (Arg0, Z174, 0xF5, 0x0833, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0838, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } Unload (DDBH) - If (CH03 (Arg0, Z174, 0xF7, 0x083D, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\DDBX, Local0)) { - ERR (Arg0, Z174, 0x0842, 0x00, 0x00, "\\DDBX", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\DDBX", 0x01) Return (Zero) } } @@ -2438,65 +2438,65 @@ Local2 = Buffer (0x0A) { /* Loading SSDT from a SystemMemory OpRegion, */ /* different targets for DDBHandle */ - CH03 (__METHOD__, Z174, 0x0200, 0x084F, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Named Objects */ SRMT ("TLD0.tst0") \DTM0.TST0 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0201, 0x0855, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* LocalX Object */ SRMT ("TLD0.tst1") \DTM0.TST1 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0202, 0x085B, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Package element */ SRMT ("TLD0.tst2") \DTM0.TST2 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0203, 0x0861, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* By Reference in ArgX */ SRMT ("TLD0.tst3") \DTM0.TST3 (__METHOD__) /* Loading SSDT from a Field of an OpRegion of any type, */ /* different targets for DDBHandle */ - CH03 (__METHOD__, Z174, 0x0204, 0x086A, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* SystemMemory Region */ SRMT ("TLD0.tst4") \DTM0.TST4 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0205, 0x0870, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* SystemIO Region */ SRMT ("TLD0.tst5") \DTM0.TST5 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0206, 0x0876, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* EmbeddedControl Region */ SRMT ("TLD0.tst6") \DTM0.TST6 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0207, 0x087C, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* User defined Region */ SRMT ("TLD0.tst7") \DTM0.TST7 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0208, 0x0882, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Check that "namespace location to load the Definition Block */ /* is relative to the current namespace" scope, */ SRMT ("TLD0.tst8") \DTM0.TST8 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0209, 0x0889, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Check global and dynamic declarations of OpRegions */ /* and the appropriate _REG Methods invocation for the */ /* loaded SSDT */ SRMT ("TLD0.tst9") \DTM0.TST9 (__METHOD__) - CH03 (__METHOD__, Z174, 0x020A, 0x0891, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Object of any type can be used as the DDBHandle argument */ SRMT ("TLD0.tstg") \DTM0.TSTG (__METHOD__) - CH03 (__METHOD__, Z174, 0x020B, 0x0897, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Loading a number of different SSDTs */ SRMT ("TLD0.tsta") @@ -2509,12 +2509,12 @@ Local2 = Buffer (0x0A) BLCK () } - CH03 (__METHOD__, Z174, 0x020C, 0x08A1, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Recursive Load in module level */ SRMT ("TLD0.tstk") \DTM0.TSTK (__METHOD__) - CH03 (__METHOD__, Z174, 0x020D, 0x08A7, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) } /* 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 5b17fc8..45b8727 100644 --- a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl +++ b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl @@ -160,7 +160,7 @@ Concatenate (Arg0, "-tst0", Arg0) If ((OEMT != FU00)) { - ERR (Arg0, Z176, 0x9F, 0x00, 0x00, FU00, OEMT) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, FU00, OEMT) Return (0x01) } @@ -180,13 +180,13 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0xB2, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } \DTM2.PLDT = 0x00 DDBH = LoadTable ("OEM1", "", "", "\\", PPST, 0x01) - If (CH03 (Arg0, Z176, 0x03, 0xBA, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -196,31 +196,31 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0xC0, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0xC5, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0xCA, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDBH) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x08, 0xD0, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0xD5, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -234,7 +234,7 @@ Concatenate (Arg0, "-tst1", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0xE4, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -250,7 +250,7 @@ DDBH = LoadTable ("OEM1", "", "", "\\", PPST, 0x01) } - If (CH03 (Arg0, Z176, 0x11, 0xF2, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -260,31 +260,31 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0xF8, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0xFD, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0102, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDBH) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x15, 0x0108, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x010D, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Unhappy comparison due to the SignatureString */ @@ -293,7 +293,7 @@ Local1 = ObjectType (Local2) If ((Local1 != C008)) { - ERR (Arg0, Z176, 0x0116, 0x00, 0x00, Local1, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C008) } Local2 = LoadTable ("OeM1", "Intel", "Many", "\\", PPST, 0x01) @@ -301,14 +301,14 @@ { /* No exception */ - If (CH03 (Arg0, Z176, 0x18, 0x011C, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } } ElseIf /* Exception: AE_BAD_SIGNATURE */ - (CH04 (Arg0, 0x01, 0x25, Z176, 0x0121, 0x00, 0x00)) + (CH04 (Arg0, 0x01, 0x25, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -318,27 +318,27 @@ { If ((Local1 != C009)) { - ERR (Arg0, Z176, 0x0128, 0x00, 0x00, Local1, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C009) } If ((Local2 != 0x00)) { - ERR (Arg0, Z176, 0x012B, 0x00, 0x00, Local2, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local2, 0x00) } } ElseIf ((Local1 != C008)) { - ERR (Arg0, Z176, 0x012F, 0x00, 0x00, Local1, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C008) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0134, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0138, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Unhappy comparison due to the OEMIDString */ @@ -347,11 +347,11 @@ Local1 = ObjectType (Local3) If ((Local1 != C008)) { - ERR (Arg0, Z176, 0x0141, 0x00, 0x00, Local1, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C008) } Local3 = LoadTable ("OEM1", "InteL", "Many", "\\", PPST, 0x01) - If (CH03 (Arg0, Z176, 0x20, 0x0146, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -359,22 +359,22 @@ Local1 = ObjectType (Local3) If ((Local1 != C009)) { - ERR (Arg0, Z176, 0x014C, 0x00, 0x00, Local1, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C009) } If ((Local3 != 0x00)) { - ERR (Arg0, Z176, 0x0150, 0x00, 0x00, Local3, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local3, 0x00) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0154, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0158, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Unhappy comparison due to the OEMTableIDString */ @@ -383,11 +383,11 @@ Local1 = ObjectType (Local4) If ((Local1 != C008)) { - ERR (Arg0, Z176, 0x0161, 0x00, 0x00, Local1, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C008) } Local4 = LoadTable ("OEM1", "Intel", "many", "\\", PPST, 0x01) - If (CH03 (Arg0, Z176, 0x26, 0x0166, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -395,22 +395,22 @@ Local1 = ObjectType (Local4) If ((Local1 != C009)) { - ERR (Arg0, Z176, 0x016C, 0x00, 0x00, Local1, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C009) } If ((Local4 != 0x00)) { - ERR (Arg0, Z176, 0x0170, 0x00, 0x00, Local4, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local4, 0x00) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0174, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0178, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -427,7 +427,7 @@ Concatenate (Arg0, "-tst2", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x018A, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -435,7 +435,7 @@ \DTM2.PLDT = 0x00 DDB0 = LoadTable ("OEM1", "", "", "", PPST, 0x01) - If (CH03 (Arg0, Z176, 0x31, 0x0194, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -445,38 +445,38 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x019A, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x019F, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x01A4, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB0) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x35, 0x01AA, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x01AF, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Check when ParameterPathString omitted */ \DTM2.PLDT = 0x00 DDB1 = LoadTable ("OEM1", "", "", "\\", "", 0x01) - If (CH03 (Arg0, Z176, 0x37, 0x01B8, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -486,38 +486,38 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x01BE, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x01C3, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x01C8, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB1) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x3B, 0x01CE, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x01D3, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Check when ParameterData omitted */ \DTM2.PLDT = 0x00 DDB2 = LoadTable ("OEM1", "", "", "\\", PPST, Zero) - If (CH03 (Arg0, Z176, 0x3D, 0x01DC, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -527,38 +527,38 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x01E2, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x01E7, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x01EC, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB2) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x41, 0x01F2, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x01F7, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Check when all optional parameters omitted */ \DTM2.PLDT = 0x00 DDB3 = LoadTable ("OEM1", "", "", "", "", Zero) - If (CH03 (Arg0, Z176, 0x43, 0x0200, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -568,31 +568,31 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x0206, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x020B, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0210, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB3) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x47, 0x0216, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x021B, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -625,7 +625,7 @@ Method (M001, 3, NotSerialized) { Concatenate (Arg0, Arg2, Arg0) - If (CH03 (Arg0, Z176, 0x51, 0x0238, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -635,31 +635,31 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x023E, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0243, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0248, 0x00, 0x00, "\\DTM2._XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x00) } Unload (Arg1) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x55, 0x024E, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0253, 0x00, 0x00, "\\DTM2._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x01) Return (0x01) } @@ -691,7 +691,7 @@ If (CondRefOf (\DTM2._XT2, Local0)) { - ERR (Arg0, Z176, 0x0272, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -804,7 +804,7 @@ Method (M001, 3, NotSerialized) { Concatenate (Arg0, Arg2, Arg0) - If (CH03 (Arg0, Z176, 0x61, 0x02F1, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -814,31 +814,31 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x02F7, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x02FC, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\DTM2._XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0301, 0x00, 0x00, "\\DTM2._XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x00) } Unload (Arg1) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x65, 0x0307, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\DTM2._XT2, Local0)) { - ERR (Arg0, Z176, 0x030C, 0x00, 0x00, "\\DTM2._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x01) Return (0x01) } @@ -872,7 +872,7 @@ Concatenate (Arg0, "-tst4", Arg0) If (CondRefOf (\DTM2._XT2, Local0)) { - ERR (Arg0, Z176, 0x032E, 0x00, 0x00, "\\DTM2._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x01) Return (0x01) } @@ -973,19 +973,19 @@ Concatenate (Arg0, "-tst5", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x03A7, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } If (CondRefOf (\DTM2.DEVR._XT2, Local0)) { - ERR (Arg0, Z176, 0x03AC, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x01) Return (0x01) } \DTM2.PLDT = 0x00 DDBH = LoadTable ("OEM1", "", "", Arg1, PPST, 0x01) - If (CH03 (Arg0, Z176, 0x72, 0x03B4, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -995,41 +995,41 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x03BA, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x03BF, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x03C3, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } If (CondRefOf (\DTM2.DEVR._XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x03C8, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x00) } Unload (DDBH) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x77, 0x03CE, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x03D3, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } If (CondRefOf (\DTM2.DEVR._XT2, Local0)) { - ERR (Arg0, Z176, 0x03D7, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x01) } Return (0x00) @@ -1043,13 +1043,13 @@ Concatenate (Arg0, "-tst6", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x03E6, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } \DTM2.PLDT = 0x00 DDBH = LoadTable ("OEM1", "", "", "", PPST, 0x01) - If (CH03 (Arg0, Z176, 0x81, 0x03EE, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1059,31 +1059,31 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x03F4, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x03F9, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x03FE, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDBH) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x85, 0x0404, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0409, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -1099,7 +1099,7 @@ Name (PLDT, 0x00) Concatenate (Arg0, "-tst7", Arg0) DDBH = LoadTable ("OEM1", "", "", RPST, "^TST7.PLDT", 0x01) - If (CH03 (Arg0, Z176, 0x91, 0x041C, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1109,17 +1109,17 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x0422, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != PLDT)) { - ERR (Arg0, Z176, 0x0427, 0x00, 0x00, PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, PLDT, 0x01) } Unload (DDBH) - If (CH03 (Arg0, Z176, 0x94, 0x042C, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1127,7 +1127,7 @@ PLDT = 0x00 \DTM2.PLDT = 0x00 DDBH = LoadTable ("OEM1", "", "", RPST, "PLDT", 0x01) - If (CH03 (Arg0, Z176, 0x95, 0x0435, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1137,22 +1137,22 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x043B, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x00 != PLDT)) { - ERR (Arg0, Z176, 0x0440, 0x00, 0x00, PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, PLDT, 0x00) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0444, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } Unload (DDBH) - If (CH03 (Arg0, Z176, 0x99, 0x0449, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1179,10 +1179,10 @@ LoadTable ("OEM1X", "", "", RPST, PPST, 0x01) } - CH04 (Arg0, 0x00, 0x3D, Z176, 0x0462, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0465, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) If (Y287) { Return (0x01) @@ -1199,20 +1199,20 @@ /* OEMIDString is greater than six characters */ LoadTable ("OEM1", "IntelXX", "", RPST, PPST, 0x01) - CH04 (Arg0, 0x00, 0x3D, Z176, 0x0473, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0476, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) Return (0x01) } /* OEMTableID is greater than eight characters */ LoadTable ("OEM1", "", "ManyXXXXX", RPST, PPST, 0x01) - CH04 (Arg0, 0x00, 0x3D, Z176, 0x047D, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0480, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) Return (0x01) } @@ -1228,19 +1228,19 @@ /* SignatureString is "DSDT" */ LoadTable ("DSDT", "", "", RPST, PPST, 0x01) - CH04 (Arg0, 0x00, 0x07, Z176, 0x0492, 0x00, 0x00) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z176, __LINE__, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0495, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } /* SignatureString is "SSDT" */ LoadTable ("SSDT", "", "", RPST, PPST, 0x01) - CH04 (Arg0, 0x00, 0x07, Z176, 0x049B, 0x00, 0x00) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z176, __LINE__, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x049E, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } Return (0x00) @@ -1254,13 +1254,13 @@ Concatenate (Arg0, "-tsta", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x04AC, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } \DTM2.PLDT = 0x00 DDBH = LoadTable ("OEM1", "", "", "\\", PPST, 0x01) - If (CH03 (Arg0, Z176, 0xB1, 0x04B4, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1270,50 +1270,50 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x04BA, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x04BF, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x04C4, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } \DTM2.PLDT = 0x00 LoadTable ("OEM1", "", "", "\\DTM2", PPST, 0x01) - CH04 (Arg0, 0x00, 0x07, Z176, 0x04CB, 0x00, 0x00) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z176, __LINE__, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x04CE, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\DTM2._XT2, Local0)) { - ERR (Arg0, Z176, 0x04D2, 0x00, 0x00, "\\DTM2._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x04D7, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDBH) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0xB9, 0x04DD, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x04E2, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -1347,13 +1347,13 @@ Concatenate (Arg0, "-tstb", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0504, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } RFU4 = BUF4 /* \DTM2.BUF4 */ Load (RFU4, DDBH) /* \DTM2.TSTB.DDBH */ - If (CH03 (Arg0, Z176, 0xC1, 0x050B, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1363,40 +1363,40 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x0511, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0517, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } \DTM2.PLDT = 0x00 LoadTable ("OEM1", "", "", "\\", PPST, 0x01) - CH04 (Arg0, 0x00, 0x07, Z176, 0x051E, 0x00, 0x00) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z176, __LINE__, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0521, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0526, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDBH) Debug = "SSDT unloaded" - If (CH03 (Arg0, Z176, 0xC7, 0x052C, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0531, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -1408,7 +1408,7 @@ { Concatenate (Arg0, "-tstc", Arg0) LoadTable ("DSDT", "", "", RPST, "\\DTM2.NULL", 0x01) - CH04 (Arg0, 0x00, 0x05, Z176, 0x053F, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (Arg0, 0x00, 0x05, Z176, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ Return (0x00) } @@ -1419,15 +1419,15 @@ Concatenate (Arg0, "-tstd", Arg0) \DTM2.PLDT = 0x00 LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \DTM2.DEVR) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x054E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0551, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0555, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -1454,7 +1454,7 @@ Case (0x00) { LoadTable (Arg1, SOID, STID, RPST, PPST, 0x01) - Return (CH04 (Arg0, 0x00, 0x25, Z176, 0x0571, 0x00, 0x00))/* AE_BAD_SIGNATURE */ + Return (CH04 (Arg0, 0x00, 0x25, Z176, __LINE__, 0x00, 0x00))/* AE_BAD_SIGNATURE */ } Case (0x01) { @@ -1467,29 +1467,29 @@ Case (0x03) { LoadTable (SOEM, SOID, STID, Arg1, PPST, 0x01) - Return (CH04 (Arg0, 0x00, 0x1E, Z176, 0x057B, 0x00, 0x00)) /* AE_BAD_PATHNAME */ + Return (CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00)) /* AE_BAD_PATHNAME */ } Case (0x04) { LoadTable (SOEM, SOID, STID, RPST, Arg1, 0x01) - Return (CH04 (Arg0, 0x00, 0x1E, Z176, 0x057F, 0x00, 0x00)) /* AE_BAD_PATHNAME */ + Return (CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00)) /* AE_BAD_PATHNAME */ } } - If (CH03 (Arg0, Z176, 0xD3, 0x0583, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0588, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) Return (0x01) } Local5 = ObjectType (DDBH) - If (CH03 (Arg0, Z176, 0xD5, 0x058E, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1498,13 +1498,13 @@ { /* Integer */ - ERR (Arg0, Z176, 0x0593, 0x00, 0x00, Local5, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local5, C009) Return (0x01) } If ((0x00 != DDBH)) { - ERR (Arg0, Z176, 0x0598, 0x00, 0x00, DDBH, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, DDBH, 0x00) Return (0x01) } @@ -1555,31 +1555,31 @@ If ((ToBuffer (SOEM) != Local0)) { - ERR (Arg0, Z176, 0x05B9, 0x00, 0x00, Local0, ToBuffer (SOEM)) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, ToBuffer (SOEM)) Return (0x01) } If ((ToBuffer (SOID) != Local1)) { - ERR (Arg0, Z176, 0x05BE, 0x00, 0x00, Local1, ToBuffer (SOID)) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, ToBuffer (SOID)) Return (0x01) } If ((ToBuffer (STID) != Local2)) { - ERR (Arg0, Z176, 0x05C3, 0x00, 0x00, Local2, ToBuffer (STID)) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local2, ToBuffer (STID)) Return (0x01) } If ((ToBuffer (RPST) != Local3)) { - ERR (Arg0, Z176, 0x05C8, 0x00, 0x00, Local3, ToBuffer (RPST)) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local3, ToBuffer (RPST)) Return (0x01) } If ((ToBuffer (PPST) != Local4)) { - ERR (Arg0, Z176, 0x05CD, 0x00, 0x00, Local4, ToBuffer (PPST)) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local4, ToBuffer (PPST)) Return (0x01) } @@ -1609,7 +1609,7 @@ { If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x05E3, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -1617,33 +1617,33 @@ Local1 = Buffer (Local0){} \DTM2.PLDT = 0x00 DDBH = LoadTable (SOEM, Local1, Local1, RPST, PPST, 0x01) - If (CH03 (Arg0, Z176, 0xE1, 0x05EE, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x05F3, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) Return (0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x05F9, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } Unload (DDBH) - If (CH03 (Arg0, Z176, 0xE4, 0x05FF, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0604, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } } @@ -1745,12 +1745,12 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z176, 0x0678, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } LoadTable (DerefOf (Arg2), "", "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x067D, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Return (0x00) } @@ -1761,12 +1761,12 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z176, 0x0689, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } LoadTable ("OEM1", DerefOf (Arg2), "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x068E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Return (0x00) } @@ -1777,12 +1777,12 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z176, 0x069A, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } LoadTable ("OEM1", "", DerefOf (Arg2), "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x069F, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Return (0x00) } @@ -1793,18 +1793,18 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z176, 0x06AB, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } LoadTable ("OEM1", "", "", DerefOf (Arg2), "\\DTM2.PLDT", 0x01) If (DerefOf (BTYP [Arg3])) { - CH04 (Arg0, 0x00, 0x1E, Z176, 0x06B1, 0x00, 0x00) /* AE_BAD_PATHNAME */ + CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00) /* AE_BAD_PATHNAME */ } Else { - CH04 (Arg0, 0x00, 0x2F, Z176, 0x06B3, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Return (0x00) @@ -1817,18 +1817,18 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z176, 0x06C0, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } LoadTable ("OEM1", "", "", "\\", DerefOf (Arg2), 0x01) If (DerefOf (BTYP [Arg3])) { - CH04 (Arg0, 0x00, 0x1E, Z176, 0x06C6, 0x00, 0x00) /* AE_BAD_PATHNAME */ + CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00) /* AE_BAD_PATHNAME */ } Else { - CH04 (Arg0, 0x00, 0x2F, Z176, 0x06C8, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Return (0x00) @@ -1839,7 +1839,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM2.TSTH.DDB0 */ - If (CH03 (Arg0, Z176, 0x010C, 0x06D4, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1854,28 +1854,28 @@ Local0 = ObjectType (Local1) If ((C008 != Local0)) { - ERR (Arg0, Z176, 0x06DE, 0x00, 0x00, Local0, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C008) } Else { LoadTable (Local1, "", "", "\\", "\\DTM2.PLDT", 0x01) If (SLCK) { - CH04 (Arg0, 0x00, 0x3D, Z176, 0x06E2, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } Else { - CH04 (Arg0, 0x00, 0x31, Z176, 0x06E4, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z176, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } LoadTable ("OEM1", Local1, "", "\\", "\\DTM2.PLDT", 0x01) If (SLCK) { - CH04 (Arg0, 0x00, 0x3D, Z176, 0x06E8, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } Else { - CH04 (Arg0, 0x00, 0x31, Z176, 0x06EA, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z176, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } LoadTable ("OEM1", "", Local1, "\\", "\\DTM2.PLDT", 0x01) @@ -1885,36 +1885,36 @@ /* The size of the "Integer" converted from "Any" is ISZ0*2. */ If ((ISZ0 <= 0x04)) { - CH03 (Arg0, Z176, 0x0110, 0x06F1, 0x00) /* No exception */ + CH03 (Arg0, Z176, __LINE__, 0x00, 0x00) /* No exception */ } Else { - CH04 (Arg0, 0x00, 0x3D, Z176, 0x06F3, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } } Else { - CH04 (Arg0, 0x00, 0x31, Z176, 0x06F6, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z176, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } LoadTable ("OEM1", "", "", Local1, "\\DTM2.PLDT", 0x01) If (SLCK) { - CH04 (Arg0, 0x00, 0x1E, Z176, 0x06FA, 0x00, 0x00) /* AE_BAD_PATHNAME */ + CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00) /* AE_BAD_PATHNAME */ } Else { - CH04 (Arg0, 0x00, 0x31, Z176, 0x06FC, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z176, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } LoadTable ("OEM1", "", "", "\\", Local1, 0x01) If (SLCK) { - CH04 (Arg0, 0x00, 0x1E, Z176, 0x0700, 0x00, 0x00) /* AE_BAD_PATHNAME */ + CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00) /* AE_BAD_PATHNAME */ } Else { - CH04 (Arg0, 0x00, 0x31, Z176, 0x0702, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z176, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } } @@ -1942,19 +1942,19 @@ } LoadTable (\AUXD.PAC0, "", "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x071B, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", \AUXD.PAC0, "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x071D, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", \AUXD.PAC0, "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x071F, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", \AUXD.PAC0, "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0721, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", "\\", \AUXD.PAC0, 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0723, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { - ERR (Arg0, Z176, 0x0726, 0x00, 0x00, Local0, C00C) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00C) } /* Field Unit */ @@ -1964,19 +1964,19 @@ /* Device */ LoadTable (\AUXD.DEV0, "", "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x072F, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", \AUXD.DEV0, "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0731, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", \AUXD.DEV0, "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0733, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", \AUXD.DEV0, "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0735, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", "\\", \AUXD.DEV0, 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0737, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { - ERR (Arg0, Z176, 0x073A, 0x00, 0x00, Local0, C00E) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00E) } /* Event */ @@ -2024,19 +2024,19 @@ /* Thermal Zone */ LoadTable (\AUXD.TZN0, "", "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0769, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", \AUXD.TZN0, "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x076B, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", \AUXD.TZN0, "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x076D, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", \AUXD.TZN0, "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x076F, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", "\\", \AUXD.TZN0, 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0771, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { - ERR (Arg0, Z176, 0x0774, 0x00, 0x00, Local0, C015) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C015) } /* Buffer Field */ @@ -2044,7 +2044,7 @@ M003 (Arg0, "bfl", RefOf (\AUXD.BFL0), C016) M004 (Arg0, "bfl", RefOf (\AUXD.BFL0), C016) Unload (DDB0) - CH03 (Arg0, Z176, 0x0126, 0x077D, 0x00) + CH03 (Arg0, Z176, __LINE__, 0x00, 0x00) Return (0x00) } @@ -2059,7 +2059,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM2.TSTI.DDB0 */ - If (CH03 (Arg0, Z176, 0x0130, 0x078F, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2074,7 +2074,7 @@ Local0 = ObjectType (Local1) If ((C008 != Local0)) { - ERR (Arg0, Z176, 0x0799, 0x00, 0x00, Local0, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C008) } /* Bug 288: iASL unexpectedly forbids ParameterData of Loadtable to be LocalX or UserTerm */ /* @@ -2094,12 +2094,12 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07A9, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } DDB1 = LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.INT0) - If (CH03 (Arg0, Z176, 0x0134, 0x07AD, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2107,18 +2107,18 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07B2, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } If ((\DTM2.PLDT != \AUXD.INT0)) { - ERR (Arg0, Z176, 0x07B6, 0x00, 0x00, \DTM2.PLDT, \AUXD.INT0) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, \AUXD.INT0) Return (0x01) } Unload (DDB1) - If (CH03 (Arg0, Z176, 0x0137, 0x07BA, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2126,7 +2126,7 @@ Local0 = ObjectType (\AUXD.INT0) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07BF, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) } /* String */ @@ -2136,12 +2136,12 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07C6, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } DDB1 = LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.STR0) - If (CH03 (Arg0, Z176, 0x013A, 0x07CA, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2149,18 +2149,18 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07CF, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } If ((\DTM2.PLDT != \AUXD.STR0)) { - ERR (Arg0, Z176, 0x07D3, 0x00, 0x00, \DTM2.PLDT, \AUXD.STR0) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, \AUXD.STR0) Return (0x01) } Unload (DDB1) - If (CH03 (Arg0, Z176, 0x013D, 0x07D7, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2168,7 +2168,7 @@ Local0 = ObjectType (\AUXD.STR0) If ((C00A != Local0)) { - ERR (Arg0, Z176, 0x07DC, 0x00, 0x00, Local0, C00A) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00A) } } @@ -2179,12 +2179,12 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07E4, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } DDB1 = LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.BUF0) - If (CH03 (Arg0, Z176, 0x0140, 0x07E8, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2192,18 +2192,18 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07ED, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } If ((\DTM2.PLDT != \AUXD.BUF0)) { - ERR (Arg0, Z176, 0x07F1, 0x00, 0x00, \DTM2.PLDT, \AUXD.BUF0) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, \AUXD.BUF0) Return (0x01) } Unload (DDB1) - If (CH03 (Arg0, Z176, 0x0143, 0x07F5, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2211,18 +2211,18 @@ Local0 = ObjectType (\AUXD.BUF0) If ((C00B != Local0)) { - ERR (Arg0, Z176, 0x07FA, 0x00, 0x00, Local0, C00B) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00B) } } /* Package */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.PAC0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0800, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { - ERR (Arg0, Z176, 0x0803, 0x00, 0x00, Local0, C00C) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00C) } /* Field Unit */ @@ -2232,12 +2232,12 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x080A, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } DDB1 = LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.FLU0) - If (CH03 (Arg0, Z176, 0x0148, 0x080E, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2245,18 +2245,18 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x0813, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } If ((\DTM2.PLDT != \AUXD.FLU0)) { - ERR (Arg0, Z176, 0x0817, 0x00, 0x00, \DTM2.PLDT, \AUXD.FLU0) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, \AUXD.FLU0) Return (0x01) } Unload (DDB1) - If (CH03 (Arg0, Z176, 0x014B, 0x081B, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2264,28 +2264,28 @@ Local0 = ObjectType (\AUXD.FLU0) If ((C00D != Local0)) { - ERR (Arg0, Z176, 0x0820, 0x00, 0x00, Local0, C00D) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00D) } } /* Device */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.DEV0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0826, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { - ERR (Arg0, Z176, 0x0829, 0x00, 0x00, Local0, C00E) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00E) } /* Event */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.EVE0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x082E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.EVE0) If ((C00F != Local0)) { - ERR (Arg0, Z176, 0x0831, 0x00, 0x00, Local0, C00F) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00F) } /* Method */ @@ -2293,62 +2293,62 @@ If (Y288) { LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.MMM0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0837, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.MMM0) If ((C010 != Local0)) { - ERR (Arg0, Z176, 0x083A, 0x00, 0x00, Local0, C010) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C010) } } /* Mutex */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.MTX0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0840, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.MTX0) If ((C011 != Local0)) { - ERR (Arg0, Z176, 0x0843, 0x00, 0x00, Local0, C011) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C011) } /* OpRegion */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.OPR0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0848, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.OPR0) If ((C012 != Local0)) { - ERR (Arg0, Z176, 0x084B, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C012) } /* Power Resource */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.PWR0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0850, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.PWR0) If ((C013 != Local0)) { - ERR (Arg0, Z176, 0x0853, 0x00, 0x00, Local0, C013) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C013) } /* Processor */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.CPU0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0858, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.CPU0) If ((C014 != Local0)) { - ERR (Arg0, Z176, 0x085B, 0x00, 0x00, Local0, C014) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C014) } /* Thermal Zone */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.TZN0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0860, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { - ERR (Arg0, Z176, 0x0863, 0x00, 0x00, Local0, C015) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C015) } /* Buffer Field */ @@ -2358,12 +2358,12 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x086A, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } DDB1 = LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.BFL0) - If (CH03 (Arg0, Z176, 0x015E, 0x086E, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2371,18 +2371,18 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x0873, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } If ((\DTM2.PLDT != \AUXD.BFL0)) { - ERR (Arg0, Z176, 0x0877, 0x00, 0x00, \DTM2.PLDT, \AUXD.BFL0) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, \AUXD.BFL0) Return (0x01) } Unload (DDB1) - If (CH03 (Arg0, Z176, 0x0161, 0x087B, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2390,78 +2390,78 @@ Local0 = ObjectType (\AUXD.BFL0) If ((C016 != Local0)) { - ERR (Arg0, Z176, 0x0880, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C016) } } Unload (DDB0) - CH03 (Arg0, Z176, 0x0163, 0x0886, 0x00) + CH03 (Arg0, Z176, __LINE__, 0x00, 0x00) Return (0x00) } } Method (TLT0, 0, Serialized) { - CH03 (__METHOD__, Z176, 0x0200, 0x0890, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Simple Loadtable test */ SRMT ("TLT0.tst0") \DTM2.TST0 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0201, 0x0896, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* All comparisons of Loadtable parameters are case sensitive, */ /* if no table matches the specified parameters, then 0 is returned */ SRMT ("TLT0.tst1") \DTM2.TST1 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0202, 0x089D, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Any of the RootPathString, ParameterPathString, and ParameterData */ /* parameters in LoadTable expression can be omitted */ SRMT ("TLT0.tst2") \DTM2.TST2 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0203, 0x08A4, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Different sources of the String parameters: Named Objects, LocalX, */ /* ArgX, elements of Packages, results of functions, any TermArg */ SRMT ("TLT0.tst3") \DTM2.TST3 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0204, 0x08AB, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Different sources of the optional parameters (RootPathString, */ /* ParameterPathString, and ParameterData): Named Objects, LocalX, */ /* ArgX, elements of Packages, results of functions, any TermArg */ SRMT ("TLT0.tst4") \DTM2.TST4 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0205, 0x08B3, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Namespace location to load the Definition Block is determined */ /* by the RootPathString parameter of Loadtable */ SRMT ("TLT0.tst5.0") \DTM2.TST5 (__METHOD__, "\\DTM2.DEVR") - CH03 (__METHOD__, Z176, 0x0206, 0x08BA, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* The RootPathString value is evaluated using normal scoping rules, */ /* assuming that the scope of the LoadTable operator is the current */ /* scope */ SRMT ("TLT0.tst5.1") \DTM2.TST5 (__METHOD__, "^DEVR") - CH03 (__METHOD__, Z176, 0x0207, 0x08C2, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* "\" is assumed to be Namespace location to load the Definition */ /* Block if RootPathString parameter is not specified */ SRMT ("TLT0.tst6") \DTM2.TST6 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0208, 0x08C9, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* If the first character of ParameterPathString is a backslash */ /* or caret character, then the path of the object set up on success */ /* is ParameterPathString. It is RootPathString.ParameterPathString */ /* in any case. */ SRMT ("TLT0.tst7") \DTM2.TST7 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0209, 0x08D2, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Implicit operand conversion of the parameters specified to be strings */ SRMT ("TLT0.tste") \DTM2.TSTE (__METHOD__) - CH03 (__METHOD__, Z176, 0x020A, 0x08D8, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* LoadTable returns 0 if some SSDT matching the LoadTable */ /* parameters is originally not listed in XSDT */ /*SRMT("TLT0.tstf") */ /*\DTM2.tstf(ts) */ - CH03 (__METHOD__, Z176, 0x020B, 0x08DF, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) } /* 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 314e727..a2f0a3e 100644 --- a/tests/aslts/src/runtime/collections/functional/table/unload.asl +++ b/tests/aslts/src/runtime/collections/functional/table/unload.asl @@ -91,7 +91,7 @@ \DTM0.RFU0 = \DTM0.BUF0 If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z175, 0x62, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -102,13 +102,13 @@ Local0 = \DTM0.RFU0 Store ((\DTM0.SUM + \DTM0.CHSM (Local0, SizeOf (Local0))), \DTM0.SUM) - If (CH03 (Arg0, Z175, 0x01, 0x6D, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (Zero) } Load (\DTM0.RFU0, HI0) /* \DTM1.TST0.HI0_ */ - If (CH03 (Arg0, Z175, 0x02, 0x73, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -119,7 +119,7 @@ { /* DDB Handle */ - ERR (Arg0, Z175, 0x7B, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local1, C017) } /* Check the new Object appears */ @@ -127,7 +127,7 @@ If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z175, 0x82, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) } Local1 = ObjectType (Local0) @@ -135,26 +135,26 @@ { /* Method */ - ERR (Arg0, Z175, 0x87, 0x00, 0x00, Local1, C010) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local1, C010) } Else { Local0 = \SSS0 () - If (CH03 (Arg0, Z175, 0x06, 0x8A, 0x01)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x01)) { Return (Zero) } If (("\\SSS0" != Local0)) { - ERR (Arg0, Z175, 0x8E, 0x00, 0x00, Local0, "\\SSS0") + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, "\\SSS0") } } /* UnLoad operator execution */ Unload (M000 ()) - If (CH03 (Arg0, Z175, 0x08, 0x95, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -162,7 +162,7 @@ Debug = "Table Unloaded" If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z175, 0x9C, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (Zero) @@ -181,7 +181,7 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z175, 0xAF, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } @@ -195,7 +195,7 @@ If (CondRefOf (\AUXD.INT0, Local0)) { - ERR (Arg0, Z175, 0xBC, 0x00, 0x00, "\\AUXD.INT0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.INT0", 0x01) Return (0x01) } @@ -203,7 +203,7 @@ If (CondRefOf (\AUXD.STR0, Local0)) { - ERR (Arg0, Z175, 0xC2, 0x00, 0x00, "\\AUXD.STR0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.STR0", 0x01) Return (0x01) } @@ -211,7 +211,7 @@ If (CondRefOf (\AUXD.BUF0, Local0)) { - ERR (Arg0, Z175, 0xC8, 0x00, 0x00, "\\AUXD.BUF0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.BUF0", 0x01) Return (0x01) } @@ -219,7 +219,7 @@ If (CondRefOf (\AUXD.PAC0, Local0)) { - ERR (Arg0, Z175, 0xCE, 0x00, 0x00, "\\AUXD.PAC0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.PAC0", 0x01) Return (0x01) } @@ -227,7 +227,7 @@ If (CondRefOf (\AUXD.FLU0, Local0)) { - ERR (Arg0, Z175, 0xD4, 0x00, 0x00, "\\AUXD.FLU0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.FLU0", 0x01) Return (0x01) } @@ -235,7 +235,7 @@ If (CondRefOf (\AUXD.DEV0, Local0)) { - ERR (Arg0, Z175, 0xDA, 0x00, 0x00, "\\AUXD.DEV0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.DEV0", 0x01) Return (0x01) } @@ -243,7 +243,7 @@ If (CondRefOf (\AUXD.EVE0, Local0)) { - ERR (Arg0, Z175, 0xE0, 0x00, 0x00, "\\AUXD.EVE0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.EVE0", 0x01) Return (0x01) } @@ -251,7 +251,7 @@ If (CondRefOf (\AUXD.MMM0, Local0)) { - ERR (Arg0, Z175, 0xE6, 0x00, 0x00, "\\AUXD.MMM0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.MMM0", 0x01) Return (0x01) } @@ -259,7 +259,7 @@ If (CondRefOf (\AUXD.MTX0, Local0)) { - ERR (Arg0, Z175, 0xEC, 0x00, 0x00, "\\AUXD.MTX0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.MTX0", 0x01) Return (0x01) } @@ -267,7 +267,7 @@ If (CondRefOf (\AUXD.OPR0, Local0)) { - ERR (Arg0, Z175, 0xF2, 0x00, 0x00, "\\AUXD.OPR0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.OPR0", 0x01) Return (0x01) } @@ -275,7 +275,7 @@ If (CondRefOf (\AUXD.PWR0, Local0)) { - ERR (Arg0, Z175, 0xF8, 0x00, 0x00, "\\AUXD.PWR0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.PWR0", 0x01) Return (0x01) } @@ -283,7 +283,7 @@ If (CondRefOf (\AUXD.CPU0, Local0)) { - ERR (Arg0, Z175, 0xFE, 0x00, 0x00, "\\AUXD.CPU0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.CPU0", 0x01) Return (0x01) } @@ -291,7 +291,7 @@ If (CondRefOf (\AUXD.TZN0, Local0)) { - ERR (Arg0, Z175, 0x0104, 0x00, 0x00, "\\AUXD.TZN0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.TZN0", 0x01) Return (0x01) } @@ -299,7 +299,7 @@ If (CondRefOf (\AUXD.BFL0, Local0)) { - ERR (Arg0, Z175, 0x010A, 0x00, 0x00, "\\AUXD.BFL0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.BFL0", 0x01) Return (0x01) } @@ -318,7 +318,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM1.TST1.DDB0 */ - If (CH03 (Arg0, Z175, 0x1F, 0x011C, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -331,7 +331,7 @@ } Else { - ERR (Arg0, Z175, 0x0124, 0x00, 0x00, "\\AUXD.INT0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.INT0", 0x00) } /* String */ @@ -342,7 +342,7 @@ } Else { - ERR (Arg0, Z175, 0x012B, 0x00, 0x00, "\\AUXD.STR0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.STR0", 0x00) } /* Buffer */ @@ -353,7 +353,7 @@ } Else { - ERR (Arg0, Z175, 0x0132, 0x00, 0x00, "\\AUXD.BUF0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.BUF0", 0x00) } /* Package */ @@ -366,7 +366,7 @@ } Else { - ERR (Arg0, Z175, 0x013A, 0x00, 0x00, "\\AUXD.PAC0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.PAC0", 0x00) } } @@ -378,7 +378,7 @@ } Else { - ERR (Arg0, Z175, 0x0142, 0x00, 0x00, "\\AUXD.FLU0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.FLU0", 0x00) } /* Device */ @@ -389,7 +389,7 @@ } Else { - ERR (Arg0, Z175, 0x0149, 0x00, 0x00, "\\AUXD.DEV0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.DEV0", 0x00) } /* Event */ @@ -400,7 +400,7 @@ } Else { - ERR (Arg0, Z175, 0x0150, 0x00, 0x00, "\\AUXD.EVE0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.EVE0", 0x00) } /* Method */ @@ -411,7 +411,7 @@ } Else { - ERR (Arg0, Z175, 0x0157, 0x00, 0x00, "\\AUXD.MMM0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.MMM0", 0x00) } /* Mutex */ @@ -422,7 +422,7 @@ } Else { - ERR (Arg0, Z175, 0x015E, 0x00, 0x00, "\\AUXD.MTX0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.MTX0", 0x00) } /* OpRegion */ @@ -433,7 +433,7 @@ } Else { - ERR (Arg0, Z175, 0x0165, 0x00, 0x00, "\\AUXD.OPR0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.OPR0", 0x00) } /* Power Resource */ @@ -444,7 +444,7 @@ } Else { - ERR (Arg0, Z175, 0x016C, 0x00, 0x00, "\\AUXD.PWR0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.PWR0", 0x00) } /* Processor */ @@ -455,7 +455,7 @@ } Else { - ERR (Arg0, Z175, 0x0173, 0x00, 0x00, "\\AUXD.CPU0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.CPU0", 0x00) } /* Thermal Zone */ @@ -466,7 +466,7 @@ } Else { - ERR (Arg0, Z175, 0x017A, 0x00, 0x00, "\\AUXD.TZN0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.TZN0", 0x00) } /* Buffer Field */ @@ -477,11 +477,11 @@ } Else { - ERR (Arg0, Z175, 0x0181, 0x00, 0x00, "\\AUXD.BFL0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.BFL0", 0x00) } Unload (DDB0) - CH03 (Arg0, Z175, 0x2F, 0x0186, 0x00) + CH03 (Arg0, Z175, __LINE__, 0x00, 0x00) /* Check absence of the auxiliary table Objects after UnLoad */ If (M001 (Concatenate (Arg0, ".after"))) @@ -524,12 +524,12 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z175, 0x01AF, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } Unload (DerefOf (Arg2)) - CH04 (Arg0, 0x00, 0x2F, Z175, 0x01B4, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Return (0x00) } @@ -538,7 +538,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM1.TST3.DDB0 */ - If (CH03 (Arg0, Z175, 0x33, 0x01BF, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -553,18 +553,18 @@ Local0 = ObjectType (Local1) If ((C008 != Local0)) { - ERR (Arg0, Z175, 0x01C9, 0x00, 0x00, Local0, C008) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, C008) } Else { Unload (Local1) If (SLCK) { - CH04 (Arg0, 0x00, 0x2F, Z175, 0x01CD, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Else { - CH04 (Arg0, 0x00, 0x31, Z175, 0x01CF, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z175, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } } @@ -587,12 +587,12 @@ Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { - ERR (Arg0, Z175, 0x01E4, 0x00, 0x00, Local0, C00C) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, C00C) } Else { Unload (\AUXD.PAC0) - CH04 (Arg0, 0x00, 0x2F, Z175, 0x01E7, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } /* Field Unit */ @@ -603,12 +603,12 @@ Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { - ERR (Arg0, Z175, 0x01F0, 0x00, 0x00, Local0, C00E) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, C00E) } Else { Unload (\AUXD.DEV0) - CH04 (Arg0, 0x00, 0x2F, Z175, 0x01F3, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } /* Event */ @@ -634,19 +634,19 @@ Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { - ERR (Arg0, Z175, 0x020B, 0x00, 0x00, Local0, C015) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, C015) } Else { Unload (\AUXD.TZN0) - CH04 (Arg0, 0x00, 0x2F, Z175, 0x020E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } /* Buffer Field */ M000 (Arg0, "bfl", RefOf (\AUXD.BFL0), C016) Unload (DDB0) - CH03 (Arg0, Z175, 0x3C, 0x0216, 0x00) + CH03 (Arg0, Z175, __LINE__, 0x00, 0x00) Return (0x00) } @@ -661,7 +661,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM1.TST4.DDB0 */ - If (CH03 (Arg0, Z175, 0x3D, 0x0227, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -669,7 +669,7 @@ /* First Unload */ Unload (DDB0) - If (CH03 (Arg0, Z175, 0x3E, 0x022E, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -680,7 +680,7 @@ /* Any next */ Unload (DDB0) - CH04 (Arg0, 0x00, 0x1C, Z175, 0x0238, 0x05, Local0) /* AE_BAD_PARAMETER */ + CH04 (Arg0, 0x00, 0x1C, Z175, __LINE__, 0x05, Local0) /* AE_BAD_PARAMETER */ Local0-- } @@ -688,7 +688,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB1) /* \DTM1.TST4.DDB1 */ - If (CH03 (Arg0, Z175, 0x40, 0x0241, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -699,12 +699,12 @@ /* Any next */ Unload (DDB0) - CH04 (Arg0, 0x00, 0x1C, Z175, 0x024B, 0x05, Local0) /* AE_BAD_PARAMETER */ + CH04 (Arg0, 0x00, 0x1C, Z175, __LINE__, 0x05, Local0) /* AE_BAD_PARAMETER */ Local0-- } Unload (DDB1) - If (CH03 (Arg0, Z175, 0x42, 0x0252, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -732,7 +732,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM1.TST5.DDB0 */ - If (CH03 (Arg0, Z175, 0x43, 0x0267, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -740,26 +740,26 @@ /* Device */ Unload (DerefOf (RefOf (\AUXD.DEV0))) - CH04 (Arg0, 0x00, 0x3E, Z175, 0x026D, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ + CH04 (Arg0, 0x00, 0x3E, Z175, __LINE__, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ /* Thermal Zone */ Unload (DerefOf (RefOf (\AUXD.TZN0))) - CH04 (Arg0, 0x00, 0x3E, Z175, 0x0271, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ + CH04 (Arg0, 0x00, 0x3E, Z175, __LINE__, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ /* Method execution */ CopyObject (M000 (), M001) /* \DTM1.TST5.M001 */ Unload (M001 ()) If (SLCK) { - CH04 (Arg0, 0x00, 0x2F, Z175, 0x0278, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Else { - CH04 (Arg0, 0x00, 0x2F, Z175, 0x027A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Unload (DDB0) - If (CH03 (Arg0, Z175, 0x48, 0x027F, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -770,24 +770,24 @@ Method (TUL0, 0, Serialized) { - CH03 (__METHOD__, Z175, 0x0200, 0x028B, 0x00) + CH03 (__METHOD__, Z175, __LINE__, 0x00, 0x00) /* Different Sources to specify DDBHandle for UnLoad. */ /* Most of them (Named Object, LocalX, ArgX, Derefof) */ /* are checked in load.asl */ /* DDBHandle returned by Method call */ SRMT ("TUL0.tst0") \DTM1.TST0 (__METHOD__) - CH03 (__METHOD__, Z175, 0x0201, 0x0294, 0x00) + CH03 (__METHOD__, Z175, __LINE__, 0x00, 0x00) /* All namespace objects created as a result of the corresponding */ /* Load operation are absent in the namespace after UnLoad */ SRMT ("TUL0.tst1") \DTM1.TST1 (__METHOD__) - CH03 (__METHOD__, Z175, 0x0202, 0x029B, 0x00) + CH03 (__METHOD__, Z175, __LINE__, 0x00, 0x00) /* Load/UnLoad processing can be done with the same table many times */ SRMT ("TUL0.tst2") \DTM1.TST2 (__METHOD__) - CH03 (__METHOD__, Z175, 0x0203, 0x02A1, 0x00) + CH03 (__METHOD__, Z175, __LINE__, 0x00, 0x00) } /* 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 7202fee..8223152 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/common.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/common.asl @@ -671,7 +671,7 @@ * lpC0 - Index of thread * Local0 - the scale of its errors */ - ERR (Arg0, Z147, 0x027E, 0x00, 0x00, LPC0, Local0) + ERR (Arg0, Z147, __LINE__, 0x00, 0x00, LPC0, Local0) } LPN0-- @@ -710,7 +710,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C00C)) { - ERR ("m107", Z147, 0x02A4, 0x00, 0x00, Local1, C00C) + ERR ("m107", Z147, __LINE__, 0x00, 0x00, Local1, C00C) Return (0x00) } @@ -720,13 +720,13 @@ Local7 = DerefOf (Local0 [0x01]) If ((Local6 != Arg1)) { - ERR ("m107", Z147, 0x02AD, 0x00, 0x00, Local6, Arg1) + ERR ("m107", Z147, __LINE__, 0x00, 0x00, Local6, Arg1) Return (0x00) } If ((Local7 != Arg2)) { - ERR ("m107", Z147, 0x02B2, 0x00, 0x00, Local7, Arg2) + ERR ("m107", Z147, __LINE__, 0x00, 0x00, Local7, Arg2) Return (0x00) } } @@ -939,7 +939,7 @@ { If ((Local0 != CMD0)) { - ERR ("m110", Z147, 0x0380, 0x00, 0x00, Local0, CMD0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local0, CMD0) Debug = LPC0 /* \M110.LPC0 */ } @@ -954,7 +954,7 @@ { /* Has executed unexpected command */ - ERR ("m110", Z147, 0x0389, 0x00, 0x00, Local1, Local0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local1, Local0) Debug = LPC0 /* \M110.LPC0 */ } } @@ -981,11 +981,11 @@ { /* Has executed unexpected command */ - ERR ("m110", Z147, 0x039C, 0x00, 0x00, Local1, Local0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local1, Local0) Debug = LPC0 /* \M110.LPC0 */ } - ERR ("m110", Z147, 0x039F, 0x00, 0x00, Local0, Local4) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local0, Local4) Debug = LPC0 /* \M110.LPC0 */ } } @@ -993,7 +993,7 @@ { If ((Local0 != C100)) { - ERR ("m110", Z147, 0x03A4, 0x00, 0x00, Local0, CMD0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local0, CMD0) Debug = LPC0 /* \M110.LPC0 */ } @@ -1008,13 +1008,13 @@ { /* Has executed unexpected command */ - ERR ("m110", Z147, 0x03AD, 0x00, 0x00, Local0, CMD0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local0, CMD0) Debug = LPC0 /* \M110.LPC0 */ } } Else { - ERR ("m110", Z147, 0x03B1, 0x00, 0x00, LPC0, Local0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, LPC0, Local0) Debug = LPC0 /* \M110.LPC0 */ } } @@ -1208,7 +1208,7 @@ If (!Arg3) { - ERR ("m112", Z147, 0x045F, 0x00, 0x00, Arg3, 0x01) + ERR ("m112", Z147, __LINE__, 0x00, 0x00, Arg3, 0x01) } } 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 9c6dcfd..11e9a44 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl @@ -560,7 +560,7 @@ Local1 = DerefOf (Local0 [Arg1]) If ((Local1 != Arg2)) { - ERR ("m333", Z149, 0x01EC, 0x00, 0x00, Local1, Arg2) + ERR ("m333", Z149, __LINE__, 0x00, 0x00, Local1, Arg2) Debug = Arg0 Debug = Arg1 } @@ -717,12 +717,12 @@ Local0 = M10F (Arg0, Arg1) If ((Local0 & 0x01)) { - ERR ("m33d", Z149, 0x0280, 0x00, 0x00, Local0, 0x00) + ERR ("m33d", Z149, __LINE__, 0x00, 0x00, Local0, 0x00) } If ((Local0 & 0x02)) { - ERR ("m33d", Z149, 0x0283, 0x00, 0x00, Local0, 0x00) + ERR ("m33d", Z149, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -861,7 +861,7 @@ Local0 = M344 (Arg5, Arg6) If (Local0) { - ERR ("m33f: incorrect parameters", Z149, 0x030D, 0x00, 0x00, Arg5, Arg6) + ERR ("m33f: incorrect parameters", Z149, __LINE__, 0x00, 0x00, Arg5, Arg6) Debug = Local0 Return (Zero) } @@ -1132,7 +1132,7 @@ } Default { - ERR ("m341: unexpected command:", Z149, 0x0403, 0x00, 0x00, 0x00, Arg0) + ERR ("m341: unexpected command:", Z149, __LINE__, 0x00, 0x00, 0x00, Arg0) } } @@ -1262,7 +1262,7 @@ If (ERR0) { - ERR ("m333", Z149, 0x0477, 0x00, 0x00, 0x00, 0x00) + ERR ("m333", Z149, __LINE__, 0x00, 0x00, 0x00, 0x00) } Return (B000) /* \M343.B000 */ @@ -1333,14 +1333,14 @@ { /* Expected exceptions but have none */ - ERR ("m333", Z149, 0x04B3, 0x00, 0x00, EXC0, 0x00) + ERR ("m333", Z149, __LINE__, 0x00, 0x00, EXC0, 0x00) } } ElseIf (EXC0) { /* Unexpected exceptions */ - ERR ("m333", Z149, 0x04B8, 0x00, 0x00, EXC0, 0x00) + ERR ("m333", Z149, __LINE__, 0x00, 0x00, EXC0, 0x00) } /*Reset EXC0 (the current number of exceptions handled) */ diff --git a/tests/aslts/src/runtime/collections/mt/mutex/service.asl b/tests/aslts/src/runtime/collections/mt/mutex/service.asl index 8cf39b7..b3d57a9 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/service.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/service.asl @@ -78,7 +78,7 @@ Name (IX02, 0x00) If ((Arg3 >= Arg1)) { - ERR ("m210", Z153, 0x55, 0x00, 0x00, Arg3, Arg1) + ERR ("m210", Z153, __LINE__, 0x00, 0x00, Arg3, Arg1) Return (Zero) } @@ -96,7 +96,7 @@ IX02 = (Arg3 + SZ01) /* \M210.SZ01 */ If ((IX02 > Arg1)) { - ERR ("m210", Z153, 0x61, 0x00, 0x00, IX02, Arg1) + ERR ("m210", Z153, __LINE__, 0x00, 0x00, IX02, Arg1) Debug = Arg1 Debug = Arg3 Debug = Arg4 diff --git a/tests/aslts/src/runtime/collections/mt/mutex/tests.asl b/tests/aslts/src/runtime/collections/mt/mutex/tests.asl index 241340c..68262cf 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/tests.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/tests.asl @@ -2630,11 +2630,11 @@ M103 (Arg0) If ((FLG2 != THR1)) { - ERR (Arg0, Z152, 0x0953, 0x00, 0x00, FLG2, THR1) + ERR (Arg0, Z152, __LINE__, 0x00, 0x00, FLG2, THR1) } If ((FLG3 != THR2)) { - ERR (Arg0, Z152, 0x0956, 0x00, 0x00, FLG3, THR2) + ERR (Arg0, Z152, __LINE__, 0x00, 0x00, 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 175bedd..0f59a11 100644 --- a/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl +++ b/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl @@ -43,7 +43,7 @@ SRMT (Arg1) If (!Arg0) { - ERR (Arg0, Z135, 0x30, 0x00, 0x00, 0x00, 0x01) + ERR (Arg0, Z135, __LINE__, 0x00, 0x00, 0x00, 0x01) } I000++ diff --git a/tests/aslts/src/runtime/common/TCI/tcicmd.asl b/tests/aslts/src/runtime/common/TCI/tcicmd.asl index 33a6f1a..1adbe90 100644 --- a/tests/aslts/src/runtime/common/TCI/tcicmd.asl +++ b/tests/aslts/src/runtime/common/TCI/tcicmd.asl @@ -176,14 +176,14 @@ } Default { - ERR ("m165", Z128, 0xBB, 0x00, 0x00, Arg0, 0x00) + ERR ("m165", Z128, __LINE__, 0x00, 0x00, Arg0, 0x00) } } If ((NUM < C22B)) { - ERR ("m165", Z128, 0xC0, 0x00, 0x00, NUM, C22B) + ERR ("m165", Z128, __LINE__, 0x00, 0x00, NUM, C22B) } Else { @@ -489,7 +489,7 @@ { If (!DE00) { - ERR ("m3a4", Z128, 0x01CB, 0x00, Arg6, Local6, Local5) + ERR ("m3a4", Z128, __LINE__, 0x00, Arg6, Local6, Local5) Debug = LPC0 /* \M3A4.LPC0 */ Debug = Local0 Debug = Local1 @@ -524,7 +524,7 @@ { If (!DE00) { - ERR ("m3a4", Z128, 0x01E9, 0x00, Arg6, Local2, Local3) + ERR ("m3a4", Z128, __LINE__, 0x00, Arg6, Local2, Local3) } Local7 = 0x01 @@ -554,7 +554,7 @@ { If (!DE00) { - ERR ("m3a4", Z128, 0x0206, 0x00, Arg6, Local3, Local6) + ERR ("m3a4", Z128, __LINE__, 0x00, Arg6, Local3, Local6) } Local7 = 0x01 @@ -584,7 +584,7 @@ { If (!DE00) { - ERR ("m3a4", Z128, 0x0224, 0x00, Arg6, Local3, Local6) + ERR ("m3a4", Z128, __LINE__, 0x00, Arg6, Local3, Local6) } Local7 = 0x01 @@ -612,7 +612,7 @@ { If (!DE00) { - ERR ("m3a4", Z128, 0x023E, 0x00, Arg6, Local2, Local3) + ERR ("m3a4", Z128, __LINE__, 0x00, Arg6, Local2, Local3) } Local7 = 0x01 @@ -649,7 +649,7 @@ { If (!DE00) { - ERR ("m3a4", Z128, 0x0260, 0x00, Arg6, Local2, Local3) + ERR ("m3a4", Z128, __LINE__, 0x00, Arg6, Local2, Local3) } Local7 = 0x01 @@ -712,7 +712,7 @@ Local1 = DerefOf (Arg0 [0x00]) If ((Local1 != Local0)) { - ERR ("m3a6", Z128, 0x029F, 0x00, Arg2, Local1, Local0) + ERR ("m3a6", Z128, __LINE__, 0x00, Arg2, Local1, Local0) Local7 = 0x01 } @@ -721,7 +721,7 @@ Local1 = DerefOf (Arg0 [0x01]) If ((Local1 != C220)) { - ERR ("m3a6", Z128, 0x02A7, 0x00, Arg2, Local1, C220) + ERR ("m3a6", Z128, __LINE__, 0x00, Arg2, Local1, C220) Local7 = 0x01 } @@ -739,7 +739,7 @@ Local1 = DerefOf (Arg0 [0x02]) If ((Local1 != Local0)) { - ERR ("m3a6", Z128, 0x02B5, 0x00, Arg2, Local1, Local0) + ERR ("m3a6", Z128, __LINE__, 0x00, Arg2, Local1, Local0) Local7 = 0x01 } @@ -748,7 +748,7 @@ Local1 = DerefOf (Arg0 [0x03]) If (!Local1) { - ERR ("m3a6", Z128, 0x02BD, 0x00, Arg2, Local1, 0x01) + ERR ("m3a6", Z128, __LINE__, 0x00, Arg2, Local1, 0x01) Local7 = 0x01 } @@ -787,7 +787,7 @@ Local1 = DerefOf (Arg0 [Local0]) If (Local1) { - ERR ("m3a7", Z128, 0x02E8, 0x00, Arg2, Local1, 0x00) + ERR ("m3a7", Z128, __LINE__, 0x00, Arg2, Local1, 0x00) Local7 = 0x01 } @@ -797,7 +797,7 @@ Local1 = DerefOf (Arg0 [Local0]) If (Local1) { - ERR ("m3a7", Z128, 0x02F1, 0x00, Arg2, Local1, 0x00) + ERR ("m3a7", Z128, __LINE__, 0x00, Arg2, Local1, 0x00) Local7 = 0x01 } @@ -807,7 +807,7 @@ Local1 = DerefOf (Arg0 [Local0]) If (Local1) { - ERR ("m3a7", Z128, 0x02FA, 0x00, Arg2, Local1, 0x00) + ERR ("m3a7", Z128, __LINE__, 0x00, Arg2, Local1, 0x00) Local7 = 0x01 } @@ -817,7 +817,7 @@ Local1 = DerefOf (Arg0 [Local0]) If (Local1) { - ERR ("m3a7", Z128, 0x0303, 0x00, Arg2, Local1, 0x00) + ERR ("m3a7", Z128, __LINE__, 0x00, Arg2, Local1, 0x00) Local7 = 0x01 } @@ -827,7 +827,7 @@ Local1 = DerefOf (Arg0 [Local0]) If (Local1) { - ERR ("m3a7", Z128, 0x030C, 0x00, Arg2, Local1, 0x00) + ERR ("m3a7", Z128, __LINE__, 0x00, Arg2, Local1, 0x00) Local7 = 0x01 } } @@ -954,7 +954,7 @@ If ((Local6 == Local7)) { Debug = "Internal error 0" - ERR ("m3aa", Z128, 0x0368, 0x00, 0x00, Local6, Local7) + ERR ("m3aa", Z128, __LINE__, 0x00, 0x00, Local6, Local7) } ElseIf (Local6) { diff --git a/tests/aslts/src/runtime/common/conversion/oproc.asl b/tests/aslts/src/runtime/common/conversion/oproc.asl index 6f9ca22..8432572 100644 --- a/tests/aslts/src/runtime/common/conversion/oproc.asl +++ b/tests/aslts/src/runtime/common/conversion/oproc.asl @@ -816,13 +816,13 @@ If (EX00) { TMP0 = FLG2 /* \FLG2 */ - CH03 (TS, Z064, 0x00, 0x0288, 0x00) + CH03 (TS, Z064, __LINE__, 0x00, 0x00) } Local7 = M482 (Local0, Local1, Local2, Local3, Local4, TMP0, Arg0) If (EX00) { - CH04 (TS, 0x00, 0xFF, Z064, 0x028E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z064, __LINE__, 0x00, 0x00) } ElseIf (FLG1) { @@ -854,13 +854,13 @@ If (EX00) { - CH03 (TS, Z064, 0x02, 0x02A6, 0x00) + CH03 (TS, Z064, __LINE__, 0x00, 0x00) } Local7 = M482 (Local1, Local0, Local2, Local3, Local4, TMP0, Arg0) If (EX00) { - CH04 (TS, 0x00, 0xFF, Z064, 0x02AC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z064, __LINE__, 0x00, 0x00) } ElseIf (FLG1) { @@ -1119,11 +1119,11 @@ Local1 = ObjectType (Arg2) If ((Local0 != Local1)) { - ERR (Arg0, Z064, 0x037A, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z064, __LINE__, 0x00, 0x00, Local0, Local1) } ElseIf ((Arg1 != Arg2)) { - ERR (Arg0, Z064, 0x037C, 0x00, 0x00, Arg1, Arg2) + ERR (Arg0, Z064, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -1139,12 +1139,12 @@ { If ((Arg2 != Local7)) { - ERR (Arg0, Z064, 0x038B, 0x00, 0x00, Arg2, Local7) + ERR (Arg0, Z064, __LINE__, 0x00, 0x00, Arg2, Local7) } } ElseIf ((Arg2 != Local6)) { - ERR (Arg0, Z064, 0x038F, 0x00, 0x00, Arg2, Local6) + ERR (Arg0, Z064, __LINE__, 0x00, 0x00, Arg2, Local6) } } @@ -1292,13 +1292,13 @@ If (EX00) { TMP0 = FLG2 /* \FLG2 */ - CH03 (TS, Z064, 0x04, 0x0421, 0x00) + CH03 (TS, Z064, __LINE__, 0x00, 0x00) } Local7 = M482 (Local0, Local1, Local2, Local3, 0x00, TMP0, Arg0) If (EX00) { - CH04 (TS, 0x00, 0xFF, Z064, 0x0427, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z064, __LINE__, 0x00, 0x00) } ElseIf /* Verify the result */ diff --git a/tests/aslts/src/runtime/common/conversion/otest.asl b/tests/aslts/src/runtime/common/conversion/otest.asl index 43fe9ea..b0d7e67 100644 --- a/tests/aslts/src/runtime/common/conversion/otest.asl +++ b/tests/aslts/src/runtime/common/conversion/otest.asl @@ -77,23 +77,23 @@ Local1 = ObjectType (Local0) If ((Local1 != 0x02)) { - ERR (Arg0, Z065, 0x5A, 0x00, 0x00, Local1, 0x02) + ERR (Arg0, Z065, __LINE__, 0x00, 0x00, Local1, 0x02) } Else { Local1 = SizeOf (Local0) If ((Local1 != 0x01)) { - ERR (Arg0, Z065, 0x5E, 0x00, 0x00, Local1, 0x01) + ERR (Arg0, Z065, __LINE__, 0x00, 0x00, Local1, 0x01) } Else { - CH03 (TS, Z065, 0x00, 0x60, 0x00) + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x00) - CH04 (Arg0, 0x00, 0x22, Z065, 0x62, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ - CH03 (TS, Z065, 0x02, 0x64, 0x00) + CH04 (Arg0, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = (0x00 + Local0) - CH04 (Arg0, 0x00, 0x22, Z065, 0x66, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH04 (Arg0, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ } } @@ -117,23 +117,23 @@ Local1 = ObjectType (Local0) If ((Local1 != 0x02)) { - ERR (Arg0, Z065, 0x81, 0x00, 0x00, Local1, 0x02) + ERR (Arg0, Z065, __LINE__, 0x00, 0x00, Local1, 0x02) } Else { Local1 = SizeOf (Local0) If ((Local1 != 0x01)) { - ERR (Arg0, Z065, 0x85, 0x00, 0x00, Local1, 0x01) + ERR (Arg0, Z065, __LINE__, 0x00, 0x00, Local1, 0x01) } Else { - CH03 (TS, Z065, 0x04, 0x87, 0x00) + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x00) - CH03 (TS, Z065, 0x05, 0x89, 0x00) - CH03 (TS, Z065, 0x06, 0x8B, 0x00) + CH03 (TS, Z065, __LINE__, 0x00, 0x00) + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = (0x00 + Local0) - CH03 (TS, Z065, 0x07, 0x8D, 0x00) + CH03 (TS, Z065, __LINE__, 0x00, 0x00) } } @@ -151,38 +151,38 @@ TS00 (TS) If (Arg0) { - CH03 (TS, Z065, 0x08, 0xA1, 0x00) + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = ("fedcba98765432101" + 0x00) - CH04 (TS, 0x00, 0x22, Z065, 0xA3, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ - CH03 (TS, Z065, 0x0A, 0xA5, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = (0x00 + "fedcba98765432101") - CH04 (TS, 0x00, 0x22, Z065, 0xA7, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ - CH03 (TS, Z065, 0x0C, 0xA9, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = ("1234q" + 0x00) - CH04 (TS, 0x00, 0x22, Z065, 0xAB, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ - CH03 (TS, Z065, 0x0E, 0xAD, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = (0x00 + "1234q") - CH04 (TS, 0x00, 0x22, Z065, 0xAF, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ If (0x00) { - CH03 (TS, Z065, 0x10, 0xB4, 0x00) + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = ("0xfedcba98765432" + 0x00) - CH04 (TS, 0x00, 0x22, Z065, 0xB6, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ - CH03 (TS, Z065, 0x12, 0xB8, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = (0x00 + "0xfedcba98765432") - CH04 (TS, 0x00, 0x22, Z065, 0xBA, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ - CH03 (TS, Z065, 0x14, 0xBC, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = ("" + 0x00) - CH04 (TS, 0x00, 0x22, Z065, 0xBE, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ - CH03 (TS, Z065, 0x16, 0xC0, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = (0x00 + "") - CH04 (TS, 0x00, 0x22, Z065, 0xC2, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ - CH03 (TS, Z065, 0x18, 0xC4, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = (" " + 0x00) - CH04 (TS, 0x00, 0x22, Z065, 0xC6, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ - CH03 (TS, Z065, 0x1A, 0xC8, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH03 (TS, Z065, __LINE__, 0x00, 0x00) Local7 = (0x00 + " ") - CH04 (TS, 0x00, 0x22, Z065, 0xCA, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x22, Z065, __LINE__, 0x00, 0x00) /* 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 67dd81d..3bd2a5a 100644 --- a/tests/aslts/src/runtime/common/conversion/rproc.asl +++ b/tests/aslts/src/runtime/common/conversion/rproc.asl @@ -54,11 +54,11 @@ TMP1 = ObjectType (Local0) If ((TMP0 != TMP1)) { - ERR (Arg0, Z066, 0x3F, 0x00, 0x00, TMP0, TMP1) + ERR (Arg0, Z066, __LINE__, 0x00, 0x00, TMP0, TMP1) } ElseIf ((Arg5 != Local0)) { - ERR (Arg0, Z066, 0x41, 0x00, 0x00, Arg5, Local0) + ERR (Arg0, Z066, __LINE__, 0x00, 0x00, Arg5, Local0) } } Else @@ -66,11 +66,11 @@ TMP1 = ObjectType (Local1) If ((TMP0 != TMP1)) { - ERR (Arg0, Z066, 0x46, 0x00, 0x00, TMP0, TMP1) + ERR (Arg0, Z066, __LINE__, 0x00, 0x00, TMP0, TMP1) } ElseIf ((Arg5 != Local1)) { - ERR (Arg0, Z066, 0x48, 0x00, 0x00, Arg5, Local1) + ERR (Arg0, Z066, __LINE__, 0x00, 0x00, Arg5, Local1) } } } @@ -93,11 +93,11 @@ TMP1 = ObjectType (Local2) If ((TMP0 != TMP1)) { - ERR (Arg0, Z066, 0x5F, 0x00, 0x00, TMP0, TMP1) + ERR (Arg0, Z066, __LINE__, 0x00, 0x00, TMP0, TMP1) } ElseIf ((Arg6 != Local2)) { - ERR (Arg0, Z066, 0x61, 0x00, 0x00, Arg6, Local2) + ERR (Arg0, Z066, __LINE__, 0x00, 0x00, Arg6, Local2) } } Else @@ -105,11 +105,11 @@ TMP1 = ObjectType (Local3) If ((TMP0 != TMP1)) { - ERR (Arg0, Z066, 0x66, 0x00, 0x00, TMP0, TMP1) + ERR (Arg0, Z066, __LINE__, 0x00, 0x00, TMP0, TMP1) } ElseIf ((Arg6 != Local3)) { - ERR (Arg0, Z066, 0x68, 0x00, 0x00, Arg6, Local3) + ERR (Arg0, Z066, __LINE__, 0x00, 0x00, Arg6, Local3) } } } diff --git a/tests/aslts/src/runtime/common/conversion/rtest.asl b/tests/aslts/src/runtime/common/conversion/rtest.asl index 0823ac8..e3871ca 100644 --- a/tests/aslts/src/runtime/common/conversion/rtest.asl +++ b/tests/aslts/src/runtime/common/conversion/rtest.asl @@ -693,21 +693,21 @@ Local2 = ObjectType (Local0) If ((Local2 != 0x02)) { - ERR (TS, Z067, 0x013A, 0x00, 0x00, Local2, 0x02) + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local2, 0x02) } ElseIf ((Local0 != "abcdef")) { - ERR (TS, Z067, 0x013C, 0x00, 0x00, Local0, "abcdef") + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local0, "abcdef") } Local2 = ObjectType (Local1) If ((Local2 != 0x02)) { - ERR (TS, Z067, 0x0141, 0x00, 0x00, Local2, 0x02) + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local2, 0x02) } ElseIf ((Local1 != "12345678")) { - ERR (TS, Z067, 0x0143, 0x00, 0x00, Local1, "12345678") + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local1, "12345678") } } @@ -1284,21 +1284,21 @@ Local2 = ObjectType (Local0) If ((Local2 != 0x03)) { - ERR (TS, Z067, 0x020A, 0x00, 0x00, Local2, 0x03) + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local2, 0x03) } ElseIf ((Local0 != B000)) { - ERR (TS, Z067, 0x020C, 0x00, 0x00, Local0, B000) + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local0, B000) } Local2 = ObjectType (Local1) If ((Local2 != 0x03)) { - ERR (TS, Z067, 0x0211, 0x00, 0x00, Local2, 0x03) + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local2, 0x03) } ElseIf ((Local1 != B001)) { - ERR (TS, Z067, 0x0213, 0x00, 0x00, Local1, B001) + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local1, B001) } } @@ -1942,11 +1942,11 @@ Local0 = ObjectType (SS00) If ((Local0 != 0x02)) { - ERR (TS, Z067, 0x04A6, 0x00, 0x00, Local0, 0x02) + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local0, 0x02) } ElseIf ((SS00 != "ABC")) { - ERR (TS, Z067, 0x04A8, 0x00, 0x00, SS00, "ABC") + ERR (TS, Z067, __LINE__, 0x00, 0x00, SS00, "ABC") } Name (B000, Buffer (0xC8){}) @@ -1959,15 +1959,15 @@ Local1 = SizeOf (B000) If ((Local0 != 0x03)) { - ERR (TS, Z067, 0x04B5, 0x00, 0x00, Local0, 0x03) + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local0, 0x03) } ElseIf ((Local1 != 0x06)) { - ERR (TS, Z067, 0x04B7, 0x00, 0x00, Local1, 0x06) + ERR (TS, Z067, __LINE__, 0x00, 0x00, Local1, 0x06) } ElseIf ((B000 != B001)) { - ERR (TS, Z067, 0x04B9, 0x00, 0x00, B000, B001) + ERR (TS, Z067, __LINE__, 0x00, 0x00, B000, B001) } } diff --git a/tests/aslts/src/runtime/common/dataproc.asl b/tests/aslts/src/runtime/common/dataproc.asl index 80bcd0d..515bb1a 100644 --- a/tests/aslts/src/runtime/common/dataproc.asl +++ b/tests/aslts/src/runtime/common/dataproc.asl @@ -38,7 +38,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg1)) { - ERR ("m1a3", Z114, 0x2D, Arg2, Arg4, Local0, Arg1) + ERR ("m1a3", Z114, __LINE__, Arg2, Arg4, Local0, Arg1) Local7 = 0x00 } @@ -55,56 +55,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (TS, Z114, 0x3F, 0x00, 0x00, Local0, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A0000)) { - ERR (TS, Z114, 0x42, 0x00, 0x00, I900, 0xFE7CB391D65A0000) + ERR (TS, Z114, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A0000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (TS, Z114, 0x47, 0x00, 0x00, Local0, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0xC1790001)) { - ERR (TS, Z114, 0x4A, 0x00, 0x00, I901, 0xC1790001) + ERR (TS, Z114, __LINE__, 0x00, 0x00, I901, 0xC1790001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (TS, Z114, 0x4F, 0x00, 0x00, Local0, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (TS, Z114, 0x52, 0x00, 0x00, I902, 0x00) + ERR (TS, Z114, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (TS, Z114, 0x57, 0x00, 0x00, Local0, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (TS, Z114, 0x5A, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (TS, Z114, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (TS, Z114, 0x5F, 0x00, 0x00, Local0, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (TS, Z114, 0x62, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (TS, Z114, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -112,23 +112,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (TS, Z114, 0x69, 0x00, 0x00, Local0, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12340002")) { - ERR (TS, Z114, 0x6C, 0x00, 0x00, S900, "12340002") + ERR (TS, Z114, __LINE__, 0x00, 0x00, S900, "12340002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (TS, Z114, 0x71, 0x00, 0x00, Local0, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu0003")) { - ERR (TS, Z114, 0x74, 0x00, 0x00, S901, "qwrtyu0003") + ERR (TS, Z114, __LINE__, 0x00, 0x00, S901, "qwrtyu0003") } /* Buffer */ @@ -136,7 +136,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (TS, Z114, 0x7B, 0x00, 0x00, Local0, C00B) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -144,7 +144,7 @@ 0xB0, 0xB1, 0xB2, 0xB3, 0xB4 // ..... })) { - ERR (TS, Z114, 0x7E, 0x00, 0x00, B900, Buffer (0x05) + ERR (TS, Z114, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0xB0, 0xB1, 0xB2, 0xB3, 0xB4 // ..... }) @@ -155,12 +155,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (TS, Z114, 0x85, 0x00, 0x00, Local0, C016) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0xB0)) { - ERR (TS, Z114, 0x88, 0x00, 0x00, BF90, 0xB0) + ERR (TS, Z114, __LINE__, 0x00, 0x00, BF90, 0xB0) } /* One level Package */ @@ -169,7 +169,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (TS, Z114, 0x90, 0x00, 0x00, Local1, C008) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -177,12 +177,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (TS, Z114, 0x97, 0x00, 0x00, Local2, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD0004)) { - ERR (TS, Z114, 0x9A, 0x00, 0x00, Local1, 0xABCD0004) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, 0xABCD0004) } Store (P901 [0x01], Local0) @@ -190,12 +190,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (TS, Z114, 0xA1, 0x00, 0x00, Local2, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455660005)) { - ERR (TS, Z114, 0xA4, 0x00, 0x00, Local1, 0x1122334455660005) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, 0x1122334455660005) } Store (P902 [0x00], Local0) @@ -203,12 +203,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (TS, Z114, 0xAB, 0x00, 0x00, Local2, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12340006")) { - ERR (TS, Z114, 0xAE, 0x00, 0x00, Local1, "12340006") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, "12340006") } Store (P902 [0x01], Local0) @@ -216,12 +216,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (TS, Z114, 0xB5, 0x00, 0x00, Local2, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i80007")) { - ERR (TS, Z114, 0xB8, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i80007") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i80007") } Store (P903 [0x00], Local0) @@ -229,12 +229,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (TS, Z114, 0xBF, 0x00, 0x00, Local2, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop0008")) { - ERR (TS, Z114, 0xC2, 0x00, 0x00, Local1, "qwrtyuiop0008") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop0008") } Store (P903 [0x01], Local0) @@ -242,12 +242,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (TS, Z114, 0xC9, 0x00, 0x00, Local2, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0250009")) { - ERR (TS, Z114, 0xCC, 0x00, 0x00, Local1, "1234567890abdef0250009") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0250009") } Store (P904 [0x00], Local0) @@ -255,7 +255,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (TS, Z114, 0xD3, 0x00, 0x00, Local2, C00B) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -263,7 +263,7 @@ 0xB5, 0xB6, 0xB7 // ... })) { - ERR (TS, Z114, 0xD6, 0x00, 0x00, Local1, Buffer (0x03) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xB5, 0xB6, 0xB7 // ... }) @@ -274,7 +274,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (TS, Z114, 0xDD, 0x00, 0x00, Local2, C00B) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -282,7 +282,7 @@ 0xB8, 0xB9 // .. })) { - ERR (TS, Z114, 0xE0, 0x00, 0x00, Local1, Buffer (0x02) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xB8, 0xB9 // .. }) @@ -297,12 +297,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (TS, Z114, 0xEB, 0x00, 0x00, Local4, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC000A)) { - ERR (TS, Z114, 0xEE, 0x00, 0x00, Local3, 0x0ABC000A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local3, 0x0ABC000A) } Store (P905 [0x00], Local0) @@ -312,12 +312,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (TS, Z114, 0xF7, 0x00, 0x00, Local4, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc000b")) { - ERR (TS, Z114, 0xFA, 0x00, 0x00, Local3, "0xabc000b") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local3, "0xabc000b") } Store (P905 [0x00], Local0) @@ -327,12 +327,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (TS, Z114, 0x0103, 0x00, 0x00, Local4, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc000c")) { - ERR (TS, Z114, 0x0106, 0x00, 0x00, Local3, "abc000c") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local3, "abc000c") } Store (P906 [0x00], Local0) @@ -342,12 +342,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (TS, Z114, 0x010F, 0x00, 0x00, Local4, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc000d")) { - ERR (TS, Z114, 0x0112, 0x00, 0x00, Local3, "abc000d") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local3, "abc000d") } Store (P907 [0x00], Local0) @@ -357,12 +357,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (TS, Z114, 0x011B, 0x00, 0x00, Local4, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm000e")) { - ERR (TS, Z114, 0x011E, 0x00, 0x00, Local3, "aqwevbgnm000e") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm000e") } Store (P908 [0x00], Local0) @@ -372,7 +372,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (TS, Z114, 0x0127, 0x00, 0x00, Local4, C00B) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -380,7 +380,7 @@ 0xBA, 0xBB, 0xBC, 0xBD, 0xBE // ..... })) { - ERR (TS, Z114, 0x012A, 0x00, 0x00, Local3, Buffer (0x05) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xBA, 0xBB, 0xBC, 0xBD, 0xBE // ..... }) @@ -397,12 +397,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (TS, Z114, 0x0137, 0x00, 0x00, Local6, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC000F)) { - ERR (TS, Z114, 0x013A, 0x00, 0x00, Local5, 0x0ABC000F) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local5, 0x0ABC000F) } Store (P90A [0x00], Local0) @@ -414,12 +414,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (TS, Z114, 0x0145, 0x00, 0x00, Local6, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12340010")) { - ERR (TS, Z114, 0x0148, 0x00, 0x00, Local5, "12340010") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local5, "12340010") } Store (P90B [0x00], Local0) @@ -431,12 +431,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (TS, Z114, 0x0153, 0x00, 0x00, Local6, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas0011")) { - ERR (TS, Z114, 0x0156, 0x00, 0x00, Local5, "zxswefas0011") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local5, "zxswefas0011") } Store (P90C [0x00], Local0) @@ -448,7 +448,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (TS, Z114, 0x0161, 0x00, 0x00, Local6, C00B) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -456,7 +456,7 @@ 0xBF, 0xC0, 0xC1 // ... })) { - ERR (TS, Z114, 0x0164, 0x00, 0x00, Local5, Buffer (0x03) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xBF, 0xC0, 0xC1 // ... }) @@ -469,12 +469,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (TS, Z114, 0x016F, 0x00, 0x00, Local2, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD0018)) { - ERR (TS, Z114, 0x0172, 0x00, 0x00, Local1, 0xABCD0018) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, 0xABCD0018) } Store (P953 [0x01], Local0) @@ -482,12 +482,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (TS, Z114, 0x0179, 0x00, 0x00, Local2, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD0019)) { - ERR (TS, Z114, 0x017C, 0x00, 0x00, Local1, 0xABCD0019) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, 0xABCD0019) } /* p955 */ @@ -511,25 +511,25 @@ Local0 = ObjectType (F900) If ((Local0 != C00D)) { - ERR (TS, Z114, 0x0193, 0x00, 0x00, Local0, C00D) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C00D) } Local0 = ObjectType (F901) If ((Local0 != C00D)) { - ERR (TS, Z114, 0x0197, 0x00, 0x00, Local0, C00D) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C00D) } Local0 = ObjectType (F902) If ((Local0 != C00D)) { - ERR (TS, Z114, 0x019B, 0x00, 0x00, Local0, C00D) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C00D) } Local0 = ObjectType (F903) If ((Local0 != C00D)) { - ERR (TS, Z114, 0x019F, 0x00, 0x00, Local0, C00D) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C00D) } /* Field Unit (IndexField) */ @@ -537,13 +537,13 @@ Local0 = ObjectType (IF90) If ((Local0 != C00D)) { - ERR (TS, Z114, 0x01A6, 0x00, 0x00, Local0, C00D) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C00D) } Local0 = ObjectType (IF91) If ((Local0 != C00D)) { - ERR (TS, Z114, 0x01AA, 0x00, 0x00, Local0, C00D) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C00D) } /* Field Unit (BankField) */ @@ -551,7 +551,7 @@ Local0 = ObjectType (BN90) If ((Local0 != C00D)) { - ERR (TS, Z114, 0x01B1, 0x00, 0x00, Local0, C00D) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local0, C00D) } /* * if (LNotEqual(f900, 0xd7)) { @@ -576,14 +576,14 @@ Local0 = ObjectType (Arg1) If ((Local0 != Arg2)) { - ERR (Arg0, Z114, 0x01CC, 0x00, Arg4, Local0, Arg2) + ERR (Arg0, Z114, __LINE__, 0x00, Arg4, Local0, Arg2) Local7 = 0x01 } ElseIf ((Arg2 < C00C)) { If ((Arg1 != Arg3)) { - ERR (Arg0, Z114, 0x01D0, 0x00, Arg4, Arg1, Arg3) + ERR (Arg0, Z114, __LINE__, 0x00, Arg4, Arg1, Arg3) Local7 = 0x01 } } @@ -675,14 +675,14 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (TS, Z114, 0x0234, 0x00, 0x00, Local1, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = DerefOf (Local0) If ((Local1 != 0x00)) { - ERR (TS, Z113, 0x0238, 0x00, 0x00, Local1, 0x00) + ERR (TS, Z113, __LINE__, 0x00, 0x00, Local1, 0x00) } } @@ -690,7 +690,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (TS, Z114, 0x0240, 0x00, 0x00, Local1, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, C009) } Else { @@ -703,7 +703,7 @@ If ((Local1 != 0xFE7CB391D65A0000)) { - ERR (TS, Z114, 0x0248, 0x00, 0x00, Local1, 0xFE7CB391D65A0000) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, 0xFE7CB391D65A0000) } } @@ -711,7 +711,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C00A)) { - ERR (TS, Z114, 0x0250, 0x00, 0x00, Local1, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, C00A) } Else { @@ -724,7 +724,7 @@ If ((Local1 != "12340002")) { - ERR (TS, Z114, 0x0258, 0x00, 0x00, Local1, "12340002") + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, "12340002") } } @@ -732,7 +732,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C00B)) { - ERR (TS, Z114, 0x0260, 0x00, 0x00, Local1, C00A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, C00A) } Else { @@ -748,7 +748,7 @@ 0xB0, 0xB1, 0xB2, 0xB3, 0xB4 // ..... })) { - ERR (TS, Z114, 0x0268, 0x00, 0x00, Local1, Buffer (0x05) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, Buffer (0x05) { 0xB0, 0xB1, 0xB2, 0xB3, 0xB4 // ..... }) @@ -768,7 +768,7 @@ { If ((Local1 != C00D)) { - ERR (TS, Z114, 0x0279, 0x00, 0x00, Local1, C00D) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, C00D) } Else { @@ -780,11 +780,11 @@ Local5 = ObjectType (Local7) If ((Local5 != C009)) { - ERR (TS, Z114, 0x0283, 0x00, 0x00, Local5, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local5, C009) } ElseIf ((Local7 != 0x00)) { - ERR (TS, Z114, 0x0286, 0x00, 0x00, Local7, 0x00) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local7, 0x00) } } @@ -819,7 +819,7 @@ { If ((Local1 != C016)) { - ERR (TS, Z114, 0x02AF, 0x00, 0x00, Local1, C016) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, C016) } Else { @@ -831,11 +831,11 @@ Local5 = ObjectType (Local7) If ((Local5 != C009)) { - ERR (TS, Z114, 0x02B9, 0x00, 0x00, Local5, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local5, C009) } ElseIf ((Local7 != 0xB0)) { - ERR (TS, Z114, 0x02BC, 0x00, 0x00, Local7, 0x00) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local7, 0x00) } } @@ -843,14 +843,14 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (TS, Z114, 0x02C5, 0x00, 0x00, Local1, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = DerefOf (Local0) If ((Local1 != 0x0F)) { - ERR (TS, Z114, 0x02C9, 0x00, 0x00, Local1, 0x0F) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, 0x0F) } } @@ -858,14 +858,14 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (TS, Z114, 0x02D1, 0x00, 0x00, Local1, C009) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = DerefOf (Local0) If ((Local1 != 0x10)) { - ERR (TS, Z114, 0x02D5, 0x00, 0x00, Local1, 0x10) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, 0x10) } } @@ -873,14 +873,14 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (TS, Z114, 0x02DD, 0x00, 0x00, Local1, C008) + ERR (TS, Z114, __LINE__, 0x00, 0x00, Local1, C008) } /* Evaluation of Method m936 takes place */ If ((I905 != 0xABCD001A)) { - ERR (TS, Z114, 0x02E3, 0x00, 0x00, I905, 0xABCD001A) + ERR (TS, Z114, __LINE__, 0x00, 0x00, I905, 0xABCD001A) } } diff --git a/tests/aslts/src/runtime/common/datastproc.asl b/tests/aslts/src/runtime/common/datastproc.asl index 83520b0..1a8e2e7 100644 --- a/tests/aslts/src/runtime/common/datastproc.asl +++ b/tests/aslts/src/runtime/common/datastproc.asl @@ -33,54 +33,54 @@ /* arg0 - test name */ /* arg1 - Integer, original object */ /* arg2 - absolute index of file initiating the checking */ - /* arg3 - index of checking (inside the file) */ + /* arg3 - line number of checking (inside the file) */ Method (M380, 4, NotSerialized) { Local0 = ObjectType (Arg1) If ((Local0 != C009)) { - ERR (Arg0, Z115, 0x2E, Arg2, Arg3, Local0, C009) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local0, C009) } ElseIf ((Arg1 != 0x77)) { - ERR (Arg0, Z115, 0x30, Arg2, Arg3, Arg1, 0x77) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Arg1, 0x77) } } /* arg0 - test name */ /* arg1 - String, original object */ /* arg2 - absolute index of file initiating the checking */ - /* arg3 - index of checking (inside the file) */ + /* arg3 - line number of checking (inside the file) */ Method (M381, 4, NotSerialized) { Local0 = ObjectType (Arg1) If ((Local0 != C00A)) { - ERR (Arg0, Z115, 0x3D, Arg2, Arg3, Local0, C00A) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local0, C00A) } ElseIf ((Arg1 != "qwer0000")) { - ERR (Arg0, Z115, 0x3F, Arg2, Arg3, Arg1, "qwer0000") + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Arg1, "qwer0000") } } /* arg0 - test name */ /* arg1 - Buffer, original object */ /* arg2 - absolute index of file initiating the checking */ - /* arg3 - index of checking (inside the file) */ + /* arg3 - line number of checking (inside the file) */ Method (M382, 4, NotSerialized) { Local0 = ObjectType (Arg1) If ((Local0 != C00B)) { - ERR (Arg0, Z115, 0x4C, Arg2, Arg3, Local0, C00B) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local0, C00B) } ElseIf ((Arg1 != Buffer (0x04) { 0x01, 0x77, 0x03, 0x04 // .w.. })) { - ERR (Arg0, Z115, 0x4E, Arg2, Arg3, Arg1, Buffer (0x04) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Arg1, Buffer (0x04) { 0x01, 0x77, 0x03, 0x04 // .w.. }) @@ -90,13 +90,13 @@ /* arg0 - test name */ /* arg1 - Package, original object */ /* arg2 - absolute index of file initiating the checking */ - /* arg3 - index of checking (inside the file) */ + /* arg3 - line number of checking (inside the file) */ Method (M383, 4, NotSerialized) { Local0 = ObjectType (Arg1) If ((Local0 != C00C)) { - ERR (Arg0, Z115, 0x5B, Arg2, Arg3, Local0, C00C) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local0, C00C) } Else { @@ -104,21 +104,21 @@ Local1 = DerefOf (Local0) If ((Local1 != 0x05)) { - ERR (Arg0, Z115, 0x60, Arg2, Arg3, Local1, 0x05) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local1, 0x05) } Local0 = Arg1 [0x01] Local1 = DerefOf (Local0) If ((Local1 != 0x77)) { - ERR (Arg0, Z115, 0x66, Arg2, Arg3, Local1, 0x77) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local1, 0x77) } Local0 = Arg1 [0x02] Local1 = DerefOf (Local0) If ((Local1 != 0x07)) { - ERR (Arg0, Z115, 0x6C, Arg2, Arg3, Local1, 0x07) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local1, 0x07) } } } @@ -127,54 +127,54 @@ /* arg0 - test name */ /* arg1 - Integer, original object */ /* arg2 - absolute index of file initiating the checking */ - /* arg3 - index of checking (inside the file) */ + /* arg3 - line number of checking (inside the file) */ Method (M384, 4, NotSerialized) { Local0 = ObjectType (Arg1) If ((Local0 != C009)) { - ERR (Arg0, Z115, 0x7C, Arg2, Arg3, Local0, C009) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local0, C009) } ElseIf ((Arg1 != 0x2B)) { - ERR (Arg0, Z115, 0x7E, Arg2, Arg3, Arg1, 0x2B) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Arg1, 0x2B) } } /* arg0 - test name */ /* arg1 - String, original object */ /* arg2 - absolute index of file initiating the checking */ - /* arg3 - index of checking (inside the file) */ + /* arg3 - line number of checking (inside the file) */ Method (M385, 4, NotSerialized) { Local0 = ObjectType (Arg1) If ((Local0 != C00A)) { - ERR (Arg0, Z115, 0x8B, Arg2, Arg3, Local0, C00A) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local0, C00A) } ElseIf ((Arg1 != "q+er0000")) { - ERR (Arg0, Z115, 0x8D, Arg2, Arg3, Arg1, "q+er0000") + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Arg1, "q+er0000") } } /* arg0 - test name */ /* arg1 - Buffer, original object */ /* arg2 - absolute index of file initiating the checking */ - /* arg3 - index of checking (inside the file) */ + /* arg3 - line number of checking (inside the file) */ Method (M386, 4, NotSerialized) { Local0 = ObjectType (Arg1) If ((Local0 != C00B)) { - ERR (Arg0, Z115, 0x9A, Arg2, Arg3, Local0, C00B) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local0, C00B) } ElseIf ((Arg1 != Buffer (0x04) { 0x01, 0x2B, 0x03, 0x04 // .+.. })) { - ERR (Arg0, Z115, 0x9C, Arg2, Arg3, Arg1, Buffer (0x04) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Arg1, Buffer (0x04) { 0x01, 0x2B, 0x03, 0x04 // .+.. }) @@ -184,13 +184,13 @@ /* arg0 - test name */ /* arg1 - Package, original object */ /* arg2 - absolute index of file initiating the checking */ - /* arg3 - index of checking (inside the file) */ + /* arg3 - line number of checking (inside the file) */ Method (M387, 4, NotSerialized) { Local0 = ObjectType (Arg1) If ((Local0 != C00C)) { - ERR (Arg0, Z115, 0xA9, Arg2, Arg3, Local0, C00C) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local0, C00C) } Else { @@ -198,21 +198,21 @@ Local1 = DerefOf (Local0) If ((Local1 != 0x05)) { - ERR (Arg0, Z115, 0xAE, Arg2, Arg3, Local1, 0x05) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local1, 0x05) } Local0 = Arg1 [0x01] Local1 = DerefOf (Local0) If ((Local1 != 0x2B)) { - ERR (Arg0, Z115, 0xB4, Arg2, Arg3, Local1, 0x2B) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local1, 0x2B) } Local0 = Arg1 [0x02] Local1 = DerefOf (Local0) If ((Local1 != 0x07)) { - ERR (Arg0, Z115, 0xBA, Arg2, Arg3, Local1, 0x07) + ERR (Arg0, Z115, __LINE__, Arg2, Arg3, Local1, 0x07) } } } @@ -220,49 +220,49 @@ /* arg0 - original object */ /* arg1 - type of it */ /* arg2 - absolute index of file initiating the checking */ - /* arg3 - index of checking (inside the file) */ + /* arg3 - line number of checking (inside the file) */ Method (M390, 4, Serialized) { Name (TS, "m390") If ((Arg1 == C009)) { - M380 (TS, Arg0, Arg2, Arg3) + M380 (TS, Arg0, Arg2, __LINE__) } ElseIf ((Arg1 == C00A)) { - M381 (TS, Arg0, Arg2, Arg3) + M381 (TS, Arg0, Arg2, __LINE__) } ElseIf ((Arg1 == C00B)) { - M382 (TS, Arg0, Arg2, Arg3) + M382 (TS, Arg0, Arg2, __LINE__) } ElseIf ((Arg1 == C00C)) { - M383 (TS, Arg0, Arg2, Arg3) + M383 (TS, Arg0, Arg2, __LINE__) } } /* arg0 - original object */ /* arg1 - type of it */ /* arg2 - absolute index of file initiating the checking */ - /* arg3 - index of checking (inside the file) */ + /* arg3 - line number of checking (inside the file) */ Method (M391, 4, Serialized) { Name (TS, "m391") If ((Arg1 == C009)) { - M384 (TS, Arg0, Arg2, Arg3) + M384 (TS, Arg0, Arg2, __LINE__) } ElseIf ((Arg1 == C00A)) { - M385 (TS, Arg0, Arg2, Arg3) + M385 (TS, Arg0, Arg2, __LINE__) } ElseIf ((Arg1 == C00B)) { - M386 (TS, Arg0, Arg2, Arg3) + M386 (TS, Arg0, Arg2, __LINE__) } ElseIf ((Arg1 == C00C)) { - M387 (TS, Arg0, Arg2, Arg3) + M387 (TS, Arg0, Arg2, __LINE__) } } diff --git a/tests/aslts/src/runtime/common/operations.asl b/tests/aslts/src/runtime/common/operations.asl index 2d97494..7a87635 100644 --- a/tests/aslts/src/runtime/common/operations.asl +++ b/tests/aslts/src/runtime/common/operations.asl @@ -464,31 +464,31 @@ TMP0 = ObjectType (Arg0) If ((TMP0 != OT00)) { - ERR (TS, Z082, 0x01A3, 0x00, 0x00, TMP0, OT00) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT00) } TMP0 = ObjectType (Arg1) If ((TMP0 != OT01)) { - ERR (TS, Z082, 0x01A7, 0x00, 0x00, TMP0, OT01) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT01) } TMP0 = ObjectType (Arg2) If ((TMP0 != OT02)) { - ERR (TS, Z082, 0x01AB, 0x00, 0x00, TMP0, OT02) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT02) } TMP0 = ObjectType (Arg3) If ((TMP0 != OT03)) { - ERR (TS, Z082, 0x01AF, 0x00, 0x00, TMP0, OT03) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT03) } TMP0 = ObjectType (Arg4) If ((TMP0 != OT04)) { - ERR (TS, Z082, 0x01B3, 0x00, 0x00, TMP0, OT04) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT04) } If (RES0) @@ -496,14 +496,14 @@ TMP0 = ObjectType (Arg5) If ((TMP0 != OT05)) { - ERR (TS, Z082, 0x01B9, 0x00, 0x00, TMP0, OT05) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT05) } } TMP0 = ObjectType (Arg6) If ((TMP0 != OT06)) { - ERR (TS, Z082, 0x01BE, 0x00, 0x00, TMP0, OT06) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT06) } /* Types of LocalX are save, and data of LocalX and ArgX are identical */ @@ -511,7 +511,7 @@ TMP0 = ObjectType (Local0) If ((TMP0 != OT10)) { - ERR (TS, Z082, 0x01C5, 0x00, 0x00, TMP0, OT10) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT10) } Else { @@ -521,7 +521,7 @@ TMP0 = ObjectType (Local1) If ((TMP0 != OT11)) { - ERR (TS, Z082, 0x01CB, 0x00, 0x00, TMP0, OT11) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT11) } Else { @@ -533,7 +533,7 @@ TMP0 = ObjectType (Local2) If ((TMP0 != OT12)) { - ERR (TS, Z082, 0x01D3, 0x00, 0x00, TMP0, OT12) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT12) } Else { @@ -544,7 +544,7 @@ TMP0 = ObjectType (Local3) If ((TMP0 != OT13)) { - ERR (TS, Z082, 0x01DB, 0x00, 0x00, TMP0, OT13) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT13) } Else { @@ -554,7 +554,7 @@ TMP0 = ObjectType (Local4) If ((TMP0 != OT14)) { - ERR (TS, Z082, 0x01E1, 0x00, 0x00, TMP0, OT14) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT14) } Else { @@ -564,7 +564,7 @@ TMP0 = ObjectType (Local5) If ((TMP0 != OT15)) { - ERR (TS, Z082, 0x01E7, 0x00, 0x00, TMP0, OT15) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT15) } ElseIf (RES0) { @@ -574,7 +574,7 @@ TMP0 = ObjectType (Local6) If ((TMP0 != OT16)) { - ERR (TS, Z082, 0x01ED, 0x00, 0x00, TMP0, OT16) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT16) } Else { @@ -585,7 +585,7 @@ { If ((Local7 != Ones)) { - ERR (TS, Z082, 0x01F4, 0x00, 0x00, Local7, Ones) + ERR (TS, Z082, __LINE__, 0x00, 0x00, Local7, Ones) } } ElseIf (RES0) @@ -594,7 +594,7 @@ TMP1 = ObjectType (Arg5) If ((TMP0 != TMP1)) { - ERR (TS, Z082, 0x01FA, 0x00, 0x00, TMP0, TMP1) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, TMP1) } Else { @@ -643,7 +643,7 @@ { If ((Arg3 != Arg4)) { - ERR (Arg0, Z082, 0x0224, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z082, __LINE__, 0x00, 0x00, Arg1, 0x00) Local0 = 0x01 } } @@ -651,7 +651,7 @@ { If ((Arg3 != Arg4)) { - ERR (Arg0, Z082, 0x022A, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z082, __LINE__, 0x00, 0x00, Arg1, 0x00) Local0 = 0x01 } } @@ -659,7 +659,7 @@ { If ((Arg3 != Arg4)) { - ERR (Arg0, Z082, 0x0230, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z082, __LINE__, 0x00, 0x00, Arg1, 0x00) Local0 = 0x01 } } @@ -748,43 +748,43 @@ TMP0 = ObjectType (Arg0) If ((TMP0 != OT00)) { - ERR (TS, Z082, 0x028D, 0x00, 0x00, TMP0, OT00) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT00) } TMP0 = ObjectType (Arg1) If ((TMP0 != OT01)) { - ERR (TS, Z082, 0x0291, 0x00, 0x00, TMP0, OT01) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT01) } TMP0 = ObjectType (Arg2) If ((TMP0 != OT02)) { - ERR (TS, Z082, 0x0295, 0x00, 0x00, TMP0, OT02) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT02) } TMP0 = ObjectType (Arg3) If ((TMP0 != OT03)) { - ERR (TS, Z082, 0x0299, 0x00, 0x00, TMP0, OT03) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT03) } TMP0 = ObjectType (Arg4) If ((TMP0 != OT04)) { - ERR (TS, Z082, 0x029D, 0x00, 0x00, TMP0, OT04) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT04) } TMP0 = ObjectType (Arg5) If ((TMP0 != OT05)) { - ERR (TS, Z082, 0x02A1, 0x00, 0x00, TMP0, OT05) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT05) } TMP0 = ObjectType (Arg6) If ((TMP0 != OT06)) { - ERR (TS, Z082, 0x02A5, 0x00, 0x00, TMP0, OT06) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT06) } /* Types of LocalX are save, and data of LocalX and ArgX are identical */ @@ -792,7 +792,7 @@ TMP0 = ObjectType (Local0) If ((TMP0 != OT10)) { - ERR (TS, Z082, 0x02AC, 0x00, 0x00, TMP0, OT10) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT10) } Else { @@ -802,7 +802,7 @@ TMP0 = ObjectType (Local1) If ((TMP0 != OT11)) { - ERR (TS, Z082, 0x02B2, 0x00, 0x00, TMP0, OT11) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT11) } Else { @@ -812,7 +812,7 @@ TMP0 = ObjectType (Local2) If ((TMP0 != OT12)) { - ERR (TS, Z082, 0x02B8, 0x00, 0x00, TMP0, OT12) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT12) } Else { @@ -822,7 +822,7 @@ TMP0 = ObjectType (Local3) If ((TMP0 != OT13)) { - ERR (TS, Z082, 0x02BE, 0x00, 0x00, TMP0, OT13) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT13) } Else { @@ -832,7 +832,7 @@ TMP0 = ObjectType (Local4) If ((TMP0 != OT14)) { - ERR (TS, Z082, 0x02C4, 0x00, 0x00, TMP0, OT14) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT14) } Else { @@ -842,7 +842,7 @@ TMP0 = ObjectType (Local5) If ((TMP0 != OT15)) { - ERR (TS, Z082, 0x02CA, 0x00, 0x00, TMP0, OT15) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT15) } Else { @@ -852,7 +852,7 @@ TMP0 = ObjectType (Local6) If ((TMP0 != OT16)) { - ERR (TS, Z082, 0x02D1, 0x00, 0x00, TMP0, OT16) + ERR (TS, Z082, __LINE__, 0x00, 0x00, TMP0, OT16) } /* Package is passed by arg6 */ /* m481(ts, 47, tmp0, Local6, arg6) */ @@ -877,7 +877,7 @@ Local3 = 0x00 If ((Local2 != Local0)) { - ERR (TS, Z082, 0x02EB, 0x00, 0x00, 0x00, 0x00) + ERR (TS, Z082, __LINE__, 0x00, 0x00, 0x00, 0x00) Debug = "Expected type of result:" Debug = Local0 Debug = "The type of obtained result:" @@ -886,7 +886,7 @@ } ElseIf ((Local7 != Local1)) { - ERR (TS, Z082, 0x02F2, 0x00, 0x00, 0x00, 0x00) + ERR (TS, Z082, __LINE__, 0x00, 0x00, 0x00, 0x00) Local3 = 0x01 }