Stop GDB when polling fails, srst assert or powerdropout is detected

[openocd.git] / src / target / arm11_dbgtap.c

diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 82612598d29fef0f60c877a91ca2fd252d8dcf2d..54e7ae658168bc89e3da708fb7caf9e9c52208bb 100644 (file)
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -386,7 +386,8 @@ int arm11_run_instr_no_data(arm11_common_t * arm11, uint32_t * opcode, size_t co
                        if (flag)
                                break;
 
-                       long long then;
+                       long long then = 0;
+
                        if (i == 1000)
                        {
                                then = timeval_ms();
@@ -465,7 +466,8 @@ int arm11_run_instr_data_to_core(arm11_common_t * arm11, uint32_t opcode, uint32
 
                        JTAG_DEBUG("DTR  Ready %d  nRetry %d", Ready, nRetry);
 
-                       long long then;
+                       long long then = 0;
+
                        if (i == 1000)
                        {
                                then = timeval_ms();
@@ -499,7 +501,8 @@ int arm11_run_instr_data_to_core(arm11_common_t * arm11, uint32_t opcode, uint32
 
                JTAG_DEBUG("DTR  Data %08x  Ready %d  nRetry %d", Data, Ready, nRetry);
 
-               long long then;
+               long long then = 0;
+
                if (i == 1000)
                {
                        then = timeval_ms();
@@ -573,7 +576,15 @@ int arm11_run_instr_data_to_core_noack(arm11_common_t * arm11, uint32_t opcode,
        arm11_setup_field(arm11,  1,    NULL,                   NULL /*&Ready*/,        chain5_fields + 1);
        arm11_setup_field(arm11,  1,    NULL,                   NULL,                           chain5_fields + 2);
 
-       uint8_t                 Readies[count + 1];
+       uint8_t                 *Readies;
+       int bytes = sizeof(*Readies)*(count + 1);
+       Readies = (uint8_t *) malloc(bytes);
+       if (Readies == NULL)
+       {
+               LOG_ERROR("Out of memory allocating %d bytes", bytes);
+               return ERROR_FAIL;
+       }
+
        uint8_t *               ReadyPos                        = Readies;
 
        while (count--)
@@ -600,22 +611,28 @@ int arm11_run_instr_data_to_core_noack(arm11_common_t * arm11, uint32_t opcode,
 
        arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
 
-       CHECK_RETVAL(jtag_execute_queue());
+       int retval = jtag_execute_queue();
+       if (retval == ERROR_OK)
+       {
 
-       size_t error_count = 0;
+               size_t error_count = 0;
 
-       for (size_t i = 0; i < asizeof(Readies); i++)
-       {
-               if (Readies[i] != 1)
+               for (size_t i = 0; i < asizeof(Readies); i++)
                {
-                       error_count++;
+                       if (Readies[i] != 1)
+                       {
+                               error_count++;
+                       }
                }
+
+               if (error_count)
+                       LOG_ERROR("Transfer errors " ZU, error_count);
+
        }
 
-       if (error_count)
-               LOG_ERROR("Transfer errors " ZU, error_count);
+       free(Readies);
 
-       return ERROR_OK;
+       return retval;
 }
 
 
@@ -678,7 +695,8 @@ int arm11_run_instr_data_from_core(arm11_common_t * arm11, uint32_t opcode, uint
 
                        JTAG_DEBUG("DTR  Data %08x  Ready %d  nRetry %d", Data, Ready, nRetry);
 
-                       long long then;
+                       long long then = 0;
+
                        if (i == 1000)
                        {
                                then = timeval_ms();