Changeset 71916 in vbox for trunk

Timestamp:

Apr 19, 2018 10:05:28 AM (7 years ago)

Author:

vboxsync

Message:

More fixes for SPARC: No ASM for openssl crypto, add simple memrchr() implementation for VBoxRT, cleanup IN_SUP_R3 usage and only enable for x86 and amd64

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)
• src/VBox/Runtime/common/asm/asm-fake.cpp (modified) (5 diffs)
• src/VBox/Runtime/common/string/memrchr.cpp (added)
• src/VBox/Runtime/testcase/tstRTInlineAsm.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstRTMemSafer.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -1574 +1574 @@
 DEFS.x86         = RT_ARCH_X86 __X86__
 DEFS.amd64       = RT_ARCH_AMD64 __AMD64__
+DEFS.sparc32     = RT_ARCH_SPARC
+DEFS.sparc64     = RT_ARCH_SPARC64
 DEFS.darwin      = RT_OS_DARWIN __DARWIN__
 DEFS.freebsd     = RT_OS_FREEBSD __FREEBSD__

trunk/src/VBox/Runtime/Makefile.kmk

@@ -263 +263 @@
 RuntimeR3_DEFS          = \
         IN_RT_R3 \
-        IN_SUP_R3 \
         LDR_WITH_NATIVE \
         LDR_WITH_ELF32 \
         LDR_WITH_PE \
         RT_WITH_VBOX \
-        RT_NO_GIP \
+        RT_NO_GIP \
         RT_WITHOUT_NOCRT_WRAPPERS \
-       IPRT_WITH_OPENSSL \
-       NOFILEID
+        IPRT_WITH_OPENSSL \
+        NOFILEID
+if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
+ RuntimeR3_DEFS         += \
+        IN_SUP_R3
+endif
 #RuntimeR3_DEFS         += RTMEM_WRAP_TO_EF_APIS
 ifdef IPRT_WITH_KSTUFF
@@ -1383 +1386 @@
         r3/solaris/RTSystemQueryDmiString-solaris.cpp
 RuntimeR3_SOURCES.solaris.sparc32 = \
+        common/string/memrchr.cpp \
         generic/RTSystemQueryDmiString-generic.cpp
 RuntimeR3_SOURCES.solaris.sparc64 = \
+        common/string/memrchr.cpp \
         generic/RTSystemQueryDmiString-generic.cpp
 
@@ -1603 +1608 @@
 endif
 VBoxRT_DEFS                   := $(filter-out RT_NO_GIP, $(RuntimeR3_DEFS)) \
-        IN_SUP_R3 IN_SUP_R3 IPRT_WITH_XAR \
+        IPRT_WITH_XAR \
         $(if-expr !defined(VBOX_WITH_ALT_HASH_CODE),IPRT_WITHOUT_SHA512T224 IPRT_WITHOUT_SHA512T256,)
 ifn1of ($(KBUILD_TARGET_ARCH), amd64 x86)

trunk/src/VBox/Runtime/common/asm/asm-fake.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2017 Oracle Corporation
+ * Copyright (C) 2010-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -139 +139 @@
 }
 
+RTDECL(uint32_t) ASMAtomicUoIncU32(uint32_t volatile *pu32)
+{
+    return *pu32 += 1;
+}
+
 RTDECL(uint32_t) ASMAtomicDecU32(uint32_t volatile *pu32)
 {
@@ -144 +149 @@
 }
 
+RTDECL(uint32_t) ASMAtomicUoDecU32(uint32_t volatile *pu32)
+{
+    return *pu32 -= 1;
+}
+
 RTDECL(uint64_t) ASMAtomicIncU64(uint64_t volatile *pu64)
 {
@@ -159 +169 @@
 }
 
+RTDECL(void) ASMAtomicUoOrU32(uint32_t volatile *pu32, uint32_t u32)
+{
+    *pu32 |= u32;
+}
+
 RTDECL(void) ASMAtomicAndU32(uint32_t volatile *pu32, uint32_t u32)
+{
+    *pu32 &= u32;
+}
+
+RTDECL(void) ASMAtomicUoAndU32(uint32_t volatile *pu32, uint32_t u32)
 {
     *pu32 &= u32;
@@ -455 +475 @@
     uint32_t iBit;
     for (iBit = 0; iBit < 64; iBit++)
+        if (u32 & RT_BIT_64(iBit))
+            return iBit + 1;
+    return 0;
+}
+
+RTDECL(unsigned) ASMBitLastSetU64(uint64_t u64)
+{
+    int32_t iBit = 64;
+    while (iBit-- > 0)
         if (u64 & RT_BIT_64(iBit))
             return iBit + 1;

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

@@ -1874 +1874 @@
     BENCH(ASMAtomicUoAndU32(&s_u32, 0xffffffff), "ASMAtomicUoAndU32");
     BENCH(ASMAtomicUoOrU32(&s_u32, 0xffffffff),  "ASMAtomicUoOrU32");
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     BENCH_TSC(ASMSerializeInstructionCpuId(),    "ASMSerializeInstructionCpuId");
     BENCH_TSC(ASMSerializeInstructionIRet(),     "ASMSerializeInstructionIRet");
+#endif
 
     /* The Darwin gcc does not like this ... */

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

@@ -36 +36 @@
 #include <iprt/string.h>
 #include <iprt/test.h>
-#ifdef VBOX
+#if defined(VBOX) && (defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64))
 # include <VBox/sup.h>
 #endif
@@ -149 +149 @@
         return rcExit;
     RTTestBanner(hTest);
-#ifdef VBOX
+#if defined(VBOX) && (defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64))
     SUPR3Init(NULL);
 #endif