January 2013 - Wine-commits

André Hentschel : include: Add ARM64 context.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: a431f83ec1a253ede1f7382fa7467b46bce0d29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a431f83ec1a253ede1f7382fa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:41:25 2013 +0100 include: Add ARM64 context. --- include/winnt.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 467b427..f2bf990 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1672,6 +1672,75 @@ typedef struct _CONTEXT { #endif /* __arm__ */ +#ifdef __aarch64__ +/* + * FIXME: + * + * There is not yet an official CONTEXT structure defined for the AArch64 + * architecture, so I just made one up. + * + */ + +#define CONTEXT_ARM64 0x2000000 +#define CONTEXT_CONTROL (CONTEXT_ARM64 | 0x00000001) +#define CONTEXT_INTEGER (CONTEXT_ARM64 | 0x00000002) +#define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x00000004) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x00000008) + +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) + +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + +typedef struct _CONTEXT { + ULONG ContextFlags; + + /* This section is specified/returned if the ContextFlags word contains + the flag CONTEXT_INTEGER. */ + ULONGLONG X0; + ULONGLONG X1; + ULONGLONG X2; + ULONGLONG X3; + ULONGLONG X4; + ULONGLONG X5; + ULONGLONG X6; + ULONGLONG X7; + ULONGLONG X8; + ULONGLONG X9; + ULONGLONG X10; + ULONGLONG X11; + ULONGLONG X12; + ULONGLONG X13; + ULONGLONG X14; + ULONGLONG X15; + ULONGLONG X16; + ULONGLONG X17; + ULONGLONG X18; + ULONGLONG X19; + ULONGLONG X20; + ULONGLONG X21; + ULONGLONG X22; + ULONGLONG X23; + ULONGLONG X24; + ULONGLONG X25; + ULONGLONG X26; + ULONGLONG X27; + ULONGLONG X28; + ULONGLONG X29; + ULONGLONG X30; + + /* These are selected by CONTEXT_CONTROL */ + ULONGLONG Sp; + ULONGLONG Pc; + ULONGLONG PState; + + /* These are selected by CONTEXT_FLOATING_POINT */ + /* FIXME */ +} CONTEXT; + +#endif /* __aarch64__ */ + /* Mips context definitions */ #if defined(_MIPS_) || defined(__MIPS__) || defined(__mips__) @@ -2449,6 +2518,7 @@ typedef struct _IMAGE_VXD_HEADER { /* Wine extension */ #define IMAGE_FILE_MACHINE_SPARC 0x2000 +#define IMAGE_FILE_MACHINE_ARM64 0x01c5 #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER 56

1 0

André Hentschel : server: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

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 16 Jan '13

16 Jan '13

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

André Hentschel : ntdll: Add ARM64 cpu info.
by Alexandre Julliard 16 Jan '13

16 Jan '13

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 : kernel32/tests: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

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

André Hentschel : dbghelp: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: ce8640cbef378c484483efa5b07420f7d7ebc829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8640cbef378c484483efa5b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:55:14 2013 +0100 dbghelp: Add ARM64 support. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_arm64.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp.c | 6 +- include/cvconst.h | 7 ++ 4 files changed, 201 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 7c4f73a..fcbe40f 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -7,6 +7,7 @@ DELAYIMPORTS = version C_SRCS = \ coff.c \ cpu_arm.c \ + cpu_arm64.c \ cpu_i386.c \ cpu_ppc.c \ cpu_sparc.c \ diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c new file mode 100644 index 0000000..26407f7 --- /dev/null +++ b/dlls/dbghelp/cpu_arm64.c @@ -0,0 +1,189 @@ +/* + * File cpu_arm64.c + * + * Copyright (C) 2009 Eric Pouech + * Copyright (C) 2010-2013 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "dbghelp_private.h" +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); + +static unsigned arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ + addr->Mode = AddrModeFlat; + addr->Segment = 0; /* don't need segment */ + switch (ca) + { +#ifdef __aarch64__ + case cpu_addr_pc: addr->Offset = ctx->Pc; return TRUE; + case cpu_addr_stack: addr->Offset = ctx->Sp; return TRUE; + case cpu_addr_frame: addr->Offset = ctx->X29; return TRUE; +#endif + default: addr->Mode = -1; + return FALSE; + } +} + +static BOOL arm64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) +{ + FIXME("not done for ARM64\n"); + return FALSE; +} + +static unsigned arm64_map_dwarf_register(unsigned regno) +{ + if (regno <= 30) return CV_ARM64_X0 + regno; + if (regno == 31) return CV_ARM64_SP; + + FIXME("Don't know how to map register %d\n", regno); + return CV_ARM64_NOREG; +} + +static void* arm64_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) +{ +#ifdef __aarch64__ + switch (regno) + { + + case CV_ARM64_X0 + 0: *size = sizeof(ctx->X0); return &ctx->X0; + case CV_ARM64_X0 + 1: *size = sizeof(ctx->X1); return &ctx->X1; + case CV_ARM64_X0 + 2: *size = sizeof(ctx->X2); return &ctx->X2; + case CV_ARM64_X0 + 3: *size = sizeof(ctx->X3); return &ctx->X3; + case CV_ARM64_X0 + 4: *size = sizeof(ctx->X4); return &ctx->X4; + case CV_ARM64_X0 + 5: *size = sizeof(ctx->X5); return &ctx->X5; + case CV_ARM64_X0 + 6: *size = sizeof(ctx->X6); return &ctx->X6; + case CV_ARM64_X0 + 7: *size = sizeof(ctx->X7); return &ctx->X7; + case CV_ARM64_X0 + 8: *size = sizeof(ctx->X8); return &ctx->X8; + case CV_ARM64_X0 + 9: *size = sizeof(ctx->X9); return &ctx->X9; + case CV_ARM64_X0 + 10: *size = sizeof(ctx->X10); return &ctx->X10; + case CV_ARM64_X0 + 11: *size = sizeof(ctx->X11); return &ctx->X11; + case CV_ARM64_X0 + 12: *size = sizeof(ctx->X12); return &ctx->X12; + case CV_ARM64_X0 + 13: *size = sizeof(ctx->X13); return &ctx->X13; + case CV_ARM64_X0 + 14: *size = sizeof(ctx->X14); return &ctx->X14; + case CV_ARM64_X0 + 15: *size = sizeof(ctx->X15); return &ctx->X15; + case CV_ARM64_X0 + 16: *size = sizeof(ctx->X16); return &ctx->X16; + case CV_ARM64_X0 + 17: *size = sizeof(ctx->X17); return &ctx->X17; + case CV_ARM64_X0 + 18: *size = sizeof(ctx->X18); return &ctx->X18; + case CV_ARM64_X0 + 19: *size = sizeof(ctx->X19); return &ctx->X19; + case CV_ARM64_X0 + 20: *size = sizeof(ctx->X20); return &ctx->X20; + case CV_ARM64_X0 + 21: *size = sizeof(ctx->X21); return &ctx->X21; + case CV_ARM64_X0 + 22: *size = sizeof(ctx->X22); return &ctx->X22; + case CV_ARM64_X0 + 23: *size = sizeof(ctx->X23); return &ctx->X23; + case CV_ARM64_X0 + 24: *size = sizeof(ctx->X24); return &ctx->X24; + case CV_ARM64_X0 + 25: *size = sizeof(ctx->X25); return &ctx->X25; + case CV_ARM64_X0 + 26: *size = sizeof(ctx->X26); return &ctx->X26; + case CV_ARM64_X0 + 27: *size = sizeof(ctx->X27); return &ctx->X27; + case CV_ARM64_X0 + 28: *size = sizeof(ctx->X28); return &ctx->X28; + case CV_ARM64_X0 + 29: *size = sizeof(ctx->X29); return &ctx->X29; + case CV_ARM64_X0 + 30: *size = sizeof(ctx->X30); return &ctx->X30; + + case CV_ARM64_SP: *size = sizeof(ctx->Sp); return &ctx->Sp; + case CV_ARM64_PC: *size = sizeof(ctx->Pc); return &ctx->Pc; + case CV_ARM64_PSTATE: *size = sizeof(ctx->PState); return &ctx->PState; + } +#endif + FIXME("Unknown register %x\n", regno); + return NULL; +} + +static const char* arm64_fetch_regname(unsigned regno) +{ + switch (regno) + { + case CV_ARM64_X0 + 0: return "x0"; + case CV_ARM64_X0 + 1: return "x1"; + case CV_ARM64_X0 + 2: return "x2"; + case CV_ARM64_X0 + 3: return "x3"; + case CV_ARM64_X0 + 4: return "x4"; + case CV_ARM64_X0 + 5: return "x5"; + case CV_ARM64_X0 + 6: return "x6"; + case CV_ARM64_X0 + 7: return "x7"; + case CV_ARM64_X0 + 8: return "x8"; + case CV_ARM64_X0 + 9: return "x9"; + case CV_ARM64_X0 + 10: return "x10"; + case CV_ARM64_X0 + 11: return "x11"; + case CV_ARM64_X0 + 12: return "x12"; + case CV_ARM64_X0 + 13: return "x13"; + case CV_ARM64_X0 + 14: return "x14"; + case CV_ARM64_X0 + 15: return "x15"; + case CV_ARM64_X0 + 16: return "x16"; + case CV_ARM64_X0 + 17: return "x17"; + case CV_ARM64_X0 + 18: return "x18"; + case CV_ARM64_X0 + 19: return "x19"; + case CV_ARM64_X0 + 20: return "x20"; + case CV_ARM64_X0 + 21: return "x21"; + case CV_ARM64_X0 + 22: return "x22"; + case CV_ARM64_X0 + 23: return "x23"; + case CV_ARM64_X0 + 24: return "x24"; + case CV_ARM64_X0 + 25: return "x25"; + case CV_ARM64_X0 + 26: return "x26"; + case CV_ARM64_X0 + 27: return "x27"; + case CV_ARM64_X0 + 28: return "x28"; + case CV_ARM64_X0 + 29: return "x29"; + case CV_ARM64_X0 + 30: return "x30"; + + case CV_ARM64_SP: return "sp"; + case CV_ARM64_PC: return "pc"; + case CV_ARM64_PSTATE: return "cpsr"; + } + FIXME("Unknown register %x\n", regno); + return NULL; +} + +static BOOL arm64_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx) +{ + if (ctx->ContextFlags && (flags & ThreadWriteInstructionWindow)) + { + /* FIXME: crop values across module boundaries, */ +#ifdef __aarch64__ + ULONG base = ctx->Pc <= 0x80 ? 0 : ctx->Pc - 0x80; + minidump_add_memory_block(dc, base, ctx->Pc + 0x80 - base, 0); +#endif + } + + return TRUE; +} + +static BOOL arm64_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) +{ + /* FIXME: actually, we should probably take care of FPO data, unless it's stored in + * function table minidump stream + */ + return FALSE; +} + +DECLSPEC_HIDDEN struct cpu cpu_arm64 = { + IMAGE_FILE_MACHINE_ARM64, + 8, + CV_ARM64_X0 + 29, + arm64_get_addr, + arm64_stack_walk, + NULL, + arm64_map_dwarf_register, + arm64_fetch_context_reg, + arm64_fetch_regname, + arm64_fetch_minidump_thread, + arm64_fetch_minidump_module, +}; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 358902b..9f3b82f 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -151,9 +151,9 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr) } } -extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_sparc, cpu_arm; +extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_sparc, cpu_arm, cpu_arm64; -static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_sparc, &cpu_arm, NULL}; +static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_sparc, &cpu_arm, &cpu_arm64, NULL}; struct cpu* dbghelp_current_cpu = #if defined(__i386__) &cpu_i386 @@ -165,6 +165,8 @@ struct cpu* dbghelp_current_cpu = &cpu_sparc #elif defined(__arm__) &cpu_arm +#elif defined(__aarch64__) + &cpu_arm64 #else #error define support for your CPU #endif diff --git a/include/cvconst.h b/include/cvconst.h index 84ff3a0..8b48f78 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -677,6 +677,13 @@ enum CV_HREG_e CV_SPARC_Y = 45, CV_SPARC_WIM = 46, CV_SPARC_TBR = 47, + + /* Wine extension */ + CV_ARM64_NOREG = CV_REG_NONE, + CV_ARM64_X0 = 10, /* this includes X0 to X30 */ + CV_ARM64_SP = 41, + CV_ARM64_PC = 42, + CV_ARM64_PSTATE = 43, }; typedef enum

1 0

André Hentschel : winedbg: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: d62d7474d43949d71ac34e2157c2fdb83341e330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62d7474d43949d71ac34e215… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:56:51 2013 +0100 winedbg: Add ARM64 support. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/be_arm64.c | 309 +++++++++++++++++++++++++++++++++++++++++ programs/winedbg/gdbproxy.c | 36 +++++ programs/winedbg/tgt_active.c | 2 + programs/winedbg/winedbg.c | 4 + 5 files changed, 352 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d62d7474d43949d71ac34…

1 0

André Hentschel : winetest: Add ARM64 support.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: fcc204c989928e4304f3b93a7bbcfba8129c036e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc204c989928e4304f3b93a7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:57:34 2013 +0100 winetest: Add ARM64 support. --- programs/winetest/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index cc73f94..427b6b4 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -319,6 +319,8 @@ static void print_version (void) static const char platform[] = "powerpc"; #elif defined(__arm__) static const char platform[] = "arm"; +#elif defined(__aarch64__) + static const char platform[] = "arm64"; #else # error CPU unknown #endif

1 0

Eric Pouech : Various background processes must be launched detached from current console (if any).
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: d1ccbceb4dea9e25912108058d7c29e49709ec7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ccbceb4dea9e25912108058… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 14 21:20:06 2013 +0100 Various background processes must be launched detached from current console (if any). --- dlls/appwiz.cpl/addons.c | 2 +- dlls/dinput/dinput_main.c | 2 +- dlls/ieframe/intshcut.c | 2 +- dlls/ole32/moniker.c | 2 +- dlls/ole32/rpc.c | 2 +- dlls/rpcrt4/rpc_epmap.c | 2 +- dlls/shell32/shelllink.c | 2 +- programs/wineboot/wineboot.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4eb37c7..2a47b84 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -630,7 +630,7 @@ static void run_winebrowser(const WCHAR *url) memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessW(app, args, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi); heap_free(args); if (ret) { CloseHandle(pi.hThread); diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c07b333..87041e4 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -656,7 +656,7 @@ static HRESULT WINAPI IDirectInputAImpl_RunControlPanel(LPDIRECTINPUT7A iface, if (!This->initialized) return DIERR_NOTINITIALIZED; - if (!CreateProcessW(NULL, control_exeW, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + if (!CreateProcessW(NULL, control_exeW, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) return HRESULT_FROM_WIN32(GetLastError()); return DI_OK; diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 7107a0a..71373c7 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -108,7 +108,7 @@ static BOOL run_winemenubuilder( const WCHAR *args ) si.cb = sizeof(si); Wow64DisableWow64FsRedirection( &redir ); - ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ); Wow64RevertWow64FsRedirection( redir ); heap_free( buffer ); diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 1d7f219..8d4e98f 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -146,7 +146,7 @@ static BOOL start_rpcss(void) strcatW( cmd, rpcss ); Wow64DisableWow64FsRedirection( &redir ); - rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ); Wow64RevertWow64FsRedirection( redir ); if (rslt) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 9b57206..5c981bb 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1680,7 +1680,7 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) /* FIXME: Win2003 supports a ServerExecutable value that is passed into * CreateProcess */ - if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &sinfo, &pinfo)) { + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) { WARN("failed to run local server %s\n", debugstr_w(command)); return HRESULT_FROM_WIN32(GetLastError()); } diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index f079ff4..540c1c4 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -92,7 +92,7 @@ static BOOL start_rpcss(void) lstrcatW( cmd, rpcss ); Wow64DisableWow64FsRedirection( &redir ); - rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ); Wow64RevertWow64FsRedirection( redir ); if (rslt) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index e325e2e..e2889ba 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -439,7 +439,7 @@ BOOL run_winemenubuilder( const WCHAR *args ) si.cb = sizeof(si); Wow64DisableWow64FsRedirection( &redir ); - ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ); Wow64RevertWow64FsRedirection( redir ); HeapFree( GetProcessHeap(), 0, buffer ); diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0be773b..7b68747 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -851,7 +851,7 @@ static BOOL start_services_process(void) strcatW(path, services); ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); - if (!CreateProcessW(path, path, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) + if (!CreateProcessW(path, path, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) { WINE_ERR("Couldn't start services.exe: error %u\n", GetLastError()); return FALSE;

1 0

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

16 Jan '13

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