another round of 64-bit SGC repairs

svn: r3646
This commit is contained in:
Robby Findler 2006-07-07 04:02:23 +00:00
parent d211acd993
commit 5f2c2e58e1
2 changed files with 3 additions and 3 deletions

View File

@ -164,7 +164,7 @@ static void COLLECT(OFFSET_ARG)
if ((p >= bstart) && (p < block->top)) {
int size = block->size;
int pos = block->positions[(p - bstart) >> LOG_PTR_SIZE];
int start = bstart + pos * size;
unsigned long start = bstart + pos * size;
MARK_STATISTIC(num_blockallocs_stat++);

View File

@ -822,7 +822,7 @@ static void *malloc_plain_sector(int count);
inline static SectorPage **create_sector_pagetables(unsigned long p) {
unsigned long pos;
SectorPage ***sector_pagetabless, **sector_pagetables;
pos = (unsigned long)p >> 48;
pos = ((unsigned long)p >> 48) & ((1 << 16) - 1);
sector_pagetabless = sector_pagetablesss[pos];
if (!sector_pagetabless) {
int c = (sizeof(SectorPage **) << 16) >> LOG_SECTOR_SEGMENT_SIZE;
@ -848,7 +848,7 @@ inline static SectorPage **create_sector_pagetables(unsigned long p) {
inline static SectorPage **get_sector_pagetables(unsigned long p) {
unsigned long pos;
SectorPage ***sector_pagetabless;
pos = (unsigned long)p >> 48;
pos = ((unsigned long)p >> 48) & ((1 << 16) - 1);
sector_pagetabless = sector_pagetablesss[pos];
if (!sector_pagetabless)
return NULL;