Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bee900db authored by David E. Box's avatar David E. Box Committed by Rafael J. Wysocki
Browse files

ACPICA: Disassembler: Do not unconditionally remove temporary names 

ACPICA commit c46f496df41e53a368f877f88b70bdfc9bd6fdbe

Change the Switch disassembly code to check if the conversion can be
done before removing temporary (_T_x) names. Prevents invalid
disassembly of AML created by older compilers (circa 2005).

Link: https://github.com/acpica/acpica/commit/c46f496d
Link: https://bugs.acpica.org/show_bug.cgi?id=1358
Link: https://bugs.acpica.org/show_bug.cgi?id=1360


Reported-by: default avatar <racerrehabman@gmail.com>
Signed-off-by: default avatarDavid E. Box <david.e.box@linux.intel.com>
Signed-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 bb1e23e6

drivers/acpi/acpica/aclocal.h

+4 −3
Original line number Diff line number Diff line
@@ -784,9 +784,10 @@ union acpi_parse_value { 
#define ACPI_DASM_LNOT_SUFFIX           0x09	/* End  of a Lnot_equal (etc.) pair of opcodes */

#define ACPI_DASM_HID_STRING            0x0A	/* String is a _HID or _CID */

#define ACPI_DASM_IGNORE_SINGLE         0x0B	/* Ignore the opcode but not it's children */

#define ACPI_DASM_SWITCH_PREDICATE      0x0C	/* Object is a predicate for a Switch or Case block */

#define ACPI_DASM_CASE                  0x0D	/* If/Else is a Case in a Switch/Case block */

#define ACPI_DASM_DEFAULT               0x0E	/* Else is a Default in a Switch/Case block */

#define ACPI_DASM_SWITCH                0x0C	/* While is a Switch */

#define ACPI_DASM_SWITCH_PREDICATE      0x0D	/* Object is a predicate for a Switch or Case block */

#define ACPI_DASM_CASE                  0x0E	/* If/Else is a Case in a Switch/Case block */

#define ACPI_DASM_DEFAULT               0x0F	/* Else is a Default in a Switch/Case block */



/*

 * Generic operation (for example:  If, While, Store)