diff options
Diffstat (limited to 'source/components/disassembler')
| -rw-r--r-- | source/components/disassembler/dmbuffer.c | 1 | ||||
| -rw-r--r-- | source/components/disassembler/dmdeferred.c | 2 | ||||
| -rw-r--r-- | source/components/disassembler/dmnames.c | 4 | ||||
| -rw-r--r-- | source/components/disassembler/dmobject.c | 16 | ||||
| -rw-r--r-- | source/components/disassembler/dmopcode.c | 27 | ||||
| -rw-r--r-- | source/components/disassembler/dmresrc.c | 1 | ||||
| -rw-r--r-- | source/components/disassembler/dmresrcl.c | 12 | ||||
| -rw-r--r-- | source/components/disassembler/dmresrcl2.c | 4 | ||||
| -rw-r--r-- | source/components/disassembler/dmwalk.c | 8 |
9 files changed, 39 insertions, 36 deletions
diff --git a/source/components/disassembler/dmbuffer.c b/source/components/disassembler/dmbuffer.c index 89102ab..d0f57ce 100644 --- a/source/components/disassembler/dmbuffer.c +++ b/source/components/disassembler/dmbuffer.c @@ -194,7 +194,6 @@ AcpiDmByteList ( case ACPI_DASM_BUFFER: default: - /* * Not a resource, string, or unicode string. * Just dump the buffer diff --git a/source/components/disassembler/dmdeferred.c b/source/components/disassembler/dmdeferred.c index 7102ea7..38e4134 100644 --- a/source/components/disassembler/dmdeferred.c +++ b/source/components/disassembler/dmdeferred.c @@ -128,6 +128,7 @@ AcpiDmParseDeferredOps ( break; default: + ACPI_ERROR ((AE_INFO, "Unhandled deferred AML opcode [0x%.4X]", Op->Common.AmlOpcode)); break; @@ -265,6 +266,7 @@ AcpiDmDeferredParse ( break; default: + break; } diff --git a/source/components/disassembler/dmnames.c b/source/components/disassembler/dmnames.c index 22f045c..0fc7751 100644 --- a/source/components/disassembler/dmnames.c +++ b/source/components/disassembler/dmnames.c @@ -237,20 +237,24 @@ AcpiDmNamestring ( switch (ACPI_GET8 (Name)) { case 0: + SegCount = 0; break; case AML_DUAL_NAME_PREFIX: + SegCount = 2; Name++; break; case AML_MULTI_NAME_PREFIX_OP: + SegCount = (UINT32) ACPI_GET8 (Name + 1); Name += 2; break; default: + SegCount = 1; break; } diff --git a/source/components/disassembler/dmobject.c b/source/components/disassembler/dmobject.c index f6c681d..ab1d744 100644 --- a/source/components/disassembler/dmobject.c +++ b/source/components/disassembler/dmobject.c @@ -214,7 +214,6 @@ AcpiDmDecodeInternalObject ( ACPI_FORMAT_UINT64 (ObjDesc->Integer.Value)); break; - case ACPI_TYPE_STRING: AcpiOsPrintf ("(%u) \"%.24s", @@ -230,7 +229,6 @@ AcpiDmDecodeInternalObject ( } break; - case ACPI_TYPE_BUFFER: AcpiOsPrintf ("(%u)", ObjDesc->Buffer.Length); @@ -240,7 +238,6 @@ AcpiDmDecodeInternalObject ( } break; - default: AcpiOsPrintf (" %p", ObjDesc); @@ -283,14 +280,17 @@ AcpiDmDecodeNode ( /* These types have no attached object */ case ACPI_TYPE_DEVICE: + AcpiOsPrintf (" Device"); break; case ACPI_TYPE_THERMAL: + AcpiOsPrintf (" Thermal Zone"); break; default: + AcpiDmDecodeInternalObject (AcpiNsGetAttachedObject (Node)); break; } @@ -335,13 +335,11 @@ AcpiDmDisplayInternalObject ( AcpiOsPrintf ("<Parser> "); break; - case ACPI_DESC_TYPE_NAMED: AcpiDmDecodeNode ((ACPI_NAMESPACE_NODE *) ObjDesc); break; - case ACPI_DESC_TYPE_OPERAND: Type = ObjDesc->Common.Type; @@ -375,7 +373,6 @@ AcpiDmDisplayInternalObject ( } break; - case ACPI_REFCLASS_ARG: AcpiOsPrintf ("%X ", ObjDesc->Reference.Value); @@ -388,7 +385,6 @@ AcpiDmDisplayInternalObject ( } break; - case ACPI_REFCLASS_INDEX: switch (ObjDesc->Reference.TargetType) @@ -420,7 +416,6 @@ AcpiDmDisplayInternalObject ( } break; - case ACPI_REFCLASS_REFOF: if (!ObjDesc->Reference.Object) @@ -446,20 +441,17 @@ AcpiDmDisplayInternalObject ( } break; - case ACPI_REFCLASS_NAME: AcpiDmDecodeNode (ObjDesc->Reference.Node); break; - case ACPI_REFCLASS_DEBUG: case ACPI_REFCLASS_TABLE: AcpiOsPrintf ("\n"); break; - default: /* Unknown reference class */ AcpiOsPrintf ("%2.2X\n", ObjDesc->Reference.Class); @@ -467,7 +459,6 @@ AcpiDmDisplayInternalObject ( } break; - default: AcpiOsPrintf ("<Obj> "); @@ -476,7 +467,6 @@ AcpiDmDisplayInternalObject ( } break; - default: AcpiOsPrintf ("<Not a valid ACPI Object Descriptor> [%s]", 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 */ diff --git a/source/components/disassembler/dmresrc.c b/source/components/disassembler/dmresrc.c index 5041e88..44111e1 100644 --- a/source/components/disassembler/dmresrc.c +++ b/source/components/disassembler/dmresrc.c @@ -337,6 +337,7 @@ AcpiDmResourceTemplate ( return; default: + break; } diff --git a/source/components/disassembler/dmresrcl.c b/source/components/disassembler/dmresrcl.c index 1b7c50b..e35b1b4 100644 --- a/source/components/disassembler/dmresrcl.c +++ b/source/components/disassembler/dmresrcl.c @@ -153,16 +153,19 @@ AcpiDmMemoryFields ( switch (Type) { case 16: + AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i], AcpiDmMemoryNames[i]); break; case 32: + AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i], AcpiDmMemoryNames[i]); break; default: + return; } } @@ -201,21 +204,25 @@ AcpiDmAddressFields ( switch (Type) { case 16: + AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i], AcpiDmAddressNames[i]); break; case 32: + AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i], AcpiDmAddressNames[i]); break; case 64: + AcpiDmDumpInteger64 (ACPI_CAST_PTR (UINT64, Source)[i], AcpiDmAddressNames[i]); break; default: + return; } } @@ -242,22 +249,27 @@ AcpiDmAddressPrefix ( switch (Type) { case ACPI_RESOURCE_TYPE_ADDRESS16: + AcpiOsPrintf ("Word"); break; case ACPI_RESOURCE_TYPE_ADDRESS32: + AcpiOsPrintf ("DWord"); break; case ACPI_RESOURCE_TYPE_ADDRESS64: + AcpiOsPrintf ("QWord"); break; case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: + AcpiOsPrintf ("Extended"); break; default: + return; } } diff --git a/source/components/disassembler/dmresrcl2.c b/source/components/disassembler/dmresrcl2.c index 5db2062..1e26f61 100644 --- a/source/components/disassembler/dmresrcl2.c +++ b/source/components/disassembler/dmresrcl2.c @@ -376,14 +376,17 @@ AcpiDmGpioDescriptor ( switch (ConnectionType) { case AML_RESOURCE_GPIO_TYPE_INT: + AcpiDmGpioIntDescriptor (Resource, Length, Level); break; case AML_RESOURCE_GPIO_TYPE_IO: + AcpiDmGpioIoDescriptor (Resource, Length, Level); break; default: + AcpiOsPrintf ("Unknown GPIO type\n"); break; } @@ -443,6 +446,7 @@ AcpiDmDumpSerialBusVendorData ( break; default: + return; } diff --git a/source/components/disassembler/dmwalk.c b/source/components/disassembler/dmwalk.c index 02c92a3..863471a 100644 --- a/source/components/disassembler/dmwalk.c +++ b/source/components/disassembler/dmwalk.c @@ -461,6 +461,7 @@ AcpiDmDescendingOp ( /* Fallthrough */ default: + AcpiDmIndent (Level); break; } @@ -699,7 +700,6 @@ AcpiDmDescendingOp ( AcpiDmFieldFlags (NextOp); break; - case AML_BUFFER_OP: /* The next op is the size parameter */ @@ -737,7 +737,6 @@ AcpiDmDescendingOp ( NextOp->Common.DisasmFlags |= ACPI_PARSEOP_PARAMLIST; return (AE_OK); - case AML_VAR_PACKAGE_OP: case AML_IF_OP: case AML_WHILE_OP: @@ -751,7 +750,6 @@ AcpiDmDescendingOp ( } return (AE_OK); - case AML_PACKAGE_OP: /* The next op is the size parameter */ @@ -763,13 +761,11 @@ AcpiDmDescendingOp ( } return (AE_OK); - case AML_MATCH_OP: AcpiDmMatchOp (Op); break; - default: break; @@ -866,7 +862,6 @@ AcpiDmAscendingOp ( } break; - case BLOCK_BRACE: case (BLOCK_BRACE | BLOCK_PAREN): @@ -906,7 +901,6 @@ AcpiDmAscendingOp ( } break; - case BLOCK_NONE: default: |
