Changeset 99124 in vbox for trunk

Timestamp:

Mar 23, 2023 8:04:09 AM (22 months ago)

Author:

vboxsync

Message:

IPRT/getoptargv.cpp: Align g_abmQuoteChars more appropriately for ASMBitSet & ASMBitTest.

File:

• trunk/src/VBox/Runtime/common/misc/getoptargv.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/misc/getoptargv.cpp

@@ -52 +52 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+/** @todo move to cdefs.h */
+#ifdef __GNUC__
+# define DECL_VAR_ALIGNED(a_Scope, a_Type, a_Name, a_Alignment) a_Scope a_Type a_Name __attribute__((__aligned__(a_Alignment)))
+#elif defined(_MSC_VER)
+# define DECL_VAR_ALIGNED(a_Scope, a_Type, a_Name, a_Alignment) a_Scope __declspec(align(a_Alignment)) a_Type a_Name
+#else
+# define DECL_VAR_ALIGNED(a_Scope, a_Type, a_Name, a_Alignment) a_Scope a_Type a_Name
+#endif
+
 /**
  * Array indexed by the quoting type and 7-bit ASCII character.
@@ -57 +66 @@
  * We include some extra stuff here that the corresponding shell would normally
  * require quoting of.
- */
-static uint8_t
+ *
+ * @note We 16-byte align this as ASMBitSet/ASMBitTest expects aligned data, and
+ *       with a uint8_t type the compiler/linker may use byte alignment.
+ */
 #ifndef IPRT_REGENERATE_QUOTE_CHARS
-const
+DECL_VAR_ALIGNED(static, uint8_t const, g_abmQuoteChars[RTGETOPTARGV_CNV_QUOTE_MASK + 1][16], 16) =
+#else
+DECL_VAR_ALIGNED(static, uint8_t,       g_abmQuoteChars[RTGETOPTARGV_CNV_QUOTE_MASK + 1][16], 16) =
 #endif
-g_abmQuoteChars[RTGETOPTARGV_CNV_QUOTE_MASK + 1][16] =
 {
     { 0xfe, 0xff, 0xff, 0xff, 0x65, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10 },