diff options
author | jkim <jkim@FreeBSD.org> | 2013-05-17 23:13:40 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2013-05-17 23:13:40 +0000 |
commit | af69f95bba3597db53a980597cfd371c9f6ee7cf (patch) | |
tree | 740dae2325e162bb086ea6e7e5d481c4b669e232 /source/components/disassembler/dmopcode.c | |
parent | 00f95aec269522bc092cf85fe57fcfc19efecec9 (diff) | |
download | FreeBSD-src-af69f95bba3597db53a980597cfd371c9f6ee7cf.zip FreeBSD-src-af69f95bba3597db53a980597cfd371c9f6ee7cf.tar.gz |
Import ACPICA 20130517.
Diffstat (limited to 'source/components/disassembler/dmopcode.c')
-rw-r--r-- | source/components/disassembler/dmopcode.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/source/components/disassembler/dmopcode.c b/source/components/disassembler/dmopcode.c index ad69531..490fa8c 100644 --- a/source/components/disassembler/dmopcode.c +++ b/source/components/disassembler/dmopcode.c @@ -121,6 +121,7 @@ AcpiDmPredefinedDescription ( switch (NameString[1]) { case 'A': + if ((NameString[2] == 'C') && (LastCharIsDigit)) { NameString = "_ACx"; @@ -132,6 +133,7 @@ AcpiDmPredefinedDescription ( break; case 'E': + if ((NameString[2] == 'J') && (LastCharIsDigit)) { NameString = "_EJx"; @@ -143,6 +145,7 @@ AcpiDmPredefinedDescription ( break; case 'L': + if (LastCharsAreHex) { NameString = "_Lxx"; @@ -150,6 +153,7 @@ AcpiDmPredefinedDescription ( break; case 'Q': + if (LastCharsAreHex) { NameString = "_Qxx"; @@ -157,6 +161,7 @@ AcpiDmPredefinedDescription ( break; case 'T': + if (NameString[2] == '_') { NameString = "_T_x"; @@ -164,6 +169,7 @@ AcpiDmPredefinedDescription ( break; case 'W': + if (LastCharsAreHex) { NameString = "_Wxx"; @@ -171,6 +177,7 @@ AcpiDmPredefinedDescription ( break; default: + break; } @@ -536,21 +543,26 @@ AcpiDmDisassembleOneOp ( return; case ACPI_DASM_LNOT_SUFFIX: + switch (Op->Common.AmlOpcode) { case AML_LEQUAL_OP: + AcpiOsPrintf ("LNotEqual"); break; case AML_LGREATER_OP: + AcpiOsPrintf ("LLessEqual"); break; case AML_LLESS_OP: + AcpiOsPrintf ("LGreaterEqual"); break; default: + break; } Op->Common.DisasmOpcode = 0; @@ -589,7 +601,6 @@ AcpiDmDisassembleOneOp ( AcpiOsPrintf ("0x%2.2X", (UINT32) Op->Common.Value.Integer); break; - case AML_WORD_OP: if (Op->Common.DisasmOpcode == ACPI_DASM_EISAID) @@ -602,7 +613,6 @@ AcpiDmDisassembleOneOp ( } break; - case AML_DWORD_OP: if (Op->Common.DisasmOpcode == ACPI_DASM_EISAID) @@ -615,22 +625,18 @@ AcpiDmDisassembleOneOp ( } break; - case AML_QWORD_OP: AcpiOsPrintf ("0x%8.8X%8.8X", ACPI_FORMAT_UINT64 (Op->Common.Value.Integer)); break; - case AML_STRING_OP: AcpiUtPrintString (Op->Common.Value.String, ACPI_UINT8_MAX); break; - case AML_BUFFER_OP: - /* * Determine the type of buffer. We can have one of the following: * @@ -680,7 +686,6 @@ AcpiDmDisassembleOneOp ( } break; - case AML_INT_STATICSTRING_OP: if (Op->Common.Value.String) @@ -693,13 +698,11 @@ AcpiDmDisassembleOneOp ( } break; - case AML_INT_NAMEPATH_OP: AcpiDmNamestring (Op->Common.Value.Name); break; - case AML_INT_NAMEDFIELD_OP: Length = AcpiDmDumpName (Op->Named.Name); @@ -710,7 +713,6 @@ AcpiDmDisassembleOneOp ( Info->BitOffset += (UINT32) Op->Common.Value.Integer; break; - case AML_INT_RESERVEDFIELD_OP: /* Offset() -- Must account for previous offsets */ @@ -730,7 +732,6 @@ AcpiDmDisassembleOneOp ( AcpiDmCommaIfFieldMember (Op); break; - case AML_INT_ACCESSFIELD_OP: case AML_INT_EXTACCESSFIELD_OP: @@ -748,9 +749,7 @@ AcpiDmDisassembleOneOp ( AcpiDmCommaIfFieldMember (Op); break; - case AML_INT_CONNECTION_OP: - /* * Two types of Connection() - one with a buffer object, the * other with a namestring that points to a buffer object. @@ -790,7 +789,6 @@ AcpiDmDisassembleOneOp ( AcpiDmByteList (Info, Op); break; - case AML_INT_METHODCALL_OP: Op = AcpiPsGetDepthNext (NULL, Op); @@ -799,7 +797,6 @@ AcpiDmDisassembleOneOp ( AcpiDmNamestring (Op->Common.Value.Name); break; - default: /* Just get the opcode name and print it */ |