Mercurial > hg > Members > kono > Cerium
changeset 811:df36d41d5135
merge
| author | yutaka@localhost.localdomain |
|---|---|
| date | Sat, 22 May 2010 23:42:58 +0900 |
| parents | baeab6b5c0ab (diff) 76a39ad68846 (current diff) |
| children | f3f982bc271c |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Renderer/Engine/KeyID.h Sat May 22 23:42:58 2010 +0900 @@ -0,0 +1,3 @@ + NONE, + HOLD, + PUSH,
--- a/example/word_count_test/main.cc Sat May 22 23:23:29 2010 +0900 +++ b/example/word_count_test/main.cc Sat May 22 23:42:58 2010 +0900 @@ -163,6 +163,7 @@ w->self = w; w->task_blocks = blocks; w->task_spwaned = 0; + //w->waiting = 0; /*sizeはdivision_sizeの倍数にしている。*/ w->size = st_mmap.size;
--- a/example/word_count_test/spe/Exec.cc Sat May 22 23:23:29 2010 +0900 +++ b/example/word_count_test/spe/Exec.cc Sat May 22 23:42:58 2010 +0900 @@ -12,7 +12,8 @@ char *i_data = (char *)rbuf; unsigned long long *o_data = (unsigned long long*)wbuf; unsigned long long *head_tail_flag = o_data +2; - int length = s->read_size(); + //int length = s->read_size(); + int length = s->get_param(0); int word_flag = 0; int word_num = 0; int line_num = 0;