January 2013 - Wine-Commits

André Hentschel : server: Add ARM64 support.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: d11e72f9258df06c2fc45d72746f30d5611e8639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11e72f9258df06c2fc45d727… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:49:36 2013 +0100 server: Add ARM64 support. --- dlls/ntdll/server.c | 2 + include/wine/server_protocol.h | 6 +++- server/protocol.def | 4 ++- server/thread.c | 6 +++++ server/trace.c | 42 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 2fe7877..af2ce06 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -102,6 +102,8 @@ static const enum cpu_type client_cpu = CPU_POWERPC; static const enum cpu_type client_cpu = CPU_SPARC; #elif defined(__arm__) static const enum cpu_type client_cpu = CPU_ARM; +#elif defined(__aarch64__) +static const enum cpu_type client_cpu = CPU_ARM64; #else #error Unsupported CPU #endif diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 2a181fc..99bcfae 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -129,7 +129,7 @@ typedef union enum cpu_type { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_SPARC }; typedef int cpu_type_t; @@ -145,6 +145,7 @@ typedef struct unsigned int cs, ss, flags, __pad; } x86_64_regs; struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; struct { unsigned int sp, lr, pc, cpsr; } arm_regs; + struct { unsigned __int64 sp, pc, pstate; } arm64_regs; struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; union @@ -154,6 +155,7 @@ typedef struct r8, r9, r10, r11, r12, r13, r14, r15; } x86_64_regs; struct { unsigned int gpr[32], cr, xer; } powerpc_regs; struct { unsigned int r[13]; } arm_regs; + struct { unsigned __int64 x[31]; } arm64_regs; struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; } integer; union @@ -5713,6 +5715,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 437 +#define SERVER_PROTOCOL_VERSION 438 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 886853f..4038e48 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -145,7 +145,7 @@ typedef union /* supported CPU types */ enum cpu_type { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_SPARC }; typedef int cpu_type_t; @@ -161,6 +161,7 @@ typedef struct unsigned int cs, ss, flags, __pad; } x86_64_regs; struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; struct { unsigned int sp, lr, pc, cpsr; } arm_regs; + struct { unsigned __int64 sp, pc, pstate; } arm64_regs; struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; /* selected by SERVER_CTX_CONTROL */ union @@ -170,6 +171,7 @@ typedef struct r8, r9, r10, r11, r12, r13, r14, r15; } x86_64_regs; struct { unsigned int gpr[32], cr, xer; } powerpc_regs; struct { unsigned int r[13]; } arm_regs; + struct { unsigned __int64 x[31]; } arm64_regs; struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; } integer; /* selected by SERVER_CTX_INTEGER */ union diff --git a/server/thread.c b/server/thread.c index f9a575e..fdbc144 100644 --- a/server/thread.c +++ b/server/thread.c @@ -63,6 +63,8 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); static const unsigned int supported_cpus = CPU_FLAG(CPU_SPARC); #elif defined(__arm__) static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM); +#elif defined(__aarch64__) +static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM64); #else #error Unsupported CPU #endif @@ -1023,6 +1025,7 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_x86_64: return SERVER_CTX_DEBUG_REGISTERS; case CPU_POWERPC: return 0; case CPU_ARM: return 0; + case CPU_ARM64: return 0; case CPU_SPARC: return 0; } return 0; @@ -1056,6 +1059,9 @@ void break_thread( struct thread *thread ) case CPU_ARM: data.exception.address = thread->context->ctl.arm_regs.pc; break; + case CPU_ARM64: + data.exception.address = thread->context->ctl.arm64_regs.pc; + break; } generate_debug_event( thread, EXCEPTION_DEBUG_EVENT, &data ); thread->debug_break = 0; diff --git a/server/trace.c b/server/trace.c index dc5074f..41c5424 100644 --- a/server/trace.c +++ b/server/trace.c @@ -557,6 +557,48 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) if (ctx.flags & SERVER_CTX_INTEGER) for (i = 0; i < 13; i++) fprintf( stderr, ",r%u=%08x", i, ctx.integer.arm_regs.r[i] ); break; + case CPU_ARM64: + if (ctx.flags & SERVER_CTX_CONTROL) + { + dump_uint64( ",sp=", &ctx.ctl.arm64_regs.sp ); + dump_uint64( ",pc=", &ctx.ctl.arm64_regs.pc ); + dump_uint64( ",pstate=", &ctx.ctl.arm64_regs.pstate ); + } + if (ctx.flags & SERVER_CTX_INTEGER) + { + dump_uint64( ",x0=", &ctx.integer.arm64_regs.x[0] ); + dump_uint64( ",x1=", &ctx.integer.arm64_regs.x[1] ); + dump_uint64( ",x2=", &ctx.integer.arm64_regs.x[2] ); + dump_uint64( ",x3=", &ctx.integer.arm64_regs.x[3] ); + dump_uint64( ",x4=", &ctx.integer.arm64_regs.x[4] ); + dump_uint64( ",x5=", &ctx.integer.arm64_regs.x[5] ); + dump_uint64( ",x6=", &ctx.integer.arm64_regs.x[6] ); + dump_uint64( ",x7=", &ctx.integer.arm64_regs.x[7] ); + dump_uint64( ",x8=", &ctx.integer.arm64_regs.x[8] ); + dump_uint64( ",x9=", &ctx.integer.arm64_regs.x[9] ); + dump_uint64( ",x10=", &ctx.integer.arm64_regs.x[10] ); + dump_uint64( ",x11=", &ctx.integer.arm64_regs.x[11] ); + dump_uint64( ",x12=", &ctx.integer.arm64_regs.x[12] ); + dump_uint64( ",x13=", &ctx.integer.arm64_regs.x[13] ); + dump_uint64( ",x14=", &ctx.integer.arm64_regs.x[14] ); + dump_uint64( ",x15=", &ctx.integer.arm64_regs.x[15] ); + dump_uint64( ",x16=", &ctx.integer.arm64_regs.x[16] ); + dump_uint64( ",x17=", &ctx.integer.arm64_regs.x[17] ); + dump_uint64( ",x18=", &ctx.integer.arm64_regs.x[18] ); + dump_uint64( ",x19=", &ctx.integer.arm64_regs.x[19] ); + dump_uint64( ",x20=", &ctx.integer.arm64_regs.x[20] ); + dump_uint64( ",x21=", &ctx.integer.arm64_regs.x[21] ); + dump_uint64( ",x22=", &ctx.integer.arm64_regs.x[22] ); + dump_uint64( ",x23=", &ctx.integer.arm64_regs.x[23] ); + dump_uint64( ",x24=", &ctx.integer.arm64_regs.x[24] ); + dump_uint64( ",x25=", &ctx.integer.arm64_regs.x[25] ); + dump_uint64( ",x26=", &ctx.integer.arm64_regs.x[26] ); + dump_uint64( ",x27=", &ctx.integer.arm64_regs.x[27] ); + dump_uint64( ",x28=", &ctx.integer.arm64_regs.x[28] ); + dump_uint64( ",x29=", &ctx.integer.arm64_regs.x[29] ); + dump_uint64( ",x30=", &ctx.integer.arm64_regs.x[30] ); + } + break; case CPU_SPARC: if (ctx.flags & SERVER_CTX_CONTROL) fprintf( stderr, ",psr=%08x,pc=%08x,npc=%08x,y=%08x,wim=%08x,tbr=%08x",

1 0

André Hentschel : ntdll: Add ARM64 signal handling.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: da9fbef9535a729f27311adaeea9bda5730ff336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9fbef9535a729f27311adae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:50:30 2013 +0100 ntdll: Add ARM64 signal handling. --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm64.c | 901 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 903 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da9fbef9535a729f27311…

1 0

Jacek Caban : atl100: Added stubs for AtlAxDialogBox[AW].
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 59881c142ed990f1dcba15cc366b144d1f992cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59881c142ed990f1dcba15cc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 16 12:50:06 2013 +0100 atl100: Added stubs for AtlAxDialogBox[AW]. --- dlls/atl/atl.spec | 4 ++-- dlls/atl100/atl100.spec | 4 ++-- dlls/atl100/atl_ax.c | 22 ++++++++++++++++++++++ dlls/atl80/atl80.spec | 4 ++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 7b36397..1a167a7 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -26,8 +26,8 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW 38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 2de1102..1732052 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -18,8 +18,8 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) 38 stdcall AtlAxCreateDialogA(long str long ptr long) 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index bd0881f..4874d39 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -1350,3 +1350,25 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) return IOleObject_QueryInterface( This->control, &IID_IUnknown, (void**) pUnk ); } + +/*********************************************************************** + * AtlAxDialogBoxW [atl100.35] + * + */ +INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); + return 0; +} + +/*********************************************************************** + * AtlAxDialogBoxA [atl100.36] + * + */ +INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); + return 0; +} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 620c719..dfc9c43 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -20,8 +20,8 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW 38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl

1 0

Stefan Dösinger : d3d9/tests: Create a plain DS surface in test_reset_resources.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: ab36ab7d11f7fcafe1cea7c1cd7135a0472ffdb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab36ab7d11f7fcafe1cea7c1c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 16 12:44:15 2013 +0100 d3d9/tests: Create a plain DS surface in test_reset_resources. r200 does not support depth textures. --- dlls/d3d9/tests/device.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a0997d6..cabdec5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3523,12 +3523,9 @@ static void test_reset_resources(void) hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_DEPTHSTENCIL, - D3DFMT_D24S8, D3DPOOL_DEFAULT, &texture, NULL); - ok(SUCCEEDED(hr), "Failed to create depth/stencil texture, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); - ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); - IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 128, 128, + D3DFMT_D24S8, D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, surface); ok(SUCCEEDED(hr), "Failed to set depth/stencil surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface);

1 0

Stefan Dösinger : d3d8/tests: Create a plain DS surface in test_reset_resources.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: ce31e40f242353c45e1e60081ad4e5a6655325ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce31e40f242353c45e1e60081… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 16 12:44:16 2013 +0100 d3d8/tests: Create a plain DS surface in test_reset_resources. --- dlls/d3d8/tests/device.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 87d3f9e..ca34b81 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3252,12 +3252,9 @@ static void test_reset_resources(void) goto done; } - hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_DEPTHSTENCIL, - D3DFMT_D24S8, D3DPOOL_DEFAULT, &texture); - ok(SUCCEEDED(hr), "Failed to create depth/stencil texture, hr %#x.\n", hr); - hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &surface); - ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); - IDirect3DTexture8_Release(texture); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 128, 128, D3DFMT_D24S8, + D3DMULTISAMPLE_NONE, &surface); + ok(SUCCEEDED(hr), "Failed to create depth/stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture);

1 0

André Hentschel : libwine: Implemented the wine_call_on_stack function for ARM64.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 16954b3a821f9585f88ce807a2b15d650ec982e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16954b3a821f9585f88ce807a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:41:58 2013 +0100 libwine: Implemented the wine_call_on_stack function for ARM64. --- libs/wine/port.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 8e8caf8..87e5833 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -156,6 +156,19 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "blx r2\n\t" /* call func */ "mov sp, r4\n\t" /* restore old sp from local var */ "pop {r4,PC}") /* fetch return address into pc */ +#elif defined(__aarch64__) && defined(__GNUC__) +__ASM_GLOBAL_FUNC( wine_call_on_stack, + "stp x29, x30, [sp,#-32]!\n\t" /* save return address on stack */ + "str x19, [sp,#16]\n\t" /* save register on stack */ + "mov x19, sp\n\t" /* store old sp in local var */ + "mov sp, x2\n\t" /* stack */ + "mov x2, x0\n\t" /* func -> scratch register */ + "mov x0, x1\n\t" /* arg */ + "blr x2\n\t" /* call func */ + "mov sp, x19\n\t" /* restore old sp from local var */ + "ldr x19, [sp,#16]\n\t" /* restore register from stack */ + "ldp x29, x30, [sp],#32\n\t" /* restore return address */ + "ret") /* return */ #elif defined(__sparc__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack, "save %sp, -96, %sp\n\t" /* push: change register window */

1 0

André Hentschel : ntdll: Add ARM64 cpu info.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 855be0bb55c52c1216404e32fe9abcf9694faedc URL: http://source.winehq.org/git/wine.git/?a=commit;h=855be0bb55c52c1216404e32f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:52:23 2013 +0100 ntdll: Add ARM64 cpu info. --- dlls/ntdll/nt.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index d415db4..a2e0716 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1103,6 +1103,14 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) info->Architecture = PROCESSOR_ARCHITECTURE_ARM; } +#elif defined(__aarch64__) + +static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) +{ + info->Level = 8; + info->Architecture = PROCESSOR_ARCHITECTURE_ARM; +} + #elif defined(__sparc__) static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)

1 0

André Hentschel : winebuild: Add ARM64 support.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 3f393a65527d8483c4c8607f2e79d49bcf26c33a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f393a65527d8483c4c8607f2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:43:01 2013 +0100 winebuild: Add ARM64 support. --- tools/winebuild/build.h | 4 ++-- tools/winebuild/import.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/main.c | 2 ++ tools/winebuild/spec32.c | 5 +++++ tools/winebuild/utils.c | 9 ++++++++- 5 files changed, 61 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 05adf31..3fbf89d 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -140,7 +140,7 @@ typedef struct enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_LAST = CPU_ARM + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 }; enum target_platform @@ -178,7 +178,7 @@ struct strarray #define FLAG_CPU(cpu) (0x01000 << (cpu)) #define FLAG_CPU_MASK (FLAG_CPU(CPU_LAST + 1) - FLAG_CPU(0)) -#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64)) +#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM64)) #define FLAG_CPU_WIN32 (FLAG_CPU_MASK & ~FLAG_CPU_WIN64) #define MAX_ORDINALS 65535 diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c73b86c..81325e9 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -675,6 +675,17 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tldr PC,[IP,#%d]\n", pos); output( "\t.long %s\n", table ); break; + case CPU_ARM64: + output( "\tadr x9, 1f\n" ); + output( "\tldur x9, [x9, #0]\n" ); + if (pos & 0xf000) output( "\tadd x9, x9, #%u\n", pos & 0xf000 ); + if (pos & 0x0f00) output( "\tadd x9, x9, #%u\n", pos & 0x0f00 ); + if (pos & 0x00f0) output( "\tadd x9, x9, #%u\n", pos & 0x00f0 ); + if (pos & 0x000f) output( "\tadd x9, x9, #%u\n", pos & 0x000f ); + output( "\tldur x9, [x9, #0]\n" ); + output( "\tbr x9\n" ); + output( "1:\t.quad %s\n", table ); + break; case CPU_POWERPC: output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); if (target_platform == PLATFORM_APPLE) @@ -994,6 +1005,21 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tldmfd SP!, {r0-r3}\n" ); output( "\tmov PC,IP\n"); break; + case CPU_ARM64: + output( "\tstp x29, x30, [sp,#-16]!\n" ); + output( "\tmov x29, sp\n" ); + output( "\tadr x9, 1f\n" ); + output( "\tldur x9, [x9, #0]\n" ); + output( "\tblr x9\n" ); + output( "\tmov x9, x0\n" ); + output( "\tldp x29, x30, [sp],#16\n" ); + output( "\tldp x0, x1, [sp,#16]\n" ); + output( "\tldp x2, x3, [sp,#32]\n" ); + output( "\tldp x4, x5, [sp,#48]\n" ); + output( "\tldp x6, x7, [sp],#80\n" ); + output( "\tbr x9\n" ); /* or "ret x9" */ + output( "1:\t.quad %s\n", asm_name("__wine_spec_delay_load") ); + break; case CPU_POWERPC: if (target_platform == PLATFORM_APPLE) extra_stack_storage = 56; @@ -1086,6 +1112,24 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tldr PC,[PC,#-4]\n"); output( "\t.long %s\n", asm_name("__wine_delay_load_asm") ); break; + case CPU_ARM64: + output( "\tstp x6, x7, [sp,#-80]!\n" ); + output( "\tstp x4, x5, [sp,#48]\n" ); + output( "\tstp x2, x3, [sp,#32]\n" ); + output( "\tstp x0, x1, [sp,#16]\n" ); + output( "\tmov x0, #%d\n", idx ); + output( "\tmov x1, #16384\n" ); + output( "\tmul x1, x0, x1\n" ); + output( "\tmov x0, x1\n" ); + output( "\tmov x1, #4\n" ); + output( "\tmul x1, x0, x1\n" ); + output( "\tmov x0, x1\n" ); + output( "\tadd x0, x0, #%d\n", j ); + output( "\tadr x9, 1f\n" ); + output( "\tldur x9, [x9, #0]\n" ); + output( "\tbr x9\n" ); + output( "1:\t.quad %s\n", asm_name("__wine_delay_load_asm") ); + break; case CPU_POWERPC: switch(target_platform) { diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 28ecec8..594b31b 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -59,6 +59,8 @@ enum target_cpu target_cpu = CPU_SPARC; enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) enum target_cpu target_cpu = CPU_ARM; +#elif defined(__aarch64__) +enum target_cpu target_cpu = CPU_ARM64; #else #error Unsupported CPU #endif diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 20fcbc0..f6c8cd2 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -39,6 +39,7 @@ #define IMAGE_FILE_MACHINE_ARMNT 0x01C4 /* Wine extension */ #define IMAGE_FILE_MACHINE_SPARC 0x2000 +#define IMAGE_FILE_MACHINE_ARM64 0x01C5 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240 @@ -447,6 +448,7 @@ static void output_asm_constructor( const char *constructor ) output( "\n\t.section \".text\",\"ax\"\n" ); output( "\tblx %s\n", asm_name(constructor) ); break; + case CPU_ARM64: case CPU_POWERPC: output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tbl %s\n", asm_name(constructor) ); @@ -494,6 +496,7 @@ void output_module( DLLSPEC *spec ) output( "\n\t.section \".text\",\"ax\"\n" ); output( "\tb 1f\n" ); break; + case CPU_ARM64: case CPU_POWERPC: output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tb 1f\n" ); @@ -518,6 +521,7 @@ void output_module( DLLSPEC *spec ) case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMNT; break; + case CPU_ARM64: machine = IMAGE_FILE_MACHINE_ARM64; break; case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; case CPU_SPARC: machine = IMAGE_FILE_MACHINE_SPARC; break; } @@ -707,6 +711,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_SPARC ); break; case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMNT ); break; + case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; } put_word( nb_sections ); /* NumberOfSections */ put_dword( 0 ); /* TimeDateStamp */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 09f9b73..559e476 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -58,7 +58,9 @@ static const struct { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, { "powerpc", CPU_POWERPC }, - { "arm", CPU_ARM } + { "arm", CPU_ARM }, + { "arm64", CPU_ARM64 }, + { "aarch64", CPU_ARM64 }, }; /* atexit handler to clean tmp files */ @@ -867,6 +869,7 @@ unsigned int get_alignment(unsigned int align) /* fall through */ case CPU_POWERPC: case CPU_ARM: + case CPU_ARM64: n = 0; while ((1u << n) != align) n++; return n; @@ -885,6 +888,7 @@ unsigned int get_page_size(void) case CPU_x86_64: return 4096; case CPU_POWERPC: return 4096; case CPU_ARM: return 4096; + case CPU_ARM64: return 4096; case CPU_SPARC: return 8192; } /* unreached */ @@ -903,6 +907,7 @@ unsigned int get_ptr_size(void) case CPU_ARM: return 4; case CPU_x86_64: + case CPU_ARM64: return 8; } /* unreached */ @@ -975,6 +980,7 @@ const char *func_declaration( const char *func ) switch(target_cpu) { case CPU_ARM: + case CPU_ARM64: buffer = strmake( ".type %s,%%function", func ); break; default: @@ -1025,6 +1031,7 @@ void output_gnu_stack_note(void) switch(target_cpu) { case CPU_ARM: + case CPU_ARM64: output( "\t.section .note.GNU-stack,\"\",%%progbits\n" ); break; default:

1 0

Jacek Caban : mshtml: Remove duplicated property entries in preprocess_dispex_data.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: bce6ee2b84629e2ce51f45ea2309ca29bf29bb97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce6ee2b84629e2ce51f45ea2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 16 12:36:08 2013 +0100 mshtml: Remove duplicated property entries in preprocess_dispex_data. --- dlls/mshtml/dispex.c | 16 ++++++++++++++++ dlls/mshtml/tests/jstest.html | 13 +++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 793bbb9..ed799d2 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -373,6 +373,22 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) data->funcs = heap_realloc(data->funcs, data->func_cnt * sizeof(func_info_t)); qsort(data->funcs, data->func_cnt, sizeof(func_info_t), dispid_cmp); + for(i = 1; i < data->func_cnt && data->funcs[i-1].id != data->funcs[i].id; i++); + if(i < data->func_cnt) { + unsigned j = i--; + + /* We have at least one duplicated property. This may happen if more than one + * interface implements the same property. We have to remove these duplicated + * entries. */ + + while(j < data->func_cnt) { + while(j+1 < data->func_cnt && data->funcs[j+1].id == data->funcs[j].id) + j++; + data->funcs[i++] = data->funcs[j++]; + } + data->func_cnt = i; + } + data->name_table = heap_alloc(data->func_cnt * sizeof(func_info_t*)); for(i=0; i < data->func_cnt; i++) data->name_table[i] = data->funcs+i; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 2bd87b1..ebf2861 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -165,6 +165,18 @@ function test_override_functions() { ok(tmp === "test", "div.addBehavior() = " + tmp); } +function test_forin() { + var cnt=0; + + document.body.innerHTML = '<a id="aid"></a>'; + + for(var x in document.getElementById("aid")) { + cnt++; + } + + ok(cnt > 100, "cnt = " + cnt); +} + var globalVar = false; function runTests() { @@ -185,6 +197,7 @@ function runTests() { test_attribute_collection(); test_arg_conv(); test_override_functions(); + test_forin(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

André Hentschel : kernel32/tests: Add ARM64 support.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 1b440629a646bc44220517e62dfed99bf53cec5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b440629a646bc44220517e62… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:53:55 2013 +0100 kernel32/tests: Add ARM64 support. --- dlls/kernel32/tests/file.c | 2 ++ dlls/kernel32/tests/loader.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0166fff..ce25cb9 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1787,6 +1787,8 @@ static BOOL create_fake_dll( LPCSTR filename ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC; #elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; +#elif defined __aarch64__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; #else # error You must specify the machine type #endif diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e503171..a884779 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -64,6 +64,8 @@ static IMAGE_NT_HEADERS nt_header = IMAGE_FILE_MACHINE_SPARC, /* Machine */ #elif defined __arm__ IMAGE_FILE_MACHINE_ARMNT, /* Machine */ +#elif defined __aarch64__ + IMAGE_FILE_MACHINE_ARM64, /* Machine */ #else # error You must specify the machine type #endif

1 0