UefiCpuPkg/RegisterCpuFeaturesLib: Enhance debug message.

Enhance debug message format to let them easy to read.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1411

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index 0a74d448c88bd3c8dc00f785aba649af7cc43ab9..624ddee0559c18d592144f7aebef987dbc88fd79 100644 (file)
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
@@ -473,8 +473,9 @@ DumpRegisterTableOnProcessor (
     case Msr:\r
       DEBUG ((\r
         DebugPrintErrorLevel,\r
-        "Processor: %d:   MSR: %x, Bit Start: %d, Bit Length: %d, Value: %lx\r\n",\r
+        "Processor: %04d: Index %04d, MSR  : %08x, Bit Start: %02d, Bit Length: %02d, Value: %016lx\r\n",\r
         ProcessorNumber,\r
+        FeatureIndex,\r
         RegisterTableEntry->Index,\r
         RegisterTableEntry->ValidBitStart,\r
         RegisterTableEntry->ValidBitLength,\r
@@ -484,8 +485,9 @@ DumpRegisterTableOnProcessor (
     case ControlRegister:\r
       DEBUG ((\r
         DebugPrintErrorLevel,\r
-        "Processor: %d:    CR: %x, Bit Start: %d, Bit Length: %d, Value: %lx\r\n",\r
+        "Processor: %04d: Index %04d, CR   : %08x, Bit Start: %02d, Bit Length: %02d, Value: %016lx\r\n",\r
         ProcessorNumber,\r
+        FeatureIndex,\r
         RegisterTableEntry->Index,\r
         RegisterTableEntry->ValidBitStart,\r
         RegisterTableEntry->ValidBitLength,\r
@@ -495,8 +497,9 @@ DumpRegisterTableOnProcessor (
     case MemoryMapped:\r
       DEBUG ((\r
         DebugPrintErrorLevel,\r
-        "Processor: %d:  MMIO: %lx, Bit Start: %d, Bit Length: %d, Value: %lx\r\n",\r
+        "Processor: %04d: Index %04d, MMIO : %08lx, Bit Start: %02d, Bit Length: %02d, Value: %016lx\r\n",\r
         ProcessorNumber,\r
+        FeatureIndex,\r
         RegisterTableEntry->Index | LShiftU64 (RegisterTableEntry->HighIndex, 32),\r
         RegisterTableEntry->ValidBitStart,\r
         RegisterTableEntry->ValidBitLength,\r
@@ -506,8 +509,9 @@ DumpRegisterTableOnProcessor (
     case CacheControl:\r
       DEBUG ((\r
         DebugPrintErrorLevel,\r
-        "Processor: %d: CACHE: %x, Bit Start: %d, Bit Length: %d, Value: %lx\r\n",\r
+        "Processor: %04d: Index %04d, CACHE: %08lx, Bit Start: %02d, Bit Length: %02d, Value: %016lx\r\n",\r
         ProcessorNumber,\r
+        FeatureIndex,\r
         RegisterTableEntry->Index,\r
         RegisterTableEntry->ValidBitStart,\r
         RegisterTableEntry->ValidBitLength,\r
@@ -517,8 +521,9 @@ DumpRegisterTableOnProcessor (
     case Semaphore:\r
       DEBUG ((\r
         DebugPrintErrorLevel,\r
-        "Processor: %d: Semaphore: Scope Value: %s\r\n",\r
+        "Processor: %04d: Index %04d, SEMAP: %s\r\n",\r
         ProcessorNumber,\r
+        FeatureIndex,\r
         mDependTypeStr[MIN ((UINT32)RegisterTableEntry->Value, InvalidDepType)]\r
         ));\r
       break;\r
@@ -833,7 +838,7 @@ ProgramProcessorRegister (
               ApLocation->Thread;\r
       DEBUG ((\r
         DEBUG_INFO,\r
-        "Processor = %lu, Entry Index %lu, Type = %s!\n",\r
+        "Processor = %08lu, Index %08lu, Type = %s!\n",\r
         (UINT64)ThreadIndex,\r
         (UINT64)Index,\r
         mRegisterTypeStr[MIN ((REGISTER_TYPE)RegisterTableEntry->RegisterType, InvalidReg)]\r