From owner-svn-src-all@freebsd.org Fri May 6 20:28:30 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2965EB2C8AD; Fri, 6 May 2016 20:28:30 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EB11A136B; Fri, 6 May 2016 20:28:29 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u46KSTJ8097253; Fri, 6 May 2016 20:28:29 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u46KSTMV097252; Fri, 6 May 2016 20:28:29 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201605062028.u46KSTMV097252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Fri, 6 May 2016 20:28:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299194 - head/sys/ddb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 May 2016 20:28:30 -0000 Author: pfg Date: Fri May 6 20:28:28 2016 New Revision: 299194 URL: https://svnweb.freebsd.org/changeset/base/299194 Log: Revert r298938: Change x/a to work similar to gdb. This badly breaks x/ia: ddb and gdb syntax are quite different and it is unclear if they can be reconciled. Modified: head/sys/ddb/db_examine.c Modified: head/sys/ddb/db_examine.c ============================================================================== --- head/sys/ddb/db_examine.c Fri May 6 19:18:44 2016 (r299193) +++ head/sys/ddb/db_examine.c Fri May 6 20:28:28 2016 (r299194) @@ -89,6 +89,15 @@ db_examine(db_addr_t addr, char *fmt, in case 'g': size = 8; break; + case 'a': /* address */ + size = sizeof(void *); + /* always forces a new line */ + if (db_print_position() != 0) + db_printf("\n"); + db_prev = addr; + db_printsym(addr, DB_STGY_ANY); + db_printf(":\t"); + break; default: if (db_print_position() == 0) { /* Print the address. */ @@ -99,18 +108,6 @@ db_examine(db_addr_t addr, char *fmt, in width = size * 4; switch (c) { - case 'a': /* address */ - size = sizeof(void *); - value = db_get_value(addr, size, TRUE); - addr += size; - db_printsym(value, DB_STGY_ANY); - break; - case 'p': - size = sizeof(void *); - value = db_get_value(addr, size, TRUE); - addr += size; - db_printf("%p", (void *)value); - break; case 'r': /* signed, current radix */ value = db_get_value(addr, size, true); addr += size; @@ -176,7 +173,7 @@ db_examine(db_addr_t addr, char *fmt, in default: break; } - if (db_print_position() != 0 || c == 'a' || c == 'p') + if (db_print_position() != 0) db_end_line(1); break; }