From owner-svn-src-projects@FreeBSD.ORG Sun Nov 24 09:43:59 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 209F94FD; Sun, 24 Nov 2013 09:43:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0E0DE2924; Sun, 24 Nov 2013 09:43:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9hxu1002262; Sun, 24 Nov 2013 09:43:59 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9htH5002238; Sun, 24 Nov 2013 09:43:55 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201311240943.rAO9htH5002238@svn.freebsd.org> From: Mark Murray Date: Sun, 24 Nov 2013 09:43:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258518 - in projects/random_number_generator: contrib/gcc contrib/gcc/cp contrib/gcc/doc contrib/gcclibs/libcpp contrib/gcclibs/libcpp/include contrib/libstdc++/include/ext gnu/usr.bin... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Nov 2013 09:43:59 -0000 Author: markm Date: Sun Nov 24 09:43:55 2013 New Revision: 258518 URL: http://svnweb.freebsd.org/changeset/base/258518 Log: MFC - tracking commit. Added: projects/random_number_generator/contrib/gcc/tree-ssa-alias-warnings.c - copied unchanged from r258516, head/contrib/gcc/tree-ssa-alias-warnings.c projects/random_number_generator/contrib/gcclibs/libcpp/directives-only.c - copied unchanged from r258516, head/contrib/gcclibs/libcpp/directives-only.c Modified: projects/random_number_generator/contrib/gcc/c-common.c projects/random_number_generator/contrib/gcc/c-common.h projects/random_number_generator/contrib/gcc/c-opts.c projects/random_number_generator/contrib/gcc/c-ppoutput.c projects/random_number_generator/contrib/gcc/c-typeck.c projects/random_number_generator/contrib/gcc/c.opt projects/random_number_generator/contrib/gcc/common.opt projects/random_number_generator/contrib/gcc/coverage.c projects/random_number_generator/contrib/gcc/cp/typeck.c projects/random_number_generator/contrib/gcc/doc/cppopts.texi projects/random_number_generator/contrib/gcc/doc/invoke.texi projects/random_number_generator/contrib/gcc/final.c projects/random_number_generator/contrib/gcc/flags.h projects/random_number_generator/contrib/gcc/gimplify.c projects/random_number_generator/contrib/gcc/opts.c projects/random_number_generator/contrib/gcc/tree-flow.h projects/random_number_generator/contrib/gcc/tree-ssa-alias.c projects/random_number_generator/contrib/gcc/tree-vrp.c projects/random_number_generator/contrib/gcclibs/libcpp/Makefile.in projects/random_number_generator/contrib/gcclibs/libcpp/directives.c projects/random_number_generator/contrib/gcclibs/libcpp/files.c projects/random_number_generator/contrib/gcclibs/libcpp/include/cpplib.h projects/random_number_generator/contrib/gcclibs/libcpp/init.c projects/random_number_generator/contrib/gcclibs/libcpp/internal.h projects/random_number_generator/contrib/gcclibs/libcpp/macro.c projects/random_number_generator/contrib/libstdc++/include/ext/hashtable.h projects/random_number_generator/gnu/usr.bin/cc/cc_int/Makefile projects/random_number_generator/gnu/usr.bin/cc/libcpp/Makefile projects/random_number_generator/lib/libc/powerpc/SYS.h projects/random_number_generator/lib/libc/powerpc64/SYS.h projects/random_number_generator/lib/libthr/thread/thr_private.h projects/random_number_generator/lib/libthr/thread/thr_sig.c projects/random_number_generator/sys/powerpc/aim/machdep.c projects/random_number_generator/sys/powerpc/include/ofw_machdep.h projects/random_number_generator/sys/powerpc/ofw/ofw_machdep.c projects/random_number_generator/sys/powerpc/pseries/mmu_phyp.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/contrib/gcc/ (props changed) projects/random_number_generator/contrib/libstdc++/ (props changed) projects/random_number_generator/contrib/llvm/ (props changed) projects/random_number_generator/lib/libc/ (props changed) projects/random_number_generator/sys/ (props changed) Modified: projects/random_number_generator/contrib/gcc/c-common.c ============================================================================== --- projects/random_number_generator/contrib/gcc/c-common.c Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/c-common.c Sun Nov 24 09:43:55 2013 (r258518) @@ -983,35 +983,67 @@ unsigned_conversion_warning (tree result strict aliasing mode is in effect. OTYPE is the original TREE_TYPE of EXPR, and TYPE the type we're casting to. */ -void +bool strict_aliasing_warning (tree otype, tree type, tree expr) { - if (flag_strict_aliasing && warn_strict_aliasing - && POINTER_TYPE_P (type) && POINTER_TYPE_P (otype) - && TREE_CODE (expr) == ADDR_EXPR + if (!(flag_strict_aliasing && POINTER_TYPE_P (type) + && POINTER_TYPE_P (otype) && !VOID_TYPE_P (TREE_TYPE (type)))) + return false; + + if ((warn_strict_aliasing > 1) && TREE_CODE (expr) == ADDR_EXPR && (DECL_P (TREE_OPERAND (expr, 0)) - || handled_component_p (TREE_OPERAND (expr, 0))) - && !VOID_TYPE_P (TREE_TYPE (type))) + || handled_component_p (TREE_OPERAND (expr, 0)))) { /* Casting the address of an object to non void pointer. Warn if the cast breaks type based aliasing. */ - if (!COMPLETE_TYPE_P (TREE_TYPE (type))) - warning (OPT_Wstrict_aliasing, "type-punning to incomplete type " - "might break strict-aliasing rules"); + if (!COMPLETE_TYPE_P (TREE_TYPE (type)) && warn_strict_aliasing == 2) + { + warning (OPT_Wstrict_aliasing, "type-punning to incomplete type " + "might break strict-aliasing rules"); + return true; + } else { - HOST_WIDE_INT set1 = get_alias_set (TREE_TYPE (TREE_OPERAND (expr, 0))); + /* warn_strict_aliasing >= 3. This includes the default (3). + Only warn if the cast is dereferenced immediately. */ + HOST_WIDE_INT set1 = + get_alias_set (TREE_TYPE (TREE_OPERAND (expr, 0))); HOST_WIDE_INT set2 = get_alias_set (TREE_TYPE (type)); if (!alias_sets_conflict_p (set1, set2)) - warning (OPT_Wstrict_aliasing, "dereferencing type-punned " - "pointer will break strict-aliasing rules"); - else if (warn_strict_aliasing > 1 - && !alias_sets_might_conflict_p (set1, set2)) - warning (OPT_Wstrict_aliasing, "dereferencing type-punned " - "pointer might break strict-aliasing rules"); + { + warning (OPT_Wstrict_aliasing, "dereferencing type-punned " + "pointer will break strict-aliasing rules"); + return true; + } + else if (warn_strict_aliasing == 2 + && !alias_sets_might_conflict_p (set1, set2)) + { + warning (OPT_Wstrict_aliasing, "dereferencing type-punned " + "pointer might break strict-aliasing rules"); + return true; + } } } + else + if ((warn_strict_aliasing == 1) && !VOID_TYPE_P (TREE_TYPE (otype))) + { + /* At this level, warn for any conversions, even if an address is + not taken in the same statement. This will likely produce many + false positives, but could be useful to pinpoint problems that + are not revealed at higher levels. */ + HOST_WIDE_INT set1 = get_alias_set (TREE_TYPE (otype)); + HOST_WIDE_INT set2 = get_alias_set (TREE_TYPE (type)); + if (!COMPLETE_TYPE_P(type) + || !alias_sets_might_conflict_p (set1, set2)) + { + warning (OPT_Wstrict_aliasing, "dereferencing type-punned " + "pointer might break strict-aliasing rules"); + return true; + } + } + + return false; } @@ -3108,6 +3140,85 @@ def_fn_type (builtin_type def, builtin_t builtin_types[def] = t; } +/* Build builtin functions common to both C and C++ language + frontends. */ + +static void +c_define_builtins (tree va_list_ref_type_node, tree va_list_arg_type_node) +{ +#define DEF_PRIMITIVE_TYPE(ENUM, VALUE) \ + builtin_types[ENUM] = VALUE; +#define DEF_FUNCTION_TYPE_0(ENUM, RETURN) \ + def_fn_type (ENUM, RETURN, 0, 0); +#define DEF_FUNCTION_TYPE_1(ENUM, RETURN, ARG1) \ + def_fn_type (ENUM, RETURN, 0, 1, ARG1); +#define DEF_FUNCTION_TYPE_2(ENUM, RETURN, ARG1, ARG2) \ + def_fn_type (ENUM, RETURN, 0, 2, ARG1, ARG2); +#define DEF_FUNCTION_TYPE_3(ENUM, RETURN, ARG1, ARG2, ARG3) \ + def_fn_type (ENUM, RETURN, 0, 3, ARG1, ARG2, ARG3); +#define DEF_FUNCTION_TYPE_4(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) \ + def_fn_type (ENUM, RETURN, 0, 4, ARG1, ARG2, ARG3, ARG4); +#define DEF_FUNCTION_TYPE_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ + def_fn_type (ENUM, RETURN, 0, 5, ARG1, ARG2, ARG3, ARG4, ARG5); +#define DEF_FUNCTION_TYPE_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ + ARG6) \ + def_fn_type (ENUM, RETURN, 0, 6, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6); +#define DEF_FUNCTION_TYPE_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ + ARG6, ARG7) \ + def_fn_type (ENUM, RETURN, 0, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7); +#define DEF_FUNCTION_TYPE_VAR_0(ENUM, RETURN) \ + def_fn_type (ENUM, RETURN, 1, 0); +#define DEF_FUNCTION_TYPE_VAR_1(ENUM, RETURN, ARG1) \ + def_fn_type (ENUM, RETURN, 1, 1, ARG1); +#define DEF_FUNCTION_TYPE_VAR_2(ENUM, RETURN, ARG1, ARG2) \ + def_fn_type (ENUM, RETURN, 1, 2, ARG1, ARG2); +#define DEF_FUNCTION_TYPE_VAR_3(ENUM, RETURN, ARG1, ARG2, ARG3) \ + def_fn_type (ENUM, RETURN, 1, 3, ARG1, ARG2, ARG3); +#define DEF_FUNCTION_TYPE_VAR_4(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) \ + def_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3, ARG4); +#define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ + def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5); +#define DEF_POINTER_TYPE(ENUM, TYPE) \ + builtin_types[(int) ENUM] = build_pointer_type (builtin_types[(int) TYPE]); + +#include "builtin-types.def" + +#undef DEF_PRIMITIVE_TYPE +#undef DEF_FUNCTION_TYPE_1 +#undef DEF_FUNCTION_TYPE_2 +#undef DEF_FUNCTION_TYPE_3 +#undef DEF_FUNCTION_TYPE_4 +#undef DEF_FUNCTION_TYPE_5 +#undef DEF_FUNCTION_TYPE_6 +#undef DEF_FUNCTION_TYPE_VAR_0 +#undef DEF_FUNCTION_TYPE_VAR_1 +#undef DEF_FUNCTION_TYPE_VAR_2 +#undef DEF_FUNCTION_TYPE_VAR_3 +#undef DEF_FUNCTION_TYPE_VAR_4 +#undef DEF_FUNCTION_TYPE_VAR_5 +#undef DEF_POINTER_TYPE + builtin_types[(int) BT_LAST] = NULL_TREE; + + c_init_attributes (); + +#define DEF_BUILTIN(ENUM, NAME, CLASS, TYPE, LIBTYPE, BOTH_P, FALLBACK_P, \ + NONANSI_P, ATTRS, IMPLICIT, COND) \ + if (NAME && COND) \ + def_builtin_1 (ENUM, NAME, CLASS, \ + builtin_types[(int) TYPE], \ + builtin_types[(int) LIBTYPE], \ + BOTH_P, FALLBACK_P, NONANSI_P, \ + built_in_attributes[(int) ATTRS], IMPLICIT); +#include "builtins.def" +#undef DEF_BUILTIN + + build_common_builtin_nodes (); + + targetm.init_builtins (); + if (flag_mudflap) + mudflap_init (); +} + /* Build tree nodes and builtin functions common to both C and C++ language frontends. */ @@ -3320,77 +3431,8 @@ c_common_nodes_and_builtins (void) va_list_ref_type_node = build_reference_type (va_list_type_node); } -#define DEF_PRIMITIVE_TYPE(ENUM, VALUE) \ - builtin_types[ENUM] = VALUE; -#define DEF_FUNCTION_TYPE_0(ENUM, RETURN) \ - def_fn_type (ENUM, RETURN, 0, 0); -#define DEF_FUNCTION_TYPE_1(ENUM, RETURN, ARG1) \ - def_fn_type (ENUM, RETURN, 0, 1, ARG1); -#define DEF_FUNCTION_TYPE_2(ENUM, RETURN, ARG1, ARG2) \ - def_fn_type (ENUM, RETURN, 0, 2, ARG1, ARG2); -#define DEF_FUNCTION_TYPE_3(ENUM, RETURN, ARG1, ARG2, ARG3) \ - def_fn_type (ENUM, RETURN, 0, 3, ARG1, ARG2, ARG3); -#define DEF_FUNCTION_TYPE_4(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) \ - def_fn_type (ENUM, RETURN, 0, 4, ARG1, ARG2, ARG3, ARG4); -#define DEF_FUNCTION_TYPE_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ - def_fn_type (ENUM, RETURN, 0, 5, ARG1, ARG2, ARG3, ARG4, ARG5); -#define DEF_FUNCTION_TYPE_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ - ARG6) \ - def_fn_type (ENUM, RETURN, 0, 6, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6); -#define DEF_FUNCTION_TYPE_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ - ARG6, ARG7) \ - def_fn_type (ENUM, RETURN, 0, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7); -#define DEF_FUNCTION_TYPE_VAR_0(ENUM, RETURN) \ - def_fn_type (ENUM, RETURN, 1, 0); -#define DEF_FUNCTION_TYPE_VAR_1(ENUM, RETURN, ARG1) \ - def_fn_type (ENUM, RETURN, 1, 1, ARG1); -#define DEF_FUNCTION_TYPE_VAR_2(ENUM, RETURN, ARG1, ARG2) \ - def_fn_type (ENUM, RETURN, 1, 2, ARG1, ARG2); -#define DEF_FUNCTION_TYPE_VAR_3(ENUM, RETURN, ARG1, ARG2, ARG3) \ - def_fn_type (ENUM, RETURN, 1, 3, ARG1, ARG2, ARG3); -#define DEF_FUNCTION_TYPE_VAR_4(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) \ - def_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3, ARG4); -#define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ - def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5); -#define DEF_POINTER_TYPE(ENUM, TYPE) \ - builtin_types[(int) ENUM] = build_pointer_type (builtin_types[(int) TYPE]); - -#include "builtin-types.def" - -#undef DEF_PRIMITIVE_TYPE -#undef DEF_FUNCTION_TYPE_1 -#undef DEF_FUNCTION_TYPE_2 -#undef DEF_FUNCTION_TYPE_3 -#undef DEF_FUNCTION_TYPE_4 -#undef DEF_FUNCTION_TYPE_5 -#undef DEF_FUNCTION_TYPE_6 -#undef DEF_FUNCTION_TYPE_VAR_0 -#undef DEF_FUNCTION_TYPE_VAR_1 -#undef DEF_FUNCTION_TYPE_VAR_2 -#undef DEF_FUNCTION_TYPE_VAR_3 -#undef DEF_FUNCTION_TYPE_VAR_4 -#undef DEF_FUNCTION_TYPE_VAR_5 -#undef DEF_POINTER_TYPE - builtin_types[(int) BT_LAST] = NULL_TREE; - - c_init_attributes (); - -#define DEF_BUILTIN(ENUM, NAME, CLASS, TYPE, LIBTYPE, BOTH_P, FALLBACK_P, \ - NONANSI_P, ATTRS, IMPLICIT, COND) \ - if (NAME && COND) \ - def_builtin_1 (ENUM, NAME, CLASS, \ - builtin_types[(int) TYPE], \ - builtin_types[(int) LIBTYPE], \ - BOTH_P, FALLBACK_P, NONANSI_P, \ - built_in_attributes[(int) ATTRS], IMPLICIT); -#include "builtins.def" -#undef DEF_BUILTIN - - build_common_builtin_nodes (); - - targetm.init_builtins (); - if (flag_mudflap) - mudflap_init (); + if (!flag_preprocess_only) + c_define_builtins (va_list_ref_type_node, va_list_arg_type_node); main_identifier_node = get_identifier ("main"); Modified: projects/random_number_generator/contrib/gcc/c-common.h ============================================================================== --- projects/random_number_generator/contrib/gcc/c-common.h Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/c-common.h Sun Nov 24 09:43:55 2013 (r258518) @@ -654,7 +654,7 @@ extern void binary_op_error (enum tree_c extern tree fix_string_type (tree); struct varray_head_tag; extern void constant_expression_warning (tree); -extern void strict_aliasing_warning(tree, tree, tree); +extern bool strict_aliasing_warning (tree, tree, tree); extern void empty_body_warning (tree, tree); extern tree convert_and_check (tree, tree); extern void overflow_warning (tree); Modified: projects/random_number_generator/contrib/gcc/c-opts.c ============================================================================== --- projects/random_number_generator/contrib/gcc/c-opts.c Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/c-opts.c Sun Nov 24 09:43:55 2013 (r258518) @@ -396,7 +396,7 @@ c_common_handle_option (size_t scode, co if (c_dialect_cxx ()) warn_sign_compare = value; warn_switch = value; - warn_strict_aliasing = value; + set_warn_strict_aliasing (value); warn_strict_overflow = value; warn_address = value; @@ -606,6 +606,10 @@ c_common_handle_option (size_t scode, co disable_builtin_function (arg); break; + case OPT_fdirectives_only: + cpp_opts->directives_only = 1; + break; + case OPT_fdollars_in_identifiers: cpp_opts->dollars_in_ident = value; break; @@ -1329,6 +1333,11 @@ sanitize_cpp_opts (void) if (flag_dump_macros == 'M') flag_no_output = 1; + /* By default, -fdirectives-only implies -dD. This allows subsequent phases + to perform proper macro expansion. */ + if (cpp_opts->directives_only && !cpp_opts->preprocessed && !flag_dump_macros) + flag_dump_macros = 'D'; + /* Disable -dD, -dN and -dI if normal output is suppressed. Allow -dM since at least glibc relies on -M -dM to work. */ /* Also, flag_no_output implies flag_no_line_commands, always. */ @@ -1359,6 +1368,14 @@ sanitize_cpp_opts (void) actually output the current directory? */ if (flag_working_directory == -1) flag_working_directory = (debug_info_level != DINFO_LEVEL_NONE); + + if (cpp_opts->directives_only) + { + if (warn_unused_macros) + error ("-fdirectives-only is incompatible with -Wunused_macros"); + if (cpp_opts->traditional) + error ("-fdirectives-only is incompatible with -traditional"); + } } /* Add include path with a prefix at the front of its name. */ @@ -1442,6 +1459,8 @@ finish_options (void) } } } + else if (cpp_opts->directives_only) + cpp_init_special_builtins (parse_in); include_cursor = 0; push_command_line_include (); Modified: projects/random_number_generator/contrib/gcc/c-ppoutput.c ============================================================================== --- projects/random_number_generator/contrib/gcc/c-ppoutput.c Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/c-ppoutput.c Sun Nov 24 09:43:55 2013 (r258518) @@ -41,6 +41,8 @@ static struct /* General output routines. */ static void scan_translation_unit (cpp_reader *); +static void print_lines_directives_only (int, const void *, size_t); +static void scan_translation_unit_directives_only (cpp_reader *); static void scan_translation_unit_trad (cpp_reader *); static void account_for_newlines (const unsigned char *, size_t); static int dump_macro (cpp_reader *, cpp_hashnode *, void *); @@ -75,6 +77,9 @@ preprocess_file (cpp_reader *pfile) } else if (cpp_get_options (pfile)->traditional) scan_translation_unit_trad (pfile); + else if (cpp_get_options (pfile)->directives_only + && !cpp_get_options (pfile)->preprocessed) + scan_translation_unit_directives_only (pfile); else scan_translation_unit (pfile); @@ -179,6 +184,26 @@ scan_translation_unit (cpp_reader *pfile } } +static void +print_lines_directives_only (int lines, const void *buf, size_t size) +{ + print.src_line += lines; + fwrite (buf, 1, size, print.outf); +} + +/* Writes out the preprocessed file, handling spacing and paste + avoidance issues. */ +static void +scan_translation_unit_directives_only (cpp_reader *pfile) +{ + struct _cpp_dir_only_callbacks cb; + + cb.print_lines = print_lines_directives_only; + cb.maybe_print_line = maybe_print_line; + + _cpp_preprocess_dir_only (pfile, &cb); +} + /* Adjust print.src_line for newlines embedded in output. */ static void account_for_newlines (const unsigned char *str, size_t len) Modified: projects/random_number_generator/contrib/gcc/c-typeck.c ============================================================================== --- projects/random_number_generator/contrib/gcc/c-typeck.c Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/c-typeck.c Sun Nov 24 09:43:55 2013 (r258518) @@ -1876,6 +1876,19 @@ build_indirect_ref (tree ptr, const char if (TREE_CODE (type) == POINTER_TYPE) { + if (TREE_CODE (pointer) == CONVERT_EXPR + || TREE_CODE (pointer) == NOP_EXPR + || TREE_CODE (pointer) == VIEW_CONVERT_EXPR) + { + /* If a warning is issued, mark it to avoid duplicates from + the backend. This only needs to be done at + warn_strict_aliasing > 2. */ + if (warn_strict_aliasing > 2) + if (strict_aliasing_warning (TREE_TYPE (TREE_OPERAND (pointer, 0)), + type, TREE_OPERAND (pointer, 0))) + TREE_NO_WARNING (pointer) = 1; + } + if (TREE_CODE (pointer) == ADDR_EXPR && (TREE_TYPE (TREE_OPERAND (pointer, 0)) == TREE_TYPE (type))) @@ -3562,7 +3575,8 @@ build_c_cast (tree type, tree expr) warning (OPT_Wint_to_pointer_cast, "cast to pointer from integer " "of different size"); - strict_aliasing_warning (otype, type, expr); + if (warn_strict_aliasing <= 2) + strict_aliasing_warning (otype, type, expr); /* If pedantic, warn for conversions between function and object pointer types, except for converting a null pointer constant Modified: projects/random_number_generator/contrib/gcc/c.opt ============================================================================== --- projects/random_number_generator/contrib/gcc/c.opt Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/c.opt Sun Nov 24 09:43:55 2013 (r258518) @@ -494,6 +494,10 @@ fdefault-inline C++ ObjC++ Inline member functions by default +fdirectives-only +C ObjC C++ ObjC++ +Preprocess directives only. + fdollars-in-identifiers C ObjC C++ ObjC++ Permit '$' as an identifier character Modified: projects/random_number_generator/contrib/gcc/common.opt ============================================================================== --- projects/random_number_generator/contrib/gcc/common.opt Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/common.opt Sun Nov 24 09:43:55 2013 (r258518) @@ -95,7 +95,11 @@ Warn when an inlined function cannot be Wlarger-than- Common RejectNegative Joined UInteger --Wlarger-than- Warn if an object is larger than bytes +-Wlarger-than- Warn if an object is larger than bytes + +Wframe-larger-than- +Common RejectNegative Joined UInteger +-Wframe-larger-than- Warn if the frame size of a function is larger than bytes Wunsafe-loop-optimizations Common Var(warn_unsafe_loop_optimizations) @@ -537,6 +541,14 @@ finstrument-functions Common Report Var(flag_instrument_function_entry_exit) Instrument function entry and exit with profiling calls +finstrument-functions-exclude-function-list= +Common RejectNegative Joined +-finstrument-functions-exclude-function-list=name,... Do not instrument listed functions + +finstrument-functions-exclude-file-list= +Common RejectNegative Joined +-finstrument-functions-exclude-file-list=filename,... Do not instrument functions listed in files + fipa-cp Common Report Var(flag_ipa_cp) Perform Interprocedural constant propagation Modified: projects/random_number_generator/contrib/gcc/coverage.c ============================================================================== --- projects/random_number_generator/contrib/gcc/coverage.c Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/coverage.c Sun Nov 24 09:43:55 2013 (r258518) @@ -429,57 +429,75 @@ tree_coverage_counter_ref (unsigned coun static unsigned coverage_checksum_string (unsigned chksum, const char *string) { - int i; char *dup = NULL; + char *ptr; /* Look for everything that looks if it were produced by get_file_function_name and zero out the second part that may result from flag_random_seed. This is not critical as the checksums are used only for sanity checking. */ - for (i = 0; string[i]; i++) +#define GLOBAL_PREFIX "_GLOBAL__" +#define TRAILING_N "N_" +#define ISCAPXDIGIT(a) (((a) >= '0' && (a) <= '9') || ((a) >= 'A' && (a) <= 'F')) + if ((ptr = strstr (string, GLOBAL_PREFIX))) { - int offset = 0; - if (!strncmp (string + i, "_GLOBAL__N_", 11)) - offset = 11; - if (!strncmp (string + i, "_GLOBAL__", 9)) - offset = 9; - - /* C++ namespaces do have scheme: - _GLOBAL__N___functionname - since filename might contain extra underscores there seems - to be no better chance then walk all possible offsets looking - for magicnuber. */ - if (offset) - { - for (i = i + offset; string[i]; i++) - if (string[i]=='_') - { - int y; - - for (y = 1; y < 9; y++) - if (!(string[i + y] >= '0' && string[i + y] <= '9') - && !(string[i + y] >= 'A' && string[i + y] <= 'F')) - break; - if (y != 9 || string[i + 9] != '_') - continue; - for (y = 10; y < 18; y++) - if (!(string[i + y] >= '0' && string[i + y] <= '9') - && !(string[i + y] >= 'A' && string[i + y] <= 'F')) - break; - if (y != 18) - continue; - if (!dup) - string = dup = xstrdup (string); - for (y = 10; y < 18; y++) - dup[i + y] = '0'; - } - break; - } + /* Skip _GLOBAL__. */ + ptr += strlen (GLOBAL_PREFIX); + + /* Skip optional N_ (in case __GLOBAL_N__). */ + if (!strncmp (ptr, TRAILING_N, strlen (TRAILING_N))) + ptr += strlen (TRAILING_N); + /* At this point, ptr should point after "_GLOBAL__N_" or "_GLOBAL__". */ + + while ((ptr = strchr (ptr, '_')) != NULL) + { + int y; + /* For every "_" in the rest of the string, + try the follwing pattern matching */ + + /* Skip over '_'. */ + ptr++; +#define NDIGITS (8) + /* Try matching the pattern: + <8-digit hex>_<8-digit hex> + The second number is randomly generated + so we want to mask it out before computing the checksum. */ + for (y = 0; *ptr != 0 && y < NDIGITS; y++, ptr++) + if (!ISCAPXDIGIT (*ptr)) + break; + if (y != NDIGITS || *ptr != '_') + continue; + /* Skip over '_' again. */ + ptr++; + for (y = 0; *ptr != 0 && y < NDIGITS; y++, ptr++) + if (!ISCAPXDIGIT (*ptr)) + break; + + if (y == NDIGITS) + { + /* We have a match. + Duplicate the string and mask out + the second 8-digit number. */ + dup = xstrdup (string); + ptr = dup + (ptr - string); + for(y = -NDIGITS - 1 ; y < 0; y++) + { + ptr[y] = '0'; + } + ptr = dup; + break; + } + } + /* "ptr" should be NULL if we couldn't find the match + (strchr will return NULL if no match is found), + or it should point to dup which contains the string + with the random part masked. */ } - chksum = crc32_string (chksum, string); + chksum = crc32_string (chksum, (ptr) ? ptr : string); + if (dup) - free (dup); + free (dup); return chksum; } Modified: projects/random_number_generator/contrib/gcc/cp/typeck.c ============================================================================== --- projects/random_number_generator/contrib/gcc/cp/typeck.c Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/cp/typeck.c Sun Nov 24 09:43:55 2013 (r258518) @@ -2334,6 +2334,19 @@ build_indirect_ref (tree ptr, const char types. */ tree t = canonical_type_variant (TREE_TYPE (type)); + if (TREE_CODE (ptr) == CONVERT_EXPR + || TREE_CODE (ptr) == NOP_EXPR + || TREE_CODE (ptr) == VIEW_CONVERT_EXPR) + { + /* If a warning is issued, mark it to avoid duplicates from + the backend. This only needs to be done at + warn_strict_aliasing > 2. */ + if (warn_strict_aliasing > 2) + if (strict_aliasing_warning (TREE_TYPE (TREE_OPERAND (ptr, 0)), + type, TREE_OPERAND (ptr, 0))) + TREE_NO_WARNING (ptr) = 1; + } + if (VOID_TYPE_P (t)) { /* A pointer to incomplete type (other than cv void) can be @@ -5256,7 +5269,8 @@ build_reinterpret_cast_1 (tree type, tre /* We need to strip nops here, because the frontend likes to create (int *)&a for array-to-pointer decay, instead of &a[0]. */ STRIP_NOPS (sexpr); - strict_aliasing_warning (intype, type, sexpr); + if (warn_strict_aliasing <= 2) + strict_aliasing_warning (intype, type, sexpr); return fold_if_not_in_template (build_nop (type, expr)); } Modified: projects/random_number_generator/contrib/gcc/doc/cppopts.texi ============================================================================== --- projects/random_number_generator/contrib/gcc/doc/cppopts.texi Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/doc/cppopts.texi Sun Nov 24 09:43:55 2013 (r258518) @@ -506,6 +506,22 @@ Search @var{dir} only for header files r @xref{Search Path}. @end ifset +@item -fdirectives-only +@opindex fdirectives-only +This option provides a simplified preprocessor to improve the +performance of distributed build systems such as distcc. It's +behavior depends on a number of other flags. + +If the @option{-E} option is enabled, it suppresses things like macro +expansion, trigraph conversion, and escaped newline splicing +outside of directives. All directives are processed normally, except that +macro definitions are output similar to the @option{-dD} option. + +If the @option{-fpreprocessed} option is enabled, it suppresses +predefinition of most builtin and command line macros. This +prevents duplicate definition of macros output with the @option{-E} +option. + @item -fdollars-in-identifiers @opindex fdollars-in-identifiers @anchor{fdollars-in-identifiers} Modified: projects/random_number_generator/contrib/gcc/doc/invoke.texi ============================================================================== --- projects/random_number_generator/contrib/gcc/doc/invoke.texi Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/doc/invoke.texi Sun Nov 24 09:43:55 2013 (r258518) @@ -214,7 +214,8 @@ in the following sections. -Wimport -Wno-import -Winit-self -Winline @gol -Wno-int-to-pointer-cast @gol -Wno-invalid-offsetof -Winvalid-pch @gol --Wlarger-than-@var{len} -Wunsafe-loop-optimizations -Wlong-long @gol +-Wlarger-than-@var{len} -Wframe-larger-than-@var{len} @gol +-Wunsafe-loop-optimizations -Wlong-long @gol -Wmain -Wmissing-braces -Wmissing-field-initializers @gol -Wmissing-format-attribute -Wmissing-include-dirs @gol -Wmissing-noreturn @gol @@ -758,6 +759,8 @@ See S/390 and zSeries Options. -fnon-call-exceptions -funwind-tables @gol -fasynchronous-unwind-tables @gol -finhibit-size-directive -finstrument-functions @gol +-finstrument-functions-exclude-function-list=@var{sym},@var{sym},@dots{} @gol +-finstrument-functions-exclude-file-list=@var{file},@var{file},@dots{} @gol -fno-common -fno-ident @gol -fpcc-struct-return -fpic -fPIC -fpie -fPIE @gol -fno-jump-tables @gol @@ -2505,14 +2508,40 @@ It warns about code which might break th compiler is using for optimization. The warning does not catch all cases, but does attempt to catch the more common pitfalls. It is included in @option{-Wall}. +It is equivalent to -Wstrict-aliasing=3 -@item -Wstrict-aliasing=2 -@opindex Wstrict-aliasing=2 +@item -Wstrict-aliasing=n +@opindex Wstrict-aliasing=n This option is only active when @option{-fstrict-aliasing} is active. It warns about code which might break the strict aliasing rules that the -compiler is using for optimization. This warning catches more cases than -@option{-Wstrict-aliasing}, but it will also give a warning for some ambiguous -cases that are safe. +compiler is using for optimization. +Higher levels correspond to higher accuracy (fewer false positives). +Higher levels also correspond to more effort, similar to the way -O works. +@option{-Wstrict-aliasing} is equivalent to @option{-Wstrict-aliasing=n}, +with n=3. + +Level 1: Most aggressive, quick, least accurate. +Possibly useful when higher levels +do not warn but -fstrict-aliasing still breaks the code, as it has very few +false negatives. However, it has many false positives. +Warns for all pointer conversions between possibly incompatible types, +even if never dereferenced. Runs in the frontend only. + +Level 2: Aggressive, quick, not too precise. +May still have many false positives (not as many as level 1 though), +and few false negatives (but possibly more than level 1). +Unlike level 1, it only warns when an address is taken. Warns about +incomplete types. Runs in the frontend only. + +Level 3 (default for @option{-Wstrict-aliasing}): +Should have very few false positives and few false +negatives. Slightly slower than levels 1 or 2 when optimization is enabled. +Takes care of the common punn+dereference pattern in the frontend: +@code{*(int*)&some_float}. +If optimization is enabled, it also runs in the backend, where it deals +with multiple statement cases using flow-sensitive points-to information. +Only warns when the converted pointer is dereferenced. +Does not warn about incomplete types. @item -Wstrict-overflow @item -Wstrict-overflow=@var{n} @@ -2828,6 +2857,10 @@ global variable or whenever a built-in f @opindex Wlarger-than Warn whenever an object of larger than @var{len} bytes is defined. +@item -Wframe-larger-than-@var{len} +@opindex Wframe-larger-than +Warn whenever the frame size of a function is larger than @var{len} bytes. + @item -Wunsafe-loop-optimizations @opindex Wunsafe-loop-optimizations Warn if the loop cannot be optimized because the compiler could not @@ -13355,6 +13388,37 @@ interrupt routines, and any functions fr cannot safely be called (perhaps signal handlers, if the profiling routines generate output or allocate memory). +@item -finstrument-functions-exclude-file-list=@var{file},@var{file},@dots{} +@opindex finstrument-functions-exclude-file-list + +Set the list of functions that are excluded from instrumentation (see +the description of @code{-finstrument-functions}). If the file that +contains a function definition matches with one of @var{file}, then +that function is not instrumented. The match is done on substrings: +if the @var{file} parameter is a substring of the file name, it is +considered to be a match. + +For example, +@code{-finstrument-functions-exclude-file-list=/bits/stl,include/sys} +will exclude any inline function defined in files whose pathnames +contain @code{/bits/stl} or @code{include/sys}. + +If, for some reason, you want to include letter @code{','} in one of +@var{sym}, write @code{'\,'}. For example, +@code{-finstrument-functions-exclude-file-list='\,\,tmp'} +(note the single quote surrounding the option). + +@item -finstrument-functions-exclude-function-list=@var{sym},@var{sym},@dots{} +@opindex finstrument-functions-exclude-function-list + +This is similar to @code{-finstrument-functions-exclude-file-list}, +but this option sets the list of function names to be excluded from +instrumentation. The function name to be matched is its user-visible +name, such as @code{vector blah(const vector &)}, not the +internal mangled name (e.g., @code{_Z4blahRSt6vectorIiSaIiEE}). The +match is done on substrings: if the @var{sym} parameter is a substring +of the function name, it is considered to be a match. + @item -fstack-check @opindex fstack-check Generate code to verify that you do not go beyond the boundary of the @@ -13932,3 +13996,4 @@ exist, because otherwise they won't get @xref{Protoize Caveats}, for more information on how to use @code{protoize} successfully. + Modified: projects/random_number_generator/contrib/gcc/final.c ============================================================================== --- projects/random_number_generator/contrib/gcc/final.c Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/final.c Sun Nov 24 09:43:55 2013 (r258518) @@ -1425,6 +1425,15 @@ final_start_function (rtx first ATTRIBUT TREE_ASM_WRITTEN (DECL_INITIAL (current_function_decl)) = 1; } + if (warn_frame_larger_than + && get_frame_size () > frame_larger_than_size) + { + /* Issue a warning */ + warning (OPT_Wframe_larger_than_, + "the frame size of %wd bytes is larger than %wd bytes", + get_frame_size (), frame_larger_than_size); + } + /* First output the function prologue: code to set up the stack frame. */ targetm.asm_out.function_prologue (file, get_frame_size ()); @@ -4083,4 +4092,3 @@ struct tree_opt_pass pass_clean_state = 0, /* todo_flags_finish */ 0 /* letter */ }; - Modified: projects/random_number_generator/contrib/gcc/flags.h ============================================================================== --- projects/random_number_generator/contrib/gcc/flags.h Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/flags.h Sun Nov 24 09:43:55 2013 (r258518) @@ -122,6 +122,15 @@ extern bool extra_warnings; extern void set_Wunused (int setting); +/* Used to set the level of -Wstrict-aliasing, when no level is specified. + The external way to set the default level is to use + -Wstrict-aliasing=level. + ONOFF is assumed to take value 1 when -Wstrict-aliasing is specified, + and 0 otherwise. After calling this function, wstrict_aliasing will be + set to the default value of -Wstrict_aliasing=level. */ + +extern void set_warn_strict_aliasing (int onoff); + /* Nonzero means warn about any objects definitions whose size is larger than N bytes. Also want about function definitions whose returned values are larger than N bytes. The value N is in `larger_than_size'. */ @@ -129,6 +138,12 @@ extern void set_Wunused (int setting); extern bool warn_larger_than; extern HOST_WIDE_INT larger_than_size; +/* Nonzero means warn about any function whose frame size is larger + than N bytes. */ + +extern bool warn_frame_larger_than; +extern HOST_WIDE_INT frame_larger_than_size; + /* Nonzero means warn about constructs which might not be strict aliasing safe. */ @@ -287,6 +302,10 @@ extern const char *flag_random_seed; #define abi_version_at_least(N) \ (flag_abi_version == 0 || flag_abi_version >= (N)) +/* Return whether the function should be excluded from + instrumentation. */ +extern bool flag_instrument_functions_exclude_p (tree fndecl); + /* True if the given mode has a NaN representation and the treatment of NaN operands is important. Certain optimizations, such as folding x * 0 into 0, are not correct for NaN operands, and are normally Modified: projects/random_number_generator/contrib/gcc/gimplify.c ============================================================================== --- projects/random_number_generator/contrib/gcc/gimplify.c Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/gimplify.c Sun Nov 24 09:43:55 2013 (r258518) @@ -6397,7 +6397,8 @@ gimplify_function_tree (tree fndecl) catch the exit hook. */ /* ??? Add some way to ignore exceptions for this TFE. */ if (flag_instrument_function_entry_exit - && ! DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT (fndecl)) + && !DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT (fndecl) + && !flag_instrument_functions_exclude_p (fndecl)) { tree tf, x, bind; Modified: projects/random_number_generator/contrib/gcc/opts.c ============================================================================== --- projects/random_number_generator/contrib/gcc/opts.c Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/opts.c Sun Nov 24 09:43:55 2013 (r258518) @@ -59,6 +59,11 @@ bool extra_warnings; bool warn_larger_than; HOST_WIDE_INT larger_than_size; +/* True to warn about any function whose frame size is larger + * than N bytes. */ +bool warn_frame_larger_than; +HOST_WIDE_INT frame_larger_than_size; + /* Nonzero means warn about constructs which might not be strict-aliasing safe. */ int warn_strict_aliasing; @@ -358,6 +363,15 @@ static bool flag_unroll_loops_set, flag_ static bool flag_value_profile_transformations_set; static bool flag_peel_loops_set, flag_branch_probabilities_set; +/* Functions excluded from profiling. */ + +typedef char *char_p; /* For DEF_VEC_P. */ +DEF_VEC_P(char_p); +DEF_VEC_ALLOC_P(char_p,heap); + +static VEC(char_p,heap) *flag_instrument_functions_exclude_functions; +static VEC(char_p,heap) *flag_instrument_functions_exclude_files; + /* Input file names. */ const char **in_fnames; unsigned num_in_fnames; @@ -604,6 +618,87 @@ add_input_filename (const char *filename in_fnames[num_in_fnames - 1] = filename; } +/* Add functions or file names to a vector of names to exclude from + instrumentation. */ + +static void +add_instrument_functions_exclude_list (VEC(char_p,heap) **pvec, + const char* arg) +{ + char *tmp; + char *r; + char *w; + char *token_start; + + /* We never free this string. */ + tmp = xstrdup (arg); + + r = tmp; + w = tmp; + token_start = tmp; + + while (*r != '\0') + { + if (*r == ',') + { + *w++ = '\0'; + ++r; + VEC_safe_push (char_p, heap, *pvec, token_start); + token_start = w; + } + if (*r == '\\' && r[1] == ',') + { + *w++ = ','; + r += 2; + } + else + *w++ = *r++; + } + if (*token_start != '\0') + VEC_safe_push (char_p, heap, *pvec, token_start); +} + +/* Return whether we should exclude FNDECL from instrumentation. */ + +bool +flag_instrument_functions_exclude_p (tree fndecl) +{ + if (VEC_length (char_p, flag_instrument_functions_exclude_functions) > 0) + { + const char *name; + int i; + char *s; + + name = lang_hooks.decl_printable_name (fndecl, 0); + for (i = 0; + VEC_iterate (char_p, flag_instrument_functions_exclude_functions, + i, s); + ++i) + { + if (strstr (name, s) != NULL) + return true; + } + } + + if (VEC_length (char_p, flag_instrument_functions_exclude_files) > 0) + { + const char *name; + int i; + char *s; + + name = DECL_SOURCE_FILE (fndecl); + for (i = 0; + VEC_iterate (char_p, flag_instrument_functions_exclude_files, i, s); + ++i) + { + if (strstr (name, s) != NULL) + return true; + } + } + + return false; +} + /* Decode and handle the vector of command line options. LANG_MASK contains has a single bit set representing the current language. */ @@ -979,7 +1074,15 @@ common_handle_option (size_t scode, cons warn_larger_than = value != -1; break; + case OPT_Wframe_larger_than_: + frame_larger_than_size = value; + warn_frame_larger_than = value != -1; + break; + case OPT_Wstrict_aliasing: + set_warn_strict_aliasing (value); + break; + case OPT_Wstrict_aliasing_: warn_strict_aliasing = value; break; @@ -1086,6 +1189,16 @@ common_handle_option (size_t scode, cons set_param_value ("max-inline-insns-auto", value / 2); break; + case OPT_finstrument_functions_exclude_function_list_: + add_instrument_functions_exclude_list + (&flag_instrument_functions_exclude_functions, arg); + break; + + case OPT_finstrument_functions_exclude_file_list_: + add_instrument_functions_exclude_list + (&flag_instrument_functions_exclude_files, arg); + break; + case OPT_fmessage_length_: pp_set_line_maximum_length (global_dc->printer, value); break; @@ -1348,6 +1461,20 @@ set_Wunused (int setting) warn_unused_value = setting; } +/* Used to set the level of strict aliasing warnings, + when no level is specified (i.e., when -Wstrict-aliasing, and not + -Wstrict-aliasing=level was given). + ONOFF is assumed to take value 1 when -Wstrict-aliasing is specified, + and 0 otherwise. After calling this function, wstrict_aliasing will be + set to the default value of -Wstrict_aliasing=level, currently 3. */ +void +set_warn_strict_aliasing (int onoff) +{ + gcc_assert (onoff == 0 || onoff == 1); + if (onoff != 0) + warn_strict_aliasing = 3; +} + /* The following routines are useful in setting all the flags that -ffast-math and -fno-fast-math imply. */ void Modified: projects/random_number_generator/contrib/gcc/tree-flow.h ============================================================================== --- projects/random_number_generator/contrib/gcc/tree-flow.h Sun Nov 24 09:32:04 2013 (r258517) +++ projects/random_number_generator/contrib/gcc/tree-flow.h Sun Nov 24 09:43:55 2013 (r258518) @@ -694,6 +694,8 @@ static inline bool overlap_subvar (unsig definition, a function with this prototype is called. */ typedef bool (*walk_use_def_chains_fn) (tree, tree, void *); +/* In tree-ssa-alias-warnings.c */ +extern void strict_aliasing_warning_backend (void); /* In tree-ssa.c */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sun Nov 24 12:48:57 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 67E5FE13; Sun, 24 Nov 2013 12:48:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 557342F84; Sun, 24 Nov 2013 12:48:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAOCmvWZ085414; Sun, 24 Nov 2013 12:48:57 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAOCmtDe085398; Sun, 24 Nov 2013 12:48:55 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201311241248.rAOCmtDe085398@svn.freebsd.org> From: Andrew Turner Date: Sun, 24 Nov 2013 12:48:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258525 - in projects/specific_leg/sys: arm/arm arm/broadcom/bcm2835 arm/include conf dev/fdt X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Nov 2013 12:48:57 -0000 Author: andrew Date: Sun Nov 24 12:48:55 2013 New Revision: 258525 URL: http://svnweb.freebsd.org/changeset/base/258525 Log: Add the start of the platform code. This is mostly copied from PowerPC. The machine independent parts will be merged later when these parts have been found. Added: projects/specific_leg/sys/arm/arm/platform.c (contents, props changed) projects/specific_leg/sys/arm/arm/platform_if.m projects/specific_leg/sys/arm/include/platform.h (contents, props changed) projects/specific_leg/sys/arm/include/platformvar.h (contents, props changed) projects/specific_leg/sys/dev/fdt/fdt_platform.c (contents, props changed) Modified: projects/specific_leg/sys/arm/arm/machdep.c projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/specific_leg/sys/arm/include/fdt.h projects/specific_leg/sys/conf/files.arm Modified: projects/specific_leg/sys/arm/arm/machdep.c ============================================================================== --- projects/specific_leg/sys/arm/arm/machdep.c Sun Nov 24 11:55:07 2013 (r258524) +++ projects/specific_leg/sys/arm/arm/machdep.c Sun Nov 24 12:48:55 2013 (r258525) @@ -96,6 +96,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -1238,6 +1239,8 @@ initarm(struct arm_boot_params *abp) if (OF_init((void *)dtbp) != 0) while (1); + platform_probe_and_attach(); + /* Grab physical memory regions information from device tree. */ if (fdt_get_mem_regions(memory_regions, &memory_regions_sz, &memsize) != 0) Added: projects/specific_leg/sys/arm/arm/platform.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/specific_leg/sys/arm/arm/platform.c Sun Nov 24 12:48:55 2013 (r258525) @@ -0,0 +1,248 @@ +/*- + * Copyright (c) 2005 Peter Grehan + * Copyright (c) 2009 Nathan Whitehorn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +/* + * Dispatch platform calls to the appropriate platform implementation + * through a previously registered kernel object. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include "platform_if.h" + +static platform_def_t *plat_def_impl; +static platform_t plat_obj; +static struct kobj_ops plat_kernel_kops; +static struct platform_kobj plat_kernel_obj; + +static char plat_name[64] = ""; +SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RD | CTLFLAG_TUN, + plat_name, 0, "Platform currently in use"); + +static struct mem_region *pregions = NULL; +static struct mem_region *aregions = NULL; +static int npregions, naregions; + +void +mem_regions(struct mem_region **phys, int *physsz, struct mem_region **avail, + int *availsz) +{ + if (pregions == NULL) + PLATFORM_MEM_REGIONS(plat_obj, &pregions, &npregions, + &aregions, &naregions); + + *phys = pregions; + *avail = aregions; + *physsz = npregions; + *availsz = naregions; +} + +#if 0 +int +mem_valid(vm_offset_t addr, int len) +{ + int i; + + if (pregions == NULL) + PLATFORM_MEM_REGIONS(plat_obj, &pregions, &npregions, + &aregions, &naregions); + + for (i = 0; i < npregions; i++) + if ((addr >= pregions[i].mr_start) + && (addr + len <= pregions[i].mr_start + pregions[i].mr_size)) + return (0); + + return (EFAULT); +} +#endif + +vm_offset_t +platform_real_maxaddr(void) +{ + return (PLATFORM_REAL_MAXADDR(plat_obj)); +} + +#if 0 +const char * +installed_platform() +{ + return (plat_def_impl->name); +} + +u_long +platform_timebase_freq(struct cpuref *cpu) +{ + return (PLATFORM_TIMEBASE_FREQ(plat_obj, cpu)); +} + +int +platform_smp_first_cpu(struct cpuref *cpu) +{ + return (PLATFORM_SMP_FIRST_CPU(plat_obj, cpu)); +} + +int +platform_smp_next_cpu(struct cpuref *cpu) +{ + return (PLATFORM_SMP_NEXT_CPU(plat_obj, cpu)); +} + +int +platform_smp_get_bsp(struct cpuref *cpu) +{ + return (PLATFORM_SMP_GET_BSP(plat_obj, cpu)); +} + +int +platform_smp_start_cpu(struct pcpu *cpu) +{ + return (PLATFORM_SMP_START_CPU(plat_obj, cpu)); +} + +void +platform_smp_ap_init() +{ + PLATFORM_SMP_AP_INIT(plat_obj); +} +#endif + +#ifdef SMP +struct cpu_group * +cpu_topo(void) +{ + return (PLATFORM_SMP_TOPO(plat_obj)); +} +#endif + +#if 0 +/* + * Reset back to firmware. + */ +void +cpu_reset() +{ + PLATFORM_RESET(plat_obj); +} +#endif + +/* + * Platform install routines. Highest priority wins, using the same + * algorithm as bus attachment. + */ +SET_DECLARE(platform_set, platform_def_t); + +void +platform_probe_and_attach(void) +{ + platform_def_t **platpp, *platp; + int prio, best_prio; + + plat_obj = &plat_kernel_obj; + best_prio = 0; + +printf("platform_probe_and_attach\n"); + /* + * Try to locate the best platform kobj + */ + SET_FOREACH(platpp, platform_set) { + platp = *platpp; +printf("platp = %p %p\n", platp, platp->baseclasses); + + /* + * Take care of compiling the selected class, and + * then statically initialise the MMU object + */ + kobj_class_compile_static(platp, &plat_kernel_kops); + kobj_init_static((kobj_t)plat_obj, platp); + + plat_obj->cls = platp; + + prio = PLATFORM_PROBE(plat_obj); + + /* Check for errors */ + if (prio > 0) + continue; + + /* + * Check if this module was specifically requested through + * the loader tunable we provide. + */ + if (strcmp(platp->name,plat_name) == 0) { + plat_def_impl = platp; + break; + } + + /* Otherwise, see if it is better than our current best */ + if (plat_def_impl == NULL || prio > best_prio) { + best_prio = prio; + plat_def_impl = platp; + } + + /* + * We can't free the KOBJ, since it is static. Reset the ops + * member of this class so that we can come back later. + */ + platp->ops = NULL; + } + + if (plat_def_impl == NULL) + panic("No platform module found!"); + + /* + * Recompile to make sure we ended with the + * correct one, and then attach. + */ + + kobj_class_compile_static(plat_def_impl, &plat_kernel_kops); + kobj_init_static((kobj_t)plat_obj, plat_def_impl); + + strlcpy(plat_name,plat_def_impl->name,sizeof(plat_name)); + + PLATFORM_ATTACH(plat_obj); +} + Added: projects/specific_leg/sys/arm/arm/platform_if.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/specific_leg/sys/arm/arm/platform_if.m Sun Nov 24 12:48:55 2013 (r258525) @@ -0,0 +1,108 @@ +#- +# Copyright (c) 2009 Nathan Whitehorn +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD: projects/specific_leg/sys/powerpc/powerpc/platform_if.m 255417 2013-09-09 12:49:19Z nwhitehorn $ +# + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +/** + * @defgroup PLATFORM platform - KObj methods for PowerPC platform + * implementations + * @brief A set of methods required by all platform implementations. + * These are used to bring up secondary CPUs, supply the physical memory + * map, etc. + *@{ + */ + +INTERFACE platform; + +# +# Default implementations +# +CODE { + static void platform_null_attach(platform_t plat) + { + return; + } +#if 0 + static int platform_null_smp_first_cpu(platform_t plat, + struct cpuref *cpuref) + { + cpuref->cr_hwref = -1; + cpuref->cr_cpuid = 0; + return (0); + } + static int platform_null_smp_next_cpu(platform_t plat, + struct cpuref *_cpuref) + { + return (ENOENT); + } + static struct cpu_group *platform_null_smp_topo(platform_t plat) + { +#ifdef SMP + return (smp_topo_none()); +#else + return (NULL); +#endif + } +#endif + static vm_offset_t platform_null_real_maxaddr(platform_t plat) + { + return (VM_MAX_ADDRESS); + } + static void platform_null_smp_ap_init(platform_t plat) + { + return; + } +}; + +/** + * @brief Probe for whether we are on this platform, returning the standard + * newbus probe codes. If we have Open Firmware or a flattened device tree, + * it is guaranteed to be available at this point. + */ +METHOD int probe { + platform_t _plat; +}; + +/** + * @brief Attach this platform module. This happens before the MMU is online, + * so the platform module can install its own high-priority MMU module at + * this point. + */ +METHOD int attach { + platform_t _plat; +} DEFAULT platform_null_attach; + Modified: projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c ============================================================================== --- projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Sun Nov 24 11:55:07 2013 (r258524) +++ projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Sun Nov 24 12:48:55 2013 (r258525) @@ -54,11 +54,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include +#include "platform_if.h" + /* Start of address space used for bootstrap map */ #define DEVMAP_BOOTSTRAP_MAP_START 0xE0000000 @@ -145,3 +148,9 @@ cpu_reset() while (1); } +static platform_method_t bcm2835_methods[] = { + PLATFORMMETHOD_END, +}; + +FDT_PLATFORM_DEF(bcm2835, "bcm2835", 0, "raspberrypi,model-b"); + Modified: projects/specific_leg/sys/arm/include/fdt.h ============================================================================== --- projects/specific_leg/sys/arm/include/fdt.h Sun Nov 24 11:55:07 2013 (r258524) +++ projects/specific_leg/sys/arm/include/fdt.h Sun Nov 24 12:48:55 2013 (r258525) @@ -39,6 +39,7 @@ #include #include +#include /* Max interrupt number */ #define FDT_INTR_MAX NIRQ @@ -51,11 +52,6 @@ */ extern bus_space_tag_t fdtbus_bs_tag; -struct mem_region { - vm_offset_t mr_start; - vm_size_t mr_size; -}; - struct arm_devmap_entry; int fdt_localbus_devmap(phandle_t, struct arm_devmap_entry *, int, int *); Added: projects/specific_leg/sys/arm/include/platform.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/specific_leg/sys/arm/include/platform.h Sun Nov 24 12:48:55 2013 (r258525) @@ -0,0 +1,59 @@ +/*- + * Copyright (C) 1996 Wolfgang Solfrank. + * Copyright (C) 1996 TooLs GmbH. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by TooLs GmbH. + * 4. The name of TooLs GmbH may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $NetBSD: powerpc.h,v 1.3 2000/06/01 00:49:59 matt Exp $ + * $FreeBSD$ + */ + +#ifndef _MACHINE_PLATFORM_H_ +#define _MACHINE_PLATFORM_H_ + +struct mem_region { + vm_offset_t mr_start; + vm_size_t mr_size; +}; + +void mem_regions(struct mem_region **, int *, struct mem_region **, int *); +vm_offset_t platform_real_maxaddr(void); + +#if 0 +u_long platform_timebase_freq(struct cpuref *); + +int platform_smp_first_cpu(struct cpuref *); +int platform_smp_next_cpu(struct cpuref *); +int platform_smp_get_bsp(struct cpuref *); +int platform_smp_start_cpu(struct pcpu *); +void platform_smp_ap_init(void); + +const char *installed_platform(void); +#endif +void platform_probe_and_attach(void); + +#endif /* _MACHINE_PLATFORM_H_ */ Added: projects/specific_leg/sys/arm/include/platformvar.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/specific_leg/sys/arm/include/platformvar.h Sun Nov 24 12:48:55 2013 (r258525) @@ -0,0 +1,124 @@ +/*- + * Copyright (c) 2005 Peter Grehan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _MACHINE_PLATFORMVAR_H_ +#define _MACHINE_PLATFORMVAR_H_ + +/* + * A PowerPC platform implementation is declared with a kernel object and + * an associated method table, similar to a device driver. + * + * e.g. + * + * static platform_method_t chrp_methods[] = { + * PLATFORMMETHOD(platform_probe, chrp_probe), + * PLATFORMMETHOD(platform_mem_regions, ofw_mem_regions), + * ... + * PLATFORMMETHOD(platform_smp_first_cpu, chrp_smp_first_cpu), + * PLATFORMMETHOD_END + * }; + * + * static platform_def_t chrp_platform = { + * "chrp", + * chrp_methods, + * sizeof(chrp_platform_softc), // or 0 if no softc + * }; + * + * PLATFORM_DEF(chrp_platform); + */ + +#include +#include + +struct platform_kobj { + /* + * A platform instance is a kernel object + */ + KOBJ_FIELDS; + + /* Platform class, for access to class specific data */ + struct kobj_class *cls; + +#if 0 + /* + * Utility elements that an instance may use + */ + struct mtx platform_mtx; /* available for instance use */ + void *platform_iptr; /* instance data pointer */ + + /* + * Opaque data that can be overlaid with an instance-private + * structure. Platform code can test that this is large enough at + * compile time with a sizeof() test againt it's softc. There + * is also a run-time test when the platform kernel object is + * registered. + */ +#define PLATFORM_OPAQUESZ 64 + u_int platform_opaque[PLATFORM_OPAQUESZ]; +#endif +}; + +typedef struct platform_kobj *platform_t; +typedef struct kobj_class platform_def_t; +#define platform_method_t kobj_method_t + +#define PLATFORMMETHOD KOBJMETHOD +#define PLATFORMMETHOD_END KOBJMETHOD_END + +#define PLATFORM_DEF(name) DATA_SET(platform_set, name) + +#ifdef FDT +struct fdt_platform_class { + KOBJ_CLASS_FIELDS; + + const char *fdt_compatible; +}; + +typedef struct fdt_platform_class fdt_platform_def_t; + +extern platform_method_t fdt_platform_methods[]; + +#define FDT_PLATFORM_DEF(NAME, NAME_STR, size, compatible) \ +static fdt_platform_def_t NAME ## _fdt_platform = { \ + .name = NAME_STR, \ + .methods = fdt_platform_methods, \ + .fdt_compatible = compatible, \ +}; \ +static kobj_class_t NAME ## _baseclasses[] = \ + { (kobj_class_t)&NAME ## _fdt_platform, NULL }; \ +static platform_def_t NAME ## _platform = { \ + NAME_STR, \ + NAME ## _methods, \ + size, \ + NAME ## _baseclasses, \ +}; \ +DATA_SET(platform_set, NAME ## _platform) + +#endif + +#endif /* _MACHINE_PLATFORMVAR_H_ */ Modified: projects/specific_leg/sys/conf/files.arm ============================================================================== --- projects/specific_leg/sys/conf/files.arm Sun Nov 24 11:55:07 2013 (r258524) +++ projects/specific_leg/sys/conf/files.arm Sun Nov 24 12:48:55 2013 (r258525) @@ -35,6 +35,8 @@ arm/arm/mp_machdep.c optional smp arm/arm/nexus.c standard arm/arm/pl190.c optional pl190 arm/arm/pl310.c optional pl310 +arm/arm/platform.c standard +arm/arm/platform_if.m standard arm/arm/pmap.c optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_sa1100 | cpu_sa1110 | cpu_xscale_80219 | cpu_xscale_80321 | cpu_xscale_81342 | cpu_xscale_ixp425 | cpu_xscale_ixp435 | cpu_xscale_pxa2x0 arm/arm/pmap-v6.c optional cpu_arm1136 | cpu_arm1176 | cpu_cortexa | cpu_mv_pj4b arm/arm/sc_machdep.c optional sc @@ -61,6 +63,7 @@ cddl/compat/opensolaris/kern/opensolaris crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/fb/fb.c optional sc +dev/fdt/fdt_platform.c optional fdt dev/hwpmc/hwpmc_arm.c optional hwpmc dev/kbd/kbd.c optional sc dev/syscons/scgfbrndr.c optional sc Added: projects/specific_leg/sys/dev/fdt/fdt_platform.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/specific_leg/sys/dev/fdt/fdt_platform.c Sun Nov 24 12:48:55 2013 (r258525) @@ -0,0 +1,69 @@ +/*- + * Copyright (c) 2013 Andrew Turner + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "opt_platform.h" + +#include + +#include +#include + +#include +#include + +#include "platform_if.h" + +#define FDT_PLATFORM(plat) \ + ((fdt_platform_def_t *)(plat)->cls->baseclasses[0]) + +static int +fdt_platform_probe(platform_t plat) +{ + const char *compat; + phandle_t root; + + /* + * TODO: Make these KASSERTs, we should only be here if we + * are using the FDT platform magic. + */ + if (plat->cls == NULL || FDT_PLATFORM(plat) == NULL) + return 1; + + /* Is the device is compatible? */ + root = OF_finddevice("/"); + compat = FDT_PLATFORM(plat)->fdt_compatible; + if (fdt_is_compatible(root, compat) != 0) + return 0; + + /* Not compatible, return an error */ + return 1; +} + +platform_method_t fdt_platform_methods[] = { + PLATFORMMETHOD(platform_probe, fdt_platform_probe), + PLATFORMMETHOD_END +}; + From owner-svn-src-projects@FreeBSD.ORG Sun Nov 24 15:03:27 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3E39446; Sun, 24 Nov 2013 15:03:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A42A624D9; Sun, 24 Nov 2013 15:03:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAOF3RAK048349; Sun, 24 Nov 2013 15:03:27 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAOF3Rjx048347; Sun, 24 Nov 2013 15:03:27 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201311241503.rAOF3Rjx048347@svn.freebsd.org> From: Andrew Turner Date: Sun, 24 Nov 2013 15:03:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258526 - projects/specific_leg/sys/arm/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Nov 2013 15:03:27 -0000 Author: andrew Date: Sun Nov 24 15:03:26 2013 New Revision: 258526 URL: http://svnweb.freebsd.org/changeset/base/258526 Log: Remove unused code. Modified: projects/specific_leg/sys/arm/arm/platform.c projects/specific_leg/sys/arm/arm/platform_if.m Modified: projects/specific_leg/sys/arm/arm/platform.c ============================================================================== --- projects/specific_leg/sys/arm/arm/platform.c Sun Nov 24 12:48:55 2013 (r258525) +++ projects/specific_leg/sys/arm/arm/platform.c Sun Nov 24 15:03:26 2013 (r258526) @@ -64,112 +64,6 @@ static char plat_name[64] = ""; SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RD | CTLFLAG_TUN, plat_name, 0, "Platform currently in use"); -static struct mem_region *pregions = NULL; -static struct mem_region *aregions = NULL; -static int npregions, naregions; - -void -mem_regions(struct mem_region **phys, int *physsz, struct mem_region **avail, - int *availsz) -{ - if (pregions == NULL) - PLATFORM_MEM_REGIONS(plat_obj, &pregions, &npregions, - &aregions, &naregions); - - *phys = pregions; - *avail = aregions; - *physsz = npregions; - *availsz = naregions; -} - -#if 0 -int -mem_valid(vm_offset_t addr, int len) -{ - int i; - - if (pregions == NULL) - PLATFORM_MEM_REGIONS(plat_obj, &pregions, &npregions, - &aregions, &naregions); - - for (i = 0; i < npregions; i++) - if ((addr >= pregions[i].mr_start) - && (addr + len <= pregions[i].mr_start + pregions[i].mr_size)) - return (0); - - return (EFAULT); -} -#endif - -vm_offset_t -platform_real_maxaddr(void) -{ - return (PLATFORM_REAL_MAXADDR(plat_obj)); -} - -#if 0 -const char * -installed_platform() -{ - return (plat_def_impl->name); -} - -u_long -platform_timebase_freq(struct cpuref *cpu) -{ - return (PLATFORM_TIMEBASE_FREQ(plat_obj, cpu)); -} - -int -platform_smp_first_cpu(struct cpuref *cpu) -{ - return (PLATFORM_SMP_FIRST_CPU(plat_obj, cpu)); -} - -int -platform_smp_next_cpu(struct cpuref *cpu) -{ - return (PLATFORM_SMP_NEXT_CPU(plat_obj, cpu)); -} - -int -platform_smp_get_bsp(struct cpuref *cpu) -{ - return (PLATFORM_SMP_GET_BSP(plat_obj, cpu)); -} - -int -platform_smp_start_cpu(struct pcpu *cpu) -{ - return (PLATFORM_SMP_START_CPU(plat_obj, cpu)); -} - -void -platform_smp_ap_init() -{ - PLATFORM_SMP_AP_INIT(plat_obj); -} -#endif - -#ifdef SMP -struct cpu_group * -cpu_topo(void) -{ - return (PLATFORM_SMP_TOPO(plat_obj)); -} -#endif - -#if 0 -/* - * Reset back to firmware. - */ -void -cpu_reset() -{ - PLATFORM_RESET(plat_obj); -} -#endif - /* * Platform install routines. Highest priority wins, using the same * algorithm as bus attachment. Modified: projects/specific_leg/sys/arm/arm/platform_if.m ============================================================================== --- projects/specific_leg/sys/arm/arm/platform_if.m Sun Nov 24 12:48:55 2013 (r258525) +++ projects/specific_leg/sys/arm/arm/platform_if.m Sun Nov 24 15:03:26 2013 (r258526) @@ -78,14 +78,6 @@ CODE { #endif } #endif - static vm_offset_t platform_null_real_maxaddr(platform_t plat) - { - return (VM_MAX_ADDRESS); - } - static void platform_null_smp_ap_init(platform_t plat) - { - return; - } }; /** From owner-svn-src-projects@FreeBSD.ORG Mon Nov 25 02:22:21 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4570C6E2; Mon, 25 Nov 2013 02:22:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 34B5923B8; Mon, 25 Nov 2013 02:22:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAP2MLmq025786; Mon, 25 Nov 2013 02:22:21 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAP2MLic025785; Mon, 25 Nov 2013 02:22:21 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311250222.rAP2MLic025785@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 25 Nov 2013 02:22:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258538 - projects/altix2/sys/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 02:22:21 -0000 Author: marcel Date: Mon Nov 25 02:22:20 2013 New Revision: 258538 URL: http://svnweb.freebsd.org/changeset/base/258538 Log: Add option BUSDMA_MI. This controls the inclusion of busdma/mi source files and can also be used to provide a backward compatible interface for it so that one doesn't have to rewrite drivers to make use of it. Modified: projects/altix2/sys/conf/options Modified: projects/altix2/sys/conf/options ============================================================================== --- projects/altix2/sys/conf/options Mon Nov 25 01:26:06 2013 (r258537) +++ projects/altix2/sys/conf/options Mon Nov 25 02:22:20 2013 (r258538) @@ -73,6 +73,7 @@ ATSE_CFI_HACK opt_cfi.h AUDIT opt_global.h BOOTHOWTO opt_global.h BOOTVERBOSE opt_global.h +BUSDMA_MI opt_global.h CALLOUT_PROFILING CAPABILITIES opt_capsicum.h CAPABILITY_MODE opt_capsicum.h From owner-svn-src-projects@FreeBSD.ORG Mon Nov 25 08:27:24 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6277E488; Mon, 25 Nov 2013 08:27:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3888B244B; Mon, 25 Nov 2013 08:27:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAP8ROWc049361; Mon, 25 Nov 2013 08:27:24 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAP8RO1P049360; Mon, 25 Nov 2013 08:27:24 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201311250827.rAP8RO1P049360@svn.freebsd.org> From: Gleb Smirnoff Date: Mon, 25 Nov 2013 08:27:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258543 - projects/sendfile X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 08:27:24 -0000 Author: glebius Date: Mon Nov 25 08:27:23 2013 New Revision: 258543 URL: http://svnweb.freebsd.org/changeset/base/258543 Log: A branch for attempts to improve sendfile() performance. Added: - copied from r258542, head/ Directory Properties: projects/sendfile/ (props changed) From owner-svn-src-projects@FreeBSD.ORG Mon Nov 25 10:49:34 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF391BE1; Mon, 25 Nov 2013 10:49:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DC21A2DD7; Mon, 25 Nov 2013 10:49:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPAnYJ0096874; Mon, 25 Nov 2013 10:49:34 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPAnIKq096775; Mon, 25 Nov 2013 10:49:18 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201311251049.rAPAnIKq096775@svn.freebsd.org> From: Mark Murray Date: Mon, 25 Nov 2013 10:49:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258544 - in projects/random_number_generator: bin/sh contrib/gcclibs/libcpp include lib/libc/iconv lib/libiconv_modules/iconv_std sys/amd64/amd64 sys/amd64/linux32 sys/arm/include sys/... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 10:49:35 -0000 Author: markm Date: Mon Nov 25 10:49:17 2013 New Revision: 258544 URL: http://svnweb.freebsd.org/changeset/base/258544 Log: MFC - tracking commit. Added: projects/random_number_generator/contrib/gcclibs/libcpp/ChangeLog.gcc43 - copied unchanged from r258543, head/contrib/gcclibs/libcpp/ChangeLog.gcc43 projects/random_number_generator/tools/regression/bin/sh/execution/bg10.0 - copied unchanged from r258543, head/tools/regression/bin/sh/execution/bg10.0 projects/random_number_generator/tools/regression/bin/sh/execution/bg10.0.stdout - copied unchanged from r258543, head/tools/regression/bin/sh/execution/bg10.0.stdout projects/random_number_generator/tools/regression/bin/sh/execution/bg7.0 - copied unchanged from r258543, head/tools/regression/bin/sh/execution/bg7.0 projects/random_number_generator/tools/regression/bin/sh/execution/bg8.0 - copied unchanged from r258543, head/tools/regression/bin/sh/execution/bg8.0 projects/random_number_generator/tools/regression/bin/sh/execution/bg9.0 - copied unchanged from r258543, head/tools/regression/bin/sh/execution/bg9.0 Modified: projects/random_number_generator/bin/sh/redir.c projects/random_number_generator/include/iconv.h projects/random_number_generator/lib/libc/iconv/citrus_iconv_local.h projects/random_number_generator/lib/libc/iconv/iconv.c projects/random_number_generator/lib/libc/iconv/iconvctl.3 projects/random_number_generator/lib/libiconv_modules/iconv_std/citrus_iconv_std.c projects/random_number_generator/sys/amd64/amd64/exception.S projects/random_number_generator/sys/amd64/amd64/machdep.c projects/random_number_generator/sys/amd64/amd64/trap.c projects/random_number_generator/sys/amd64/linux32/linux32_dummy.c projects/random_number_generator/sys/arm/include/machdep.h projects/random_number_generator/sys/arm/mv/mv_machdep.c projects/random_number_generator/sys/arm/s3c2xx0/s3c24x0_machdep.c projects/random_number_generator/sys/boot/arm/uboot/start.S projects/random_number_generator/sys/cam/ctl/ctl_backend_block.c projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_test.c projects/random_number_generator/sys/cddl/dev/lockstat/lockstat.c projects/random_number_generator/sys/cddl/dev/sdt/sdt.c projects/random_number_generator/sys/compat/linux/linux_emul.c projects/random_number_generator/sys/compat/linux/linux_fork.c projects/random_number_generator/sys/compat/linux/linux_futex.c projects/random_number_generator/sys/compat/linux/linux_mib.c projects/random_number_generator/sys/compat/linux/linux_misc.c projects/random_number_generator/sys/compat/linux/linux_sysctl.c projects/random_number_generator/sys/compat/linux/linux_time.c projects/random_number_generator/sys/compat/linux/linux_uid16.c projects/random_number_generator/sys/compat/linux/linux_util.c projects/random_number_generator/sys/conf/options projects/random_number_generator/sys/dev/sfxge/common/efsys.h projects/random_number_generator/sys/dev/xen/blkback/blkback.c projects/random_number_generator/sys/fs/nfs/nfs_commonkrpc.c projects/random_number_generator/sys/fs/nfsclient/nfs_clbio.c projects/random_number_generator/sys/fs/nfsclient/nfs_clnode.c projects/random_number_generator/sys/fs/nfsclient/nfs_clport.c projects/random_number_generator/sys/fs/nfsclient/nfs_clsubs.c projects/random_number_generator/sys/fs/nfsclient/nfs_clvnops.c projects/random_number_generator/sys/i386/i386/exception.s projects/random_number_generator/sys/i386/i386/machdep.c projects/random_number_generator/sys/i386/i386/trap.c projects/random_number_generator/sys/i386/linux/linux_dummy.c projects/random_number_generator/sys/kern/kern_clock.c projects/random_number_generator/sys/kern/kern_clocksource.c projects/random_number_generator/sys/kern/kern_exec.c projects/random_number_generator/sys/kern/kern_exit.c projects/random_number_generator/sys/kern/kern_fork.c projects/random_number_generator/sys/kern/kern_lock.c projects/random_number_generator/sys/kern/kern_lockstat.c projects/random_number_generator/sys/kern/kern_malloc.c projects/random_number_generator/sys/kern/kern_mutex.c projects/random_number_generator/sys/kern/kern_priv.c projects/random_number_generator/sys/kern/kern_proc.c projects/random_number_generator/sys/kern/kern_racct.c projects/random_number_generator/sys/kern/kern_rmlock.c projects/random_number_generator/sys/kern/kern_rwlock.c projects/random_number_generator/sys/kern/kern_sdt.c projects/random_number_generator/sys/kern/kern_sig.c projects/random_number_generator/sys/kern/kern_sx.c projects/random_number_generator/sys/kern/kern_synch.c projects/random_number_generator/sys/kern/kern_thread.c projects/random_number_generator/sys/kern/kern_timeout.c projects/random_number_generator/sys/kern/sched_4bsd.c projects/random_number_generator/sys/kern/sched_ule.c projects/random_number_generator/sys/kern/subr_devstat.c projects/random_number_generator/sys/kern/subr_sleepqueue.c projects/random_number_generator/sys/kern/subr_syscall.c projects/random_number_generator/sys/kern/subr_trap.c projects/random_number_generator/sys/kern/subr_turnstile.c projects/random_number_generator/sys/kern/vfs_cache.c projects/random_number_generator/sys/kern/vfs_lookup.c projects/random_number_generator/sys/kern/vfs_syscalls.c projects/random_number_generator/sys/mips/mips/exception.S projects/random_number_generator/sys/mips/mips/trap.c projects/random_number_generator/sys/modules/crypto/Makefile projects/random_number_generator/sys/modules/ctl/Makefile projects/random_number_generator/sys/modules/dtrace/dtrace_test/Makefile projects/random_number_generator/sys/modules/dtrace/lockstat/Makefile projects/random_number_generator/sys/modules/dtrace/sdt/Makefile projects/random_number_generator/sys/modules/ip6_mroute_mod/Makefile projects/random_number_generator/sys/modules/linux/Makefile projects/random_number_generator/sys/modules/nfscl/Makefile projects/random_number_generator/sys/modules/nfsclient/Makefile projects/random_number_generator/sys/modules/nfscommon/Makefile projects/random_number_generator/sys/modules/send/Makefile projects/random_number_generator/sys/net/vnet.c projects/random_number_generator/sys/netinet/in_kdtrace.c projects/random_number_generator/sys/netinet/ip_fastfwd.c projects/random_number_generator/sys/netinet/ip_input.c projects/random_number_generator/sys/netinet/ip_output.c projects/random_number_generator/sys/netinet/sctp_dtrace_declare.h projects/random_number_generator/sys/netinet/sctp_dtrace_define.h projects/random_number_generator/sys/netinet/tcp_input.c projects/random_number_generator/sys/netinet/tcp_output.c projects/random_number_generator/sys/netinet/tcp_subr.c projects/random_number_generator/sys/netinet/udp_usrreq.c projects/random_number_generator/sys/netinet6/ip6_input.c projects/random_number_generator/sys/netinet6/ip6_mroute.c projects/random_number_generator/sys/netinet6/nd6.c projects/random_number_generator/sys/netinet6/send.c projects/random_number_generator/sys/netinet6/udp6_usrreq.c projects/random_number_generator/sys/nfsclient/nfs_bio.c projects/random_number_generator/sys/nfsclient/nfs_krpc.c projects/random_number_generator/sys/nfsclient/nfs_subs.c projects/random_number_generator/sys/nfsclient/nfs_vnops.c projects/random_number_generator/sys/opencrypto/crypto.c projects/random_number_generator/sys/opencrypto/deflate.c projects/random_number_generator/sys/pc98/pc98/machdep.c projects/random_number_generator/sys/powerpc/aim/locore32.S projects/random_number_generator/sys/powerpc/aim/locore64.S projects/random_number_generator/sys/powerpc/aim/trap.c projects/random_number_generator/sys/security/mac/mac_audit.c projects/random_number_generator/sys/security/mac/mac_cred.c projects/random_number_generator/sys/security/mac/mac_framework.c projects/random_number_generator/sys/security/mac/mac_inet.c projects/random_number_generator/sys/security/mac/mac_net.c projects/random_number_generator/sys/security/mac/mac_pipe.c projects/random_number_generator/sys/security/mac/mac_posix_sem.c projects/random_number_generator/sys/security/mac/mac_posix_shm.c projects/random_number_generator/sys/security/mac/mac_priv.c projects/random_number_generator/sys/security/mac/mac_process.c projects/random_number_generator/sys/security/mac/mac_socket.c projects/random_number_generator/sys/security/mac/mac_system.c projects/random_number_generator/sys/security/mac/mac_sysv_msg.c projects/random_number_generator/sys/security/mac/mac_sysv_sem.c projects/random_number_generator/sys/security/mac/mac_sysv_shm.c projects/random_number_generator/sys/security/mac/mac_vfs.c projects/random_number_generator/sys/sys/mutex.h projects/random_number_generator/sys/sys/rwlock.h projects/random_number_generator/sys/sys/sx.h projects/random_number_generator/sys/tools/vnode_if.awk projects/random_number_generator/sys/x86/x86/local_apic.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/lib/libc/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/boot/ (props changed) projects/random_number_generator/sys/conf/ (props changed) Modified: projects/random_number_generator/bin/sh/redir.c ============================================================================== --- projects/random_number_generator/bin/sh/redir.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/bin/sh/redir.c Mon Nov 25 10:49:17 2013 (r258544) @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$"); struct redirtab { struct redirtab *next; int renamed[10]; + int fd0_redirected; }; @@ -109,11 +110,14 @@ redirect(union node *redir, int flags) sv = ckmalloc(sizeof (struct redirtab)); for (i = 0 ; i < 10 ; i++) sv->renamed[i] = EMPTY; + sv->fd0_redirected = fd0_redirected; sv->next = redirlist; redirlist = sv; } for (n = redir ; n ; n = n->nfile.next) { fd = n->nfile.fd; + if (fd == 0) + fd0_redirected = 1; if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) && n->ndup.dupfd == fd) continue; /* redirect from/to same file descriptor */ @@ -134,8 +138,6 @@ redirect(union node *redir, int flags) sv->renamed[fd] = i; INTON; } - if (fd == 0) - fd0_redirected++; openredirect(n, memory); } if (memory[1]) @@ -303,8 +305,6 @@ popredir(void) for (i = 0 ; i < 10 ; i++) { if (rp->renamed[i] != EMPTY) { - if (i == 0) - fd0_redirected--; if (rp->renamed[i] >= 0) { dup2(rp->renamed[i], i); close(rp->renamed[i]); @@ -314,6 +314,7 @@ popredir(void) } } INTOFF; + fd0_redirected = rp->fd0_redirected; redirlist = rp->next; ckfree(rp); INTON; Copied: projects/random_number_generator/contrib/gcclibs/libcpp/ChangeLog.gcc43 (from r258543, head/contrib/gcclibs/libcpp/ChangeLog.gcc43) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/random_number_generator/contrib/gcclibs/libcpp/ChangeLog.gcc43 Mon Nov 25 10:49:17 2013 (r258544, copy of r258543, head/contrib/gcclibs/libcpp/ChangeLog.gcc43) @@ -0,0 +1,29 @@ +2007-06-05 Joerg Wunsch (r250566) + + PR preprocessor/23479 + * expr.c (cpp_classify_number): Implement 0b-prefixed binary + integer constants. + (append_digit): Likewise. + * include/cpplib.h: Add CPP_N_BINARY, to be used for 0b-prefixed + binary integer constants. + +2007-05-21 Ian Lance Taylor (r124929) + + * internal.h (struct cpp_reader): Add new fields: + nonexistent_file_hash and nonexistent_file_ob. + * files.c: Include "obstack.h". + (find_file_in_dir): Before trying to open the file, look up the + path name in the hash table of nonexistent files. After failing + to open the file, add the path name to the hash table. + (_cpp_find_file): Cache the results of looking up the file name + starting with the quote and bracket chain heads, if we can. + (nonexistent_file_hash_eq): New static function. + (_cpp_init_files): Initialize pfile->nonexistent_file_hash and + pfile->nonexistent_file_ob. + (_cpp_cleanup_files): Free pfile->nonexistent_file_hash and + pfile->nonexistent_file_ob. + +2006-12-29 Ian Lance Taylor (r120263) + + * lex.c (_cpp_clean_line): Add uses of __builtin_expect. Don't + look backward at the end of the line unless we saw a backslash. Modified: projects/random_number_generator/include/iconv.h ============================================================================== --- projects/random_number_generator/include/iconv.h Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/include/iconv.h Mon Nov 25 10:49:17 2013 (r258544) @@ -86,6 +86,8 @@ void iconv_set_relocation_prefix(const #define ICONV_SET_DISCARD_ILSEQ 4 #define ICONV_SET_HOOKS 5 #define ICONV_SET_FALLBACKS 6 +#define ICONV_GET_ILSEQ_INVALID 128 +#define ICONV_SET_ILSEQ_INVALID 129 typedef void (*iconv_unicode_char_hook) (unsigned int mbr, void *data); typedef void (*iconv_wide_char_hook) (wchar_t wc, void *data); Modified: projects/random_number_generator/lib/libc/iconv/citrus_iconv_local.h ============================================================================== --- projects/random_number_generator/lib/libc/iconv/citrus_iconv_local.h Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/lib/libc/iconv/citrus_iconv_local.h Mon Nov 25 10:49:17 2013 (r258544) @@ -99,6 +99,7 @@ struct _citrus_iconv_shared { char *ci_convname; bool ci_discard_ilseq; struct iconv_hooks *ci_hooks; + bool ci_ilseq_invalid; }; struct _citrus_iconv { Modified: projects/random_number_generator/lib/libc/iconv/iconv.c ============================================================================== --- projects/random_number_generator/lib/libc/iconv/iconv.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/lib/libc/iconv/iconv.c Mon Nov 25 10:49:17 2013 (r258544) @@ -298,6 +298,12 @@ __bsd_iconvctl(iconv_t cd, int request, case ICONV_SET_FALLBACKS: errno = EOPNOTSUPP; return (-1); + case ICONV_GET_ILSEQ_INVALID: + *i = cv->cv_shared->ci_ilseq_invalid ? 1 : 0; + return (0); + case ICONV_SET_ILSEQ_INVALID: + cv->cv_shared->ci_ilseq_invalid = *i; + return (0); default: errno = EINVAL; return (-1); Modified: projects/random_number_generator/lib/libc/iconv/iconvctl.3 ============================================================================== --- projects/random_number_generator/lib/libc/iconv/iconvctl.3 Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/lib/libc/iconv/iconvctl.3 Mon Nov 25 10:49:17 2013 (r258544) @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 7, 2009 +.Dd November 25, 2009 .Dt ICONVCTL 3 .Os .Sh NAME @@ -110,6 +110,31 @@ variable, which is passed to via .Fa argument by its address. +.It ICONV_GET_ILSEQ_INVALID +Determines if a character in the input buffer that is valid, +but for which an identical character does not exist in the target +codeset returns +.Er EILSEQ +or not. +The answer is stored in +.Fa argument , +which is of +.Ft int * . +It will be set to 1 if this feature is enabled or set to 0 otherwise. +.It ICONV_SET_ILSEQ_INVALID +Sets whether a character in the input buffer that is valid, +but for which an identical character does not exist in the target +codeset returns +.Er EILSEQ +or not. +If +.Fa argument , +which is of +.Ft int * +is set to 1 it will be enabled, +and if +.Fa argument +is set to 0 it will be disabled. .El .\" XXX: fallbacks are unimplemented and trying to set them will always .\" return EOPNOTSUPP but definitions are provided for source-level Modified: projects/random_number_generator/lib/libiconv_modules/iconv_std/citrus_iconv_std.c ============================================================================== --- projects/random_number_generator/lib/libiconv_modules/iconv_std/citrus_iconv_std.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/lib/libiconv_modules/iconv_std/citrus_iconv_std.c Mon Nov 25 10:49:17 2013 (r258544) @@ -543,6 +543,16 @@ _citrus_iconv_std_iconv_convert(struct _ ret = do_conv(is, &csid, &idx); if (ret) { if (ret == E_NO_CORRESPONDING_CHAR) { + /* + * GNU iconv returns EILSEQ when no + * corresponding character in the output. + * Some software depends on this behavior + * though this is against POSIX specification. + */ + if (cv->cv_shared->ci_ilseq_invalid != 0) { + ret = EILSEQ; + goto err; + } inval++; szrout = 0; if ((((flags & _CITRUS_ICONV_F_HIDE_INVALID) == 0) && Modified: projects/random_number_generator/sys/amd64/amd64/exception.S ============================================================================== --- projects/random_number_generator/sys/amd64/amd64/exception.S Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/amd64/amd64/exception.S Mon Nov 25 10:49:17 2013 (r258544) @@ -37,7 +37,6 @@ #include "opt_atpic.h" #include "opt_compat.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/amd64/amd64/machdep.c ============================================================================== --- projects/random_number_generator/sys/amd64/amd64/machdep.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/amd64/amd64/machdep.c Mon Nov 25 10:49:17 2013 (r258544) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include "opt_perfmon.h" #include "opt_platform.h" #include "opt_sched.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/amd64/amd64/trap.c ============================================================================== --- projects/random_number_generator/sys/amd64/amd64/trap.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/amd64/amd64/trap.c Mon Nov 25 10:49:17 2013 (r258544) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_kdb.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/amd64/linux32/linux32_dummy.c ============================================================================== --- projects/random_number_generator/sys/amd64/linux32/linux32_dummy.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/amd64/linux32/linux32_dummy.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/arm/include/machdep.h ============================================================================== --- projects/random_number_generator/sys/arm/include/machdep.h Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/arm/include/machdep.h Mon Nov 25 10:49:17 2013 (r258544) @@ -41,10 +41,10 @@ vm_offset_t parse_boot_param(struct arm_ * - initarm_early_init() is called very early, after parsing the boot params * and after physical memory has been located and sized. * - * - platform_devmap_init() is called as one of the last steps of early virtual + * - initarm_devmap_init() is called as one of the last steps of early virtual * memory initialization, shortly before the new page tables are installed. * - * - initarm_lastaddr() is called after platform_devmap_init(), and must return + * - initarm_lastaddr() is called after initarm_devmap_init(), and must return * the address of the first byte of unusable KVA space. This allows a * platform to carve out of the top of the KVA space whatever reserves it * needs for things like static device mapping, and this is called to get the Modified: projects/random_number_generator/sys/arm/mv/mv_machdep.c ============================================================================== --- projects/random_number_generator/sys/arm/mv/mv_machdep.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/arm/mv/mv_machdep.c Mon Nov 25 10:49:17 2013 (r258544) @@ -296,7 +296,7 @@ out: * Supply a default do-nothing implementation of fdt_pci_devmap() via a weak * alias. Many Marvell platforms don't support a PCI interface, but to support * those that do, we end up with a reference to this function below, in - * platform_devmap_init(). If "device pci" appears in the kernel config, the + * initarm_devmap_init(). If "device pci" appears in the kernel config, the * real implementation of this function in dev/fdt/fdt_pci.c overrides the weak * alias defined here. */ Modified: projects/random_number_generator/sys/arm/s3c2xx0/s3c24x0_machdep.c ============================================================================== --- projects/random_number_generator/sys/arm/s3c2xx0/s3c24x0_machdep.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/arm/s3c2xx0/s3c24x0_machdep.c Mon Nov 25 10:49:17 2013 (r258544) @@ -351,7 +351,7 @@ initarm(struct arm_boot_params *abp) * but since we are boot strapping the addresses used for the read * may have just been remapped and thus the cache could be out * of sync. A re-clean after the switch will cure this. - * After booting there are no gross reloations of the kernel thus + * After booting there are no gross relocations of the kernel thus * this problem will not occur after initarm(). */ cpu_idcache_wbinv_all(); Modified: projects/random_number_generator/sys/boot/arm/uboot/start.S ============================================================================== --- projects/random_number_generator/sys/boot/arm/uboot/start.S Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/boot/arm/uboot/start.S Mon Nov 25 10:49:17 2013 (r258544) @@ -39,9 +39,10 @@ _start: ldr ip, =uboot_address str sp, [ip] - /* Save U-Boot's r8 */ + /* Save U-Boot's r8 and r9 */ ldr ip, =saved_regs str r8, [ip, #0] + str r9, [ip, #4] #ifdef _ARM_ARCH_6 mrc p15, 0, r2, c1, c0, 0 @@ -57,21 +58,24 @@ _start: * syscall() */ ENTRY(syscall) - /* Save caller's lr and r8 */ + /* Save caller's lr, r8 and r9 */ ldr ip, =saved_regs - str lr, [ip, #4] str r8, [ip, #8] - /* Restore U-Boot's r8 */ + str r9, [ip, #12] + str lr, [ip, #16] + /* Restore U-Boot's r8 and r9 */ ldr r8, [ip, #0] + ldr r9, [ip, #4] /* Call into U-Boot */ ldr lr, =return_from_syscall ldr ip, =syscall_ptr ldr pc, [ip] return_from_syscall: - /* Restore loader's r8 and lr */ + /* Restore loader's r8, r9 and lr */ ldr ip, =saved_regs + ldr lr, [ip, #16] + ldr r9, [ip, #12] ldr r8, [ip, #8] - ldr lr, [ip, #4] /* Return to caller */ mov pc, lr @@ -90,5 +94,7 @@ uboot_address: saved_regs: .long 0 /* U-Boot's r8 */ + .long 0 /* U-Boot's r9 */ .long 0 /* Loader's r8 */ + .long 0 /* Loader's r9 */ .long 0 /* Loader's lr */ Modified: projects/random_number_generator/sys/cam/ctl/ctl_backend_block.c ============================================================================== --- projects/random_number_generator/sys/cam/ctl/ctl_backend_block.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/cam/ctl/ctl_backend_block.c Mon Nov 25 10:49:17 2013 (r258544) @@ -42,8 +42,6 @@ #include __FBSDID("$FreeBSD$"); -#include - #include #include #include Modified: projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_test.c ============================================================================== --- projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_test.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_test.c Mon Nov 25 10:49:17 2013 (r258544) @@ -25,8 +25,6 @@ * $FreeBSD$ * */ -#include "opt_kdtrace.h" - #include #include #include Modified: projects/random_number_generator/sys/cddl/dev/lockstat/lockstat.c ============================================================================== --- projects/random_number_generator/sys/cddl/dev/lockstat/lockstat.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/cddl/dev/lockstat/lockstat.c Mon Nov 25 10:49:17 2013 (r258544) @@ -29,8 +29,6 @@ * Use is subject to license terms. */ -#include "opt_kdtrace.h" - #include #include #include Modified: projects/random_number_generator/sys/cddl/dev/sdt/sdt.c ============================================================================== --- projects/random_number_generator/sys/cddl/dev/sdt/sdt.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/cddl/dev/sdt/sdt.c Mon Nov 25 10:49:17 2013 (r258544) @@ -39,8 +39,6 @@ * unloaded; in particular, probes may not span multiple kernel modules. */ -#include "opt_kdtrace.h" - #include #include #include Modified: projects/random_number_generator/sys/compat/linux/linux_emul.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_emul.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_emul.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/compat/linux/linux_fork.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_fork.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_fork.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/compat/linux/linux_futex.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_futex.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_futex.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex. #endif #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/compat/linux/linux_mib.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_mib.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_mib.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/compat/linux/linux_misc.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_misc.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_misc.c Mon Nov 25 10:49:17 2013 (r258544) @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/compat/linux/linux_sysctl.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_sysctl.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_sysctl.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/compat/linux/linux_time.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_time.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_time.c Mon Nov 25 10:49:17 2013 (r258544) @@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c #endif #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/compat/linux/linux_uid16.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_uid16.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_uid16.c Mon Nov 25 10:49:17 2013 (r258544) @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/compat/linux/linux_util.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_util.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_util.c Mon Nov 25 10:49:17 2013 (r258544) @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/conf/options ============================================================================== --- projects/random_number_generator/sys/conf/options Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/conf/options Mon Nov 25 10:49:17 2013 (r258544) @@ -126,7 +126,7 @@ GEOM_UZIP opt_geom.h GEOM_VIRSTOR opt_geom.h GEOM_VOL opt_geom.h GEOM_ZERO opt_geom.h -KDTRACE_HOOKS opt_kdtrace.h +KDTRACE_HOOKS opt_global.h KSTACK_MAX_PAGES KSTACK_PAGES KTRACE Modified: projects/random_number_generator/sys/dev/sfxge/common/efsys.h ============================================================================== --- projects/random_number_generator/sys/dev/sfxge/common/efsys.h Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/dev/sfxge/common/efsys.h Mon Nov 25 10:49:17 2013 (r258544) @@ -270,7 +270,7 @@ typedef struct __efsys_identifier_s efsy /* PROBE */ -#ifndef KDTRACE_HOOKS +#ifndef DTRACE_PROBE #define EFSYS_PROBE(_name) @@ -295,7 +295,7 @@ typedef struct __efsys_identifier_s efsy _type3, _arg3, _type4, _arg4, _type5, _arg5, \ _type6, _arg6, _type7, _arg7) -#else /* KDTRACE_HOOKS */ +#else /* DTRACE_PROBE */ #define EFSYS_PROBE(_name) \ DTRACE_PROBE(_name) @@ -359,7 +359,7 @@ typedef struct __efsys_identifier_s efsy _type6, _arg6) #endif -#endif /* KDTRACE_HOOKS */ +#endif /* DTRACE_PROBE */ /* DMA */ Modified: projects/random_number_generator/sys/dev/xen/blkback/blkback.c ============================================================================== --- projects/random_number_generator/sys/dev/xen/blkback/blkback.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/dev/xen/blkback/blkback.c Mon Nov 25 10:49:17 2013 (r258544) @@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$"); * a FreeBSD domain to other domains. */ -#include "opt_kdtrace.h" - #include #include #include Modified: projects/random_number_generator/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- projects/random_number_generator/sys/fs/nfs/nfs_commonkrpc.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfs/nfs_commonkrpc.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); * Socket operations for use by nfs */ -#include "opt_kdtrace.h" #include "opt_kgssapi.h" #include "opt_nfs.h" Modified: projects/random_number_generator/sys/fs/nfsclient/nfs_clbio.c ============================================================================== --- projects/random_number_generator/sys/fs/nfsclient/nfs_clbio.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfsclient/nfs_clbio.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,8 +35,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" - #include #include #include Modified: projects/random_number_generator/sys/fs/nfsclient/nfs_clnode.c ============================================================================== --- projects/random_number_generator/sys/fs/nfsclient/nfs_clnode.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfsclient/nfs_clnode.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,8 +35,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" - #include #include #include Modified: projects/random_number_generator/sys/fs/nfsclient/nfs_clport.c ============================================================================== --- projects/random_number_generator/sys/fs/nfsclient/nfs_clport.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfsclient/nfs_clport.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" -#include "opt_kdtrace.h" #include Modified: projects/random_number_generator/sys/fs/nfsclient/nfs_clsubs.c ============================================================================== --- projects/random_number_generator/sys/fs/nfsclient/nfs_clsubs.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfsclient/nfs_clsubs.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,8 +35,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" - /* * These functions support the macros and help fiddle mbuf chains for * the nfs op functions. They do things like create the rpc header and Modified: projects/random_number_generator/sys/fs/nfsclient/nfs_clvnops.c ============================================================================== --- projects/random_number_generator/sys/fs/nfsclient/nfs_clvnops.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfsclient/nfs_clvnops.c Mon Nov 25 10:49:17 2013 (r258544) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); * vnode op calls for Sun NFS version 2, 3 and 4 */ -#include "opt_kdtrace.h" #include "opt_inet.h" #include Modified: projects/random_number_generator/sys/i386/i386/exception.s ============================================================================== --- projects/random_number_generator/sys/i386/i386/exception.s Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/i386/i386/exception.s Mon Nov 25 10:49:17 2013 (r258544) @@ -37,7 +37,6 @@ #include "opt_apic.h" #include "opt_atpic.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_npx.h" #include Modified: projects/random_number_generator/sys/i386/i386/machdep.c ============================================================================== --- projects/random_number_generator/sys/i386/i386/machdep.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/i386/i386/machdep.c Mon Nov 25 10:49:17 2013 (r258544) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include "opt_perfmon.h" #include "opt_platform.h" #include "opt_xbox.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/i386/i386/trap.c ============================================================================== --- projects/random_number_generator/sys/i386/i386/trap.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/i386/i386/trap.c Mon Nov 25 10:49:17 2013 (r258544) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_kdb.h" -#include "opt_kdtrace.h" #include "opt_npx.h" #include "opt_trap.h" Modified: projects/random_number_generator/sys/i386/linux/linux_dummy.c ============================================================================== --- projects/random_number_generator/sys/i386/linux/linux_dummy.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/i386/linux/linux_dummy.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/kern/kern_clock.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_clock.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_clock.c Mon Nov 25 10:49:17 2013 (r258544) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdb.h" #include "opt_device_polling.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_ntp.h" #include "opt_watchdog.h" Modified: projects/random_number_generator/sys/kern/kern_clocksource.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_clocksource.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_clocksource.c Mon Nov 25 10:49:17 2013 (r258544) @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); */ #include "opt_device_polling.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/kern/kern_exec.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_exec.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_exec.c Mon Nov 25 10:49:17 2013 (r258544) @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_vm.h" Modified: projects/random_number_generator/sys/kern/kern_exit.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_exit.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_exit.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_procdesc.h" Modified: projects/random_number_generator/sys/kern/kern_fork.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_fork.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_fork.c Mon Nov 25 10:49:17 2013 (r258544) @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_kstack_pages.h" #include "opt_procdesc.h" Modified: projects/random_number_generator/sys/kern/kern_lock.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_lock.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_lock.c Mon Nov 25 10:49:17 2013 (r258544) @@ -29,7 +29,6 @@ #include "opt_adaptive_lockmgrs.h" #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include __FBSDID("$FreeBSD$"); Modified: projects/random_number_generator/sys/kern/kern_lockstat.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_lockstat.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_lockstat.c Mon Nov 25 10:49:17 2013 (r258544) @@ -32,8 +32,6 @@ * */ -#include "opt_kdtrace.h" - #ifdef KDTRACE_HOOKS #include Modified: projects/random_number_generator/sys/kern/kern_malloc.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_malloc.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_malloc.c Mon Nov 25 10:49:17 2013 (r258544) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_kdtrace.h" #include "opt_vm.h" #include Modified: projects/random_number_generator/sys/kern/kern_mutex.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_mutex.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_mutex.c Mon Nov 25 10:49:17 2013 (r258544) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_global.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_sched.h" #include @@ -249,8 +248,6 @@ __mtx_unlock_flags(volatile uintptr_t *c line); mtx_assert(m, MA_OWNED); - if (m->mtx_recurse == 0) - LOCKSTAT_PROFILE_RELEASE_LOCK(LS_MTX_UNLOCK_RELEASE, m); __mtx_unlock(m, curthread, opts, file, line); curthread->td_locks--; } Modified: projects/random_number_generator/sys/kern/kern_priv.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_priv.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_priv.c Mon Nov 25 10:49:17 2013 (r258544) @@ -28,8 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_kdtrace.h" - #include __FBSDID("$FreeBSD$"); Modified: projects/random_number_generator/sys/kern/kern_proc.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_proc.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_proc.c Mon Nov 25 10:49:17 2013 (r258544) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_ddb.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_kstack_pages.h" #include "opt_stack.h" Modified: projects/random_number_generator/sys/kern/kern_racct.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_racct.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_racct.c Mon Nov 25 10:49:17 2013 (r258544) @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_sched.h" #include Modified: projects/random_number_generator/sys/kern/kern_rmlock.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_rmlock.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_rmlock.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/kern/kern_rwlock.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_rwlock.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_rwlock.c Mon Nov 25 10:49:17 2013 (r258544) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_no_adaptive_rwlocks.h" #include @@ -322,8 +321,6 @@ _rw_wunlock_cookie(volatile uintptr_t *c WITNESS_UNLOCK(&rw->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("WUNLOCK", &rw->lock_object, 0, rw->rw_recurse, file, line); - if (!rw_recursed(rw)) - LOCKSTAT_PROFILE_RELEASE_LOCK(LS_RW_WUNLOCK_RELEASE, rw); __rw_wunlock(rw, curthread, file, line); curthread->td_locks--; } Modified: projects/random_number_generator/sys/kern/kern_sdt.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_sdt.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_sdt.c Mon Nov 25 10:49:17 2013 (r258544) @@ -25,8 +25,6 @@ * $FreeBSD$ */ -#include "opt_kdtrace.h" - #include #include #include Modified: projects/random_number_generator/sys/kern/kern_sig.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_sig.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_sig.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_core.h" #include "opt_procdesc.h" Modified: projects/random_number_generator/sys/kern/kern_sx.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_sx.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_sx.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_no_adaptive_sx.h" #include @@ -109,7 +108,6 @@ PMC_SOFT_DECLARE( , , lock, failed); * Returns true if an exclusive lock is recursed. It assumes * curthread currently has an exclusive lock. */ -#define sx_recurse lock_object.lo_data #define sx_recursed(sx) ((sx)->sx_recurse != 0) static void assert_sx(const struct lock_object *lock, int what); @@ -365,7 +363,6 @@ _sx_sunlock(struct sx *sx, const char *f WITNESS_UNLOCK(&sx->lock_object, 0, file, line); LOCK_LOG_LOCK("SUNLOCK", &sx->lock_object, 0, 0, file, line); __sx_sunlock(sx, file, line); - LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_SUNLOCK_RELEASE, sx); curthread->td_locks--; } @@ -381,8 +378,6 @@ _sx_xunlock(struct sx *sx, const char *f WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file, line); - if (!sx_recursed(sx)) - LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_XUNLOCK_RELEASE, sx); __sx_xunlock(sx, curthread, file, line); curthread->td_locks--; } Modified: projects/random_number_generator/sys/kern/kern_synch.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_synch.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_synch.c Mon Nov 25 10:49:17 2013 (r258544) @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_sched.h" Modified: projects/random_number_generator/sys/kern/kern_thread.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_thread.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_thread.c Mon Nov 25 10:49:17 2013 (r258544) @@ -27,7 +27,6 @@ */ #include "opt_witness.h" -#include "opt_kdtrace.h" #include "opt_hwpmc_hooks.h" #include Modified: projects/random_number_generator/sys/kern/kern_timeout.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_timeout.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_timeout.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_callout_profiling.h" -#include "opt_kdtrace.h" #if defined(__arm__) #include "opt_timer.h" #endif Modified: projects/random_number_generator/sys/kern/sched_4bsd.c ============================================================================== --- projects/random_number_generator/sys/kern/sched_4bsd.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/sched_4bsd.c Mon Nov 25 10:49:17 2013 (r258544) @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/kern/sched_ule.c ============================================================================== --- projects/random_number_generator/sys/kern/sched_ule.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/sched_ule.c Mon Nov 25 10:49:17 2013 (r258544) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_sched.h" #include Modified: projects/random_number_generator/sys/kern/subr_devstat.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_devstat.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/subr_devstat.c Mon Nov 25 10:49:17 2013 (r258544) @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" - #include #include #include Modified: projects/random_number_generator/sys/kern/subr_sleepqueue.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_sleepqueue.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/subr_sleepqueue.c Mon Nov 25 10:49:17 2013 (r258544) @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sleepqueue_profiling.h" #include "opt_ddb.h" -#include "opt_kdtrace.h" #include "opt_sched.h" #include Modified: projects/random_number_generator/sys/kern/subr_syscall.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_syscall.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/subr_syscall.c Mon Nov 25 10:49:17 2013 (r258544) @@ -40,7 +40,6 @@ #include "opt_capsicum.h" #include "opt_ktrace.h" -#include "opt_kdtrace.h" __FBSDID("$FreeBSD$"); Modified: projects/random_number_generator/sys/kern/subr_trap.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_trap.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/subr_trap.c Mon Nov 25 10:49:17 2013 (r258544) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" -#include "opt_kdtrace.h" #include "opt_sched.h" #include Modified: projects/random_number_generator/sys/kern/subr_turnstile.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_turnstile.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/subr_turnstile.c Mon Nov 25 10:49:17 2013 (r258544) @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_kdtrace.h" #include "opt_turnstile_profiling.h" #include "opt_sched.h" Modified: projects/random_number_generator/sys/kern/vfs_cache.c ============================================================================== --- projects/random_number_generator/sys/kern/vfs_cache.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/vfs_cache.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,7 +35,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include Modified: projects/random_number_generator/sys/kern/vfs_lookup.c ============================================================================== --- projects/random_number_generator/sys/kern/vfs_lookup.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/vfs_lookup.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include Modified: projects/random_number_generator/sys/kern/vfs_syscalls.c ============================================================================== --- projects/random_number_generator/sys/kern/vfs_syscalls.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/vfs_syscalls.c Mon Nov 25 10:49:17 2013 (r258544) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" #include "opt_compat.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include Modified: projects/random_number_generator/sys/mips/mips/exception.S ============================================================================== --- projects/random_number_generator/sys/mips/mips/exception.S Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/mips/mips/exception.S Mon Nov 25 10:49:17 2013 (r258544) @@ -55,7 +55,7 @@ */ #include "opt_ddb.h" -#include "opt_kdtrace.h" + #include #include #include Modified: projects/random_number_generator/sys/mips/mips/trap.c ============================================================================== --- projects/random_number_generator/sys/mips/mips/trap.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/mips/mips/trap.c Mon Nov 25 10:49:17 2013 (r258544) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_global.h" #include "opt_ktrace.h" -#include "opt_kdtrace.h" #include #include Modified: projects/random_number_generator/sys/modules/crypto/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/crypto/Makefile Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/modules/crypto/Makefile Mon Nov 25 10:49:17 2013 (r258544) @@ -16,6 +16,6 @@ SRCS += skipjack.c bf_enc.c bf_ecb.c bf_ SRCS += des_ecb.c des_enc.c des_setkey.c SRCS += sha1.c sha2.c SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h -SRCS += opt_ddb.h opt_kdtrace.h +SRCS += opt_ddb.h SRCS += camellia.c camellia-api.c .include Modified: projects/random_number_generator/sys/modules/ctl/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/ctl/Makefile Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/modules/ctl/Makefile Mon Nov 25 10:49:17 2013 (r258544) @@ -22,7 +22,6 @@ SRCS+= bus_if.h SRCS+= device_if.h SRCS+= vnode_if.h SRCS+= opt_cam.h -SRCS+= opt_kdtrace.h #CFLAGS+=-DICL_KERNEL_PROXY Modified: projects/random_number_generator/sys/modules/dtrace/dtrace_test/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/dtrace/dtrace_test/Makefile Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/modules/dtrace/dtrace_test/Makefile Mon Nov 25 10:49:17 2013 (r258544) @@ -5,7 +5,6 @@ KMOD= dtrace_test SRCS= dtrace_test.c -SRCS+= opt_kdtrace.h SRCS+= vnode_if.h CFLAGS+= -I${.CURDIR}/../../.. Modified: projects/random_number_generator/sys/modules/dtrace/lockstat/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/dtrace/lockstat/Makefile Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/modules/dtrace/lockstat/Makefile Mon Nov 25 10:49:17 2013 (r258544) @@ -5,7 +5,7 @@ KMOD= lockstat *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Nov 25 19:04:14 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AC631C4; Mon, 25 Nov 2013 19:04:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 25F042123; Mon, 25 Nov 2013 19:04:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPJ4Ei0089416; Mon, 25 Nov 2013 19:04:14 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPJ4A58089391; Mon, 25 Nov 2013 19:04:10 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201311251904.rAPJ4A58089391@svn.freebsd.org> From: Ed Maste Date: Mon, 25 Nov 2013 19:04:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258577 - in projects/sv: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt cddl/lib/libdtrace cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge crypto/openssl etc/periodic/daily gnu... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 19:04:14 -0000 Author: emaste Date: Mon Nov 25 19:04:10 2013 New Revision: 258577 URL: http://svnweb.freebsd.org/changeset/base/258577 Log: Add files/changes missing from previous MFC at 219925 Sponsored by: The FreeBSD Foundation Added: - copied unchanged from r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile - copied unchanged from r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/main.c - copied unchanged from r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.d - copied unchanged from r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h - copied unchanged from r219925, head/cddl/lib/libdtrace/libproc_compat.h - copied unchanged from r219925, head/cddl/lib/libdtrace/regs_x86.d - copied unchanged from r219925, head/cddl/usr.bin/ctfconvert/ctfconvert.1 - copied unchanged from r219925, head/cddl/usr.bin/ctfmerge/ctfmerge.1 - copied unchanged from r219925, head/crypto/openssl/ACKNOWLEDGMENTS - copied unchanged from r219925, head/etc/periodic/daily/490.status-pkg-changes - copied unchanged from r219925, head/gnu/lib/libdialog/dlg_config.h - copied unchanged from r219925, head/lib/libc/gen/aux.c - copied unchanged from r219925, head/lib/libc/gen/elf_utils.c - copied unchanged from r219925, head/lib/libc/sys/stack_protector_compat.c - copied unchanged from r219925, head/lib/msun/src/e_log2.c - copied unchanged from r219925, head/lib/msun/src/e_log2f.c - copied unchanged from r219925, head/lib/msun/src/k_log.h - copied unchanged from r219925, head/lib/msun/src/k_logf.h - copied unchanged from r219925, head/share/doc/psd/12.make/stubs - copied unchanged from r219925, head/share/doc/psd/12.make/tutorial.ms - copied unchanged from r219925, head/share/doc/psd/18.gprof/abstract.me - copied unchanged from r219925, head/share/doc/psd/18.gprof/gathering.me - copied unchanged from r219925, head/share/doc/psd/18.gprof/header.me - copied unchanged from r219925, head/share/doc/psd/18.gprof/intro.me - copied unchanged from r219925, head/share/doc/psd/18.gprof/postp.me - copied unchanged from r219925, head/share/doc/psd/18.gprof/postp1.pic - copied unchanged from r219925, head/share/doc/psd/18.gprof/postp2.pic - copied unchanged from r219925, head/share/doc/psd/18.gprof/postp3.pic - copied unchanged from r219925, head/share/doc/psd/18.gprof/pres1.pic - copied unchanged from r219925, head/share/doc/psd/18.gprof/pres2.pic - copied unchanged from r219925, head/share/doc/psd/18.gprof/present.me - copied unchanged from r219925, head/share/doc/psd/18.gprof/profiling.me - copied unchanged from r219925, head/share/doc/psd/18.gprof/refs.me - copied unchanged from r219925, head/share/doc/psd/22.rpcgen/rpcgen.ms - copied unchanged from r219925, head/share/doc/psd/22.rpcgen/stubs - copied unchanged from r219925, head/share/doc/psd/23.rpc/rpc.prog.ms - copied unchanged from r219925, head/share/doc/psd/23.rpc/stubs - copied unchanged from r219925, head/share/doc/psd/24.xdr/stubs - copied unchanged from r219925, head/share/doc/psd/24.xdr/xdr.nts.ms - copied unchanged from r219925, head/share/doc/psd/25.xdrrfc/stubs - copied unchanged from r219925, head/share/doc/psd/25.xdrrfc/xdr.rfc.ms - copied unchanged from r219925, head/share/doc/psd/26.rpcrfc/rpc.rfc.ms - copied unchanged from r219925, head/share/doc/psd/26.rpcrfc/stubs - copied unchanged from r219925, head/share/doc/psd/27.nfsrpc/nfs.rfc.ms - copied unchanged from r219925, head/share/doc/psd/27.nfsrpc/stubs - copied unchanged from r219925, head/share/doc/smm/02.config/0.t - copied unchanged from r219925, head/share/doc/smm/02.config/1.t - copied unchanged from r219925, head/share/doc/smm/02.config/2.t - copied unchanged from r219925, head/share/doc/smm/02.config/3.t - copied unchanged from r219925, head/share/doc/smm/02.config/4.t - copied unchanged from r219925, head/share/doc/smm/02.config/5.t - copied unchanged from r219925, head/share/doc/smm/02.config/6.t - copied unchanged from r219925, head/share/doc/smm/02.config/a.t - copied unchanged from r219925, head/share/doc/smm/02.config/b.t - copied unchanged from r219925, head/share/doc/smm/02.config/c.t - copied unchanged from r219925, head/share/doc/smm/02.config/d.t - copied unchanged from r219925, head/share/doc/smm/02.config/e.t - copied unchanged from r219925, head/share/doc/smm/02.config/spell.ok - copied unchanged from r219925, head/share/doc/smm/03.fsck/0.t - copied unchanged from r219925, head/share/doc/smm/03.fsck/1.t - copied unchanged from r219925, head/share/doc/smm/03.fsck/2.t - copied unchanged from r219925, head/share/doc/smm/03.fsck/3.t - copied unchanged from r219925, head/share/doc/smm/03.fsck/4.t - copied unchanged from r219925, head/share/doc/smm/11.timedop/timed.ms - copied unchanged from r219925, head/share/doc/smm/12.timed/date - copied unchanged from r219925, head/share/doc/smm/12.timed/loop - copied unchanged from r219925, head/share/doc/smm/12.timed/spell.ok - copied unchanged from r219925, head/share/doc/smm/12.timed/time - copied unchanged from r219925, head/share/doc/smm/12.timed/timed.ms - copied unchanged from r219925, head/share/doc/smm/12.timed/unused - copied unchanged from r219925, head/share/doc/usd/04.csh/csh.1 - copied unchanged from r219925, head/share/doc/usd/04.csh/csh.2 - copied unchanged from r219925, head/share/doc/usd/04.csh/csh.3 - copied unchanged from r219925, head/share/doc/usd/04.csh/csh.4 - copied unchanged from r219925, head/share/doc/usd/04.csh/csh.a - copied unchanged from r219925, head/share/doc/usd/04.csh/csh.g - copied unchanged from r219925, head/share/doc/usd/04.csh/tabs - copied unchanged from r219925, head/share/doc/usd/05.dc/dc - copied unchanged from r219925, head/share/doc/usd/06.bc/bc - copied unchanged from r219925, head/share/doc/usd/07.mail/mail0.nr - copied unchanged from r219925, head/share/doc/usd/07.mail/mail1.nr - copied unchanged from r219925, head/share/doc/usd/07.mail/mail2.nr - copied unchanged from r219925, head/share/doc/usd/07.mail/mail3.nr - copied unchanged from r219925, head/share/doc/usd/07.mail/mail4.nr - copied unchanged from r219925, head/share/doc/usd/07.mail/mail5.nr - copied unchanged from r219925, head/share/doc/usd/07.mail/mail6.nr - copied unchanged from r219925, head/share/doc/usd/07.mail/mail7.nr - copied unchanged from r219925, head/share/doc/usd/07.mail/mail8.nr - copied unchanged from r219925, head/share/doc/usd/07.mail/mail9.nr - copied unchanged from r219925, head/share/doc/usd/07.mail/maila.nr - copied unchanged from r219925, head/share/man/man4/rgephy.4 - copied unchanged from r219925, head/share/man/man4/runfw.4 - copied unchanged from r219925, head/share/man/man4/tpm.4 - copied unchanged from r219925, head/share/man/man9/SYSINIT.9 - copied unchanged from r219925, head/share/syscons/fonts/swiss-8x14.fnt - copied unchanged from r219925, head/share/syscons/keymaps/swissgerman.macbook.acc.kbd - copied unchanged from r219925, head/sys/boot/Makefile.amd64 - copied unchanged from r219925, head/sys/boot/Makefile.arm - copied unchanged from r219925, head/sys/boot/Makefile.i386 - copied unchanged from r219925, head/sys/boot/Makefile.ia64 - copied unchanged from r219925, head/sys/boot/Makefile.pc98 - copied unchanged from r219925, head/sys/boot/Makefile.powerpc - copied unchanged from r219925, head/sys/boot/Makefile.sparc64 - copied unchanged from r219925, head/sys/conf/ldscript.mips.octeon1 - copied unchanged from r219925, head/sys/mips/atheros/ar71xx_chip.c - copied unchanged from r219925, head/sys/mips/atheros/ar71xx_chip.h - copied unchanged from r219925, head/sys/mips/atheros/ar71xx_cpudef.h - copied unchanged from r219925, head/sys/mips/atheros/ar71xx_setup.c - copied unchanged from r219925, head/sys/mips/atheros/ar71xx_setup.h - copied unchanged from r219925, head/sys/mips/atheros/ar724x_chip.c - copied unchanged from r219925, head/sys/mips/atheros/ar724x_chip.h - copied unchanged from r219925, head/sys/mips/atheros/ar724xreg.h - copied unchanged from r219925, head/sys/mips/atheros/ar91xx_chip.c - copied unchanged from r219925, head/sys/mips/atheros/ar91xx_chip.h - copied unchanged from r219925, head/sys/mips/atheros/ar91xxreg.h - copied unchanged from r219925, head/sys/mips/cavium/if_octm.c - copied unchanged from r219925, head/sys/mips/cavium/octeon_nmi.S - copied unchanged from r219925, head/sys/mips/cavium/octeon_wdog.c - copied unchanged from r219925, head/sys/powerpc/aim/mmu_oea64.h - copied unchanged from r219925, head/sys/powerpc/aim/moea64_if.m - copied unchanged from r219925, head/sys/powerpc/aim/moea64_native.c - copied unchanged from r219925, head/sys/powerpc/powerpc/iommu_if.m - copied unchanged from r219925, head/tools/build/options/WITH_BSD_GREP - copied unchanged from r219925, head/tools/regression/bin/sh/builtins/break1.0 - copied unchanged from r219925, head/tools/regression/bin/sh/builtins/break2.0 - copied unchanged from r219925, head/tools/regression/bin/sh/builtins/break2.0.stdout - copied unchanged from r219925, head/tools/regression/bin/sh/builtins/break3.0 - copied unchanged from r219925, head/tools/regression/bin/sh/builtins/exit2.8 - copied unchanged from r219925, head/tools/regression/bin/sh/builtins/exit3.0 - copied unchanged from r219925, head/tools/regression/bin/sh/builtins/return5.0 - copied unchanged from r219925, head/tools/regression/bin/sh/builtins/trap5.0 - copied unchanged from r219925, head/tools/regression/bin/sh/builtins/trap6.0 - copied unchanged from r219925, head/tools/regression/bin/sh/builtins/wait3.0 - copied unchanged from r219925, head/tools/regression/bin/sh/execution/killed1.0 - copied unchanged from r219925, head/tools/regression/bin/sh/execution/path1.0 - copied unchanged from r219925, head/tools/regression/bin/sh/expansion/arith6.0 - copied unchanged from r219925, head/tools/regression/bin/sh/expansion/ifs2.0 - copied unchanged from r219925, head/tools/regression/bin/sh/expansion/ifs3.0 - copied unchanged from r219925, head/tools/regression/bin/sh/expansion/pathname3.0 - copied unchanged from r219925, head/tools/regression/bin/sh/expansion/pathname4.0 - copied unchanged from r219925, head/tools/regression/bin/sh/expansion/plus-minus4.0 - copied unchanged from r219925, head/tools/regression/bin/sh/parser/heredoc8.0 - copied unchanged from r219925, head/tools/regression/lib/msun/test-logarithm.c - copied unchanged from r219925, head/tools/regression/lib/msun/test-logarithm.t - copied unchanged from r219925, head/tools/regression/lib/msun/test-nearbyint.c - copied unchanged from r219925, head/tools/regression/lib/msun/test-nearbyint.t - copied unchanged from r219925, head/usr.sbin/pc-sysinstall/backend-query/set-mirror.sh - copied unchanged from r219925, head/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh Directory Properties: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile (props changed) projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/main.c (props changed) projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.d (props changed) projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h (props changed) projects/sv/cddl/lib/libdtrace/libproc_compat.h (props changed) projects/sv/cddl/lib/libdtrace/regs_x86.d (props changed) projects/sv/cddl/usr.bin/ctfconvert/ctfconvert.1 (props changed) projects/sv/cddl/usr.bin/ctfmerge/ctfmerge.1 (props changed) projects/sv/crypto/openssl/ACKNOWLEDGMENTS (props changed) projects/sv/etc/periodic/daily/490.status-pkg-changes (props changed) projects/sv/gnu/lib/libdialog/dlg_config.h (props changed) projects/sv/lib/libc/gen/aux.c (props changed) projects/sv/lib/libc/gen/elf_utils.c (props changed) projects/sv/lib/libc/sys/stack_protector_compat.c (props changed) projects/sv/lib/msun/src/e_log2.c (props changed) projects/sv/lib/msun/src/e_log2f.c (props changed) projects/sv/lib/msun/src/k_log.h (props changed) projects/sv/lib/msun/src/k_logf.h (props changed) projects/sv/share/doc/psd/12.make/stubs (props changed) projects/sv/share/doc/psd/12.make/tutorial.ms (props changed) projects/sv/share/doc/psd/18.gprof/abstract.me (props changed) projects/sv/share/doc/psd/18.gprof/gathering.me (props changed) projects/sv/share/doc/psd/18.gprof/header.me (props changed) projects/sv/share/doc/psd/18.gprof/intro.me (props changed) projects/sv/share/doc/psd/18.gprof/postp.me (props changed) projects/sv/share/doc/psd/18.gprof/postp1.pic (props changed) projects/sv/share/doc/psd/18.gprof/postp2.pic (props changed) projects/sv/share/doc/psd/18.gprof/postp3.pic (props changed) projects/sv/share/doc/psd/18.gprof/pres1.pic (props changed) projects/sv/share/doc/psd/18.gprof/pres2.pic (props changed) projects/sv/share/doc/psd/18.gprof/present.me (props changed) projects/sv/share/doc/psd/18.gprof/profiling.me (props changed) projects/sv/share/doc/psd/18.gprof/refs.me (props changed) projects/sv/share/doc/psd/22.rpcgen/rpcgen.ms (props changed) projects/sv/share/doc/psd/22.rpcgen/stubs (props changed) projects/sv/share/doc/psd/23.rpc/rpc.prog.ms (props changed) projects/sv/share/doc/psd/23.rpc/stubs (props changed) projects/sv/share/doc/psd/24.xdr/stubs (props changed) projects/sv/share/doc/psd/24.xdr/xdr.nts.ms (props changed) projects/sv/share/doc/psd/25.xdrrfc/stubs (props changed) projects/sv/share/doc/psd/25.xdrrfc/xdr.rfc.ms (props changed) projects/sv/share/doc/psd/26.rpcrfc/rpc.rfc.ms (props changed) projects/sv/share/doc/psd/26.rpcrfc/stubs (props changed) projects/sv/share/doc/psd/27.nfsrpc/nfs.rfc.ms (props changed) projects/sv/share/doc/psd/27.nfsrpc/stubs (props changed) projects/sv/share/doc/smm/02.config/0.t (props changed) projects/sv/share/doc/smm/02.config/1.t (props changed) projects/sv/share/doc/smm/02.config/2.t (props changed) projects/sv/share/doc/smm/02.config/3.t (props changed) projects/sv/share/doc/smm/02.config/4.t (props changed) projects/sv/share/doc/smm/02.config/5.t (props changed) projects/sv/share/doc/smm/02.config/6.t (props changed) projects/sv/share/doc/smm/02.config/a.t (props changed) projects/sv/share/doc/smm/02.config/b.t (props changed) projects/sv/share/doc/smm/02.config/c.t (props changed) projects/sv/share/doc/smm/02.config/d.t (props changed) projects/sv/share/doc/smm/02.config/e.t (props changed) projects/sv/share/doc/smm/02.config/spell.ok (props changed) projects/sv/share/doc/smm/03.fsck/0.t (props changed) projects/sv/share/doc/smm/03.fsck/1.t (props changed) projects/sv/share/doc/smm/03.fsck/2.t (props changed) projects/sv/share/doc/smm/03.fsck/3.t (props changed) projects/sv/share/doc/smm/03.fsck/4.t (props changed) projects/sv/share/doc/smm/11.timedop/timed.ms (props changed) projects/sv/share/doc/smm/12.timed/date (props changed) projects/sv/share/doc/smm/12.timed/loop (props changed) projects/sv/share/doc/smm/12.timed/spell.ok (props changed) projects/sv/share/doc/smm/12.timed/time (props changed) projects/sv/share/doc/smm/12.timed/timed.ms (props changed) projects/sv/share/doc/smm/12.timed/unused (props changed) projects/sv/share/doc/usd/04.csh/csh.1 (props changed) projects/sv/share/doc/usd/04.csh/csh.2 (props changed) projects/sv/share/doc/usd/04.csh/csh.3 (props changed) projects/sv/share/doc/usd/04.csh/csh.4 (props changed) projects/sv/share/doc/usd/04.csh/csh.a (props changed) projects/sv/share/doc/usd/04.csh/csh.g (props changed) projects/sv/share/doc/usd/04.csh/tabs (props changed) projects/sv/share/doc/usd/05.dc/dc (props changed) projects/sv/share/doc/usd/06.bc/bc (props changed) projects/sv/share/doc/usd/07.mail/mail0.nr (props changed) projects/sv/share/doc/usd/07.mail/mail1.nr (props changed) projects/sv/share/doc/usd/07.mail/mail2.nr (props changed) projects/sv/share/doc/usd/07.mail/mail3.nr (props changed) projects/sv/share/doc/usd/07.mail/mail4.nr (props changed) projects/sv/share/doc/usd/07.mail/mail5.nr (props changed) projects/sv/share/doc/usd/07.mail/mail6.nr (props changed) projects/sv/share/doc/usd/07.mail/mail7.nr (props changed) projects/sv/share/doc/usd/07.mail/mail8.nr (props changed) projects/sv/share/doc/usd/07.mail/mail9.nr (props changed) projects/sv/share/doc/usd/07.mail/maila.nr (props changed) projects/sv/share/man/man4/rgephy.4 (props changed) projects/sv/share/man/man4/runfw.4 (props changed) projects/sv/share/man/man4/tpm.4 (props changed) projects/sv/share/man/man9/SYSINIT.9 (props changed) projects/sv/share/syscons/fonts/swiss-8x14.fnt (props changed) projects/sv/share/syscons/keymaps/swissgerman.macbook.acc.kbd (props changed) projects/sv/sys/boot/Makefile.amd64 (props changed) projects/sv/sys/boot/Makefile.arm (props changed) projects/sv/sys/boot/Makefile.i386 (props changed) projects/sv/sys/boot/Makefile.ia64 (props changed) projects/sv/sys/boot/Makefile.pc98 (props changed) projects/sv/sys/boot/Makefile.powerpc (props changed) projects/sv/sys/boot/Makefile.sparc64 (props changed) projects/sv/sys/conf/ldscript.mips.octeon1 (props changed) projects/sv/sys/mips/atheros/ar71xx_chip.c (props changed) projects/sv/sys/mips/atheros/ar71xx_chip.h (props changed) projects/sv/sys/mips/atheros/ar71xx_cpudef.h (props changed) projects/sv/sys/mips/atheros/ar71xx_setup.c (props changed) projects/sv/sys/mips/atheros/ar71xx_setup.h (props changed) projects/sv/sys/mips/atheros/ar724x_chip.c (props changed) projects/sv/sys/mips/atheros/ar724x_chip.h (props changed) projects/sv/sys/mips/atheros/ar724xreg.h (props changed) projects/sv/sys/mips/atheros/ar91xx_chip.c (props changed) projects/sv/sys/mips/atheros/ar91xx_chip.h (props changed) projects/sv/sys/mips/atheros/ar91xxreg.h (props changed) projects/sv/sys/mips/cavium/if_octm.c (props changed) projects/sv/sys/mips/cavium/octeon_nmi.S (props changed) projects/sv/sys/mips/cavium/octeon_wdog.c (props changed) projects/sv/sys/powerpc/aim/mmu_oea64.h (props changed) projects/sv/sys/powerpc/aim/moea64_if.m (props changed) projects/sv/sys/powerpc/aim/moea64_native.c (props changed) projects/sv/sys/powerpc/powerpc/iommu_if.m (props changed) projects/sv/tools/build/options/WITH_BSD_GREP (props changed) projects/sv/tools/regression/bin/sh/builtins/break1.0 (props changed) projects/sv/tools/regression/bin/sh/builtins/break2.0 (props changed) projects/sv/tools/regression/bin/sh/builtins/break2.0.stdout (props changed) projects/sv/tools/regression/bin/sh/builtins/break3.0 (props changed) projects/sv/tools/regression/bin/sh/builtins/exit2.8 (props changed) projects/sv/tools/regression/bin/sh/builtins/exit3.0 (props changed) projects/sv/tools/regression/bin/sh/builtins/return5.0 (props changed) projects/sv/tools/regression/bin/sh/builtins/trap5.0 (props changed) projects/sv/tools/regression/bin/sh/builtins/trap6.0 (props changed) projects/sv/tools/regression/bin/sh/builtins/wait3.0 (props changed) projects/sv/tools/regression/bin/sh/execution/killed1.0 (props changed) projects/sv/tools/regression/bin/sh/execution/path1.0 (props changed) projects/sv/tools/regression/bin/sh/expansion/arith6.0 (props changed) projects/sv/tools/regression/bin/sh/expansion/ifs2.0 (props changed) projects/sv/tools/regression/bin/sh/expansion/ifs3.0 (props changed) projects/sv/tools/regression/bin/sh/expansion/pathname3.0 (props changed) projects/sv/tools/regression/bin/sh/expansion/pathname4.0 (props changed) projects/sv/tools/regression/bin/sh/expansion/plus-minus4.0 (props changed) projects/sv/tools/regression/bin/sh/parser/heredoc8.0 (props changed) projects/sv/tools/regression/lib/msun/test-logarithm.c (props changed) projects/sv/tools/regression/lib/msun/test-logarithm.t (props changed) projects/sv/tools/regression/lib/msun/test-nearbyint.c (props changed) projects/sv/tools/regression/lib/msun/test-nearbyint.t (props changed) projects/sv/usr.sbin/pc-sysinstall/backend-query/set-mirror.sh (props changed) projects/sv/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh (props changed) Modified: projects/sv/sys/contrib/dev/acpica/utilities/utosi.c (contents, props changed) projects/sv/sys/dev/ixgbe/ixgbe_mbx.c (contents, props changed) projects/sv/sys/dev/ixgbe/ixv.c (contents, props changed) projects/sv/sys/dev/ixgbe/ixv.h (contents, props changed) projects/sv/sys/dev/usb/usb_pf.c (contents, props changed) projects/sv/sys/dev/usb/usb_pf.h (contents, props changed) projects/sv/sys/netinet/cc/cc_cubic.c (contents, props changed) projects/sv/sys/netinet/cc/cc_htcp.c (contents, props changed) projects/sv/sys/netinet/sctp_dtrace_declare.h (contents, props changed) projects/sv/sys/netinet/sctp_dtrace_define.h (contents, props changed) Directory Properties: projects/sv/sys/netinet6/send.c (props changed) Copied: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile (from r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile) @@ -0,0 +1,13 @@ +all: main + +main: main.o prov.o + $(CC) -o main main.o prov.o + +main.o: main.c prov.h + $(CC) -c main.c + +prov.h: prov.d + /usr/sbin/dtrace -h -s prov.d + +prov.o: prov.d main.o + /usr/sbin/dtrace -G -32 -s prov.d main.o Copied: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/main.c (from r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/main.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/main.c Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/main.c) @@ -0,0 +1,11 @@ +#include +#include +#include "prov.h" + +int +main(int argc, char **argv, char **envp) +{ + envp[0] = (char*)0xff; + TESTER_ENTRY(); + return 0; +} Copied: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.d (from r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.d Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.d) @@ -0,0 +1,3 @@ +provider tester { + probe entry(); +}; Copied: projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h (from r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h) @@ -0,0 +1,46 @@ +/* + * Generated by dtrace(1M). + */ + +#ifndef _PROV_H +#define _PROV_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#if _DTRACE_VERSION + +#define TESTER_ENTRY() \ + __dtrace_tester___entry() +#ifndef __sparc +#define TESTER_ENTRY_ENABLED() \ + __dtraceenabled_tester___entry() +#else +#define TESTER_ENTRY_ENABLED() \ + __dtraceenabled_tester___entry(0) +#endif + + +extern void __dtrace_tester___entry(void); +#ifndef __sparc +extern int __dtraceenabled_tester___entry(void); +#else +extern int __dtraceenabled_tester___entry(long); +#endif + +#else + +#define TESTER_ENTRY() +#define TESTER_ENTRY_ENABLED() (0) + +#endif + + +#ifdef __cplusplus +} +#endif + +#endif /* _PROV_H */ Copied: projects/sv/cddl/lib/libdtrace/libproc_compat.h (from r219925, head/cddl/lib/libdtrace/libproc_compat.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/cddl/lib/libdtrace/libproc_compat.h Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/cddl/lib/libdtrace/libproc_compat.h) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Rui Paulo under sponsorship from the + * FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * Compatibility functions between Solaris libproc and FreeBSD libproc. + * Functions sorted alphabetically. + */ +#define PR_LMID_EVERY 0 +#define Psetrun(p, a1, a2) proc_continue((p)) +#define Pxlookup_by_addr(p, a, n, s, sym, i) \ + proc_addr2sym(p, a, n, s, sym) +#define Pxlookup_by_name(p, l, s1, s2, sym, a) \ + proc_name2sym((p), (s1), (s2), (sym)) +#define Paddr_to_map proc_addr2map +#define Pcreate_error strerror +#define Pdelbkpt proc_bkptdel +#define Pgrab_error strerror +#define Plmid_to_map(p, l, o) proc_obj2map((p), (o)) +#define Plookup_by_addr proc_addr2sym +#define Pname_to_map proc_name2map +#define Pobject_iter proc_iter_objs +#define Pobjname proc_objname +#define Pread proc_read +#define Prd_agent proc_rdagent +#define Prelease proc_detach +#define Psetbkpt proc_bkptset +#define Psetflags proc_setflags +#define Pstate proc_state +#define Pstate proc_state +#define Psymbol_iter_by_addr proc_iter_symbyaddr +#define Punsetflags proc_clearflags +#define Pupdate_maps(p) do { } while (0) +#define Pupdate_syms proc_updatesyms +#define Pxecbkpt proc_bkptexec Copied: projects/sv/cddl/lib/libdtrace/regs_x86.d (from r219925, head/cddl/lib/libdtrace/regs_x86.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/cddl/lib/libdtrace/regs_x86.d Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/cddl/lib/libdtrace/regs_x86.d) @@ -0,0 +1,121 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + * + * Portions Copyright 2009 Stacey Son sson@FreeBSD.org + * + * $FreeBSD$ + */ +/* + * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#pragma ident "@(#)regs.d.in 1.1 04/09/28 SMI" + +inline int R_GS = 0; +#pragma D binding "1.0" R_GS +inline int R_FS = 1; +#pragma D binding "1.0" R_FS +inline int R_ES = 2; +#pragma D binding "1.0" R_ES +inline int R_DS = 3; +#pragma D binding "1.0" R_DS + +inline int R_EDI = 4; +#pragma D binding "1.0" R_EDI +inline int R_ESI = 5; +#pragma D binding "1.0" R_ESI +inline int R_EBP = 6; +#pragma D binding "1.0" R_EBP +inline int R_ESP = 7; +#pragma D binding "1.0" R_ESP +inline int R_EBX = 8; +#pragma D binding "1.0" R_EBX +inline int R_EDX = 9; +#pragma D binding "1.0" R_EDX +inline int R_ECX = 10; +#pragma D binding "1.0" R_ECX +inline int R_EAX = 11; +#pragma D binding "1.0" R_EAX + +inline int R_TRAPNO = 12; +#pragma D binding "1.0" R_TRAPNO +inline int R_ERR = 13; +#pragma D binding "1.0" R_ERR +inline int R_EIP = 14; +#pragma D binding "1.0" R_EIP +inline int R_CS = 15; +#pragma D binding "1.0" R_CS +inline int R_EFL = 16; +#pragma D binding "1.0" R_EFL +inline int R_UESP = 17; +#pragma D binding "1.0" R_UESP +inline int R_SS = 18; +#pragma D binding "1.0" R_SS + +inline int R_PC = R_EIP; +#pragma D binding "1.0" R_PC +inline int R_SP = R_UESP; +#pragma D binding "1.0" R_SP +inline int R_PS = R_EFL; +#pragma D binding "1.0" R_PS +inline int R_R0 = R_EAX; +#pragma D binding "1.0" R_R0 +inline int R_R1 = R_EBX; +#pragma D binding "1.0" R_R1 + +inline int R_RSP = 18 + 1 + 20; +#pragma D binding "1.0" R_RSP +inline int R_RFL = 18 + 1 + 19; +#pragma D binding "1.0" R_RFL +inline int R_RIP = 18 + 1 + 17; +#pragma D binding "1.0" R_RIP +inline int R_RAX = 18 + 1 + 14; +#pragma D binding "1.0" R_RAX +inline int R_RCX = 18 + 1 + 13; +#pragma D binding "1.0" R_RCX +inline int R_RDX = 18 + 1 + 12; +#pragma D binding "1.0" R_RDX +inline int R_RBX = 18 + 1 + 11; +#pragma D binding "1.0" R_RBX +inline int R_RBP = 18 + 1 + 10; +#pragma D binding "1.0" R_RBP +inline int R_RSI = 18 + 1 + 9; +#pragma D binding "1.0" R_RSI +inline int R_RDI = 18 + 1 + 8; +#pragma D binding "1.0" R_RDI +inline int R_R8 = 18 + 1 + 7; +#pragma D binding "1.0" R_R8 +inline int R_R9 = 18 + 1 + 6; +#pragma D binding "1.0" R_R9 +inline int R_R10 = 18 + 1 + 5; +#pragma D binding "1.0" R_R10 +inline int R_R11 = 18 + 1 + 4; +#pragma D binding "1.0" R_R11 +inline int R_R12 = 18 + 1 + 3; +#pragma D binding "1.0" R_R12 +inline int R_R13 = 18 + 1 + 2; +#pragma D binding "1.0" R_R13 +inline int R_R14 = 18 + 1 + 1; +#pragma D binding "1.0" R_R14 +inline int R_R15 = 18 + 1 + 0; +#pragma D binding "1.0" R_R15 + Copied: projects/sv/cddl/usr.bin/ctfconvert/ctfconvert.1 (from r219925, head/cddl/usr.bin/ctfconvert/ctfconvert.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/cddl/usr.bin/ctfconvert/ctfconvert.1 Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/cddl/usr.bin/ctfconvert/ctfconvert.1) @@ -0,0 +1,85 @@ +.\" +.\" Copyright (c) 2010 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This software was developed by Rui Paulo under sponsorship from the +.\" FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd July 7, 2010 +.Dt CTFCONVERT 1 +.Os +.Sh NAME +.Nm ctfconvert +.Nd convert debug data to CTF data +.Sh SYNOPSIS +.Nm +.Op Fl gis +.Fl l Ar label +.Fl L Ar labelenv +.Op Fl o Ar outfile +object_file +.Sh DESCRIPTION +The +.Nm +utility converts debug information from a binary file to CTF data and replaces +the debug section of that file with a CTF section called SUNW_ctf. +This new section is added to the input file, unless the -o +option is present. +You can also opt to keep the original debugging section with the +-g option. +.Pp +The following options are available: +.Bl -tag -width indent +.It Fl l Ar label +Sets the label as +.Ar label . +.It Fl L Ar labelenv +Instructs +.Nm +to read the label from the environment variable +.Ar labelenv . +.It Fl g +Don't delete the original debugging section. +.It Fl i +Ignore object files built from other languages than C. +.It Fl s +Use the .dynsym ELF section instead of the .symtab ELF section. +.It Fl o Ar outfile +Write the output to file in +.Ar outfile . +.El +.Sh EXIT STATUS +.Ex -std +.Sh SEE ALSO +.Xr ctfmerge 1 , +.Xr ctfdump 1 +.Sh HISTORY +The +.Nm +utility first appeared in +.Fx 7.0 . +.Sh AUTHORS +The CTF utilities came from OpenSolaris. Copied: projects/sv/cddl/usr.bin/ctfmerge/ctfmerge.1 (from r219925, head/cddl/usr.bin/ctfmerge/ctfmerge.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/cddl/usr.bin/ctfmerge/ctfmerge.1 Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/cddl/usr.bin/ctfmerge/ctfmerge.1) @@ -0,0 +1,120 @@ +.\" +.\" Copyright (c) 2010 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This software was developed by Rui Paulo under sponsorship from the +.\" FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd July 7, 2010 +.Dt CTFMERGE 1 +.Os +.Sh NAME +.Nm ctfmerge +.Nd merge several CTF data sections into one +.Sh SYNOPSIS +.Nm +.Op Fl fgstv +.Fl l Ar label +.Fl L Ar labelenv +.Fl o Ar outfile +file ... +.Nm +.Op Fl fgstv +.Fl l Ar label +.Fl L Ar labelenv +.Fl o Ar outfile +.Fl d Ar uniqfile +.Op Fl g +.Op Fl D Ar uniqlabel +file ... +.Nm +.Op Fl fgstv +.Fl l Ar label +.Fl L Ar labelenv +.Fl o Ar outfile +.Fl w Ar withfile +file ... +.Nm +.Op Fl g +.Fl c Ar srcfile +.Ar destfile +.Sh DESCRIPTION +The +.Nm +utility merges several CTF data sections from several files into one +output file, unifying common data. +.Pp +The following options are available: +.Bl -tag -width indent +.It Fl f +Match global symbols to global CTF data. +.It Fl g +Don't delete the original debugging sections. +.It Fl s +Use the .dynsym ELF section instead of the .symtab ELF section. +.It Fl t +Make sure that all object files have a CTF section. +.It Fl v +Enable verbose mode. +.It Fl l Ar label +Sets the label as +.Ar label . +.It Fl L Ar labelenv +Instructs +.Nm +to read the label from the environment variable +.Ar labelenv . +.It Fl o Ar outfile +Use +.Ar outfile +to store the merged CTF data. +.It Fl d Ar uniqfile +Uniquify against +.Ar uniqfile . +.It Fl d Ar uniqlabel +Uniquify against label +.Ar uniqlabel +.It Fl w Ar withfile +Additive merge with +.Ar withfile . +.It Fl c Ar srcfile Ar destfile +Copy CTF data from +.Ar srcfile +into +.Ar destfile . +.El +.Sh EXIT STATUS +.Ex -std +.Sh SEE ALSO +.Xr ctfconvert 1 , +.Xr ctfdump 1 +.Sh HISTORY +The +.Nm +utility first appeared in +.Fx 7.0 . +.Sh AUTHORS +The CTF utilities came from OpenSolaris. Copied: projects/sv/crypto/openssl/ACKNOWLEDGMENTS (from r219925, head/crypto/openssl/ACKNOWLEDGMENTS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/crypto/openssl/ACKNOWLEDGMENTS Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/crypto/openssl/ACKNOWLEDGMENTS) @@ -0,0 +1,25 @@ +The OpenSSL project depends on volunteer efforts and financial support from +the end user community. That support comes in the form of donations and paid +sponsorships, software support contracts, paid consulting services +and commissioned software development. + +Since all these activities support the continued development and improvement +of OpenSSL we consider all these clients and customers as sponsors of the +OpenSSL project. + +We would like to identify and thank the following such sponsors for their past +or current significant support of the OpenSSL project: + +Very significant support: + + OpenGear: www.opengear.com + +Significant support: + + PSW Group: www.psw.net + +Please note that we ask permission to identify sponsors and that some sponsors +we consider eligible for inclusion here have requested to remain anonymous. + +Additional sponsorship or financial support is always welcome: for more +information please contact the OpenSSL Software Foundation. Copied: projects/sv/etc/periodic/daily/490.status-pkg-changes (from r219925, head/etc/periodic/daily/490.status-pkg-changes) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/etc/periodic/daily/490.status-pkg-changes Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/etc/periodic/daily/490.status-pkg-changes) @@ -0,0 +1,43 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ]; then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +case "$daily_status_pkg_changes_enable" in + [Yy][Ee][Ss]) + if [ ! -f /usr/sbin/pkg_info ]; then + echo '$daily_status_pkg_changes_enable is enabled but' \ + "/usr/sbin/pkg_info doesn't exist" + rc=2 + else + bak=/var/backups + rc=0 + + if [ -f $bak/pkg_info.bak ]; then + mv -f $bak/pkg_info.bak $bak/pkg_info.bak2 + fi + /usr/sbin/pkg_info > $bak/pkg_info.bak + + cmp -sz $bak/pkg_info.bak $bak/pkg_info.bak2 + if [ $? -eq 1 ]; then + echo "" + echo "Changes in installed packages:" + diff -U 0 $bak/pkg_info.bak2 $bak/pkg_info.bak \ + | grep '^[-+][^-+]' | sort -k 1.2 + fi + fi + ;; + + *) + rc=0 + ;; +esac + +exit $rc Copied: projects/sv/gnu/lib/libdialog/dlg_config.h (from r219925, head/gnu/lib/libdialog/dlg_config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/gnu/lib/libdialog/dlg_config.h Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/gnu/lib/libdialog/dlg_config.h) @@ -0,0 +1,91 @@ +/* dlg_config.h. Generated automatically by configure. */ +/* + * The configure script expands this as a set of definitions + * + * $FreeBSD$ + */ + +#define DIALOG_PATCHDATE 20100428 +#define DIALOG_VERSION "1.1" +#define HAVE_ALLOCA 1 +#define HAVE_COLOR 1 +#define HAVE_DIRENT_H 1 +#define HAVE_DLG_FORMBOX 1 +#define HAVE_DLG_GAUGE 1 +#define HAVE_DLG_MIXEDFORM 1 +#define HAVE_DLG_TAILBOX 1 +#define HAVE_DLG_TRACE 1 +#define HAVE_FEOF_UNLOCKED 1 +#define HAVE_FLUSHINP 1 +#define HAVE_FSEEKO 1 +#define HAVE_GETBEGX 1 +#define HAVE_GETBEGY 1 +#define HAVE_GETBEGYX 1 +#define HAVE_GETCURX 1 +#define HAVE_GETCURY 1 +#define HAVE_GETCWD 1 +#define HAVE_GETEGID 1 +#define HAVE_GETEUID 1 +#define HAVE_GETGID 1 +#define HAVE_GETMAXX 1 +#define HAVE_GETMAXY 1 +#define HAVE_GETMAXYX 1 +#define HAVE_GETPAGESIZE 1 +#define HAVE_GETPARX 1 +#define HAVE_GETPARY 1 +#define HAVE_GETPARYX 1 +#define HAVE_GETUID 1 +#define HAVE_ICONV 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_LANGINFO_CODESET 1 +#define HAVE_LC_MESSAGES 1 +#define HAVE_LIBNCURSESW 1 +#define HAVE_LIMITS_H 1 +#define HAVE_LOCALE_H 1 +#define HAVE_MBSTATE_T 1 +#define HAVE_MEMORY_H 1 +#define HAVE_MIXEDGAUGE 1 +#define HAVE_MMAP 1 +#define HAVE_MUNMAP 1 +#define HAVE_NL_TYPES_H 1 +#define HAVE_PUTENV 1 +#define HAVE_RC_FILE 1 +#define HAVE_SEARCH_H 1 +#define HAVE_SETENV 1 +#define HAVE_SETLOCALE 1 +#define HAVE_STDDEF_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STPCPY 1 +#define HAVE_STRCASECMP 1 +#define HAVE_STRCHR 1 +#define HAVE_STRDUP 1 +#define HAVE_STRFTIME 1 +#define HAVE_STRINGS_H 1 +#define HAVE_STRING_H 1 +#define HAVE_STRTOUL 1 +#define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_WAIT_H 1 +#define HAVE_TERM_H 1 +#define HAVE_TSEARCH 1 +#define HAVE_TYPE_CHTYPE 1 +#define HAVE_UNCTRL_H 1 +#define HAVE_UNISTD_H 1 +#define HAVE_USE_DEFAULT_COLORS 1 +#define HAVE_WAITPID 1 +#define HAVE_WGET_WCH 1 +#define HAVE_XDIALOG 1 +#define HAVE__NC_FREE_AND_EXIT 1 +#define ICONV_CONST const +#define MIXEDCASE_FILENAMES 1 +#define NCURSES 1 +#define NEED_WCHAR_H 1 +#define PACKAGE "dialog" +#define RETSIGTYPE void +#define STDC_HEADERS 1 +#define SYSTEM_NAME "freebsd9.0" +#define TIME_WITH_SYS_TIME 1 +#define TYPE_CHTYPE_IS_SCALAR 1 +#define USE_WIDE_CURSES 1 Copied: projects/sv/lib/libc/gen/aux.c (from r219925, head/lib/libc/gen/aux.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/lib/libc/gen/aux.c Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/lib/libc/gen/aux.c) @@ -0,0 +1,146 @@ +/*- + * Copyright 2010 Konstantin Belousov . + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include "namespace.h" +#include +#include +#include +#include +#include +#include "un-namespace.h" +#include "libc_private.h" + +Elf_Auxinfo *__elf_aux_vector; + +static pthread_once_t aux_once = PTHREAD_ONCE_INIT; + +static int pagesize, osreldate, canary_len, ncpus, pagesizes_len; +static char *canary, *pagesizes; + +static void +init_aux(void) +{ + Elf_Auxinfo *aux; + + for (aux = __elf_aux_vector; aux->a_type != AT_NULL; aux++) { + switch (aux->a_type) { + case AT_CANARY: + canary = (char *)(aux->a_un.a_ptr); + break; + + case AT_CANARYLEN: + canary_len = aux->a_un.a_val; + break; + + case AT_PAGESIZES: + pagesizes = (char *)(aux->a_un.a_ptr); + break; + + case AT_PAGESIZESLEN: + pagesizes_len = aux->a_un.a_val; + break; + + case AT_PAGESZ: + pagesize = aux->a_un.a_val; + break; + + case AT_OSRELDATE: + osreldate = aux->a_un.a_val; + break; + + case AT_NCPUS: + ncpus = aux->a_un.a_val; + break; + } + } +} + +int +_elf_aux_info(int aux, void *buf, int buflen) +{ + int res; + + if (__elf_aux_vector == NULL) + return (ENOSYS); + _once(&aux_once, init_aux); + + switch (aux) { + case AT_CANARY: + if (canary != NULL && canary_len >= buflen) { + memcpy(buf, canary, buflen); + memset(canary, 0, canary_len); + canary = NULL; + res = 0; + } else + res = ENOENT; + break; + case AT_PAGESIZES: + if (pagesizes != NULL && pagesizes_len >= buflen) { + memcpy(buf, pagesizes, buflen); + res = 0; + } else + res = ENOENT; + break; + + case AT_PAGESZ: + if (buflen == sizeof(int)) { + if (pagesize != 0) { + *(int *)buf = pagesize; + res = 0; + } else + res = ENOENT; + } else + res = EINVAL; + break; + case AT_OSRELDATE: + if (buflen == sizeof(int)) { + if (osreldate != 0) { + *(int *)buf = osreldate; + res = 0; + } else + res = ENOENT; + } else + res = EINVAL; + break; + case AT_NCPUS: + if (buflen == sizeof(int)) { + if (ncpus != 0) { + *(int *)buf = ncpus; + res = 0; + } else + res = ENOENT; + } else + res = EINVAL; + break; + default: + res = ENOENT; + break; + } + return (res); +} Copied: projects/sv/lib/libc/gen/elf_utils.c (from r219925, head/lib/libc/gen/elf_utils.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/lib/libc/gen/elf_utils.c Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/lib/libc/gen/elf_utils.c) @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2010 Konstantin Belousov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +#include +#include +#include +#include +#include + +int +__elf_phdr_match_addr(struct dl_phdr_info *phdr_info, void *addr) +{ + const Elf_Phdr *ph; + int i; + + for (i = 0; i < phdr_info->dlpi_phnum; i++) { + ph = &phdr_info->dlpi_phdr[i]; + if (ph->p_type != PT_LOAD || (ph->p_flags & PF_X) == 0) + continue; + if (phdr_info->dlpi_addr + ph->p_vaddr <= (uintptr_t)addr && + (uintptr_t)addr + sizeof(addr) < phdr_info->dlpi_addr + + ph->p_vaddr + ph->p_memsz) + break; + } + return (i != phdr_info->dlpi_phnum); +} + +#pragma weak __pthread_map_stacks_exec +void +__pthread_map_stacks_exec(void) +{ + int mib[2]; + struct rlimit rlim; + u_long usrstack; + size_t len; + + mib[0] = CTL_KERN; + mib[1] = KERN_USRSTACK; + len = sizeof(usrstack); + if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), &usrstack, &len, NULL, 0) + == -1) + return; + if (getrlimit(RLIMIT_STACK, &rlim) == -1) + return; + mprotect((void *)(uintptr_t)(usrstack - rlim.rlim_cur), + rlim.rlim_cur, _rtld_get_stack_prot()); +} + Copied: projects/sv/lib/libc/sys/stack_protector_compat.c (from r219925, head/lib/libc/sys/stack_protector_compat.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/lib/libc/sys/stack_protector_compat.c Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/lib/libc/sys/stack_protector_compat.c) @@ -0,0 +1,20 @@ +/* + * Written by Alexander Kabaev + * The file is in public domain. + */ + +#include +__FBSDID("$FreeBSD$"); + +void __stack_chk_fail(void); + +#ifdef PIC +void +__stack_chk_fail_local_hidden(void) +{ + + __stack_chk_fail(); +} + +__sym_compat(__stack_chk_fail_local, __stack_chk_fail_local_hidden, FBSD_1.0); +#endif Copied: projects/sv/lib/msun/src/e_log2.c (from r219925, head/lib/msun/src/e_log2.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/lib/msun/src/e_log2.c Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/lib/msun/src/e_log2.c) @@ -0,0 +1,60 @@ + +/* @(#)e_log10.c 1.3 95/01/18 */ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunSoft, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + */ + +#include +__FBSDID("$FreeBSD$"); + +/* + * Return the base 2 logarithm of x. See k_log.c for details on the algorithm. + */ + +#include "math.h" +#include "math_private.h" +#include "k_log.h" + +static const double +two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */ +ivln2hi = 1.44269504072144627571e+00, /* 0x3ff71547, 0x65200000 */ +ivln2lo = 1.67517131648865118353e-10; /* 0x3de705fc, 0x2eefa200 */ + +static const double zero = 0.0; + +double +__ieee754_log2(double x) +{ + double f,hi,lo; + int32_t i,k,hx; + u_int32_t lx; + + EXTRACT_WORDS(hx,lx,x); + + k=0; + if (hx < 0x00100000) { /* x < 2**-1022 */ + if (((hx&0x7fffffff)|lx)==0) + return -two54/zero; /* log(+-0)=-inf */ + if (hx<0) return (x-x)/zero; /* log(-#) = NaN */ + k -= 54; x *= two54; /* subnormal number, scale up x */ + GET_HIGH_WORD(hx,x); + } + if (hx >= 0x7ff00000) return x+x; + k += (hx>>20)-1023; + hx &= 0x000fffff; + i = (hx+0x95f64)&0x100000; + SET_HIGH_WORD(x,hx|(i^0x3ff00000)); /* normalize x or x/2 */ + k += (i>>20); + f = __kernel_log(x); + hi = x = x - 1; + SET_LOW_WORD(hi,0); + lo = x - hi; + return (x+f)*ivln2lo + (lo+f)*ivln2hi + hi*ivln2hi + k; +} Copied: projects/sv/lib/msun/src/e_log2f.c (from r219925, head/lib/msun/src/e_log2f.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sv/lib/msun/src/e_log2f.c Mon Nov 25 19:04:10 2013 (r258577, copy of r219925, head/lib/msun/src/e_log2f.c) @@ -0,0 +1,58 @@ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunPro, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + */ + +#include +__FBSDID("$FreeBSD$"); + +/* + * Return the base 2 logarithm of x. See k_log.c for details on the algorithm. + */ + +#include "math.h" +#include "math_private.h" +#include "k_logf.h" + +static const float +two25 = 3.3554432000e+07, /* 0x4c000000 */ +ivln2hi = 1.4428710938e+00, /* 0x3fb8b000 */ +ivln2lo = -1.7605285393e-04; /* 0xb9389ad4 */ + +static const float zero = 0.0; + +float +__ieee754_log2f(float x) +{ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Nov 25 19:53:47 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B4E29126; Mon, 25 Nov 2013 19:53:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9662F24F6; Mon, 25 Nov 2013 19:53:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPJrlor009041; Mon, 25 Nov 2013 19:53:47 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPJrl2Q009034; Mon, 25 Nov 2013 19:53:47 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201311251953.rAPJrl2Q009034@svn.freebsd.org> From: Ed Maste Date: Mon, 25 Nov 2013 19:53:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258583 - in projects/sv: sys/modules/cc usr.sbin/usbdump X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 19:53:47 -0000 Author: emaste Date: Mon Nov 25 19:53:46 2013 New Revision: 258583 URL: http://svnweb.freebsd.org/changeset/base/258583 Log: Add changes missing from previous MFC at r219925 (Parts of) r217358, r218010, r218152, r218153, and r218155 were missing from the projects/sv branch. Modified: projects/sv/sys/modules/cc/Makefile projects/sv/usr.sbin/usbdump/usbdump.8 projects/sv/usr.sbin/usbdump/usbdump.c Modified: projects/sv/sys/modules/cc/Makefile ============================================================================== --- projects/sv/sys/modules/cc/Makefile Mon Nov 25 19:24:15 2013 (r258582) +++ projects/sv/sys/modules/cc/Makefile Mon Nov 25 19:53:46 2013 (r258583) @@ -1,6 +1,9 @@ # $FreeBSD$ -SUBDIR= cc_cubic \ - cc_htcp +SUBDIR= cc_chd \ + cc_cubic \ + cc_hd \ + cc_htcp \ + cc_vegas .include Modified: projects/sv/usr.sbin/usbdump/usbdump.8 ============================================================================== --- projects/sv/usr.sbin/usbdump/usbdump.8 Mon Nov 25 19:24:15 2013 (r258582) +++ projects/sv/usr.sbin/usbdump/usbdump.8 Mon Nov 25 19:53:46 2013 (r258583) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 14, 2010 +.Dd December 4, 2010 .Dt usbdump 8 .Os .Sh NAME @@ -41,24 +41,29 @@ .Sh DESCRIPTION The .Nm -utility provides a way to dump USB packets on each host controller. +utility provides a way to dump USB packets on host controllers. .Pp -The following options are accepted. +The following options are accepted: .Bl -tag -width ".Fl f Ar file" .It Fl i Ar ifname -Listen on USB bus interface. +Listen on USB bus interface +.Ar ifname . .It Fl r Ar file -Read the raw packets from file. +Read the raw packets from +.Ar file . .It Fl s Ar snaplen -Snapshot bytes from each packet. +Snapshot +.Ar snaplen +bytes from each packet. .It Fl v Enable debugging messages. -When it defined multiple times the verbose level increases. +When defined multiple times the verbosity level increases. .It Fl w Ar file -Write the raw packets to file. +Write the raw packets to +.Ar file . .El .Sh EXAMPLES -Captures the USB raw packets alive on usbus2: +Captures USB raw packets on usbus2: .Pp .Dl "usbdump -i usbus2 -s 256 -v" .Pp @@ -67,11 +72,61 @@ size limit: .Pp .Dl "usbdump -i usbus2 -s 0 -w /tmp/dump_pkts" .Pp -Read the USB raw packets from the file: +Read the USB raw packets from previous file: .Pp .Dl "usbdump -r /tmp/dump_pkts -v" +.Sh OUTPUT FORMAT +The output format of +.Nm +is as follows: +.Pp +.Dl "