# HG changeset patch
# User root@localhost.localdomain
# Date 1244478131 -32400
# Node ID 2ddf79a7c5fbe7095e927d67e3823689f9b00646
# Parent  c9f8cfcdc5c2326471695c210a29c20516df26bf
debugging

diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb TaskManager/Cell/CellTaskManagerImpl.cc
--- a/TaskManager/Cell/CellTaskManagerImpl.cc	Tue Jun 09 00:10:36 2009 +0900
+++ b/TaskManager/Cell/CellTaskManagerImpl.cc	Tue Jun 09 01:22:11 2009 +0900
@@ -1,3 +1,5 @@
+#define DEBUG
+#include "error.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -5,8 +7,6 @@
 #include "CellBufferManager.h"
 #include "PpeScheduler.h"
 #include "types.h"
-// #define _PPE_DEBUG
-#include "error.h"
 
 CellTaskManagerImpl::~CellTaskManagerImpl(void)
 {
@@ -222,6 +222,7 @@
 		     * ここでは TaskList を allocate(new) して登録してやろうか
 		     */
 
+		    __debug_ppe("[PPE] MALLOCED 0x%x from [SPE %d]\n", alloc_info[1],id);
 		    speThreads->add_output_tasklist(command, alloc_info[1], alloc_size);
 
 		    speThreads->send_mail(id, 2, alloc_info);
diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb TaskManager/Test/test_render/Makefile
--- a/TaskManager/Test/test_render/Makefile	Tue Jun 09 00:10:36 2009 +0900
+++ b/TaskManager/Test/test_render/Makefile	Tue Jun 09 01:22:11 2009 +0900
@@ -33,5 +33,9 @@
 	perl tools/create_sglist.pl xml_file/*.xml 
 
 run-ps3:
-	sudo ps3-video-mode -v 133
-	./test_nogl -video fb -width 1980 -height 1080
\ No newline at end of file
+	ps3-video-mode -v 133
+	./test_nogl -video fb -width 1980 -height 1080
+
+run-ps3tv:
+	./test_nogl -video fb -width 576 -height 384 -bpp 32
+
diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb TaskManager/Test/test_render/spe/CreatePolygon.cpp
--- a/TaskManager/Test/test_render/spe/CreatePolygon.cpp	Tue Jun 09 00:10:36 2009 +0900
+++ b/TaskManager/Test/test_render/spe/CreatePolygon.cpp	Tue Jun 09 01:22:11 2009 +0900
@@ -4,6 +4,9 @@
  * だめだったら、そこら辺が怪しいと思うべき
  */
 
+#define DEBUG
+#include "error.h"
+
 #include "CreatePolygon.h"
 #include "polygon_pack.h"
 #include "scene_graph_pack.h"
@@ -37,6 +40,8 @@
 int 
 CreatePolygon::run(void *rbuf, void *wbuf)
 {
+    __debug_spe("CreatePolygon\n");
+
     float xyz1[4],xyz2[4],xyz3[4];
 
     SceneGraphPackPtr sgp = (SceneGraphPack*)smanager->get_input(0);
diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb TaskManager/Test/test_render/spe/CreateSpan.cpp
--- a/TaskManager/Test/test_render/spe/CreateSpan.cpp	Tue Jun 09 00:10:36 2009 +0900
+++ b/TaskManager/Test/test_render/spe/CreateSpan.cpp	Tue Jun 09 01:22:11 2009 +0900
@@ -1,3 +1,5 @@
+#define DEBUG
+#include "error.h"
 #include "CreateSpan.h"
 #include "viewer_types.h"
 
@@ -291,9 +293,11 @@
 	    if (spack->info.size >= MAX_SIZE_SPAN) {
 		SpanPackPtr next;
 		
+	__debug_spe("CreateSpan mainMem_alloc 0x%x\n", (unsigned int)sizeof(SpanPack));
 		smanager->mainMem_alloc(0, sizeof(SpanPack));
 		smanager->mainMem_wait();
 		next = (SpanPackPtr)smanager->mainMem_get(0);
+	__debug_spe("CreateSpan mainMem_allocated 0x%x\n", (unsigned int)next);
 		
 		spack->next = next; // この部分は TaskManager でやる
 
@@ -408,6 +412,8 @@
 int
 CreateSpan::run(void *rbuf, void *wbuf)
 {
+    __debug_spe("CreateSpan\n");
+
     PolygonPack *pp = (PolygonPack*)smanager->get_input(0);
     PolygonPack *next_pp = 
 	(PolygonPack*)smanager->allocate(sizeof(PolygonPack));
@@ -432,6 +438,8 @@
     int charge_y_end = get_param(2);
 
     do {
+	__debug_spe("CreateSpan allocated 0x%x\n",(uint32)next_pp);
+
 	if (pp->next != NULL) {
 	    smanager->dma_load(next_pp, (uint32)pp->next,
 			       sizeof(PolygonPack), POLYGON_PACK_LOAD);
@@ -486,6 +494,7 @@
     smanager->dma_store(spack, (uint32)spackList[prev_index],
 			sizeof(SpanPack), SPAN_PACK_STORE);
     smanager->dma_wait(SPAN_PACK_STORE);
+	__debug_spe("CreateSpan spack_stored 0x%x\n",(uint32)spackList[prev_index]);
 
     // smanager で allocate したのだから free も smanager でやるべき
     free(free_pp);
diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb TaskManager/Test/test_render/spe/DrawBack.cpp
--- a/TaskManager/Test/test_render/spe/DrawBack.cpp	Tue Jun 09 00:10:36 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawBack.cpp	Tue Jun 09 01:22:11 2009 +0900
@@ -1,3 +1,6 @@
+#define DEBUG
+#include "error.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include "DrawBack.h"
@@ -16,6 +19,7 @@
 int
 DrawBack::run(void *rbuf, void *wbuf)
 {
+    __debug_spe("DrawBack\n");
     int rgb          = smanager->get_param(0);
     int rangex_start = smanager->get_param(1);
     int rangex_end   = smanager->get_param(2);
diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb TaskManager/Test/test_render/spe/DrawSpan.cpp
--- a/TaskManager/Test/test_render/spe/DrawSpan.cpp	Tue Jun 09 00:10:36 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawSpan.cpp	Tue Jun 09 01:22:11 2009 +0900
@@ -1,3 +1,6 @@
+#define DEBUG
+#include "error.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <spu_intrinsics.h>
@@ -557,6 +560,7 @@
 int
 DrawSpan::run(void *rbuf, void *wbuf)
 {
+    __debug_spe("DrawSpan\n");
     SpanPackPtr spack = (SpanPackPtr)smanager->get_input(0);
     SpanPackPtr next_spack = (SpanPackPtr)smanager->allocate(sizeof(SpanPack));
     SpanPackPtr free_spack = next_spack; // next_spack の free() 用
diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb TaskManager/Test/test_render/spe/DrawSpanRenew.cpp
--- a/TaskManager/Test/test_render/spe/DrawSpanRenew.cpp	Tue Jun 09 00:10:36 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawSpanRenew.cpp	Tue Jun 09 01:22:11 2009 +0900
@@ -1,3 +1,6 @@
+#define DEBUG
+#include "error.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <spu_mfcio.h>
@@ -44,6 +47,7 @@
 int
 DrawSpanRenew::run(void *rbuf, void *wbuf)
 {
+    __debug_spe("DrawSpanRenew\n");
     SpanPackPtr spack = (SpanPackPtr)smanager->get_param(1);
     SpanPackPtr next_spack = (SpanPackPtr)smanager->allocate(sizeof(SpanPack));
     SpanPackPtr free_spack1 = spack;
diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb TaskManager/Test/test_render/spe/Load_Texture.cpp
--- a/TaskManager/Test/test_render/spe/Load_Texture.cpp	Tue Jun 09 00:10:36 2009 +0900
+++ b/TaskManager/Test/test_render/spe/Load_Texture.cpp	Tue Jun 09 01:22:11 2009 +0900
@@ -1,3 +1,6 @@
+#define DEBUG
+#include "error.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include "Load_Texture.h"
@@ -14,6 +17,7 @@
 int 
 LoadTexture::run(void *rbuf , void *wbuf) 
 {
+    __debug_spe("LoadTexture\n");
     /**
      * 現在 global_alloc() では new をサポートしてないので
      * コンストラクタ呼ぶために placement new してます。
diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb TaskManager/Test/test_render/spe/Set_Texture.cpp
--- a/TaskManager/Test/test_render/spe/Set_Texture.cpp	Tue Jun 09 00:10:36 2009 +0900
+++ b/TaskManager/Test/test_render/spe/Set_Texture.cpp	Tue Jun 09 01:22:11 2009 +0900
@@ -1,3 +1,6 @@
+#define DEBUG
+#include "error.h"
+
 #include <string.h>
 #include "Set_Texture.h"
 #include "texture.h"
@@ -8,6 +11,7 @@
 int 
 SetTexture::run(void *rbuf, void *wbuf)
 {
+    __debug_spe("SetTexture\n");
     void *src[4];
     
     src[0] = get_input(rbuf, 0);
diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb example/mainMem/spe/Hello.cc
--- a/example/mainMem/spe/Hello.cc	Tue Jun 09 00:10:36 2009 +0900
+++ b/example/mainMem/spe/Hello.cc	Tue Jun 09 01:22:11 2009 +0900
@@ -38,5 +38,6 @@
     fprintf(stderr,"sizeof(int) = [%d] sizeof(void*)=[%d]\n", (int)sizeof(int),(int)sizeof(void*));
     fprintf(stderr,"[%d] Main Mem %0x len %d\n", task_id, (unsigned int)next,(int)SIZE);
 
+    free(ptr);
     return 0;
 }
diff -r c9f8cfcdc5c2 -r 2ddf79a7c5fb include/TaskManager/error.h
--- a/include/TaskManager/error.h	Tue Jun 09 00:10:36 2009 +0900
+++ b/include/TaskManager/error.h	Tue Jun 09 01:22:11 2009 +0900
@@ -1,3 +1,6 @@
+#ifndef CERIUM_ERR
+#define CERIUM_ERR
+
 #ifdef DEBUG
 #  include <stdio.h>
 #  define __debug(...) do { \
@@ -7,7 +10,7 @@
 #  define __debug(...)
 #endif
 
-#ifdef _PPE_DEBUG
+#ifdef DEBUG
 #  include <stdio.h>
 #  define __debug_ppe(...) do { \
 	printf("[PPE] "); printf(__VA_ARGS__);	\
@@ -16,12 +19,12 @@
 #  define __debug_ppe(...)
 #endif
 
-#ifdef _PPE_DEBUG
+#ifdef DEBUG
 #  include <stdio.h>
 #  define __debug_spe(...) do { \
 	printf("[SPE] "); printf(__VA_ARGS__);	\
     } while (0)
 #else /* DEBUG */
-#  define __debug_ppe(...)
+#  define __debug_spe(...)
 #endif
-
+#endif