# HG changeset patch # User Shinji KONO # Date 1279162793 -32400 # Node ID baae338d91da65566f59747d97fa4868179536b3 # Parent b150914f59762b65d6d17959f433844ecc77137a minor fix. possible schedTaskArray overrun diff -r b150914f5976 -r baae338d91da TaskManager/Makefile.def --- a/TaskManager/Makefile.def Thu Jul 15 00:29:52 2010 +0900 +++ b/TaskManager/Makefile.def Thu Jul 15 11:59:53 2010 +0900 @@ -30,7 +30,7 @@ ABIBIT = 32 #OPT = -O9 -OPT = -g # -DTASK_LIST_MAIL +OPT = -g -O9 -DTASK_LIST_MAIL CC = g++ CFLAGS = -Wall `sdl-config --cflags` -m$(ABIBIT) $(OPT) diff -r b150914f5976 -r baae338d91da TaskManager/kernel/schedule/SchedTaskArray.h --- a/TaskManager/kernel/schedule/SchedTaskArray.h Thu Jul 15 00:29:52 2010 +0900 +++ b/TaskManager/kernel/schedule/SchedTaskArray.h Thu Jul 15 11:59:53 2010 +0900 @@ -17,10 +17,6 @@ virtual ~SchedTaskArray(); - - SchedTaskBase *savedTask; - Task *array; - private: /* variables */ diff -r b150914f5976 -r baae338d91da TaskManager/kernel/schedule/SchedTaskArrayLoad.h --- a/TaskManager/kernel/schedule/SchedTaskArrayLoad.h Thu Jul 15 00:29:52 2010 +0900 +++ b/TaskManager/kernel/schedule/SchedTaskArrayLoad.h Thu Jul 15 11:59:53 2010 +0900 @@ -13,8 +13,6 @@ BASE_NEW_DELETE(SchedTaskArrayLoad); - SchedTaskBase *savedTask; - private: /* variables */ diff -r b150914f5976 -r baae338d91da TaskManager/kernel/schedule/SchedTaskArrayNop.cc --- a/TaskManager/kernel/schedule/SchedTaskArrayNop.cc Thu Jul 15 00:29:52 2010 +0900 +++ b/TaskManager/kernel/schedule/SchedTaskArrayNop.cc Thu Jul 15 11:59:53 2010 +0900 @@ -56,7 +56,7 @@ savedTask ->write(); free(atask); delete savedTask; - + savedTask = 0; } SchedTaskBase* diff -r b150914f5976 -r baae338d91da TaskManager/kernel/schedule/SchedTaskBase.h --- a/TaskManager/kernel/schedule/SchedTaskBase.h Thu Jul 15 00:29:52 2010 +0900 +++ b/TaskManager/kernel/schedule/SchedTaskBase.h Thu Jul 15 11:59:53 2010 +0900 @@ -53,7 +53,7 @@ memaddr params_addr; memaddr waiter; - memaddr dummy; + Task *array; /** * read データ、write 用のバッファ