Applied patch #2762516

[fw/sdcc] / device / include / stdarg.h

diff --git a/device/include/stdarg.h b/device/include/stdarg.h
index 49e3a7221c0008edd8ad931df44465db9ab176d8..db0b889ca0dc65497a93b7afaea5567f876a4aa9 100644 (file)
--- a/device/include/stdarg.h
+++ b/device/include/stdarg.h
@@ -1,27 +1,33 @@
 /*-----------------------------------------------------------------------------------*/
-/* stdarg.h - ANSI macros for variable parameter list                               */
+/* stdarg.h - ANSI macros for variable parameter list                                */
 /*-----------------------------------------------------------------------------------*/
 
 #ifndef __SDC51_STDARG_H
 #define __SDC51_STDARG_H 1
 
-#if defined(__ds390)
+#if defined(__z80) || defined(__gbz80) || defined(__hc08)
 
-typedef        unsigned char * va_list ;
-#define va_arg(marker,type) *((type *)(marker -= sizeof(type)))
-#define        va_start(marker,first) { marker = &first; }
+typedef unsigned char * va_list;
+#define va_start(marker, last)  { marker = (va_list)&last + sizeof(last); }
+#define va_arg(marker, type)    *((type *)((marker += sizeof(type)) - sizeof(type)))
+
+#elif defined(__ds390) || defined(__ds400)
+
+typedef unsigned char * va_list;
+#define va_start(marker, first) { marker = (va_list)&first; }
+#define va_arg(marker, type)    *((type *)(marker -= sizeof(type)))
 
 #elif defined(SDCC_USE_XSTACK)
 
-typedef        unsigned char _pdata * va_list ;
-#define va_arg(marker,type) *((type _data *)(marker -= sizeof(type)))
-#define        va_start(marker,first) { marker = (va_list)((char _pdata *)&first); }
+typedef unsigned char __pdata * va_list;
+#define va_start(marker, first) { marker = (va_list)&first; }
+#define va_arg(marker, type)    *((type __pdata *)(marker -= sizeof(type)))
 
 #else
 
-typedef        unsigned char _data * va_list ;
-#define va_arg(marker,type) *((type _data * )(marker -= sizeof(type)))
-#define        va_start(marker,first) { marker = (va_list) ((char _data * )&first); }
+typedef unsigned char __data * va_list;
+#define va_start(marker, first) { marker = (va_list)&first; }
+#define va_arg(marker, type)    *((type __data * )(marker -= sizeof(type)))
 
 #endif