# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1305962861 -32400
# Node ID 21ac9f57a6d4e092490343daf55111379489f8de
# Parent  fce767bb5e25a91ba23340ee5c6bf9bbefac72fa
Mac OS X 64bit

diff -r fce767bb5e25 -r 21ac9f57a6d4 Makefile.def
--- a/Makefile.def	Tue Jan 18 02:20:10 2011 +0900
+++ b/Makefile.def	Sat May 21 16:27:41 2011 +0900
@@ -4,7 +4,7 @@
 # ex  linux/ps3
 CERIUM = ../Cerium
 
-ABIBIT = 32
+ABIBIT = 64
 ABI = -m$(ABIBIT)
 CC      = g++
 OPT = -g
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/Atari.cc
--- a/ppe/Atari.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/Atari.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,11 +6,11 @@
 static int
 atari(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int w = (int)smanager->get_param(0);
-    int h = (int)smanager->get_param(1);
-    int tama_lv1_end = (int)smanager->get_param(2);
-    int tama_lv2_end = (int)smanager->get_param(3);
-    int laser_lv1_end = (int)smanager->get_param(4);
+    long w = (long)smanager->get_param(0);
+    long h = (long)smanager->get_param(1);
+    long tama_lv1_end = (long)smanager->get_param(2);
+    long tama_lv2_end = (long)smanager->get_param(3);
+    long laser_lv1_end = (long)smanager->get_param(4);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     player *jiki = (player*)smanager->get_input(rbuf, 1);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/asteroid.cc
--- a/ppe/asteroid.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/asteroid.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,7 +6,7 @@
 static int
 asteroid_task(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int asteroidi = (int)smanager->get_param(0);
+    long asteroidi = (long)smanager->get_param(0);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state10.cc
--- a/ppe/chara_state10.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state10.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state10(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rinkx = (int)smanager->get_param(0);
-    int rinky = (int)smanager->get_param(1);
+    long rinkx = (long)smanager->get_param(0);
+    long rinky = (long)smanager->get_param(1);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state11.cc
--- a/ppe/chara_state11.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state11.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state11(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rinkf1 = (int)smanager->get_param(0);
-    int count = (int)smanager->get_param(1);
+    long rinkf1 = (long)smanager->get_param(0);
+    long count = (long)smanager->get_param(1);
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
 
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state12.cc
--- a/ppe/chara_state12.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state12.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,10 +6,10 @@
 static int
 state12(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int fastebos = (int)smanager->get_param(0);
-    int count = (int)smanager->get_param(1);
-    int rinkx = (int)smanager->get_param(2);
-    int rinky = (int)smanager->get_param(3);
+    long fastebos = (long)smanager->get_param(0);
+    long count = (long)smanager->get_param(1);
+    long rinkx = (long)smanager->get_param(2);
+    long rinky = (long)smanager->get_param(3);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     int length;
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state13.cc
--- a/ppe/chara_state13.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state13.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,11 +6,11 @@
 static int
 state13(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rinkx = (int)smanager->get_param(0);
-    int rinky = (int)smanager->get_param(1);
-    int filpcount = (int)smanager->get_param(2);
-    int flag = (int)smanager->get_param(3);
-    int count = (int)smanager->get_param(4);
+    long rinkx = (long)smanager->get_param(0);
+    long rinky = (long)smanager->get_param(1);
+    long filpcount = (long)smanager->get_param(2);
+    long flag = (long)smanager->get_param(3);
+    long count = (long)smanager->get_param(4);
 
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state22.cc
--- a/ppe/chara_state22.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state22.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,7 +6,7 @@
 static int
 state22(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rand = (int)smanager->get_param(0);
+    int rand = (long)smanager->get_param(0);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
 
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state25.cc
--- a/ppe/chara_state25.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state25.cc	Sat May 21 16:27:41 2011 +0900
@@ -10,9 +10,9 @@
     int length = 1;
     int amari;
 
-    int part1_f = (int)smanager->get_param(0);
-    int part5_f = (int)smanager->get_param(1);
-    int rand = (int)smanager->get_param(2);
+    long part1_f = (long)smanager->get_param(0);
+    long part5_f = (long)smanager->get_param(1);
+    long rand = (long)smanager->get_param(2);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     int count = *(int*)smanager->get_input(rbuf, 1);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state28.cc
--- a/ppe/chara_state28.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state28.cc	Sat May 21 16:27:41 2011 +0900
@@ -7,7 +7,7 @@
 static int
 state28(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rand = (int)smanager->get_param(2);
+    long rand = (long)smanager->get_param(2);
 
     int length = 2;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state31.cc
--- a/ppe/chara_state31.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state31.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,7 +6,7 @@
 static int
 state31(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int part3_f = (int)smanager->get_param(2);
+    long part3_f = (long)smanager->get_param(2);
 
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state32.cc
--- a/ppe/chara_state32.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state32.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,9 +6,9 @@
 static int
 state32(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int part4_f = (int)smanager->get_param(3);
-    int enemystate_14 = (int)smanager->get_param(4);
-    int enemystate_20 = (int)smanager->get_param(5);
+    long part4_f = (long)smanager->get_param(3);
+    long enemystate_14 = (long)smanager->get_param(4);
+    long enemystate_20 = (long)smanager->get_param(5);
     
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state33.cc
--- a/ppe/chara_state33.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state33.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state33(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int enemystate_11 = (int)smanager->get_param(4);
-    int enemystate_19 = (int)smanager->get_param(5);
+    long enemystate_11 = (long)smanager->get_param(4);
+    long enemystate_19 = (long)smanager->get_param(5);
 
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state34.cc
--- a/ppe/chara_state34.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state34.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state34(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int enemystate_12 = (int)smanager->get_param(4);
-    int enemystate_21 = (int)smanager->get_param(5);
+    long enemystate_12 = (long)smanager->get_param(4);
+    long enemystate_21 = (long)smanager->get_param(5);
 
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state35.cc
--- a/ppe/chara_state35.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state35.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state35(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int enemystate_15 = (int)smanager->get_param(4);
-    int enemystate_16 = (int)smanager->get_param(5);
+    long enemystate_15 = (long)smanager->get_param(4);
+    long enemystate_16 = (long)smanager->get_param(5);
     
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state40.cc
--- a/ppe/chara_state40.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state40.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,7 +6,7 @@
 static int
 state40(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int enemy_part1_f = (int)smanager->get_param(0);
+    long enemy_part1_f = (long)smanager->get_param(0);
     
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state41.cc
--- a/ppe/chara_state41.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state41.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state41(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int enemy_part2_f = (int)smanager->get_param(1);
-    int rand = (int)smanager->get_param(6);
+    long enemy_part2_f = (long)smanager->get_param(1);
+    long rand = (long)smanager->get_param(6);
     
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state500.cc
--- a/ppe/chara_state500.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state500.cc	Sat May 21 16:27:41 2011 +0900
@@ -7,7 +7,7 @@
 static int
 state500(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rand = (int)smanager->get_param(0);
+    long rand = (long)smanager->get_param(0);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     int count = *(int*)smanager->get_input(rbuf, 1);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state601.cc
--- a/ppe/chara_state601.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state601.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,7 +6,7 @@
 static int
 state601(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rand = (int)smanager->get_param(0);
+    long rand = (long)smanager->get_param(0);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     player *jiki = (player*)smanager->get_input(rbuf, 1);
diff -r fce767bb5e25 -r 21ac9f57a6d4 ppe/chara_state602.cc
--- a/ppe/chara_state602.cc	Tue Jan 18 02:20:10 2011 +0900
+++ b/ppe/chara_state602.cc	Sat May 21 16:27:41 2011 +0900
@@ -6,7 +6,7 @@
 static int
 state602(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rand = (int)smanager->get_param(0);
+    long rand = (long)smanager->get_param(0);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
 
diff -r fce767bb5e25 -r 21ac9f57a6d4 sys.c
--- a/sys.c	Tue Jan 18 02:20:10 2011 +0900
+++ b/sys.c	Sat May 21 16:27:41 2011 +0900
@@ -10,7 +10,7 @@
 int malloc_align16(void *free, void *aligned, int size)
 {
   char *index;
-  unsigned int *f=(unsigned int *)free,*a=(unsigned int *)aligned;
+  unsigned long *f=(unsigned long *)free,*a=(unsigned long *)aligned;
 
   if (free == NULL || aligned == NULL || size <= 0) return(-1);
 
@@ -20,11 +20,11 @@
       return(-1);
     }
 
-  *f = *a = (unsigned int)index;
-  if (((unsigned int)index % ALIGN_16BYTE) != 0)
+  *f = *a = (unsigned long)index;
+  if (((unsigned long)index % ALIGN_16BYTE) != 0)
     {
-      index += ALIGN_16BYTE - ((unsigned int)index % ALIGN_16BYTE);
-      *a = (unsigned int)index;
+      index += ALIGN_16BYTE - ((unsigned long)index % ALIGN_16BYTE);
+      *a = (unsigned long)index;
     }
   return(0);
 }