Mercurial > hg > Members > kono > Cerium

changeset 383:25c820b6060e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix header, MemHash in kernel
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 06 Aug 2009 12:04:55 +0900
parents 12099d1ce7fc
children eb7babaf7976
files TaskManager/Test/test_render/Camera.h TaskManager/Test/test_render/Joystick.h TaskManager/Test/test_render/Keyboard.h TaskManager/Test/test_render/Pad.h TaskManager/Test/test_render/SceneGraph.h TaskManager/Test/test_render/SceneGraphArray.h TaskManager/Test/test_render/SceneGraphIterator.h TaskManager/Test/test_render/SceneGraphRoot.h TaskManager/Test/test_render/Span.h TaskManager/Test/test_render/SpanPack.h TaskManager/Test/test_render/boss1_action.h TaskManager/Test/test_render/bullet_action.h TaskManager/Test/test_render/demonstration.h TaskManager/Test/test_render/fb.h TaskManager/Test/test_render/global_alloc.h TaskManager/Test/test_render/hash_texture.h TaskManager/Test/test_render/hit_judge.h TaskManager/Test/test_render/polygon.h TaskManager/Test/test_render/polygon_pack.h TaskManager/Test/test_render/scene.h TaskManager/Test/test_render/scene_graph_pack.h TaskManager/Test/test_render/show_time.h TaskManager/Test/test_render/spe/CreatePolygon.h TaskManager/Test/test_render/spe/CreateSpan.h TaskManager/Test/test_render/spe/DrawBack.h TaskManager/Test/test_render/spe/DrawSpan.h TaskManager/Test/test_render/spe/DrawSpanRenew.h TaskManager/Test/test_render/spe/Load_Texture.h TaskManager/Test/test_render/spe/Set_Texture.h TaskManager/Test/test_render/spe/TileHash.h TaskManager/Test/test_render/sys.h TaskManager/Test/test_render/task/CreatePolygon.h TaskManager/Test/test_render/task/CreatePolygonFromSceneGraph.h TaskManager/Test/test_render/task/CreateSpan.h TaskManager/Test/test_render/task/DrawBack.h TaskManager/Test/test_render/task/DrawSpanRenew.h TaskManager/Test/test_render/task/Set_Texture.h TaskManager/Test/test_render/task/TileHash.h TaskManager/Test/test_render/vacuum.h TaskManager/Test/test_render/viewer.h TaskManager/Test/test_render/viewerFB.h TaskManager/Test/test_render/viewerSDL.h TaskManager/Test/test_render/xml.h TaskManager/kernel/memory/MemHash.cpp TaskManager/kernel/memory/MemHash.h TaskManager/kernel/memory/MemorySegment.h
diffstat 46 files changed, 222 insertions(+), 165 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Test/test_render/Camera.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/Camera.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_CAMERA
 #define INCLUDED_CAMERA
 
-#ifndef INCLUDED_SCENE_GRAPH
-#  include "SceneGraph.h"
-#endif
+#include "SceneGraph.h"
 
 class Camera : public SceneGraph {
 public:
--- a/TaskManager/Test/test_render/Joystick.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/Joystick.h	Thu Aug 06 12:04:55 2009 +0900
@@ -3,9 +3,7 @@
 
 #include "SDL.h"
 
-#ifndef INCLUDED_PAD
-#  include "Pad.h"
-#endif
+#include "Pad.h"
 
 class Joystick : public Pad {
 public:
--- a/TaskManager/Test/test_render/Keyboard.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/Keyboard.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_KEYBOARD
 #define INCLUDED_KEYBOARD
 
-#ifndef INCLUDED_PAD
-#  include "Pad.h"
-#endif
+#include "Pad.h"
 
 class Keyboard : public Pad {
 public:
--- a/TaskManager/Test/test_render/Pad.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/Pad.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_PAD
 #define INCLUDED_PAD
 
-#ifndef INCLUDED_BUTTON
-#  include "Button.h"
-#endif
+#include "Button.h"
 
 class Pad {
 public:
--- a/TaskManager/Test/test_render/SceneGraph.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/SceneGraph.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_SCENE_GRAPH
 #define INCLUDED_SCENE_GRAPH
 
-#ifndef INCLUDED_POLYGON
-#  include "polygon.h"
-#endif
-
-#ifndef INCLUDED_PAD
-#  include "Pad.h"
-#endif
+#include "polygon.h"
+#include "Pad.h"
 
 class SceneGraph;
 
--- a/TaskManager/Test/test_render/SceneGraphArray.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/SceneGraphArray.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCUDED_SCENE_GRAPH_ARRAY
 #define INCUDED_SCENE_GRAPH_ARRAY
 
-#ifndef INCLUDED_SCENE_GRAPH
-#  include "SceneGraph.h"
-#endif
+#include "SceneGraph.h"
 
 // 下ですぐ #undef してます
 #define MAX_SIZE 32
--- a/TaskManager/Test/test_render/SceneGraphIterator.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/SceneGraphIterator.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_SCENE_GRAPH_ITERATOR
 #define INCLUDED_SCENE_GRAPH_ITERATOR
 
-#ifndef INCLUDED_SCENE_GRAPH
-#  include "SceneGraph.h"
-#endif
+#include "SceneGraph.h"
 
 class SceneGraphIterator {
 public:
--- a/TaskManager/Test/test_render/SceneGraphRoot.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/SceneGraphRoot.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,21 +1,10 @@
 #ifndef INCLUDED_SCENE_GRAPH_ROOT
 #define INCLUDED_SCENE_GRAPH_ROOT
 
-#ifndef INCLUDED_SCENE_GRAPH
-#  include "SceneGraph.h"
-#endif
-
-#ifndef INCLUDED_SCENE_GRAPH_ARRAY
-#  include "SceneGraphArray.h"
-#endif
-
-#ifndef INCLUDED_CAMERA
-#  include "Camera.h"
-#endif
-
-#ifndef INCLUDED_SCENE_GRAPH_ITERATOR
-#  include "SceneGraphIterator.h"
-#endif
+#include "SceneGraph.h"
+#include "SceneGraphArray.h"
+#include "Camera.h"
+#include "SceneGraphIterator.h"
 
 class SceneGraphRoot {
 public:
--- a/TaskManager/Test/test_render/Span.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/Span.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_SPAN
 #define INCLUDED_SPAN
 
-#ifndef INCLUDED_TAPESTRY
-#  include "Tapestry.h"
-#endif
-
-#ifndef INCLUDED_TYPES
-#  include "types.h"
-#endif
+#include "Tapestry.h"
+#include "types.h"
 
 #define MAX_TILE_LIST 64
 
--- a/TaskManager/Test/test_render/SpanPack.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/SpanPack.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_SPAN_PACK
 #define INCLUDED_SPAN_PACK
 
-#ifndef INCLUDED_SPAN
-#  include "Span.h"
-#endif
+#include "Span.h"
 
 #define MAX_SIZE_SPAN 64
 
--- a/TaskManager/Test/test_render/boss1_action.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/boss1_action.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,3 +1,6 @@
+#ifndef BOSS1_ACCTION_H
+#define BOSS1_ACCTION_H
+
 #include <math.h>
 #include "SceneGraphRoot.h"
 #include "SGList.h"
@@ -59,3 +62,5 @@
 	       SceneGraphPtr tree);
 static void
 blast_move(SceneGraphPtr node, int screen_w, int screen_h);
+
+#endif
--- a/TaskManager/Test/test_render/bullet_action.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/bullet_action.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,3 +1,8 @@
+#ifndef BULLET_ACTION_H
+#define BULLET_ACTION_H
+
 void bullet_init(SceneGraphPtr scene_graph, SceneGraphPtr node);
 void bluebullet_move(SceneGraphPtr node, int screen_w, int screen_h);
 void bullet_collision(SceneGraphPtr node, int screen_w, int screen_h ,SceneGraphPtr tree);
+
+#endif
--- a/TaskManager/Test/test_render/demonstration.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/demonstration.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_DEMONSTRATION
 #define INCLUDED_DEMONSTRATION
 
-#ifndef INCLUDED_POLYGON
 #include "polygon.h"
-#endif
 
 class Demonstration{
  public:
--- a/TaskManager/Test/test_render/fb.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/fb.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,4 +1,8 @@
+#ifndef FB_H
+#define FB_H
+
 #if defined(__linux__)
+
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -17,6 +21,10 @@
 void send_current_error_msg(const char *ptr);
 void send_current_information(const char *ptr);
 
+/*
+    Don't put real function in a header...
+ */
+
 int get_fbdev_addr(void)
 {
 	int fd_framebuffer ;
@@ -89,3 +97,5 @@
 #endif /* defined(__linux__) */
 
 extern int get_fbdev_addr(void);
+
+#endif
--- a/TaskManager/Test/test_render/global_alloc.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/global_alloc.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,6 +1,10 @@
+#ifndef GLOBAL_ACCLOC_H
+#define GLOBAL_ACCLOC_H
+
 /*!
   global_alloc 用の ID
 
+  should be auto genarated.
  */
 enum global_allocate_id {
 
@@ -9,3 +13,5 @@
   GLOBAL_TILE_LIST,
 
 };
+
+#endif
--- a/TaskManager/Test/test_render/hash_texture.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/hash_texture.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,3 +1,6 @@
+#ifndef HASH_TEXTURE_H
+#define HASH_TEXTURE_H
+
 const int N = 8192;
 
 struct
@@ -13,3 +16,5 @@
     int hash_function(const char*);
     int hash_regist(const char*);
 };
+
+#endif
--- a/TaskManager/Test/test_render/hit_judge.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/hit_judge.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,3 +1,6 @@
+#ifndef HIT_JUDGE_H
+#define HIT_JUDGE_H
+
 #define TOUCH_LOWER 1
 #define TOUCH_TOP 2
 #define TOUCH_RIGHT 3
@@ -5,3 +8,4 @@
 #define HIT 5
 
 extern int square_judge(SceneGraphPtr oneself, SceneGraphPtr partner);
+#endif
--- a/TaskManager/Test/test_render/polygon.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/polygon.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,23 +1,11 @@
 #ifndef INCLUDED_POLYGON
 #define INCLUDED_POLYGON
 
-#ifndef INCLUDED_VIEWER
-#  include "viewer.h"
-#endif
-
+#include "viewer.h"
 #include <libxml/parser.h>
-
-#ifndef INCLUDED_POLYGON_PACK
-#  include "polygon_pack.h"
-#endif
-
-#ifndef INCLUDED_SPAN_PACK
-#  include "SpanPack.h"
-#endif
-
-#ifndef INCLUDED_TEXTURE
-#  include "texture.h"
-#endif
+#include "polygon_pack.h"
+#include "SpanPack.h"
+#include "texture.h"
 
 class Polygon {
 public:
--- a/TaskManager/Test/test_render/polygon_pack.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/polygon_pack.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_POLYGON_PACK
 #define INCLUDED_POLYGON_PACK
 
-#ifndef INCLUDED_TYPES
-#  include "types.h"
-#endif
+#include "types.h"
 
 #define MAX_SIZE_TRIANGLE 128
 
--- a/TaskManager/Test/test_render/scene.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/scene.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_SCENE
 #define INCLUDED_SCENE
 
-#ifndef INCLUDED_POLYGON
 #include "polygon.h"
-#endif
 
 class Scene{
  public:
--- a/TaskManager/Test/test_render/scene_graph_pack.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/scene_graph_pack.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,13 +1,9 @@
 #ifndef INCLUDED_SCENE_GRAPH_PACK
 #define INCLUDED_SCENE_GRAPH_PACK
 
-#ifndef INCLUDED_SCENE_GRAPH
-#  include "SceneGraph.h"
-#endif
+#include "SceneGraph.h"
 
-#ifndef INCLUDED_TYPES
-#  include "types.h"
-#endif
+#include "types.h"
 
 #define MAX_NODE 16
 #define MAX_POLYGON 36
--- a/TaskManager/Test/test_render/show_time.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/show_time.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,1 +1,6 @@
+#ifndef SHOW_TIME_H
+#define SHOW_TIME_H
+
 void show_time();
+
+#endif
--- a/TaskManager/Test/test_render/spe/CreatePolygon.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/spe/CreatePolygon.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_CREATE_POLYGON
 #define INCLUDED_CREATE_POLYGON
 
-#ifndef INCLUDED_SCHED_TASK
-#  include "SchedTask.h"
-#endif
+#include "SchedTask.h"
 
 class CreatePolygon : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/spe/CreateSpan.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/spe/CreateSpan.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,17 +1,9 @@
 #ifndef INCLUDED_CREATE_SPAN
 #define INCLUDED_CREATE_SPAN
 
-#ifndef INCLUDED_SCHED_TASK
-#  include "SchedTask.h"
-#endif
-
-#ifndef INCLUDED_POLYGON_PACK
-#  include "polygon_pack.h"
-#endif
-
-#ifndef INCLUDED_SPAN_PACK
-#  include "SpanPack.h"
-#endif
+#include "SchedTask.h"
+#include "polygon_pack.h"
+#include "SpanPack.h"
 
 class CreateSpan : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/spe/DrawBack.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawBack.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_TASK_DRAW_BACK
 #define INCLUDED_TASK_DRAW_BACK
 
-#ifndef INCLUDED_SCHED_TASK
-#  include "SchedTask.h"
-#endif
+#include "SchedTask.h"
 
 class DrawBack : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/spe/DrawSpan.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawSpan.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,21 +1,10 @@
 #ifndef INCLUDED_TASK_DRAW_SPAN
 #define INCLUDED_TASK_DRAW_SPAN
 
-#ifndef INCLUDED_SCHED_TASK
-#  include "SchedTask.h"
-#endif
-
-#ifndef INCLUDED_TAPESTRY
-#  include "Tapestry.h"
-#endif
-
-#ifndef INCLUDED_SPAN_PACK
-#  include "SpanPack.h"
-#endif
-
-#ifndef INCLUDED_TEXTURE_HASH
-#  include "TileHash.h"
-#endif
+#include "SchedTask.h"
+#include "Tapestry.h"
+#include "SpanPack.h"
+#include "TileHash.h"
 
 class DrawSpan : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/spe/DrawSpanRenew.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/spe/DrawSpanRenew.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_TASK_DRAW_SPAN2
 #define INCLUDED_TASK_DRAW_SPAN2
 
-#ifndef INCLUDED_TASK_DRAW_SPAN
-#  include "DrawSpan.h"
-#endif
+#include "DrawSpan.h"
 
 class DrawSpanRenew : public DrawSpan {
 public:
--- a/TaskManager/Test/test_render/spe/Load_Texture.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/spe/Load_Texture.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,13 +1,8 @@
 #ifndef INCLUDED_TASK_LOAD_TEXTURE
 #define INCLUDED_TASK_LOAD_TEXTURE
 
-#ifndef INCLUDED_SCHED_TASK
 #include  "SchedTask.h"
-#endif
-
-#ifndef INCLUDED_TAPESTRY
-#  include "Tapestry.h"
-#endif
+#include "Tapestry.h"
 
 class LoadTexture : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/spe/Set_Texture.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/spe/Set_Texture.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_TASK_LOAD_TEXTURE
 #define INCLUDED_TASK_LOAD_TEXTURE
 
-#ifndef INCLUDED_SCHED_TASK
-#  include  "SchedTask.h"
-#endif
+#include  "SchedTask.h"
 
 class SetTexture : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/spe/TileHash.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/spe/TileHash.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_TEXTURE_HASH
 #define INCLUDED_TEXTURE_HASH
 
-#ifndef INCLUDED_TAPESTRY
-#  include "Tapestry.h"
-#endif
+#include "Tapestry.h"
 
 class TileHash {
 public:
--- a/TaskManager/Test/test_render/sys.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/sys.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,3 +1,6 @@
+#ifndef CR_SYS_H
+#define CR_SYS_H
+
 void noMoreMemory();
 void get_matrix(float *matrix, float *rxyz, float *txyz, float *stack);
 void rotate_x(float *xyz, float r);
@@ -17,3 +20,5 @@
 void transposeMatrix(float *m0, float *m1);
 void unitMatrix(float *m);
 void transMatrix(float *m0, float *m1, float *v);
+
+#endif
--- a/TaskManager/Test/test_render/task/CreatePolygon.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/task/CreatePolygon.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_CREATE_POLYGON
 #define INCLUDED_CREATE_POLYGON
 
-#ifndef INCLUDED_SCHED_TASK
-#  include "SchedTask.h"
-#endif
+#include "SchedTask.h"
 
 class CreatePolygon : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/task/CreatePolygonFromSceneGraph.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/task/CreatePolygonFromSceneGraph.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_CREATE_POLYGON
 #define INCLUDED_CREATE_POLYGON
 
-#ifndef INCLUDED_SCHED_TASK
-#  include "SchedTask.h"
-#endif
+#include "SchedTask.h"
 
 class CreatePolygonFromSceneGraph : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/task/CreateSpan.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/task/CreateSpan.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,17 +1,9 @@
 #ifndef INCLUDED_CREATE_SPAN
 #define INCLUDED_CREATE_SPAN
 
-#ifndef INCLUDED_SCHED_TASK
-#  include "SchedTask.h"
-#endif
-
-#ifndef INCLUDED_POLYGON_PACK
-#  include "polygon_pack.h"
-#endif
-
-#ifndef INCLUDED_SPAN_PACK
-#  include "SpanPack.h"
-#endif
+#include "SchedTask.h"
+#include "polygon_pack.h"
+#include "SpanPack.h"
 
 class CreateSpan : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/task/DrawBack.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/task/DrawBack.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_TASK_DRAW_BACK
 #define INCLUDED_TASK_DRAW_BACK
 
-#ifndef INCLUDED_SCHED_TASK
-#  include "SchedTask.h"
-#endif
+#include "SchedTask.h"
 
 class DrawBack : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/task/DrawSpanRenew.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/task/DrawSpanRenew.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_TASK_DRAW_SPAN2
 #define INCLUDED_TASK_DRAW_SPAN2
 
-#ifndef INCLUDED_TASK_DRAW_SPAN
-#  include "DrawSpan.h"
-#endif
+#include "DrawSpan.h"
 
 class DrawSpanRenew : public DrawSpan {
 public:
--- a/TaskManager/Test/test_render/task/Set_Texture.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/task/Set_Texture.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_TASK_LOAD_TEXTURE
 #define INCLUDED_TASK_LOAD_TEXTURE
 
-#ifndef INCLUDED_SCHED_TASK
-#  include  "SchedTask.h"
-#endif
+#include  "SchedTask.h"
 
 class SetTexture : public SchedTask {
 public:
--- a/TaskManager/Test/test_render/task/TileHash.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/task/TileHash.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_TEXTURE_HASH
 #define INCLUDED_TEXTURE_HASH
 
-#ifndef INCLUDED_TAPESTRY
-#  include "Tapestry.h"
-#endif
+#include "Tapestry.h"
 
 class TileHash {
 public:
--- a/TaskManager/Test/test_render/vacuum.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/vacuum.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,3 +1,6 @@
+#ifndef VACUUM_H
+#define VACUUM_H
+
 #include "SGList.h"
 #include "SceneGraphRoot.h"
 
@@ -22,3 +25,4 @@
 void lockon_collision(SceneGraphPtr node,int w,int h,SceneGraphPtr tree);
 void cube_rotate(SceneGraphPtr node,int w,int h);
 
+#endif
--- a/TaskManager/Test/test_render/viewer.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/viewer.h	Thu Aug 06 12:04:55 2009 +0900
@@ -3,9 +3,7 @@
 
 #include <SDL.h>
 
-#ifndef INCLUDED_VIEWER_TYPES
-#  include "viewer_types.h"
-#endif
+#include "viewer_types.h"
 
 class Viewer {
 public:
@@ -40,6 +38,7 @@
     virtual void run_finish(void);
 };
 
+#define default_sdl_flag SDL_INIT_TIMER | SDL_INIT_JOYSTICK
+
 #endif
 
-#define default_sdl_flag SDL_INIT_TIMER | SDL_INIT_JOYSTICK
--- a/TaskManager/Test/test_render/viewerFB.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/viewerFB.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_VIEWER_FB
 #define INCLUDED_VIEWER_FB
 
-#ifndef INCLUDED_VIEWER
-#  include "viewer.h"
-#endif
+#include "viewer.h"
 
 class ViewerFB : public Viewer {
 public:
--- a/TaskManager/Test/test_render/viewerSDL.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/viewerSDL.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,9 +1,7 @@
 #ifndef INCLUDED_VIEWER_SDL
 #define INCLUDED_VIEWER_SDL
 
-#ifndef INCLUDED_VIEWER
-#  include "viewer.h"
-#endif
+#include "viewer.h"
 
 class ViewerSDL : public Viewer {
 public:
--- a/TaskManager/Test/test_render/xml.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/Test/test_render/xml.h	Thu Aug 06 12:04:55 2009 +0900
@@ -1,2 +1,7 @@
+#ifdef CR_XML_H
+#define CR_XML_H
+
 char *skip_to_number(char *cont);
 char *pickup_float(char *cont, float *index);
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TaskManager/kernel/memory/MemHash.cpp	Thu Aug 06 12:04:55 2009 +0900
@@ -0,0 +1,90 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "MemHash.h"
+
+static unsigned short PRIME[8] = {
+    0x002, 0x065, 0x0c7, 0x133, 0x191, 0x1f3, 0x259, 0x2bd,
+};
+
+int
+MemHash::hash(memaddr data)
+{
+    int value = 0;
+    int n = 0;
+    int key;
+
+    for (uint32 i = 0; i < sizeof(memaddr) * 2; i ++) {
+        key = data & 0xf;
+        value += key * PRIME[n++ & 7];
+        data >>= 4;
+    }
+
+    return value % hashSize;
+}
+
+MemHash::MemHash(void)
+{
+  //hashSize = 263;
+  //tableSize = sizeof(MemorySegmentPtr)*hashSize;
+
+    table = (MemorySegmentPtr*)malloc(tableSize);
+    clear();
+}
+
+int
+MemHash::put(memaddr key, MemorySegmentPtr data)
+{
+    int hashval = hash(key);
+
+    for (int i = 0; i < hashSize/2; i++) {
+        int index = (hashval + i*i)%hashSize;
+
+        if (table[index] == 0) { // 空の table に入れる
+            table[index] = data;
+            return index;
+        }
+    }
+
+    return -1;
+}
+
+MemorySegmentPtr
+MemHash::get(memaddr key)
+{
+    int hashval = hash(key);
+
+    for (int i = 0; i < hashSize/2; i++) {
+        int index = (hashval + i*i)%hashSize;
+
+        if (table[index] != NULL &&
+            table[index]->address == key) {
+            return table[index];
+        }
+    }
+
+    return NULL;
+}
+
+void
+MemHash::remove(memaddr key)
+{
+    int hashval = hash(key);
+
+    for (int i = 0; i < hashSize/2; i++) {
+        int index = (hashval + i*i)%hashSize;
+
+        if (table[index] != NULL &&
+            table[index]->address == key) {
+            table[index] = NULL;
+        }
+    }
+}
+
+void
+MemHash::clear(void)
+{
+    bzero(table, tableSize);
+}
+
+/* end */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TaskManager/kernel/memory/MemHash.h	Thu Aug 06 12:04:55 2009 +0900
@@ -0,0 +1,27 @@
+#ifndef INCLUDED_MEM_HASH
+#define INCLUDED_MEM_HASH
+
+class MemHash {
+public:
+    MemHash(void);
+
+private:
+    MemorySegmentPtr *table;
+
+public:
+    void clear(void);
+    int hash(memaddr data);
+    int put(memaddr addr, MemPtr tile);
+    MemorySegmentPtr get(memaddr addr);
+    void remove(memaddr addr);
+};
+
+typedef MemHash* MemHashPtr;
+
+const int hashSize = 263;
+const int tableSize = sizeof(MemorySegementPtr)*hashSize;
+
+#endif
+
+
+
--- a/TaskManager/kernel/memory/MemorySegment.h	Mon Aug 03 04:22:11 2009 +0900
+++ b/TaskManager/kernel/memory/MemorySegment.h	Thu Aug 06 12:04:55 2009 +0900
@@ -11,4 +11,6 @@
     void* data;
 };
 
+typedef MemorySegment *MemorySegementPtr;
+
 #endif