duan ellis target tcl work in progress

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

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 7cca55de61f375cb602ff1d2f6b5c1f761a78356..599b2159548fa3b9e079bf2cb513fb7f5d036772 100644 (file)
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -119,8 +119,9 @@ int mips_m4k_debug_entry(target_t *target)
        
        mips32_save_context(target);
        
-       LOG_DEBUG("entered debug state at PC 0x%x, target->state: %s", \
-               *(u32*)(mips32->core_cache->reg_list[MIPS32_PC].value), target_state_strings[target->state]);
+       LOG_DEBUG("entered debug state at PC 0x%x, target->state: %s", 
+               *(u32*)(mips32->core_cache->reg_list[MIPS32_PC].value), 
+                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
        
        return ERROR_OK;
 }
@@ -187,7 +188,8 @@ int mips_m4k_halt(struct target_s *target)
        mips32_common_t *mips32 = target->arch_info;
        mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
        
-       LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
+       LOG_DEBUG("target->state: %s", 
+                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
        
        if (target->state == TARGET_HALTED)
        {
@@ -231,7 +233,8 @@ int mips_m4k_assert_reset(target_t *target)
        mips32_common_t *mips32 = target->arch_info;
        mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
        
-       LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
+       LOG_DEBUG("target->state: %s", 
+                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
        
        if (!(jtag_reset_config & RESET_HAS_SRST))
        {
@@ -279,7 +282,8 @@ int mips_m4k_assert_reset(target_t *target)
 
 int mips_m4k_deassert_reset(target_t *target)
 {
-       LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
+       LOG_DEBUG("target->state: %s", 
+                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
        
        /* deassert reset lines */
        jtag_add_reset(0, 0);