Win64 patch 8/13
Ge van Geldorp
ge at gse.nl
Mon Jun 19 13:03:43 CDT 2006
Changelog:
Ge van Geldorp <ge at gse.nl>
- Fix compilation on Win64
Index: programs/winedbg/Makefile.in
===================================================================
RCS file: /home/wine/wine/programs/winedbg/Makefile.in,v
retrieving revision 1.12
diff -u -r1.12 Makefile.in
--- programs/winedbg/Makefile.in 14 Feb 2006 13:36:10 -0000 1.12
+++ programs/winedbg/Makefile.in 19 Jun 2006 17:30:29 -0000
@@ -26,6 +26,9 @@
types.c \
winedbg.c
+C_SRCS64 = \
+ be_x86_64.c
+
EXTRA_SRCS = dbg.y debug.l
EXTRA_OBJS = dbg.tab.o @LEX_OUTPUT_ROOT at .o
Index: programs/winedbg/gdbproxy.c
===================================================================
RCS file: /home/wine/wine/programs/winedbg/gdbproxy.c,v
retrieving revision 1.33
diff -u -r1.33 gdbproxy.c
--- programs/winedbg/gdbproxy.c 2 Mar 2006 11:18:27 -0000 1.33
+++ programs/winedbg/gdbproxy.c 19 Jun 2006 17:30:31 -0000
@@ -338,6 +338,33 @@
FIELD_OFFSET(CONTEXT, Fpcr),
FIELD_OFFSET(CONTEXT, SoftFpcr),
};
+#elif defined(__x86_64__)
+static size_t cpu_register_map[] = {
+ FIELD_OFFSET(CONTEXT, Rax),
+ FIELD_OFFSET(CONTEXT, Rbx),
+ FIELD_OFFSET(CONTEXT, Rcx),
+ FIELD_OFFSET(CONTEXT, Rdx),
+ FIELD_OFFSET(CONTEXT, Rsi),
+ FIELD_OFFSET(CONTEXT, Rdi),
+ FIELD_OFFSET(CONTEXT, Rbp),
+ FIELD_OFFSET(CONTEXT, Rsp),
+ FIELD_OFFSET(CONTEXT, R8),
+ FIELD_OFFSET(CONTEXT, R9),
+ FIELD_OFFSET(CONTEXT, R10),
+ FIELD_OFFSET(CONTEXT, R11),
+ FIELD_OFFSET(CONTEXT, R12),
+ FIELD_OFFSET(CONTEXT, R13),
+ FIELD_OFFSET(CONTEXT, R14),
+ FIELD_OFFSET(CONTEXT, R15),
+ FIELD_OFFSET(CONTEXT, Rip),
+ FIELD_OFFSET(CONTEXT, EFlags),
+ FIELD_OFFSET(CONTEXT, SegCs),
+ FIELD_OFFSET(CONTEXT, SegSs),
+ FIELD_OFFSET(CONTEXT, SegDs),
+ FIELD_OFFSET(CONTEXT, SegEs),
+ FIELD_OFFSET(CONTEXT, SegFs),
+ FIELD_OFFSET(CONTEXT, SegGs),
+};
#else
# error Define the registers map for your CPU
#endif
Index: programs/winedbg/winedbg.c
===================================================================
RCS file: /home/wine/wine/programs/winedbg/winedbg.c,v
retrieving revision 1.58
diff -u -r1.58 winedbg.c
--- programs/winedbg/winedbg.c 2 Mar 2006 11:18:29 -0000 1.58
+++ programs/winedbg/winedbg.c 19 Jun 2006 17:30:31 -0000
@@ -479,6 +479,8 @@
extern struct backend_cpu be_ppc;
#elif __ALPHA__
extern struct backend_cpu be_alpha;
+#elif __x86_64__
+extern struct backend_cpu be_x86_64;
#else
# error CPU unknown
#endif
@@ -495,6 +497,8 @@
be_cpu = &be_ppc;
#elif __ALPHA__
be_cpu = &be_alpha;
+#elif __x86_64__
+ be_cpu = &be_x86_64;
#else
# error CPU unknown
#endif
--- /dev/null 2006-06-19 18:35:16.644352750 +0200
+++ programs/winedbg/be_x86_64.c 2006-06-19 17:22:25.000000000 +0200
@@ -0,0 +1,154 @@
+/*
+ * Debugger x86_64 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "debugger.h"
+
+#if defined(__x86_64__)
+
+static unsigned be_x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx,
+ enum be_cpu_addr bca, ADDRESS* addr)
+{
+ dbg_printf("not done\n");
+ return FALSE;
+}
+
+static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable)
+{
+ dbg_printf("not done\n");
+}
+
+static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx)
+{
+ dbg_printf("Context printing for x86_64 not done yet\n");
+}
+
+static void be_x86_64_print_segment_info(HANDLE hThread, const CONTEXT* ctx)
+{
+}
+
+static struct dbg_internal_var be_x86_64_ctx[] =
+{
+ {0, NULL, 0, dbg_itype_none}
+};
+
+static const struct dbg_internal_var* be_x86_64_init_registers(CONTEXT* ctx)
+{
+ dbg_printf("not done\n");
+ return be_x86_64_ctx;
+}
+
+static unsigned be_x86_64_is_step_over_insn(void* insn)
+{
+ dbg_printf("not done\n");
+ return FALSE;
+}
+
+static unsigned be_x86_64_is_function_return(void* insn)
+{
+ dbg_printf("not done\n");
+ return FALSE;
+}
+
+static unsigned be_x86_64_is_break_insn(void* insn)
+{
+ dbg_printf("not done\n");
+ return FALSE;
+}
+
+static unsigned be_x86_64_is_func_call(void* insn, void** insn_callee)
+{
+ return FALSE;
+}
+
+static void be_x86_64_disasm_one_insn(ADDRESS* addr, int display)
+{
+ dbg_printf("Disasm NIY\n");
+}
+
+static unsigned be_x86_64_insert_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 0;
+}
+
+static unsigned be_x86_64_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_x86_64_is_watchpoint_set(const CONTEXT* ctx, unsigned idx)
+{
+ dbg_printf("not done\n");
+ return FALSE;
+}
+
+static void be_x86_64_clear_watchpoint(CONTEXT* ctx, unsigned idx)
+{
+ dbg_printf("not done\n");
+}
+
+static int be_x86_64_adjust_pc_for_break(CONTEXT* ctx, BOOL way)
+{
+ dbg_printf("not done\n");
+ return 0;
+}
+
+static int be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,
+ unsigned ext_sign, LONGLONG* ret)
+{
+ dbg_printf("not done\n");
+ return FALSE;
+}
+
+static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size,
+ long double* ret)
+{
+ dbg_printf("not done\n");
+ return FALSE;
+}
+
+struct backend_cpu be_x86_64 =
+{
+ be_cpu_linearize,
+ be_cpu_build_addr,
+ be_x86_64_get_addr,
+ be_x86_64_single_step,
+ be_x86_64_print_context,
+ be_x86_64_print_segment_info,
+ be_x86_64_init_registers,
+ be_x86_64_is_step_over_insn,
+ be_x86_64_is_function_return,
+ be_x86_64_is_break_insn,
+ be_x86_64_is_func_call,
+ be_x86_64_disasm_one_insn,
+ be_x86_64_insert_Xpoint,
+ be_x86_64_remove_Xpoint,
+ be_x86_64_is_watchpoint_set,
+ be_x86_64_clear_watchpoint,
+ be_x86_64_adjust_pc_for_break,
+ be_x86_64_fetch_integer,
+ be_x86_64_fetch_float,
+};
+#endif
More information about the wine-patches
mailing list