[PATCH 0/3] MR1230: winebuild: Cleanup in preparation for dlltool replacement.
From: Rémi Bernon <rbernon(a)codeweavers.com> And rename it to get_abi_name. --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 4 ++-- tools/winebuild/spec16.c | 2 +- tools/winebuild/spec32.c | 10 +++++----- tools/winebuild/utils.c | 24 ++++++++++++------------ 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 9918c2341f4..79a22315b0d 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -273,7 +273,7 @@ extern DLLSPEC *alloc_dll_spec(void); extern void free_dll_spec( DLLSPEC *spec ); extern char *make_c_identifier( const char *str ); extern const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ); -extern const char *get_link_name( const ORDDEF *odp ); +extern const char *get_abi_name( const ORDDEF *odp, const char *name ); extern int sort_func_list( ORDDEF **list, int count, int (*compare)(const void *, const void *) ); extern unsigned int get_alignment(unsigned int align); extern unsigned int get_page_size(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b1c14db9cab..3f3775dc3bd 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -627,7 +627,7 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue; if (odp->flags & FLAG_FORWARD) continue; if (odp->flags & FLAG_SYSCALL) continue; - output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( odp ))); + output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_abi_name( odp, odp->link_name ))); } for (j = 0; j < extra_ld_symbols.count; j++) output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name(extra_ld_symbols.str[j]) ); @@ -1393,7 +1393,7 @@ void output_syscalls( DLLSPEC *spec ) for (i = 0; i < count; i++) { ORDDEF *odp = syscalls[i]; - const char *name = get_link_name(odp); + const char *name = get_abi_name(odp, odp->link_name); unsigned int id = (spec->syscall_table << 12) + i; output( "\t.align %d\n", get_alignment(16) ); diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 8d4f96ea323..ea5fb44986c 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -738,7 +738,7 @@ static void output_module16( DLLSPEC *spec ) output( ".L__wine_%s_%u:\n", spec->c_name, i ); output( "\tpushw %%bp\n" ); output( "\tpushl $%s\n", - asm_name( odp->type == TYPE_STUB ? get_stub_name( odp, spec ) : get_link_name( odp ))); + asm_name( odp->type == TYPE_STUB ? get_stub_name( odp, spec ) : get_abi_name( odp, odp->link_name ))); output( "\tcallw .L__wine_spec_callfrom16_%s\n", get_callfrom16_name( odp ) ); } output( ".L__wine_spec_code_segment_end:\n" ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index c09e58084cc..c445a2440d2 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -470,7 +470,7 @@ void output_exports( DLLSPEC *spec ) } else { - output( "\t%s %s\n", func_ptr, asm_name( get_link_name( odp ))); + output( "\t%s %s\n", func_ptr, asm_name( get_abi_name( odp, odp->link_name ))); } break; case TYPE_STUB: @@ -592,14 +592,14 @@ void output_exports( DLLSPEC *spec ) if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tjmp *__imp_%s-1b(%%eax)\n", asm_name( get_link_name( odp ))); + output( "1:\tjmp *__imp_%s-1b(%%eax)\n", asm_name( get_abi_name( odp, odp->link_name ))); needs_get_pc_thunk = 1; } - else output( "\tjmp *__imp_%s\n", asm_name( get_link_name( odp ))); + else output( "\tjmp *__imp_%s\n", asm_name( get_abi_name( odp, odp->link_name ))); break; case CPU_x86_64: output( "\t.byte 0x48,0x8d,0xa4,0x24,0x00,0x00,0x00,0x00\n" ); /* hotpatch prolog */ - output( "\tjmp *__imp_%s(%%rip)\n", asm_name( get_link_name( odp ))); + output( "\tjmp *__imp_%s(%%rip)\n", asm_name( get_abi_name( odp, odp->link_name ))); break; default: assert(0); @@ -1325,7 +1325,7 @@ void output_def_file( DLLSPEC *spec, int import_only ) if (odp->flags & FLAG_FORWARD) output( "=%s", odp->link_name ); else if (strcmp(name, odp->link_name)) /* try to reduce output */ - output( "=%s", get_link_name( odp )); + output( "=%s", get_abi_name( odp, odp->link_name )); break; } case TYPE_STUB: diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 4f1bdf7cd2d..eb75aaed50b 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -728,28 +728,28 @@ const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ) } /* return the stdcall-decorated name for an entry point */ -const char *get_link_name( const ORDDEF *odp ) +const char *get_abi_name( const ORDDEF *odp, const char *name ) { static char *buffer; char *ret; - if (target.cpu != CPU_i386) return odp->link_name; + if (target.cpu != CPU_i386) return name; switch (odp->type) { case TYPE_STDCALL: if (is_pe()) { - if (odp->flags & FLAG_THISCALL) return odp->link_name; - if (odp->flags & FLAG_FASTCALL) ret = strmake( "@%s@%u", odp->link_name, get_args_size( odp )); - else if (!kill_at) ret = strmake( "%s@%u", odp->link_name, get_args_size( odp )); - else return odp->link_name; + if (odp->flags & FLAG_THISCALL) return name; + if (odp->flags & FLAG_FASTCALL) ret = strmake( "@%s@%u", name, get_args_size( odp )); + else if (!kill_at) ret = strmake( "%s@%u", name, get_args_size( odp )); + else return name; } else { - if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", odp->link_name ); - else if (odp->flags & FLAG_FASTCALL) ret = strmake( "__fastcall_%s", odp->link_name ); - else return odp->link_name; + if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", name ); + else if (odp->flags & FLAG_FASTCALL) ret = strmake( "__fastcall_%s", name ); + else return name; } break; @@ -758,13 +758,13 @@ const char *get_link_name( const ORDDEF *odp ) { int args = get_args_size( odp ); if (odp->flags & FLAG_REGISTER) args += get_ptr_size(); /* context argument */ - ret = strmake( "%s@%u", odp->link_name, args ); + ret = strmake( "%s@%u", name, args ); } - else return odp->link_name; + else return name; break; default: - return odp->link_name; + return name; } free( buffer ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1230
From: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/winebuild/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index eb75aaed50b..f5928965c36 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1016,8 +1016,7 @@ const char *asm_globl( const char *func ) break; case PLATFORM_MINGW: case PLATFORM_WINDOWS: - buffer = strmake( "\t.globl %s%s\n%s%s:", target.cpu == CPU_i386 ? "_" : "", func, - target.cpu == CPU_i386 ? "_" : "", func ); + buffer = strmake( "\t.globl %s\n%s:", asm_name( func ), asm_name( func ) ); break; default: buffer = strmake( "\t.globl %s\n\t.hidden %s\n%s:", func, func, func ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1230
From: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/winebuild/build.h | 3 ++- tools/winebuild/import.c | 24 ++++++++++-------------- tools/winebuild/main.c | 4 ++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 79a22315b0d..86115e05d25 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -305,7 +305,8 @@ extern void output_module( DLLSPEC *spec ); extern void output_stubs( DLLSPEC *spec ); extern void output_syscalls( DLLSPEC *spec ); extern void output_imports( DLLSPEC *spec ); -extern void output_static_lib( DLLSPEC *spec, struct strarray files ); +extern void output_import_lib( DLLSPEC *spec, struct strarray files ); +extern void output_static_lib( const char *output_name, struct strarray files, int create ); extern void output_exports( DLLSPEC *spec ); extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 3f3775dc3bd..8dc278b4eaa 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1552,7 +1552,7 @@ static void assemble_files( const char *prefix ) } /* build a library from the current asm files and any additional object files in argv */ -static void build_library( const char *output_name, struct strarray files, int create ) +void output_static_lib( const char *output_name, struct strarray files, int create ) { struct strarray args; @@ -1582,7 +1582,7 @@ static void build_library( const char *output_name, struct strarray files, int c } /* create a Windows-style import library */ -static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec ) +static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) { struct strarray args; char *def_file; @@ -1623,10 +1623,12 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec ) } spawn( args ); + + if (files.count) output_static_lib( output_file_name, files, 0 ); } /* create a Unix-style import library */ -static void build_unix_import_lib( DLLSPEC *spec ) +static void build_unix_import_lib( DLLSPEC *spec, struct strarray files ) { int i, total; const char *name, *prefix; @@ -1679,19 +1681,13 @@ static void build_unix_import_lib( DLLSPEC *spec ) assemble_files( spec->file_name ); free( dll_name ); + + output_static_lib( output_file_name, files, 1 ); } /* output an import library for a Win32 module and additional object files */ -void output_static_lib( DLLSPEC *spec, struct strarray files ) +void output_import_lib( DLLSPEC *spec, struct strarray files ) { - if (is_pe()) - { - if (spec) build_windows_import_lib( output_file_name, spec ); - if (files.count || !spec) build_library( output_file_name, files, !spec ); - } - else - { - if (spec) build_unix_import_lib( spec ); - build_library( output_file_name, files, 1 ); - } + if (!is_pe()) build_unix_import_lib( spec, files ); + else build_windows_import_lib( output_file_name, spec, files ); } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index cfccee6cf8b..cbe1e4669c1 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -669,10 +669,10 @@ int main(int argc, char **argv) case MODE_IMPLIB: if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; - output_static_lib( spec, files ); + output_import_lib( spec, files ); break; case MODE_STATICLIB: - output_static_lib( NULL, files ); + output_static_lib( output_file_name, files, 1 ); break; case MODE_BUILTIN: if (!files.count) fatal_error( "missing file argument for --builtin option\n" ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1230
Alexandre Julliard (@julliard) commented about tools/winebuild/utils.c:
}
/* return the stdcall-decorated name for an entry point */ -const char *get_link_name( const ORDDEF *odp ) +const char *get_abi_name( const ORDDEF *odp, const char *name ) That's fine, but I don't see a reason not to keep get_link_name() as well as a thin wrapper, instead of changing all callers.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1230#note_12808
participants (2)
-
Alexandre Julliard (＠julliard) -
Rémi Bernon