Mercurial > hg > CbC > old > device

changeset 275:8f09f8bbc494

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MIPS switch statement. basic.c passed.
author kono
date Fri, 21 May 2004 14:00:02 +0900
parents 3ae68af07fce
children ebaec1ae566e
files .gdbinit Changes mc-code-mips.c mc-parse.c test/code-gen.c test/simp1.c
diffstat 6 files changed, 101 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/.gdbinit	Fri May 21 05:29:53 2004 +0900
+++ b/.gdbinit	Fri May 21 14:00:02 2004 +0900
@@ -1,7 +1,7 @@
 tb main
-# run  -s test/basic.c
+run  -s test/basic.c
 # run  -s -ob00.s mc-parse.c
-run -s test/code-gen-all.c
+# run -s test/code-gen-all.c
 define regs 
 printf "pc =%08x lr =%08x r0 =%08x r1 =%08x r3= %08x r4= %08x\n",$pc,$lr,$r0,$r1,$r3,$r4
 printf "r10=%08x r11=%08x r12=%08x r13=%08x r14=%08x r15=%08x\n",$r10,$r11,$r12,$r13,$r14,$r15
--- a/Changes	Fri May 21 05:29:53 2004 +0900
+++ b/Changes	Fri May 21 14:00:02 2004 +0900
@@ -4351,3 +4351,24 @@
 Thu May 20 21:46:17 JST 2004
 
 register_dassop をテストしてなくて、コードも間違ってる。
+
+chptrsave なんだけど、
+     case hoge:
+     macro_replace()
+で、case hoge: が終了すると、getsymの先読みで、macro_replace
+を展開して、そこが lfree ( chptrsave = list2(hoge,chptrsave) )に乗ってしまう。
+docase で、lfree = slfree すると、そのlist2 は破壊されてしまう。
+つまり、slfree=lfree;.... getsym  ...; lfree=slfree は、正しくない。
+なので、list2 じゃなくて、glist2 して、free_glist2 してやるようにする。
+
+でも、そもそも、macro_buffer は、どうなの? その領域は再利用されるのか?
+そうでないと巨大なmacroを書かれたときに気まずい。cheap は、malloc
+してもいいんじゃないかなぁ。
+
+code-gen-all.c と simp1.c は通ったんだけど、basic.c が微妙に
+通らない。なんでかな。diff もね。
+
+Fri May 21 13:09:10 JST 2004
+
+switch なんだけど、long long を通すと落ちるね。
+
--- a/mc-code-mips.c	Fri May 21 05:29:53 2004 +0900
+++ b/mc-code-mips.c	Fri May 21 14:00:02 2004 +0900
@@ -108,8 +108,8 @@
 int MAX_CODE_INPUT_FREGISTER_VAR = 14-MIN_TMP_FREG;
 
 #define LREG_V 3    /* for virtual long long/double register */
-static int mips_regs[REAL_MAX_REGISTER+REAL_MAX_FREGISTER+
-   REAL_MAX_LREGISTER+LREG_V];
+#define REGS_MAX (REAL_MAX_REGISTER+REAL_MAX_FREGISTER+REAL_MAX_LREGISTER+LREG_V)
+static int mips_regs[REGS_MAX];
 static int regv_h0[REAL_MAX_LREGISTER+LREG_V];
 static int regv_l0[REAL_MAX_LREGISTER+LREG_V];
 #define regv_h(i)  regv_h0[(i)-LREG_OFFSET]
@@ -175,7 +175,7 @@
 char *ll(i) { return lregister_name_low(i); }
 char *lh(i) { return lregister_name_high(i); }
 
-#define is_int_reg(i)  (0<=i&&i<REAL_MAX_REGISTER)
+#define is_int_reg(i)  (0<i&&i<REAL_MAX_REGISTER)
 #define is_float_reg(i)  (REAL_MAX_REGISTER<=i&&i<REAL_MAX_FREGISTER+REAL_MAX_REGISTER)
 #define is_longlong_reg(i)  (LREG_OFFSET<=i&&i<LREG_OFFSET+REAL_MAX_LREGISTER+LREG_V)
 #define is_double_reg(i)  is_longlong_reg(i)
@@ -335,7 +335,7 @@
 #define CODE_CALLER_ARG(l) ((l)+arg_offset1)
 #define FUNC_LVAR(l) (l+disp_offset)
 #define CALLER_ARG(l) ((l)+arg_offset1)
-#define CALLEE_ARG(l) ((l)+arg_offset)
+#define CALLEE_ARG(l) ((l)+arg_offset1)
 
 static void
 code_offset_set(int *lvar_offsetv_p,int *r1_offsetv_p)
@@ -1119,7 +1119,7 @@
     if (sign) {
         return sz==1?"lb":sz==SIZE_OF_SHORT?"lh":"lw"; 
     } else {
-        return sz==1?"lbu":sz==SIZE_OF_SHORT?"lhu":"lhu"; 
+        return sz==1?"lbu":sz==SIZE_OF_SHORT?"lhu":"lw"; 
     }
 }
 
@@ -1710,7 +1710,7 @@
 use_reg(int arg)
 {
 // printf("# use reg %d\n",arg);
-    if (arg<0||arg> REAL_MAX_REGISTER+REAL_MAX_FREGISTER+ REAL_MAX_LREGISTER)
+    if (arg<0||arg> REGS_MAX)
 	error(-1);
     clear_ptr_cache_reg(arg);
     regs[arg]=USING_REG;
@@ -1891,10 +1891,10 @@
     int t=caddr(e3);
     int e4 = car(e3);
     reg_arg_list = list2(arg,reg_arg_list);
-    g_expr_u(assign_expr0(arg,e4,t,t));
     if (car(arg)==REGISTER||car(arg)==DREGISTER||
 	car(arg)==FREGISTER||car(arg)==LREGISTER)
 	use_input_reg(cadr(arg),1);
+    g_expr_u(assign_expr0(arg,e4,t,t));
     car(e3) = arg;
     return reg_arg_list;
 }
@@ -1909,7 +1909,7 @@
 	nargs ++ ; reg_arg++;
 	nargs ++ ; reg_arg++;
     } else if (t==FLOAT) {
-	nargs ++ ; reg_arg ++ ; freg_arg++;
+	reg_arg ++ ; freg_arg++;
 	nargs += size(t)/SIZE_OF_INT;
     } else if (t>=0&&(car(t)==STRUCT||car(t)==UNION)) {
 	nargs += round4(size(t))/SIZE_OF_INT;
@@ -2143,7 +2143,8 @@
         printf("\tjal\t%s\n",fn->nm);
     } else {
         jrn = register_name(cadr(jmp));
-        printf("\tj %s\n",jrn);
+        printf("\tmove $25,%s\n",jrn);
+        printf("\tjal\t$31,$25\n");
     }
     for(;reg_arg_list;reg_arg_list=cadr(reg_arg_list)) {
 	arg = car(reg_arg_list);
@@ -2587,6 +2588,10 @@
     return creg;
 }
 
+#define CMP_IMM (-2)
+static char * cmpreg_1;
+static char * cmpreg_2;
+
 void
 code_cmpdimm(int e, int csreg)
 {
@@ -2594,10 +2599,12 @@
     int reg;
     char *rn;
     if(chk) return;
+    use_reg(csreg);
     rn = register_name(reg = get_register());
     printf("\tli %s,%d\n",rn,e);
-    printf("\tsltu %s,%s,%s\n",rn,register_name(csreg),rn);
-    cmpreg=csreg;
+    cmpreg_1 = rn;
+    cmpreg_2 = register_name(csreg);
+    cmpreg=CMP_IMM;
     free_register(reg);
 }
 
@@ -2658,9 +2665,11 @@
 jcond(int l, char cond)
 {       
     if (chk) return;
-    if (cmpreg==CMP_C1T) 
+    if (cmpreg==CMP_C1T)  {
       printf("\tbc1%s $L_%d\n",cond?"f":"t",l);
-    else
+    } else if (cmpreg==CMP_IMM)  {
+      printf("\tb%s %s,%s,$L_%d\n",cond?"ne":"eq",cmpreg_1,cmpreg_2,l);
+    } else
       printf("\tb%s %s,$0,$L_%d\n",cond?"ne":"eq",register_name(cmpreg),l);
 }
 
@@ -4473,7 +4482,8 @@
 	printf("\tmove    %s,%s\n",crn_l,drn_l);
 	break;
     case LDIV:
-	code_ldiv_lib(reg,oreg); // ___divdi3$stub
+	code_ldiv_lib(reg,oreg)
+;  // ___divdi3$stub
 	check_lreg(reg);
 	break;
     case LUDIV:
--- a/mc-parse.c	Fri May 21 05:29:53 2004 +0900
+++ b/mc-parse.c	Fri May 21 14:00:02 2004 +0900
@@ -167,7 +167,12 @@
 	init_free_lvar_list();
 	mode=TOP;
 	lfree= HEAPSIZE;
-	chptrsave = chsave = 0;
+	while (chptrsave!=0) {
+	    i = cadr(chptrsave); free_glist2(chptrsave); chptrsave = i;
+	}
+	while (chsave!=0) {
+	    i = cadr(chsave); free_glist2(chsave); chsave = i;
+	}
 	while(getsym(0)==SM) conv->sm_();
 	mode=GDECL;
 	stmode=0;
@@ -3677,8 +3682,8 @@
 	mode = i;
 	return;
     }
-    chptrsave = list2((int)chptr,chptrsave);
-    chsave = list2(chptr[-1],chsave);
+    chptrsave = glist2((int)chptr,chptrsave);
+    chsave = glist2(chptr[-1],chsave);
     chptr = macro_buf;
     ch = *chptr++;
     mode = i;
@@ -4124,13 +4129,18 @@
 static int
 getch(void)
 {
+    int i,j;
     if(*chptr) 
 	return ch = *chptr++;
     else if (chptrsave) {
 	chptr = (char *)car(chptrsave);
 	ch = car(chsave);
-	chptrsave = cadr(chptrsave);
-	chsave = cadr(chsave);
+	i = cadr(chptrsave);
+	j = cadr(chsave);
+        free_glist2(chptrsave);
+        free_glist2(chsave);
+	chptrsave = i;
+	chsave = j;
 	return ch;
     }
     getline();
--- a/test/code-gen.c	Fri May 21 05:29:53 2004 +0900
+++ b/test/code-gen.c	Fri May 21 14:00:02 2004 +0900
@@ -2415,8 +2415,46 @@
 	printf("code_lneq 0\n");
 }
 
+#if 0
+void
+code_lswitch()
+{
+    long long i;
+    for(i=0;i<6;i++) {
+	switch(i) {
+	case 1: printf("code_lswitch 1 %d\n",i); break;
+	case 2: printf("code_lswitch 2 %d\n",i); break;
+	case 3: printf("code_lswitch 3 %d\n",i);
+	case 4: printf("code_lswitch 4 %d\n",i); break;
+	default: printf("code_lswitch d %d\n",i);
+	}
+    }
+}
+#endif
 
 
 #endif
+
+void
+code_switch()
+{
+    int i;
+    for(i=0;i<10;i++) {
+	switch(i) {
+	case 1: printf("code_switch 1 %d\n",i); break;
+	case 2: printf("code_switch 2 %d\n",i); break;
+	case 3: printf("code_switch 3 %d\n",i);
+	case 4: printf("code_switch 4 %d\n",i); break;
+        case 7:
+	case 5: printf("code_switch 5 %d\n",i); break;
+	case 6: printf("code_switch 6 %d\n",i); break;
+	default: printf("code_switch d %d\n",i);
+	}
+    }
+}
+
+
+
+
 /* end */
 
--- a/test/simp1.c	Fri May 21 05:29:53 2004 +0900
+++ b/test/simp1.c	Fri May 21 14:00:02 2004 +0900
@@ -1,6 +1,7 @@
 int
 i(int a,int b,int c,int d,int f)
 {
+	printf("i(%d,%d,%d,%d,%d)\n",a,b,c,d,f);
 	return a+b+c+d+f;
 }