From 7a7487bee79c16312270eb30275b095c92324348 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 24 Oct 2015 01:48:55 +0300 Subject: [PATCH] cvt_data: allow fastcall compatible funcs --- tools/cvt_data.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/cvt_data.c b/tools/cvt_data.c index a00c081..692fa10 100644 --- a/tools/cvt_data.c +++ b/tools/cvt_data.c @@ -305,10 +305,17 @@ check_sym: } if (pp_cmp_func(pp, pp_sym)) { - pp_print(fp_sym, sizeof(fp_sym), pp_sym); - anote("var: %s\n", fp_var); - anote("sym: %s\n", fp_sym); - awarn("^ mismatch\n"); + if (pp_sym->argc_stack == 0 && pp_sym->is_fastcall + && pp->argc_stack == 0 + && (pp->is_fastcall || pp->argc_reg == 0) + && pp_sym->argc_reg > pp->argc_reg) + ; /* fascall compatible func doesn't use all args -> ok */ + else { + pp_print(fp_sym, sizeof(fp_sym), pp_sym); + anote("var: %s\n", fp_var); + anote("sym: %s\n", fp_sym); + awarn("^ mismatch\n"); + } } return pp; -- 2.39.2