From a840dd4884c73f1d42f4c4b0eb048573b23d8348 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Sat, 16 Jul 2011 07:00:59 +0000 Subject: [PATCH] gets rid of crashes... --- Robust/src/Runtime/bamboo/multicoremem.h | 2 ++ Robust/src/Runtime/bamboo/pmc_forward.c | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Robust/src/Runtime/bamboo/multicoremem.h b/Robust/src/Runtime/bamboo/multicoremem.h index 585a2d93..03720c90 100644 --- a/Robust/src/Runtime/bamboo/multicoremem.h +++ b/Robust/src/Runtime/bamboo/multicoremem.h @@ -68,5 +68,7 @@ void * globalmalloc_I(int coren, unsigned INTPTR memcheck, unsigned INTPTR * all void * smemalloc(int coren, unsigned INTPTR isize, unsigned INTPTR * allocsize); void * smemalloc_I(int coren, unsigned INTPTR isize, unsigned INTPTR * allocsize); +#warning Block size is BAMBOO_SMEM_SIZE +#warning Numblocks is BAMBOO_NUM_BLOCKS #endif // BAMBOO_MULTICORE_MEM_H diff --git a/Robust/src/Runtime/bamboo/pmc_forward.c b/Robust/src/Runtime/bamboo/pmc_forward.c index c60d7ce5..746d947f 100644 --- a/Robust/src/Runtime/bamboo/pmc_forward.c +++ b/Robust/src/Runtime/bamboo/pmc_forward.c @@ -69,9 +69,11 @@ void pmc_processunits() { pmc_heapptr->regions[regionnum].highunit=i; pmc_heapptr->regions[regionnum].endptr=pmc_heapptr->units[i-1].endptr; - pmc_heapptr->regions[regionnum+1].startptr=pmc_heapptr->units[i-1].endptr; - pmc_heapptr->regions[regionnum+1].lowunit=i; - regionnum++; + if((regionnum+1)regions[regionnum+1].startptr=pmc_heapptr->units[i-1].endptr; + pmc_heapptr->regions[regionnum+1].lowunit=i; + regionnum++; + } totalbytes-=livebytespercore; numregions=0; } @@ -80,9 +82,7 @@ void pmc_processunits() { tmc_spin_mutex_init(&pmc_heapptr->units[i].lock); totalbytes+=pmc_heapptr->units[i].numbytes; } - pmc_heapptr->regions[regionnum].highunit=NUMPMCUNITS; - pmc_heapptr->regions[regionnum].endptr=pmc_heapptr->units[NUMPMCUNITS-1].endptr; - regionnum++; + for(;regionnumregions[regionnum].highunit=NUMPMCUNITS; pmc_heapptr->regions[regionnum].endptr=pmc_heapptr->units[NUMPMCUNITS-1].endptr; -- 2.34.1