diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-03-15 16:54:34 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-03-15 17:04:58 +0000 |
| commit | b0b76b2e926d08582538e2d31b18a1d80b83398d (patch) | |
| tree | 64d165cc4b581ee9b2aa475e7f817338c8ff8231 | |
| parent | dad672f3c37011f084938ce9e0afddeaa4692d89 (diff) | |
| download | haskell-b0b76b2e926d08582538e2d31b18a1d80b83398d.tar.gz | |
Some Win64 fixes
Convert some sizes, as CLong is a different size to pointers
| -rw-r--r-- | includes/Cmm.h | 2 | ||||
| -rw-r--r-- | rts/HeapStackCheck.cmm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/Cmm.h b/includes/Cmm.h index 11c02b4e3e..f582ca9771 100644 --- a/includes/Cmm.h +++ b/includes/Cmm.h @@ -383,7 +383,7 @@ // allocate() - this includes many of the primops. #define MAYBE_GC(liveness,reentry) \ if (bdescr_link(CurrentNursery) == NULL || \ - generation_n_new_large_words(W_[g0]) >= CLong[large_alloc_lim]) { \ + generation_n_new_large_words(W_[g0]) >= TO_W_(CLong[large_alloc_lim])) { \ R9 = liveness; \ R10 = reentry; \ HpAlloc = 0; \ diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm index 7ba44d3bcd..199f0cd378 100644 --- a/rts/HeapStackCheck.cmm +++ b/rts/HeapStackCheck.cmm @@ -676,8 +676,8 @@ INFO_TABLE_RET( stg_block_async, RET_SMALL, W_ unused ) W_ len, errC; ares = Sp(1); - len = StgAsyncIOResult_len(ares); - errC = StgAsyncIOResult_errCode(ares); + len = TO_W_(StgAsyncIOResult_len(ares)); + errC = TO_W_(StgAsyncIOResult_errCode(ares)); foreign "C" free(ares "ptr"); #ifdef GhcUnregisterised Sp(1) = errC; |