diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-11-26 19:57:06 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-11-26 19:57:06 +0000 |
| commit | b252b09cf2d3193465c7734ba49a5479db9ee060 (patch) | |
| tree | efb1eacdd0fc8f2a5f06828bfc493798bcdc27e3 /usr.sbin | |
| parent | 99c7bb4a728e4ee4d04f67b483093a60d6aa464b (diff) | |
Decode CreateQWordFiled().
ok marco@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/acpidump/aml/aml_parse.c | 12 | ||||
| -rw-r--r-- | usr.sbin/acpidump/asl_dump.c | 14 |
2 files changed, 19 insertions, 7 deletions
diff --git a/usr.sbin/acpidump/aml/aml_parse.c b/usr.sbin/acpidump/aml/aml_parse.c index e13e4a4183b..a0783c46528 100644 --- a/usr.sbin/acpidump/aml/aml_parse.c +++ b/usr.sbin/acpidump/aml/aml_parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aml_parse.c,v 1.4 2006/10/31 01:15:13 millert Exp $ */ +/* $OpenBSD: aml_parse.c,v 1.5 2007/11/26 19:57:05 kettenis Exp $ */ /*- * Copyright (c) 1999 Doug Rabson * Copyright (c) 1999, 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org> @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aml_parse.c,v 1.4 2006/10/31 01:15:13 millert Exp $ + * $Id: aml_parse.c,v 1.5 2007/11/26 19:57:05 kettenis Exp $ * $FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_parse.c,v 1.7 2001/10/23 14:54:15 takawata Exp $ */ @@ -1310,9 +1310,10 @@ aml_parse_termobj(struct aml_environ *env, int indent) union aml_object *srcobj; union aml_object *obj; union aml_object *srcbuf; - static int widthtbl[4] = {32, 16, 8, 1}; - const char *opname[4] = {"CreateDWordField", "CreateWordField", - "CreateByteField", "CreateBitField"}; + static int widthtbl[6] = {32, 16, 8, 1, -1, 64}; + const char *opname[6] = {"CreateDWordField", "CreateWordField", + "CreateByteField", "CreateBitField", + NULL, "CreateQWordField"}; aname = &env->tempname; ret = &env->tempobject; @@ -1970,6 +1971,7 @@ aml_parse_termobj(struct aml_environ *env, int indent) case 0x8b: case 0x8c: case 0x8d: + case 0x8f: /* CreateDWordFieldOp */ widthindex = *(env->dp - 1) - 0x8a; AML_DEBUGPRINT("%s(", opname[widthindex]); diff --git a/usr.sbin/acpidump/asl_dump.c b/usr.sbin/acpidump/asl_dump.c index fea5484ee1d..7e7e2529779 100644 --- a/usr.sbin/acpidump/asl_dump.c +++ b/usr.sbin/acpidump/asl_dump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asl_dump.c,v 1.4 2007/09/22 19:42:19 otto Exp $ */ +/* $OpenBSD: asl_dump.c,v 1.5 2007/11/26 19:57:05 kettenis Exp $ */ /*- * Copyright (c) 1999 Doug Rabson * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org> @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: asl_dump.c,v 1.4 2007/09/22 19:42:19 otto Exp $ + * $Id: asl_dump.c,v 1.5 2007/11/26 19:57:05 kettenis Exp $ * $FreeBSD: src/usr.sbin/acpi/acpidump/asl_dump.c,v 1.5 2001/10/23 14:53:58 takawata Exp $ */ @@ -1236,6 +1236,16 @@ asl_dump_termobj(u_int8_t **dpp, int indent) asl_dump_termobj(&dp, indent); printf(")"); break; + case 0x8f: /* CreateQWordFieldOp */ + printf("CreateQWordField("); + asl_dump_termobj(&dp, indent); + printf(", "); + asl_dump_termobj(&dp, indent); + printf(", "); + ASL_CREATE_LOCALNAMEOBJ(dp); + asl_dump_termobj(&dp, indent); + printf(")"); + break; case 0x90: printf("LAnd("); asl_dump_termobj(&dp, indent); |