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

Fix a bug in cpuid, which mistakenly use %rax where %eax is actually needed

Browse Source
This commit is contained in:
geding.lq 2019-07-20 03:17:58 +00:00 committed by Tate, Hongliang Tian
parent 8686322afb
commit 9c226c9a9f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libos/src/exceptions.c
View File

@ -48,8 +48,8 @@ void setup_cpuid_info() {
int handle_cpuid_exception(sgx_exception_info_t *info) { int handle_cpuid_exception(sgx_exception_info_t *info) {
uint16_t ip_opcode = *(uint16_t *)(info->cpu_context.rip); uint16_t ip_opcode = *(uint16_t *)(info->cpu_context.rip);
uint64_t leaf; uint32_t leaf;
uint64_t subleaf; uint32_t subleaf;
if (info->exception_vector != SGX_EXCEPTION_VECTOR_UD || if (info->exception_vector != SGX_EXCEPTION_VECTOR_UD ||
info->exception_type != SGX_EXCEPTION_HARDWARE || info->exception_type != SGX_EXCEPTION_HARDWARE ||
@ -57,8 +57,8 @@ int handle_cpuid_exception(sgx_exception_info_t *info) {
return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
} }
leaf = info->cpu_context.rax; leaf = (uint32_t)info->cpu_context.rax;
subleaf = info->cpu_context.rcx; subleaf = (uint32_t)info->cpu_context.rcx;
for (int i = 0; i < SUPPORTED_CPUID_LEAF_NUM; i++) { for (int i = 0; i < SUPPORTED_CPUID_LEAF_NUM; i++) {
for (int j = 0; j < SUPPORTED_CPUID_SUBLEAF_NUM; j++) { for (int j = 0; j < SUPPORTED_CPUID_SUBLEAF_NUM; j++) {