add more msvcrt funcs

[ia32rtools.git] / tools / mkbridge.c

diff --git a/tools/mkbridge.c b/tools/mkbridge.c
index 4fb10a9..2066f02 100644 (file)
--- a/tools/mkbridge.c
+++ b/tools/mkbridge.c
@@ -41,10 +41,13 @@ static void out_toasm_x86(FILE *f, const char *sym_in,
                        must_save |= is_x86_reg_saved(pp->arg[i].reg);
        }
 
-       fprintf(f, ".global _%s\n", sym_in);
-       fprintf(f, "_%s:\n", sym_in);
+       fprintf(f, ".global %s%s\n", pp->is_fastcall ? "@" : "_", sym_in);
+       fprintf(f, "%s%s:\n", pp->is_fastcall ? "@" : "_", sym_in);
 
-       if (pp->argc_reg == 0) {
+       if (pp->argc_reg == 0 || pp->is_fastcall) {
+               fprintf(f, "\t# %s\n",
+                 pp->is_fastcall ? "__fastcall" :
+                 (pp->is_stdcall ? "__stdcall" : "__cdecl"));
                fprintf(f, "\tjmp %s\n\n", sym_out);
                return;
        }
@@ -108,8 +111,10 @@ static void out_fromasm_x86(FILE *f, const char *sym,
        const struct parsed_proto *pp)
 {
        int sarg_ofs = 1; // stack offset to args, in DWORDs
+       int saved_regs = 0;
        int argc_repush;
        int stack_args;
+       int ret64;
        int i;
 
        argc_repush = pp->argc;
@@ -119,35 +124,49 @@ static void out_fromasm_x86(FILE *f, const char *sym,
                stack_args = argc_repush - pp->argc_reg;
        }
 
-       fprintf(f, "# %s\n", pp->is_stdcall ? "__stdcall" : "__cdecl");
-       fprintf(f, ".global %s\n", sym);
+       ret64 = strstr(pp->ret_type.name, "int64") != NULL;
+
+       fprintf(f, "# %s",
+         pp->is_fastcall ? "__fastcall" :
+         (pp->is_stdcall ? "__stdcall" : "__cdecl"));
+       if (ret64)
+                fprintf(f, " ret64");
+       fprintf(f, "\n.global %s\n", sym);
        fprintf(f, "%s:\n", sym);
 
-       if (pp->argc_reg == 0) {
-               //fprintf(f, "\tjmp _%s\n\n", sym);
-               fprintf(f, "\tjmp _%s", sym);
+       if (pp->argc_reg == 0 || pp->is_fastcall) {
+               fprintf(f, "\tjmp %s%s",
+                       pp->is_fastcall ? "@" : "_", sym);
                if (pp->is_stdcall && pp->argc > 0)
                        fprintf(f, "@%d", pp->argc * 4);
                fprintf(f, "\n\n");
                return;
        }
 
-       // scratch reg, must not be eax or edx (for ret edx:eax)
-       fprintf(f, "\tpushl %%ebx\n");
+       // at least sc sub_47B150 needs edx to be preserved
+       // int64 returns use edx:eax - no edx save
+       // we use ecx also as scratch
+       fprintf(f, "\tpushl %%ecx\n");
+       saved_regs++;
        sarg_ofs++;
+       if (!ret64) {
+               fprintf(f, "\tpushl %%edx\n");
+               saved_regs++;
+               sarg_ofs++;
+       }
 
        // construct arg stack
        for (i = argc_repush - 1; i >= 0; i--) {
                if (pp->arg[i].reg == NULL) {
-                       fprintf(f, "\tmovl %d(%%esp), %%ebx\n",
+                       fprintf(f, "\tmovl %d(%%esp), %%ecx\n",
                                (sarg_ofs + stack_args - 1) * 4);
-                       fprintf(f, "\tpushl %%ebx\n");
+                       fprintf(f, "\tpushl %%ecx\n");
                        stack_args--;
                }
                else {
-                       if (IS(pp->arg[i].reg, "ebx"))
-                               // must reload original ebx
-                               fprintf(f, "\tmovl %d(%%esp), %%ebx\n",
+                       if (IS(pp->arg[i].reg, "ecx"))
+                               // must reload original ecx
+                               fprintf(f, "\tmovl %d(%%esp), %%ecx\n",
                                        (sarg_ofs - 2) * 4);
 
                        fprintf(f, "\tpushl %%%s\n", pp->arg[i].reg);
@@ -158,10 +177,13 @@ static void out_fromasm_x86(FILE *f, const char *sym,
        // no worries about calling conventions - always __cdecl
        fprintf(f, "\n\tcall _%s\n\n", sym);
 
-       if (sarg_ofs > 2)
-               fprintf(f, "\tadd $%d,%%esp\n", (sarg_ofs - 2) * 4);
+       if (sarg_ofs > saved_regs + 1)
+               fprintf(f, "\tadd $%d,%%esp\n",
+                       (sarg_ofs - (saved_regs + 1)) * 4);
 
-       fprintf(f, "\tpopl %%ebx\n");
+       if (!ret64)
+               fprintf(f, "\tpopl %%edx\n");
+       fprintf(f, "\tpopl %%ecx\n");
 
        if (pp->is_stdcall && pp->argc_stack)
                fprintf(f, "\tret $%d\n\n", pp->argc_stack * 4);
@@ -213,7 +235,7 @@ int main(int argc, char *argv[])
                if (p != NULL)
                        *p = 0;
 
-               pp = proto_parse(fhdr, sym_noat);
+               pp = proto_parse(fhdr, sym_noat, 0);
                if (pp == NULL)
                        goto out;
 
@@ -228,7 +250,7 @@ int main(int argc, char *argv[])
                if (sym[0] == 0 || sym[0] == ';' || sym[0] == '#')
                        continue;
 
-               pp = proto_parse(fhdr, sym);
+               pp = proto_parse(fhdr, sym, 0);
                if (pp == NULL)
                        goto out;