general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[test] Fix the errors in cpuid test

Browse Source
This commit is contained in:
LI Qing 2022-02-28 17:51:49 +08:00 committed by Zongmin.Gu
parent f334374a43
commit e735cf00fb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/cpuid/main.c
View File

@ -41,6 +41,10 @@ static bool is_cpuidinfo_equal(int leaf, t_cpuid_t *cpu, t_cpuid_t *cpu_sgx) {
(cpu->ebx == cpu_sgx->ebx) && (cpu->ebx == cpu_sgx->ebx) &&
(cpu->ecx == cpu_sgx->ecx)); (cpu->ecx == cpu_sgx->ecx));
} }
/* Leaf 0x8000001E is for threads/core_id/apic_ids/socket_id */
if (leaf == 0x8000001E) {
return cpu->edx == cpu_sgx->edx;
}
return ((cpu->eax == cpu_sgx->eax) && return ((cpu->eax == cpu_sgx->eax) &&
(cpu->ebx == cpu_sgx->ebx) && (cpu->ebx == cpu_sgx->ebx) &&
(cpu->ecx == cpu_sgx->ecx) && (cpu->ecx == cpu_sgx->ecx) &&
@ -222,7 +226,7 @@ static int test_cpuid_with_oversized_leaf() {
native_cpuid(leaf, subleaf, &cpu); native_cpuid(leaf, subleaf, &cpu);
t_cpuid_t cpu_max; t_cpuid_t cpu_max;
leaf = g_max_basic_leaf; leaf = g_max_basic_leaf + 1;
subleaf = 1; subleaf = 1;
native_cpuid(leaf, subleaf, &cpu_max); native_cpuid(leaf, subleaf, &cpu_max);