On 12/10/2015 01:41 AM, Igor Mammedov wrote:
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 <imamm...@redhat.com> --- hw/acpi/aml-build.c | 4 ++-- hw/i386/acpi-build.c | 2 +- include/hw/acpi/aml-build.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 22015d2..3bb19bf 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 95e0c65..bce0252 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -669,7 +669,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)); diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index c113b17..da38c92 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -204,7 +204,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);
Reviewed-by: Marcel Apfelbaum <mar...@redhat.com>
