Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
target: or1k: remove wrong endian swap from or1k generic code
[openocd.git] / src / target / openrisc / or1k_du_adv.c
diff --git a/src/target/openrisc/or1k_du_adv.c b/src/target/openrisc/or1k_du_adv.c
index 6d449e8f3a5deb20c5b81baaa2ba95c82a8c5ec8..f497a869d4b16c510462dd65cd3fb06294aad26b 100644 (file)
--- a/src/target/openrisc/or1k_du_adv.c
+++ b/src/target/openrisc/or1k_du_adv.c
@@ -283,7 +283,7 @@ static int adbg_ctrl_write(struct or1k_jtag *jtag_info, uint8_t regidx,
        uint32_t opcode;
        uint32_t opcode_len;
 
-       LOG_DEBUG("Write control register %d: 0x%08x", regidx, cmd_data[0]);
+       LOG_DEBUG("Write control register %" PRId8 ": 0x%08" PRIx32, regidx, cmd_data[0]);
 
        int retval = adbg_select_ctrl_reg(jtag_info, regidx);
        if (retval != ERROR_OK) {
@@ -419,7 +419,7 @@ static int adbg_wb_burst_read(struct or1k_jtag *jtag_info, int size,
        int retval;
        uint8_t opcode;
 
-       LOG_DEBUG("Doing burst read, word size %d, word count %d, start address 0x%08x",
+       LOG_DEBUG("Doing burst read, word size %d, word count %d, start address 0x%08" PRIx32,
                  size, count, start_address);
 
        /* Select the appropriate opcode */
@@ -508,7 +508,7 @@ retry_read_full:
                crc_calc = adbg_compute_crc(crc_calc, data[i], 8);
 
        if (crc_calc != crc_read) {
-               LOG_WARNING("CRC ERROR! Computed 0x%08x, read CRC 0x%08x", crc_calc, crc_read);
+               LOG_WARNING("CRC ERROR! Computed 0x%08" PRIx32 ", read CRC 0x%08" PRIx32, crc_calc, crc_read);
                if (retry_full_crc++ < MAX_READ_CRC_RETRY)
                        goto retry_read_full;
                else {
@@ -540,7 +540,7 @@ retry_read_full:
                                goto out;
 
                        addr = (err_data[0] >> 1) | (err_data[1] << 31);
-                       LOG_WARNING("WB bus error during burst read, address 0x%08x, retrying!", addr);
+                       LOG_WARNING("WB bus error during burst read, address 0x%08" PRIx32 ", retrying!", addr);
 
                        bus_error_retries++;
                        if (bus_error_retries > MAX_BUS_ERRORS) {
@@ -656,7 +656,7 @@ retry_full_write:
                return retval;
 
        if (!value) {
-               LOG_WARNING("CRC ERROR! match bit after write is %i (computed CRC 0x%08x)", value, crc_calc);
+               LOG_WARNING("CRC ERROR! match bit after write is %" PRIi8 " (computed CRC 0x%08" PRIx32 ")", value, crc_calc);
                if (retry_full_crc++ < MAX_WRITE_CRC_RETRY)
                        goto retry_full_write;
                else
@@ -684,7 +684,7 @@ retry_full_write:
                                return retval;
 
                        addr = (err_data[0] >> 1) | (err_data[1] << 31);
-                       LOG_WARNING("WB bus error during burst write, address 0x%08x, retrying!", addr);
+                       LOG_WARNING("WB bus error during burst write, address 0x%08" PRIx32 ", retrying!", addr);
 
                        bus_error_retries++;
                        if (bus_error_retries > MAX_BUS_ERRORS) {
@@ -711,10 +711,14 @@ retry_full_write:
 static int or1k_adv_jtag_read_cpu(struct or1k_jtag *jtag_info,
                uint32_t addr, int count, uint32_t *value)
 {
-       if (!jtag_info->or1k_jtag_inited)
-               or1k_adv_jtag_init(jtag_info);
+       int retval;
+       if (!jtag_info->or1k_jtag_inited) {
+               retval = or1k_adv_jtag_init(jtag_info);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
 
-       int retval = adbg_select_module(jtag_info, DC_CPU0);
+       retval = adbg_select_module(jtag_info, DC_CPU0);
        if (retval != ERROR_OK)
                return retval;
 
@@ -724,10 +728,14 @@ static int or1k_adv_jtag_read_cpu(struct or1k_jtag *jtag_info,
 static int or1k_adv_jtag_write_cpu(struct or1k_jtag *jtag_info,
                uint32_t addr, int count, const uint32_t *value)
 {
-       if (!jtag_info->or1k_jtag_inited)
-               or1k_adv_jtag_init(jtag_info);
+       int retval;
+       if (!jtag_info->or1k_jtag_inited) {
+               retval = or1k_adv_jtag_init(jtag_info);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
 
-       int retval = adbg_select_module(jtag_info, DC_CPU0);
+       retval = adbg_select_module(jtag_info, DC_CPU0);
        if (retval != ERROR_OK)
                return retval;
 
@@ -736,10 +744,14 @@ static int or1k_adv_jtag_write_cpu(struct or1k_jtag *jtag_info,
 
 static int or1k_adv_cpu_stall(struct or1k_jtag *jtag_info, int action)
 {
-       if (!jtag_info->or1k_jtag_inited)
-               or1k_adv_jtag_init(jtag_info);
+       int retval;
+       if (!jtag_info->or1k_jtag_inited) {
+               retval = or1k_adv_jtag_init(jtag_info);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
 
-       int retval = adbg_select_module(jtag_info, DC_CPU0);
+       retval = adbg_select_module(jtag_info, DC_CPU0);
        if (retval != ERROR_OK)
                return retval;
 
@@ -762,10 +774,14 @@ static int or1k_adv_cpu_stall(struct or1k_jtag *jtag_info, int action)
 
 static int or1k_adv_is_cpu_running(struct or1k_jtag *jtag_info, int *running)
 {
-       if (!jtag_info->or1k_jtag_inited)
-               or1k_adv_jtag_init(jtag_info);
+       int retval;
+       if (!jtag_info->or1k_jtag_inited) {
+               retval = or1k_adv_jtag_init(jtag_info);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
 
-       int retval = adbg_select_module(jtag_info, DC_CPU0);
+       retval = adbg_select_module(jtag_info, DC_CPU0);
        if (retval != ERROR_OK)
                return retval;
 
@@ -784,10 +800,14 @@ static int or1k_adv_is_cpu_running(struct or1k_jtag *jtag_info, int *running)
 
 static int or1k_adv_cpu_reset(struct or1k_jtag *jtag_info, int action)
 {
-       if (!jtag_info->or1k_jtag_inited)
-               or1k_adv_jtag_init(jtag_info);
+       int retval;
+       if (!jtag_info->or1k_jtag_inited) {
+               retval = or1k_adv_jtag_init(jtag_info);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
 
-       int retval = adbg_select_module(jtag_info, DC_CPU0);
+       retval = adbg_select_module(jtag_info, DC_CPU0);
        if (retval != ERROR_OK)
                return retval;
 
@@ -811,18 +831,22 @@ static int or1k_adv_cpu_reset(struct or1k_jtag *jtag_info, int action)
 static int or1k_adv_jtag_read_memory(struct or1k_jtag *jtag_info,
                            uint32_t addr, uint32_t size, int count, uint8_t *buffer)
 {
-       LOG_DEBUG("Reading WB%d at 0x%08x", size * 8, addr);
+       LOG_DEBUG("Reading WB%" PRId32 " at 0x%08" PRIx32, size * 8, addr);
 
-       if (!jtag_info->or1k_jtag_inited)
-               or1k_adv_jtag_init(jtag_info);
+       int retval;
+       if (!jtag_info->or1k_jtag_inited) {
+               retval = or1k_adv_jtag_init(jtag_info);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
 
-       int retval = adbg_select_module(jtag_info, DC_WISHBONE);
+       retval = adbg_select_module(jtag_info, DC_WISHBONE);
        if (retval != ERROR_OK)
                return retval;
 
        int block_count_left = count;
        uint32_t block_count_address = addr;
-       uint8_t *block_count_buffer = (uint8_t *)buffer;
+       uint8_t *block_count_buffer = buffer;
 
        while (block_count_left) {
 
@@ -839,21 +863,67 @@ static int or1k_adv_jtag_read_memory(struct or1k_jtag *jtag_info,
                block_count_buffer += size * MAX_BURST_SIZE;
        }
 
+       /* The adv_debug_if always return words and half words in
+        * little-endian order no matter what the target endian is.
+        * So if the target endian is big, change the order.
+        */
+
+       struct target *target = jtag_info->target;
+       if ((target->endianness == TARGET_BIG_ENDIAN) && (size != 1)) {
+               switch (size) {
+               case 4:
+                       buf_bswap32(buffer, buffer, size * count);
+                       break;
+               case 2:
+                       buf_bswap16(buffer, buffer, size * count);
+                       break;
+               }
+       }
+
        return ERROR_OK;
 }
 
 static int or1k_adv_jtag_write_memory(struct or1k_jtag *jtag_info,
                             uint32_t addr, uint32_t size, int count, const uint8_t *buffer)
 {
-       LOG_DEBUG("Writing WB%d at 0x%08x", size * 8, addr);
+       LOG_DEBUG("Writing WB%" PRId32 " at 0x%08" PRIx32, size * 8, addr);
 
-       if (!jtag_info->or1k_jtag_inited)
-               or1k_adv_jtag_init(jtag_info);
+       int retval;
+       if (!jtag_info->or1k_jtag_inited) {
+               retval = or1k_adv_jtag_init(jtag_info);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
 
-       int retval = adbg_select_module(jtag_info, DC_WISHBONE);
+       retval = adbg_select_module(jtag_info, DC_WISHBONE);
        if (retval != ERROR_OK)
                return retval;
 
+       /* The adv_debug_if wants words and half words in little-endian
+        * order no matter what the target endian is. So if the target
+        * endian is big, change the order.
+        */
+
+       void *t = NULL;
+       struct target *target = jtag_info->target;
+       if ((target->endianness == TARGET_BIG_ENDIAN) && (size != 1)) {
+               t = malloc(count * size * sizeof(uint8_t));
+               if (t == NULL) {
+                       LOG_ERROR("Out of memory");
+                       return ERROR_FAIL;
+               }
+
+               switch (size) {
+               case 4:
+                       buf_bswap32(t, buffer, size * count);
+                       break;
+               case 2:
+                       buf_bswap16(t, buffer, size * count);
+                       break;
+               }
+               buffer = t;
+       }
+
        int block_count_left = count;
        uint32_t block_count_address = addr;
        uint8_t *block_count_buffer = (uint8_t *)buffer;
@@ -866,14 +936,20 @@ static int or1k_adv_jtag_write_memory(struct or1k_jtag *jtag_info,
                retval = adbg_wb_burst_write(jtag_info, block_count_buffer,
                                             size, blocks_this_round,
                                             block_count_address);
-               if (retval != ERROR_OK)
+               if (retval != ERROR_OK) {
+                       if (t != NULL)
+                               free(t);
                        return retval;
+               }
 
                block_count_left -= blocks_this_round;
                block_count_address += size * MAX_BURST_SIZE;
                block_count_buffer += size * MAX_BURST_SIZE;
        }
 
+       if (t != NULL)
+               free(t);
+
        return ERROR_OK;
 }
 
Open On-Chip Debugger

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)