Module: wine Branch: master Commit: 102dd9e92feaae767c84111d60298551715c87b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=102dd9e92feaae767c84111d60...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Jan 16 15:41:48 2010 +0100
winebuild: Rename __wine_call_from_32_regs for consistency with 64-bit.
---
dlls/krnl386.exe16/kernel16_private.h | 2 +- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_i386.c | 6 +++--- tools/winebuild/relay.c | 11 ++++++----- 4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index 2f68c57..8ab4c89 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -287,7 +287,7 @@ static inline struct kernel_thread_data *kernel_get_thread_data(void) ".byte 0x68\n\t" /* pushl $__regs_func */ \ ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \ ".byte 0x6a," #args "\n\t" /* pushl $args */ \ - "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ + "call " __ASM_NAME("__wine_call_from_regs") "\n\t" \ "ret $(4*" #args ")" ) /* fake ret to make copy protections happy */
#endif /* __WINE_KERNEL16_PRIVATE_H */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 32966b7..586250d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -237,7 +237,7 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) ".byte 0x68\n\t" /* pushl $__regs_func */ \ ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \ ".byte 0x6a," #args "\n\t" /* pushl $args */ \ - "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ + "call " __ASM_NAME("__wine_call_from_regs") "\n\t" \ "ret $(4*" #args ")" ) /* fake ret to make copy protections happy */ #elif defined(__x86_64__) #define DEFINE_REGS_ENTRYPOINT( name, args ) \ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5a919b3..4eccb61 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -423,7 +423,7 @@ static wine_signal_handler handlers[256];
static int fpux_support; /* whether the CPU support extended fpu context */
-extern void DECLSPEC_NORETURN __wine_call_from_32_restore_regs( const CONTEXT *context ); +extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context );
enum i386_trap_code { @@ -1173,7 +1173,7 @@ void set_cpu_context( const CONTEXT *context ) if (!(flags & CONTEXT_CONTROL)) FIXME( "setting partial context (%x) not supported\n", flags ); else if (flags & CONTEXT_SEGMENTS) - __wine_call_from_32_restore_regs( context ); + __wine_restore_regs( context ); else { CONTEXT newcontext = *context; @@ -1181,7 +1181,7 @@ void set_cpu_context( const CONTEXT *context ) newcontext.SegEs = wine_get_es(); newcontext.SegFs = wine_get_fs(); newcontext.SegGs = wine_get_gs(); - __wine_call_from_32_restore_regs( &newcontext ); + __wine_restore_regs( &newcontext ); } } } diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 3f95545..64bb2d5 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -752,7 +752,8 @@ static void BuildCallFrom32Regs(void)
/* Function header */
- function_header( "__wine_call_from_32_regs" ); + output( "\t.text\n" ); + function_header( "__wine_call_from_regs" );
/* Allocate some buffer space on the stack */
@@ -845,12 +846,12 @@ static void BuildCallFrom32Regs(void)
output( "\tpopl %%ds\n" ); output( "\tiret\n" ); - output_function_size( "__wine_call_from_32_regs" ); + output_function_size( "__wine_call_from_regs" );
- function_header( "__wine_call_from_32_restore_regs" ); + function_header( "__wine_restore_regs" ); output( "\tmovl 4(%%esp),%%ecx\n" ); output( "\tjmp 2b\n" ); - output_function_size( "__wine_call_from_32_restore_regs" ); + output_function_size( "__wine_restore_regs" ); }
@@ -991,6 +992,7 @@ static void build_call_from_regs_x86_64(void)
/* Function header */
+ output( "\t.text\n" ); function_header( "__wine_call_from_regs" );
output( "\t.cfi_startproc\n" ); @@ -1170,7 +1172,6 @@ void BuildRelays32(void)
case CPU_x86_64: output( "/* File generated automatically. Do not edit! */\n\n" ); - output( "\t.text\n" ); build_call_from_regs_x86_64(); output_gnu_stack_note(); break;