changes

[IRC.git] / Robust / src / buildscript

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index b158326f294764fc973bcf4611df16b8b4cfd88c..e328f0c8b1151fba926894e591df7f1c67530529 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -101,12 +101,13 @@ echo "-gccacheadapt setup as cacheadaptable mode (should be used together with -
 echo -gcprofile build with gcprofile options
 echo -mgc generate Multicore GC binary without task stuff
 echo -objectlockdebug generate OBJECT_LOCK_DEBUG code
-echo -mappinttbldebug generate MAPPINGTBL_DEBUG code
+echo -gctbldebug generate GC_TBL_DEBUG code
 echo
 echo SSJava options
 echo -ssjava enables SSJava
 echo
 echo Other options
+echo -jni enable jni
 echo -abcclose turnoff array boundary checks
 echo -builddir setup different build directory
 echo -robustroot set up the ROBUSTROOT to directory other than default one
@@ -154,6 +155,7 @@ echo -help help
 }
 
 tmpbuilddirectory="tmpbuilddirectory"
+JNI=false
 SRCAFTERPP=false;
 COREPROF=false;
 NUMA=false;
@@ -188,6 +190,7 @@ TILERABMEFLAG=false
 TILERAZLINUXFLAG=false
 TILERAMEMPROFFLAG=false
 TILERACONFIG=''
+TILERACORES=''
 CACHEFLUSHFLAG=false
 RAWCONFIG=''
 DEBUGFLAG=false
@@ -222,7 +225,7 @@ GCCACHESAMPLINGFLAG=false
 MGCFLAG=false
 MGCINTELFLAG=false
 OBJECTLOCKDEBUGFLAG=false
-MAPPINGTBLDEBUGFLAG=false
+GCTBLDEBUGFLAG=false
 USEDMALLOC=false
 THREADFLAG=false
 FASTCHECK=false
@@ -251,7 +254,10 @@ if [[ $1 = '-help' ]]
 then
 printhelp
 exit
-
+elif [[ $1 = '-jni' ]]
+then
+JNI=true
+JAVAOPTS="$JAVAOPTS -jni"
 elif [[ $1 = '-justanalyze' ]]
 then
 EXITAFTERANALYSIS=true
@@ -424,6 +430,7 @@ JAVAOPTS="$JAVAOPTS -multicore"
 elif [[ $1 = '-numcore' ]]
 then
 JAVAOPTS="$JAVAOPTS -numcore $2"
+TILERACORES="$2"
 if [[ "$2" -gt "1" ]]
 then
 TILERAN1COREFLAG=true
@@ -542,9 +549,9 @@ elif [[ $1 = '-objectlockdebug' ]]
 then
 OBJECTLOCKDEBUGFLAG=true
 JAVAOPTS="$JAVAOPTS -objectlockdebug"
-elif [[ $1 = '-mappingtbldebug' ]]
+elif [[ $1 = '-gctbldebug' ]]
 then
-MAPPINGTBLDEBUGFLAG=true
+GCTBLDEBUGFLAG=true
 elif [[ $1 = '-dmalloc' ]]
 then
 USEDMALLOC=true
@@ -930,9 +937,6 @@ cp ../Runtime/*.c ./
 cp ../Runtime/*.h ./
 cp ../Runtime/*.S ./
 cp ../Runtime/*.s ./
-mkdir ./coreprof
-cp ../Runtime/coreprof/*.c ./coreprof/
-cp ../Runtime/coreprof/*.h ./coreprof/
 cp $BAMBOORUNTIME/*.c ./
 cp $BAMBOORUNTIME/*.h ./
 cp $BAMBOORUNTIME/RAW/*.c ./
@@ -950,9 +954,9 @@ TILERADIR="$CURDIR/tilera"
 if $TILERABMEFLAG
 then # TILERABMEFLAG
 TILERA_INDIR="BME"
-MAKEFILE="Makefile.tilera.$TILERACONFIG"
-SIMHVC="sim.hvc.$TILERACONFIG"
-PCIHVC="pci.hvc.$TILERACONFIG"
+MAKEFILE="Makefile.tilera.$TILERACORES"
+#SIMHVC="sim.hvc.$TILERACONFIG"
+PCIHVC="pci.hvc.$TILERACORES"
 if $TILERA56COREFLAG
 then
   PCIHVC="$PCIHVC.56"
@@ -971,14 +975,13 @@ rm ./*
 if $MGCFLAG
 then
 export TILERACFLAGS="-DMULTICORE -DCLOSE_PRINT -DTILERA"
-#-DMAPPINGTBL_DEBUG"
 else
 export TILERACFLAGS="-DTASK -DMULTICORE -DCLOSE_PRINT -DTILERA"
 fi
 
-if $MAPPINGTBLDEBUGFLAG
+if $GCTBLDEBUGFLAG
 then
-TILERACFLAGS="${TILERACFLAGS} -DMAPPINGTBL_DEBUG"
+TILERACFLAGS="${TILERACFLAGS} -DGC_TBL_DEBUG"
 fi
 
 if $OBJECTLOCKDEBUGFLAG
@@ -1042,7 +1045,7 @@ fi #INTERRUPT version
 
 if $MGCFLAG
 then #MGCFLAG
-TILERACFLAGS="${TILERACFLAGS} -DMGC"
+TILERACFLAGS="${TILERACFLAGS} -DMGC -DMGC_SPEC"
 fi
 
 if $MULTICOREGCFLAG
@@ -1153,7 +1156,7 @@ cp $ROBUSTROOT/Tilera/Runtime/$TILERA_INDIR/$MAKEFILE ./Makefile
 fi
 if $TILERABMEFLAG
 then # TILERABMEFLAG
-cp $ROBUSTROOT/Tilera/Runtime/$TILERA_INDIR/$SIMHVC ./sim.hvc
+#cp $ROBUSTROOT/Tilera/Runtime/$TILERA_INDIR/$SIMHVC ./sim.hvc
 cp $ROBUSTROOT/Tilera/Runtime/$TILERA_INDIR/$PCIHVC ./pci.hvc
 if $TILERA56COREFLAG
 then
@@ -1184,9 +1187,6 @@ cp ../Runtime/ObjectHash.h ./
 cp ../Runtime/Queue.h ./
 cp ../Runtime/runtime.h ./
 cp ../Runtime/SimpleHash.h ./
-mkdir ./coreprof
-cp ../Runtime/coreprof/coreprof.c ./coreprof/
-cp ../Runtime/coreprof/coreprof.h ./coreprof/
 cp $BAMBOORUNTIME/multicoretask.c ./
 cp $BAMBOORUNTIME/multicoreruntime.c ./
 cp $BAMBOORUNTIME/multicoremem.c ./