Mercurial > hg > Game > Cerium
changeset 1259:52667b4c31e0 draft
merge
| author | Daichi Toma <toma@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sat, 19 Nov 2011 07:41:45 +0900 |
| parents | ee938477af88 |
| children | fde4e3de9806 |
| files | TaskManager/Fifo/ReferencedDmaManager.cc TaskManager/Fifo/ReferencedDmaManager.h TaskManager/Makefile.def example/Miller_Rabin/Makefile.def example/Miller_Rabin/Makefile.macosx |
| diffstat | 5 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Fifo/ReferencedDmaManager.cc Sat Nov 19 07:38:48 2011 +0900 +++ b/TaskManager/Fifo/ReferencedDmaManager.cc Sat Nov 19 07:41:45 2011 +0900 @@ -5,7 +5,7 @@ void * ReferencedDmaManager::dma_load(Scheduler *s, void *buf, memaddr addr, uint32 size, uint32 mask) { - asm volatile("prefetcht0 %0"::"m"(addr):"memory"); + asm("prefetcht0 %0"::"m"(addr):"memory"); return (void*)addr; }
--- a/TaskManager/Fifo/ReferencedDmaManager.h Sat Nov 19 07:38:48 2011 +0900 +++ b/TaskManager/Fifo/ReferencedDmaManager.h Sat Nov 19 07:41:45 2011 +0900 @@ -7,7 +7,7 @@ public: /* functions */ - void *dma_load(Scheduler *s, void *buf, memaddr addr, uint32 size, uint32 mask); + virtual void *dma_load(Scheduler *s, void *buf, memaddr addr, uint32 size, uint32 mask); } ; #endif/* REFERENCED_DMA_MANAGER */
--- a/TaskManager/Makefile.def Sat Nov 19 07:38:48 2011 +0900 +++ b/TaskManager/Makefile.def Sat Nov 19 07:41:45 2011 +0900 @@ -29,8 +29,8 @@ ABIBIT = 64 -OPT = -g -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE -# OPT = -O9 -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE +# OPT = -g -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE +OPT = -O9 -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE
--- a/example/Miller_Rabin/Makefile.def Sat Nov 19 07:38:48 2011 +0900 +++ b/example/Miller_Rabin/Makefile.def Sat Nov 19 07:41:45 2011 +0900 @@ -8,8 +8,9 @@ CERIUM = ../../../Cerium CC = g++ -CFLAGS = -O9 -Wall +#CFLAGS = -O9 -Wall #CFLAGS = -g -Wall +CFLAGS = -pg -Wall INCLUDE = -I${CERIUM}/include/TaskManager -I. -I.. LIBS = -L${CERIUM}/TaskManager
--- a/example/Miller_Rabin/Makefile.macosx Sat Nov 19 07:38:48 2011 +0900 +++ b/example/Miller_Rabin/Makefile.macosx Sat Nov 19 07:41:45 2011 +0900 @@ -21,7 +21,7 @@ all: $(TARGET) $(TARGET): $(OBJS) $(TASK_OBJS) - $(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) + $(CC) -pg -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) link: $(CC) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS)