From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBQD9-0000RA-4E for qemu-devel@nongnu.org; Tue, 22 Dec 2015 11:54:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBQD5-00016A-4m for qemu-devel@nongnu.org; Tue, 22 Dec 2015 11:54:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBQD4-000166-Rc for qemu-devel@nongnu.org; Tue, 22 Dec 2015 11:54:51 -0500 Date: Tue, 22 Dec 2015 18:54:47 +0200 From: "Michael S. Tsirkin" Message-ID: <1450803119-4223-46-git-send-email-mst@redhat.com> References: <1450803119-4223-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1450803119-4223-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 45/55] acpi: extend aml_shiftright() to accept target argument List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Igor Mammedov , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson From: Igor Mammedov it allows to express ShiftRight(A,B,C) syntax Signed-off-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Marcel Apfelbaum --- include/hw/acpi/aml-build.h | 2 +- hw/acpi/aml-build.c | 4 ++-- hw/i386/acpi-build.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index c3d3fd5..365e388 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -229,7 +229,7 @@ Aml *aml_store(Aml *val, Aml *target); Aml *aml_and(Aml *arg1, Aml *arg2); Aml *aml_or(Aml *arg1, Aml *arg2); Aml *aml_shiftleft(Aml *arg1, Aml *count); -Aml *aml_shiftright(Aml *arg1, Aml *count); +Aml *aml_shiftright(Aml *arg1, Aml *count, Aml *dst); Aml *aml_lless(Aml *arg1, Aml *arg2); Aml *aml_add(Aml *arg1, Aml *arg2, Aml *dst); Aml *aml_subtract(Aml *arg1, Aml *arg2, Aml *dst); diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index f58eb01..9337b87 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -491,9 +491,9 @@ Aml *aml_shiftleft(Aml *arg1, Aml *count) } /* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefShiftRight */ -Aml *aml_shiftright(Aml *arg1, Aml *count) +Aml *aml_shiftright(Aml *arg1, Aml *count, Aml *dst) { - return build_opcode_2arg_dst(0x7A /* ShiftRightOp */, arg1, count, NULL); + return build_opcode_2arg_dst(0x7A /* ShiftRightOp */, arg1, count, dst); } /* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefLLess */ diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 16fb168..35ea92d 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -667,7 +667,7 @@ static Aml *build_prt(void) /* slot = pin >> 2 */ aml_append(while_ctx, - aml_store(aml_shiftright(pin, aml_int(2)), slot)); + aml_store(aml_shiftright(pin, aml_int(2), NULL), slot)); /* lnk_idx = (slot + pin) & 3 */ aml_append(while_ctx, aml_store(aml_and(aml_add(pin, slot, NULL), aml_int(3)), lnk_idx)); -- MST