changeset 17:b59d134a81a7

*** empty log message ***
author gongo
date Sat, 09 Feb 2008 16:50:02 +0900
parents ee339757428d
children 0c9341da4522
files TaskManager/Fifo/spe-main.cc TaskManager/Test/Sum/main.cpp
diffstat 2 files changed, 7 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Fifo/spe-main.cc	Fri Feb 08 18:44:23 2008 +0900
+++ b/TaskManager/Fifo/spe-main.cc	Sat Feb 09 16:50:02 2008 +0900
@@ -11,9 +11,12 @@
 MailQueuePtr
 spe_main(MailManager* _mailManager, MailQueuePtr mail_list)
 {
-    SpeManager *manager = new SpeManager();
-    FifoDmaManager *connect = new FifoDmaManager();
+    SpeManager *manager;
+    FifoDmaManager *connect;
     MailQueuePtr ret;
+
+    manager = new SpeManager();
+    connect = new FifoDmaManager();
     
     connect->mail_recvQueue = mail_list;
     connect->mail_sendQueue = NULL;
--- a/TaskManager/Test/Sum/main.cpp	Fri Feb 08 18:44:23 2008 +0900
+++ b/TaskManager/Test/Sum/main.cpp	Sat Feb 09 16:50:02 2008 +0900
@@ -6,12 +6,6 @@
 
 TaskManager *manager;
 
-//SymTable *TaskManager::symtb;
-
-int add(void*, void*);
-int sub(void*, void*);
-int mul(void*, void*);
-int div(void*, void*);
 int sum(void*, void*);
 int sum2(void*, void*);
 
@@ -20,50 +14,6 @@
 int out[MAX] __attribute__((aligned(16)));
 
 int
-add(void *wbuf, void *rbuf)
-{
-    int *ret = (int*)wbuf;
-    int *data = (int*)rbuf;
-
-    *ret = data[0] + data[1];
-
-    return sizeof(int);
-}
-
-int
-sub(void *wbuf, void *rbuf)
-{
-    int *ret = (int*)wbuf;
-    int *data = (int*)rbuf;
-
-    *ret = data[0]-data[1];
-
-    return sizeof(int);
-}
-
-int
-mul(void *wbuf, void *rbuf)
-{
-    int *ret = (int*)wbuf;
-    int *data = (int*)rbuf;
-
-    *ret = data[0]*data[1];
-
-    return sizeof(int);
-}
-
-int
-Div(void *wbuf, void *rbuf)
-{
-    int *ret = (int*)wbuf;
-    int *data = (int*)rbuf;
-
-    *ret = data[0]/data[1];
-
-    return sizeof(int);
-}
-
-int
 sum(void *wbuf, void *rbuf)
 {
     int *ret = (int*)wbuf;
@@ -191,8 +141,9 @@
     manager = new TaskManager(1);
     manager->init();
 
-    // 本当は、ここは user 側で書かない
+    // ここは user 側で書かない...のか?
     // 設定ファイルかなにかで読むとか?違うな
+    // あと、void* って書くのめんどくせ
     manager->set_symbol("Init", (void*)init);
     manager->set_symbol("Init2", (void*)init2);
     manager->set_symbol("Result", (void*)result);