Changeset 87205 in vbox

Timestamp:

Jan 8, 2021 4:55:19 PM (4 years ago)

Author:

vboxsync

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

142158

Message:

IPRT: Added generic RTMpGetDescription implementation for darwin. bugref:9898

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• generic/RTMpGetDescription-generic.cpp (modified) (1 diff)
• r3/darwin/RTMpGetDescription-generic.cpp (copied) (copied from trunk/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp ) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1289 +1289 @@
 RuntimeR3_SOURCES.darwin.x86   += common/string/memrchr.asm
 RuntimeR3_SOURCES.darwin.amd64 += common/string/memrchr.asm
-RuntimeR3_SOURCES.darwin.arm32 += common/string/memrchr.cpp
-RuntimeR3_SOURCES.darwin.arm64 += common/string/memrchr.cpp
+RuntimeR3_SOURCES.darwin.arm32 += \
+        common/string/memrchr.cpp \
+        r3/darwin/RTMpGetDescription-generic.cpp
+RuntimeR3_SOURCES.darwin.arm64 += \
+        common/string/memrchr.cpp \
+        r3/darwin/RTMpGetDescription-generic.cpp
 
 ## @todo Make BSD sched, implement RTMP*.

trunk/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp

@@ -94 +94 @@
     }
 
+#elif defined(RT_ARCH_ARM64)
+    RTCCINTREG uFreq;
+
 #else
 # error "PORTME or use RTMpGetDescription-generic-stub.cpp."

trunk/src/VBox/Runtime/r3/darwin/RTMpGetDescription-generic.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Multiprocessor, Generic RTMpGetDescription.
+ * IPRT - Multiprocessor, RTMpGetDescription for darwin/arm.
  */
 
 /*
- * Copyright (C) 2009-2020 Oracle Corporation
+ * Copyright (C) 2009-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31 +31 @@
 #include <iprt/mp.h>
 #include "internal/iprt.h"
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-# include <iprt/asm-amd64-x86.h>
-#endif
 #include <iprt/err.h>
 #include <iprt/string.h>
 
-
-
-/**
- * Returns "Unknown" as description.
- *
- * @returns VERR_BUFFER_OVERFLOW or VINF_SUCCESS.
- * @param   pszBuf              Output buffer.
- * @param   cbBuf               Buffer size.
- */
-static int rtMpGetDescriptionUnknown(char *pszBuf, size_t cbBuf)
-{
-    static const char s_szUnknown[] = "Unknown";
-    if (cbBuf < sizeof(s_szUnknown))
-        return VERR_BUFFER_OVERFLOW;
-    memcpy(pszBuf, s_szUnknown, sizeof(s_szUnknown));
-    return VINF_SUCCESS;
-}
+#include <sys/sysctl.h>
 
 
@@ -67 +48 @@
 
     /*
-     * Construct the description string in a temporary buffer.
+     * Just use the sysctl machdep.cpu.brand_string value for now.
      */
-    char        szString[4*4*3+1];
-    RT_ZERO(szString);
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-    if (!ASMHasCpuId())
-        return rtMpGetDescriptionUnknown(pszBuf, cbBuf);
+    /** @todo on arm this is very boring, so we could use the cpufamily and
+     *        cpusubfamily instead... */
+    char szBrand[128] = {0};
+    size_t cb = sizeof(szBrand);
+    int rc = sysctlbyname("machdep.cpu.brand_string", &szBrand, &cb, NULL, 0);
+    if (rc == -1)
+        szBrand[0] = '\0';
 
-    uint32_t    uMax;
-    uint32_t    uEBX, uECX, uEDX;
-    ASMCpuId(0x80000000, &uMax, &uEBX, &uECX, &uEDX);
-    if (uMax >= 0x80000002)
-    {
-        ASMCpuId(0x80000002,     &szString[0  + 0], &szString[0  + 4], &szString[0  + 8], &szString[0  + 12]);
-        if (uMax >= 0x80000003)
-            ASMCpuId(0x80000003, &szString[16 + 0], &szString[16 + 4], &szString[16 + 8], &szString[16 + 12]);
-        if (uMax >= 0x80000004)
-            ASMCpuId(0x80000004, &szString[32 + 0], &szString[32 + 4], &szString[32 + 8], &szString[32 + 12]);
-    }
-    else
-    {
-        ASMCpuId(0x00000000, &uMax, &uEBX, &uECX, &uEDX);
-        ((uint32_t *)&szString[0])[0] = uEBX;
-        ((uint32_t *)&szString[0])[1] = uEDX;
-        ((uint32_t *)&szString[0])[2] = uECX;
-    }
-
-#else
-# error "PORTME or use RTMpGetDescription-generic-stub.cpp."
-#endif
-
-    /*
-     * Copy it out into the buffer supplied by the caller.
-     */
-    char   *pszSrc = RTStrStrip(szString);
-    size_t  cchSrc = strlen(pszSrc);
-    if (cchSrc >= cbBuf)
-        return VERR_BUFFER_OVERFLOW;
-    memcpy(pszBuf, pszSrc, cchSrc + 1);
-    return VINF_SUCCESS;
+    char *pszStripped = RTStrStrip(szBrand);
+    if (*pszStripped)
+        return RTStrCopy(pszBuf, cbBuf, pszStripped);
+    return RTStrCopy(pszBuf, cbBuf, "Unknown");
 }
 RT_EXPORT_SYMBOL(RTMpGetDescription);