# HG changeset patch
# User kono
# Date 1137084933 -32400
# Node ID 3de2ae36c7e5053c132ae6575b260cb93caf968a
# Parent  388baa7d4beeac22e6353c5274a640b823ad6a9b
*** empty log message ***

diff -r 388baa7d4bee -r 3de2ae36c7e5 test/conv1.c
--- a/test/conv1.c	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/conv1.c	Fri Jan 13 01:55:33 2006 +0900
@@ -101,7 +101,7 @@
 code main_return(int i,stack sp) {
     if (loop-->0)
 	goto f(233,sp);
-    printf("#0101:%d\n",i);
+    printf("#0103:%d\n",i);
     goto (( (struct main_continuation *)sp)->main_ret)(0),
            ((struct main_continuation *)sp)->env;
 }
@@ -130,7 +130,7 @@
 code main_return2(int i,stack sp) {
     if (loop-->0)
 	goto f2(233,sp);
-    printf("#0130:%d\n",i);
+    printf("#0132:%d\n",i);
     goto (( (struct main_continuation *)sp)->main_ret)(0),
            ((struct main_continuation *)sp)->env;
 }
@@ -163,7 +163,7 @@
 code main_return2_1(int i,stack sp) {
     if (loop-->0)
         goto f2_1(233,sp);
-    printf("#0163:%d\n",i);
+    printf("#0165:%d\n",i);
     goto (( (struct main_continuation *)sp)->main_ret)(0),
            ((struct main_continuation *)sp)->env;
 }
@@ -191,7 +191,7 @@
 	for(loop=0;loop<LOOP_COUNT;loop++) {
 	   j = f0(233);
 	}
-	printf("#0191:%d\n",j);
+	printf("#0193:%d\n",j);
 #if !CC_ONLY
     } else if (sw==1) {
 	loop = LOOP_COUNT;
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/conv1.code-out
--- a/test/conv1.code-out	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/conv1.code-out	Fri Jan 13 01:55:33 2006 +0900
@@ -1,1 +1,1 @@
-#0163:720
+#0165:720
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/fact-a.c
--- a/test/fact-a.c	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/fact-a.c	Fri Jan 13 01:55:33 2006 +0900
@@ -27,7 +27,7 @@
 
 code print(int n,int result,int orig,code(*print)(),code (*exit1)(),void*exit1env)
 {
-    printf("#0027:%d! = %d\n",orig, result);
+    printf("#0029:%d! = %d\n",orig, result);
     goto (*exit1)(0),exit1env;
 }
 
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/fact-a.code-out
--- a/test/fact-a.code-out	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/fact-a.code-out	Fri Jan 13 01:55:33 2006 +0900
@@ -1,1 +1,1 @@
-#0027:10! = 3628800
+#0029:10! = 3628800
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/goto.c
--- a/test/goto.c	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/goto.c	Fri Jan 13 01:55:33 2006 +0900
@@ -18,56 +18,56 @@
 code
 a2(int i,code conv())
 {
-    printf("#0028:a2 %d %s\n",i,print_conv(conv));
+    printf("#0020:a2 %d %s\n",i,print_conv(conv));
     goto conv(i+1,a4);
 }
 
 code
 a3(int i,code (*conv)())
 {
-    printf("#0035:a3 %d %s\n",i,print_conv(conv));
+    printf("#0027:a3 %d %s\n",i,print_conv(conv));
     goto conv(i+1,a5);
 }
 
 code
 a4(int i,code conv())
 {
-    printf("#0042:a4 %d %s\n",i,print_conv(conv));
+    printf("#0034:a4 %d %s\n",i,print_conv(conv));
     goto (*conv)(i+1,a6);
 }
 
 code
 a5(int i,code (*conv)())
 {
-    printf("#0049:a5 %d %s\n",i,print_conv(conv));
+    printf("#0041:a5 %d %s\n",i,print_conv(conv));
     goto (*conv)(i+1,i+2,i+3,a7);
 }
 
 code
 a6(int i,int j,int k,code conv())
 {
-    printf("#0056:a6 %d %s\n",i,print_conv(conv));
+    printf("#0048:a6 %d %s\n",i,print_conv(conv));
     goto conv(i+1,j,k,a8);
 }
 
 code
 a7(int i,,int j,int k,code (*conv)())
 {
-    printf("#0063:a7 %d %s\n",i,print_conv(conv));
+    printf("#0055:a7 %d %s\n",i,print_conv(conv));
     goto conv(i+1,j,k,a9);
 }
 
 code
 a8(int i,int j,int k,code conv())
 {
-    printf("#0070:a8 %d %s\n",i,print_conv(conv));
+    printf("#0062:a8 %d %s\n",i,print_conv(conv));
     goto (*conv)(i+1,j,k,exit0);
 }
 
 code
 a9(int i,int j,int k,code (*conv)())
 {
-    printf("#0077:a9 %d %s\n",i,print_conv(conv));
+    printf("#0069:a9 %d %s\n",i,print_conv(conv));
     goto (*conv)(0),env;
 }
 
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/goto.code-out
--- a/test/goto.code-out	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/goto.code-out	Fri Jan 13 01:55:33 2006 +0900
@@ -1,8 +1,8 @@
-#0028:a2 1 a3
-#0035:a3 2 a4
-#0042:a4 3 a5
-#0049:a5 4 a6
-#0056:a6 5 a7
-#0063:a7 6 a8
-#0070:a8 7 a9
-#0077:a9 8 xx
+#0020:a2 1 a3
+#0027:a3 2 a4
+#0034:a4 3 a5
+#0041:a5 4 a6
+#0048:a6 5 a7
+#0055:a7 6 a8
+#0062:a8 7 a9
+#0069:a9 8 xx
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/inline.c
--- a/test/inline.c	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/inline.c	Fri Jan 13 01:55:33 2006 +0900
@@ -84,9 +84,9 @@
     switch(j) {
     case 1: printf("#0084:1\n"); break;
     default:
-    case 2: printf("#0085:2\n"); break;
-    case 3: printf("#0086:3\n"); break;
-    case 4: printf("#0087:4\n"); break;
+    case 2: printf("#0086:2\n"); break;
+    case 3: printf("#0087:3\n"); break;
+    case 4: printf("#0088:4\n"); break;
     }
     return 0;
 }
@@ -108,7 +108,7 @@
 static
 inline int ins(const int i,const int j)
 {
-   printf("#0109:%d %d\n",i,j);
+   printf("#0110:%d %d\n",i,j);
    if (f(i)>j) return j;
    else return i;
 }
@@ -116,7 +116,7 @@
 static
 inline int ins1(const int i,const int j, const int k)
 {
-   printf("#0117:%d %d %d\n",i,j,k);
+   printf("#0118:%d %d %d\n",i,j,k);
    if (f(i)>j) return j;
    else return i;
 }
@@ -130,14 +130,14 @@
 	k += 3;
 	order <<= 4; order|=7;
     } while ( k < j);
-    printf("#0131: %d do %d %x\n",p,k,order);
+    printf("#0132: %d do %d %x\n",p,k,order);
 
     while (k > j) {
 	order <<= 4; order|=0;
 	k -= 3;
 	order <<= 4; order|=7;
     } 
-    printf("#0138: %d while %d %x\n",p,k,order);
+    printf("#0139: %d while %d %x\n",p,k,order);
 
     m = 0;
     for(k=0;k<j;k++) {
@@ -153,9 +153,9 @@
 	    m += k;
 	    order <<= 4; order|=10;
 	}
-	printf("#0154: %x\n",order);
+	printf("#0155: %x\n",order);
     }
-    printf("#0156: %d for %d\n",p,m);
+    printf("#0157: %d for %d\n",p,m);
 
 
     switch(i) {
@@ -169,13 +169,13 @@
 	break;
     default: k = 5;
     }
-    printf("#0170: %d switch %d\n",p,k);
+    printf("#0171: %d switch %d\n",p,k);
 
     for(k=0;k<j;k++) {
 	i += k;
 	if (k<3) continue;
     }
-    printf("#0176: %d for %d\n",p,i);
+    printf("#0177: %d for %d\n",p,i);
     goto hoge;
 hage:
     goto hage;
@@ -196,27 +196,27 @@
     // a = 10;
 
     k1 = in1(a,b);
-    printf("#0197:%d %d %d\n",a,b,k1);
+    printf("#0198:%d %d %d\n",a,b,k1);
     j1 = in1(k,j-6)+f(k1);
-    printf("#0199:%d %d %s\n",k1,j1,hoo);
+    printf("#0200:%d %d %s\n",k1,j1,hoo);
     k1 = &v-&x>0? &v-&x : &x-&v;
-    printf("#0201:v-x: %d\n",k1);
+    printf("#0202:v-x: %d\n",k1);
 
     k1 = ins(a,b);
     j1 = ins(k,j-6)+f(k1);
-    printf("#0205:%d %d %s\n",k1,j1,haa);
+    printf("#0206:%d %d %s\n",k1,j1,haa);
 
     k1 = ins(as,bs);
     j1 = ins(k,j-6)+f(k1);
-    printf("#0209:%d %d %s\n",k1,j1,haa);
+    printf("#0210:%d %d %s\n",k1,j1,haa);
 
     k1 = ins(v,x);
     j1 = ins(k,j-6)+f(v);
-    printf("#0213:%d %d %s\n",k1,j1,haa);
+    printf("#0214:%d %d %s\n",k1,j1,haa);
 
     k1 = fnp(v,x,5);
     j1 = ins1(k,j-6,6)+f(v);
-    printf("#0217:%d %d %s\n",k1,j1,haa);
+    printf("#0218:%d %d %s\n",k1,j1,haa);
 }
 
 void
@@ -235,13 +235,13 @@
 static
 inline int order(int a0,int a1,int a2, int a3, int a4)
 {
-    printf("#0236:order  %d %d %d %d %d\n",a0,a1,a2,a3,a4);
+    printf("#0237:order  %d %d %d %d %d\n",a0,a1,a2,a3,a4);
 }
 
 static
 inline int order1(int a0,int a1,int a2, int a3, int a4)
 {
-    printf("#0242:orderp %d %d %d %d %d\n",a0,a1,a2,a3,a4);
+    printf("#0243:orderp %d %d %d %d %d\n",a0,a1,a2,a3,a4);
 }
 
 int (*order1p)(int a0,int a1,int a2, int a3, int a4) = order1;
@@ -263,15 +263,15 @@
 void
 main5()
 {
- printf("test1 " " test2\n");
- printf("test3 "
+ printf("#0265:test1 " " test2\n");
+ printf("#0266:test3 "
      " test4\n");
 #if 0
   // error
- printf("test5 
+ printf("#0270:test5 
       test6\n");
 #endif
- printf("test7  \
+ printf("#0273:test7  \
       test8\n");
 }
 
@@ -282,7 +282,7 @@
   const int i = 3;
 
      fnp = ins1;
-     printf("#0265:%d\n",(1,2,3,4,5));
+     printf("#0284:%d\n",(1,2,3,4,5));
      order(1,2,3,4,5);
      order1p(1,2,3,4,5);
      a0(5,6);
@@ -295,14 +295,14 @@
      main2(ac,av);
      main3(ac,av);
 
- printf("test1 " " test2\n");
+ printf("#0297:test1 " " test2\n");
 
 
   switch(i) { 
-  case 1: printf("1\n"); break;
+  case 1: printf("#0301:1\n"); break;
   default:
-  case 2: printf("2\n"); break;
-  case 3: printf("3\n"); break;
+  case 2: printf("#0303:2\n"); break;
+  case 3: printf("#0304:3\n"); break;
   }
 
     main5();
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/strinit.c
--- a/test/strinit.c	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/strinit.c	Fri Jan 13 01:55:33 2006 +0900
@@ -68,23 +68,23 @@
        .c = (int)&temp4,
     };
 
-    printf("#0064:1: %d\n",temp1.a);
-    printf("#0065:1: %d\n",temp1.e);
-    printf("#0066:1: %d\n",temp1.b);
-    printf("#0067:2: %d\n",temp2.c);
-    printf("#0068:2: %d\n",temp2.e);
-    printf("#0069:2: %d\n",temp2.b);
-    printf("#0070:2: %d\n",(void*)temp3.c==b);
-    printf("#0071:2: %d\n",temp3.c==(int)b);
-    printf("#0072:2: %d\n",temp3.a==(int)&b);
-    printf("#0073:2: %d\n",temp4.m.j);
-    printf("#0074:2: %d\n",temp5.m.j);
-    printf("#0075:2: %d\n",temp11.m.j);
-    printf("#0076:2: %d\n",temp12.m.k);
-    printf("#0077:2: %d\n",temp12.m.j);
-    printf("#0078:2: %d\n",temp11.c==(int)&b);
-    printf("#0068:2: %d\n",temp8.e);
-    printf("#0068:2: %d\n",temp6.e);
+    printf("#0070:1: %d\n",temp1.a);
+    printf("#0071:1: %d\n",temp1.e);
+    printf("#0072:1: %d\n",temp1.b);
+    printf("#0073:2: %d\n",temp2.c);
+    printf("#0074:2: %d\n",temp2.e);
+    printf("#0075:2: %d\n",temp2.b);
+    printf("#0076:2: %d\n",(void*)temp3.c==b);
+    printf("#0077:2: %d\n",temp3.c==(int)b);
+    printf("#0078:2: %d\n",temp3.a==(int)&b);
+    printf("#0079:2: %d\n",temp4.m.j);
+    printf("#0080:2: %d\n",temp5.m.j);
+    printf("#0081:2: %d\n",temp11.m.j);
+    printf("#0082:2: %d\n",temp12.m.k);
+    printf("#0083:2: %d\n",temp12.m.j);
+    printf("#0084:2: %d\n",temp11.c==(int)&b);
+    printf("#0085:2: %d\n",temp8.e);
+    printf("#0086:2: %d\n",temp6.e);
     linux_kernel();
     return 0;
 }
@@ -164,7 +164,7 @@
                                        { .sport = sport,
                                          .dport = dport } } };
 
-	printf("#0158:%d %d\n",fl.oif,fl.uli_u.ports.dport);
+	printf("#0166:%d %d\n",fl.oif,fl.uli_u.ports.dport);
 }
 
 static 
@@ -182,8 +182,8 @@
                                        { .sport = sport,
                                          .dport = dport } } };
 
-	printf("#0176:%d %d\n",fl.oif,fl.uli_u.ports.dport);
-	printf("#0177:%d %d\n",fl.iif,fl.nl_u.ip4_u.saddr);
+	printf("#0184:%d %d\n",fl.oif,fl.uli_u.ports.dport);
+	printf("#0185:%d %d\n",fl.iif,fl.nl_u.ip4_u.saddr);
 }
 
 void
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/test1.c
--- a/test/test1.c	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/test1.c	Fri Jan 13 01:55:33 2006 +0900
@@ -68,15 +68,15 @@
 code f0(int i,int j,code(*exit2)(), void *exit2env,void *sp)
 {
 	struct f0_save *c;
-    printf("#0069:f0 1 sp: %x\n",sp-stack0);
+    printf("#0070:f0 1 sp: %x\n",sp-stack0);
 	sp -= sizeof(struct f0_save);
-    printf("#0071:f0 2 sp: %x\n",sp-stack0);
+    printf("#0072:f0 2 sp: %x\n",sp-stack0);
 	c = sp;
 	c->jj = j;
         c->exit1 = exit2;
         c->exit1env = exit2env;
 	c->ret = f1;
-    printf("#0077:f0 3 sp: %x\n",sp-stack0);
+    printf("#0078:f0 3 sp: %x\n",sp-stack0);
 	goto f(i,sp);
 }
 
@@ -106,13 +106,13 @@
     sp = stack0;
     j = i;
     
-    printf("#0107:sp: %x %x\n",sp-(int*)stack0,sizeof(*stack0));
+    printf("#0108:sp: %x %x\n",sp-(int*)stack0,sizeof(*stack0));
     goto f0(i,j,return,environment,sp);
 }
 
 code print(int i,int j,(*exit1)(),void*exit1env)
 {
-    printf("#0113:%d %d\n",i,j);
+    printf("#0114:%d %d\n",i,j);
     goto (*exit1)(0),exit1env;
 }
 
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/test1.code-out
--- a/test/test1.code-out	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/test1.code-out	Fri Jan 13 01:55:33 2006 +0900
@@ -1,8 +1,8 @@
-#0107:sp: 0 1
-#0069:f0 1 sp: 0
-#0071:f0 2 sp: fffffff0
-#0077:f0 3 sp: fffffff0
+#0108:sp: 0 1
+#0070:f0 1 sp: 0
+#0072:f0 2 sp: fffffff0
+#0078:f0 3 sp: fffffff0
 #0042:f 0 sp: fffffff0
 #0046:f 1 sp: fffffff0
 #0048:f 2 sp: ffffffe0
-#0113:13 1
+#0114:13 1
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/tmp1.c
--- a/test/tmp1.c	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/tmp1.c	Fri Jan 13 01:55:33 2006 +0900
@@ -10,12 +10,12 @@
 {
     ret = return;
     env = environment;
-    printf("#0011:main0 %d start.\n",ac);
+    printf("#0012:main0 %d start.\n",ac);
     if (ac>=1)
 	goto code0(ac,av,return);
     goto code1(ac,av,exit1);
     // not reached. (warning?)
-    printf("#0016:main0 %d end.\n",ac);
+    printf("#0017:main0 %d end.\n",ac);
 }
 
 code exit1(int ac)
@@ -28,7 +28,7 @@
 char a,b;
 int c,d,e,f;
 {
-    printf("#0029:code3: %d %d %d %d %d %d\n",a,b,c,d,e,f);
+    printf("#0030:code3: %d %d %d %d %d %d\n",a,b,c,d,e,f);
     if(a<10)
 	goto code3(a+1,b,c,d,e,f);
     else
@@ -40,7 +40,7 @@
 int c,d,e,f;
 {
     int i=1,j=2;
-    printf("#0041:code4: %d %d %d %d %d %d\n",a,b,c,d,e,f);
+    printf("#0042:code4: %d %d %d %d %d %d\n",a,b,c,d,e,f);
     if(a<20)   // cyclic binary dependency
 	goto code3(a+b,b+c,c+d,d+e,e+f,f+a);
     else if(a<30)
@@ -65,7 +65,7 @@
 char *av[];
 {
     code (*f)(int);
-    printf("#0066:code1: %d\n",ac);
+    printf("#0067:code1: %d\n",ac);
     f = exit;
     if (ac>3)
 	goto code1(ac,av,f);
@@ -79,9 +79,9 @@
 main(int ac,char *av[])
 {
    main0(1,av);
-   printf("#0080:main continue.\n");
+   printf("#0081:main continue.\n");
    main0(0,av);
-   printf("#0082:main end.\n");
+   printf("#0083:main end.\n");
 }
 
 /* end */
diff -r 388baa7d4bee -r 3de2ae36c7e5 test/tmp1.code-out
--- a/test/tmp1.code-out	Fri Jan 13 01:51:39 2006 +0900
+++ b/test/tmp1.code-out	Fri Jan 13 01:55:33 2006 +0900
@@ -1,42 +1,42 @@
-#0011:main0 1 start.
-#0066:code1: 1
-#0080:main continue.
-#0011:main0 0 start.
-#0066:code1: 0
-#0029:code3: 0 1 2 3 4 5
-#0029:code3: 1 1 2 3 4 5
-#0029:code3: 2 1 2 3 4 5
-#0029:code3: 3 1 2 3 4 5
-#0029:code3: 4 1 2 3 4 5
-#0029:code3: 5 1 2 3 4 5
-#0029:code3: 6 1 2 3 4 5
-#0029:code3: 7 1 2 3 4 5
-#0029:code3: 8 1 2 3 4 5
-#0029:code3: 9 1 2 3 4 5
-#0029:code3: 10 1 2 3 4 5
-#0041:code4: 13 4 5 6 7 8
-#0029:code3: 17 9 11 13 15 21
-#0041:code4: 20 12 14 16 18 24
-#0029:code3: 20 12 14 16 18 24
-#0041:code4: 23 15 17 19 21 27
-#0029:code3: 23 15 17 19 21 27
-#0041:code4: 26 18 20 22 24 30
-#0029:code3: 26 18 20 22 24 30
-#0041:code4: 29 21 23 25 27 33
-#0029:code3: 29 21 23 25 27 33
-#0041:code4: 32 24 26 28 30 36
-#0029:code3: 24 26 32 30 36 28
-#0041:code4: 27 29 35 33 39 31
-#0029:code3: 27 29 35 33 39 31
-#0041:code4: 30 32 38 36 42 34
-#0029:code3: 32 38 30 42 34 36
-#0041:code4: 35 41 33 45 37 39
-#0029:code3: 41 33 35 37 39 45
-#0041:code4: 44 36 38 40 42 48
-#0041:code4: 45 38 39 43 45 51
-#0041:code4: 46 40 40 46 48 54
-#0041:code4: 47 42 41 49 51 57
-#0041:code4: 48 44 42 52 54 60
-#0041:code4: 49 46 43 55 57 63
-#0041:code4: 50 48 44 58 60 66
-#0082:main end.
+#0012:main0 1 start.
+#0067:code1: 1
+#0081:main continue.
+#0012:main0 0 start.
+#0067:code1: 0
+#0030:code3: 0 1 2 3 4 5
+#0030:code3: 1 1 2 3 4 5
+#0030:code3: 2 1 2 3 4 5
+#0030:code3: 3 1 2 3 4 5
+#0030:code3: 4 1 2 3 4 5
+#0030:code3: 5 1 2 3 4 5
+#0030:code3: 6 1 2 3 4 5
+#0030:code3: 7 1 2 3 4 5
+#0030:code3: 8 1 2 3 4 5
+#0030:code3: 9 1 2 3 4 5
+#0030:code3: 10 1 2 3 4 5
+#0042:code4: 13 4 5 6 7 8
+#0030:code3: 17 9 11 13 15 21
+#0042:code4: 20 12 14 16 18 24
+#0030:code3: 20 12 14 16 18 24
+#0042:code4: 23 15 17 19 21 27
+#0030:code3: 23 15 17 19 21 27
+#0042:code4: 26 18 20 22 24 30
+#0030:code3: 26 18 20 22 24 30
+#0042:code4: 29 21 23 25 27 33
+#0030:code3: 29 21 23 25 27 33
+#0042:code4: 32 24 26 28 30 36
+#0030:code3: 24 26 32 30 36 28
+#0042:code4: 27 29 35 33 39 31
+#0030:code3: 27 29 35 33 39 31
+#0042:code4: 30 32 38 36 42 34
+#0030:code3: 32 38 30 42 34 36
+#0042:code4: 35 41 33 45 37 39
+#0030:code3: 41 33 35 37 39 45
+#0042:code4: 44 36 38 40 42 48
+#0042:code4: 45 38 39 43 45 51
+#0042:code4: 46 40 40 46 48 54
+#0042:code4: 47 42 41 49 51 57
+#0042:code4: 48 44 42 52 54 60
+#0042:code4: 49 46 43 55 57 63
+#0042:code4: 50 48 44 58 60 66
+#0083:main end.