summaryrefslogtreecommitdiff
path: root/source/tools/acpiexec/aeexception.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2017-09-29 17:08:30 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2017-09-29 17:08:30 +0000
commit2c673001fb88105f2d160032c4d4b76cb518e37f (patch)
tree3fc3b6aef8822267bd455907a6fce55c3f98b2ed /source/tools/acpiexec/aeexception.c
parent0810e26699e1b40b9384eca2137be6155de0a5ba (diff)
Notes
Diffstat (limited to 'source/tools/acpiexec/aeexception.c')
-rw-r--r--source/tools/acpiexec/aeexception.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/source/tools/acpiexec/aeexception.c b/source/tools/acpiexec/aeexception.c
index 62e9db0a0122..2e44dbc504a3 100644
--- a/source/tools/acpiexec/aeexception.c
+++ b/source/tools/acpiexec/aeexception.c
@@ -196,13 +196,22 @@ AeExceptionHandler (
Exception = AcpiFormatException (AmlStatus);
AcpiOsPrintf (AE_PREFIX
"Exception %s during execution\n", Exception);
+
if (Name)
{
AcpiOsPrintf (AE_PREFIX
- "Evaluating Method or Node: [%4.4s]",
+ "Evaluating Method or Node: [%4.4s]\n",
(char *) &Name);
}
+ /* Be terse about loop timeouts */
+
+ if ((AmlStatus == AE_AML_LOOP_TIMEOUT) && AcpiGbl_AbortLoopOnTimeout)
+ {
+ AcpiOsPrintf (AE_PREFIX "Aborting loop after timeout\n");
+ return (AE_OK);
+ }
+
AcpiOsPrintf ("\n" AE_PREFIX
"AML Opcode [%s], Method Offset ~%5.5X\n",
AcpiPsGetOpcodeName (Opcode), AmlOffset);