Module: wine Branch: master Commit: 0effd926b6475842baefc5379b9dd932c08ff14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0effd926b6475842baefc5379b...
Author: André Hentschel nerv@dawncrow.de Date: Wed Feb 20 21:10:16 2013 +0100
server: Remove SPARC support.
---
dlls/ntdll/server.c | 2 -- include/wine/server_protocol.h | 6 ++---- server/protocol.def | 4 +--- server/thread.c | 6 ------ server/trace.c | 14 -------------- 5 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index dd0d83e..46494e2 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -98,8 +98,6 @@ static const enum cpu_type client_cpu = CPU_x86; static const enum cpu_type client_cpu = CPU_x86_64; #elif defined(__powerpc__) static const enum cpu_type client_cpu = CPU_POWERPC; -#elif defined(__sparc__) -static const enum cpu_type client_cpu = CPU_SPARC; #elif defined(__arm__) static const enum cpu_type client_cpu = CPU_ARM; #elif defined(__aarch64__) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8a8a0ed..6f3a5d6 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_ARM64, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; typedef int cpu_type_t;
@@ -146,7 +146,6 @@ typedef struct 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 { @@ -156,7 +155,6 @@ typedef struct 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 { @@ -5717,6 +5715,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; };
-#define SERVER_PROTOCOL_VERSION 439 +#define SERVER_PROTOCOL_VERSION 440
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 7bb679a..234c41e 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_ARM64, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; typedef int cpu_type_t;
@@ -162,7 +162,6 @@ typedef struct 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 { @@ -172,7 +171,6 @@ typedef struct 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 fdbc144..69d547c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -59,8 +59,6 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_x86); static const unsigned int supported_cpus = CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_x86); #elif defined(__powerpc__) static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); -#elif defined(__sparc__) -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__) @@ -1026,7 +1024,6 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_POWERPC: return 0; case CPU_ARM: return 0; case CPU_ARM64: return 0; - case CPU_SPARC: return 0; } return 0; } @@ -1053,9 +1050,6 @@ void break_thread( struct thread *thread ) case CPU_POWERPC: data.exception.address = thread->context->ctl.powerpc_regs.iar; break; - case CPU_SPARC: - data.exception.address = thread->context->ctl.sparc_regs.pc; - break; case CPU_ARM: data.exception.address = thread->context->ctl.arm_regs.pc; break; diff --git a/server/trace.c b/server/trace.c index c7a13d8..a183fde 100644 --- a/server/trace.c +++ b/server/trace.c @@ -114,7 +114,6 @@ static void dump_cpu_type( const char *prefix, const cpu_type_t *code ) CASE(x86); CASE(x86_64); CASE(POWERPC); - CASE(SPARC); default: fprintf( stderr, "%s%u", prefix, *code ); break; #undef CASE } @@ -599,19 +598,6 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) 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", - ctx.ctl.sparc_regs.psr, ctx.ctl.sparc_regs.pc, ctx.ctl.sparc_regs.npc, - ctx.ctl.sparc_regs.y, ctx.ctl.sparc_regs.wim, ctx.ctl.sparc_regs.tbr ); - if (ctx.flags & SERVER_CTX_INTEGER) - { - for (i = 0; i < 8; i++) fprintf( stderr, ",g%u=%08x", i, ctx.integer.sparc_regs.g[i] ); - for (i = 0; i < 8; i++) fprintf( stderr, ",o%u=%08x", i, ctx.integer.sparc_regs.o[i] ); - for (i = 0; i < 8; i++) fprintf( stderr, ",l%u=%08x", i, ctx.integer.sparc_regs.l[i] ); - for (i = 0; i < 8; i++) fprintf( stderr, ",i%u=%08x", i, ctx.integer.sparc_regs.i[i] ); - } - break; } fputc( '}', stderr ); remove_data( size );