Better way to use CREATE_VALIST_FROM_VAARG macro

2 files changed, 7 insertions, 5 deletions

diff --git a/src/include/myalign.h b/src/include/myalign.h
index 4a705afa..cc4922bd 100755
--- a/src/include/myalign.h
+++ b/src/include/myalign.h
@@ -50,7 +50,7 @@ typedef struct {
     memcpy(&p[6], emu->xmm, 8*16);                  \
   }
 
-
+#define PREFER_CONVERT_VAARG
 
 #elif defined(__aarch64__)
 // aarch64: 8 64bits general regs and 8 128bits float regs
@@ -92,6 +92,8 @@ typedef struct  va_list {
     memcpy(&p[6], emu->xmm, 8*16);                                      \
   }
 
+#define PREFER_CONVERT_VAARG
+
 #elif defined(__sw_64__) /* or Alpha */
 /*
 typdef struct {
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index 39c905ec..0f9ae4a5 100755
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -763,7 +763,7 @@ EXPORT void *my_div(void *result, int numerator, int denominator) {
 #endif
 
 EXPORT int my_snprintf(x64emu_t* emu, void* buff, size_t s, void * fmt, uint64_t * b) {
-    #ifdef CREATE_VALIST_FROM_VAARG
+    #ifdef PREFER_CONVERT_VAARG
     CREATE_VALIST_FROM_VAARG(b, emu->scratch, 3);
     #else
     myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 3);
@@ -776,7 +776,7 @@ EXPORT int my___snprintf(x64emu_t* emu, void* buff, size_t s, void * fmt, uint64
 EXPORT int my___snprintf_chk(x64emu_t* emu, void* buff, size_t s, int flags, size_t maxlen, void * fmt, uint64_t * b)
 {
     (void)flags; (void)maxlen;
-    #ifdef CREATE_VALIST_FROM_VAARG
+    #ifdef PREFER_CONVERT_VAARG
     CREATE_VALIST_FROM_VAARG(b, emu->scratch, 5);
     #else
     myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 5);
@@ -787,7 +787,7 @@ EXPORT int my___snprintf_chk(x64emu_t* emu, void* buff, size_t s, int flags, siz
 }
 
 EXPORT int my_sprintf(x64emu_t* emu, void* buff, void * fmt, void * b) {
-    #ifdef CREATE_VALIST_FROM_VAARG
+    #ifdef PREFER_CONVERT_VAARG
     CREATE_VALIST_FROM_VAARG(b, emu->scratch, 2);
     #else
     myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 2);
@@ -797,7 +797,7 @@ EXPORT int my_sprintf(x64emu_t* emu, void* buff, void * fmt, void * b) {
 }
 EXPORT int my___sprintf_chk(x64emu_t* emu, void* buff, int flag, size_t l, void * fmt, void * b) {
     (void)flag; (void)l;
-    #ifdef CREATE_VALIST_FROM_VAARG
+    #ifdef PREFER_CONVERT_VAARG
     CREATE_VALIST_FROM_VAARG(b, emu->scratch, 4);
     #else
     myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 4);