From owner-p4-projects@FreeBSD.ORG  Fri Jul  9 02:30:43 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BB80016A4D0; Fri,  9 Jul 2004 02:30:43 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8061A16A4CE
	for <perforce@freebsd.org>; Fri,  9 Jul 2004 02:30:43 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6251D43D49
	for <perforce@freebsd.org>; Fri,  9 Jul 2004 02:30:43 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i692Uhnb036569
	for <perforce@freebsd.org>; Fri, 9 Jul 2004 02:30:43 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i692UhTI036566
	for perforce@freebsd.org; Fri, 9 Jul 2004 02:30:43 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 9 Jul 2004 02:30:43 GMT
Message-Id: <200407090230.i692UhTI036566@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 56826 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jul 2004 02:30:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=56826

Change 56826 by marcel@marcel_nfs on 2004/07/09 02:29:47

	Implement support for the M packet (memory write). This allows
	setting breakpoints for example. Can't be bad...

Affected files ...

.. //depot/projects/gdb/sys/gdb/gdb_int.h#7 edit
.. //depot/projects/gdb/sys/gdb/gdb_main.c#16 edit
.. //depot/projects/gdb/sys/gdb/gdb_packet.c#10 edit

Differences ...

==== //depot/projects/gdb/sys/gdb/gdb_int.h#7 (text+ko) ====

@@ -37,6 +37,7 @@
 
 int gdb_rx_begin(void);
 int gdb_rx_equal(const char *);
+int gdb_rx_mem(unsigned char *, size_t);
 int gdb_rx_varhex(uintmax_t *);
 
 static __inline int

==== //depot/projects/gdb/sys/gdb/gdb_main.c#16 (text+ko) ====

@@ -163,13 +163,25 @@
 				break;
 			}
 			gdb_tx_begin(0);
-			gdb_tx_mem((char *)(uintptr_t)addr, size);
-			gdb_tx_end();
+			if (gdb_tx_mem((char *)(uintptr_t)addr, size))
+				gdb_tx_end();
+			else
+				gdb_tx_err(EIO);
 			break;
 		}
-		case 'M':	/* Write memory. */
-			gdb_tx_err(0);
+		case 'M': {	/* Write memory. */
+			uintmax_t addr, size;
+			if (gdb_rx_varhex(&addr) || gdb_rx_char() != ',' ||
+			    gdb_rx_varhex(&size) || gdb_rx_char() != ':') {
+				gdb_tx_err(EINVAL);
+				break;
+			}
+			if (gdb_rx_mem((char *)(uintptr_t)addr, size) == 0)
+				gdb_tx_err(EIO);
+			else
+				gdb_tx_ok();
 			break;
+		}
 		case 'P': {	/* Write register. */
 			uintmax_t reg, val;
 			if (gdb_rx_varhex(&reg) || gdb_rx_char() != '=' ||

==== //depot/projects/gdb/sys/gdb/gdb_packet.c#10 (text+ko) ====

@@ -112,6 +112,32 @@
 }
 
 int
+gdb_rx_mem(unsigned char *addr, size_t size)
+{
+	void *prev;
+	jmp_buf jb;
+	int ret;
+	unsigned char c;
+
+	if (size * 2 != gdb_rxsz)
+		return (-1);
+
+	prev = kdb_jmpbuf(jb);
+	ret = setjmp(jb);
+	if (ret == 0) {
+		while (size-- > 0) {
+			c = (C2N(gdb_rxp[0]) << 4) & 0xf0;
+			c |= C2N(gdb_rxp[1]) & 0x0f;
+			*addr++ = c;
+			gdb_rxsz -= 2;
+			gdb_rxp += 2;
+		}
+	}
+	(void)kdb_jmpbuf(prev);
+	return ((ret == 0) ? 1 : 0);
+}
+
+int
 gdb_rx_varhex(uintmax_t *vp)
 {
 	uintmax_t v;