# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1258218333 -32400
# Node ID 55ed910d13c21b7cc81228ecb0cf2480f49bd947
# Parent  0decff4e867b770000026126a95c75c3dc0b5a6d# Parent  4cfcac2367d54f4b5c92efd046dc973f564d6136
merge

diff -r 0decff4e867b -r 55ed910d13c2 TaskManager/Cell/CellTaskManagerImpl.cc
--- a/TaskManager/Cell/CellTaskManagerImpl.cc	Sun Nov 15 02:02:30 2009 +0900
+++ b/TaskManager/Cell/CellTaskManagerImpl.cc	Sun Nov 15 02:05:33 2009 +0900
@@ -221,7 +221,7 @@
 		    //__debug_ppe("[PPE] MALLOCED 0x%x from [SPE %d]\n", alloc_info[1],id);
 		    speThreads->add_output_tasklist(command, alloc_info[1], alloc_size);
 
-		    speThreads->send_mail(id, 2, alloc_info);
+		    speThreads->send_mail(id, 2, (memaddr *)alloc_info);
 		} else if (data > MY_SPE_NOP) {
 		    //__debug_ppe("[PPE] recv from [SPE %d] : 0x%x\n", id, data);
 		    HTaskPtr task = (HTaskPtr)data;
@@ -274,7 +274,8 @@
 
     taskListImpl->clear_taskList(speTaskList_bg[id]);
 
-    speThreads->send_mail(id, 1, (unsigned int *)&speTaskList[id]);
+    //speThreads->send_mail(id, 1, (unsigned int *)&speTaskList[id]);
+    speThreads->send_mail(id, 1, (memaddr *)&speTaskList[id]);
     flag_sendTaskList[id] = 0;
 }
 
diff -r 0decff4e867b -r 55ed910d13c2 TaskManager/Cell/SpeThreads.cc
--- a/TaskManager/Cell/SpeThreads.cc	Sun Nov 15 02:02:30 2009 +0900
+++ b/TaskManager/Cell/SpeThreads.cc	Sun Nov 15 02:05:33 2009 +0900
@@ -160,6 +160,7 @@
  */
 void
 SpeThreads::send_mail(int speid, int num, memaddr *data1)
+
 {
     unsigned int *data = (unsigned int *) data1;
     spe_in_mbox_write(spe_ctx[speid], data, num, SPE_MBOX_ALL_BLOCKING);