diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2018-04-27 21:30:01 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2018-04-27 21:30:01 +0000 |
| commit | 5dc04bcfd5c1bd0942e4a6640bf39d15f464af4f (patch) | |
| tree | 78a599bc6dc9341412480da5af5b8f78175d1d65 /source/tools | |
| parent | e44d3d8ceb12ae786d331468fe4acf41a4af5424 (diff) | |
Notes
Diffstat (limited to 'source/tools')
| -rw-r--r-- | source/tools/acpiexec/aecommon.h | 1 | ||||
| -rw-r--r-- | source/tools/acpiexec/aeexception.c | 13 | ||||
| -rw-r--r-- | source/tools/acpiexec/aemain.c | 12 |
3 files changed, 22 insertions, 4 deletions
diff --git a/source/tools/acpiexec/aecommon.h b/source/tools/acpiexec/aecommon.h index 4f560a22aab2..49a386be50a6 100644 --- a/source/tools/acpiexec/aecommon.h +++ b/source/tools/acpiexec/aecommon.h @@ -189,6 +189,7 @@ typedef struct ae_debug_regions } AE_DEBUG_REGIONS; +extern BOOLEAN AcpiGbl_UseLocalFaultHandler; extern BOOLEAN AcpiGbl_IgnoreErrors; extern BOOLEAN AcpiGbl_AbortLoopOnTimeout; extern UINT8 AcpiGbl_RegionFillValue; diff --git a/source/tools/acpiexec/aeexception.c b/source/tools/acpiexec/aeexception.c index b5bb4aecddf9..2f5bfb22d395 100644 --- a/source/tools/acpiexec/aeexception.c +++ b/source/tools/acpiexec/aeexception.c @@ -199,9 +199,16 @@ AeExceptionHandler ( if (Name) { - AcpiOsPrintf (AE_PREFIX - "Evaluating Method or Node: [%4.4s]\n", - (char *) &Name); + if (ACPI_COMPARE_NAME (&Name, ACPI_ROOT_PATHNAME)) + { + AcpiOsPrintf (AE_PREFIX + "Evaluating executable code at [%s]\n", ACPI_NAMESPACE_ROOT); + } + else + { + AcpiOsPrintf (AE_PREFIX + "Evaluating Method or Node: [%4.4s]\n", (char *) &Name); + } } /* Be terse about loop timeouts */ diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c index 0bf9b3c6193e..f1ad2aa65d46 100644 --- a/source/tools/acpiexec/aemain.c +++ b/source/tools/acpiexec/aemain.c @@ -187,6 +187,7 @@ AeDoOptions ( /* Globals */ +BOOLEAN AcpiGbl_UseLocalFaultHandler = TRUE; UINT8 AcpiGbl_RegionFillValue = 0; BOOLEAN AcpiGbl_IgnoreErrors = FALSE; BOOLEAN AcpiGbl_AbortLoopOnTimeout = FALSE; @@ -248,6 +249,7 @@ usage ( printf ("\n"); ACPI_OPTION ("-da", "Disable method abort on error"); + ACPI_OPTION ("-df", "Disable Local fault handler"); ACPI_OPTION ("-di", "Disable execution of STA/INI methods during init"); ACPI_OPTION ("-do", "Disable Operation Region address simulation"); ACPI_OPTION ("-dp", "Disable TermList parsing for scope objects"); @@ -330,6 +332,11 @@ AeDoOptions ( AcpiGbl_IgnoreErrors = TRUE; break; + case 'f': + + AcpiGbl_UseLocalFaultHandler = FALSE; + break; + case 'i': AcpiGbl_DbOpt_NoIniMethods = TRUE; @@ -600,7 +607,10 @@ main ( ACPI_DEBUG_INITIALIZE (); /* For debug version only */ signal (SIGINT, AeSignalHandler); - signal (SIGSEGV, AeSignalHandler); + if (AcpiGbl_UseLocalFaultHandler) + { + signal (SIGSEGV, AeSignalHandler); + } /* Init debug globals */ |