[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 41/55] acpi: extend aml_add() to accept target argume
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 41/55] acpi: extend aml_add() to accept target argument |
Date: |
Tue, 22 Dec 2015 18:54:37 +0200 |
From: Igor Mammedov <address@hidden>
it allows to express following ASL expression:
Add(arg1, arg2, result)
usecases that do not need to store result
should pass NULL as 3rd arg that would express
Add(arg1, arg2,)
construct.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
---
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 4acc4d0..0769b35 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -230,7 +230,7 @@ Aml *aml_or(Aml *arg1, Aml *arg2);
Aml *aml_shiftleft(Aml *arg1, Aml *count);
Aml *aml_shiftright(Aml *arg1, Aml *count);
Aml *aml_lless(Aml *arg1, Aml *arg2);
-Aml *aml_add(Aml *arg1, Aml *arg2);
+Aml *aml_add(Aml *arg1, Aml *arg2, Aml *dst);
Aml *aml_increment(Aml *arg);
Aml *aml_index(Aml *arg1, Aml *idx);
Aml *aml_notify(Aml *arg1, Aml *arg2);
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index c661d58..15bb5bd 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -497,9 +497,9 @@ Aml *aml_lless(Aml *arg1, Aml *arg2)
}
/* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefAdd */
-Aml *aml_add(Aml *arg1, Aml *arg2)
+Aml *aml_add(Aml *arg1, Aml *arg2, Aml *dst)
{
- return build_opcode_2arg_dst(0x72 /* AddOp */, arg1, arg2, NULL);
+ return build_opcode_2arg_dst(0x72 /* AddOp */, arg1, arg2, dst);
}
/* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefIncrement */
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 479b11e..16fb168 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -670,7 +670,7 @@ static Aml *build_prt(void)
aml_store(aml_shiftright(pin, aml_int(2)), slot));
/* lnk_idx = (slot + pin) & 3 */
aml_append(while_ctx,
- aml_store(aml_and(aml_add(pin, slot), aml_int(3)),
lnk_idx));
+ aml_store(aml_and(aml_add(pin, slot, NULL), aml_int(3)), lnk_idx));
/* route[2] = "LNK[D|A|B|C]", selection based on pin % 3 */
aml_append(while_ctx, initialize_route(route, "LNKD", lnk_idx, 0));
--
MST
- [Qemu-devel] [PULL 31/55] acpi: support specified oem table id for build_header, (continued)
- [Qemu-devel] [PULL 31/55] acpi: support specified oem table id for build_header, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 32/55] nvdimm acpi: build ACPI NFIT table, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 33/55] nvdimm acpi: build ACPI nvdimm devices, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 34/55] nvdimm: add maintain info, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 35/55] acpi: add aml_derefof, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 36/55] acpi: add aml_sizeof, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 37/55] acpi: add aml_lgreater_equal(), Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 38/55] acpi: add aml_mutex(), aml_acquire(), aml_release(), Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 39/55] acpi: add aml_create_qword_field(), Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 40/55] acpi: aml: add helper for Opcode Arg2 Arg2 [Dst] AML pattern, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 41/55] acpi: extend aml_add() to accept target argument,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 42/55] acpi: add aml_decrement() and aml_subtract(), Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 43/55] acpi: add aml_call0() helper, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 44/55] acpi: add aml_to_integer(), Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 46/55] acpi: add aml_alias(), Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 45/55] acpi: extend aml_shiftright() to accept target argument, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 47/55] acpi: add aml_sleep(), Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 48/55] acpi: add aml_lor(), Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 50/55] acpi: extend aml_field() to support LockRule, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 49/55] acpi: add aml_lgreater(), Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 51/55] acpi: add aml_to_hexstring(), Michael S. Tsirkin, 2015/12/22