Changeset 71522 in vbox for trunk

Timestamp:

Mar 26, 2018 6:15:27 PM (7 years ago)

Author:

vboxsync

Message:

Fixes for SPARC

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• include/iprt/asm.h (modified) (1 diff)
• src/VBox/Runtime/common/asm/asm-fake.cpp (modified) (1 diff)
• src/VBox/Storage/VCICache.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -170 +170 @@
          && $(KBUILD_VERSION_PATCH) >= 999))
  VBOX_MIN_KMK_REVISION        := 3093
- VBOX_MIN_KBUILD_KMK_REVISION := $(if-expr "$(KBUILD_HOST)" == "win",3097,3074)
+ VBOX_MIN_KBUILD_KMK_REVISION := $(if-expr "$(KBUILD_HOST)" == "win",3097,$(if-expr "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "solaris.sparc64",2511,3074))
  if $(KMK_REVISION) >= $(VBOX_MIN_KMK_REVISION)
   if $(KBUILD_KMK_REVISION) >= $(VBOX_MIN_KBUILD_KMK_REVISION)

trunk/include/iprt/asm.h

@@ -1510 +1510 @@
 #if (defined(RT_ARCH_X86) && ARCH_BITS == 16) || defined(IN_GUEST)
 # define ASMSerializeInstruction() ASMSerializeInstructionIRet()
-#else
+#elif defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
 # define ASMSerializeInstruction() ASMSerializeInstructionCpuId()
+#elif defined(RT_ARCH_SPARC64)
+RTDECL(void) ASMSerializeInstruction(void);
+#else
+# error "Port me"
 #endif
 

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

@@ -451 +451 @@
 }
 
+RTDECL(unsigned) ASMBitFirstSetU64(uint64_t u64)
+{
+    uint32_t iBit;
+    for (iBit = 0; iBit < 64; iBit++)
+        if (u64 & RT_BIT_64(iBit))
+            return iBit + 1;
+    return 0;
+}
+
 RTDECL(uint16_t) ASMByteSwapU16(uint16_t u16)
 {

trunk/src/VBox/Storage/VCICache.cpp

@@ -1426 +1426 @@
         /* Setup the root tree. */
         memset(&NodeRoot, 0, sizeof(VciTreeNode));
-        NodeRoot.u8Type = RT_H2LE_U32(VCI_TREE_NODE_TYPE_LEAF);
+        NodeRoot.u8Type = VCI_TREE_NODE_TYPE_LEAF;
 
         rc = vdIfIoIntFileWriteSync(pCache->pIfIo, pCache->pStorage, offTreeRoot,