# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1257570809 -32400
# Node ID 42c94f85c7798fa739975f577796f296063af073
# Parent  1733f3cbfa28c632bac0507f301c53605fd0d3ec
long -> memaddr (64 or 32)

diff -r 1733f3cbfa28 -r 42c94f85c779 Renderer/Engine/lindaapi.cc
--- a/Renderer/Engine/lindaapi.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/Renderer/Engine/lindaapi.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -42,7 +42,7 @@
 /* Static Functions */
 static void unix_chkserv(int ps);
 void psx_free(void *);
-static long psx_queue(unsigned int tspace_id, unsigned int id,
+static int psx_queue(unsigned int tspace_id, unsigned int id,
               unsigned int size, unsigned char *data, char mode,
               void(*callback)(unsigned char *,void *),void * obj);
 
@@ -314,10 +314,10 @@
   返り値:
       シーケンス番号
 /-------------------------------------------------------------------*/
-long
+int
 psx_out(unsigned int tspace_id, unsigned int id,
         unsigned char *data, unsigned int size){
-    long r;
+    int r;
     if ((r = psx_queue(tspace_id, id, size, data, 'o', NULL, NULL)) == FAIL) {
         return(FAIL);
     }
@@ -343,10 +343,10 @@
   返り値:
       psx_queue内でmallocされたREPLY構造体へのポインタ
 /-------------------------------------------------------------------*/
-long
+int
 psx_ld(unsigned int tspace_id, unsigned int id,
        char mode, void(*callback)(unsigned char *,void *), void * obj){
-    long r;
+    int r;
     if ((r = psx_queue(tspace_id, id, 0, NULL, mode, callback, obj)) == FAIL) {
         return(FAIL);
     }
@@ -371,6 +371,7 @@
     
     DEB(fprintf(stdout, "psx_reply: search of seq = %d\n", seq));
     PSX_Debug(("psx_reply: seq %d", seq)); 
+    // linear search なの?
     for(q = NULL,p = reply; p; q = p,p = p->next){
         if (p->seq == seq){
             DEB(fprintf(stdout, "psx_reply: match of seq = %d\n", seq));
@@ -471,7 +472,7 @@
                      0が返る。
       失敗した場合 - FAIL(-1)が返る。
 /-------------------------------------------------------------------*/
-static long
+static int
 psx_queue(unsigned int tspace_id, unsigned int id,
           unsigned int size, unsigned char *data, char mode,
           void(*callback)(unsigned char *,void *), void * obj){
@@ -506,18 +507,14 @@
     /* データ受け取り要求(in,rd,wait)なら受け取り用の箱を用意 */
     if (mode != 'o') {  
         if (reply == NULL){
-            if ((reply = (REPLY *) malloc (sizeof(REPLY))) == NULL){
-                return(FAIL);
-            }
+            reply = new_reply();
             p = r_end = reply; p->next = NULL;
         } else {
-            if ((r_end->next = (REPLY *) malloc (sizeof(REPLY))) == NULL){
-                return(FAIL);
-            }
+            r_end->next = new_reply();
             p = r_end->next; r_end = p; p->next = NULL;
         }
         p->mode = '?';
-        p->seq = (long)p;  // 構造体のアドレスで識別
+        p->seq = p->reply_id;  
         p->callback = callback;
         p->obj = obj;
         PSX_Debug(("psx_queue: seq %d reply %x p %x r_end %x",seq,reply,p,r_end));
@@ -534,16 +531,6 @@
     q_end->command[LINDA_SEQ_OFFSET+2] = ((long)p>>8)  & 0xff;
     q_end->command[LINDA_SEQ_OFFSET+3] = ((long)p)     & 0xff;
 
-    q_end->command[LINDA_SEQ_OFFSET+4]   = ((long)p>>56) & 0xff;
-    q_end->command[LINDA_SEQ_OFFSET+5] = ((long)p>>48) & 0xff;
-    q_end->command[LINDA_SEQ_OFFSET+6] = ((long)p>>40)  & 0xff;
-    q_end->command[LINDA_SEQ_OFFSET+7] = ((long)p>>32)     & 0xff;
-    
-    
-    q_end->command[LINDA_DATA_LENGTH_OFFSET]   = (size>>24) & 0xff;
-    q_end->command[LINDA_DATA_LENGTH_OFFSET+1] = (size>>16) & 0xff;
-    q_end->command[LINDA_DATA_LENGTH_OFFSET+2] = (size>>8)  & 0xff;
-    q_end->command[LINDA_DATA_LENGTH_OFFSET+3] = (size)     & 0xff;
     
     q_end->size = size+LINDA_HEADER_SIZE;       /* command size */
     q_end->tspace_id = tspace_id;  /* destination id */
@@ -726,4 +713,134 @@
 
 
 
+
+static ReplyPtr freeReply;   /* Free Pool of Reply */
+static ReplyPtr replyPool;   /* List of malloced free Reply */
+
+static ReplyPtr extend_reply_pool(int num);
+
+static const int QUEUE_MALLOC_ERROR =   10;
+static const int POOL_SIZE_OVER_ERROR = 11;
+
+static int reply_errno;
+
+//
+// Initialize Reply Pool
+//    return NULL on error
+//
+
+static ReplyPtr
+init_reply(int num)
+{
+    ReplyPtr q;
+    if (! replyPool) {
+	return extend_reply_pool(num);
+    }
+    return replyPool;
+}
+
+static ReplyPtr
+extend_reply_pool(int num)
+{
+    ReplyPtr q;
+    // Keep malloc history in ReplyPool
+    q =  (ReplyPtr) malloc(sizeof(Reply) * (num+1));
+    if (!q) {
+	reply_errno = QUEUE_MALLOC_ERROR;
+	retrun q;
+    }
+    q->next = replyPool;
+    replyPool = q;
+    // Connect all free reply in the pool
+    q = queeuePool + 1;
+    for(q = replyPool+1; num-->0;  q++) q->next = q+1;
+    q->next = freeReply;
+    freeReply = replyPool+1;
+    return replyPool;
+}
+
+static void
+destory_reply()
+{
+    ReplyPtr q;
+    for(q = replyPool ;q; q = q->next) {
+	free(q);
+    }
+    freeReply = replyPool = NULL;
+}
+
+static ReplyPtr
+new_reply(int priority, int task)
+{
+    ReplyPtr q;
+    if (!freeReply) {
+	pool_size *= 2;
+	if (pool_size > MAX_POOL_SIZE) {
+	    reply_errno = POOL_SIZE_OVER_ERROR;
+	    return NULL;
+	}
+	if (!extend_reply_pool(pool_size)) {
+	    return NULL;
+	}
+    }
+    q = freeReply;
+    freeReply = freeReply->next;
+    q->next = NULL;
+    q->priority = priority;
+    q->task = task;
+    return q;
+}
+
+static void
+free_reply(ReplyPtr q)
+{
+    q->next = freeReply;
+    freeReply = q;
+}
+
+static TaskListPtr
+new_task_list(char *name)
+{
+    TaskLilstPtr task;
+    task =  (TaskListPtr) malloc(sizeof(TaskList));
+    task->reply = NULL;
+    task->name = name;
+}
+
+static void
+free_task_list(TaskListPtr task)
+{
+    free(task);
+}
+
+static void
+insert_reply(TaskListPtr list,ReplyPtr q)
+{
+    q->next = list->reply;
+    list->reply = q; 
+}
+
+static void
+qppend_reply(TaskListPtr list,ReplyPtr q)
+{
+    ReplyPtr p = list->reply;
+    while(p->next) p = p->next;
+    p->next = q;
+}
+
+static void
+remove_reply(TaskListPtr list,ReplyPtr q)
+{
+    ReplyPtr p = list->reply;
+    ReplyPtr p1 = p->next;
+
+    while(p1 && p1 != q) { p1 = p1->next; p = p->next; }
+    if (p1) {
+	p->next = p1->next;
+    }
+}
+
+
+
+
 /* end */
diff -r 1733f3cbfa28 -r 42c94f85c779 Renderer/Engine/lindaapi.h
--- a/Renderer/Engine/lindaapi.h	Fri Nov 06 21:20:26 2009 +0900
+++ b/Renderer/Engine/lindaapi.h	Sat Nov 07 14:13:29 2009 +0900
@@ -26,14 +26,14 @@
  パケットフォーマット
  char     short  8byte    int
  Mode +   ID   + Seq  + Data_len + Padding + Data
- 0        1      3      7+4        11+4        12+4
+ 0        1      3      7        11        12
 ----------------------------------------------------------------------*/
 
 #define LINDA_MODE_OFFSET          0
 #define LINDA_ID_OFFSET            1
 #define LINDA_SEQ_OFFSET           3
-#define LINDA_DATA_LENGTH_OFFSET   (7+4)
-#define LINDA_HEADER_SIZE          (12+4)
+#define LINDA_DATA_LENGTH_OFFSET   7
+#define LINDA_HEADER_SIZE          12
 
 /*----------------------------------------------------------------------
   構造体定義
@@ -45,7 +45,7 @@
     char mode;
     void(*callback)(unsigned char * tuple, void * obj);
     void * obj;
-} REPLY;
+} REPLY, Reply, *ReplyPtr;
           
 typedef struct command_queue{
     struct command_queue *next;
@@ -75,9 +75,9 @@
 extern unsigned char psx_get_mode(unsigned char *);
 extern unsigned char * psx_get_data(unsigned char *);
 
-extern long psx_out(unsigned int tspace_id, unsigned int id,
+extern int psx_out(unsigned int tspace_id, unsigned int id,
                    unsigned char *data, unsigned int size);
-extern long psx_ld(unsigned int tspace_id, unsigned int id,
+extern int psx_ld(unsigned int tspace_id, unsigned int id,
                   char mode, void(*callback)(unsigned char *,void *),void * obj);
 
 #define psx_in(tid, id)      psx_ld(tid, id, 'i', NULL, NULL)
diff -r 1733f3cbfa28 -r 42c94f85c779 Renderer/Engine/task/CreatePolygon.cc
--- a/Renderer/Engine/task/CreatePolygon.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/Renderer/Engine/task/CreatePolygon.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -63,7 +63,7 @@
 
     do {
 	if (sgp->next != NULL) {
-	    smanager->dma_load(next_sgp, (long)sgp->next,
+	    smanager->dma_load(next_sgp, (memaddr)sgp->next,
 			       sizeof(SceneGraphPack), SG_PACK_LOAD);
 	} else {
 	    next_sgp = NULL;
@@ -74,7 +74,7 @@
 
 	    do {
 		if (node->next != NULL) {
-		    smanager->dma_load(next_node, (long)node->next,
+		    smanager->dma_load(next_node, (memaddr)node->next,
 				       sizeof(SceneGraphNode), SG_NODE_LOAD);
 		} else {
 		    next_node = NULL;
@@ -96,13 +96,13 @@
 			send_pp = tmp_pp;
 
 			smanager->dma_wait(PP_STORE);
-			smanager->dma_store(send_pp, (long)pp_addr,
+			smanager->dma_store(send_pp, (memaddr)pp_addr,
 					    sizeof(PolygonPack), PP_STORE);
 			
 			pp_addr = next;
 
 			smanager->dma_wait(PP_LOAD);
-			smanager->dma_load(pp, (long)pp_addr,
+			smanager->dma_load(pp, (memaddr)pp_addr,
 					   sizeof(PolygonPack), PP_LOAD);
 			smanager->dma_wait(PP_LOAD);
 			pp->init();
@@ -175,7 +175,7 @@
     } while (sgp);
     
     smanager->dma_wait(PP_STORE);
-    smanager->dma_store(pp, (long)pp_addr,
+    smanager->dma_store(pp, (memaddr)pp_addr,
 			sizeof(PolygonPack), PP_STORE);
     smanager->dma_wait(PP_STORE);
 
diff -r 1733f3cbfa28 -r 42c94f85c779 Renderer/Engine/task/CreatePolygonFromSceneGraph.cc
--- a/Renderer/Engine/task/CreatePolygonFromSceneGraph.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/Renderer/Engine/task/CreatePolygonFromSceneGraph.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -112,13 +112,13 @@
 		    send_pp = tmp_pp;
 	    
 		    smanager->dma_wait(PP_STORE);
-		    smanager->dma_store(send_pp, (long)pp_addr,
+		    smanager->dma_store(send_pp, (memaddr)pp_addr,
 					sizeof(PolygonPack), PP_STORE);
 	    
 		    pp_addr = next;
 	    
 		    smanager->dma_wait(PP_LOAD);
-		    smanager->dma_load(pp, (long)pp_addr,
+		    smanager->dma_load(pp, (memaddr)pp_addr,
 				       sizeof(PolygonPack), PP_LOAD);
 		    smanager->dma_wait(PP_LOAD);
 		    pp->init();
@@ -234,7 +234,7 @@
     }
     
     smanager->dma_wait(PP_STORE);
-    smanager->dma_store(pp, (long)pp_addr,
+    smanager->dma_store(pp, (memaddr)pp_addr,
 			sizeof(PolygonPack), PP_STORE);
     smanager->dma_wait(PP_STORE);
 
diff -r 1733f3cbfa28 -r 42c94f85c779 Renderer/Engine/task/CreateSpan.cc
--- a/Renderer/Engine/task/CreateSpan.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/Renderer/Engine/task/CreateSpan.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -280,10 +280,10 @@
 		send_spack = tmp_spack;
 
 		smanager->dma_wait(SPAN_PACK_STORE);
-		smanager->dma_store(send_spack, (long)spackList[prev_index],
+		smanager->dma_store(send_spack, (memaddr)spackList[prev_index],
 				    sizeof(SpanPack), SPAN_PACK_STORE);
 		
-		smanager->dma_load(spack, (long)spackList[index],
+		smanager->dma_load(spack, (memaddr)spackList[index],
 				   sizeof(SpanPack), SPAN_PACK_LOAD);
 		prev_index = index;
 		smanager->dma_wait(SPAN_PACK_LOAD);
@@ -308,12 +308,12 @@
 		send_spack = tmp_spack;
 
 		smanager->dma_wait(SPAN_PACK_STORE);
-		smanager->dma_store(send_spack, (long)spackList[index],
+		smanager->dma_store(send_spack, (memaddr)spackList[index],
 				    sizeof(SpanPack), SPAN_PACK_STORE);
 
 		spackList[index] = next;
 		
-		smanager->dma_load(spack, (long)spackList[index],
+		smanager->dma_load(spack, (memaddr)spackList[index],
 				   sizeof(SpanPack), SPAN_PACK_LOAD);
 		smanager->dma_wait(SPAN_PACK_LOAD);
 		spack->init((index+1)*split_screen_h);
@@ -446,7 +446,7 @@
 
     do {
 	if (pp->next != NULL) {
-	    smanager->dma_load(next_pp, (long)pp->next,
+	    smanager->dma_load(next_pp, (memaddr)pp->next,
 			       sizeof(PolygonPack), POLYGON_PACK_LOAD);
 	} else {
 	    next_pp = NULL;
@@ -498,7 +498,7 @@
     } while (pp);
 
     smanager->dma_wait(SPAN_PACK_STORE);
-    smanager->dma_store(spack, (long)spackList[prev_index],
+    smanager->dma_store(spack, (memaddr)spackList[prev_index],
 			sizeof(SpanPack), SPAN_PACK_STORE);
     smanager->dma_wait(SPAN_PACK_STORE);
 
diff -r 1733f3cbfa28 -r 42c94f85c779 Renderer/Engine/task/DrawSpan.cc
--- a/Renderer/Engine/task/DrawSpan.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/Renderer/Engine/task/DrawSpan.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -21,7 +21,10 @@
 {
     Gptr g = (Gptr)s->get_param(0);
     s->dma_wait(FB_STORE);
-    free((void*)((long)g->linebuf*g->doneWrite));
+
+    if (!g->doneWrite) {
+	free(g->linebuf);
+    }
     free(g);
     return 0;
 }
@@ -418,7 +421,7 @@
          * 次の SpanPack の DMA 転送を行う
          */
         if (spack->next != NULL) {
-            smanager->dma_load(next_spack, (long)spack->next,
+            smanager->dma_load(next_spack, (memaddr)spack->next,
                                sizeof(SpanPack), SPAN_PACK_LOAD);
         } else {
             next_spack = NULL;
@@ -479,7 +482,7 @@
     free(free_spack);
 
     TaskPtr nextTask = smanager->create_task(TASK_DRAW_SPAN_END);
-    nextTask->add_param((long)g);
+    nextTask->add_param((memaddr)g);
     smanager->wait_task(nextTask);
 
     return 0;
diff -r 1733f3cbfa28 -r 42c94f85c779 Renderer/Engine/task/Set_Texture.cc
--- a/Renderer/Engine/task/Set_Texture.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/Renderer/Engine/task/Set_Texture.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -23,9 +23,9 @@
         void *data = s->global_alloc(TEXTURE_ID, MAX_LOAD_SIZE*4);
 
         memcpy(data, src[0], MAX_LOAD_SIZE);
-        memcpy((void*)((long)data + MAX_LOAD_SIZE), src[1], MAX_LOAD_SIZE);
-        memcpy((void*)((long)data + MAX_LOAD_SIZE*2), src[2], MAX_LOAD_SIZE);
-        memcpy((void*)((long)data + MAX_LOAD_SIZE*3), src[3], MAX_LOAD_SIZE);
+        memcpy((void*)((memaddr)data + MAX_LOAD_SIZE), src[1], MAX_LOAD_SIZE);
+        memcpy((void*)((memaddr)data + MAX_LOAD_SIZE*2), src[2], MAX_LOAD_SIZE);
+        memcpy((void*)((memaddr)data + MAX_LOAD_SIZE*3), src[3], MAX_LOAD_SIZE);
     }
 
     return 0;
diff -r 1733f3cbfa28 -r 42c94f85c779 Renderer/Engine/viewer.cc
--- a/Renderer/Engine/viewer.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/Renderer/Engine/viewer.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -452,8 +452,8 @@
     
     // SceneGraph(木構造) -> PolygonPack
 
-    task_create_pp->add_param((long)sgroot->getDrawSceneGraph());
-    task_create_pp->add_param((long)ppack);
+    task_create_pp->add_param((memaddr)sgroot->getDrawSceneGraph());
+    task_create_pp->add_param((memaddr)ppack);
 
     task_next->wait_for(task_create_pp);
     
@@ -522,7 +522,7 @@
                 task_draw->add_inData(spack, sizeof(SpanPack));
 
                 task_draw->add_param(
-                    (long)&pixels[(startx-1) + this->width*(starty-1)]);
+                    (memaddr)&pixels[(startx-1) + this->width*(starty-1)]);
                 task_draw->add_param(this->width);
             } else {
 		// 7.7.3 SL1 Data Cache Range Set to Zero コマンド
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/Fifo/FifoDmaManager.cc
--- a/TaskManager/Fifo/FifoDmaManager.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/Fifo/FifoDmaManager.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -4,14 +4,14 @@
 #include "FifoDmaManager.h"
 
 void
-FifoDmaManager::dma_load(void *buf, long addr, uint32 size, uint32 mask)
+FifoDmaManager::dma_load(void *buf, memaddr addr, uint32 size, uint32 mask)
 {
     if (size == 0) return;
     memcpy(buf, (void*)addr, size);
 }
 
 void
-FifoDmaManager::dma_store(void *buf, long addr, uint32 size, uint32 mask)
+FifoDmaManager::dma_store(void *buf, memaddr addr, uint32 size, uint32 mask)
 {
     if (size == 0) return;
     memcpy((void*)addr, buf, size);
@@ -28,18 +28,18 @@
 }
 
 void
-FifoDmaManager::mail_write(long data)
+FifoDmaManager::mail_write(memaddr data)
 {
     mail_sendQueue
 	= MailManager::append_mailQueue(mail_sendQueue,
 					mailManager->create(data));
 }
 
-long
-FifoDmaManager::mail_read(void)
+memaddr
+FifoDmaManager::mail_read()
 {
     MailQueuePtr q;
-    long ret;
+    memaddr ret;
 
     q = mail_recvQueue;
 
@@ -100,9 +100,9 @@
 FifoDmaManager::dma_storeList(ListDataPtr list, void *buff, uint32 mask)
 {
     int list_size = list->length;
-    long bound;
+    memaddr bound;
 
-    bound = (long)(buff);
+    bound = (memaddr)(buff);
 
     for (int i = 0; i < list_size; i++) {
 	ListElementPtr elm = &list->element[i];
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/Fifo/FifoDmaManager.h
--- a/TaskManager/Fifo/FifoDmaManager.h	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/Fifo/FifoDmaManager.h	Sat Nov 07 14:13:29 2009 +0900
@@ -15,12 +15,12 @@
     MailQueuePtr mail_sendQueue;
 
     /* functions */
-    void dma_load(void *buf, long addr, uint32 size, uint32 mask);
-    void dma_store(void *buf, long addr, uint32 size, uint32 mask);
+    void dma_load(void *buf, memaddr addr, uint32 size, uint32 mask);
+    void dma_store(void *buf, memaddr addr, uint32 size, uint32 mask);
     void dma_wait(uint32 mask) ;
 
-    void mail_write(long data);
-    long mail_read(void);
+    void mail_write(memaddr data);
+    memaddr mail_read(void);
 
     void dma_loadList(ListDataPtr list, void *buff, uint32 mask);
     void dma_storeList(ListDataPtr, void *buff, uint32 mask);
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/Fifo/FifoTaskManagerImpl.cc
--- a/TaskManager/Fifo/FifoTaskManagerImpl.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/Fifo/FifoTaskManagerImpl.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -167,7 +167,7 @@
     MailQueuePtr out_mail_list = NULL;
 
     // TaskList のアドレス
-    list_mail = mailManager->create((long)list);
+    list_mail = mailManager->create((memaddr)list);
     in_mail_list = MailManager::append_mailQueue(in_mail_list, list_mail);
 
     // EXIT_COMMAND (番兵的な意味で)
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/include/types.h
--- a/TaskManager/include/types.h	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/include/types.h	Sat Nov 07 14:13:29 2009 +0900
@@ -13,6 +13,7 @@
 #ifdef MODE64
 typedef uint64_t memaddr;
 #else
+//  In LP64, sizeof(long)==8
 typedef long memaddr;
 #endif
 #endif
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/ppe/DmaBuffer.cc
--- a/TaskManager/kernel/ppe/DmaBuffer.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/ppe/DmaBuffer.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -13,7 +13,7 @@
     char *align;
 
     nonalign = new char[size + sizeof(void*) + alignment - 1];
-    align = (char*)(ALIGN_UP((unsigned long)nonalign+sizeof(void*),alignment));
+    align = (char*)(ALIGN_UP((memaddr)nonalign+sizeof(void*),alignment));
     *((void**)align - 1) = (void*)nonalign;
 
     return align;
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/ppe/HTaskInfo.cc
--- a/TaskManager/kernel/ppe/HTaskInfo.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/ppe/HTaskInfo.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -66,7 +66,7 @@
     q->command  = cmd;
     q->inData.clear();
     q->outData.clear();
-    q->self = (long) q;
+    q->self = (memaddr) q;
     q->param_size = 0;
 
     q->post_func = NULL;
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/ppe/MailManager.cc
--- a/TaskManager/kernel/ppe/MailManager.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/ppe/MailManager.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -40,7 +40,7 @@
 }
 
 MailQueuePtr
-MailManager::create(long data)
+MailManager::create(memaddr data)
 {
     MailQueuePtr q;
 	
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/ppe/MailManager.h
--- a/TaskManager/kernel/ppe/MailManager.h	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/ppe/MailManager.h	Sat Nov 07 14:13:29 2009 +0900
@@ -2,19 +2,19 @@
 #define INCLUDED_MAIL_MANAGER
 
 typedef struct mail_queue {
-    long data;
+    memaddr data;
     struct mail_queue *next;
 } MailQueue, *MailQueuePtr;
 
 class MailManager {
 public:
     /* constructor */
-    MailManager(void);
-    ~MailManager(void);
+    MailManager();
+    ~MailManager();
 
     /* functions */
     int init(int num);
-    MailQueuePtr create(long data);
+    MailQueuePtr create(memaddr data);
     void free(MailQueuePtr q);
     static MailQueuePtr append_mailQueue(MailQueuePtr list, MailQueuePtr q);
 
@@ -25,7 +25,7 @@
 
     /* functions */
     int extend_pool(int num);
-    void destroy(void);
+    void destroy();
 };
 
 #endif
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/ppe/Task.cc
--- a/TaskManager/kernel/ppe/Task.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/ppe/Task.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -9,7 +9,7 @@
  * @return if ([ret] == 0) ? success : failuer;
  */
 int
-Task::add_inData_t(long addr, int size)
+Task::add_inData_t(memaddr addr, int size)
 {
     return add_data(inData, addr, size);
 }
@@ -23,7 +23,7 @@
  * @return if ([ret] == 0) ? success : failuer;
  */
 int
-Task::add_outData_t(long addr, int size)
+Task::add_outData_t(memaddr addr, int size)
 {
     return add_data(outData, addr, size);
 }
@@ -37,7 +37,7 @@
  * そのアドレスは メインメモリでアロケートされた int の集合。
  */
 int
-Task::add_param(long _param)
+Task::add_param(memaddr _param)
 {
     if (param_size >= MAX_PARAMS) return -1;
     
@@ -50,7 +50,7 @@
  * perror みたいにしたほうがわかりやすいかな。
  */
 int
-Task::add_data(ListData& list, long addr, int size)
+Task::add_data(ListData& list, memaddr addr, int size)
 {
     if (list.length >= MAX_LIST_DMA_SIZE) return -1;
 
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/ppe/Task.h
--- a/TaskManager/kernel/ppe/Task.h	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/ppe/Task.h	Sat Nov 07 14:13:29 2009 +0900
@@ -15,23 +15,23 @@
     BASE_NEW_DELETE(Task);
 
     int command;         // 4 byte
-    long self;         // 4 byte (or 8byte on 64bit mode)
+    memaddr self;         // 4 byte (or 8byte on 64bit mode)
 
     int param_size;        // 4 byte
-    long param[MAX_PARAMS]; // 4*MAX_PARAMS byte
+    memaddr param[MAX_PARAMS]; // 4*MAX_PARAMS byte
     ListData inData  __attribute__ ((aligned (DEFAULT_ALIGNMENT)));  // 4 byte 64bit であるべき
     ListData outData  __attribute__ ((aligned (DEFAULT_ALIGNMENT))); // 4 byte 64bit であるべき
 
 public: // functions
-    int add_inData_t(long addr, int size);  // unsigned int ではなく 64bit
-    int add_outData_t(long addr, int size); // unsigned int ではなく 64bit
-    int add_data(ListData &list, long addr, int size);
-    int add_param(long param);
+    int add_inData_t(memaddr addr, int size);  // unsigned int ではなく 64bit
+    int add_outData_t(memaddr addr, int size); // unsigned int ではなく 64bit
+    int add_data(ListData &list, memaddr addr, int size);
+    int add_param(memaddr param);
 
 #define add_inData(addr, size)			\
-    add_inData_t((long)(addr), (size));
+    add_inData_t((memaddr)(addr), (size));
 #define add_outData(addr, size)			\
-    add_outData_t((long)(addr), (size));
+    add_outData_t((memaddr)(addr), (size));
 };
 
 typedef Task* TaskPtr;
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/schedule/DmaManager.h
--- a/TaskManager/kernel/schedule/DmaManager.h	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/schedule/DmaManager.h	Sat Nov 07 14:13:29 2009 +0900
@@ -15,19 +15,19 @@
 
 class DmaManager {
 public:
-    virtual ~DmaManager(void) {};
+    virtual ~DmaManager() {};
 
     BASE_NEW_DELETE(DmaManager);
 
     // API for DMA transfer
-    virtual void dma_load(void *buf, long addr, uint32 size, uint32 mask) {}
-    virtual void dma_store(void *buf,long addr, uint32 size, uint32 mask) {}
+    virtual void dma_load(void *buf, memaddr addr, uint32 size, uint32 mask) {}
+    virtual void dma_store(void *buf,memaddr addr, uint32 size, uint32 mask) {}
     virtual void dma_wait(uint32 mask) {}
     virtual void show_dma_wait(int cpu) {}
 
     // API for SPU inbound/outbound mailbox
-    virtual void mail_write(long data) {}
-    virtual long mail_read(void) {return 0;}
+    virtual void mail_write(memaddr data) {}
+    virtual memaddr mail_read() {return 0;}
     
     // API for MFC list DMA transfer
     virtual void dma_loadList(ListDataPtr list, void *,uint32 mask) {}
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/schedule/ListData.h
--- a/TaskManager/kernel/schedule/ListData.h	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/schedule/ListData.h	Sat Nov 07 14:13:29 2009 +0900
@@ -10,7 +10,7 @@
     BASE_NEW_DELETE(ListElement);
 
     int size;
-    long addr;
+    memaddr addr;
 };
 
 typedef ListElement* ListElementPtr;
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/schedule/SchedTask.cc
--- a/TaskManager/kernel/schedule/SchedTask.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/schedule/SchedTask.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -356,7 +356,7 @@
             return nextSched;
         }
     } else {
-        long nextList = (long)list->next;
+        memaddr nextList = (memaddr)list->next;
 
         if (nextList == 0) {
             return new SchedNop2Ready(scheduler);
@@ -435,7 +435,7 @@
 SchedTask::get_input(void *buff, int index)
 {
     if (buff != NULL) {
-        return (void*)((long)buff + inListData->bound[index]);
+        return (void*)((memaddr)buff + inListData->bound[index]);
     } else {
         return NULL;
     }
@@ -466,7 +466,7 @@
 SchedTask::get_output(void *buff, int index)
 {
     if (buff != NULL) {
-        return (void*)((long)buff + outListData->bound[index]);
+        return (void*)((memaddr)buff + outListData->bound[index]);
     } else {
         return NULL;
     }
@@ -523,7 +523,7 @@
 void
 SchedTask::wait_task(TaskPtr waitTask)
 {
-    waitTask->self = (long)taskGroup;
+    waitTask->self = (memaddr)taskGroup;
 
     scheduler->add_groupTask(taskGroup, waitTask);
 
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/schedule/SchedTaskList.cc
--- a/TaskManager/kernel/schedule/SchedTaskList.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskList.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -16,7 +16,7 @@
  *            0: メインメモリ, 1: SPE
  */
 SchedTaskList*
-createSchedTaskList(long next_list, Scheduler* scheduler, int renew_flag)
+createSchedTaskList(memaddr next_list, Scheduler* scheduler, int renew_flag)
 {
     SchedTaskList* sched = new SchedTaskList(next_list, scheduler);
     sched->flag_renewTaskList = renew_flag;
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/schedule/SchedTaskList.h
--- a/TaskManager/kernel/schedule/SchedTaskList.h	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskList.h	Sat Nov 07 14:13:29 2009 +0900
@@ -37,7 +37,7 @@
 const int SCHED_TASKLIST_NORMAL = 0;
 const int SCHED_TASKLIST_RENEW  = 1;
 
-extern SchedTaskList* createSchedTaskList(long, Scheduler*, int);
+extern SchedTaskList* createSchedTaskList(memaddr, Scheduler*, int);
 
 #endif
 
diff -r 1733f3cbfa28 -r 42c94f85c779 TaskManager/kernel/schedule/Scheduler.cc
--- a/TaskManager/kernel/schedule/Scheduler.cc	Fri Nov 06 21:20:26 2009 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.cc	Sat Nov 07 14:13:29 2009 +0900
@@ -168,7 +168,7 @@
 
         list->next = NULL;
         SchedTaskList *sched
-            = createSchedTaskList((long)list, this, SCHED_TASKLIST_RENEW);
+            = createSchedTaskList((memaddr)list, this, SCHED_TASKLIST_RENEW);
         return sched;
     } else {
         return NULL;