bug fixes

diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
index 07cf220e7d7f9a93783874b02f6467b82f8663e5..f37a045996bd5ec30d7b67e2db1b931ae38db834 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
@@ -1,6 +1,6 @@
 MAINCLASS=MatrixMultiply
 SRC=${MAINCLASS}.java
-FLAGS=-dsm -prefetch -optimize -printflat -profile -debug -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -o ${MAINCLASS} -trueprob 0.9
+FLAGS=-dsm -prefetch -optimize -printflat -profile -debug -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -o ${MAINCLASS} -trueprob 0.8
 FLAGS2=-dsm -optimize -printflat -profile -debug -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -o ${MAINCLASS}NP
 default:
        ../../../buildscript ${FLAGS2} ${SRC}

diff --git a/Robust/src/Runtime/thread.c b/Robust/src/Runtime/thread.c
index 2b388245ce0f62ca56d60029b41179801b1e9e4e..93e827aa25cc8e70f55d426e673f767fe2325fa4 100644 (file)
--- a/Robust/src/Runtime/thread.c
+++ b/Robust/src/Runtime/thread.c
@@ -177,7 +177,7 @@ transstart:
 #ifdef THREADS
 void CALL01(___Thread______nativeJoin____, struct ___Thread___ * ___this___) {
   /* This is an evil, non portable hack*/
-  pthread_join((thread_t)___this___->___threadid___, NULL);
+  pthread_join((pthread_t)VAR(___this___)->___threadid___, NULL);
 }
 
 void CALL01(___Thread______nativeCreate____, struct ___Thread___ * ___this___) {
@@ -197,7 +197,7 @@ void CALL01(___Thread______nativeCreate____, struct ___Thread___ * ___this___) {
       usleep(1);
   } while(retval!=0);
   /* This next statement will likely not work on many machines */
-  ___this___->___threadid___=thread;
+  VAR(___this___)->___threadid___=thread;
 
   pthread_attr_destroy(&nattr);
 }

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index e9e5565a9130df4a5028e674f0492ea60992313d..6fc2d977c3e78cbc9998d12aeddfeac4a177bfbe 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -178,7 +178,7 @@ fi
 # Build bristlecone/java sources
 
 #if ! java -Xms5m -Xmx100m $JAVAFORWARDOPTS -cp $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main -classlibrary \
-if ! java $JAVAFORWARDOPTS -cp $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main -classlibrary \
+if ! java $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main -classlibrary \
 $ROBUSTROOT/ClassLibrary/ -dir $BUILDDIR -precise \
 $JAVAOPTS $SRCFILES
 then exit $?