Mercurial > hg > Game > Cerium
changeset 1511:34582cd8a7af draft cell
Fix compile error for cell
| author | Daichi TOMA <toma@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 02 Oct 2012 16:20:44 +0900 |
| parents | 81f1afd1851f |
| children | 30145272ff0b |
| files | TaskManager/Cell/spe/CellDmaManager.h TaskManager/Cell/spe/SpeTaskManagerImpl.cc TaskManager/Fifo/ReferencedDmaManager.cc TaskManager/Makefile.cell TaskManager/kernel/ppe/CpuThreads.cc TaskManager/kernel/schedule/Scheduler.cc |
| diffstat | 6 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Cell/spe/CellDmaManager.h Mon Oct 01 16:51:26 2012 +0900 +++ b/TaskManager/Cell/spe/CellDmaManager.h Tue Oct 02 16:20:44 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 Mon Oct 01 16:51:26 2012 +0900 +++ b/TaskManager/Cell/spe/SpeTaskManagerImpl.cc Tue Oct 02 16:20:44 2012 +0900 @@ -21,7 +21,7 @@ void SpeTaskManagerImpl::print_arch() { printf("SpeTaskManagerImpl\n"); } // Odd -#ifndef __CERIUM_FIFO__ +#ifdef __CERIUM_GPU__ SpeTaskManagerImpl::SpeTaskManagerImpl(int i) {} void SpeTaskManagerImpl::append_activeTask(HTask* p) {}
--- a/TaskManager/Fifo/ReferencedDmaManager.cc Mon Oct 01 16:51:26 2012 +0900 +++ b/TaskManager/Fifo/ReferencedDmaManager.cc Tue Oct 02 16:20:44 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 Mon Oct 01 16:51:26 2012 +0900 +++ b/TaskManager/Makefile.cell Tue Oct 02 16:20:44 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 \
--- a/TaskManager/kernel/ppe/CpuThreads.cc Mon Oct 01 16:51:26 2012 +0900 +++ b/TaskManager/kernel/ppe/CpuThreads.cc Tue Oct 02 16:20:44 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 Mon Oct 01 16:51:26 2012 +0900 +++ b/TaskManager/kernel/schedule/Scheduler.cc Tue Oct 02 16:20:44 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();