openocd.git
14 years agoimprove alloc_vprintf
Andreas Fritiofson [Tue, 24 Nov 2009 20:24:06 +0000 (21:24 +0100)]
improve alloc_vprintf

The previous implementation was unnecessarily complex. Get rid of the loops,
let vsnprintf() tell us directly how much storage we need and allocate that. A
second pass writes the actual string. Also add a va_end() that was missing.
This should be much faster for large strings and less wasteful for small ones.

A quirk that has been retained is that some callers patch in a newline at the
end of the returned string and depend on alloc_vprintf to allocate at least
one byte extra.

Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Signed-off-by: Zachary T Welch <zw@superlucidity.net>
14 years agofix doxygen build
Zachary T Welch [Tue, 24 Nov 2009 16:59:45 +0000 (08:59 -0800)]
fix doxygen build

Update build rules to skip the PDF unless the TeX has been created.
Also, fixes a warning regarding pattern rules being a GNU make trick.

14 years agojlink: rewrite to use jtag_usb_open
Zachary T Welch [Thu, 19 Nov 2009 20:57:32 +0000 (12:57 -0800)]
jlink: rewrite to use jtag_usb_open

Rewrite jlink_usb_open to use jtag_usb_open helper.

14 years agojlink: remove superfluous indentation
Zachary T Welch [Thu, 19 Nov 2009 20:41:25 +0000 (12:41 -0800)]
jlink: remove superfluous indentation

Rewrite logic to remove indentation in jlink_usb_open, in prep
for further surgery.

14 years agorlink: use jtag_usb_open helper
Zachary T Welch [Thu, 19 Nov 2009 20:25:16 +0000 (12:25 -0800)]
rlink: use jtag_usb_open helper

Rewrite rlink_init routine to use jtag_usb_open helper.  Eliminates
some spurious calls to exit().

Wraps a tremendously long line of comment to fit 80 columns too.

14 years agorlink: eliminate spurious indentation
Zachary T Welch [Thu, 19 Nov 2009 20:12:21 +0000 (12:12 -0800)]
rlink: eliminate spurious indentation

Rework rlink_init to use less indentation.  Best viewed with diff -w.

14 years agovsllink: rewrite to use jtag_usb_open
Zachary T Welch [Thu, 19 Nov 2009 20:11:03 +0000 (12:11 -0800)]
vsllink: rewrite to use jtag_usb_open

Rewrite vsllink_usb_open to use jtag_usb_open helper.

Eliminates spurious calls to exit().

14 years agousbprog: use jtag_usb_open
Zachary T Welch [Thu, 19 Nov 2009 20:09:11 +0000 (12:09 -0800)]
usbprog: use jtag_usb_open

Rewrite usbprob_jtag_open to use jtag_usb_open helper.

14 years agoarm-jtag-ew: use jtag_usb_open
Zachary T Welch [Thu, 19 Nov 2009 20:06:05 +0000 (12:06 -0800)]
arm-jtag-ew: use jtag_usb_open

Rewrite armjtagwe_usb_open to use jtag_usb_open.

14 years agoadd jtag/usb_common.[ch] files
Zachary T Welch [Thu, 19 Nov 2009 20:02:07 +0000 (12:02 -0800)]
add jtag/usb_common.[ch] files

Begins to consolidate code used by several USB JTAG interfaces.
This first patch provides the required build system changes and
a common jtag_usb_open routine, which will replace the guts for
probing the busses and devices for possible VID/PID matches.
The following patches convert each driver to use it.

14 years agoARM11: remove old R0..R15/CPSR code
David Brownell [Tue, 24 Nov 2009 09:27:29 +0000 (01:27 -0800)]
ARM11: remove old R0..R15/CPSR code

This finishes the basic switchover to the new register code,
for everything except the debug registers.  (And maybe we
shouldn't have a cache for *those* which works this way...)

The context save/restore code now uses the new code, but
it's in a slightly different sequence.  That should be fine
since the R0/PC/CPSR stuff is all that really matters (and
if we can update those, we can update the rest).

Now there's no longer a way any code can be confused about
which copy of "r1" (etc) to use.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM11: use standard run_algorithm()
David Brownell [Tue, 24 Nov 2009 09:27:24 +0000 (01:27 -0800)]
ARM11: use standard run_algorithm()

As with single stepping, the previous stuff was needed because
the ARM11 code wasn't using the standard ARM base type and
register access ... but now those mechanisms work, so we can
switch out that special-purpose glue, in favor of the more
thoroughly tested/capable "standard" code.

Fixes a bug in the resume() implementation:  it wasn't handling
two of its arguments correctly, preventing the "flash erase_check"
algorithm from working.  (This code needs a *subsequent* update
for correct register handling, though... removing the confusion
about which "r2", for example, to use.)

This should resolve some "FIXME" comments too, for Thumb and
processor mode support.  It also gets rid of a nasty exit()
call; servers should only have *clean* shutdown paths.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM11: use standard single step simulation
David Brownell [Tue, 24 Nov 2009 09:27:21 +0000 (01:27 -0800)]
ARM11: use standard single step simulation

The previous stuff was needed because the ARM11 code wasn't using
the standard ARM base type and register access ... but now those
mechanisms work, so we can switch out that special-purpose glue.

This should resolve all the "FIXME -- handle Thumb single stepping"
comments too, and properly handle the processor's mode.  (Modulo
the issue that this code doesn't yet handle two-byte breakpoints.)

Clarify the comments about the the hardware single stepping.  When
we eventually share breakpoint code with Cortex-A8, we can just make
that be the default on cores which support it.  We may still want an
override command, not just to facilitate testing but to cope with
"instruction address mismatch" not quite being true single-step.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM11: partial support for standard ARM register interfaces.
David Brownell [Tue, 24 Nov 2009 09:27:16 +0000 (01:27 -0800)]
ARM11: partial support for standard ARM register interfaces.

This provides "standard" ARM register support -- with twenty or
more shadow registers on top of what this code now handles, but
properly associated with the various core modes -- parallel to
the current register code.  That is, the current code is stilil
managing the "current" registers; the new code shadows them.

You can see all the registers with "arm reg", modify the shadows
like "r8_fiq" or "sp_abt" with "reg", and see them get properly
written back when you step.  (Just don't do that with any of the
registers managed by the "old" code ...)

It also switches to using more standard code, relying on those
standard registers, in two places:  (a) the poll status display,
which now shows core state (ARM/Thumb/...) and mode (Supervisor,
IRQ, etc); and (b) GDB register access.

So it's not a full migration, there are warts -- every place that
touches the old register cache is a potential bug -- but it's a
small more-or-less-comprehensible step that's even somewhat useful.
Later patches complete the migration.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM11: remove register "history" debug stuff
David Brownell [Tue, 24 Nov 2009 08:14:15 +0000 (00:14 -0800)]
ARM11: remove register "history" debug stuff

This was a private mechanism to snapshot registers before leaving
debug state, and then on reentry to optionally display what changed.
It was coupled to the private register cache, which won't be sticking
around in that form for much longer.  Remove (instead of teaching
it how to handle *all* the registers).

(The idea is interesting, but we ought to be able to implement
this in a generic way.  Ideally through Tcl scripts that can
automatically be invoked following debug entry...)

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM11: implement provider for new DPM interface
David Brownell [Tue, 24 Nov 2009 08:14:06 +0000 (00:14 -0800)]
ARM11: implement provider for new DPM interface

This is a very thin layer over some of the current ARM11
debug TAP utilities.  The layer isn't yet hooked up.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: new DPM interface
David Brownell [Tue, 24 Nov 2009 08:13:58 +0000 (00:13 -0800)]
ARM: new DPM interface

First version of interface for sharing code between ARMv6 and ARMv7a
debug modules ... now the architecture includes debug support.  (Not
the same as for the trimmed-down v7m or v6m though!)  This is a first
version of an interface that will let the ARM11 and Cortex-A8 support
share code, features, and bugfixes.  Based on existing code from both
of those cores.

The ARM v7-AR architecture specification calls this commonality the
"Debug Programmer's Model (DPM)", which seemed to be an appropriate
acronym -- a TLA even! -- for use in our code.  Made it so.  :)

The initial scope of this just supports register access, and is geared
towards supporting top level "struct arm" mechanisms.  Later, things
like breakpoint and watchpoint support should be included.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agotarget: cope with *any* error setting a breakpoint
David Brownell [Tue, 24 Nov 2009 08:13:43 +0000 (00:13 -0800)]
target: cope with *any* error setting a breakpoint

It's wrong to map unrecognized failure codes to success.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agosupport for scripts in $HOME/.openocd
Andreas Fritiofson [Mon, 23 Nov 2009 23:32:54 +0000 (00:32 +0100)]
support for scripts in $HOME/.openocd

Add $HOME/.openocd as the first default script search directory, allowing
the user to override the standard scripts.

Update the user guide with information on where OpenOCD expects to find
configuration files and scripts. Also fixed some minor formatting issues.

Add entry to NEWS as well.

Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agomips: fix gaffe when removing dynamic array allocation
Jerry Ling [Mon, 23 Nov 2009 11:11:54 +0000 (12:11 +0100)]
mips: fix gaffe when removing dynamic array allocation

Classic sizeof() gaffe.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agoarm926ejs: fix gaffe when converting from arm926ejs cp15 to mcr
Øyvind Harboe [Mon, 23 Nov 2009 17:23:10 +0000 (18:23 +0100)]
arm926ejs: fix gaffe when converting from arm926ejs cp15 to mcr

the first arg is the register number 15 = cp15.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agoarm926ejs: retire cp15 commands, handled by mrc/mcr.
Øyvind Harboe [Mon, 26 Oct 2009 13:08:43 +0000 (14:08 +0100)]
arm926ejs: retire cp15 commands, handled by mrc/mcr.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agoARM11: remove unused state and exports
David Brownell [Sun, 22 Nov 2009 23:51:16 +0000 (15:51 -0800)]
ARM11: remove unused state and exports

For now there's no point in saving this stuff after examine()
checks it out as OK.  Ditto exporting symbols that aren't
used outside of the module which defines them.  In fact, those
two things needlessly complicate the code...

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM11: macro cleanup
David Brownell [Sun, 22 Nov 2009 23:50:24 +0000 (15:50 -0800)]
ARM11: macro cleanup

Make this code look more like the rest of the OpenOCD code.

 - Use calloc() directly, not NEW() ... and fix some potential
   memory leaks while we're at it.

 - Remove FNC_INFO ... it's a NOP that just clutters things,
   and it's trivial for developers to add tracing as needed.

 - Replace FNC_INFO_NOTIMPLEMENTED with LOG_WARNING calls;
   ditto.  And stop having those call sites wrongly succeed!

 - Waste less space with the CHECK_RETVAL() macro.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agomips: remove dynamic arrays - reduces stack usage
Øyvind Harboe [Sun, 22 Nov 2009 19:23:34 +0000 (20:23 +0100)]
mips: remove dynamic arrays - reduces stack usage

Allocate working memory dynamically.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agomips: use const for code sequences
Øyvind Harboe [Sun, 22 Nov 2009 19:18:26 +0000 (20:18 +0100)]
mips: use const for code sequences

This will allow data to be allocated in read only
memory instead of on the stack. Speeds things up
and reduces stack usage.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agoarm11: do not use dynamic arrays
Øyvind Harboe [Sun, 22 Nov 2009 18:57:57 +0000 (19:57 +0100)]
arm11: do not use dynamic arrays

Allocate working memory dynamically, caught by checkstack.pl

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agoarm926ejs: fix warnings
Øyvind Harboe [Sun, 22 Nov 2009 18:52:37 +0000 (19:52 +0100)]
arm926ejs: fix warnings

buf_set_u32() operated on an uninitialized stack
variable with non-byte boundaries, which led to
warnings about reading uninitialized stack.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agoTODO: ref 'checkstack.pl' not 'checkpatch.pl'
David Brownell [Sun, 22 Nov 2009 18:28:19 +0000 (10:28 -0800)]
TODO: ref 'checkstack.pl' not 'checkpatch.pl'

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: use arm_reg_current()
David Brownell [Sun, 22 Nov 2009 18:21:48 +0000 (10:21 -0800)]
ARM: use arm_reg_current()

Start using the arm_reg_current() call.  This shrinks and speeds
the affected code.  It can also prevent some coredumps coming from
invalid CPSR values ... the ARMV4_5_CORE_REG_MODE() macro returns
bogus registers if e.g. "Secure Monitor" mode isn't supported by
the current CPU.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM11: remove needless string format #ifdeffery
David Brownell [Sun, 22 Nov 2009 18:21:22 +0000 (10:21 -0800)]
ARM11: remove needless string format #ifdeffery

We don't need to use size_t in these places; so it's easy
to be rid of the need for this #ifdef and its MS-derived
portability problems.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agotarget: make register flags "bool"
David Brownell [Sun, 22 Nov 2009 18:20:14 +0000 (10:20 -0800)]
target: make register flags "bool"

Mostly for clarity, but it also saves code and data space.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: remove 'armv4_5_common_s' migration #define
David Brownell [Sun, 22 Nov 2009 18:19:58 +0000 (10:19 -0800)]
ARM: remove 'armv4_5_common_s' migration #define

Finish migrating from the old symbol to the new one.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoflash: dynamically allocate working storage
Øyvind Harboe [Sun, 22 Nov 2009 18:06:44 +0000 (19:06 +0100)]
flash: dynamically allocate working storage

Allocate working memory rather than using stack.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agotarget: reduce stack usage
Øyvind Harboe [Sun, 22 Nov 2009 17:58:42 +0000 (18:58 +0100)]
target: reduce stack usage

4096 byte buffer allocated dynamically. Better
for embedded OS's.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agotodo: add tip on how to identify excessive stack usage
Øyvind Harboe [Sun, 22 Nov 2009 17:50:57 +0000 (18:50 +0100)]
todo: add tip on how to identify excessive stack usage

Use dynamic allocations for working memory rather than stack.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agozy1000: un-break uart command after command handler refactoring
Øyvind Harboe [Wed, 18 Nov 2009 10:08:33 +0000 (11:08 +0100)]
zy1000: un-break uart command after command handler refactoring

Switched it to jim command to insulate it from command refactoring.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agoembedded: reduce stack usage
Øyvind Harboe [Sat, 21 Nov 2009 22:29:58 +0000 (23:29 +0100)]
embedded: reduce stack usage

Allocate working structures on stack to avoid issues with
path lengths + reduce stack usage.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agoembedded: do not allocate large temporary structures on stack
Øyvind Harboe [Sat, 21 Nov 2009 22:25:46 +0000 (23:25 +0100)]
embedded: do not allocate large temporary structures on stack

With -O3 when inlining aggressively the total stack usage will
be the sum of many fn's, which can easily get out of hand.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agoembedded: save stack
Øyvind Harboe [Sat, 21 Nov 2009 22:45:36 +0000 (23:45 +0100)]
embedded: save stack

and also do not recaluate the crc32_table upon
every invocation.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agozy1000: fix breakage in command parsing code for power command
Øyvind Harboe [Sun, 22 Nov 2009 12:16:48 +0000 (13:16 +0100)]
zy1000: fix breakage in command parsing code for power command

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agobuild: fix breakage in building bin2char
Øyvind Harboe [Sun, 22 Nov 2009 12:24:45 +0000 (13:24 +0100)]
build: fix breakage in building bin2char

bin2char build relied on $(builddir) which is not defined
for arm-elf X builds at least.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
14 years agoARM: arm_set_cpsr() handles T and J bits
David Brownell [Sun, 22 Nov 2009 11:41:14 +0000 (03:41 -0800)]
ARM: arm_set_cpsr() handles T and J bits

Have arm_set_cpsr() handle the two core state flags, updating
the CPU state.  This eliminates code in various debug_entry()
paths, and marginally improves handling of the J bit.

Catch and comment a few holes in the handling of the J bit on
ARM926ejs cores ... it's unlikely our users will care about
Jazelle mode, but we can at least warn of Impending Doom.  If
anyone does use it, these breadcrumbs may help them to find
the right path through the code.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: define two register utilities
David Brownell [Sun, 22 Nov 2009 11:38:34 +0000 (03:38 -0800)]
ARM: define two register utilities

Define arm_reg_current() ... returning handle to a given register,
and encapsulating the current mode's register shadowing.  It's got
one current use, for reporting the current register set to GDB.
This will let later patches clean up much ARMV4_5_CORE_REG_MODE()
nastiness, saving a bit of code.

Define and use arm_set_cpsr() ... initially it updates the cached
CPSR and sets up state used by arm_reg_current(), plus any SPSR
handle.   (Later: can also set up for T and J bits.)

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: simplify CPSR handling
David Brownell [Sun, 22 Nov 2009 11:37:21 +0000 (03:37 -0800)]
ARM: simplify CPSR handling

Stash a pointer to the CPSR in the "struct arm", to help get rid
of the (common) references to its index in the register cache.

This removes almost all references to CPSR offsets outside of the
toplevel ARM code ... except a pair related to the current ARM11
"simulator" logic (which should be removable soonish).

This is a net minor code shrink of a few hundred bytes of object
code, and also makes the code more readable.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM11: remove disabled register hooks
David Brownell [Sun, 22 Nov 2009 11:36:24 +0000 (03:36 -0800)]
ARM11: remove disabled register hooks

Minor cleanup of ARM11 register handling:  remove disabled
register hooks.  This should all be handled by shared code,
and this stuff is just clutter.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agojtag: remove useless forward declarations
Zachary T Welch [Sat, 21 Nov 2009 18:20:56 +0000 (10:20 -0800)]
jtag: remove useless forward declarations

Removes some more useless forward declarations from a few JTAG drivers.
Moves interface and bit-bang structure defitions below their callbacks.

14 years agoallow jtag interfaces to lack commands
Zachary T Welch [Sat, 21 Nov 2009 18:19:47 +0000 (10:19 -0800)]
allow jtag interfaces to lack commands

Allow JTAG interface drivers to skip registering an register_commands
callback when it will just be empty.

14 years agoshow script search dirs in debug log
Andreas Fritiofson [Sat, 21 Nov 2009 17:30:09 +0000 (09:30 -0800)]
show script search dirs in debug log

Add this to ease debugging why the standard scripts aren't
found on the default script search path in some build/install
enviroments. Especially on Windows it's not straight forward
where openocd actually looks for the scripts.

Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: pass 'struct reg *' to register r/w routines
David Brownell [Sat, 21 Nov 2009 00:27:24 +0000 (16:27 -0800)]
ARM: pass 'struct reg *' to register r/w routines

Implementations need to access the register struct they modify;
make it easier and less error-prone to identify the instance.
(This removes over 10% of the ARMV4_5_CORE_REG_MODE nastiness...)

Plus some minor fixes noted when making these updates:  ARM7/ARM9
accessor methods should be static; don't leave CPSR wrongly marked
"dirty"; note significant XScale omissions in register handling;
and have armv4_5_build_reg_cache() record its result.

Rename "struct armv4_5_core_reg" as "struct arm_reg"; it's used
for more than those older architecture generations.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM7/ARM9: remove old "debug commands"
David Brownell [Sat, 21 Nov 2009 00:21:29 +0000 (16:21 -0800)]
ARM7/ARM9: remove old "debug commands"

Remove two commands that were documented as "debug commands"
and where "you probably don't want to use this".   We never
intended to support them, and at least one problem report
boiled down to using this when it shouldn't have been used.

Update the docs on the existing register commands to talk a
bit more about register access and cache behavior.  (Those
debug commands existed largely to *bypass* the cache.)  And
fix some minor doc goofs that snuck in with recent changes,
renaming "armv4_5" as "arm" and "arm9tdmi" as "arm9".

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agomaintain command lists in sorted order
Zachary T Welch [Fri, 20 Nov 2009 18:16:46 +0000 (10:16 -0800)]
maintain command lists in sorted order

Use insertion sort to the command link lists.  The only practical effect
of this is to order the output of the new 'help' command.

14 years agoadd add_help_text command handler
Zachary T Welch [Thu, 19 Nov 2009 15:23:25 +0000 (07:23 -0800)]
add add_help_text command handler

Rewrite means for scripts to register help text for commands.  These
cause the new commands to be stored in the command heirarchy, with
built-in commands; however, they will never be invoked there because
they do not receive a command handler.  The same trick is used for
the Jim commands.

Remove the old helpers that were used to register commands.

14 years agoprovide command context during cmd_init
Zachary T Welch [Fri, 20 Nov 2009 17:11:39 +0000 (09:11 -0800)]
provide command context during cmd_init

For the startup.tcl code to use built-in commands, the context must be
associated with the interpreter temporarily.  This will be required to
add help text.

14 years agoimprove 'help' command
Zachary T Welch [Thu, 19 Nov 2009 14:48:37 +0000 (06:48 -0800)]
improve 'help' command

Rewrites 'help' command in C, using new 'cmd_help' for display.  Adds the
built-in 'help' COMMAND_HANDLER to provide better output than the
TCL-based script command (e.g. heirarchical listing of commands).

The help string is stored in the command structure, though it conitnues
to be pushed into the Jim environment.  The current idiomatic usage
suggests the addition of a usage field as well, to provide two levels
of detail for users to consume (i.e. terse usage list, or verbose help).

14 years agofactor help script command into parts
Zachary T Welch [Thu, 19 Nov 2009 14:44:58 +0000 (06:44 -0800)]
factor help script command into parts

Creates a helper function, cmd_help, which displays the help string
for a single command.  Presently, it is called from the loop in help.

The routine has been extended to allow indentation of command groups,
so an improved help command can improve the display of information.

14 years agorefactor command registration
Zachary T Welch [Thu, 19 Nov 2009 16:38:17 +0000 (08:38 -0800)]
refactor command registration

Refactors the command registration to use helpers to simplify the code.
The unregistration routines were made more flexible by allowing them
to operate on a single command, such that one can remove all of a
commands children in one step (perhaps before adding back a 'config'
subcommand that allows getting the others back).  Eliminates a bit
of duplicated code and adds full API documentation for these routines.

14 years agochange command_find helper interface
Zachary T Welch [Thu, 19 Nov 2009 15:26:28 +0000 (07:26 -0800)]
change command_find helper interface

Avoid requiring double pointers where a single would suffice.

14 years agofactor script_command argv allocation
Zachary T Welch [Thu, 19 Nov 2009 00:34:34 +0000 (16:34 -0800)]
factor script_command argv allocation

Splits argument allocation out from script command, reusing free() code.

14 years agotarget.cfg: TAP id for Hilscher netX 500
David Brownell [Fri, 20 Nov 2009 20:21:00 +0000 (12:21 -0800)]
target.cfg: TAP id for Hilscher netX 500

Based on email from "Martin Kaul <martin.kaul@leuze.de>".

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agofix flash/nand name parsing
Zachary T Welch [Fri, 20 Nov 2009 02:11:30 +0000 (18:11 -0800)]
fix flash/nand name parsing

Start driver.num check from end, and make sure the numeric part is
actually a number.  Fix problems trying to parse bank names.

14 years agoCortex-A8: better context restore
David Brownell [Fri, 20 Nov 2009 03:03:12 +0000 (19:03 -0800)]
Cortex-A8: better context restore

The previous version never wrote dirty registers
for non-current CPU modes ... fix that.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoCortex-A8: mode support
David Brownell [Fri, 20 Nov 2009 03:03:02 +0000 (19:03 -0800)]
Cortex-A8: mode support

We *should* be able to read and write registers in any core mode,
instead of being stuck with whatever mode the core was when we
entered debug state.  This patch makes them work.

Note that the current restore_context() only handles the current
mode; writing to other-mode registers is a NOP without a followup
patch fixing that.  Also, that SPSR access needed some bugfixes;
it was confused with CPSR.

Secure monitor mode also seems dubious; there's probably more to
be done before that's sufficiently understood by the debugger.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agotarget: create/use register_cache_invalidate()
David Brownell [Fri, 20 Nov 2009 03:02:10 +0000 (19:02 -0800)]
target: create/use register_cache_invalidate()

Create a generic register_cache_invalidate(), and use it to
replace three all-but-identical core-specific routines:

 - armv4_5_invalidate_core_regs()
 - armv7m_invalidate_core_regs
 - mips32_invalidate_core_regs() too.

Make cache->num_regs be unsigned, avoiding various errors.

Net code shrink and simplification.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoNAND verify doesn't advance.
Dean Glazeski [Thu, 19 Nov 2009 23:12:23 +0000 (17:12 -0600)]
NAND verify doesn't advance.

Fix to move the device address up as the contents are verified.

Signed-off-by: Zachary T Welch <zw@superlucidity.net>
14 years agodocument new flash syntax
Zachary T Welch [Wed, 18 Nov 2009 11:16:37 +0000 (03:16 -0800)]
document new flash syntax

Updates the user documentation with the new syntax for defining
flash and nand banks.

14 years agoupdate 'nand device' usage in scripts
Zachary T Welch [Wed, 18 Nov 2009 10:19:35 +0000 (02:19 -0800)]
update 'nand device' usage in scripts

Add $_FLASHNAME variable to update 'nand device' command syntax.

14 years agoadd support for naming NAND banks
Zachary T Welch [Tue, 17 Nov 2009 22:11:24 +0000 (14:11 -0800)]
add support for naming NAND banks

Requires users to name their nand banks, allowing them to be used
instead of bank numbers in script commands.

14 years agorefactor handle_nand_device_command
Zachary T Welch [Tue, 17 Nov 2009 23:14:03 +0000 (15:14 -0800)]
refactor handle_nand_device_command

Move bulk of for-loop to a new static command helper function.

Adds handle_nand_list_drivers command handler, registered as
'nand drivers'.

Improves command help text and error reporting.

14 years agoupdate 'flash bank' usage in scripts
Zachary T Welch [Wed, 18 Nov 2009 10:15:52 +0000 (02:15 -0800)]
update 'flash bank' usage in scripts

Sets $_FLASHNAME to "$_CHIPNAME.flash" and passes it as the
first argument to 'flash bank'.

14 years agoadd support for naming flash banks
Zachary T Welch [Tue, 17 Nov 2009 22:04:25 +0000 (14:04 -0800)]
add support for naming flash banks

Requires users to name their flash banks, allowing them to be used
instead of bank numbers in script commands.

14 years agorefactor handle_flash_bank_command
Zachary T Welch [Tue, 17 Nov 2009 21:52:43 +0000 (13:52 -0800)]
refactor handle_flash_bank_command

Move variables to point of first use, reducing their scope.
Add driver_name temporary to help arguments be changed later.

Eliminates the useless 'found' variable, changing the code to terminate
the loop immediate and return its success.

14 years agorename flash and nand command helpers
Zachary T Welch [Tue, 17 Nov 2009 21:07:36 +0000 (13:07 -0800)]
rename flash and nand command helpers

After adding support for referencing banks by name, renames
the COMMAND_HELPERs appropriately:
flash_command_get_bank_by_num  -> flash_command_get_bank
nand_command_get_device_by_num -> flash_command_get_device

14 years agoallow flash/nand banks commands to accept names
Zachary T Welch [Tue, 17 Nov 2009 21:04:49 +0000 (13:04 -0800)]
allow flash/nand banks commands to accept names

Add get_flash_bank_by_name (and get_nand_device_by_name) helpers
to retrieves struct flash_bank * (struct nand_device *) given a
driver name and an (optional) driver-specific bank index.

These are used to extend flash_command_get_bank_by_num (and
nand_command_get_device_by_num) to allow all flash (nand) commands to
reference defined banks by name, not just by number.

To avoid some code duplication, add the flash/common.[ch] files to hold
functionality common to both types driver.  The first two methods are
helpers for the above routines to find a bank specified by a "name" or
"name.index" string.  get_flash_name_index() finds the '.index' portion,
while flash_driver_name_matches() performs the string portion matching.

14 years agoARM: remove per-register malloc
David Brownell [Thu, 19 Nov 2009 21:23:49 +0000 (13:23 -0800)]
ARM: remove per-register malloc

Just pre-allocate memory for the cached register value.
Shrinks heap overhead; increases locality-of-reference.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: streamline register init
David Brownell [Thu, 19 Nov 2009 21:23:08 +0000 (13:23 -0800)]
ARM: streamline register init

Combine register names with other per-register data into a
single template structure.  This saves space, and makes it
easier to change how registers get handled (by shrinking
the number of places that care about cache indices).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoCortex-A8: parts of examine() run just once
David Brownell [Thu, 19 Nov 2009 18:47:31 +0000 (10:47 -0800)]
Cortex-A8: parts of examine() run just once

The examine() method has some conceptual breakage.  Cope
with it by manually splitting out the run-once parts from
the after-each-reset parts ... this gets rid of memory
leaks and speeds up resets after the first one.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agonand_fileio_parse_args parses wrong param for size
Dean Glazeski [Thu, 19 Nov 2009 05:22:25 +0000 (23:22 -0600)]
nand_fileio_parse_args parses wrong param for size

This changes the size parameter from argv[2] to argv[3], which is what it's
supposed to be.

Signed-off-by: Zachary T Welch <zw@superlucidity.net>
14 years agoARMv7-A: use standard ARM core states
David Brownell [Thu, 19 Nov 2009 10:33:01 +0000 (02:33 -0800)]
ARMv7-A: use standard ARM core states

We don't want an ARMv7-specific core state enumeration just to
add ThumbEE state.  Update the generic stuff to handle that,
and replace the V7-specific bits with it.

For Cortex-A8:  on debug entry, check both the T and J bits
instead of just the T bit.  When the J bit is set, set the
right state and warn appropriately.

(And while we're at it, move the generic arm struct to the front
of the v7a structure, for somewhat better code generation.)

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARMv7-A: use standard ARM core_mode symbols
David Brownell [Thu, 19 Nov 2009 10:31:34 +0000 (02:31 -0800)]
ARMv7-A: use standard ARM core_mode symbols

The only way ARMv7-A modes differ from ARMv4/ARMv5 flavors
is that v7-A is allowed to include "Secure monitor" support.
That's now handled by our standard top-level ARM code ... so
phase out the stuff that's specific to ARMv7-A.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agofix zy1000 command handler
Zachary T Welch [Wed, 18 Nov 2009 14:00:26 +0000 (06:00 -0800)]
fix zy1000 command handler

Rewrite ZY1000 power command handler to use new macros, simplify logic.

Remove unused port command handler declaration.

14 years agoremove fast command and jim_global_long
Zachary T Welch [Wed, 18 Nov 2009 13:02:08 +0000 (05:02 -0800)]
remove fast command and jim_global_long

Removing the fast command eliminates the fast_and_dangerous global,
which was used only by arm7_9_common as an initializer.  The command
is not called in the tree; instead, more explicit commands are used.

The jim_global_long function was not used anywhere in the tree.

14 years agoupdate src/hello.c with parsing examples
Zachary T Welch [Wed, 18 Nov 2009 23:20:58 +0000 (15:20 -0800)]
update src/hello.c with parsing examples

Adds the foo/bar commands to provide more working examples of command
argument parsing, including the new handle_command_parse_bool helper.

Updates hello command help text to provide useful information.

14 years agochange all bool parsers to accept any value
Zachary T Welch [Wed, 18 Nov 2009 20:41:20 +0000 (12:41 -0800)]
change all bool parsers to accept any value

This patch changes the behavior of all boolean parsing callers to
accept any one of "true/enable/on/yes/1" or "false/disable/off/no/0".

Since one particular pair will be most appropriate in any given
situation, the specific macros should continue to be used in
order to display the most informative error messages possible.

14 years agoadd handle_command_parse_bool command helper
Zachary T Welch [Wed, 18 Nov 2009 14:58:27 +0000 (06:58 -0800)]
add handle_command_parse_bool command helper

Rewrite arm11_handle_bool to provide a generic on/off command helper.

Refactors COMMAND_PARSE_BOOL to use new command_parse_bool helper,
which gets reused by the new command_parse_bool_any helper.
This later helper is called by the new command helper function to
accepts any on/off, enable/disable, true/false, yes/no, or 0/1 parameter.

14 years agouse COMMAND_PARSE_ENABLE macro where appropriate
Zachary T Welch [Wed, 18 Nov 2009 13:36:18 +0000 (05:36 -0800)]
use COMMAND_PARSE_ENABLE macro where appropriate

Updates all command parsing of simple "enable" and "disable" arguments.
A few case in the tree use a tri-state or extended arguments, which
cannot use this simple macro.

Simlifies the xscale icache/dcache command handler logic.

14 years agouse COMMAND_PARSE_ON_OFF where appropriate
Zachary T Welch [Wed, 18 Nov 2009 13:22:44 +0000 (05:22 -0800)]
use COMMAND_PARSE_ON_OFF where appropriate

Updates all command parsing of "on" and "off" arguments.

14 years agoadd COMMAND_PARSE_BOOL macro and friends
Zachary T Welch [Wed, 18 Nov 2009 13:19:34 +0000 (05:19 -0800)]
add COMMAND_PARSE_BOOL macro and friends

Adds several macros similar to COMMAND_PARSE_NUMBER, but for parsing
boolean command arguments.  Two flavors are provided to provide
drop-in compatibility with existing code, allow for the elimination
of a lot of code bloat while improving the error checking and reporting.

COMMAND_PARSE_ON_OFF parses "on"/"off" command parameters.
COMMAND_PARSE_ENABLE parses "enable"/"disable" command parameters.

Both print the error and return an error out of the calling function.

14 years agoARM: rework "arm reg" output for new mode
David Brownell [Wed, 18 Nov 2009 23:31:24 +0000 (15:31 -0800)]
ARM: rework "arm reg" output for new mode

Change the layout to show the "Secure Monitor" registers too,
when they're present.

Instead of lining registers for each of six (or seven) modes up
in adjacent vertical columns, display each mode's registers (or
shadows) in a single block, avoiding duplicate value displays.

This also lets us shrink the line length to fits in standard 80
character lines ... six or seven 18-character columns can't fit.

Relabel "r13" as "sp", so it's more meaningful.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoCortex-A8: xPSR handling updates
David Brownell [Wed, 18 Nov 2009 23:04:58 +0000 (15:04 -0800)]
Cortex-A8: xPSR handling updates

When we read the CPSR on debug entry, update the CPSR cache in all
cases, not just when the current processor state is User or System.

Plus minor cleanup of how the (too-many) other registers' cache
entries get updated.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: add a default full_context() method
David Brownell [Wed, 18 Nov 2009 22:49:22 +0000 (14:49 -0800)]
ARM: add a default full_context() method

If the core doesn't provide an optimized version of this
method, provide one without core-specific optimizations.
Use this to make Cortex-A8 support the "arm reg" command.

Related: make the two register access methods properly static,
have the "set" log a "not halted" error too, and make sure
that the "valid" flag is set on successful reads.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: simplify ARMv7-A register handling
David Brownell [Wed, 18 Nov 2009 22:46:14 +0000 (14:46 -0800)]
ARM: simplify ARMv7-A register handling

ARMv7-A doesn't need to duplicate all the standard ARM code
for register handling.

 - Switch Cortex-A8 to use the standard register code
 - Remove duplicated infrastructure from ARMv7-A
 - Have ARMv7-A arch_state() show CPSR, like other ARMs

Add comments to show where the Cortex-A8 isn't actually doing
the right thing for register reads/writes, unless core happens
to be in the right mode to start with.  (Looks like maybe there
may be generic confusion between saved/current PSR values in all
the ARM code ...)

Make related ARMv7-A and Cortex-A8 symbols properly static.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: setup "secure monitor mode" shadow regs
David Brownell [Wed, 18 Nov 2009 21:23:00 +0000 (13:23 -0800)]
ARM: setup "secure monitor mode" shadow regs

Teach the "armv4_5" register code to understand about the
secure monitor mode:

 - Add the other three shadowed registers to the arrays
 - Support another internal mode number (sigh) in mappings
 - Catch malloc/calloc failures building that register cache

This should kick in for Cortex-A8 and ARM1176.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agoARM: add "core_type" field to "struct arm"
David Brownell [Wed, 18 Nov 2009 21:22:27 +0000 (13:22 -0800)]
ARM: add "core_type" field to "struct arm"

It's used to flag cores with the "TrustZone" extension,
and is used in subsequent patches to set up support for
the registers shadowed by its new secure monitor mode.

The ARM1176 and Cortex-A8 both support this new mode.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
14 years agofix segfault at startup
Zachary T Welch [Wed, 18 Nov 2009 19:56:24 +0000 (11:56 -0800)]
fix segfault at startup

The previous changes to move the startup TCL code resulted in segfaults
during startup.  This seemingly innocuous patch fixes the problem.
I would explain why changing from 'foo[]' to '*foo' caused this issue,
but the difference seems superficial.  For now, this hot fix will do,
but this issue might bear further scrutiny.

14 years agopass startup_tcl to command_init
Zachary T Welch [Tue, 17 Nov 2009 17:15:09 +0000 (09:15 -0800)]
pass startup_tcl to command_init

Removes external linkage from helper module, making the startup
code a parameter to a new command context's initialization routine.

14 years agosplit startup.tcl file across modules
Zachary T Welch [Tue, 17 Nov 2009 16:29:20 +0000 (08:29 -0800)]
split startup.tcl file across modules

Moves definitions for each layer into their own file, eliminating
layering violations in the built-in TCL code.  Updates src/Makefile.am
rules to include all files in the final startup.tcl input file, and
others Makefile.am rules to distribute the new files in our packages.

14 years agomove startup.c to libopenocd
Zachary T Welch [Tue, 17 Nov 2009 16:30:51 +0000 (08:30 -0800)]
move startup.c to libopenocd

Moves the creation of startup_tcl.c from src/helper/ to src/.
Prepares to split the startup.tcl file into its per-module parts.

14 years agofix regression in md/mw commands
Zachary T Welch [Wed, 18 Nov 2009 11:34:52 +0000 (03:34 -0800)]
fix regression in md/mw commands

The recent migration broke them, the fixes broken them in a new way,
but this should restore them to working order.  Eliminates the
temporary variable, as the CMD_NAME macro can once again be use
in routines that increment CMD_ARGV without nasty side-effects.

14 years agojtag-api: get rid of unecessary buf_set_u23() that make code obtuse.
Øyvind Harboe [Tue, 17 Nov 2009 20:59:01 +0000 (21:59 +0100)]
jtag-api: get rid of unecessary buf_set_u23() that make code obtuse.

Also, this is on the path to increasing the word size for
bit vectors from 8 to something wider(32? natural host machine
width?)

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)