mirror/libcpuid
1
0
Fork 0
mirror of https://github.com/anrieff/libcpuid synced 2024-11-10 22:59:13 +00:00
Code Issues Releases Wiki Activity

Fix a compilation error on MSVC.

Browse source
This commit is contained in:
Veselin Georgiev 2016-10-18 02:15:36 +02:00
parent 6907241564
commit ee88463079
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libcpuid/recog_intel.c
View file

@ -824,6 +824,7 @@ static void decode_intel_sgx_features(const struct cpu_raw_data_t* raw, struct c
struct cpu_epc_t cpuid_get_epc(int index, const struct cpu_raw_data_t* raw) struct cpu_epc_t cpuid_get_epc(int index, const struct cpu_raw_data_t* raw)
{ {
uint32_t regs[4]; uint32_t regs[4];
struct cpu_epc_t retval = {0, 0};
if (raw && index < MAX_INTELFN12H_LEVEL - 2) { if (raw && index < MAX_INTELFN12H_LEVEL - 2) {
// this was queried already, use the data: // this was queried already, use the data:
memcpy(regs, raw->intel_fn12h[2 + index], sizeof(regs)); memcpy(regs, raw->intel_fn12h[2 + index], sizeof(regs));
@ -836,7 +837,6 @@ struct cpu_epc_t cpuid_get_epc(int index, const struct cpu_raw_data_t* raw)
} }
// decode values: // decode values:
struct cpu_epc_t retval = {0, 0};
if ((regs[0] & 0xf) == 0x1) { if ((regs[0] & 0xf) == 0x1) {
retval.start_addr |= (regs[0] & 0xfffff000); // bits [12, 32) -> bits [12, 32) retval.start_addr |= (regs[0] & 0xfffff000); // bits [12, 32) -> bits [12, 32)
retval.start_addr |= ((uint64_t) (regs[1] & 0x000fffff)) << 32; // bits [0, 20) -> bits [32, 52) retval.start_addr |= ((uint64_t) (regs[1] & 0x000fffff)) << 32; // bits [0, 20) -> bits [32, 52)