Changeset 5490 in vbox

Timestamp:

Oct 25, 2007 1:45:46 AM (17 years ago)

Author:

vboxsync

Message:

Converted gcc ASMMultU64ByU32DivByU32 inline code to nasm in order to speed up the MSC builds (yes, it makes a noticable difference for TSC).

Location:

trunk

Files:

• include/iprt/asm.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (6 diffs)
• src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm (added)
• src/VBox/Runtime/common/asm/Makefile.kup (added)
• src/VBox/Runtime/r3/win/VBoxRT-win32.def (copied) (copied from trunk/src/VBox/Runtime/r3/win/VBoxRT-win64.def ) (2 diffs)
• src/VBox/Runtime/r3/win/VBoxRT-win64.def (modified) (3 diffs)
• src/VBox/Runtime/win/amd64/ASMMultU64ByU32DivByU32.asm (deleted)

trunk/include/iprt/asm.h

@@ -2945 +2945 @@
  * @param   u32C    The 32-bit value to divide A*B by.
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL || !defined(__GNUC__)
 DECLASM(uint64_t) ASMMultU64ByU32DivByU32(uint64_t u64A, uint32_t u32B, uint32_t u32C);
 #else

trunk/src/VBox/Runtime/Makefile.kmk

@@ -103 +103 @@
         win/amd64/ASMGetDR6.asm \
         win/amd64/ASMGetDR7.asm \
-        win/amd64/ASMMultU64ByU32DivByU32.asm \
+        common/asm/ASMMultU64ByU32DivByU32.asm
+
+#
+# Win32 assembly sources.
+#
+RuntimeWin32ASM_SOURCES = \
+        common/asm/ASMMultU64ByU32DivByU32.asm
 
 #
@@ -269 +275 @@
         win/RTErrConvertFromWin32.cpp
 
-RuntimeR3_SOURCES.win.amd64 = \
-        $(RuntimeWin64ASM_SOURCES)
+RuntimeR3_SOURCES.win.amd64 = $(RuntimeWin64ASM_SOURCES)
+RuntimeR3_SOURCES.win.x86   = $(RuntimeWin32ASM_SOURCES)
 
 RuntimeR3_SOURCES.linux = \
@@ -534 +540 @@
 VBoxRT_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH) = $(RuntimeR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
 VBoxRT_SOURCES.win            += r3/win/dllmain-win.cpp
+VBoxRT_SOURCES.win.x86        += r3/win/VBoxRT-win32.def
 VBoxRT_SOURCES.win.amd64      += r3/win/VBoxRT-win64.def
 VBoxRT_INCS                    = $(RuntimeR3_INCS)
@@ -687 +694 @@
 
 RuntimeR0_SOURCES.win.amd64 = $(RuntimeWin64ASM_SOURCES)
+RuntimeR0_SOURCES.win.x86   = $(RuntimeWin32ASM_SOURCES)
 
 RuntimeR0_SOURCES.os2 = \
@@ -803 +811 @@
 ## @todo timer-r0drv-nt.cpp and assert-r0drv-nt.cpp
 
-RuntimeR0Drv_SOURCES.win.amd64 = \
-        $(RuntimeWin64ASM_SOURCES)
+RuntimeR0Drv_SOURCES.win.amd64 = $(RuntimeWin64ASM_SOURCES)
+RuntimeR0Drv_SOURCES.win.x86   = $(RuntimeWin32ASM_SOURCES)
 
 RuntimeR0Drv_SOURCES.darwin = \
@@ -1016 +1024 @@
 #endif
 
+RuntimeGC_SOURCES.win.x86 = $(RuntimeWin32ASM_SOURCES)
+
 ifeq ($(VBOX_LDR_FMT32),lx)
  RuntimeGC_SOURCES += os2/sys0.asm

trunk/src/VBox/Runtime/r3/win/VBoxRT-win32.def

@@ +1 @@
+; $Id: $
 ;; @file
-; Innotek Portable Runtime - Win64 ASM exports.
+; innotek Portable Runtime - Win32 ASM exports.
 ;
 
+;
 ;  Copyright (C) 2006-2007 innotek GmbH
-; 
+;
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -12 +14 @@
 ;  distribution. VirtualBox OSE is distributed in the hope that it will
 ;  be useful, but WITHOUT ANY WARRANTY of any kind.
+;
 
 EXPORTS
-    ASMAtomicBitClear
-    ASMAtomicBitToggle
-    ASMAtomicBitTestAndToggle
-    ASMBitFirstClear
-    ASMBitFirstSet
-    ASMAtomicReadU64
-    ASMAtomicXchgU8
-    ASMAtomicXchgU16
-    ASMGetFlags
-    ASMProbeReadByte
-    ASMSetFlags
     ASMMultU64ByU32DivByU32
 
+    RTTimeNanoTSLegacySync
+    RTTimeNanoTSLegacyAsync
+    RTTimeNanoTSLFenceSync
+    RTTimeNanoTSLFenceAsync
+

trunk/src/VBox/Runtime/r3/win/VBoxRT-win64.def

@@ +1 @@
+; $Id: $
 ;; @file
-; Innotek Portable Runtime - Win64 ASM exports.
+; innotek Portable Runtime - Win64 ASM exports.
 ;
 
+;
 ;  Copyright (C) 2006-2007 innotek GmbH
-; 
+;
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -12 +14 @@
 ;  distribution. VirtualBox OSE is distributed in the hope that it will
 ;  be useful, but WITHOUT ANY WARRANTY of any kind.
+;
 
 EXPORTS
@@ -27 +30 @@
     ASMMultU64ByU32DivByU32
 
+    RTTimeNanoTSLegacySync
+    RTTimeNanoTSLegacyAsync
+    RTTimeNanoTSLFenceSync
+    RTTimeNanoTSLFenceAsync
+