wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

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

16 Jan '13

Module: wine Branch: master Commit: 198b70cb9d6f144be83d96a1912dc3b5799988c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=198b70cb9d6f144be83d96a19… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:45:06 2013 +0100 wrc: Add ARM64 support. --- tools/wrc/wrc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 7d5ad89..ac1fdcc 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -318,7 +318,8 @@ static void set_target( const char *target ) /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ if (!(p = strchr( cpu, '-' ))) error( "Invalid target specification '%s'\n", target ); *p = 0; - if (!strcmp( cpu, "amd64" ) || !strcmp( cpu, "x86_64" ) || !strcmp( cpu, "ia64" )) + if (!strcmp( cpu, "amd64" ) || !strcmp( cpu, "x86_64" ) || + !strcmp( cpu, "ia64" ) || !strcmp( cpu, "aarch64" )) pointer_size = 8; else pointer_size = 4;

1 0

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

16 Jan '13

Module: wine Branch: master Commit: 3ea316638dc79ba031aadeb7a3c992c1c3235cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea316638dc79ba031aadeb7a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:44:33 2013 +0100 widl: Add ARM64 support. --- tools/widl/widl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1718247..5626d13 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -266,7 +266,8 @@ static void set_target( const char *target ) { "sparc", SYS_WIN32 }, { "alpha", SYS_WIN32 }, { "powerpc", SYS_WIN32 }, - { "arm", SYS_WIN32 } + { "arm", SYS_WIN32 }, + { "aarch64", SYS_WIN64 } }; unsigned int i;

1 0

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

16 Jan '13

Module: wine Branch: master Commit: 99f722e24f869bfc12424aa25973675e0fe13571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f722e24f869bfc12424aa25… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:43:39 2013 +0100 winegcc: Add ARM64 support. --- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 70316c9..a75b3cc 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -37,7 +37,7 @@ enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; enum target_platform diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3550960..2432bf3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -160,7 +160,8 @@ static const struct { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, { "powerpc", CPU_POWERPC }, - { "arm", CPU_ARM } + { "arm", CPU_ARM }, + { "aarch64", CPU_ARM64 } }; static const struct @@ -223,6 +224,8 @@ static const enum target_cpu build_cpu = CPU_SPARC; static const enum target_cpu build_cpu = CPU_POWERPC; #elif defined(__arm__) static const enum target_cpu build_cpu = CPU_ARM; +#elif defined(__aarch64__) +static const enum target_cpu build_cpu = CPU_ARM64; #else #error Unsupported CPU #endif @@ -344,10 +347,10 @@ static int check_platform( struct options *opts, const char *file ) { if (header[4] == 2) /* 64-bit */ ret = (opts->force_pointer_size == 8 || - (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)); + (!opts->force_pointer_size && (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64))); else ret = (opts->force_pointer_size == 4 || - (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)); + (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64)); } } close( fd ); @@ -370,13 +373,13 @@ static char *get_lib_dir( struct options *opts ) strcpy( p, libwine ); if (check_platform( opts, buffer )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; - if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)) + if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64)) { strcpy( p, "32" ); strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; } - if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)) + if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64))) { strcpy( p, "64" ); strcat( p, libwine ); @@ -438,7 +441,7 @@ static void compile(struct options* opts, const char* lang) strarray_addall(comp_args, strarray_fromstring(DLLFLAGS, " ")); } - if (opts->target_cpu == CPU_x86_64) + if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) { strarray_add(comp_args, "-DWIN64"); strarray_add(comp_args, "-D_WIN64"); @@ -505,7 +508,7 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D__int8=char"); strarray_add(comp_args, "-D__int16=short"); strarray_add(comp_args, "-D__int32=int"); - if (opts->target_cpu == CPU_x86_64) + if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) strarray_add(comp_args, "-D__int64=long"); else strarray_add(comp_args, "-D__int64=long long"); @@ -1399,6 +1402,8 @@ int main(int argc, char **argv) { if (opts.target_cpu == CPU_x86_64) opts.target_cpu = CPU_x86; + else if (opts.target_cpu == CPU_ARM64) + opts.target_cpu = CPU_ARM; opts.force_pointer_size = 4; raw_linker_arg = 1; }

1 0

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

16 Jan '13

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

Alexandre Julliard : libport: Implemented the interlocked_cmpxchg128 function for ARM64.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: cf66a1f0eed0d71ad45a365c5c51a8a35df2c591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf66a1f0eed0d71ad45a365c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 12:34:51 2013 +0100 libport: Implemented the interlocked_cmpxchg128 function for ARM64. --- libs/port/interlocked.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 143d226..135bfc1 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -313,28 +313,6 @@ __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) return compare; } -#ifdef __aarch64__ -int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) -{ - int retv; - pthread_mutex_lock( &interlocked_mutex ); - if (dest[0] == compare[0] && dest[1] == compare[1]) - { - dest[0] = xchg_low; - dest[1] = xchg_high; - retv = 1; - } - else - { - compare[0] = dest[0]; - compare[1] = dest[1]; - retv = 0; - } - pthread_mutex_unlock( &interlocked_mutex ); - return retv; -} -#endif - int interlocked_xchg( int *dest, int val ) { int retv; @@ -365,4 +343,26 @@ int interlocked_xchg_add( int *dest, int incr ) return retv; } +#ifdef _WIN64 +int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + int retv; + pthread_mutex_lock( &interlocked_mutex ); + if (dest[0] == compare[0] && dest[1] == compare[1]) + { + dest[0] = xchg_low; + dest[1] = xchg_high; + retv = 1; + } + else + { + compare[0] = dest[0]; + compare[1] = dest[1]; + retv = 0; + } + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} +#endif + #endif

1 0

André Hentschel : libport: Implemented the interlocked_cmpxchg128 function for ARM64.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: c2ef2edf850a4cf27cae53b1664d1a40e80eb8e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ef2edf850a4cf27cae53b16… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:42:12 2013 +0100 libport: Implemented the interlocked_cmpxchg128 function for ARM64. --- libs/port/interlocked.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index eb14daa..143d226 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -313,6 +313,28 @@ __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) return compare; } +#ifdef __aarch64__ +int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + int retv; + pthread_mutex_lock( &interlocked_mutex ); + if (dest[0] == compare[0] && dest[1] == compare[1]) + { + dest[0] = xchg_low; + dest[1] = xchg_high; + retv = 1; + } + else + { + compare[0] = dest[0]; + compare[1] = dest[1]; + retv = 0; + } + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} +#endif + int interlocked_xchg( int *dest, int val ) { int retv;

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013