Message ID | 1425567322-8337-5-git-send-email-marcel@redhat.com |
---|---|
State | New |
Headers | show |
On Thu, 5 Mar 2015 16:55:02 +0200 Marcel Apfelbaum <marcel@redhat.com> wrote: > Add encoding for ACPI DefIndex Opcode. > > Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> > --- > hw/acpi/aml-build.c | 10 ++++++++++ > include/hw/acpi/aml-build.h | 1 + > 2 files changed, 11 insertions(+) > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index 611c949..0b3fcda 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -477,6 +477,16 @@ Aml *aml_add(Aml *arg1, Aml *arg2) > return var; > } > > +/* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefIndex */ > +Aml *aml_index(Aml *arg1, Aml *idx) > +{ > + Aml *var = aml_opcode(0x88 /* IndexOp */); could you add assert to check that Arg1 is BuffPkgStrObj? > + aml_append(var, arg1); > + aml_append(var, idx); > + build_append_int(var->buf, 0x00 /* NullNameOp */); > + return var; > +} > + > /* ACPI 1.0b: 16.2.5.3 Type 1 Opcodes Encoding: DefNotify */ > Aml *aml_notify(Aml *arg1, Aml *arg2) > { > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index edc0520..b860732 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -140,6 +140,7 @@ Aml *aml_and(Aml *arg1, Aml *arg2); > Aml *aml_or(Aml *arg1, Aml *arg2); > Aml *aml_lless(Aml *arg1, Aml *arg2); > Aml *aml_add(Aml *arg1, Aml *arg2); > +Aml *aml_index(Aml *arg1, Aml *idx); > Aml *aml_notify(Aml *arg1, Aml *arg2); > Aml *aml_call1(const char *method, Aml *arg1); > Aml *aml_call2(const char *method, Aml *arg1, Aml *arg2);
On 03/06/2015 12:40 PM, Igor Mammedov wrote: > On Thu, 5 Mar 2015 16:55:02 +0200 > Marcel Apfelbaum <marcel@redhat.com> wrote: > >> Add encoding for ACPI DefIndex Opcode. >> >> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> >> --- >> hw/acpi/aml-build.c | 10 ++++++++++ >> include/hw/acpi/aml-build.h | 1 + >> 2 files changed, 11 insertions(+) >> >> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c >> index 611c949..0b3fcda 100644 >> --- a/hw/acpi/aml-build.c >> +++ b/hw/acpi/aml-build.c >> @@ -477,6 +477,16 @@ Aml *aml_add(Aml *arg1, Aml *arg2) >> return var; >> } >> >> +/* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefIndex */ >> +Aml *aml_index(Aml *arg1, Aml *idx) >> +{ >> + Aml *var = aml_opcode(0x88 /* IndexOp */); > could you add assert to check that Arg1 is BuffPkgStrObj? Sure, thanks! Marcel > >> + aml_append(var, arg1); >> + aml_append(var, idx); >> + build_append_int(var->buf, 0x00 /* NullNameOp */); >> + return var; >> +} >> + >> /* ACPI 1.0b: 16.2.5.3 Type 1 Opcodes Encoding: DefNotify */ >> Aml *aml_notify(Aml *arg1, Aml *arg2) >> { >> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h >> index edc0520..b860732 100644 >> --- a/include/hw/acpi/aml-build.h >> +++ b/include/hw/acpi/aml-build.h >> @@ -140,6 +140,7 @@ Aml *aml_and(Aml *arg1, Aml *arg2); >> Aml *aml_or(Aml *arg1, Aml *arg2); >> Aml *aml_lless(Aml *arg1, Aml *arg2); >> Aml *aml_add(Aml *arg1, Aml *arg2); >> +Aml *aml_index(Aml *arg1, Aml *idx); >> Aml *aml_notify(Aml *arg1, Aml *arg2); >> Aml *aml_call1(const char *method, Aml *arg1); >> Aml *aml_call2(const char *method, Aml *arg1, Aml *arg2); >
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 611c949..0b3fcda 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -477,6 +477,16 @@ Aml *aml_add(Aml *arg1, Aml *arg2) return var; } +/* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefIndex */ +Aml *aml_index(Aml *arg1, Aml *idx) +{ + Aml *var = aml_opcode(0x88 /* IndexOp */); + aml_append(var, arg1); + aml_append(var, idx); + build_append_int(var->buf, 0x00 /* NullNameOp */); + return var; +} + /* ACPI 1.0b: 16.2.5.3 Type 1 Opcodes Encoding: DefNotify */ Aml *aml_notify(Aml *arg1, Aml *arg2) { diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index edc0520..b860732 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -140,6 +140,7 @@ Aml *aml_and(Aml *arg1, Aml *arg2); Aml *aml_or(Aml *arg1, Aml *arg2); Aml *aml_lless(Aml *arg1, Aml *arg2); Aml *aml_add(Aml *arg1, Aml *arg2); +Aml *aml_index(Aml *arg1, Aml *idx); Aml *aml_notify(Aml *arg1, Aml *arg2); Aml *aml_call1(const char *method, Aml *arg1); Aml *aml_call2(const char *method, Aml *arg1, Aml *arg2);
Add encoding for ACPI DefIndex Opcode. Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> --- hw/acpi/aml-build.c | 10 ++++++++++ include/hw/acpi/aml-build.h | 1 + 2 files changed, 11 insertions(+)