commit 7c1c91f9ead54e755f5264b72ea7876735a82f9b
author fuzun <fuzun54@outlook.com> Sat Sep 08 05:16:44 2018 +0300
committer GitHub <noreply@github.com> Sat Sep 08 05:16:44 2018 +0300
tree 6d157f46d93ecedafa2129d3af16b2bd68c9da1c
parent f189298f4f89a7f29e9bec2f35b8d3b2aa5cadcd
parent 8ba03e9d24e2a1509b6cb85a7f355e7e953da65e

Merge pull request #1 from google/master

Sync with head

include/internal/bit_utils.h

diff --git a/include/internal/bit_utils.h b/include/internal/bit_utils.h
index 75f0cdd..bc965cb 100644
--- a/include/internal/bit_utils.h
+++ b/include/internal/bit_utils.h
@@ -28,7 +28,7 @@
 
 inline static uint32_t ExtractBitRange(uint32_t reg, uint32_t msb,
                                        uint32_t lsb) {
-  const uint64_t bits = msb - lsb + 1;
+  const uint64_t bits = msb - lsb + 1ULL;
   const uint64_t mask = (1ULL << bits) - 1ULL;
   assert(msb >= lsb);
   return (reg >> lsb) & mask;

src/cpuinfo_x86.c

diff --git a/src/cpuinfo_x86.c b/src/cpuinfo_x86.c
index 390e8c9..0114817 100644
--- a/src/cpuinfo_x86.c
+++ b/src/cpuinfo_x86.c
@@ -149,7 +149,7 @@
   return info;
 }
 
-#define CPUID(FAMILY, MODEL) (((FAMILY & 0xFF) << 8) | (MODEL & 0xFF))
+#define CPUID(FAMILY, MODEL) ((((FAMILY) & 0xFF) << 8) | ((MODEL) & 0xFF))
 
 X86Microarchitecture GetX86Microarchitecture(const X86Info* info) {
   if (memcmp(info->vendor, "GenuineIntel", sizeof(info->vendor)) == 0) {