# HG changeset patch # User Shinji KONO # Date 1279286402 -32400 # Node ID 586b4f825f245e8018d3aacf1878386e6b3f0430 # Parent ae9231be6dbda1116af3f6a2e7bd1182744d31c2 minor fix.. diff -r ae9231be6dbd -r 586b4f825f24 Renderer/Engine/Makefile.def --- a/Renderer/Engine/Makefile.def Fri Jul 16 19:00:49 2010 +0900 +++ b/Renderer/Engine/Makefile.def Fri Jul 16 22:20:02 2010 +0900 @@ -5,7 +5,7 @@ ABIBIT = 32 ABI = -m$(ABIBIT) CC = g++ -OPT = -g -O9 # -DSPE_CREATE_POLYGON +OPT = -g -O9 -DSPE_CREATE_POLYGON=1 CFLAGS = -g -Wall $(ABI) $(OPT) # -DDEBUG INCLUDE = -I$(CERIUM)/include/TaskManager -I. diff -r ae9231be6dbd -r 586b4f825f24 Renderer/Engine/viewer.cc --- a/Renderer/Engine/viewer.cc Fri Jul 16 19:00:49 2010 +0900 +++ b/Renderer/Engine/viewer.cc Fri Jul 16 22:20:02 2010 +0900 @@ -175,6 +175,7 @@ spackList_length = (this->height + split_screen_h - 1) / split_screen_h; spackList = (SpanPack*)manager->allocate(sizeof(SpanPack)*spackList_length); +printf("spackList %0x\n",(unsigned int)spackList); /** * SPU に送る address list は 16 バイト倍数でないといけない。 diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/Cell/spe/CellDmaManager.h --- a/TaskManager/Cell/spe/CellDmaManager.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/Cell/spe/CellDmaManager.h Fri Jul 16 22:20:02 2010 +0900 @@ -53,6 +53,6 @@ /* end */ -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/Cell/spe/CellScheduler.h --- a/TaskManager/Cell/spe/CellScheduler.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/Cell/spe/CellScheduler.h Fri Jul 16 22:20:02 2010 +0900 @@ -17,6 +17,6 @@ private: int mainMemNum; -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/Cell/spe/SpeTaskManagerImpl.h --- a/TaskManager/Cell/spe/SpeTaskManagerImpl.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/Cell/spe/SpeTaskManagerImpl.h Fri Jul 16 22:20:02 2010 +0900 @@ -27,7 +27,7 @@ void set_task_cpu(HTaskPtr, CPU_TYPE); void polling() {} -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif /* INCLUDED_SPE_TASK_MANAGER_IMPL */ diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/ppe/DmaBuffer.h --- a/TaskManager/kernel/ppe/DmaBuffer.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/ppe/DmaBuffer.h Fri Jul 16 22:20:02 2010 +0900 @@ -18,6 +18,6 @@ /* functions */ void swap_buffer(void); void get_buffer(void*); -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/ppe/HTaskInfo.h --- a/TaskManager/kernel/ppe/HTaskInfo.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/ppe/HTaskInfo.h Fri Jul 16 22:20:02 2010 +0900 @@ -44,6 +44,6 @@ /* functions */ int extend_pool(int num); void destroy(); -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/ppe/MailManager.h --- a/TaskManager/kernel/ppe/MailManager.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/ppe/MailManager.h Fri Jul 16 22:20:02 2010 +0900 @@ -25,7 +25,7 @@ void calc_mask(unsigned int qsize); void extend(); -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; typedef MailManager *MailManagerPtr; diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/ppe/QueueInfo.h --- a/TaskManager/kernel/ppe/QueueInfo.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/ppe/QueueInfo.h Fri Jul 16 22:20:02 2010 +0900 @@ -65,7 +65,7 @@ int extend_pool(int num); void destroy(); void queueInfoInit(); -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/ppe/TaskList.h --- a/TaskManager/kernel/ppe/TaskList.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/ppe/TaskList.h Fri Jul 16 22:20:02 2010 +0900 @@ -19,7 +19,7 @@ SimpleTask tasks[TASK_MAX_SIZE]; // 32*TASK_MAX_SIZE void init() { length = 0; waiter=this; } -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; typedef TaskList* TaskListPtr; diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/ppe/TaskManager.h --- a/TaskManager/kernel/ppe/TaskManager.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/ppe/TaskManager.h Fri Jul 16 22:20:02 2010 +0900 @@ -40,7 +40,7 @@ private: int machineNum; -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/ppe/TaskManagerImpl.h --- a/TaskManager/kernel/ppe/TaskManagerImpl.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/ppe/TaskManagerImpl.h Fri Jul 16 22:20:02 2010 +0900 @@ -56,7 +56,7 @@ void* allocate(int size, int alignment) { - void *buff; + void *buff = 0; if (size==0) return 0; #if defined(__SPU__) || ! defined(HAS_POSIX_MEMALIGN) buff = malloc(size); @@ -70,7 +70,7 @@ void* allocate(int size) { - void *buff; + void *buff = 0; if (size==0) return 0; #if defined(__SPU__) || ! defined(HAS_POSIX_MEMALIGN) buff = malloc(size); diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/ppe/TaskQueue.h --- a/TaskManager/kernel/ppe/TaskQueue.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/ppe/TaskQueue.h Fri Jul 16 22:20:02 2010 +0900 @@ -22,7 +22,7 @@ TaskQueue *next; TaskQueue *prev; -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; typedef TaskQueue* TaskQueuePtr; diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/ppe/TaskQueueInfo.h --- a/TaskManager/kernel/ppe/TaskQueueInfo.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/ppe/TaskQueueInfo.h Fri Jul 16 22:20:02 2010 +0900 @@ -44,6 +44,6 @@ /* functions */ int extend_pool(int num); void destroy(); -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/ppe/Threads.h --- a/TaskManager/kernel/ppe/Threads.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/ppe/Threads.h Fri Jul 16 22:20:02 2010 +0900 @@ -22,6 +22,6 @@ /* variables */ pthread_t *threads; int cpu_num; -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/schedule/SchedTask.h --- a/TaskManager/kernel/schedule/SchedTask.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/schedule/SchedTask.h Fri Jul 16 22:20:02 2010 +0900 @@ -107,7 +107,7 @@ int printf(const char * format, ...); -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; extern void loadSchedTask(Scheduler *scheduler,TaskPtr task); diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/schedule/SchedTaskArray.h --- a/TaskManager/kernel/schedule/SchedTaskArray.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/schedule/SchedTaskArray.h Fri Jul 16 22:20:02 2010 +0900 @@ -38,7 +38,7 @@ memaddr get_param(int); int read_size(); -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/schedule/SchedTaskArrayLoad.h --- a/TaskManager/kernel/schedule/SchedTaskArrayLoad.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/schedule/SchedTaskArrayLoad.h Fri Jul 16 22:20:02 2010 +0900 @@ -25,7 +25,7 @@ SchedTaskBase* next(Scheduler *, SchedTaskBase *); -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/schedule/SchedTaskArrayNop.h --- a/TaskManager/kernel/schedule/SchedTaskArrayNop.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/schedule/SchedTaskArrayNop.h Fri Jul 16 22:20:02 2010 +0900 @@ -26,7 +26,7 @@ void write(); SchedTaskBase* next(Scheduler *, SchedTaskBase *); -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/schedule/SchedTaskBase.h --- a/TaskManager/kernel/schedule/SchedTaskBase.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/schedule/SchedTaskBase.h Fri Jul 16 22:20:02 2010 +0900 @@ -74,6 +74,6 @@ ListData inListData; ListData outListData; -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; #endif diff -r ae9231be6dbd -r 586b4f825f24 TaskManager/kernel/schedule/Scheduler.h --- a/TaskManager/kernel/schedule/Scheduler.h Fri Jul 16 19:00:49 2010 +0900 +++ b/TaskManager/kernel/schedule/Scheduler.h Fri Jul 16 22:20:02 2010 +0900 @@ -139,7 +139,7 @@ int printf(const char *format, ...); int vprintf0(const char *format, va_list ap); -} __attribute__ ((aligned (DEFAULT_ALIGNMENT))); +} ; extern void register_task(int cmd, TaskObjectRun run); extern void register_dynamic_task(int cmd,