You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

options.c 6.0 KiB

src/helper/configuration.h - Log output handlers now get a "const char *line" - Added "const" to parameter. src/helper/command.c src/helper/command.h - New function: 'command_output_text()' - Log output handlers now get a "const char *line" src/helper/options.c - Log output handlers now get a "const char *line" src/server/telnet_server.c - DO not transmit NULL bytes via TELNET. - Log output handlers now get a "const char *line" src/server/gdb_server.c - Log output handlers now get a "const char *line" *** THIS INCLUDES PORTIONS OF A PATCH FROM Oyvind sent previously to the mailing list for TCL users try src/target/target.c *** THIS INCLUDES PORTIONS OF A PATCH FROM Oyvind sent previously to the mailing list for TCL users try src/target/target.h *** THIS INCLUDES PORTIONS OF A PATCH FROM Oyvind sent previously to the mailing list for TCL users try src/openocd.c - **MAJOR** Work: New TCL/Jim function: mem2array - **MAJOR** Work: Redirect Tcl/Jim stdio output to remote users. - Previously: TCL output did not go to GDB. - Previously: TCL output did not go to TELNET - Previously: TCL output only goes to control console. - This fixes that problem. + Created callbacks: +openocd_jim_fwrite() +openocd_jim_fread() +openocd_jim_vfprintf() +openocd_jim_fflush() +openocd_jim_fgets() src/Makefile.am - New TCL files. - Future note: This should be more automated. As the list of 'tcl' files grows maintaning this list will suck. src/Jim.c - ** THIS INCLUDES A PREVIOUS PATCH I SENT EARLIER ** - that impliments many [format] specifies JIM did not support. - Jim_FormatString() - **MAJOR** work. - Previously only supported "%s" "%d" and "%c" - And what support existed had bugs. - NEW: *MANY* formating parameters are now supported. - TODO: The "precision" specifier is not supported. ** NEW ** This patch. - Jim_StringToWide() test if no conversion occured. - Jim_StringToIndex() test if no conversion occured. - Jim_StringToDouble() test if no conversion occured. ** NEW ** This Patch. Major Work. - Previously output from JIM did not get sent to GDB - Ditto: Output to Telnet session. - Above items are now fixed - By introducing callbacks new function pointers in the "interp" structure. - Helpers that call the callbacks. - New function: Jim_fprintf() - New function: Jim_vfprintf() - New function: Jim_fwrite() - New function: Jim_fread() - New function: Jim_fflush() - New function: Jim_fgets() By default: the output is to STDIO as previous. The "openocd.c" - redirects the output as needed. - Jim_Panic() - Send panic to both STDERR and the interps specified STDERR output as a 2nd choice. - Now JIM's "stdin/stdout/stderr" paramters are "void *" and are no longer "FILE *". src/Jim.h - **MAJOR** - New JIM STDIO callbacks in the "interp" structure. - change: "stdin/stdout/stderr" are now "void *" cookies. - New JIM stdio helper functions. git-svn-id: svn://svn.berlios.de/openocd/trunk@755 b42882b7-edfa-0310-969c-e2dbd0fdcd60
14 years ago
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202
  1. /***************************************************************************
  2. * Copyright (C) 2004, 2005 by Dominic Rath *
  3. * Dominic.Rath@gmx.de *
  4. * *
  5. * Copyright (C) 2007,2008 Řyvind Harboe *
  6. * oyvind.harboe@zylin.com *
  7. * *
  8. * This program is free software; you can redistribute it and/or modify *
  9. * it under the terms of the GNU General Public License as published by *
  10. * the Free Software Foundation; either version 2 of the License, or *
  11. * (at your option) any later version. *
  12. * *
  13. * This program is distributed in the hope that it will be useful, *
  14. * but WITHOUT ANY WARRANTY; without even the implied warranty of *
  15. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
  16. * GNU General Public License for more details. *
  17. * *
  18. * You should have received a copy of the GNU General Public License *
  19. * along with this program; if not, write to the *
  20. * Free Software Foundation, Inc., *
  21. * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
  22. ***************************************************************************/
  23. #ifdef HAVE_CONFIG_H
  24. #include "config.h"
  25. #endif
  26. #include "replacements.h"
  27. #include "types.h"
  28. #include "command.h"
  29. #include "configuration.h"
  30. #include "log.h"
  31. #include "server.h"
  32. #include <stdio.h>
  33. #include <stdlib.h>
  34. #include <getopt.h>
  35. #include <string.h>
  36. static int help_flag, version_flag;
  37. static struct option long_options[] =
  38. {
  39. {"help", no_argument, &help_flag, 1},
  40. {"version", no_argument, &version_flag, 1},
  41. {"debug", optional_argument, 0, 'd'},
  42. {"file", required_argument, 0, 'f'},
  43. {"search", required_argument, 0, 's'},
  44. {"log_output", required_argument, 0, 'l'},
  45. {"command", required_argument, 0, 'c'},
  46. {"pipe", no_argument, 0, 'p'},
  47. {0, 0, 0, 0}
  48. };
  49. int configuration_output_handler(struct command_context_s *context, const char* line)
  50. {
  51. LOG_USER_N(line);
  52. return ERROR_OK;
  53. }
  54. int add_default_dirs(void)
  55. {
  56. #ifdef _WIN32
  57. /* Add the parent of the directory where openocd.exe resides to the
  58. * config script search path.
  59. * Directory layout:
  60. * bin\openocd.exe
  61. * lib\openocd
  62. * event\at91eb40a_reset.cfg
  63. * target\at91eb40a.cfg
  64. */
  65. {
  66. char strExePath [MAX_PATH];
  67. GetModuleFileName (NULL, strExePath, MAX_PATH);
  68. /* Either this code will *always* work or it will SEGFAULT giving
  69. * excellent information on the culprit.
  70. */
  71. *strrchr(strExePath, '\\')=0;
  72. strcat(strExePath, "\\..");
  73. add_script_search_dir(strExePath);
  74. }
  75. /*
  76. * Add support for the default (as of 20080121) layout when
  77. * using autotools and cygwin to build native MinGW binary.
  78. * Path separator is converted to UNIX style so that MinGW is
  79. * pleased.
  80. *
  81. * bin/openocd.exe
  82. * lib/openocd/event/at91eb40a_reset.cfg
  83. * lib/openocd/target/at91eb40a.cfg
  84. */
  85. {
  86. char strExePath [MAX_PATH];
  87. char *p;
  88. GetModuleFileName (NULL, strExePath, MAX_PATH);
  89. *strrchr(strExePath, '\\')=0;
  90. strcat(strExePath, "/../lib/"PACKAGE);
  91. for(p=strExePath; *p; p++) {
  92. if(*p == '\\')
  93. *p = '/';
  94. }
  95. add_script_search_dir(strExePath);
  96. }
  97. #else
  98. /* Add dir for openocd supplied scripts last so that user can over
  99. ride those scripts if desired. */
  100. add_script_search_dir(PKGDATADIR);
  101. add_script_search_dir(PKGLIBDIR);
  102. #endif
  103. return ERROR_OK;
  104. }
  105. int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[])
  106. {
  107. int c;
  108. char command_buffer[128];
  109. while (1)
  110. {
  111. /* getopt_long stores the option index here. */
  112. int option_index = 0;
  113. c = getopt_long(argc, argv, "hvd::l:f:s:c:p", long_options, &option_index);
  114. /* Detect the end of the options. */
  115. if (c == -1)
  116. break;
  117. switch (c)
  118. {
  119. case 0:
  120. break;
  121. case 'h': /* --help | -h */
  122. help_flag = 1;
  123. break;
  124. case 'v': /* --version | -v */
  125. version_flag = 1;
  126. break;
  127. case 'f': /* --file | -f */
  128. {
  129. snprintf(command_buffer, 128, "script {%s}", optarg);
  130. add_config_command(command_buffer);
  131. break;
  132. }
  133. case 's': /* --search | -s */
  134. add_script_search_dir(optarg);
  135. break;
  136. case 'd': /* --debug | -d */
  137. if (optarg)
  138. snprintf(command_buffer, 128, "debug_level %s", optarg);
  139. else
  140. snprintf(command_buffer, 128, "debug_level 3");
  141. command_run_line(cmd_ctx, command_buffer);
  142. break;
  143. case 'l': /* --log_output | -l */
  144. if (optarg)
  145. {
  146. snprintf(command_buffer, 128, "log_output %s", optarg);
  147. command_run_line(cmd_ctx, command_buffer);
  148. }
  149. break;
  150. case 'c': /* --command | -c */
  151. if (optarg)
  152. {
  153. add_config_command(optarg);
  154. }
  155. break;
  156. case 'p': /* --pipe | -p */
  157. #if BUILD_ECOSBOARD == 1
  158. /* pipes unsupported on hosted platforms */
  159. LOG_WARNING("pipes not supported on this platform");
  160. #else
  161. server_use_pipes = 1;
  162. #endif
  163. break;
  164. }
  165. }
  166. if (help_flag)
  167. {
  168. LOG_OUTPUT("Open On-Chip Debugger\n(c) 2005-2008 by Dominic Rath\n\n");
  169. LOG_OUTPUT("--help | -h\tdisplay this help\n");
  170. LOG_OUTPUT("--version | -v\tdisplay OpenOCD version\n");
  171. LOG_OUTPUT("--file | -f\tuse configuration file <name>\n");
  172. LOG_OUTPUT("--search | -s\tdir to search for config files and scripts\n");
  173. LOG_OUTPUT("--debug | -d\tset debug level <0-3>\n");
  174. LOG_OUTPUT("--log_output | -l\tredirect log output to file <name>\n");
  175. LOG_OUTPUT("--command | -c\trun <command>\n");
  176. LOG_OUTPUT("--pipe | -p\tuse pipes for gdb communication\n");
  177. exit(-1);
  178. }
  179. if (version_flag)
  180. {
  181. /* Nothing to do, version gets printed automatically. */
  182. // It is not an error to request the VERSION number.
  183. exit(0);
  184. }
  185. return ERROR_OK;
  186. }