commit 9a785c2af93bab9d6d3d9c9551f91394b25930c2
author Lawrence Tang <lawrence.tang@arm.com> Thu Jul 07 15:47:17 2022 +0100
committer Lawrence Tang <lawrence.tang@arm.com> Thu Jul 07 15:47:17 2022 +0100
tree bd2fbe659ed5382af146fbd1b1bebc39dfae804f
parent 6c461e90d1a8ecc8fb128e83dc977610d44490ee

Add CPU information to generic/IA32/x64 sections.

sections/cper-section-ia32x64.c

diff --git a/sections/cper-section-ia32x64.c b/sections/cper-section-ia32x64.c
index 5dbad18..9b38341 100644
--- a/sections/cper-section-ia32x64.c
+++ b/sections/cper-section-ia32x64.c
@@ -40,8 +40,14 @@
     //APIC ID.
     json_object_object_add(record_ir, "localAPICID", json_object_new_uint64(record->ApicId));
 
-    //CPU ID information (todo, see generic).
-    //...
+    //CPUID information.
+    json_object* cpuid_info_ir = json_object_new_object();
+    EFI_IA32_X64_CPU_ID* cpuid_info = (EFI_IA32_X64_CPU_ID*)record->CpuIdInfo;
+    json_object_object_add(cpuid_info_ir, "eax", json_object_new_uint64(cpuid_info->Eax));
+    json_object_object_add(cpuid_info_ir, "ebx", json_object_new_uint64(cpuid_info->Ebx));
+    json_object_object_add(cpuid_info_ir, "ecx", json_object_new_uint64(cpuid_info->Ecx));
+    json_object_object_add(cpuid_info_ir, "edx", json_object_new_uint64(cpuid_info->Edx));
+    json_object_object_add(record_ir, "cpuidInfo", cpuid_info_ir);
 
     //Processor error information, of the amount described above.
     EFI_IA32_X64_PROCESS_ERROR_INFO* current_error_info = (EFI_IA32_X64_PROCESS_ERROR_INFO*)(record + 1);