From 372a8212471344d55128b7bffc9cf8bb962ae742 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 24 Apr 2008 13:15:26 +0000 Subject: [PATCH] Fix int64ToInteger 0xFFFFFFFF00000000 on 32bit machine; trac #2223 Patch from Mike Gunter. --- rts/PrimOps.cmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index cbdfe67..6c3593e 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -452,11 +452,11 @@ int64ToIntegerzh_fast hi = TO_W_(val >> 32); lo = TO_W_(val); - if ( hi != 0 && hi != 0xFFFFFFFF ) { - words_needed = 2; - } else { + if ( hi == 0 || (hi == 0xFFFFFFFF && lo != 0) ) { // minimum is one word words_needed = 1; + } else { + words_needed = 2; } ALLOC_PRIM( SIZEOF_StgArrWords + WDS(words_needed), -- 1.7.10.4