Changeset 93288 in vbox

Timestamp:

Jan 17, 2022 10:14:56 PM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk,IPRT: Set arch bitness for assembler use through compiler for sparc32 and sparc64. Improve zero-alt.S to handle SPARC.

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Runtime/common/misc/zero-alt.S (modified) (2 diffs)

trunk/Config.kmk

@@ -1700 +1700 @@
 VBOX_LDR_FMT_2_FLAGS.macho := -DASM_FORMAT_MACHO
 VBOX_LDR_FMT_2_FLAGS.pe    := -DASM_FORMAT_PE
-VBOX_ASFLAGS   := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT))
-VBOX_ASFLAGS32 := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT32))
-VBOX_ASFLAGS64 := -g $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT64))
+ if1of ($(KBUILD_TARGET_ARCH), sparc32 sparc64)
+VBOX_ASFLAGS_BITS := -m$(VBOX_HC_ARCH_BITS)
+VBOX_ASFLAGS_BITS32 := -m32
+VBOX_ASFLAGS_BITS64 := -m64
+ endif
+VBOX_ASFLAGS   := -g $(VBOX_ASFLAGS_BITS) $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT))
+VBOX_ASFLAGS32 := -g $(VBOX_ASFLAGS_BITS32) $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT32))
+VBOX_ASFLAGS64 := -g $(VBOX_ASFLAGS_BITS64) $(VBOX_LDR_FMT_2_FLAGS.$(VBOX_LDR_FMT64))
 endif # ifn1of ($(KBUILD_TARGET_ARCH), amd64 x86)
 
@@ -3255 +3260 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_LD_no_compact_linkedit    ?= $(call VBOX_GCC_CHECK_LD,-no_compact_linkedit,)'
 endif
+ifn1of ($(KBUILD_TARGET_ARCH), sparc32 sparc64)
 # YASM
         $(QUIET)$(APPEND) '$@' '# debug: TOOL_YASM_AS="$(TOOL_YASM_AS)"'
@@ -3260 +3266 @@
 # NASM (--allow-64-bit: 2.12rc2)
         $(QUIET)$(APPEND) '$@' 'VBOX_NASM_allow_64_bit         ?= $(call VBOX_NASM_CHECK,--allow-64-bit,)'
+endif
 if1of ($(KBUILD_TARGET), linux)
  ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Zero Memory, mach-o version (for arm).
+ * IPRT - Zero Memory, mach-o version (for arm/sparc).
  */
 
@@ -26 +26 @@
 
 
+#ifdef ASM_FORMAT_MACHO
 ; Putting it in the code segment/section for now.
-#ifdef ASM_FORMAT_MACHO
         .section    __TEXT,__text,regular,pure_instructions
         .section    __TEXT,__const
 # define NAME(a) _##a
+#elif defined(ASM_FORMAT_ELF) && (defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64))
+! Putting it in the rodata segment/section for now.
+        .file       "zero-alt.S"
+        .section    ".rodata"
+# define NAME(a) a
 #else
 # error "PORT ME!"
 #endif
 
-;;
-; 64KB of zero memory with various sized labels.
+/* 64KB of zero memory with various sized labels. */
         .globl      NAME(g_abRTZeroPage)
 #ifdef ASM_FORMAT_ELF
-        .size       NAME(g_abRTZeroPage),16384
+# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+        .hidden     NAME(g_abRTZeroPage)
+# endif
+        .type       NAME(g_abRTZeroPage),#object
+# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+        .size       NAME(g_abRTZeroPage),8192
+# else
+        .size       NAME(g_abRTZeroPage),4096
+# endif
 #endif
 NAME(g_abRTZeroPage):
         .globl      NAME(g_abRTZero4K)
 #ifdef ASM_FORMAT_ELF
+# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+        .hidden     NAME(g_abRTZero4K)
+# endif
+        .type       NAME(g_abRTZero4K),#object
         .size       NAME(g_abRTZero4K),4096
 #endif
 NAME(g_abRTZero4K):
         .globl      NAME(g_abRTZero8K)
-NAME(g_abRTZero8K):
 #ifdef ASM_FORMAT_ELF
+# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+        .hidden     NAME(g_abRTZero8K)
+# endif
+        .type       NAME(g_abRTZero8K),#object
         .size       NAME(g_abRTZero8K),8192
 #endif
+NAME(g_abRTZero8K):
         .globl      NAME(g_abRTZero16K)
-NAME(g_abRTZero16K):
 #ifdef ASM_FORMAT_ELF
+# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+        .hidden     NAME(g_abRTZero16K)
+# endif
+        .type       NAME(g_abRTZero16K),#object
         .size       NAME(g_abRTZero16K),16384
 #endif
+NAME(g_abRTZero16K):
         .globl      NAME(g_abRTZero32K)
+#ifdef ASM_FORMAT_ELF
+# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+        .hidden     NAME(g_abRTZero32K)
+# endif
+        .type       NAME(g_abRTZero32K),#object
+        .size       NAME(g_abRTZero32K),32768
+#endif
 NAME(g_abRTZero32K):
         .globl      NAME(g_abRTZero64K)
 #ifdef ASM_FORMAT_ELF
-        .size       NAME(g_abRTZero32K),32768
+# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+        .hidden     NAME(g_abRTZero64K)
+# endif
+        .type       NAME(g_abRTZero64K),#object
+        .size       NAME(g_abRTZero64K),65536
 #endif
 NAME(g_abRTZero64K):
+
+#ifdef ASM_FORMAT_MACHO
         .space      65536
-#ifdef ASM_FORMAT_ELF
-        .size       NAME(g_abRTZero64K),65536
+#elif defined(ASM_FORMAT_ELF) && (defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64))
+        .skip       65536
 #endif