Date: Fri, 10 Apr 2015 05:11:55 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383691 - in head/sysutils/acpica-tools: . files Message-ID: <201504100511.t3A5BtlA062711@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Fri Apr 10 05:11:54 2015 New Revision: 383691 URL: https://svnweb.freebsd.org/changeset/ports/383691 Log: Revert an upstream commit to fix a serious disassembler regression. Added: head/sysutils/acpica-tools/files/patch-source__components__disassembler__dmcstyle.c (contents, props changed) Modified: head/sysutils/acpica-tools/Makefile Modified: head/sysutils/acpica-tools/Makefile ============================================================================== --- head/sysutils/acpica-tools/Makefile Fri Apr 10 04:16:28 2015 (r383690) +++ head/sysutils/acpica-tools/Makefile Fri Apr 10 05:11:54 2015 (r383691) @@ -2,6 +2,7 @@ PORTNAME= acpica PORTVERSION= 20150408 +PORTREVISION= 1 CATEGORIES= sysutils devel MASTER_SITES= https://acpica.org/sites/acpica/files/ \ LOCAL Added: head/sysutils/acpica-tools/files/patch-source__components__disassembler__dmcstyle.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/acpica-tools/files/patch-source__components__disassembler__dmcstyle.c Fri Apr 10 05:11:54 2015 (r383691) @@ -0,0 +1,68 @@ +--- ../../source/components/disassembler/dmcstyle.c.orig 2015-04-08 13:17:53.000000000 -0400 ++++ ../../source/components/disassembler/dmcstyle.c 2015-04-10 00:55:46.808791000 -0400 +@@ -114,20 +114,12 @@ + 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 @@ + /* 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 @@ + /* 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 @@ + * 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504100511.t3A5BtlA062711>