Mercurial > hg > Members > kono > Cerium

changeset 523:b273767962b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
half finish for Cell
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Tue, 20 Oct 2009 22:29:27 +0900
parents 3b7b9caa8f09
children 0f180d46db89
files Renderer/Engine/MainLoop.h Renderer/Engine/Makefile Renderer/Engine/Makefile.cell Renderer/Engine/viewer.cc Renderer/Test/Makefile Renderer/Test/Makefile.cell TaskManager/kernel/schedule/Scheduler.cc
diffstat 7 files changed, 60 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/MainLoop.h	Tue Oct 20 22:02:33 2009 +0900
+++ b/Renderer/Engine/MainLoop.h	Tue Oct 20 22:29:27 2009 +0900
@@ -9,4 +9,4 @@
 };
 
 typedef MainLoop *MainLoopPtr;
-#endif MAINLOOP
+#endif /* MAINLOOP */
--- a/Renderer/Engine/Makefile	Tue Oct 20 22:02:33 2009 +0900
+++ b/Renderer/Engine/Makefile	Tue Oct 20 22:29:27 2009 +0900
@@ -4,11 +4,11 @@
 	@echo "Make for Mac OS X"
 	@$(MAKE) -f Makefile.macosx
 
-cell: 
+cell: FORCE
 	@echo "Make for PS3 (Cell)"
 	@$(MAKE) -f Makefile.cell
 
-linux: 
+linux: FORCE
 	@echo "Make for Linux"
 	@$(MAKE) -f Makefile.linux
 
@@ -22,8 +22,8 @@
 	@$(MAKE) -f Makefile.linux depend
 
 FORCE:
-	-mkdir -p ../include/Cerium
-	rsync `find . -name Test -prune -or -name '*.h' -print` ../../include/Cerium
+	-mkdir -p ../../include/Cerium
+	rsync `find . -name Test -prune -or -name spe -prune -or -name task -prune -or -name '*.h' -print` ../../include/Cerium
 
 
 clean:
--- a/Renderer/Engine/Makefile.cell	Tue Oct 20 22:02:33 2009 +0900
+++ b/Renderer/Engine/Makefile.cell	Tue Oct 20 22:29:27 2009 +0900
@@ -26,7 +26,7 @@
 all: $(TARGET) speobject
 
 $(TARGET): $(OBJS) $(TASK_OBJS)
-	$(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS)
+	$(AR) crus $@ $(OBJS) $(TASK_OBJS) 
 
 SGList.o: create_sg_list
 	$(CC) $(CFLAGS) $(INCLUDE) -c SGList.cc -o $@
--- a/Renderer/Engine/viewer.cc	Tue Oct 20 22:02:33 2009 +0900
+++ b/Renderer/Engine/viewer.cc	Tue Oct 20 22:29:27 2009 +0900
@@ -12,11 +12,11 @@
 #include "Pad.h"
 #include "Application.h"
 
-static void post2runLoop(SchedTask *s,void *viewer,void *s);
-static void post2runDraw(SchedTask *s,void *viewer,void *s);
-static void post2speRendering(SchedTask *s,void *viewer,void *s);
-static void post2speDraw(SchedTask *s,void *viewer,void *s);
-static void post2runMoveDrawLoop(SchedTask *s,void *viewer,void *s);
+static void post2runLoop(SchedTask *s,void *viewer,void *s1);
+static void post2runDraw(SchedTask *s,void *viewer,void *s1);
+static void post2speRendering(SchedTask *s,void *viewer,void *s1);
+static void post2speDraw(SchedTask *s,void *viewer,void *s1);
+static void post2runMoveDrawLoop(SchedTask *s,void *viewer,void *s1);
 
 /* measure for FPS (Frame Per Second) */
 int start_time;
--- a/Renderer/Test/Makefile	Tue Oct 20 22:02:33 2009 +0900
+++ b/Renderer/Test/Makefile	Tue Oct 20 22:29:27 2009 +0900
@@ -12,6 +12,9 @@
 
 all: ball_bound
 
+cell:
+	make -f Makefile.cell
+
 BALL_BOUND_OBJ = ball_bound.o
 BALL_BOUND_XML = xml_file/Ball.xml
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Renderer/Test/Makefile.cell	Tue Oct 20 22:29:27 2009 +0900
@@ -0,0 +1,45 @@
+include ./Makefile.def
+
+LIBS += -lFifoManager -lCerium
+
+CFLAGS += `sdl-config --cflags` `xml2-config --cflags`
+LIBS   += `sdl-config --libs` `xml2-config --libs` -lSDL_image -Wl,-framework,OpenGL
+
+.SUFFIXES: .cc .o .xml
+
+.cc.o:
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+all: ball_bound
+
+cell:
+	make -f Makefile.cell
+
+BALL_BOUND_OBJ = ball_bound.o
+BALL_BOUND_XML = xml_file/Ball.xml
+
+ball_bound : $(BALL_BOUND_OBJ) $(BALL_BOUND_XML).o 
+	$(CC) -o $@ $< $(BALL_BOUND_XML).o  $(LIBS)
+
+ball_bound.cc : $(BALL_BOUND_XML).h 
+
+$(BALL_BOUND_XML).cc $(BALL_BOUND_XML).h : $(BALL_BOUND_XML)
+	perl $(TOOL)/create_sglist.pl -o $@ $(BALL_BOUND_XML)
+
+
+run: $(TARGET)
+	sudo ./$(TARGET) -width 576 -height 384 -bpp 32
+
+debug: $(TARGET)
+	sudo ppu-gdb ./$(TARGET) 
+
+depend:
+	$(RM) depend.inc
+	$(CC) -MM -MG $(INCLUDE) $(CFLAGS) $(SRCS) $(TASK_SRCS) > depend.inc
+
+clean:
+	rm -f $(TARGET) $(OBJS) $(TASK_OBJS) *.o
+	rm -f *~ \#*
+	rm -f $(BALL_BOUND_XML).cc $(BALL_BOUND_XML).h $(BALL_BOUND_OBJ)
+
+-include depend.inc
--- a/TaskManager/kernel/schedule/Scheduler.cc	Tue Oct 20 22:02:33 2009 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.cc	Tue Oct 20 22:29:27 2009 +0900
@@ -364,8 +364,8 @@
 static void
 wait_load(Scheduler *m, int task_id)
 {
+#if 0
     MemorySegment *s = task_list[task_id].segment;
-#if 0
     if (s)
 	fprintf(stderr,"wait load task id %d 0x%x\n",task_id,(int)s->data);
     else