target: Add 64-bit target address support

[openocd] / src / target / nds32_v3m.c

diff --git a/src/target/nds32_v3m.c b/src/target/nds32_v3m.c
index d72d986915fb0246caf49b73a20c354eb1e146c0..86903a51ba6ee75e61ef6884ed03b79aaea6da06 100644 (file)
--- a/src/target/nds32_v3m.c
+++ b/src/target/nds32_v3m.c
@@ -13,9 +13,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/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -52,7 +50,7 @@ static int nds32_v3m_activate_hardware_breakpoint(struct target *target)
                                /* enable breakpoint (physical address) */
                                aice_write_debug_reg(aice, NDS_EDM_SR_BPC0 + brp_num, 0xA);
 
-                       LOG_DEBUG("Add hardware BP %d at %08" PRIx32, brp_num,
+                       LOG_DEBUG("Add hardware BP %u at %08" TARGET_PRIxADDR, brp_num,
                                        bp->address);
 
                        brp_num--;
@@ -80,7 +78,7 @@ static int nds32_v3m_deactivate_hardware_breakpoint(struct target *target)
                else
                        return ERROR_FAIL;
 
-               LOG_DEBUG("Remove hardware BP %d at %08" PRIx32, brp_num,
+               LOG_DEBUG("Remove hardware BP %u at %08" TARGET_PRIxADDR, brp_num,
                                bp->address);
 
                brp_num--;
@@ -127,9 +125,8 @@ static int nds32_v3m_activate_hardware_watchpoint(struct target *target)
                        /* enable watchpoint */
                        aice_write_debug_reg(aice, NDS_EDM_SR_BPC0 + wp_num, wp_config);
 
-                       LOG_DEBUG("Add hardware wathcpoint %d at %08" PRIx32
-                                       " mask %08" PRIx32, wp_num,
-                                       wp->address, wp->mask);
+                       LOG_DEBUG("Add hardware watchpoint %" PRId32 " at %08" TARGET_PRIxADDR
+                                       " mask %08" PRIx32, wp_num, wp->address, wp->mask);
 
                        wp_num++;
                } else if (nds32_v3m->nds32.global_stop) {
@@ -169,9 +166,8 @@ static int nds32_v3m_deactivate_hardware_watchpoint(struct target *target)
                        /* disable watchpoint */
                        aice_write_debug_reg(aice, NDS_EDM_SR_BPC0 + wp_num, 0x0);
 
-                       LOG_DEBUG("Remove hardware wathcpoint %d at %08" PRIx32
-                                       " mask %08" PRIx32, wp_num,
-                                       wp->address, wp->mask);
+                       LOG_DEBUG("Remove hardware watchpoint %" PRId32 " at %08" TARGET_PRIxADDR
+                                       " mask %08" PRIx32, wp_num, wp->address, wp->mask);
                        wp_num++;
                } else if (nds32_v3m->nds32.global_stop) {
                        clean_global_stop = true;
@@ -198,7 +194,7 @@ static int nds32_v3m_check_interrupt_stack(struct nds32 *nds32)
        nds32->current_interrupt_level = (val_ir0 >> 1) & 0x3;
 
        if (nds32_reach_max_interrupt_level(nds32))
-               LOG_ERROR("<-- TARGET ERROR! Reaching the max interrupt stack level %d. -->",
+               LOG_ERROR("<-- TARGET ERROR! Reaching the max interrupt stack level %" PRIu32 ". -->",
                                nds32->current_interrupt_level);
 
        /* backup $ir6 to avoid suppressed exception overwrite */
@@ -235,10 +231,7 @@ static int nds32_v3m_deassert_reset(struct target *target)
                retval = target_halt(target);
                if (retval != ERROR_OK)
                        return retval;
-               /* call target_poll() to avoid "Halt timed out" */
-               CHECK_RETVAL(target_poll(target));
-       } else {
-               jtag_poll_set_enabled(false);
+
        }
 
        return ERROR_OK;
@@ -257,11 +250,11 @@ static int nds32_v3m_add_breakpoint(struct target *target,
                        LOG_WARNING("<-- TARGET WARNING! Insert too many "
                                        "hardware breakpoints/watchpoints! "
                                        "The limit of combined hardware "
-                                       "breakpoints/watchpoints is %d. -->",
+                                       "breakpoints/watchpoints is %" PRId32 ". -->",
                                        nds32_v3m->n_hbr);
                        LOG_WARNING("<-- TARGET STATUS: Inserted number of "
-                                       "hardware breakpoint: %d, hardware "
-                                       "watchpoints: %d. -->",
+                                       "hardware breakpoint: %" PRId32 ", hardware "
+                                       "watchpoints: %" PRId32 ". -->",
                                        nds32_v3m->n_hbr - nds32_v3m->next_hbr_index - 1,
                                        nds32_v3m->used_n_wp);
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
@@ -331,9 +324,9 @@ static int nds32_v3m_add_watchpoint(struct target *target,
 
                LOG_WARNING("<-- TARGET WARNING! Insert too many hardware "
                                "watchpoints! The limit of hardware watchpoints "
-                               "is %d. -->", nds32_v3m->n_hwp);
+                               "is %" PRId32 ". -->", nds32_v3m->n_hwp);
                LOG_WARNING("<-- TARGET STATUS: Inserted number of "
-                               "hardware watchpoint: %d. -->",
+                               "hardware watchpoint: %" PRId32 ". -->",
                                nds32_v3m->used_n_wp);
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
@@ -350,11 +343,11 @@ static int nds32_v3m_add_watchpoint(struct target *target,
 
                LOG_WARNING("<-- TARGET WARNING! Insert too many hardware "
                                "breakpoints/watchpoints! The limit of combined "
-                               "hardware breakpoints/watchpoints is %d. -->",
+                               "hardware breakpoints/watchpoints is %" PRId32 ". -->",
                                nds32_v3m->n_hbr);
                LOG_WARNING("<-- TARGET STATUS: Inserted number of "
-                               "hardware breakpoint: %d, hardware "
-                               "watchpoints: %d. -->",
+                               "hardware breakpoint: %" PRId32 ", hardware "
+                               "watchpoints: %" PRId32 ". -->",
                                nds32_v3m->n_hbr - nds32_v3m->next_hbr_index - 1,
                                nds32_v3m->used_n_wp);
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
@@ -449,9 +442,9 @@ static int nds32_v3m_examine(struct target *target)
        /* hardware watchpoint is inserted from low index to high index */
        nds32_v3m->next_hwp_index = 0;
 
-       LOG_INFO("%s: total hardware breakpoint %d (simple breakpoint %d)",
+       LOG_INFO("%s: total hardware breakpoint %" PRId32 " (simple breakpoint %" PRId32 ")",
                        target_name(target), nds32_v3m->n_hbr, nds32_v3m->n_hbr - nds32_v3m->n_hwp);
-       LOG_INFO("%s: total hardware watchpoint %d", target_name(target), nds32_v3m->n_hwp);
+       LOG_INFO("%s: total hardware watchpoint %" PRId32, target_name(target), nds32_v3m->n_hwp);
 
        nds32->target->state = TARGET_RUNNING;
        nds32->target->debug_reason = DBG_REASON_NOTHALTED;
@@ -476,7 +469,6 @@ struct target_type nds32_v3m_target = {
 
        .assert_reset = nds32_assert_reset,
        .deassert_reset = nds32_v3m_deassert_reset,
-       .soft_reset_halt = nds32_v3_soft_reset_halt,
 
        /* register access */
        .get_gdb_reg_list = nds32_get_gdb_reg_list,