Changeset 87149 in vbox for trunk/src/VBox/Runtime

Timestamp:

Dec 30, 2020 11:02:07 PM (4 years ago)

Author:

vboxsync

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

142059

Message:

/Config.kmk,IPRT: Assembler/ly adjustments for bugref:9898. Shut up backdoor logging for now.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (8 diffs)
• VBox/logbackdoor.cpp (modified) (3 diffs)
• common/misc/zero-alt.S (copied) (copied from trunk/src/VBox/Runtime/common/misc/zero.asm ) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -532 +532 @@
         common/misc/term.cpp \
         common/misc/uri.cpp \
-        common/misc/zero.asm \
         common/net/netaddrstr2.cpp \
         common/net/macstr.cpp \
@@ -760 +759 @@
 RuntimeR3_SOURCES.x86 += \
         generic/RTMpGetDescription-generic.cpp \
+        common/misc/zero.asm \
         common/misc/RTSystemIsInsideVM-amd64-x86.cpp \
         common/string/RTStrMemFind32.asm
 RuntimeR3_SOURCES.amd64 += \
         generic/RTMpGetDescription-generic.cpp \
+        common/misc/zero.asm \
         common/misc/RTSystemIsInsideVM-amd64-x86.cpp \
         common/string/RTStrMemFind32.asm
+RuntimeR3_SOURCES.arm32 := \
+        common/misc/zero-alt.S
+RuntimeR3_SOURCES.arm64 := \
+        common/misc/zero-alt.S
 RuntimeR3_SOURCES.sparc32 += \
         generic/RTMpGetDescription-generic-stub.cpp \
         generic/RTSystemIsInsideVM-generic.cpp \
         common/asm/asm-fake.cpp \
+        common/misc/zero-alt.S \
         common/string/RTStrMemFind32.cpp
 RuntimeR3_SOURCES.sparc64 += \
@@ -775 +781 @@
         generic/RTSystemIsInsideVM-generic.cpp \
         common/asm/asm-fake.cpp \
+        common/misc/zero-alt.S \
         common/string/RTStrMemFind32.cpp
 
@@ -861 +868 @@
 RuntimeR3_SOURCES += \
         $(if $(VBOX_WITH_DBUS),VBox/dbus.cpp,)
-endif
-
-if1of ($(KBUILD_TARGET_ARCH), sparc32 sparc64)
-RuntimeR3_SOURCES := \
-        $(filter-out common/misc/zero.asm, $(RuntimeR3_SOURCES)) \
-        common/misc/zero.cpp
 endif
 
@@ -1788 +1789 @@
         common/misc/term.cpp \
         common/misc/thread.cpp \
-        common/misc/zero.asm \
         common/net/macstr.cpp \
         common/net/netaddrstr2.cpp \
@@ -1933 +1933 @@
         common/err/errmsgxpcom.cpp
 endif
+RuntimeBldProg_SOURCES.amd64 = \
+        common/misc/zero.asm
+RuntimeBldProg_SOURCES.x86 = \
+        common/misc/zero.asm
+RuntimeBldProg_SOURCES.arm64 = \
+        common/misc/zero-alt.S \
+        common/string/RTStrEnd.cpp
+RuntimeBldProg_SOURCES.arm32 = \
+        common/misc/zero-alt.S \
+        common/string/RTStrEnd.cpp
+RuntimeBldProg_SOURCES.sparc32 = \
+        common/misc/zero-alt.S \
+        common/string/RTStrEnd.cpp
+RuntimeBldProg_SOURCES.sparc64 = \
+        common/misc/zero-alt.S \
+        common/string/RTStrEnd.cpp
+
 RuntimeBldProg_SOURCES.darwin = $(filter-out \
         generic/cdrom-generic.cpp \
@@ -2473 +2490 @@
 
 if1of ($(KBUILD_TARGET),win linux darwin) # remove later
+if1of ($(KBUILD_TARGET_ARCH),x86 amd64) ## @todo bugref:9898
 if1of (VBoxRT,$(DLLS))
  #
@@ -2513 +2531 @@
                 -f "$<" $(filter %.def, $^)
 endif
+endif ## @todo bugref:9898
 endif # remove later
 

trunk/src/VBox/Runtime/VBox/logbackdoor.cpp

@@ -31 +31 @@
 #include <VBox/log.h>
 #include "internal/iprt.h"
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/string.h>
 #ifdef IN_GUEST_R3
@@ -84 +86 @@
     VbglR3WriteLog(pch, cb);
 #else  /* !IN_GUEST_R3 */
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     const uint8_t *pau8 = (const uint8_t *)pch;
     if (cb > 1)
@@ -89 +92 @@
     else if (cb)
         ASMOutU8(RTLOG_DEBUG_PORT, *pau8);
+# else
+    /** @todo port me */
+    RT_BREAKPOINT();
+# endif
 #endif /* !IN_GUEST_R3 */
 }

trunk/src/VBox/Runtime/common/misc/zero-alt.S

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; IPRT - Zero Memory.
+; IPRT - Zero Memory, mach-o version (for arm).
 ;
 
@@ -25 +25 @@
 ;
 
-;*******************************************************************************
-;* Header Files                                                                *
-;*******************************************************************************
-%include "iprt/asmdefs.mac"
 
 ; Putting it in the code segment/section for now.
-BEGINCODE
+#ifdef ASM_FORMAT_MACHO
+        .section    __TEXT,__text,regular,pure_instructions
+        .section    __TEXT,__const
+# define NAME(a) _##a
+#else
+# error "PORT ME!"
+#endif
 
 ;;
 ; 64KB of zero memory with various sized labels.
-;
-EXPORTEDNAME_EX g_abRTZeroPage, object
-EXPORTEDNAME_EX g_abRTZero4K, object
-EXPORTEDNAME_EX g_abRTZero8K, object
-EXPORTEDNAME_EX g_abRTZero16K, object
-EXPORTEDNAME_EX g_abRTZero32K, object
-EXPORTEDNAME_EX g_abRTZero64K, object
-        times 0x10000/(16*4) dd 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0
-%ifdef ASM_FORMAT_ELF
-size g_abRTZeroPage     _4K
-size g_abRTZero4K       _4K
-size g_abRTZero8K       _8K
-size g_abRTZero16K     _16K
-size g_abRTZero32K     _32K
-size g_abRTZero64K     _64K
-%endif
+        .globl      NAME(g_abRTZeroPage)
+#ifdef ASM_FORMAT_ELF
+        .size       NAME(g_abRTZeroPage),16384
+#endif
+NAME(g_abRTZeroPage):
+        .globl      NAME(g_abRTZero4K)
+#ifdef ASM_FORMAT_ELF
+        .size       NAME(g_abRTZero4K),4096
+#endif
+NAME(g_abRTZero4K):
+        .globl      NAME(g_abRTZero8K)
+NAME(g_abRTZero8K):
+#ifdef ASM_FORMAT_ELF
+        .size       NAME(g_abRTZero8K),8192
+#endif
+        .globl      NAME(g_abRTZero16K)
+NAME(g_abRTZero16K):
+#ifdef ASM_FORMAT_ELF
+        .size       NAME(g_abRTZero16K),16384
+#endif
+        .globl      NAME(g_abRTZero32K)
+NAME(g_abRTZero32K):
+        .globl      NAME(g_abRTZero64K)
+#ifdef ASM_FORMAT_ELF
+        .size       NAME(g_abRTZero32K),32768
+#endif
+NAME(g_abRTZero64K):
+        .space      65536
+#ifdef ASM_FORMAT_ELF
+        .size       NAME(g_abRTZero64K),65536
+#endif
+