mips32 : Fixed memory byte access
authorDrasko DRASKOVIC <drasko.draskovic@gmail.com>
Mon, 25 Jul 2011 12:23:35 +0000 (14:23 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Tue, 9 Aug 2011 21:17:28 +0000 (23:17 +0200)
Function mips_m4k_write_memory() does endianess byte swap,
but this procedure break one byte access (temporary array
overwrites content in buffer).
As a fix, this endianess swap and buffer affecting
is preformed only on hword and word accesses (not on byte access).

src/target/mips_m4k.c

index 350ed5139ce0f08a82570626b4db099c1e3bf511..e4ab044ab7039d2c00c4a843ac34930b5b1235dd 100644 (file)
@@ -923,33 +923,38 @@ static int mips_m4k_write_memory(struct target *target, uint32_t address,
        if (((size == 4) && (address & 0x3u)) || ((size == 2) && (address & 0x1u)))
                return ERROR_TARGET_UNALIGNED_ACCESS;
 
-       /* mips32_..._write_mem with size 4/2 requires uint32_t/uint16_t in host */
-       /* endianness, but byte array represents target endianness               */
-       uint8_t * t = NULL;
-       t = malloc(count * sizeof(uint32_t));
-       if (t == NULL)
+       /** correct endianess if we have word or hword access */
+       uint8_t *t = NULL;
+       if (size > 1)
        {
-               LOG_ERROR("Out of memory");
-               return ERROR_FAIL;
-       }
+               /* mips32_..._write_mem with size 4/2 requires uint32_t/uint16_t in host */
+               /* endianness, but byte array represents target endianness               */
+               t = malloc(count * sizeof(uint32_t));
+               if (t == NULL)
+               {
+                       LOG_ERROR("Out of memory");
+                       return ERROR_FAIL;
+               }
 
-       uint32_t i, t32;
-       uint16_t t16;
-       for(i = 0; i < (count*size); i += size)
-       {
-               switch(size)
+               uint32_t i, t32;
+               uint16_t t16;
+               for(i = 0; i < (count*size); i += size)
                {
-               case 4:
-                       t32 = target_buffer_get_u32(target,&buffer[i]);
-                       h_u32_to_le(&t[i], t32);
-                       break;
-               case 2:
-                       t16 = target_buffer_get_u16(target,&buffer[i]);
-                       h_u16_to_le(&t[i], t16);
-                       break;
+                       switch(size)
+                       {
+                       case 4:
+                               t32 = target_buffer_get_u32(target,&buffer[i]);
+                               h_u32_to_le(&t[i], t32);
+                               break;
+                       case 2:
+                               t16 = target_buffer_get_u16(target,&buffer[i]);
+                               h_u16_to_le(&t[i], t16);
+                               break;
+                       }
                }
+
+               buffer = t;
        }
-       buffer = t;
 
        /* if noDMA off, use DMAACC mode for memory write */
        int retval;

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)