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.__archive__
parent
6e95f16d0a
commit
59f32cbe53
|
@ -2248,8 +2248,7 @@ COMMAND_HANDLER(handle_md_command)
|
||||||
return ERROR_COMMAND_SYNTAX_ERROR;
|
return ERROR_COMMAND_SYNTAX_ERROR;
|
||||||
|
|
||||||
unsigned size = 0;
|
unsigned size = 0;
|
||||||
const char *cmd_name = CMD_NAME;
|
switch (CMD_NAME[2]) {
|
||||||
switch (cmd_name[6]) {
|
|
||||||
case 'w': size = 4; break;
|
case 'w': size = 4; break;
|
||||||
case 'h': size = 2; break;
|
case 'h': size = 2; break;
|
||||||
case 'b': size = 1; break;
|
case 'b': size = 1; break;
|
||||||
|
@ -2301,7 +2300,6 @@ COMMAND_HANDLER(handle_mw_command)
|
||||||
bool physical=strcmp(CMD_ARGV[0], "phys")==0;
|
bool physical=strcmp(CMD_ARGV[0], "phys")==0;
|
||||||
int (*fn)(struct target *target,
|
int (*fn)(struct target *target,
|
||||||
uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
|
uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
|
||||||
const char *cmd_name = CMD_NAME;
|
|
||||||
if (physical)
|
if (physical)
|
||||||
{
|
{
|
||||||
CMD_ARGC--;
|
CMD_ARGC--;
|
||||||
|
@ -2327,7 +2325,7 @@ COMMAND_HANDLER(handle_mw_command)
|
||||||
struct target *target = get_current_target(CMD_CTX);
|
struct target *target = get_current_target(CMD_CTX);
|
||||||
unsigned wordsize;
|
unsigned wordsize;
|
||||||
uint8_t value_buf[4];
|
uint8_t value_buf[4];
|
||||||
switch (cmd_name[6])
|
switch (CMD_NAME[2])
|
||||||
{
|
{
|
||||||
case 'w':
|
case 'w':
|
||||||
wordsize = 4;
|
wordsize = 4;
|
||||||
|
|
Loading…
Reference in New Issue