diff options
| author | Igor Mammedov | 2015-12-10 00:41:02 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-12-22 17:39:21 +0100 |
| commit | 20ca52088448252c392cde99a06bb9bf020413b4 (patch) | |
| tree | 7aa0c8d6d6ae5c956c411f977da77b585d9d8af8 /hw | |
| parent | acpi: aml: add helper for Opcode Arg2 Arg2 [Dst] AML pattern (diff) | |
| download | qemu-20ca52088448252c392cde99a06bb9bf020413b4.tar.gz qemu-20ca52088448252c392cde99a06bb9bf020413b4.tar.xz qemu-20ca52088448252c392cde99a06bb9bf020413b4.zip | |
acpi: extend aml_add() to accept target argument
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 <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/acpi/aml-build.c | 4 | ||||
| -rw-r--r-- | hw/i386/acpi-build.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index c661d58718..15bb5bdafe 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 479b11ec4d..16fb168611 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)); |