cleanup: rename armv4_5 to arm for readability

[openocd.git] / src / target / mips_m4k.c

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index facf9a5676f843d4f1e42ecf4ffe34c20c798818..83a2a7bd81fc86330d97df963ee06b74ef9700d0 100644 (file)
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -865,12 +865,27 @@ static int mips_m4k_read_memory(struct target *target, uint32_t address,
 
        /* sanitize arguments */
        if (((size != 4) && (size != 2) && (size != 1)) || (count == 0) || !(buffer))
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        if (((size == 4) && (address & 0x3u)) || ((size == 2) && (address & 0x1u)))
                return ERROR_TARGET_UNALIGNED_ACCESS;
 
-       void * t = buffer;
+       /* since we don't know if buffer is aligned, we allocate new mem that is always aligned */
+       void *t = NULL;
+
+       if (size > 1)
+       {
+               t = malloc(count * size * sizeof(uint8_t));
+               if (t == NULL)
+               {
+                       LOG_ERROR("Out of memory");
+                       return ERROR_FAIL;
+               }
+       }
+       else
+       {
+               t = buffer;
+       }
 
        /* if noDMA off, use DMAACC mode for memory read */
        int retval;
@@ -894,6 +909,9 @@ static int mips_m4k_read_memory(struct target *target, uint32_t address,
                }
        }
 
+       if ((size > 1) && (t != NULL))
+               free(t);
+
        return retval;
 }
 
@@ -914,7 +932,7 @@ static int mips_m4k_write_memory(struct target *target, uint32_t address,
 
        /* sanitize arguments */
        if (((size != 4) && (size != 2) && (size != 1)) || (count == 0) || !(buffer))
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        if (((size == 4) && (address & 0x3u)) || ((size == 2) && (address & 0x1u)))
                return ERROR_TARGET_UNALIGNED_ACCESS;
@@ -1122,7 +1140,7 @@ COMMAND_HANDLER(mips_m4k_handle_cp0_command)
        /* two or more argument, access a single register/select (write if third argument is given) */
        if (CMD_ARGC < 2)
        {
-               command_print(CMD_CTX, "command requires more arguments.");
+           return ERROR_COMMAND_SYNTAX_ERROR;
        }
        else
        {
@@ -1187,6 +1205,7 @@ const struct command_registration mips_m4k_command_handlers[] = {
                .name = "mips_m4k",
                .mode = COMMAND_ANY,
                .help = "mips_m4k command group",
+               .usage = "",
                .chain = mips_m4k_exec_command_handlers,
        },
        COMMAND_REGISTRATION_DONE