April 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : wininet: Use an accessor function instead of directly accessing the X509_STORE_CTX structure .
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 5b4be5d4c3fa3e43ea19f836e2831d6ba978ad3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4be5d4c3fa3e43ea19f836e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 20 16:28:27 2011 +0200 wininet: Use an accessor function instead of directly accessing the X509_STORE_CTX structure. --- dlls/wininet/netconnection.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index cfc4e7c..5a4be9a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -162,6 +162,7 @@ MAKE_FUNCPTR(ERR_free_strings); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); +MAKE_FUNCPTR(X509_STORE_CTX_get_chain); MAKE_FUNCPTR(i2d_X509); MAKE_FUNCPTR(sk_num); MAKE_FUNCPTR(sk_value); @@ -328,13 +329,14 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) X509 *cert; int i; PCCERT_CONTEXT endCert = NULL; + struct stack_st *chain = (struct stack_st *)pX509_STORE_CTX_get_chain( ctx ); ret = TRUE; - for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++) + for (i = 0; ret && i < psk_num(chain); i++) { PCCERT_CONTEXT context; - cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i); + cert = (X509 *)psk_value(chain, i); if ((context = X509_to_cert_context(cert))) { if (i == 0) @@ -452,6 +454,7 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); DYNCRYPTO(X509_STORE_CTX_get_ex_data); + DYNCRYPTO(X509_STORE_CTX_get_chain); DYNCRYPTO(i2d_X509); DYNCRYPTO(sk_num); DYNCRYPTO(sk_value);

1 0

Alexandre Julliard : winhttp: Use an accessor function instead of directly accessing the X509_STORE_CTX structure .
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 84f2960e5b2e9c0e7fce104dbb3060573e94de85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f2960e5b2e9c0e7fce104db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 20 16:28:31 2011 +0200 winhttp: Use an accessor function instead of directly accessing the X509_STORE_CTX structure. --- dlls/winhttp/net.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 38fd2cb..02ba1af 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -134,6 +134,7 @@ MAKE_FUNCPTR( ERR_free_strings ); MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); +MAKE_FUNCPTR( X509_STORE_CTX_get_chain ); MAKE_FUNCPTR( i2d_X509 ); MAKE_FUNCPTR( sk_value ); MAKE_FUNCPTR( sk_num ); @@ -370,13 +371,14 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) X509 *cert; int i; PCCERT_CONTEXT endCert = NULL; + struct stack_st *chain = (struct stack_st *)pX509_STORE_CTX_get_chain( ctx ); ret = TRUE; - for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++) + for (i = 0; ret && i < psk_num(chain); i++) { PCCERT_CONTEXT context; - cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i); + cert = (X509 *)psk_value(chain, i); if ((context = X509_to_cert_context( cert ))) { if (i == 0) @@ -484,6 +486,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( ERR_get_error ); LOAD_FUNCPTR( ERR_error_string ); LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); + LOAD_FUNCPTR( X509_STORE_CTX_get_chain ); LOAD_FUNCPTR( i2d_X509 ); LOAD_FUNCPTR( sk_value ); LOAD_FUNCPTR( sk_num );

1 0

André Hentschel : configure: Remove Alpha check.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 8bfb81dbf64e248e9aa183fb9dccccbb8251af40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfb81dbf64e248e9aa183fb9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 19:36:01 2011 +0200 configure: Remove Alpha check. --- configure | 26 -------------------------- configure.ac | 1 - 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/configure b/configure index 0e6dea4..12783b3 100755 --- a/configure +++ b/configure @@ -14422,32 +14422,6 @@ if test $ac_cv_cpp_def___x86_64__ = yes; then : CFLAGS="$CFLAGS -D__x86_64__" LINTFLAGS="$LINTFLAGS -D__x86_64__" fi ;; - *alpha*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __ALPHA__" >&5 -$as_echo_n "checking whether we need to define __ALPHA__... " >&6; } -if test "${ac_cv_cpp_def___ALPHA__+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __ALPHA__ -yes -#endif -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : - ac_cv_cpp_def___ALPHA__=yes -else - ac_cv_cpp_def___ALPHA__=no -fi -rm -f conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___ALPHA__" >&5 -$as_echo "$ac_cv_cpp_def___ALPHA__" >&6; } -if test $ac_cv_cpp_def___ALPHA__ = yes; then : - CFLAGS="$CFLAGS -D__ALPHA__" - LINTFLAGS="$LINTFLAGS -D__ALPHA__" -fi ;; *sparc*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __sparc__" >&5 $as_echo_n "checking whether we need to define __sparc__... " >&6; } if test "${ac_cv_cpp_def___sparc__+set}" = set; then : diff --git a/configure.ac b/configure.ac index 6047744..2b92883 100644 --- a/configure.ac +++ b/configure.ac @@ -2332,7 +2332,6 @@ dnl *** check for the need to define platform-specific symbols case $host_cpu in *i[[3456789]]86*) WINE_CHECK_DEFINE([__i386__]) ;; *x86_64*) WINE_CHECK_DEFINE([__x86_64__]) ;; - *alpha*) WINE_CHECK_DEFINE([__ALPHA__]) ;; *sparc*) WINE_CHECK_DEFINE([__sparc__]) ;; *powerpc*) WINE_CHECK_DEFINE([__powerpc__]) ;; esac

1 0

André Hentschel : winegcc: Remove Alpha support.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 40cecfc20dda10c94ca962ef7dddbe267a5eb84b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cecfc20dda10c94ca962ef7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 19:29:16 2011 +0200 winegcc: Remove Alpha support. --- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 7e124c2..70316c9 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_ALPHA, CPU_POWERPC, CPU_ARM + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM }; enum target_platform diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 8a22dfe..f135e71 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -159,7 +159,6 @@ static const struct { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, - { "alpha", CPU_ALPHA }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM } }; @@ -219,8 +218,6 @@ static const enum target_cpu build_cpu = CPU_x86; static const enum target_cpu build_cpu = CPU_x86_64; #elif defined(__sparc__) static const enum target_cpu build_cpu = CPU_SPARC; -#elif defined(__ALPHA__) -static const enum target_cpu build_cpu = CPU_ALPHA; #elif defined(__powerpc__) static const enum target_cpu build_cpu = CPU_POWERPC; #elif defined(__arm__)

1 0

André Hentschel : server: Remove Alpha support.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 417e926a80fcbdbce44a8adbc3c31405f9726434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=417e926a80fcbdbce44a8adbc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 19:27:36 2011 +0200 server: Remove Alpha support. --- include/wine/server_protocol.h | 9 +----- server/protocol.def | 7 +----- server/thread.c | 6 ----- server/trace.c | 49 ---------------------------------------- 4 files changed, 3 insertions(+), 68 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e1015dd..98bc101 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_ALPHA, CPU_POWERPC, CPU_ARM, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_SPARC }; typedef int cpu_type_t; @@ -143,8 +143,6 @@ typedef struct struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs; struct { unsigned __int64 rip, rbp, rsp; unsigned int cs, ss, flags, __pad; } x86_64_regs; - struct { unsigned __int64 fir; - unsigned int psr, __pad; } alpha_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 int psr, pc, npc, y, wim, tbr; } sparc_regs; @@ -154,8 +152,6 @@ typedef struct struct { unsigned int eax, ebx, ecx, edx, esi, edi; } i386_regs; struct { unsigned __int64 rax,rbx, rcx, rdx, rsi, rdi, r8, r9, r10, r11, r12, r13, r14, r15; } x86_64_regs; - struct { unsigned __int64 v0, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, - s0, s1, s2, s3, s4, s5, s6, a0, a1, a2, a3, a4, a5, at; } alpha_regs; struct { unsigned int gpr[32], cr, xer; } powerpc_regs; struct { unsigned int r[13]; } arm_regs; struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; @@ -170,7 +166,6 @@ typedef struct struct { unsigned int ctrl, status, tag, err_off, err_sel, data_off, data_sel, cr0npx; unsigned char regs[80]; } i386_regs; struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; - struct { unsigned __int64 f[32], fpcr, softfpcr; } alpha_regs; struct { double fpr[32], fpscr; } powerpc_regs; } fp; union @@ -5563,6 +5558,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 420 +#define SERVER_PROTOCOL_VERSION 421 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 8e50ed9..7e0f0c8 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_ALPHA, CPU_POWERPC, CPU_ARM, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_SPARC }; typedef int cpu_type_t; @@ -159,8 +159,6 @@ typedef struct struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs; struct { unsigned __int64 rip, rbp, rsp; unsigned int cs, ss, flags, __pad; } x86_64_regs; - struct { unsigned __int64 fir; - unsigned int psr, __pad; } alpha_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 int psr, pc, npc, y, wim, tbr; } sparc_regs; @@ -170,8 +168,6 @@ typedef struct struct { unsigned int eax, ebx, ecx, edx, esi, edi; } i386_regs; struct { unsigned __int64 rax,rbx, rcx, rdx, rsi, rdi, r8, r9, r10, r11, r12, r13, r14, r15; } x86_64_regs; - struct { unsigned __int64 v0, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, - s0, s1, s2, s3, s4, s5, s6, a0, a1, a2, a3, a4, a5, at; } alpha_regs; struct { unsigned int gpr[32], cr, xer; } powerpc_regs; struct { unsigned int r[13]; } arm_regs; struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; @@ -186,7 +182,6 @@ typedef struct struct { unsigned int ctrl, status, tag, err_off, err_sel, data_off, data_sel, cr0npx; unsigned char regs[80]; } i386_regs; struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; - struct { unsigned __int64 f[32], fpcr, softfpcr; } alpha_regs; struct { double fpr[32], fpscr; } powerpc_regs; } fp; /* selected by SERVER_CTX_FLOATING_POINT */ union diff --git a/server/thread.c b/server/thread.c index 983ba2d..392c4a4 100644 --- a/server/thread.c +++ b/server/thread.c @@ -57,8 +57,6 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_x86); #elif defined(__x86_64__) static const unsigned int supported_cpus = CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_x86); -#elif defined(__ALPHA__) -static const unsigned int supported_cpus = CPU_FLAG(CPU_ALPHA); #elif defined(__powerpc__) static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); #elif defined(__sparc__) @@ -1017,7 +1015,6 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) { case CPU_x86: return SERVER_CTX_DEBUG_REGISTERS; case CPU_x86_64: return SERVER_CTX_DEBUG_REGISTERS; - case CPU_ALPHA: return 0; case CPU_POWERPC: return 0; case CPU_ARM: return 0; case CPU_SPARC: return 0; @@ -1044,9 +1041,6 @@ void break_thread( struct thread *thread ) case CPU_x86_64: data.exception.address = thread->context->ctl.x86_64_regs.rip; break; - case CPU_ALPHA: - data.exception.address = thread->context->ctl.alpha_regs.fir; - break; case CPU_POWERPC: data.exception.address = thread->context->ctl.powerpc_regs.iar; break; diff --git a/server/trace.c b/server/trace.c index a723c6c..2d2d82b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -113,7 +113,6 @@ static void dump_cpu_type( const char *prefix, const cpu_type_t *code ) #define CASE(c) case CPU_##c: fprintf( stderr, "%s%s", prefix, #c ); break CASE(x86); CASE(x86_64); - CASE(ALPHA); CASE(POWERPC); CASE(SPARC); default: fprintf( stderr, "%s%u", prefix, *code ); break; @@ -530,54 +529,6 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) (unsigned int)ctx.fp.x86_64_regs.fpregs[i].low ); } break; - case CPU_ALPHA: - if (ctx.flags & SERVER_CTX_CONTROL) - { - dump_uint64( ",fir=", &ctx.ctl.alpha_regs.fir ); - fprintf( stderr, ",psr=%08x", ctx.ctl.alpha_regs.psr ); - } - if (ctx.flags & SERVER_CTX_INTEGER) - { - dump_uint64( ",v0=", &ctx.integer.alpha_regs.v0 ); - dump_uint64( ",t0=", &ctx.integer.alpha_regs.t0 ); - dump_uint64( ",t1=", &ctx.integer.alpha_regs.t1 ); - dump_uint64( ",t2=", &ctx.integer.alpha_regs.t2 ); - dump_uint64( ",t3=", &ctx.integer.alpha_regs.t3 ); - dump_uint64( ",t4=", &ctx.integer.alpha_regs.t4 ); - dump_uint64( ",t5=", &ctx.integer.alpha_regs.t5 ); - dump_uint64( ",t6=", &ctx.integer.alpha_regs.t6 ); - dump_uint64( ",t7=", &ctx.integer.alpha_regs.t7 ); - dump_uint64( ",t8=", &ctx.integer.alpha_regs.t8 ); - dump_uint64( ",t9=", &ctx.integer.alpha_regs.t9 ); - dump_uint64( ",t10=", &ctx.integer.alpha_regs.t10 ); - dump_uint64( ",t11=", &ctx.integer.alpha_regs.t11 ); - dump_uint64( ",t12=", &ctx.integer.alpha_regs.t12 ); - dump_uint64( ",s0=", &ctx.integer.alpha_regs.s0 ); - dump_uint64( ",s1=", &ctx.integer.alpha_regs.s1 ); - dump_uint64( ",s2=", &ctx.integer.alpha_regs.s2 ); - dump_uint64( ",s3=", &ctx.integer.alpha_regs.s3 ); - dump_uint64( ",s4=", &ctx.integer.alpha_regs.s4 ); - dump_uint64( ",s5=", &ctx.integer.alpha_regs.s5 ); - dump_uint64( ",s6=", &ctx.integer.alpha_regs.s6 ); - dump_uint64( ",a0=", &ctx.integer.alpha_regs.a0 ); - dump_uint64( ",a1=", &ctx.integer.alpha_regs.a1 ); - dump_uint64( ",a2=", &ctx.integer.alpha_regs.a2 ); - dump_uint64( ",a3=", &ctx.integer.alpha_regs.a3 ); - dump_uint64( ",a4=", &ctx.integer.alpha_regs.a4 ); - dump_uint64( ",a5=", &ctx.integer.alpha_regs.a5 ); - dump_uint64( ",at=", &ctx.integer.alpha_regs.at ); - } - if (ctx.flags & SERVER_CTX_FLOATING_POINT) - { - for (i = 0; i < 32; i++) - { - fprintf( stderr, ",f%u", i ); - dump_uint64( "=", &ctx.fp.alpha_regs.f[i] ); - } - dump_uint64( ",fpcr=", &ctx.fp.alpha_regs.fpcr ); - dump_uint64( ",softfpcr=", &ctx.fp.alpha_regs.softfpcr ); - } - break; case CPU_POWERPC: if (ctx.flags & SERVER_CTX_CONTROL) fprintf( stderr, ",iar=%08x,msr=%08x,ctr=%08x,lr=%08x,dar=%08x,dsisr=%08x,trap=%08x",

1 0

André Hentschel : winetest: Remove Alpha support.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 71af7f1ffa9ccb83f97edf08fa722296c6aa47d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71af7f1ffa9ccb83f97edf08f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 19:25:00 2011 +0200 winetest: Remove Alpha support. --- programs/winetest/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 70a1e1c..3316b44 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -312,8 +312,6 @@ static void print_version (void) static const char platform[] = "x86_64"; #elif defined(__sparc__) static const char platform[] = "sparc"; -#elif defined(__ALPHA__) - static const char platform[] = "alpha"; #elif defined(__powerpc__) static const char platform[] = "powerpc"; #elif defined(__arm__)

1 0

André Hentschel : winebuild: Copy IMAGE_FILE_MACHINE_SPARC from winnt.h and use it.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: d4cf5489e8fd4f2bc783e7278335782a8657a5ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4cf5489e8fd4f2bc783e7278… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 19:32:39 2011 +0200 winebuild: Copy IMAGE_FILE_MACHINE_SPARC from winnt.h and use it. --- tools/winebuild/spec32.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index e55acf0..6642661 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -37,6 +37,8 @@ #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_FILE_MACHINE_ARM 0x01C0 +/* Wine extension */ +#define IMAGE_FILE_MACHINE_SPARC 0x2000 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240 @@ -465,7 +467,7 @@ void output_module( DLLSPEC *spec ) case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARM; break; case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; - case CPU_SPARC: machine = IMAGE_FILE_MACHINE_UNKNOWN; break; + case CPU_SPARC: machine = IMAGE_FILE_MACHINE_SPARC; break; } output( "\t%s 0x%04x\n", /* Machine */ get_asm_short_keyword(), machine ); @@ -651,7 +653,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_x86: put_word( IMAGE_FILE_MACHINE_I386 ); break; case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; - case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_UNKNOWN ); break; + case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_SPARC ); break; case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARM ); break; } put_word( nb_sections ); /* NumberOfSections */

1 0

André Hentschel : winedbg: Remove Alpha support.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 18aaad2063a398f0d1f2e747caa7f260c890462b URL: http://source.winehq.org/git/wine.git/?a=commit;h=18aaad2063a398f0d1f2e747c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 19:28:23 2011 +0200 winedbg: Remove Alpha support. --- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_alpha.c | 177 ------------------------------------------ programs/winedbg/gdbproxy.c | 72 ----------------- programs/winedbg/winedbg.c | 4 - 4 files changed, 0 insertions(+), 254 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index aba9e44..34d7c35 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -6,7 +6,6 @@ EXTRALIBS = @LIBPOLL@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = \ - be_alpha.c \ be_arm.c \ be_i386.c \ be_ppc.c \ diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c deleted file mode 100644 index f16952c..0000000 --- a/programs/winedbg/be_alpha.c +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Debugger Alpha specific functions - * - * Copyright 2004 Vincent Béron - * - * 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 "debugger.h" - -#if defined(__ALPHA__) - -static unsigned be_alpha_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum be_cpu_addr bca, ADDRESS64* addr) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static unsigned be_alpha_get_register_info(int regno, enum be_cpu_addr* kind) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static void be_alpha_single_step(CONTEXT* ctx, unsigned enable) -{ - dbg_printf("not done\n"); -} - -static void be_alpha_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) -{ - dbg_printf("Context printing for Alpha not done yet\n"); -} - -static void be_alpha_print_segment_info(HANDLE hThread, const CONTEXT* ctx) -{ -} - -static struct dbg_internal_var be_alpha_ctx[] = -{ - {0, NULL, 0, dbg_itype_none} -}; - -static unsigned be_alpha_is_step_over_insn(const void* insn) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static unsigned be_alpha_is_function_return(const void* insn) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static unsigned be_alpha_is_break_insn(const void* insn) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static unsigned be_alpha_is_func_call(const void* insn, ADDRESS64* callee) -{ - return FALSE; -} - -static unsigned be_alpha_is_jump(const void* insn, ADDRESS64* jumpee) -{ - return FALSE; -} - -static void be_alpha_disasm_one_insn(ADDRESS64* addr, int display) -{ - dbg_printf("Disasm NIY\n"); -} - -static unsigned be_alpha_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, - CONTEXT* ctx, enum be_xpoint_type type, - void* addr, unsigned long* val, unsigned size) -{ - unsigned long xbp; - SIZE_T sz; - - switch (type) - { - case be_xpoint_break: - if (!size) return 0; - if (!pio->read(hProcess, addr, val, 4, &sz) || sz != 4) return 0; - xbp = 0x7d821008; /* 7d 82 10 08 ... in big endian */ - if (!pio->write(hProcess, addr, &xbp, 4, &sz) || sz != 4) return 0; - break; - default: - dbg_printf("Unknown/unsupported bp type %c\n", type); - return 0; - } - return 1; -} - -static unsigned be_alpha_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, - CONTEXT* ctx, enum be_xpoint_type type, - void* addr, unsigned long val, unsigned size) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static unsigned be_alpha_is_watchpoint_set(const CONTEXT* ctx, unsigned idx) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static void be_alpha_clear_watchpoint(CONTEXT* ctx, unsigned idx) -{ - dbg_printf("not done\n"); -} - -static int be_alpha_adjust_pc_for_break(CONTEXT* ctx, BOOL way) -{ - dbg_printf("not done\n"); - return 0; -} - -static int be_alpha_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, LONGLONG* ret) -{ - dbg_printf("not done\n"); - return FALSE; -} - -static int be_alpha_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) -{ - dbg_printf("not done\n"); - return FALSE; -} - -struct backend_cpu be_alpha = -{ - IMAGE_FILE_MACHINE_ALPHA, - 8, - be_cpu_linearize, - be_cpu_build_addr, - be_alpha_get_addr, - be_alpha_get_register_info, - be_alpha_single_step, - be_alpha_print_context, - be_alpha_print_segment_info, - be_alpha_ctx, - be_alpha_is_step_over_insn, - be_alpha_is_function_return, - be_alpha_is_break_insn, - be_alpha_is_func_call, - be_alpha_is_jump, - be_alpha_disasm_one_insn, - be_alpha_insert_Xpoint, - be_alpha_remove_Xpoint, - be_alpha_is_watchpoint_set, - be_alpha_clear_watchpoint, - be_alpha_adjust_pc_for_break, - be_alpha_fetch_integer, - be_alpha_fetch_float, -}; -#endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index fae1582..e81f72c 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -292,78 +292,6 @@ static size_t cpu_register_map[] = { /* FIXME: MQ is missing? FIELD_OFFSET(CONTEXT, Mq), */ /* see gdb/nlm/ppc.c */ }; -#elif defined(__ALPHA__) -static size_t cpu_register_map[] = { - FIELD_OFFSET(CONTEXT, IntV0), - FIELD_OFFSET(CONTEXT, IntT0), - FIELD_OFFSET(CONTEXT, IntT1), - FIELD_OFFSET(CONTEXT, IntT2), - FIELD_OFFSET(CONTEXT, IntT3), - FIELD_OFFSET(CONTEXT, IntT4), - FIELD_OFFSET(CONTEXT, IntT5), - FIELD_OFFSET(CONTEXT, IntT6), - FIELD_OFFSET(CONTEXT, IntT7), - FIELD_OFFSET(CONTEXT, IntS0), - FIELD_OFFSET(CONTEXT, IntS1), - FIELD_OFFSET(CONTEXT, IntS2), - FIELD_OFFSET(CONTEXT, IntS3), - FIELD_OFFSET(CONTEXT, IntS4), - FIELD_OFFSET(CONTEXT, IntS5), - FIELD_OFFSET(CONTEXT, IntFp), - FIELD_OFFSET(CONTEXT, IntA0), - FIELD_OFFSET(CONTEXT, IntA1), - FIELD_OFFSET(CONTEXT, IntA2), - FIELD_OFFSET(CONTEXT, IntA3), - FIELD_OFFSET(CONTEXT, IntA4), - FIELD_OFFSET(CONTEXT, IntA5), - FIELD_OFFSET(CONTEXT, IntT8), - FIELD_OFFSET(CONTEXT, IntT9), - FIELD_OFFSET(CONTEXT, IntT10), - FIELD_OFFSET(CONTEXT, IntT11), - FIELD_OFFSET(CONTEXT, IntRa), - FIELD_OFFSET(CONTEXT, IntT12), - FIELD_OFFSET(CONTEXT, IntAt), - FIELD_OFFSET(CONTEXT, IntGp), - FIELD_OFFSET(CONTEXT, IntSp), - FIELD_OFFSET(CONTEXT, IntZero), - FIELD_OFFSET(CONTEXT, FltF0), - FIELD_OFFSET(CONTEXT, FltF1), - FIELD_OFFSET(CONTEXT, FltF2), - FIELD_OFFSET(CONTEXT, FltF3), - FIELD_OFFSET(CONTEXT, FltF4), - FIELD_OFFSET(CONTEXT, FltF5), - FIELD_OFFSET(CONTEXT, FltF6), - FIELD_OFFSET(CONTEXT, FltF7), - FIELD_OFFSET(CONTEXT, FltF8), - FIELD_OFFSET(CONTEXT, FltF9), - FIELD_OFFSET(CONTEXT, FltF10), - FIELD_OFFSET(CONTEXT, FltF11), - FIELD_OFFSET(CONTEXT, FltF12), - FIELD_OFFSET(CONTEXT, FltF13), - FIELD_OFFSET(CONTEXT, FltF14), - FIELD_OFFSET(CONTEXT, FltF15), - FIELD_OFFSET(CONTEXT, FltF16), - FIELD_OFFSET(CONTEXT, FltF17), - FIELD_OFFSET(CONTEXT, FltF18), - FIELD_OFFSET(CONTEXT, FltF19), - FIELD_OFFSET(CONTEXT, FltF20), - FIELD_OFFSET(CONTEXT, FltF21), - FIELD_OFFSET(CONTEXT, FltF22), - FIELD_OFFSET(CONTEXT, FltF23), - FIELD_OFFSET(CONTEXT, FltF24), - FIELD_OFFSET(CONTEXT, FltF25), - FIELD_OFFSET(CONTEXT, FltF26), - FIELD_OFFSET(CONTEXT, FltF27), - FIELD_OFFSET(CONTEXT, FltF28), - FIELD_OFFSET(CONTEXT, FltF29), - FIELD_OFFSET(CONTEXT, FltF30), - FIELD_OFFSET(CONTEXT, FltF31), - - /* FIXME: Didn't look for the right order yet */ - FIELD_OFFSET(CONTEXT, Fir), - FIELD_OFFSET(CONTEXT, Fpcr), - FIELD_OFFSET(CONTEXT, SoftFpcr), -}; #elif defined(__x86_64__) static size_t cpu_register_map[] = { FIELD_OFFSET(CONTEXT, Rax), diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 03bff8c..a3a9f16 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -614,8 +614,6 @@ struct backend_cpu* be_cpu; extern struct backend_cpu be_i386; #elif defined(__powerpc__) extern struct backend_cpu be_ppc; -#elif defined(__ALPHA__) -extern struct backend_cpu be_alpha; #elif defined(__x86_64__) extern struct backend_cpu be_x86_64; #elif defined(__sparc__) @@ -636,8 +634,6 @@ int main(int argc, char** argv) be_cpu = &be_i386; #elif defined(__powerpc__) be_cpu = &be_ppc; -#elif defined(__ALPHA__) - be_cpu = &be_alpha; #elif defined(__x86_64__) be_cpu = &be_x86_64; #elif defined(__sparc__)

1 0

André Hentschel : winebuild: Remove Alpha support.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 46f52f77dccdaae22628b944e307177af5a91fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f52f77dccdaae22628b944e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 19:31:23 2011 +0200 winebuild: Remove Alpha support. --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 14 -------------- tools/winebuild/main.c | 2 -- tools/winebuild/spec32.c | 7 ------- tools/winebuild/utils.c | 4 ---- 5 files changed, 1 insertions(+), 28 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index b03b6b2..2429446 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_ALPHA, CPU_POWERPC, CPU_ARM, CPU_LAST = CPU_ARM + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_LAST = CPU_ARM }; enum target_platform diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8c97b32..a2c51ea 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -670,11 +670,6 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\trestore\n" ); } break; - case CPU_ALPHA: - output( "\tlda $0,%s\n", table ); - output( "\tlda $0,%d($0)\n", pos ); - output( "\tjmp $31,($0)\n" ); - break; case CPU_ARM: output( "\tldr IP,[PC,#0]\n"); output( "\tmov PC,PC\n"); @@ -989,10 +984,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp %%o0\n" ); output( "\trestore\n" ); break; - case CPU_ALPHA: - output( "\tjsr $26,%s\n", asm_name("__wine_spec_delay_load") ); - output( "\tjmp $31,($0)\n" ); - break; case CPU_ARM: output( "\tstmfd SP!, {r4-r10,FP,LR}\n" ); output( "\tmov LR,PC\n"); @@ -1082,11 +1073,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tset %d, %%g1\n", (idx << 16) | j ); output( "\tb,a %s\n", asm_name("__wine_delay_load_asm") ); break; - case CPU_ALPHA: - output( "\tlda $0,%d($31)\n", j); - output( "\tldah $0,%d($0)\n", idx); - output( "\tjmp $31,%s\n", asm_name("__wine_delay_load_asm") ); - break; case CPU_ARM: output( "\tstmfd SP!, {r0-r3}\n" ); output( "\tmov r0, #%d\n", idx ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 7c38e44..f6d39b0 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -55,8 +55,6 @@ enum target_cpu target_cpu = CPU_x86; enum target_cpu target_cpu = CPU_x86_64; #elif defined(__sparc__) enum target_cpu target_cpu = CPU_SPARC; -#elif defined(__ALPHA__) -enum target_cpu target_cpu = CPU_ALPHA; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 2429982..e55acf0 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -34,7 +34,6 @@ #define IMAGE_FILE_MACHINE_UNKNOWN 0 #define IMAGE_FILE_MACHINE_I386 0x014c -#define IMAGE_FILE_MACHINE_ALPHA 0x0184 #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_FILE_MACHINE_ARM 0x01C0 @@ -398,9 +397,6 @@ static void output_asm_constructor( const char *constructor ) output( "\tcall %s\n", asm_name(constructor) ); output( "\tnop\n" ); break; - case CPU_ALPHA: - output( "\tjsr $26,%s\n", asm_name(constructor) ); - break; case CPU_ARM: case CPU_POWERPC: output( "\tbl %s\n", asm_name(constructor) ); @@ -441,7 +437,6 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: case CPU_x86_64: - case CPU_ALPHA: case CPU_SPARC: output( "\tjmp 1f\n" ); break; @@ -470,7 +465,6 @@ void output_module( DLLSPEC *spec ) case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARM; break; case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; - case CPU_ALPHA: machine = IMAGE_FILE_MACHINE_ALPHA; break; case CPU_SPARC: machine = IMAGE_FILE_MACHINE_UNKNOWN; break; } output( "\t%s 0x%04x\n", /* Machine */ @@ -657,7 +651,6 @@ void output_fake_module( DLLSPEC *spec ) case CPU_x86: put_word( IMAGE_FILE_MACHINE_I386 ); break; case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; - case CPU_ALPHA: put_word( IMAGE_FILE_MACHINE_ALPHA ); break; case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_UNKNOWN ); break; case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARM ); break; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 9aadf14..ad637b6 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -57,7 +57,6 @@ static const struct { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, - { "alpha", CPU_ALPHA }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM } }; @@ -844,7 +843,6 @@ unsigned int get_alignment(unsigned int align) if (target_platform != PLATFORM_APPLE) return align; /* fall through */ case CPU_POWERPC: - case CPU_ALPHA: case CPU_ARM: n = 0; while ((1u << n) != align) n++; @@ -865,7 +863,6 @@ unsigned int get_page_size(void) case CPU_POWERPC: return 4096; case CPU_ARM: return 4096; case CPU_SPARC: return 8192; - case CPU_ALPHA: return 8192; } /* unreached */ assert(0); @@ -880,7 +877,6 @@ unsigned int get_ptr_size(void) case CPU_x86: case CPU_POWERPC: case CPU_SPARC: - case CPU_ALPHA: case CPU_ARM: return 4; case CPU_x86_64:

1 0

André Hentschel : libport: Remove Alpha support.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: ff2b5c453585c3553955ba5dc72dd12fddec0436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2b5c453585c3553955ba5dc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 19:24:48 2011 +0200 libport: Remove Alpha support. --- libs/port/interlocked.c | 57 ----------------------------------------------- 1 files changed, 0 insertions(+), 57 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 8fb9972..eb14daa 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -268,63 +268,6 @@ void* interlocked_xchg_ptr( void** dest, void* val ) return ret; } -#elif defined(__ALPHA__) && defined(__GNUC__) - -__ASM_GLOBAL_FUNC(interlocked_cmpxchg, - "L0cmpxchg:\n\t" - "ldl_l $0,0($16)\n\t" - "cmpeq $0,$18,$1\n\t" - "beq $1,L1cmpxchg\n\t" - "mov $17,$0\n\t" - "stl_c $0,0($16)\n\t" - "beq $0,L0cmpxchg\n\t" - "mov $18,$0\n" - "L1cmpxchg:\n\t" - "mb") - -__ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr, - "L0cmpxchg_ptr:\n\t" - "ldq_l $0,0($16)\n\t" - "cmpeq $0,$18,$1\n\t" - "beq $1,L1cmpxchg_ptr\n\t" - "mov $17,$0\n\t" - "stq_c $0,0($16)\n\t" - "beq $0,L0cmpxchg_ptr\n\t" - "mov $18,$0\n" - "L1cmpxchg_ptr:\n\t" - "mb") - -__int64 interlocked_cmpxchg64(__int64 *dest, __int64 xchg, __int64 compare) -{ - /* FIXME: add code */ - assert(0); -} - -__ASM_GLOBAL_FUNC(interlocked_xchg, - "L0xchg:\n\t" - "ldl_l $0,0($16)\n\t" - "mov $17,$1\n\t" - "stl_c $1,0($16)\n\t" - "beq $1,L0xchg\n\t" - "mb") - -__ASM_GLOBAL_FUNC(interlocked_xchg_ptr, - "L0xchg_ptr:\n\t" - "ldq_l $0,0($16)\n\t" - "mov $17,$1\n\t" - "stq_c $1,0($16)\n\t" - "beq $1,L0xchg_ptr\n\t" - "mb") - -__ASM_GLOBAL_FUNC(interlocked_xchg_add, - "L0xchg_add:\n\t" - "ldl_l $0,0($16)\n\t" - "addl $0,$17,$1\n\t" - "stl_c $1,0($16)\n\t" - "beq $1,L0xchg_add\n\t" - "mb") - - #else #include <pthread.h>

1 0