From 54a7512b919e9d76a18a81c32bc5ec74d6292342 Mon Sep 17 00:00:00 2001
From: Stefanos Kornilios Mitsis Poiitidis <skmp@emudev.org>
Date: Sun, 16 Mar 2025 17:09:48 +0200
Subject: [PATCH] Unity getExecutableTag, export it for KOS, cleanups, KOS
 update

---
 src/liberty/core/Frontend.cpp | 2 +-
 src/liberty/skel/dc/dc.cpp    | 9 +++++----
 src/liberty/skel/dc/dc.h      | 6 +-----
 src/miami/core/Frontend.cpp   | 2 +-
 src/miami/skel/dc/dc.cpp      | 9 +++++----
 src/miami/skel/dc/dc.h        | 6 +-----
 vendor/dca3-kos               | 2 +-
 7 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/liberty/core/Frontend.cpp b/src/liberty/core/Frontend.cpp
index e6546b30..e805ac59 100644
--- a/src/liberty/core/Frontend.cpp
+++ b/src/liberty/core/Frontend.cpp
@@ -2016,7 +2016,7 @@ CMenuManager::Draw()
 
 	char strver[200];
 	wchar ustr[200];
-	snprintf(strver, sizeof(strver), "dca-liberty: %s", getExecutableTag());
+	snprintf(strver, sizeof(strver), "%s", getExecutableTag());
 	AsciiToUnicode(strver, ustr);
 
 	CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X*3/4), MENU_Y(MENU_TEXT_SIZE_Y*3/4));
diff --git a/src/liberty/skel/dc/dc.cpp b/src/liberty/skel/dc/dc.cpp
index d3e3bde9..5e6da543 100644
--- a/src/liberty/skel/dc/dc.cpp
+++ b/src/liberty/skel/dc/dc.cpp
@@ -1981,7 +1981,7 @@ __attribute__((noinline)) void stacktrace() {
 		: "+r" (sp), "+r" (pr)
 		:
 		: );
-	dbglog(DBG_CRITICAL, "DCA3: %s\n", getExecutableTag());
+	dbglog(DBG_CRITICAL, "%s\n", getExecutableTag());
 	dbglog(DBG_CRITICAL, "Stack trace: %p ", (void*)pr);
 	int found = 0;
 	if(!(sp & 3) && sp > 0x8c000000 && sp < _arch_mem_top) {
@@ -2030,14 +2030,15 @@ __attribute__((noinline)) void stacktrace() {
 
 #endif
 
-const char* getExecutableTag() {
-	return GIT_VERSION ":" CI_JOB_ID;
+// extern "C" cus also used by KOS
+extern "C" const char* getExecutableTag() {
+	return "dca-liberty " GIT_VERSION ":" CI_JOB_ID;
 }
 
 int
 main(int argc, char *argv[])
 {
-	dbglog(DBG_CRITICAL, "DCA3: %s\n", getExecutableTag());
+	dbglog(DBG_CRITICAL, "%s\n", getExecutableTag());
 	#if !defined(DC_SIM)
 	std::set_terminate([]() {
 		fflush(stdout);
diff --git a/src/liberty/skel/dc/dc.h b/src/liberty/skel/dc/dc.h
index a843f115..08c3b1fa 100644
--- a/src/liberty/skel/dc/dc.h
+++ b/src/liberty/skel/dc/dc.h
@@ -1,7 +1,3 @@
 #pragma once
-#include <string>
 
-std::string getBuildId();
-const char* getSourceId();
-const char* getCIJobId();
-const char* getExecutableTag();
\ No newline at end of file
+extern "C" const char* getExecutableTag();
\ No newline at end of file
diff --git a/src/miami/core/Frontend.cpp b/src/miami/core/Frontend.cpp
index 8f9d8e0e..18dfce7e 100644
--- a/src/miami/core/Frontend.cpp
+++ b/src/miami/core/Frontend.cpp
@@ -2298,7 +2298,7 @@ CMenuManager::DrawFrontEnd()
 
 	char strver[200];
 	wchar ustr[200];
-	snprintf(strver, sizeof(strver), "dca-miami: %s", getExecutableTag());
+	snprintf(strver, sizeof(strver), "%s", getExecutableTag());
 	AsciiToUnicode(strver, ustr);
 
 	CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT*3/4), MENU_Y(MENUACTION_SCALE_MULT*3/4));
diff --git a/src/miami/skel/dc/dc.cpp b/src/miami/skel/dc/dc.cpp
index 5868c3bd..7c997e69 100644
--- a/src/miami/skel/dc/dc.cpp
+++ b/src/miami/skel/dc/dc.cpp
@@ -2015,7 +2015,7 @@ __attribute__((noinline)) void stacktrace() {
 		: "+r" (sp), "+r" (pr)
 		:
 		: );
-	dbglog(DBG_CRITICAL, "DCA3: %s\n", getExecutableTag());
+	dbglog(DBG_CRITICAL, "%s\n", getExecutableTag());
 	dbglog(DBG_CRITICAL, "Stack trace: %p ", (void*)pr);
 	int found = 0;
 	if(!(sp & 3) && sp > 0x8c000000 && sp < _arch_mem_top) {
@@ -2064,14 +2064,15 @@ __attribute__((noinline)) void stacktrace() {
 
 #endif
 
-const char* getExecutableTag() {
-	return GIT_VERSION ":" CI_JOB_ID;
+// extern "C" cus also used by KOS
+extern "C" const char* getExecutableTag() {
+	return "dca-miami " GIT_VERSION ":" CI_JOB_ID;
 }
 
 int
 main(int argc, char *argv[])
 {
-    dbglog(DBG_CRITICAL, "DCA3: %s\n", getExecutableTag());
+    dbglog(DBG_CRITICAL, "%s\n", getExecutableTag());
 	#if !defined(DC_SIM)
 	std::set_terminate([]() {
 		fflush(stdout);
diff --git a/src/miami/skel/dc/dc.h b/src/miami/skel/dc/dc.h
index a843f115..08c3b1fa 100644
--- a/src/miami/skel/dc/dc.h
+++ b/src/miami/skel/dc/dc.h
@@ -1,7 +1,3 @@
 #pragma once
-#include <string>
 
-std::string getBuildId();
-const char* getSourceId();
-const char* getCIJobId();
-const char* getExecutableTag();
\ No newline at end of file
+extern "C" const char* getExecutableTag();
\ No newline at end of file
diff --git a/vendor/dca3-kos b/vendor/dca3-kos
index 4b585111..017da381 160000
--- a/vendor/dca3-kos
+++ b/vendor/dca3-kos
@@ -1 +1 @@
-Subproject commit 4b585111bc1e8fb3f8d2c265b9b84cc5fbfd44e2
+Subproject commit 017da381c27d0ddda05a73479ec98ebf3c4471f4