#if defined(__MINGW32__)
/* in Win32Utils.c */
extern void maperrno (void);
-extern HsInt getTicksOfDay(void);
+extern HsWord64 getUSecOfDay(void);
#endif
#if defined(__MINGW32__)
#ifdef SUPPORT_LONG_LONGS
-StgInt stg_gtWord64 (StgWord64, StgWord64);
-StgInt stg_geWord64 (StgWord64, StgWord64);
-StgInt stg_eqWord64 (StgWord64, StgWord64);
-StgInt stg_neWord64 (StgWord64, StgWord64);
-StgInt stg_ltWord64 (StgWord64, StgWord64);
-StgInt stg_leWord64 (StgWord64, StgWord64);
-
-StgInt stg_gtInt64 (StgInt64, StgInt64);
-StgInt stg_geInt64 (StgInt64, StgInt64);
-StgInt stg_eqInt64 (StgInt64, StgInt64);
-StgInt stg_neInt64 (StgInt64, StgInt64);
-StgInt stg_ltInt64 (StgInt64, StgInt64);
-StgInt stg_leInt64 (StgInt64, StgInt64);
-
-StgWord64 stg_remWord64 (StgWord64, StgWord64);
-StgWord64 stg_quotWord64 (StgWord64, StgWord64);
-
-StgInt64 stg_remInt64 (StgInt64, StgInt64);
-StgInt64 stg_quotInt64 (StgInt64, StgInt64);
-StgInt64 stg_negateInt64 (StgInt64);
-StgInt64 stg_plusInt64 (StgInt64, StgInt64);
-StgInt64 stg_minusInt64 (StgInt64, StgInt64);
-StgInt64 stg_timesInt64 (StgInt64, StgInt64);
-
-StgWord64 stg_and64 (StgWord64, StgWord64);
-StgWord64 stg_or64 (StgWord64, StgWord64);
-StgWord64 stg_xor64 (StgWord64, StgWord64);
-StgWord64 stg_not64 (StgWord64);
-
-StgWord64 stg_uncheckedShiftL64 (StgWord64, StgInt);
-StgWord64 stg_uncheckedShiftRL64 (StgWord64, StgInt);
-StgInt64 stg_uncheckedIShiftL64 (StgInt64, StgInt);
-StgInt64 stg_uncheckedIShiftRL64 (StgInt64, StgInt);
-StgInt64 stg_uncheckedIShiftRA64 (StgInt64, StgInt);
-
-StgInt64 stg_intToInt64 (StgInt);
-StgInt stg_int64ToInt (StgInt64);
-StgWord64 stg_int64ToWord64 (StgInt64);
-
-StgWord64 stg_wordToWord64 (StgWord);
-StgWord stg_word64ToWord (StgWord64);
-StgInt64 stg_word64ToInt64 (StgWord64);
-
-StgInt64 stg_integerToInt64 (StgInt sa, StgByteArray /* Really: mp_limb_t* */ da);
-StgWord64 stg_integerToWord64 (StgInt sa, StgByteArray /* Really: mp_limb_t* */ da);
+HsBool hs_gtWord64 (HsWord64, HsWord64);
+HsBool hs_geWord64 (HsWord64, HsWord64);
+HsBool hs_eqWord64 (HsWord64, HsWord64);
+HsBool hs_neWord64 (HsWord64, HsWord64);
+HsBool hs_ltWord64 (HsWord64, HsWord64);
+HsBool hs_leWord64 (HsWord64, HsWord64);
+
+HsBool hs_gtInt64 (HsInt64, HsInt64);
+HsBool hs_geInt64 (HsInt64, HsInt64);
+HsBool hs_eqInt64 (HsInt64, HsInt64);
+HsBool hs_neInt64 (HsInt64, HsInt64);
+HsBool hs_ltInt64 (HsInt64, HsInt64);
+HsBool hs_leInt64 (HsInt64, HsInt64);
+
+HsWord64 hs_remWord64 (HsWord64, HsWord64);
+HsWord64 hs_quotWord64 (HsWord64, HsWord64);
+
+HsInt64 hs_remInt64 (HsInt64, HsInt64);
+HsInt64 hs_quotInt64 (HsInt64, HsInt64);
+HsInt64 hs_negateInt64 (HsInt64);
+HsInt64 hs_plusInt64 (HsInt64, HsInt64);
+HsInt64 hs_minusInt64 (HsInt64, HsInt64);
+HsInt64 hs_timesInt64 (HsInt64, HsInt64);
+
+HsWord64 hs_and64 (HsWord64, HsWord64);
+HsWord64 hs_or64 (HsWord64, HsWord64);
+HsWord64 hs_xor64 (HsWord64, HsWord64);
+HsWord64 hs_not64 (HsWord64);
+
+HsWord64 hs_uncheckedShiftL64 (HsWord64, HsInt);
+HsWord64 hs_uncheckedShiftRL64 (HsWord64, HsInt);
+HsInt64 hs_uncheckedIShiftL64 (HsInt64, HsInt);
+HsInt64 hs_uncheckedIShiftRA64 (HsInt64, HsInt);
+HsInt64 hs_uncheckedIShiftRL64 (HsInt64, HsInt);
+
+HsInt64 hs_intToInt64 (HsInt);
+HsInt hs_int64ToInt (HsInt64);
+HsWord64 hs_int64ToWord64 (HsInt64);
+HsWord64 hs_wordToWord64 (HsWord);
+HsWord hs_word64ToWord (HsWord64);
+HsInt64 hs_word64ToInt64 (HsWord64);
+
+HsWord64 hs_integerToWord64 (HsInt sa, StgByteArray /* Really: mp_limb_t* */ da);
+HsInt64 hs_integerToInt64 (HsInt sa, StgByteArray /* Really: mp_limb_t* */ da);
#endif /* SUPPORT_LONG_LONGS */
INLINE void __hscore_set_errno(int e) { errno = e; }
#if !defined(_MSC_VER)
-INLINE int __hscore_s_isreg(m) { return S_ISREG(m); }
-INLINE int __hscore_s_isdir(m) { return S_ISDIR(m); }
-INLINE int __hscore_s_isfifo(m) { return S_ISFIFO(m); }
-INLINE int __hscore_s_isblk(m) { return S_ISBLK(m); }
-INLINE int __hscore_s_ischr(m) { return S_ISCHR(m); }
+INLINE int __hscore_s_isreg(mode_t m) { return S_ISREG(m); }
+INLINE int __hscore_s_isdir(mode_t m) { return S_ISDIR(m); }
+INLINE int __hscore_s_isfifo(mode_t m) { return S_ISFIFO(m); }
+INLINE int __hscore_s_isblk(mode_t m) { return S_ISBLK(m); }
+INLINE int __hscore_s_ischr(mode_t m) { return S_ISCHR(m); }
#ifdef S_ISSOCK
-INLINE int __hscore_s_issock(m) { return S_ISSOCK(m); }
+INLINE int __hscore_s_issock(mode_t m) { return S_ISSOCK(m); }
#endif
#endif
return BUFSIZ;
}
-INLINE HsInt
+INLINE int
__hscore_seek_cur()
{
return SEEK_CUR;
}
-INLINE HsInt
+INLINE int
__hscore_o_binary()
{
#if defined(_MSC_VER)
#endif
}
-INLINE HsInt
+INLINE int
__hscore_seek_set( void )
{
return SEEK_SET;
}
-INLINE HsInt
+INLINE int
__hscore_seek_end( void )
{
return SEEK_END;
#endif
}
-INLINE HsInt
-__hscore_setmode( HsInt fd, HsBool toBin )
+INLINE int
+__hscore_setmode( int fd, HsBool toBin )
{
#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
return setmode(fd,(toBin == HS_BOOL_TRUE) ? _O_BINARY : _O_TEXT);
#if __GLASGOW_HASKELL__
-INLINE HsInt
-__hscore_PrelHandle_write( HsInt fd, HsAddr ptr, HsInt off, int sz )
+INLINE int
+__hscore_PrelHandle_write( int fd, void *ptr, HsInt off, int sz )
{
return write(fd,(char *)ptr + off, sz);
}
-INLINE HsInt
-__hscore_PrelHandle_read( HsInt fd, HsAddr ptr, HsInt off, int sz )
+INLINE int
+__hscore_PrelHandle_read( int fd, void *ptr, HsInt off, int sz )
{
return read(fd,(char *)ptr + off, sz);
}
#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
-INLINE HsInt
-__hscore_PrelHandle_send( HsInt fd, HsAddr ptr, HsInt off, int sz )
+INLINE int
+__hscore_PrelHandle_send( int fd, void *ptr, HsInt off, int sz )
{
return send(fd,(char *)ptr + off, sz, 0);
}
-INLINE HsInt
-__hscore_PrelHandle_recv( HsInt fd, HsAddr ptr, HsInt off, int sz )
+INLINE int
+__hscore_PrelHandle_recv( int fd, void *ptr, HsInt off, int sz )
{
return recv(fd,(char *)ptr + off, sz, 0);
}
#endif /* __GLASGOW_HASKELL__ */
-INLINE HsInt
-__hscore_mkdir( HsAddr pathName, HsInt mode )
+INLINE int
+__hscore_mkdir( char *pathName, int mode )
{
#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
return mkdir(pathName);
#endif
}
-INLINE HsInt
-__hscore_lstat( HsAddr fname, HsAddr st )
+INLINE int
+__hscore_lstat( const char *fname, struct stat *st )
{
#if HAVE_LSTAT
- return lstat((const char*)fname, (struct stat*)st);
+ return lstat(fname, st);
#else
- return stat((const char*)fname, (struct stat*)st);
+ return stat(fname, st);
#endif
}
#endif
#ifdef R_OK
-INLINE mode_t __hscore_R_OK() { return R_OK; }
+INLINE int __hscore_R_OK() { return R_OK; }
#endif
#ifdef W_OK
-INLINE mode_t __hscore_W_OK() { return W_OK; }
+INLINE int __hscore_W_OK() { return W_OK; }
#endif
#ifdef X_OK
-INLINE mode_t __hscore_X_OK() { return X_OK; }
+INLINE int __hscore_X_OK() { return X_OK; }
#endif
#ifdef S_IRUSR
INLINE mode_t __hscore_S_IXUSR() { return S_IXUSR; }
#endif
-INLINE HsAddr
+INLINE char *
__hscore_d_name( struct dirent* d )
{
- return (HsAddr)(d->d_name);
+ return (d->d_name);
}
-INLINE HsInt
+INLINE int
__hscore_end_of_dir( void )
{
return READDIR_ERRNO_EOF;
}
INLINE void
-__hscore_free_dirent(HsAddr dEnt)
+__hscore_free_dirent(struct dirent *dEnt)
{
#if HAVE_READDIR_R
free(dEnt);
INLINE void hsFD_CLR(int fd, fd_set *fds) { FD_CLR(fd, fds); }
INLINE int hsFD_ISSET(int fd, fd_set *fds) { return FD_ISSET(fd, fds); }
INLINE void hsFD_SET(int fd, fd_set *fds) { FD_SET(fd, fds); }
-INLINE int sizeof_fd_set(void) { return sizeof(fd_set); }
+INLINE HsInt sizeof_fd_set(void) { return sizeof(fd_set); }
extern void hsFD_ZERO(fd_set *fds);
#endif
// gettimeofday()-related
#if !defined(__MINGW32__)
-#define TICK_FREQ 50
INLINE HsInt sizeofTimeVal(void) { return sizeof(struct timeval); }
-INLINE HsInt getTicksOfDay(void)
+INLINE HsWord64 getUSecOfDay(void)
{
struct timeval tv;
gettimeofday(&tv, (struct timezone *) NULL);
- return (tv.tv_sec * TICK_FREQ +
- tv.tv_usec * TICK_FREQ / 1000000);
+ // Don't forget to cast *before* doing the arithmetic, otherwise
+ // the arithmetic happens at the type of tv_sec, which is probably
+ // only 'int'.
+ return ((HsWord64)tv.tv_sec * 1000000 + (HsWord64)tv.tv_usec);
}
-INLINE void setTimevalTicks(struct timeval *p, HsInt ticks)
+INLINE void setTimevalTicks(struct timeval *p, HsWord64 usecs)
{
- p->tv_sec = ticks / TICK_FREQ;
- p->tv_usec = (ticks % TICK_FREQ) * (1000000 / TICK_FREQ);
+ p->tv_sec = usecs / 1000000;
+ p->tv_usec = usecs % 1000000;
}
#endif /* !defined(__MINGW32__) */