CVS: gdbproxy/gdbproxy configure,1.5,1.6 configure.in,1.4,1.5 gdbproxy.c,1.3,1.4 remote.c,1.4,1.5 rpmisc.c,1.1.1.1,1.2 target_skeleton.c,1.4,1.5
Steve Underwood <[email protected]>
| Newsgroups | gmane.comp.hardware.texas-instruments.msp430.gcc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/mspgcc/gdbproxy/gdbproxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25117/gdbproxy/gdbproxy
Modified Files:
configure configure.in gdbproxy.c remote.c rpmisc.c
target_skeleton.c
Log Message:
Various tidyups, and elimination of the many many warnings GCC 4.0 gave.
Index: configure
===================================================================
RCS file: /cvsroot/mspgcc/gdbproxy/gdbproxy/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- configure 18 Nov 2003 13:42:01 -0000 1.5
+++ configure 21 Aug 2005 06:51:56 -0000 1.6
@@ -1,9 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57.
+# Generated by GNU Autoconf 2.59.
#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
[...2145 lines suppressed...]
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
Index: configure.in
===================================================================
RCS file: /cvsroot/mspgcc/gdbproxy/gdbproxy/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- configure.in 18 Nov 2003 13:42:01 -0000 1.4
+++ configure.in 21 Aug 2005 06:51:56 -0000 1.5
@@ -34,7 +34,7 @@
dnl add warning options if GCC
if test "x$GCC" = "xyes"; then
- CFLAGS="$CFLAGS -Wall -Wtraditional -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline"
+ CFLAGS="$CFLAGS -Wall -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline"
else
echo "gcc not found, it is required to build this program"
exit 1
Index: gdbproxy.c
===================================================================
RCS file: /cvsroot/mspgcc/gdbproxy/gdbproxy/gdbproxy.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- gdbproxy.c 17 Feb 2003 14:30:24 -0000 1.3
+++ gdbproxy.c 21 Aug 2005 06:51:56 -0000 1.4
@@ -541,7 +541,7 @@
rp_target *t)
{
int step;
- int sig;
+ uint32_t sig;
int go;
int more;
int implemented;
@@ -1640,10 +1640,10 @@
int ret;
size_t len;
size_t dummy_len;
- unsigned char csum;
- char *d;
+ uint8_t csum;
+ uint8_t *d;
const char *s;
- char buf2[RP_PARAM_INOUTBUF_SIZE + 4];
+ uint8_t buf2[RP_PARAM_INOUTBUF_SIZE + 4];
char in_buf[RP_PARAM_INOUTBUF_SIZE];
static const char hex[] = "0123456789abcdef";
@@ -2219,7 +2219,7 @@
uint64_t *addr,
unsigned int *len)
{
- int val;
+ unsigned int val;
assert(in != NULL);
assert(*in != '\0');
@@ -2699,7 +2699,7 @@
printf("\nOptions:\n");
printf(" --copying print copying information\n");
#ifndef WIN32
- printf(" --daemon run it as daemon\n");
+ printf(" --daemon run %s as daemon\n", name);
#endif /* WIN32 */
printf(" --debug run %s in debug mode\n", name);
printf(" --help `%s --help' prints this message\n", name);
@@ -2707,7 +2707,7 @@
printf(" `%s --help target' prints target's help\n",
name);
- printf(" --port=PORT use specified port\n");
+ printf(" --port=PORT use the specified TCP port\n");
printf(" --version print version\n");
printf(" --warranty print warranty information\n");
Index: remote.c
===================================================================
RCS file: /cvsroot/mspgcc/gdbproxy/gdbproxy/remote.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- remote.c 18 Nov 2003 13:42:01 -0000 1.4
+++ remote.c 21 Aug 2005 06:51:56 -0000 1.5
@@ -292,22 +292,22 @@
remote_target.name);
printf("\nOptions:\n\n");
printf(" --copying print copying information\n");
- printf(" --debug run proxy in debug mode\n");
+ printf(" --debug run %s in debug mode\n", prog_name);
printf(" --help `%s --help %s' prints this message\n",
prog_name,
remote_target.name);
- printf(" --port=PORT use specified port\n");
+ printf(" --port=PORT use the specified TCP port\n");
printf(" --version print version\n");
printf(" --warranty print warranty information\n");
printf("\nRemote-options:\n\n");
- printf(" --debug enables proxy target debugging.\n");
+ printf(" --debug run %s in debug mode\n", prog_name);
printf(" --use-break instructs to send BREAK to stop running\n");
- printf(" target. Default is to send CTRL-C.\n");
- printf(" --baud-rate=BAUD sets baud rate, default is %d.\n",
+ printf(" target (default is to send CTRL-C)\n");
+ printf(" --baud-rate=BAUD sets baud rate (default is %d)\n",
RPREMOTE_VAL_BAUDRATE_DEFAULT);
- printf(" --timeout=TIMEOUT sets timeout in seconds, default is %d,\n",
+ printf(" --timeout=TIMEOUT sets timeout in seconds (default is %d,\n",
RPREMOTE_VAL_TIMEOUT_DEFAULT);
- printf(" min value is 1 max value is 3600\n");
+ printf(" min value is 1, max value is 3600)\n");
printf("\nDevice:\n\n");
printf(" Device specifies serial device, e.g. `/dev/ttyS0'\n");
@@ -327,22 +327,22 @@
extended_remote_target.name);
printf("\nOptions:\n\n");
printf(" --copying print copying information\n");
- printf(" --debug run proxy in debug mode\n");
+ printf(" --debug run %s in debug mode\n", prog_name);
printf(" --help `%s --help %s' prints this message\n",
prog_name,
extended_remote_target.name);
- printf(" --port=PORT use specified port\n");
+ printf(" --port=PORT use the specified TCP port\n");
printf(" --version print version\n");
printf(" --warranty print warranty information\n");
printf("\nRemote-options:\n\n");
printf(" --debug enables proxy target debugging.\n");
printf(" --use-break instructs to send BREAK to stop running\n");
- printf(" target. Default is to send CTRL-C.\n");
- printf(" --baud-rate=BAUD sets baud rate, default is %d.\n",
+ printf(" target. Default is to send CTRL-C\n");
+ printf(" --baud-rate=BAUD sets baud rate (default is %d)\n",
RPREMOTE_VAL_BAUDRATE_DEFAULT);
- printf(" --timeout=TIMEOUT sets timeout in seconds, default is %d,\n",
+ printf(" --timeout=TIMEOUT sets timeout in seconds (default is %d,\n",
RPREMOTE_VAL_TIMEOUT_DEFAULT);
- printf(" min value is 1 max value is 3600\n");
+ printf(" min value is 1, max value is 3600)\n");
printf("\nDevice:\n\n");
printf(" Device specifies serial device, e.g. `/dev/ttyS0'\n");
printf("\nNote:\n\n");
@@ -531,7 +531,7 @@
{
int ret;
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
assert(remote_is_open);
assert(remote_connected);
@@ -561,7 +561,7 @@
static void remote_kill(void)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
assert(remote_is_open);
@@ -626,7 +626,7 @@
int ret;
char buf[40];
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
assert(thread != NULL);
@@ -649,7 +649,7 @@
static int remote_set_ctrl_thread(rp_thread_ref *thread)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
char buf[40];
@@ -672,7 +672,7 @@
static int remote_is_thread_alive(rp_thread_ref *thread, int *alive)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
char buf[40];
@@ -711,7 +711,7 @@
size_t *read_size)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
size_t count;
char *in;
@@ -788,7 +788,7 @@
static int remote_write_registers(unsigned char *buf, size_t write_size)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
assert(buf != NULL);
@@ -827,7 +827,7 @@
size_t *read_size)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
size_t count;
char *in;
@@ -908,7 +908,7 @@
size_t write_size)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
size_t len;
@@ -947,7 +947,7 @@
size_t *actual_size)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
assert(buf != NULL);
@@ -974,7 +974,7 @@
size_t write_size)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
size_t off;
@@ -1074,7 +1074,7 @@
int *more)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
assert(status_string != NULL);
@@ -1173,7 +1173,7 @@
int *implemented)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
assert(status_string != NULL);
@@ -1261,7 +1261,7 @@
rp_thread_info *info)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int off;
int ret;
@@ -1300,7 +1300,7 @@
int *done)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int off;
int ret;
@@ -1336,7 +1336,7 @@
static int remote_current_thread_query(rp_thread_ref *thread)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int i;
int ret;
char *in;
@@ -1379,7 +1379,7 @@
uint64_t *bss)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
uint64_t addr;
unsigned int val;
unsigned int i;
@@ -1460,7 +1460,7 @@
uint32_t *val)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int32_t crc;
unsigned int tmp;
unsigned int i;
@@ -1503,7 +1503,7 @@
/* Target method */
static int remote_raw_query(char *in_buf, char *out_buf, size_t out_buf_size)
{
- int out_len;
+ unsigned int out_len;
int ret;
assert(strlen(in_buf) < sizeof(remote_out_buf));
@@ -1524,7 +1524,7 @@
/* Target method */
static int remote_remcmd(char *in_buf, out_func of, data_func df)
{
- int in_len;
+ unsigned int in_len;
int ret;
assert(strlen(in_buf) < (sizeof(remote_out_buf) - 6));
@@ -1588,7 +1588,7 @@
static int remote_add_break(int type, uint64_t addr, unsigned int len)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
sprintf(remote_out_buf, "Z%d,%Lx,%x", type, addr, len);
@@ -1610,7 +1610,7 @@
static int remote_remove_break(int type, uint64_t addr, unsigned int len)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
sprintf(remote_out_buf, "z%d,%Lx,%x", type, addr, len);
@@ -1636,7 +1636,7 @@
int *can_restart)
{
char in_buf[RP_PARAM_INOUTBUF_SIZE];
- int in_len;
+ unsigned int in_len;
int ret;
assert(status_string != NULL);
Index: rpmisc.c
===================================================================
RCS file: /cvsroot/mspgcc/gdbproxy/gdbproxy/rpmisc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -w -d -r1.1.1.1 -r1.2
--- rpmisc.c 12 Nov 2002 12:39:29 -0000 1.1.1.1
+++ rpmisc.c 21 Aug 2005 06:51:56 -0000 1.2
@@ -143,7 +143,7 @@
struct sockaddr_in sa;
int tmp;
int ret;
- unsigned short int p;
+ int p;
assert(port == NULL || *port < 0x10000);
@@ -186,8 +186,7 @@
}
else
{
-
- /* We have to try for available port */
+ /* We have to try for an available port */
for (p = RP_PARAM_SOCKPORT_MIN; p < 0x10000; p++)
{
sa.sin_port = htons(p);
@@ -217,7 +216,7 @@
int dbg_sock_accept(void)
{
int ret;
- int tmp;
+ socklen_t tmp;
struct sockaddr_in sa;
struct protoent *pe;
@@ -341,7 +340,7 @@
or -1 for no timeout */
int dbg_sock_readchar(int ms)
{
- static char buf[PACKET_BUFF_SIZE];
+ static uint8_t buf[PACKET_BUFF_SIZE];
static int count = 0;
static uint8_t *p;
int ret;
Index: target_skeleton.c
===================================================================
RCS file: /cvsroot/mspgcc/gdbproxy/gdbproxy/target_skeleton.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- target_skeleton.c 18 Nov 2003 13:42:01 -0000 1.4
+++ target_skeleton.c 21 Aug 2005 06:51:56 -0000 1.5
@@ -271,12 +271,14 @@
{
printf("This is the skeleton target for the GDB proxy server. Usage:\n\n");
printf(" %s [options] %s [skeleton-options] [port]\n",
- prog_name, skeleton_target.name);
+ prog_name,
+ skeleton_target.name);
printf("\nOptions:\n\n");
- printf(" --debug run proxy in debug mode\n");
+ printf(" --debug run %s in debug mode\n", prog_name);
printf(" --help `%s --help %s' prints this message\n",
- prog_name, skeleton_target.name);
- printf(" --port=PORT use specified port\n");
+ prog_name,
+ skeleton_target.name);
+ printf(" --port=PORT use the specified TCP port\n");
printf("\nskeleton-options:\n\n");
printf("\n");
@@ -940,7 +942,7 @@
/* Target method */
static int skeleton_crc_query(uint64_t addr, size_t len, uint32_t *val)
{
- char buf[1];
+ uint8_t buf[1];
skeleton_status.log(RP_VAL_LOGLEVEL_DEBUG,
"%s: skeleton_crc_query()",
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf