Skip to content

Commit

Permalink
- remove requirement for file2c.tcl
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.berlios.de/openocd/trunk@800 b42882b7-edfa-0310-969c-e2dbd0fdcd60
  • Loading branch information
ntfreak committed Jul 12, 2008
1 parent cebfbfa commit 2e832a3
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 223 deletions.
15 changes: 11 additions & 4 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,20 @@ AM_CONDITIONAL(BITQ, test $build_bitq = yes)
AC_LANG_C
AC_PROG_CC
AC_PROG_RANLIB
AC_PATH_PROG(TCLSH, tclsh)

# quit if we have no tclsh
if test "x${TCLSH}" = "x"; then
AC_MSG_ERROR([no working tclsh found])
AC_CHECK_PROG(OBJDUMP, objdump, objdump)
AC_CHECK_PROG(OBJCOPY, objcopy, objcopy)

if test x${OBJDUMP} != x -a x${OBJCOPY} != x ; then
AC_MSG_CHECKING(objcopy command line)
AC_TRY_COMPILE(,,[OBJCOPY_format=`${OBJDUMP} -f conftest.$ac_objext | sed -e '/file format/!d' -e 's/.*format \(.*\)/\1/'`
OBJCOPY_arch=`${OBJDUMP} -f conftest.$ac_objext | sed -e '/architecture/!d' -e 's/.*architecture: \(.*\),.*/\1/'`])
AC_MSG_RESULT(-I binary -O ${OBJCOPY_format} -B ${OBJCOPY_arch})
fi

AC_SUBST(OBJCOPY_FORMAT, ${OBJCOPY_format})
AC_SUBST(OBJCOPY_ARCH, ${OBJCOPY_arch})

AC_SUBST(WITH_FTD2XX, $with_ftd2xx)

AC_OUTPUT(Makefile src/Makefile src/helper/Makefile src/jtag/Makefile src/xsvf/Makefile src/target/Makefile src/server/Makefile src/flash/Makefile src/pld/Makefile doc/Makefile)
12 changes: 5 additions & 7 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ else
MAINFILE = main.c jim.c
endif

openocd_SOURCES = $(MAINFILE) openocd.c startup.c
openocd_SOURCES = $(MAINFILE) openocd.c

# set the include path found by configure
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper \
Expand Down Expand Up @@ -70,7 +70,7 @@ FTD2XXLIB =
endif
endif

openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
openocd_LDADD = $(top_builddir)/src/startup.o $(top_builddir)/src/xsvf/libxsvf.a \
$(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \
$(top_builddir)/src/helper/libhelper.a \
$(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \
Expand All @@ -96,9 +96,7 @@ nobase_dist_pkglib_DATA = \
tcl/mmr_helpers.tcl \
tcl/readable.tcl

# Convert .tcl to .c file
startup.c: $(top_srcdir)/src/startup.tcl Makefile $(top_srcdir)/src/file2c.tcl
${TCLSH} $(top_srcdir)/src/file2c.tcl $(top_srcdir)/src/startup.tcl startup.c
# Convert .tcl to object

# add startup.c to make clean list
CLEANFILES = startup.c
$(top_builddir)/src/startup.o: $(top_srcdir)/src/startup.tcl
${OBJCOPY} -I binary -O ${OBJCOPY_FORMAT} -B ${OBJCOPY_ARCH} startup.tcl startup.o
125 changes: 0 additions & 125 deletions src/file2c.tcl

This file was deleted.

22 changes: 15 additions & 7 deletions src/openocd.c
Original file line number Diff line number Diff line change
Expand Up @@ -711,10 +711,14 @@ void add_jim(const char *name, int (*cmd)(Jim_Interp *interp, int argc, Jim_Obj
Jim_ListAppendElement(interp, helptext, cmd_entry);
}

extern const unsigned char filedata_startup[];
extern char binary_startup_tcl_start;
extern char binary_startup_tcl_size;

void initJim(void)
{
char *script;
int script_len;

Jim_CreateCommand(interp, "openocd", Jim_Command_openocd, NULL, NULL);
Jim_CreateCommand(interp, "openocd_throw", Jim_Command_openocd_throw, NULL, NULL);
Jim_CreateCommand(interp, "find", Jim_Command_find, NULL, NULL);
Expand All @@ -734,23 +738,27 @@ void initJim(void)

add_default_dirs();

if (Jim_Eval(interp, filedata_startup)==JIM_ERR)
script_len = (int)&binary_startup_tcl_size;
script = malloc(script_len + sizeof(char));
memcpy(script, &binary_startup_tcl_start, script_len);

/* null terminate */
script[script_len] = 0;

if (Jim_Eval(interp, script)==JIM_ERR)
{
LOG_ERROR("Failed to run startup.tcl (embedded into OpenOCD compile time)");
Jim_PrintErrorMessage(interp);
exit(-1);
}

free(script);
}



int handle_script_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
FILE *script_file;

if (argc != 1)
return ERROR_COMMAND_SYNTAX_ERROR;


/* Run a tcl script file */
return command_run_linef(cmd_ctx, "source [find {%s}]", args[0]);
Expand Down
30 changes: 15 additions & 15 deletions testing/tcl_server.tcl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Simple tcl client to connect to openocd
puts "Use empty line to exit"
set fo [socket 127.0.0.1 6666]
puts -nonewline stdout "> "
flush stdout
while {[gets stdin line] >= 0} {
if {$line eq {}} break
puts $fo $line
flush $fo
gets $fo line
puts $line
puts -nonewline stdout "> "
flush stdout
}
close $fo
# Simple tcl client to connect to openocd
puts "Use empty line to exit"
set fo [socket 127.0.0.1 6666]
puts -nonewline stdout "> "
flush stdout
while {[gets stdin line] >= 0} {
if {$line eq {}} break
puts $fo $line
flush $fo
gets $fo line
puts $line
puts -nonewline stdout "> "
flush stdout
}
close $fo
130 changes: 65 additions & 65 deletions testing/tcl_test.tcl
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
if { $argc != 1 } {
puts "Usage: test_tcl.tcl <ipaddress>"
exit 1
}

puts $argv

# Simple tcl client to connect to openocd
global fo
set fo [socket $argv 6666]

# If a fn is unknown to Tcl, send it off to OpenOCD
proc unknown args {
global fo
puts $fo $args
flush $fo
gets $fo line
return $line
}



#Print help text for a command. Word wrap
#help text that is too wide inside column.
proc pc_help {args} {
global ocd_helptext
set cmd $args
foreach a [lsort $ocd_helptext] {
if {[string length $cmd]==0||[string first $cmd $a]!=-1||[string first $cmd [lindex $a 1]]!=-1} {
set w 50
set cmdname [lindex $a 0]
set h [lindex $a 1]
set n 0
while 1 {
if {$n > [string length $h]} {break}

set next_a [expr $n+$w]
if {[string length $h]>$n+$w} {
set xxxx [string range $h $n [expr $n+$w]]
for {set lastpos [expr [string length $xxxx]-1]} {$lastpos>=0&&[string compare [string range $xxxx $lastpos $lastpos] " "]!=0} {set lastpos [expr $lastpos-1]} {
}
#set next_a -1
if {$lastpos!=-1} {
set next_a [expr $lastpos+$n+1]
}
}


puts [format "%-25s %s" $cmdname [string range $h $n [expr $next_a-1]] ]
set cmdname ""
set n [expr $next_a]
}
}
}
}

puts "Running flash_banks"
puts [flash_banks]
puts "Running help on PC using data from OpenOCD"
global ocd_helptext
set ocd_helptext [get_help_text]
puts [pc_help]



if { $argc != 1 } {
puts "Usage: test_tcl.tcl <ipaddress>"
exit 1
}

puts $argv

# Simple tcl client to connect to openocd
global fo
set fo [socket $argv 6666]

# If a fn is unknown to Tcl, send it off to OpenOCD
proc unknown args {
global fo
puts $fo $args
flush $fo
gets $fo line
return $line
}



#Print help text for a command. Word wrap
#help text that is too wide inside column.
proc pc_help {args} {
global ocd_helptext
set cmd $args
foreach a [lsort $ocd_helptext] {
if {[string length $cmd]==0||[string first $cmd $a]!=-1||[string first $cmd [lindex $a 1]]!=-1} {
set w 50
set cmdname [lindex $a 0]
set h [lindex $a 1]
set n 0
while 1 {
if {$n > [string length $h]} {break}

set next_a [expr $n+$w]
if {[string length $h]>$n+$w} {
set xxxx [string range $h $n [expr $n+$w]]
for {set lastpos [expr [string length $xxxx]-1]} {$lastpos>=0&&[string compare [string range $xxxx $lastpos $lastpos] " "]!=0} {set lastpos [expr $lastpos-1]} {
}
#set next_a -1
if {$lastpos!=-1} {
set next_a [expr $lastpos+$n+1]
}
}


puts [format "%-25s %s" $cmdname [string range $h $n [expr $next_a-1]] ]
set cmdname ""
set n [expr $next_a]
}
}
}
}

puts "Running flash_banks"
puts [flash_banks]
puts "Running help on PC using data from OpenOCD"
global ocd_helptext
set ocd_helptext [get_help_text]
puts [pc_help]



0 comments on commit 2e832a3

Please sign in to comment.