Guest User

patch-c-format.c

a guest
Nov 8th, 2010
268
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.10 KB | None | 0 0
  1. 2010-10-30 Alexander Williams <[email protected]>
  2.  
  3. Index: gcc/c-format.c
  4. ===================================================================
  5. --- gcc/c-format.c
  6. +++ gcc/c-format.c (working copy)
  7. @@ -184,7 +184,7 @@
  8. if (TREE_CODE (format_type_id) != IDENTIFIER_NODE)
  9. {
  10. gcc_assert (!validated_p);
  11. - error ("unrecognized format specifier");
  12. + error ("%Junrecognized format specifier", lang_hooks.decls.getdecls ());
  13. return false;
  14. }
  15. else
  16. @@ -531,6 +531,26 @@
  17. { NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL }
  18. };
  19.  
  20. +static const format_char_info fbsd_ext_char_info =
  21. +{ NULL, 1, STD_EXT, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "cR", NULL };
  22. +
  23. +static const format_char_info fbsd_print_char_table[] =
  24. +{
  25. + /* BSD conversion specifiers. */
  26. + /* FreeBSD kernel extensions (src/sys/kern/subr_prf.c).
  27. + The format %b is supported to decode error registers.
  28. + Its usage is: printf("reg=%b\n", regval, "<base><arg>*");
  29. + which produces: reg=3<BITTWO,BITONE>
  30. + The format %D provides a hexdump given a pointer and separator string:
  31. + ("%6D", ptr, ":") -> XX:XX:XX:XX:XX:XX
  32. + ("%*D", len, ptr, " ") -> XX XX XX XX ...
  33. + */
  34. + { "D", 1, STD_EXT, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR", &fbsd_ext_char_info },
  35. + { "b", 0, STD_EXT, { T89_I, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "", &fbsd_ext_char_info },
  36. + { "ry", 0, STD_EXT, { T89_I, BADLEN, BADLEN, T89_L, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "i", NULL },
  37. + { NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL }
  38. +};
  39. +
  40. static const format_char_info asm_fprintf_char_table[] =
  41. {
  42. /* C89 conversion specifiers. */
  43. @@ -766,6 +786,12 @@
  44. strfmon_flag_specs, strfmon_flag_pairs,
  45. FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L', 0,
  46. NULL, NULL
  47. + },
  48. + { "printf0", printf_length_specs, print_char_table, " +#0-'I", NULL,
  49. + printf_flag_specs, printf_flag_pairs,
  50. + FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK|FMT_FLAG_NULL_FORMAT_OK,
  51. + 'w', 0, 'p', 0, 'L', 0,
  52. + &integer_type_node, &integer_type_node
  53. }
  54. };
  55.  
  56. @@ -1778,6 +1804,14 @@
  57. while (fli->name != 0
  58. && strncmp (fli->name, format_chars, strlen (fli->name)))
  59. fli++;
  60. + /*
  61. + * Make sure FreeBSD's D format char takes preference
  62. + * over new DD length specifier if FreeBSD format
  63. + * extensions are requested.
  64. + */
  65. + if (fli->index == FMT_LEN_D && flag_format_extensions
  66. + && fki->conversion_specs == print_char_table)
  67. + while (fli->name != 0) fli++;
  68. if (fli->name != 0)
  69. {
  70. format_chars += strlen (fli->name);
  71. @@ -1845,6 +1879,14 @@
  72. while (fci->format_chars != 0
  73. && strchr (fci->format_chars, format_char) == 0)
  74. ++fci;
  75. + if (fci->format_chars == 0 && flag_format_extensions
  76. + && fki->conversion_specs == print_char_table)
  77. + {
  78. + fci = fbsd_print_char_table;
  79. + while (fci->format_chars != 0
  80. + && strchr (fci->format_chars, format_char) == 0)
  81. + ++fci;
  82. + }
  83. if (fci->format_chars == 0)
  84. {
  85. if (ISGRAPH (format_char))
  86. @@ -1964,7 +2006,7 @@
  87. y2k_level = 2;
  88. if (y2k_level == 3)
  89. warning (OPT_Wformat_y2k, "%<%%%c%> yields only last 2 digits of "
  90. - "year in some locales", format_char);
  91. + "year in some locales on non-BSD systems", format_char);
  92. else if (y2k_level == 2)
  93. warning (OPT_Wformat_y2k, "%<%%%c%> yields only last 2 digits of "
  94. "year", format_char);
  95. y2k_level = 2;
  96. if (y2k_level == 3)
  97. warning (OPT_Wformat_y2k, "%<%%%c%> yields only last 2 digits of "
  98. - "year in some locales", format_char);
  99. + "year in some locales on non-BSD systems", format_char);
  100. else if (y2k_level == 2)
  101. warning (OPT_Wformat_y2k, "%<%%%c%> yields only last 2 digits of "
  102. "year", format_char);
Advertisement
Add Comment
Please, Sign In to add comment