Small bug fix for SPECjbb. And the BAMBOO_ASSERT macro has been moved to runtime_arch...

diff --git a/Robust/src/Runtime/bamboo/multicoregcprofile.h b/Robust/src/Runtime/bamboo/multicoregcprofile.h
index d6ffeff3901db27d1c913fceecc5e52aaecdfa31..4a63185fcfc13b6f69ccc2680d486e82207c6bff 100644 (file)
--- a/Robust/src/Runtime/bamboo/multicoregcprofile.h
+++ b/Robust/src/Runtime/bamboo/multicoregcprofile.h
@@ -105,6 +105,12 @@ void gc_outputProfileData();
       gc_profileItem(); \
     } \
   }
+#define GCPROFILE_END() \
+  { \
+    if(gc_profile_flag) { \
+      gc_profileEnd(); \
+    } \
+  }
 #else // MGC_SPEC
 #define GCPROFILE_RECORD_LOBJ() (gc_num_lobj++)
 #define GCPROFILE_RECORD_LOBJSPACE() (gc_num_lobjspace = sumsize)
@@ -120,9 +126,9 @@ void gc_outputProfileData();
 #define GCPROFILE_RECORD_LIVE_OBJ() (gc_num_liveobj++)
 #define GCPROFILE_START() gc_profileStart()
 #define GCPROFILE_ITEM() gc_profileItem()
+#define GCPROFILE_END() gc_profileEnd()
 #endif // MGC_SPEC
 
-#define GCPROFILE_END() gc_profileEnd()
 #define GCPROFILE_INIT() gc_profileInit()
 
 #else // GC_PROFILE

diff --git a/Robust/src/Runtime/bamboo/multicoremsg.c b/Robust/src/Runtime/bamboo/multicoremsg.c
index 07189da492d6e44cca67397cae5c222c80baa62b..5a783fed2f8d0c77cae0f3b1f9e8671825cef752 100644 (file)
--- a/Robust/src/Runtime/bamboo/multicoremsg.c
+++ b/Robust/src/Runtime/bamboo/multicoremsg.c
@@ -65,7 +65,7 @@ INLINE unsigned int checkMsgLength_I(unsigned int realtype) {
 #else
   unsigned int type = realtype;
 #endif
-  BAMBOO_ASSERT(type<=MSGEND, 0x1234);
+  BAMBOO_ASSERT(type<=MSGEND);
 #ifdef TASK
 #ifdef MULTICORE_GC
   if(type==TRANSOBJ||type==GCLOBJINFO) {