system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 19:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

winebuild: Remove unnecessary .cfi_startproc/endproc annotations.

Browse source
This commit is contained in:
Alexandre Julliard 2023-09-19 12:06:59 +02:00
parent 6828fc8b3a
commit e3aa775a63
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/winebuild/import.c
View file

@ -756,10 +756,8 @@ void output_get_pc_thunk(void)
output( "\t.align %d\n", get_alignment(4) );
output( "\t%s\n", func_declaration("__wine_spec_get_pc_thunk_eax") );
output( "%s:\n", asm_name("__wine_spec_get_pc_thunk_eax") );
output_cfi( ".cfi_startproc" );
output( "\tmovl (%%esp),%%eax\n" );
output( "\tret\n" );
output_cfi( ".cfi_endproc" );
output_function_size( "__wine_spec_get_pc_thunk_eax" );
}
@ -769,7 +767,6 @@ static void output_import_thunk( const char *name, const char *table, int pos )
output( "\n\t.align %d\n", get_alignment(4) );
output( "\t%s\n", func_declaration(name) );
output( "%s\n", asm_globl(name) );
output_cfi( ".cfi_startproc" );
switch (target.cpu)
{
@ -811,7 +808,6 @@ static void output_import_thunk( const char *name, const char *table, int pos )
output( "\tbr x16\n" );
break;
}
output_cfi( ".cfi_endproc" );
output_function_size( name );
}
@ -1144,7 +1140,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec )
if (thumb_mode) output( "\t.thumb_func\n" );
output( "__wine_delay_imp_%s_%s:\n", import->c_name, name );
output_cfi( ".cfi_startproc" );
switch (target.cpu)
{
case CPU_i386:
@ -1183,7 +1178,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec )
output( "\tb %s\n", asm_name(module_func) );
break;
}
output_cfi( ".cfi_endproc" );
iat_pos += get_ptr_size();
}
pos += 8 * 4; /* IMAGE_DELAYLOAD_DESCRIPTOR is 8 DWORDs */
@ -1267,11 +1261,11 @@ void output_stubs( DLLSPEC *spec )
output( "\t.align %d\n", get_alignment(4) );
output( "\t%s\n", func_declaration(name) );
output( "%s:\n", asm_name(name) );
output_cfi( ".cfi_startproc" );
switch (target.cpu)
{
case CPU_i386:
output_cfi( ".cfi_startproc" );
/* flesh out the stub a bit to make safedisc happy */
output(" \tnop\n" );
output(" \tnop\n" );
@ -1309,8 +1303,10 @@ void output_stubs( DLLSPEC *spec )
output( "\tmovl $.L__wine_spec_file_name,(%%esp)\n" );
}
output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") );
output_cfi( ".cfi_endproc" );
break;
case CPU_x86_64:
output_cfi( ".cfi_startproc" );
output( "\tsubq $0x28,%%rsp\n" );
output_cfi( ".cfi_adjust_cfa_offset 8" );
output( "\tleaq .L__wine_spec_file_name(%%rip),%%rcx\n" );
@ -1319,6 +1315,7 @@ void output_stubs( DLLSPEC *spec )
else
output( "\tmovq $%d,%%rdx\n", odp->ordinal );
output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") );
output_cfi( ".cfi_endproc" );
break;
case CPU_ARM:
if (UsePIC)
@ -1362,7 +1359,6 @@ void output_stubs( DLLSPEC *spec )
default:
assert(0);
}
output_cfi( ".cfi_endproc" );
output_function_size( name );
}
@ -1421,7 +1417,6 @@ void output_syscalls( DLLSPEC *spec )
output( "\t.align %d\n", get_alignment(16) );
output( "\t%s\n", func_declaration(name) );
output( "%s\n", asm_globl(name) );
output_cfi( ".cfi_startproc" );
switch (target.cpu)
{
case CPU_i386:
@ -1483,7 +1478,6 @@ void output_syscalls( DLLSPEC *spec )
default:
assert(0);
}
output_cfi( ".cfi_endproc" );
output_function_size( name );
}
@ -1678,10 +1672,10 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc
output( "%s\n", asm_globl( delay_load ) );
output( "\t%s\n", func_declaration( delay_load ) );
output_cfi( ".cfi_startproc" );
switch (target.cpu)
{
case CPU_i386:
output_cfi( ".cfi_startproc" );
output( "\tpushl %%ecx\n" );
output_cfi( ".cfi_adjust_cfa_offset 4" );
output( "\tpushl %%edx\n" );
@ -1696,11 +1690,11 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc
output( "\tpopl %%ecx\n" );
output_cfi( ".cfi_adjust_cfa_offset -4" );
output( "\tjmp *%%eax\n" );
output_cfi( ".cfi_endproc" );
break;
case CPU_x86_64:
output_seh( ".seh_proc %s", asm_name( delay_load ) );
output( "\tsubq $0x48, %%rsp\n" );
output_cfi( ".cfi_adjust_cfa_offset 0x48" );
output_seh( ".seh_stackalloc 0x48" );
output_seh( ".seh_endprologue" );
output( "\tmovq %%rcx, 0x40(%%rsp)\n" );
@ -1715,7 +1709,6 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc
output( "\tmovq 0x38(%%rsp), %%rdx\n" );
output( "\tmovq 0x40(%%rsp), %%rcx\n" );
output( "\taddq $0x48, %%rsp\n" );
output_cfi( ".cfi_adjust_cfa_offset -0x48" );
output( "\tjmp *%%rax\n" );
output_seh( ".seh_endproc" );
break;
@ -1750,7 +1743,6 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc
output( "\tbr x16\n" );
break;
}
output_cfi( ".cfi_endproc" );
output_function_size( delay_load );
output_gnu_stack_note();

6
tools/winebuild/spec32.c
View file

@ -300,7 +300,6 @@ static void output_relay_debug( DLLSPEC *spec )
output( "\t.align %d\n", get_alignment(4) );
output( "__wine_spec_relay_entry_point_%d:\n", i );
output_cfi( ".cfi_startproc" );
output( "\tpush {r0-r3}\n" );
output( "\tmov r2, SP\n");
if (has_float) output( "\tvpush {s0-s15}\n" );
@ -324,7 +323,6 @@ static void output_relay_debug( DLLSPEC *spec )
output( "\tadd SP, #%u\n", 24 + (has_float ? 64 : 0) );
output( "\tbx IP\n");
if (UsePIC) output( "2:\t.long .L__wine_spec_relay_descr-1b-%u\n", thumb_mode ? 4 : 8 );
output_cfi( ".cfi_endproc" );
break;
}
@ -371,7 +369,6 @@ static void output_relay_debug( DLLSPEC *spec )
output( "\t.align %d\n", get_alignment(4) );
output( "\t.long 0x90909090,0x90909090\n" );
output( "__wine_spec_relay_entry_point_%d:\n", i );
output_cfi( ".cfi_startproc" );
switch (odp->u.func.nb_args)
{
default: output( "\tmovq %%%s,32(%%rsp)\n", is_float_arg( odp, 3 ) ? "xmm3" : "r9" );
@ -388,7 +385,6 @@ static void output_relay_debug( DLLSPEC *spec )
output( "\tleaq .L__wine_spec_relay_descr(%%rip),%%rcx\n" );
output( "\tcallq *8(%%rcx)\n" );
output( "\tret\n" );
output_cfi( ".cfi_endproc" );
break;
default:
@ -583,7 +579,6 @@ void output_exports( DLLSPEC *spec )
output( "\t.long 0x90909090,0x90909090\n" );
if (name) output( "%s_%s:\n", asm_name("__wine_spec_imp"), name );
else output( "%s_%u:\n", asm_name("__wine_spec_imp"), i );
output_cfi( ".cfi_startproc" );
switch (target.cpu)
{
@ -604,7 +599,6 @@ void output_exports( DLLSPEC *spec )
default:
assert(0);
}
output_cfi( ".cfi_endproc" );
}
}