Mercurial > hg > Game > Cerium
changeset 1525:23f8034d8100 draft
merge
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Wed, 14 Nov 2012 10:37:22 +0900 |
| parents | d232231e1425 (current diff) 32305a19a380 (diff) |
| children | 27d34e7a1d66 |
| files | |
| diffstat | 6 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Cell/spe/CellDmaManager.h Tue Nov 13 16:46:19 2012 +0900 +++ b/TaskManager/Cell/spe/CellDmaManager.h Wed Nov 14 10:37:22 2012 +0900 @@ -35,7 +35,7 @@ int task_list_read_count; /* functions */ - void *dma_load(Scheduler *s,void *buf, memaddr addr, uint32 size, uint32 mask); + void *dma_load(Scheduler *s, memaddr addr, uint32 size, uint32 mask); void *dma_load1(void *buf, memaddr addr, uint32 size, uint32 mask); void *dma_store(Scheduler *s,void *buf, memaddr addr, uint32 size, uint32 mask);
--- a/TaskManager/Cell/spe/SpeTaskManagerImpl.cc Tue Nov 13 16:46:19 2012 +0900 +++ b/TaskManager/Cell/spe/SpeTaskManagerImpl.cc Wed Nov 14 10:37:22 2012 +0900 @@ -23,13 +23,16 @@ // Odd #ifndef __CERIUM_FIFO__ -SpeTaskManagerImpl::SpeTaskManagerImpl(int i) {} -void SpeTaskManagerImpl::append_activeTask(HTask* p) {} -void SpeTaskManagerImpl::append_waitTask(HTask* p) {} +TaskManagerImpl::TaskManagerImpl(int i) {} +void TaskManagerImpl::append_activeTask(HTask* p) {} +void TaskManagerImpl::append_waitTask(HTask* p) {} -HTaskPtr SpeTaskManagerImpl::create_task(int cmd,void *from) {return 0;} -HTaskPtr SpeTaskManagerImpl::create_task(int cmd, memaddr rbuf, long rs, memaddr wbuf, long ws,void *from) { return 0; } -HTask * SpeTaskManagerImpl::create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData,void *from) {return 0;} +HTaskPtr TaskManagerImpl::create_task(int cmd,void *from) {return 0;} +HTaskPtr TaskManagerImpl::create_task(int cmd, memaddr rbuf, long rs, memaddr wbuf, long ws,void *from) { return 0; } +HTask * TaskManagerImpl::create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData,void *from) {return 0;} +void TaskManagerImpl::set_task_depend(HTaskPtr master, HTaskPtr slave) {} +void TaskManagerImpl::spawn_task(HTaskPtr) {} +void TaskManagerImpl::set_task_cpu(HTaskPtr, CPU_TYPE) {} #endif
--- a/TaskManager/Fifo/ReferencedDmaManager.cc Tue Nov 13 16:46:19 2012 +0900 +++ b/TaskManager/Fifo/ReferencedDmaManager.cc Wed Nov 14 10:37:22 2012 +0900 @@ -42,7 +42,11 @@ { ListElement *elm = list->element; int *bound = list->bound; +#ifdef __CERIUM_CELL__ + uint32 readbuf = elm[0].addr; +#else memaddr readbuf = elm[0].addr; +#endif for(int i=0;i<list->length;i++) { bound[i] = elm[i].addr-readbuf; }
--- a/TaskManager/Makefile.cell Tue Nov 13 16:46:19 2012 +0900 +++ b/TaskManager/Makefile.cell Wed Nov 14 10:37:22 2012 +0900 @@ -13,9 +13,6 @@ $(CELL_SPE_DIR)/SchedTaskList.cc \ $(CELL_SPE_DIR)/SchedMail.cc \ $(CELL_SPE_DIR)/SchedTask.cc \ - $(CELL_SPE_DIR)/SchedTaskArray.cc \ - $(CELL_SPE_DIR)/SchedTaskArrayNop.cc \ - $(CELL_SPE_DIR)/SchedTaskArrayLoad.cc \ $(CELL_SPE_DIR)/Scheduler.cc\ $(CELL_SPE_DIR)/SchedNop.cc \ $(CELL_SPE_DIR)/MemList.cc \ @@ -39,7 +36,7 @@ # $(wildcard $(CELL_SPE_DIR)/*.cc) -CELL_SPE_OBJS = $(CELL_SPE_SRCS:.cc=.o) $(CELL_SPE_SCHEDULE_OBJ) $(CELL_SPE_TASK_SRCS:.cc=.o) # $(CELL_SPE_PROFILE:.cc=.o) +CELL_SPE_OBJS = $(CELL_SPE_SRCS:.cc=.o) $(CELL_SPE_SCHEDULE_OBJ) $(CELL_SPE_TASK_SRCS:.cc=.o) $(CELL_SPE_PROFILE:.cc=.o) SPUCC = spu-g++ -DABIBIT=$(ABIBIT)
--- a/TaskManager/kernel/ppe/CpuThreads.cc Tue Nov 13 16:46:19 2012 +0900 +++ b/TaskManager/kernel/ppe/CpuThreads.cc Wed Nov 14 10:37:22 2012 +0900 @@ -4,7 +4,6 @@ #ifdef __CERIUM_GPU__ #include "GpuThreads.h" #endif -#include "GpuThreads.h" #include "MainScheduler.h" #include "SysFunc.h" #include "SchedNop.h"
--- a/TaskManager/kernel/schedule/Scheduler.cc Tue Nov 13 16:46:19 2012 +0900 +++ b/TaskManager/kernel/schedule/Scheduler.cc Wed Nov 14 10:37:22 2012 +0900 @@ -337,9 +337,6 @@ MemorySegment * Scheduler::get_segment(memaddr addr, MemList *m) { - if (addr > (memaddr)0x200029f26) - addr = addr+1; - #ifdef USE_CACHE MemorySegment *s = m->getFirst();