[RFA v2] Allow cygwin native to compile with --enable-64-bit-bfd

Pierre Muller
2007-11-29T10:11:37Z

> >> And the warning is?
> >
> >Cast from pointer to integer of different size. Casts are the way
> >we've handled it elsewhere in GDB, but I wouldn't complain about a
> >wrapper; casting host pointers to CORE_ADDRs is an action we try to
> >keep to a minimum anyway.
>
> I wouldn't mind a double cast either, if there is precedent for that.

Here is a revised patch that only uses double typecasts.
I ran the testsuite and got a slight improvement (2 FAIL less in
gdb.base/signals.exp),
but I doubt this is significant...

OK to check in?

ChangeLog entry:

2007-11-28 Pierre Muller <muller@ics.u-strasbg.fr>

*win32-nat.c: Allow compilation if CORE_ADDR is 8 byte long.
Add "gdb_stdint.h" dependency required for uintptr_t type use.
(handle_output_debug_string): Use uintptr_t typecast.
(handle_exception): Ditto.
(win32_xfer_memory): Ditto.

Index: gdb/win32-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/win32-nat.c,v
retrieving revision 1.140
diff -u -p -r1.140 win32-nat.c
--- gdb/win32-nat.c 24 Nov 2007 12:13:28 -0000 1.140
+++ gdb/win32-nat.c 28 Nov 2007 11:02:09 -0000
@@ -48,6 +48,7 @@
#include "objfiles.h"
#include "gdb_obstack.h"
#include "gdb_string.h"
+#include "gdb_stdint.h"
#include "gdbthread.h"
#include "gdbcmd.h"
#include <sys/param.h>
@@ -829,7 +830,8 @@ handle_output_debug_string (struct targe
int retval = 0;

if (!target_read_string
- ((CORE_ADDR) current_event.u.DebugString.lpDebugStringData, &s, 1024,
0)
+ ((CORE_ADDR) (uintptr_t)
current_event.u.DebugString.lpDebugStringData,
+ &s, 1024, 0)
|| !s || !*s)
/* nothing to do */;
else if (strncmp (s, _CYGWIN_SIGNAL_STRING, sizeof
(_CYGWIN_SIGNAL_STRING) -
1) != 0)
@@ -1023,7 +1025,8 @@ handle_exception (struct target_waitstat
and will be sent as a cygwin-specific-signal. So, ignore SEGVs
if th
ey show up
within the text segment of the DLL itself. */
char *fn;
- bfd_vma addr = (bfd_vma)
current_event.u.Exception.ExceptionRecord.Excep
tionAddress;
+ bfd_vma addr = (bfd_vma) (uintptr_t) current_event.u.Exception.
+
ExceptionRecord.ExceptionAddress;
if ((!cygwin_exceptions && (addr >= cygwin_load_start && addr <
cygwin_l
oad_end))
|| (find_pc_partial_function (addr, &fn, NULL, NULL)
&& strncmp (fn, "KERNEL32!IsBad", strlen ("KERNEL32!IsBad"))
==
0))
@@ -1925,20 +1928,24 @@ win32_xfer_memory (CORE_ADDR memaddr, gd
struct target_ops *target)
{
DWORD done = 0;
+
if (write)
{
DEBUG_MEM (("gdb: write target memory, %d bytes at 0x%08lx\n",
- len, (DWORD) memaddr));
- if (!WriteProcessMemory (current_process_handle, (LPVOID) memaddr,
our,
+ len, (DWORD) (uintptr_t) memaddr));
+ if (!WriteProcessMemory (current_process_handle,
+ (LPVOID) (uintptr_t) memaddr, our,
len, &done))
done = 0;
- FlushInstructionCache (current_process_handle, (LPCVOID) memaddr,
len);
+ FlushInstructionCache (current_process_handle,
+ (LPCVOID) (uintptr_t) memaddr, len);
}
else
{
DEBUG_MEM (("gdb: read target memory, %d bytes at 0x%08lx\n",
- len, (DWORD) memaddr));
- if (!ReadProcessMemory (current_process_handle, (LPCVOID) memaddr,
our,
+ len, (DWORD) (uintptr_t) memaddr));
+ if (!ReadProcessMemory (current_process_handle,
+ (LPCVOID) (uintptr_t) memaddr, our,
len, &done))
done = 0;
}