Changeset 9846 for ps

Timestamp:

07/16/11 19:27:07 (13 years ago)

Author:

Jan Wassenberg

Message:

acpi: fix cast error (caught by runtime check)
x86_x64: simplify MSC version check

Location:

ps/trunk/source/lib/sysdep

Files:

• acpi.cpp (modified) (1 diff)
• arch/x86_x64/x86_x64.cpp (modified) (1 diff)

ps/trunk/source/lib/sysdep/acpi.cpp

@@ -64 +64 @@
     u8 sum = 0;
     for(PCV_u8 p = buf; p < buf+numBytes; p++)
-        sum = u8(sum + *p);
+        sum = u8((sum + *p) & 0xFF);
     return sum;
 }

ps/trunk/source/lib/sysdep/arch/x86_x64/x86_x64.cpp

@@ -46 +46 @@
 
 #define CPUID_INTRINSIC 0
-#if MSC_VERSION > 1500 || (MSC_VERSION == 1500 && _MSC_FULL_VER >= 150030729)   // __cpuidex available on VC10+ and VC9 SP1 (allows setting ecx beforehand)
+#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 150030729    // __cpuidex available on VC10+ and VC9 SP1 (allows setting ecx beforehand)
 # undef CPUID_INTRINSIC
 # define CPUID_INTRINSIC 1