From owner-p4-projects@FreeBSD.ORG Thu Dec 8 19:26:23 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCB1D16A42B; Thu, 8 Dec 2005 19:26:22 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 993F616A422 for ; Thu, 8 Dec 2005 19:26:22 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C93443D7B for ; Thu, 8 Dec 2005 19:25:50 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB8JPiht008309 for ; Thu, 8 Dec 2005 19:25:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB8JPip1008306 for perforce@freebsd.org; Thu, 8 Dec 2005 19:25:44 GMT (envelope-from jhb@freebsd.org) Date: Thu, 8 Dec 2005 19:25:44 GMT Message-Id: <200512081925.jB8JPip1008306@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 87901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Dec 2005 19:26:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=87901 Change 87901 by jhb@jhb_slimer on 2005/12/08 19:24:49 Split up DB_SET. DB_SET now just creates a linker_set entry for a command and can be used to setup aliases. DB_FUNC() now does what DB_SET used to do which is to setup the linker_set entry and define a function without a body. Affected files ... .. //depot/projects/smpng/sys/ddb/ddb.h#17 edit .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#21 edit .. //depot/projects/smpng/sys/kern/kern_mutex.c#110 edit Differences ... ==== //depot/projects/smpng/sys/ddb/ddb.h#17 (text+ko) ==== @@ -55,20 +55,23 @@ typedef void db_page_calloutfcn_t(void *arg); #define DB_COMMAND(cmd_name, func_name) \ - DB_SET(cmd_name, func_name, db_cmd_set, 0, NULL) + DB_FUNC(cmd_name, func_name, db_cmd_set, 0, NULL) #define DB_SHOW_COMMAND(cmd_name, func_name) \ - DB_SET(cmd_name, func_name, db_show_cmd_set, 0, NULL) + DB_FUNC(cmd_name, func_name, db_show_cmd_set, 0, NULL) -#define DB_SET(cmd_name, func_name, set, flag, more) \ -static db_cmdfcn_t func_name; \ - \ +#define DB_SET(cmd_name, func_name, set, flag, more) \ static const struct command __CONCAT(func_name,_cmd) = { \ __STRING(cmd_name), \ func_name, \ flag, \ more \ }; \ -TEXT_SET(set, __CONCAT(func_name,_cmd)); \ +TEXT_SET(set, __CONCAT(func_name,_cmd)) + +#define DB_FUNC(cmd_name, func_name, set, flag, more) \ +static db_cmdfcn_t func_name; \ + \ +DB_SET(cmd_name, func_name, set, flag, more); \ \ static void \ func_name(addr, have_addr, count, modif) \ ==== //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#21 (text+ko) ==== @@ -1629,7 +1629,7 @@ } } -DB_SET(ahd_out, ahd_ddb_out, db_cmd_set, CS_MORE, NULL) +DB_FUNC(ahd_out, ahd_ddb_out, db_cmd_set, CS_MORE, NULL) { db_expr_t old_value; db_expr_t new_value; ==== //depot/projects/smpng/sys/kern/kern_mutex.c#110 (text+ko) ==== @@ -980,12 +980,6 @@ } } -/* Make 'show mtx' an alias for 'show mutex'. Ugly. */ -static const struct command db_show_mutex_mtx = { - "mtx", - db_show_mutex, - 0, - NULL -}; -TEXT_SET(db_show_cmd_set, db_show_mutex_mtx); +/* Make 'show mtx' an alias for 'show mutex'. */ +DB_SET(mtx, db_show_mutex, db_show_cmd_set, 0, NULL); #endif