From da370a47c267742ff52022f49a0a27475fad9193 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Jun 02 2019 00:39:02 +0000
Subject: psxglue.h: update struct __psx_vtbl (psxscl) to match member names in psxscl.


---

diff --git a/arch/nt32/psxglue.h b/arch/nt32/psxglue.h
index 4e4b9fd..d2e8739 100644
--- a/arch/nt32/psxglue.h
+++ b/arch/nt32/psxglue.h
@@ -22,10 +22,10 @@ struct __ldso_vtbl {
 struct __psx_vtbl {
 	void	(*do_global_ctors_fn)	();
 	void	(*do_global_dtors_fn)	();
-	int	(*start_main)		(int, char **, int (*)());
-	void	(*convert_thread)	(void);
-	void	(*unmapself)		(void *, size_t);
-	ssize_t	(*log_output)		(void *, ssize_t);
+	int	(*mm_start_main)	(int, char **, int (*)());
+	void	(*mm_convert_thread)	(void);
+	void	(*mm_unmapself)		(void *, size_t);
+	ssize_t	(*mm_log_output)	(void *, ssize_t);
 };
 
 struct __tlca_abi {
diff --git a/arch/nt64/psxglue.h b/arch/nt64/psxglue.h
index 4e4b9fd..d2e8739 100644
--- a/arch/nt64/psxglue.h
+++ b/arch/nt64/psxglue.h
@@ -22,10 +22,10 @@ struct __ldso_vtbl {
 struct __psx_vtbl {
 	void	(*do_global_ctors_fn)	();
 	void	(*do_global_dtors_fn)	();
-	int	(*start_main)		(int, char **, int (*)());
-	void	(*convert_thread)	(void);
-	void	(*unmapself)		(void *, size_t);
-	ssize_t	(*log_output)		(void *, ssize_t);
+	int	(*mm_start_main)	(int, char **, int (*)());
+	void	(*mm_convert_thread)	(void);
+	void	(*mm_unmapself)		(void *, size_t);
+	ssize_t	(*mm_log_output)	(void *, ssize_t);
 };
 
 struct __tlca_abi {
diff --git a/src/arch/nt64/crt_glue.c b/src/arch/nt64/crt_glue.c
index db5d3a6..cd35d52 100644
--- a/src/arch/nt64/crt_glue.c
+++ b/src/arch/nt64/crt_glue.c
@@ -95,7 +95,7 @@ void __libc_entry_routine(
 	__global_dtors_fn = __psx_vtbl->do_global_dtors_fn;
 
 	/* enter libc */
-	__psx_vtbl->start_main(argc,argv,__libc_start_main);
+	__psx_vtbl->mm_start_main(argc,argv,__libc_start_main);
 
 	/* guard */
 	a_crash();
diff --git a/src/arch/nt64/syscall_disp.c b/src/arch/nt64/syscall_disp.c
index 31baddb..61ff807 100644
--- a/src/arch/nt64/syscall_disp.c
+++ b/src/arch/nt64/syscall_disp.c
@@ -8,7 +8,7 @@ extern struct __psx_vtbl * __psx_vtbl;
 
 void __unmapself(void * base, size_t size)
 {
-	__psx_vtbl->unmapself(base,size);
+	__psx_vtbl->mm_unmapself(base,size);
 }
 
 uintptr_t __syscall_disp(long n,
diff --git a/src/arch/nt64/vtbl.c b/src/arch/nt64/vtbl.c
index 751990b..ad0a0e9 100644
--- a/src/arch/nt64/vtbl.c
+++ b/src/arch/nt64/vtbl.c
@@ -19,7 +19,7 @@ long __syscall_alert(long n)
 	__lmsg[35] = '0' + n % 10; n /= 10;
 	__lmsg[34] = '0' + n % 10;
 
-	__psx_vtbl->log_output(
+	__psx_vtbl->mm_log_output(
 		__lmsg,
 		sizeof(__lmsg));