Address Review comments

* generalize assert statements for the unequal masks
* remove duplicate line

Author: saitama951

src/mono/mono/mini/mini-codegen.c

@@ -141,14 +141,9 @@ static void
 mono_regstate_assign (MonoRegState *rs)
 {
 #ifdef MONO_ARCH_USE_SHARED_FP_SIMD_BANK
-	/* The regalloc may fail if fp and simd logical regbanks share the same physical reg bank and
-	 * if the values here are not the same.
-	 */
-/* s390x has unequal regbank masks for vector and floats*/
-#ifndef TARGET_S390X
-	g_assert(regbank_callee_regs [MONO_REG_SIMD] == regbank_callee_regs [MONO_REG_DOUBLE]);
-	g_assert(regbank_size [MONO_REG_SIMD] == regbank_size [MONO_REG_DOUBLE]);
-#endif
+	/* fp and simd logical banks may share the same physical reg bank with unequal overlapping registers */
+	g_assert((regbank_callee_regs [MONO_REG_SIMD] & regbank_callee_regs[MONO_REG_DOUBLE]) == regbank_callee_regs [MONO_REG_DOUBLE]);
+	g_assert(regbank_size [MONO_REG_SIMD] >= regbank_size [MONO_REG_DOUBLE]);
 	g_assert(regbank_callee_saved_regs [MONO_REG_SIMD] == regbank_callee_saved_regs [MONO_REG_DOUBLE]);
 #endif
 

src/mono/mono/mini/mini-s390x.h

@@ -83,8 +83,8 @@ struct SeqPointInfo {
 #define MONO_ARCH_HAVE_SETUP_RESUME_FROM_SIGNAL_HANDLER_CTX	1
 #define MONO_ARCH_HAVE_UNWIND_BACKTRACE 		1
 #define MONO_ARCH_FLOAT32_SUPPORTED			1
-#define MONO_ARCH_NEED_SIMD_BANK                       1
-#define MONO_ARCH_USE_SHARED_FP_SIMD_BANK              1
+#define MONO_ARCH_NEED_SIMD_BANK			1
+#define MONO_ARCH_USE_SHARED_FP_SIMD_BANK		1
 #define S390_STACK_ALIGNMENT		 8
 #define S390_FIRST_ARG_REG 		s390_r2
 #define S390_LAST_ARG_REG 		s390_r6
@@ -150,8 +150,7 @@ struct SeqPointInfo {
 /*-----------------------------------------------*/
 /* f0 overlaps with v0 and vr16 is used internally */
 #define MONO_MAX_XREGS			31
-#define MONO_ARCH_CALLEE_XREGS 0xFFFEFFFE
-#define MONO_ARCH_CALLEE_XREGS		0x0
+#define MONO_ARCH_CALLEE_XREGS		0xFFFEFFFE
 #define MONO_ARCH_CALLEE_SAVED_XREGS	0x0
 
 // Does the ABI have a volatile non-parameter register, so tailcall