Date: Fri, 10 Apr 2015 17:54:54 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r281374 - in vendor-sys/acpica/dist: . source/components/disassembler source/include Message-ID: <201504101754.t3AHssYx027944@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Fri Apr 10 17:54:53 2015 New Revision: 281374 URL: https://svnweb.freebsd.org/changeset/base/281374 Log: Import ACPICA 20150410. Modified: vendor-sys/acpica/dist/changes.txt vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c vendor-sys/acpica/dist/source/include/acpixf.h Modified: vendor-sys/acpica/dist/changes.txt ============================================================================== --- vendor-sys/acpica/dist/changes.txt Fri Apr 10 17:50:28 2015 (r281373) +++ vendor-sys/acpica/dist/changes.txt Fri Apr 10 17:54:53 2015 (r281374) @@ -1,4 +1,11 @@ ---------------------------------------- +10 April 2015. Summary of changes for version 20150410: + +Reverted a change introduced in version 20150408 that caused +a regression in the disassembler where incorrect operator +symbols could be emitted. + +---------------------------------------- 08 April 2015. Summary of changes for version 20150408: Modified: vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c ============================================================================== --- vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c Fri Apr 10 17:50:28 2015 (r281373) +++ vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c Fri Apr 10 17:54:53 2015 (r281374) @@ -114,20 +114,12 @@ AcpiDmCheckForSymbolicOpcode ( Child1 = AcpiPsGetArg (Op, 0); if (!Child1) { - /* Parse tree may be confused or corrupted */ - return (FALSE); } /* Get the second operand */ Child2 = Child1->Common.Next; - if (!Child2) - { - /* Parse tree may be confused or corrupted */ - - return (FALSE); - } /* Setup the operator string for this opcode */ @@ -307,16 +299,8 @@ AcpiDmCheckForSymbolicOpcode ( /* Target is 3rd operand */ Target = Child2->Common.Next; - if (Op->Common.AmlOpcode == AML_DIVIDE_OP) { - if (!Target) - { - /* Parse tree may be confused or corrupted */ - - return (FALSE); - } - /* * Divide has an extra target operand (Remainder). * If this extra target is specified, it cannot be converted @@ -419,13 +403,6 @@ AcpiDmCheckForSymbolicOpcode ( /* Target is optional, 3rd operand */ Target = Child2->Common.Next; - if (!Target) - { - /* Parse tree may be confused or corrupted */ - - return (FALSE); - } - if (AcpiDmIsValidTarget (Target)) { AcpiDmPromoteTarget (Op, Target); @@ -446,13 +423,6 @@ AcpiDmCheckForSymbolicOpcode ( * source so that the target is processed first. */ Target = Child1->Common.Next; - if (!Target) - { - /* Parse tree may be confused or corrupted */ - - return (FALSE); - } - AcpiDmPromoteTarget (Op, Target); if (!Target->Common.OperatorSymbol) Modified: vendor-sys/acpica/dist/source/include/acpixf.h ============================================================================== --- vendor-sys/acpica/dist/source/include/acpixf.h Fri Apr 10 17:50:28 2015 (r281373) +++ vendor-sys/acpica/dist/source/include/acpixf.h Fri Apr 10 17:54:53 2015 (r281374) @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20150408 +#define ACPI_CA_VERSION 0x20150410 #include "acconfig.h" #include "actypes.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504101754.t3AHssYx027944>