changeset 61:e66cab264350

RenderingEngine Task is worked on spe, task_dandy Task is worked on ppe
author yutaka@localhost.localdomain
date Sun, 06 Feb 2011 18:11:30 +0900
parents cfd42ee2ad28
children a5ddd99181df
files Makefile.ps3 collision_task.cc state_task.cc
diffstat 3 files changed, 124 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.ps3	Sun Feb 06 17:16:43 2011 +0900
+++ b/Makefile.ps3	Sun Feb 06 18:11:30 2011 +0900
@@ -3,7 +3,7 @@
 
 ABI = -m32
 
-CFLAGS  += `/usr/bin/sdl-config --cflags` `xml2-config --cflags`
+CFLAGS  += `/usr/bin/sdl-config --cflags` `xml2-config --cflags` -DPPE_ONLY
 LIBS	+= `sdl-config --libs` -lGL -lGLU -lSDL_mixer -lSDL_image `xml2-config --libs`
 LIBS +=  -lCerium -lCellManager -lspe2
 
@@ -41,7 +41,7 @@
 
 cell-dandy: t_dandy spe-main
 
-t_dandy: $(OBJS) $(TASK_OBJS) TaskDandy.o collision_task.o state_task.o
+t_dandy: $(OBJS) $(TASK_OBJS) TaskDandy.o collision_task.o state_task.o 
 	 $(CC) $(ABI) -o $@ $? $(LIBS)
 
 clean:
--- a/collision_task.cc	Sun Feb 06 17:16:43 2011 +0900
+++ b/collision_task.cc	Sun Feb 06 18:11:30 2011 +0900
@@ -119,7 +119,11 @@
     alloc_task->set_param(1, (memaddr)sizeof(CollisionProperty));
     alloc_task->set_param(2, (memaddr)COLLDATA);
 
+#ifndef PPE_ONLY
     alloc_task->set_cpu(SPE_0);
+#else
+    alloc_task->set_cpu(CPU_PPE);
+#endif
     alloc_task->spawn();
 }
 
@@ -135,7 +139,12 @@
     update_task->set_inData(0, property, sizeof(CollisionProperty));
 
     update_task->set_post(after_free, (void*)property, NULL);
+
+#ifndef PPE_ONLY
     update_task->set_cpu(SPE_0);
+#else
+    update_task->set_cpu(CPU_PPE);
+#endif
 
     return update_task;
 }
@@ -151,7 +160,11 @@
     reflect_task->set_outData(0, property, sizeof(CollisionProperty));
 
     reflect_task->set_post(reflect_property, (void*)property, NULL);
+#ifndef PPE_ONLY
     reflect_task->set_cpu(SPE_0);
+#else
+    reflect_task->set_cpu(CPU_PPE);
+#endif
 
     return reflect_task;
 }
@@ -162,8 +175,11 @@
     HTaskPtr free_task = tmanager->create_task(DataFree);
 
     free_task->set_param(0, (memaddr)COLLDATA);
-
+#ifndef PPE_ONLY
     free_task->set_cpu(SPE_0);
+#else
+    free_task->set_cpu(CPU_PPE);
+#endif
     free_task->spawn();
 }
 
@@ -204,7 +220,11 @@
     collision_task->set_outData(1, obj, obj_size);
 
     collision_task->set_post(collision_check, (void*)obj, (void*)p);
+#ifndef PPE_ONLY
     collision_task->set_cpu(SPE_0);
+#else
+    collision_task->set_cpu(CPU_PPE);
+#endif
 
     collision_task->wait_for(update_task);
     reflect_task->wait_for(collision_task);
--- a/state_task.cc	Sun Feb 06 17:16:43 2011 +0900
+++ b/state_task.cc	Sun Feb 06 18:11:30 2011 +0900
@@ -179,7 +179,12 @@
     state_task->set_outData(0, p, sizeof(CHARACTER));
 
     state_task->set_post(updateState, (void*)p, NULL);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -204,7 +209,12 @@
     state_task->set_outData(0, p, sizeof(CHARACTER));
 
     state_task->set_post(printState, (void*)p, NULL);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -225,7 +235,12 @@
     state_task->set_outData(0, p, sizeof(CHARACTER));
 
     state_task->set_post(updateState, (void*)p, NULL);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -250,7 +265,12 @@
     state_task->set_outData(1, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -276,7 +296,12 @@
     state_task->set_outData(1, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);    
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -310,7 +335,12 @@
     } else {
 	state_task->set_post(updateState, (void*)p, NULL);
     }
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -338,7 +368,12 @@
     state_task->set_outData(2, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY    
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -367,7 +402,12 @@
     state_task->set_outData(4, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -391,7 +431,13 @@
     state_task->set_outData(1, &rinkf1, sizeof(int));
     
     state_task->set_post(updateState, (void*)p, NULL);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
+
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -420,7 +466,12 @@
     state_task->set_outData(2, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -456,7 +507,12 @@
     state_task->set_outData(6, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -489,7 +545,12 @@
     state_task->set_outData(2, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -522,7 +583,12 @@
     state_task->set_outData(4, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -553,7 +619,12 @@
     state_task->set_outData(4, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -583,7 +654,12 @@
     state_task->set_outData(2, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -619,7 +695,12 @@
     state_task->set_outData(2, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -653,7 +734,12 @@
     state_task->set_outData(1, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -684,7 +770,12 @@
     state_task->set_outData(2, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -713,7 +804,12 @@
     state_task->set_outData(1, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);    
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();
@@ -744,7 +840,12 @@
     state_task->set_outData(1, obj, 0);
 
     state_task->set_post(checkContainer, (void*)p, (void*)obj);    
+
+#ifndef PPE_ONLY
     state_task->set_cpu(get_cpunum());
+#else
+    state_task->set_cpu(CPU_PPE);
+#endif
 
     state_next->wait_for(state_task);
     state_task->spawn();