* support/regression/valdiag/tests/switch.c,

[fw/sdcc] / support / regression / tests / libmullong.c

diff --git a/support/regression/tests/libmullong.c b/support/regression/tests/libmullong.c
index d824c71293dab6f88b3d93f85e3674d408f81e87..4ab6ee755533ac32402668a9f921a2ebdb3ae3e2 100644 (file)
--- a/support/regression/tests/libmullong.c
+++ b/support/regression/tests/libmullong.c
@@ -7,19 +7,19 @@
 #define type_{type}
 
 #if defined(PORT_HOST)
-#  include "../../../../../sdccconf.h"
+#  include "sdccconf.h"
 #  define mullong(a,b) mullong_wrapper(a,b)
 #  if defined(type_c) && !defined(WORDS_BIGENDIAN)
 #    define _SDCC_NO_ASM_LIB_FUNCS 1
 #    define near
 #    define long int
-#    include "../../../../../device/lib/_mullong.c"
+#    include "device/lib/_mullong.c"
 #  endif
 #else
 #  if defined(type_c)
 #    define _SDCC_NO_ASM_LIB_FUNCS 1
 #  endif
-#  include "../../../../../device/lib/_mullong.c"
+#  include "device/lib/_mullong.c"
 #  define mullong _mullong
 #endif
 
@@ -28,6 +28,13 @@
  */
 #if defined(PORT_HOST)
 
+#define TYPE_TARGET_CHAR  TYPE_BYTE
+#define TYPE_TARGET_INT   TYPE_WORD
+#define TYPE_TARGET_LONG  TYPE_DWORD
+#define TYPE_TARGET_UCHAR TYPE_UBYTE
+#define TYPE_TARGET_UINT  TYPE_UWORD
+#define TYPE_TARGET_ULONG TYPE_UDWORD
+
 #if defined(type_c) && !defined(WORDS_BIGENDIAN)
 struct
 {
@@ -35,24 +42,24 @@ struct
   short i;
   char c2;
 } pack_test;
-       
-long
-mullong_wrapper (long a, long b)
+
+TYPE_TARGET_LONG
+mullong_wrapper (TYPE_TARGET_LONG a, TYPE_TARGET_LONG b)
 {
   if (sizeof(pack_test) == 4)
     /* length of struct ok: use SDCC library */
     return _mullong (a, b);
   else
-  {
+    {
       /* buggy gcc: use generic multiplication */
       return a * b;
-  }
+    }
 }
 
 #else
 
-long
-mullong_wrapper (long a, long b)
+TYPE_TARGET_LONG
+mullong_wrapper (TYPE_TARGET_LONG a, TYPE_TARGET_LONG b)
 {
     return a * b;
 }