Commit 5b0bbfbd authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki

ACPICA: iASL/disassembler - fix possible fault for -e option.

ACPICA commit 403b8b0023fd7549b2f9bf818fcc1ba481047b69

If non-AML files are used with the -e option, the disassembler
can fault. The fix is to ensure that all -e files are either
SSDTs or a DSDT. ACPICA BZ 1158.

Link: https://github.com/acpica/acpica/commit/403b8b00
Reference: https://bugs.acpica.org/show_bug.cgi?id=1158Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 80fa6cf9
...@@ -231,7 +231,9 @@ void acpi_db_open_debug_file(char *name); ...@@ -231,7 +231,9 @@ void acpi_db_open_debug_file(char *name);
acpi_status acpi_db_load_acpi_table(char *filename); acpi_status acpi_db_load_acpi_table(char *filename);
acpi_status acpi_status
acpi_db_get_table_from_file(char *filename, struct acpi_table_header **table); acpi_db_get_table_from_file(char *filename,
struct acpi_table_header **table,
u8 must_be_aml_table);
/* /*
* dbhistry - debugger HISTORY command * dbhistry - debugger HISTORY command
......
...@@ -312,7 +312,7 @@ acpi_ut_read_table_from_file(char *filename, struct acpi_table_header ** table) ...@@ -312,7 +312,7 @@ acpi_ut_read_table_from_file(char *filename, struct acpi_table_header ** table)
/* Get the entire file */ /* Get the entire file */
fprintf(stderr, fprintf(stderr,
"Loading Acpi table from file %10s - Length %.8u (%06X)\n", "Reading ACPI table from file %10s - Length %.8u (0x%06X)\n",
filename, file_size, file_size); filename, file_size, file_size);
status = acpi_ut_read_table(file, table, &table_length); status = acpi_ut_read_table(file, table, &table_length);
......
...@@ -107,9 +107,16 @@ acpi_exception(const char *module_name, ...@@ -107,9 +107,16 @@ acpi_exception(const char *module_name,
va_list arg_list; va_list arg_list;
ACPI_MSG_REDIRECT_BEGIN; ACPI_MSG_REDIRECT_BEGIN;
acpi_os_printf(ACPI_MSG_EXCEPTION "%s, ",
acpi_format_exception(status));
/* For AE_OK, just print the message */
if (ACPI_SUCCESS(status)) {
acpi_os_printf(ACPI_MSG_EXCEPTION);
} else {
acpi_os_printf(ACPI_MSG_EXCEPTION "%s, ",
acpi_format_exception(status));
}
va_start(arg_list, format); va_start(arg_list, format);
acpi_os_vprintf(format, arg_list); acpi_os_vprintf(format, arg_list);
ACPI_MSG_SUFFIX; ACPI_MSG_SUFFIX;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment