Deleted Added
sdiff udiff text old ( 99679 ) new ( 100966 )
full compact
dbdisply.c (99679) dbdisply.c (100966)
1/*******************************************************************************
2 *
3 * Module Name: dbdisply - debug display commands
1/*******************************************************************************
2 *
3 * Module Name: dbdisply - debug display commands
4 * $Revision: 75 $
4 * $Revision: 76 $
5 *
6 ******************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.

--- 393 unchanged lines hidden (view full) ---

406
407
408 if (!ObjDesc)
409 {
410 AcpiOsPrintf (" Uninitialized\n");
411 return;
412 }
413
5 *
6 ******************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.

--- 393 unchanged lines hidden (view full) ---

406
407
408 if (!ObjDesc)
409 {
410 AcpiOsPrintf (" Uninitialized\n");
411 return;
412 }
413
414 if (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc) != ACPI_DESC_TYPE_OPERAND)
415 {
416 AcpiOsPrintf ("%p", ObjDesc);
417 return;
418 }
419
414 AcpiOsPrintf (" %s", AcpiUtGetObjectTypeName (ObjDesc));
415
416 switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
417 {
418 case ACPI_TYPE_INTEGER:
419
420 AcpiOsPrintf (" %8.8X%8.8X", ACPI_HIDWORD (ObjDesc->Integer.Value),
421 ACPI_LODWORD (ObjDesc->Integer.Value));

--- 22 unchanged lines hidden (view full) ---

444 for (i = 0; (i < 8) && (i < ObjDesc->Buffer.Length); i++)
445 {
446 AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]);
447 }
448 break;
449
450
451 default:
420 AcpiOsPrintf (" %s", AcpiUtGetObjectTypeName (ObjDesc));
421
422 switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
423 {
424 case ACPI_TYPE_INTEGER:
425
426 AcpiOsPrintf (" %8.8X%8.8X", ACPI_HIDWORD (ObjDesc->Integer.Value),
427 ACPI_LODWORD (ObjDesc->Integer.Value));

--- 22 unchanged lines hidden (view full) ---

450 for (i = 0; (i < 8) && (i < ObjDesc->Buffer.Length); i++)
451 {
452 AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]);
453 }
454 break;
455
456
457 default:
452 /* No additional display for other types */
458
459 AcpiOsPrintf ("%p", ObjDesc);
453 break;
454 }
455}
456
457
458/*******************************************************************************
459 *
460 break;
461 }
462}
463
464
465/*******************************************************************************
466 *
467 * FUNCTION: AcpiDbDecodeNode
468 *
469 * PARAMETERS: Node - Object to be displayed
470 *
471 * RETURN: None
472 *
473 * DESCRIPTION: Short display of a namespace node
474 *
475 ******************************************************************************/
476
477void
478AcpiDbDecodeNode (
479 ACPI_NAMESPACE_NODE *Node)
480{
481
482
483 AcpiOsPrintf ("<Node> Name %4.4s Type-%s",
484 Node->Name.Ascii, AcpiUtGetTypeName (Node->Type));
485
486 if (Node->Flags & ANOBJ_METHOD_ARG)
487 {
488 AcpiOsPrintf (" [Method Arg]");
489 }
490 if (Node->Flags & ANOBJ_METHOD_LOCAL)
491 {
492 AcpiOsPrintf (" [Method Local]");
493 }
494
495 AcpiDbDecodeInternalObject (AcpiNsGetAttachedObject (Node));
496}
497
498
499/*******************************************************************************
500 *
460 * FUNCTION: AcpiDbDisplayInternalObject
461 *
462 * PARAMETERS: ObjDesc - Object to be displayed
463 * WalkState - Current walk state
464 *
465 * RETURN: None
466 *
467 * DESCRIPTION: Short display of an internal object

--- 23 unchanged lines hidden (view full) ---

491 case ACPI_DESC_TYPE_PARSER:
492
493 AcpiOsPrintf ("<Parser> ");
494 break;
495
496
497 case ACPI_DESC_TYPE_NAMED:
498
501 * FUNCTION: AcpiDbDisplayInternalObject
502 *
503 * PARAMETERS: ObjDesc - Object to be displayed
504 * WalkState - Current walk state
505 *
506 * RETURN: None
507 *
508 * DESCRIPTION: Short display of an internal object

--- 23 unchanged lines hidden (view full) ---

532 case ACPI_DESC_TYPE_PARSER:
533
534 AcpiOsPrintf ("<Parser> ");
535 break;
536
537
538 case ACPI_DESC_TYPE_NAMED:
539
499 AcpiOsPrintf ("<Node> Name %4.4s Type-%s",
500 ((ACPI_NAMESPACE_NODE *)ObjDesc)->Name.Ascii,
501 AcpiUtGetTypeName (((ACPI_NAMESPACE_NODE *) ObjDesc)->Type));
502
503 if (((ACPI_NAMESPACE_NODE *) ObjDesc)->Flags & ANOBJ_METHOD_ARG)
504 {
505 AcpiOsPrintf (" [Method Arg]");
506 }
507 if (((ACPI_NAMESPACE_NODE *) ObjDesc)->Flags & ANOBJ_METHOD_LOCAL)
508 {
509 AcpiOsPrintf (" [Method Local]");
510 }
540 AcpiDbDecodeNode ((ACPI_NAMESPACE_NODE *) ObjDesc);
511 break;
512
513
514 case ACPI_DESC_TYPE_OPERAND:
515
516 Type = ACPI_GET_OBJECT_TYPE (ObjDesc);
517 if (Type > INTERNAL_TYPE_MAX)
518 {
519 AcpiOsPrintf (" Type %hX [Invalid Type]", Type);
520 return;
521 }
522
523 /* Decode the ACPI object type */
524
525 switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
526 {
527 case INTERNAL_TYPE_REFERENCE:
541 break;
542
543
544 case ACPI_DESC_TYPE_OPERAND:
545
546 Type = ACPI_GET_OBJECT_TYPE (ObjDesc);
547 if (Type > INTERNAL_TYPE_MAX)
548 {
549 AcpiOsPrintf (" Type %hX [Invalid Type]", Type);
550 return;
551 }
552
553 /* Decode the ACPI object type */
554
555 switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
556 {
557 case INTERNAL_TYPE_REFERENCE:
558
528 switch (ObjDesc->Reference.Opcode)
529 {
530 case AML_LOCAL_OP:
559 switch (ObjDesc->Reference.Opcode)
560 {
561 case AML_LOCAL_OP:
562
531 AcpiOsPrintf ("[Local%d] ", ObjDesc->Reference.Offset);
532 if (WalkState)
533 {
534 ObjDesc = WalkState->LocalVariables[ObjDesc->Reference.Offset].Object;
535 AcpiOsPrintf ("%p", ObjDesc);
536 AcpiDbDecodeInternalObject (ObjDesc);
537 }
538 break;
539
563 AcpiOsPrintf ("[Local%d] ", ObjDesc->Reference.Offset);
564 if (WalkState)
565 {
566 ObjDesc = WalkState->LocalVariables[ObjDesc->Reference.Offset].Object;
567 AcpiOsPrintf ("%p", ObjDesc);
568 AcpiDbDecodeInternalObject (ObjDesc);
569 }
570 break;
571
572
540 case AML_ARG_OP:
573 case AML_ARG_OP:
574
541 AcpiOsPrintf ("[Arg%d] ", ObjDesc->Reference.Offset);
542 if (WalkState)
543 {
544 ObjDesc = WalkState->Arguments[ObjDesc->Reference.Offset].Object;
545 AcpiOsPrintf ("%p", ObjDesc);
546 AcpiDbDecodeInternalObject (ObjDesc);
547 }
548 break;
549
575 AcpiOsPrintf ("[Arg%d] ", ObjDesc->Reference.Offset);
576 if (WalkState)
577 {
578 ObjDesc = WalkState->Arguments[ObjDesc->Reference.Offset].Object;
579 AcpiOsPrintf ("%p", ObjDesc);
580 AcpiDbDecodeInternalObject (ObjDesc);
581 }
582 break;
583
584
550 case AML_DEBUG_OP:
585 case AML_DEBUG_OP:
586
551 AcpiOsPrintf ("[Debug] ");
552 break;
553
587 AcpiOsPrintf ("[Debug] ");
588 break;
589
590
554 case AML_INDEX_OP:
591 case AML_INDEX_OP:
555 AcpiOsPrintf ("[Index] ");
592
593 AcpiOsPrintf ("[Index] ");
556 AcpiDbDecodeInternalObject (ObjDesc->Reference.Object);
557 break;
558
594 AcpiDbDecodeInternalObject (ObjDesc->Reference.Object);
595 break;
596
597
598 case AML_REF_OF_OP:
599
600 AcpiOsPrintf ("[Reference] ");
601
602 /* Reference can be to a Node or an Operand object */
603
604 switch (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc->Reference.Object))
605 {
606 case ACPI_DESC_TYPE_NAMED:
607 AcpiDbDecodeNode (ObjDesc->Reference.Object);
608 break;
609
610 case ACPI_DESC_TYPE_OPERAND:
611 AcpiDbDecodeInternalObject (ObjDesc->Reference.Object);
612 break;
613
614 default:
615 break;
616 }
617 break;
618
619
559 default:
620 default:
621
560 AcpiOsPrintf ("Unknown Reference opcode %X\n",
561 ObjDesc->Reference.Opcode);
562 break;
622 AcpiOsPrintf ("Unknown Reference opcode %X\n",
623 ObjDesc->Reference.Opcode);
624 break;
563
564 }
565 break;
566
567 default:
625 }
626 break;
627
628 default:
629
568 AcpiOsPrintf ("<Obj> ");
569 AcpiOsPrintf (" ");
570 AcpiDbDecodeInternalObject (ObjDesc);
571 break;
572 }
573 break;
574
575

--- 365 unchanged lines hidden --- 		630 AcpiOsPrintf ("<Obj> ");
631 AcpiOsPrintf (" ");
632 AcpiDbDecodeInternalObject (ObjDesc);
633 break;
634 }
635 break;
636
637

--- 365 unchanged lines hidden ---