Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Cleanup: nuke trailling whitespaces
[openocd.git] / src / target / armv4_5_mmu.c
diff --git a/src/target/armv4_5_mmu.c b/src/target/armv4_5_mmu.c
index c7dad3e2799c10f547549a9687a072b42b21fd7d..e64021e800db3ec28d6ae7001e896012e5291ed3 100644 (file)
--- a/src/target/armv4_5_mmu.c
+++ b/src/target/armv4_5_mmu.c
@@ -17,43 +17,45 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "arm7_9_common.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "log.h"
-#include "command.h"
 #include "armv4_5_mmu.h"
 
-#include <stdlib.h>
 
-u32 armv4mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 va, int *type, u32 *cb, int *domain, u32 *ap);
-int armv4_5_mmu_read_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 address, u32 size, u32 count, u8 *buffer);
-int armv4_5_mmu_write_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 address, u32 size, u32 count, u8 *buffer);
+uint32_t armv4mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap);
 
 char* armv4_5_mmu_page_type_names[] =
 {
        "section", "large page", "small page", "tiny page"
 };
 
-u32 armv4_5_mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 va, int *type, u32 *cb, int *domain, u32 *ap)
+uint32_t armv4_5_mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap)
 {
-       u32 first_lvl_descriptor = 0x0;
-       u32 second_lvl_descriptor = 0x0;
-       u32 ttb = armv4_5_mmu->get_ttb(target);
+       uint32_t first_lvl_descriptor = 0x0;
+       uint32_t second_lvl_descriptor = 0x0;
+       uint32_t ttb = armv4_5_mmu->get_ttb(target);
 
        armv4_5_mmu_read_physical(target, armv4_5_mmu,
                (ttb & 0xffffc000) | ((va & 0xfff00000) >> 18),
-               4, 1, (u8*)&first_lvl_descriptor);
+               4, 1, (uint8_t*)&first_lvl_descriptor);
+       first_lvl_descriptor = target_buffer_get_u32(target, (uint8_t*)&first_lvl_descriptor);
 
-       DEBUG("1st lvl desc: %8.8x", first_lvl_descriptor);
+       LOG_DEBUG("1st lvl desc: %8.8" PRIx32 "", first_lvl_descriptor);
 
        if ((first_lvl_descriptor & 0x3) == 0)
        {
                *type = -1;
+               LOG_ERROR("Address translation failure");
                return ERROR_TARGET_TRANSLATION_FAULT;
        }
 
        if (!armv4_5_mmu->has_tiny_pages && ((first_lvl_descriptor & 0x3) == 3))
        {
                *type = -1;
+               LOG_ERROR("Address translation failure");
                return ERROR_TARGET_TRANSLATION_FAULT;
        }
 
@@ -74,22 +76,24 @@ u32 armv4_5_mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu
                /* coarse page table */
                armv4_5_mmu_read_physical(target, armv4_5_mmu,
                        (first_lvl_descriptor & 0xfffffc00) | ((va & 0x000ff000) >> 10),
-                       4, 1, (u8*)&second_lvl_descriptor);
+                       4, 1, (uint8_t*)&second_lvl_descriptor);
        }
-
-       if ((first_lvl_descriptor & 0x3) == 3)
+       else if ((first_lvl_descriptor & 0x3) == 3)
        {
                /* fine page table */
                armv4_5_mmu_read_physical(target, armv4_5_mmu,
                        (first_lvl_descriptor & 0xfffff000) | ((va & 0x000ffc00) >> 8),
-                       4, 1, (u8*)&second_lvl_descriptor);
+                       4, 1, (uint8_t*)&second_lvl_descriptor);
        }
 
-       DEBUG("2nd lvl desc: %8.8x", first_lvl_descriptor);
+       second_lvl_descriptor = target_buffer_get_u32(target, (uint8_t*)&second_lvl_descriptor);
+
+       LOG_DEBUG("2nd lvl desc: %8.8" PRIx32 "", second_lvl_descriptor);
 
        if ((second_lvl_descriptor & 0x3) == 0)
        {
                *type = -1;
+               LOG_ERROR("Address translation failure");
                return ERROR_TARGET_TRANSLATION_FAULT;
        }
 
@@ -122,10 +126,11 @@ u32 armv4_5_mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu
 
        /* should not happen */
        *type = -1;
+       LOG_ERROR("Address translation failure");
        return ERROR_TARGET_TRANSLATION_FAULT;
 }
 
-int armv4_5_mmu_read_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 address, u32 size, u32 count, u8 *buffer)
+int armv4_5_mmu_read_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
        int retval;
 
@@ -145,7 +150,7 @@ int armv4_5_mmu_read_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mm
        return retval;
 }
 
-int armv4_5_mmu_write_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 address, u32 size, u32 count, u8 *buffer)
+int armv4_5_mmu_write_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
        int retval;
 
@@ -154,26 +159,26 @@ int armv4_5_mmu_write_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_m
 
        /* disable MMU and data (or unified) cache */
        armv4_5_mmu->disable_mmu_caches(target, 1, 1, 0);
-       
+
        retval = armv4_5_mmu->write_memory(target, address, size, count, buffer);
 
        /* reenable MMU / cache */
        armv4_5_mmu->enable_mmu_caches(target, armv4_5_mmu->mmu_enabled,
                armv4_5_mmu->armv4_5_cache.d_u_cache_enabled,
                armv4_5_mmu->armv4_5_cache.i_cache_enabled);
-       
+
        return retval;
 }
 
 int armv4_5_mmu_handle_virt2phys_command(command_context_t *cmd_ctx, char *cmd, char **args, int argc, target_t *target, armv4_5_mmu_common_t *armv4_5_mmu)
 {
-       u32 va;
-       u32 pa;
+       uint32_t va;
+       uint32_t pa;
        int type;
-       u32 cb;
+       uint32_t cb;
        int domain;
-       u32 ap;
-       
+       uint32_t ap;
+
        if (target->state != TARGET_HALTED)
        {
                command_print(cmd_ctx, "target must be stopped for \"virt2phys\" command");
@@ -195,18 +200,18 @@ int armv4_5_mmu_handle_virt2phys_command(command_context_t *cmd_ctx, char *cmd,
                        switch (pa)
                        {
                                case ERROR_TARGET_TRANSLATION_FAULT:
-                                       command_print(cmd_ctx, "no valid translation for 0x%8.8x", va);
+                                       command_print(cmd_ctx, "no valid translation for 0x%8.8" PRIx32 "", va);
                                        break;
                                default:
                                        command_print(cmd_ctx, "unknown translation error");
                        }
                        return ERROR_OK;
                }
-       
-               command_print(cmd_ctx, "0x%8.8x -> 0x%8.8x, type: %s, cb: %i, domain: %i, ap: %2.2x",
-                       va, pa, armv4_5_mmu_page_type_names[type], cb, domain, ap);
-       }                       
-       
+
+               command_print(cmd_ctx, "0x%8.8" PRIx32 " -> 0x%8.8" PRIx32 ", type: %s, cb: %i, domain: %d, ap: %2.2x",
+                             va, pa, armv4_5_mmu_page_type_names[type], (int)cb, domain, (int)ap);
+       }
+
        return ERROR_OK;
 }
 
@@ -214,7 +219,7 @@ int armv4_5_mmu_handle_md_phys_command(command_context_t *cmd_ctx, char *cmd, ch
 {
        int count = 1;
        int size = 4;
-       u32 address = 0;
+       uint32_t address = 0;
        int i;
 
        char output[128];
@@ -222,7 +227,7 @@ int armv4_5_mmu_handle_md_phys_command(command_context_t *cmd_ctx, char *cmd, ch
 
        int retval;
 
-       u8 *buffer;
+       uint8_t *buffer;
 
        if (target->state != TARGET_HALTED)
        {
@@ -263,7 +268,7 @@ int armv4_5_mmu_handle_md_phys_command(command_context_t *cmd_ctx, char *cmd, ch
                                break;
                        case ERROR_TARGET_NOT_HALTED:
                                command_print(cmd_ctx, "error: target must be halted for memory accesses");
-                               break;                  
+                               break;
                        case ERROR_TARGET_DATA_ABORT:
                                command_print(cmd_ctx, "error: access caused data abort, system possibly corrupted");
                                break;
@@ -277,38 +282,39 @@ int armv4_5_mmu_handle_md_phys_command(command_context_t *cmd_ctx, char *cmd, ch
        for (i = 0; i < count; i++)
        {
                if (i%8 == 0)
-                       output_len += snprintf(output + output_len, 128 - output_len, "0x%8.8x: ", address + (i*size));
-               
+                       output_len += snprintf(output + output_len, 128 - output_len, "0x%8.8" PRIx32 ": ", address + (i*size));
+
                switch (size)
                {
                        case 4:
-                               output_len += snprintf(output + output_len, 128 - output_len, "%8.8x ", ((u32*)buffer)[i]);
+                               output_len += snprintf(output + output_len, 128 - output_len, "%8.8" PRIx32 " ", target_buffer_get_u32(target, &buffer[i*4]));
                                break;
                        case 2:
-                               output_len += snprintf(output + output_len, 128 - output_len, "%4.4x ", ((u16*)buffer)[i]);
+                               output_len += snprintf(output + output_len, 128 - output_len, "%4.4x ", target_buffer_get_u16(target, &buffer[i*2]));
                                break;
                        case 1:
-                               output_len += snprintf(output + output_len, 128 - output_len, "%2.2x ", ((u8*)buffer)[i]);
+                               output_len += snprintf(output + output_len, 128 - output_len, "%2.2x ", buffer[i*1]);
                                break;
                }
 
-               if ((i%8 == 7) || (i == count - 1))
+               if ((i % 8 == 7) || (i == count - 1))
                {
-                       command_print(cmd_ctx, output);
+                       command_print(cmd_ctx, "%s", output);
                        output_len = 0;
                }
        }
 
        free(buffer);
-       
+
        return ERROR_OK;
 }
 
 int armv4_5_mmu_handle_mw_phys_command(command_context_t *cmd_ctx, char *cmd, char **args, int argc, target_t *target, armv4_5_mmu_common_t *armv4_5_mmu)
 {
-       u32 address = 0;
-       u32 value = 0;
+       uint32_t address = 0;
+       uint32_t value = 0;
        int retval;
+       uint8_t value_buf[4];
 
        if (target->state != TARGET_HALTED)
        {
@@ -325,13 +331,16 @@ int armv4_5_mmu_handle_mw_phys_command(command_context_t *cmd_ctx, char *cmd, ch
        switch (cmd[2])
        {
                case 'w':
-                       retval = armv4_5_mmu_write_physical(target, armv4_5_mmu, address, 4, 1, (u8*)&value);
+                       target_buffer_set_u32(target, value_buf, value);
+                       retval = armv4_5_mmu_write_physical(target, armv4_5_mmu, address, 4, 1, value_buf);
                        break;
                case 'h':
-                       retval = armv4_5_mmu_write_physical(target, armv4_5_mmu, address, 2, 1, (u8*)&value);
+                       target_buffer_set_u16(target, value_buf, value);
+                       retval = armv4_5_mmu_write_physical(target, armv4_5_mmu, address, 2, 1, value_buf);
                        break;
                case 'b':
-                       retval = armv4_5_mmu_write_physical(target, armv4_5_mmu, address, 1, 1, (u8*)&value);
+                       value_buf[0] = value;
+                       retval = armv4_5_mmu_write_physical(target, armv4_5_mmu, address, 1, 1, value_buf);
                        break;
                default:
                        return ERROR_OK;
@@ -352,7 +361,7 @@ int armv4_5_mmu_handle_mw_phys_command(command_context_t *cmd_ctx, char *cmd, ch
                        break;
                default:
                        command_print(cmd_ctx, "error: unknown error");
-       }       
+       }
 
        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)