v: support a new CPU architecture s390x (#24107)

tankf33der · web-flow · commit 44d3d59dd5e0 · 2025-04-02T09:11:49.000+03:00
diff --git a/vlib/v/ast/types.v b/vlib/v/ast/types.v
@@ -51,6 +51,7 @@ pub enum Language {
 	arm32 // 32-bit arm
 	rv64  // 64-bit risc-v
 	rv32  // 32-bit risc-v
+	s390x
 	wasm32
 }
 
@@ -75,6 +76,9 @@ pub fn pref_arch_to_table_language(pref_arch pref.Arch) Language {
 		.i386 {
 			.i386
 		}
+		.s390x {
+			.s390x
+		}
 		.js_node, .js_browser, .js_freestanding {
 			.js
 		}
diff --git a/vlib/v/gen/c/cheaders.v b/vlib/v/gen/c/cheaders.v
@@ -143,6 +143,17 @@ static char __CLOSURE_GET_DATA_BYTES[] = {
 	0x03, 0xA5, 0x0F, 0x00,  // lw    a0, 0(t6)
 	0x67, 0x80, 0x00, 0x00   // ret
 };
+#elif defined (__V_s390x)
+static char __closure_thunk[] = {
+	0xC0, 0x30, 0xFF, 0xFF, 0xE0, 0x00,  // larl %r3, -16384
+	0xE3, 0x40, 0x30, 0x00, 0x00, 0x04,  // lg   %r4, 0(%r3)
+	0xE3, 0x30, 0x30, 0x08, 0x00, 0x04,  // lg   %r3, 8(%r3)
+	0x07, 0xF3,			     // br   %r3
+};
+static char __CLOSURE_GET_DATA_BYTES[] = {
+	0xB9, 0x04, 0x00, 0x24,		     // lgr  %r2, %r4
+	0x07, 0xFE,			     // br   %r14
+};
 #endif
 
 static void*(*__CLOSURE_GET_DATA)(void) = 0;
@@ -301,6 +312,12 @@ const c_common_macros = '
 	#define __V_architecture 6
 #endif
 
+#if defined(__s390x__)
+	#define __V_s390x  1
+	#undef __V_architecture
+	#define __V_architecture 7
+#endif
+
 // Using just __GNUC__ for detecting gcc, is not reliable because other compilers define it too:
 #ifdef __GNUC__
 	#define __V_GCC__
@@ -658,7 +675,7 @@ static void* g_live_info = NULL;
 
 const c_builtin_types = '
 //================================== builtin types ================================*/
-#if defined(__x86_64__) || defined(_M_AMD64) || defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64) || (defined(__riscv_xlen) && __riscv_xlen == 64)
+#if defined(__x86_64__) || defined(_M_AMD64) || defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64) || (defined(__riscv_xlen) && __riscv_xlen == 64) || defined(__s390x__)
 typedef int64_t vint_t;
 #else
 typedef int32_t vint_t;
diff --git a/vlib/v/gen/c/comptime.v b/vlib/v/gen/c/comptime.v
@@ -1280,6 +1280,9 @@ fn (mut g Gen) comptime_if_to_ifdef(name string, is_comptime_option bool) !strin
 		'rv64', 'riscv64' {
 			return '__V_rv64'
 		}
+		's390x' {
+			return '__V_s390x'
+		}
 		// bitness:
 		'x64' {
 			return 'TARGET_IS_64BIT'
diff --git a/vlib/v/pref/arch.c.v b/vlib/v/pref/arch.c.v
@@ -8,6 +8,7 @@ pub enum Arch {
 	rv64  // 64-bit risc-v
 	rv32  // 32-bit risc-v
 	i386
+	s390x
 	js_node
 	js_browser
 	js_freestanding
@@ -48,6 +49,9 @@ pub fn arch_from_string(arch_str string) !Arch {
 		'x86_32', 'x32', 'i386', 'IA-32', 'ia-32', 'ia32' { // i386 recommended
 			return .i386
 		}
+		's390x' {
+			return .s390x
+		}
 		'js', 'js_node' {
 			return .js_node
 		}

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ pub enum Language {`
`51`	`51`	`arm32 // 32-bit arm`
`52`	`52`	`rv64 // 64-bit risc-v`
`53`	`53`	`rv32 // 32-bit risc-v`
	`54`	`+ s390x`
`54`	`55`	`wasm32`
`55`	`56`	`}`
`56`	`57`
`@@ -75,6 +76,9 @@ pub fn pref_arch_to_table_language(pref_arch pref.Arch) Language {`
`75`	`76`	`.i386 {`
`76`	`77`	`.i386`
`77`	`78`	`}`
	`79`	`+ .s390x {`
	`80`	`+ .s390x`
	`81`	`+ }`
`78`	`82`	`.js_node, .js_browser, .js_freestanding {`
`79`	`83`	`.js`
`80`	`84`	`}`