target: Add 64-bit target address support

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

diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c
index e2b40c4c65bd448ebbb084a132810a6e3b4eab9c..5456e8cca27df87495baeee88088c2bf964cf155 100644 (file)
--- a/src/target/mips32_pracc.c
+++ b/src/target/mips32_pracc.c
@@ -20,9 +20,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 /*
@@ -88,7 +86,7 @@ struct mips32_pracc_context {
 static int wait_for_pracc_rw(struct mips_ejtag *ejtag_info, uint32_t *ctrl)
 {
        uint32_t ejtag_ctrl;
-       long long then = timeval_ms();
+       int64_t then = timeval_ms();
 
        /* wait for the PrAcc to become "1" */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
@@ -102,7 +100,7 @@ static int wait_for_pracc_rw(struct mips_ejtag *ejtag_info, uint32_t *ctrl)
                if (ejtag_ctrl & EJTAG_CTRL_PRACC)
                        break;
 
-               int timeout = timeval_ms() - then;
+               int64_t timeout = timeval_ms() - then;
                if (timeout > 1000) {
                        LOG_DEBUG("DEBUGMODULE: No memory access in progress!");
                        return ERROR_JTAG_DEVICE_ERROR;
@@ -160,19 +158,22 @@ int mips32_pracc_clean_text_jump(struct mips_ejtag *ejtag_info)
                        return retval;
        }
 
-       if (ejtag_info->mode != 0)      /* done, queued mode won't work with lexra cores */
+       if (ejtag_info->mode != 0)      /* async mode support only for MIPS ... */
                return ERROR_OK;
 
-       retval = mips32_pracc_read_ctrl_addr(ejtag_info);
-       if (retval != ERROR_OK)
-               return retval;
-
-       if (ejtag_info->pa_addr != MIPS32_PRACC_TEXT) {                 /* LEXRA/BMIPS ?, shift out another NOP */
-               mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
-               mips_ejtag_drscan_32_out(ejtag_info, MIPS32_NOP);
-               retval = mips32_pracc_finish(ejtag_info);
+       for (int i = 0; i != 2; i++) {
+               retval = mips32_pracc_read_ctrl_addr(ejtag_info);
                if (retval != ERROR_OK)
                        return retval;
+
+               if (ejtag_info->pa_addr != MIPS32_PRACC_TEXT) {         /* LEXRA/BMIPS ?, shift out another NOP, max 2 */
+                       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
+                       mips_ejtag_drscan_32_out(ejtag_info, MIPS32_NOP);
+                       retval = mips32_pracc_finish(ejtag_info);
+                       if (retval != ERROR_OK)
+                               return retval;
+               } else
+                       break;
        }
 
        return ERROR_OK;
@@ -212,7 +213,7 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_info *ct
                if (ejtag_info->pa_ctrl & EJTAG_CTRL_PRNW) {                                            /* write/store access */
                        /* Check for pending store from a previous store instruction at dmseg */
                        if (store_pending == 0) {
-                               LOG_DEBUG("unexpected write at address %x", ejtag_info->pa_addr);
+                               LOG_DEBUG("unexpected write at address %" PRIx32, ejtag_info->pa_addr);
                                if (code_count < 2) {   /* allow for restart */
                                        restart = 1;
                                        continue;
@@ -222,7 +223,7 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_info *ct
                                /* check address */
                                if (ejtag_info->pa_addr < MIPS32_PRACC_PARAM_OUT || ejtag_info->pa_addr > max_store_addr) {
 
-                                       LOG_DEBUG("writing at unexpected address %x", ejtag_info->pa_addr);
+                                       LOG_DEBUG("writing at unexpected address %" PRIx32, ejtag_info->pa_addr);
                                        return ERROR_JTAG_DEVICE_ERROR;
                                }
                        }
@@ -241,7 +242,7 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_info *ct
                         if (!final_check) {                    /* executing function code */
                                /* check address */
                                if (ejtag_info->pa_addr != (MIPS32_PRACC_TEXT + code_count * 4)) {
-                                       LOG_DEBUG("reading at unexpected address %x, expected %x",
+                                       LOG_DEBUG("reading at unexpected address %" PRIx32 ", expected %x",
                                                        ejtag_info->pa_addr, MIPS32_PRACC_TEXT + code_count * 4);
 
                                        /* restart code execution only in some cases */
@@ -283,7 +284,7 @@ int mips32_pracc_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_info *ct
                                        }
                                } else {
                                        if (ejtag_info->pa_addr != (MIPS32_PRACC_TEXT + code_count * 4)) {
-                                               LOG_DEBUG("unexpected read address in final check: %x, expected: %x",
+                                               LOG_DEBUG("unexpected read address in final check: %" PRIx32 ", expected: %x",
                                                          ejtag_info->pa_addr, MIPS32_PRACC_TEXT + code_count * 4);
                                                return ERROR_JTAG_DEVICE_ERROR;
                                        }
@@ -1034,7 +1035,7 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are
                ejtag_info->fast_access_save = write_t;
        }
 
-       LOG_DEBUG("%s using 0x%.8" PRIx32 " for write handler", __func__, source->address);
+       LOG_DEBUG("%s using 0x%.8" TARGET_PRIxADDR " for write handler", __func__, source->address);
 
        jmp_code[0] |= UPPER16(source->address);
        jmp_code[1] |= LOWER16(source->address);