Add RTOS memory read/write functions.

If not implemented, these specify to regular target read/write. However,
if individual threads in an RTOS can have different address translation
configured then the RTOS support can use this to do the right thing.

Use this in hwthread, where of course address translation can be set up
differently for different real cores.

Change-Id: I62c501cff1f863d855ee197dee7b73204ea8885a
Signed-off-by: Tim Newsome <tim@sifive.com>
Reviewed-on: http://openocd.zylin.com/6327
Tested-by: jenkins
Reviewed-by: Marc Schink <dev@zapb.de>
Reviewed-by: Jan Matyas <matyas@codasip.com>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>

diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c
index ce24086353a2398a34250b25f1c0296bd1f00dfd..dfa247f2c0a5551ac610bfa107103df28efaa4bc 100644 (file)
--- a/src/rtos/hwthread.c
+++ b/src/rtos/hwthread.c
@@ -38,6 +38,10 @@ static int hwthread_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
 static int hwthread_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]);
 static int hwthread_smp_init(struct target *target);
 static int hwthread_set_reg(struct rtos *rtos, uint32_t reg_num, uint8_t *reg_value);
+static int hwthread_read_buffer(struct rtos *rtos, target_addr_t address,
+               uint32_t size, uint8_t *buffer);
+static int hwthread_write_buffer(struct rtos *rtos, target_addr_t address,
+               uint32_t size, const uint8_t *buffer);
 
 #define HW_THREAD_NAME_STR_SIZE (32)
 
@@ -58,6 +62,8 @@ const struct rtos_type hwthread_rtos = {
        .get_symbol_list_to_lookup = hwthread_get_symbol_list_to_lookup,
        .smp_init = hwthread_smp_init,
        .set_reg = hwthread_set_reg,
+       .read_buffer = hwthread_read_buffer,
+       .write_buffer = hwthread_write_buffer,
 };
 
 struct hwthread_params {
@@ -396,3 +402,33 @@ static int hwthread_create(struct target *target)
        target->rtos->gdb_thread_packet = hwthread_thread_packet;
        return 0;
 }
+
+static int hwthread_read_buffer(struct rtos *rtos, target_addr_t address,
+               uint32_t size, uint8_t *buffer)
+{
+       if (!rtos)
+               return ERROR_FAIL;
+
+       struct target *target = rtos->target;
+
+       struct target *curr = hwthread_find_thread(target, rtos->current_thread);
+       if (!curr)
+               return ERROR_FAIL;
+
+       return target_read_buffer(curr, address, size, buffer);
+}
+
+static int hwthread_write_buffer(struct rtos *rtos, target_addr_t address,
+               uint32_t size, const uint8_t *buffer)
+{
+       if (!rtos)
+               return ERROR_FAIL;
+
+       struct target *target = rtos->target;
+
+       struct target *curr = hwthread_find_thread(target, rtos->current_thread);
+       if (!curr)
+               return ERROR_FAIL;
+
+       return target_write_buffer(curr, address, size, buffer);
+}

diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index 5fc958db20b52c1c27729674c58bc8fe5ffba489..2bc8910c237e9b95b9b1981291aff9eaf77f57c4 100644 (file)
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -679,3 +679,19 @@ void rtos_free_threadlist(struct rtos *rtos)
                rtos->current_thread = 0;
        }
 }
+
+int rtos_read_buffer(struct target *target, target_addr_t address,
+               uint32_t size, uint8_t *buffer)
+{
+       if (target->rtos->type->read_buffer)
+               return target->rtos->type->read_buffer(target->rtos, address, size, buffer);
+       return ERROR_NOT_IMPLEMENTED;
+}
+
+int rtos_write_buffer(struct target *target, target_addr_t address,
+               uint32_t size, const uint8_t *buffer)
+{
+       if (target->rtos->type->write_buffer)
+               return target->rtos->type->write_buffer(target->rtos, address, size, buffer);
+       return ERROR_NOT_IMPLEMENTED;
+}

diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h
index 20f7de775b48a96f7d3c383ebda1550fc05f8816..81751fe0a80ea2200478a4da7f085c82b522f237 100644 (file)
--- a/src/rtos/rtos.h
+++ b/src/rtos/rtos.h
@@ -82,6 +82,13 @@ struct rtos_type {
        int (*clean)(struct target *target);
        char * (*ps_command)(struct target *target);
        int (*set_reg)(struct rtos *rtos, uint32_t reg_num, uint8_t *reg_value);
+       /* Implement these if different threads in the RTOS can see memory
+        * differently (for instance because address translation might be different
+        * for each thread). */
+       int (*read_buffer)(struct rtos *rtos, target_addr_t address, uint32_t size,
+                       uint8_t *buffer);
+       int (*write_buffer)(struct rtos *rtos, target_addr_t address, uint32_t size,
+                       const uint8_t *buffer);
 };
 
 struct stack_register_offset {
@@ -127,5 +134,9 @@ void rtos_free_threadlist(struct rtos *rtos);
 int rtos_smp_init(struct target *target);
 /*  function for handling symbol access */
 int rtos_qsymbol(struct connection *connection, char const *packet, int packet_size);
+int rtos_read_buffer(struct target *target, target_addr_t address,
+               uint32_t size, uint8_t *buffer);
+int rtos_write_buffer(struct target *target, target_addr_t address,
+               uint32_t size, const uint8_t *buffer);
 
 #endif /* OPENOCD_RTOS_RTOS_H */

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index d0586d1706e89ded317c5845ab2e180efe1a3528..9ac982f6ca20b07fd79f4bf654ba71e3a6cc4e3e 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -1494,7 +1494,11 @@ static int gdb_read_memory_packet(struct connection *connection,
 
        LOG_DEBUG("addr: 0x%16.16" PRIx64 ", len: 0x%8.8" PRIx32 "", addr, len);
 
-       retval = target_read_buffer(target, addr, len, buffer);
+       retval = ERROR_NOT_IMPLEMENTED;
+       if (target->rtos)
+               retval = rtos_read_buffer(target, addr, len, buffer);
+       if (retval == ERROR_NOT_IMPLEMENTED)
+               retval = target_read_buffer(target, addr, len, buffer);
 
        if ((retval != ERROR_OK) && !gdb_report_data_abort) {
                /* TODO : Here we have to lie and send back all zero's lest stack traces won't work.
@@ -1565,7 +1569,11 @@ static int gdb_write_memory_packet(struct connection *connection,
        if (unhexify(buffer, separator, len) != len)
                LOG_ERROR("unable to decode memory packet");
 
-       retval = target_write_buffer(target, addr, len, buffer);
+       retval = ERROR_NOT_IMPLEMENTED;
+       if (target->rtos)
+               retval = rtos_write_buffer(target, addr, len, buffer);
+       if (retval == ERROR_NOT_IMPLEMENTED)
+               retval = target_write_buffer(target, addr, len, buffer);
 
        if (retval == ERROR_OK)
                gdb_put_packet(connection, "OK", 2);
@@ -1634,7 +1642,12 @@ static int gdb_write_memory_binary_packet(struct connection *connection,
        if (len) {
                LOG_DEBUG("addr: 0x%" PRIx64 ", len: 0x%8.8" PRIx32 "", addr, len);
 
-               retval = target_write_buffer(target, addr, len, (uint8_t *)separator);
+               retval = ERROR_NOT_IMPLEMENTED;
+               if (target->rtos)
+                       retval = rtos_write_buffer(target, addr, len, (uint8_t *)separator);
+               if (retval == ERROR_NOT_IMPLEMENTED)
+                       retval = target_write_buffer(target, addr, len, (uint8_t *)separator);
+
                if (retval != ERROR_OK)
                        gdb_connection->mem_write_error = true;
        }