changeset 899:586b4f825f24

minor fix..
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 16 Jul 2010 22:20:02 +0900
parents ae9231be6dbd
children ac76784d70cb
files Renderer/Engine/Makefile.def Renderer/Engine/viewer.cc TaskManager/Cell/spe/CellDmaManager.h TaskManager/Cell/spe/CellScheduler.h TaskManager/Cell/spe/SpeTaskManagerImpl.h TaskManager/kernel/ppe/DmaBuffer.h TaskManager/kernel/ppe/HTaskInfo.h TaskManager/kernel/ppe/MailManager.h TaskManager/kernel/ppe/QueueInfo.h TaskManager/kernel/ppe/TaskList.h TaskManager/kernel/ppe/TaskManager.h TaskManager/kernel/ppe/TaskManagerImpl.h TaskManager/kernel/ppe/TaskQueue.h TaskManager/kernel/ppe/TaskQueueInfo.h TaskManager/kernel/ppe/Threads.h TaskManager/kernel/schedule/SchedTask.h TaskManager/kernel/schedule/SchedTaskArray.h TaskManager/kernel/schedule/SchedTaskArrayLoad.h TaskManager/kernel/schedule/SchedTaskArrayNop.h TaskManager/kernel/schedule/SchedTaskBase.h TaskManager/kernel/schedule/Scheduler.h
diffstat 21 files changed, 22 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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 バイト倍数でないといけない。
--- 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
--- 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
--- 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 */
--- 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
--- 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
--- 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;
 
--- 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)));
+}  ;
 
 
 
--- 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;
 
--- 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
 
--- 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);
--- 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;
 
--- 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
--- 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
--- 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);
--- 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
--- 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
--- 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
--- 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
--- 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,