Changed _xdata, _near, etc and removed _generic from library files

[fw/sdcc] / device / lib / _mululong.c

diff --git a/device/lib/_mululong.c b/device/lib/_mululong.c
index 19a1352a3c02fd67af4fea4e06ad776bd3e84f14..c7c249d2a506243f5fda1fe82b6c20327df6efda 100644 (file)
--- a/device/lib/_mululong.c
+++ b/device/lib/_mululong.c
@@ -33,9 +33,11 @@ union bil {
         struct { unsigned char b0; unsigned int i12; unsigned char b3;} bi;
 } ;
 #if defined(SDCC_MODEL_LARGE) || defined (SDCC_ds390)
-#define bcast(x) ((union bil _xdata  *)&(x))
+#define bcast(x) ((union bil xdata  *)&(x))
+#elif defined(__z80) || defined(__gbz80)
+#define bcast(x) ((union bil *)&(x))
 #else
-#define bcast(x) ((union bil _near *)&(x))
+#define bcast(x) ((union bil near *)&(x))
 #endif
 
 /*
@@ -63,7 +65,6 @@ unsigned long _mululong (unsigned long a, unsigned long b)
 
         t.i.hi = bcast(a)->b.b0 * bcast(b)->b.b2;       // A
         t.i.lo = bcast(a)->b.b0 * bcast(b)->b.b0;       // A
-       _asm ;johan _endasm;
         t.b.b3 += bcast(a)->b.b3 *
                                   bcast(b)->b.b0;       // G
         t.b.b3 += bcast(a)->b.b2 *