Merge pull request #116 from peastman/master

Bug fixes

examples/CMakeLists.txt

@@ -93,7 +93,7 @@ FOREACH(EX_ROOT ${F_EXAMPLES})
     INSTALL(FILES ${EX_ROOT}.f90 DESTINATION examples)
 ENDFOREACH(EX_ROOT ${F_EXAMPLES})
 
-INSTALL(FILES simulateAmber.py simulatePdb.py testInstallation.py argon-chemical-potential.py input.inpcrd input.prmtop input.pdb
+INSTALL(FILES simulateAmber.py simulatePdb.py simulateGromacs.py testInstallation.py argon-chemical-potential.py input.inpcrd input.prmtop input.pdb input.gro input.top
         DESTINATION examples)
 
 INSTALL(FILES VisualStudio/HelloArgon.vcproj 

plugins/cpupme/src/CpuPmeKernels.cpp

@@ -95,6 +95,7 @@ static int getNumProcessors() {
 #define cpuid __cpuid
 #else
 static void cpuid(int cpuInfo[4], int infoType){
+#ifdef __LP64__
     __asm__ __volatile__ (
         "cpuid":
         "=a" (cpuInfo[0]),
@@ -103,6 +104,19 @@ static void cpuid(int cpuInfo[4], int infoType){
         "=d" (cpuInfo[3]) :
         "a" (infoType)
     );
+#else
+    __asm__ __volatile__ (
+        "pushl %%ebx\n"
+        "cpuid\n"
+        "movl %%ebx, %1\n"
+        "popl %%ebx\n" :
+        "=a" (cpuInfo[0]),
+        "=r" (cpuInfo[1]),
+        "=c" (cpuInfo[2]),
+        "=d" (cpuInfo[3]) :
+        "a" (infoType)
+    );
+#endif
 }
 #endif