]> www.infradead.org Git - users/borneoa/openocd-next.git/commitdiff
target: Use 'bool' data type in target_{step,resume}
authorMarc Schink <dev@zapb.de>
Thu, 10 Oct 2024 15:07:20 +0000 (17:07 +0200)
committerAntonio Borneo <borneo.antonio@gmail.com>
Sat, 22 Feb 2025 18:37:01 +0000 (18:37 +0000)
While at it, adapt data types of related functions and fix some coding
style issues.

Change-Id: I74db9258fc17b1ee8aa446f35ae722ea7c2f67e6
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: https://review.openocd.org/c/openocd/+/8524
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Tested-by: jenkins
44 files changed:
src/server/gdb_server.c
src/target/aarch64.c
src/target/arc.c
src/target/arm11.c
src/target/arm7_9_common.c
src/target/arm7_9_common.h
src/target/arm_semihosting.c
src/target/armv4_5.c
src/target/armv7m.c
src/target/avr32_ap7k.c
src/target/avrt.c
src/target/cortex_a.c
src/target/cortex_m.c
src/target/dsp563xx.c
src/target/dsp5680xx.c
src/target/esirisc.c
src/target/espressif/esp32.c
src/target/espressif/esp32_apptrace.c
src/target/espressif/esp32s2.c
src/target/espressif/esp32s3.c
src/target/espressif/esp_xtensa.c
src/target/espressif/esp_xtensa_smp.c
src/target/espressif/esp_xtensa_smp.h
src/target/feroceon.c
src/target/hla_target.c
src/target/lakemont.c
src/target/lakemont.h
src/target/ls1_sap.c
src/target/mem_ap.c
src/target/mips32.c
src/target/mips_m4k.c
src/target/mips_mips64.c
src/target/openrisc/or1k.c
src/target/quark_d20xx.c
src/target/riscv/riscv-011.c
src/target/riscv/riscv.c
src/target/riscv/riscv.h
src/target/stm8.c
src/target/target.c
src/target/target.h
src/target/target_type.h
src/target/xscale.c
src/target/xtensa/xtensa.c
src/target/xtensa/xtensa.h

index c572f392a93e0d945f1d77c13012fabd654d1725..1866de0b561d4ca04d5f85d7b7545de819682169 100644 (file)
@@ -909,7 +909,7 @@ static void gdb_fileio_reply(struct target *target, struct connection *connectio
 
                /* encounter unknown syscall, continue */
                gdb_connection->frontend_state = TARGET_RUNNING;
-               target_resume(target, 1, 0x0, 0, 0);
+               target_resume(target, true, 0x0, false, false);
                return;
        }
 
@@ -919,7 +919,7 @@ static void gdb_fileio_reply(struct target *target, struct connection *connectio
        if (program_exited) {
                /* Use target_resume() to let target run its own exit syscall handler. */
                gdb_connection->frontend_state = TARGET_RUNNING;
-               target_resume(target, 1, 0x0, 0, 0);
+               target_resume(target, true, 0x0, false, false);
        } else {
                gdb_connection->frontend_state = TARGET_HALTED;
                rtos_update_threads(target);
@@ -1704,7 +1704,7 @@ static int gdb_step_continue_packet(struct connection *connection,
                char const *packet, int packet_size)
 {
        struct target *target = get_target_from_connection(connection);
-       int current = 0;
+       bool current = false;
        uint64_t address = 0x0;
        int retval = ERROR_OK;
 
@@ -1713,17 +1713,17 @@ static int gdb_step_continue_packet(struct connection *connection,
        if (packet_size > 1)
                address = strtoull(packet + 1, NULL, 16);
        else
-               current = 1;
+               current = true;
 
        gdb_running_type = packet[0];
        if (packet[0] == 'c') {
                LOG_DEBUG("continue");
                /* resume at current address, don't handle breakpoints, not debugging */
-               retval = target_resume(target, current, address, 0, 0);
+               retval = target_resume(target, current, address, false, false);
        } else if (packet[0] == 's') {
                LOG_DEBUG("step");
                /* step at current or address, don't handle breakpoints */
-               retval = target_step(target, current, address, 0);
+               retval = target_step(target, current, address, false);
        }
        return retval;
 }
@@ -3003,7 +3003,7 @@ static bool gdb_handle_vcont_packet(struct connection *connection, const char *p
                gdb_running_type = 'c';
                LOG_TARGET_DEBUG(target, "target continue");
                gdb_connection->output_flag = GDB_OUTPUT_ALL;
-               retval = target_resume(target, 1, 0, 0, 0);
+               retval = target_resume(target, true, 0, false, false);
                if (retval == ERROR_TARGET_NOT_HALTED)
                        LOG_TARGET_INFO(target, "target was not halted when resume was requested");
 
@@ -3031,7 +3031,7 @@ static bool gdb_handle_vcont_packet(struct connection *connection, const char *p
                bool fake_step = false;
 
                struct target *ct = target;
-               int current_pc = 1;
+               bool current_pc = true;
                int64_t thread_id;
                parse++;
                if (parse[0] == ':') {
@@ -3129,7 +3129,7 @@ static bool gdb_handle_vcont_packet(struct connection *connection, const char *p
                        return true;
                }
 
-               retval = target_step(ct, current_pc, 0, 0);
+               retval = target_step(ct, current_pc, 0, false);
                if (retval == ERROR_TARGET_NOT_HALTED)
                        LOG_TARGET_INFO(ct, "target was not halted when step was requested");
 
@@ -3457,9 +3457,9 @@ static int gdb_fileio_response_packet(struct connection *connection,
 
        /* After File-I/O ends, keep continue or step */
        if (gdb_running_type == 'c')
-               retval = target_resume(target, 1, 0x0, 0, 0);
+               retval = target_resume(target, true, 0x0, false, false);
        else if (gdb_running_type == 's')
-               retval = target_step(target, 1, 0x0, 0);
+               retval = target_step(target, true, 0x0, false);
        else
                retval = ERROR_FAIL;
 
index 3cc8130054bd4b5c2f6493f63235365027e539fb..609965ba55ff5fb7cc3928e537a67b48773c114c 100644 (file)
@@ -589,8 +589,8 @@ static int aarch64_halt(struct target *target)
        return aarch64_halt_one(target, HALT_SYNC);
 }
 
-static int aarch64_restore_one(struct target *target, int current,
-       uint64_t *address, int handle_breakpoints, int debug_execution)
+static int aarch64_restore_one(struct target *target, bool current,
+       uint64_t *address, bool handle_breakpoints, bool debug_execution)
 {
        struct armv8_common *armv8 = target_to_armv8(target);
        struct arm *arm = &armv8->arm;
@@ -602,7 +602,7 @@ static int aarch64_restore_one(struct target *target, int current,
        if (!debug_execution)
                target_free_all_working_areas(target);
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        resume_pc = buf_get_u64(arm->pc->value, 0, 64);
        if (!current)
                resume_pc = *address;
@@ -753,7 +753,8 @@ static int aarch64_restart_one(struct target *target, enum restart_mode mode)
 /*
  * prepare all but the current target for restart
  */
-static int aarch64_prep_restart_smp(struct target *target, int handle_breakpoints, struct target **p_first)
+static int aarch64_prep_restart_smp(struct target *target,
+               bool handle_breakpoints, struct target **p_first)
 {
        int retval = ERROR_OK;
        struct target_list *head;
@@ -772,7 +773,8 @@ static int aarch64_prep_restart_smp(struct target *target, int handle_breakpoint
                        continue;
 
                /*  resume at current address, not in step mode */
-               retval = aarch64_restore_one(curr, 1, &address, handle_breakpoints, 0);
+               retval = aarch64_restore_one(curr, true, &address, handle_breakpoints,
+                       false);
                if (retval == ERROR_OK)
                        retval = aarch64_prepare_restart_one(curr);
                if (retval != ERROR_OK) {
@@ -799,7 +801,7 @@ static int aarch64_step_restart_smp(struct target *target)
 
        LOG_DEBUG("%s", target_name(target));
 
-       retval = aarch64_prep_restart_smp(target, 0, &first);
+       retval = aarch64_prep_restart_smp(target, false, &first);
        if (retval != ERROR_OK)
                return retval;
 
@@ -864,8 +866,8 @@ static int aarch64_step_restart_smp(struct target *target)
        return retval;
 }
 
-static int aarch64_resume(struct target *target, int current,
-       target_addr_t address, int handle_breakpoints, int debug_execution)
+static int aarch64_resume(struct target *target, bool current,
+       target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        int retval = 0;
        uint64_t addr = address;
@@ -1113,8 +1115,8 @@ static int aarch64_post_debug_entry(struct target *target)
 /*
  * single-step a target
  */
-static int aarch64_step(struct target *target, int current, target_addr_t address,
-       int handle_breakpoints)
+static int aarch64_step(struct target *target, bool current, target_addr_t address,
+       bool handle_breakpoints)
 {
        struct armv8_common *armv8 = target_to_armv8(target);
        struct aarch64_common *aarch64 = target_to_aarch64(target);
@@ -1147,7 +1149,7 @@ static int aarch64_step(struct target *target, int current, target_addr_t addres
        if (retval != ERROR_OK)
                return retval;
 
-       if (target->smp && (current == 1)) {
+       if (target->smp && current) {
                /*
                 * isolate current target so that it doesn't get resumed
                 * together with the others
@@ -1164,7 +1166,7 @@ static int aarch64_step(struct target *target, int current, target_addr_t addres
        }
 
        /* all other targets running, restore and restart the current target */
-       retval = aarch64_restore_one(target, current, &address, 0, 0);
+       retval = aarch64_restore_one(target, current, &address, false, false);
        if (retval == ERROR_OK)
                retval = aarch64_restart_one(target, RESTART_LAZY);
 
index 0c111d553bfd026e9496e1a62549555432fabdea..8757cafedc6ca0eaff896be5dbc4df6c3cccbeb9 100644 (file)
@@ -1100,7 +1100,7 @@ static int arc_assert_reset(struct target *target)
                        /* Resume the target and continue from the current
                         * PC register value. */
                        LOG_TARGET_DEBUG(target, "Starting CPU execution after reset");
-                       CHECK_RETVAL(target_resume(target, 1, 0, 0, 0));
+                       CHECK_RETVAL(target_resume(target, true, 0, false, false));
                }
                target->state = TARGET_RESET;
 
@@ -1246,7 +1246,7 @@ exit:
        return retval;
 }
 
-static int arc_enable_interrupts(struct target *target, int enable)
+static int arc_enable_interrupts(struct target *target, bool enable)
 {
        uint32_t value;
 
@@ -1269,8 +1269,8 @@ static int arc_enable_interrupts(struct target *target, int enable)
        return ERROR_OK;
 }
 
-static int arc_resume(struct target *target, int current, target_addr_t address,
-       int handle_breakpoints, int debug_execution)
+static int arc_resume(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints, bool debug_execution)
 {
        struct arc_common *arc = target_to_arc(target);
        uint32_t resume_pc = 0;
@@ -1297,7 +1297,7 @@ static int arc_resume(struct target *target, int current, target_addr_t address,
                CHECK_RETVAL(arc_enable_watchpoints(target));
        }
 
-       /* current = 1: continue on current PC, otherwise continue at <address> */
+       /* current = true: continue on current PC, otherwise continue at <address> */
        if (!current) {
                target_buffer_set_u32(target, pc->value, address);
                pc->dirty = true;
@@ -2030,7 +2030,7 @@ static int arc_hit_watchpoint(struct target *target, struct watchpoint **hit_wat
 
 /* Helper function which switches core to single_step mode by
  * doing aux r/w operations.  */
-static int arc_config_step(struct target *target, int enable_step)
+static int arc_config_step(struct target *target, bool enable_step)
 {
        uint32_t value;
 
@@ -2071,10 +2071,10 @@ static int arc_single_step_core(struct target *target)
        CHECK_RETVAL(arc_debug_entry(target));
 
        /* disable interrupts while stepping */
-       CHECK_RETVAL(arc_enable_interrupts(target, 0));
+       CHECK_RETVAL(arc_enable_interrupts(target, false));
 
        /* configure single step mode */
-       CHECK_RETVAL(arc_config_step(target, 1));
+       CHECK_RETVAL(arc_config_step(target, true));
 
        /* exit debug mode */
        CHECK_RETVAL(arc_exit_debug(target));
@@ -2082,8 +2082,8 @@ static int arc_single_step_core(struct target *target)
        return ERROR_OK;
 }
 
-static int arc_step(struct target *target, int current, target_addr_t address,
-       int handle_breakpoints)
+static int arc_step(struct target *target, bool current, target_addr_t address,
+       bool handle_breakpoints)
 {
        /* get pointers to arch-specific information */
        struct arc_common *arc = target_to_arc(target);
@@ -2095,7 +2095,7 @@ static int arc_step(struct target *target, int current, target_addr_t address,
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current) {
                buf_set_u32(pc->value, 0, 32, address);
                pc->dirty = true;
@@ -2120,10 +2120,10 @@ static int arc_step(struct target *target, int current, target_addr_t address,
        CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_RESUMED));
 
        /* disable interrupts while stepping */
-       CHECK_RETVAL(arc_enable_interrupts(target, 0));
+       CHECK_RETVAL(arc_enable_interrupts(target, false));
 
        /* do a single step */
-       CHECK_RETVAL(arc_config_step(target, 1));
+       CHECK_RETVAL(arc_config_step(target, true));
 
        /* make sure we done our step */
        alive_sleep(1);
index c583a2ebd727ca8907e36ed5c0eae0fbfda618fd..756b36b9597715b7331c75072d1f023c26107755 100644 (file)
@@ -30,8 +30,8 @@
 #endif
 
 
-static int arm11_step(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints);
+static int arm11_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints);
 
 
 /** Check and if necessary take control of the system
@@ -401,7 +401,8 @@ static int arm11_halt(struct target *target)
        return ERROR_OK;
 }
 
-static uint32_t arm11_nextpc(struct arm11_common *arm11, int current, uint32_t address)
+static uint32_t arm11_nextpc(struct arm11_common *arm11, bool current,
+               uint32_t address)
 {
        void *value = arm11->arm.pc->value;
 
@@ -435,8 +436,8 @@ static uint32_t arm11_nextpc(struct arm11_common *arm11, int current, uint32_t a
        return address;
 }
 
-static int arm11_resume(struct target *target, int current,
-       target_addr_t address, int handle_breakpoints, int debug_execution)
+static int arm11_resume(struct target *target, bool current,
+       target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        /*        LOG_DEBUG("current %d  address %08x  handle_breakpoints %d  debug_execution %d", */
        /*      current, address, handle_breakpoints, debug_execution); */
@@ -469,7 +470,7 @@ static int arm11_resume(struct target *target, int current,
                for (bp = target->breakpoints; bp; bp = bp->next) {
                        if (bp->address == address) {
                                LOG_DEBUG("must step over %08" TARGET_PRIxADDR "", bp->address);
-                               arm11_step(target, 1, 0, 0);
+                               arm11_step(target, true, 0, false);
                                break;
                        }
                }
@@ -543,8 +544,8 @@ static int arm11_resume(struct target *target, int current,
        return ERROR_OK;
 }
 
-static int arm11_step(struct target *target, int current,
-       target_addr_t address, int handle_breakpoints)
+static int arm11_step(struct target *target, bool current,
+       target_addr_t address, bool handle_breakpoints)
 {
        LOG_DEBUG("target->state: %s",
                target_state_name(target));
@@ -569,13 +570,13 @@ static int arm11_step(struct target *target, int current,
 
        /* skip over BKPT */
        if ((next_instruction & 0xFFF00070) == 0xe1200070) {
-               address = arm11_nextpc(arm11, 0, address + 4);
+               address = arm11_nextpc(arm11, false, address + 4);
                LOG_DEBUG("Skipping BKPT %08" TARGET_PRIxADDR, address);
        }
        /* skip over Wait for interrupt / Standby
         * mcr  15, 0, r?, cr7, cr0, {4} */
        else if ((next_instruction & 0xFFFF0FFF) == 0xee070f90) {
-               address = arm11_nextpc(arm11, 0, address + 4);
+               address = arm11_nextpc(arm11, false, address + 4);
                LOG_DEBUG("Skipping WFI %08" TARGET_PRIxADDR, address);
        }
        /* ignore B to self */
index ad814e05413423567948edc3be2d5469de0c0e44..5550fb1e2489fc21014c0e692f6b4a950df3b5e5 100644 (file)
@@ -1697,10 +1697,10 @@ static void arm7_9_enable_breakpoints(struct target *target)
 }
 
 int arm7_9_resume(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints,
-       int debug_execution)
+       bool handle_breakpoints,
+       bool debug_execution)
 {
        struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
        struct arm *arm = &arm7_9->arm;
@@ -1717,7 +1717,7 @@ int arm7_9_resume(struct target *target,
        if (!debug_execution)
                target_free_all_working_areas(target);
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current)
                buf_set_u32(arm->pc->value, 0, 32, address);
 
@@ -1900,7 +1900,8 @@ void arm7_9_disable_eice_step(struct target *target)
        embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE]);
 }
 
-int arm7_9_step(struct target *target, int current, target_addr_t address, int handle_breakpoints)
+int arm7_9_step(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints)
 {
        struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
        struct arm *arm = &arm7_9->arm;
@@ -1912,7 +1913,7 @@ int arm7_9_step(struct target *target, int current, target_addr_t address, int h
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current)
                buf_set_u32(arm->pc->value, 0, 32, address);
 
index 92d0fd51a23a173fd84c2cf45eacd0b90a7fce82..c4a5b08d2160484666a345b52b89235c0dbe1e44 100644 (file)
@@ -145,10 +145,10 @@ int arm7_9_early_halt(struct target *target);
 int arm7_9_soft_reset_halt(struct target *target);
 
 int arm7_9_halt(struct target *target);
-int arm7_9_resume(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints, int debug_execution);
-int arm7_9_step(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints);
+int arm7_9_resume(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints, bool debug_execution);
+int arm7_9_step(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints);
 int arm7_9_read_memory(struct target *target, target_addr_t address,
                uint32_t size, uint32_t count, uint8_t *buffer);
 int arm7_9_write_memory(struct target *target, target_addr_t address,
index b5575894079e3b72a0d9364970301de4b0aabcc8..a7c47bf417e20c7698ad92f7a114661fdd9141aa 100644 (file)
@@ -50,7 +50,7 @@ static int arm_semihosting_resume(struct target *target, int *retval)
        if (is_armv8(target_to_armv8(target))) {
                struct armv8_common *armv8 = target_to_armv8(target);
                if (armv8->last_run_control_op == ARMV8_RUNCONTROL_RESUME) {
-                       *retval = target_resume(target, 1, 0, 0, 0);
+                       *retval = target_resume(target, true, 0, false, false);
                        if (*retval != ERROR_OK) {
                                LOG_ERROR("Failed to resume target");
                                return 0;
@@ -58,7 +58,7 @@ static int arm_semihosting_resume(struct target *target, int *retval)
                } else if (armv8->last_run_control_op == ARMV8_RUNCONTROL_STEP)
                        target->debug_reason = DBG_REASON_SINGLESTEP;
        } else {
-               *retval = target_resume(target, 1, 0, 0, 0);
+               *retval = target_resume(target, true, 0, false, false);
                if (*retval != ERROR_OK) {
                        LOG_ERROR("Failed to resume target");
                        return 0;
index a258c7fd4542f5ad8dcc3e93cd6f2875edd4f516..597dc8990c32092e50e547d15b47ab583f2dd996 100644 (file)
@@ -1514,7 +1514,7 @@ int armv4_5_run_algorithm_inner(struct target *target,
                }
        }
 
-       retval = target_resume(target, 0, entry_point, 1, 1);
+       retval = target_resume(target, false, entry_point, true, true);
        if (retval != ERROR_OK)
                return retval;
        retval = run_it(target, exit_point, timeout_ms, arch_info);
index 440ca49d1661091518a0c13fc8d1c9c7a0860b60..dc2d84fe15cd09e31dd810ae7921563dd3046877 100644 (file)
@@ -642,7 +642,7 @@ int armv7m_start_algorithm(struct target *target,
        /* save previous core mode */
        armv7m_algorithm_info->core_mode = core_mode;
 
-       retval = target_resume(target, 0, entry_point, 1, 1);
+       retval = target_resume(target, false, entry_point, true, true);
 
        return retval;
 }
index bbbf236592c012c736c55ec250aac81bb8e1f3a1..1b051dc014e3ecf180801a39da175210a84c55d1 100644 (file)
@@ -300,8 +300,8 @@ static int avr32_ap7k_deassert_reset(struct target *target)
        return ERROR_OK;
 }
 
-static int avr32_ap7k_resume(struct target *target, int current,
-       target_addr_t address, int handle_breakpoints, int debug_execution)
+static int avr32_ap7k_resume(struct target *target, bool current,
+       target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        struct avr32_ap7k_common *ap7k = target_to_ap7k(target);
        struct breakpoint *breakpoint = NULL;
@@ -321,7 +321,7 @@ static int avr32_ap7k_resume(struct target *target, int current,
                */
        }
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current) {
 #if 0
                if (retval != ERROR_OK)
@@ -382,8 +382,8 @@ static int avr32_ap7k_resume(struct target *target, int current,
        return ERROR_OK;
 }
 
-static int avr32_ap7k_step(struct target *target, int current,
-       target_addr_t address, int handle_breakpoints)
+static int avr32_ap7k_step(struct target *target, bool current,
+       target_addr_t address, bool handle_breakpoints)
 {
        LOG_ERROR("%s: implement me", __func__);
 
index 8886a46778dea836186b4527c3845ffadb70b6be..3afe32015796cd8e5edab205eedc860b81b749be 100644 (file)
@@ -22,10 +22,10 @@ static int avr_init_target(struct command_context *cmd_ctx, struct target *targe
 static int avr_arch_state(struct target *target);
 static int avr_poll(struct target *target);
 static int avr_halt(struct target *target);
-static int avr_resume(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints, int debug_execution);
-static int avr_step(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints);
+static int avr_resume(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints, bool debug_execution);
+static int avr_step(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints);
 
 static int avr_assert_reset(struct target *target);
 static int avr_deassert_reset(struct target *target);
@@ -105,14 +105,15 @@ static int avr_halt(struct target *target)
        return ERROR_OK;
 }
 
-static int avr_resume(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints, int debug_execution)
+static int avr_resume(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints, bool debug_execution)
 {
        LOG_DEBUG("%s", __func__);
        return ERROR_OK;
 }
 
-static int avr_step(struct target *target, int current, target_addr_t address, int handle_breakpoints)
+static int avr_step(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints)
 {
        LOG_DEBUG("%s", __func__);
        return ERROR_OK;
index bfe698051858ccdbee5fabc6243503370bebd4e2..b32fec270e7d6a4aa20249c2d9facca7bda784be 100644 (file)
@@ -817,8 +817,8 @@ static int cortex_a_halt(struct target *target)
        return ERROR_OK;
 }
 
-static int cortex_a_internal_restore(struct target *target, int current,
-       target_addr_t *address, int handle_breakpoints, int debug_execution)
+static int cortex_a_internal_restore(struct target *target, bool current,
+       target_addr_t *address, bool handle_breakpoints, bool debug_execution)
 {
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct arm *arm = &armv7a->arm;
@@ -849,7 +849,7 @@ static int cortex_a_internal_restore(struct target *target, int current,
        }
 #endif
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        resume_pc = buf_get_u32(arm->pc->value, 0, 32);
        if (!current)
                resume_pc = *address;
@@ -965,7 +965,7 @@ static int cortex_a_internal_restart(struct target *target)
        return ERROR_OK;
 }
 
-static int cortex_a_restore_smp(struct target *target, int handle_breakpoints)
+static int cortex_a_restore_smp(struct target *target, bool handle_breakpoints)
 {
        int retval = 0;
        struct target_list *head;
@@ -976,16 +976,16 @@ static int cortex_a_restore_smp(struct target *target, int handle_breakpoints)
                if ((curr != target) && (curr->state != TARGET_RUNNING)
                        && target_was_examined(curr)) {
                        /*  resume current address , not in step mode */
-                       retval += cortex_a_internal_restore(curr, 1, &address,
-                                       handle_breakpoints, 0);
+                       retval += cortex_a_internal_restore(curr, true, &address,
+                                       handle_breakpoints, false);
                        retval += cortex_a_internal_restart(curr);
                }
        }
        return retval;
 }
 
-static int cortex_a_resume(struct target *target, int current,
-       target_addr_t address, int handle_breakpoints, int debug_execution)
+static int cortex_a_resume(struct target *target, bool current,
+       target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        int retval = 0;
        /* dummy resume for smp toggle in order to reduce gdb impact  */
@@ -997,7 +997,8 @@ static int cortex_a_resume(struct target *target, int current,
                target_call_event_callbacks(target, TARGET_EVENT_RESUMED);
                return 0;
        }
-       cortex_a_internal_restore(target, current, &address, handle_breakpoints, debug_execution);
+       cortex_a_internal_restore(target, current, &address, handle_breakpoints,
+               debug_execution);
        if (target->smp) {
                target->gdb_service->core[0] = -1;
                retval = cortex_a_restore_smp(target, handle_breakpoints);
@@ -1168,8 +1169,8 @@ static int cortex_a_set_dscr_bits(struct target *target,
        return retval;
 }
 
-static int cortex_a_step(struct target *target, int current, target_addr_t address,
-       int handle_breakpoints)
+static int cortex_a_step(struct target *target, bool current, target_addr_t address,
+       bool handle_breakpoints)
 {
        struct cortex_a_common *cortex_a = target_to_cortex_a(target);
        struct armv7a_common *armv7a = target_to_armv7a(target);
@@ -1184,7 +1185,7 @@ static int cortex_a_step(struct target *target, int current, target_addr_t addre
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        r = arm->pc;
        if (!current)
                buf_set_u32(r->value, 0, 32, address);
@@ -1195,7 +1196,7 @@ static int cortex_a_step(struct target *target, int current, target_addr_t addre
         * But since Cortex-A uses breakpoint for single step,
         * we MUST handle breakpoints.
         */
-       handle_breakpoints = 1;
+       handle_breakpoints = true;
        if (handle_breakpoints) {
                breakpoint = breakpoint_find(target, address);
                if (breakpoint)
@@ -1222,7 +1223,7 @@ static int cortex_a_step(struct target *target, int current, target_addr_t addre
 
        target->debug_reason = DBG_REASON_SINGLESTEP;
 
-       retval = cortex_a_resume(target, 1, address, 0, 0);
+       retval = cortex_a_resume(target, true, address, false, false);
        if (retval != ERROR_OK)
                return retval;
 
index 9314d6675ff7469a487dbda42266731d38f6d239..e17f23c1d3476404019ee03b62ea6bada3204100 100644 (file)
@@ -1359,7 +1359,7 @@ static int cortex_m_restore_one(struct target *target, bool current,
                r->valid = true;
        }
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        r = armv7m->arm.pc;
        if (!current) {
                buf_set_u32(r->value, 0, 32, *address);
@@ -1444,7 +1444,7 @@ static int cortex_m_restore_smp(struct target *target, bool handle_breakpoints)
                        continue;
 
                int retval = cortex_m_restore_one(curr, true, &address,
-                                                                               handle_breakpoints, false);
+                       handle_breakpoints, false);
                if (retval != ERROR_OK)
                        return retval;
 
@@ -1457,22 +1457,23 @@ static int cortex_m_restore_smp(struct target *target, bool handle_breakpoints)
        return ERROR_OK;
 }
 
-static int cortex_m_resume(struct target *target, int current,
-                                                  target_addr_t address, int handle_breakpoints, int debug_execution)
+static int cortex_m_resume(struct target *target, bool current,
+          target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
-       int retval = cortex_m_restore_one(target, !!current, &address, !!handle_breakpoints, !!debug_execution);
+       int retval = cortex_m_restore_one(target, current, &address,
+               handle_breakpoints, debug_execution);
        if (retval != ERROR_OK) {
                LOG_TARGET_ERROR(target, "context restore failed, aborting resume");
                return retval;
        }
 
        if (target->smp && !debug_execution) {
-               retval = cortex_m_restore_smp(target, !!handle_breakpoints);
+               retval = cortex_m_restore_smp(target, handle_breakpoints);
                if (retval != ERROR_OK)
                        LOG_TARGET_WARNING(target, "resume of a SMP target failed, trying to resume current one");
        }
 
-       cortex_m_restart_one(target, !!debug_execution);
+       cortex_m_restart_one(target, debug_execution);
        if (retval != ERROR_OK) {
                LOG_TARGET_ERROR(target, "resume failed");
                return retval;
@@ -1485,8 +1486,8 @@ static int cortex_m_resume(struct target *target, int current,
 }
 
 /* int irqstepcount = 0; */
-static int cortex_m_step(struct target *target, int current,
-       target_addr_t address, int handle_breakpoints)
+static int cortex_m_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints)
 {
        struct cortex_m_common *cortex_m = target_to_cm(target);
        struct armv7m_common *armv7m = &cortex_m->armv7m;
@@ -1506,7 +1507,7 @@ static int cortex_m_step(struct target *target, int current,
        if (target->smp && target->gdb_service)
                target->gdb_service->target = target;
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current) {
                buf_set_u32(pc->value, 0, 32, address);
                pc->dirty = true;
@@ -2316,7 +2317,7 @@ int cortex_m_profiling(struct target *target, uint32_t *samples,
        /* Make sure the target is running */
        target_poll(target);
        if (target->state == TARGET_HALTED)
-               retval = target_resume(target, 1, 0, 0, 0);
+               retval = target_resume(target, true, 0, false, false);
 
        if (retval != ERROR_OK) {
                LOG_TARGET_ERROR(target, "Error while resuming target");
index 953888de3dc59c64f4f18b74c508b135832f5dfe..9b6f4756c9c674910976cb2a8b0c7a41fdd92d27 100644 (file)
@@ -1115,10 +1115,10 @@ static int dsp563xx_halt(struct target *target)
 }
 
 static int dsp563xx_resume(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints,
-       int debug_execution)
+       bool handle_breakpoints,
+       bool debug_execution)
 {
        int err;
        struct dsp563xx_common *dsp563xx = target_to_dsp563xx(target);
@@ -1132,7 +1132,7 @@ static int dsp563xx_resume(struct target *target,
        if (current && dsp563xx->core_cache->reg_list[DSP563XX_REG_IDX_PC].dirty) {
                dsp563xx_write_core_reg(target, DSP563XX_REG_IDX_PC);
                address = dsp563xx->core_regs[DSP563XX_REG_IDX_PC];
-               current = 0;
+               current = false;
        }
 
        LOG_DEBUG("%s %08X %08" TARGET_PRIXADDR, __func__, current, address);
@@ -1172,9 +1172,9 @@ static int dsp563xx_resume(struct target *target,
 }
 
 static int dsp563xx_step_ex(struct target *target,
-       int current,
+       bool current,
        uint32_t address,
-       int handle_breakpoints,
+       bool handle_breakpoints,
        int steps)
 {
        int err;
@@ -1196,7 +1196,7 @@ static int dsp563xx_step_ex(struct target *target,
        if (current && dsp563xx->core_cache->reg_list[DSP563XX_REG_IDX_PC].dirty) {
                dsp563xx_write_core_reg(target, DSP563XX_REG_IDX_PC);
                address = dsp563xx->core_regs[DSP563XX_REG_IDX_PC];
-               current = 0;
+               current = false;
        }
 
        LOG_DEBUG("%s %08X %08" PRIX32, __func__, current, address);
@@ -1288,9 +1288,9 @@ static int dsp563xx_step_ex(struct target *target,
 }
 
 static int dsp563xx_step(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints)
+       bool handle_breakpoints)
 {
        int err;
        struct dsp563xx_common *dsp563xx = target_to_dsp563xx(target);
@@ -1359,7 +1359,7 @@ static int dsp563xx_deassert_reset(struct target *target)
                         * reset vector and need 2 cycles to fill
                         * the cache (fetch,decode,execute)
                         */
-                       err = dsp563xx_step_ex(target, 1, 0, 1, 1);
+                       err = dsp563xx_step_ex(target, true, 0, true, 1);
                        if (err != ERROR_OK)
                                return err;
                }
@@ -1419,7 +1419,7 @@ static int dsp563xx_run_algorithm(struct target *target,
        }
 
        /* exec */
-       retval = target_resume(target, 0, entry_point, 1, 1);
+       retval = target_resume(target, false, entry_point, true, true);
        if (retval != ERROR_OK)
                return retval;
 
@@ -1972,7 +1972,7 @@ static int dsp563xx_add_custom_watchpoint(struct target *target, uint32_t addres
 
        if (err == ERROR_OK && was_running) {
                /* Resume from current PC */
-               err = dsp563xx_resume(target, 1, 0x0, 0, 0);
+               err = dsp563xx_resume(target, true, 0x0, false, false);
        }
 
        return err;
index b370aafa463a006a50cbd362858a8e25c9b41062..3f9a6742c43eb54914b926f3029d2c77f46c0413 100644 (file)
@@ -993,8 +993,8 @@ static int dsp5680xx_poll(struct target *target)
        return ERROR_OK;
 }
 
-static int dsp5680xx_resume(struct target *target, int current,
-                           target_addr_t address, int hb, int d)
+static int dsp5680xx_resume(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        if (target->state == TARGET_RUNNING) {
                LOG_USER("Target already running.");
@@ -2048,7 +2048,7 @@ int dsp5680xx_f_wr(struct target *t, const uint8_t *b, uint32_t a, uint32_t coun
        retval = core_tx_upper_data(target, tmp, &drscan_data);
        err_check_propagate(retval);
 
-       retval = dsp5680xx_resume(target, 0, ram_addr, 0, 0);
+       retval = dsp5680xx_resume(target, false, ram_addr, false, false);
        err_check_propagate(retval);
 
        int counter = FLUSH_COUNT_FLASH;
@@ -2234,8 +2234,8 @@ int dsp5680xx_f_lock(struct target *target)
        return retval;
 }
 
-static int dsp5680xx_step(struct target *target, int current, target_addr_t address,
-                         int handle_breakpoints)
+static int dsp5680xx_step(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints)
 {
        err_check(ERROR_FAIL, DSP5680XX_ERROR_NOT_IMPLEMENTED_STEP,
                  "Not implemented yet.");
index fc2d20105a46dd18056f60aaf76748a4a953ff72..da40928da91c538bcd541b3ba204fcdbbc6b1ba7 100644 (file)
@@ -846,8 +846,9 @@ static int esirisc_enable_step(struct target *target)
        return ERROR_OK;
 }
 
-static int esirisc_resume_or_step(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints, int debug_execution, bool step)
+static int esirisc_resume_or_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints, bool debug_execution,
+               bool step)
 {
        struct esirisc_common *esirisc = target_to_esirisc(target);
        struct esirisc_jtag *jtag_info = &esirisc->jtag_info;
@@ -917,8 +918,8 @@ static int esirisc_resume_or_step(struct target *target, int current, target_add
        return ERROR_OK;
 }
 
-static int esirisc_resume(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints, int debug_execution)
+static int esirisc_resume(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        LOG_TARGET_DEBUG(target, "-");
 
@@ -926,13 +927,13 @@ static int esirisc_resume(struct target *target, int current, target_addr_t addr
                        handle_breakpoints, debug_execution, false);
 }
 
-static int esirisc_step(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints)
+static int esirisc_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints)
 {
        LOG_TARGET_DEBUG(target, "-");
 
        return esirisc_resume_or_step(target, current, address,
-                       handle_breakpoints, 0, true);
+                       handle_breakpoints, false, true);
 }
 
 static int esirisc_debug_step(struct target *target)
index 324aa3993b7d567887efa022f25d2b46d9cf4960..4deb5e070914012fb8b0dced2ee6960db6c2894f 100644 (file)
@@ -175,7 +175,8 @@ static int esp32_soc_reset(struct target *target)
        LOG_DEBUG("Resuming the target");
        xtensa = target_to_xtensa(target);
        xtensa->suppress_dsr_errors = true;
-       res = xtensa_resume(target, 0, ESP32_RTC_SLOW_MEM_BASE + 4, 0, 0);
+       res = xtensa_resume(target, false, ESP32_RTC_SLOW_MEM_BASE + 4, false,
+               false);
        xtensa->suppress_dsr_errors = false;
        if (res != ERROR_OK) {
                LOG_ERROR("Failed to run stub (%d)!", res);
index 125f36632933b8a7fc7db8617ff7bd446240495e..3202fd3d64a4f477bce2d208a301525cfde40f8d 100644 (file)
@@ -708,7 +708,7 @@ int esp32_apptrace_safe_halt_targets(struct esp32_apptrace_cmd_ctx *ctx,
                        }
                        while (stat) {
                                /* allow this CPU to leave ERI write critical section */
-                               res = target_resume(ctx->cpus[k], 1, 0, 1, 0);
+                               res = target_resume(ctx->cpus[k], true, 0, true, false);
                                if (res != ERROR_OK) {
                                        LOG_ERROR("Failed to resume target (%d)!", res);
                                        breakpoint_remove(ctx->cpus[k], bp_addr);
@@ -796,7 +796,7 @@ static int esp32_apptrace_connect_targets(struct esp32_apptrace_cmd_ctx *ctx,
                                /* in SMP mode we need to call target_resume for one core only */
                                continue;
                        }
-                       res = target_resume(ctx->cpus[k], 1, 0, 1, 0);
+                       res = target_resume(ctx->cpus[k], true, 0, true, false);
                        if (res != ERROR_OK) {
                                command_print(ctx->cmd, "Failed to resume target (%d)!", res);
                                return res;
@@ -1352,7 +1352,7 @@ static int esp32_sysview_stop(struct esp32_apptrace_cmd_ctx *ctx)
                        /* in SMP mode we need to call target_resume for one core only */
                        continue;
                }
-               res = target_resume(ctx->cpus[k], 1, 0, 1, 0);
+               res = target_resume(ctx->cpus[k], true, 0, true, false);
                if (res != ERROR_OK) {
                        LOG_ERROR("sysview: Failed to resume target '%s' (%d)!", target_name(ctx->cpus[k]), res);
                        return res;
index 2abde479ea7e9a91b615da78b0e46cc8e3a2bcca..4f3914f66acb20551ac739c94c2492573df397c9 100644 (file)
@@ -370,7 +370,8 @@ static int esp32s2_on_halt(struct target *target)
        return ret;
 }
 
-static int esp32s2_step(struct target *target, int current, target_addr_t address, int handle_breakpoints)
+static int esp32s2_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints)
 {
        int ret = xtensa_step(target, current, address, handle_breakpoints);
        if (ret == ERROR_OK) {
@@ -397,7 +398,7 @@ static int esp32s2_poll(struct target *target)
                                if (ret == ERROR_OK && esp_xtensa->semihost.need_resume) {
                                        esp_xtensa->semihost.need_resume = false;
                                        /* Resume xtensa_resume will handle BREAK instruction. */
-                                       ret = target_resume(target, 1, 0, 1, 0);
+                                       ret = target_resume(target, true, 0, true, false);
                                        if (ret != ERROR_OK) {
                                                LOG_ERROR("Failed to resume target");
                                                return ret;
index 2afb4b009e0a823980f9dd26784e716b94b0e4e4..7507c11c245834785aa9c4a2908b41e29015aef2 100644 (file)
@@ -175,7 +175,8 @@ static int esp32s3_soc_reset(struct target *target)
        LOG_DEBUG("Resuming the target");
        xtensa = target_to_xtensa(target);
        xtensa->suppress_dsr_errors = true;
-       res = xtensa_resume(target, 0, ESP32_S3_RTC_SLOW_MEM_BASE + 4, 0, 0);
+       res = xtensa_resume(target, false, ESP32_S3_RTC_SLOW_MEM_BASE + 4, false,
+               false);
        xtensa->suppress_dsr_errors = false;
        if (res != ERROR_OK) {
                LOG_ERROR("Failed to run stub (%d)!", res);
index 9b57f345e4afdbb5f4d333efe1e36fbe616c12fc..4cadcb3301d1d89e10add5d5b08cfa04ec1c22e3 100644 (file)
@@ -213,7 +213,7 @@ int esp_xtensa_profiling(struct target *target, uint32_t *samples,
        /* Make sure the target is running */
        target_poll(target);
        if (target->state == TARGET_HALTED)
-               retval = target_resume(target, 1, 0, 0, 0);
+               retval = target_resume(target, true, 0, false, false);
 
        if (retval != ERROR_OK) {
                LOG_TARGET_ERROR(target, "Error while resuming target");
index c49146d7871787a20d32ff403840acc5d6493beb..b9e21564409b2e1d95886ed8ad7cae14995f6c17 100644 (file)
@@ -218,7 +218,7 @@ int esp_xtensa_smp_poll(struct target *target)
                                        !esp_xtensa_smp->other_core_does_resume) {
                                        esp_xtensa->semihost.need_resume = false;
                                        /* Resume xtensa_resume will handle BREAK instruction. */
-                                       ret = target_resume(target, 1, 0, 1, 0);
+                                       ret = target_resume(target, true, 0, true, false);
                                        if (ret != ERROR_OK) {
                                                LOG_ERROR("Failed to resume target");
                                                return ret;
@@ -229,7 +229,7 @@ int esp_xtensa_smp_poll(struct target *target)
                        /* check whether any core polled by esp_xtensa_smp_update_halt_gdb() requested resume */
                        if (target->smp && other_core_resume_req) {
                                /* Resume xtensa_resume will handle BREAK instruction. */
-                               ret = target_resume(target, 1, 0, 1, 0);
+                               ret = target_resume(target, true, 0, true, false);
                                if (ret != ERROR_OK) {
                                        LOG_ERROR("Failed to resume target");
                                        return ret;
@@ -334,8 +334,7 @@ static inline int esp_xtensa_smp_smpbreak_restore(struct target *target, uint32_
 }
 
 static int esp_xtensa_smp_resume_cores(struct target *target,
-       int handle_breakpoints,
-       int debug_execution)
+               bool handle_breakpoints, bool debug_execution)
 {
        struct target_list *head;
        struct target *curr;
@@ -348,7 +347,7 @@ static int esp_xtensa_smp_resume_cores(struct target *target,
                if ((curr != target) && (curr->state != TARGET_RUNNING) && target_was_examined(curr)) {
                        /*  resume current address, not in SMP mode */
                        curr->smp = 0;
-                       int res = esp_xtensa_smp_resume(curr, 1, 0, handle_breakpoints, debug_execution);
+                       int res = esp_xtensa_smp_resume(curr, true, 0, handle_breakpoints, debug_execution);
                        curr->smp = 1;
                        if (res != ERROR_OK)
                                return res;
@@ -358,10 +357,10 @@ static int esp_xtensa_smp_resume_cores(struct target *target,
 }
 
 int esp_xtensa_smp_resume(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints,
-       int debug_execution)
+       bool handle_breakpoints,
+       bool debug_execution)
 {
        int res;
        uint32_t smp_break;
@@ -420,9 +419,9 @@ int esp_xtensa_smp_resume(struct target *target,
 }
 
 int esp_xtensa_smp_step(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints)
+       bool handle_breakpoints)
 {
        int res;
        uint32_t smp_break = 0;
index 39afd8af1054bcd191345aa0afe6ebc52b938f4f..ec074c11ce2e2703cfaa8ea5ea50e07898a7a7bc 100644 (file)
@@ -27,14 +27,14 @@ struct esp_xtensa_smp_common {
 
 int esp_xtensa_smp_poll(struct target *target);
 int esp_xtensa_smp_resume(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints,
-       int debug_execution);
+       bool handle_breakpoints,
+       bool debug_execution);
 int esp_xtensa_smp_step(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints);
+       bool handle_breakpoints);
 int esp_xtensa_smp_assert_reset(struct target *target);
 int esp_xtensa_smp_deassert_reset(struct target *target);
 int esp_xtensa_smp_soft_reset_halt(struct target *target);
index 1e7eb0961fbd4876a979e9b5767e3c8e0005fc38..840ca1b62b2969d7e1f47b968a704a7b2be656a0 100644 (file)
@@ -526,7 +526,7 @@ static int feroceon_bulk_write_memory(struct target *target,
        arm->core_state = ARM_STATE_ARM;
 
        embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], 0);
-       arm7_9_resume(target, 0, arm7_9->dcc_working_area->address, 1, 1);
+       arm7_9_resume(target, false, arm7_9->dcc_working_area->address, true, true);
 
        /* send data over */
        x = 0;
index 6b0d2e95e89b243f4202b071c539ada7b9ea7b1c..ef05df20278c1c39e3aace1ba9d19b26ab2b553e 100644 (file)
@@ -406,7 +406,8 @@ static int hl_deassert_reset(struct target *target)
 
        target->SAVED_DCRDR = 0;  /* clear both DCC busy bits on initial resume */
 
-       return target->reset_halt ? ERROR_OK : target_resume(target, 1, 0, 0, 0);
+       return target->reset_halt ? ERROR_OK : target_resume(target, true, 0, false,
+               false);
 }
 
 static int adapter_halt(struct target *target)
@@ -434,9 +435,9 @@ static int adapter_halt(struct target *target)
        return ERROR_OK;
 }
 
-static int adapter_resume(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints,
-               int debug_execution)
+static int adapter_resume(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints,
+               bool debug_execution)
 {
        int res;
        struct hl_interface *adapter = target_to_adapter(target);
@@ -525,8 +526,8 @@ static int adapter_resume(struct target *target, int current,
        return ERROR_OK;
 }
 
-static int adapter_step(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints)
+static int adapter_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints)
 {
        int res;
        struct hl_interface *adapter = target_to_adapter(target);
index 0340d0d0b16bad9fbfa5d3c870540ff5cbb6f4e6..39a50c7a69364e6578fe34dad682bc70fe739cf5 100644 (file)
@@ -988,8 +988,8 @@ int lakemont_halt(struct target *t)
        }
 }
 
-int lakemont_resume(struct target *t, int current, target_addr_t address,
-                       int handle_breakpoints, int debug_execution)
+int lakemont_resume(struct target *t, bool current, target_addr_t address,
+               bool handle_breakpoints, bool debug_execution)
 {
        struct breakpoint *bp = NULL;
        struct x86_32_common *x86_32 = target_to_x86_32(t);
@@ -1004,7 +1004,7 @@ int lakemont_resume(struct target *t, int current, target_addr_t address,
                bp = breakpoint_find(t, eip);
                if (bp /*&& bp->type == BKPT_SOFT*/) {
                        /* the step will step over the breakpoint */
-                       if (lakemont_step(t, 0, 0, 1) != ERROR_OK) {
+                       if (lakemont_step(t, false, 0, true) != ERROR_OK) {
                                LOG_ERROR("%s stepping over a software breakpoint at 0x%08" PRIx32 " "
                                                "failed to resume the target", __func__, eip);
                                return ERROR_FAIL;
@@ -1029,8 +1029,8 @@ int lakemont_resume(struct target *t, int current, target_addr_t address,
        return ERROR_OK;
 }
 
-int lakemont_step(struct target *t, int current,
-                       target_addr_t address, int handle_breakpoints)
+int lakemont_step(struct target *t, bool current, target_addr_t address,
+               bool handle_breakpoints)
 {
        struct x86_32_common *x86_32 = target_to_x86_32(t);
        uint32_t eflags = buf_get_u32(x86_32->cache->reg_list[EFLAGS].value, 0, 32);
index ca6557fcdedb99b2b9673e0b13b653143e8bfac3..4c84f74aee1506a78fa7d91ca6daabf92e4c0e5c 100644 (file)
@@ -84,10 +84,10 @@ int lakemont_init_arch_info(struct target *t, struct x86_32_common *x86_32);
 int lakemont_poll(struct target *t);
 int lakemont_arch_state(struct target *t);
 int lakemont_halt(struct target *t);
-int lakemont_resume(struct target *t, int current, target_addr_t address,
-                       int handle_breakpoints, int debug_execution);
-int lakemont_step(struct target *t, int current,
-                       target_addr_t address, int handle_breakpoints);
+int lakemont_resume(struct target *t, bool current, target_addr_t address,
+               bool handle_breakpoints, bool debug_execution);
+int lakemont_step(struct target *t, bool current,
+               target_addr_t address, bool handle_breakpoints);
 int lakemont_reset_assert(struct target *t);
 int lakemont_reset_deassert(struct target *t);
 int lakemont_update_after_probemode_entry(struct target *t);
index 9bd00c0e5ff346be8ef027c05d84c6290236cb59..692f4cc9e42697a54aed0670d49c133f5d674933 100644 (file)
@@ -55,15 +55,15 @@ static int ls1_sap_halt(struct target *target)
        return ERROR_OK;
 }
 
-static int ls1_sap_resume(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints, int debug_execution)
+static int ls1_sap_resume(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        LOG_DEBUG("%s", __func__);
        return ERROR_OK;
 }
 
-static int ls1_sap_step(struct target *target, int current, target_addr_t address,
-                               int handle_breakpoints)
+static int ls1_sap_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints)
 {
        LOG_DEBUG("%s", __func__);
        return ERROR_OK;
index 5b2bbb1ae05636b2f9b3228f7bb0766333278007..fdc52c307150e29d57650c1e35ef9e10b82a1f55 100644 (file)
@@ -102,8 +102,9 @@ static int mem_ap_halt(struct target *target)
        return ERROR_OK;
 }
 
-static int mem_ap_resume(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints, int debug_execution)
+static int mem_ap_resume(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints,
+               bool debug_execution)
 {
        LOG_TARGET_DEBUG(target, "%s", __func__);
        target->state = TARGET_RUNNING;
@@ -111,8 +112,8 @@ static int mem_ap_resume(struct target *target, int current, target_addr_t addre
        return ERROR_OK;
 }
 
-static int mem_ap_step(struct target *target, int current, target_addr_t address,
-                               int handle_breakpoints)
+static int mem_ap_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints)
 {
        LOG_TARGET_DEBUG(target, "%s", __func__);
        target->state = TARGET_HALTED;
index fcb7042cb156748107b83ee1635f35722e2f8f28..4527c5fa8815bdb71ec2451be39394e76d2657f6 100644 (file)
@@ -588,7 +588,7 @@ static int mips32_run_and_wait(struct target *target, target_addr_t entry_point,
        int retval;
        /* This code relies on the target specific  resume() and  poll()->debug_entry()
         * sequence to write register values to the processor and the read them back */
-       retval = target_resume(target, 0, entry_point, 0, 1);
+       retval = target_resume(target, false, entry_point, false, true);
        if (retval != ERROR_OK)
                return retval;
 
index 1543de355e7228e4a4de5364b34b18e3034c7694..dc74501086ce4372b3098025b043d491356f3d41 100644 (file)
@@ -30,9 +30,9 @@ static int mips_m4k_set_breakpoint(struct target *target,
                struct breakpoint *breakpoint);
 static int mips_m4k_unset_breakpoint(struct target *target,
                struct breakpoint *breakpoint);
-static int mips_m4k_internal_restore(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints,
-               int debug_execution);
+static int mips_m4k_internal_restore(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints,
+               bool debug_execution);
 static int mips_m4k_halt(struct target *target);
 static int mips_m4k_bulk_write_memory(struct target *target, target_addr_t address,
                uint32_t count, const uint8_t *buffer);
@@ -398,7 +398,8 @@ static int mips_m4k_single_step_core(struct target *target)
        return ERROR_OK;
 }
 
-static int mips_m4k_restore_smp(struct target *target, uint32_t address, int handle_breakpoints)
+static int mips_m4k_restore_smp(struct target *target, uint32_t address,
+               bool handle_breakpoints)
 {
        int retval = ERROR_OK;
        struct target_list *head;
@@ -408,8 +409,8 @@ static int mips_m4k_restore_smp(struct target *target, uint32_t address, int han
                struct target *curr = head->target;
                if ((curr != target) && (curr->state != TARGET_RUNNING)) {
                        /*  resume current address , not in step mode */
-                       ret = mips_m4k_internal_restore(curr, 1, address,
-                                                  handle_breakpoints, 0);
+                       ret = mips_m4k_internal_restore(curr, true, address,
+                                                  handle_breakpoints, false);
 
                        if (ret != ERROR_OK) {
                                LOG_TARGET_ERROR(curr, "failed to resume at address: 0x%" PRIx32,
@@ -421,8 +422,9 @@ static int mips_m4k_restore_smp(struct target *target, uint32_t address, int han
        return retval;
 }
 
-static int mips_m4k_internal_restore(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints, int debug_execution)
+static int mips_m4k_internal_restore(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints,
+               bool debug_execution)
 {
        struct mips32_common *mips32 = target_to_mips32(target);
        struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
@@ -440,7 +442,7 @@ static int mips_m4k_internal_restore(struct target *target, int current,
                mips_m4k_enable_watchpoints(target);
        }
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current) {
                mips_m4k_isa_filter(mips32->isa_imp, &address);
                buf_set_u32(mips32->core_cache->reg_list[MIPS32_REGLIST_C0_PC_INDEX].value, 0, 32, address);
@@ -448,7 +450,7 @@ static int mips_m4k_internal_restore(struct target *target, int current,
                mips32->core_cache->reg_list[MIPS32_REGLIST_C0_PC_INDEX].valid = true;
        }
 
-       if ((mips32->isa_imp > 1) &&  debug_execution)  /* if more than one isa supported */
+       if (mips32->isa_imp > 1 && debug_execution)     /* if more than one isa supported */
                buf_set_u32(mips32->core_cache->reg_list[MIPS32_REGLIST_C0_PC_INDEX].value, 0, 1, mips32->isa_mode);
 
        if (!current)
@@ -494,8 +496,8 @@ static int mips_m4k_internal_restore(struct target *target, int current,
        return ERROR_OK;
 }
 
-static int mips_m4k_resume(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints, int debug_execution)
+static int mips_m4k_resume(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        int retval = ERROR_OK;
 
@@ -521,8 +523,8 @@ static int mips_m4k_resume(struct target *target, int current,
        return retval;
 }
 
-static int mips_m4k_step(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints)
+static int mips_m4k_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints)
 {
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
@@ -534,7 +536,7 @@ static int mips_m4k_step(struct target *target, int current,
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current) {
                mips_m4k_isa_filter(mips32->isa_imp, &address);
                buf_set_u32(mips32->core_cache->reg_list[MIPS32_REGLIST_C0_PC_INDEX].value, 0, 32, address);
index 9921e93807f1512fd2a2ec78d9f00bb71a4c5867..85e3779375fdf47620106ea08e1240db82f4a441 100644 (file)
@@ -592,9 +592,9 @@ static int mips_mips64_unset_breakpoint(struct target *target,
        return ERROR_OK;
 }
 
-static int mips_mips64_resume(struct target *target, int current,
-                             uint64_t address, int handle_breakpoints,
-                             int debug_execution)
+static int mips_mips64_resume(struct target *target, bool current,
+                             uint64_t address, bool handle_breakpoints,
+                             bool debug_execution)
 {
        struct mips64_common *mips64 = target->arch_info;
        struct mips_ejtag *ejtag_info = &mips64->ejtag_info;
@@ -622,7 +622,7 @@ static int mips_mips64_resume(struct target *target, int current,
        }
 
        pc = &mips64->core_cache->reg_list[MIPS64_PC];
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current) {
                buf_set_u64(pc->value, 0, 64, address);
                pc->dirty = true;
@@ -696,8 +696,8 @@ static int mips_mips64_resume(struct target *target, int current,
        return ERROR_OK;
 }
 
-static int mips_mips64_step(struct target *target, int current,
-                           uint64_t address, int handle_breakpoints)
+static int mips_mips64_step(struct target *target, bool current,
+                           uint64_t address, bool handle_breakpoints)
 {
        struct mips64_common *mips64 = target->arch_info;
        struct mips_ejtag *ejtag_info = &mips64->ejtag_info;
@@ -713,7 +713,7 @@ static int mips_mips64_step(struct target *target, int current,
        if (mips64->mips64mode32)
                address = mips64_extend_sign(address);
 
-       /* current = 1: continue on current pc, otherwise continue at
+       /* current = true: continue on current pc, otherwise continue at
         * <address> */
        if (!current) {
                buf_set_u64(pc->value, 0, 64, address);
index efc076c9999aafc55a435d7e7320538b34fab36b..4b9d3bca689df976fb3f25fe695acf1f140fa7d1 100644 (file)
@@ -775,9 +775,9 @@ static bool is_any_soft_breakpoint(struct target *target)
        return false;
 }
 
-static int or1k_resume_or_step(struct target *target, int current,
-                              uint32_t address, int handle_breakpoints,
-                              int debug_execution, int step)
+static int or1k_resume_or_step(struct target *target, bool current,
+               uint32_t address, bool handle_breakpoints, bool debug_execution,
+               int step)
 {
        struct or1k_common *or1k = target_to_or1k(target);
        struct or1k_du *du_core = or1k_to_du(or1k);
@@ -885,9 +885,8 @@ static int or1k_resume_or_step(struct target *target, int current,
        return ERROR_OK;
 }
 
-static int or1k_resume(struct target *target, int current,
-                      target_addr_t address, int handle_breakpoints,
-                      int debug_execution)
+static int or1k_resume(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        return or1k_resume_or_step(target, current, address,
                                   handle_breakpoints,
@@ -895,12 +894,12 @@ static int or1k_resume(struct target *target, int current,
                                   NO_SINGLE_STEP);
 }
 
-static int or1k_step(struct target *target, int current,
-                    target_addr_t address, int handle_breakpoints)
+static int or1k_step(struct target *target, bool current,
+                    target_addr_t address, bool handle_breakpoints)
 {
        return or1k_resume_or_step(target, current, address,
                                   handle_breakpoints,
-                                  0,
+                                  false,
                                   SINGLE_STEP);
 
 }
@@ -1216,7 +1215,7 @@ static int or1k_profiling(struct target *target, uint32_t *samples,
        /* Make sure the target is running */
        target_poll(target);
        if (target->state == TARGET_HALTED)
-               retval = target_resume(target, 1, 0, 0, 0);
+               retval = target_resume(target, true, 0, false, false);
 
        if (retval != ERROR_OK) {
                LOG_ERROR("Error while resuming target");
index d63a42a6c067d6bf93f5ead3003c07b1732da15c..90cf6670ec19180558cc0fcf210c6b439b432773 100644 (file)
@@ -65,7 +65,7 @@ static int quark_d20xx_reset_deassert(struct target *t)
                }
                /* resume target if reset mode is run */
                if (!t->reset_halt) {
-                       retval = lakemont_resume(t, 1, 0, 0, 0);
+                       retval = lakemont_resume(t, true, 0, false, false);
                        if (retval != ERROR_OK) {
                                LOG_ERROR("%s could not resume target", __func__);
                                return retval;
index 302ace86982cc52ba63f4b6c6babfc50519dc9fc..f4a7d0e5caf38a812a0e1d89fd03aaf7b4b81d52 100644 (file)
@@ -1192,7 +1192,7 @@ static int full_step(struct target *target, bool announce)
        return ERROR_OK;
 }
 
-static int resume(struct target *target, int debug_execution, bool step)
+static int resume(struct target *target, bool debug_execution, bool step)
 {
        if (debug_execution) {
                LOG_ERROR("TODO: debug_execution is true");
@@ -1439,8 +1439,8 @@ static int strict_step(struct target *target, bool announce)
        return ERROR_OK;
 }
 
-static int step(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints)
+static int step(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints)
 {
        jtag_add_ir_scan(target->tap, &select_dbus, TAP_IDLE);
 
@@ -1929,8 +1929,9 @@ static int riscv011_poll(struct target *target)
        return poll_target(target, true);
 }
 
-static int riscv011_resume(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints, int debug_execution)
+static int riscv011_resume(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints,
+               bool debug_execution)
 {
        RISCV_INFO(r);
        jtag_add_ir_scan(target->tap, &select_dbus, TAP_IDLE);
index 99f40a7393702a08d72d68ed75713b327926871f..6a8577f5cb1a746a77921cceac00f760f6981cf3 100644 (file)
@@ -1096,16 +1096,15 @@ static int riscv_hit_watchpoint(struct target *target, struct watchpoint **hit_w
        return ERROR_FAIL;
 }
 
-
-static int oldriscv_step(struct target *target, int current, uint32_t address,
-               int handle_breakpoints)
+static int oldriscv_step(struct target *target, bool current, uint32_t address,
+               bool handle_breakpoints)
 {
        struct target_type *tt = get_target_type(target);
        return tt->step(target, current, address, handle_breakpoints);
 }
 
-static int old_or_new_riscv_step(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints)
+static int old_or_new_riscv_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints)
 {
        RISCV_INFO(r);
        LOG_DEBUG("handle_breakpoints=%d", handle_breakpoints);
@@ -1115,7 +1114,6 @@ static int old_or_new_riscv_step(struct target *target, int current,
                return riscv_openocd_step(target, current, address, handle_breakpoints);
 }
 
-
 static int riscv_examine(struct target *target)
 {
        LOG_DEBUG("riscv_examine()");
@@ -1395,8 +1393,8 @@ static int enable_triggers(struct target *target, riscv_reg_t *state)
 /**
  * Get everything ready to resume.
  */
-static int resume_prep(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints, int debug_execution)
+static int resume_prep(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        RISCV_INFO(r);
        LOG_DEBUG("[%d]", target->coreid);
@@ -1434,8 +1432,8 @@ static int resume_prep(struct target *target, int current,
  * Resume all the harts that have been prepped, as close to instantaneous as
  * possible.
  */
-static int resume_go(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints, int debug_execution)
+static int resume_go(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        RISCV_INFO(r);
        int result;
@@ -1465,10 +1463,10 @@ static int resume_finish(struct target *target)
  */
 static int riscv_resume(
                struct target *target,
-               int current,
+               bool current,
                target_addr_t address,
-               int handle_breakpoints,
-               int debug_execution,
+               bool handle_breakpoints,
+               bool debug_execution,
                bool single_hart)
 {
        LOG_DEBUG("handle_breakpoints=%d", handle_breakpoints);
@@ -1515,8 +1513,8 @@ static int riscv_resume(
        return result;
 }
 
-static int riscv_target_resume(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints, int debug_execution)
+static int riscv_target_resume(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        return riscv_resume(target, current, address, handle_breakpoints,
                        debug_execution, false);
@@ -1904,7 +1902,7 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
 
        /* Run algorithm */
        LOG_DEBUG("resume at 0x%" TARGET_PRIxADDR, entry_point);
-       if (riscv_resume(target, 0, entry_point, 0, 0, true) != ERROR_OK)
+       if (riscv_resume(target, false, entry_point, false, false, true) != ERROR_OK)
                return ERROR_FAIL;
 
        int64_t start = timeval_ms();
@@ -2245,7 +2243,7 @@ int riscv_openocd_poll(struct target *target)
                        riscv_halt(target);
                } else if (should_resume) {
                        LOG_DEBUG("resume all");
-                       riscv_resume(target, true, 0, 0, 0, false);
+                       riscv_resume(target, true, 0, false, false, false);
                }
 
                /* Sample memory if any target is running. */
@@ -2287,7 +2285,7 @@ int riscv_openocd_poll(struct target *target)
                                target_call_event_callbacks(target, TARGET_EVENT_HALTED);
                                break;
                        case SEMIHOSTING_HANDLED:
-                               if (riscv_resume(target, true, 0, 0, 0, false) != ERROR_OK)
+                               if (riscv_resume(target, true, 0, false, false, false) != ERROR_OK)
                                        return ERROR_FAIL;
                                break;
                        case SEMIHOSTING_ERROR:
@@ -2300,8 +2298,8 @@ int riscv_openocd_poll(struct target *target)
        return ERROR_OK;
 }
 
-int riscv_openocd_step(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints)
+int riscv_openocd_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints)
 {
        LOG_DEBUG("stepping rtos hart");
 
index 6cb2709de81c64d0107571c74ec99b6617a69303..f06b5f516db92045577b99d0969004c5e9ac702b 100644 (file)
@@ -294,9 +294,9 @@ int riscv_halt(struct target *target);
 
 int riscv_openocd_step(
        struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints
+       bool handle_breakpoints
 );
 
 int riscv_openocd_assert_reset(struct target *target);
index fb5c81f061fa039cdb9f4ff9333783713ea16322..76482e87896347200a90fac7445ecd02a560d764 100644 (file)
@@ -980,9 +980,9 @@ static int stm8_single_step_core(struct target *target)
        return ERROR_OK;
 }
 
-static int stm8_resume(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints,
-               int debug_execution)
+static int stm8_resume(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints,
+               bool debug_execution)
 {
        struct stm8_common *stm8 = target_to_stm8(target);
        struct breakpoint *breakpoint = NULL;
@@ -1004,7 +1004,7 @@ static int stm8_resume(struct target *target, int current,
                stm8_set_hwbreak(target, comparator_list);
        }
 
-       /* current = 1: continue on current pc,
+       /* current = true: continue on current pc,
           otherwise continue at <address> */
        if (!current) {
                buf_set_u32(stm8->core_cache->reg_list[STM8_PC].value,
@@ -1290,8 +1290,8 @@ static int stm8_arch_state(struct target *target)
        return ERROR_OK;
 }
 
-static int stm8_step(struct target *target, int current,
-               target_addr_t address, int handle_breakpoints)
+static int stm8_step(struct target *target, bool current,
+               target_addr_t address, bool handle_breakpoints)
 {
        LOG_DEBUG("%x " TARGET_ADDR_FMT " %x",
                current, address, handle_breakpoints);
@@ -1305,7 +1305,7 @@ static int stm8_step(struct target *target, int current,
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current) {
                buf_set_u32(stm8->core_cache->reg_list[STM8_PC].value, 0, 32, address);
                stm8->core_cache->reg_list[STM8_PC].dirty = true;
@@ -1789,7 +1789,7 @@ static int stm8_run_and_wait(struct target *target, uint32_t entry_point,
        /* This code relies on the target specific resume() and
           poll()->debug_entry() sequence to write register values to the
           processor and the read them back */
-       retval = target_resume(target, 0, entry_point, 0, 1);
+       retval = target_resume(target, false, entry_point, false, true);
        if (retval != ERROR_OK)
                return retval;
 
index 8deab8f34d9cfd62e8c527ae7cac9c629612fd85..9c5a33d3d297a743ce1b28bc5717ddc10abb17a2 100644 (file)
@@ -553,8 +553,8 @@ int target_halt(struct target *target)
  * hand the infrastructure for running such helpers might use this
  * procedure but rely on hardware breakpoint to detect termination.)
  */
-int target_resume(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints, int debug_execution)
+int target_resume(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints, bool debug_execution)
 {
        int retval;
 
@@ -579,7 +579,8 @@ int target_resume(struct target *target, int current, target_addr_t address,
         * in the correct order.
         */
        bool save_poll_mask = jtag_poll_mask();
-       retval = target->type->resume(target, current, address, handle_breakpoints, debug_execution);
+       retval = target->type->resume(target, current, address, handle_breakpoints,
+               debug_execution);
        jtag_poll_unmask(save_poll_mask);
 
        if (retval != ERROR_OK)
@@ -1408,7 +1409,7 @@ bool target_supports_gdb_connection(const struct target *target)
 }
 
 int target_step(struct target *target,
-               int current, target_addr_t address, int handle_breakpoints)
+               bool current, target_addr_t address, bool handle_breakpoints)
 {
        int retval;
 
@@ -2309,7 +2310,7 @@ int target_profiling_default(struct target *target, uint32_t *samples,
                        uint32_t t = buf_get_u32(reg->value, 0, 32);
                        samples[sample_count++] = t;
                        /* current pc, addr = 0, do not handle breakpoints, not debugging */
-                       retval = target_resume(target, 1, 0, 0, 0);
+                       retval = target_resume(target, true, 0, false, false);
                        target_poll(target);
                        alive_sleep(10); /* sleep 10ms, i.e. <100 samples/second. */
                } else if (target->state == TARGET_RUNNING) {
@@ -3303,7 +3304,7 @@ COMMAND_HANDLER(handle_reset_command)
 
 COMMAND_HANDLER(handle_resume_command)
 {
-       int current = 1;
+       bool current = true;
        if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
@@ -3315,10 +3316,10 @@ COMMAND_HANDLER(handle_resume_command)
        target_addr_t addr = 0;
        if (CMD_ARGC == 1) {
                COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr);
-               current = 0;
+               current = false;
        }
 
-       return target_resume(target, current, addr, 1, 0);
+       return target_resume(target, current, addr, true, false);
 }
 
 COMMAND_HANDLER(handle_step_command)
@@ -3340,7 +3341,7 @@ COMMAND_HANDLER(handle_step_command)
 
        struct target *target = get_current_target(CMD_CTX);
 
-       return target_step(target, current_pc, addr, 1);
+       return target_step(target, current_pc, addr, true);
 }
 
 void target_handle_md_output(struct command_invocation *cmd,
@@ -4379,7 +4380,7 @@ COMMAND_HANDLER(handle_profile_command)
        } else if (target->state == TARGET_HALTED && !halted_before_profiling) {
                /* The target was running before we started and is halted now. Resume
                 * it, for consistency. */
-               retval = target_resume(target, 1, 0, 0, 0);
+               retval = target_resume(target, true, 0, false, false);
                if (retval != ERROR_OK) {
                        free(samples);
                        return retval;
index abd0b582550f897b9e8559a2787d1cfda9ac22e8..47f02ec266625008ded4f3f06f865e1530e95c8a 100644 (file)
@@ -386,8 +386,8 @@ int target_unregister_trace_callback(
  * yet it is possible to detect error conditions.
  */
 int target_poll(struct target *target);
-int target_resume(struct target *target, int current, target_addr_t address,
-               int handle_breakpoints, int debug_execution);
+int target_resume(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints, bool debug_execution);
 int target_halt(struct target *target);
 int target_call_event_callbacks(struct target *target, enum target_event event);
 int target_call_reset_callbacks(struct target *target, enum target_reset_mode reset_mode);
@@ -536,7 +536,7 @@ bool target_supports_gdb_connection(const struct target *target);
  * This routine is a wrapper for target->type->step.
  */
 int target_step(struct target *target,
-               int current, target_addr_t address, int handle_breakpoints);
+               bool current, target_addr_t address, bool handle_breakpoints);
 /**
  * Run an algorithm on the @a target given.
  *
index f35a59c5fe8fd4a9a23a714218dde6dd5890e9d5..ce98cbad277bb65bda51403c5b351df8d6457050 100644 (file)
@@ -42,10 +42,10 @@ struct target_type {
        /* halt will log a warning, but return ERROR_OK if the target is already halted. */
        int (*halt)(struct target *target);
        /* See target.c target_resume() for documentation. */
-       int (*resume)(struct target *target, int current, target_addr_t address,
-                       int handle_breakpoints, int debug_execution);
-       int (*step)(struct target *target, int current, target_addr_t address,
-                       int handle_breakpoints);
+       int (*resume)(struct target *target, bool current, target_addr_t address,
+                       bool handle_breakpoints, bool debug_execution);
+       int (*step)(struct target *target, bool current, target_addr_t address,
+                       bool handle_breakpoints);
        /* target reset control. assert reset can be invoked when OpenOCD and
         * the target is out of sync.
         *
index 83afd5de23796da1685a9689737a9230586b60cd..5cc790a311acaaebd1970a170ed9996580e00fe2 100644 (file)
@@ -47,8 +47,8 @@
  */
 
 /* forward declarations */
-static int xscale_resume(struct target *, int current,
-       target_addr_t address, int handle_breakpoints, int debug_execution);
+static int xscale_resume(struct target *, bool current,
+       target_addr_t address, bool handle_breakpoints, bool debug_execution);
 static int xscale_debug_entry(struct target *);
 static int xscale_restore_banked(struct target *);
 static int xscale_get_reg(struct reg *reg);
@@ -997,7 +997,7 @@ static int xscale_debug_entry(struct target *target)
                 * can only happen in fill mode. */
                if (xscale->arch_debug_reason == XSCALE_DBG_REASON_TB_FULL) {
                        if (--xscale->trace.fill_counter > 0)
-                               xscale_resume(target, 1, 0x0, 1, 0);
+                               xscale_resume(target, true, 0x0, true, false);
                } else  /* entered debug for other reason; reset counter */
                        xscale->trace.fill_counter = 0;
        }
@@ -1106,8 +1106,8 @@ static void xscale_free_trace_data(struct xscale_common *xscale)
        xscale->trace.data = NULL;
 }
 
-static int xscale_resume(struct target *target, int current,
-       target_addr_t address, int handle_breakpoints, int debug_execution)
+static int xscale_resume(struct target *target, bool current,
+       target_addr_t address, bool handle_breakpoints, bool debug_execution)
 {
        struct xscale_common *xscale = target_to_xscale(target);
        struct arm *arm = &xscale->arm;
@@ -1130,7 +1130,7 @@ static int xscale_resume(struct target *target, int current,
        if (retval != ERROR_OK)
                return retval;
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current)
                buf_set_u32(arm->pc->value, 0, 32, address);
 
@@ -1277,8 +1277,8 @@ static int xscale_resume(struct target *target, int current,
        return ERROR_OK;
 }
 
-static int xscale_step_inner(struct target *target, int current,
-       uint32_t address, int handle_breakpoints)
+static int xscale_step_inner(struct target *target, bool current,
+       uint32_t address, bool handle_breakpoints)
 {
        struct xscale_common *xscale = target_to_xscale(target);
        struct arm *arm = &xscale->arm;
@@ -1372,8 +1372,8 @@ static int xscale_step_inner(struct target *target, int current,
        return ERROR_OK;
 }
 
-static int xscale_step(struct target *target, int current,
-       target_addr_t address, int handle_breakpoints)
+static int xscale_step(struct target *target, bool current,
+       target_addr_t address, bool handle_breakpoints)
 {
        struct arm *arm = target_to_arm(target);
        struct breakpoint *breakpoint = NULL;
@@ -1386,7 +1386,7 @@ static int xscale_step(struct target *target, int current,
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       /* current = 1: continue on current pc, otherwise continue at <address> */
+       /* current = true: continue on current pc, otherwise continue at <address> */
        if (!current)
                buf_set_u32(arm->pc->value, 0, 32, address);
 
@@ -1598,7 +1598,7 @@ static int xscale_deassert_reset(struct target *target)
                        target->state = TARGET_HALTED;
 
                        /* resume the target */
-                       xscale_resume(target, 1, 0x0, 1, 0);
+                       xscale_resume(target, true, 0x0, true, false);
                }
        }
 
index 3b888fe5f0d1fba1a654aed60f8ced3c4b498732..3a877edfa6308de541075258f4e625b6100c9641 100644 (file)
@@ -1591,10 +1591,10 @@ int xtensa_halt(struct target *target)
 }
 
 int xtensa_prepare_resume(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints,
-       int debug_execution)
+       bool handle_breakpoints,
+       bool debug_execution)
 {
        struct xtensa *xtensa = target_to_xtensa(target);
        uint32_t bpena = 0;
@@ -1671,13 +1671,14 @@ int xtensa_do_resume(struct target *target)
 }
 
 int xtensa_resume(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints,
-       int debug_execution)
+       bool handle_breakpoints,
+       bool debug_execution)
 {
        LOG_TARGET_DEBUG(target, "start");
-       int res = xtensa_prepare_resume(target, current, address, handle_breakpoints, debug_execution);
+       int res = xtensa_prepare_resume(target, current, address,
+               handle_breakpoints, debug_execution);
        if (res != ERROR_OK) {
                LOG_TARGET_ERROR(target, "Failed to prepare for resume!");
                return res;
@@ -1719,7 +1720,8 @@ static bool xtensa_pc_in_winexc(struct target *target, target_addr_t pc)
        return false;
 }
 
-int xtensa_do_step(struct target *target, int current, target_addr_t address, int handle_breakpoints)
+int xtensa_do_step(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints)
 {
        struct xtensa *xtensa = target_to_xtensa(target);
        int res;
@@ -1844,7 +1846,7 @@ int xtensa_do_step(struct target *target, int current, target_addr_t address, in
                /* Now that ICOUNT (LX) or DCR.StepRequest (NX) is set,
                 * we can resume as if we were going to run
                 */
-               res = xtensa_prepare_resume(target, current, address, 0, 0);
+               res = xtensa_prepare_resume(target, current, address, false, false);
                if (res != ERROR_OK) {
                        LOG_TARGET_ERROR(target, "Failed to prepare resume for single step");
                        return res;
@@ -1941,7 +1943,8 @@ int xtensa_do_step(struct target *target, int current, target_addr_t address, in
        return res;
 }
 
-int xtensa_step(struct target *target, int current, target_addr_t address, int handle_breakpoints)
+int xtensa_step(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints)
 {
        int retval = xtensa_do_step(target, current, address, handle_breakpoints);
        if (retval != ERROR_OK)
@@ -2806,7 +2809,7 @@ int xtensa_start_algorithm(struct target *target,
                }
        }
 
-       return xtensa_resume(target, 0, entry_point, 1, 1);
+       return xtensa_resume(target, false, entry_point, true, true);
 }
 
 /** Waits for an algorithm in the target. */
index 419277675c84aaef039c8e9c4f654ec7a302f932..a920f77cdf4a68cfd156704b5c6eea94fb7db450 100644 (file)
@@ -378,18 +378,20 @@ int xtensa_poll(struct target *target);
 void xtensa_on_poll(struct target *target);
 int xtensa_halt(struct target *target);
 int xtensa_resume(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints,
-       int debug_execution);
+       bool handle_breakpoints,
+       bool debug_execution);
 int xtensa_prepare_resume(struct target *target,
-       int current,
+       bool current,
        target_addr_t address,
-       int handle_breakpoints,
-       int debug_execution);
+       bool handle_breakpoints,
+       bool debug_execution);
 int xtensa_do_resume(struct target *target);
-int xtensa_step(struct target *target, int current, target_addr_t address, int handle_breakpoints);
-int xtensa_do_step(struct target *target, int current, target_addr_t address, int handle_breakpoints);
+int xtensa_step(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints);
+int xtensa_do_step(struct target *target, bool current, target_addr_t address,
+               bool handle_breakpoints);
 int xtensa_mmu_is_enabled(struct target *target, int *enabled);
 int xtensa_read_memory(struct target *target, target_addr_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 int xtensa_read_buffer(struct target *target, target_addr_t address, uint32_t count, uint8_t *buffer);