From 39f399f42442af8b3286ae3ff679d74762b60c35 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Wed, 25 Jul 2012 00:56:34 +0200
Subject: [PATCH] fixes #172

---
 compiler/ccgexprs.nim |  2 +-
 lib/nimbase.h         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
index 42f19b0694..6c8510ff86 100755
--- a/compiler/ccgexprs.nim
+++ b/compiler/ccgexprs.nim
@@ -524,7 +524,7 @@ proc unaryArith(p: BProc, e: PNode, d: var TLoc, op: TMagic) =
       "(($3)(NU32)(NU64)($1))", # ToU32
       "((double) ($1))",      # ToFloat
       "((double) ($1))",      # ToBiggestFloat
-      "float64ToInt32($1)",   # ToInt XXX: this is not correct!
+      "float64ToInt32($1)",   # ToInt
       "float64ToInt64($1)"]   # ToBiggestInt
   var
     a: TLoc
diff --git a/lib/nimbase.h b/lib/nimbase.h
index a73933a408..71f3b0d7c7 100755
--- a/lib/nimbase.h
+++ b/lib/nimbase.h
@@ -352,14 +352,14 @@ typedef char* NCSTRING;
 #  define NIM_IMAN 0
 #endif
 
-static N_INLINE(NI32, float64ToInt32)(double val) {
-  val = val + 68719476736.0*1.5;
-  /* 2^36 * 1.5,  (52-_shiftamt=36) uses limited precisicion to floor */
-  return ((NI32*)&val)[NIM_IMAN] >> 16; /* 16.16 fixed point representation */
+static N_INLINE(NI, float64ToInt32)(double x) {
+  /* nowadays no hack necessary anymore */
+  return x >= 0 ? (NI)(x+0.5) : (NI)(x-0.5);
 }
 
-static N_INLINE(NI32, float32ToInt32)(float val) {
-  return float64ToInt32((double)val);
+static N_INLINE(NI32, float32ToInt32)(float x) {
+  /* nowadays no hack necessary anymore */
+  return x >= 0 ? (NI32)(x+0.5) : (NI32)(x-0.5);
 }
 
 #define float64ToInt64(x) ((NI64) (x))