nrf51: Implement the support for Nordic's nRF51 devices

[fw/openocd] / src / rtos / linux.c

diff --git a/src/rtos/linux.c b/src/rtos/linux.c
index 9c955972a8469b056e168d0c0883e947739a725f..b98cf453157a08ff1895b09ce17590b6a0f2aad2 100644 (file)
--- a/src/rtos/linux.c
+++ b/src/rtos/linux.c
@@ -16,7 +16,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -140,9 +140,9 @@ static int linux_read_memory(struct target *target,
                return ERROR_FAIL;
        }
 #ifdef PHYS
-       target->type->read_phys_memory(target, pa, size, count, buffer);
+       target_read_phys_memory(target, pa, size, count, buffer);
 #endif
-       target->type->read_memory(target, address, size, count, buffer);
+       target_read_memory(target, address, size, count, buffer);
        return ERROR_OK;
 }
 
@@ -160,7 +160,7 @@ int fill_buffer(struct target *target, uint32_t addr, uint8_t *buffer)
 {
 
        if ((addr & 0xfffffffc) != addr)
-               LOG_INFO("unaligned address %x!!", addr);
+               LOG_INFO("unaligned address %" PRIx32 "!!", addr);
 
        int retval = linux_read_memory(target, addr, 4, 1, buffer);
        return retval;
@@ -217,7 +217,7 @@ static int linux_os_thread_reg_list(struct rtos *rtos,
                if (found == 0) {
                        LOG_ERROR
                        (
-                               "current thread %" PRIx64 ": no target to perform access of core id %x",
+                               "current thread %" PRIx64 ": no target to perform access of core id %" PRIx32,
                                thread_id,
                                next->core_id);
                        return ERROR_FAIL;
@@ -226,7 +226,8 @@ static int linux_os_thread_reg_list(struct rtos *rtos,
                /*LOG_INFO("thread %lx current on core %x",thread_id,
                 * target->coreid);*/
                retval =
-                       target_get_gdb_reg_list(target, &reg_list, &reg_list_size);
+                       target_get_gdb_reg_list(target, &reg_list, &reg_list_size,
+                                       REG_CLASS_GENERAL);
 
                if (retval != ERROR_OK)
                        return retval;
@@ -234,6 +235,8 @@ static int linux_os_thread_reg_list(struct rtos *rtos,
                for (i = 0; i < reg_list_size; i++)
                        reg_packet_size += reg_list[i]->size;
 
+               assert(reg_packet_size > 0);
+
                *hex_reg_list = malloc(DIV_ROUND_UP(reg_packet_size, 8) * 2);
 
                hex_string = *hex_reg_list;
@@ -496,7 +499,7 @@ int get_current(struct target *target, int create)
                int retval;
 
                if (target_get_gdb_reg_list(head->target, &reg_list,
-                               &reg_list_size) != ERROR_OK) {
+                               &reg_list_size, REG_CLASS_GENERAL) != ERROR_OK) {
                        free(buffer);
                        return ERROR_TARGET_FAILURE;
                }
@@ -530,7 +533,7 @@ int get_current(struct target *target, int create)
                                        LOG_ERROR
                                                ("error in linux current thread update");
 
-                               if (create) {
+                               if (create && ct) {
                                        struct threads *t;
                                        t = calloc(1, sizeof(struct threads));
                                        t->base_addr = ct->TS;
@@ -1137,13 +1140,12 @@ int linux_gdb_thread_packet(struct target *target,
        char *tmp_str = out_str;
        tmp_str += sprintf(tmp_str, "m");
        struct threads *temp = linux_os->thread_list;
-       tmp_str += sprintf(tmp_str, "%016" PRIx64, temp->threadid);
-       temp = temp->next;
 
        while (temp != NULL) {
-               tmp_str += sprintf(tmp_str, ",");
                tmp_str += sprintf(tmp_str, "%016" PRIx64, temp->threadid);
                temp = temp->next;
+               if (temp)
+                       tmp_str += sprintf(tmp_str, ",");
        }
 
        gdb_put_packet(connection, out_str, strlen(out_str));
@@ -1217,7 +1219,7 @@ int linux_thread_extra_info(struct target *target,
                        char *tmp_str = (char *)calloc(1, str_size + 50);
                        char *tmp_str_ptr = tmp_str;
 
-                       /*  discriminate cuurent task */
+                       /*  discriminate current task */
                        if (temp->status == 3)
                                tmp_str_ptr += sprintf(tmp_str_ptr, "%s",
                                                pid_current);
@@ -1229,10 +1231,9 @@ int linux_thread_extra_info(struct target *target,
                        tmp_str_ptr += sprintf(tmp_str_ptr, "%s", " | ");
                        sprintf(tmp_str_ptr, "%s", name);
                        sprintf(tmp_str_ptr, "%s", temp->name);
-                       char *hex_str =
-                               (char *)calloc(1, strlen(tmp_str) * 2 + 1);
-                       str_to_hex(hex_str, tmp_str);
-                       gdb_put_packet(connection, hex_str, strlen(hex_str));
+                       char *hex_str = (char *)calloc(1, strlen(tmp_str) * 2 + 1);
+                       int pkt_len = hexify(hex_str, tmp_str, 0, strlen(tmp_str) * 2 + 1);
+                       gdb_put_packet(connection, hex_str, pkt_len);
                        free(hex_str);
                        free(tmp_str);
                        return ERROR_OK;
@@ -1523,7 +1524,7 @@ static int linux_os_create(struct target *target)
        os_linux->threads_needs_update = 0;
        os_linux->threadid_count = 1;
        os_linux->current_threads = NULL;
-       target->rtos->rtos_specific_params = (void *)os_linux;
+       target->rtos->rtos_specific_params = os_linux;
        ct->core_id = target->coreid;
        ct->threadid = -1;
        ct->TS = 0xdeadbeef;
@@ -1570,14 +1571,14 @@ static char *linux_ps_command(struct target *target)
                                if (temp->context)
                                        tmp +=
                                                sprintf(tmp,
-                                                       "%d\t\t%d\t\t%x\t\t%s\n",
-                                                       (int)temp->pid, temp->oncpu,
+                                                       "%" PRId32 "\t\t%" PRId32 "\t\t%" PRIx32 "\t\t%s\n",
+                                                       temp->pid, temp->oncpu,
                                                        temp->asid, temp->name);
                                else
                                        tmp +=
                                                sprintf(tmp,
-                                                       "%d\t\t%d\t\t%x\t\t%s\n",
-                                                       (int)temp->pid, temp->oncpu,
+                                                       "%" PRId32 "\t\t%" PRId32 "\t\t%" PRIx32 "\t\t%s\n",
+                                                       temp->pid, temp->oncpu,
                                                        temp->asid, temp->name);
                        }