Mercurial > hg > Game > Cerium
changeset 620:51d2ce7946e3 draft
merge
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sun, 15 Nov 2009 02:05:33 +0900 |
| parents | 278db3ca751d (current diff) 0cc2e76d9cf4 (diff) |
| children | 64e05530e333 |
| files | TaskManager/Cell/CellTaskManagerImpl.cc |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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);