From 230fcda9599305f35a04265aa0e48477c581473a Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Mon, 3 Apr 2006 16:59:21 +0000 Subject: [PATCH] more 64-bit 3m fixes svn: r2582 --- src/mzscheme/gc2/newgc.c | 2 +- src/mzscheme/src/hash.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mzscheme/gc2/newgc.c b/src/mzscheme/gc2/newgc.c index 0a9c1265f2..eb56774989 100644 --- a/src/mzscheme/gc2/newgc.c +++ b/src/mzscheme/gc2/newgc.c @@ -2103,7 +2103,7 @@ inline static void do_heap_compact(void) gcWORDS_TO_BYTES(info->size), start+1, newplace+1)); memcpy(newplace, start, gcWORDS_TO_BYTES(info->size)); info->moved = 1; - *(PPTR(NUM(start) + 4)) = PTR(NUM(newplace) + 4); + *(PPTR(NUM(start) + WORD_SIZE)) = PTR(NUM(newplace) + WORD_SIZE); newplace += info->size; } start += info->size; diff --git a/src/mzscheme/src/hash.c b/src/mzscheme/src/hash.c index ea52d1effa..b17aa52d00 100644 --- a/src/mzscheme/src/hash.c +++ b/src/mzscheme/src/hash.c @@ -715,7 +715,8 @@ static long hash_general(Scheme_Object *o) keygen += 4; } - return *(long *) mzALIAS o; + /* Relies on int = two shorts: */ + return *(int *) mzALIAS o; } static long hash_symbol(Scheme_Object *o) @@ -736,7 +737,8 @@ static long hash_symbol(Scheme_Object *o) return hash_general(o); } - return *(long *) mzALIAS o; + /* Relies on int = two shorts: */ + return *(int *) mzALIAS o; } static long hash_prim(Scheme_Object *o)