Alexandre Julliard : winebuild: Output cfi data for relay thunks on i386.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 37dba06ed31a2e9541f9c5abb9657458bbfe6d9d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=37dba06ed31a2e9541f9c5abb9657458bbfe6d9d

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jul  6 21:53:37 2011 +0200

winebuild: Output cfi data for relay thunks on i386.

---

 tools/winebuild/spec32.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index a5b4118..2cfeb99 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -161,6 +161,7 @@ static void output_relay_debug( DLLSPEC *spec )
 
         output( "\t.align %d\n", get_alignment(4) );
         output( ".L__wine_spec_relay_entry_point_%d:\n", i );
+        output_cfi( ".cfi_startproc" );
 
         args = get_args_size(odp) / get_ptr_size();
         flags = 0;
@@ -179,9 +180,11 @@ static void output_relay_debug( DLLSPEC *spec )
                 output( "\tpushl %%eax\n" );
             else
                 output( "\tpushl %%esp\n" );
+            output_cfi( ".cfi_adjust_cfa_offset 4" );
 
             if (odp->flags & FLAG_RET64) flags |= 1;
             output( "\tpushl $%u\n", (flags << 24) | (args << 16) | (i - spec->base) );
+            output_cfi( ".cfi_adjust_cfa_offset 4" );
 
             if (UsePIC)
             {
@@ -190,6 +193,7 @@ static void output_relay_debug( DLLSPEC *spec )
             }
             else output( "\tmovl $.L__wine_spec_relay_descr,%%eax\n" );
             output( "\tpushl %%eax\n" );
+            output_cfi( ".cfi_adjust_cfa_offset 4" );
 
             if (odp->flags & FLAG_REGISTER)
             {
@@ -198,6 +202,7 @@ static void output_relay_debug( DLLSPEC *spec )
             else
             {
                 output( "\tcall *4(%%eax)\n" );
+                output_cfi( ".cfi_adjust_cfa_offset -12" );
                 if (odp->type == TYPE_STDCALL || odp->type == TYPE_THISCALL)
                     output( "\tret $%u\n", args * get_ptr_size() );
                 else
@@ -206,9 +211,8 @@ static void output_relay_debug( DLLSPEC *spec )
             break;
 
         case CPU_x86_64:
-            output( "\t.cfi_startproc\n" );
             output( "\tsubq $40,%%rsp\n" );
-            output( "\t.cfi_adjust_cfa_offset 40\n" );
+            output_cfi( ".cfi_adjust_cfa_offset 40" );
             switch (args)
             {
             default: output( "\tmovq %%%s,72(%%rsp)\n", is_float_arg( odp, 3 ) ? "xmm3" : "r9" );
@@ -226,14 +230,14 @@ static void output_relay_debug( DLLSPEC *spec )
             output( "\tleaq .L__wine_spec_relay_descr(%%rip),%%rcx\n" );
             output( "\tcallq *8(%%rcx)\n" );
             output( "\taddq $40,%%rsp\n" );
-            output( "\t.cfi_adjust_cfa_offset -40\n" );
+            output_cfi( ".cfi_adjust_cfa_offset -40" );
             output( "\tret\n" );
-            output( "\t.cfi_endproc\n" );
             break;
 
         default:
             assert(0);
         }
+        output_cfi( ".cfi_endproc" );
     }
 }