changeset 804:7ac03079a2b2

merge
author yutaka@localhost.localdomain
date Fri, 21 May 2010 17:58:43 +0900
parents 2746a16a86f5 (current diff) bf4ee251767e (diff)
children daab9cd6f91f
files TaskManager/Makefile.def example/word_count/spe/Exec.cc
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Makefile.def	Wed May 19 21:24:54 2010 +0900
+++ b/TaskManager/Makefile.def	Fri May 21 17:58:43 2010 +0900
@@ -29,8 +29,8 @@
 
 ABIBIT = 32
 
-OPT = #-O9 
-OPT =  -g
+OPT = -O9 
+#OPT =  -g
 
 CC     = g++   
 CFLAGS = -Wall `sdl-config --cflags` -m$(ABIBIT)   $(OPT)
--- a/TaskManager/kernel/schedule/SchedTaskBase.h	Wed May 19 21:24:54 2010 +0900
+++ b/TaskManager/kernel/schedule/SchedTaskBase.h	Fri May 21 17:58:43 2010 +0900
@@ -25,10 +25,10 @@
     virtual void read()  {}
     virtual void exec()  {}
     virtual void write() {}
+    virtual SchedTaskBase* next(Scheduler *, SchedTaskBase*) {return 0;}
 
     /* functions */
-    virtual SchedTaskBase* next(Scheduler *, SchedTaskBase*) {return 0;}
-
+    virtual void* get_output(void *buff, int index) { return 0; }
     virtual void* get_input(void *buff, int index) { return 0;}
     virtual memaddr get_param(int index) { return 0;}
 
--- a/example/word_count/spe/Exec.cc	Wed May 19 21:24:54 2010 +0900
+++ b/example/word_count/spe/Exec.cc	Fri May 21 17:58:43 2010 +0900
@@ -12,6 +12,7 @@
     char *i_data = (char*)s->get_input(rbuf, 0);
     unsigned long long *o_data = (unsigned long long*)s->get_output(wbuf, 0);
     int length = (int)s->get_param(0);
+    //int length = s->read_size();
     int word_flag = 1-(int)s->get_param(1); 
     //int word_flag = (int)s->get_param(1); 
     int word_num = 0;