From 4e29fb547ead13cd1f2856f1af3d4029a81ea196 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 15 Jun 2010 10:44:48 +0000 Subject: [PATCH] * linux-x86-low.c (amd64_emit_const, amd64_emit_void_call_2) (i386_emit_const, i386_emit_void_call_2): Replace int64_t uses with LONGEST uses. * server.h (struct emit_ops): Replace int64_t uses with LONGEST uses. * tracepoint.c (emit_const, emit_void_call_2): Replace int64_t uses with LONGEST uses. --- gdb/gdbserver/ChangeLog | 10 ++++++++++ gdb/gdbserver/linux-x86-low.c | 12 ++++++------ gdb/gdbserver/server.h | 2 +- gdb/gdbserver/tracepoint.c | 4 ++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 2fde399d0e8..6b9f4935b0f 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,13 @@ +2010-06-15 Pedro Alves + + * linux-x86-low.c (amd64_emit_const, amd64_emit_void_call_2) + (i386_emit_const, i386_emit_void_call_2): Replace int64_t uses with + LONGEST uses. + * server.h (struct emit_ops): Replace int64_t uses with LONGEST + uses. + * tracepoint.c (emit_const, emit_void_call_2): Replace int64_t + uses with LONGEST uses. + 2010-06-14 Stan Shebs Pedro Alves diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index cf00f7c9830..772aaa31535 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -1764,7 +1764,7 @@ amd64_write_goto_address (CORE_ADDR from, CORE_ADDR to, int size) } static void -amd64_emit_const (int64_t num) +amd64_emit_const (LONGEST num) { unsigned char buf[16]; int i; @@ -1772,7 +1772,7 @@ amd64_emit_const (int64_t num) i = 0; buf[i++] = 0x48; buf[i++] = 0xb8; /* mov $,%rax */ - *((int64_t *) (&buf[i])) = num; + *((LONGEST *) (&buf[i])) = num; i += 8; append_insns (&buildaddr, i, buf); current_insn_ptr = buildaddr; @@ -1784,7 +1784,7 @@ amd64_emit_call (CORE_ADDR fn) unsigned char buf[16]; int i; CORE_ADDR buildaddr; - int64_t offset64; + LONGEST offset64; /* The destination function being in the shared library, may be >31-bits away off the compiled code pad. */ @@ -1919,7 +1919,7 @@ amd64_emit_int_call_1 (CORE_ADDR fn, int arg1) amd64_emit_call (fn); } -/* FN's prototype is `void(*fn)(int,int64_t)'. */ +/* FN's prototype is `void(*fn)(int,LONGEST)'. */ static void amd64_emit_void_call_2 (CORE_ADDR fn, int arg1) @@ -2251,7 +2251,7 @@ i386_write_goto_address (CORE_ADDR from, CORE_ADDR to, int size) } static void -i386_emit_const (int64_t num) +i386_emit_const (LONGEST num) { unsigned char buf[16]; int i, hi; @@ -2414,7 +2414,7 @@ i386_emit_int_call_1 (CORE_ADDR fn, int arg1) "lea 0x8(%esp),%esp"); } -/* FN's prototype is `void(*fn)(int,int64_t)'. */ +/* FN's prototype is `void(*fn)(int,LONGEST)'. */ static void i386_emit_void_call_2 (CORE_ADDR fn, int arg1) diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 89c53118111..8bdd217a290 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -598,7 +598,7 @@ struct emit_ops void (*emit_if_goto) (int *offset_p, int *size_p); void (*emit_goto) (int *offset_p, int *size_p); void (*write_goto_address) (CORE_ADDR from, CORE_ADDR to, int size); - void (*emit_const) (int64_t num); + void (*emit_const) (LONGEST num); void (*emit_call) (CORE_ADDR fn); void (*emit_reg) (int reg); void (*emit_pop) (void); diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index bafd82ad270..5f2e6b6ffb8 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -5113,7 +5113,7 @@ write_goto_address (CORE_ADDR from, CORE_ADDR to, int size) } static void -emit_const (int64_t num) +emit_const (LONGEST num) { target_emit_ops ()->emit_const (num); } @@ -5162,7 +5162,7 @@ emit_int_call_1 (CORE_ADDR fn, int arg1) target_emit_ops ()->emit_int_call_1 (fn, arg1); } -/* FN's prototype is `void(*fn)(int,int64_t)'. */ +/* FN's prototype is `void(*fn)(int,LONGEST)'. */ static void emit_void_call_2 (CORE_ADDR fn, int arg1) -- 2.30.2