November 2017 - Wine-Commits

Nikolay Sivov : dwrite: Set lfItalic style to get more compatible results for gdiinterop.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: e5276c766b25d19c35e5dd2e0394e9d336db4410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5276c766b25d19c35e5dd2e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 13:15:34 2017 +0300 dwrite: Set lfItalic style to get more compatible results for gdiinterop. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 4f570f5..18fb00b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1375,6 +1375,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->style = DWRITE_FONT_STYLE_OBLIQUE; else if (fsSelection & OS2_FSSELECTION_ITALIC) props->style = DWRITE_FONT_STYLE_ITALIC; + props->lf.lfItalic = !!(fsSelection & OS2_FSSELECTION_ITALIC); memcpy(&props->panose, &tt_os2->panose, sizeof(props->panose)); @@ -1404,12 +1405,13 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (macStyle & TT_HEAD_MACSTYLE_BOLD) props->weight = DWRITE_FONT_WEIGHT_BOLD; - if (macStyle & TT_HEAD_MACSTYLE_ITALIC) + if (macStyle & TT_HEAD_MACSTYLE_ITALIC) { props->style = DWRITE_FONT_STYLE_ITALIC; + props->lf.lfItalic = 1; + } } props->lf.lfWeight = props->weight; - props->lf.lfItalic = props->style == DWRITE_FONT_STYLE_ITALIC; TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style);

1 0

Józef Kucia : wined3d: Add 4.4 to supported OpenGL versions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 6a0546da92e7607e8013a3c26bc2151e2efc6884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0546da92e7607e8013a3c26… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 2 11:39:28 2017 +0100 wined3d: Add 4.4 to supported OpenGL versions. We have a more efficient codepath for SM4+ interpolation modifiers if GLSL 4.40 is available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef3a7fd..c89d556 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6515,6 +6515,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, { static const DWORD supported_gl_versions[] = { + MAKEDWORD_VERSION(4, 4), MAKEDWORD_VERSION(3, 2), MAKEDWORD_VERSION(1, 0), };

1 0

Józef Kucia : wined3d: Factor out acquire_graphics_pipeline_resources().
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: c736181da4e8430259f6a447ef3112abffe9b305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c736181da4e8430259f6a447e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:41 2017 +0100 wined3d: Factor out acquire_graphics_pipeline_resources(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 04e01da..afc4b05 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -809,25 +809,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); } -void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, - int base_vertex_idx, unsigned int start_idx, unsigned int index_count, - unsigned int start_instance, unsigned int instance_count, BOOL indexed) +static void acquire_graphics_pipeline_resources(const struct wined3d_state *state, + BOOL indexed, const struct wined3d_gl_info *gl_info) { - const struct wined3d_state *state = &cs->device->state; - struct wined3d_cs_draw *op; unsigned int i; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_DRAW; - op->primitive_type = primitive_type; - op->patch_vertex_count = patch_vertex_count; - op->base_vertex_idx = base_vertex_idx; - op->start_idx = start_idx; - op->index_count = index_count; - op->start_instance = start_instance; - op->instance_count = instance_count; - op->indexed = indexed; - if (indexed) wined3d_resource_acquire(&state->index_buffer->resource); for (i = 0; i < ARRAY_SIZE(state->streams); ++i) @@ -845,7 +831,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned if (state->textures[i]) wined3d_resource_acquire(&state->textures[i]->resource); } - for (i = 0; i < cs->device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < gl_info->limits.buffers; ++i) { if (state->fb->render_targets[i]) wined3d_resource_acquire(state->fb->render_targets[i]->resource); @@ -855,6 +841,28 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned acquire_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); +} + +void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, + int base_vertex_idx, unsigned int start_idx, unsigned int index_count, + unsigned int start_instance, unsigned int instance_count, BOOL indexed) +{ + const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_state *state = &cs->device->state; + struct wined3d_cs_draw *op; + + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_DRAW; + op->primitive_type = primitive_type; + op->patch_vertex_count = patch_vertex_count; + op->base_vertex_idx = base_vertex_idx; + op->start_idx = start_idx; + op->index_count = index_count; + op->start_instance = start_instance; + op->instance_count = instance_count; + op->indexed = indexed; + + acquire_graphics_pipeline_resources(state, indexed, gl_info); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); }

1 0

Michael Stefaniuc : wined3d: Use ARRAY_SIZE().
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 9d1acd197d4aaddb618b0e77caebf8b384785740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1acd197d4aaddb618b0e77c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 31 12:10:29 2017 +0100 wined3d: Use ARRAY_SIZE(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 994c4b1..76f6705 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -488,7 +488,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) state_cleanup(&device->state); - for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) + for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); device->multistate_funcs[i] = NULL; @@ -5106,7 +5106,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, return WINED3D_OK; err: - for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) + for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); }

1 0

Alexandre Julliard : xcopy: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 9aa298ba69401e4b9f0003c4543ec0b0f8e2ea78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa298ba69401e4b9f0003c45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:27 2017 +0100 xcopy: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 5c2f7ca..a173cc1 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -94,7 +94,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int __cdecl XCOPY_wprintf(const WCHAR *format, ...) { +static int WINAPIV XCOPY_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL;

1 0

Alexandre Julliard : reg: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: a37358d0f5ab6e447f96f22ceee0da6c34b5355f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37358d0f5ab6e447f96f22ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:21:30 2017 +0100 reg: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 4 ++-- programs/reg/reg.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index fac3d22..42fd6e9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -151,7 +151,7 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) LocalFree(str); } -void __cdecl output_message(unsigned int id, ...) +void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1024]; __ms_va_list va_args; @@ -166,7 +166,7 @@ void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } -static void __cdecl output_string(const WCHAR *fmt, ...) +static void WINAPIV output_string(const WCHAR *fmt, ...) { __ms_va_list va_args; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 14c05b1..07bbecf 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -27,7 +27,7 @@ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); BOOL heap_free(void *buf); -void __cdecl output_message(unsigned int id, ...); +void WINAPIV output_message(unsigned int id, ...); HKEY path_get_rootkey(const WCHAR *path); /* import.c */

1 0

Alexandre Julliard : attrib: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 1722db40e5a14613aa7a44becfef05ef4124c804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1722db40e5a14613aa7a44bec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:20:40 2017 +0100 attrib: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 0938cb8..a574204 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -48,7 +48,7 @@ static WCHAR *ATTRIB_LoadMessage(UINT id) * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) +static int WINAPIV ATTRIB_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL;

1 0

Alexandre Julliard : ntdll: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: a5b67f3fddd49645fc9afaeac25bb3a5782fe6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b67f3fddd49645fc9afaeac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:16:54 2017 +0100 ntdll: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 8 ++++---- dlls/ntdll/string.c | 2 +- dlls/ntdll/tests/string.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index b6b8b6c..8a966304 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -709,7 +709,7 @@ int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_v /********************************************************************* * _snprintf (NTDLL.@) */ -int CDECL NTDLL__snprintf( char *str, SIZE_T len, const char *format, ... ) +int WINAPIV NTDLL__snprintf( char *str, SIZE_T len, const char *format, ... ) { int ret; __ms_va_list valist; @@ -724,7 +724,7 @@ int CDECL NTDLL__snprintf( char *str, SIZE_T len, const char *format, ... ) /*********************************************************************** * _snwprintf (NTDLL.@) */ -int CDECL NTDLL__snwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, ... ) +int WINAPIV NTDLL__snwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, ... ) { int ret; __ms_va_list valist; @@ -748,7 +748,7 @@ int CDECL NTDLL_vsprintf( char *str, const char *format, __ms_va_list args ) /********************************************************************* * sprintf (NTDLL.@) */ -int CDECL NTDLL_sprintf( char *str, const char *format, ... ) +int WINAPIV NTDLL_sprintf( char *str, const char *format, ... ) { int ret; __ms_va_list valist; @@ -763,7 +763,7 @@ int CDECL NTDLL_sprintf( char *str, const char *format, ... ) /*********************************************************************** * swprintf (NTDLL.@) */ -int CDECL NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ) +int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ) { int ret; __ms_va_list valist; diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index e8d061a..eb762c6 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1363,7 +1363,7 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) /********************************************************************* * sscanf (NTDLL.@) */ -int __cdecl NTDLL_sscanf( const char *str, const char *format, ... ) +int WINAPIV NTDLL_sscanf( const char *str, const char *format, ... ) { int ret; __ms_va_list valist; diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 9bbaddd..8fca5d4 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -59,7 +59,7 @@ static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); -static int (__cdecl *p__snprintf)(char *, size_t, const char *, ...); +static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...); static void InitFunctionPtrs(void)

1 0

Alexandre Julliard : wldap32: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 70e02ce73c627837ad6ca1b1d8c6a91b7bb4dbd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e02ce73c627837ad6ca1b1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:16:27 2017 +0100 wldap32: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 4 ++-- include/winldap.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 41acd70..c2c6f26 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -322,7 +322,7 @@ ULONG CDECL WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len ) * berelement must have been allocated with ber_alloc_t. This function * can be called multiple times to append data. */ -INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) +INT WINAPIV WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP __ms_va_list list; @@ -417,7 +417,7 @@ INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) * berelement must have been allocated with ber_init. This function * can be called multiple times to decode data. */ -INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) +INT WINAPIV WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP __ms_va_list list; diff --git a/include/winldap.h b/include/winldap.h index 2014e06..e5c1faa 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -628,9 +628,9 @@ void CDECL ber_free(BerElement*,INT); BerElement* CDECL ber_init(BERVAL*); ULONG CDECL ber_next_element(BerElement*,ULONG*,CHAR*); ULONG CDECL ber_peek_tag(BerElement*,ULONG*); -INT CDECL ber_printf(BerElement*,PCHAR,...); +INT WINAPIV ber_printf(BerElement*,PCHAR,...); ULONG CDECL ber_skip_tag(BerElement*,ULONG*); -INT CDECL ber_scanf(BerElement*,PCHAR,...); +INT WINAPIV ber_scanf(BerElement*,PCHAR,...); ULONG CDECL LdapGetLastError(void); ULONG CDECL LdapMapErrorToWin32(ULONG);

1 0

Martin Storsjo : msvcrt: Back up and restore the FPU state in setjmp/ longjmp on ARM.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 171b3bcf3b7c4ef992fce81849108202d70dbddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=171b3bcf3b7c4ef992fce8184… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Nov 2 08:55:42 2017 +0200 msvcrt: Back up and restore the FPU state in setjmp/longjmp on ARM. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 29ddb7b..76c4735 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -151,7 +151,16 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmpex, "str r11, [r0, #0x20]\n\t" /* jmp_buf->R11 */ "str sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "str lr, [r0, #0x28]\n\t" /* jmp_buf->Pc */ - /* FIXME: Save floating point data */ + "vmrs r2, fpscr\n\t" + "str r2, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ + "vstr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ + "vstr d9, [r0, #0x38]\n\t" /* jmp_buf->D[1] */ + "vstr d10, [r0, #0x40]\n\t" /* jmp_buf->D[2] */ + "vstr d11, [r0, #0x48]\n\t" /* jmp_buf->D[3] */ + "vstr d12, [r0, #0x50]\n\t" /* jmp_buf->D[4] */ + "vstr d13, [r0, #0x58]\n\t" /* jmp_buf->D[5] */ + "vstr d14, [r0, #0x60]\n\t" /* jmp_buf->D[6] */ + "vstr d15, [r0, #0x68]\n\t" /* jmp_buf->D[7] */ "mov r0, #0\n\t" "bx lr"); @@ -168,7 +177,16 @@ __ASM_GLOBAL_FUNC(longjmp_set_regs, "ldr r11, [r0, #0x20]\n\t" /* jmp_buf->R11 */ "ldr sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "ldr r2, [r0, #0x28]\n\t" /* jmp_buf->Pc */ - /* FIXME: Restore floating point data */ + "ldr r3, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ + "vmsr fpscr, r3\n\t" + "vldr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ + "vldr d9, [r0, #0x38]\n\t" /* jmp_buf->D[1] */ + "vldr d10, [r0, #0x40]\n\t" /* jmp_buf->D[2] */ + "vldr d11, [r0, #0x48]\n\t" /* jmp_buf->D[3] */ + "vldr d12, [r0, #0x50]\n\t" /* jmp_buf->D[4] */ + "vldr d13, [r0, #0x58]\n\t" /* jmp_buf->D[5] */ + "vldr d14, [r0, #0x60]\n\t" /* jmp_buf->D[6] */ + "vldr d15, [r0, #0x68]\n\t" /* jmp_buf->D[7] */ "mov r0, r1\n\t" /* retval */ "bx r2");

1 0