From 191fd47e386b89089d45dee1a554231c32913802 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 23 Apr 2021 12:39:48 +0200 Subject: [PATCH] server: Get rid of the remaining PowerPC support. Signed-off-by: Alexandre Julliard --- dlls/kernel32/module.c | 3 --- dlls/ntdll/unix/process.c | 2 +- dlls/ntdll/unix/server.c | 2 +- include/wine/server_protocol.h | 8 ++------ server/mapping.c | 3 --- server/protocol.def | 6 +----- server/thread.c | 3 --- server/trace.c | 21 --------------------- 8 files changed, 5 insertions(+), 43 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 2f47423e74b..adf6b3c9a60 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -194,10 +194,7 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR name, LPDWORD type ) switch (info.Machine) { case IMAGE_FILE_MACHINE_I386: - case IMAGE_FILE_MACHINE_ARM: - case IMAGE_FILE_MACHINE_THUMB: case IMAGE_FILE_MACHINE_ARMNT: - case IMAGE_FILE_MACHINE_POWERPC: *type = SCS_32BIT_BINARY; return TRUE; case IMAGE_FILE_MACHINE_AMD64: diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 6782ceb647d..7100b46f1ef 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -70,7 +70,7 @@ static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE | (sizeof(void *) > size MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION | MEM_EXECUTE_OPTION_PERMANENT : 0); -static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64" }; +static const char * const cpu_names[] = { "x86", "x86_64", "ARM", "ARM64" }; static UINT process_error_mode; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 52e390e75ce..e775c22ae16 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1480,7 +1480,7 @@ void process_exit_wrapper( int status ) */ size_t server_init_process(void) { - static const char *cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64" }; + static const char *cpu_names[] = { "x86", "x86_64", "ARM", "ARM64" }; const char *arch = getenv( "WINEARCH" ); const char *env_socket = getenv( "WINESERVERSOCKET" ); obj_handle_t version; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5a372699e75..2b5fe25cb67 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -112,7 +112,7 @@ typedef union enum cpu_type { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_ARM, CPU_ARM64 }; typedef int client_cpu_t; @@ -126,7 +126,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 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; } ctl; @@ -135,7 +134,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 int gpr[32], cr, xer; } powerpc_regs; struct { unsigned int r[13]; } arm_regs; struct { unsigned __int64 x[31]; } arm64_regs; } integer; @@ -149,7 +147,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 { double fpr[32], fpscr; } powerpc_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; struct { struct { unsigned __int64 low, high; } q[32]; unsigned int fpcr, fpsr; } arm64_regs; } fp; @@ -157,7 +154,6 @@ typedef struct { struct { unsigned int dr0, dr1, dr2, dr3, dr6, dr7; } i386_regs; struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; - struct { unsigned int dr[8]; } powerpc_regs; struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; struct { unsigned __int64 bvr[8], wvr[2]; unsigned int bcr[8], wcr[2]; } arm64_regs; } debug; @@ -6222,7 +6218,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 691 +#define SERVER_PROTOCOL_VERSION 692 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index 0dcaa13e91d..8ac3189f9a4 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -678,9 +678,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s case IMAGE_FILE_MACHINE_ARMNT: if (cpu_mask & (CPU_FLAG(CPU_ARM) | CPU_FLAG(CPU_ARM64))) break; return STATUS_INVALID_IMAGE_FORMAT; - case IMAGE_FILE_MACHINE_POWERPC: - if (cpu_mask & CPU_FLAG(CPU_POWERPC)) break; - return STATUS_INVALID_IMAGE_FORMAT; default: return STATUS_INVALID_IMAGE_FORMAT; } diff --git a/server/protocol.def b/server/protocol.def index 9ea6967acdd..73d5eaf261e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -128,7 +128,7 @@ typedef union /* supported CPU types */ enum cpu_type { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_ARM, CPU_ARM64 }; typedef int client_cpu_t; @@ -142,7 +142,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 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; } ctl; /* selected by SERVER_CTX_CONTROL */ @@ -151,7 +150,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 int gpr[32], cr, xer; } powerpc_regs; struct { unsigned int r[13]; } arm_regs; struct { unsigned __int64 x[31]; } arm64_regs; } integer; /* selected by SERVER_CTX_INTEGER */ @@ -165,7 +163,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 { double fpr[32], fpscr; } powerpc_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; struct { struct { unsigned __int64 low, high; } q[32]; unsigned int fpcr, fpsr; } arm64_regs; } fp; /* selected by SERVER_CTX_FLOATING_POINT */ @@ -173,7 +170,6 @@ typedef struct { struct { unsigned int dr0, dr1, dr2, dr3, dr6, dr7; } i386_regs; struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; - struct { unsigned int dr[8]; } powerpc_regs; struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; struct { unsigned __int64 bvr[8], wvr[2]; unsigned int bcr[8], wcr[2]; } arm64_regs; } debug; /* selected by SERVER_CTX_DEBUG_REGISTERS */ diff --git a/server/thread.c b/server/thread.c index 66f1057d1db..5cfa790af72 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(__powerpc__) -static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); #elif defined(__arm__) static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM); #elif defined(__aarch64__) @@ -1313,7 +1311,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_POWERPC: return 0; case CPU_ARM: return SERVER_CTX_DEBUG_REGISTERS; case CPU_ARM64: return SERVER_CTX_DEBUG_REGISTERS; } diff --git a/server/trace.c b/server/trace.c index 67b2d0c8ec9..2c50495d52c 100644 --- a/server/trace.c +++ b/server/trace.c @@ -154,7 +154,6 @@ static void dump_client_cpu( const char *prefix, const client_cpu_t *code ) #define CASE(c) case CPU_##c: fprintf( stderr, "%s%s", prefix, #c ); break CASE(x86); CASE(x86_64); - CASE(POWERPC); CASE(ARM); CASE(ARM64); default: fprintf( stderr, "%s%u", prefix, *code ); break; @@ -696,26 +695,6 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) dump_uints( ",ymm_high=", (const unsigned int *)ctx.ymm.ymm_high_regs.ymm_high, sizeof(ctx.ymm.ymm_high_regs) / sizeof(int) ); 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", - ctx.ctl.powerpc_regs.iar, ctx.ctl.powerpc_regs.msr, ctx.ctl.powerpc_regs.ctr, - ctx.ctl.powerpc_regs.lr, ctx.ctl.powerpc_regs.dar, ctx.ctl.powerpc_regs.dsisr, - ctx.ctl.powerpc_regs.trap ); - if (ctx.flags & SERVER_CTX_INTEGER) - { - for (i = 0; i < 32; i++) fprintf( stderr, ",gpr%u=%08x", i, ctx.integer.powerpc_regs.gpr[i] ); - fprintf( stderr, ",cr=%08x,xer=%08x", - ctx.integer.powerpc_regs.cr, ctx.integer.powerpc_regs.xer ); - } - if (ctx.flags & SERVER_CTX_DEBUG_REGISTERS) - for (i = 0; i < 8; i++) fprintf( stderr, ",dr%u=%08x", i, ctx.debug.powerpc_regs.dr[i] ); - if (ctx.flags & SERVER_CTX_FLOATING_POINT) - { - for (i = 0; i < 32; i++) fprintf( stderr, ",fpr%u=%g", i, ctx.fp.powerpc_regs.fpr[i] ); - fprintf( stderr, ",fpscr=%g", ctx.fp.powerpc_regs.fpscr ); - } - break; case CPU_ARM: if (ctx.flags & SERVER_CTX_CONTROL) fprintf( stderr, ",sp=%08x,lr=%08x,pc=%08x,cpsr=%08x",