Commit a5922a1f authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Improve typechecking, both compile-time and runtime 

ACPICA commit 8d0f96e2a11a4ceabb2cae4b41e0ce1f4d3786b9

Adds much stricter typechecking in the iASL compiler, and
also adds some additional checking in the interpreter.

Link: https://github.com/acpica/acpica/commit/8d0f96e2


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 ca321d1c

drivers/acpi/acpica/aclocal.h

+6 −2
Original line number Diff line number Diff line
@@ -285,13 +285,17 @@ acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state); 
#define ACPI_BTYPE_BUFFER_FIELD         0x00002000

#define ACPI_BTYPE_DDB_HANDLE           0x00004000

#define ACPI_BTYPE_DEBUG_OBJECT         0x00008000

#define ACPI_BTYPE_REFERENCE            0x00010000

#define ACPI_BTYPE_REFERENCE_OBJECT     0x00010000	/* From Index(), ref_of(), etc (type6_opcodes) */

#define ACPI_BTYPE_RESOURCE             0x00020000

#define ACPI_BTYPE_NAMED_REFERENCE      0x00040000	/* Generic unresolved Name or Namepath */



#define ACPI_BTYPE_COMPUTE_DATA         (ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING | ACPI_BTYPE_BUFFER)



#define ACPI_BTYPE_DATA                 (ACPI_BTYPE_COMPUTE_DATA  | ACPI_BTYPE_PACKAGE)

#define ACPI_BTYPE_DATA_REFERENCE       (ACPI_BTYPE_DATA | ACPI_BTYPE_REFERENCE | ACPI_BTYPE_DDB_HANDLE)



	/* Used by Copy, de_ref_of, Store, Printf, Fprintf */



#define ACPI_BTYPE_DATA_REFERENCE       (ACPI_BTYPE_DATA | ACPI_BTYPE_REFERENCE_OBJECT | ACPI_BTYPE_DDB_HANDLE)

#define ACPI_BTYPE_DEVICE_OBJECTS       (ACPI_BTYPE_DEVICE | ACPI_BTYPE_THERMAL | ACPI_BTYPE_PROCESSOR)

#define ACPI_BTYPE_OBJECTS_AND_REFS     0x0001FFFF	/* ARG or LOCAL */

#define ACPI_BTYPE_ALL_OBJECTS          0x0000FFFF

drivers/acpi/acpica/acopcode.h

+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ 
#define ARGI_ARG4                       ARG_NONE

#define ARGI_ARG5                       ARG_NONE

#define ARGI_ARG6                       ARG_NONE

#define ARGI_BANK_FIELD_OP              ARGI_INVALID_OPCODE

#define ARGI_BANK_FIELD_OP              ARGI_LIST1 (ARGI_INTEGER)

#define ARGI_BIT_AND_OP                 ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)

#define ARGI_BIT_NAND_OP                ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)

#define ARGI_BIT_NOR_OP                 ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)
@@ -307,7 +307,7 @@ 
#define ARGI_SLEEP_OP                   ARGI_LIST1 (ARGI_INTEGER)

#define ARGI_STALL_OP                   ARGI_LIST1 (ARGI_INTEGER)

#define ARGI_STATICSTRING_OP            ARGI_INVALID_OPCODE

#define ARGI_STORE_OP                   ARGI_LIST2 (ARGI_DATAREFOBJ, ARGI_TARGETREF)

#define ARGI_STORE_OP                   ARGI_LIST2 (ARGI_DATAREFOBJ, ARGI_STORE_TARGET)

#define ARGI_STRING_OP                  ARGI_INVALID_OPCODE

#define ARGI_SUBTRACT_OP                ARGI_LIST3 (ARGI_INTEGER,    ARGI_INTEGER,       ARGI_TARGETREF)

#define ARGI_THERMAL_ZONE_OP            ARGI_INVALID_OPCODE

drivers/acpi/acpica/amlcode.h

+6 −5
Original line number Diff line number Diff line
@@ -277,14 +277,15 @@ 
#define ARGI_TARGETREF              0x0F	/* Target, subject to implicit conversion */

#define ARGI_FIXED_TARGET           0x10	/* Target, no implicit conversion */

#define ARGI_SIMPLE_TARGET          0x11	/* Name, Local, Arg -- no implicit conversion */

#define ARGI_STORE_TARGET           0x12	/* Target for store is TARGETREF + package objects */



/* Multiple/complex types */



#define ARGI_DATAOBJECT             0x12	/* Buffer, String, package or reference to a node - Used only by size_of operator */

#define ARGI_COMPLEXOBJ             0x13	/* Buffer, String, or package (Used by INDEX op only) */

#define ARGI_REF_OR_STRING          0x14	/* Reference or String (Used by DEREFOF op only) */

#define ARGI_REGION_OR_BUFFER       0x15	/* Used by LOAD op only */

#define ARGI_DATAREFOBJ             0x16

#define ARGI_DATAOBJECT             0x13	/* Buffer, String, package or reference to a node - Used only by size_of operator */

#define ARGI_COMPLEXOBJ             0x14	/* Buffer, String, or package (Used by INDEX op only) */

#define ARGI_REF_OR_STRING          0x15	/* Reference or String (Used by DEREFOF op only) */

#define ARGI_REGION_OR_BUFFER       0x16	/* Used by LOAD op only */

#define ARGI_DATAREFOBJ             0x17



/* Note: types above can expand to 0x1F maximum */

drivers/acpi/acpica/exconvrt.c

+1 −0
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type, 
		break;



	case ARGI_TARGETREF:

	case ARGI_STORE_TARGET:



		switch (destination_type) {

		case ACPI_TYPE_INTEGER:

drivers/acpi/acpica/exresolv.c

+0 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr, 
					 * (i.e., dereference the package index)

					 * Delete the ref object, increment the returned object

					 */

					acpi_ut_remove_reference(stack_desc);

					acpi_ut_add_reference(obj_desc);

					*stack_ptr = obj_desc;

				} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE