From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOA5d-000818-6j for qemu-devel@nongnu.org; Wed, 18 Feb 2015 14:15:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOA5c-0004GT-3R for qemu-devel@nongnu.org; Wed, 18 Feb 2015 14:15:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60866) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOA5b-0004G7-SE for qemu-devel@nongnu.org; Wed, 18 Feb 2015 14:15:16 -0500 From: Igor Mammedov Date: Wed, 18 Feb 2015 19:14:20 +0000 Message-Id: <1424286895-21611-8-git-send-email-imammedo@redhat.com> In-Reply-To: <1424286895-21611-1-git-send-email-imammedo@redhat.com> References: <1424286895-21611-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v4 07/42] acpi: add aml_name() & aml_name_decl() term List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: drjones@redhat.com, mst@redhat.com, zhaoshenglong@huawei.com, marcel.a@redhat.com Signed-off-by: Igor Mammedov --- hw/acpi/aml-build.c | 32 ++++++++++++++++++++++++++++++++ include/hw/acpi/aml-build.h | 4 ++++ 2 files changed, 36 insertions(+) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index d19d1fb..cb00a1b 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -271,6 +271,15 @@ static Aml *aml_alloc(void) return var; } +static Aml *aml_opcode(uint8_t op) +{ + Aml *var = aml_alloc(); + + var->op = op; + var->block_flags = AML_OPCODE; + return var; +} + static Aml *aml_bundle(uint8_t op, AmlBlockFlags flags) { Aml *var = aml_alloc(); @@ -356,6 +365,29 @@ Aml *aml_scope(const char *name_format, ...) return var; } +/* + * helper to construct NameString, which returns Aml object + * for using with aml_append or other aml_* terms + */ +Aml *aml_name(const char *name_format, ...) +{ + va_list ap; + Aml *var = aml_alloc(); + va_start(ap, name_format); + build_append_namestringv(var->buf, name_format, ap); + va_end(ap); + return var; +} + +/* ACPI 1.0b: 16.2.5.1 Namespace Modifier Objects Encoding: DefName */ +Aml *aml_name_decl(const char *name, Aml *val) +{ + Aml *var = aml_opcode(0x08 /* NameOp */); + build_append_namestring(var->buf, "%s", name); + aml_append(var, val); + return var; +} + /* ACPI 1.0b: 16.2.5.3 Type 1 Opcodes Encoding: DefIfElse */ Aml *aml_if(Aml *predicate) { diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 13cc9e9..946aece 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -59,6 +59,10 @@ void free_aml_allocator(void); */ void aml_append(Aml *parent_ctx, Aml *child); +/* non block AML object primitives */ +Aml *aml_name(const char *name_format, ...) GCC_FMT_ATTR(1, 2); +Aml *aml_name_decl(const char *name, Aml *val); + /* Block AML object primitives */ Aml *aml_scope(const char *name_format, ...) GCC_FMT_ATTR(1, 2); Aml *aml_device(const char *name_format, ...) GCC_FMT_ATTR(1, 2); -- 1.8.3.1