[ros-diffs] [reactos] 172/179: [WINESYNC] dbghelp: Remove support for PPC32.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8c8313c67808a85555b2…

commit c8c8313c67808a85555b20fcee0014f960ae3ffd
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Fri Sep 11 19:12:34 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Wed Sep 16 10:36:01 2020 +0200

    [WINESYNC] dbghelp: Remove support for PPC32.
    
    Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 30f17befaf216a42a4e2cfbca3ed7bdce43e476a by André Hentschel
<nerv(a)dawncrow.de>
---
 dll/win32/dbghelp/CMakeLists.txt |   1 -
 dll/win32/dbghelp/cpu_ppc.c      | 100 ---------------------------------------
 dll/win32/dbghelp/dbghelp.c      |   6 +--
 sdk/tools/winesync/dbghelp.cfg   |   2 +-
 4 files changed, 3 insertions(+), 106 deletions(-)

diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt
index 15e1aaba010..508a9692842 100644
--- a/dll/win32/dbghelp/CMakeLists.txt
+++ b/dll/win32/dbghelp/CMakeLists.txt
@@ -50,7 +50,6 @@ else()
         cpu_arm.c
         cpu_arm64.c
         cpu_i386.c
-        cpu_ppc.c
         cpu_x86_64.c
         dbghelp.c
         dwarf.c
diff --git a/dll/win32/dbghelp/cpu_ppc.c b/dll/win32/dbghelp/cpu_ppc.c
deleted file mode 100644
index 80db2be704b..00000000000
--- a/dll/win32/dbghelp/cpu_ppc.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * File cpu_ppc.c
- *
- * Copyright (C) 2009-2009, Eric Pouech.
- *
- * 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 BOOL ppc_get_addr(HANDLE hThread, const CONTEXT* ctx,
-                         enum cpu_addr ca, ADDRESS64* addr)
-{
-   switch (ca)
-    {
-#if defined(__powerpc__)
-    case cpu_addr_pc:
-        addr->Mode    = AddrModeFlat;
-        addr->Segment = 0; /* don't need segment */
-        addr->Offset  = ctx->Iar;
-        return TRUE;
-#endif
-    default:
-    case cpu_addr_stack:
-    case cpu_addr_frame:
-        FIXME("not done\n");
-    }
-    return FALSE;
-}
-
-static BOOL ppc_stack_walk(struct cpu_stack_walk* csw, STACKFRAME64 *frame,
-    union ctx *ctx)
-{
-    FIXME("not done\n");
-    return FALSE;
-}
-
-static unsigned ppc_map_dwarf_register(unsigned regno, const struct module* module, BOOL
eh_frame)
-{
-    FIXME("not done\n");
-    return 0;
-}
-
-static void *ppc_fetch_context_reg(union ctx *ctx, unsigned regno, unsigned *size)
-{
-    FIXME("NIY\n");
-    return NULL;
-}
-
-static const char* ppc_fetch_regname(unsigned regno)
-{
-    FIXME("Unknown register %x\n", regno);
-    return NULL;
-}
-
-static BOOL ppc_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned
flags, const CONTEXT* ctx)
-{
-    FIXME("NIY\n");
-    return FALSE;
-}
-
-static BOOL ppc_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned
flags)
-{
-    FIXME("NIY\n");
-    return FALSE;
-}
-
-DECLSPEC_HIDDEN struct cpu cpu_ppc = {
-    IMAGE_FILE_MACHINE_POWERPC,
-    4,
-    CV_REG_NONE, /* FIXME */
-    ppc_get_addr,
-    ppc_stack_walk,
-    NULL,
-    ppc_map_dwarf_register,
-    ppc_fetch_context_reg,
-    ppc_fetch_regname,
-    ppc_fetch_minidump_thread,
-    ppc_fetch_minidump_module,
-};
diff --git a/dll/win32/dbghelp/dbghelp.c b/dll/win32/dbghelp/dbghelp.c
index 5a4f55f5470..892ad9927cd 100644
--- a/dll/win32/dbghelp/dbghelp.c
+++ b/dll/win32/dbghelp/dbghelp.c
@@ -158,10 +158,10 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr)
 }
 #endif
 
-extern struct cpu       cpu_i386, cpu_x86_64, cpu_ppc, cpu_arm, cpu_arm64;
+extern struct cpu       cpu_i386, cpu_x86_64, cpu_arm, cpu_arm64;
 
 #ifndef DBGHELP_STATIC_LIB
-static struct cpu*      dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc,
&cpu_arm, &cpu_arm64, NULL};
+static struct cpu*      dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_arm,
&cpu_arm64, NULL};
 #else
 static struct cpu*      dbghelp_cpus[] = {&cpu_i386, NULL};
 #endif
@@ -171,8 +171,6 @@ struct cpu*             dbghelp_current_cpu =
     &cpu_i386
 #elif defined(__x86_64__)
     &cpu_x86_64
-#elif defined(__powerpc__)
-    &cpu_ppc
 #elif defined(__arm__)
     &cpu_arm
 #elif defined(__aarch64__)
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index edefd93828d..e7ba3c932be 100644
--- a/sdk/tools/winesync/dbghelp.cfg
+++ b/sdk/tools/winesync/dbghelp.cfg
@@ -4,4 +4,4 @@ files:
   include/dbghelp.h: sdk/include/psdk/dbghelp.h
   include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
 tags:
-  wine: 7b6f6257bc7e9d8f8a93dfa969510ab4aa16e765
+  wine: 30f17befaf216a42a4e2cfbca3ed7bdce43e476a