Changeset 331 for EcnlProtoTool/trunk/tcc-0.9.27/c67-gen.c

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

Location:

EcnlProtoTool/trunk/tcc-0.9.27

Files:

• . (moved) (moved from EcnlProtoTool/trunk/tcc-0.9.26 )
• c67-gen.c (modified) (21 diffs)

EcnlProtoTool/trunk/tcc-0.9.27/c67-gen.c

@@ -21 +21 @@
 #ifdef TARGET_DEFS_ONLY
 
-//#define ASSEMBLY_LISTING_C67
+/* #define ASSEMBLY_LISTING_C67 */
 
 /* number of available registers */
@@ -94 +94 @@
 
 /* defined if function parameters must be evaluated in reverse order */
-//#define INVERT_FUNC_PARAMS
+/* #define INVERT_FUNC_PARAMS */
 
 /* defined if structures are passed as pointers. Otherwise structures
    are directly pushed on stack. */
-//#define FUNC_STRUCT_PARAM_AS_PTR
+/* #define FUNC_STRUCT_PARAM_AS_PTR */
 
 /* pointer size, in bytes */
@@ -108 +108 @@
 /* maximum alignment (for aligned attribute support) */
 #define MAX_ALIGN     8
-
-/******************************************************/
-/* ELF defines */
-
-#define EM_TCC_TARGET EM_C60
-
-/* relocation type for 32 bit data relocation */
-#define R_DATA_32   R_C60_32
-#define R_DATA_PTR  R_C60_32
-#define R_JMP_SLOT  R_C60_JMP_SLOT
-#define R_COPY      R_C60_COPY
-
-#define ELF_START_ADDR 0x00000400
-#define ELF_PAGE_SIZE  0x1000
 
 /******************************************************/
@@ -197 +183 @@
 {
     int ind1;
-
+    if (nocode_wanted)
+        return;
 #ifdef ASSEMBLY_LISTING_C67
     fprintf(f, " %08X", c);
@@ -246 +233 @@
 
 // these are regs that tcc doesn't really know about, 
-// but asign them unique values so the mapping routines
-// can distinquish them
+// but assign them unique values so the mapping routines
+// can distinguish them
 
 #define C67_A0 105
@@ -254 +241 @@
 #define C67_FP 108
 #define C67_B2 109
-#define C67_CREG_ZERO -1        // Special code for no condition reg test
+#define C67_CREG_ZERO -1        /* Special code for no condition reg test */
 
 
@@ -1568 +1555 @@
     fr = sv->r;
     ft = sv->type.t;
-    fc = sv->c.ul;
+    fc = sv->c.i;
 
     v = fr & VT_VALMASK;
@@ -1575 +1562 @@
             v1.type.t = VT_INT;
             v1.r = VT_LOCAL | VT_LVAL;
-            v1.c.ul = fc;
+            v1.c.i = fc;
             load(r, &v1);
             fr = r;
@@ -1727 +1714 @@
 
     ft = v->type.t;
-    fc = v->c.ul;
+    fc = v->c.i;
     fr = v->r & VT_VALMASK;
     bt = ft & VT_BTYPE;
@@ -1880 +1867 @@
 }
 
+/* Return the number of registers needed to return the struct, or 0 if
+   returning via struct pointer. */
+ST_FUNC int gfunc_sret(CType *vt, int variadic, CType *ret, int *ret_align, int *regsize) {
+    *ret_align = 1; // Never have to re-align return values for x86-64
+    return 0;
+}
+
 /* generate function call with address in (vtop->t, vtop->c) and free function
    context. Stack entry is popped */
@@ -1894 +1888 @@
     for (i = 0; i < nb_args; i++) {
         if ((vtop->type.t & VT_BTYPE) == VT_STRUCT) {
-            ALWAYS_ASSERT(FALSE);
-        } else if ((vtop->type.t & VT_BTYPE) == VT_STRUCT) {
             ALWAYS_ASSERT(FALSE);
         } else {
@@ -1960 +1952 @@
 
     sym = func_type->ref;
-    func_call = sym->r;
+    func_call = sym->f.func_call;
     addr = 8;
     /* if the function returns a structure, then add an
        implicit pointer parameter */
     func_vt = sym->type;
+    func_var = (sym->f.func_type == FUNC_ELLIPSIS);
     if ((func_vt.t & VT_BTYPE) == VT_STRUCT) {
         func_vc = addr;
@@ -2047 +2040 @@
 {
     int ind1 = ind;
+    if (nocode_wanted)
+        return t;
 
     C67_MVKL(C67_A0, t);        //r=reg to load,  constant
@@ -2079 +2074 @@
 
     v = vtop->r & VT_VALMASK;
-    if (v == VT_CMP) {
+    if (nocode_wanted) {
+        ;
+    } else if (v == VT_CMP) {
         /* fast case : can jump directly since flags are set */
         // C67 uses B2 sort of as flags register
@@ -2101 +2098 @@
         if ((v & 1) == inv) {
             /* insert vtop->c jump list in t */
-            p = &vtop->c.i;
 
             // I guess the idea is to traverse to the
@@ -2107 +2103 @@
             // there
 
-            n = *p;
+            n = vtop->c.i;
             while (n != 0) {
                 p = (int *) (cur_text_section->data + n);
@@ -2122 +2118 @@
             t = gjmp(t);
             gsym(vtop->c.i);
-        }
-    } else {
-        if (is_float(vtop->type.t)) {
-            vpushi(0);
-            gen_op(TOK_NE);
-        }
-        if ((vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST) {
-            /* constant jmp optimization */
-            if ((vtop->c.i != 0) != inv)
-                t = gjmp(t);
-        } else {
-            // I think we need to get the value on the stack
-            // into a register, test it, and generate a branch
-            // return the address of the branch, so it can be
-            // later patched
-
-            v = gv(RC_INT);     // get value into a reg 
-            ind1 = ind;
-            C67_MVKL(C67_A0, t);        //r=reg to load, constant
-            C67_MVKH(C67_A0, t);        //r=reg to load, constant
-
-            if (v != TREG_EAX &&        // check if not already in a conditional test reg
-                v != TREG_EDX && v != TREG_ST0 && v != C67_B2) {
-                C67_MV(v, C67_B2);
-                v = C67_B2;
-            }
-
-            C67_IREG_B_REG(inv, v, C67_A0);     // [!R] B.S2x  A0
-            C67_NOP(5);
-            t = ind1;           //return where we need to patch
-            ind1 = ind;
         }
     }
@@ -2261 +2226 @@
         fr = vtop[0].r;
         vtop--;
-        C67_MPYI(fr, r);        // 32 bit bultiply  fr,r,fr
+        C67_MPYI(fr, r);        // 32 bit multiply  fr,r,fr
         C67_NOP(8);             // NOP 8 for worst case
         break;
@@ -2318 +2283 @@
 
 /* generate a floating point operation 'v = t1 op t2' instruction. The
-   two operands are guaranted to have the same floating point type */
+   two operands are guaranteed to have the same floating point type */
 /* XXX: need to use ST1 too */
 void gen_opf(int op)
@@ -2330 +2295 @@
 
     ft = vtop->type.t;
-    fc = vtop->c.ul;
+    fc = vtop->c.i;
     r = vtop->r;
     fr = vtop[-1].r;
@@ -2555 +2520 @@
 }
 
+/* Save the stack pointer onto the stack and return the location of its address */
+ST_FUNC void gen_vla_sp_save(int addr) {
+    tcc_error("variable length arrays unsupported for this target");
+}
+
+/* Restore the SP from a location on the stack */
+ST_FUNC void gen_vla_sp_restore(int addr) {
+    tcc_error("variable length arrays unsupported for this target");
+}
+
+/* Subtract from the stack pointer, and push the resulting value onto the stack */
+ST_FUNC void gen_vla_alloc(CType *type, int align) {
+    tcc_error("variable length arrays unsupported for this target");
+}
+
 /* end of C67 code generator */
 /*************************************************************/