Changeset 8882 in vbox

Timestamp:

May 16, 2008 11:55:20 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30917

Message:

Added ASMGetCpuFamily, ASMGetCpuModel and ASMGetCpuStepping to pack up the bit fiddling.

Location:

trunk

Files:

• include/iprt/asm.h (modified) (1 diff)
• src/VBox/Runtime/testcase/tstInlineAsm.cpp (modified) (3 diffs)

trunk/include/iprt/asm.h

@@ -942 +942 @@
 #endif
 
+
+/**
+ * Extracts the CPU family from ASMCpuId(1) or ASMCpuId(0x80000001)
+ *
+ * @returns Family.
+ * @param   uEAX    EAX return from ASMCpuId(1) or ASMCpuId(0x80000001).
+ */
+DECLINLINE(uint32_t) ASMGetCpuFamily(uint32_t uEAX)
+{
+    return ((uEAX >> 8) & 0xf) == 0xf
+         ? ((uEAX >> 20) & 0x7f) + 0xf
+         : ((uEAX >> 8) & 0xf);
+}
+
+
+/**
+ * Extracts the CPU model from ASMCpuId(1) or ASMCpuId(0x80000001)
+ *
+ * @returns Model.
+ * @param   uEAX    EAX from ASMCpuId(1) or ASMCpuId(0x80000001).
+ */
+DECLINLINE(uint32_t) ASMGetCpuModel(uint32_t uEAX)
+{
+    return ((uEAX >> 8) & 0xf) == 0xf /* family! */
+         ? ((uEAX >> 4) & 0xf) | ((uEAX >> 12) & 0xf0)
+         : ((uEAX >> 4) & 0xf);
+}
+
+
+/**
+ * Extracts the CPU stepping from ASMCpuId(1) or ASMCpuId(0x80000001)
+ *
+ * @returns Model.
+ * @param   uEAX    EAX from ASMCpuId(1) or ASMCpuId(0x80000001).
+ */
+DECLINLINE(uint32_t) ASMGetCpuStepping(uint32_t uEAX)
+{
+    return uEAX & 0xf;
+}
+
+
 /**
  * Get cr0.

trunk/src/VBox/Runtime/testcase/tstInlineAsm.cpp

@@ -182 +182 @@
     {
         ASMCpuId(1, &s.uEAX, &s.uEBX, &s.uECX, &s.uEDX);
-        RTPrintf("Family:                          %d  \tExtended: %d \tEffectiv: %d\n"
-                 "Model:                           %d  \tExtended: %d \tEffectiv: %d\n"
+        RTPrintf("Family:                          %#x \tExtended: %#x \tEffectiv: %#x\n"
+                 "Model:                           %#x \tExtended: %#x \tEffectiv: %#x\n"
                  "Stepping:                        %d\n"
                  "APIC ID:                         %#04x\n"
@@ -189 +189 @@
                  "CLFLUSH Size:                    %d\n"
                  "Brand ID:                        %#04x\n",
-                 (s.uEAX >> 8) & 0xf, (s.uEAX >> 20) & 0x7f, ((s.uEAX >> 8) & 0xf) + (((s.uEAX >> 8) & 0xf) == 0xf ? (s.uEAX >> 20) & 0x7f : 0),
-                 (s.uEAX >> 4) & 0xf, (s.uEAX >> 16) & 0x0f, ((s.uEAX >> 4) & 0xf) | (((s.uEAX >> 4) & 0xf) == 0xf ? (s.uEAX >> 16) & 0x0f : 0),
-                 (s.uEAX >> 0) & 0xf,
+                 (s.uEAX >> 8) & 0xf, (s.uEAX >> 20) & 0x7f, ASMGetCpuFamily(s.uEAX),
+                 (s.uEAX >> 4) & 0xf, (s.uEAX >> 16) & 0x0f, ASMGetCpuModel(s.uEAX),
+                 ASMGetCpuStepping(s.uEAX),
                  (s.uEBX >> 24) & 0xff,
                  (s.uEBX >> 16) & 0xff,
@@ -280 +280 @@
     {
         ASMCpuId(0x80000001, &s.uEAX, &s.uEBX, &s.uECX, &s.uEDX);
-        RTPrintf("Family:                          %d  \tExtended: %d \tEffectiv: %d\n"
-                 "Model:                           %d  \tExtended: %d \tEffectiv: %d\n"
+        RTPrintf("Family:                          %#x \tExtended: %#x \tEffectiv: %#x\n"
+                 "Model:                           %#x \tExtended: %#x \tEffectiv: %#x\n"
                  "Stepping:                        %d\n"
                  "Brand ID:                        %#05x\n",
-                 (s.uEAX >> 8) & 0xf, (s.uEAX >> 20) & 0x7f, ((s.uEAX >> 8) & 0xf) + (((s.uEAX >> 8) & 0xf) == 0xf ? (s.uEAX >> 20) & 0x7f : 0),
-                 (s.uEAX >> 4) & 0xf, (s.uEAX >> 16) & 0x0f, ((s.uEAX >> 4) & 0xf) | (((s.uEAX >> 4) & 0xf) == 0xf ? (s.uEAX >> 16) & 0x0f : 0),
-                 (s.uEAX >> 0) & 0xf,
+                 (s.uEAX >> 8) & 0xf, (s.uEAX >> 20) & 0x7f, ASMGetCpuFamily(s.uEAX),
+                 (s.uEAX >> 4) & 0xf, (s.uEAX >> 16) & 0x0f, ASMGetCpuModel(s.uEAX),
+                 ASMGetCpuStepping(s.uEAX),
                  s.uEBX & 0xfff);