changeset 1809:138e7edff3ae draft

fix bound int size
author Yuhi TOMARI <yuhi@cr.ie.u-ryukyu.ac.jp>
date Wed, 11 Dec 2013 18:42:34 +0900
parents c25aa7edd1ba
children b0bd89171162
files TaskManager/Fifo/FifoDmaManager.cc TaskManager/Fifo/ReferencedDmaManager.cc TaskManager/kernel/schedule/ListData.h TaskManager/kernel/schedule/SchedTask.cc example/regex_mas/ppe/Exec.cc
diffstat 5 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Fifo/FifoDmaManager.cc	Wed Dec 11 17:42:09 2013 +0900
+++ b/TaskManager/Fifo/FifoDmaManager.cc	Wed Dec 11 18:42:34 2013 +0900
@@ -324,7 +324,7 @@
 FifoDmaManager::bound(ListData *list)
 {
     ListElement *elm = list->element;
-    int *bound = list->bound;
+    long *bound = list->bound;
     int offset=0;
     for(int i=0;i<list->length;i++) {
         bound[i] = offset;
--- a/TaskManager/Fifo/ReferencedDmaManager.cc	Wed Dec 11 17:42:09 2013 +0900
+++ b/TaskManager/Fifo/ReferencedDmaManager.cc	Wed Dec 11 18:42:34 2013 +0900
@@ -41,7 +41,7 @@
 ReferencedDmaManager::bound(ListData *list)
 {
     ListElement *elm = list->element;
-    int *bound = list->bound;
+    long *bound = list->bound;
 #ifdef __CERIUM_CELL__
     uint32  readbuf = elm[0].addr;
 #else
--- a/TaskManager/kernel/schedule/ListData.h	Wed Dec 11 17:42:09 2013 +0900
+++ b/TaskManager/kernel/schedule/ListData.h	Wed Dec 11 18:42:34 2013 +0900
@@ -27,7 +27,7 @@
 
     int length; // The number of data (4)
     int size;   // Total size of data (4)
-    int *bound;
+    long *bound;
     ListElement *element;
 
     void clear(void) {
--- a/TaskManager/kernel/schedule/SchedTask.cc	Wed Dec 11 17:42:09 2013 +0900
+++ b/TaskManager/kernel/schedule/SchedTask.cc	Wed Dec 11 18:42:34 2013 +0900
@@ -239,7 +239,7 @@
 }
 
 /**
- * get_input(index) のアドレスを返す
+ * get_input(index) の元の空間のアドレスを返す
  */
 memaddr
 SchedTask::get_inputAddr(int index)
--- a/example/regex_mas/ppe/Exec.cc	Wed Dec 11 17:42:09 2013 +0900
+++ b/example/regex_mas/ppe/Exec.cc	Wed Dec 11 18:42:34 2013 +0900
@@ -33,9 +33,9 @@
 run(SchedTask *s, void *rbuf, void *wbuf)
 {
     //get_input
-    unsigned char *i_data = (unsigned char *)s->get_inputAddr(0);
-    unsigned char *search_word = (unsigned char *)s->get_inputAddr(1);
-    int *skip_table = (int *)s->get_inputAddr(2);
+    unsigned char *i_data = (unsigned char *)s->get_input(rbuf, 0);
+    unsigned char *search_word = (unsigned char *)s->get_input(rbuf, 1);
+    int *skip_table = (int *)s->get_input(rbuf, 2);
 
     int length = (int)s->get_inputSize(0);
     int sw_len = (int)s->get_inputSize(1);