Mercurial > hg > CbC > old > device

changeset 862:68cbc637f486

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 31 Mar 2014 18:40:27 +0900
parents c005a392e27e
children e253ffedf947
files Makefile Makefile.i64 Makefile.ia32 mc-code-i64.c
diffstat 4 files changed, 73 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Mar 31 18:33:20 2014 +0900
+++ b/Makefile	Mon Mar 31 18:40:27 2014 +0900
@@ -156,16 +156,16 @@
 
 check-nkf: mc
 	( cd nkf203; $(CC) -g -o nkf1 nkf.c utf8tbl.c )
-	( cd nkf203; ../mc-$(ARCH) -s nkf.c utf8tbl.c )
+	( cd nkf203; ../mc-$(ARCH) nkf.c utf8tbl.c )
 	( cd nkf203; $(CC) -g -o nkf nkf.s utf8tbl.s )
 	( cd nkf203; perl test.pl )
 
-#	-./$(MC) -Itest/ -s $(TARGET).c
+#	-./$(MC) -Itest/ $(TARGET).c
 
 check: mc $(MC) $(TARGET).c
 	-$(CC) $(CFLAGS1) $(STDFLAG) $(TARGET).c -o b.out $(MLIB)
 	-./b.out > $(TARGET).gcc.out
-	-./$(MC) $(MCFLAG) -s $(TARGET).c
+	-./$(MC) $(MCFLAG)  $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff $(TARGET).gcc.out $(TARGET).$(MC).out
@@ -173,23 +173,23 @@
 check-inline: mc $(MC) $(TARGET).c
 	-$(CC) $(CFLAGS1) $(STDFLAG) $(TARGET).c -o b.out $(MLIB)
 	-./b.out > $(TARGET).gcc.out
-	-./$(MC) $(MCFLAG) -s -DINLINE=inline $(TARGET).c
+	-./$(MC) $(MCFLAG)  -DINLINE=inline $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff $(TARGET).gcc.out $(TARGET).$(MC).out
 
 check-code: mc $(MC)
-	-./$(MC) $(MCFLAG) -s $(TARGET).c
+	-./$(MC) $(MCFLAG)  $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff  $(TARGET).code-out $(TARGET).$(MC).out
 check-code-inline: mc $(MC)
-	-./$(MC) $(MCFLAG) -s -DINLINE=inline $(TARGET).c
+	-./$(MC) $(MCFLAG)  -DINLINE=inline $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff  $(TARGET).code-out $(TARGET).$(MC).out
 check-code-make: mc $(MC)
-	-./$(MC) $(MCFLAG) -s $(TARGET).c
+	-./$(MC) $(MCFLAG)  $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).code-out
 
@@ -197,10 +197,10 @@
 	-$(CC) -DFLIP -c test/basic2.c
 	-$(CC) basic2.o test/basic2.c
 	./a.out
-	-./$(MC) -s test/basic2.c
+	-./$(MC) test/basic2.c
 	-$(CC) test/basic2.s -DFLIP test/basic2.c
 	./a.out
-	-./$(MC) -DFLIP -s test/basic2.c
+	-./$(MC) -DFLIP test/basic2.c
 	-$(CC) test/basic2.s test/basic2.c
 	./a.out
 
@@ -243,37 +243,37 @@
 	$(CC) -g -o $@ $(PRINTF) b00.s b01.s b02.s b03.s b04.s mc-macro.o mc-inline.o $(CONVERTER)
 
 b00.s : mc-parse.c $(MC)
-	./$(MC) $(MCFLAG) -s -ob00.s mc-parse.c
+	./$(MC) $(MCFLAG) -ob00.s mc-parse.c
 b01.s : $(CODE) $(MC)
-	./$(MC) $(MCFLAG) -s -ob01.s $(CODE)
+	./$(MC) $(MCFLAG) -ob01.s $(CODE)
 b02.s : mc-codegen.c $(MC)
-	./$(MC) $(MCFLAG) -s -ob02.s mc-codegen.c
+	./$(MC) $(MCFLAG) -ob02.s mc-codegen.c
 b03.s : mc-tree.c $(MC)
-	./$(MC) $(MCFLAG) -s -ob03.s mc-tree.c
+	./$(MC) $(MCFLAG) -ob03.s mc-tree.c
 b04.s : mc-switch.c $(MC)
-	./$(MC) $(MCFLAG) -s -ob04.s mc-switch.c
+	./$(MC) $(MCFLAG) -ob04.s mc-switch.c
 
 b10.s : mc-parse.c mc1
-	./mc1 $(MCFLAG) -s -ob10.s mc-parse.c
+	./mc1 $(MCFLAG) -ob10.s mc-parse.c
 b11.s : $(CODE) $(PRINTF) mc1
-	./mc1 $(MCFLAG) -s -ob11.s $(CODE)
+	./mc1 $(MCFLAG) -ob11.s $(CODE)
 b12.s : mc-codegen.c mc1
-	./mc1 $(MCFLAG) -s -ob12.s mc-codegen.c
+	./mc1 $(MCFLAG) -ob12.s mc-codegen.c
 b13.s : mc-tree.c mc1
-	./mc1 $(MCFLAG) -s -ob13.s mc-tree.c
+	./mc1 $(MCFLAG) -ob13.s mc-tree.c
 b14.s : mc-switch.c mc1
-	./mc1 $(MCFLAG) -s -ob14.s mc-switch.c
+	./mc1 $(MCFLAG) -ob14.s mc-switch.c
 
 b20.s : mc-parse.c mc2
-	./mc2 $(MCFLAG) -s -ob20.s mc-parse.c
+	./mc2 $(MCFLAG) -ob20.s mc-parse.c
 b21.s : $(CODE) $(PRINTF) mc2
-	./mc2 $(MCFLAG) -s -ob21.s $(CODE)
+	./mc2 $(MCFLAG) -ob21.s $(CODE)
 b22.s : mc-codegen.c mc2
-	./mc2 $(MCFLAG) -s -ob22.s mc-codegen.c
+	./mc2 $(MCFLAG) -ob22.s mc-codegen.c
 b23.s : mc-tree.c mc2
-	./mc2 $(MCFLAG) -s -ob23.s mc-tree.c
+	./mc2 $(MCFLAG) -ob23.s mc-tree.c
 b24.s : mc-switch.c mc1
-	./mc2 $(MCFLAG) -s -ob24.s mc-switch.c
+	./mc2 $(MCFLAG) -ob24.s mc-switch.c
 
 diff :  b00.s b01.s b02.s b03.s b04.s b10.s b11.s b12.s b13.s b14.s
 	-diff b00.s b10.s
--- a/Makefile.i64	Mon Mar 31 18:33:20 2014 +0900
+++ b/Makefile.i64	Mon Mar 31 18:40:27 2014 +0900
@@ -156,16 +156,16 @@
 
 check-nkf: mc
 	( cd nkf203; $(CC) -g -o nkf1 nkf.c utf8tbl.c )
-	( cd nkf203; ../mc-$(ARCH) -s nkf.c utf8tbl.c )
+	( cd nkf203; ../mc-$(ARCH) nkf.c utf8tbl.c )
 	( cd nkf203; $(CC) -g -o nkf nkf.s utf8tbl.s )
 	( cd nkf203; perl test.pl )
 
-#	-./$(MC) -Itest/ -s $(TARGET).c
+#	-./$(MC) -Itest/ $(TARGET).c
 
 check: mc $(MC) $(TARGET).c
 	-$(CC) $(CFLAGS1) $(STDFLAG) $(TARGET).c -o b.out $(MLIB)
 	-./b.out > $(TARGET).gcc.out
-	-./$(MC) $(MCFLAG) -s $(TARGET).c
+	-./$(MC) $(MCFLAG) $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff $(TARGET).gcc.out $(TARGET).$(MC).out
@@ -173,23 +173,23 @@
 check-inline: mc $(MC) $(TARGET).c
 	-$(CC) $(CFLAGS1) $(STDFLAG) $(TARGET).c -o b.out $(MLIB)
 	-./b.out > $(TARGET).gcc.out
-	-./$(MC) $(MCFLAG) -s -DINLINE=inline $(TARGET).c
+	-./$(MC) $(MCFLAG) -DINLINE=inline $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff $(TARGET).gcc.out $(TARGET).$(MC).out
 
 check-code: mc $(MC)
-	-./$(MC) $(MCFLAG) -s $(TARGET).c
+	-./$(MC) $(MCFLAG) $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff  $(TARGET).code-out $(TARGET).$(MC).out
 check-code-inline: mc $(MC)
-	-./$(MC) $(MCFLAG) -s -DINLINE=inline $(TARGET).c
+	-./$(MC) $(MCFLAG) -DINLINE=inline $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff  $(TARGET).code-out $(TARGET).$(MC).out
 check-code-make: mc $(MC)
-	-./$(MC) $(MCFLAG) -s $(TARGET).c
+	-./$(MC) $(MCFLAG) $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).code-out
 
@@ -197,10 +197,10 @@
 	-$(CC) -DFLIP -c test/basic2.c
 	-$(CC) basic2.o test/basic2.c
 	./a.out
-	-./$(MC) -s test/basic2.c
+	-./$(MC) test/basic2.c
 	-$(CC) test/basic2.s -DFLIP test/basic2.c
 	./a.out
-	-./$(MC) -DFLIP -s test/basic2.c
+	-./$(MC) -DFLIP test/basic2.c
 	-$(CC) test/basic2.s test/basic2.c
 	./a.out
 
@@ -243,37 +243,37 @@
 	$(CC) -g -o $@ $(PRINTF) b00.s b01.s b02.s b03.s b04.s mc-macro.o mc-inline.o $(CONVERTER)
 
 b00.s : mc-parse.c $(MC)
-	./$(MC) $(MCFLAG) -s -ob00.s mc-parse.c
+	./$(MC) $(MCFLAG) -ob00.s mc-parse.c
 b01.s : $(CODE) $(MC)
-	./$(MC) $(MCFLAG) -s -ob01.s $(CODE)
+	./$(MC) $(MCFLAG) -ob01.s $(CODE)
 b02.s : mc-codegen.c $(MC)
-	./$(MC) $(MCFLAG) -s -ob02.s mc-codegen.c
+	./$(MC) $(MCFLAG) -ob02.s mc-codegen.c
 b03.s : mc-tree.c $(MC)
-	./$(MC) $(MCFLAG) -s -ob03.s mc-tree.c
+	./$(MC) $(MCFLAG) -ob03.s mc-tree.c
 b04.s : mc-switch.c $(MC)
-	./$(MC) $(MCFLAG) -s -ob04.s mc-switch.c
+	./$(MC) $(MCFLAG) -ob04.s mc-switch.c
 
 b10.s : mc-parse.c mc1
-	./mc1 $(MCFLAG) -s -ob10.s mc-parse.c
+	./mc1 $(MCFLAG) -ob10.s mc-parse.c
 b11.s : $(CODE) $(PRINTF) mc1
-	./mc1 $(MCFLAG) -s -ob11.s $(CODE)
+	./mc1 $(MCFLAG) -ob11.s $(CODE)
 b12.s : mc-codegen.c mc1
-	./mc1 $(MCFLAG) -s -ob12.s mc-codegen.c
+	./mc1 $(MCFLAG) -ob12.s mc-codegen.c
 b13.s : mc-tree.c mc1
-	./mc1 $(MCFLAG) -s -ob13.s mc-tree.c
+	./mc1 $(MCFLAG) -ob13.s mc-tree.c
 b14.s : mc-switch.c mc1
-	./mc1 $(MCFLAG) -s -ob14.s mc-switch.c
+	./mc1 $(MCFLAG) -ob14.s mc-switch.c
 
 b20.s : mc-parse.c mc2
-	./mc2 $(MCFLAG) -s -ob20.s mc-parse.c
+	./mc2 $(MCFLAG) -ob20.s mc-parse.c
 b21.s : $(CODE) $(PRINTF) mc2
-	./mc2 $(MCFLAG) -s -ob21.s $(CODE)
+	./mc2 $(MCFLAG) -ob21.s $(CODE)
 b22.s : mc-codegen.c mc2
-	./mc2 $(MCFLAG) -s -ob22.s mc-codegen.c
+	./mc2 $(MCFLAG) -ob22.s mc-codegen.c
 b23.s : mc-tree.c mc2
-	./mc2 $(MCFLAG) -s -ob23.s mc-tree.c
+	./mc2 $(MCFLAG) -ob23.s mc-tree.c
 b24.s : mc-switch.c mc1
-	./mc2 $(MCFLAG) -s -ob24.s mc-switch.c
+	./mc2 $(MCFLAG) -ob24.s mc-switch.c
 
 diff :  b00.s b01.s b02.s b03.s b04.s b10.s b11.s b12.s b13.s b14.s
 	-diff b00.s b10.s
--- a/Makefile.ia32	Mon Mar 31 18:33:20 2014 +0900
+++ b/Makefile.ia32	Mon Mar 31 18:40:27 2014 +0900
@@ -144,7 +144,7 @@
 
 check-nkf: mc
 	( cd nkf203; $(CC) -g -o nkf1 nkf.c utf8tbl.c )
-	( cd nkf203; ../mc-$(ARCH) -s nkf.c utf8tbl.c )
+	( cd nkf203; ../mc-$(ARCH)  nkf.c utf8tbl.c )
 	( cd nkf203; $(CC) -g -o nkf nkf.s utf8tbl.s )
 	( cd nkf203; perl test.pl )
 
@@ -153,7 +153,7 @@
 check: mc $(MC) $(TARGET).c
 	-$(CC) $(CFLAGS1) $(STDFLAG) $(TARGET).c -o b.out $(MLIB)
 	-./b.out > $(TARGET).gcc.out
-	-./$(MC) -s $(TARGET).c
+	-./$(MC) $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff $(TARGET).gcc.out $(TARGET).$(MC).out
@@ -161,23 +161,23 @@
 check-inline: mc $(MC) $(TARGET).c
 	-$(CC) $(CFLAGS1) $(STDFLAG) $(TARGET).c -o b.out $(MLIB)
 	-./b.out > $(TARGET).gcc.out
-	-./$(MC) -s -DINLINE=inline $(TARGET).c
+	-./$(MC) -DINLINE=inline $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff $(TARGET).gcc.out $(TARGET).$(MC).out
 
 check-code: mc $(MC)
-	-./$(MC) -s $(TARGET).c
+	-./$(MC) $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff  $(TARGET).code-out $(TARGET).$(MC).out
 check-code-inline: mc $(MC)
-	-./$(MC) -s -DINLINE=inline $(TARGET).c
+	-./$(MC) -DINLINE=inline $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).$(MC).out
 	-diff  $(TARGET).code-out $(TARGET).$(MC).out
 check-code-make: mc $(MC)
-	-./$(MC) -s $(TARGET).c
+	-./$(MC) $(TARGET).c
 	-$(CC) $(TARGET).s $(MLIB)
 	-./a.out > $(TARGET).code-out
 
@@ -185,10 +185,10 @@
 	-$(CC) -DFLIP -c test/basic2.c
 	-$(CC) basic2.o test/basic2.c
 	./a.out
-	-./$(MC) -s test/basic2.c
+	-./$(MC) test/basic2.c
 	-$(CC) test/basic2.s -DFLIP test/basic2.c
 	./a.out
-	-./$(MC) -DFLIP -s test/basic2.c
+	-./$(MC) -DFLIP test/basic2.c
 	-$(CC) test/basic2.s test/basic2.c
 	./a.out
 
@@ -232,37 +232,37 @@
 	$(CC) -g -o $@ $(PRINTF) b00.s b01.s b02.s b03.s b04.s mc-macro.o mc-inline.o $(CONVERTER)
 
 b00.s : mc-parse.c $(MC)
-	./$(MC) $(MCFLAGS) -s -ob00.s mc-parse.c
+	./$(MC) $(MCFLAGS) -ob00.s mc-parse.c
 b01.s : $(CODE) $(MC)
-	./$(MC) $(MCFLAGS) -s -ob01.s $(CODE)
+	./$(MC) $(MCFLAGS) -ob01.s $(CODE)
 b02.s : mc-codegen.c $(MC)
-	./$(MC) $(MCFLAGS) -s -ob02.s mc-codegen.c
+	./$(MC) $(MCFLAGS) -ob02.s mc-codegen.c
 b03.s : mc-tree.c $(MC)
-	./$(MC) $(MCFLAGS) -s -ob03.s mc-tree.c
+	./$(MC) $(MCFLAGS) -ob03.s mc-tree.c
 b04.s : mc-switch.c $(MC)
-	./$(MC) $(MCFLAGS) -s -ob04.s mc-switch.c
+	./$(MC) $(MCFLAGS) -ob04.s mc-switch.c
 
 b10.s : mc-parse.c mc1
-	./mc1 $(MCFLAGS) -s -ob10.s mc-parse.c
+	./mc1 $(MCFLAGS) -ob10.s mc-parse.c
 b11.s : $(CODE) $(PRINTF) mc1
-	./mc1 $(MCFLAGS) -s -ob11.s $(CODE)
+	./mc1 $(MCFLAGS) -ob11.s $(CODE)
 b12.s : mc-codegen.c mc1
-	./mc1 $(MCFLAGS) -s -ob12.s mc-codegen.c
+	./mc1 $(MCFLAGS) -ob12.s mc-codegen.c
 b13.s : mc-tree.c mc1
-	./mc1 $(MCFLAGS) -s -ob13.s mc-tree.c
+	./mc1 $(MCFLAGS) -ob13.s mc-tree.c
 b14.s : mc-switch.c mc1
-	./mc1 $(MCFLAGS) -s -ob14.s mc-switch.c
+	./mc1 $(MCFLAGS) -ob14.s mc-switch.c
 
 b20.s : mc-parse.c mc2
-	./mc2 $(MCFLAGS) -s -ob20.s mc-parse.c
+	./mc2 $(MCFLAGS) -ob20.s mc-parse.c
 b21.s : $(CODE) $(PRINTF) mc2
-	./mc2 $(MCFLAGS) -s -ob21.s $(CODE)
+	./mc2 $(MCFLAGS) -ob21.s $(CODE)
 b22.s : mc-codegen.c mc2
-	./mc2 $(MCFLAGS) -s -ob22.s mc-codegen.c
+	./mc2 $(MCFLAGS) -ob22.s mc-codegen.c
 b23.s : mc-tree.c mc2
-	./mc2 $(MCFLAGS) -s -ob23.s mc-tree.c
+	./mc2 $(MCFLAGS) -ob23.s mc-tree.c
 b24.s : mc-switch.c mc1
-	./mc2 $(MCFLAGS) -s -ob24.s mc-switch.c
+	./mc2 $(MCFLAGS) -ob24.s mc-switch.c
 
 diff :  b00.s b01.s b02.s b03.s b04.s b10.s b11.s b12.s b13.s b14.s
 	-diff b00.s b10.s
--- a/mc-code-i64.c	Mon Mar 31 18:33:20 2014 +0900
+++ b/mc-code-i64.c	Mon Mar 31 18:40:27 2014 +0900
@@ -3014,7 +3014,9 @@
 code_opening(char *filename)
 {
     printf("\t.file \"%s\"\n",filename);
+#ifndef __llvm__
     printf("\t.version\t\"01.01\"\n");
+#endif 
     /* printf("gcc2_compiled.:\n"); */
     // printf(".text\n");
 }